- npm updates

- renamed 'models' and 'validators' folders - removed unneccessary files in contracts folder
2024-04-30 11:50:50 +02:00 · 2024-04-30 11:50:50 +02:00 · 08c2edca3b
commit 08c2edca3b
parent a29865b781
62 changed files with 371 additions and 458 deletions
--- a/app/Controllers/Http/Admin/AdminuserController.ts
+++ b/app/Controllers/Http/Admin/AdminuserController.ts
@ -1,9 +1,9 @@
 import type { HttpContext } from '@adonisjs/core/http';
-import User from '#app/Models/User';
-import Role from '#app/Models/Role';
+import User from '#models/user';
+import Role from '#models/role';
 import { ModelQueryBuilderContract } from "@adonisjs/lucid/types/model";
-import CreateUserValidator from '#app/Validators/CreateUserValidator';
-import UpdateUserValidator from '#app/Validators/UpdateUserValidator';
+import CreateUserValidator from '#validators/create_user_validator';
+import UpdateUserValidator from '#validators/update_user_validator';
 // import { schema, rules } from '@ioc:Adonis/Core/Validator';
 // import Hash from '@ioc:Adonis/Core/Hash';
 // import { schema, rules } from '@ioc:Adonis/Core/Validator';
--- a/app/Controllers/Http/Admin/RoleController.ts
+++ b/app/Controllers/Http/Admin/RoleController.ts
@ -1,8 +1,8 @@
 import type { HttpContext } from '@adonisjs/core/http';
-import Role from '#app/Models/Role';
-import Permission from '#app/Models/Permission';
-import CreateRoleValidator from '#app/Validators/CreateRoleValidator';
-import UpdateRoleValidator from '#app/Validators/UpdateRoleValidator';
+import Role from '#models/role';
+import Permission from '#models/permission';
+import CreateRoleValidator from '#validators/create_role_validator';
+import UpdateRoleValidator from '#validators/update_role_validator';
 import type { ModelQueryBuilderContract } from "@adonisjs/lucid/types/model";

 // import { schema, rules } from '@ioc:Adonis/Core/Validator';
--- a/app/Controllers/Http/Api/AuthorsController.ts
+++ b/app/Controllers/Http/Api/AuthorsController.ts
@ -1,5 +1,5 @@
 import type { HttpContext } from '@adonisjs/core/http';
-import Person from '#app/Models/Person';
+import Person from '#models/person';
 // import Dataset from 'App/Models/Dataset';

 // node ace make:controller Author
--- a/app/Controllers/Http/Api/DatasetController.ts
+++ b/app/Controllers/Http/Api/DatasetController.ts
@ -1,6 +1,6 @@
 import type { HttpContext } from '@adonisjs/core/http';
 // import Person from 'App/Models/Person';
-import Dataset from '#app/Models/Dataset';
+import Dataset from '#models/dataset';
 import { StatusCodes } from 'http-status-codes';

 // node ace make:controller Author
--- a/app/Controllers/Http/Api/FileController.ts
+++ b/app/Controllers/Http/Api/FileController.ts
@ -1,5 +1,5 @@
 import type { HttpContext } from '@adonisjs/core/http';
-import File from '#app/Models/File';
+import File from '#models/file';
 import { StatusCodes } from 'http-status-codes';
 import * as fs from 'fs';
 import * as path from 'path';
--- a/app/Controllers/Http/Api/UserController.ts
+++ b/app/Controllers/Http/Api/UserController.ts
@ -1,6 +1,6 @@
 import type { HttpContext } from '@adonisjs/core/http';
 // import TotpSecret from 'App/Models/TotpSecret';
-import User from '#app/Models/User';
+import User from '#models/user';
 import TwoFactorAuthProvider from '#app/services/TwoFactorAuthProvider';
 import { StatusCodes } from 'http-status-codes';
 import { InvalidArgumentException } from 'node-exceptions';
--- a/app/Controllers/Http/Auth/AuthController.ts
+++ b/app/Controllers/Http/Auth/AuthController.ts
@ -1,8 +1,8 @@
 import type { HttpContext } from '@adonisjs/core/http';
-import User from '#models/User';
+import User from '#models/user';
 // import Hash from '@ioc:Adonis/Core/Hash';
 // import InvalidCredentialException from 'App/Exceptions/InvalidCredentialException';
-import AuthValidator from '#app/Validators/AuthValidator';
+import AuthValidator from '#validators/auth_validator';

 import TwoFactorAuthProvider from '#app/services/TwoFactorAuthProvider';
 // import { Authenticator } from '@adonisjs/auth';
--- a/app/Controllers/Http/Auth/UserController.ts
+++ b/app/Controllers/Http/Auth/UserController.ts
@ -1,5 +1,5 @@
 import type { HttpContext } from '@adonisjs/core/http';
-import User from '#app/Models/User';
+import User from '#models/user';
 // import { RenderResponse } from '@ioc:EidelLev/Inertia';
 import TwoFactorAuthProvider from '#app/services/TwoFactorAuthProvider';
 import hash from '@adonisjs/core/services/hash';
--- a/app/Controllers/Http/Editor/DatasetController.ts
+++ b/app/Controllers/Http/Editor/DatasetController.ts
@ -1,8 +1,8 @@
 import type { HttpContext } from '@adonisjs/core/http';
 import { Client } from '@opensearch-project/opensearch';
-import User from '#app/Models/User';
-import Dataset from '#app/Models/Dataset';
-import DatasetIdentifier from '#app/Models/DatasetIdentifier';
+import User from '#models/user';
+import Dataset from '#models/dataset';
+import DatasetIdentifier from '#models/dataset_identifier';
 import XmlModel from '#app/Library/XmlModel';
 import { XMLBuilder } from 'xmlbuilder2/lib/interfaces.js';
 import { create } from 'xmlbuilder2';
@ -11,7 +11,7 @@ import SaxonJS from 'saxon-js';
 import { schema } from '@adonisjs/validator';
 import { DateTime } from 'luxon';
 import Index from '#app/Library/Utils/Index';
-import { getDomain } from '#app/Utils/utility-functions';
+import { getDomain } from '#app/utils/utility-functions';
 import { DoiClient } from '#app/Library/Doi/DoiClient';
 import DoiClientException from '#app/exceptions/DoiClientException';
 import logger from '@adonisjs/core/services/logger';
--- a/app/Controllers/Http/Oai/OaiController.ts
+++ b/app/Controllers/Http/Oai/OaiController.ts
@ -12,9 +12,9 @@ import SaxonJS from 'saxon-js';
 // import { Xslt, xmlParse } from 'xslt-processor'
 import { OaiErrorCodes, OaiModelError } from '#app/exceptions/OaiErrorCodes';
 import { OaiModelException, BadOaiModelException } from '#app/exceptions/OaiModelException';
-import Dataset from '#app/Models/Dataset';
-import Collection from '#app/Models/Collection';
-import { getDomain, preg_match } from '#app/Utils/utility-functions';
+import Dataset from '#models/dataset';
+import Collection from '#models/collection';
+import { getDomain, preg_match } from '#app/utils/utility-functions';
 import XmlModel from '#app/Library/XmlModel';
 import logger from '@adonisjs/core/services/logger';
 import ResumptionToken from '#app/Library/Oai/ResumptionToken';
--- a/app/Controllers/Http/Reviewer/DatasetController.ts
+++ b/app/Controllers/Http/Reviewer/DatasetController.ts
@ -1,8 +1,8 @@
 import type { HttpContext } from '@adonisjs/core/http';
-import User from '#app/Models/User';
-import Dataset from '#app/Models/Dataset';
+import User from '#models/user';
+import Dataset from '#models/dataset';
 import Field from '#app/Library/Field';
-import BaseModel from '#app/Models/BaseModel';
+import BaseModel from '#models/base_model';
 import { DateTime } from 'luxon';
 import { schema, rules } from '@adonisjs/validator';
 import { ModelQueryBuilderContract } from "@adonisjs/lucid/types/model";
--- a/app/Controllers/Http/Submitter/DatasetController.ts
+++ b/app/Controllers/Http/Submitter/DatasetController.ts
@ -1,22 +1,22 @@
 import type { HttpContext } from '@adonisjs/core/http';
-import User from '#app/Models/User';
-import Dataset from '#app/Models/Dataset';
-import License from '#app/Models/License';
-import Project from '#app/Models/Project';
-import Title from '#app/Models/Title';
-import Description from '#app/Models/Description';
-import Language from '#app/Models/Language';
-import Coverage from '#app/Models/Coverage';
-import Collection from '#app/Models/Collection';
+import User from '#models/user';
+import Dataset from '#models/dataset';
+import License from '#models/license';
+import Project from '#models/project';
+import Title from '#models/title';
+import Description from '#models/description';
+import Language from '#models/language';
+import Coverage from '#models/coverage';
+import Collection from '#models/collection';
 import { schema, rules } from '@adonisjs/validator';
 import { CustomMessages } from '@adonisjs/validator/types';
 import dayjs from 'dayjs';
-import Person from '#app/Models/Person';
+import Person from '#models/person';
 import db from '@adonisjs/lucid/services/db';
 import { TransactionClientContract } from '@adonisjs/lucid/types/database';
