feathers-utils 7.0.0 → 7.0.1

package/README.md

@@ -1,7 +1,7 @@
 # feathers-utils
 
 [![npm](https://img.shields.io/npm/v/feathers-utils)](https://www.npmjs.com/package/feathers-utils)
-[![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/fratzinger/feathers-utils/node.js.yml?branch=main)](https://github.com/fratzinger/feathers-utils/actions/workflows/node.js.yml?query=branch%3Amain)
+[![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/fratzinger/feathers-utils/node.js.yaml?branch=main)](https://github.com/fratzinger/feathers-utils/actions/workflows/node.js.yaml?query=branch%3Amain)
 [![Code Climate maintainability](https://img.shields.io/codeclimate/maintainability/fratzinger/feathers-utils)](https://codeclimate.com/github/fratzinger/feathers-utils)
 [![Code Climate coverage](https://img.shields.io/codeclimate/coverage/fratzinger/feathers-utils)](https://codeclimate.com/github/fratzinger/feathers-utils)
 [![npm](https://img.shields.io/npm/dm/feathers-utils)](https://www.npmjs.com/package/feathers-utils)
@@ -9,7 +9,6 @@
 
 > NOTE: This is the version for Feathers v5. For Feathers v4 use [feathers-utils v1](https://github.com/fratzinger/feathers-utils/tree/crow)
 
-
 ## Installation
 
 ```shell
@@ -48,7 +47,7 @@ npm i feathers-utils
 - `markHookForSkip`: add hookName to `context.params.skipHooks` - also see `shouldSkip`
 - `mergeQuery`: deeply merges queries
 - `mergeArrays`: merges arrays with intersection options
-- `pushSet`: if existing array: *push*, else *set*
+- `pushSet`: if existing array: _push_, else _set_
 - `setQueryKeySafely`
 - `setResultEmpty`
-- `shouldSkip`: checks `context.params.skipHooks` for `'all' | '${hookName}' | '${type}:${hookName}'` - also see `markHookForSkip`
+- `shouldSkip`: checks `context.params.skipHooks` for `'all' | '${hookName}' | '${type}:${hookName}'` - also see `markHookForSkip`

package/dist/index.cjs

@@ -24,7 +24,7 @@ function defineHooks(hooks) {
 }
 
 function filterQuery(providedQuery) {
-  providedQuery ?? (providedQuery = {});
+  providedQuery ??= {};
   const { $select, $limit, $skip, $sort, ...query } = providedQuery;
   const result = { query };
   if ("$select" in providedQuery) {
@@ -392,12 +392,12 @@ function handleCircular(target, source, prependKey, options) {
   }
 }
 function makeDefaultOptions$1(options) {
-  options ?? (options = {});
-  options.defaultHandle ?? (options.defaultHandle = "combine");
-  options.useLogicalConjunction ?? (options.useLogicalConjunction = false);
-  options.actionOnEmptyIntersect ?? (options.actionOnEmptyIntersect = () => {
+  options ??= {};
+  options.defaultHandle ??= "combine";
+  options.useLogicalConjunction ??= false;
+  options.actionOnEmptyIntersect ??= () => {
     throw new errors.Forbidden("You're not allowed to make this request");
-  });
+  };
   options.handle = options.handle || {};
   if (options.defaultHandle === "intersect") {
     options.handle.$select = options.handle.$select || "intersectOrFull";
@@ -517,7 +517,6 @@ function mergeQuery(target, source, _options) {
 }
 
 const setQueryKeySafely = (params, key, value, operator = "$eq", options) => {
-  var _a;
   const { mutate = false } = options || {};
   if (!mutate) {
     params = structuredClone(params);
@@ -538,7 +537,7 @@ const setQueryKeySafely = (params, key, value, operator = "$eq", options) => {
   if (isPlainObject(params.query[key]) && !(operator in params.query[key])) {
     params.query[key][operator] = value;
   } else {
-    (_a = params.query).$and ?? (_a.$and = []);
+    params.query.$and ??= [];
     params.query.$and.push(
       operator === "$eq" ? { [key]: value } : {
         [key]: {
@@ -826,7 +825,7 @@ function onDelete(options) {
           const data = { [keyThere]: null };
           promise = context.app.service(service).patch(null, data, params);
         }
-        if (blocking) {
+        if (blocking && promise) {
           promises.push(promise);
         }
       }
@@ -966,19 +965,18 @@ function defineParamsForServer(keyToHide) {
           return;
         }
         if (whitelist.includes(key)) {
-          if (!clonedParams) {
-            clonedParams = {
-              ...context.params,
-              query: {
-                ...context.params.query
-              }
-            };
-          }
-          if (!clonedParams.query[keyToHide]) {
-            clonedParams.query[keyToHide] = {};
+          const currentParams = clonedParams ?? {
+            ...context.params,
+            query: {
+              ...context.params.query
+            }
+          };
+          if (!currentParams.query[keyToHide]) {
+            currentParams.query[keyToHide] = {};
           }
-          clonedParams.query[keyToHide][key] = clonedParams[key];
-          delete clonedParams[key];
+          currentParams.query[keyToHide][key] = currentParams[key];
+          delete currentParams[key];
+          clonedParams = currentParams;
         }
       });
       if (clonedParams) {
@@ -1035,20 +1033,14 @@ const makeDefaultOptions = () => {
   };
 };
 
-var __defProp = Object.defineProperty;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField = (obj, key, value) => {
-  __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
-  return value;
-};
 class DebouncedStore {
+  _app;
+  _options;
+  _isRunningById;
+  _queueById;
+  //_waitingById: Record<string, WaitingObject>;
+  add;
   constructor(app, options) {
-    __publicField(this, "_app");
-    __publicField(this, "_options");
-    __publicField(this, "_isRunningById");
-    __publicField(this, "_queueById");
-    //_waitingById: Record<string, WaitingObject>;
-    __publicField(this, "add");
     this._app = app;
     this._options = Object.assign(makeDefaultOptions(), options);
     this._queueById = {};
@@ -1091,13 +1083,9 @@ class DebouncedStore {
 function debounceMixin(options) {
   return (app) => {
     options = options || {};
-    const defaultOptions = Object.assign(
-      makeDefaultOptions(),
-      options?.default
-    );
+    const defaultOptions = Object.assign(makeDefaultOptions(), options?.default);
     app.mixins.push((service, path) => {
-      if (options?.blacklist && options.blacklist.includes(path))
-        return;
+      if (options?.blacklist && options.blacklist.includes(path)) return;
       if (service.debouncedStore) {
         console.warn(
           `[feathers-utils] service: '${path}' already has a property 'debouncedStore'. Mixin will skip creating a new debouncedStore`
@@ -1115,9 +1103,7 @@ function debounceMixin(options) {
 
 const filterQueryArray = (key) => (arr, { operators }) => {
   if (arr && !Array.isArray(arr)) {
-    throw new Error(
-      `Invalid query parameter '${key}'. It has to be an array`
-    );
+    throw new Error(`Invalid query parameter '${key}'. It has to be an array`);
   }
   if (Array.isArray(arr)) {
     return arr.map((current) => validateQueryProperty(current, operators));

package/dist/index.d.cts

@@ -1,6 +1,5 @@
 import * as _feathersjs_feathers from '@feathersjs/feathers';
 import { HookContext, Application, Id, HookOptions, Query, Params } from '@feathersjs/feathers';
-import { HookContext as HookContext$1, Application as Application$1 } from '@feathersjs/feathers/lib';
 import { PropertyPath, DebouncedFunc } from 'lodash';
 import { PaginationOptions, FilterQueryOptions } from '@feathersjs/adapter-commons';
 import { HookType } from 'feathers-hooks-common';
@@ -13,7 +12,7 @@ declare function checkMulti<H extends HookContext = HookContext>(): (context: H)
 type MaybeArray<T> = T | T[];
 type Promisable<T> = T | Promise<T>;
 type Path = Array<string | number>;
-type ReturnAsyncHook<H extends HookContext$1 = HookContext$1> = (context: H) => Promise<H>;
+type ReturnAsyncHook<H extends HookContext = HookContext> = (context: H) => Promise<H>;
 type KeyOf<T> = Extract<keyof T, string>;
 
 interface CreateRelatedOptions<S = Record<string, any>> {
@@ -27,7 +26,7 @@ interface CreateRelatedOptions<S = Record<string, any>> {
  */
 declare function createRelated<S = Record<string, any>, H extends HookContext = HookContext>(options: MaybeArray<CreateRelatedOptions<S>>): (context: H) => Promise<H>;
 
-type GetItemsIsArrayFrom = "data" | "result" | "automatic";
+type GetItemsIsArrayFrom = 'data' | 'result' | 'automatic';
 type GetItemsIsArrayOptions = {
     from?: GetItemsIsArrayFrom;
 };
@@ -35,11 +34,11 @@ interface GetItemsIsArrayResult<T = any> {
     items: T[];
     isArray: boolean;
 }
-declare const getItemsIsArray: <T = any, H extends HookContext = HookContext<_feathersjs_feathers.Application<any, any>, any>>(context: H, options?: GetItemsIsArrayOptions) => GetItemsIsArrayResult<T>;
+declare const getItemsIsArray: <T = any, H extends HookContext = HookContext>(context: H, options?: GetItemsIsArrayOptions) => GetItemsIsArrayResult<T>;
 
 type HookForEachOptions<T = any, H = HookContext, R = any> = {
-    wait?: "sequential" | "parallel" | false;
-    items?: GetItemsIsArrayOptions["from"];
+    wait?: 'sequential' | 'parallel' | false;
+    items?: GetItemsIsArrayOptions['from'];
     forAll?: (items: T[], context: H) => Promisable<R>;
     skip?: (context: H) => Promisable<boolean>;
 };
@@ -49,9 +48,9 @@ type ActionPerItem<T, H, R> = (item: T, options: {
 } & (undefined extends R ? {} : {
     fromAll: R;
 })) => Promisable<any>;
-declare const forEach: <H extends HookContext = HookContext<_feathersjs_feathers.Application<any, any>, any>, T = any, R = any>(actionPerItem: ActionPerItem<T, H, R>, options?: HookForEachOptions<T, H, R>) => ReturnAsyncHook<H>;
+declare const forEach: <H extends HookContext = HookContext, T = any, R = any>(actionPerItem: ActionPerItem<T, H, R>, options?: HookForEachOptions<T, H, R>) => ReturnAsyncHook<H>;
 
-type OnDeleteAction = "cascade" | "set null";
+type OnDeleteAction = 'cascade' | 'set null';
 interface OnDeleteOptions<Path extends string = string> {
     service: Path;
     keyThere: string;
@@ -92,7 +91,7 @@ interface HookRunPerItemOptions {
  * hook to run a hook for each item in the context
  * uses `context.result` if it is existent. otherwise uses context.data
  */
-declare const runPerItem: <H extends HookContext = HookContext<_feathersjs_feathers.Application<any, any>, any>, T = any>(actionPerItem: (item: T, context: H) => Promisable<any>, _options?: HookRunPerItemOptions) => (context: H) => Promise<H>;
+declare const runPerItem: <H extends HookContext = HookContext, T = any>(actionPerItem: (item: T, context: H) => Promisable<any>, _options?: HookRunPerItemOptions) => (context: H) => Promise<H>;
 
 type Predicate<T = any> = (item: T) => boolean;
 type PredicateWithContext<T = any> = (item: T, context: HookContext) => boolean;
@@ -139,14 +138,14 @@ declare class DebouncedStore {
     private _options;
     private _isRunningById;
     _queueById: Record<string, DebouncedFunc<(id: Id, action: DebouncedFunctionApp) => void | Promise<void>>>;
-    add: any;
+    add: (id: Id, action: (app?: Application) => void | Promise<void>) => void | Promise<void> | undefined;
     constructor(app: Application, options?: Partial<DebouncedStoreOptions>);
     private unbounced;
     private debounceById;
     cancel(id: Id): void;
 }
 
-declare function debounceMixin(options?: Partial<InitDebounceMixinOptions>): (app: Application$1) => void;
+declare function debounceMixin(options?: Partial<InitDebounceMixinOptions>): (app: Application) => void;
 
 declare function defineHooks<A extends Application = Application, S = {
     find: any;
@@ -158,11 +157,11 @@ declare function defineHooks<A extends Application = Application, S = {
 }, Options = HookOptions<A, S>>(hooks: Options): Options;
 
 type FilterQueryResult<Q extends Query = Query> = {
-    $select: Q["$select"] extends any ? Q["$select"] : never;
-    $limit: Q["$limit"] extends any ? Q["$limit"] : never;
-    $skip: Q["$skip"] extends any ? Q["$skip"] : never;
-    $sort: Q["$sort"] extends any ? Q["$sort"] : never;
-    query: Omit<Q, "$select" | "$limit" | "$skip" | "$sort">;
+    $select: Q['$select'] extends any ? Q['$select'] : never;
+    $limit: Q['$limit'] extends any ? Q['$limit'] : never;
+    $skip: Q['$skip'] extends any ? Q['$skip'] : never;
+    $sort: Q['$sort'] extends any ? Q['$sort'] : never;
+    query: Omit<Q, '$select' | '$limit' | '$skip' | '$sort'>;
 };
 /**
  * Extracts $select, $limit, $skip, $sort from a query and returns the rest as a query object.
@@ -179,7 +178,7 @@ declare function reassembleQuery(query: FilterQueryResult): Query;
  * 2. it uses `service.options.paginate` if it exists
  * 3. it uses `context.params.adapter` if it exists
  */
-declare const getPaginate: <H extends HookContext = HookContext<_feathersjs_feathers.Application<any, any>, any>>(context: H) => PaginationOptions | undefined;
+declare const getPaginate: <H extends HookContext = HookContext>(context: H) => PaginationOptions | undefined;
 
 /**
  * util to check if a hook is a multi hook:
@@ -190,19 +189,19 @@ declare const getPaginate: <H extends HookContext = HookContext<_feathersjs_feat
  * - patch: `context.id == null`
  * - remove: `context.id == null`
  */
-declare const isMulti: <H extends HookContext = HookContext<_feathersjs_feathers.Application<any, any>, any>>(context: H) => boolean;
+declare const isMulti: <H extends HookContext = HookContext>(context: H) => boolean;
 
 /**
  * util to check if a hook is a paginated hook using `getPaginate`
  */
-declare const isPaginated: <H extends HookContext = HookContext<_feathersjs_feathers.Application<any, any>, any>>(context: H) => boolean;
+declare const isPaginated: <H extends HookContext = HookContext>(context: H) => boolean;
 
 /**
  * util to mark a hook for skip, has to be used with `shouldSkip`
  */
-declare function markHookForSkip<H extends HookContext = HookContext>(hookName: string, type: "all" | MaybeArray<HookType>, context?: H): H;
+declare function markHookForSkip<H extends HookContext = HookContext>(hookName: string, type: 'all' | MaybeArray<HookType>, context?: H): H | undefined;
 
-type Handle = "target" | "source" | "combine" | "intersect" | "intersectOrFull";
+type Handle = 'target' | 'source' | 'combine' | 'intersect' | 'intersectOrFull';
 type ActionOnEmptyIntersect = (target: unknown, source: unknown, prependKey: Path) => void;
 interface MergeQueryOptions {
     defaultHandle: Handle;
@@ -240,7 +239,7 @@ declare const setQueryKeySafely: (params: Params, key: string, value: any, opera
 /**
  * util to set `context.result` to an empty array or object, depending on the hook type
  */
-declare const setResultEmpty: <H extends HookContext = HookContext<_feathersjs_feathers.Application<any, any>, any>>(context: H) => H;
+declare const setResultEmpty: <H extends HookContext = HookContext>(context: H) => H;
 
 type ShouldSkipOptions = {
     notSkippable?: boolean;
@@ -248,7 +247,7 @@ type ShouldSkipOptions = {
 /**
  * util to detect if a hook should be skipped
  */
-declare const shouldSkip: <H extends HookContext = HookContext<_feathersjs_feathers.Application<any, any>, any>>(hookName: string, context: H, options?: ShouldSkipOptions) => boolean;
+declare const shouldSkip: <H extends HookContext = HookContext>(hookName: string, context: H, options?: ShouldSkipOptions) => boolean;
 
 declare const toJSON: (context: HookContext) => HookContext<_feathersjs_feathers.Application<any, any>, any>;
 
@@ -261,10 +260,10 @@ type OptimizeBatchPatchOptions<IdKey extends string> = {
     /** the key of the id property */
     id?: IdKey;
 };
-type OptimizeBatchPatchResultItem<T = Record<string, unknown>, P = Params> = [Id, T, P | undefined];
+type OptimizeBatchPatchResultItem<T = Record<string, unknown>, P = Params> = [Id | null, T, P | undefined];
 declare function optimizeBatchPatch<T extends Record<string, any>, IdKey extends KeyOf<T>, P extends Params, R extends Omit<T, IdKey> = Omit<T, IdKey>>(items: T[], options?: OptimizeBatchPatchOptions<IdKey>): OptimizeBatchPatchResultItem<R, P>[];
 
-declare function flattenQuery(q: Query): any;
+declare function flattenQuery(q: Query): Query;
 
 declare function deflattenQuery(query: Query): Query;
 
@@ -303,7 +302,7 @@ type InferPatchResult<S, IdOrNullable = any> = S extends {
 type InferRemoveResult<S, IdOrNullable = any> = S extends {
     remove: (id: IdOrNullable, params: any) => infer R;
 } ? IdOrNullable extends Id ? Single<Awaited<R>> : IdOrNullable extends null ? AsArray<Awaited<R>> : Awaited<R> : never;
-type GetService<App extends Application, Path extends string> = App["services"][Path];
+type GetService<App extends Application, Path extends string> = App['services'][Path];
 type InferGetResultFromPath<App extends Application, Path extends string> = InferGetResult<GetService<App, Path>>;
 type InferFindResultFromPath<App extends Application, Path extends string> = InferFindResult<GetService<App, Path>>;
 type InferCreateDataFromPath<App extends Application, Path extends string> = InferCreateData<GetService<App, Path>>;
@@ -315,7 +314,7 @@ type InferPatchDataFromPath<App extends Application, Path extends string> = Infe
 type InferUpdateResultFromPath<App extends Application, Path extends string> = InferUpdateResult<GetService<App, Path>>;
 type InferPatchResultFromPath<App extends Application, Path extends string, IdOrNullable = any> = InferPatchResult<GetService<App, Path>, IdOrNullable>;
 type InferRemoveResultFromPath<App extends Application, Path extends string, IdOrNullable = any> = InferRemoveResult<GetService<App, Path>, IdOrNullable>;
-type InferDataFromPath<App extends Application, Path extends string, Method extends "create" | "update" | "patch"> = Method extends "create" ? InferCreateDataFromPath<App, Path> : Method extends "update" ? InferUpdateDataFromPath<App, Path> : Method extends "patch" ? InferPatchDataFromPath<App, Path> : never;
-type InferResultFromPath<App extends Application, Path extends string, Method extends "get" | "find" | "create" | "update" | "patch" | "remove"> = Method extends "get" ? InferGetResultFromPath<App, Path> : Method extends "find" ? InferFindResultFromPath<App, Path> : Method extends "create" ? InferCreateResultFromPath<App, Path> : Method extends "update" ? InferUpdateResultFromPath<App, Path> : Method extends "patch" ? InferPatchResultFromPath<App, Path> : Method extends "remove" ? InferRemoveResultFromPath<App, Path> : never;
+type InferDataFromPath<App extends Application, Path extends string, Method extends 'create' | 'update' | 'patch'> = Method extends 'create' ? InferCreateDataFromPath<App, Path> : Method extends 'update' ? InferUpdateDataFromPath<App, Path> : Method extends 'patch' ? InferPatchDataFromPath<App, Path> : never;
+type InferResultFromPath<App extends Application, Path extends string, Method extends 'get' | 'find' | 'create' | 'update' | 'patch' | 'remove'> = Method extends 'get' ? InferGetResultFromPath<App, Path> : Method extends 'find' ? InferFindResultFromPath<App, Path> : Method extends 'create' ? InferCreateResultFromPath<App, Path> : Method extends 'update' ? InferUpdateResultFromPath<App, Path> : Method extends 'patch' ? InferPatchResultFromPath<App, Path> : Method extends 'remove' ? InferRemoveResultFromPath<App, Path> : never;
 
 export { type ActionOnEmptyIntersect, type CreateRelatedOptions, type DebouncedFunctionApp, type DebouncedService, DebouncedStore, type DebouncedStoreOptions, type GetItemsIsArrayFrom, type GetItemsIsArrayOptions, type GetItemsIsArrayResult, type GetService, type Handle, type HookForEachOptions, type HookRunPerItemOptions, type HookSetDataOptions, type InferCreateData, type InferCreateDataFromPath, type InferCreateDataSingle, type InferCreateDataSingleFromPath, type InferCreateResult, type InferCreateResultFromPath, type InferCreateResultSingle, type InferCreateResultSingleFromPath, type InferDataFromPath, type InferFindResult, type InferFindResultFromPath, type InferGetResult, type InferGetResultFromPath, type InferPatchData, type InferPatchDataFromPath, type InferPatchResult, type InferPatchResultFromPath, type InferRemoveResult, type InferRemoveResultFromPath, type InferResultFromPath, type InferUpdateData, type InferUpdateDataFromPath, type InferUpdateResult, type InferUpdateResultFromPath, type InitDebounceMixinOptions, type MergeQueryOptions, type OnDeleteAction, type OnDeleteOptions, type OptimizeBatchPatchOptions, type OptimizeBatchPatchResultItem, type Predicate, type PredicateWithContext, type PushSetOptions, type RemoveRelatedOptions, type SetQueryKeySafelyOptions, type ShouldSkipOptions, checkMulti, createRelated, debounceMixin, defineHooks, defineParamsForServer, defineParamsFromClient, deflattenQuery, filterArray, filterObject, filterQuery, flattenQuery, forEach, getItemsIsArray, getPaginate, isMulti, isPaginated, markHookForSkip, mergeArrays, mergeQuery, onDelete, optimizeBatchPatch, paramsForServer, paramsFromClient, parseFields, pushSet, reassembleQuery, removeRelated, runPerItem, setData, setQueryKeySafely, setResultEmpty, shouldSkip, toJSON, validateQueryProperty };

package/dist/index.d.mts

@@ -1,6 +1,5 @@
 import * as _feathersjs_feathers from '@feathersjs/feathers';
 import { HookContext, Application, Id, HookOptions, Query, Params } from '@feathersjs/feathers';
-import { HookContext as HookContext$1, Application as Application$1 } from '@feathersjs/feathers/lib';
 import { PropertyPath, DebouncedFunc } from 'lodash';
 import { PaginationOptions, FilterQueryOptions } from '@feathersjs/adapter-commons';
 import { HookType } from 'feathers-hooks-common';
@@ -13,7 +12,7 @@ declare function checkMulti<H extends HookContext = HookContext>(): (context: H)
 type MaybeArray<T> = T | T[];
 type Promisable<T> = T | Promise<T>;
 type Path = Array<string | number>;
-type ReturnAsyncHook<H extends HookContext$1 = HookContext$1> = (context: H) => Promise<H>;
+type ReturnAsyncHook<H extends HookContext = HookContext> = (context: H) => Promise<H>;
 type KeyOf<T> = Extract<keyof T, string>;
 
 interface CreateRelatedOptions<S = Record<string, any>> {
@@ -27,7 +26,7 @@ interface CreateRelatedOptions<S = Record<string, any>> {
  */
 declare function createRelated<S = Record<string, any>, H extends HookContext = HookContext>(options: MaybeArray<CreateRelatedOptions<S>>): (context: H) => Promise<H>;
 
-type GetItemsIsArrayFrom = "data" | "result" | "automatic";
+type GetItemsIsArrayFrom = 'data' | 'result' | 'automatic';
 type GetItemsIsArrayOptions = {
     from?: GetItemsIsArrayFrom;
 };
@@ -35,11 +34,11 @@ interface GetItemsIsArrayResult<T = any> {
     items: T[];
     isArray: boolean;
 }
-declare const getItemsIsArray: <T = any, H extends HookContext = HookContext<_feathersjs_feathers.Application<any, any>, any>>(context: H, options?: GetItemsIsArrayOptions) => GetItemsIsArrayResult<T>;
+declare const getItemsIsArray: <T = any, H extends HookContext = HookContext>(context: H, options?: GetItemsIsArrayOptions) => GetItemsIsArrayResult<T>;
 
 type HookForEachOptions<T = any, H = HookContext, R = any> = {
-    wait?: "sequential" | "parallel" | false;
-    items?: GetItemsIsArrayOptions["from"];
+    wait?: 'sequential' | 'parallel' | false;
+    items?: GetItemsIsArrayOptions['from'];
     forAll?: (items: T[], context: H) => Promisable<R>;
     skip?: (context: H) => Promisable<boolean>;
 };
@@ -49,9 +48,9 @@ type ActionPerItem<T, H, R> = (item: T, options: {
 } & (undefined extends R ? {} : {
     fromAll: R;
 })) => Promisable<any>;
-declare const forEach: <H extends HookContext = HookContext<_feathersjs_feathers.Application<any, any>, any>, T = any, R = any>(actionPerItem: ActionPerItem<T, H, R>, options?: HookForEachOptions<T, H, R>) => ReturnAsyncHook<H>;
+declare const forEach: <H extends HookContext = HookContext, T = any, R = any>(actionPerItem: ActionPerItem<T, H, R>, options?: HookForEachOptions<T, H, R>) => ReturnAsyncHook<H>;
 
-type OnDeleteAction = "cascade" | "set null";
+type OnDeleteAction = 'cascade' | 'set null';
 interface OnDeleteOptions<Path extends string = string> {
     service: Path;
     keyThere: string;
@@ -92,7 +91,7 @@ interface HookRunPerItemOptions {
  * hook to run a hook for each item in the context
  * uses `context.result` if it is existent. otherwise uses context.data
  */
-declare const runPerItem: <H extends HookContext = HookContext<_feathersjs_feathers.Application<any, any>, any>, T = any>(actionPerItem: (item: T, context: H) => Promisable<any>, _options?: HookRunPerItemOptions) => (context: H) => Promise<H>;
+declare const runPerItem: <H extends HookContext = HookContext, T = any>(actionPerItem: (item: T, context: H) => Promisable<any>, _options?: HookRunPerItemOptions) => (context: H) => Promise<H>;
 
 type Predicate<T = any> = (item: T) => boolean;
 type PredicateWithContext<T = any> = (item: T, context: HookContext) => boolean;
@@ -139,14 +138,14 @@ declare class DebouncedStore {
     private _options;
     private _isRunningById;
     _queueById: Record<string, DebouncedFunc<(id: Id, action: DebouncedFunctionApp) => void | Promise<void>>>;
-    add: any;
+    add: (id: Id, action: (app?: Application) => void | Promise<void>) => void | Promise<void> | undefined;
     constructor(app: Application, options?: Partial<DebouncedStoreOptions>);
     private unbounced;
     private debounceById;
     cancel(id: Id): void;
 }
 
-declare function debounceMixin(options?: Partial<InitDebounceMixinOptions>): (app: Application$1) => void;
+declare function debounceMixin(options?: Partial<InitDebounceMixinOptions>): (app: Application) => void;
 
 declare function defineHooks<A extends Application = Application, S = {
     find: any;
@@ -158,11 +157,11 @@ declare function defineHooks<A extends Application = Application, S = {
 }, Options = HookOptions<A, S>>(hooks: Options): Options;
 
 type FilterQueryResult<Q extends Query = Query> = {
-    $select: Q["$select"] extends any ? Q["$select"] : never;
-    $limit: Q["$limit"] extends any ? Q["$limit"] : never;
-    $skip: Q["$skip"] extends any ? Q["$skip"] : never;
-    $sort: Q["$sort"] extends any ? Q["$sort"] : never;
-    query: Omit<Q, "$select" | "$limit" | "$skip" | "$sort">;
+    $select: Q['$select'] extends any ? Q['$select'] : never;
+    $limit: Q['$limit'] extends any ? Q['$limit'] : never;
+    $skip: Q['$skip'] extends any ? Q['$skip'] : never;
+    $sort: Q['$sort'] extends any ? Q['$sort'] : never;
+    query: Omit<Q, '$select' | '$limit' | '$skip' | '$sort'>;
 };
 /**
  * Extracts $select, $limit, $skip, $sort from a query and returns the rest as a query object.
@@ -179,7 +178,7 @@ declare function reassembleQuery(query: FilterQueryResult): Query;
  * 2. it uses `service.options.paginate` if it exists
  * 3. it uses `context.params.adapter` if it exists
  */
-declare const getPaginate: <H extends HookContext = HookContext<_feathersjs_feathers.Application<any, any>, any>>(context: H) => PaginationOptions | undefined;
+declare const getPaginate: <H extends HookContext = HookContext>(context: H) => PaginationOptions | undefined;
 
 /**
  * util to check if a hook is a multi hook:
@@ -190,19 +189,19 @@ declare const getPaginate: <H extends HookContext = HookContext<_feathersjs_feat
  * - patch: `context.id == null`
  * - remove: `context.id == null`
  */
-declare const isMulti: <H extends HookContext = HookContext<_feathersjs_feathers.Application<any, any>, any>>(context: H) => boolean;
+declare const isMulti: <H extends HookContext = HookContext>(context: H) => boolean;
 
 /**
  * util to check if a hook is a paginated hook using `getPaginate`
  */
-declare const isPaginated: <H extends HookContext = HookContext<_feathersjs_feathers.Application<any, any>, any>>(context: H) => boolean;
+declare const isPaginated: <H extends HookContext = HookContext>(context: H) => boolean;
 
 /**
  * util to mark a hook for skip, has to be used with `shouldSkip`
  */
-declare function markHookForSkip<H extends HookContext = HookContext>(hookName: string, type: "all" | MaybeArray<HookType>, context?: H): H;
+declare function markHookForSkip<H extends HookContext = HookContext>(hookName: string, type: 'all' | MaybeArray<HookType>, context?: H): H | undefined;
 
-type Handle = "target" | "source" | "combine" | "intersect" | "intersectOrFull";
+type Handle = 'target' | 'source' | 'combine' | 'intersect' | 'intersectOrFull';
 type ActionOnEmptyIntersect = (target: unknown, source: unknown, prependKey: Path) => void;
 interface MergeQueryOptions {
     defaultHandle: Handle;
@@ -240,7 +239,7 @@ declare const setQueryKeySafely: (params: Params, key: string, value: any, opera
 /**
  * util to set `context.result` to an empty array or object, depending on the hook type
  */
-declare const setResultEmpty: <H extends HookContext = HookContext<_feathersjs_feathers.Application<any, any>, any>>(context: H) => H;
+declare const setResultEmpty: <H extends HookContext = HookContext>(context: H) => H;
 
 type ShouldSkipOptions = {
     notSkippable?: boolean;
@@ -248,7 +247,7 @@ type ShouldSkipOptions = {
 /**
  * util to detect if a hook should be skipped
  */
-declare const shouldSkip: <H extends HookContext = HookContext<_feathersjs_feathers.Application<any, any>, any>>(hookName: string, context: H, options?: ShouldSkipOptions) => boolean;
+declare const shouldSkip: <H extends HookContext = HookContext>(hookName: string, context: H, options?: ShouldSkipOptions) => boolean;
 
 declare const toJSON: (context: HookContext) => HookContext<_feathersjs_feathers.Application<any, any>, any>;
 
@@ -261,10 +260,10 @@ type OptimizeBatchPatchOptions<IdKey extends string> = {
     /** the key of the id property */
     id?: IdKey;
 };
-type OptimizeBatchPatchResultItem<T = Record<string, unknown>, P = Params> = [Id, T, P | undefined];
+type OptimizeBatchPatchResultItem<T = Record<string, unknown>, P = Params> = [Id | null, T, P | undefined];
 declare function optimizeBatchPatch<T extends Record<string, any>, IdKey extends KeyOf<T>, P extends Params, R extends Omit<T, IdKey> = Omit<T, IdKey>>(items: T[], options?: OptimizeBatchPatchOptions<IdKey>): OptimizeBatchPatchResultItem<R, P>[];
 
-declare function flattenQuery(q: Query): any;
+declare function flattenQuery(q: Query): Query;
 
 declare function deflattenQuery(query: Query): Query;
 
@@ -303,7 +302,7 @@ type InferPatchResult<S, IdOrNullable = any> = S extends {
 type InferRemoveResult<S, IdOrNullable = any> = S extends {
     remove: (id: IdOrNullable, params: any) => infer R;
 } ? IdOrNullable extends Id ? Single<Awaited<R>> : IdOrNullable extends null ? AsArray<Awaited<R>> : Awaited<R> : never;
-type GetService<App extends Application, Path extends string> = App["services"][Path];
+type GetService<App extends Application, Path extends string> = App['services'][Path];
 type InferGetResultFromPath<App extends Application, Path extends string> = InferGetResult<GetService<App, Path>>;
 type InferFindResultFromPath<App extends Application, Path extends string> = InferFindResult<GetService<App, Path>>;
 type InferCreateDataFromPath<App extends Application, Path extends string> = InferCreateData<GetService<App, Path>>;
@@ -315,7 +314,7 @@ type InferPatchDataFromPath<App extends Application, Path extends string> = Infe
 type InferUpdateResultFromPath<App extends Application, Path extends string> = InferUpdateResult<GetService<App, Path>>;
 type InferPatchResultFromPath<App extends Application, Path extends string, IdOrNullable = any> = InferPatchResult<GetService<App, Path>, IdOrNullable>;
 type InferRemoveResultFromPath<App extends Application, Path extends string, IdOrNullable = any> = InferRemoveResult<GetService<App, Path>, IdOrNullable>;
-type InferDataFromPath<App extends Application, Path extends string, Method extends "create" | "update" | "patch"> = Method extends "create" ? InferCreateDataFromPath<App, Path> : Method extends "update" ? InferUpdateDataFromPath<App, Path> : Method extends "patch" ? InferPatchDataFromPath<App, Path> : never;
-type InferResultFromPath<App extends Application, Path extends string, Method extends "get" | "find" | "create" | "update" | "patch" | "remove"> = Method extends "get" ? InferGetResultFromPath<App, Path> : Method extends "find" ? InferFindResultFromPath<App, Path> : Method extends "create" ? InferCreateResultFromPath<App, Path> : Method extends "update" ? InferUpdateResultFromPath<App, Path> : Method extends "patch" ? InferPatchResultFromPath<App, Path> : Method extends "remove" ? InferRemoveResultFromPath<App, Path> : never;
+type InferDataFromPath<App extends Application, Path extends string, Method extends 'create' | 'update' | 'patch'> = Method extends 'create' ? InferCreateDataFromPath<App, Path> : Method extends 'update' ? InferUpdateDataFromPath<App, Path> : Method extends 'patch' ? InferPatchDataFromPath<App, Path> : never;
+type InferResultFromPath<App extends Application, Path extends string, Method extends 'get' | 'find' | 'create' | 'update' | 'patch' | 'remove'> = Method extends 'get' ? InferGetResultFromPath<App, Path> : Method extends 'find' ? InferFindResultFromPath<App, Path> : Method extends 'create' ? InferCreateResultFromPath<App, Path> : Method extends 'update' ? InferUpdateResultFromPath<App, Path> : Method extends 'patch' ? InferPatchResultFromPath<App, Path> : Method extends 'remove' ? InferRemoveResultFromPath<App, Path> : never;
 
 export { type ActionOnEmptyIntersect, type CreateRelatedOptions, type DebouncedFunctionApp, type DebouncedService, DebouncedStore, type DebouncedStoreOptions, type GetItemsIsArrayFrom, type GetItemsIsArrayOptions, type GetItemsIsArrayResult, type GetService, type Handle, type HookForEachOptions, type HookRunPerItemOptions, type HookSetDataOptions, type InferCreateData, type InferCreateDataFromPath, type InferCreateDataSingle, type InferCreateDataSingleFromPath, type InferCreateResult, type InferCreateResultFromPath, type InferCreateResultSingle, type InferCreateResultSingleFromPath, type InferDataFromPath, type InferFindResult, type InferFindResultFromPath, type InferGetResult, type InferGetResultFromPath, type InferPatchData, type InferPatchDataFromPath, type InferPatchResult, type InferPatchResultFromPath, type InferRemoveResult, type InferRemoveResultFromPath, type InferResultFromPath, type InferUpdateData, type InferUpdateDataFromPath, type InferUpdateResult, type InferUpdateResultFromPath, type InitDebounceMixinOptions, type MergeQueryOptions, type OnDeleteAction, type OnDeleteOptions, type OptimizeBatchPatchOptions, type OptimizeBatchPatchResultItem, type Predicate, type PredicateWithContext, type PushSetOptions, type RemoveRelatedOptions, type SetQueryKeySafelyOptions, type ShouldSkipOptions, checkMulti, createRelated, debounceMixin, defineHooks, defineParamsForServer, defineParamsFromClient, deflattenQuery, filterArray, filterObject, filterQuery, flattenQuery, forEach, getItemsIsArray, getPaginate, isMulti, isPaginated, markHookForSkip, mergeArrays, mergeQuery, onDelete, optimizeBatchPatch, paramsForServer, paramsFromClient, parseFields, pushSet, reassembleQuery, removeRelated, runPerItem, setData, setQueryKeySafely, setResultEmpty, shouldSkip, toJSON, validateQueryProperty };