quetch 0.6.4 → 0.6.6

package/dist/middlewares/aggregate.js

@@ -24,14 +24,14 @@ export function aggregate({ queryGroupId = ({ type, method = "get" }) => {
     }
     return `${context.id}`;
 }, mergeQuery = (query, _currentQuery) => query, delay = 200, queryForGroup = (queryList, _) => ({
-    type: queryList[0].type,
-    method: "read",
-    multiple: true,
     filter: {
-        operator: "include",
         field: "id",
+        operator: "include",
         value: queryList.map((query) => query.context.id),
     },
+    method: "read",
+    multiple: true,
+    type: queryList[0].type,
 }), resultForQuery = (resultList, query) => {
     const result = resultList.find((result) => result.id === query.context.id);
     if (result === undefined) {
@@ -59,8 +59,8 @@ export function aggregate({ queryGroupId = ({ type, method = "get" }) => {
                         ? next(queryMap.values().next().value)
                         : next(queryForGroup([...queryMap.values()], groupId));
                 })(),
-                requestMap: new Map(),
                 queryMap,
+                requestMap: new Map(),
             });
         }
         const { groupRequest, requestMap, queryMap } = queryGroupMap.get(groupId);

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/combine.js

@@ -1,10 +1,12 @@
 function combine(...handlerList) {
+    // eslint-disable-next-line func-names
     return function (input, next) {
         function dispatch(input, index) {
             const handler = handlerList[index];
             if (!handler) {
                 return next(input);
             }
+            // eslint-disable-next-line func-names, prefer-arrow-callback
             const result = handler(input, function (input) {
                 return dispatch(input, index + 1);
             });

package/dist/middlewares/combine.js.map

@@ -1 +1 @@
-{"version":3,"file":"combine.js","sourceRoot":"","sources":["../../lib/middlewares/combine.ts"],"names":[],"mappings":"AAs2BA,SAAS,OAAO,CA8Cd,GAAG,WAsBF;IAED,OAAO,UAAU,KAAK,EAAE,IAAI;QAC1B,SAAS,QAAQ,CAAC,KAAU,EAAE,KAAa;YACzC,MAAM,OAAO,GAAG,WAAW,CAAC,KAAK,CAAC,CAAC;YACnC,IAAI,CAAC,OAAO,EAAE;gBACZ,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC;aACpB;YACD,MAAM,MAAM,GAAQ,OAAO,CAAC,KAAK,EAAE,UAAU,KAAK;gBAChD,OAAO,QAAQ,CAAC,KAAK,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC;YACpC,CAAC,CAAC,CAAC;YACH,IAAI,MAAM,KAAK,SAAS,EAAE;gBACxB,MAAM,IAAI,KAAK,CAAC,oBAAoB,KAAK,4BAA4B,CAAC,CAAC;aACxE;YACD,OAAO,MAAM,CAAC;QAChB,CAAC;QACD,OAAO,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;IAC5B,CAAC,CAAC;AACJ,CAAC;AAED,OAAO,EAAE,OAAO,EAAE,CAAC"}
+{"version":3,"file":"combine.js","sourceRoot":"","sources":["../../lib/middlewares/combine.ts"],"names":[],"mappings":"AAs2BA,SAAS,OAAO,CA8Cd,GAAG,WAsBF;IAED,sCAAsC;IACtC,OAAO,UAAU,KAAK,EAAE,IAAI;QAC1B,SAAS,QAAQ,CAAC,KAAU,EAAE,KAAa;YACzC,MAAM,OAAO,GAAG,WAAW,CAAC,KAAK,CAAC,CAAC;YACnC,IAAI,CAAC,OAAO,EAAE;gBACZ,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC;aACpB;YACD,6DAA6D;YAC7D,MAAM,MAAM,GAAQ,OAAO,CAAC,KAAK,EAAE,UAAU,KAAK;gBAChD,OAAO,QAAQ,CAAC,KAAK,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC;YACpC,CAAC,CAAC,CAAC;YACH,IAAI,MAAM,KAAK,SAAS,EAAE;gBACxB,MAAM,IAAI,KAAK,CAAC,oBAAoB,KAAK,4BAA4B,CAAC,CAAC;aACxE;YACD,OAAO,MAAM,CAAC;QAChB,CAAC;QACD,OAAO,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;IAC5B,CAAC,CAAC;AACJ,CAAC;AAED,OAAO,EAAE,OAAO,EAAE,CAAC"}

package/dist/middlewares/fetchLocal.d.ts

@@ -4,7 +4,7 @@ import type { CustomFieldMap, Handler, Query } from "../types";
  *
  * @returns Promise that resolves to the response.
  */
-export declare function fetchLocal<T extends object>(): Handler<Query<T, {}> & {
+export declare function fetchLocal<T extends object>(): Handler<Query<T, undefined> & {
     type: T[];
     customFields: never;
 }, any, never, never>;

package/dist/middlewares/log.js

@@ -1,3 +1,4 @@
+/* global process, console */
 import { identity } from "./identity.js";
 /**
  * Logs the outgoing query and the incoming result or the error.

package/dist/middlewares/log.js.map

@@ -1 +1 @@
-{"version":3,"file":"log.js","sourceRoot":"","sources":["../../lib/middlewares/log.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAEzC;;;;;GAKG;AACH,MAAM,UAAU,GAAG,CAAe,KAAK,GAAG,OAAO;IAC/C,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,YAAY,EAAE;QACzC,OAAO,QAAQ,CAAC;KACjB;IACD,OAAO,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;QAC3B,+BAA+B;QAC/B,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QACrB,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QAC7B,IAAI;YACF,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,KAAsB,CAAC,CAAC;YAClD,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;YAC9B,OAAO,CAAC,QAAQ,EAAE,CAAC;YACnB,OAAO,MAAsB,CAAC;SAC/B;QAAC,OAAO,KAAK,EAAE;YACd,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;YAC5B,OAAO,CAAC,QAAQ,EAAE,CAAC;YACnB,MAAM,KAAK,CAAC;SACb;QACD,8BAA8B;IAChC,CAAC,CAAC;AACJ,CAAC"}
+{"version":3,"file":"log.js","sourceRoot":"","sources":["../../lib/middlewares/log.ts"],"names":[],"mappings":"AAAA,6BAA6B;AAI7B,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAEzC;;;;;GAKG;AACH,MAAM,UAAU,GAAG,CAAe,KAAK,GAAG,OAAO;IAC/C,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,YAAY,EAAE;QACzC,OAAO,QAAQ,CAAC;KACjB;IACD,OAAO,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;QAC3B,+BAA+B;QAC/B,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QACrB,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QAC7B,IAAI;YACF,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,KAAsB,CAAC,CAAC;YAClD,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;YAC9B,OAAO,CAAC,QAAQ,EAAE,CAAC;YACnB,OAAO,MAAsB,CAAC;SAC/B;QAAC,OAAO,KAAK,EAAE;YACd,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;YAC5B,OAAO,CAAC,QAAQ,EAAE,CAAC;YACnB,MAAM,KAAK,CAAC;SACb;QACD,8BAA8B;IAChC,CAAC,CAAC;AACJ,CAAC"}

package/dist/tools/defineCustomFetch.d.ts

@@ -9,17 +9,17 @@ export declare function defineCustomFetch<M extends Record<string, object>>(hand
     type: Key | any[];
     customFields?: CustomFieldMap<any>;
 }, any, never, never>): {
-    <K extends keyof M, T extends M[K], const Q extends Query<T, {}>>(query: Q & {
+    <K extends keyof M, T extends M[K], const Q extends Query<T, undefined>>(query: Q & {
         type: K;
         customFields?: undefined;
-    }): Promise<Result<T, Q, {}>>;
+    }): 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, {}>>(type: T_2[], query: Q_2 & {
+    <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, {}>>;
+    }): 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;

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;IAsBD,KAAK,UAAU,WAAW,CAKxB,KAA8C;QAC9C,OAAO,MAAM,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;IACpC,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,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"}

package/dist/tools/defineGenericFetch.d.ts

@@ -3,10 +3,10 @@ export declare function defineGenericFetch<K extends string>(handler: Handler<Qu
     type: Key | any[];
     customFields?: CustomFieldMap<any>;
 }, any, never, never>): <T extends object>() => {
-    <const Q extends Query<T, {}>>(query: Q & {
+    <const Q extends Query<T, undefined>>(query: Q & {
         type: K | T[];
         customFields?: undefined;
-    }): Promise<Result<T, Q, {}>>;
+    }): 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;

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,KAAK,EAAE,IAAI,CAAC,CAAC;QACpC,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,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"}

package/dist/tools/filterFromContext.js

@@ -3,8 +3,8 @@ export function filterFromContext(context) {
     return {
         operator: "all",
         value: entries(context).map(([field, value]) => ({
-            operator: "equal",
             field,
+            operator: "equal",
             value,
         })),
     };

package/dist/tools/filterFromContext.js.map

@@ -1 +1 @@
-{"version":3,"file":"filterFromContext.js","sourceRoot":"","sources":["../../lib/tools/filterFromContext.ts"],"names":[],"mappings":"AAEA,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC;AAE3B,MAAM,UAAU,iBAAiB,CAC/B,OAAmB;IAEnB,OAAO;QACL,QAAQ,EAAE,KAAK;QACf,KAAK,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC;YAC/C,QAAQ,EAAE,OAAO;YACjB,KAAK;YACL,KAAK;SACN,CAAC,CAAgB;KACnB,CAAC;AACJ,CAAC"}
+{"version":3,"file":"filterFromContext.js","sourceRoot":"","sources":["../../lib/tools/filterFromContext.ts"],"names":[],"mappings":"AAEA,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC;AAE3B,MAAM,UAAU,iBAAiB,CAC/B,OAAmB;IAEnB,OAAO;QACL,QAAQ,EAAE,KAAK;QACf,KAAK,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC;YAC/C,KAAK;YACL,QAAQ,EAAE,OAAO;YACjB,KAAK;SACN,CAAC,CAAgB;KACnB,CAAC;AACJ,CAAC"}

package/dist/tools/normalizeOrder.js

@@ -3,8 +3,8 @@ export function normalizeOrder(order) {
         return order;
     }
     return {
-        field: order,
         descending: false,
+        field: order,
     };
 }
 //# sourceMappingURL=normalizeOrder.js.map

package/dist/tools/normalizeOrder.js.map

@@ -1 +1 @@
-{"version":3,"file":"normalizeOrder.js","sourceRoot":"","sources":["../../lib/tools/normalizeOrder.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,cAAc,CAC5B,KAAe;IAEf,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;QAC7B,OAAO,KAAK,CAAC;KACd;IACD,OAAO;QACL,KAAK,EAAE,KAAK;QACZ,UAAU,EAAE,KAAK;KAClB,CAAC;AACJ,CAAC"}
+{"version":3,"file":"normalizeOrder.js","sourceRoot":"","sources":["../../lib/tools/normalizeOrder.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,cAAc,CAC5B,KAAe;IAEf,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;QAC7B,OAAO,KAAK,CAAC;KACd;IACD,OAAO;QACL,UAAU,EAAE,KAAK;QACjB,KAAK,EAAE,KAAK;KACb,CAAC;AACJ,CAAC"}

package/dist/tools/queryItemList.d.ts

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

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

@@ -1,6 +1,6 @@
 /**
  * Returns object type with field extending the provided `P` type.
  */
-export type FilterKeys<T extends object, P> = {
-    [K in keyof T]-?: T[K] extends P ? K : never;
-}[keyof T];
+export type FilterKeys<T extends object, P> = keyof T & keyof {
+    [K in keyof T as T[K] extends P ? K : never]-?: T[K];
+};

package/dist/types/Result.d.ts

@@ -2,19 +2,17 @@ import type { CustomFieldMap } from "./CustomFieldMap";
 import type { InjectCustomFields } from "./InjectCustomFields";
 import type { Item } from "./Item";
 import type { Query } from "./Query";
-export type PickFields<T extends object, F extends string | number | symbol> = [
-    F
-] extends [keyof T] ? {
+export type PickFields<T extends object | undefined, 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, C>, C extends CustomFieldMap<T>, U extends InjectCustomFields<T, C> = InjectCustomFields<T, C>> = [C] extends [CustomFieldMap<T>] ? [Q] extends [{
+export type ResultRead<T extends object, Q extends Query<T, C>, C extends CustomFieldMap<T> | undefined, U extends InjectCustomFields<T, C> | undefined = InjectCustomFields<T, C>> = [C] extends [CustomFieldMap<T>] ? [Q] extends [{
     fields: (keyof U)[];
 }] ? PickFields<U, Item<Q["fields"]>> : U : [Q] extends [{
     fields: (keyof T)[];
 }] ? PickFields<T, Item<Q["fields"]>> : T;
-export type Result<T extends object, Q extends Query<T, C>, C extends CustomFieldMap<T>, U extends InjectCustomFields<T, C> = InjectCustomFields<T, C>> = [Q] extends [{
+export type Result<T extends object, Q extends Query<T, C>, C extends CustomFieldMap<T> | undefined, U extends InjectCustomFields<T, C> | undefined = InjectCustomFields<T, C>> = [Q] extends [{
     method: "read";
 }] ? [Q] extends [{
     multiple: true;

package/lib/middlewares/aggregate.ts

@@ -32,14 +32,14 @@ export function aggregate<I extends QueryAny, O, In extends QueryAny, On>({
   mergeQuery = (query, _currentQuery) => query,
   delay = 200,
   queryForGroup = (queryList, _): QueryAny => ({
-    type: queryList[0].type,
-    method: "read",
-    multiple: true,
     filter: {
-      operator: "include",
       field: "id",
+      operator: "include",
       value: queryList.map((query) => query.context!.id),
     },
+    method: "read",
+    multiple: true,
+    type: queryList[0].type,
   }),
   resultForQuery = (resultList, query) => {
     const result = resultList.find(
@@ -87,8 +87,8 @@ export function aggregate<I extends QueryAny, O, In extends QueryAny, On>({
                 queryForGroup([...queryMap.values()], groupId) as unknown as In,
               );
         })(),
-        requestMap: new Map(),
         queryMap,
+        requestMap: new Map(),
       });
     }
     const { groupRequest, requestMap, queryMap } = queryGroupMap.get(groupId)!;

package/lib/middlewares/combine.ts

@@ -938,12 +938,14 @@ function combine<
     Handler<I20, O20, I21, O21>?,
   ]
 ): Handler<I0, O0, I21, O21> {
+  // eslint-disable-next-line func-names
   return function (input, next) {
     function dispatch(input: any, index: number) {
       const handler = handlerList[index];
       if (!handler) {
         return next(input);
       }
+      // eslint-disable-next-line func-names, prefer-arrow-callback
       const result: any = handler(input, function (input) {
         return dispatch(input, index + 1);
       });

package/lib/middlewares/fetchLocal.ts

@@ -7,7 +7,7 @@ import type { CustomFieldMap, Handler, Query } from "../types";
  * @returns Promise that resolves to the response.
  */
 export function fetchLocal<T extends object>(): Handler<
-  Query<T, {}> & { type: T[]; customFields: never },
+  Query<T, undefined> & { type: T[]; customFields: never },
   any,
   never,
   never

package/lib/middlewares/log.ts

@@ -1,3 +1,5 @@
+/* global process, console */
+
 import type { Handler } from "../types";
 
 import { identity } from "./identity.js";

package/lib/tools/defineCustomFetch.ts

@@ -19,18 +19,23 @@ export function defineCustomFetch<M extends Record<string, object>>(
   async function customFetch<
     K extends keyof M,
     T extends M[K],
-    const Q extends Query<T, {}>,
-  >(query: Q & { type: K; customFields?: never }): Promise<Result<T, Q, {}>>;
+    const Q extends Query<T, undefined>,
+  >(
+    query: Q & { type: K; customFields?: never },
+  ): Promise<Result<T, Q, undefined>>;
   async function customFetch<
     K extends keyof M,
     T extends M[K],
     const Q extends Query<T, C>,
     const C extends CustomFieldMap<T>,
   >(query: Q & { type: K; customFields: C }): Promise<Result<T, Q, C>>;
-  async function customFetch<T extends object, const Q extends Query<T, {}>>(
+  async function customFetch<
+    T extends object,
+    const Q extends Query<T, undefined>,
+  >(
     type: T[],
     query: Q & { customFields?: never },
-  ): Promise<Result<T, Q, {}>>;
+  ): Promise<Result<T, Q, undefined>>;
   async function customFetch<
     T extends object,
     const Q extends Query<T, C>,
@@ -42,7 +47,7 @@ export function defineCustomFetch<M extends Record<string, object>>(
     const Q extends Query<T, C>,
     const C extends CustomFieldMap<T>,
   >(query: Q & { type: T[] | K; customFields?: C }): Promise<Result<T, Q, C>> {
-    return await handler(query, cork);
+    return await handler(query as any, cork);
   }
   return customFetch;
 }

package/lib/tools/defineGenericFetch.ts

@@ -12,9 +12,9 @@ export function defineGenericFetch<K extends string>(
 ) {
   // FIXME: Until https://github.com/microsoft/TypeScript/issues/26242 gets resolved, the fetcher needs to be curried
   function genericFetch<T extends object>() {
-    async function customFetch<const Q extends Query<T, {}>>(
+    async function customFetch<const Q extends Query<T, undefined>>(
       query: Q & { type: K | T[]; customFields?: never },
-    ): Promise<Result<T, Q, {}>>;
+    ): Promise<Result<T, Q, undefined>>;
     async function customFetch<
       const Q extends Query<T, C>,
       const C extends CustomFieldMap<T>,
@@ -25,7 +25,7 @@ export function defineGenericFetch<K extends string>(
     >(
       query: Q & { type: K | T[]; customFields?: C },
     ): Promise<Result<T, Q, C>> {
-      return await handler(query, cork);
+      return await handler(query as any, cork);
     }
     return customFetch;
   }

package/lib/tools/filterFromContext.ts

@@ -8,8 +8,8 @@ export function filterFromContext<T extends object>(
   return {
     operator: "all",
     value: entries(context).map(([field, value]) => ({
-      operator: "equal",
       field,
+      operator: "equal",
       value,
     })) as Filter<T>[],
   };

package/lib/tools/filterItem.test.ts

@@ -8,8 +8,8 @@ test("tests filter lists", () => {
       {
         operator: "all",
         value: [
-          { operator: "equal", field: "a", value: "foo" },
-          { operator: "equal", field: "b", value: "bar" },
+          { field: "a", operator: "equal", value: "foo" },
+          { field: "b", operator: "equal", value: "bar" },
         ],
       },
       { a: "foo", b: "bar" },
@@ -20,8 +20,8 @@ test("tests filter lists", () => {
       {
         operator: "all",
         value: [
-          { operator: "equal", field: "a", value: "foo" },
-          { operator: "equal", field: "b", value: "baz" },
+          { field: "a", operator: "equal", value: "foo" },
+          { field: "b", operator: "equal", value: "baz" },
         ],
       },
       { a: "foo", b: "bar" },
@@ -57,8 +57,8 @@ test("tests filter lists", () => {
       {
         operator: "any",
         value: [
-          { operator: "equal", field: "a", value: "foo" },
-          { operator: "equal", field: "b", value: "baz" },
+          { field: "a", operator: "equal", value: "foo" },
+          { field: "b", operator: "equal", value: "baz" },
         ],
       },
       { a: "foo", b: "bar" },
@@ -69,8 +69,8 @@ test("tests filter lists", () => {
       {
         operator: "none",
         value: [
-          { operator: "equal", field: "a", value: "a" },
-          { operator: "equal", field: "b", value: "b" },
+          { field: "a", operator: "equal", value: "a" },
+          { field: "b", operator: "equal", value: "b" },
         ],
       },
       { a: "foo", b: "bar" },
@@ -81,8 +81,8 @@ test("tests filter lists", () => {
       {
         operator: "none",
         value: [
-          { operator: "equal", field: "a", value: "a" },
-          { operator: "equal", field: "b", value: "b" },
+          { field: "a", operator: "equal", value: "a" },
+          { field: "b", operator: "equal", value: "b" },
         ],
       },
       { a: "foo", b: "bar" },
@@ -92,42 +92,42 @@ test("tests filter lists", () => {
 
 test("tests filter on string values", () => {
   expect(
-    filterItem({ operator: "equal", field: "a", value: "foo" }, { a: "foo" }),
+    filterItem({ field: "a", operator: "equal", value: "foo" }, { a: "foo" }),
   ).toBeTruthy();
   expect(
-    filterItem({ operator: "equal", field: "a", value: "bar" }, { a: "foo" }),
+    filterItem({ field: "a", operator: "equal", value: "bar" }, { a: "foo" }),
   ).toBeFalsy();
   expect(
     filterItem(
-      { operator: "notEqual", field: "a", value: "bar" },
+      { field: "a", operator: "notEqual", value: "bar" },
       { a: "foo" },
     ),
   ).toBeTruthy();
   expect(
     filterItem(
-      { operator: "include", field: "a", value: "bar" },
+      { field: "a", operator: "include", value: "bar" },
       { a: "foobar" },
     ),
   ).toBeTruthy();
   expect(
     filterItem(
-      { operator: "intersect", field: "a", value: ["foo", "bar", "foobar"] },
+      { field: "a", operator: "intersect", value: ["foo", "bar", "foobar"] },
       { a: "foobar" },
     ),
   ).toBeTruthy();
   expect(
     filterItem(
-      { operator: "intersect", field: "a", value: ["foo", "bar"] },
+      { field: "a", operator: "intersect", value: ["foo", "bar"] },
       { a: "foobar" },
     ),
   ).toBeFalsy();
   expect(
     filterItem(
       {
-        operator: "match",
         field: "a",
-        value: "^FOO",
+        operator: "match",
         options: { ignoreCase: true },
+        value: "^FOO",
       },
       { a: "foobar" },
     ),
@@ -135,10 +135,10 @@ test("tests filter on string values", () => {
   expect(
     filterItem(
       {
-        operator: "match",
         field: "a",
-        value: "FOO$",
+        operator: "match",
         options: { ignoreCase: true },
+        value: "FOO$",
       },
       { a: "foobar" },
     ),
@@ -147,26 +147,26 @@ test("tests filter on string values", () => {
 
 test("tests filter on number values", () => {
   expect(
-    filterItem({ operator: "equal", field: "a", value: 1 }, { a: 1 }),
+    filterItem({ field: "a", operator: "equal", value: 1 }, { a: 1 }),
   ).toBeTruthy();
   expect(
-    filterItem({ operator: "notEqual", field: "a", value: 2 }, { a: 1 }),
+    filterItem({ field: "a", operator: "notEqual", value: 2 }, { a: 1 }),
   ).toBeTruthy();
   expect(
-    filterItem({ operator: "greaterThan", field: "a", value: 0 }, { a: 1 }),
+    filterItem({ field: "a", operator: "greaterThan", value: 0 }, { a: 1 }),
   ).toBeTruthy();
   expect(
     filterItem(
-      { operator: "greaterThanOrEqual", field: "a", value: 1 },
+      { field: "a", operator: "greaterThanOrEqual", value: 1 },
       { a: 1 },
     ),
   ).toBeTruthy();
   expect(
-    filterItem({ operator: "lowerThan", field: "a", value: 2 }, { a: 1 }),
+    filterItem({ field: "a", operator: "lowerThan", value: 2 }, { a: 1 }),
   ).toBeTruthy();
   expect(
     filterItem(
-      { operator: "lowerThanOrEqual", field: "a", value: 1 },
+      { field: "a", operator: "lowerThanOrEqual", value: 1 },
       { a: 1 },
     ),
   ).toBeTruthy();
@@ -174,29 +174,29 @@ test("tests filter on number values", () => {
 
 test("tests filter on array values", () => {
   expect(
-    filterItem({ operator: "equal", field: "a", value: [2, 1] }, { a: [1, 2] }),
+    filterItem({ field: "a", operator: "equal", value: [2, 1] }, { a: [1, 2] }),
   ).toBeTruthy();
   expect(
-    filterItem({ operator: "equal", field: "a", value: [2] }, { a: [1, 2] }),
+    filterItem({ field: "a", operator: "equal", value: [2] }, { a: [1, 2] }),
   ).toBeFalsy();
   expect(
-    filterItem({ operator: "include", field: "a", value: [1] }, { a: [1, 2] }),
+    filterItem({ field: "a", operator: "include", value: [1] }, { a: [1, 2] }),
   ).toBeTruthy();
   expect(
     filterItem(
-      { operator: "include", field: "a", value: [2, 3] },
+      { field: "a", operator: "include", value: [2, 3] },
       { a: [1, 2] },
     ),
   ).toBeFalsy();
   expect(
     filterItem(
-      { operator: "intersect", field: "a", value: [2, 3] },
+      { field: "a", operator: "intersect", value: [2, 3] },
       { a: [1, 2] },
     ),
   ).toBeTruthy();
   expect(
     filterItem(
-      { operator: "intersect", field: "a", value: [3, 4] },
+      { field: "a", operator: "intersect", value: [3, 4] },
       { a: [1, 2] },
     ),
   ).toBeFalsy();

package/lib/tools/normalizeOrder.ts

@@ -7,7 +7,7 @@ export function normalizeOrder<T extends object>(
     return order;
   }
   return {
-    field: order,
     descending: false,
+    field: order,
   };
 }

package/lib/tools/queryItemList.test.ts

@@ -10,30 +10,30 @@ test("queries a single item", () => {
   ).toEqual({ a: 1 });
   expect(() =>
     queryItemList({
-      type: [{ a: 1 }, { a: 2 }, { a: 3 }],
       context: {
         a: 4,
       },
+      type: [{ a: 1 }, { a: 2 }, { a: 3 }],
     }),
   ).toThrow("Not found");
   expect(
     queryItemList({
-      type: [{ a: 1 }, { a: 2 }, { a: 3 }],
       filter: {
         field: "a",
         operator: "greaterThan",
         value: 1,
       },
+      type: [{ a: 1 }, { a: 2 }, { a: 3 }],
     }),
   ).toEqual({ a: 2 });
   expect(() =>
     queryItemList({
-      type: [{ a: 1 }, { a: 2 }, { a: 3 }],
       filter: {
         field: "a",
         operator: "greaterThanOrEqual",
         value: 4,
       },
+      type: [{ a: 1 }, { a: 2 }, { a: 3 }],
     }),
   ).toThrow("Not found");
 });
@@ -41,30 +41,23 @@ test("queries a single item", () => {
 test("queries lists of items", () => {
   expect(
     queryItemList({
-      type: [{ a: 1 }, { a: 2 }, { a: 3 }],
       multiple: true,
+      type: [{ a: 1 }, { a: 2 }, { a: 3 }],
     }),
   ).toEqual([{ a: 1 }, { a: 2 }, { a: 3 }]);
   expect(
     queryItemList({
-      type: [{ a: 1 }, { a: 2 }, { a: 3 }],
-      multiple: true,
       filter: {
         field: "a",
         operator: "greaterThan",
         value: 1,
       },
+      multiple: true,
+      type: [{ a: 1 }, { a: 2 }, { a: 3 }],
     }),
   ).toEqual([{ a: 2 }, { a: 3 }]);
   expect(
     queryItemList({
-      type: [
-        { a: 1, c: "a" },
-        { a: 2, c: "a" },
-        { a: 3, c: "b" },
-      ],
-      method: "read",
-      multiple: true,
       context: {
         c: "a",
       },
@@ -73,17 +66,24 @@ test("queries lists of items", () => {
         operator: "greaterThan",
         value: 1,
       },
+      method: "read",
+      multiple: true,
+      type: [
+        { a: 1, c: "a" },
+        { a: 2, c: "a" },
+        { a: 3, c: "b" },
+      ],
     }),
   ).toEqual([{ a: 2, c: "a" }]);
   expect(
     queryItemList({
-      type: [{ a: 1 }, { a: 2 }, { a: 3 }],
-      multiple: true,
       filter: {
         field: "a",
         operator: "greaterThanOrEqual",
         value: 4,
       },
+      multiple: true,
+      type: [{ a: 1 }, { a: 2 }, { a: 3 }],
     }),
   ).toEqual([]);
 });
@@ -91,6 +91,8 @@ test("queries lists of items", () => {
 test("sorts items", () => {
   expect(
     queryItemList({
+      multiple: true,
+      order: ["a", "c"],
       type: [
         { a: 1, c: "a" },
         { a: 2, c: "a" },
@@ -98,8 +100,6 @@ test("sorts items", () => {
         { a: 2, c: "b" },
         { a: 1, c: "b" },
       ],
-      multiple: true,
-      order: ["a", "c"],
     }),
   ).toEqual([
     { a: 1, c: "a" },
@@ -110,6 +110,11 @@ test("sorts items", () => {
   ]);
   expect(
     queryItemList({
+      multiple: true,
+      order: [
+        { descending: true, field: "a" },
+        { descending: true, field: "c" },
+      ],
       type: [
         { a: 1, c: "a" },
         { a: 2, c: "a" },
@@ -117,11 +122,6 @@ test("sorts items", () => {
         { a: 2, c: "b" },
         { a: 1, c: "b" },
       ],
-      multiple: true,
-      order: [
-        { field: "a", descending: true },
-        { field: "c", descending: true },
-      ],
     }),
   ).toEqual([
     { a: 3, c: "b" },
@@ -135,26 +135,20 @@ test("sorts items", () => {
 test("aggregates items", () => {
   expect(
     queryItemList({
-      type: [
-        { a: 1, c: "a" },
-        { a: 2, c: "a" },
-        { a: 3, c: "b" },
-      ],
-      method: "aggregate",
       aggregator: "length",
       context: {
         c: "a",
       },
-    }),
-  ).toBe(2);
-  expect(
-    queryItemList({
+      method: "aggregate",
       type: [
         { a: 1, c: "a" },
         { a: 2, c: "a" },
         { a: 3, c: "b" },
       ],
-      method: "aggregate",
+    }),
+  ).toBe(2);
+  expect(
+    queryItemList({
       aggregator: "length",
       context: {
         c: "a",
@@ -164,6 +158,12 @@ test("aggregates items", () => {
         operator: "greaterThan",
         value: 1,
       },
+      method: "aggregate",
+      type: [
+        { a: 1, c: "a" },
+        { a: 2, c: "a" },
+        { a: 3, c: "b" },
+      ],
     }),
   ).toBe(1);
 });
@@ -171,43 +171,43 @@ test("aggregates items", () => {
 test("slices items", () => {
   expect(
     queryItemList({
+      limit: 1,
+      method: "read",
+      multiple: true,
       type: [
         { a: 1, c: "a" },
         { a: 2, c: "a" },
         { a: 3, c: "b" },
       ],
-      method: "read",
-      multiple: true,
-      limit: 1,
     }),
   ).toEqual([{ a: 1, c: "a" }]);
   expect(
     queryItemList({
+      context: {
+        c: "a",
+      },
+      method: "read",
+      multiple: true,
+      offset: 1,
       type: [
         { a: 1, c: "a" },
         { a: 2, c: "a" },
         { a: 3, c: "b" },
       ],
-      method: "read",
-      multiple: true,
-      context: {
-        c: "a",
-      },
-      offset: 1,
     }),
   ).toEqual([{ a: 2, c: "a" }]);
   expect(
     queryItemList({
+      limit: 2,
+      method: "read",
+      multiple: true,
+      offset: 1,
       type: [
         { a: 1, c: "a" },
         { a: 2, c: "a" },
         { a: 3, c: "b" },
         { a: 2, c: "b" },
       ],
-      method: "read",
-      multiple: true,
-      offset: 1,
-      limit: 2,
     }),
   ).toEqual([
     { a: 2, c: "a" },

package/lib/tools/queryItemList.ts

@@ -7,6 +7,7 @@ import type {
   Filter,
   Order,
   Query,
+  QueryAny,
   Result,
 } from "../types.js";
 
@@ -39,9 +40,9 @@ function normalizeAggregator<T extends object>(
   return aggregator.operator;
 }
 
-function queryItemList<T extends object, const Q extends Query<T, {}>>(
+function queryItemList<T extends object, const Q extends Query<T, undefined>>(
   query: Q & { type: T[]; customFields?: never },
-): Result<T, Q, {}>;
+): Result<T, Q, undefined>;
 function queryItemList<
   T extends object,
   const Q extends Query<T, C>,
@@ -85,7 +86,7 @@ function queryItemList<
       );
       const result = data.find((item) => filterItem(normalizedFilter, item));
       if (result === undefined) {
-        throw new RequestError("Not found", 404, query);
+        throw new RequestError("Not found", 404, query as QueryAny);
       }
       return result as Result<T, Q, C>;
     }

package/lib/tools/sortItemList.test.ts

@@ -24,8 +24,8 @@ test("sorts items", () => {
   expect(
     sortItemList(
       [
-        { field: "a", descending: true },
-        { field: "c", descending: true },
+        { descending: true, field: "a" },
+        { descending: true, field: "c" },
       ],
       [
         { a: 1, c: "a" },
@@ -44,7 +44,7 @@ test("sorts items", () => {
   ]);
   expect(
     sortItemList(
-      ["a", { field: "c", descending: true }],
+      ["a", { descending: true, field: "c" }],
       [
         { a: 1, c: "a" },
         { a: 2, c: "a" },

package/lib/types/FilterKeys.ts

@@ -1,6 +1,7 @@
 /**
  * Returns object type with field extending the provided `P` type.
  */
-export type FilterKeys<T extends object, P> = {
-  [K in keyof T]-?: T[K] extends P ? K : never;
-}[keyof T];
+export type FilterKeys<T extends object, P> = keyof T &
+  keyof {
+    [K in keyof T as T[K] extends P ? K : never]-?: T[K];
+  };

package/lib/types/QueryReadMultiple.ts

@@ -16,7 +16,6 @@ export type QueryReadMultiple<T extends object> = {
    * Upper bound of the number of items to return.
    */
   limit?: number;
-
   /**
    * Item fields to pick. If omitted, all fields are picked.
    */

package/lib/types/Result.ts

@@ -3,17 +3,18 @@ import type { InjectCustomFields } from "./InjectCustomFields";
 import type { Item } from "./Item";
 import type { Query } from "./Query";
 
-export type PickFields<T extends object, F extends string | number | symbol> = [
-  F,
-] extends [keyof T]
+export type PickFields<
+  T extends object | undefined,
+  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, C>,
-  C extends CustomFieldMap<T>,
-  U extends InjectCustomFields<T, C> = InjectCustomFields<T, C>,
+  C extends CustomFieldMap<T> | undefined,
+  U extends InjectCustomFields<T, C> | undefined = InjectCustomFields<T, C>,
 > = [C] extends [CustomFieldMap<T>]
   ? [Q] extends [{ fields: (keyof U)[] }]
     ? PickFields<U, Item<Q["fields"]>>
@@ -25,8 +26,8 @@ export type ResultRead<
 export type Result<
   T extends object,
   Q extends Query<T, C>,
-  C extends CustomFieldMap<T>,
-  U extends InjectCustomFields<T, C> = InjectCustomFields<T, C>,
+  C extends CustomFieldMap<T> | undefined,
+  U extends InjectCustomFields<T, C> | undefined = InjectCustomFields<T, C>,
 > = [Q] extends [{ method: "read" }]
   ? [Q] extends [{ multiple: true }]
     ? ResultRead<T, Q, C, U>[]

package/package.json

@@ -1,12 +1,18 @@
 {
   "name": "quetch",
-  "version": "0.6.4",
+  "version": "0.6.6",
   "type": "module",
   "main": "./dist/main.js",
   "exports": {
     "types": "./dist/main.d.ts",
     "import": "./dist/main.js"
   },
+  "author": "David Bonnet <david@bonnet.cc>",
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/nevoland/quetch.git"
+  },
   "files": [
     "dist",
     "lib",
@@ -40,7 +46,9 @@
     "release:beta": "npm version prerelease --preid=beta && git push origin --follow-tags && npm publish --tag=next"
   },
   "devDependencies": {
+    "@eslint/js": "^8.53.0",
     "@preact/preset-vite": "^2.5.0",
+    "@types/eslint": "^8.44.6",
     "@types/node": "^20.8.3",
     "@typescript-eslint/parser": "^6.7.4",
     "autoprefixer": "^10.4.16",
@@ -50,6 +58,7 @@
     "eslint-config-prettier": "^9.0.0",
     "eslint-plugin-import": "^2.28.1",
     "eslint-plugin-inferno": "^7.32.2",
+    "eslint-plugin-sort-keys": "^2.3.5",
     "eslint-plugin-tailwindcss": "^3.13.0",
     "eslint-plugin-vitest": "^0.3.2",
     "postcss": "^8.4.31",
@@ -67,6 +76,6 @@
   },
   "dependencies": {
     "@davidbonnet/get-global": "^2.0.1",
-    "futurise": "^1.2.1"
+    "futurise": "^1.2.3"
   }
 }