-import Subject from '#app/Models/Subject';
-import CreateDatasetValidator from '#app/Validators/CreateDatasetValidator';
-import UpdateDatasetValidator from '#app/Validators/UpdateDatasetValidator';
+import Subject from '#models/subject';
+import CreateDatasetValidator from '#validators/create_dataset_validator';
+import UpdateDatasetValidator from '#validators/update_dataset_validator';
 import {
    TitleTypes,
    DescriptionTypes,
@ -28,9 +28,9 @@ import {
    SubjectTypes,
 } from '#contracts/enums';
 import { ModelQueryBuilderContract } from '@adonisjs/lucid/types/model';
-import DatasetReference from '#app/Models/DatasetReference';
+import DatasetReference from '#models/dataset_reference';
 import { cuid } from '@adonisjs/core/helpers';
-import File from '#app/Models/File';
+import File from '#models/file';
 import ClamScan from 'clamscan';
 import { ValidationException } from '@adonisjs/validator';
 // import Drive from '@ioc:Adonis/Core/Drive';
--- a/app/Controllers/Http/Submitter/PersonController.ts
+++ b/app/Controllers/Http/Submitter/PersonController.ts
@ -10,7 +10,7 @@ import type { HttpContext } from '@adonisjs/core/http';
 // import Collection from 'App/Models/Collection';
 // import { schema, CustomMessages, rules } from '@ioc:Adonis/Core/Validator';
 // import dayjs from 'dayjs';
-import Person from '#app/Models/Person';
+import Person from '#models/person';
 import { ModelQueryBuilderContract } from "@adonisjs/lucid/types/model";

 export default class PersonController {
--- a/app/Library/Strategy.ts
+++ b/app/Library/Strategy.ts
@ -1,8 +1,8 @@
 import { XMLBuilder } from 'xmlbuilder2/lib/interfaces.js';
 import { create } from 'xmlbuilder2';
-import Dataset from '#app/Models/Dataset';
+import Dataset from '#models/dataset';
 import Field from './Field.js';
-import BaseModel from '#app/Models/BaseModel';
+import BaseModel from '#models/base_model';
 import { DateTime } from 'luxon';

 export default class Strategy {
--- a/app/Library/Utils/Index.ts
+++ b/app/Library/Utils/Index.ts
@ -1,4 +1,4 @@
-import Dataset from '#app/Models/Dataset';
+import Dataset from '#models/dataset';
 import { Client } from '@opensearch-project/opensearch';
 import { create } from 'xmlbuilder2';
 import SaxonJS from 'saxon-js';
@ -8,7 +8,7 @@ import logger from '@adonisjs/core/services/logger';
 import { readFileSync } from 'fs';
 import { DateTime } from 'luxon';
 // import Config from '@ioc:Adonis/Core/Config';
-import { getDomain } from '#app/Utils/utility-functions';
+import { getDomain } from '#app/utils/utility-functions';

 // const opensearchNode = process.env.OPENSEARCH_HOST || 'localhost';
 // const client = new Client({ node: `http://${opensearchNode}` }); // replace with your OpenSearch endpoint
--- a/app/Library/XmlModel.ts
+++ b/app/Library/XmlModel.ts
@ -1,6 +1,6 @@
-import DocumentXmlCache from '#app/Models/DocumentXmlCache';
+import DocumentXmlCache from '#models/DocumentXmlCache';
 import { XMLBuilder } from 'xmlbuilder2/lib/interfaces.js';
-import Dataset from '#app/Models/Dataset';
+import Dataset from '#models/dataset';
 import Strategy from './Strategy.js';
 import { DateTime } from 'luxon';
 import { builder } from 'xmlbuilder2';
--- a/app/middleware/Is.ts
+++ b/app/middleware/Is.ts
@ -2,7 +2,7 @@ import { HttpContext } from '@adonisjs/core/http';
 // import Config from '@ioc:Adonis/Core/Config';
 import config from '@adonisjs/core/services/config'
 import db from '@adonisjs/lucid/services/db';
-import User from '#app/Models/User';
+import User from '#models/user';
 // import { Exception } from '@adonisjs/core/build/standalone'

 const roleTable = config.get('rolePermission.role_table', 'roles');
--- a/app/middleware/can_middleware.ts
+++ b/app/middleware/can_middleware.ts
@ -2,7 +2,7 @@ import { HttpContext } from '@adonisjs/core/http';
 // import Config from '@ioc:Adonis/Core/Config';
 import config from '@adonisjs/core/services/config';
 import db from '@adonisjs/lucid/services/db';
-import User from '#app/Models/User';
+import User from '#models/user';
 import { Exception } from '@adonisjs/core/exceptions';

 const permissionTable = config.get('rolePermission.permission_table', 'permissions');
--- a/app/middleware/role_middleware.ts
+++ b/app/middleware/role_middleware.ts
@ -1,7 +1,7 @@
 import type { HttpContext } from '@adonisjs/core/http';
 import db from '@adonisjs/lucid/services/db';
 import config from '@adonisjs/core/services/config';
-import User from '#app/Models/User';
+import User from '#models/user';
 import { Exception } from '@adonisjs/core/exceptions';

 // const roleTable = Config.get('rolePermission.role_table', 'roles');
--- a/app/models/DocumentXmlCache.ts
+++ b/app/models/DocumentXmlCache.ts
@ -1,5 +1,5 @@
 import { column, BaseModel, SnakeCaseNamingStrategy, belongsTo } from '@adonisjs/lucid/orm';
-import Dataset from './Dataset.js';
+import Dataset from './dataset.js';
 import { builder, create } from 'xmlbuilder2';
 import { XMLBuilder } from 'xmlbuilder2/lib/interfaces.js';
 import db from '@adonisjs/lucid/services/db';
--- a/app/models/base_model.ts
+++ b/app/models/base_model.ts
--- a/app/models/collection.ts
+++ b/app/models/collection.ts
@ -1,7 +1,7 @@
 import { column, SnakeCaseNamingStrategy, manyToMany, belongsTo } from '@adonisjs/lucid/orm';
-import Dataset from './Dataset.js';
-import BaseModel from './BaseModel.js';
-import CollectionRole from './CollectionRole.js';
+import Dataset from './dataset.js';
+import BaseModel from './base_model.js';
+import CollectionRole from './collection_role.js';
 import type { ManyToMany } from "@adonisjs/lucid/types/relations";
 import type { BelongsTo } from "@adonisjs/lucid/types/relations";

--- a/app/models/collection_role.ts
+++ b/app/models/collection_role.ts
@ -1,6 +1,6 @@
 import { column, SnakeCaseNamingStrategy, hasMany } from '@adonisjs/lucid/orm';
-import BaseModel from './BaseModel.js';
-import Collection from './Collection.js';
+import BaseModel from './base_model.js';
+import Collection from './collection.js';
 import type { HasMany } from "@adonisjs/lucid/types/relations";

 export default class CollectionRole extends BaseModel {
--- a/app/models/coverage.ts
+++ b/app/models/coverage.ts
@ -1,7 +1,7 @@
 import { column, SnakeCaseNamingStrategy, belongsTo } from '@adonisjs/lucid/orm';
 import { DateTime } from 'luxon';
-import Dataset from './Dataset.js';
-import BaseModel from './BaseModel.js';
+import Dataset from './dataset.js';
+import BaseModel from './base_model.js';
 import type { BelongsTo } from "@adonisjs/lucid/types/relations";

 export default class Coverage extends BaseModel {
--- a/app/models/dataset.ts
+++ b/app/models/dataset.ts
@ -9,20 +9,20 @@ import {
 } from '@adonisjs/lucid/orm';
 import { DateTime } from 'luxon';
 import dayjs from 'dayjs';
-import Person from './Person.js';
-import User from './User.js';
-import Title from './Title.js';
-import Description from './Description.js';
-import License from './License.js';
-import Subject from './Subject.js';
-import File from './File.js';
-import Coverage from './Coverage.js';
-import DatasetReference from './DatasetReference.js';
-import Collection from './Collection.js';
-import DatasetIdentifier from './DatasetIdentifier.js';
-import Project from './Project.js';
+import Person from './person.js';
+import User from './user.js';
+import Title from './title.js';
+import Description from './description.js';
+import License from './license.js';
+import Subject from './subject.js';
+import File from './file.js';
+import Coverage from './coverage.js';
+import DatasetReference from './dataset_reference.js';
+import Collection from './collection.js';
+import DatasetIdentifier from './dataset_identifier.js';
+import Project from './project.js';
 import DocumentXmlCache from './DocumentXmlCache.js';
-import DatasetExtension from '#app/Models/Traits/DatasetExtension';
+import DatasetExtension from '#models/traits/dataset_extension';
 import type { ManyToMany } from "@adonisjs/lucid/types/relations";
 import type { BelongsTo } from "@adonisjs/lucid/types/relations";
 import type { HasMany } from "@adonisjs/lucid/types/relations";
--- a/app/models/dataset_identifier.ts
+++ b/app/models/dataset_identifier.ts
@ -1,7 +1,7 @@
 import { column, SnakeCaseNamingStrategy, belongsTo } from '@adonisjs/lucid/orm';
 import { DateTime } from 'luxon';
-import Dataset from './Dataset.js';
-import BaseModel from './BaseModel.js';
+import Dataset from './dataset.js';
+import BaseModel from './base_model.js';
 import type { BelongsTo } from "@adonisjs/lucid/types/relations";

 export default class DatasetIdentifier extends BaseModel {
--- a/app/models/dataset_reference.ts
+++ b/app/models/dataset_reference.ts
@ -1,7 +1,7 @@
 import { column, SnakeCaseNamingStrategy, belongsTo } from '@adonisjs/lucid/orm';
 import { DateTime } from 'luxon';
-import Dataset from './Dataset.js';
-import BaseModel from './BaseModel.js';
+import Dataset from './dataset.js';
+import BaseModel from './base_model.js';
 import type { BelongsTo } from "@adonisjs/lucid/types/relations";

 export default class DatasetReference extends BaseModel {
--- a/app/models/description.ts
+++ b/app/models/description.ts
@ -1,6 +1,6 @@
 import { column, belongsTo } from '@adonisjs/lucid/orm';
-import Dataset from './Dataset.js';
-import BaseModel from './BaseModel.js';
+import Dataset from './dataset.js';
+import BaseModel from './base_model.js';
 import type { BelongsTo } from "@adonisjs/lucid/types/relations";

 export default class Description extends BaseModel {
--- a/app/models/file.ts
+++ b/app/models/file.ts
@ -1,8 +1,8 @@
 import { DateTime } from 'luxon';
 import { column, hasMany, belongsTo, SnakeCaseNamingStrategy, computed } from '@adonisjs/lucid/orm';
-import HashValue from './HashValue.js';
-import Dataset from './Dataset.js';
-import BaseModel from './BaseModel.js';
+import HashValue from './hash_value.js';
+import Dataset from './dataset.js';
+import BaseModel from './base_model.js';
 // import { Buffer } from 'buffer';
 import * as fs from 'fs';
 import crypto from 'crypto';
--- a/app/models/hash_value.ts
+++ b/app/models/hash_value.ts
@ -1,5 +1,5 @@
 import { column, BaseModel, belongsTo, SnakeCaseNamingStrategy } from '@adonisjs/lucid/orm';
-import File from './File.js';
+import File from './file.js';
 import type { BelongsTo } from "@adonisjs/lucid/types/relations";

 export default class HashValue extends BaseModel {
--- a/app/models/language.ts
+++ b/app/models/language.ts
@ -1,5 +1,5 @@
 import { column, SnakeCaseNamingStrategy } from '@adonisjs/lucid/orm';
-import BaseModel from './BaseModel.js';
+import BaseModel from './base_model.js';
 // import { DateTime } from 'luxon';

 export default class Language extends BaseModel {
--- a/app/models/license.ts
+++ b/app/models/license.ts
@ -1,5 +1,5 @@
 import { column, SnakeCaseNamingStrategy } from '@adonisjs/lucid/orm';
-import BaseModel from './BaseModel.js';
+import BaseModel from './base_model.js';

 export default class License extends BaseModel {
    public static namingStrategy = new SnakeCaseNamingStrategy();
--- a/app/models/permission.ts
+++ b/app/models/permission.ts
@ -1,8 +1,8 @@
 import { column, manyToMany, SnakeCaseNamingStrategy } from '@adonisjs/lucid/orm';
 import { DateTime } from 'luxon';
 import dayjs from 'dayjs';
-import Role from '#app/Models/Role';
-import BaseModel from './BaseModel.js';
+import Role from '#models/role';
+import BaseModel from './base_model.js';
 import type { ManyToMany } from "@adonisjs/lucid/types/relations";

 export default class Permission extends BaseModel {
--- a/app/models/person.ts
+++ b/app/models/person.ts
@ -1,8 +1,8 @@
 import { column, SnakeCaseNamingStrategy, computed, manyToMany } from '@adonisjs/lucid/orm';
 import { DateTime } from 'luxon';
 import dayjs from 'dayjs';
-import Dataset from './Dataset.js';
-import BaseModel from './BaseModel.js';
+import Dataset from './dataset.js';
+import BaseModel from './base_model.js';
 import type { ManyToMany } from "@adonisjs/lucid/types/relations";

 export default class Person extends BaseModel {
--- a/app/models/project.ts
+++ b/app/models/project.ts
@ -1,6 +1,6 @@
 import { column, SnakeCaseNamingStrategy } from '@adonisjs/lucid/orm';
 import { DateTime } from 'luxon';
-import BaseModel from './BaseModel.js';
+import BaseModel from './base_model.js';

 export default class Project extends BaseModel {
    public static namingStrategy = new SnakeCaseNamingStrategy();
--- a/app/models/role.ts
+++ b/app/models/role.ts
@ -1,10 +1,10 @@
 import { column, SnakeCaseNamingStrategy, manyToMany, beforeCreate, beforeUpdate } from '@adonisjs/lucid/orm';
-import BaseModel from './BaseModel.js';
+import BaseModel from './base_model.js';
 import { DateTime } from 'luxon';
 // import moment from 'moment';
 import dayjs from 'dayjs';
-import User from './User.js';
-import Permission from '#app/Models/Permission';
+import User from './user.js';
+import Permission from '#models/permission';
 import type { ManyToMany } from "@adonisjs/lucid/types/relations";

 export default class Role extends BaseModel {
--- a/app/models/subject.ts
+++ b/app/models/subject.ts
@ -1,9 +1,9 @@
 import { column, SnakeCaseNamingStrategy, manyToMany, computed} from '@adonisjs/lucid/orm';
-import BaseModel from './BaseModel.js';
+import BaseModel from './base_model.js';

 import { DateTime } from 'luxon';
 import dayjs from 'dayjs';
-import Dataset from './Dataset.js';
+import Dataset from './dataset.js';
 import type { ManyToMany } from "@adonisjs/lucid/types/relations";

 export default class Subject extends BaseModel {
--- a/app/models/title.ts
+++ b/app/models/title.ts
@ -1,6 +1,6 @@
 import { column, belongsTo } from '@adonisjs/lucid/orm';
-import Dataset from './Dataset.js';
-import BaseModel from './BaseModel.js';
+import Dataset from './dataset.js';
+import BaseModel from './base_model.js';
 import type { BelongsTo } from "@adonisjs/lucid/types/relations";

 // import { DatasetRelatedBaseModel } from './BaseModel';
--- a/app/models/totp_secret.ts
+++ b/app/models/totp_secret.ts
@ -1,5 +1,5 @@
 import { column, BaseModel, SnakeCaseNamingStrategy, belongsTo } from '@adonisjs/lucid/orm';
-import User from './User.js';
+import User from './user.js';
 import { DateTime } from 'luxon';
 import dayjs from 'dayjs';
 // import Encryption from '@ioc:Adonis/Core/Encryption';
--- a/app/models/traits/dataset_extension.ts
+++ b/app/models/traits/dataset_extension.ts
@ -1,13 +1,13 @@
-import Title from '#app/Models/Title';
-import Description from '#app/Models/Description';
-import License from '#app/Models/License';
-import Person from '#app/Models/Person';
-import DatasetReference from '#app/Models/DatasetReference';
-import DatasetIdentifier from '#app/Models/DatasetIdentifier';
-import Subject from '#app/Models/Subject';
-import File from '#app/Models/File';
-import Coverage from '#app/Models/Coverage';
-import Collection from '#app/Models/Collection';
+import Title from '#models/title';
+import Description from '#models/description';
+import License from '#models/license';
+import Person from '#models/person';
+import DatasetReference from '#models/dataset_reference';
+import DatasetIdentifier from '#models/dataset_identifier';
+import Subject from '#models/subject';
+import File from '#models/file';
+import Coverage from '#models/coverage';
+import Collection from '#models/collection';
 import { BaseModel as LucidBaseModel } from '@adonisjs/lucid/orm';
 import Field from '#app/Library/Field';
 import { DateTime } from 'luxon';
--- a/app/models/user.ts
+++ b/app/models/user.ts
@ -2,11 +2,11 @@ import { DateTime } from 'luxon';
 import { withAuthFinder } from '@adonisjs/auth/mixins/lucid'
 import { column, manyToMany, hasMany } from '@adonisjs/lucid/orm';
 import hash from '@adonisjs/core/services/hash';
-import Role from './Role.js';
+import Role from './role.js';
 import db from '@adonisjs/lucid/services/db';
 import config from '@adonisjs/core/services/config';
-import Dataset from './Dataset.js';
-import BaseModel from './BaseModel.js';
+import Dataset from './dataset.js';
+import BaseModel from './base_model.js';
 // import Encryption from '@ioc:Adonis/Core/Encryption';
 import encryption from '@adonisjs/core/services/encryption';
 import { TotpState } from '#contracts/enums';
--- a/app/models/user_role.ts
+++ b/app/models/user_role.ts
@ -1,7 +1,7 @@
 import { column, BaseModel, belongsTo, SnakeCaseNamingStrategy } from '@adonisjs/lucid/orm';

-import User from '#app/Models/User';
-import Role from '#app/Models/Role';
+import User from '#models/user';
+import Role from '#models/role';
 import { DateTime } from 'luxon';
 import type { BelongsTo } from "@adonisjs/lucid/types/relations";

--- a/app/services/TwoFactorAuthProvider.ts
+++ b/app/services/TwoFactorAuthProvider.ts
@ -1,6 +1,6 @@
 // import Config from '@ioc:Adonis/Core/Config';
 import config from '@adonisjs/core/services/config'
-import User from '#app/Models/User';
+import User from '#models/user';
 import { generateSecret, verifyToken } from 'node-2fa/dist/index.js';
 // import cryptoRandomString from 'crypto-random-string';
 import QRCode from 'qrcode';
--- a/app/utils/utility-functions.ts
+++ b/app/utils/utility-functions.ts
--- a/app/validators/auth_validator.ts
+++ b/app/validators/auth_validator.ts
--- a/app/validators/create_dataset_validator.ts
+++ b/app/validators/create_dataset_validator.ts
--- a/app/validators/create_role_validator.ts
+++ b/app/validators/create_role_validator.ts
--- a/app/validators/create_user_validator.ts
+++ b/app/validators/create_user_validator.ts
--- a/app/validators/update_dataset_validator.ts
+++ b/app/validators/update_dataset_validator.ts
--- a/app/validators/update_role_validator.ts
+++ b/app/validators/update_role_validator.ts
--- a/app/validators/update_user_validator.ts
+++ b/app/validators/update_user_validator.ts
--- a/commands/index_datasets.ts
+++ b/commands/index_datasets.ts
@ -1,17 +1,17 @@
 // import Logger from '@ioc:Adonis/Core/Logger';
 import { XMLBuilder } from 'xmlbuilder2/lib/interfaces.js';
 import { create } from 'xmlbuilder2';
-import Dataset from '#app/Models/Dataset';
+import Dataset from '#models/dataset';
 import XmlModel from '#app/Library/XmlModel';
 import { readFileSync } from 'fs';
 import SaxonJS from 'saxon-js';
 import { Client } from '@opensearch-project/opensearch';
-import { getDomain } from '#app/Utils/utility-functions';
+import { getDomain } from '#app/utils/utility-functions';
 import { BaseCommand, flags } from '@adonisjs/core/ace';
 import { CommandOptions } from '@adonisjs/core/types/ace';
 import env from '#start/env';
 // import db from '@adonisjs/lucid/services/db';
-// import { default as Dataset } from '#app/Models/Dataset';
+// import { default as Dataset } from '#models/dataset';

 const opensearchNode = env.get('OPENSEARCH_HOST', 'localhost');
 const client = new Client({ node: `http://${opensearchNode}` }); // replace with your OpenSearch endpoint
@ -33,7 +33,7 @@ export default class IndexDatasets extends BaseCommand {

    async run() {
        this.logger.info('Hello world!');
-        // const { default: Dataset } = await import('#app/Models/Dataset');
+        // const { default: Dataset } = await import('#models/dataset');
        // const datasets = await Dataset.query().where('server_state', 'published').exec(); //this.getDatasets();
        const datasets = await this.getDatasets();
        const proc = readFileSync('public/assets2/solr.sef.json');
@ -48,10 +48,10 @@ export default class IndexDatasets extends BaseCommand {
    }

    private async getDatasets(): Promise<any[]> {
-        // const { default: Dataset } = await import('#app/Models/Dataset');
-        // const Dataset = (await import('#app/Models/Dataset')).default
+        // const { default: Dataset } = await import('#models/dataset');
+        // const Dataset = (await import('#models/dataset')).default
        //    const Dataset = (
-        //         await this.app.container.make('#app/Models/Dataset')
+        //         await this.app.container.make('#models/dataset')
        //       ).default;
        // const query: ModelQueryBuilder<Dataset, any> = db.from(Dataset);
        const query = Dataset.query().preload('xmlCache').where('server_state', 'published');
--- a/commands/validate_checksum.ts
+++ b/commands/validate_checksum.ts
@ -22,7 +22,7 @@ export default class ValidateChecksum extends BaseCommand {

    public async run() {
        // this.logger.info('Hello world!')
-        const { default: File } = await import('#app/Models/File');
+        const { default: File } = await import('#models/file');
        // const { default: HashValue } = await  (await (import ('App/Models/HashValue')));

        // query all published files from database:
--- a/config/auth.ts
+++ b/config/auth.ts
@ -1,7 +1,7 @@
 import { defineConfig } from '@adonisjs/auth';
 import { Authenticators } from '@adonisjs/auth/types';
 import { sessionGuard, sessionUserProvider } from '@adonisjs/auth/session';
-// import User from '#app/Models/User';
+// import User from '#models/user';
 // import { SessionLucidUserProviderOptions } from '@adonisjs/auth/types/session';
 import { Authenticator } from '@adonisjs/auth';
 import { GuardFactory } from '@adonisjs/auth/types';
@ -14,7 +14,7 @@ const authConfig = defineConfig({
        web: sessionGuard({
            useRememberMeTokens: false,
            provider: sessionUserProvider({
-                model: () => import('#app/Models/User'),
+                model: () => import('#models/user'),
            }),
        }),
    },
--- a/contracts/auth.ts
+++ b/contracts/auth.ts
@ -1,63 +0,0 @@
-// /**
-//  * Contract source: https://git.io/JOdz5
-//  *
-//  * Feel free to let us know via PR, if you find something broken in this
-//  * file.
-//  */
-
-// import User from '#app/Models/User';
-
-// declare module '@ioc:Adonis/Addons/Auth' {
-//     /*
-//     |
-//     interface ProvidersList {
-//         /*
-//     |--------------------------------------------------------------------------
-//     | User Provider
-//     |--------------------------------------------------------------------------
-//     |
-//     | The following provider uses Lucid models as a driver for fetching user
-//     | details from the database for authentication.
-//     |
-//     | You can create multiple providers using the same underlying driver with
-//     | different Lucid models.
-//     |
-//     */
-//         user: {
-//             implementation: LucidProviderContract<typeof User>;
-//             config: LucidProviderConfig<typeof User>;
-//         };
-//     }
-
-//     /*
-//   |--------------------------------------------------------------------------
-//   | Guards
-//   |--------------------------------------------------------------------------
-//   |
-//   | The guards are used for authenticating users using different drivers.
-//   | The auth module comes with 3 different guards.
-//   |
-//   | - SessionGuardContract
-//   | - BasicAuthGuardContract
-//   | - OATGuardContract ( Opaque access token )
-//   |
-//   | Every guard needs a provider for looking up users from the database.
-//   |
-//   */
-//     interface GuardsList {
-//         /*
-//     |--------------------------------------------------------------------------
-//     | Web Guard
-//     |--------------------------------------------------------------------------
-//     |
-//     | The web guard uses sessions for maintaining user login state. It uses
-//     | the `user` provider for fetching user details.
-//     |
-//     */
-//         web: {
-//             implementation: SessionGuardContract<'user', 'web'>;
-//             config: SessionGuardConfig<'user'>;
-//             client: SessionClientContract<'user'>;
-//         };
-//     }
-// }
--- a/contracts/drive.ts
+++ b/contracts/drive.ts
@ -1,13 +0,0 @@
-/**
- * Contract source: https://git.io/JBt3I
- *
- * Feel free to let us know via PR, if you find something broken in this contract
- * file.
- */
-
-// import type { InferDisksFromConfig } from '@adonisjs/core/build/config';
-// import type driveConfig from '../config/drive.js';
-
-// declare module '@ioc:Adonis/Core/Drive' {
-//     interface DisksList extends InferDisksFromConfig<typeof driveConfig> {}
-// }
--- a/contracts/tests.ts
+++ b/contracts/tests.ts
@ -1,18 +0,0 @@
-/**
- * Contract source: https://bit.ly/3DP1ypf
- *
- * Feel free to let us know via PR, if you find something broken in this contract
- * file.
- */
-
-import '@japa/runner';
-
-declare module '@japa/runner' {
-    interface TestContext {
-        // Extend context
-    }
-
-    interface Test<TestData> {
-        // Extend test
-    }
-}
--- a/package-lock.json
+++ b/package-lock.json
@ -204,9 +204,9 @@
      }
    },
    "node_modules/@adonisjs/assembler/node_modules/@adonisjs/env": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/@adonisjs/env/-/env-6.0.1.tgz",
-      "integrity": "sha512-oET3fKhgrz4j7qRIMb3oEWb4AZfUIOAT9whaBiX0YYrxG0um5GlP4/tE6Tm0EDM2JK5D+0atdL/VIv32MFDq0Q==",
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/@adonisjs/env/-/env-6.1.0.tgz",
+      "integrity": "sha512-CzK+njXTH3EK+d/UJPqckyqWocOItmLgHIUbvhpd6WvveBnfv1Dz5j9H3k+ogHqThDSJCXu1RkaRAC+HNym9gA==",
      "devOptional": true,
      "dependencies": {
        "@poppinss/utils": "^6.7.3",
@ -425,9 +425,9 @@
      }
    },
    "node_modules/@adonisjs/core/node_modules/@adonisjs/env": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/@adonisjs/env/-/env-6.0.1.tgz",
-      "integrity": "sha512-oET3fKhgrz4j7qRIMb3oEWb4AZfUIOAT9whaBiX0YYrxG0um5GlP4/tE6Tm0EDM2JK5D+0atdL/VIv32MFDq0Q==",
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/@adonisjs/env/-/env-6.1.0.tgz",
+      "integrity": "sha512-CzK+njXTH3EK+d/UJPqckyqWocOItmLgHIUbvhpd6WvveBnfv1Dz5j9H3k+ogHqThDSJCXu1RkaRAC+HNym9gA==",
      "dependencies": {
        "@poppinss/utils": "^6.7.3",
        "@poppinss/validator-lite": "^1.0.3",
@ -573,6 +573,11 @@
        "pino": "bin.js"
      }
    },
+    "node_modules/@adonisjs/core/node_modules/pino-std-serializers": {
+      "version": "6.2.2",
+      "resolved": "https://registry.npmjs.org/pino-std-serializers/-/pino-std-serializers-6.2.2.tgz",
+      "integrity": "sha512-cHjPPsE+vhj/tnhCy/wiMh3M3z3h/j15zHQX+S9GkTBgqJuTuJzYJ4gUyACLhDaJ7kk9ba9iRDmbH2tJU03OiA=="
+    },
    "node_modules/@adonisjs/core/node_modules/process-warning": {
      "version": "3.0.0",
      "resolved": "https://registry.npmjs.org/process-warning/-/process-warning-3.0.0.tgz",
@ -1347,21 +1352,21 @@
      }
    },
    "node_modules/@babel/core": {
-      "version": "7.24.4",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.24.4.tgz",
-      "integrity": "sha512-MBVlMXP+kkl5394RBLSxxk/iLTeVGuXTV3cIDXavPpMMqnSnt6apKgan/U8O3USWZCWZT/TbgfEpKa4uMgN4Dg==",
+      "version": "7.24.5",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.24.5.tgz",
+      "integrity": "sha512-tVQRucExLQ02Boi4vdPp49svNGcfL2GhdTCT9aldhXgCJVAI21EtRfBettiuLUwce/7r6bFdgs6JFkcdTiFttA==",
      "dev": true,
      "dependencies": {
        "@ampproject/remapping": "^2.2.0",
        "@babel/code-frame": "^7.24.2",
-        "@babel/generator": "^7.24.4",
+        "@babel/generator": "^7.24.5",
        "@babel/helper-compilation-targets": "^7.23.6",
-        "@babel/helper-module-transforms": "^7.23.3",
-        "@babel/helpers": "^7.24.4",
-        "@babel/parser": "^7.24.4",
+        "@babel/helper-module-transforms": "^7.24.5",
+        "@babel/helpers": "^7.24.5",
+        "@babel/parser": "^7.24.5",
        "@babel/template": "^7.24.0",
-        "@babel/traverse": "^7.24.1",
-        "@babel/types": "^7.24.0",
+        "@babel/traverse": "^7.24.5",
+        "@babel/types": "^7.24.5",
        "convert-source-map": "^2.0.0",
        "debug": "^4.1.0",
        "gensync": "^1.0.0-beta.2",
@ -1386,12 +1391,12 @@
      }
    },
    "node_modules/@babel/generator": {
-      "version": "7.24.4",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.24.4.tgz",
-      "integrity": "sha512-Xd6+v6SnjWVx/nus+y0l1sxMOTOMBkyL4+BIdbALyatQnAe/SRVjANeDPSCYaX+i1iJmuGSKf3Z+E+V/va1Hvw==",
+      "version": "7.24.5",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.24.5.tgz",
+      "integrity": "sha512-x32i4hEXvr+iI0NEoEfDKzlemF8AmtOP8CcrRaEcpzysWuoEb1KknpcvMsHKPONoKZiDuItklgWhB18xEhr9PA==",
      "dev": true,
      "dependencies": {
-        "@babel/types": "^7.24.0",
+        "@babel/types": "^7.24.5",
        "@jridgewell/gen-mapping": "^0.3.5",
        "@jridgewell/trace-mapping": "^0.3.25",
        "jsesc": "^2.5.1"
@ -1450,19 +1455,19 @@
      }
    },
    "node_modules/@babel/helper-create-class-features-plugin": {
-      "version": "7.24.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.24.4.tgz",
-      "integrity": "sha512-lG75yeuUSVu0pIcbhiYMXBXANHrpUPaOfu7ryAzskCgKUHuAxRQI5ssrtmF0X9UXldPlvT0XM/A4F44OXRt6iQ==",
+      "version": "7.24.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.24.5.tgz",
+      "integrity": "sha512-uRc4Cv8UQWnE4NXlYTIIdM7wfFkOqlFztcC/gVXDKohKoVB3OyonfelUBaJzSwpBntZ2KYGF/9S7asCHsXwW6g==",
      "dev": true,
      "dependencies": {
        "@babel/helper-annotate-as-pure": "^7.22.5",
        "@babel/helper-environment-visitor": "^7.22.20",
        "@babel/helper-function-name": "^7.23.0",
-        "@babel/helper-member-expression-to-functions": "^7.23.0",
+        "@babel/helper-member-expression-to-functions": "^7.24.5",
        "@babel/helper-optimise-call-expression": "^7.22.5",
        "@babel/helper-replace-supers": "^7.24.1",
        "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5",
-        "@babel/helper-split-export-declaration": "^7.22.6",
+        "@babel/helper-split-export-declaration": "^7.24.5",
        "semver": "^6.3.1"
      },
      "engines": {
@ -1558,12 +1563,12 @@
      }
    },
    "node_modules/@babel/helper-member-expression-to-functions": {
-      "version": "7.23.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.23.0.tgz",
-      "integrity": "sha512-6gfrPwh7OuT6gZyJZvd6WbTfrqAo7vm4xCzAXOusKqq/vWdKXphTpj5klHKNmRUU6/QRGlBsyU9mAIPaWHlqJA==",
+      "version": "7.24.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.24.5.tgz",
+      "integrity": "sha512-4owRteeihKWKamtqg4JmWSsEZU445xpFRXPEwp44HbgbxdWlUV1b4Agg4lkA806Lil5XM/e+FJyS0vj5T6vmcA==",
      "dev": true,
      "dependencies": {
-        "@babel/types": "^7.23.0"
+        "@babel/types": "^7.24.5"
      },
      "engines": {
        "node": ">=6.9.0"
@ -1582,16 +1587,16 @@
      }
    },
    "node_modules/@babel/helper-module-transforms": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.23.3.tgz",
-      "integrity": "sha512-7bBs4ED9OmswdfDzpz4MpWgSrV7FXlc3zIagvLFjS5H+Mk7Snr21vQ6QwrsoCGMfNC4e4LQPdoULEt4ykz0SRQ==",
+      "version": "7.24.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.24.5.tgz",
+      "integrity": "sha512-9GxeY8c2d2mdQUP1Dye0ks3VDyIMS98kt/llQ2nUId8IsWqTF0l1LkSX0/uP7l7MCDrzXS009Hyhe2gzTiGW8A==",
      "dev": true,
      "dependencies": {
        "@babel/helper-environment-visitor": "^7.22.20",
-        "@babel/helper-module-imports": "^7.22.15",
-        "@babel/helper-simple-access": "^7.22.5",
-        "@babel/helper-split-export-declaration": "^7.22.6",
-        "@babel/helper-validator-identifier": "^7.22.20"
+        "@babel/helper-module-imports": "^7.24.3",
+        "@babel/helper-simple-access": "^7.24.5",
+        "@babel/helper-split-export-declaration": "^7.24.5",
+        "@babel/helper-validator-identifier": "^7.24.5"
      },
      "engines": {
        "node": ">=6.9.0"
@ -1613,9 +1618,9 @@
      }
    },
    "node_modules/@babel/helper-plugin-utils": {
-      "version": "7.24.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.0.tgz",
-      "integrity": "sha512-9cUznXMG0+FxRuJfvL82QlTqIzhVW9sL0KjMPHhAOOvpQGL8QtdxnBKILjBqxlHyliz0yCa1G903ZXI/FuHy2w==",
+      "version": "7.24.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.5.tgz",
+      "integrity": "sha512-xjNLDopRzW2o6ba0gKbkZq5YWEBaK3PCyTOY1K2P/O07LGMhMqlMXPxwN4S5/RhWuCobT8z0jrlKGlYmeR1OhQ==",
      "dev": true,
      "engines": {
        "node": ">=6.9.0"
@ -1656,12 +1661,12 @@
      }
    },
    "node_modules/@babel/helper-simple-access": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz",
-      "integrity": "sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==",
+      "version": "7.24.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.24.5.tgz",
+      "integrity": "sha512-uH3Hmf5q5n7n8mz7arjUlDOCbttY/DW4DYhE6FUsjKJ/oYC1kQQUvwEQWxRwUpX9qQKRXeqLwWxrqilMrf32sQ==",
      "dev": true,
      "dependencies": {
-        "@babel/types": "^7.22.5"
+        "@babel/types": "^7.24.5"
      },
      "engines": {
        "node": ">=6.9.0"
@ -1680,12 +1685,12 @@
      }
    },
    "node_modules/@babel/helper-split-export-declaration": {
-      "version": "7.22.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz",
-      "integrity": "sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==",
+      "version": "7.24.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.24.5.tgz",
+      "integrity": "sha512-5CHncttXohrHk8GWOFCcCl4oRD9fKosWlIRgWm4ql9VYioKm52Mk2xsmoohvm7f3JoiLSM5ZgJuRaf5QZZYd3Q==",
      "dev": true,
      "dependencies": {
-        "@babel/types": "^7.22.5"
+        "@babel/types": "^7.24.5"
      },
      "engines": {
        "node": ">=6.9.0"
@ -1701,9 +1706,9 @@
      }
    },
    "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.22.20",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz",
-      "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==",
+      "version": "7.24.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.5.tgz",
+      "integrity": "sha512-3q93SSKX2TWCG30M2G2kwaKeTYgEUp5Snjuj8qm729SObL6nbtUldAi37qbxkD5gg3xnBio+f9nqpSepGZMvxA==",
      "dev": true,
      "engines": {
        "node": ">=6.9.0"
@ -1719,40 +1724,40 @@
      }
    },
    "node_modules/@babel/helper-wrap-function": {
-      "version": "7.22.20",
-      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.22.20.tgz",
-      "integrity": "sha512-pms/UwkOpnQe/PDAEdV/d7dVCoBbB+R4FvYoHGZz+4VPcg7RtYy2KP7S2lbuWM6FCSgob5wshfGESbC/hzNXZw==",
+      "version": "7.24.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.24.5.tgz",
+      "integrity": "sha512-/xxzuNvgRl4/HLNKvnFwdhdgN3cpLxgLROeLDl83Yx0AJ1SGvq1ak0OszTOjDfiB8Vx03eJbeDWh9r+jCCWttw==",
      "dev": true,
      "dependencies": {
-        "@babel/helper-function-name": "^7.22.5",
-        "@babel/template": "^7.22.15",
-        "@babel/types": "^7.22.19"
+        "@babel/helper-function-name": "^7.23.0",
+        "@babel/template": "^7.24.0",
+        "@babel/types": "^7.24.5"
      },
      "engines": {
        "node": ">=6.9.0"
      }
    },
    "node_modules/@babel/helpers": {
-      "version": "7.24.4",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.24.4.tgz",
-      "integrity": "sha512-FewdlZbSiwaVGlgT1DPANDuCHaDMiOo+D/IDYRFYjHOuv66xMSJ7fQwwODwRNAPkADIO/z1EoF/l2BCWlWABDw==",
+      "version": "7.24.5",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.24.5.tgz",
+      "integrity": "sha512-CiQmBMMpMQHwM5m01YnrM6imUG1ebgYJ+fAIW4FZe6m4qHTPaRHti+R8cggAwkdz4oXhtO4/K9JWlh+8hIfR2Q==",
      "dev": true,
      "dependencies": {
        "@babel/template": "^7.24.0",
-        "@babel/traverse": "^7.24.1",
-        "@babel/types": "^7.24.0"
+        "@babel/traverse": "^7.24.5",
+        "@babel/types": "^7.24.5"
      },
      "engines": {
        "node": ">=6.9.0"
      }
    },
    "node_modules/@babel/highlight": {
-      "version": "7.24.2",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.24.2.tgz",
-      "integrity": "sha512-Yac1ao4flkTxTteCDZLEvdxg2fZfz1v8M4QpaGypq/WPDqg3ijHYbDfs+LG5hvzSoqaSZ9/Z9lKSP3CjZjv+pA==",
+      "version": "7.24.5",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.24.5.tgz",
+      "integrity": "sha512-8lLmua6AVh/8SLJRRVD6V8p73Hir9w5mJrhE+IPpILG31KKlI9iz5zmBYKcWPS59qSfgP9RaSBQSHHE81WKuEw==",
      "dev": true,
      "dependencies": {
-        "@babel/helper-validator-identifier": "^7.22.20",
+        "@babel/helper-validator-identifier": "^7.24.5",
        "chalk": "^2.4.2",
        "js-tokens": "^4.0.0",
        "picocolors": "^1.0.0"
@ -1762,9 +1767,9 @@
      }
    },
    "node_modules/@babel/parser": {
-      "version": "7.24.4",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.24.4.tgz",
-      "integrity": "sha512-zTvEBcghmeBma9QIGunWevvBAp4/Qu9Bdq+2k0Ot4fVMD6v3dsC9WOcRSKk7tRRyBM/53yKMJko9xOatGQAwSg==",
+      "version": "7.24.5",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.24.5.tgz",
+      "integrity": "sha512-EOv5IK8arwh3LI47dz1b0tKUb/1uhHAnHJOrjgtQMIpu1uXd9mlFrJg9IUgGUgZ41Ch0K8REPTYpO7B76b4vJg==",
      "bin": {
        "parser": "bin/babel-parser.js"
      },
@ -1773,13 +1778,13 @@
      }
    },
    "node_modules/@babel/plugin-bugfix-firefox-class-in-computed-class-key": {
-      "version": "7.24.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-firefox-class-in-computed-class-key/-/plugin-bugfix-firefox-class-in-computed-class-key-7.24.4.tgz",
-      "integrity": "sha512-qpl6vOOEEzTLLcsuqYYo8yDtrTocmu2xkGvgNebvPjT9DTtfFYGmgDqY+rBYXNlqL4s9qLDn6xkrJv4RxAPiTA==",
+      "version": "7.24.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-firefox-class-in-computed-class-key/-/plugin-bugfix-firefox-class-in-computed-class-key-7.24.5.tgz",
+      "integrity": "sha512-LdXRi1wEMTrHVR4Zc9F8OewC3vdm5h4QB6L71zy6StmYeqGi1b3ttIO8UC+BfZKcH9jdr4aI249rBkm+3+YvHw==",
      "dev": true,
      "dependencies": {
        "@babel/helper-environment-visitor": "^7.22.20",
-        "@babel/helper-plugin-utils": "^7.24.0"
+        "@babel/helper-plugin-utils": "^7.24.5"
      },
      "engines": {
        "node": ">=6.9.0"
@ -2228,12 +2233,12 @@
      }
    },
    "node_modules/@babel/plugin-transform-block-scoping": {
-      "version": "7.24.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.24.4.tgz",
-      "integrity": "sha512-nIFUZIpGKDf9O9ttyRXpHFpKC+X3Y5mtshZONuEUYBomAKoM4y029Jr+uB1bHGPhNmK8YXHevDtKDOLmtRrp6g==",
+      "version": "7.24.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.24.5.tgz",
+      "integrity": "sha512-sMfBc3OxghjC95BkYrYocHL3NaOplrcaunblzwXhGmlPwpmfsxr4vK+mBBt49r+S240vahmv+kUxkeKgs+haCw==",
      "dev": true,
      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.0"
+        "@babel/helper-plugin-utils": "^7.24.5"
      },
      "engines": {
        "node": ">=6.9.0"
@ -2276,18 +2281,18 @@
      }
    },
    "node_modules/@babel/plugin-transform-classes": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.24.1.tgz",
-      "integrity": "sha512-ZTIe3W7UejJd3/3R4p7ScyyOoafetUShSf4kCqV0O7F/RiHxVj/wRaRnQlrGwflvcehNA8M42HkAiEDYZu2F1Q==",
+      "version": "7.24.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.24.5.tgz",
+      "integrity": "sha512-gWkLP25DFj2dwe9Ck8uwMOpko4YsqyfZJrOmqqcegeDYEbp7rmn4U6UQZNj08UF6MaX39XenSpKRCvpDRBtZ7Q==",
      "dev": true,
      "dependencies": {
        "@babel/helper-annotate-as-pure": "^7.22.5",
        "@babel/helper-compilation-targets": "^7.23.6",
        "@babel/helper-environment-visitor": "^7.22.20",
        "@babel/helper-function-name": "^7.23.0",
-        "@babel/helper-plugin-utils": "^7.24.0",
+        "@babel/helper-plugin-utils": "^7.24.5",
        "@babel/helper-replace-supers": "^7.24.1",
-        "@babel/helper-split-export-declaration": "^7.22.6",
+        "@babel/helper-split-export-declaration": "^7.24.5",
        "globals": "^11.1.0"
      },
      "engines": {
@ -2314,12 +2319,12 @@
      }
    },
    "node_modules/@babel/plugin-transform-destructuring": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.24.1.tgz",
-      "integrity": "sha512-ow8jciWqNxR3RYbSNVuF4U2Jx130nwnBnhRw6N6h1bOejNkABmcI5X5oz29K4alWX7vf1C+o6gtKXikzRKkVdw==",
+      "version": "7.24.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.24.5.tgz",
+      "integrity": "sha512-SZuuLyfxvsm+Ah57I/i1HVjveBENYK9ue8MJ7qkc7ndoNjqquJiElzA7f5yaAXjyW2hKojosOTAQQRX50bPSVg==",
      "dev": true,
      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.0"
+        "@babel/helper-plugin-utils": "^7.24.5"
      },
      "engines": {
        "node": ">=6.9.0"
@ -2633,15 +2638,15 @@
      }
    },
    "node_modules/@babel/plugin-transform-object-rest-spread": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.24.1.tgz",
-      "integrity": "sha512-XjD5f0YqOtebto4HGISLNfiNMTTs6tbkFf2TOqJlYKYmbo+mN9Dnpl4SRoofiziuOWMIyq3sZEUqLo3hLITFEA==",
+      "version": "7.24.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.24.5.tgz",
+      "integrity": "sha512-7EauQHszLGM3ay7a161tTQH7fj+3vVM/gThlz5HpFtnygTxjrlvoeq7MPVA1Vy9Q555OB8SnAOsMkLShNkkrHA==",
      "dev": true,
      "dependencies": {
        "@babel/helper-compilation-targets": "^7.23.6",
-        "@babel/helper-plugin-utils": "^7.24.0",
+        "@babel/helper-plugin-utils": "^7.24.5",
        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-        "@babel/plugin-transform-parameters": "^7.24.1"
+        "@babel/plugin-transform-parameters": "^7.24.5"
      },
      "engines": {
        "node": ">=6.9.0"
@ -2683,12 +2688,12 @@
      }
    },
    "node_modules/@babel/plugin-transform-optional-chaining": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.24.1.tgz",
-      "integrity": "sha512-n03wmDt+987qXwAgcBlnUUivrZBPZ8z1plL0YvgQalLm+ZE5BMhGm94jhxXtA1wzv1Cu2aaOv1BM9vbVttrzSg==",
+      "version": "7.24.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.24.5.tgz",
+      "integrity": "sha512-xWCkmwKT+ihmA6l7SSTpk8e4qQl/274iNbSKRRS8mpqFR32ksy36+a+LWY8OXCCEefF8WFlnOHVsaDI2231wBg==",
      "dev": true,
      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.0",
+        "@babel/helper-plugin-utils": "^7.24.5",
        "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5",
        "@babel/plugin-syntax-optional-chaining": "^7.8.3"
      },
@ -2700,12 +2705,12 @@
      }
    },
    "node_modules/@babel/plugin-transform-parameters": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.24.1.tgz",
-      "integrity": "sha512-8Jl6V24g+Uw5OGPeWNKrKqXPDw2YDjLc53ojwfMcKwlEoETKU9rU0mHUtcg9JntWI/QYzGAXNWEcVHZ+fR+XXg==",
+      "version": "7.24.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.24.5.tgz",
+      "integrity": "sha512-9Co00MqZ2aoky+4j2jhofErthm6QVLKbpQrvz20c3CH9KQCLHyNB+t2ya4/UrRpQGR+Wrwjg9foopoeSdnHOkA==",
      "dev": true,
      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.0"
+        "@babel/helper-plugin-utils": "^7.24.5"
      },
      "engines": {
        "node": ">=6.9.0"
@ -2731,14 +2736,14 @@
      }
    },
    "node_modules/@babel/plugin-transform-private-property-in-object": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.24.1.tgz",
-      "integrity": "sha512-pTHxDVa0BpUbvAgX3Gat+7cSciXqUcY9j2VZKTbSB6+VQGpNgNO9ailxTGHSXlqOnX1Hcx1Enme2+yv7VqP9bg==",
+      "version": "7.24.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.24.5.tgz",
+      "integrity": "sha512-JM4MHZqnWR04jPMujQDTBVRnqxpLLpx2tkn7iPn+Hmsc0Gnb79yvRWOkvqFOx3Z7P7VxiRIR22c4eGSNj87OBQ==",
      "dev": true,
      "dependencies": {
        "@babel/helper-annotate-as-pure": "^7.22.5",
-        "@babel/helper-create-class-features-plugin": "^7.24.1",
-        "@babel/helper-plugin-utils": "^7.24.0",
+        "@babel/helper-create-class-features-plugin": "^7.24.5",
+        "@babel/helper-plugin-utils": "^7.24.5",
        "@babel/plugin-syntax-private-property-in-object": "^7.14.5"
      },
      "engines": {
@ -2885,12 +2890,12 @@
      }
    },
    "node_modules/@babel/plugin-transform-typeof-symbol": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.24.1.tgz",
-      "integrity": "sha512-CBfU4l/A+KruSUoW+vTQthwcAdwuqbpRNB8HQKlZABwHRhsdHZ9fezp4Sn18PeAlYxTNiLMlx4xUBV3AWfg1BA==",
+      "version": "7.24.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.24.5.tgz",
+      "integrity": "sha512-UTGnhYVZtTAjdwOTzT+sCyXmTn8AhaxOS/MjG9REclZ6ULHWF9KoCZur0HSGU7hk8PdBFKKbYe6+gqdXWz84Jg==",
      "dev": true,
      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.0"
+        "@babel/helper-plugin-utils": "^7.24.5"
      },
      "engines": {
        "node": ">=6.9.0"
@ -2900,14 +2905,14 @@
      }
    },
    "node_modules/@babel/plugin-transform-typescript": {
-      "version": "7.24.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.24.4.tgz",
-      "integrity": "sha512-79t3CQ8+oBGk/80SQ8MN3Bs3obf83zJ0YZjDmDaEZN8MqhMI760apl5z6a20kFeMXBwJX99VpKT8CKxEBp5H1g==",
+      "version": "7.24.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.24.5.tgz",
+      "integrity": "sha512-E0VWu/hk83BIFUWnsKZ4D81KXjN5L3MobvevOHErASk9IPwKHOkTgvqzvNo1yP/ePJWqqK2SpUR5z+KQbl6NVw==",
      "dev": true,
      "dependencies": {
        "@babel/helper-annotate-as-pure": "^7.22.5",
-        "@babel/helper-create-class-features-plugin": "^7.24.4",
-        "@babel/helper-plugin-utils": "^7.24.0",
+        "@babel/helper-create-class-features-plugin": "^7.24.5",
+        "@babel/helper-plugin-utils": "^7.24.5",
        "@babel/plugin-syntax-typescript": "^7.24.1"
      },
      "engines": {
@ -2981,16 +2986,16 @@
      }
    },
    "node_modules/@babel/preset-env": {
-      "version": "7.24.4",
-      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.24.4.tgz",
-      "integrity": "sha512-7Kl6cSmYkak0FK/FXjSEnLJ1N9T/WA2RkMhu17gZ/dsxKJUuTYNIylahPTzqpLyJN4WhDif8X0XK1R8Wsguo/A==",
+      "version": "7.24.5",
+      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.24.5.tgz",
+      "integrity": "sha512-UGK2ifKtcC8i5AI4cH+sbLLuLc2ktYSFJgBAXorKAsHUZmrQ1q6aQ6i3BvU24wWs2AAKqQB6kq3N9V9Gw1HiMQ==",
      "dev": true,
      "dependencies": {
        "@babel/compat-data": "^7.24.4",
        "@babel/helper-compilation-targets": "^7.23.6",
-        "@babel/helper-plugin-utils": "^7.24.0",
+        "@babel/helper-plugin-utils": "^7.24.5",
        "@babel/helper-validator-option": "^7.23.5",
-        "@babel/plugin-bugfix-firefox-class-in-computed-class-key": "^7.24.4",
+        "@babel/plugin-bugfix-firefox-class-in-computed-class-key": "^7.24.5",
        "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.24.1",
        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.24.1",
        "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "^7.24.1",
@ -3017,12 +3022,12 @@
        "@babel/plugin-transform-async-generator-functions": "^7.24.3",
        "@babel/plugin-transform-async-to-generator": "^7.24.1",
        "@babel/plugin-transform-block-scoped-functions": "^7.24.1",
-        "@babel/plugin-transform-block-scoping": "^7.24.4",
+        "@babel/plugin-transform-block-scoping": "^7.24.5",
        "@babel/plugin-transform-class-properties": "^7.24.1",
        "@babel/plugin-transform-class-static-block": "^7.24.4",
-        "@babel/plugin-transform-classes": "^7.24.1",
+        "@babel/plugin-transform-classes": "^7.24.5",
        "@babel/plugin-transform-computed-properties": "^7.24.1",
-        "@babel/plugin-transform-destructuring": "^7.24.1",
+        "@babel/plugin-transform-destructuring": "^7.24.5",
        "@babel/plugin-transform-dotall-regex": "^7.24.1",
        "@babel/plugin-transform-duplicate-keys": "^7.24.1",
        "@babel/plugin-transform-dynamic-import": "^7.24.1",
@ -3042,13 +3047,13 @@
        "@babel/plugin-transform-new-target": "^7.24.1",
        "@babel/plugin-transform-nullish-coalescing-operator": "^7.24.1",
        "@babel/plugin-transform-numeric-separator": "^7.24.1",
-        "@babel/plugin-transform-object-rest-spread": "^7.24.1",
+        "@babel/plugin-transform-object-rest-spread": "^7.24.5",
        "@babel/plugin-transform-object-super": "^7.24.1",
        "@babel/plugin-transform-optional-catch-binding": "^7.24.1",
-        "@babel/plugin-transform-optional-chaining": "^7.24.1",
-        "@babel/plugin-transform-parameters": "^7.24.1",
+        "@babel/plugin-transform-optional-chaining": "^7.24.5",
+        "@babel/plugin-transform-parameters": "^7.24.5",
        "@babel/plugin-transform-private-methods": "^7.24.1",
-        "@babel/plugin-transform-private-property-in-object": "^7.24.1",
+        "@babel/plugin-transform-private-property-in-object": "^7.24.5",
        "@babel/plugin-transform-property-literals": "^7.24.1",
        "@babel/plugin-transform-regenerator": "^7.24.1",
        "@babel/plugin-transform-reserved-words": "^7.24.1",
@ -3056,7 +3061,7 @@
        "@babel/plugin-transform-spread": "^7.24.1",
        "@babel/plugin-transform-sticky-regex": "^7.24.1",
        "@babel/plugin-transform-template-literals": "^7.24.1",
-        "@babel/plugin-transform-typeof-symbol": "^7.24.1",
+        "@babel/plugin-transform-typeof-symbol": "^7.24.5",
        "@babel/plugin-transform-unicode-escapes": "^7.24.1",
        "@babel/plugin-transform-unicode-property-regex": "^7.24.1",
        "@babel/plugin-transform-unicode-regex": "^7.24.1",
@ -3124,9 +3129,9 @@
      "dev": true
    },
    "node_modules/@babel/runtime": {
-      "version": "7.24.4",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.24.4.tgz",
-      "integrity": "sha512-dkxf7+hn8mFBwKjs9bvBlArzLVxVbS8usaPUDd5p2a9JCL9tB8OaOVN1isD4+Xyk4ns89/xeOmbQvgdK7IIVdA==",
+      "version": "7.24.5",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.24.5.tgz",
+      "integrity": "sha512-Nms86NXrsaeU9vbBJKni6gXiEXZ4CVpYVzEjDH9Sb8vmZ3UljyA1GSOJl/6LGPO8EHLuSF9H+IxNXHPX8QHJ4g==",
      "dev": true,
      "dependencies": {
        "regenerator-runtime": "^0.14.0"
@ -3150,19 +3155,19 @@
      }
    },
    "node_modules/@babel/traverse": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.24.1.tgz",
-      "integrity": "sha512-xuU6o9m68KeqZbQuDt2TcKSxUw/mrsvavlEqQ1leZ/B+C9tk6E4sRWy97WaXgvq5E+nU3cXMxv3WKOCanVMCmQ==",
+      "version": "7.24.5",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.24.5.tgz",
+      "integrity": "sha512-7aaBLeDQ4zYcUFDUD41lJc1fG8+5IU9DaNSJAgal866FGvmD5EbWQgnEC6kO1gGLsX0esNkfnJSndbTXA3r7UA==",
      "dev": true,
      "dependencies": {
-        "@babel/code-frame": "^7.24.1",
-        "@babel/generator": "^7.24.1",
+        "@babel/code-frame": "^7.24.2",
+        "@babel/generator": "^7.24.5",
        "@babel/helper-environment-visitor": "^7.22.20",
        "@babel/helper-function-name": "^7.23.0",
        "@babel/helper-hoist-variables": "^7.22.5",
-        "@babel/helper-split-export-declaration": "^7.22.6",
-        "@babel/parser": "^7.24.1",
-        "@babel/types": "^7.24.0",
+        "@babel/helper-split-export-declaration": "^7.24.5",
+        "@babel/parser": "^7.24.5",
+        "@babel/types": "^7.24.5",
        "debug": "^4.3.1",
        "globals": "^11.1.0"
      },
@ -3171,13 +3176,13 @@
      }
    },
    "node_modules/@babel/types": {
-      "version": "7.24.0",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.24.0.tgz",
-      "integrity": "sha512-+j7a5c253RfKh8iABBhywc8NSfP5LURe7Uh4qpsh6jc+aLJguvmIUBdjSdEMQv2bENrCR5MfRdjGo7vzS/ob7w==",
+      "version": "7.24.5",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.24.5.tgz",
+      "integrity": "sha512-6mQNsaLeXTw0nxYUYu+NSa4Hx4BlF1x1x8/PMFbiR+GBSr+2DkECc69b8hgy2frEodNcvPffeH8YfWd3LI6jhQ==",
      "dev": true,
      "dependencies": {
-        "@babel/helper-string-parser": "^7.23.4",
-        "@babel/helper-validator-identifier": "^7.22.20",
+        "@babel/helper-string-parser": "^7.24.1",
+        "@babel/helper-validator-identifier": "^7.24.5",
        "to-fast-properties": "^2.0.0"
      },
      "engines": {
@ -4707,9 +4712,9 @@
      }
    },
    "node_modules/@rollup/rollup-android-arm-eabi": {
-      "version": "4.17.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.17.1.tgz",
-      "integrity": "sha512-P6Wg856Ou/DLpR+O0ZLneNmrv7QpqBg+hK4wE05ijbC/t349BRfMfx+UFj5Ha3fCFopIa6iSZlpdaB4agkWp2Q==",
+      "version": "4.17.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.17.2.tgz",
+      "integrity": "sha512-NM0jFxY8bB8QLkoKxIQeObCaDlJKewVlIEkuyYKm5An1tdVZ966w2+MPQ2l8LBZLjR+SgyV+nRkTIunzOYBMLQ==",
      "cpu": [
        "arm"
      ],
@ -4720,9 +4725,9 @@
      "peer": true
    },
    "node_modules/@rollup/rollup-android-arm64": {
-      "version": "4.17.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.17.1.tgz",
-      "integrity": "sha512-piwZDjuW2WiHr05djVdUkrG5JbjnGbtx8BXQchYCMfib/nhjzWoiScelZ+s5IJI7lecrwSxHCzW026MWBL+oJQ==",
+      "version": "4.17.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.17.2.tgz",
+      "integrity": "sha512-yeX/Usk7daNIVwkq2uGoq2BYJKZY1JfyLTaHO/jaiSwi/lsf8fTFoQW/n6IdAsx5tx+iotu2zCJwz8MxI6D/Bw==",
      "cpu": [
        "arm64"
      ],
@ -4733,9 +4738,9 @@
      "peer": true
    },
    "node_modules/@rollup/rollup-darwin-arm64": {
-      "version": "4.17.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.17.1.tgz",
-      "integrity": "sha512-LsZXXIsN5Q460cKDT4Y+bzoPDhBmO5DTr7wP80d+2EnYlxSgkwdPfE3hbE+Fk8dtya+8092N9srjBTJ0di8RIA==",
+      "version": "4.17.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.17.2.tgz",
+      "integrity": "sha512-kcMLpE6uCwls023+kknm71ug7MZOrtXo+y5p/tsg6jltpDtgQY1Eq5sGfHcQfb+lfuKwhBmEURDga9N0ol4YPw==",
      "cpu": [
        "arm64"
      ],
@ -4746,9 +4751,9 @@
      "peer": true
    },
    "node_modules/@rollup/rollup-darwin-x64": {
-      "version": "4.17.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.17.1.tgz",
-      "integrity": "sha512-S7TYNQpWXB9APkxu/SLmYHezWwCoZRA9QLgrDeml+SR2A1LLPD2DBUdUlvmCF7FUpRMKvbeeWky+iizQj65Etw==",
+      "version": "4.17.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.17.2.tgz",
+      "integrity": "sha512-AtKwD0VEx0zWkL0ZjixEkp5tbNLzX+FCqGG1SvOu993HnSz4qDI6S4kGzubrEJAljpVkhRSlg5bzpV//E6ysTQ==",
      "cpu": [
        "x64"
      ],
@ -4759,9 +4764,9 @@
      "peer": true
    },
    "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-      "version": "4.17.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.17.1.tgz",
