quetch 0.26.0 → 0.27.1

package/lib/tools/filterFromValue.ts

@@ -1,21 +1,31 @@
 import { EMPTY_ARRAY } from "unchangeable";
 
 import { SELF } from "../constants/SELF.js";
-import type { Filter } from "../types.js";
+import type { IntrinsicFilter } from "../types.js";
 
 const { entries } = Object;
 
-export function filterFromValue<T>(value: T): Filter<T> {
-  return {
-    operator: "all",
-    value: criteria(value),
-  };
+export function filterFromValue<T>(value: T): IntrinsicFilter<T> {
+  const criteriaValue = criteria(value);
+  switch (criteriaValue.length) {
+    case 0:
+      return {
+        operator: "any",
+      };
+    case 1:
+      return criteriaValue[0]!;
+    default:
+      return {
+        operator: "all",
+        value: criteria(value),
+      };
+  }
 }
 
 function criteria<T>(
   value: T,
   path: readonly string[] = EMPTY_ARRAY,
-): readonly Filter<T>[] {
+): readonly IntrinsicFilter<T>[] {
   return entriesAndSelf(value).flatMap(([field, value]) => {
     switch (typeof value) {
       case "symbol":
@@ -36,7 +46,7 @@ function criteria<T>(
             field: path.length === 0 ? field : [...path, field],
             operator: "equal",
             value,
-          } as Filter<T>,
+          } as IntrinsicFilter<T>,
         ];
       case "object": {
         if (value == null) {
@@ -45,7 +55,7 @@ function criteria<T>(
               field: path.length === 0 ? field : [...path, field],
               operator: "equal",
               value,
-            } as Filter<T>,
+            } as IntrinsicFilter<T>,
           ];
         }
         return criteria<T>(value, [...path, field as string]);

package/lib/tools/testFilter.ts

@@ -38,7 +38,9 @@ export function testFilter<T>(
   }
   switch (filter.operator) {
     case "all":
-      return filter.value.every((filter) => testFilter(filter, value));
+      return filter.value.every((filter) =>
+        testFilter(filter, value, settings),
+      );
     case "any": {
       const length = filter.value?.length ?? 0;
       const minimum = filter.minimum ?? (length > 0 ? 1 : 0);
@@ -47,10 +49,13 @@ export function testFilter<T>(
         return true;
       }
       if (minimum === 1 && maximum >= length) {
-        return filter.value.some((filter) => testFilter(filter, value));
+        return filter.value.some((filter) =>
+          testFilter(filter, value, settings),
+        );
       }
       const matched = filter.value.reduce(
-        (count, filter) => count + (testFilter(filter, value) ? 1 : 0),
+        (count, filter) =>
+          count + (testFilter(filter, value, settings) ? 1 : 0),
         0,
       );
       return matched >= minimum && matched <= maximum;
@@ -59,7 +64,9 @@ export function testFilter<T>(
       if (filter.value === undefined || filter.value.length === 0) {
         return false;
       }
-      return filter.value.every((filter) => !testFilter(filter, value));
+      return filter.value.every(
+        (filter) => !testFilter(filter, value, settings),
+      );
     }
     case "exist":
       return get(value, filter.field as any) !== undefined;
@@ -127,7 +134,7 @@ export function testFilter<T>(
             const {
               pathField = "id" as FieldFiltered<T, string>,
               pathFieldSeparator,
-            } = settings || (EMPTY_OBJECT as QuerySettings<T>);
+            } = settings || EMPTY_OBJECT;
             filter[CACHE] = filterChildren(
               filter.value as string,
               pathField,
@@ -137,7 +144,7 @@ export function testFilter<T>(
           }
         }
       }
-      return negate(testFilter(filter[CACHE], value), not);
+      return negate(testFilter(filter[CACHE], value, settings), not);
     }
     case "custom": {
       return filter.value(value);

package/lib/types/FilterChildren.ts

@@ -1,7 +1,7 @@
 import type { CACHE } from "../constants/CACHE.js";
 
 import type { Context } from "./Context";
-import type { Filter } from "./Filter";
+import type { IntrinsicFilter } from "./IntrinsicFilter.js";
 
 /**
  * Matches the direct children of a specified `value` item.
@@ -11,5 +11,5 @@ export type FilterChildren<T> = {
   operator: "children" | "notChildren";
   value?: Context<T> | string;
   deep?: boolean;
-  [CACHE]?: Filter<T>;
+  [CACHE]?: IntrinsicFilter<T>;
 };

package/lib/types/IntrinsicFilter.ts

@@ -0,0 +1,9 @@
+import type { Filter } from "./Filter";
+
+/**
+ * Filter that does not rely on query settings, and thus can be evaluated directly on the items.
+ */
+export type IntrinsicFilter<T> = Exclude<
+  Filter<T>,
+  { operator: "children" | "notChildren" | "is" | "notIs" }
+>;

package/lib/types/QuerySettings.ts

@@ -1,6 +1,6 @@
 import type { FieldFiltered } from "./FieldFiltered";
-import type { Filter } from "./Filter";
 import type { FilterChildren } from "./FilterChildren";
+import type { IntrinsicFilter } from "./IntrinsicFilter";
 
 /**
  * Settings to use when doing a query.
@@ -23,14 +23,12 @@ export type QuerySettings<T> = {
    */
   pathFieldSeparator?: string;
   /**
-   * Returns a filter that captures the items expressed by the provided `FilterChildren`. The return filter cannot use filters of type `FilterChildren`.
+   * Returns a filter that captures the items expressed by the provided `FilterChildren`. The return filter cannot use filters of type `FilterChildren` or `FilterContext`.
    *
    * @param filter The provided `FilterChildren` to express.
    * @returns A filter that captures the items expressed by the provided `FilterChildren`.
    */
-  transformFilterChildren?: (
-    filter: FilterChildren<T>,
-  ) => Exclude<Filter<T>, { operator: "children" | "notChildren" }>;
+  transformFilterChildren?: (filter: FilterChildren<T>) => IntrinsicFilter<T>;
   /**
    * Abort signal to abort the query.
    */

package/lib/types.ts

@@ -33,6 +33,7 @@ export type { Immutable } from "./types/Immutable";
 export type { Increment } from "./types/Increment";
 export type { InjectCustomFields } from "./types/InjectCustomFields";
 export type { IntersectUnion } from "./types/IntersectUnion";
+export type { IntrinsicFilter } from "./types/IntrinsicFilter";
 export type { Item } from "./types/Item";
 export type { Join } from "./types/Join";
 export type { Key } from "./types/Key";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "quetch",
-  "version": "0.26.0",
+  "version": "0.27.1",
   "type": "module",
   "main": "./dist/main.js",
   "exports": {