quetch 0.9.2 → 0.10.1

package/dist/errors/RequestError.d.ts

@@ -1,11 +1,11 @@
-import type { QueryAny } from "../types";
+import type { Query } from "../types/Query";
 /**
  * Error to be thrown in case there is an issue with the query call. Only instances of this error will be caught by the `retry()` middleware.
  */
 export declare class RequestError extends Error {
     status: number;
-    query?: QueryAny | undefined;
+    query?: Query<any> | undefined;
     request?: Request | undefined;
     response?: Response | undefined;
-    constructor(message: string, status: number, query?: QueryAny | undefined, request?: Request | undefined, response?: Response | undefined);
+    constructor(message: string, status: number, query?: Query<any> | undefined, request?: Request | undefined, response?: Response | undefined);
 }

package/dist/errors/RequestError.js.map

@@ -1 +1 @@
-{"version":3,"file":"RequestError.js","sourceRoot":"","sources":["../../lib/errors/RequestError.ts"],"names":[],"mappings":"AAEA;;GAEG;AACH,MAAM,OAAO,YAAa,SAAQ,KAAK;IACrC,YACE,OAAe,EACR,MAAc,EACd,KAAgB,EAChB,OAAiB,EACjB,QAAmB;QAE1B,KAAK,CAAC,OAAO,CAAC,CAAC;QALf;;;;mBAAO,MAAM;WAAQ;QACrB;;;;mBAAO,KAAK;WAAW;QACvB;;;;mBAAO,OAAO;WAAU;QACxB;;;;mBAAO,QAAQ;WAAW;IAG5B,CAAC;CACF"}
+{"version":3,"file":"RequestError.js","sourceRoot":"","sources":["../../lib/errors/RequestError.ts"],"names":[],"mappings":"AAEA;;GAEG;AACH,MAAM,OAAO,YAAa,SAAQ,KAAK;IACrC,YACE,OAAe,EACR,MAAc,EACd,KAAkB,EAClB,OAAiB,EACjB,QAAmB;QAE1B,KAAK,CAAC,OAAO,CAAC,CAAC;QALf;;;;mBAAO,MAAM;WAAQ;QACrB;;;;mBAAO,KAAK;WAAa;QACzB;;;;mBAAO,OAAO;WAAU;QACxB;;;;mBAAO,QAAQ;WAAW;IAG5B,CAAC;CACF"}

package/dist/middlewares/aggregate.d.ts

@@ -1,4 +1,4 @@
-import type { Handler, QueryAny } from "../types";
+import type { Handler, Query } from "../types";
 /**
  * Aggregates multiple incoming query calls into one query.
  * Queries are grouped according to the string key returned by `queryGroupId(query)`. Inside a group, each query is identified with `queryId(query)`.
@@ -9,11 +9,17 @@ import type { Handler, QueryAny } from "../types";
  * @param options
  * @returns
  */
