feathers-utils 10.0.0 → 10.0.2

package/dist/{hooks-DPFxxjBu.mjs → hooks-yFJ5FmU5.mjs}

@@ -1,10 +1,9 @@
-import { g as every, p as isMulti, t as throwIf, u as isProvider } from "./predicates-CT08opkD.mjs";
-import { d as checkContext, f as addToQuery, h as sortQueryProperties, r as transformParams, u as contextToJson } from "./utils-1I_iPZkV.mjs";
-import { a as traverse$1, i as isPromise, r as toArray, t as early } from "./internal.utils-BWQ25nOd.mjs";
-import { i as getDataIsArray, r as getResultIsArray } from "./mutate-result.util-CCBWix-G.mjs";
-import { r as transformData } from "./transform-result.hook-CevWK5TA.mjs";
-import "./resolve-Cx9osy8O.mjs";
-import isObject from "lodash/isObject.js";
+import { a as traverse$1, i as isPromise, r as toArray, t as early } from "./internal.utils-3BrB8lRY.mjs";
+import { g as every, p as isMulti, t as throwIf, u as isProvider } from "./predicates-BC8p_YLo.mjs";
+import { d as checkContext, f as addToQuery, h as sortQueryProperties, r as transformParams, u as contextToJson } from "./utils-BrvpblXB.mjs";
+import { a as getResultIsArray, o as getDataIsArray } from "./mutate-result.util-B6FOkwrd.mjs";
+import { r as transformData } from "./transform-result.hook-CanJtTPV.mjs";
+import "./resolve-ClHfNFlm.mjs";
 import { copy } from "fast-copy";
 import { BadRequest, Forbidden, MethodNotAllowed, TooManyRequests } from "@feathersjs/errors";
 import _get from "lodash/get.js";
