@e22m4u/js-repository 0.6.5 → 0.8.0

package/eslint.config.js

@@ -1,68 +1,39 @@
 import globals from 'globals';
 import eslintJs from '@eslint/js';
-import eslintTypescript from 'typescript-eslint';
 import eslintJsdocPlugin from 'eslint-plugin-jsdoc';
 import eslintMochaPlugin from 'eslint-plugin-mocha';
+import eslintImportPlugin from 'eslint-plugin-import';
 import eslintPrettierConfig from 'eslint-config-prettier';
 import eslintChaiExpectPlugin from 'eslint-plugin-chai-expect';
 
-export default [
-  {
-    files: ['src/**/*.js'],
-    languageOptions: {
-      globals: {
-        ...globals.node,
-        ...globals.es2021,
-        ...globals.mocha,
-      },
-    },
-    plugins: {
-      'jsdoc': eslintJsdocPlugin,
-      'mocha': eslintMochaPlugin,
-      'chai-expect': eslintChaiExpectPlugin,
-    },
-    rules: {
-      ...eslintJs.configs.recommended.rules,
-      ...eslintPrettierConfig.rules,
-      ...eslintMochaPlugin.configs.recommended.rules,
-      ...eslintChaiExpectPlugin.configs['recommended-flat'].rules,
-      ...eslintJsdocPlugin.configs['flat/recommended-error'].rules,
-      'no-unused-vars': ['error', {'caughtErrors': 'none'}],
-      'jsdoc/reject-any-type': 0,
-      'jsdoc/reject-function-type': 0,
-      'jsdoc/require-param-description': 0,
-      'jsdoc/require-returns-description': 0,
-      'jsdoc/require-property-description': 0,
-      'jsdoc/tag-lines': ['error', 'any', {startLines: 1}],
+export default [{
+  languageOptions: {
+    globals: {
+      ...globals.node,
+      ...globals.es2021,
+      ...globals.mocha,
     },
   },
-  {
-    files: ['src/**/*.ts'],
-    ignores: ['src/**/*.d.ts'],
-    languageOptions: {
-      globals: {
-        ...globals.node,
-        ...globals.es2021,
-        ...globals.mocha,
-      },
-      parser: eslintTypescript.parser,
-      parserOptions: {
-        projectService: true,
-        tsconfigRootDir: import.meta.dirname,
-      },
-    },
-    plugins: {
-      '@typescript-eslint': eslintTypescript.plugin,
-      'mocha': eslintMochaPlugin,
-      'chai-expect': eslintChaiExpectPlugin,
-    },
-    rules: {
-      ...eslintJs.configs.recommended.rules,
-      ...eslintPrettierConfig.rules,
-      ...eslintTypescript.configs.recommended.rules,
-      '@typescript-eslint/no-namespace': 0,
-      '@typescript-eslint/no-var-requires': 0,
-      '@typescript-eslint/no-unnecessary-type-constraint': 0,
-    },
+  plugins: {
+    'jsdoc': eslintJsdocPlugin,
+    'mocha': eslintMochaPlugin,
+    'import': eslintImportPlugin,
+    'chai-expect': eslintChaiExpectPlugin,
+  },
+  rules: {
+    ...eslintJs.configs.recommended.rules,
+    ...eslintPrettierConfig.rules,
+    ...eslintImportPlugin.flatConfigs.recommended.rules,
+    ...eslintMochaPlugin.configs.recommended.rules,
+    ...eslintChaiExpectPlugin.configs['recommended-flat'].rules,
+    ...eslintJsdocPlugin.configs['flat/recommended-error'].rules,
+    'no-duplicate-imports': 'error',
+    'jsdoc/reject-any-type': 0,
+    'jsdoc/reject-function-type': 0,
+    'jsdoc/require-param-description': 0,
+    'jsdoc/require-returns-description': 0,
+    'jsdoc/require-property-description': 0,
+    'jsdoc/tag-lines': ['error', 'any', {startLines: 1}],
   },
-];
+  files: ['src/**/*.js'],
+}];

package/jsconfig.json

@@ -0,0 +1,7 @@
+{
+  "compilerOptions": {
+    "target": "es2022",
+    "module": "NodeNext",
+    "moduleResolution": "NodeNext"
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@e22m4u/js-repository",
-  "version": "0.6.5",
+  "version": "0.8.0",
   "description": "Реализация репозитория для работы с базами данных",
   "author": "Mikhail Evstropov <e22m4u@yandex.ru>",
   "license": "MIT",
@@ -12,17 +12,15 @@
     "Datasource",
     "Relations"
   ],
-  "homepage": "https://github.com/e22m4u/js-repository",
+  "homepage": "https://gitrepos.ru/e22m4u/js-repository",
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/e22m4u/js-repository.git"
+    "url": "git+https://gitrepos.ru/e22m4u/js-repository.git"
   },
   "type": "module",
-  "types": "./src/index.d.ts",
   "module": "./src/index.js",
   "main": "./dist/cjs/index.cjs",
   "exports": {
-    "types": "./src/index.d.ts",
     "import": "./src/index.js",
     "require": "./dist/cjs/index.cjs"
   },
@@ -30,26 +28,22 @@
     "node": ">=12"
   },
   "scripts": {
-    "lint": "tsc && eslint ./src",
-    "lint:fix": "tsc && eslint ./src --fix",
+    "lint": "eslint ./src",
+    "lint:fix": "eslint ./src --fix",
     "format": "prettier --write \"./src/**/*.js\"",
     "test": "npm run lint && c8 --reporter=text-summary mocha --bail",
     "test:coverage": "npm run lint && c8 --reporter=text mocha --bail",
-    "build:cjs": "rimraf ./dist/cjs && node --no-warnings=ExperimentalWarning build-cjs.js",
+    "build:cjs": "rimraf ./dist/cjs && node build-cjs.js",
     "prepare": "husky"
   },
   "dependencies": {
-    "@e22m4u/js-empty-values": "~0.1.3",
-    "@e22m4u/js-format": "~0.2.1",
+    "@e22m4u/js-empty-values": "~0.2.0",
+    "@e22m4u/js-format": "~0.3.0",
     "@e22m4u/js-service": "~0.4.6"
   },
   "devDependencies": {
     "@commitlint/cli": "~20.1.0",
     "@commitlint/config-conventional": "~20.0.0",
-    "@types/chai": "~5.2.3",
-    "@types/chai-as-promised": "~8.0.2",
-    "@types/chai-spies": "~1.0.6",
-    "@types/mocha": "~10.0.10",
     "c8": "~10.1.3",
     "chai": "~6.2.1",
     "chai-as-promised": "~8.0.2",
@@ -58,14 +52,12 @@
     "eslint": "~9.39.1",
     "eslint-config-prettier": "~10.1.8",
     "eslint-plugin-chai-expect": "~3.1.0",
-    "eslint-plugin-jsdoc": "~61.2.1",
+    "eslint-plugin-import": "~2.32.0",
+    "eslint-plugin-jsdoc": "~61.4.1",
     "eslint-plugin-mocha": "~11.2.0",
     "husky": "~9.1.7",
     "mocha": "~11.7.5",
-    "prettier": "~3.6.2",
-    "rimraf": "~6.1.0",
-    "ts-node": "~10.9.2",
-    "typescript": "~5.9.3",
-    "typescript-eslint": "~8.46.4"
+    "prettier": "~3.7.3",
+    "rimraf": "~6.1.2"
   }
 }

package/src/adapter/adapter-loader.js

@@ -1,7 +1,6 @@
-import {Adapter} from './adapter.js';
 import {Service} from '@e22m4u/js-service';
-import {ADAPTER_CLASS_NAME} from './adapter.js';
 import {InvalidArgumentError} from '../errors/index.js';
+import {Adapter, ADAPTER_CLASS_NAME} from './adapter.js';
 
 /**
  * Adapter loader.
@@ -24,7 +23,7 @@ export class AdapterLoader extends Service {
     try {
       const module = await import(`./builtin/${adapterName}-adapter.js`);
       adapterCtor = findAdapterCtorInModule(module);
-    } catch (e) {
+    } catch {
       /**/
     }
     if (!adapterCtor)