-export declare function aggregate<I extends QueryAny, O, In extends QueryAny, On>({ queryGroupId, queryId, mergeQuery, delay, queryForGroup, resultForQuery, }: {
+export declare function aggregate<I extends Query<any> & {
+    type: any;
+}, O, In extends Query<any> & {
+    type: any;
+}, On>({ queryGroupId, queryId, mergeQuery, delay, queryForGroup, resultForQuery, }: {
     queryGroupId?: (query: I) => string | undefined;
     queryId?: (query: I) => string | undefined;
     mergeQuery?: (query: I, currentQuery: I) => I;
     delay?: number;
-    queryForGroup: (queryList: I[], group: string) => QueryAny;
+    queryForGroup: (queryList: I[], group: string) => Query<any> & {
+        type: any;
+    };
     resultForQuery: (resultList: O[], query: I) => O | never;
 }): Handler<I, O, In, On>;

package/dist/middlewares/aggregate.js.map

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

package/dist/middlewares/cache.d.ts

@@ -1,9 +1,11 @@
-import type { Handler, QueryAny, Store } from "../types";
-type CachedItem<I extends QueryAny> = {
+import type { Handler, Query, Store } from "../types";
+type CachedItem<I extends Query<any>> = {
     query: I;
     value: any;
 };
-type CacheOptions<I extends QueryAny> = {
+export declare function cache<I extends Query<any> & {
+    type: any;
+}, O, In extends Query<any>, On>({ itemId, store, invalidatesItem, extendCachedQuery, mergeQuery, mergeItem, }: {
     /**
      * Unique identifier for the item to cache.
      * Returns `undefined` if the item should not be cached.
@@ -32,6 +34,5 @@ type CacheOptions<I extends QueryAny> = {
      * Only called when `extendCachedQuery` returns a query.
      */
     mergeItem: (value: any, cachedValue: any, query: I, cachedQuery: I) => any;
-};
-export declare function cache<I extends QueryAny, O, In extends QueryAny, On>({ itemId, store, invalidatesItem, extendCachedQuery, mergeQuery, mergeItem, }: CacheOptions<I>): Handler<I, O, In, On>;
+}): Handler<I, O, In, On>;
 export {};

package/dist/middlewares/cache.js.map

@@ -1 +1 @@
-{"version":3,"file":"cache.js","sourceRoot":"","sources":["../../lib/middlewares/cache.ts"],"names":[],"mappings":"AAsCA,MAAM,UAAU,KAAK,CAAiD,EACpE,MAAM,GAAG,CAAC,EAAE,OAAO,GAAG,EAAE,EAAE,MAAM,GAAG,MAAM,EAAE,IAAI,EAAK,EAAE,EAAE;IACtD,IAAI,MAAM,KAAK,MAAM,IAAI,OAAO,CAAC,EAAE,EAAE,CAAC;QACpC,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,OAAO,CAAC,EAAE,EAAE,CAAC;IACzC,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC,EACD,KAAK,EACL,eAAe,EACf,iBAAiB,EACjB,UAAU,EACV,SAAS,GACO;IAChB;;;MAGE;IACF,OAAO,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;QAC3B,MAAM,EAAE,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;QACzB,IAAI,CAAC,EAAE,EAAE,CAAC;YACR,OAAO,IAAI,CAAC,KAAsB,CAAC,CAAC;QACtC,CAAC;QACD,IAAI,MAAM,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC;YACxB,MAAM,EAAE,KAAK,EAAE,WAAW,EAAE,KAAK,EAAE,WAAW,EAAE,GAAG,MAAM,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YACvE,IAAI,eAAe,CAAC,KAAK,EAAE,WAAW,EAAE,WAAW,CAAC,EAAE,CAAC;gBACrD,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,KAAsB,CAAC,CAAC;gBACjD,KAAK,CAAC,GAAG,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC;gBAChC,OAAO,KAAK,CAAC;YACf,CAAC;YACD,MAAM,aAAa,GAAG,iBAAiB,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC;YAC5D,IAAI,aAAa,KAAK,SAAS,EAAE,CAAC;gBAChC,OAAO,WAAW,CAAC;YACrB,CAAC;YACD,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,aAA8B,CAAC,CAAC;YACzD,MAAM,aAAa,GAAG,SAAS,CAAC,KAAK,EAAE,WAAW,EAAE,KAAK,EAAE,WAAW,CAAC,CAAC;YACxE,KAAK,CAAC,GAAG,CAAC,EAAE,EAAE;gBACZ,KAAK,EAAE,UAAU,CAAC,aAAa,EAAE,WAAW,CAAC;gBAC7C,KAAK,EAAE,aAAa;aACrB,CAAC,CAAC;YACH,OAAO,aAAa,CAAC;QACvB,CAAC;QACD,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,KAAsB,CAAC,CAAC;QACjD,KAAK,CAAC,GAAG,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC;QAChC,OAAO,KAAK,CAAC;IACf,CAAC,CAAC;AACJ,CAAC"}
+{"version":3,"file":"cache.js","sourceRoot":"","sources":["../../lib/middlewares/cache.ts"],"names":[],"mappings":"AAOA,MAAM,UAAU,KAAK,CAKnB,EACA,MAAM,GAAG,CAAC,EAAE,OAAO,GAAG,EAAE,EAAE,MAAM,GAAG,MAAM,EAAE,IAAI,EAAK,EAAE,EAAE;IACtD,IAAI,MAAM,KAAK,MAAM,IAAI,OAAO,CAAC,EAAE,EAAE,CAAC;QACpC,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,OAAO,CAAC,EAAE,EAAE,CAAC;IACzC,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC,EACD,KAAK,EACL,eAAe,EACf,iBAAiB,EACjB,UAAU,EACV,SAAS,GA8BV;IACC;;;MAGE;IACF,OAAO,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;QAC3B,MAAM,EAAE,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;QACzB,IAAI,CAAC,EAAE,EAAE,CAAC;YACR,OAAO,IAAI,CAAC,KAAsB,CAAC,CAAC;QACtC,CAAC;QACD,IAAI,MAAM,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC;YACxB,MAAM,EAAE,KAAK,EAAE,WAAW,EAAE,KAAK,EAAE,WAAW,EAAE,GAAG,MAAM,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YACvE,IAAI,eAAe,CAAC,KAAK,EAAE,WAAW,EAAE,WAAW,CAAC,EAAE,CAAC;gBACrD,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,KAAsB,CAAC,CAAC;gBACjD,KAAK,CAAC,GAAG,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC;gBAChC,OAAO,KAAK,CAAC;YACf,CAAC;YACD,MAAM,aAAa,GAAG,iBAAiB,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC;YAC5D,IAAI,aAAa,KAAK,SAAS,EAAE,CAAC;gBAChC,OAAO,WAAW,CAAC;YACrB,CAAC;YACD,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,aAA8B,CAAC,CAAC;YACzD,MAAM,aAAa,GAAG,SAAS,CAAC,KAAK,EAAE,WAAW,EAAE,KAAK,EAAE,WAAW,CAAC,CAAC;YACxE,KAAK,CAAC,GAAG,CAAC,EAAE,EAAE;gBACZ,KAAK,EAAE,UAAU,CAAC,aAAa,EAAE,WAAW,CAAC;gBAC7C,KAAK,EAAE,aAAa;aACrB,CAAC,CAAC;YACH,OAAO,aAAa,CAAC;QACvB,CAAC;QACD,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,KAAsB,CAAC,CAAC;QACjD,KAAK,CAAC,GAAG,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC;QAChC,OAAO,KAAK,CAAC;IACf,CAAC,CAAC;AACJ,CAAC"}

package/dist/middlewares/fetchLocal.d.ts

@@ -1,14 +1,9 @@
-import type { CustomFieldMap, Handler, Query } from "../types";
+import type { Handler, Query } from "../types";
 /**
  * Performs the fetch query on local data.
  *
  * @returns Promise that resolves to the response.
  */
-export declare function fetchLocal<T extends object>(): Handler<Query<T, undefined> & {
+export declare function fetchLocal<T extends object>(): Handler<Query<T> & {
     type: T[];
-    customFields: never;
-}, any, never, never>;
-export declare function fetchLocal<T extends object, C extends CustomFieldMap<T>>(): Handler<Query<T, C> & {
-    type: T[];
-    customFields: C;
 }, any, never, never>;

package/dist/middlewares/fetchLocal.js

@@ -1,4 +1,9 @@
 import { queryItemList } from "../tools/queryItemList.js";
+/**
+ * Performs the fetch query on local data.
+ *
+ * @returns Promise that resolves to the response.
+ */
 export function fetchLocal() {
     return async (query, _) => queryItemList(query);
 }

package/dist/middlewares/fetchLocal.js.map

@@ -1 +1 @@
-{"version":3,"file":"fetchLocal.js","sourceRoot":"","sources":["../../lib/middlewares/fetchLocal.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAkB1D,MAAM,UAAU,UAAU;IASxB,OAAO,KAAK,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;AAClD,CAAC"}
+{"version":3,"file":"fetchLocal.js","sourceRoot":"","sources":["../../lib/middlewares/fetchLocal.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAG1D;;;;GAIG;AACH,MAAM,UAAU,UAAU;IAMxB,OAAO,KAAK,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;AAClD,CAAC"}

package/dist/tools/defineCheckQuery.d.ts

@@ -1,22 +1,18 @@
-import type { CustomFieldMap, Query } from "../types";
+import type { Query } from "../types";
 /**
  * Returns a function that checks queries. This is useful to prevent the query to have its type being narrowed if declared outside of a custom fetcher function argument.
  *
  * @returns Function that checks queries.
  */
 export declare function defineCheckQuery<M extends Record<string, object>>(): {
-    <T extends object, C extends CustomFieldMap<T>, const Q extends Query<T, C>>(query: Q & {
+    <T extends object, const Q extends Query<T>>(query: Q & {
         type: T[];
-        customFields?: C | undefined;
     }): Q & {
         type: T[];
-        customFields?: C | undefined;
     };
-    <K extends keyof M, T_1 extends M[K], C_1 extends CustomFieldMap<T_1>, const Q_1 extends Query<T_1, C_1>>(query: Q_1 & {
+    <K extends keyof M, T_1 extends M[K], const Q_1 extends Query<T_1>>(query: Q_1 & {
         type: K;
-        customFields?: C_1 | undefined;
     }): Q_1 & {
         type: K;
-        customFields?: C_1 | undefined;
     };
 };

package/dist/tools/defineCheckQuery.js.map

@@ -1 +1 @@
-{"version":3,"file":"defineCheckQuery.js","sourceRoot":"","sources":["../../lib/tools/defineCheckQuery.ts"],"names":[],"mappings":"AAEA;;;;GAIG;AACH,MAAM,UAAU,gBAAgB;IAY9B,SAAS,UAAU,CAKjB,KAA8C;QAC9C,OAAO,KAAK,CAAC;IACf,CAAC;IACD,OAAO,UAAU,CAAC;AACpB,CAAC"}
+{"version":3,"file":"defineCheckQuery.js","sourceRoot":"","sources":["../../lib/tools/defineCheckQuery.ts"],"names":[],"mappings":"AAEA;;;;GAIG;AACH,MAAM,UAAU,gBAAgB;IAS9B,SAAS,UAAU,CAIjB,KAA4B;QAC5B,OAAO,KAAK,CAAC;IACf,CAAC;IACD,OAAO,UAAU,CAAC;AACpB,CAAC"}

package/dist/tools/defineCustomFetch.d.ts

@@ -1,27 +1,15 @@
-import type { CustomFieldMap, Handler, Key, Query, Result } from "../types";
+import type { Handler, Key, Query, Result } from "../types";
 /**
+ * Returns a custom fetch function that handles a `query`
  *
- *
- * @param handler
- * @returns
+ * @param handler The query handler.
+ * @returns A custom fetch function.
  */
-export declare function defineCustomFetch<M extends Record<string, object>>(handler: Handler<Query<any, any> & {
+export declare function defineCustomFetch<M extends Record<string, object>>(handler: Handler<Query<any> & {
     type: Key | any[];
-    customFields?: CustomFieldMap<any>;
 }, any, never, never>): {
-    <K extends keyof M, T extends M[K], const Q extends Query<T, undefined>>(query: Q & {
+    <K extends keyof M, T extends M[K], const Q extends Query<T>>(query: Q & {
         type: K;
-        customFields?: undefined;
-    }): Promise<Result<T, Q, undefined>>;
-    <K_1 extends keyof M, T_1 extends M[K_1], const Q_1 extends Query<T_1, C>, const C extends CustomFieldMap<T_1>>(query: Q_1 & {
-        type: K_1;
-        customFields: C;
-    }): Promise<Result<T_1, Q_1, C>>;
-    <T_2 extends object, const Q_2 extends Query<T_2, undefined>>(type: T_2[], query: Q_2 & {
-        customFields?: undefined;
-    }): Promise<Result<T_2, Q_2, undefined>>;
-    <T_3 extends object, const Q_3 extends Query<T_3, C_1>, const C_1 extends CustomFieldMap<T_3>>(query: Q_3 & {
-        type: T_3[];
-        customFields: C_1;
-    }): Promise<Result<T_3, Q_3, C_1>>;
+    }): Promise<Result<T, Q>>;
+    <T_1 extends object, const Q_1 extends Query<T_1>>(type: T_1[], query: Q_1): Promise<Result<T_1, Q_1>>;
 };

package/dist/tools/defineCustomFetch.js

@@ -1,9 +1,9 @@
 import { cork } from "./cork.js";
 /**
+ * Returns a custom fetch function that handles a `query`
  *
- *
- * @param handler
- * @returns
+ * @param handler The query handler.
+ * @returns A custom fetch function.
  */
 export function defineCustomFetch(handler) {
     async function customFetch(query) {

package/dist/tools/defineCustomFetch.js.map

@@ -1 +1 @@
-{"version":3,"file":"defineCustomFetch.js","sourceRoot":"","sources":["../../lib/tools/defineCustomFetch.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEjC;;;;;GAKG;AACH,MAAM,UAAU,iBAAiB,CAC/B,OAKC;IA2BD,KAAK,UAAU,WAAW,CAKxB,KAA8C;QAC9C,OAAO,MAAM,OAAO,CAAC,KAAY,EAAE,IAAI,CAAC,CAAC;IAC3C,CAAC;IACD,OAAO,WAAW,CAAC;AACrB,CAAC"}
+{"version":3,"file":"defineCustomFetch.js","sourceRoot":"","sources":["../../lib/tools/defineCustomFetch.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEjC;;;;;GAKG;AACH,MAAM,UAAU,iBAAiB,CAC/B,OAAuE;IAWvE,KAAK,UAAU,WAAW,CAIxB,KAA4B;QAC5B,OAAO,MAAM,OAAO,CAAC,KAAY,EAAE,IAAI,CAAC,CAAC;IAC3C,CAAC;IACD,OAAO,WAAW,CAAC;AACrB,CAAC"}

package/dist/tools/defineGenericFetch.d.ts

@@ -1,14 +1,15 @@
-import type { CustomFieldMap, Handler, Key, Query, Result } from "../types";
-export declare function defineGenericFetch<K extends string>(handler: Handler<Query<any, any> & {
+import type { Handler, Key, Query, Result } from "../types";
+/**
+ * Returns a generic fetch function that has to be called like this:
+ * ```ts
+ * genericFetch<T>()(query)
+ * ```
+ *
+ * @param handler The query handler.
+ * @returns A curried generic fetch function.
+ */
+export declare function defineGenericFetch<K extends string>(handler: Handler<Query<any> & {
     type: Key | any[];
-    customFields?: CustomFieldMap<any>;
-}, any, never, never>): <T extends object>() => {
-    <const Q extends Query<T, undefined>>(query: Q & {
-        type: K | T[];
-        customFields?: undefined;
-    }): Promise<Result<T, Q, undefined>>;
-    <const Q_1 extends Query<T, C>, const C extends CustomFieldMap<T>>(query: Q_1 & {
-        type: K | T[];
-        customFields: C;
-    }): Promise<Result<T, Q_1, C>>;
-};
+}, any, never, never>): <T extends object>() => <const Q extends Query<T>>(query: Q & {
+    type: K | T[];
+}) => Promise<Result<T, Q>>;

package/dist/tools/defineGenericFetch.js

@@ -1,4 +1,13 @@
 import { cork } from "./cork.js";
+/**
+ * Returns a generic fetch function that has to be called like this:
+ * ```ts
+ * genericFetch<T>()(query)
+ * ```
+ *
+ * @param handler The query handler.
+ * @returns A curried generic fetch function.
+ */
 export function defineGenericFetch(handler) {
     // FIXME: Until https://github.com/microsoft/TypeScript/issues/26242 gets resolved, the fetcher needs to be curried
     function genericFetch() {

package/dist/tools/defineGenericFetch.js.map

@@ -1 +1 @@
-{"version":3,"file":"defineGenericFetch.js","sourceRoot":"","sources":["../../lib/tools/defineGenericFetch.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEjC,MAAM,UAAU,kBAAkB,CAChC,OAKC;IAED,mHAAmH;IACnH,SAAS,YAAY;QAQnB,KAAK,UAAU,WAAW,CAIxB,KAA8C;YAE9C,OAAO,MAAM,OAAO,CAAC,KAAY,EAAE,IAAI,CAAC,CAAC;QAC3C,CAAC;QACD,OAAO,WAAW,CAAC;IACrB,CAAC;IACD,OAAO,YAAY,CAAC;AACtB,CAAC"}
+{"version":3,"file":"defineGenericFetch.js","sourceRoot":"","sources":["../../lib/tools/defineGenericFetch.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEjC;;;;;;;;GAQG;AACH,MAAM,UAAU,kBAAkB,CAChC,OAAuE;IAEvE,mHAAmH;IACnH,SAAS,YAAY;QACnB,KAAK,UAAU,WAAW,CACxB,KAA4B;YAE5B,OAAO,MAAM,OAAO,CAAC,KAAY,EAAE,IAAI,CAAC,CAAC;QAC3C,CAAC;QACD,OAAO,WAAW,CAAC;IACrB,CAAC;IACD,OAAO,YAAY,CAAC;AACtB,CAAC"}

package/dist/tools/filterItem.d.ts

@@ -1,5 +1,5 @@
 import type { Filter } from "../types";
-import type { QuerySettings } from "../types/QuerySettings";
+import type { QuerySettings } from "../types/QuerySettings.js";
 /**
  * Checks wether the provided `value` matches the `filter` or not.
  *

package/dist/tools/filterItem.js

@@ -63,6 +63,9 @@ export function filterItem(filter, value, settings) {
             }
             return filterItem(filter[SymbolCache], value);
         }
+        case "custom": {
+            return filter.value(value);
+        }
         case "startWith":
             return (value[filter.field]?.startsWith(filter.value) ??
                 false);

package/dist/tools/filterItem.js.map

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

package/dist/tools/queryItemList.d.ts

@@ -1,10 +1,5 @@
-import type { CustomFieldMap, Query, Result } from "../types.js";
-declare function queryItemList<T extends object, const Q extends Query<T, undefined>>(query: Q & {
+import type { Query, Result } from "../types.js";
+declare function queryItemList<T extends object, const Q extends Query<T>>(query: Q & {
     type: T[];
-    customFields?: never;
-}): Result<T, Q, undefined>;
-declare function queryItemList<T extends object, const Q extends Query<T, C>, const C extends CustomFieldMap<T>>(query: Q & {
-    type: T[];
-    customFields: C;
-}): Result<T, Q, C>;
+}): Result<T, Q>;
 export { queryItemList };

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/types/CustomFetch.d.ts

@@ -1,11 +1,5 @@
-import type { CustomFieldMap } from "./CustomFieldMap";
 import type { Query } from "./Query";
 import type { Result } from "./Result";
 export interface CustomFetch<T extends object> {
-    <Q extends Query<T, {}>>(query: Q & {
-        customFields?: never;
-    }): Promise<Result<T, Q, {}>>;
-    <Q extends Query<T, C>, C extends CustomFieldMap<T>>(query: Q & {
-        customFields: C;
-    }): Promise<Result<T, Q, C>>;
+    <Q extends Query<T>>(query: Q): Promise<Result<T, Q>>;
 }

package/dist/types/Group.d.ts

@@ -1,8 +1,6 @@
-import type { CustomFieldAggregateMap } from "./CustomFieldAggregateMap";
 /**
  * Specifies how items should be grouped.
  */
 export type Group<T extends object> = keyof T | {
     field: keyof T;
-    customFields?: CustomFieldAggregateMap<T>;
 };

package/dist/types/Parameters.d.ts

@@ -0,0 +1 @@
+export type Parameters = Record<string, string | string[] | number | number[]>;

package/dist/types/Parameters.js

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

package/dist/types/Parameters.js.map

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

package/dist/types/Query.d.ts

@@ -1,6 +1,3 @@
-import type { Context } from "./Context";
-import type { CustomFieldMap } from "./CustomFieldMap";
-import type { InjectCustomFields } from "./InjectCustomFields";
 import type { QueryAggregate } from "./QueryAggregate";
 import type { QueryCreate } from "./QueryCreate";
 import type { QueryCreateMultiple } from "./QueryCreateMultiple";
@@ -8,44 +5,13 @@ import type { QueryDelete } from "./QueryDelete";
 import type { QueryDeleteMultiple } from "./QueryDeleteMultiple";
 import type { QueryRead } from "./QueryRead";
 import type { QueryReadMultiple } from "./QueryReadMultiple";
-import type { QuerySettings } from "./QuerySettings";
 import type { QueryUpdate } from "./QueryUpdate";
 import type { QueryUpdateMultiple } from "./QueryUpdateMultiple";
-type QueryBase<T extends object> = QueryRead<T> | QueryReadMultiple<T> | QueryCreate<T> | QueryCreateMultiple<T> | QueryUpdate<T> | QueryUpdateMultiple<T> | QueryDelete<T> | QueryDeleteMultiple<T> | QueryAggregate<T>;
 /**
  * Query that fetches or mutates an entity.
  */
 export type Query<
 /**
- * Type.
+ * Type of the object item to be queried.
  */
-T extends object, 
-/**
- * Custom fields.
- */
-C extends CustomFieldMap<T> | undefined, 
-/**
- * Methods.
- */
-M extends QueryBase<never>["method"] = QueryBase<never>["method"], 
-/**
- * Multiple.
- */
-L extends boolean | undefined = boolean> = Extract<QueryBase<InjectCustomFields<T, C>>, {
-    method?: M;
-    multiple?: L;
-}> & {
-    /**
-     * Common item properties to use for identifying the item.
-     */
-    context?: Context<T>;
-    /**
-     * Query parameters.
-     */
-    parameters?: Record<string, string | string[] | number | number[]>;
-    /**
-     * Query settings.
-     */
-    settings?: QuerySettings<T>;
-};
-export {};
+T extends object> = QueryRead<T> | QueryReadMultiple<T> | QueryCreate<T> | QueryCreateMultiple<T> | QueryUpdate<T> | QueryUpdateMultiple<T> | QueryDelete<T> | QueryDeleteMultiple<T> | QueryAggregate<T>;

package/dist/types/QueryAggregate.d.ts

@@ -1,10 +1,25 @@
 import type { AggregateFunction } from "./AggregateFunction";
+import type { Context } from "./Context";
 import type { Filter } from "./Filter";
+import type { Parameters } from "./Parameters";
+import type { QuerySettings } from "./QuerySettings";
 /**
  * Query for computing an aggregated value.
  */
 export type QueryAggregate<T extends object> = {
     method: "aggregate";
+    /**
+     * Common item properties to use for identifying the item.
+     */
+    context?: Context<T>;
     aggregator: AggregateFunction<T>;
     filter?: Filter<T>;
+    /**
+     * Query parameters.
+     */
+    parameters?: Parameters;
+    /**
+     * Query settings.
+     */
+    settings?: QuerySettings<T>;
 };

package/dist/types/QueryCreate.d.ts

@@ -1,8 +1,26 @@
+import type { Context } from "./Context";
+import type { Parameters } from "./Parameters";
+import type { QuerySettings } from "./QuerySettings";
 /**
  * Query for creating an item.
  */
 export type QueryCreate<T extends object> = {
     method: "create";
     multiple?: false;
+    /**
+     * Common item properties to use for identifying the context in which to create the item.
+     */
+    context?: Context<T>;
+    /**
+     * Value properties of the item to create.
+     */
     value: Partial<T>;
+    /**
+     * Query parameters.
+     */
+    parameters?: Parameters;
+    /**
+     * Query settings.
+     */
+    settings?: QuerySettings<T>;
 };

package/dist/types/QueryCreateMultiple.d.ts

@@ -1,8 +1,23 @@
+import type { Context } from "./Context";
+import type { Parameters } from "./Parameters";
+import type { QuerySettings } from "./QuerySettings";
 /**
  * Query for creating multiple items.
  */
 export type QueryCreateMultiple<T extends object> = {
     method: "create";
     multiple: true;
+    /**
+     * Common item properties to use for identifying the context in which to create the items.
+     */
+    context?: Context<T>;
     value: Partial<T>[];
+    /**
+     * Query parameters.
+     */
+    parameters?: Parameters;
+    /**
+     * Query settings.
+     */
+    settings?: QuerySettings<T>;
 };

package/dist/types/QueryDelete.d.ts

@@ -1,11 +1,24 @@
-import type { CustomFieldMap } from "./CustomFieldMap";
+import type { Context } from "./Context";
 import type { Filter } from "./Filter";
+import type { Parameters } from "./Parameters";
+import type { QuerySettings } from "./QuerySettings";
 /**
  * Query for deleting an item.
  */
 export type QueryDelete<T extends object> = {
     method: "delete";
     multiple?: false;
+    /**
+     * Common item properties to use for identifying the context in which to delete the item.
+     */
+    context?: Context<T>;
     filter?: Filter<T>;
-    customFields?: CustomFieldMap<T>;
+    /**
+     * Query parameters.
+     */
+    parameters?: Parameters;
+    /**
+     * Query settings.
+     */
+    settings?: QuerySettings<T>;
 };

package/dist/types/QueryDeleteMultiple.d.ts

@@ -1,11 +1,24 @@
-import type { CustomFieldMap } from "./CustomFieldMap";
+import type { Context } from "./Context";
 import type { Filter } from "./Filter";
+import type { Parameters } from "./Parameters";
+import type { QuerySettings } from "./QuerySettings";
 /**
  * Query for deleting multiple items.
  */
 export type QueryDeleteMultiple<T extends object> = {
     method: "delete";
     multiple: true;
+    /**
+     * Common item properties to use for identifying the context in which to delete the item.
+     */
+    context?: Context<T>;
     filter?: Filter<T>;
-    customFields?: CustomFieldMap<T>;
+    /**
+     * Query parameters.
+     */
+    parameters?: Parameters;
+    /**
+     * Query settings.
+     */
+    settings?: QuerySettings<T>;
 };

package/dist/types/QueryMethod.d.ts

@@ -2,4 +2,4 @@ import type { Query } from "./Query";
 /**
  * Available query methods.
  */
-export type QueryMethod = Exclude<Query<never, never>["method"], undefined>;
+export type QueryMethod = Exclude<Query<never>["method"], undefined>;

package/dist/types/QueryRead.d.ts

@@ -1,11 +1,18 @@
+import type { Context } from "./Context";
 import type { Filter } from "./Filter";
 import type { Order } from "./Order";
+import type { Parameters } from "./Parameters";
+import type { QuerySettings } from "./QuerySettings";
 /**
  * Query for reading a single item.
  */
 export type QueryRead<T extends object> = {
     method?: "read";
     multiple?: false;
+    /**
+     * Common item properties to use for identifying the context in which to delete the item.
+     */
+    context?: Context<T>;
     offset?: never;
     limit?: never;
     group?: never;
@@ -21,4 +28,12 @@ export type QueryRead<T extends object> = {
      * Order by which the items should be sorted.
      */
     order?: Order<T>[];
+    /**
+     * Query parameters.
+     */
+    parameters?: Parameters;
+    /**
+     * Query settings.
+     */
+    settings?: QuerySettings<T>;
 };