@e22m4u/js-repository 0.0.32 → 0.0.34

package/package.json

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

package/src/adapter/adapter-loader.js

@@ -16,7 +16,7 @@ export class AdapterLoader extends Service {
   async loadByName(adapterName, settings = undefined) {
     if (!adapterName || typeof adapterName !== 'string')
       throw new InvalidArgumentError(
-        'The adapter name must be a non-empty String, but %v given.',
+        'The adapter name should be a non-empty String, but %v given.',
         adapterName,
       );
     let adapterCtor;

package/src/adapter/adapter-loader.spec.js

@@ -9,7 +9,7 @@ describe('AdapterLoader', function () {
     it('requires an adapter name as a non-empty string', async function () {
       const promise = S.loadByName('');
       await expect(promise).to.be.rejectedWith(
-        'The adapter name must be a non-empty String, but "" given.',
+        'The adapter name should be a non-empty String, but "" given.',
       );
     });
 

package/src/adapter/adapter.d.ts

@@ -1,10 +1,10 @@
 import {ModelId} from '../types.js';
 import {AnyObject} from '../types.js';
 import {ModelData} from '../types.js';
-import {Filter} from '../filter/index.js';
 import {Service} from '@e22m4u/js-service';
-import {ItemFilter} from '../filter/index.js';
 import {WhereClause} from '../filter/index.js';
+import {FilterClause} from '../filter/index.js';
+import {ItemFilterClause} from '../filter/index.js';
 import {ServiceContainer} from '@e22m4u/js-service';
 
 /**
@@ -34,7 +34,7 @@ export declare class Adapter extends Service {
   create(
     modelName: string,
     modelData: ModelData,
-    filter?: ItemFilter,
+    filter?: ItemFilterClause,
   ): Promise<ModelData>;
 
   /**
@@ -49,7 +49,7 @@ export declare class Adapter extends Service {
     modelName: string,
     id: ModelId,
     modelData: ModelData,
-    filter?: ItemFilter,
+    filter?: ItemFilterClause,
   ): Promise<ModelData>;
 
   /**
@@ -64,7 +64,7 @@ export declare class Adapter extends Service {
     modelName: string,
     id: ModelId,
     modelData: ModelData,
-    filter?: ItemFilter,
+    filter?: ItemFilterClause,
   ): Promise<ModelData>;
 
   /**
@@ -73,7 +73,7 @@ export declare class Adapter extends Service {
    * @param modelName
    * @param filter
    */
-  find(modelName: string, filter?: Filter): Promise<ModelData[]>;
+  find(modelName: string, filter?: FilterClause): Promise<ModelData[]>;
 
   /**
    * Find by id.
@@ -82,7 +82,11 @@ export declare class Adapter extends Service {
    * @param id
    * @param filter
    */
-  findById(modelName: string, id: ModelId, filter?: Filter): Promise<ModelData>;
+  findById(
+    modelName: string,
+    id: ModelId,
+    filter?: ItemFilterClause,
+  ): Promise<ModelData>;
 
   /**
    * Delete.

package/src/adapter/builtin/memory-adapter.d.ts

@@ -2,10 +2,10 @@ import {Adapter} from '../adapter.js';
 import {ModelId} from '../../types.js';
 import {AnyObject} from '../../types.js';
 import {ModelData} from '../../types.js';
-import {Filter} from '../../filter/index.js';
-import {ItemFilter} from '../../filter/index.js';
 import {WhereClause} from '../../filter/index.js';
+import {FilterClause} from '../../filter/index.js';
 import {ServiceContainer} from '@e22m4u/js-service';
+import {ItemFilterClause} from '../../filter/index.js';
 
 /**
  * Memory adapter.
@@ -34,7 +34,7 @@ export declare class MemoryAdapter extends Adapter {
   create(
     modelName: string,
     modelData: ModelData,
-    filter?: ItemFilter,
+    filter?: ItemFilterClause,
   ): Promise<ModelData>;
 
   /**
@@ -49,7 +49,7 @@ export declare class MemoryAdapter extends Adapter {
     modelName: string,
     id: ModelId,
     modelData: ModelData,
-    filter?: ItemFilter,
+    filter?: ItemFilterClause,
   ): Promise<ModelData>;
 
   /**
@@ -64,7 +64,7 @@ export declare class MemoryAdapter extends Adapter {
     modelName: string,
     id: ModelId,
     modelData: ModelData,
-    filter?: ItemFilter,
+    filter?: ItemFilterClause,
   ): Promise<ModelData>;
 
   /**
@@ -73,7 +73,7 @@ export declare class MemoryAdapter extends Adapter {
    * @param modelName
    * @param filter
    */
-  find(modelName: string, filter?: Filter): Promise<ModelData[]>;
+  find(modelName: string, filter?: FilterClause): Promise<ModelData[]>;
 
   /**
    * Find by id.
@@ -82,7 +82,11 @@ export declare class MemoryAdapter extends Adapter {
    * @param id
    * @param filter
    */
-  findById(modelName: string, id: ModelId, filter?: Filter): Promise<ModelData>;
+  findById(
+    modelName: string,
+    id: ModelId,
+    filter?: ItemFilterClause,
+  ): Promise<ModelData>;
 
   /**
    * Delete.

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 must be ' +
+        'A 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 must be ' +
+        'A 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 must be ' +
+        'A 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 must be ' +
+        'A 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 must be ' +
+        'A first argument of InclusionDecorator.decorate should be ' +
           'an Adapter instance, but %v given.',
         adapter,
       );

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

@@ -17,13 +17,13 @@ export class ModelDataSanitizer extends Service {
     if (!modelName || typeof modelName !== 'string')
       throw new InvalidArgumentError(
         'The first argument of ModelDataSanitizer.sanitize ' +
-          'must be a string, but %v given.',
+          'should be a string, but %v given.',
         modelName,
       );
     if (!modelData || typeof modelData !== 'object')
       throw new InvalidArgumentError(
         'The second argument of ModelDataSanitizer.sanitize ' +
-          'must be an Object, but %v given.',
+          'should be an Object, but %v given.',
         modelData,
       );
     return this.getService(

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

@@ -19,7 +19,7 @@ export class ModelDataValidator extends Service {
   validate(modelName, modelData, isPartial = false) {
     if (!isPureObject(modelData))
       throw new InvalidArgumentError(
-        'The data of the model %v must be an Object, but %v given.',
+        'The data of the model %v should be an Object, but %v given.',
         modelName,
         modelData,
       );

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

@@ -24,7 +24,7 @@ describe('ModelDataValidator', function () {
       };
       const error = given =>
         format(
-          'The data of the model "model" must be an Object, but %s given.',
+          'The data of the model "model" should be an Object, but %s given.',
           given,
         );
       expect(throwable('str')).to.throw(error('"str"'));

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

@@ -361,7 +361,7 @@ export class ModelDefinitionUtils extends Service {
     if (!modelData || typeof modelData !== 'object' || Array.isArray(modelData))
       throw new InvalidArgumentError(
         'The second argument of ModelDefinitionUtils.excludeObjectKeysByRelationNames ' +
-          'must be an Object, but %v given.',
+          'should be an Object, but %v given.',
         modelData,
       );
     const relDefs = this.getRelationsDefinitionInBaseModelHierarchy(modelName);

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

@@ -1456,7 +1456,7 @@ describe('ModelDefinitionUtils', function () {
       const error = v =>
         format(
           'The second argument of ModelDefinitionUtils.excludeObjectKeysByRelationNames ' +
-            'must be an Object, but %s given.',
+            'should be an Object, but %s given.',
           v,
         );
       expect(throwable('')).to.throw(error('""'));

package/src/filter/fields-clause-tool.d.ts

@@ -1,7 +1,7 @@
 import {ModelData} from '../types.js';
-import {FieldsClause} from './filter.js';
 import {Service} from '@e22m4u/js-service';
-import {NormalizedFieldsClause} from './filter.js';
+import {FieldsClause} from './filter-clause.js';
+import {NormalizedFieldsClause} from './filter-clause.js';
 
 /**
  * Field clause tool.
@@ -10,12 +10,12 @@ export declare class FieldsClauseTool extends Service {
   /**
    * Filter.
    *
-   * @param entities
+   * @param input
    * @param modelName
    * @param clause
    */
   filter<T extends ModelData | ModelData[]>(
-    entities: T,
+    input: T,
     modelName: string,
     clause: FieldsClause | undefined,
   ): T;

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

@@ -10,30 +10,39 @@ export class FieldsClauseTool extends Service {
   /**
    * Filter.
    *
-   * @param {object|object[]} entities
+   * @param {object|object[]} input
    * @param {string} modelName
    * @param {string|string[]|undefined} clause
    * @returns {object|object[]}
    */
-  filter(entities, modelName, clause) {
-    const isArray = Array.isArray(entities);
-    entities = isArray ? entities : [entities];
+  filter(input, modelName, clause) {
+    const isArray = Array.isArray(input);
+    let entities = isArray ? input : [input];
     entities.forEach(entity => {
       if (!entity || typeof entity !== 'object' || Array.isArray(entity))
         throw new InvalidArgumentError(
-          'A first argument of FieldClauseTool.filter should be an Object or ' +
+          'The first argument of FieldsClauseTool.filter should be an Object or ' +
             'an Array of Object, but %v given.',
           entity,
         );
     });
 
-    if (!clause) return entities;
+    if (!modelName || typeof modelName !== 'string')
+      throw new InvalidArgumentError(
+        'The second argument of FieldsClauseTool.filter should be ' +
+          'a non-empty String, but %v given.',
+        modelName,
+      );
+
+    if (clause == null) return input;
     const fields = Array.isArray(clause) ? clause.slice() : [clause];
+    if (!fields.length) return input;
+
     fields.forEach(field => {
       if (!field || typeof field !== 'string')
         throw new InvalidArgumentError(
-          'The provided option "fields" should be a String ' +
-            'or an Array of String, but %v given.',
+          'The provided option "fields" should be a non-empty String ' +
+            'or an Array of non-empty String, but %v given.',
           field,
         );
     });
@@ -54,14 +63,15 @@ export class FieldsClauseTool extends Service {
    * @param {string|string[]|undefined} clause
    */
   static validateFieldsClause(clause) {
-    if (!clause) return;
-    const tempClause = Array.isArray(clause) ? clause : [clause];
-    tempClause.forEach(key => {
-      if (!key || typeof key !== 'string')
+    if (clause == null) return;
+    const fields = Array.isArray(clause) ? clause : [clause];
+    if (!fields.length) return;
+    fields.forEach(field => {
+      if (!field || typeof field !== 'string')
         throw new InvalidArgumentError(
           'The provided option "fields" should be a non-empty String ' +
-            'or an Array of String, but %v given.',
-          key,
+            'or an Array of non-empty String, but %v given.',
+          field,
         );
     });
   }
@@ -73,16 +83,17 @@ export class FieldsClauseTool extends Service {
    * @returns {string[]|undefined}
    */
   static normalizeFieldsClause(clause) {
-    if (!clause) return;
-    clause = Array.isArray(clause) ? clause : [clause];
-    clause.forEach(key => {
-      if (!key || typeof key !== 'string')
+    if (clause == null) return;
+    const fields = Array.isArray(clause) ? clause : [clause];
+    if (!fields.length) return;
+    fields.forEach(field => {
+      if (!field || typeof field !== 'string')
         throw new InvalidArgumentError(
           'The provided option "fields" should be a non-empty String ' +
-            'or an Array of String, but %v given.',
-          key,
+            'or an Array of non-empty String, but %v given.',
+          field,
         );
     });
-    return clause;
+    return fields;
   }
 }