@e22m4u/js-repository 0.8.5 → 0.8.7

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

@@ -47,8 +47,12 @@ export class OperatorClauseTool extends Service {
     }
     // лексикографическое сравнение
     if (type1 === 'string' && type2 === 'string') {
-      if (val1 > val2) return 1;
-      if (val1 < val2) return -1;
+      if (val1 > val2) {
+        return 1;
+      }
+      if (val1 < val2) {
+        return -1;
+      }
       return 0;
     }
     return NaN;
@@ -62,12 +66,13 @@ export class OperatorClauseTool extends Service {
    * @returns {boolean|undefined}
    */
   testAll(clause, value) {
-    if (!clause || typeof clause !== 'object' || Array.isArray(clause))
+    if (!clause || typeof clause !== 'object' || Array.isArray(clause)) {
       throw new InvalidArgumentError(
         'The first argument of OperatorUtils.testAll ' +
           'should be an Object, but %v was given.',
         clause,
       );
+    }
     const operatorMap = {
       eq: this.testEqNeq,
       neq: this.testEqNeq,
@@ -130,14 +135,19 @@ export class OperatorClauseTool extends Service {
    * @returns {boolean|undefined}
    */
   testEqNeq(clause, value) {
-    if (!clause || typeof clause !== 'object')
+    if (!clause || typeof clause !== 'object') {
       throw new InvalidArgumentError(
         'The first argument of OperatorUtils.testEqNeq ' +
           'should be an Object, but %v was given.',
         clause,
       );
-    if ('eq' in clause) return this.compare(clause.eq, value, true) === 0;
-    if ('neq' in clause) return this.compare(clause.neq, value, true) !== 0;
+    }
+    if ('eq' in clause) {
+      return this.compare(clause.eq, value, true) === 0;
+    }
+    if ('neq' in clause) {
+      return this.compare(clause.neq, value, true) !== 0;
+    }
   }
 
   /**
@@ -176,16 +186,25 @@ export class OperatorClauseTool extends Service {
    * @returns {boolean|undefined}
    */
   testGtLt(clause, value) {
-    if (!clause || typeof clause !== 'object')
+    if (!clause || typeof clause !== 'object') {
       throw new InvalidArgumentError(
         'The first argument of OperatorUtils.testGtLt ' +
           'should be an Object, but %v was given.',
         clause,
       );
-    if ('gt' in clause) return this.compare(value, clause.gt) > 0;
-    if ('gte' in clause) return this.compare(value, clause.gte) >= 0;
-    if ('lt' in clause) return this.compare(value, clause.lt) < 0;
-    if ('lte' in clause) return this.compare(value, clause.lte) <= 0;
+    }
+    if ('gt' in clause) {
+      return this.compare(value, clause.gt) > 0;
+    }
+    if ('gte' in clause) {
+      return this.compare(value, clause.gte) >= 0;
+    }
+    if ('lt' in clause) {
+      return this.compare(value, clause.lt) < 0;
+    }
+    if ('lte' in clause) {
+      return this.compare(value, clause.lte) <= 0;
+    }
   }
 
   /**
@@ -203,12 +222,13 @@ export class OperatorClauseTool extends Service {
    * @returns {boolean|undefined}
    */
   testInq(clause, value) {
-    if (!clause || typeof clause !== 'object')
+    if (!clause || typeof clause !== 'object') {
       throw new InvalidArgumentError(
         'The first argument of OperatorUtils.testInq ' +
           'should be an Object, but %v was given.',
         clause,
       );
+    }
     if ('inq' in clause && clause.inq !== undefined) {
       if (!clause.inq || !Array.isArray(clause.inq)) {
         throw new InvalidOperatorValueError(
@@ -241,12 +261,13 @@ export class OperatorClauseTool extends Service {
    * @returns {boolean|undefined}
    */
   testNin(clause, value) {
-    if (!clause || typeof clause !== 'object')
+    if (!clause || typeof clause !== 'object') {
       throw new InvalidArgumentError(
         'The first argument of OperatorUtils.testNin ' +
           'should be an Object, but %v was given.',
         clause,
       );
+    }
     if ('nin' in clause && clause.nin !== undefined) {
       if (!clause.nin || !Array.isArray(clause.nin)) {
         throw new InvalidOperatorValueError(
@@ -276,12 +297,13 @@ export class OperatorClauseTool extends Service {
    * @returns {boolean|undefined}
    */
   testBetween(clause, value) {
-    if (!clause || typeof clause !== 'object')
+    if (!clause || typeof clause !== 'object') {
       throw new InvalidArgumentError(
         'The first argument of OperatorUtils.testBetween ' +
           'should be an Object, but %v was given.',
         clause,
       );
+    }
     if ('between' in clause && clause.between !== undefined) {
       if (!Array.isArray(clause.between) || clause.between.length !== 2) {
         throw new InvalidOperatorValueError(
@@ -312,12 +334,13 @@ export class OperatorClauseTool extends Service {
    * @returns {boolean|undefined}
    */
   testExists(clause, value) {
-    if (!clause || typeof clause !== 'object')
+    if (!clause || typeof clause !== 'object') {
       throw new InvalidArgumentError(
         'The first argument of OperatorUtils.testExists ' +
           'should be an Object, but %v was given.',
         clause,
       );
+    }
     if ('exists' in clause && clause.exists !== undefined) {
       if (typeof clause.exists !== 'boolean') {
         throw new InvalidOperatorValueError(
@@ -345,15 +368,17 @@ export class OperatorClauseTool extends Service {
    * @returns {boolean|undefined}
    */
   testLike(clause, value) {
-    if (!clause || typeof clause !== 'object' || Array.isArray(clause))
+    if (!clause || typeof clause !== 'object' || Array.isArray(clause)) {
       throw new InvalidArgumentError(
         'The first argument of OperatorUtils.testLike ' +
           'should be an Object, but %v was given.',
         clause,
       );
+    }
     if ('like' in clause && clause.like !== undefined) {
-      if (typeof clause.like !== 'string')
+      if (typeof clause.like !== 'string') {
         throw new InvalidOperatorValueError('like', 'a String', clause.like);
+      }
       return likeToRegexp(clause.like).test(value);
     }
   }
@@ -373,12 +398,13 @@ export class OperatorClauseTool extends Service {
    * @returns {boolean|undefined}
    */
   testNlike(clause, value) {
-    if (!clause || typeof clause !== 'object' || Array.isArray(clause))
+    if (!clause || typeof clause !== 'object' || Array.isArray(clause)) {
       throw new InvalidArgumentError(
         'The first argument of OperatorUtils.testNlike ' +
           'should be an Object, but %v was given.',
         clause,
       );
+    }
     if ('nlike' in clause && clause.nlike !== undefined) {
       if (typeof clause.nlike !== 'string') {
         throw new InvalidOperatorValueError('nlike', 'a String', clause.nlike);
@@ -402,12 +428,13 @@ export class OperatorClauseTool extends Service {
    * @returns {boolean|undefined}
    */
   testIlike(clause, value) {
-    if (!clause || typeof clause !== 'object' || Array.isArray(clause))
+    if (!clause || typeof clause !== 'object' || Array.isArray(clause)) {
       throw new InvalidArgumentError(
         'The first argument of OperatorUtils.testIlike ' +
           'should be an Object, but %v was given.',
         clause,
       );
+    }
     if ('ilike' in clause && clause.ilike !== undefined) {
       if (typeof clause.ilike !== 'string') {
         throw new InvalidOperatorValueError('ilike', 'a String', clause.ilike);
@@ -431,12 +458,13 @@ export class OperatorClauseTool extends Service {
    * @returns {boolean|undefined}
    */
   testNilike(clause, value) {
-    if (!clause || typeof clause !== 'object' || Array.isArray(clause))
+    if (!clause || typeof clause !== 'object' || Array.isArray(clause)) {
       throw new InvalidArgumentError(
         'The first argument of OperatorUtils.testNilike ' +
           'should be an Object, but %v was given.',
         clause,
       );
+    }
     if ('nilike' in clause && clause.nilike !== undefined) {
       if (typeof clause.nilike !== 'string') {
         throw new InvalidOperatorValueError(
@@ -472,12 +500,13 @@ export class OperatorClauseTool extends Service {
    * @returns {boolean|undefined}
    */
   testRegexp(clause, value) {
-    if (!clause || typeof clause !== 'object')
+    if (!clause || typeof clause !== 'object') {
       throw new InvalidArgumentError(
         'The first argument of OperatorUtils.testRegexp ' +
           'should be an Object, but %v was given.',
         clause,
       );
+    }
     if ('regexp' in clause && clause.regexp !== undefined) {
       if (
         typeof clause.regexp !== 'string' &&
@@ -490,12 +519,15 @@ export class OperatorClauseTool extends Service {
         );
       }
       const flags = clause.flags || undefined;
-      if (flags && typeof flags !== 'string')
+      if (flags && typeof flags !== 'string') {
         throw new InvalidArgumentError(
           'RegExp flags should be a String, but %v was given.',
           clause.flags,
         );
-      if (!value || typeof value !== 'string') return false;
+      }
+      if (!value || typeof value !== 'string') {
+        return false;
+      }
       const regExp = stringToRegexp(clause.regexp, flags);
       return !!value.match(regExp);
     }

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

@@ -13,22 +13,31 @@ export class OrderClauseTool extends Service {
    * @param {string|string[]|undefined} clause
    */
   sort(entities, clause) {
-    if (clause == null) return;
-    if (Array.isArray(clause) === false) clause = [clause];
-    if (!clause.length) return;
+    if (clause == null) {
+      return;
+    }
+    if (Array.isArray(clause) === false) {
+      clause = [clause];
+    }
+    if (!clause.length) {
+      return;
+    }
     const mapping = [];
     clause.forEach((key, index) => {
-      if (!key || typeof key !== 'string')
+      if (!key || typeof key !== 'string') {
         throw new InvalidArgumentError(
           'The provided option "order" should be a non-empty String ' +
             'or an Array of non-empty String, but %v was given.',
           key,
         );
+      }
       let reverse = 1;
       const matches = key.match(/\s+(A|DE)SC$/i);
       if (matches) {
         key = key.replace(/\s+(A|DE)SC/i, '');
-        if (matches[1].toLowerCase() === 'de') reverse = -1;
+        if (matches[1].toLowerCase() === 'de') {
+          reverse = -1;
+        }
       }
       mapping[index] = {key: key, reverse};
     });
@@ -41,16 +50,23 @@ export class OrderClauseTool extends Service {
    * @param {string|string[]|undefined} clause
    */
   static validateOrderClause(clause) {
-    if (clause == null) return;
-    if (Array.isArray(clause) === false) clause = [clause];
-    if (!clause.length) return;
+    if (clause == null) {
+      return;
+    }
+    if (Array.isArray(clause) === false) {
+      clause = [clause];
+    }
+    if (!clause.length) {
+      return;
+    }
     clause.forEach(field => {
-      if (!field || typeof field !== 'string')
+      if (!field || typeof field !== 'string') {
         throw new InvalidArgumentError(
           'The provided option "order" should be a non-empty String ' +
             'or an Array of non-empty String, but %v was given.',
           field,
         );
+      }
     });
   }
 
@@ -61,16 +77,23 @@ export class OrderClauseTool extends Service {
    * @returns {string[]|undefined}
    */
   static normalizeOrderClause(clause) {
-    if (clause == null) return;
-    if (Array.isArray(clause) === false) clause = [clause];
-    if (!clause.length) return;
+    if (clause == null) {
+      return;
+    }
+    if (Array.isArray(clause) === false) {
+      clause = [clause];
+    }
+    if (!clause.length) {
+      return;
+    }
     clause.forEach(field => {
-      if (!field || typeof field !== 'string')
+      if (!field || typeof field !== 'string') {
         throw new InvalidArgumentError(
           'The provided option "order" should be a non-empty String ' +
             'or an Array of non-empty String, but %v was given.',
           field,
         );
+      }
     });
     return clause;
   }

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

@@ -14,22 +14,25 @@ export class SliceClauseTool extends Service {
    * @returns {object[]}
    */
   slice(entities, skip = undefined, limit = undefined) {
-    if (!Array.isArray(entities))
+    if (!Array.isArray(entities)) {
       throw new InvalidArgumentError(
         'The first argument of SliceClauseTool.slice ' +
           'should be an Array, but %v was given.',
         entities,
       );
-    if (skip != null && typeof skip !== 'number')
+    }
+    if (skip != null && typeof skip !== 'number') {
       throw new InvalidArgumentError(
         'The provided option "skip" should be a Number, but %v was given.',
         skip,
       );
-    if (limit != null && typeof limit !== 'number')
+    }
+    if (limit != null && typeof limit !== 'number') {
       throw new InvalidArgumentError(
         'The provided option "limit" should be a Number, but %v was given.',
         limit,
       );
+    }
     skip = skip || 0;
     limit = limit || entities.length;
     return entities.slice(skip, skip + limit);
@@ -41,12 +44,15 @@ export class SliceClauseTool extends Service {
    * @param {number|undefined} skip
    */
   static validateSkipClause(skip) {
-    if (skip == null) return;
-    if (typeof skip !== 'number')
+    if (skip == null) {
+      return;
+    }
+    if (typeof skip !== 'number') {
       throw new InvalidArgumentError(
         'The provided option "skip" should be a Number, but %v was given.',
         skip,
       );
+    }
   }
 
   /**
@@ -55,11 +61,14 @@ export class SliceClauseTool extends Service {
    * @param {number|undefined} limit
    */
   static validateLimitClause(limit) {
-    if (limit == null) return;
-    if (typeof limit !== 'number')
+    if (limit == null) {
+      return;
+    }
+    if (typeof limit !== 'number') {
       throw new InvalidArgumentError(
         'The provided option "limit" should be a Number, but %v was given.',
         limit,
       );
+    }
   }
 }

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

@@ -39,13 +39,16 @@ export class WhereClauseTool extends Service {
    * @returns {object[]}
    */
   filter(entities, where = undefined) {
-    if (!Array.isArray(entities))
+    if (!Array.isArray(entities)) {
       throw new InvalidArgumentError(
         'The first argument of WhereClauseTool.filter should be ' +
           'an Array of Object, but %v was given.',
         entities,
       );
-    if (where == null) return entities;
+    }
+    if (where == null) {
+      return entities;
+    }
     return entities.filter(this._createFilter(where));
   }
 
@@ -56,37 +59,43 @@ export class WhereClauseTool extends Service {
    * @returns {Function}
    */
   _createFilter(whereClause) {
-    if (typeof whereClause !== 'object' || Array.isArray(whereClause))
+    if (typeof whereClause !== 'object' || Array.isArray(whereClause)) {
       throw new InvalidArgumentError(
         'The provided option "where" should be an Object, but %v was given.',
         whereClause,
       );
+    }
     const keys = Object.keys(whereClause);
     return data => {
-      if (typeof data !== 'object')
+      if (typeof data !== 'object') {
         throw new InvalidArgumentError(
           'The first argument of WhereClauseTool.filter should be ' +
             'an Array of Object, but %v was given.',
           data,
         );
+      }
       return keys.every(key => {
         // AndClause (recursion)
         if (key === 'and' && key in whereClause) {
           const andClause = whereClause[key];
-          if (Array.isArray(andClause))
+          if (Array.isArray(andClause)) {
             return andClause.every(clause => this._createFilter(clause)(data));
+          }
         }
         // OrClause (recursion)
         else if (key === 'or' && key in whereClause) {
           const orClause = whereClause[key];
-          if (Array.isArray(orClause))
+          if (Array.isArray(orClause)) {
             return orClause.some(clause => this._createFilter(clause)(data));
+          }
         }
         // PropertiesClause (properties)
         const value = getValueByPath(data, key);
         const matcher = whereClause[key];
         // Test property value.
-        if (this._test(matcher, value)) return true;
+        if (this._test(matcher, value)) {
+          return true;
+        }
       });
     };
   }
@@ -145,7 +154,9 @@ export class WhereClauseTool extends Service {
       // если один из элементов массива соответствует
       // поиску, то возвращается true
       const isElementMatched = value.some(el => isDeepEqual(el, example));
-      if (isElementMatched) return true;
+      if (isElementMatched) {
+        return true;
+      }
     }
     return isDeepEqual(example, value);
   }
@@ -156,11 +167,14 @@ export class WhereClauseTool extends Service {
    * @param {WhereClause|undefined} clause
    */
   static validateWhereClause(clause) {
-    if (clause == null || typeof clause === 'function') return;
-    if (typeof clause !== 'object' || Array.isArray(clause))
+    if (clause == null || typeof clause === 'function') {
+      return;
+    }
+    if (typeof clause !== 'object' || Array.isArray(clause)) {
       throw new InvalidArgumentError(
         'The provided option "where" should be an Object, but %v was given.',
         clause,
       );
+    }
   }
 }

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

@@ -27,50 +27,59 @@ export class BelongsToResolver extends Service {
     foreignKey = undefined,
     scope = undefined,
   ) {
-    if (!entities || !Array.isArray(entities))
+    if (!entities || !Array.isArray(entities)) {
       throw new InvalidArgumentError(
         'The parameter "entities" of BelongsToResolver.includeTo requires ' +
           'an Array of Object, but %v was given.',
         entities,
       );
-    if (!sourceName || typeof sourceName !== 'string')
+    }
+    if (!sourceName || typeof sourceName !== 'string') {
       throw new InvalidArgumentError(
         'The parameter "sourceName" of BelongsToResolver.includeTo requires ' +
           'a non-empty String, but %v was given.',
         sourceName,
       );
-    if (!targetName || typeof targetName !== 'string')
+    }
+    if (!targetName || typeof targetName !== 'string') {
       throw new InvalidArgumentError(
         'The parameter "targetName" of BelongsToResolver.includeTo requires ' +
           'a non-empty String, but %v was given.',
         targetName,
       );
-    if (!relationName || typeof relationName !== 'string')
+    }
+    if (!relationName || typeof relationName !== 'string') {
       throw new InvalidArgumentError(
         'The parameter "relationName" of BelongsToResolver.includeTo requires ' +
           'a non-empty String, but %v was given.',
         relationName,
       );
-    if (foreignKey && typeof foreignKey !== 'string')
+    }
+    if (foreignKey && typeof foreignKey !== 'string') {
       throw new InvalidArgumentError(
         'The provided parameter "foreignKey" of BelongsToResolver.includeTo ' +
           'should be a String, but %v was given.',
         foreignKey,
       );
-    if (scope && (typeof scope !== 'object' || Array.isArray(scope)))
+    }
+    if (scope && (typeof scope !== 'object' || Array.isArray(scope))) {
       throw new InvalidArgumentError(
         'The provided parameter "scope" of BelongsToResolver.includeTo ' +
           'should be an Object, but %v was given.',
         scope,
       );
-    if (foreignKey == null) foreignKey = `${relationName}Id`;
+    }
+    if (foreignKey == null) {
+      foreignKey = `${relationName}Id`;
+    }
     const targetIds = entities.reduce((acc, entity) => {
-      if (!entity || typeof entity !== 'object' || Array.isArray(entity))
+      if (!entity || typeof entity !== 'object' || Array.isArray(entity)) {
         throw new InvalidArgumentError(
           'The parameter "entities" of BelongsToResolver.includeTo requires ' +
             'an Array of Object, but %v was given.',
           entity,
         );
+      }
       const targetId = entity[foreignKey];
       return targetId != null ? [...acc, targetId] : acc;
     }, []);
@@ -93,7 +102,9 @@ export class BelongsToResolver extends Service {
       const target = targets.find(
         e => e[targetPkPropName] === entity[foreignKey],
       );
-      if (target) entity[relationName] = target;
+      if (target) {
+        entity[relationName] = target;
+      }
     });
   }
 
@@ -116,42 +127,48 @@ export class BelongsToResolver extends Service {
     discriminator = undefined,
     scope = undefined,
   ) {
-    if (!entities || !Array.isArray(entities))
+    if (!entities || !Array.isArray(entities)) {
       throw new InvalidArgumentError(
         'The parameter "entities" of BelongsToResolver.includePolymorphicTo ' +
           'requires an Array of Object, but %v was given.',
         entities,
       );
-    if (!sourceName || typeof sourceName !== 'string')
+    }
+    if (!sourceName || typeof sourceName !== 'string') {
       throw new InvalidArgumentError(
         'The parameter "sourceName" of BelongsToResolver.includePolymorphicTo ' +
           'requires a non-empty String, but %v was given.',
         sourceName,
       );
-    if (!relationName || typeof relationName !== 'string')
+    }
+    if (!relationName || typeof relationName !== 'string') {
       throw new InvalidArgumentError(
         'The parameter "relationName" of BelongsToResolver.includePolymorphicTo ' +
           'requires a non-empty String, but %v was given.',
         relationName,
       );
-    if (foreignKey && typeof foreignKey !== 'string')
+    }
+    if (foreignKey && typeof foreignKey !== 'string') {
       throw new InvalidArgumentError(
         'The provided parameter "foreignKey" of BelongsToResolver.includePolymorphicTo ' +
           'should be a String, but %v was given.',
         foreignKey,
       );
-    if (discriminator && typeof discriminator !== 'string')
+    }
+    if (discriminator && typeof discriminator !== 'string') {
       throw new InvalidArgumentError(
         'The provided parameter "discriminator" of BelongsToResolver.includePolymorphicTo ' +
           'should be a String, but %v was given.',
         discriminator,
       );
-    if (scope && (typeof scope !== 'object' || Array.isArray(scope)))
+    }
+    if (scope && (typeof scope !== 'object' || Array.isArray(scope))) {
       throw new InvalidArgumentError(
         'The provided parameter "scope" of BelongsToResolver.includePolymorphicTo ' +
           'should be an Object, but %v was given.',
         scope,
       );
+    }
     if (foreignKey == null) {
       const singularRelationName = singularize(relationName);
       foreignKey = `${singularRelationName}Id`;
@@ -162,19 +179,24 @@ export class BelongsToResolver extends Service {
     }
     const targetIdsByTargetName = {};
     entities.forEach(entity => {
-      if (!entity || typeof entity !== 'object' || Array.isArray(entity))
+      if (!entity || typeof entity !== 'object' || Array.isArray(entity)) {
         throw new InvalidArgumentError(
           'The parameter "entities" of BelongsToResolver.includePolymorphicTo requires ' +
             'an Array of Object, but %v was given.',
           entity,
         );
+      }
       const targetId = entity[foreignKey];
       const targetName = entity[discriminator];
-      if (targetId == null || targetName == null) return;
-      if (targetIdsByTargetName[targetName] == null)
+      if (targetId == null || targetName == null) {
+        return;
+      }
+      if (targetIdsByTargetName[targetName] == null) {
         targetIdsByTargetName[targetName] = [];
-      if (!targetIdsByTargetName[targetName].includes(targetId))
+      }
+      if (!targetIdsByTargetName[targetName].includes(targetId)) {
         targetIdsByTargetName[targetName].push(targetId);
+      }
     });
     const promises = [];
     const targetNames = Object.keys(targetIdsByTargetName);
@@ -235,7 +257,9 @@ export class BelongsToResolver extends Service {
           targetName,
         );
       const target = targetEntities.find(e => e[targetPkPropName] === targetId);
-      if (target) entity[relationName] = target;
+      if (target) {
+        entity[relationName] = target;
+      }
     });
   }
 }