@e22m4u/js-repository 0.1.25 → 0.2.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@e22m4u/js-repository",
-  "version": "0.1.25",
+  "version": "0.2.1",
   "description": "Модуль для работы с базами данных для Node.js",
   "type": "module",
   "types": "./src/index.d.ts",
@@ -20,7 +20,7 @@
     "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": "node build-cjs.js",
+    "build:cjs": "rimraf ./dist/cjs && node --no-warnings=ExperimentalWarning build-cjs.js",
     "prepare": "husky"
   },
   "repository": {
@@ -40,31 +40,32 @@
   "homepage": "https://github.com/e22m4u/js-repository",
   "peerDependencies": {
     "@e22m4u/js-format": "0.1.x",
-    "@e22m4u/js-service": "0.1.x"
+    "@e22m4u/js-service": "0.2.x"
   },
   "devDependencies": {
-    "@commitlint/cli": "~19.5.0",
-    "@commitlint/config-conventional": "~19.5.0",
+    "@commitlint/cli": "~19.6.0",
+    "@commitlint/config-conventional": "~19.6.0",
     "@types/chai": "~5.0.1",
     "@types/chai-as-promised": "~8.0.1",
     "@types/chai-spies": "~1.0.6",
-    "@types/mocha": "~10.0.9",
+    "@types/mocha": "~10.0.10",
     "c8": "~10.1.2",
     "chai": "~5.1.2",
     "chai-as-promised": "~8.0.0",
     "chai-spies": "~1.1.0",
     "chai-subset": "~1.6.0",
     "esbuild": "~0.24.0",
-    "eslint": "~9.14.0",
+    "eslint": "~9.15.0",
     "eslint-config-prettier": "~9.1.0",
     "eslint-plugin-chai-expect": "~3.1.0",
-    "eslint-plugin-jsdoc": "~50.4.3",
+    "eslint-plugin-jsdoc": "~50.5.0",
     "eslint-plugin-mocha": "~10.5.0",
-    "husky": "~9.1.6",
+    "husky": "~9.1.7",
     "mocha": "~10.8.2",
     "prettier": "~3.3.3",
+    "rimraf": "~6.0.1",
     "tsx": "~4.19.2",
     "typescript": "~5.6.3",
-    "typescript-eslint": "~8.13.0"
+    "typescript-eslint": "~8.15.0"
   }
 }

package/src/adapter/adapter-loader.js

@@ -1,5 +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';
 
 /**
@@ -54,8 +55,11 @@ function findAdapterCtorInModule(module) {
   let adapterCtor;
   if (!module || typeof module !== 'object' || Array.isArray(module)) return;
   for (const ctor of Object.values(module)) {
-    console.log(ctor);
-    if (typeof ctor === 'function' && ctor.kind === Adapter.name) {
+    if (
+      typeof ctor === 'function' &&
+      Array.isArray(ctor.kinds) &&
+      Adapter.kinds.includes(ADAPTER_CLASS_NAME)
+    ) {
       adapterCtor = ctor;
       break;
     }

package/src/adapter/adapter.js

@@ -10,6 +10,13 @@ import {FieldsFilteringDecorator} from './decorator/index.js';
 import {DataTransformationDecorator} from './decorator/index.js';
 import {PropertyUniquenessDecorator} from './decorator/index.js';
 
+/**
+ * Adapter class name.
+ *
+ * @type {string}
+ */
+export const ADAPTER_CLASS_NAME = 'Adapter';
+
 /**
  * Adapter.
  */