-      "integrity": "sha512-Lq2JR5a5jsA5um2ZoLiXXEaOagnVyCpCW7xvlcqHC7y46tLwTEgUSTM3a2TfmmTMmdqv+jknUioWXlmxYxE9Yw==",
+      "version": "4.17.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.17.2.tgz",
+      "integrity": "sha512-3reX2fUHqN7sffBNqmEyMQVj/CKhIHZd4y631duy0hZqI8Qoqf6lTtmAKvJFYa6bhU95B1D0WgzHkmTg33In0A==",
      "cpu": [
        "arm"
      ],
@ -4772,9 +4777,9 @@
      "peer": true
    },
    "node_modules/@rollup/rollup-linux-arm-musleabihf": {
-      "version": "4.17.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.17.1.tgz",
-      "integrity": "sha512-9BfzwyPNV0IizQoR+5HTNBGkh1KXE8BqU0DBkqMngmyFW7BfuIZyMjQ0s6igJEiPSBvT3ZcnIFohZ19OqjhDPg==",
+      "version": "4.17.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.17.2.tgz",
+      "integrity": "sha512-uSqpsp91mheRgw96xtyAGP9FW5ChctTFEoXP0r5FAzj/3ZRv3Uxjtc7taRQSaQM/q85KEKjKsZuiZM3GyUivRg==",
      "cpu": [
        "arm"
      ],
@ -4785,9 +4790,9 @@
      "peer": true
    },
    "node_modules/@rollup/rollup-linux-arm64-gnu": {
-      "version": "4.17.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.17.1.tgz",
-      "integrity": "sha512-e2uWaoxo/rtzA52OifrTSXTvJhAXb0XeRkz4CdHBK2KtxrFmuU/uNd544Ogkpu938BzEfvmWs8NZ8Axhw33FDw==",
+      "version": "4.17.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.17.2.tgz",
+      "integrity": "sha512-EMMPHkiCRtE8Wdk3Qhtciq6BndLtstqZIroHiiGzB3C5LDJmIZcSzVtLRbwuXuUft1Cnv+9fxuDtDxz3k3EW2A==",
      "cpu": [
        "arm64"
      ],
@ -4798,9 +4803,9 @@
      "peer": true
    },
    "node_modules/@rollup/rollup-linux-arm64-musl": {
-      "version": "4.17.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.17.1.tgz",
-      "integrity": "sha512-ekggix/Bc/d/60H1Mi4YeYb/7dbal1kEDZ6sIFVAE8pUSx7PiWeEh+NWbL7bGu0X68BBIkgF3ibRJe1oFTksQQ==",
+      "version": "4.17.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.17.2.tgz",
+      "integrity": "sha512-NMPylUUZ1i0z/xJUIx6VUhISZDRT+uTWpBcjdv0/zkp7b/bQDF+NfnfdzuTiB1G6HTodgoFa93hp0O1xl+/UbA==",
      "cpu": [
        "arm64"
      ],
@ -4811,9 +4816,9 @@
      "peer": true
    },
    "node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