@@ -33,7 +32,7 @@ export class AdapterLoader extends Service {
           `@e22m4u/js-repository-${adapterName}-adapter`
         );
         adapterCtor = findAdapterCtorInModule(module);
-      } catch (e) {
+      } catch {
         /**/
       }
     if (!adapterCtor)

package/src/adapter/adapter.js

@@ -2,13 +2,14 @@
 /* eslint jsdoc/require-returns-check: 0 */
 import {Service} from '@e22m4u/js-service';
 import {NotImplementedError} from '../errors/index.js';
-import {InclusionDecorator} from './decorator/index.js';
-import {DefaultValuesDecorator} from './decorator/index.js';
-import {DataValidationDecorator} from './decorator/index.js';
-import {DataSanitizingDecorator} from './decorator/index.js';
-import {FieldsFilteringDecorator} from './decorator/index.js';
-import {DataTransformationDecorator} from './decorator/index.js';
-import {PropertyUniquenessDecorator} from './decorator/index.js';
+
+import {
+  InclusionDecorator,
+  DefaultValuesDecorator,
+  DataSanitizingDecorator,
+  FieldsFilteringDecorator,
+  PropertyUniquenessDecorator,
+} from './decorator/index.js';
 
 /**
  * Adapter class name.
@@ -22,9 +23,9 @@ export const ADAPTER_CLASS_NAME = 'Adapter';
  */
 export class Adapter extends Service {
   /**
-   * Kind.
+   * Kinds.
    *
-   * @type {string}
+   * @type {string[]}
    */
   static kinds = [...Service.kinds, ADAPTER_CLASS_NAME];
 
@@ -57,8 +58,6 @@ export class Adapter extends Service {
     if (this.constructor !== Adapter) {
       this.getService(DataSanitizingDecorator).decorate(this);
       this.getService(DefaultValuesDecorator).decorate(this);
-      this.getService(DataTransformationDecorator).decorate(this);
-      this.getService(DataValidationDecorator).decorate(this);
       this.getService(PropertyUniquenessDecorator).decorate(this);
       this.getService(FieldsFilteringDecorator).decorate(this);
       this.getService(InclusionDecorator).decorate(this);

package/src/adapter/adapter.spec.js

@@ -1,17 +1,16 @@
 import {expect} from 'chai';
 import {chai} from '../chai.js';
-import {Adapter} from './adapter.js';
-import {Service} from '@e22m4u/js-service';
-import {ADAPTER_CLASS_NAME} from './adapter.js';
-import {ServiceContainer} from '@e22m4u/js-service';
 import {DatabaseSchema} from '../database-schema.js';
-import {InclusionDecorator} from './decorator/index.js';
-import {DefaultValuesDecorator} from './decorator/index.js';
-import {DataValidationDecorator} from './decorator/index.js';
-import {DataSanitizingDecorator} from './decorator/index.js';
-import {FieldsFilteringDecorator} from './decorator/index.js';
-import {DataTransformationDecorator} from './decorator/index.js';
-import {PropertyUniquenessDecorator} from './decorator/index.js';
+import {Adapter, ADAPTER_CLASS_NAME} from './adapter.js';
+import {Service, ServiceContainer} from '@e22m4u/js-service';
+
+import {
+  InclusionDecorator,
+  DefaultValuesDecorator,
+  DataSanitizingDecorator,
+  FieldsFilteringDecorator,
+  PropertyUniquenessDecorator,
+} from './decorator/index.js';
 
 const sandbox = chai.spy.sandbox();
 
@@ -45,11 +44,9 @@ describe('Adapter', function () {
       const dbs = new DatabaseSchema();
       const dec1 = dbs.getService(DataSanitizingDecorator);
       const dec2 = dbs.getService(DefaultValuesDecorator);
-      const dec3 = dbs.getService(DataTransformationDecorator);
-      const dec4 = dbs.getService(DataValidationDecorator);
-      const dec5 = dbs.getService(PropertyUniquenessDecorator);
-      const dec6 = dbs.getService(FieldsFilteringDecorator);
-      const dec7 = dbs.getService(InclusionDecorator);
+      const dec3 = dbs.getService(PropertyUniquenessDecorator);
+      const dec4 = dbs.getService(FieldsFilteringDecorator);
+      const dec5 = dbs.getService(InclusionDecorator);
       const order = [];
       const decorate = function (ctx) {
         expect(ctx).to.be.instanceof(Adapter);
@@ -60,8 +57,6 @@ describe('Adapter', function () {
       sandbox.on(dec3, 'decorate', decorate);
       sandbox.on(dec4, 'decorate', decorate);
       sandbox.on(dec5, 'decorate', decorate);
-      sandbox.on(dec6, 'decorate', decorate);
-      sandbox.on(dec7, 'decorate', decorate);
       new Adapter(dbs.container);
       expect(order).to.be.empty;
       expect(dec1.decorate).to.be.not.called;
@@ -69,8 +64,6 @@ describe('Adapter', function () {
       expect(dec3.decorate).to.be.not.called;
       expect(dec4.decorate).to.be.not.called;
       expect(dec5.decorate).to.be.not.called;
-      expect(dec6.decorate).to.be.not.called;
-      expect(dec7.decorate).to.be.not.called;
       class ExtendedAdapter extends Adapter {}
       new ExtendedAdapter(dbs.container);
       expect(order[0]).to.be.eql(dec1);
@@ -78,15 +71,11 @@ describe('Adapter', function () {
       expect(order[2]).to.be.eql(dec3);
       expect(order[3]).to.be.eql(dec4);
       expect(order[4]).to.be.eql(dec5);
-      expect(order[5]).to.be.eql(dec6);
-      expect(order[6]).to.be.eql(dec7);
       expect(dec1.decorate).to.be.called.once;
       expect(dec2.decorate).to.be.called.once;
       expect(dec3.decorate).to.be.called.once;
       expect(dec4.decorate).to.be.called.once;
       expect(dec5.decorate).to.be.called.once;
-      expect(dec6.decorate).to.be.called.once;
-      expect(dec7.decorate).to.be.called.once;
     });
   });
 

package/src/adapter/builtin/memory-adapter.js

@@ -1,12 +1,13 @@
 import {Adapter} from '../adapter.js';
-import {cloneDeep} from '../../utils/index.js';
-import {capitalize} from '../../utils/index.js';
-import {DataType} from '../../definition/index.js';
-import {SliceClauseTool} from '../../filter/index.js';
-import {WhereClauseTool} from '../../filter/index.js';
-import {OrderClauseTool} from '../../filter/index.js';
+import {cloneDeep, capitalize} from '../../utils/index.js';
 import {InvalidArgumentError} from '../../errors/index.js';
-import {ModelDefinitionUtils} from '../../definition/index.js';
+import {DataType, ModelDefinitionUtils} from '../../definition/index.js';
+
+import {
+  SliceClauseTool,
+  WhereClauseTool,
+  OrderClauseTool,
+} from '../../filter/index.js';
 
 /**
  * Memory adapter.
@@ -50,10 +51,9 @@ export class MemoryAdapter extends Adapter {
    * @returns {number}
    */
   _genNextIdValue(modelName, propName) {
-    const propType = this.getService(
-      ModelDefinitionUtils,
-    ).getDataTypeByPropertyName(modelName, propName);
-    if (propType !== DataType.ANY && propType !== DataType.NUMBER)
+    const modelUtils = this.getService(ModelDefinitionUtils);
+    const propType = modelUtils.getDataTypeByPropertyName(modelName, propName);
+    if (propType !== DataType.ANY && propType !== DataType.NUMBER) {
       throw new InvalidArgumentError(
         'The memory adapter able to generate only Number identifiers, ' +
           'but the primary key %v of the model %v is defined as %s. ' +
@@ -65,18 +65,36 @@ export class MemoryAdapter extends Adapter {
         capitalize(propType),
         propName,
       );
-    const tableName =
-      this.getService(ModelDefinitionUtils).getTableNameByModelName(modelName);
-    const lastId = this._lastIds.get(tableName) ?? 0;
-    const nextId = lastId + 1;
-    this._lastIds.set(tableName, nextId);
+    }
+    const tableName = modelUtils.getTableNameByModelName(modelName);
     const table = this._getTableOrCreate(modelName);
-    const existedIds = Array.from(table.keys());
-    if (existedIds.includes(nextId))
-      return this._genNextIdValue(modelName, propName);
+    let nextId = this._lastIds.get(tableName) ?? 0;
+    do {
+      nextId++;
+    } while (table.has(nextId));
+    this._lastIds.set(tableName, nextId);
     return nextId;
   }
 
+  /**
+   * Update last id value if needed.
+   *
+   * Если переданное значение последнего использованного
+   * идентификатора больше текущего, то текущее значение
+   * перезаписывается полученным.
+   *
+   * @param {string} modelName
+   * @param {number} idValue
+   */
+  _updateLastIdValueIfNeeded(modelName, idValue) {
+    const tableName =
+      this.getService(ModelDefinitionUtils).getTableNameByModelName(modelName);
+    const currentLastId = this._lastIds.get(tableName) ?? 0;
+    if (idValue > currentLastId) {
+      this._lastIds.set(tableName, idValue);
+    }
+  }
+
   /**
    * Create
    *
@@ -95,6 +113,12 @@ export class MemoryAdapter extends Adapter {
     if (idValue == null || idValue === '' || idValue === 0) {
       idValue = this._genNextIdValue(modelName, pkPropName);
     }
+    // если идентификатор передан вручную и является числом,
+    // то значение последнего использованного идентификатора
+    // обновляется на полученное
+    else if (typeof idValue === 'number') {
+      this._updateLastIdValueIfNeeded(modelName, idValue);
+    }
 
     const table = this._getTableOrCreate(modelName);
     if (table.has(idValue))
@@ -174,6 +198,12 @@ export class MemoryAdapter extends Adapter {
     if (idValue == null || idValue === '' || idValue === 0) {
       idValue = this._genNextIdValue(modelName, pkPropName);
     }
+    // если идентификатор передан вручную и является числом,
+    // то значение последнего использованного идентификатора
+    // обновляется на полученное
+    else if (typeof idValue === 'number') {
+      this._updateLastIdValueIfNeeded(modelName, idValue);
+    }
 
     const table = this._getTableOrCreate(modelName);
     modelData = cloneDeep(modelData);

package/src/adapter/builtin/memory-adapter.spec.js

@@ -1,9 +1,12 @@
 import {expect} from 'chai';
 import {format} from '@e22m4u/js-format';
 import {MemoryAdapter} from './memory-adapter.js';
-import {DataType} from '../../definition/index.js';
 import {DatabaseSchema} from '../../database-schema.js';
-import {DEFAULT_PRIMARY_KEY_PROPERTY_NAME as DEF_PK} from '../../definition/index.js';
+
+import {
+  DataType,
+  DEFAULT_PRIMARY_KEY_PROPERTY_NAME as DEF_PK,
+} from '../../definition/index.js';
 
 describe('MemoryAdapter', function () {
   describe('_getTableOrCreate', function () {
@@ -56,6 +59,53 @@ describe('MemoryAdapter', function () {
       expect(id2).to.be.eq(2);
       expect(id3).to.be.eq(3);
     });
+
+    it('increments from the the last known identifier', function () {
+      const dbs = new DatabaseSchema();
+      dbs.defineModel({name: 'model'});
+      const A = dbs.getService(MemoryAdapter);
+      A._lastIds.set('model', 10);
+      const id1 = A._genNextIdValue('model', DEF_PK);
+      const id2 = A._genNextIdValue('model', DEF_PK);
+      const id3 = A._genNextIdValue('model', DEF_PK);
+      expect(id1).to.be.eq(11);
+      expect(id2).to.be.eq(12);
+      expect(id3).to.be.eq(13);
+    });
+  });
+
+  describe('_updateLastIdValueIfNeeded', function () {
+    it('does nothing when the given identifier is lower or equal', function () {
+      const dbs = new DatabaseSchema();
+      dbs.defineModel({name: 'model'});
+      const A = dbs.getService(MemoryAdapter);
+      A._lastIds.set('model', 10);
+      A._updateLastIdValueIfNeeded('model', 9);
+      A._updateLastIdValueIfNeeded('model', 10);
+      const res = A._lastIds.get('model');
+      expect(res).to.be.eq(10);
+    });
+
+    it('updates the last known identifier if the given identifier is greater', function () {
+      const dbs = new DatabaseSchema();
+      dbs.defineModel({name: 'model'});
+      const A = dbs.getService(MemoryAdapter);
+      A._lastIds.set('model', 10);
+      A._updateLastIdValueIfNeeded('model', 15);
+      const res = A._lastIds.get('model');
+      expect(res).to.be.eq(15);
+    });
+
+    it('correctly resolves table name from model name', function () {
+      const dbs = new DatabaseSchema();
+      dbs.defineModel({name: 'MyModel', tableName: 'custom_table_name'});
+      const A = dbs.getService(MemoryAdapter);
+      A._lastIds.set('custom_table_name', 10);
+      A._updateLastIdValueIfNeeded('MyModel', 20);
+      const res = A._lastIds.get('custom_table_name');
+      expect(res).to.be.eq(20);
+      expect(A._lastIds.has('MyModel')).to.be.false;
+    });
   });
 
   describe('create', function () {

package/src/adapter/decorator/default-values-decorator.spec.js

@@ -1,9 +1,8 @@
 import {expect} from 'chai';
 import {chai} from '../../chai.js';
 import {Adapter} from '../adapter.js';
-import {DataType} from '../../definition/index.js';
 import {DatabaseSchema} from '../../database-schema.js';
-import {ModelDefinitionUtils} from '../../definition/index.js';
+import {DataType, ModelDefinitionUtils} from '../../definition/index.js';
 
 const dbs = new DatabaseSchema();
 dbs.defineModel({

package/src/adapter/decorator/index.js

@@ -1,7 +1,5 @@
 export * from './inclusion-decorator.js';
 export * from './default-values-decorator.js';
 export * from './data-sanitizing-decorator.js';
-export * from './data-validation-decorator.js';
 export * from './fields-filtering-decorator.js';
-export * from './data-transformation-decorator.js';
 export * from './property-uniqueness-decorator.js';

package/src/database-schema.js

@@ -1,7 +1,6 @@
 import {Service} from '@e22m4u/js-service';
-import {Repository} from './repository/index.js';
 import {DefinitionRegistry} from './definition/index.js';
-import {RepositoryRegistry} from './repository/index.js';
+import {Repository, RepositoryRegistry} from './repository/index.js';
 
 /**
  * Database schema.

package/src/{database-schema.spec.ts → database-schema.spec.js}

@@ -17,16 +17,17 @@ describe('DatabaseSchema', function () {
     it('sets the datasource definition', function () {
       const dbs = new DatabaseSchema();
       dbs.defineDatasource({name: 'datasource', adapter: 'memory'});
-      const res =
-        dbs.getService(DefinitionRegistry).getDatasource('datasource');
+      const res = dbs
+        .getService(DefinitionRegistry)
+        .getDatasource('datasource');
       expect(res).to.be.eql({name: 'datasource', adapter: 'memory'});
     });
 
     it('throws an error if the datasource name already defined', function () {
       const dbs = new DatabaseSchema();
       dbs.defineDatasource({name: 'datasource', adapter: 'memory'});
-      const throwable =
-        () => dbs.defineDatasource({name: 'datasource', adapter: 'memory'});
+      const throwable = () =>
+        dbs.defineDatasource({name: 'datasource', adapter: 'memory'});
       expect(throwable).to.throw(
         'The datasource "datasource" is already defined.',
       );
@@ -69,18 +70,5 @@ describe('DatabaseSchema', function () {
       const throwable = () => dbs.getRepository('model');
       expect(throwable).to.throw('The model "model" is not defined.');
     });
-
-    it('uses generic types to define the repository type', function () {
-      const dbs = new DatabaseSchema();
-      dbs.defineDatasource({name: 'datasource', adapter: 'memory'});
-      dbs.defineModel({name: 'model', datasource: 'datasource'});
-      interface MyModel {
-        myId: number;
-      }
-      const res1: Repository = dbs.getRepository('model');
-      const res2: Repository<MyModel, number, 'myId'> =
-        dbs.getRepository<MyModel, number, 'myId'>('model');
-      expect(res1).to.be.eq(res2);
-    });
   });
 });

package/src/definition/model/index.js

@@ -1,8 +1,5 @@
 export * from './relations/index.js';
 export * from './properties/index.js';
-export * from './model-definition.js';
-export * from './model-data-validator.js';
 export * from './model-data-sanitizer.js';
-export * from './model-data-transformer.js';
 export * from './model-definition-utils.js';
 export * from './model-definition-validator.js';

package/src/definition/model/model-definition-utils.js

@@ -1,10 +1,9 @@
 import {Service} from '@e22m4u/js-service';
 import {DataType} from './properties/index.js';
-import {cloneDeep} from '../../utils/index.js';
-import {excludeObjectKeys} from '../../utils/index.js';
 import {EmptyValuesService} from '@e22m4u/js-empty-values';
 import {InvalidArgumentError} from '../../errors/index.js';
 import {DefinitionRegistry} from '../definition-registry.js';
+import {cloneDeep, excludeObjectKeys} from '../../utils/index.js';
 
 /**
  * Default primary key property name.

package/src/definition/model/model-definition-utils.spec.js

@@ -6,8 +6,11 @@ import {RelationType} from './relations/index.js';
 import {DatabaseSchema} from '../../database-schema.js';
 import {EmptyValuesService} from '@e22m4u/js-empty-values';
 import {InvalidArgumentError} from '../../errors/index.js';
-import {ModelDefinitionUtils} from './model-definition-utils.js';
-import {DEFAULT_PRIMARY_KEY_PROPERTY_NAME as DEF_PK} from './model-definition-utils.js';
+
+import {
+  ModelDefinitionUtils,
+  DEFAULT_PRIMARY_KEY_PROPERTY_NAME as DEF_PK,
+} from './model-definition-utils.js';
 
 const sandbox = chai.spy.sandbox();
 

package/src/definition/model/properties/index.js

@@ -1,8 +1,5 @@
 export * from './data-type.js';
-export * from './property-definition.js';
 export * from './property-uniqueness.js';
-export * from './property-validator/index.js';
-export * from './property-transformer/index.js';
 export * from './property-uniqueness-validator.js';
 export * from './properties-definition-validator.js';
 export * from './primary-keys-definition-validator.js';