@@ -19,7 +26,7 @@ export class Adapter extends Service {
    *
    * @type {string}
    */
-  static kind = 'Adapter';
+  static kinds = [...Service.kinds, ADAPTER_CLASS_NAME];
 
   /**
    * Settings.

package/src/adapter/adapter.spec.js

@@ -3,6 +3,7 @@ import {chai} from '../chai.js';
 import {Schema} from '../schema.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 {InclusionDecorator} from './decorator/index.js';
 import {DefaultValuesDecorator} from './decorator/index.js';
@@ -15,12 +16,11 @@ import {PropertyUniquenessDecorator} from './decorator/index.js';
 const sandbox = chai.spy.sandbox();
 
 describe('Adapter', function () {
-  it('exposes static property "kind"', function () {
-    expect(Adapter.kind).to.be.eq(Adapter.name);
-    const MyAdapter1 = class extends Adapter {};
-    expect(MyAdapter1.kind).to.be.eq(Adapter.name);
-    class MyAdapter2 extends Adapter {}
-    expect(MyAdapter2.kind).to.be.eq(Adapter.name);
+  it('exposes static property "kinds"', function () {
+    const kinds = [...Service.kinds, ADAPTER_CLASS_NAME];
+    expect(Adapter.kinds).to.be.eql(kinds);
+    const MyAdapter = class extends Adapter {};
+    expect(MyAdapter.kinds).to.be.eql(kinds);
   });
 
   describe('constructor', function () {

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

@@ -157,11 +157,15 @@ export class ModelDataValidator extends Service {
         );
         break;
       // OBJECT
-      case DataType.OBJECT:
+      case DataType.OBJECT: {
         if (!isPureObject(propValue)) throw createError('an Object');
-        if (typeof propDef === 'object' && propDef.model)
-          this.validate(propDef.model, propValue);
+        if (typeof propDef === 'object') {
+          const modelOptionField = isArrayValue ? 'itemModel' : 'model';
+          const modelOptionValue = propDef[modelOptionField];
+          if (modelOptionValue) this.validate(modelOptionValue, propValue);
+        }
         break;
+      }
     }
   }
 

package/src/definition/model/model-data-validator.spec.js

@@ -1651,7 +1651,22 @@ describe('ModelDataValidator', function () {
             );
           });
 
-          describe('the "model" option', function () {
+          describe('the "itemModel" option', function () {
+            it('does not throw an error if the option "itemModel" is not specified in case of Object item type', function () {
+              const S = new Schema();
+              S.defineModel({
+                name: 'model',
+                properties: {
+                  foo: {
+                    type: DataType.ARRAY,
+                    itemType: DataType.OBJECT,
+                  },
+                },
+              });
+              const value = {foo: [{a: 1}, {b: 2}]};
+              S.getService(ModelDataValidator).validate('model', value);
+            });
+
             it('throws an error when the given object element has an invalid model', function () {
               const S = new Schema();
               S.defineModel({
@@ -1667,7 +1682,7 @@ describe('ModelDataValidator', function () {
                   bar: {
                     type: DataType.ARRAY,
                     itemType: DataType.OBJECT,
-                    model: 'modelA',
+                    itemModel: 'modelA',
                   },
                 },
               });
@@ -1696,7 +1711,7 @@ describe('ModelDataValidator', function () {
                   bar: {
                     type: DataType.ARRAY,
                     itemType: DataType.OBJECT,
-                    model: 'modelA',
+                    itemModel: 'modelA',
                   },
                 },
               });

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

@@ -112,6 +112,15 @@ export class PropertiesDefinitionValidator extends Service {
         propDef.itemType,
       );
     }
+    if (propDef.itemModel && typeof propDef.itemModel !== 'string') {
+      throw new InvalidArgumentError(
+        'The provided option "itemModel" of the property %v in the model %v ' +
+          'should be a String, but %v given.',
+        propName,
+        modelName,
+        propDef.itemModel,
+      );
+    }
     if (propDef.model && typeof propDef.model !== 'string')
       throw new InvalidArgumentError(
         'The provided option "model" of the property %v in the model %v ' +
@@ -175,37 +184,50 @@ export class PropertiesDefinitionValidator extends Service {
       );
     if (propDef.itemType && propDef.type !== Type.ARRAY)
       throw new InvalidArgumentError(
-        'The property %v of the model %v has the non-array type, ' +
+        'The property %v of the model %v has a non-array type, ' +
           'so it should not have the option "itemType" to be provided.',
         propName,
         modelName,
         propDef.type,
       );
-    if (
-      propDef.model &&
-      propDef.type !== Type.OBJECT &&
-      propDef.itemType !== Type.OBJECT
-    ) {
-      if (propDef.type !== Type.ARRAY) {
+    if (propDef.itemModel && propDef.type !== Type.ARRAY)
+      throw new InvalidArgumentError(
+        'The option "itemModel" is not supported for %s property type, ' +
+          'so the property %v of the model %v should not have ' +
+          'the option "itemModel" to be provided.',
+        capitalize(propDef.type),
+        propName,
+        modelName,
+      );
+    if (propDef.itemModel && propDef.itemType !== Type.OBJECT) {
+      if (propDef.itemType) {
         throw new InvalidArgumentError(
-          'The option "model" is not supported for %s property type, ' +
-            'so the property %v of the model %v should not have ' +
-            'the option "model" to be provided.',
-          capitalize(propDef.type),
+          'The provided option "itemModel" requires the option "itemType" ' +
+            'to be explicitly set to Object, but the property %v of ' +
+            'the model %v has specified item type as %s.',
           propName,
           modelName,
+          capitalize(propDef.itemType),
         );
       } else {
         throw new InvalidArgumentError(
-          'The option "model" is not supported for Array property type of %s, ' +
-            'so the property %v of the model %v should not have ' +
-            'the option "model" to be provided.',
-          capitalize(propDef.itemType),
+          'The provided option "itemModel" requires the option "itemType" ' +
+            'to be explicitly set to Object, but the property %v of ' +
+            'the model %v does not have specified item type.',
           propName,
           modelName,
         );
       }
     }
+    if (propDef.model && propDef.type !== Type.OBJECT)
+      throw new InvalidArgumentError(
+        'The option "model" is not supported for %s property type, ' +
+          'so the property %v of the model %v should not have ' +
+          'the option "model" to be provided.',
+        capitalize(propDef.type),
+        propName,
+        modelName,
+      );
     if (propDef.validate != null) {
       const propertyValidatorRegistry = this.getService(
         PropertyValidatorRegistry,

package/src/definition/model/properties/properties-definition-validator.spec.js

@@ -133,7 +133,7 @@ describe('PropertiesDefinitionValidator', function () {
       validate(DataType.STRING)();
     });
 
-    it('expects provided the option "itemType" to be a DataType', function () {
+    it('expects the provided option "itemType" to be a DataType', function () {
       const validate = v => {
         const foo = {type: DataType.ARRAY, itemType: v};
         return () => S.validate('model', {foo});
@@ -153,7 +153,29 @@ describe('PropertiesDefinitionValidator', function () {
       validate(DataType.STRING)();
     });
 
-    it('expects provided the option "model" to be a string', function () {
+    it('expects the provided option "itemModel" to be a string', function () {
+      const validate = v => {
+        const foo = {
+          type: DataType.ARRAY,
+          itemType: DataType.OBJECT,
+          itemModel: v,
+        };
+        return () => S.validate('model', {foo});
+      };
+      const error = v =>
+        format(
+          'The provided option "itemModel" of the property "foo" ' +
+            'in the model "model" should be a String, but %s given.',
+          v,
+        );
+      expect(validate(10)).to.throw(error('10'));
+      expect(validate(true)).to.throw(error('true'));
+      expect(validate([])).to.throw(error('Array'));
+      expect(validate({})).to.throw(error('Object'));
+      validate('model')();
+    });
+
+    it('expects the provided option "model" to be a string', function () {
       const validate = v => {
         const foo = {
           type: DataType.OBJECT,
@@ -174,7 +196,7 @@ describe('PropertiesDefinitionValidator', function () {
       validate('model')();
     });
 
-    it('expects provided the option "primaryKey" to be a boolean', function () {
+    it('expects the provided option "primaryKey" to be a boolean', function () {
       const validate = v => {
         const foo = {
           type: DataType.STRING,
@@ -195,7 +217,7 @@ describe('PropertiesDefinitionValidator', function () {
       validate(false)();
     });
 
-    it('expects provided the option "columnName" to be a string', function () {
+    it('expects the provided option "columnName" to be a string', function () {
       const validate = v => {
         const foo = {
           type: DataType.STRING,
@@ -216,7 +238,7 @@ describe('PropertiesDefinitionValidator', function () {
       validate('columnName')();
     });
 
-    it('expects provided the option "columnType" to be a string', function () {
+    it('expects the provided option "columnType" to be a string', function () {
       const validate = v => {
         const foo = {
           type: DataType.STRING,
@@ -237,7 +259,7 @@ describe('PropertiesDefinitionValidator', function () {
       validate('columnType')();
     });
 
-    it('expects provided the option "required" to be a boolean', function () {
+    it('expects the provided option "required" to be a boolean', function () {
       const validate = v => {
         const foo = {
           type: DataType.STRING,
@@ -332,7 +354,7 @@ describe('PropertiesDefinitionValidator', function () {
         S.validate('model', {foo});
       };
       const error =
-        'The property "foo" of the model "model" has the non-array type, ' +
+        'The property "foo" of the model "model" has a non-array type, ' +
         'so it should not have the option "itemType" to be provided.';
       expect(validate(DataType.ANY)).to.throw(error);
       expect(validate(DataType.STRING)).to.throw(error);
@@ -364,27 +386,34 @@ describe('PropertiesDefinitionValidator', function () {
       validate(DataType.OBJECT)();
     });
 
-    it('the option "model" requires the "object" item type', function () {
+    it('the option "itemModel" requires the "object" item type', function () {
       const validate = v => () => {
         const foo = {
           type: DataType.ARRAY,
           itemType: v,
-          model: 'model',
+          itemModel: 'model',
         };
         S.validate('model', {foo});
       };
-      const error = v =>
+      const errorForNonEmpty = v =>
         format(
-          'The option "model" is not supported for Array property type of %s, ' +
-            'so the property "foo" of the model "model" should not have ' +
-            'the option "model" to be provided.',
+          'The provided option "itemModel" requires the option "itemType" ' +
+            'to be explicitly set to Object, but the property "foo" of ' +
+            'the model "model" has specified item type as %s.',
           v,
         );
-      expect(validate(DataType.ANY)).to.throw(error('Any'));
-      expect(validate(DataType.STRING)).to.throw(error('String'));
-      expect(validate(DataType.NUMBER)).to.throw(error('Number'));
-      expect(validate(DataType.BOOLEAN)).to.throw(error('Boolean'));
-      expect(validate(DataType.ARRAY)).to.throw(error('Array'));
+      const errorForEmpty = format(
+        'The provided option "itemModel" requires the option "itemType" ' +
+          'to be explicitly set to Object, but the property "foo" of ' +
+          'the model "model" does not have specified item type.',
+      );
+      expect(validate(DataType.ANY)).to.throw(errorForNonEmpty('Any'));
+      expect(validate(DataType.STRING)).to.throw(errorForNonEmpty('String'));
+      expect(validate(DataType.NUMBER)).to.throw(errorForNonEmpty('Number'));
+      expect(validate(DataType.BOOLEAN)).to.throw(errorForNonEmpty('Boolean'));
+      expect(validate(DataType.ARRAY)).to.throw(errorForNonEmpty('Array'));
+      expect(validate(undefined)).to.throw(errorForEmpty);
+      expect(validate(null)).to.throw(errorForEmpty);
       validate(DataType.OBJECT)();
     });
 
@@ -491,7 +520,7 @@ describe('PropertiesDefinitionValidator', function () {
       validate({myTransformer: true})();
     });
 
-    it('expects provided the option "unique" to be a Boolean or the PropertyUniqueness', function () {
+    it('expects the provided option "unique" to be a Boolean or the PropertyUniqueness', function () {
       const validate = v => {
         const foo = {
           type: DataType.STRING,

package/src/definition/model/properties/property-definition.d.ts

@@ -9,6 +9,7 @@ import {PropertyTransformOptions} from './property-transformer/index.js';
 export declare type FullPropertyDefinition = {
   type: DataType;
   itemType?: DataType;
+  itemModel?: string;
   model?: string;
   primaryKey?: boolean;
   columnName?: string;