@e22m4u/js-repository 0.0.34 → 0.0.35

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@e22m4u/js-repository",
-  "version": "0.0.34",
+  "version": "0.0.35",
   "description": "Абстракция для работы с базами данных для Node.js",
   "type": "module",
   "main": "src/index.js",

package/src/adapter/decorator/data-sanitizing-decorator.js

@@ -15,7 +15,7 @@ export class DataSanitizingDecorator extends Service {
   decorate(adapter) {
     if (!adapter || !(adapter instanceof Adapter))
       throw new InvalidArgumentError(
-        'A first argument of DataSanitizingDecorator.decorate should be ' +
+        'The first argument of DataSanitizingDecorator.decorate should be ' +
           'an Adapter instance, but %v given.',
         adapter,
       );

package/src/adapter/decorator/data-validation-decorator.js

@@ -15,7 +15,7 @@ export class DataValidationDecorator extends Service {
   decorate(adapter) {
     if (!adapter || !(adapter instanceof Adapter))
       throw new InvalidArgumentError(
-        'A first argument of DataValidationDecorator.decorate should be ' +
+        'The first argument of DataValidationDecorator.decorate should be ' +
           'an Adapter instance, but %v given.',
         adapter,
       );

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

@@ -15,7 +15,7 @@ export class DefaultValuesDecorator extends Service {
   decorate(adapter) {
     if (!adapter || !(adapter instanceof Adapter))
       throw new InvalidArgumentError(
-        'A first argument of DefaultValuesDecorator.decorate should be ' +
+        'The first argument of DefaultValuesDecorator.decorate should be ' +
           'an Adapter instance, but %v given.',
         adapter,
       );

package/src/adapter/decorator/fields-filtering-decorator.js

@@ -15,7 +15,7 @@ export class FieldsFilteringDecorator extends Service {
   decorate(adapter) {
     if (!adapter || !(adapter instanceof Adapter))
       throw new InvalidArgumentError(
-        'A first argument of FieldsFilteringDecorator.decorate should be ' +
+        'The first argument of FieldsFilteringDecorator.decorate should be ' +
           'an Adapter instance, but %v given.',
         adapter,
       );

package/src/adapter/decorator/inclusion-decorator.js

@@ -15,7 +15,7 @@ export class InclusionDecorator extends Service {
   decorate(adapter) {
     if (!adapter || !(adapter instanceof Adapter))
       throw new InvalidArgumentError(
-        'A first argument of InclusionDecorator.decorate should be ' +
+        'The first argument of InclusionDecorator.decorate should be ' +
           'an Adapter instance, but %v given.',
         adapter,
       );

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

@@ -15,7 +15,7 @@ export class DefaultValuesDefinitionValidator extends Service {
   validate(modelName, propDefs) {
     if (!modelName || typeof modelName !== 'string')
       throw new InvalidArgumentError(
-        'A first argument of DefaultValuesDefinitionValidator.validate ' +
+        'The first argument of DefaultValuesDefinitionValidator.validate ' +
           'should be a non-empty String, but %v given.',
         modelName,
       );

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

@@ -11,7 +11,7 @@ describe('DefaultValuesDefinitionValidator', function () {
       const validate = v => () => S.validate(v, {});
       const error = v =>
         format(
-          'A first argument of DefaultValuesDefinitionValidator.validate ' +
+          'The first argument of DefaultValuesDefinitionValidator.validate ' +
             'should be a non-empty String, but %s given.',
           v,
         );

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

@@ -17,7 +17,7 @@ export class PropertiesDefinitionValidator extends Service {
   validate(modelName, propDefs) {
     if (!modelName || typeof modelName !== 'string')
       throw new InvalidArgumentError(
-        'A first argument of PropertiesDefinitionValidator.validate ' +
+        'The first argument of PropertiesDefinitionValidator.validate ' +
           'should be a non-empty String, but %v given.',
         modelName,
       );
@@ -54,7 +54,7 @@ export class PropertiesDefinitionValidator extends Service {
   _validateProperty(modelName, propName, propDef) {
     if (!modelName || typeof modelName !== 'string')
       throw new InvalidArgumentError(
-        'A first argument of PropertiesDefinitionValidator._validateProperty ' +
+        'The first argument of PropertiesDefinitionValidator._validateProperty ' +
           'should be a non-empty String, but %v given.',
         modelName,
       );

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

@@ -19,7 +19,7 @@ describe('PropertiesDefinitionValidator', function () {
       const validate = v => () => S.validate(v, {});
       const error = v =>
         format(
-          'A first argument of PropertiesDefinitionValidator.validate ' +
+          'The first argument of PropertiesDefinitionValidator.validate ' +
             'should be a non-empty String, but %s given.',
           v,
         );

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

@@ -16,7 +16,7 @@ export class RelationsDefinitionValidator extends Service {
   validate(modelName, relDefs) {
     if (!modelName || typeof modelName !== 'string')
       throw new InvalidArgumentError(
-        'A first argument of RelationsDefinitionValidator.validate ' +
+        'The first argument of RelationsDefinitionValidator.validate ' +
           'should be a non-empty String, but %v given.',
         modelName,
       );
@@ -44,7 +44,7 @@ export class RelationsDefinitionValidator extends Service {
   _validateRelation(modelName, relName, relDef) {
     if (!modelName || typeof modelName !== 'string')
       throw new InvalidArgumentError(
-        'A first argument of RelationsDefinitionValidator._validateRelation ' +
+        'The first argument of RelationsDefinitionValidator._validateRelation ' +
           'should be a non-empty String, but %v given.',
         modelName,
       );

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

@@ -11,7 +11,7 @@ describe('RelationsDefinitionValidator', function () {
       const validate = v => () => S.validate(v, {});
       const error = v =>
         format(
-          'A first argument of RelationsDefinitionValidator.validate ' +
+          'The first argument of RelationsDefinitionValidator.validate ' +
             'should be a non-empty String, but %s given.',
           v,
         );

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

@@ -163,14 +163,14 @@ export class IncludeClauseTool extends Service {
    * @param {IncludeClause|undefined} clause
    */
   static validateIncludeClause(clause) {
-    if (!clause) {
-      // empty
-    } else if (typeof clause === 'string') {
-      // string
+    if (clause == null) {
+      // allows undefined and null
+    } else if (clause && typeof clause === 'string') {
+      // allows non-empty string
     } else if (Array.isArray(clause)) {
-      // array
+      // validate array
       const relNames = [];
-      clause.flat().forEach(el => {
+      clause.flat(Infinity).forEach(el => {
         this.validateIncludeClause(el);
         if (typeof el === 'string') {
           relNames.push(el);
@@ -191,7 +191,7 @@ export class IncludeClauseTool extends Service {
           duplicateNames[0],
         );
     } else if (typeof clause === 'object') {
-      // object
+      // validate object
       if ('relation' in clause) {
         // {relation: 'name', scope: {}}
         if (!clause.relation || typeof clause.relation !== 'string')
@@ -205,14 +205,15 @@ export class IncludeClauseTool extends Service {
         // {foo: 'bar', 'baz': ['qux'], ...}
         Object.keys(clause).forEach(key => {
           if (!Object.prototype.hasOwnProperty.call(clause, key)) return;
+          this.validateIncludeClause(key);
           this.validateIncludeClause(clause[key]);
         });
       }
     } else {
-      // unknown.
+      // unsupported
       throw new InvalidArgumentError(
-        'The provided option "include" should have a value of ' +
-          'following types: String, Object or Array, but %v given.',
+        'The provided option "include" should have a non-empty String, ' +
+          'an Object or an Array, but %v given.',
         clause,
       );
     }
@@ -224,24 +225,36 @@ export class IncludeClauseTool extends Service {
    * @param {object|undefined} clause
    */
   static validateScopeClause(clause) {
-    if (!clause) return;
+    if (clause == null) return;
     if (typeof clause !== 'object' || Array.isArray(clause))
       throw new InvalidArgumentError(
         'The provided option "scope" should be an Object, but %v given.',
         clause,
       );
-    if ('where' in clause && clause.where)
+    // {where: ...}
+    if (clause.where != null) {
       WhereClauseTool.validateWhereClause(clause.where);
-    if ('order' in clause && clause.order)
+    }
+    // {order: ...}
+    if (clause.order != null) {
       OrderClauseTool.validateOrderClause(clause.order);
-    if ('skip' in clause && clause.skip)
+    }
+    // {skip: ...}
+    if (clause.skip != null) {
       SliceClauseTool.validateSkipClause(clause.skip);
-    if ('limit' in clause && clause.limit)
+    }
+    // {limit: ...}
+    if (clause.limit != null) {
       SliceClauseTool.validateLimitClause(clause.limit);
-    if ('fields' in clause && clause.fields)
+    }
+    // {fields: ...}
+    if (clause.fields != null) {
       FieldsClauseTool.validateFieldsClause(clause.fields);
-    if ('include' in clause && clause.include)
+    }
+    // {include: ...}
+    if (clause.include != null) {
       IncludeClauseTool.validateIncludeClause(clause.include);
+    }
   }
 
   /**
@@ -252,23 +265,16 @@ export class IncludeClauseTool extends Service {
    */
   static normalizeIncludeClause(clause) {
     let result = [];
-    if (!clause) {
-      // empty
+    if (clause == null) {
+      // allows undefined and null
       return result;
-    } else if (typeof clause === 'string') {
-      // string
+    } else if (clause && typeof clause === 'string') {
+      // normalize non-empty string
       result.push({relation: clause});
     } else if (Array.isArray(clause)) {
-      // array
-      clause.flat().forEach(el => {
-        if (Array.isArray(el)) {
-          el = el
-            .flat()
-            .map(v => this.normalizeIncludeClause(v))
-            .flat();
-        } else {
-          el = this.normalizeIncludeClause(el);
-        }
+      // normalize array
+      clause.flat(Infinity).forEach(el => {
+        el = this.normalizeIncludeClause(el);
         result = [...result, ...el];
       });
       // duplicates checking
@@ -282,7 +288,7 @@ export class IncludeClauseTool extends Service {
           duplicateNames[0],
         );
     } else if (typeof clause === 'object') {
-      // object
+      // normalize object
       if ('relation' in clause) {
         // {relation: 'name', scope: {...}}
         if (!clause.relation || typeof clause.relation !== 'string')
@@ -299,6 +305,7 @@ export class IncludeClauseTool extends Service {
         // {foo: 'bar', baz: ['qux'], ...}
         Object.keys(clause).forEach(key => {
           if (!Object.prototype.hasOwnProperty.call(clause, key)) return;
+          this.validateIncludeClause(key);
           const normalized = {relation: key};
           const include = this.normalizeIncludeClause(clause[key]);
           if (include.length) normalized.scope = {include};
@@ -306,10 +313,10 @@ export class IncludeClauseTool extends Service {
         });
       }
     } else {
-      // unknown
+      // unsupported
       throw new InvalidArgumentError(
-        'The provided option "include" should have a value of ' +
-          'following types: String, Object or Array, but %v given.',
+        'The provided option "include" should have a non-empty String, ' +
+          'an Object or an Array, but %v given.',
         clause,
       );
     }
@@ -323,7 +330,7 @@ export class IncludeClauseTool extends Service {
    * @returns {object|undefined}
    */
   static normalizeScopeClause(clause) {
-    if (!clause) return;
+    if (clause == null) return;
     if (typeof clause !== 'object' || Array.isArray(clause))
       throw new InvalidArgumentError(
         'The provided option "scope" should be an Object, but %v given.',
@@ -331,33 +338,34 @@ export class IncludeClauseTool extends Service {
       );
     const result = {};
     // {where: ...}
-    if ('where' in clause && clause.where) {
+    if (clause.where != null) {
       WhereClauseTool.validateWhereClause(clause.where);
       result.where = clause.where;
     }
     // {order: ...}
-    if ('order' in clause && clause.order) {
+    if (clause.order != null) {
       OrderClauseTool.validateOrderClause(clause.order);
       result.order = clause.order;
     }
     // {skip: ...}
-    if ('skip' in clause && clause.skip) {
+    if (clause.skip != null) {
       SliceClauseTool.validateSkipClause(clause.skip);
       result.skip = clause.skip;
     }
     // {limit: ...}
-    if ('limit' in clause && clause.limit) {
+    if (clause.limit != null) {
       SliceClauseTool.validateLimitClause(clause.limit);
       result.limit = clause.limit;
     }
     // {fields: ...}
-    if ('fields' in clause && clause.fields) {
+    if (clause.fields != null) {
       FieldsClauseTool.validateFieldsClause(clause.fields);
       result.fields = clause.fields;
     }
     // {include: ...}
-    if ('include' in clause && clause.include)
+    if (clause.include != null) {
       result.include = this.normalizeIncludeClause(clause.include);
+    }
     if (Object.keys(result).length) return result;
     return undefined;
   }