quetch 0.18.0 → 0.18.2

package/dist/tools/filterFromContext.js

@@ -30,19 +30,4 @@ function criteria(context, path = EMPTY_ARRAY) {
         }
     });
 }
-/*
-
-{
-  filter: {
-    field: "a"
-  }
-}
-
-{
-  operator: "equal",
-  field: ["filter", "field"],
-  value: "a"
-}
-  
-*/
 //# 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":"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,CAAgB;KACxC,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;qBACN;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;AAED;;;;;;;;;;;;;;EAcE"}
+{"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/dist/types/FilterArray.d.ts

@@ -2,7 +2,11 @@ import type { Any } from "./Any";
 import type { FieldFiltered } from "./FieldFiltered";
 import type { Value } from "./Value";
 /**
- * Checks if a given array field matches a given array value according to a given operator.
+ * Checks if a given array field matches a given array value according to a given operator:
+ *
+ * - `equal` matches the exact content of the array.
+ * - `include` requires every value to be present in the array.
+ * - `intersect` requires at least one item of the value to be present in the array.
  */
 export type FilterArray<T extends object, P = Any> = {
     operator: "equal" | "include" | "intersect";

package/dist/types/Path.d.ts

@@ -1,4 +1,4 @@
 import type { Increment } from "./Increment";
-export type Path<T, D = 0> = D extends 4 ? never : T extends Array<infer P> ? readonly [number] | readonly [number, ...Path<P, Increment<D>>] : T extends object ? {
+export type Path<T, D = 0> = D extends 2 ? never : T extends Array<infer P> ? readonly [number] | readonly [number, ...Path<P, Increment<D>>] : T extends object ? {
     [K in keyof T]-?: [K] | [K, ...Path<T[K], Increment<D>>];
 }[keyof T] : never;

package/lib/tools/filterFromContext.ts

@@ -9,7 +9,7 @@ export function filterFromContext<T extends object>(
 ): Filter<T> {
   return {
     operator: "all",
-    value: criteria(context) as Filter<T>[],
+    value: criteria(context),
   };
 }
 
@@ -30,7 +30,7 @@ function criteria<T extends object>(
             field: path.length === 0 ? field : [...path, field],
             operator: "equal",
             value,
-          },
+          } as Filter<T>,
         ];
       case "object":
         return criteria(value, [...path, field]);
@@ -40,19 +40,3 @@ function criteria<T extends object>(
     }
   });
 }
-
-/* 
-
-{
-  filter: {
-    field: "a"
-  }
-}
-
-{
-  operator: "equal",
-  field: ["filter", "field"],
-  value: "a"
-}
-  
-*/

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/lib/types/FilterArray.ts

@@ -3,7 +3,11 @@ import type { FieldFiltered } from "./FieldFiltered";
 import type { Value } from "./Value";
 
 /**
- * Checks if a given array field matches a given array value according to a given operator.
+ * Checks if a given array field matches a given array value according to a given operator:
+ *
+ * - `equal` matches the exact content of the array.
+ * - `include` requires every value to be present in the array.
+ * - `intersect` requires at least one item of the value to be present in the array.
  */
 export type FilterArray<T extends object, P = Any> = {
   operator: "equal" | "include" | "intersect";

package/lib/types/FilterString.ts

@@ -8,6 +8,7 @@ import type { Value } from "./Value";
 export type FilterString<T extends object> = {
   operator:
     | "equal"
+    // FIXME: Redundant with `"not"` operator
     | "notEqual"
     | "startWith"
     | "endWith"

package/lib/types/Path.ts

@@ -1,6 +1,6 @@
 import type { Increment } from "./Increment";
 
-export type Path<T, D = 0> = D extends 4
+export type Path<T, D = 0> = D extends 2
   ? never
   : T extends Array<infer P>
     ? readonly [number] | readonly [number, ...Path<P, Increment<D>>]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "quetch",
-  "version": "0.18.0",
+  "version": "0.18.2",
   "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"
   }
 }