feathers-utils 4.1.0 → 5.0.0

package/dist/index.cjs

@@ -607,6 +607,30 @@ const validateQueryProperty = (query, operators = []) => {
   };
 };
 
+function optimizeBatchPatch(items, options) {
+  const map = [];
+  const id = options?.id ?? "id";
+  for (const [id2, data] of items) {
+    const index = map.findIndex((item) => fastEquals.deepEqual(item.data, data));
+    if (index === -1) {
+      map.push({ ids: [id2], data });
+    } else {
+      map[index].ids.push(id2);
+    }
+  }
+  return map.map(({ ids, data }) => {
+    return ids.length === 1 ? [ids[0], data, void 0] : [
+      null,
+      data,
+      {
+        query: {
+          [id]: { $in: ids }
+        }
+      }
+    ];
+  });
+}
+
 function checkMulti() {
   return (context) => {
     if (shouldSkip("checkMulti", context)) {
@@ -658,27 +682,30 @@ function createRelated({
   };
 }
 
-const forEach = (actionPerItem, _options) => {
-  const options = {
-    wait: "parallel",
-    items: "automatic",
-    ..._options
-  };
+const forEach = (actionPerItem, options) => {
+  const { wait = "parallel", items: from = "automatic" } = options || {};
   return async (context) => {
-    if (shouldSkip("runForItems", context)) {
+    if (shouldSkip("forEach", context)) {
       return context;
     }
-    const { items } = getItemsIsArray(context, { from: options.items });
+    const { items } = getItemsIsArray(context, { from });
+    const forAll = options?.forAll ? await options.forAll(items, context) : {};
     const promises = [];
+    let i = 0;
     for (const item of items) {
-      const promise = actionPerItem(item, context);
-      if (options.wait === "sequential") {
+      const promise = actionPerItem(item, {
+        context,
+        i,
+        fromAll: forAll
+      });
+      if (wait === "sequential") {
         await promise;
       } else {
         promises.push(promise);
       }
+      i++;
     }
-    if (options.wait === "parallel") {
+    if (wait === "parallel") {
       await Promise.all(promises);
     }
     return context;
@@ -986,6 +1013,7 @@ exports.markHookForSkip = markHookForSkip;
 exports.mergeArrays = mergeArrays;
 exports.mergeQuery = mergeQuery;
 exports.onDelete = onDelete;
+exports.optimizeBatchPatch = optimizeBatchPatch;
 exports.parseFields = parseFields;
 exports.pushSet = pushSet;
 exports.removeRelated = removeRelated;

package/dist/index.d.cts

@@ -36,11 +36,17 @@ interface GetItemsIsArrayResult<T = any> {
 }
 declare const getItemsIsArray: <T = any, H extends HookContext<_feathersjs_feathers.Application<any, any>, any> = HookContext<_feathersjs_feathers.Application<any, any>, any>>(context: H, options?: GetItemsIsArrayOptions) => GetItemsIsArrayResult<T>;
 
-interface HookForEachOptions {
+type HookForEachOptions<T = any, H = HookContext, R = never> = {
     wait?: "sequential" | "parallel" | false;
     items?: GetItemsIsArrayOptions["from"];
-}
-declare const forEach: <H extends HookContext<_feathersjs_feathers.Application<any, any>, any> = HookContext<_feathersjs_feathers.Application<any, any>, any>, T = any>(actionPerItem: (item: T, context: H) => Promisable<any>, _options?: HookForEachOptions) => ReturnAsyncHook<H>;
+    forAll?: (items: T[], context: H) => Promisable<R>;
+};
+type ActionPerItem<T, H, R> = (item: T, options: {
+    context: H;
+    i: number;
+    fromAll: R;
+}) => Promisable<any>;
+declare const forEach: <H extends HookContext<_feathersjs_feathers.Application<any, any>, any> = HookContext<_feathersjs_feathers.Application<any, any>, any>, T = any, R = never>(actionPerItem: ActionPerItem<T, H, R>, options?: HookForEachOptions<T, H, R>) => ReturnAsyncHook<H>;
 
 type OnDeleteAction = "cascade" | "set null";
 interface OnDeleteOptions {
@@ -234,6 +240,12 @@ declare const toJSON: (context: HookContext) => HookContext<_feathersjs_feathers
  */
 declare const validateQueryProperty: (query: any, operators?: string[]) => Query;
 
+type OptimizeBatchPatchOptions = {
+    id?: string;
+};
+type OptimizeBatchPatchResultItem<T = Record<string, unknown>, P = Params> = [Id, T, P | undefined];
+declare function optimizeBatchPatch<T extends Record<string, unknown>, P extends Params>(items: Map<Id, T>, options?: OptimizeBatchPatchOptions): OptimizeBatchPatchResultItem<T, P>[];
+
 declare const filterArray: <T extends string[]>(...keys: T) => { [key in T[number]]: (value: any, options: FilterQueryOptions) => any; };
 
 declare const filterObject: <T extends string[]>(...keys: T) => { [key in T[number]]: (value: any, options: FilterQueryOptions) => any; };
@@ -284,4 +296,4 @@ type InferRemoveResultFromPath<App extends Application, Path extends string, IdO
 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 FirstLast, 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 Predicate, type PredicateWithContext, type PushSetOptions, type RemoveRelatedOptions, type SetQueryKeySafelyOptions, type ShouldSkipOptions, checkMulti, createRelated, debounceMixin, defineHooks, filterArray, filterObject, filterQuery, forEach, getItemsIsArray, getPaginate, isMulti, isPaginated, makeDefaultOptions, markHookForSkip, mergeArrays, mergeQuery, onDelete, parseFields, pushSet, removeRelated, runPerItem, setData, setQueryKeySafely, setResultEmpty, shouldSkip, toJSON, validateQueryProperty };
+export { type ActionOnEmptyIntersect, type CreateRelatedOptions, type DebouncedFunctionApp, type DebouncedService, DebouncedStore, type DebouncedStoreOptions, type FirstLast, 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, filterArray, filterObject, filterQuery, forEach, getItemsIsArray, getPaginate, isMulti, isPaginated, makeDefaultOptions, markHookForSkip, mergeArrays, mergeQuery, onDelete, optimizeBatchPatch, parseFields, pushSet, removeRelated, runPerItem, setData, setQueryKeySafely, setResultEmpty, shouldSkip, toJSON, validateQueryProperty };

package/dist/index.d.mts

@@ -36,11 +36,17 @@ interface GetItemsIsArrayResult<T = any> {
 }
 declare const getItemsIsArray: <T = any, H extends HookContext<_feathersjs_feathers.Application<any, any>, any> = HookContext<_feathersjs_feathers.Application<any, any>, any>>(context: H, options?: GetItemsIsArrayOptions) => GetItemsIsArrayResult<T>;
 
-interface HookForEachOptions {
+type HookForEachOptions<T = any, H = HookContext, R = never> = {
     wait?: "sequential" | "parallel" | false;
     items?: GetItemsIsArrayOptions["from"];
-}
-declare const forEach: <H extends HookContext<_feathersjs_feathers.Application<any, any>, any> = HookContext<_feathersjs_feathers.Application<any, any>, any>, T = any>(actionPerItem: (item: T, context: H) => Promisable<any>, _options?: HookForEachOptions) => ReturnAsyncHook<H>;
+    forAll?: (items: T[], context: H) => Promisable<R>;
+};
+type ActionPerItem<T, H, R> = (item: T, options: {
+    context: H;
+    i: number;
+    fromAll: R;
+}) => Promisable<any>;
+declare const forEach: <H extends HookContext<_feathersjs_feathers.Application<any, any>, any> = HookContext<_feathersjs_feathers.Application<any, any>, any>, T = any, R = never>(actionPerItem: ActionPerItem<T, H, R>, options?: HookForEachOptions<T, H, R>) => ReturnAsyncHook<H>;
 
 type OnDeleteAction = "cascade" | "set null";
 interface OnDeleteOptions {
@@ -234,6 +240,12 @@ declare const toJSON: (context: HookContext) => HookContext<_feathersjs_feathers
  */
 declare const validateQueryProperty: (query: any, operators?: string[]) => Query;
 
+type OptimizeBatchPatchOptions = {
+    id?: string;
+};
+type OptimizeBatchPatchResultItem<T = Record<string, unknown>, P = Params> = [Id, T, P | undefined];
+declare function optimizeBatchPatch<T extends Record<string, unknown>, P extends Params>(items: Map<Id, T>, options?: OptimizeBatchPatchOptions): OptimizeBatchPatchResultItem<T, P>[];
+
 declare const filterArray: <T extends string[]>(...keys: T) => { [key in T[number]]: (value: any, options: FilterQueryOptions) => any; };
 
 declare const filterObject: <T extends string[]>(...keys: T) => { [key in T[number]]: (value: any, options: FilterQueryOptions) => any; };
@@ -284,4 +296,4 @@ type InferRemoveResultFromPath<App extends Application, Path extends string, IdO
 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 FirstLast, 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 Predicate, type PredicateWithContext, type PushSetOptions, type RemoveRelatedOptions, type SetQueryKeySafelyOptions, type ShouldSkipOptions, checkMulti, createRelated, debounceMixin, defineHooks, filterArray, filterObject, filterQuery, forEach, getItemsIsArray, getPaginate, isMulti, isPaginated, makeDefaultOptions, markHookForSkip, mergeArrays, mergeQuery, onDelete, parseFields, pushSet, removeRelated, runPerItem, setData, setQueryKeySafely, setResultEmpty, shouldSkip, toJSON, validateQueryProperty };
+export { type ActionOnEmptyIntersect, type CreateRelatedOptions, type DebouncedFunctionApp, type DebouncedService, DebouncedStore, type DebouncedStoreOptions, type FirstLast, 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, filterArray, filterObject, filterQuery, forEach, getItemsIsArray, getPaginate, isMulti, isPaginated, makeDefaultOptions, markHookForSkip, mergeArrays, mergeQuery, onDelete, optimizeBatchPatch, parseFields, pushSet, removeRelated, runPerItem, setData, setQueryKeySafely, setResultEmpty, shouldSkip, toJSON, validateQueryProperty };

package/dist/index.d.ts

@@ -36,11 +36,17 @@ interface GetItemsIsArrayResult<T = any> {
 }
 declare const getItemsIsArray: <T = any, H extends HookContext<_feathersjs_feathers.Application<any, any>, any> = HookContext<_feathersjs_feathers.Application<any, any>, any>>(context: H, options?: GetItemsIsArrayOptions) => GetItemsIsArrayResult<T>;
 
-interface HookForEachOptions {
+type HookForEachOptions<T = any, H = HookContext, R = never> = {
     wait?: "sequential" | "parallel" | false;
     items?: GetItemsIsArrayOptions["from"];
-}
-declare const forEach: <H extends HookContext<_feathersjs_feathers.Application<any, any>, any> = HookContext<_feathersjs_feathers.Application<any, any>, any>, T = any>(actionPerItem: (item: T, context: H) => Promisable<any>, _options?: HookForEachOptions) => ReturnAsyncHook<H>;
+    forAll?: (items: T[], context: H) => Promisable<R>;
+};
+type ActionPerItem<T, H, R> = (item: T, options: {
+    context: H;
+    i: number;
+    fromAll: R;
+}) => Promisable<any>;
+declare const forEach: <H extends HookContext<_feathersjs_feathers.Application<any, any>, any> = HookContext<_feathersjs_feathers.Application<any, any>, any>, T = any, R = never>(actionPerItem: ActionPerItem<T, H, R>, options?: HookForEachOptions<T, H, R>) => ReturnAsyncHook<H>;
 
 type OnDeleteAction = "cascade" | "set null";
 interface OnDeleteOptions {
@@ -234,6 +240,12 @@ declare const toJSON: (context: HookContext) => HookContext<_feathersjs_feathers
  */
 declare const validateQueryProperty: (query: any, operators?: string[]) => Query;
 
+type OptimizeBatchPatchOptions = {
+    id?: string;
+};
+type OptimizeBatchPatchResultItem<T = Record<string, unknown>, P = Params> = [Id, T, P | undefined];
+declare function optimizeBatchPatch<T extends Record<string, unknown>, P extends Params>(items: Map<Id, T>, options?: OptimizeBatchPatchOptions): OptimizeBatchPatchResultItem<T, P>[];
+
 declare const filterArray: <T extends string[]>(...keys: T) => { [key in T[number]]: (value: any, options: FilterQueryOptions) => any; };
 
 declare const filterObject: <T extends string[]>(...keys: T) => { [key in T[number]]: (value: any, options: FilterQueryOptions) => any; };
@@ -284,4 +296,4 @@ type InferRemoveResultFromPath<App extends Application, Path extends string, IdO
 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 FirstLast, 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 Predicate, type PredicateWithContext, type PushSetOptions, type RemoveRelatedOptions, type SetQueryKeySafelyOptions, type ShouldSkipOptions, checkMulti, createRelated, debounceMixin, defineHooks, filterArray, filterObject, filterQuery, forEach, getItemsIsArray, getPaginate, isMulti, isPaginated, makeDefaultOptions, markHookForSkip, mergeArrays, mergeQuery, onDelete, parseFields, pushSet, removeRelated, runPerItem, setData, setQueryKeySafely, setResultEmpty, shouldSkip, toJSON, validateQueryProperty };
+export { type ActionOnEmptyIntersect, type CreateRelatedOptions, type DebouncedFunctionApp, type DebouncedService, DebouncedStore, type DebouncedStoreOptions, type FirstLast, 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, filterArray, filterObject, filterQuery, forEach, getItemsIsArray, getPaginate, isMulti, isPaginated, makeDefaultOptions, markHookForSkip, mergeArrays, mergeQuery, onDelete, optimizeBatchPatch, parseFields, pushSet, removeRelated, runPerItem, setData, setQueryKeySafely, setResultEmpty, shouldSkip, toJSON, validateQueryProperty };

package/dist/index.mjs

@@ -593,6 +593,30 @@ const validateQueryProperty = (query, operators = []) => {
   };
 };
 
+function optimizeBatchPatch(items, options) {
+  const map = [];
+  const id = options?.id ?? "id";
+  for (const [id2, data] of items) {
+    const index = map.findIndex((item) => deepEqual(item.data, data));
+    if (index === -1) {
+      map.push({ ids: [id2], data });
+    } else {
+      map[index].ids.push(id2);
+    }
+  }
+  return map.map(({ ids, data }) => {
+    return ids.length === 1 ? [ids[0], data, void 0] : [
+      null,
+      data,
+      {
+        query: {
+          [id]: { $in: ids }
+        }
+      }
+    ];
+  });
+}
+
 function checkMulti() {
   return (context) => {
     if (shouldSkip("checkMulti", context)) {
@@ -644,27 +668,30 @@ function createRelated({
   };
 }
 
-const forEach = (actionPerItem, _options) => {
-  const options = {
-    wait: "parallel",
-    items: "automatic",
-    ..._options
-  };
+const forEach = (actionPerItem, options) => {
+  const { wait = "parallel", items: from = "automatic" } = options || {};
   return async (context) => {
-    if (shouldSkip("runForItems", context)) {
+    if (shouldSkip("forEach", context)) {
       return context;
     }
-    const { items } = getItemsIsArray(context, { from: options.items });
+    const { items } = getItemsIsArray(context, { from });
+    const forAll = options?.forAll ? await options.forAll(items, context) : {};
     const promises = [];
+    let i = 0;
     for (const item of items) {
-      const promise = actionPerItem(item, context);
-      if (options.wait === "sequential") {
+      const promise = actionPerItem(item, {
+        context,
+        i,
+        fromAll: forAll
+      });
+      if (wait === "sequential") {
         await promise;
       } else {
         promises.push(promise);
       }
+      i++;
     }
-    if (options.wait === "parallel") {
+    if (wait === "parallel") {
       await Promise.all(promises);
     }
     return context;
@@ -954,4 +981,4 @@ const filterObject = (...keys) => {
   return result;
 };
 
-export { DebouncedStore, checkMulti, createRelated, debounceMixin, defineHooks, filterArray, filterObject, filterQuery, forEach, getItemsIsArray, getPaginate, isMulti, isPaginated, makeDefaultOptions, markHookForSkip, mergeArrays, mergeQuery, onDelete, parseFields, pushSet, removeRelated, runPerItem, setData, setQueryKeySafely, setResultEmpty, shouldSkip, toJSON, validateQueryProperty };
+export { DebouncedStore, checkMulti, createRelated, debounceMixin, defineHooks, filterArray, filterObject, filterQuery, forEach, getItemsIsArray, getPaginate, isMulti, isPaginated, makeDefaultOptions, markHookForSkip, mergeArrays, mergeQuery, onDelete, optimizeBatchPatch, parseFields, pushSet, removeRelated, runPerItem, setData, setQueryKeySafely, setResultEmpty, shouldSkip, toJSON, validateQueryProperty };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "feathers-utils",
-  "version": "4.1.0",
+  "version": "5.0.0",
   "description": "Some utils for projects using '@feathersjs/feathers'",
   "author": "fratzinger",
   "repository": {

package/src/hooks/forEach.ts

@@ -5,42 +5,63 @@ import type { HookContext } from "@feathersjs/feathers";
 import type { GetItemsIsArrayOptions } from "../utils/getItemsIsArray";
 import { getItemsIsArray } from "../utils/getItemsIsArray";
 
-export interface HookForEachOptions {
+export type HookForEachOptions<T = any, H = HookContext, R = never> = {
   wait?: "sequential" | "parallel" | false;
   items?: GetItemsIsArrayOptions["from"];
-}
+  forAll?: (items: T[], context: H) => Promisable<R>;
+};
+
+type ActionPerItem<T, H, R> = (
+  item: T,
+  options: {
+    context: H;
+    i: number;
+    fromAll: R;
+  },
+) => Promisable<any>;
 
-export const forEach = <H extends HookContext = HookContext, T = any>(
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  actionPerItem: (item: T, context: H) => Promisable<any>,
-  _options?: HookForEachOptions,
+export const forEach = <
+  H extends HookContext = HookContext,
+  T = any,
+  R = never,
+>(
+  actionPerItem: ActionPerItem<T, H, R>,
+  options?: HookForEachOptions<T, H, R>,
 ): ReturnAsyncHook<H> => {
-  const options: Required<HookForEachOptions> = {
-    wait: "parallel",
-    items: "automatic",
-    ..._options,
-  };
+  const { wait = "parallel", items: from = "automatic" } = options || {};
 
   return async (context: H): Promise<H> => {
-    if (shouldSkip("runForItems", context)) {
+    if (shouldSkip("forEach", context)) {
       return context;
     }
 
-    const { items } = getItemsIsArray(context, { from: options.items });
+    const { items } = getItemsIsArray(context, { from });
+
+    const forAll = options?.forAll
+      ? await options.forAll(items, context)
+      : ({} as R);
 
     const promises: Promise<any>[] = [];
 
+    let i = 0;
+
     for (const item of items) {
-      const promise = actionPerItem(item, context);
+      const promise = actionPerItem(item, {
+        context,
+        i,
+        fromAll: forAll,
+      });
 
-      if (options.wait === "sequential") {
+      if (wait === "sequential") {
         await promise;
       } else {
         promises.push(promise);
       }
+
+      i++;
     }
 
-    if (options.wait === "parallel") {
+    if (wait === "parallel") {
       await Promise.all(promises);
     }
 

package/src/utils/index.ts

@@ -12,3 +12,4 @@ export * from "./setResultEmpty";
 export * from "./shouldSkip";
 export * from "./toJSON";
 export * from "./validateQueryProperty";
+export * from "./optimizeBatchPatch";

package/src/utils/optimizeBatchPatch.ts

@@ -0,0 +1,66 @@
+import type { Id, Params } from "@feathersjs/feathers";
+import { deepEqual } from "fast-equals";
+
+export type OptimizeBatchPatchOptions = {
+  id?: string;
+};
+
+export type OptimizeBatchPatchResultItem<
+  T = Record<string, unknown>,
+  P = Params,
+> = [Id, T, P | undefined];
+
+export function optimizeBatchPatch<
+  T extends Record<string, unknown>,
+  P extends Params,
+>(
+  items: Map<Id, T>,
+  options?: OptimizeBatchPatchOptions,
+): OptimizeBatchPatchResultItem<T, P>[] {
+  const map: { ids: Id[]; data: T }[] = [];
+
+  const id = options?.id ?? "id";
+
+  for (const [id, data] of items) {
+    const index = map.findIndex((item) => deepEqual(item.data, data));
+
+    if (index === -1) {
+      map.push({ ids: [id], data });
+    } else {
+      map[index].ids.push(id);
+    }
+  }
+
+  return map.map(({ ids, data }) => {
+    return ids.length === 1
+      ? ([ids[0], data, undefined] as OptimizeBatchPatchResultItem<T, P>)
+      : ([
+          null,
+          data,
+          {
+            query: {
+              [id]: { $in: ids },
+            },
+          },
+        ] as OptimizeBatchPatchResultItem<T, P>);
+  });
+}
+
+if (import.meta.vitest) {
+  const { it, expect } = import.meta.vitest;
+  it("optimizeBatchPatch", () => {
+    const items = new Map<Id, Record<string, unknown>>([
+      ["1", { name: "John" }],
+      ["2", { name: "Jane" }],
+      ["3", { name: "John" }],
+      ["4", { name: "Jane" }],
+      [5, { name: "Jack" }],
+    ]);
+
+    expect(optimizeBatchPatch(items)).toEqual([
+      [null, { name: "John" }, { query: { id: { $in: ["1", "3"] } } }],
+      [null, { name: "Jane" }, { query: { id: { $in: ["2", "4"] } } }],
+      [5, { name: "Jack" }, undefined],
+    ]);
+  });
+}