quetch 0.18.2 → 0.19.0

package/lib/types/FieldFunctionFormatDate.ts

@@ -3,7 +3,7 @@ import type { FieldFiltered } from "./FieldFiltered";
 /**
  * Formats the date found in a given field, which can be an ISO string date or a timestamp.
  */
-export type FieldFunctionFormatDate<T extends object> = {
+export type FieldFunctionFormatDate<T> = {
   operator: "formatDate";
   field: FieldFiltered<T, string | number>;
   format: string;

package/lib/types/Filter.ts

@@ -12,7 +12,7 @@ import type { FilterStringMatch } from "./FilterStringMatch";
 /**
  * Describes a predicate for filtering items.
  */
-export type Filter<T extends object> =
+export type Filter<T> =
   | FilterArray<T>
   | FilterBoolean<T>
   | FilterChildren<T>

package/lib/types/FilterArray.ts

@@ -1,4 +1,3 @@
-import type { Any } from "./Any";
 import type { FieldFiltered } from "./FieldFiltered";
 import type { Value } from "./Value";
 
@@ -9,7 +8,7 @@ import type { Value } from "./Value";
  * - `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> = {
+export type FilterArray<T, P = any> = {
   operator: "equal" | "include" | "intersect";
   field: FieldFiltered<T, P[]>;
 } & Value<T, P[]>;

package/lib/types/FilterBoolean.ts

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

package/lib/types/FilterChildren.ts

@@ -7,7 +7,7 @@ import type { Filter } from "./Filter";
  * Matches the direct children of a specified `value` item.
  * If `deep` is `true`, also captures all the descendants.
  */
-export type FilterChildren<T extends object> = {
+export type FilterChildren<T> = {
   operator: "children";
   value?: Context<T> | string;
   deep?: boolean;

package/lib/types/FilterCustom.ts

@@ -1,7 +1,7 @@
 /**
  * Custom filter where `value(item)` returns `true` for matching items.
  */
-export type FilterCustom<T extends object> = {
+export type FilterCustom<T> = {
   operator: "custom";
   value: (item: T) => boolean;
 };

package/lib/types/FilterField.ts

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

package/lib/types/FilterGroup.ts

@@ -3,7 +3,7 @@ import type { Filter } from "./Filter";
 /**
  * Joins a list of filters with a specific boolean operator.
  */
-export type FilterGroup<T extends object> =
+export type FilterGroup<T> =
   | {
       /**
        * Boolean operator to use for joining the filters.

package/lib/types/FilterNumber.ts

@@ -4,7 +4,7 @@ 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> = {
+export type FilterNumber<T> = {
   operator:
     | "equal"
     | "notEqual"

package/lib/types/FilterString.ts

@@ -5,7 +5,7 @@ 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> = {
+export type FilterString<T> = {
   operator:
     | "equal"
     // FIXME: Redundant with `"not"` operator

package/lib/types/FilterStringIntersect.ts

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

package/lib/types/FilterStringMatch.ts

@@ -6,7 +6,7 @@ import type { Value } from "./Value";
 /**
  * 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> = {
+export type FilterStringMatch<T> = {
   operator: "match";
   field: FieldFiltered<T, string>;
   /**

package/lib/types/Get.ts

@@ -3,7 +3,7 @@ import type { Path } from "./Path";
 /**
  * Returns the type of the property at the specified `P` path.
  */
-export type Get<T, P> = [P] extends [[infer K, ...infer R]]
+export type Get<T, P> = [P] extends [readonly [infer K, ...infer R]]
   ? K extends keyof T
     ? R extends Path<T[K]>
       ? Get<T[K], R>

package/lib/types/Group.ts

@@ -1,7 +1,7 @@
 /**
  * Specifies how items should be grouped.
  */
-export type Group<T extends object> =
+export type Group<T> =
   | keyof T
   | {
       field: keyof T;

package/lib/types/Immutable.ts

@@ -1,3 +1,3 @@
-export type Immutable<T extends object> = {
+export type Immutable<T> = {
   readonly [K in keyof T]: T[K];
 };

package/lib/types/InjectCustomFields.ts

@@ -5,10 +5,7 @@ import type { FieldFunctionReturn } from "./FieldFunctionReturn";
 /**
  * Injects the custom fields into the entity type.
  */
-export type InjectCustomFields<
-  T extends object,
-  C extends CustomFieldMap<T> | undefined,
-> =
+export type InjectCustomFields<T, C extends CustomFieldMap<T> | undefined> =
   C extends CustomFieldMap<T>
     ? {
         readonly [K in keyof T | keyof C]: K extends keyof T

package/lib/types/KeyFiltered.ts

@@ -1,7 +1,31 @@
+import type { SymbolSelf } from "../constants/SymbolSelf";
+
+import type { Key } from "./Key";
+import type { Primitive } from "./Primitive";
+
+type SymbolSelfType = typeof SymbolSelf;
+
 /**
- * Returns object type with field extending the provided `P` type.
+ * Returns union of keys whose mapped value extend the provided `P` type.
  */
-export type KeyFiltered<T extends object, P> = keyof T &
-  keyof {
-    [K in keyof T as T[K] extends P ? K : never]-?: T[K];
-  };
+export type KeyFiltered<T, P> = [0] extends [1 & T]
+  ? Key | SymbolSelfType
+  : T extends object
+    ? T extends Primitive
+      ? [MapPrimitive<T>] extends [P]
+        ? SymbolSelfType
+        : never
+      : keyof {
+          [K in keyof T as Extract<T[K], P> extends never ? never : K]-?: T[K];
+        }
+    : never;
+
+type MapPrimitive<P> = P extends String
+  ? string
+  : P extends Number
+    ? number
+    : P extends Boolean
+      ? boolean
+      : P extends BigInt
+        ? bigint
+        : never;

package/lib/types/KeyFromUnion.ts

@@ -0,0 +1 @@
+export type KeyFromUnion<U> = U extends U ? keyof U : never;

package/lib/types/Order.ts

@@ -3,7 +3,7 @@ import type { Field } from "./Field";
 /**
  * Order item.
  */
-export type Order<T extends object> =
+export type Order<T> =
   | Field<T>
   | {
       field: Field<T>;

package/lib/types/Path.ts

@@ -1,11 +1,17 @@
 import type { Increment } from "./Increment";
+import type { Key } from "./Key";
+import type { Primitive } from "./Primitive";
 
-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;
+export type Path<T, D = 6> = [0] extends [1 & T]
+  ? readonly (Key | never)[]
+  : D extends -1
+    ? never
+    : T extends Array<infer P>
+      ? readonly [number] | readonly [number, ...Path<P, Increment<D>>]
+      : T extends object
+        ? T extends Primitive
+          ? readonly never[]
+          : {
+              [K in keyof T]: [K] | [K, ...Path<T[K], Increment<D>>];
+            }[keyof T]
+        : never;

package/lib/types/PathFiltered.ts

@@ -1,15 +1,18 @@
 import type { Increment } from "./Increment";
+import type { Key } from "./Key";
 
-export type PathFiltered<T, P, D = 0> = D extends 4
-  ? never
-  : T extends ReadonlyArray<infer I>
-    ? I extends P
-      ? readonly [number]
-      : readonly [number, ...PathFiltered<I, P, Increment<D>>]
-    : T extends object
-      ? {
-          [K in keyof T]-?: T[K] extends P
-            ? readonly [K]
-            : readonly [K, ...PathFiltered<T[K], P, Increment<D>>];
-        }[keyof T]
-      : never;
+export type PathFiltered<T, P, D = 7> = [0] extends [1 & T]
+  ? readonly (Key | never)[]
+  : D extends -1
+    ? never
+    : T extends ReadonlyArray<infer I>
+      ? Extract<I, P> extends never
+        ? readonly [number, ...PathFiltered<I, P, Increment<D>>]
+        : readonly [number]
+      : T extends object
+        ? {
+            [K in keyof T]: Extract<T[K], P> extends never
+              ? readonly [K, ...PathFiltered<T[K], P, Increment<D>>]
+              : readonly [K];
+          }[keyof T]
+        : never;

package/lib/types/Primitive.ts

@@ -0,0 +1 @@
+export type Primitive = String | Number | Boolean | BigInt;

package/lib/types/Query.ts

@@ -13,9 +13,9 @@ import type { QueryUpdateMultiple } from "./QueryUpdateMultiple";
  */
 export type Query<
   /**
-   * Type of the object item to be queried.
+   * Type of the item to be queried.
    */
-  T extends object,
+  T,
 > =
   | QueryRead<T>
   | QueryReadMultiple<T>

package/lib/types/QueryAggregate.ts

@@ -8,7 +8,7 @@ import type { QuerySettings } from "./QuerySettings";
 /**
  * Query for computing an aggregated value.
  */
-export type QueryAggregate<T extends object> = {
+export type QueryAggregate<T> = {
   method: "aggregate";
   /**
    * Common item properties to use for identifying the item.

package/lib/types/QueryCreate.ts

@@ -5,7 +5,7 @@ import type { QuerySettings } from "./QuerySettings";
 /**
  * Query for creating an item.
  */
-export type QueryCreate<T extends object> = {
+export type QueryCreate<T> = {
   method: "create";
   multiple?: false;
   /**

package/lib/types/QueryCreateMultiple.ts

@@ -5,7 +5,7 @@ import type { QuerySettings } from "./QuerySettings";
 /**
  * Query for creating multiple items.
  */
-export type QueryCreateMultiple<T extends object> = {
+export type QueryCreateMultiple<T> = {
   method: "create";
   multiple: true;
   /**

package/lib/types/QueryDelete.ts

@@ -6,7 +6,7 @@ import type { QuerySettings } from "./QuerySettings";
 /**
  * Query for deleting an item.
  */
-export type QueryDelete<T extends object> = {
+export type QueryDelete<T> = {
   method: "delete";
   multiple?: false;
   /**

package/lib/types/QueryDeleteMultiple.ts

@@ -6,7 +6,7 @@ import type { QuerySettings } from "./QuerySettings";
 /**
  * Query for deleting multiple items.
  */
-export type QueryDeleteMultiple<T extends object> = {
+export type QueryDeleteMultiple<T> = {
   method: "delete";
   multiple: true;
   /**

package/lib/types/QueryRead.ts

@@ -7,7 +7,7 @@ import type { QuerySettings } from "./QuerySettings";
 /**
  * Query for reading a single item.
  */
-export type QueryRead<T extends object> = {
+export type QueryRead<T> = {
   method?: "read";
   multiple?: false;
   /**

package/lib/types/QueryReadMultiple.ts

@@ -8,7 +8,7 @@ import type { QuerySettings } from "./QuerySettings";
 /**
  * Query for getting a list of items.
  */
-export type QueryReadMultiple<T extends object> = {
+export type QueryReadMultiple<T> = {
   method?: "read";
   multiple: true;
   /**

package/lib/types/QuerySettings.ts

@@ -5,7 +5,7 @@ import type { FilterChildren } from "./FilterChildren";
 /**
  * Settings to use when doing a query.
  */
-export type QuerySettings<T extends object> = {
+export type QuerySettings<T> = {
   // TODO: Move `path*` and `transform*` to fetch middleware?
   /**
    * String used to separate the path nodes of an item.

package/lib/types/QueryUpdate.ts

@@ -6,7 +6,7 @@ import type { QuerySettings } from "./QuerySettings";
 /**
  * Query for updating an item.
  */
-export type QueryUpdate<T extends object> = {
+export type QueryUpdate<T> = {
   method: "update";
   multiple?: false;
   /**

package/lib/types/QueryUpdateMultiple.ts

@@ -7,7 +7,7 @@ import type { QuerySettings } from "./QuerySettings";
 /**
  * Query for updating multiple items.
  */
-export type QueryUpdateMultiple<T extends object> = {
+export type QueryUpdateMultiple<T> = {
   method: "update";
   multiple: true;
   /**

package/lib/types/Result.ts

@@ -4,23 +4,20 @@ import type { Query } from "./Query";
 /**
  * Picks fields `F` from object `T`.
  */
-export type PickFields<
-  T extends object | undefined,
-  F extends string | number | symbol,
-> = [F] extends [keyof T]
+export type PickFields<T, F extends string | number | symbol> = [F] extends [
+  keyof T,
+]
   ? { readonly [K in F]: T[K] }
   : { readonly [K in keyof T]: T[K] };
 
-export type ResultRead<T extends object, Q extends Query<T>> = [Q] extends [
+export type ResultRead<T, Q extends Query<T>> = [Q] extends [
   // FIXME: `keyof T` should be `Field<T>`
   { fields: (keyof T)[] },
 ]
   ? PickFields<T, Item<Q["fields"]>>
   : T;
 
-export type Result<T extends object, Q extends Query<T>> = [Q] extends [
-  { method: "read" },
-]
+export type Result<T, Q extends Query<T>> = [Q] extends [{ method: "read" }]
   ? [Q] extends [{ multiple: true }]
     ? readonly ResultRead<T, Q>[]
     : ResultRead<T, Q>

package/lib/types/Value.ts

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

package/lib/types.ts

@@ -1,7 +1,7 @@
 // File automatically generated by `vite-plugin-module-list`
 export type { AggregateFunction } from "./types/AggregateFunction";
 export type { AggregateFunctionOperator } from "./types/AggregateFunctionOperator";
-export type { Any } from "./types/Any";
+export type { CombineUnion } from "./types/CombineUnion";
 export type { Context } from "./types/Context";
 export type { CustomFetch } from "./types/CustomFetch";
 export type { CustomFieldAggregateMap } from "./types/CustomFieldAggregateMap";
@@ -35,14 +35,14 @@ export type { Item } from "./types/Item";
 export type { Join } from "./types/Join";
 export type { Key } from "./types/Key";
 export type { KeyFiltered } from "./types/KeyFiltered";
+export type { KeyFromUnion } from "./types/KeyFromUnion";
 export type { Locale } from "./types/Locale";
-export type { Mutable } from "./types/Mutable";
 export type { NextHandler } from "./types/NextHandler";
-export type { Normalized } from "./types/Normalized";
 export type { Order } from "./types/Order";
 export type { Parameters } from "./types/Parameters";
 export type { Path } from "./types/Path";
 export type { PathFiltered } from "./types/PathFiltered";
+export type { Primitive } from "./types/Primitive";
 export type { Query } from "./types/Query";
 export type { QueryAggregate } from "./types/QueryAggregate";
 export type { QueryCreate } from "./types/QueryCreate";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "quetch",
-  "version": "0.18.2",
+  "version": "0.19.0",
   "type": "module",
   "main": "./dist/main.js",
   "exports": {
@@ -39,6 +39,7 @@
     "lint": "npm run lint:ts",
     "lint:fix": "npm run lint:ts:fix",
     "lint:ts": "eslint . && tsc --project tsconfig.package.json --noEmit",
+    "lint:types": "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",
@@ -53,7 +54,7 @@
     "@preact/preset-vite": "^2.9.1",
     "@types/eslint": "^9.6.1",
     "@types/node": "^22.8.5",
-    "@typescript-eslint/parser": "^8.12.2",
+    "@typescript-eslint/parser": "^8.16.0",
     "autoprefixer": "^10.4.20",
     "cssnano": "^6.1.2",
     "eslint": "^8.57.1",
@@ -70,9 +71,9 @@
     "prettier": "^3.3.3",
     "prettier-plugin-tailwindcss": "^0.6.8",
     "tailwindcss": "^3.4.14",
-    "typedoc": "^0.26.10",
-    "typedoc-plugin-markdown": "^4.2.9",
-    "typescript": "^5.6.3",
+    "typedoc": "^0.27.0",
+    "typedoc-plugin-markdown": "^4.3.0",
+    "typescript": "^5.7.2",
     "vite": "^5.4.10",
     "vite-plugin-module-list": "^2.2.2",
     "vitest": "^2.1.4"

package/dist/types/Any.d.ts

@@ -1 +0,0 @@
-export type Any = boolean | string | number | object | symbol | null | undefined | Array<any> | ((...args: any[]) => any);

package/dist/types/Any.js

@@ -1 +0,0 @@
-//# sourceMappingURL=Any.js.map

package/dist/types/Any.js.map

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

package/dist/types/Mutable.d.ts

@@ -1,3 +0,0 @@
-export type Mutable<T extends object> = {
-    -readonly [K in keyof T]: T[K];
-};

package/dist/types/Mutable.js

@@ -1 +0,0 @@
-//# sourceMappingURL=Mutable.js.map

package/dist/types/Mutable.js.map

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

package/dist/types/Normalized.d.ts

@@ -1,2 +0,0 @@
-import type { IntersectUnion } from "./IntersectUnion";
-export type Normalized<T extends object> = Required<IntersectUnion<T>>;

package/dist/types/Normalized.js

@@ -1 +0,0 @@
-//# sourceMappingURL=Normalized.js.map

package/dist/types/Normalized.js.map

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

package/lib/types/Any.ts

@@ -1,10 +0,0 @@
-export type Any =
-  | boolean
-  | string
-  | number
-  | object
-  | symbol
-  | null
-  | undefined
-  | Array<any>
-  | ((...args: any[]) => any);

package/lib/types/Mutable.ts

@@ -1,3 +0,0 @@
-export type Mutable<T extends object> = {
-  -readonly [K in keyof T]: T[K];
-};

package/lib/types/Normalized.ts

@@ -1,3 +0,0 @@
-import type { IntersectUnion } from "./IntersectUnion";
-
-export type Normalized<T extends object> = Required<IntersectUnion<T>>;