@ls-stack/utils 3.44.1 → 3.45.0

package/dist/partialEqual.cjs

@@ -125,6 +125,9 @@ var match = {
   equal: (value) => createComparison(["deepEqual", value]),
   partialEqual: (value) => createComparison(["partialEqual", value]),
   custom: (isEqual) => createComparison(["custom", isEqual]),
+  keyNotBePresent: createComparison(["keyNotBePresent", null]),
+  any: (...comparisons) => createComparison(["any", comparisons.map((c) => c["~sc"])]),
+  all: (...comparisons) => createComparison(["all", comparisons.map((c) => c["~sc"])]),
   not: {
     hasType: {
       string: createComparison(["not", ["hasType", "string"]]),
@@ -153,7 +156,9 @@ var match = {
     },
     equal: (value) => createComparison(["not", ["deepEqual", value]]),
     partialEqual: (value) => createComparison(["not", ["partialEqual", value]]),
-    custom: (value) => createComparison(["not", ["custom", value]])
+    custom: (value) => createComparison(["not", ["custom", value]]),
+    any: (...comparisons) => createComparison(["not", ["any", comparisons.map((c) => c["~sc"])]]),
+    all: (...comparisons) => createComparison(["not", ["all", comparisons.map((c) => c["~sc"])]])
   }
 };
 function find2(iter, tar) {
@@ -161,6 +166,24 @@ function find2(iter, tar) {
     if (partialEqual(key, tar)) return key;
   }
 }
+function executeComparisonWithKeyContext(target, comp, keyExists) {
+  const [type, value] = comp;
+  if (type === "keyNotBePresent") {
+    return !keyExists;
+  }
+  if (type === "any") {
+    for (const childComp of value) {
+      if (executeComparisonWithKeyContext(target, childComp, keyExists)) {
+        return true;
+      }
+    }
+    return false;
+  }
+  if (type === "not") {
+    return !executeComparisonWithKeyContext(target, value, keyExists);
+  }
+  return executeComparison(target, comp);
+}
 function executeComparison(target, comparison) {
   const [type, value] = comparison;
   switch (type) {
@@ -215,6 +238,22 @@ function executeComparison(target, comparison) {
       return partialEqual(target, value);
     case "custom":
       return value(target);
+    case "keyNotBePresent":
+      return false;
+    case "any":
+      for (const comp of value) {
+        if (executeComparison(target, comp)) {
+          return true;
+        }
+      }
+      return false;
+    case "all":
+      for (const comp of value) {
+        if (!executeComparison(target, comp)) {
+          return false;
+        }
+      }
+      return true;
     case "not":
       return !executeComparison(target, value);
     default:
@@ -271,8 +310,21 @@ function partialEqual(target, sub) {
     if (!ctor || typeof sub === "object") {
       for (const key in sub) {
         if (has2.call(sub, key)) {
-          if (!has2.call(target, key) || !partialEqual(target[key], sub[key])) {
-            return false;
+          const subValue = sub[key];
+          if (subValue && typeof subValue === "object" && "~sc" in subValue && subValue["~sc"][0] === "keyNotBePresent") {
+            if (has2.call(target, key)) {
+              return false;
+            }
+          } else if (subValue && typeof subValue === "object" && "~sc" in subValue && subValue["~sc"][0] === "any") {
+            const targetHasKey = has2.call(target, key);
+            const targetValue = targetHasKey ? target[key] : void 0;
+            if (!executeComparisonWithKeyContext(targetValue, subValue["~sc"], targetHasKey)) {
+              return false;
+            }
+          } else {
+            if (!has2.call(target, key) || !partialEqual(target[key], subValue)) {
+              return false;
+            }
           }
         }
       }

package/dist/partialEqual.d.cts

@@ -1,7 +1,7 @@
 type ComparisonsType = [type: 'strStartsWith', value: string] | [type: 'strEndsWith', value: string] | [
     type: 'hasType',
     value: 'string' | 'number' | 'boolean' | 'object' | 'array' | 'function'
-] | [type: 'strContains', value: string] | [type: 'strMatchesRegex', value: RegExp] | [type: 'deepEqual', value: any] | [type: 'numIsGreaterThan', value: number] | [type: 'numIsGreaterThanOrEqual', value: number] | [type: 'numIsLessThan', value: number] | [type: 'numIsLessThanOrEqual', value: number] | [type: 'numIsInRange', value: [number, number]] | [type: 'jsonStringHasPartial', value: any] | [type: 'partialEqual', value: any] | [type: 'custom', value: (target: unknown) => boolean] | [type: 'isInstanceOf', value: new (...args: any[]) => any] | [type: 'not', value: ComparisonsType];
+] | [type: 'strContains', value: string] | [type: 'strMatchesRegex', value: RegExp] | [type: 'deepEqual', value: any] | [type: 'numIsGreaterThan', value: number] | [type: 'numIsGreaterThanOrEqual', value: number] | [type: 'numIsLessThan', value: number] | [type: 'numIsLessThanOrEqual', value: number] | [type: 'numIsInRange', value: [number, number]] | [type: 'jsonStringHasPartial', value: any] | [type: 'partialEqual', value: any] | [type: 'custom', value: (target: unknown) => boolean] | [type: 'isInstanceOf', value: new (...args: any[]) => any] | [type: 'keyNotBePresent', value: null] | [type: 'not', value: ComparisonsType] | [type: 'any', value: ComparisonsType[]] | [type: 'all', value: ComparisonsType[]];
 type Comparison = {
     '~sc': ComparisonsType;
 };
@@ -34,6 +34,9 @@ declare const match: {
     equal: (value: any) => Comparison;
     partialEqual: (value: any) => Comparison;
     custom: (isEqual: (value: unknown) => boolean) => Comparison;
+    keyNotBePresent: Comparison;
+    any: (...comparisons: Comparison[]) => Comparison;
+    all: (...comparisons: Comparison[]) => Comparison;
     not: {
         hasType: {
             string: Comparison;
@@ -63,6 +66,8 @@ declare const match: {
         equal: (value: any) => Comparison;
         partialEqual: (value: any) => Comparison;
         custom: (value: (target: unknown) => boolean) => Comparison;
+        any: (...comparisons: Comparison[]) => Comparison;
+        all: (...comparisons: Comparison[]) => Comparison;
     };
 };
 declare function partialEqual(target: any, sub: any): boolean;

package/dist/partialEqual.d.ts

@@ -1,7 +1,7 @@
 type ComparisonsType = [type: 'strStartsWith', value: string] | [type: 'strEndsWith', value: string] | [
     type: 'hasType',
     value: 'string' | 'number' | 'boolean' | 'object' | 'array' | 'function'
-] | [type: 'strContains', value: string] | [type: 'strMatchesRegex', value: RegExp] | [type: 'deepEqual', value: any] | [type: 'numIsGreaterThan', value: number] | [type: 'numIsGreaterThanOrEqual', value: number] | [type: 'numIsLessThan', value: number] | [type: 'numIsLessThanOrEqual', value: number] | [type: 'numIsInRange', value: [number, number]] | [type: 'jsonStringHasPartial', value: any] | [type: 'partialEqual', value: any] | [type: 'custom', value: (target: unknown) => boolean] | [type: 'isInstanceOf', value: new (...args: any[]) => any] | [type: 'not', value: ComparisonsType];
+] | [type: 'strContains', value: string] | [type: 'strMatchesRegex', value: RegExp] | [type: 'deepEqual', value: any] | [type: 'numIsGreaterThan', value: number] | [type: 'numIsGreaterThanOrEqual', value: number] | [type: 'numIsLessThan', value: number] | [type: 'numIsLessThanOrEqual', value: number] | [type: 'numIsInRange', value: [number, number]] | [type: 'jsonStringHasPartial', value: any] | [type: 'partialEqual', value: any] | [type: 'custom', value: (target: unknown) => boolean] | [type: 'isInstanceOf', value: new (...args: any[]) => any] | [type: 'keyNotBePresent', value: null] | [type: 'not', value: ComparisonsType] | [type: 'any', value: ComparisonsType[]] | [type: 'all', value: ComparisonsType[]];
 type Comparison = {
     '~sc': ComparisonsType;
 };
@@ -34,6 +34,9 @@ declare const match: {
     equal: (value: any) => Comparison;
     partialEqual: (value: any) => Comparison;
     custom: (isEqual: (value: unknown) => boolean) => Comparison;
+    keyNotBePresent: Comparison;
+    any: (...comparisons: Comparison[]) => Comparison;
+    all: (...comparisons: Comparison[]) => Comparison;
     not: {
         hasType: {
             string: Comparison;
@@ -63,6 +66,8 @@ declare const match: {
         equal: (value: any) => Comparison;
         partialEqual: (value: any) => Comparison;
         custom: (value: (target: unknown) => boolean) => Comparison;
+        any: (...comparisons: Comparison[]) => Comparison;
+        all: (...comparisons: Comparison[]) => Comparison;
     };
 };
 declare function partialEqual(target: any, sub: any): boolean;

package/dist/partialEqual.js

@@ -38,6 +38,9 @@ var match = {
   equal: (value) => createComparison(["deepEqual", value]),
   partialEqual: (value) => createComparison(["partialEqual", value]),
   custom: (isEqual) => createComparison(["custom", isEqual]),
+  keyNotBePresent: createComparison(["keyNotBePresent", null]),
+  any: (...comparisons) => createComparison(["any", comparisons.map((c) => c["~sc"])]),
+  all: (...comparisons) => createComparison(["all", comparisons.map((c) => c["~sc"])]),
   not: {
     hasType: {
       string: createComparison(["not", ["hasType", "string"]]),
@@ -66,7 +69,9 @@ var match = {
     },
     equal: (value) => createComparison(["not", ["deepEqual", value]]),
     partialEqual: (value) => createComparison(["not", ["partialEqual", value]]),
-    custom: (value) => createComparison(["not", ["custom", value]])
+    custom: (value) => createComparison(["not", ["custom", value]]),
+    any: (...comparisons) => createComparison(["not", ["any", comparisons.map((c) => c["~sc"])]]),
+    all: (...comparisons) => createComparison(["not", ["all", comparisons.map((c) => c["~sc"])]])
   }
 };
 function find(iter, tar) {
@@ -74,6 +79,24 @@ function find(iter, tar) {
     if (partialEqual(key, tar)) return key;
   }
 }
+function executeComparisonWithKeyContext(target, comp, keyExists) {
+  const [type, value] = comp;
+  if (type === "keyNotBePresent") {
+    return !keyExists;
+  }
+  if (type === "any") {
+    for (const childComp of value) {
+      if (executeComparisonWithKeyContext(target, childComp, keyExists)) {
+        return true;
+      }
+    }
+    return false;
+  }
+  if (type === "not") {
+    return !executeComparisonWithKeyContext(target, value, keyExists);
+  }
+  return executeComparison(target, comp);
+}
 function executeComparison(target, comparison) {
   const [type, value] = comparison;
   switch (type) {
@@ -128,6 +151,22 @@ function executeComparison(target, comparison) {
       return partialEqual(target, value);
     case "custom":
       return value(target);
+    case "keyNotBePresent":
+      return false;
+    case "any":
+      for (const comp of value) {
+        if (executeComparison(target, comp)) {
+          return true;
+        }
+      }
+      return false;
+    case "all":
+      for (const comp of value) {
+        if (!executeComparison(target, comp)) {
+          return false;
+        }
+      }
+      return true;
     case "not":
       return !executeComparison(target, value);
     default:
@@ -184,8 +223,21 @@ function partialEqual(target, sub) {
     if (!ctor || typeof sub === "object") {
       for (const key in sub) {
         if (has.call(sub, key)) {
-          if (!has.call(target, key) || !partialEqual(target[key], sub[key])) {
-            return false;
+          const subValue = sub[key];
+          if (subValue && typeof subValue === "object" && "~sc" in subValue && subValue["~sc"][0] === "keyNotBePresent") {
+            if (has.call(target, key)) {
+              return false;
+            }
+          } else if (subValue && typeof subValue === "object" && "~sc" in subValue && subValue["~sc"][0] === "any") {
+            const targetHasKey = has.call(target, key);
+            const targetValue = targetHasKey ? target[key] : void 0;
+            if (!executeComparisonWithKeyContext(targetValue, subValue["~sc"], targetHasKey)) {
+              return false;
+            }
+          } else {
+            if (!has.call(target, key) || !partialEqual(target[key], subValue)) {
+              return false;
+            }
           }
         }
       }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ls-stack/utils",
   "description": "Universal TypeScript utilities for browser and Node.js",
-  "version": "3.44.1",
+  "version": "3.45.0",
   "license": "MIT",
   "files": [
     "dist",