-      "version": "4.17.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.17.1.tgz",
-      "integrity": "sha512-UGV0dUo/xCv4pkr/C8KY7XLFwBNnvladt8q+VmdKrw/3RUd3rD0TptwjisvE2TTnnlENtuY4/PZuoOYRiGp8Gw==",
+      "version": "4.17.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.17.2.tgz",
+      "integrity": "sha512-T19My13y8uYXPw/L/k0JYaX1fJKFT/PWdXiHr8mTbXWxjVF1t+8Xl31DgBBvEKclw+1b00Chg0hxE2O7bTG7GQ==",
      "cpu": [
        "ppc64"
      ],
@ -4824,9 +4829,9 @@
      "peer": true
    },
    "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-      "version": "4.17.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.17.1.tgz",
-      "integrity": "sha512-gEYmYYHaehdvX46mwXrU49vD6Euf1Bxhq9pPb82cbUU9UT2NV+RSckQ5tKWOnNXZixKsy8/cPGtiUWqzPuAcXQ==",
+      "version": "4.17.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.17.2.tgz",
+      "integrity": "sha512-BOaNfthf3X3fOWAB+IJ9kxTgPmMqPPH5f5k2DcCsRrBIbWnaJCgX2ll77dV1TdSy9SaXTR5iDXRL8n7AnoP5cg==",
      "cpu": [
        "riscv64"
      ],