@@ -15,16 +14,9 @@ import _setWith from "lodash/setWith.js";
 import _clone from "lodash/clone.js";
 //#region src/hooks/cache/cache-utils.ts
 const stableStringify = (obj) => {
-	if (obj.query) obj = {
-		...obj,
-		query: sortQueryProperties(obj.query)
-	};
-	return JSON.stringify(obj, (key, value) => {
+	const normalized = sortQueryProperties(obj);
+	return JSON.stringify(normalized, (_key, value) => {
 		if (typeof value === "function") throw new Error("Cannot stringify non JSON value");
-		if (isObject(value)) return Object.keys(value).sort().reduce((result, key) => {
-			result[key] = value[key];
-			return result;
-		}, {});
 		return value;
 	});
 };
@@ -68,12 +60,10 @@ const cacheBefore = async (context, cacheMap) => {
 		const value = await cacheMap.get(context);
 		if (value) context.result = value;
 	}
-	return context;
 };
 const cacheAfter = async (context, cacheMap) => {
 	if (context.method === "get" || context.method === "find") await cacheMap.set(context);
 	else await cacheMap.clear(context);
-	return context;
 };
 var ContextCacheMap = class {
 	map;
@@ -81,11 +71,13 @@ var ContextCacheMap = class {
 	options;
 	log;
 	serialize;
+	clone;
 	constructor(options) {
 		this.map = options.map;
 		this.options = options;
 		this.log = options.logger;
 		this.serialize = options.serialize ?? stableStringify;
+		this.clone = options.clone === false ? (value) => value : typeof options.clone === "function" ? options.clone : copy;
 	}
 	stringifyCacheKey(context) {
 		if (context.method !== "get" && context.method !== "find") throw new Error(`Cache can only be used with 'get' or 'find' methods, not '${context.method}'`);
@@ -108,14 +100,14 @@ var ContextCacheMap = class {
 	*/
 	async get(context) {
 		const key = this.stringifyCacheKey(context);
-		const result = this.map.get(key);
+		const result = await this.map.get(key);
 		if (result) {
 			this.log?.({
 				type: "hit",
 				method: context.method,
 				key
 			});
-			return copy(result);
+			return this.clone(result);
 		}
 		this.log?.({
 			type: "miss",
@@ -135,7 +127,7 @@ var ContextCacheMap = class {
 			method: context.method,
 			key
 		});
-		return this.map.set(key, copy(context.result));
+		return this.map.set(key, this.clone(context.result));
 	}
 	async clear(context) {
 		const results = Array.isArray(context.result) ? context.result : [context.result];
@@ -149,6 +141,7 @@ var ContextCacheMap = class {
 			await this.map.clear();
 			return context;
 		}
+		const idSet = new Set(itemIds.map((id) => `${id}`));
 		for (const key of this.map.keys()) {
 			const cachedId = this.getCachedId(key);
 			if (cachedId === "null") {
@@ -161,7 +154,7 @@ var ContextCacheMap = class {
 				continue;
 			}
 			if (context.method === "create") continue;
-			for (const itemId of itemIds) if (cachedId === itemId) {
+			if (idSet.has(cachedId)) {
 				this.log?.({
 					type: "invalidate",
 					method: context.method,
@@ -193,14 +186,15 @@ var ContextCacheMap = class {
 * @see https://utils.feathersjs.com/hooks/check-multi.html
 */
 function checkMulti(options) {
-	return (context, next) => {
+	function hook(context, next) {
 		const { service, method } = context;
 		if (!service.allowsMulti || !isMulti(context) || method === "find" || service.allowsMulti(method)) {
 			if (next) return next();
-			return context;
+			return;
 		}
 		throw options?.error ? options.error(context) : new MethodNotAllowed(`Can not ${method} multiple entries`);
-	};
+	}
+	return hook;
 }
 //#endregion
 //#region src/hooks/check-required/check-required.hook.ts
@@ -222,7 +216,7 @@ function checkMulti(options) {
 */
 function checkRequired(fieldNames) {
 	const fieldNamesArray = toArray(fieldNames);
-	return (context, next) => {
+	function hook(context, next) {
 		checkContext(context, {
 			type: ["before", "around"],
 			method: [
@@ -243,7 +237,8 @@ function checkRequired(fieldNames) {
 			}
 		}
 		if (next) return next();
-	};
+	}
+	return hook;
 }
 //#endregion
 //#region src/hooks/create-related/create-related.hook.ts
@@ -278,7 +273,7 @@ function createRelated(options) {
 		await Promise.all(entries.map(async (entry) => {
 			const { data, service, multi } = entry;
 			const dataToCreate = (await Promise.all(result.map(async (item) => data(item, context)))).flat().filter((x) => !!x);
-			if (!dataToCreate || dataToCreate.length <= 0) return context;
+			if (!dataToCreate || dataToCreate.length <= 0) return;
 			if (multi || dataToCreate.length === 1) await context.app.service(service).create(dataToCreate.length === 1 ? dataToCreate[0] : dataToCreate);
 			else await Promise.all(dataToCreate.map(async (item) => context.app.service(service).create(item)));
 		}));
@@ -338,19 +333,21 @@ const debug = (msg, ...fieldNames) => async (context, next) => {
 *
 * @see https://utils.feathersjs.com/hooks/disable-pagination.html
 */
-const disablePagination = () => (context, next) => {
-	checkContext(context, {
-		type: ["before", "around"],
-		method: ["find"],
-		label: "disablePagination"
-	});
-	const $limit = context.params?.query?.$limit;
-	if ($limit === "-1" || $limit === -1) {
-		context.params.paginate = false;
-		delete context.params.query.$limit;
+const disablePagination = () => {
+	function hook(context, next) {
+		checkContext(context, {
+			type: ["before", "around"],
+			method: ["find"],
+			label: "disablePagination"
+		});
+		const $limit = context.params?.query?.$limit;
+		if ($limit === "-1" || $limit === -1) {
+			context.params.paginate = false;
+			delete context.params.query.$limit;
+		}
+		if (next) return next();
 	}
-	if (next) return next();
-	return context;
+	return hook;
 };
 //#endregion
 //#region src/hooks/disallow/disallow.hook.ts
@@ -375,11 +372,12 @@ const disablePagination = () => (context, next) => {
 */
 const disallow = (transports) => {
 	const transportsArr = toArray(transports);
-	return (context, next) => {
-		if (!transports) throw new MethodNotAllowed("Method not allowed");
+	function hook(context, next) {
+		if (!transports || transportsArr.length === 0) throw new MethodNotAllowed("Method not allowed");
 		if (isProvider(...transportsArr)(context)) throw new MethodNotAllowed(`Provider '${context.params.provider}' can not call '${context.method}' on '${context.path}'. (disallow)`);
-		if (next) return next().then(() => context);
-	};
+		if (next) return next();
+	}
+	return hook;
 };
 //#endregion
 //#region src/hooks/on-delete/on-delete.hook.ts
@@ -394,11 +392,11 @@ const onDelete = (options) => {
 		if (next) await next();
 		const { result } = getResultIsArray(context);
 		if (!result.length) return;
-		const promises = [];
-		optionsMulti.forEach(async ({ keyHere, keyThere, onDelete, service, blocking, query }) => {
+		const blockingPromises = [];
+		for (const { keyHere, keyThere, onDelete, service, blocking, query, onError } of optionsMulti) {
 			let ids = result.map((x) => x[keyHere]).filter((x) => !!x);
 			ids = [...new Set(ids)];
-			if (!ids || ids.length <= 0) return context;
+			if (!ids || ids.length <= 0) continue;
 			const params = {
 				query: {
 					...query,
@@ -412,9 +410,11 @@ const onDelete = (options) => {
 				const data = { [keyThere]: null };
 				promise = context.app.service(service).patch(null, data, params);
 			}
-			if (promise && blocking) promises.push(promise);
-		});
-		if (promises.length) await Promise.all(promises);
+			if (!promise) continue;
+			if (blocking) blockingPromises.push(promise);
+			else promise.catch((error) => onError?.(error, context));
+		}
+		if (blockingPromises.length) await Promise.all(blockingPromises);
 	};
 };
 //#endregion
@@ -442,7 +442,7 @@ const FROM_CLIENT_FOR_SERVER_DEFAULT_KEY = "_$client";
 const paramsForServer = (whitelist, options) => {
 	const whitelistArr = toArray(whitelist);
 	const { keyToHide = FROM_CLIENT_FOR_SERVER_DEFAULT_KEY } = options || {};
-	return (context, next) => {
+	function hook(context, next) {
 		let clonedParams;
 		Object.keys(context.params).forEach((key) => {
 			if (key === "query") return;
@@ -452,14 +452,15 @@ const paramsForServer = (whitelist, options) => {
 					query: { ...context.params.query }
 				};
 				if (!clonedParams.query[keyToHide]) clonedParams.query[keyToHide] = {};
+				else clonedParams.query[keyToHide] = { ...clonedParams.query[keyToHide] };
 				clonedParams.query[keyToHide][key] = clonedParams[key];
 				delete clonedParams[key];
 			}
 		});
 		if (clonedParams) context.params = clonedParams;
 		if (next) return next();
-		return context;
-	};
+	}
+	return hook;
 };
 //#endregion
 //#region src/hooks/params-from-client/params-from-client.hook.ts
@@ -483,10 +484,10 @@ const paramsForServer = (whitelist, options) => {
 const paramsFromClient = (whitelist, options) => {
 	const whitelistArr = toArray(whitelist);
 	const { keyToHide = FROM_CLIENT_FOR_SERVER_DEFAULT_KEY } = options || {};
-	return (context, next) => {
+	function hook(context, next) {
 		if (!context.params?.query?.[keyToHide] || typeof context.params.query[keyToHide] !== "object") {
 			if (next) return next();
-			return context;
+			return;
 		}
 		const params = {
 			...context.params,
@@ -505,8 +506,8 @@ const paramsFromClient = (whitelist, options) => {
 		if (Object.keys(client).length === 0) delete params.query[keyToHide];
 		context.params = params;
 		if (next) return next();
-		return context;
-	};
+	}
+	return hook;
 };
 //#endregion
 //#region src/hooks/prevent-changes/prevent-changes.hook.ts
@@ -577,7 +578,7 @@ const rateLimit = (rateLimiter, options) => {
 			context.params.rateLimit = res;
 			throw new TooManyRequests("Too many requests", { rateLimitRes: res });
 		}
-		if (next) return await next();
+		if (next) await next();
 	};
 };
 //#endregion
@@ -600,17 +601,17 @@ const rateLimit = (rateLimiter, options) => {
 */
 function setData(from, to, options) {
 	const { allowUndefined = false, overwrite = true } = options ?? {};
-	return (context, next) => {
+	function hook(context, next) {
 		const { data } = getDataIsArray(context);
 		const contextJson = contextToJson(context);
 		if (!_has(contextJson, from)) {
 			if (!context.params?.provider || allowUndefined === true) {
 				if (next) return next();
-				return context;
+				return;
 			}
 			if (!overwrite && data.every((item) => _has(item, to))) {
 				if (next) return next();
-				return context;
+				return;
 			}
 			throw options?.error ? options.error(context, from) : new Forbidden(`Expected field ${from.toString()} not available`);
 		}
@@ -621,8 +622,8 @@ function setData(from, to, options) {
 			_set(item, to, val);
 		}
 		if (next) return next();
-		return context;
-	};
+	}
+	return hook;
 }
 //#endregion
 //#region src/hooks/set-field/set-field.hook.ts
@@ -642,23 +643,26 @@ function setData(from, to, options) {
 *
 * @see https://utils.feathersjs.com/hooks/set-field.html
 */
-const setField = ({ as, from, allowUndefined = false, error }) => (context, next) => {
-	const { params } = context;
-	checkContext(context, {
-		type: ["before", "around"],
-		label: "setField"
-	});
-	const value = _get(context, from);
-	if (value === void 0) {
-		if (!params.provider || allowUndefined) {
-			if (next) return next();
-			return context;
+const setField = ({ as, from, allowUndefined = false, error }) => {
+	const targets = Array.isArray(as) ? as : [as];
+	function hook(context, next) {
+		const { params } = context;
+		checkContext(context, {
+			type: ["before", "around"],
+			label: "setField"
+		});
+		const value = typeof from === "function" ? from(context) : _get(context, from);
+		if (value === void 0) {
+			if (!params.provider || allowUndefined) {
+				if (next) return next();
+				return;
+			}
+			throw error ? error(context, from) : new Forbidden(`Expected field ${targets.join(", ")} not available`);
 		}
-		throw error ? error(context, from) : new Forbidden(`Expected field ${as} not available`);
+		for (const target of targets) _setWith(context, target, value, _clone);
+		if (next) return next();
 	}
-	context = _setWith(context, as, value, _clone);
-	if (next) return next();
-	return context;
+	return hook;
 };
 //#endregion
 //#region src/hooks/set-result/set-result.hook.ts
@@ -697,16 +701,20 @@ function setResult(from, to, options) {
 		return context;
 	};
 	const fn = (context) => {
+		if (!!options?.dispatch && !context.dispatch) context.dispatch = copy(context.result);
 		if (options?.dispatch === "both") {
 			forResultOrDispatch(context, true);
 			return forResultOrDispatch(context, false);
 		}
 		return forResultOrDispatch(context, !!options?.dispatch);
 	};
-	return (context, next) => {
-		if (next) return next().then(() => fn(context));
-		return fn(context);
-	};
+	function hook(context, next) {
+		if (next) return next().then(() => {
+			fn(context);
+		});
+		fn(context);
+	}
+	return hook;
 }
 //#endregion
 //#region src/hooks/set-slug/set-slug.hook.ts
@@ -727,15 +735,15 @@ function setResult(from, to, options) {
 * @see https://utils.feathersjs.com/hooks/set-slug.html
 */
 const setSlug = (slug, fieldName) => {
-	if (typeof fieldName !== "string") fieldName = `query.${slug}`;
-	return (context, next) => {
+	const targetField = typeof fieldName === "string" ? fieldName : `query.${slug}`;
+	function hook(context, next) {
 		if (context.params && context.params.provider === "rest") {
 			const value = context.params.route[slug];
-			if (typeof value === "string" && value[0] !== ":") _set(context.params, fieldName, value);
+			if (typeof value === "string" && value[0] !== ":") _set(context.params, targetField, value);
 		}
 		if (next) return next();
-		return context;
-	};
+	}
+	return hook;
 };
 //#endregion
 //#region src/hooks/soft-delete/soft-delete.hook.ts
@@ -765,7 +773,10 @@ const softDelete = (options) => {
 			label: "softDelete"
 		});
 		const { disableSoftDeleteKey = "disableSoftDelete" } = options;
-		if (context.params[disableSoftDeleteKey]) return early(context, next);
+		if (context.params[disableSoftDeleteKey]) {
+			await early(context, next);
+			return;
+		}
 		const { deletedQuery, removeData } = options;
 		let deleteQuery = getValue(deletedQuery, context);
 		if (isPromise(deleteQuery)) deleteQuery = await deleteQuery;
@@ -781,8 +792,7 @@ const softDelete = (options) => {
 			const method = options.usePatchWithHooks ? "patch" : "_patch";
 			context.result = await context.service[method](context.id, data, params);
 		}
-		if (next) return await next();
-		return context;
+		if (next) await next();
 	};
 };
 const getValue = (value, ...args) => {
@@ -823,10 +833,10 @@ const defaultStashFunc = (context) => {
 function stashable(options) {
 	const propName = options?.propName ?? "stashed";
 	const stashFunc = options?.stashFunc ?? defaultStashFunc;
-	return ((context, next) => {
+	function hook(context, next) {
 		if (context.params._stashable) {
 			if (next) return next();
-			return context;
+			return;
 		}
 		checkContext(context, {
 			type: ["before", "around"],
@@ -840,8 +850,8 @@ function stashable(options) {
 		const promise = stashFunc(context).catch(() => void 0);
 		context.params[propName] = () => promise;
 		if (next) return next();
-		return context;
-	});
+	}
+	return hook;
 }
 //#endregion
 //#region src/hooks/throw-if-is-multi/throw-if-is-multi.hook.ts
@@ -905,12 +915,18 @@ const throwIfIsProvider = (transports, options) => {
 *
 * @see https://utils.feathersjs.com/hooks/traverse.html
 */
-const traverse = ({ transformer, getObject }) => (context, next) => {
-	traverse$1(getObject(context), transformer);
-	if (next) return next();
-	return context;
+const traverse = ({ transformer, getObject, runAfter = false }) => {
+	const runTraverse = (context) => traverse$1(getObject(context), transformer);
+	function hook(context, next) {
+		if (next && runAfter) return next().then(() => {
+			runTraverse(context);
+		});
+		runTraverse(context);
+		if (next) return next();
+	}
+	return hook;
 };
 //#endregion
 export { debug as _, softDelete as a, checkMulti as b, setField as c, preventChanges as d, paramsFromClient as f, disablePagination as g, disallow as h, stashable as i, setData as l, onDelete as m, throwIfIsProvider as n, setSlug as o, paramsForServer as p, throwIfIsMulti as r, setResult as s, traverse as t, rateLimit as u, createRelated as v, cache as x, checkRequired as y };
 
-//# sourceMappingURL=hooks-DPFxxjBu.mjs.map
+//# sourceMappingURL=hooks-yFJ5FmU5.mjs.map