@e22m4u/js-repository 0.6.1 → 0.6.3

package/dist/cjs/index.cjs

@@ -218,64 +218,6 @@ var init_is_pure_object = __esm({
   }
 });
 
-// src/utils/string-to-regexp.js
-function stringToRegexp(pattern, flags = void 0) {
-  if (pattern instanceof RegExp) {
-    return new RegExp(pattern, flags);
-  }
-  let regex = "";
-  for (let i = 0, n = pattern.length; i < n; i++) {
-    const char = pattern.charAt(i);
-    if (char === "%") {
-      regex += ".*";
-    } else {
-      regex += char;
-    }
-  }
-  return new RegExp(regex, flags);
-}
-var init_string_to_regexp = __esm({
-  "src/utils/string-to-regexp.js"() {
-    "use strict";
-    __name(stringToRegexp, "stringToRegexp");
-  }
-});
-
-// src/utils/get-value-by-path.js
-function getValueByPath(obj, path, orElse = void 0) {
-  if (!obj || typeof obj !== "object") return orElse;
-  if (!path || typeof path !== "string") return orElse;
-  const keys = path.split(".");
-  let value = obj;
-  for (const key of keys) {
-    if (typeof value === "object" && value !== null && key in value) {
-      value = value[key];
-    } else {
-      value = orElse;
-      break;
-    }
-  }
-  return value;
-}
-var init_get_value_by_path = __esm({
-  "src/utils/get-value-by-path.js"() {
-    "use strict";
-    __name(getValueByPath, "getValueByPath");
-  }
-});
-
-// src/utils/transform-promise.js
-function transformPromise(valueOrPromise, transformer) {
-  return isPromise(valueOrPromise) ? valueOrPromise.then(transformer) : transformer(valueOrPromise);
-}
-var init_transform_promise = __esm({
-  "src/utils/transform-promise.js"() {
-    "use strict";
-    init_is_promise();
-    __name(transformPromise, "transformPromise");
-  }
-});
-
 // src/errors/not-implemented-error.js
 var import_js_format, _NotImplementedError, NotImplementedError;
 var init_not_implemented_error = __esm({
@@ -342,6 +284,96 @@ var init_errors = __esm({
   }
 });
 
+// src/utils/like-to-regexp.js
+function likeToRegexp(pattern, isCaseInsensitive = false) {
+  if (typeof pattern !== "string") {
+    throw new InvalidArgumentError(
+      "The first argument of `likeToRegexp` should be a String, but %v was given.",
+      pattern
+    );
+  }
+  const regexSpecials = "-[]{}()*+?.\\^$|";
+  let regexString = "";
+  let isEscaping = false;
+  for (const char of pattern) {
+    if (isEscaping) {
+      regexString += regexSpecials.includes(char) ? `\\${char}` : char;
+      isEscaping = false;
+    } else if (char === "\\") {
+      isEscaping = true;
+    } else if (char === "%") {
+      regexString += ".*";
+    } else if (char === "_") {
+      regexString += ".";
+    } else if (regexSpecials.includes(char)) {
+      regexString += `\\${char}`;
+    } else {
+      regexString += char;
+    }
+  }
+  if (isEscaping) {
+    regexString += "\\\\";
+  }
+  const flags = isCaseInsensitive ? "i" : "";
+  return new RegExp(`^${regexString}$`, flags);
+}
+var init_like_to_regexp = __esm({
+  "src/utils/like-to-regexp.js"() {
+    "use strict";
+    init_errors();
+    __name(likeToRegexp, "likeToRegexp");
+  }
+});
+
+// src/utils/string-to-regexp.js
+function stringToRegexp(pattern, flags = void 0) {
+  if (pattern instanceof RegExp) {
+    return new RegExp(pattern, flags);
+  }
+  return new RegExp(pattern, flags);
+}
+var init_string_to_regexp = __esm({
+  "src/utils/string-to-regexp.js"() {
+    "use strict";
+    __name(stringToRegexp, "stringToRegexp");
+  }
+});
+
+// src/utils/get-value-by-path.js
+function getValueByPath(obj, path, orElse = void 0) {
+  if (!obj || typeof obj !== "object") return orElse;
+  if (!path || typeof path !== "string") return orElse;
+  const keys = path.split(".");
+  let value = obj;
+  for (const key of keys) {
+    if (typeof value === "object" && value !== null && key in value) {
+      value = value[key];
+    } else {
+      value = orElse;
+      break;
+    }
+  }
+  return value;
+}
+var init_get_value_by_path = __esm({
+  "src/utils/get-value-by-path.js"() {
+    "use strict";
+    __name(getValueByPath, "getValueByPath");
+  }
+});
+
+// src/utils/transform-promise.js
+function transformPromise(valueOrPromise, transformer) {
+  return isPromise(valueOrPromise) ? valueOrPromise.then(transformer) : transformer(valueOrPromise);
+}
+var init_transform_promise = __esm({
+  "src/utils/transform-promise.js"() {
+    "use strict";
+    init_is_promise();
+    __name(transformPromise, "transformPromise");
+  }
+});
+
 // src/utils/select-object-keys.js
 function selectObjectKeys(obj, keys) {
   if (!obj || typeof obj !== "object" || Array.isArray(obj))
@@ -466,6 +498,7 @@ var init_utils = __esm({
     init_is_deep_equal();
     init_get_ctor_name();
     init_is_pure_object();
+    init_like_to_regexp();
     init_string_to_regexp();
     init_get_value_by_path();
     init_transform_promise();
@@ -646,41 +679,43 @@ var init_operator_clause_tool = __esm({
     import_js_service3 = require("@e22m4u/js-service");
     init_utils();
     init_errors();
-    init_errors();
     _OperatorClauseTool = class _OperatorClauseTool extends import_js_service3.Service {
       /**
        * Compare.
        *
        * @param {*} val1 The 1st value
        * @param {*} val2 The 2nd value
+       * @param {*} noTypeConversion
        * @returns {number} 0: =, positive: >, negative <
        */
-      compare(val1, val2) {
+      compare(val1, val2, noTypeConversion = false) {
+        if (val1 === val2) {
+          return 0;
+        }
         if (val1 == null || val2 == null) {
           return val1 == val2 ? 0 : NaN;
         }
-        if (typeof val1 === "number") {
-          if (typeof val2 === "number" || typeof val2 === "string" || typeof val2 === "boolean") {
-            if (val1 === val2) return 0;
-            return val1 - Number(val2);
-          }
-          return NaN;
+        const type1 = typeof val1;
+        const type2 = typeof val2;
+        if (type1 === "object" || type2 === "object") {
+          return isDeepEqual(val1, val2) ? 0 : NaN;
         }
-        if (typeof val1 === "string") {
-          const isDigits = /^\d+$/.test(val1);
-          if (isDigits) return this.compare(Number(val1), val2);
-          try {
-            if (val1 > val2) return 1;
-            if (val1 < val2) return -1;
-            if (val1 == val2) return 0;
-          } catch (e) {
+        if ((type1 === "number" || type1 === "string" || type1 === "boolean") && (type2 === "number" || type2 === "string" || type2 === "boolean")) {
+          if (noTypeConversion && type1 !== type2) {
+            return NaN;
+          }
+          const num1 = Number(val1);
+          const num2 = Number(val2);
+          if (!isNaN(num1) && !isNaN(num2)) {
+            return num1 - num2;
           }
-          return NaN;
         }
-        if (typeof val1 === "boolean") {
-          return Number(val1) - Number(val2);
+        if (type1 === "string" && type2 === "string") {
+          if (val1 > val2) return 1;
+          if (val1 < val2) return -1;
+          return 0;
         }
-        return val1 === val2 ? 0 : NaN;
+        return NaN;
       }
       /**
        * Test all operators.
@@ -695,28 +730,37 @@ var init_operator_clause_tool = __esm({
             "The first argument of OperatorUtils.testAll should be an Object, but %v was given.",
             clause
           );
-        const eqNeqTest = this.testEqNeq(clause, value);
-        if (eqNeqTest !== void 0) return eqNeqTest;
-        const gtLtTest = this.testGtLt(clause, value);
-        if (gtLtTest !== void 0) return gtLtTest;
-        const incTest = this.testInq(clause, value);
-        if (incTest !== void 0) return incTest;
-        const ninTest = this.testNin(clause, value);
-        if (ninTest !== void 0) return ninTest;
-        const betweenTest = this.testBetween(clause, value);
-        if (betweenTest !== void 0) return betweenTest;
-        const existsTest = this.testExists(clause, value);
-        if (existsTest !== void 0) return existsTest;
-        const likeTest = this.testLike(clause, value);
-        if (likeTest !== void 0) return likeTest;
-        const nlikeTest = this.testNlike(clause, value);
-        if (nlikeTest !== void 0) return nlikeTest;
-        const ilikeTest = this.testIlike(clause, value);
-        if (ilikeTest !== void 0) return ilikeTest;
-        const nilikeTest = this.testNilike(clause, value);
-        if (nilikeTest !== void 0) return nilikeTest;
-        const regExpTest = this.testRegexp(clause, value);
-        if (regExpTest !== void 0) return regExpTest;
+        const operatorMap = {
+          eq: this.testEqNeq,
+          neq: this.testEqNeq,
+          gt: this.testGtLt,
+          gte: this.testGtLt,
+          lt: this.testGtLt,
+          lte: this.testGtLt,
+          inq: this.testInq,
+          nin: this.testNin,
+          between: this.testBetween,
+          exists: this.testExists,
+          like: this.testLike,
+          nlike: this.testNlike,
+          ilike: this.testIlike,
+          nilike: this.testNilike,
+          regexp: this.testRegexp
+        };
+        const clauseKeys = Object.keys(clause);
+        const knownOperators = clauseKeys.filter((key) => operatorMap[key]);
+        if (knownOperators.length === 0) {
+          return void 0;
+        }
+        return knownOperators.every((op) => {
+          const singleOpClause = { [op]: clause[op] };
+          if (op === "regexp" && "flags" in clause) {
+            singleOpClause.flags = clause.flags;
+          }
+          const testFn = operatorMap[op];
+          const result = testFn.call(this, singleOpClause, value);
+          return result;
+        });
       }
       /**
        * Test eq/neq operator.
@@ -745,8 +789,8 @@ var init_operator_clause_tool = __esm({
             "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) === 0;
-        if ("neq" in clause) return this.compare(clause.neq, value) !== 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;
       }
       /**
        * Test lt/gt/lte/gte operator.
@@ -823,7 +867,9 @@ var init_operator_clause_tool = __esm({
             );
           }
           for (let i = 0; i < clause.inq.length; i++) {
-            if (clause.inq[i] == value) return true;
+            if (this.compare(clause.inq[i], value, true) === 0) {
+              return true;
+            }
           }
           return false;
         }
@@ -856,10 +902,9 @@ var init_operator_clause_tool = __esm({
               clause.nin
             );
           }
-          for (let i = 0; i < clause.nin.length; i++) {
-            if (clause.nin[i] == value) return false;
-          }
-          return true;
+          return clause.nin.every((element) => {
+            return this.compare(element, value, true) !== 0;
+          });
         }
       }
       /**
@@ -939,15 +984,15 @@ var init_operator_clause_tool = __esm({
        * @returns {boolean|undefined}
        */
       testLike(clause, value) {
-        if (!clause || typeof clause !== "object")
+        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 !== void 0) {
-          if (typeof clause.like !== "string" && !(clause.like instanceof RegExp))
+          if (typeof clause.like !== "string")
             throw new InvalidOperatorValueError("like", "a String", clause.like);
-          return stringToRegexp(clause.like).test(value);
+          return likeToRegexp(clause.like).test(value);
         }
       }
       /**
@@ -965,16 +1010,16 @@ var init_operator_clause_tool = __esm({
        * @returns {boolean|undefined}
        */
       testNlike(clause, value) {
-        if (!clause || typeof clause !== "object")
+        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 !== void 0) {
-          if (typeof clause.nlike !== "string" && !(clause.nlike instanceof RegExp)) {
+          if (typeof clause.nlike !== "string") {
             throw new InvalidOperatorValueError("nlike", "a String", clause.nlike);
           }
-          return !stringToRegexp(clause.nlike).test(value);
+          return !likeToRegexp(clause.nlike).test(value);
         }
       }
       /**
@@ -992,16 +1037,16 @@ var init_operator_clause_tool = __esm({
        * @returns {boolean|undefined}
        */
       testIlike(clause, value) {
-        if (!clause || typeof clause !== "object")
+        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 !== void 0) {
-          if (typeof clause.ilike !== "string" && !(clause.ilike instanceof RegExp)) {
+          if (typeof clause.ilike !== "string") {
             throw new InvalidOperatorValueError("ilike", "a String", clause.ilike);
           }
-          return stringToRegexp(clause.ilike, "i").test(value);
+          return likeToRegexp(clause.ilike, true).test(value);
         }
       }
       /**
@@ -1019,20 +1064,20 @@ var init_operator_clause_tool = __esm({
        * @returns {boolean|undefined}
        */
       testNilike(clause, value) {
-        if (!clause || typeof clause !== "object")
+        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 !== void 0) {
-          if (typeof clause.nilike !== "string" && !(clause.nilike instanceof RegExp)) {
+          if (typeof clause.nilike !== "string") {
             throw new InvalidOperatorValueError(
               "nilike",
               "a String",
               clause.nilike
             );
           }
-          return !stringToRegexp(clause.nilike, "i").test(value);
+          return !likeToRegexp(clause.nilike, true).test(value);
         }
       }
       /**
@@ -1094,9 +1139,9 @@ var init_where_clause_tool = __esm({
   "src/filter/where-clause-tool.js"() {
     "use strict";
     import_js_service4 = require("@e22m4u/js-service");
-    init_utils();
     init_errors();
     init_operator_clause_tool();
+    init_utils();
     _WhereClauseTool = class _WhereClauseTool extends import_js_service4.Service {
       /**
        * Filter by where clause.
@@ -1167,21 +1212,6 @@ var init_where_clause_tool = __esm({
             }
             const value = getValueByPath(data, key);
             const matcher = whereClause[key];
-            if (Array.isArray(value)) {
-              if (typeof matcher === "object" && matcher !== null && "neq" in matcher && matcher.neq !== void 0) {
-                if (value.length === 0) return true;
-                return value.every((el, index) => {
-                  const where = {};
-                  where[index] = matcher;
-                  return this._createFilter(where)({ ...value });
-                });
-              }
-              return value.some((el, index) => {
-                const where = {};
-                where[index] = matcher;
-                return this._createFilter(where)({ ...value });
-              });
-            }
             if (this._test(matcher, value)) return true;
           });
         };
@@ -1194,6 +1224,9 @@ var init_where_clause_tool = __esm({
        * @returns {boolean}
        */
       _test(example, value) {
+        if (example === value) {
+          return true;
+        }
         if (example === null) {
           return value === null;
         }
@@ -1201,17 +1234,31 @@ var init_where_clause_tool = __esm({
           return value === void 0;
         }
         if (example instanceof RegExp) {
-          if (typeof value === "string") return !!value.match(example);
+          if (typeof value === "string") {
+            return example.test(value);
+          }
+          if (Array.isArray(value)) {
+            return value.some((el) => typeof el === "string" && example.test(el));
+          }
           return false;
         }
-        if (typeof example === "object") {
+        if (isPureObject(example)) {
           const operatorsTest = this.getService(OperatorClauseTool).testAll(
             example,
             value
           );
-          if (operatorsTest !== void 0) return operatorsTest;
+          if (operatorsTest !== void 0) {
+            if ("neq" in example && Array.isArray(value)) {
+              return !value.some((el) => isDeepEqual(el, example.neq));
+            }
+            return operatorsTest;
+          }
+        }
+        if (Array.isArray(value)) {
+          const isElementMatched = value.some((el) => isDeepEqual(el, example));
+          if (isElementMatched) return true;
         }
-        return example == value;
+        return isDeepEqual(example, value);
       }
       /**
        * Validate where clause.
@@ -6438,6 +6485,7 @@ __export(index_exports, {
   isDeepEqual: () => isDeepEqual,
   isPromise: () => isPromise,
   isPureObject: () => isPureObject,
+  likeToRegexp: () => likeToRegexp,
   modelNameToModelKey: () => modelNameToModelKey,
   selectObjectKeys: () => selectObjectKeys,
   singularize: () => singularize,
@@ -6543,6 +6591,7 @@ init_repository2();
   isDeepEqual,
   isPromise,
   isPureObject,
+  likeToRegexp,
   modelNameToModelKey,
   selectObjectKeys,
   singularize,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@e22m4u/js-repository",
-  "version": "0.6.1",
+  "version": "0.6.3",
   "description": "Реализация репозитория для работы с базами данных в Node.js",
   "author": "Mikhail Evstropov <e22m4u@yandex.ru>",
   "license": "MIT",
@@ -58,7 +58,7 @@
     "eslint": "~9.38.0",
     "eslint-config-prettier": "~10.1.8",
     "eslint-plugin-chai-expect": "~3.1.0",
-    "eslint-plugin-jsdoc": "~61.1.5",
+    "eslint-plugin-jsdoc": "~61.1.7",
     "eslint-plugin-mocha": "~11.2.0",
     "husky": "~9.1.7",
     "mocha": "~11.7.4",

package/src/adapter/builtin/memory-adapter.spec.js

@@ -3409,7 +3409,7 @@ describe('MemoryAdapter', function () {
       await adapter.create('model', input2);
       await adapter.create('model', input3);
       const filter1 = {where: {foo: 10}};
-      const filter2 = {where: {foo: {gte: 15}, baz: {like: 'bc'}}};
+      const filter2 = {where: {foo: {gte: 15}, baz: {like: '%bc'}}};
       const filter3 = {where: {bar: true}};
       const result1 = await adapter.find('model', filter1);
       const result2 = await adapter.find('model', filter2);
@@ -3466,7 +3466,7 @@ describe('MemoryAdapter', function () {
         baz: tableInput2.bazCol,
       };
       const filter1 = {where: {foo: 10}};
-      const filter2 = {where: {foo: {gte: 15}, baz: {like: 'bc'}}};
+      const filter2 = {where: {foo: {gte: 15}, baz: {like: '%bc'}}};
       const filter3 = {where: {bar: true}};
       const result1 = await adapter.find('model', filter1);
       const result2 = await adapter.find('model', filter2);

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

@@ -113,10 +113,10 @@ export declare type OperatorClause = {
   nin?: PrimitiveValue[];
   between?: readonly [string | number, string | number];
   exists?: boolean;
-  like?: string | RegExp;
-  nlike?: string | RegExp;
-  ilike?: string | RegExp;
-  nilike?: string | RegExp;
+  like?: string;
+  nlike?: string;
+  ilike?: string;
+  nilike?: string;
   regexp?: string | RegExp;
   flags?: string;
 };

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

@@ -9,8 +9,9 @@ export declare class OperatorClauseTool extends Service {
    *
    * @param val1
    * @param val2
+   * @param noTypeConversion
    */
-  compare(val1: unknown, val2: unknown): number;
+  compare(val1: unknown, val2: unknown, noTypeConversion?: boolean): number;
 
   /**
    * Test all operators.