@ -4837,9 +4842,9 @@
      "peer": true
    },
    "node_modules/@rollup/rollup-linux-s390x-gnu": {
-      "version": "4.17.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.17.1.tgz",
-      "integrity": "sha512-xeae5pMAxHFp6yX5vajInG2toST5lsCTrckSRUFwNgzYqnUjNBcQyqk1bXUxX5yhjWFl2Mnz3F8vQjl+2FRIcw==",
+      "version": "4.17.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.17.2.tgz",
+      "integrity": "sha512-W0UP/x7bnn3xN2eYMql2T/+wpASLE5SjObXILTMPUBDB/Fg/FxC+gX4nvCfPBCbNhz51C+HcqQp2qQ4u25ok6g==",
      "cpu": [
        "s390x"
      ],
@ -4850,9 +4855,9 @@
      "peer": true
    },
    "node_modules/@rollup/rollup-linux-x64-gnu": {
-      "version": "4.17.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.17.1.tgz",
-      "integrity": "sha512-AsdnINQoDWfKpBzCPqQWxSPdAWzSgnYbrJYtn6W0H2E9It5bZss99PiLA8CgmDRfvKygt20UpZ3xkhFlIfX9zQ==",
+      "version": "4.17.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.17.2.tgz",
+      "integrity": "sha512-Hy7pLwByUOuyaFC6mAr7m+oMC+V7qyifzs/nW2OJfC8H4hbCzOX07Ov0VFk/zP3kBsELWNFi7rJtgbKYsav9QQ==",
      "cpu": [
        "x64"
      ],
@ -4863,9 +4868,9 @@
      "peer": true
    },
    "node_modules/@rollup/rollup-linux-x64-musl": {
-      "version": "4.17.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.17.1.tgz",
-      "integrity": "sha512-KoB4fyKXTR+wYENkIG3fFF+5G6N4GFvzYx8Jax8BR4vmddtuqSb5oQmYu2Uu067vT/Fod7gxeQYKupm8gAcMSQ==",
+      "version": "4.17.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.17.2.tgz",
+      "integrity": "sha512-h1+yTWeYbRdAyJ/jMiVw0l6fOOm/0D1vNLui9iPuqgRGnXA0u21gAqOyB5iHjlM9MMfNOm9RHCQ7zLIzT0x11Q==",
      "cpu": [
        "x64"
      ],
@ -4876,9 +4881,9 @@
      "peer": true
    },
    "node_modules/@rollup/rollup-win32-arm64-msvc": {
-      "version": "4.17.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.17.1.tgz",
-      "integrity": "sha512-J0d3NVNf7wBL9t4blCNat+d0PYqAx8wOoY+/9Q5cujnafbX7BmtYk3XvzkqLmFECaWvXGLuHmKj/wrILUinmQg==",
+      "version": "4.17.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.17.2.tgz",
+      "integrity": "sha512-tmdtXMfKAjy5+IQsVtDiCfqbynAQE/TQRpWdVataHmhMb9DCoJxp9vLcCBjEQWMiUYxO1QprH/HbY9ragCEFLA==",
      "cpu": [
        "arm64"
      ],
@ -4889,9 +4894,9 @@
      "peer": true
    },
    "node_modules/@rollup/rollup-win32-ia32-msvc": {
-      "version": "4.17.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.17.1.tgz",
-      "integrity": "sha512-xjgkWUwlq7IbgJSIxvl516FJ2iuC/7ttjsAxSPpC9kkI5iQQFHKyEN5BjbhvJ/IXIZ3yIBcW5QDlWAyrA+TFag==",
+      "version": "4.17.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.17.2.tgz",
+      "integrity": "sha512-7II/QCSTAHuE5vdZaQEwJq2ZACkBpQDOmQsE6D6XUbnBHW8IAhm4eTufL6msLJorzrHDFv3CF8oCA/hSIRuZeQ==",
      "cpu": [
        "ia32"
      ],
@ -4902,9 +4907,9 @@
      "peer": true
    },
    "node_modules/@rollup/rollup-win32-x64-msvc": {
-      "version": "4.17.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.17.1.tgz",
-      "integrity": "sha512-0QbCkfk6cnnVKWqqlC0cUrrUMDMfu5ffvYMTUHf+qMN2uAb3MKP31LPcwiMXBNsvoFGs/kYdFOsuLmvppCopXA==",
+      "version": "4.17.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.17.2.tgz",
+      "integrity": "sha512-TGGO7v7qOq4CYmSBVEYpI1Y5xDuCEnbVC5Vth8mOsW0gDSzxNrVERPc790IGHsrT2dQSimgMr9Ub3Y1Jci5/8w==",
      "cpu": [
        "x64"
      ],
@ -6653,15 +6658,15 @@
      }
    },
    "node_modules/ajv-formats/node_modules/ajv": {
-      "version": "8.12.0",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
-      "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
+      "version": "8.13.0",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.13.0.tgz",
+      "integrity": "sha512-PRA911Blj99jR5RMeTunVbNXMF6Lp4vZXnk5GQjcnUWUTsrXtekg/pnmFFI2u/I36Y/2bITGS30GZCXei6uNkA==",
      "dev": true,
      "dependencies": {
-        "fast-deep-equal": "^3.1.1",
+        "fast-deep-equal": "^3.1.3",
        "json-schema-traverse": "^1.0.0",
        "require-from-string": "^2.0.2",
-        "uri-js": "^4.2.2"
+        "uri-js": "^4.4.1"
      },
      "funding": {
        "type": "github",
@ -9509,9 +9514,9 @@
      "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="
    },
    "node_modules/electron-to-chromium": {
-      "version": "1.4.750",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.750.tgz",
-      "integrity": "sha512-9ItEpeu15hW5m8jKdriL+BQrgwDTXEL9pn4SkillWFu73ZNNNQ2BKKLS+ZHv2vC9UkNhosAeyfxOf/5OSeTCPA==",
+      "version": "1.4.751",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.751.tgz",
+      "integrity": "sha512-2DEPi++qa89SMGRhufWTiLmzqyuGmNF3SK4+PQetW1JKiZdEpF4XQonJXJCzyuYSA6mauiMhbyVhqYAP45Hvfw==",
      "dev": true
    },
    "node_modules/emittery": {
@ -9597,9 +9602,9 @@
      }
    },
    "node_modules/envinfo": {
-      "version": "7.12.0",
-      "resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.12.0.tgz",
-      "integrity": "sha512-Iw9rQJBGpJRd3rwXm9ft/JiGoAZmLxxJZELYDQoPRZ4USVhkKtIcNBPw6U+/K2mBpaqM25JSV6Yl4Az9vO2wJg==",
+      "version": "7.13.0",
+      "resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.13.0.tgz",
+      "integrity": "sha512-cvcaMr7KqXVh4nyzGTVqTum+gAiL265x5jUWQIDLq//zOGbW+gSW/C+OWLleY/rs9Qole6AZLMXPbtIFQbqu+Q==",
      "dev": true,
      "peer": true,
      "bin": {
@ -11060,12 +11065,13 @@
      }
    },
    "node_modules/globalthis": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.3.tgz",
