@e22m4u/js-repository 0.0.33 → 0.0.35

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

@@ -58,7 +58,7 @@ export class OperatorClauseTool extends Service {
   testAll(clause, value) {
     if (!clause || typeof clause !== 'object' || Array.isArray(clause))
       throw new InvalidArgumentError(
-        'A first argument of OperatorUtils.testAll ' +
+        'The first argument of OperatorUtils.testAll ' +
           'should be an Object, but %v given.',
         clause,
       );
@@ -136,7 +136,7 @@ export class OperatorClauseTool extends Service {
   testEqNeq(clause, value) {
     if (!clause || typeof clause !== 'object')
       throw new InvalidArgumentError(
-        'A first argument of OperatorUtils.testEqNeq ' +
+        'The first argument of OperatorUtils.testEqNeq ' +
           'should be an Object, but %v given.',
         clause,
       );
@@ -182,7 +182,7 @@ export class OperatorClauseTool extends Service {
   testGtLt(clause, value) {
     if (!clause || typeof clause !== 'object')
       throw new InvalidArgumentError(
-        'A first argument of OperatorUtils.testGtLt ' +
+        'The first argument of OperatorUtils.testGtLt ' +
           'should be an Object, but %v given.',
         clause,
       );
@@ -209,7 +209,7 @@ export class OperatorClauseTool extends Service {
   testInq(clause, value) {
     if (!clause || typeof clause !== 'object')
       throw new InvalidArgumentError(
-        'A first argument of OperatorUtils.testInq ' +
+        'The first argument of OperatorUtils.testInq ' +
           'should be an Object, but %v given.',
         clause,
       );
@@ -245,7 +245,7 @@ export class OperatorClauseTool extends Service {
   testNin(clause, value) {
     if (!clause || typeof clause !== 'object')
       throw new InvalidArgumentError(
-        'A first argument of OperatorUtils.testNin ' +
+        'The first argument of OperatorUtils.testNin ' +
           'should be an Object, but %v given.',
         clause,
       );
@@ -281,7 +281,7 @@ export class OperatorClauseTool extends Service {
   testBetween(clause, value) {
     if (!clause || typeof clause !== 'object')
       throw new InvalidArgumentError(
-        'A first argument of OperatorUtils.testBetween ' +
+        'The first argument of OperatorUtils.testBetween ' +
           'should be an Object, but %v given.',
         clause,
       );
@@ -317,7 +317,7 @@ export class OperatorClauseTool extends Service {
   testExists(clause, value) {
     if (!clause || typeof clause !== 'object')
       throw new InvalidArgumentError(
-        'A first argument of OperatorUtils.testExists ' +
+        'The first argument of OperatorUtils.testExists ' +
           'should be an Object, but %v given.',
         clause,
       );
@@ -350,7 +350,7 @@ export class OperatorClauseTool extends Service {
   testLike(clause, value) {
     if (!clause || typeof clause !== 'object')
       throw new InvalidArgumentError(
-        'A first argument of OperatorUtils.testLike ' +
+        'The first argument of OperatorUtils.testLike ' +
           'should be an Object, but %v given.',
         clause,
       );
@@ -378,7 +378,7 @@ export class OperatorClauseTool extends Service {
   testNlike(clause, value) {
     if (!clause || typeof clause !== 'object')
       throw new InvalidArgumentError(
-        'A first argument of OperatorUtils.testNlike ' +
+        'The first argument of OperatorUtils.testNlike ' +
           'should be an Object, but %v given.',
         clause,
       );
@@ -410,7 +410,7 @@ export class OperatorClauseTool extends Service {
   testIlike(clause, value) {
     if (!clause || typeof clause !== 'object')
       throw new InvalidArgumentError(
-        'A first argument of OperatorUtils.testIlike ' +
+        'The first argument of OperatorUtils.testIlike ' +
           'should be an Object, but %v given.',
         clause,
       );
@@ -442,7 +442,7 @@ export class OperatorClauseTool extends Service {
   testNilike(clause, value) {
     if (!clause || typeof clause !== 'object')
       throw new InvalidArgumentError(
-        'A first argument of OperatorUtils.testNilike ' +
+        'The first argument of OperatorUtils.testNilike ' +
           'should be an Object, but %v given.',
         clause,
       );
@@ -486,7 +486,7 @@ export class OperatorClauseTool extends Service {
   testRegexp(clause, value) {
     if (!clause || typeof clause !== 'object')
       throw new InvalidArgumentError(
-        'A first argument of OperatorUtils.testRegexp ' +
+        'The first argument of OperatorUtils.testRegexp ' +
           'should be an Object, but %v given.',
         clause,
       );
@@ -504,7 +504,7 @@ export class OperatorClauseTool extends Service {
       const flags = clause.flags || undefined;
       if (flags && typeof flags !== 'string')
         throw new InvalidArgumentError(
-          'RegExp flags must be a String, but %v given.',
+          'RegExp flags should be a String, but %v given.',
           clause.flags,
         );
       if (!value || typeof value !== 'string') return false;

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

@@ -115,7 +115,7 @@ describe('OperatorClauseTool', function () {
     it('throws an error if a first argument is not an object', function () {
       const throwable = () => S.testAll(10);
       expect(throwable).to.throw(
-        'A first argument of OperatorUtils.testAll ' +
+        'The first argument of OperatorUtils.testAll ' +
           'should be an Object, but 10 given.',
       );
     });
@@ -130,7 +130,7 @@ describe('OperatorClauseTool', function () {
     it('throws an error if a first argument is not an object', function () {
       const throwable = () => S.testEqNeq(10);
       expect(throwable).to.throw(
-        'A first argument of OperatorUtils.testEqNeq ' +
+        'The first argument of OperatorUtils.testEqNeq ' +
           'should be an Object, but 10 given.',
       );
     });
@@ -215,7 +215,7 @@ describe('OperatorClauseTool', function () {
     it('throws an error if a first argument is not an object', function () {
       const throwable = () => S.testGtLt(10);
       expect(throwable).to.throw(
-        'A first argument of OperatorUtils.testGtLt ' +
+        'The first argument of OperatorUtils.testGtLt ' +
           'should be an Object, but 10 given.',
       );
     });
@@ -390,7 +390,7 @@ describe('OperatorClauseTool', function () {
     it('throws an error if a first argument is not an object', function () {
       const throwable = () => S.testInq(10);
       expect(throwable).to.throw(
-        'A first argument of OperatorUtils.testInq ' +
+        'The first argument of OperatorUtils.testInq ' +
           'should be an Object, but 10 given.',
       );
     });
@@ -445,7 +445,7 @@ describe('OperatorClauseTool', function () {
     it('throws an error if a first argument is not an object', function () {
       const throwable = () => S.testNin(10);
       expect(throwable).to.throw(
-        'A first argument of OperatorUtils.testNin ' +
+        'The first argument of OperatorUtils.testNin ' +
           'should be an Object, but 10 given.',
       );
     });
@@ -514,7 +514,7 @@ describe('OperatorClauseTool', function () {
     it('throws an error if a first argument is not an object', function () {
       const throwable = () => S.testBetween(10);
       expect(throwable).to.throw(
-        'A first argument of OperatorUtils.testBetween ' +
+        'The first argument of OperatorUtils.testBetween ' +
           'should be an Object, but 10 given.',
       );
     });
@@ -571,7 +571,7 @@ describe('OperatorClauseTool', function () {
     it('throws an error if a first argument is not an object', function () {
       const throwable = () => S.testExists(10);
       expect(throwable).to.throw(
-        'A first argument of OperatorUtils.testExists ' +
+        'The first argument of OperatorUtils.testExists ' +
           'should be an Object, but 10 given.',
       );
     });
@@ -694,7 +694,7 @@ describe('OperatorClauseTool', function () {
     it('throws an error if a first argument is not an object', function () {
       const throwable = () => S.testLike(10);
       expect(throwable).to.throw(
-        'A first argument of OperatorUtils.testLike ' +
+        'The first argument of OperatorUtils.testLike ' +
           'should be an Object, but 10 given.',
       );
     });
@@ -773,7 +773,7 @@ describe('OperatorClauseTool', function () {
     it('throws an error if a first argument is not an object', function () {
       const throwable = () => S.testNlike(10);
       expect(throwable).to.throw(
-        'A first argument of OperatorUtils.testNlike ' +
+        'The first argument of OperatorUtils.testNlike ' +
           'should be an Object, but 10 given.',
       );
     });
@@ -852,7 +852,7 @@ describe('OperatorClauseTool', function () {
     it('throws an error if a first argument is not an object', function () {
       const throwable = () => S.testIlike(10);
       expect(throwable).to.throw(
-        'A first argument of OperatorUtils.testIlike ' +
+        'The first argument of OperatorUtils.testIlike ' +
           'should be an Object, but 10 given.',
       );
     });
@@ -931,7 +931,7 @@ describe('OperatorClauseTool', function () {
     it('throws an error if a first argument is not an object', function () {
       const throwable = () => S.testNilike(10);
       expect(throwable).to.throw(
-        'A first argument of OperatorUtils.testNilike ' +
+        'The first argument of OperatorUtils.testNilike ' +
           'should be an Object, but 10 given.',
       );
     });
@@ -1022,7 +1022,7 @@ describe('OperatorClauseTool', function () {
     it('throws an error if a first argument is not an object', function () {
       const throwable = () => S.testRegexp(10);
       expect(throwable).to.throw(
-        'A first argument of OperatorUtils.testRegexp ' +
+        'The first argument of OperatorUtils.testRegexp ' +
           'should be an Object, but 10 given.',
       );
     });
@@ -1049,7 +1049,7 @@ describe('OperatorClauseTool', function () {
       const throwable = v => () =>
         S.testRegexp({regexp: 'Val.+', flags: v}, 'val');
       const error = v =>
-        format('RegExp flags must be a String, but %s given.', v);
+        format('RegExp flags should be a String, but %s given.', v);
       expect(throwable(10)).to.throw(error('10'));
       expect(throwable(true)).to.throw(error('true'));
       expect(throwable([])).to.throw(error('Array'));

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

@@ -13,14 +13,15 @@ export class OrderClauseTool extends Service {
    * @param {string|string[]|undefined} clause
    */
   sort(entities, clause) {
-    if (!clause) return;
-    if (!Array.isArray(clause)) clause = [clause];
+    if (clause == null) return;
+    if (Array.isArray(clause) === false) clause = [clause];
+    if (!clause.length) return;
     const mapping = [];
     clause.forEach((key, index) => {
-      if (typeof key !== 'string')
+      if (!key || typeof key !== 'string')
         throw new InvalidArgumentError(
-          'The provided option "order" should be a String ' +
-            'or an Array of String, but %v given.',
+          'The provided option "order" should be a non-empty String ' +
+            'or an Array of non-empty String, but %v given.',
           key,
         );
       let reverse = 1;
@@ -40,14 +41,15 @@ export class OrderClauseTool extends Service {
    * @param {string|string[]|undefined} clause
    */
   static validateOrderClause(clause) {
-    if (!clause) return;
-    const tempClause = Array.isArray(clause) ? clause : [clause];
-    tempClause.forEach(key => {
-      if (!key || typeof key !== 'string')
+    if (clause == null) return;
+    if (Array.isArray(clause) === false) clause = [clause];
+    if (!clause.length) return;
+    clause.forEach(field => {
+      if (!field || typeof field !== 'string')
         throw new InvalidArgumentError(
           'The provided option "order" 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,
         );
     });
   }
@@ -59,14 +61,15 @@ export class OrderClauseTool extends Service {
    * @returns {string[]|undefined}
    */
   static normalizeOrderClause(clause) {
-    if (!clause) return;
-    clause = Array.isArray(clause) ? clause : [clause];
-    clause.forEach(key => {
-      if (!key || typeof key !== 'string')
+    if (clause == null) return;
+    if (Array.isArray(clause) === false) clause = [clause];
+    if (!clause.length) return;
+    clause.forEach(field => {
+      if (!field || typeof field !== 'string')
         throw new InvalidArgumentError(
           'The provided option "order" 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;