quetch 0.14.0 → 0.15.0

package/dist/tools/queryItemList.js

@@ -1,7 +1,7 @@
 import { RequestError } from "../errors.js";
 import { filterFromContext } from "./filterFromContext.js";
-import { filterItem } from "./filterItem.js";
 import { sortItemList } from "./sortItemList.js";
+import { testFilter } from "./testFilter.js";
 function mergeContextAndFilter(context, filter) {
     if (context === undefined) {
         return filter ?? { operator: "any" };
@@ -32,7 +32,7 @@ function queryItemList(query) {
                 let result = data;
                 if (context !== undefined || filter !== undefined) {
                     const normalizedFilter = mergeContextAndFilter(context, filter);
-                    result = data.filter((item) => filterItem(normalizedFilter, item, query.settings));
+                    result = data.filter((item) => testFilter(normalizedFilter, item, query.settings));
                 }
                 // Sort
                 result = sortItemList(order, result === data ? [...data] : result);
@@ -43,7 +43,7 @@ function queryItemList(query) {
                 return result;
             }
             const normalizedFilter = mergeContextAndFilter(context, filter);
-            const result = data.find((item) => filterItem(normalizedFilter, item, query.settings));
+            const result = data.find((item) => testFilter(normalizedFilter, item, query.settings));
             if (result === undefined) {
                 throw new RequestError("Not found", 404, query);
             }
@@ -58,7 +58,7 @@ function queryItemList(query) {
                     }
                     const normalizedFilter = mergeContextAndFilter(context, filter);
                     return data.reduce((result, item) => {
-                        if (filterItem(normalizedFilter, item, query.settings)) {
+                        if (testFilter(normalizedFilter, item, query.settings)) {
                             return result + 1;
                         }
                         return result;

package/dist/tools/queryItemList.js.map

@@ -1 +1 @@
-{"version":3,"file":"queryItemList.js","sourceRoot":"","sources":["../../lib/tools/queryItemList.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"queryItemList.js","sourceRoot":"","sources":["../../lib/tools/queryItemList.ts"],"names":[],"mappings":"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"}

package/dist/tools/{filterItem.d.ts → testFilter.d.ts}

@@ -1,5 +1,5 @@
-import type { Filter } from "../types";
 import type { QuerySettings } from "../types/QuerySettings.js";
+import type { Filter } from "../types.js";
 /**
  * Checks wether the provided `value` matches the `filter` or not.
  *
@@ -8,4 +8,4 @@ import type { QuerySettings } from "../types/QuerySettings.js";
  * @param settings Optional query settings.
  * @returns `true` if the `value` matches the `filter` and `false` otherwise.
  */
-export declare function filterItem<T extends object>(filter: Filter<T> | undefined, value: T | undefined, settings?: QuerySettings<T>): boolean;
+export declare function testFilter<T extends object>(filter: Filter<T> | undefined, value: T | undefined, settings?: QuerySettings<T>): boolean;

package/dist/tools/testFilter.js

@@ -0,0 +1,214 @@
+import { SymbolCache } from "../constants/SymbolCache.js";
+import { filterChildren } from "./filterChildren.js";
+import { get } from "./get.js";
+const { isArray } = Array;
+function valueFromFilter(value, filter) {
+    if ("valueField" in filter) {
+        return get(value, filter.valueField);
+    }
+    return filter.value;
+}
+/**
+ * Checks wether the provided `value` matches the `filter` or not.
+ *
+ * @param filter The filter to apply.
+ * @param value The value to check.
+ * @param settings Optional query settings.
+ * @returns `true` if the `value` matches the `filter` and `false` otherwise.
+ */
+export function testFilter(filter, value, settings) {
+    if (value === undefined) {
+        return false;
+    }
+    if (filter === undefined) {
+        return true;
+    }
+    switch (filter.operator) {
+        case "all":
+            return filter.value.every((filter) => testFilter(filter, value));
+        case "any": {
+            if (filter.value === undefined || filter.value.length === 0) {
+                return true;
+            }
+            return filter.value.some((filter) => testFilter(filter, value));
+        }
+        case "none": {
+            if (filter.value === undefined || filter.value.length === 0) {
+                return false;
+            }
+            return filter.value.every((filter) => !testFilter(filter, value));
+        }
+        case "exist":
+            return get(value, filter.value) !== undefined;
+        case "equal": {
+            const rightValue = valueFromFilter(value, filter);
+            if (isArray(rightValue)) {
+                const leftValue = get(value, filter.field);
+                if (!isArray(leftValue)) {
+                    return false;
+                }
+                if (rightValue.length !== leftValue.length) {
+                    return false;
+                }
+                return rightValue.every((value) => leftValue.includes(value));
+            }
+            const leftValue = get(value, filter.field);
+            if (leftValue === rightValue) {
+                return true;
+            }
+            if (filter.options ||
+                filter.locale) {
+                return (leftValue !== undefined &&
+                    rightValue.localeCompare(leftValue, filter.locale, filter.options) === 0);
+            }
+            return false;
+        }
+        case "notEqual": {
+            const rightValue = valueFromFilter(value, filter);
+            const leftValue = get(value, filter.field);
+            if (leftValue === rightValue) {
+                return false;
+            }
+            if (filter.options ||
+                filter.locale) {
+                return (rightValue.localeCompare(get(value, filter.field), filter.locale, filter.options) !== 0);
+            }
+            return true;
+        }
+        case "children": {
+            if (filter[SymbolCache] === undefined) {
+                switch (true) {
+                    case settings?.transformFilterChildren !== undefined:
+                        filter[SymbolCache] = settings.transformFilterChildren(filter);
+                        break;
+                    default: {
+                        const { pathFieldKey = "id", pathFieldSeparator = "/", } = settings || {};
+                        filter[SymbolCache] = filterChildren(filter.value, pathFieldKey, filter.deep, pathFieldSeparator);
+                    }
+                }
+            }
+            return testFilter(filter[SymbolCache], value);
+        }
+        case "custom": {
+            return filter.value(value);
+        }
+        case "startWith": {
+            const rightValue = valueFromFilter(value, filter);
+            const leftValue = get(value, filter.field);
+            if (leftValue === undefined || leftValue.length < rightValue.length) {
+                return false;
+            }
+            if (filter.options !== undefined || filter.locale !== undefined) {
+                return (rightValue.localeCompare(leftValue.slice(0, rightValue.length), filter.locale, filter.options) !== 0);
+            }
+            return leftValue.startsWith(rightValue) ?? false;
+        }
+        case "endWith": {
+            const rightValue = valueFromFilter(value, filter);
+            const leftValue = get(value, filter.field);
+            if (leftValue === undefined || leftValue.length < rightValue.length) {
+                return false;
+            }
+            if (filter.options !== undefined || filter.locale !== undefined) {
+                return (rightValue.localeCompare(leftValue.slice(-rightValue.length), filter.locale, filter.options) !== 0);
+            }
+            return leftValue.endsWith(rightValue) ?? false;
+        }
+        case "include": {
+            const rightValue = valueFromFilter(value, filter);
+            const leftValue = get(value, filter.field);
+            if (leftValue == null) {
+                return false;
+            }
+            if (isArray(rightValue)) {
+                // FIXME: Get unique values
+                if (!isArray(leftValue) || leftValue.length < rightValue.length) {
+                    return false;
+                }
+                return rightValue.every((value) => leftValue.includes(value));
+            }
+            if (isArray(leftValue) || leftValue.length < rightValue.length) {
+                return false;
+            }
+            if (filter.options ||
+                filter.locale) {
+                const { length } = rightValue;
+                const end = leftValue.length - length + 1;
+                for (let i = 0; i < end; i++) {
+                    if (rightValue.localeCompare(leftValue.slice(i, i + length), filter.locale, filter.options) === 0) {
+                        return true;
+                    }
+                }
+                return false;
+            }
+            return leftValue.includes?.(rightValue) ?? false;
+        }
+        case "greaterThan": {
+            const rightValue = valueFromFilter(value, filter);
+            const leftValue = get(value, filter.field);
+            if (filter.options ||
+                filter.locale) {
+                return (rightValue.localeCompare(leftValue, filter.locale, filter.options) < 0);
+            }
+            return leftValue > rightValue;
+        }
+        case "greaterThanOrEqual": {
+            const rightValue = valueFromFilter(value, filter);
+            const leftValue = get(value, filter.field);
+            if (filter.options ||
+                filter.locale) {
+                return (rightValue.localeCompare(leftValue, filter.locale, filter.options) <= 0);
+            }
+            return leftValue >= rightValue;
+        }
+        case "lowerThan": {
+            const rightValue = valueFromFilter(value, filter);
+            const leftValue = get(value, filter.field);
+            if (filter.options ||
+                filter.locale) {
+                return (rightValue.localeCompare(leftValue, filter.locale, filter.options) > 0);
+            }
+            return leftValue < rightValue;
+        }
+        case "lowerThanOrEqual": {
+            const rightValue = valueFromFilter(value, filter);
+            const leftValue = get(value, filter.field);
+            if (filter.options ||
+                filter.locale) {
+                return (rightValue.localeCompare(leftValue, filter.locale, filter.options) >= 0);
+            }
+            return leftValue <= rightValue;
+        }
+        case "match": {
+            const rightValue = valueFromFilter(value, filter);
+            const leftValue = get(value, filter.field);
+            if (leftValue === undefined) {
+                return false;
+            }
+            if (filter[SymbolCache] === undefined) {
+                filter[SymbolCache] = new RegExp(rightValue, `${filter.options?.ignoreCase ? "i" : ""}${filter.options?.dotAll ? "s" : ""}`);
+            }
+            return filter[SymbolCache].test(leftValue);
+        }
+        case "intersect": {
+            const rightValue = valueFromFilter(value, filter);
+            const leftValue = get(value, filter.field);
+            if (leftValue == null) {
+                return false;
+            }
+            if (isArray(leftValue)) {
+                return (isArray(rightValue) &&
+                    rightValue.some((value) => leftValue.includes(value)));
+            }
+            if (filter.options ||
+                filter.locale) {
+                return (leftValue !== undefined &&
+                    rightValue.some((value) => value.localeCompare(leftValue, filter.locale, filter.options) === 0));
+            }
+            return rightValue.includes(leftValue);
+        }
+        default:
+            throw new Error(`Unknown filter operator '${filter.operator}'`);
+    }
+}
+//# sourceMappingURL=testFilter.js.map

package/dist/tools/testFilter.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"testFilter.js","sourceRoot":"","sources":["../../lib/tools/testFilter.ts"],"names":[],"mappings":"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"}

package/dist/tools.d.ts

@@ -5,9 +5,9 @@ export { defineGenericFetch } from "./tools/defineGenericFetch.js";
 export { escapeRegex } from "./tools/escapeRegex.js";
 export { filterChildren } from "./tools/filterChildren.js";
 export { filterFromContext } from "./tools/filterFromContext.js";
-export { filterItem } from "./tools/filterItem.js";
 export { get } from "./tools/get.js";
 export { isFilterGroup } from "./tools/isFilterGroup.js";
 export { normalizeOrder } from "./tools/normalizeOrder.js";
 export { queryItemList } from "./tools/queryItemList.js";
 export { sortItemList } from "./tools/sortItemList.js";
+export { testFilter } from "./tools/testFilter.js";

package/dist/tools.js

@@ -6,10 +6,10 @@ export { defineGenericFetch } from "./tools/defineGenericFetch.js";
 export { escapeRegex } from "./tools/escapeRegex.js";
 export { filterChildren } from "./tools/filterChildren.js";
 export { filterFromContext } from "./tools/filterFromContext.js";
-export { filterItem } from "./tools/filterItem.js";
 export { get } from "./tools/get.js";
 export { isFilterGroup } from "./tools/isFilterGroup.js";
 export { normalizeOrder } from "./tools/normalizeOrder.js";
 export { queryItemList } from "./tools/queryItemList.js";
 export { sortItemList } from "./tools/sortItemList.js";
+export { testFilter } from "./tools/testFilter.js";
 //# sourceMappingURL=tools.js.map

package/dist/tools.js.map

@@ -1 +1 @@
-{"version":3,"file":"tools.js","sourceRoot":"","sources":["../lib/tools.ts"],"names":[],"mappings":"AAAA,4DAA4D;AAC5D,OAAO,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAC;AACvC,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AACjE,OAAO,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAC;AACnE,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AACjE,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAC;AACrC,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC"}
+{"version":3,"file":"tools.js","sourceRoot":"","sources":["../lib/tools.ts"],"names":[],"mappings":"AAAA,4DAA4D;AAC5D,OAAO,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAC;AACvC,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AACjE,OAAO,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAC;AACnE,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AACjE,OAAO,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAC;AACrC,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC"}

package/dist/types/FilterArray.d.ts

@@ -1,10 +1,10 @@
 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.
  */
 export type FilterArray<T extends object, P = Any> = {
     operator: "equal" | "include" | "intersect";
     field: FieldFiltered<T, P[]>;
-    value: P[];
-};
+} & Value<T, P[]>;

package/dist/types/FilterBoolean.d.ts

@@ -1,9 +1,9 @@
 import type { FieldFiltered } from "./FieldFiltered";
+import type { Value } from "./Value";
 /**
  * Checks if a given boolean field is `true` or `false`.
  */
 export type FilterBoolean<T extends object> = {
     operator: "equal" | "notEqual";
     field: FieldFiltered<T, boolean>;
-    value: boolean;
-};
+} & Value<T, boolean>;

package/dist/types/FilterField.d.ts

@@ -5,7 +5,7 @@ import type { Field } from "./Field";
 export type FilterField<T extends object> = {
     operator: "exist";
     /**
-     * The field name for which to check its existence.
+     * The field name or path for which to check its existence.
      */
     value: Field<T>;
 };

package/dist/types/FilterNumber.d.ts

@@ -1,9 +1,9 @@
 import type { FieldFiltered } from "./FieldFiltered";
+import type { Value } from "./Value";
 /**
  * Checks if a given number field matches a given number value according to a given operator.
  */
 export type FilterNumber<T extends object> = {
     operator: "equal" | "notEqual" | "greaterThan" | "greaterThanOrEqual" | "lowerThan" | "lowerThanOrEqual";
     field: FieldFiltered<T, number>;
-    value: number;
-};
+} & Value<T, number>;

package/dist/types/FilterString.d.ts

@@ -1,12 +1,12 @@
 import type { FieldFiltered } from "./FieldFiltered";
 import type { Locale } from "./Locale";
+import type { Value } from "./Value";
 /**
  * Checks if a given string field matches a given string value according to a given operator.
  */
 export type FilterString<T extends object> = {
     operator: "equal" | "notEqual" | "startWith" | "endWith" | "include" | "greaterThan" | "greaterThanOrEqual" | "lowerThan" | "lowerThanOrEqual";
     field: FieldFiltered<T, string>;
-    value: string;
     options?: Intl.CollatorOptions;
     locale?: Locale;
-};
+} & Value<T, string>;

package/dist/types/FilterStringIntersect.d.ts

@@ -1,12 +1,12 @@
 import type { FieldFiltered } from "./FieldFiltered";
 import type { Locale } from "./Locale";
+import type { Value } from "./Value";
 /**
  * Checks if a given string field has any of the provided values.
  */
 export type FilterStringIntersect<T extends object> = {
     operator: "intersect";
     field: FieldFiltered<T, string>;
-    value: string[];
     options?: Intl.CollatorOptions;
     locale?: Locale;
-};
+} & Value<T, string[]>;

package/dist/types/FilterStringMatch.d.ts

@@ -1,15 +1,12 @@
 import type { SymbolCache } from "../constants/SymbolCache";
 import type { FieldFiltered } from "./FieldFiltered";
+import type { Value } from "./Value";
 /**
- * Checks if a given string field matches a given regular expression.
+ * Checks if a given string field matches a given regular expression, the value being a raw regular expression string.
  */
 export type FilterStringMatch<T extends object> = {
     operator: "match";
     field: FieldFiltered<T, string>;
-    /**
-     * Raw regular expression string.
-     */
-    value: string;
     /**
      * Regular expression options.
      */
@@ -27,4 +24,4 @@ export type FilterStringMatch<T extends object> = {
      * Compiled regular expression generated by the `testFilter` function.
      */
     [SymbolCache]?: RegExp;
-};
+} & Value<T, string>;

package/dist/types/Value.d.ts

@@ -0,0 +1,15 @@
+import type { FieldFiltered } from "./FieldFiltered";
+/**
+ * Actual `value` or `valueField` leading to the value.
+ */
+export type Value<T extends object, V> = {
+    /**
+     * Value to use.
+     */
+    value: V;
+} | {
+    /**
+     * Path leading to the value.
+     */
+    valueField: FieldFiltered<T, V>;
+};

package/dist/types/Value.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=Value.js.map

package/dist/types/Value.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Value.js","sourceRoot":"","sources":["../../lib/types/Value.ts"],"names":[],"mappings":""}

package/dist/types.d.ts

@@ -52,3 +52,4 @@ export type { QueryUpdate } from "./types/QueryUpdate";
 export type { QueryUpdateMultiple } from "./types/QueryUpdateMultiple";
 export type { Result } from "./types/Result";
 export type { Store } from "./types/Store";
+export type { Value } from "./types/Value";

package/lib/tools/queryItemList.ts

@@ -10,8 +10,8 @@ import type {
 } from "../types.js";
 
 import { filterFromContext } from "./filterFromContext.js";
-import { filterItem } from "./filterItem.js";
 import { sortItemList } from "./sortItemList.js";
+import { testFilter } from "./testFilter.js";
 
 function mergeContextAndFilter<T extends object>(
   context?: Context<T>,
@@ -56,7 +56,7 @@ function queryItemList<T extends object, const Q extends Query<T>>(
             filter as Filter<T>,
           );
           result = data.filter((item) =>
-            filterItem(normalizedFilter, item, query.settings),
+            testFilter(normalizedFilter, item, query.settings),
           );
         }
         // Sort
@@ -75,7 +75,7 @@ function queryItemList<T extends object, const Q extends Query<T>>(
         filter as Filter<T>,
       );
       const result = data.find((item) =>
-        filterItem(normalizedFilter, item, query.settings),
+        testFilter(normalizedFilter, item, query.settings),
       );
       if (result === undefined) {
         throw new RequestError("Not found", 404, query as Query<any>);
@@ -94,7 +94,7 @@ function queryItemList<T extends object, const Q extends Query<T>>(
             filter as Filter<T>,
           );
           return data.reduce((result, item) => {
-            if (filterItem(normalizedFilter, item, query.settings)) {
+            if (testFilter(normalizedFilter, item, query.settings)) {
               return result + 1;
             }
             return result;