-      "integrity": "sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.4.tgz",
+      "integrity": "sha512-DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ==",
      "dev": true,
      "dependencies": {
-        "define-properties": "^1.1.3"
+        "define-properties": "^1.2.1",
+        "gopd": "^1.0.1"
      },
      "engines": {
        "node": ">= 0.4"
@ -14402,9 +14408,10 @@
      }
    },
    "node_modules/pino-std-serializers": {
-      "version": "6.2.2",
-      "resolved": "https://registry.npmjs.org/pino-std-serializers/-/pino-std-serializers-6.2.2.tgz",
-      "integrity": "sha512-cHjPPsE+vhj/tnhCy/wiMh3M3z3h/j15zHQX+S9GkTBgqJuTuJzYJ4gUyACLhDaJ7kk9ba9iRDmbH2tJU03OiA=="
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/pino-std-serializers/-/pino-std-serializers-7.0.0.tgz",
+      "integrity": "sha512-e906FRY0+tV27iq4juKzSYPbUj2do2X2JX4EzSca1631EB2QJQUqGbDuERal7LCtOpxl6x3+nvo9NPZcmjkiFA==",
+      "peer": true
    },
    "node_modules/pino/node_modules/pino-std-serializers": {
      "version": "3.2.0",
@ -15899,9 +15906,9 @@
      "integrity": "sha512-fJhQQI5tLrQvYIYFpOnFinzv9dwmR7hRnUz1XqP3OJ1jIweTNOd6aTO4jwQSgcBSFUB+/KHJxuGneime+FdzOw=="
    },
    "node_modules/rollup": {
-      "version": "4.17.1",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.17.1.tgz",
-      "integrity": "sha512-0gG94inrUtg25sB2V/pApwiv1lUb0bQ25FPNuzO89Baa+B+c0ccaaBKM5zkZV/12pUUdH+lWCSm9wmHqyocuVQ==",
+      "version": "4.17.2",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.17.2.tgz",
+      "integrity": "sha512-/9ClTJPByC0U4zNLowV1tMBe8yMEAxewtR3cUNX5BoEpGH3dQEWpJLr6CLp0fPdYRF/fzVOgvDb1zXuakwF5kQ==",
      "peer": true,
      "dependencies": {
        "@types/estree": "1.0.5"
@ -15914,22 +15921,22 @@
        "npm": ">=8.0.0"
      },
      "optionalDependencies": {
-        "@rollup/rollup-android-arm-eabi": "4.17.1",
-        "@rollup/rollup-android-arm64": "4.17.1",
-        "@rollup/rollup-darwin-arm64": "4.17.1",
-        "@rollup/rollup-darwin-x64": "4.17.1",
-        "@rollup/rollup-linux-arm-gnueabihf": "4.17.1",
-        "@rollup/rollup-linux-arm-musleabihf": "4.17.1",
-        "@rollup/rollup-linux-arm64-gnu": "4.17.1",
-        "@rollup/rollup-linux-arm64-musl": "4.17.1",
-        "@rollup/rollup-linux-powerpc64le-gnu": "4.17.1",
-        "@rollup/rollup-linux-riscv64-gnu": "4.17.1",
-        "@rollup/rollup-linux-s390x-gnu": "4.17.1",
-        "@rollup/rollup-linux-x64-gnu": "4.17.1",
-        "@rollup/rollup-linux-x64-musl": "4.17.1",
-        "@rollup/rollup-win32-arm64-msvc": "4.17.1",
-        "@rollup/rollup-win32-ia32-msvc": "4.17.1",
-        "@rollup/rollup-win32-x64-msvc": "4.17.1",
+        "@rollup/rollup-android-arm-eabi": "4.17.2",
+        "@rollup/rollup-android-arm64": "4.17.2",
+        "@rollup/rollup-darwin-arm64": "4.17.2",
+        "@rollup/rollup-darwin-x64": "4.17.2",
+        "@rollup/rollup-linux-arm-gnueabihf": "4.17.2",
+        "@rollup/rollup-linux-arm-musleabihf": "4.17.2",
+        "@rollup/rollup-linux-arm64-gnu": "4.17.2",
+        "@rollup/rollup-linux-arm64-musl": "4.17.2",
+        "@rollup/rollup-linux-powerpc64le-gnu": "4.17.2",
+        "@rollup/rollup-linux-riscv64-gnu": "4.17.2",
+        "@rollup/rollup-linux-s390x-gnu": "4.17.2",
+        "@rollup/rollup-linux-x64-gnu": "4.17.2",
+        "@rollup/rollup-linux-x64-musl": "4.17.2",
+        "@rollup/rollup-win32-arm64-msvc": "4.17.2",
+        "@rollup/rollup-win32-ia32-msvc": "4.17.2",
+        "@rollup/rollup-win32-x64-msvc": "4.17.2",
        "fsevents": "~2.3.2"
      }
    },
