@e22m4u/js-repository 0.7.0 → 0.8.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@e22m4u/js-repository",
-  "version": "0.7.0",
+  "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-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.2",
-    "ts-node": "~10.9.2",
-    "typescript": "~5.9.3",
-    "typescript-eslint": "~8.48.0"
+    "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,11 +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 {DataSanitizingDecorator} from './decorator/index.js';
-import {FieldsFilteringDecorator} from './decorator/index.js';
-import {PropertyUniquenessDecorator} from './decorator/index.js';
+
+import {
+  InclusionDecorator,
+  DefaultValuesDecorator,
+  DataSanitizingDecorator,
+  FieldsFilteringDecorator,
+  PropertyUniquenessDecorator,
+} from './decorator/index.js';
 
 /**
  * Adapter class name.

package/src/adapter/adapter.spec.js

@@ -1,15 +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 {DataSanitizingDecorator} from './decorator/index.js';
-import {FieldsFilteringDecorator} 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();
 

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.

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 () {

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/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,6 +1,5 @@
 export * from './relations/index.js';
 export * from './properties/index.js';
-export * from './model-definition.js';
 export * from './model-data-sanitizer.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,5 +1,4 @@
 export * from './data-type.js';
-export * from './property-definition.js';
 export * from './property-uniqueness.js';
 export * from './property-uniqueness-validator.js';
 export * from './properties-definition-validator.js';

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

@@ -1,3 +1,2 @@
 export * from './relation-type.js';
-export * from './relation-definition.js';
 export * from './relations-definition-validator.js';

package/src/definition/model/relations/relations-definition-validator.js

@@ -1,6 +1,5 @@
 import {Service} from '@e22m4u/js-service';
 import {RelationType} from './relation-type.js';
-import {RelationType as Type} from './relation-type.js';
 import {InvalidArgumentError} from '../../../errors/index.js';
 
 /**
@@ -62,13 +61,13 @@ export class RelationsDefinitionValidator extends Service {
         modelName,
         relDef,
       );
-    if (!relDef.type || !Object.values(Type).includes(relDef.type))
+    if (!relDef.type || !Object.values(RelationType).includes(relDef.type))
       throw new InvalidArgumentError(
         'The relation %v of the model %v requires the option "type" ' +
           'to have one of relation types: %l, but %v was given.',
         relName,
         modelName,
-        Object.values(Type),
+        Object.values(RelationType),
         relDef.type,
       );
     this._validateBelongsTo(modelName, relName, relDef);
@@ -105,7 +104,7 @@ export class RelationsDefinitionValidator extends Service {
    * @private
    */
   _validateBelongsTo(modelName, relName, relDef) {
-    if (relDef.type !== Type.BELONGS_TO) return;
+    if (relDef.type !== RelationType.BELONGS_TO) return;
     if (relDef.polymorphic) {
       // A polymorphic "belongsTo" relation.
       if (typeof relDef.polymorphic !== 'boolean')
@@ -419,7 +418,7 @@ export class RelationsDefinitionValidator extends Service {
    * @private
    */
   _validateReferencesMany(modelName, relName, relDef) {
-    if (relDef.type !== Type.REFERENCES_MANY) return;
+    if (relDef.type !== RelationType.REFERENCES_MANY) return;
     if (!relDef.model || typeof relDef.model !== 'string')
       throw new InvalidArgumentError(
         'The relation %v of the model %v has the type "referencesMany", ' +

package/src/filter/include-clause-tool.js

@@ -1,15 +1,17 @@
 import {Service} from '@e22m4u/js-service';
-import {RelationType} from '../definition/index.js';
-import {HasOneResolver} from '../relations/index.js';
-import {HasManyResolver} from '../relations/index.js';
 import {WhereClauseTool} from './where-clause-tool.js';
 import {OrderClauseTool} from './order-clause-tool.js';
 import {SliceClauseTool} from './slice-clause-tool.js';
 import {InvalidArgumentError} from '../errors/index.js';
-import {BelongsToResolver} from '../relations/index.js';
 import {FieldsClauseTool} from './fields-clause-tool.js';
-import {ModelDefinitionUtils} from '../definition/index.js';
-import {ReferencesManyResolver} from '../relations/index.js';
+import {RelationType, ModelDefinitionUtils} from '../definition/index.js';
+
+import {
+  HasOneResolver,
+  HasManyResolver,
+  BelongsToResolver,
+  ReferencesManyResolver,
+} from '../relations/index.js';
 
 /**
  * Include clause tool.

package/src/index.js

@@ -1,4 +1,3 @@
-export * from './types.js';
 export * from './utils/index.js';
 export * from './errors/index.js';
 export * from './filter/index.js';

package/src/relations/belongs-to-resolver.js

@@ -1,7 +1,6 @@
 import {Service} from '@e22m4u/js-service';
-import {cloneDeep} from '../utils/index.js';
-import {singularize} from '../utils/index.js';
 import {InvalidArgumentError} from '../errors/index.js';
+import {cloneDeep, singularize} from '../utils/index.js';
 import {RepositoryRegistry} from '../repository/index.js';
 import {ModelDefinitionUtils} from '../definition/index.js';
 

package/src/relations/belongs-to-resolver.spec.js

@@ -1,10 +1,13 @@
 import {expect} from 'chai';
 import {format} from '@e22m4u/js-format';
-import {DataType} from '../definition/index.js';
-import {RelationType} from '../definition/index.js';
 import {DatabaseSchema} from '../database-schema.js';
 import {BelongsToResolver} from './belongs-to-resolver.js';
-import {DEFAULT_PRIMARY_KEY_PROPERTY_NAME as DEF_PK} from '../definition/index.js';
+
+import {
+  DataType,
+  RelationType,
+  DEFAULT_PRIMARY_KEY_PROPERTY_NAME as DEF_PK,
+} from '../definition/index.js';
 
 describe('BelongsToResolver', function () {
   describe('includeTo', function () {

package/src/relations/has-many-resolver.js

@@ -1,9 +1,8 @@
 import {Service} from '@e22m4u/js-service';
 import {cloneDeep} from '../utils/index.js';
-import {RelationType} from '../definition/index.js';
 import {InvalidArgumentError} from '../errors/index.js';
 import {RepositoryRegistry} from '../repository/index.js';
-import {ModelDefinitionUtils} from '../definition/index.js';
+import {RelationType, ModelDefinitionUtils} from '../definition/index.js';
 
 /**
  * Has many resolver.

package/src/relations/has-many-resolver.spec.js

@@ -1,10 +1,13 @@
 import {expect} from 'chai';
 import {format} from '@e22m4u/js-format';
-import {DataType} from '../definition/index.js';
-import {RelationType} from '../definition/index.js';
 import {DatabaseSchema} from '../database-schema.js';
 import {HasManyResolver} from './has-many-resolver.js';
-import {DEFAULT_PRIMARY_KEY_PROPERTY_NAME as DEF_PK} from '../definition/index.js';
+
+import {
+  DataType,
+  RelationType,
+  DEFAULT_PRIMARY_KEY_PROPERTY_NAME as DEF_PK,
+} from '../definition/index.js';
 
 describe('HasManyResolver', function () {
   describe('includeTo', function () {

package/src/relations/has-one-resolver.js

@@ -1,9 +1,8 @@
 import {Service} from '@e22m4u/js-service';
 import {cloneDeep} from '../utils/index.js';
-import {RelationType} from '../definition/index.js';
 import {InvalidArgumentError} from '../errors/index.js';
 import {RepositoryRegistry} from '../repository/index.js';
-import {ModelDefinitionUtils} from '../definition/index.js';
+import {RelationType, ModelDefinitionUtils} from '../definition/index.js';
 
 /**
  * Has one resolver.

package/src/relations/has-one-resolver.spec.js

@@ -1,10 +1,13 @@
 import {expect} from 'chai';
 import {format} from '@e22m4u/js-format';
-import {DataType} from '../definition/index.js';
-import {RelationType} from '../definition/index.js';
 import {HasOneResolver} from './has-one-resolver.js';
 import {DatabaseSchema} from '../database-schema.js';
-import {DEFAULT_PRIMARY_KEY_PROPERTY_NAME as DEF_PK} from '../definition/index.js';
+
+import {
+  DataType,
+  RelationType,
+  DEFAULT_PRIMARY_KEY_PROPERTY_NAME as DEF_PK,
+} from '../definition/index.js';
 
 describe('HasOneResolver', function () {
   describe('includeTo', function () {

package/src/relations/references-many-resolver.js

@@ -1,7 +1,6 @@
 import {Service} from '@e22m4u/js-service';
-import {cloneDeep} from '../utils/index.js';
-import {singularize} from '../utils/index.js';
 import {InvalidArgumentError} from '../errors/index.js';
+import {cloneDeep, singularize} from '../utils/index.js';
 import {RepositoryRegistry} from '../repository/index.js';
 import {ModelDefinitionUtils} from '../definition/index.js';
 

package/src/relations/references-many-resolver.spec.js

@@ -1,10 +1,13 @@
 import {expect} from 'chai';
 import {format} from '@e22m4u/js-format';
-import {DataType} from '../definition/index.js';
-import {RelationType} from '../definition/index.js';
 import {DatabaseSchema} from '../database-schema.js';
 import {ReferencesManyResolver} from './references-many-resolver.js';
-import {DEFAULT_PRIMARY_KEY_PROPERTY_NAME as DEF_PK} from '../definition/index.js';
+
+import {
+  DataType,
+  RelationType,
+  DEFAULT_PRIMARY_KEY_PROPERTY_NAME as DEF_PK,
+} from '../definition/index.js';
 
 describe('ReferencesManyResolver', function () {
   describe('includeTo', function () {

package/src/repository/repository.js

@@ -1,8 +1,7 @@
 import {Service} from '@e22m4u/js-service';
-import {Adapter} from '../adapter/index.js';
-import {AdapterRegistry} from '../adapter/index.js';
 import {InvalidArgumentError} from '../errors/index.js';
 import {DefinitionRegistry} from '../definition/index.js';
+import {Adapter, AdapterRegistry} from '../adapter/index.js';
 
 /**
  * Repository.

package/src/utils/is-plain-object.js

@@ -7,9 +7,9 @@
 export function isPlainObject(value) {
   return Boolean(
     typeof value === 'object' &&
-      value &&
-      !Array.isArray(value) &&
-      (!value.constructor ||
-        (value.constructor && value.constructor.name === 'Object')),
+    value &&
+    !Array.isArray(value) &&
+    (!value.constructor ||
+      (value.constructor && value.constructor.name === 'Object')),
   );
 }

package/src/adapter/adapter-loader.d.ts

@@ -1,16 +0,0 @@
-import {Adapter} from './adapter.js';
-import {AnyObject} from '../types.js';
-import {Service} from '@e22m4u/js-service';
-
-/**
- * Adapter loader.
- */
-export declare class AdapterLoader extends Service {
-  /**
-   * Load by name.
-   *
-   * @param adapterName
-   * @param settings
-   */
-  loadByName(adapterName: string, settings?: AnyObject): Promise<Adapter>;
-}

package/src/adapter/adapter-registry.d.ts

@@ -1,14 +0,0 @@
-import {Adapter} from './adapter.js';
-import {Service} from '@e22m4u/js-service';
-
-/**
- * Adapter registry.
- */
-export declare class AdapterRegistry extends Service {
-  /**
-   * Get adapter.
-   *
-   * @param datasourceName
-   */
-  getAdapter(datasourceName: string): Promise<Adapter>;
-}