@e22m4u/js-repository 0.4.0 → 0.5.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@e22m4u/js-repository",
-  "version": "0.4.0",
+  "version": "0.5.1",
   "description": "Реализация репозитория для работы с базами данных в Node.js",
   "author": "Mikhail Evstropov <e22m4u@yandex.ru>",
   "license": "MIT",

package/src/adapter/adapter-loader.js

@@ -17,7 +17,7 @@ export class AdapterLoader extends Service {
   async loadByName(adapterName, settings = undefined) {
     if (!adapterName || typeof adapterName !== 'string')
       throw new InvalidArgumentError(
-        'The adapter name should be a non-empty String, but %v given.',
+        'The adapter name should be a non-empty String, but %v was 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 should be a non-empty String, but "" given.',
+        'The adapter name should be a non-empty String, but "" was given.',
       );
     });
 

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

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

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

@@ -16,7 +16,7 @@ export class DataTransformationDecorator extends Service {
     if (!adapter || !(adapter instanceof Adapter))
       throw new InvalidArgumentError(
         'The first argument of DataTransformerDecorator.decorate should be ' +
-          'an Adapter instance, but %v given.',
+          'an Adapter instance, but %v was given.',
         adapter,
       );
     const transformer = this.getService(ModelDataTransformer);

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

@@ -16,7 +16,7 @@ export class DataValidationDecorator extends Service {
     if (!adapter || !(adapter instanceof Adapter))
       throw new InvalidArgumentError(
         'The first argument of DataValidationDecorator.decorate should be ' +
-          'an Adapter instance, but %v given.',
+          'an Adapter instance, but %v was given.',
         adapter,
       );
     const validator = this.getService(ModelDataValidator);

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

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

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

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

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

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

package/src/adapter/decorator/property-uniqueness-decorator.js

@@ -16,7 +16,7 @@ export class PropertyUniquenessDecorator extends Service {
     if (!adapter || !(adapter instanceof Adapter))
       throw new InvalidArgumentError(
         'The first argument of PropertyUniquenessDecorator.decorate should be ' +
-          'an Adapter instance, but %v given.',
+          'an Adapter instance, but %v was given.',
         adapter,
       );
     const validator = this.getService(PropertyUniquenessValidator);

package/src/definition/datasource/datasource-definition-validator.js

@@ -13,19 +13,19 @@ export class DatasourceDefinitionValidator extends Service {
   validate(datasourceDef) {
     if (!datasourceDef || typeof datasourceDef !== 'object')
       throw new InvalidArgumentError(
-        'The datasource definition should be an Object, but %v given.',
+        'The datasource definition should be an Object, but %v was given.',
         datasourceDef,
       );
     if (!datasourceDef.name || typeof datasourceDef.name !== 'string')
       throw new InvalidArgumentError(
         'The datasource definition requires the option "name" ' +
-          'as a non-empty String, but %v given.',
+          'as a non-empty String, but %v was given.',
         datasourceDef.name,
       );
     if (!datasourceDef.adapter || typeof datasourceDef.adapter !== 'string')
       throw new InvalidArgumentError(
         'The datasource %v requires the option "adapter" ' +
-          'as a non-empty String, but %v given.',
+          'as a non-empty String, but %v was given.',
         datasourceDef.name,
         datasourceDef.adapter,
       );

package/src/definition/datasource/datasource-definition-validator.spec.js

@@ -10,7 +10,7 @@ describe('DatasourceDefinitionValidator', function () {
       const validate = v => () => S.validate(v);
       const error = v =>
         format(
-          'The datasource definition should be an Object, but %s given.',
+          'The datasource definition should be an Object, but %s was given.',
           v,
         );
       expect(validate('str')).to.throw(error('"str"'));
@@ -27,7 +27,7 @@ describe('DatasourceDefinitionValidator', function () {
       const error = v =>
         format(
           'The datasource definition requires the option "name" ' +
-            'as a non-empty String, but %s given.',
+            'as a non-empty String, but %s was given.',
           v,
         );
       expect(validate('')).to.throw(error('""'));
@@ -46,7 +46,7 @@ describe('DatasourceDefinitionValidator', function () {
       const error = v =>
         format(
           'The datasource "datasource" requires the option "adapter" ' +
-            'as a non-empty String, but %s given.',
+            'as a non-empty String, but %s was given.',
           v,
         );
       expect(validate('')).to.throw(error('""'));

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 ' +
-          'should be a string, but %v given.',
+          'should be a string, but %v was given.',
         modelName,
       );
     if (!modelData || typeof modelData !== 'object')
       throw new InvalidArgumentError(
         'The second argument of ModelDataSanitizer.sanitize ' +
-          'should be an Object, but %v given.',
+          'should be an Object, but %v was given.',
         modelData,
       );
     return this.getService(

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

@@ -22,7 +22,7 @@ export class ModelDataTransformer extends Service {
   transform(modelName, modelData, isPartial = false) {
     if (!isPureObject(modelData))
       throw new InvalidArgumentError(
-        'The data of the model %v should be an Object, but %v given.',
+        'The data of the model %v should be an Object, but %v was given.',
         modelName,
         modelData,
       );
@@ -64,7 +64,7 @@ export class ModelDataTransformer extends Service {
    * @param {string} propName
    * @param {string|object} propDef
    * @param {*} propValue
-   * @returns {*}
+   * @returns {*|Promise<*>}
    */
   _transformPropertyValue(modelName, propName, propDef, propValue) {
     if (typeof propDef === 'string' || propDef.transform == null)
@@ -73,22 +73,76 @@ export class ModelDataTransformer extends Service {
     const transformerRegistry = this.getService(PropertyTransformerRegistry);
     const transformFn = (
       value,
-      transformerName,
+      transformerOrName,
       transformerOptions = undefined,
     ) => {
-      const transformer = transformerRegistry.getTransformer(transformerName);
+      let transformerName, transformerFn;
+      // если второй аргумент является строкой, то строка
+      // воспринимается как название зарегистрированного
+      // трансформера
+      if (typeof transformerOrName === 'string') {
+        transformerName = transformerOrName;
+        transformerFn = transformerRegistry.getTransformer(transformerName);
+      }
+      // если второй аргумент является функцией,
+      // то функция воспринимается как трансформер
+      else if (typeof transformerOrName === 'function') {
+        transformerName =
+          transformerOrName.name && transformerOrName.name !== 'transform'
+            ? transformerOrName.name
+            : undefined;
+        transformerFn = transformerOrName;
+      }
+      // если второй аргумент не является строкой
+      // и функцией, то выбрасывается ошибка
+      else {
+        throw new InvalidArgumentError(
+          'Transformer must be a non-empty String or ' +
+            'a Function, but %v was given.',
+          transformerOrName,
+        );
+      }
       const context = {transformerName, modelName, propName};
-      return transformer(value, transformerOptions, context);
+      return transformerFn(value, transformerOptions, context);
     };
+    // если значением опции "transform" является строка,
+    // то строка воспринимается как название трансформера
     if (transformDef && typeof transformDef === 'string') {
       return transformFn(propValue, transformDef);
-    } else if (Array.isArray(transformDef)) {
-      return transformDef.reduce((valueOrPromise, transformerName) => {
+    }
+    // если значением опции "transform" является функция,
+    // то функция воспринимается как трансформер
+    else if (transformDef && typeof transformDef === 'function') {
+      return transformFn(propValue, transformDef);
+    }
+    // если значение опции "transform" является массив, то каждый
+    // элемент массива воспринимается как название трансформера
+    // или функция-валидатор
+    else if (Array.isArray(transformDef)) {
+      return transformDef.reduce((valueOrPromise, transformerOrName) => {
+        if (
+          !transformerOrName ||
+          (typeof transformerOrName !== 'string' &&
+            typeof transformerOrName !== 'function')
+        ) {
+          throw new InvalidArgumentError(
+            'The provided option "transform" for the property %v ' +
+              'in the model %v has an Array value that should contain ' +
+              'transformer names or transformer functions, but %v was given.',
+            propName,
+            modelName,
+            transformerOrName,
+          );
+        }
         return transformPromise(valueOrPromise, value => {
-          return transformFn(value, transformerName);
+          return transformFn(value, transformerOrName);
         });
       }, propValue);
-    } else if (transformDef !== null && typeof transformDef === 'object') {
+    }
+    // если значение опции "transform" является объектом,
+    // то ключи объекта воспринимаются как названия трансформеров,
+    // а их значения аргументами
+    else if (transformDef !== null && typeof transformDef === 'object') {
       return Object.keys(transformDef).reduce(
         (valueOrPromise, transformerName) => {
           const transformerOptions = transformDef[transformerName];
@@ -98,11 +152,15 @@ export class ModelDataTransformer extends Service {
         },
         propValue,
       );
-    } else {
+    }
+    // если значение опции "transform" не является строкой,
+    // функцией и массивом, то выбрасывается ошибка
+    else {
       throw new InvalidArgumentError(
-        'The provided option "transform" of the property %v in the model %v ' +
-          'should be a non-empty String, an Array of String or an Object, ' +
-          'but %v given.',
+        'The provided option "transform" for the property %v in the model %v ' +
+          'should be either a transformer name, a transformer function, an array ' +
+          'of transformer names or functions, or an object mapping transformer ' +
+          'names to their arguments, but %v was given.',
         propName,
         modelName,
         transformDef,