quetch 0.17.0 → 0.18.1

package/dist/tools/filterFromContext.js

@@ -1,12 +1,33 @@
+import { EMPTY_ARRAY } from "unchangeable";
 const { entries } = Object;
 export function filterFromContext(context) {
     return {
         operator: "all",
-        value: entries(context).map(([field, value]) => ({
-            field,
-            operator: "equal",
-            value,
-        })),
+        value: criteria(context),
     };
 }
+function criteria(context, path = EMPTY_ARRAY) {
+    return entries(context).flatMap(([field, value]) => {
+        switch (typeof value) {
+            case "bigint":
+            case "string":
+            case "number":
+            case "boolean":
+            case "symbol":
+            case "undefined":
+                return [
+                    {
+                        field: path.length === 0 ? field : [...path, field],
+                        operator: "equal",
+                        value,
+                    },
+                ];
+            case "object":
+                return criteria(value, [...path, field]);
+            default:
+                return EMPTY_ARRAY;
+            // Ignore
+        }
+    });
+}
 //# sourceMappingURL=filterFromContext.js.map

package/dist/tools/filterFromContext.js.map

@@ -1 +1 @@
-{"version":3,"file":"filterFromContext.js","sourceRoot":"","sources":["../../lib/tools/filterFromContext.ts"],"names":[],"mappings":"AAEA,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC;AAE3B,MAAM,UAAU,iBAAiB,CAC/B,OAAmB;IAEnB,OAAO;QACL,QAAQ,EAAE,KAAK;QACf,KAAK,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC;YAC/C,KAAK;YACL,QAAQ,EAAE,OAAO;YACjB,KAAK;SACN,CAAC,CAAgB;KACnB,CAAC;AACJ,CAAC"}
+{"version":3,"file":"filterFromContext.js","sourceRoot":"","sources":["../../lib/tools/filterFromContext.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAI3C,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC;AAE3B,MAAM,UAAU,iBAAiB,CAC/B,OAAmB;IAEnB,OAAO;QACL,QAAQ,EAAE,KAAK;QACf,KAAK,EAAE,QAAQ,CAAC,OAAO,CAAC;KACzB,CAAC;AACJ,CAAC;AAED,SAAS,QAAQ,CACf,OAAe,EACf,OAA0B,WAAW;IAErC,OAAO,OAAO,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,EAAE,KAAK,CAAC,EAAE,EAAE;QACjD,QAAQ,OAAO,KAAK,EAAE,CAAC;YACrB,KAAK,QAAQ,CAAC;YACd,KAAK,QAAQ,CAAC;YACd,KAAK,QAAQ,CAAC;YACd,KAAK,SAAS,CAAC;YACf,KAAK,QAAQ,CAAC;YACd,KAAK,WAAW;gBACd,OAAO;oBACL;wBACE,KAAK,EAAE,IAAI,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,EAAE,KAAK,CAAC;wBACnD,QAAQ,EAAE,OAAO;wBACjB,KAAK;qBACO;iBACf,CAAC;YACJ,KAAK,QAAQ;gBACX,OAAO,QAAQ,CAAC,KAAK,EAAE,CAAC,GAAG,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC;YAC3C;gBACE,OAAO,WAAW,CAAC;YACrB,SAAS;QACX,CAAC;IACH,CAAC,CAAC,CAAC;AACL,CAAC"}

package/lib/tools/filterFromContext.test.ts

@@ -0,0 +1,41 @@
+import { expect, test } from "vitest";
+
+import { filterFromContext } from "./filterFromContext.js";
+
+test("returns filter from context", () => {
+  expect(filterFromContext({ a: 1 })).toEqual({
+    operator: "all",
+    value: [
+      {
+        field: "a",
+        operator: "equal",
+        value: 1,
+      },
+    ],
+  });
+  expect(filterFromContext({ a: { b: 1 } })).toEqual({
+    operator: "all",
+    value: [
+      {
+        field: ["a", "b"],
+        operator: "equal",
+        value: 1,
+      },
+    ],
+  });
+  expect(filterFromContext({ a: { b: 1 }, c: 2 })).toEqual({
+    operator: "all",
+    value: [
+      {
+        field: ["a", "b"],
+        operator: "equal",
+        value: 1,
+      },
+      {
+        field: "c",
+        operator: "equal",
+        value: 2,
+      },
+    ],
+  });
+});

package/lib/tools/filterFromContext.ts

@@ -1,3 +1,5 @@
+import { EMPTY_ARRAY } from "unchangeable";
+
 import type { Context, Filter } from "../types";
 
 const { entries } = Object;
@@ -7,10 +9,34 @@ export function filterFromContext<T extends object>(
 ): Filter<T> {
   return {
     operator: "all",
-    value: entries(context).map(([field, value]) => ({
-      field,
-      operator: "equal",
-      value,
-    })) as Filter<T>[],
+    value: criteria(context),
   };
 }
+
+function criteria<T extends object>(
+  context: object,
+  path: readonly string[] = EMPTY_ARRAY,
+): readonly Filter<T>[] {
+  return entries(context).flatMap(([field, value]) => {
+    switch (typeof value) {
+      case "bigint":
+      case "string":
+      case "number":
+      case "boolean":
+      case "symbol":
+      case "undefined":
+        return [
+          {
+            field: path.length === 0 ? field : [...path, field],
+            operator: "equal",
+            value,
+          } as Filter<T>,
+        ];
+      case "object":
+        return criteria(value, [...path, field]);
+      default:
+        return EMPTY_ARRAY;
+      // Ignore
+    }
+  });
+}

package/lib/tools/testFilter.test.ts

@@ -3,6 +3,7 @@ import { expect, test } from "vitest";
 import { SymbolCache } from "../constants.js";
 import type { FilterChildren } from "../types.js";
 
+import { filterFromContext } from "./filterFromContext.js";
 import { testFilter } from "./testFilter.js";
 
 test("tests filter lists", () => {
@@ -266,6 +267,15 @@ test("tests filter on array values", () => {
   ).toBe(false);
 });
 
+test("tests filter with paths", () => {
+  const context = { value: { filter: { field: "label" } } };
+  expect(
+    testFilter(filterFromContext(context), {
+      value: { filter: { field: "label" } },
+    }),
+  ).toBe(true);
+});
+
 test("tests filter with children predicates", () => {
   expect(testFilter({ operator: "children", value: "a" }, { id: "a/b" })).toBe(
     true,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "quetch",
-  "version": "0.17.0",
+  "version": "0.18.1",
   "type": "module",
   "main": "./dist/main.js",
   "exports": {
@@ -38,7 +38,7 @@
     "format:fix": "prettier --write './**/*.{css,scss,md,mdx,json,tsx,ts,jsx,js}'",
     "lint": "npm run lint:ts",
     "lint:fix": "npm run lint:ts:fix",
-    "lint:ts": "eslint .",
+    "lint:ts": "eslint . && tsc --project tsconfig.package.json --noEmit",
     "lint:ts:fix": "eslint --fix .",
     "release:init": "npm publish --access=public",
     "release:patch": "npm version patch && git push origin --follow-tags && npm publish",
@@ -79,6 +79,6 @@
   },
   "dependencies": {
     "futurise": "^1.7.1",
-    "unchangeable": "^1.7.2"
+    "unchangeable": "^1.7.3"
   }
 }