@ -16047,15 +16054,15 @@
      }
    },
    "node_modules/schema-utils/node_modules/ajv": {
-      "version": "8.12.0",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
-      "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
+      "version": "8.13.0",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.13.0.tgz",
+      "integrity": "sha512-PRA911Blj99jR5RMeTunVbNXMF6Lp4vZXnk5GQjcnUWUTsrXtekg/pnmFFI2u/I36Y/2bITGS30GZCXei6uNkA==",
      "dev": true,
      "dependencies": {
-        "fast-deep-equal": "^3.1.1",
+        "fast-deep-equal": "^3.1.3",
        "json-schema-traverse": "^1.0.0",
        "require-from-string": "^2.0.2",
-        "uri-js": "^4.2.2"
+        "uri-js": "^4.4.1"
      },
      "funding": {
        "type": "github",
@ -17319,9 +17326,9 @@
      }
    },
    "node_modules/terser": {
-      "version": "5.30.4",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-5.30.4.tgz",
-      "integrity": "sha512-xRdd0v64a8mFK9bnsKVdoNP9GQIKUAaJPTaqEQDL4w/J8WaW4sWXXoMZ+6SimPkfT5bElreXf8m9HnmPc3E1BQ==",
+      "version": "5.31.0",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-5.31.0.tgz",
+      "integrity": "sha512-Q1JFAoUKE5IMfI4Z/lkE/E6+SwgzO+x4tq4v1AyBLRj8VSYvRO6A/rQrPg1yud4g0En9EKI1TvFRF2tQFcoUkg==",
      "devOptional": true,
      "dependencies": {
        "@jridgewell/source-map": "^0.3.3",
--- a/package.json
+++ b/package.json
@ -120,12 +120,12 @@
  "imports": {
    "#controllers/*": "./app/Controllers/*.js",
    "#exceptions/*": "./app/exceptions/*.js",
-    "#models/*": "./app/Models/*.js",
+    "#models/*": "./app/models/*.js",
    "#services/*": "./app/services/*.js",
    "#listeners/*": "./app/listeners/*.js",
    "#events/*": "./app/events/*.js",
    "#middleware/*": "./app/middleware/*.js",
-    "#validators/*": "./app/Validators/*.js",
+    "#validators/*": "./app/validators/*.js",
    "#start/*": "./start/*.js",
    "#config/*": "./config/*.js",
    "#app/*": "./app/*.js",
--- a/resources/js/Pages/App.vue
+++ b/resources/js/Pages/App.vue
@ -54,7 +54,7 @@ export default {

 <script lang="ts">
 import { Component, Vue, Prop } from 'vue-facing-decorator';
-import type User from '#app/Models/User';
+import type User from '#models/user';
 import { Link } from '@inertiajs/vue3';
 import DefaultLayout from '@/Layouts/Default.vue';
 // import { NInput, NButton } from 'naive-ui';
--- a/start/routes.ts
+++ b/start/routes.ts
@ -24,9 +24,9 @@ import router from '@adonisjs/core/services/router';
 import type { HttpContext } from '@adonisjs/core/http';

 // import Inertia from '@ioc:EidelLev/Inertia';
-import AuthValidator from '#app/Validators/AuthValidator';
+import AuthValidator from '#validators/auth_validator';
 // import HealthCheck from '@ioc:Adonis/Core/HealthCheck';
-import User from '#app/Models/User';
+import User from '#models/user';
 import AuthController from '#controllers/Http/Auth/AuthController';
 import UserController from '#controllers/Http/Auth/UserController';
 import AdminuserController from '#controllers/Http/Admin/AdminuserController';
--- a/tests/functional/dataset_controller.spec.ts
+++ b/tests/functional/dataset_controller.spec.ts
@ -1,12 +1,12 @@
 import { test } from '@japa/runner';
 import supertest from 'supertest';
 import db from '@adonisjs/lucid/services/db';
-import Dataset from '#app/Models/Dataset';
+import Dataset from '#models/dataset';
 // import server from '@adonisjs/core/services/server'; // Import the server instance
 // import { Server } from '@adonisjs/core/http';
-import User from '#app/Models/User';
-import Role from '#app/Models/Role';
-import Permission from '#app/Models/Permission';
+import User from '#models/user';
+import Role from '#models/role';
+import Permission from '#models/permission';
 import { TestContext } from '@japa/runner/core';
 const BASE_URL = `http://${process.env.HOST}:${process.env.PORT}`