feathers-utils 1.10.0 → 1.12.0

package/README.md

@@ -21,6 +21,7 @@ npm i feathers-utils
 
 - `checkMulti`: throws if the request is **multi** data, but the service has `allowsMulti(method)` returns `false`
 - `createRelated`: simply create related items from a hook.
+- `onDelete`: simply remove/set null related items from a hook.
 - `removeRelated`: simple remove related items from a hook. Basically `cascade` at feathers level.
 - `runPerItem`: run a function for every item. Meant for `multi:true`.
 - `setData`: map properties from `context` to `data`. Something like `userId: context.params.user.id`

package/dist/esm/hooks/onDelete.d.ts

@@ -0,0 +1,3 @@
+import type { HookContext } from "@feathersjs/feathers";
+import type { OnDeleteOptions } from "../types";
+export declare function onDelete<S = Record<string, any>>(service: keyof S, { keyThere, keyHere, onDelete, blocking }: OnDeleteOptions): (context: HookContext) => Promise<HookContext>;

package/dist/esm/hooks/onDelete.js

@@ -0,0 +1,39 @@
+import { checkContext } from "feathers-hooks-common";
+import { getItemsIsArray } from "../utils/getItemsIsArray";
+export function onDelete(service, { keyThere, keyHere = "id", onDelete = "cascade", blocking = true }) {
+    if (!service || !keyThere) {
+        throw "initialize hook 'removeRelated' completely!";
+    }
+    if (!["cascade", "set null"].includes(onDelete)) {
+        throw "onDelete must be 'cascade' or 'set null'";
+    }
+    return async (context) => {
+        checkContext(context, "after", "remove", "onDelete");
+        const { items } = getItemsIsArray(context);
+        let ids = items.map(x => x[keyHere]).filter(x => !!x);
+        ids = [...new Set(ids)];
+        if (!ids || ids.length <= 0) {
+            return context;
+        }
+        const params = {
+            query: {
+                [keyThere]: {
+                    $in: ids
+                }
+            },
+            paginate: false
+        };
+        let promise;
+        if (onDelete === "cascade") {
+            promise = context.app.service(service).remove(null, params);
+        }
+        else if (onDelete === "set null") {
+            const data = { [keyThere]: null };
+            promise = context.app.service(service).patch(null, data, params);
+        }
+        if (blocking) {
+            await promise;
+        }
+        return context;
+    };
+}

package/dist/esm/hooks/runPerItem.d.ts

@@ -1,3 +1,3 @@
 import type { HookRunPerItemOptions, ReturnAsyncHook, Promisable } from "../types";
 import type { HookContext } from "@feathersjs/feathers";
-export declare const runPerItem: (actionPerItem: (item: any, context: HookContext) => Promisable<any>, _options?: HookRunPerItemOptions | undefined) => ReturnAsyncHook;
+export declare const runPerItem: (actionPerItem: (item: any, context: HookContext) => Promisable<any>, _options?: HookRunPerItemOptions) => ReturnAsyncHook;

package/dist/esm/hooks/setData.js

@@ -1,6 +1,6 @@
-import _get from "lodash/get";
-import _set from "lodash/set";
-import _has from "lodash/has";
+import _get from "lodash/get.js";
+import _set from "lodash/set.js";
+import _has from "lodash/has.js";
 import { Forbidden } from "@feathersjs/errors";
 import { getItemsIsArray } from "../utils/getItemsIsArray";
 const defaultOptions = {

package/dist/esm/index.d.ts

@@ -29,5 +29,7 @@ export { setResultEmpty } from "./utils/setResultEmpty";
 export { markHookForSkip } from "./utils/markHookForSkip";
 export { filterQuery } from "./utils/filterQuery";
 export { getItemsIsArray } from "./utils/getItemsIsArray";
+export { onDelete } from "./hooks/onDelete";
 export { shouldSkip } from "./utils/shouldSkip";
 export * from "./types";
+export * from "./utility-types/utility-types";

package/dist/esm/index.js

@@ -5,7 +5,7 @@ import { runPerItem } from "./hooks/runPerItem";
 export const hooks = {
     checkMulti,
     setData,
-    runPerItem
+    runPerItem,
 };
 export { checkMulti };
 export { createRelated } from "./hooks/createRelated";
@@ -15,7 +15,7 @@ export { runPerItem };
 import { debounceMixin, DebouncedStore } from "./mixins/debounce-mixin";
 export const mixins = {
     debounceMixin,
-    DebouncedStore
+    DebouncedStore,
 };
 export { debounceMixin };
 export { DebouncedStore };
@@ -30,5 +30,7 @@ export { setResultEmpty } from "./utils/setResultEmpty";
 export { markHookForSkip } from "./utils/markHookForSkip";
 export { filterQuery } from "./utils/filterQuery";
 export { getItemsIsArray } from "./utils/getItemsIsArray";
+export { onDelete } from "./hooks/onDelete";
 export { shouldSkip } from "./utils/shouldSkip";
 export * from "./types";
+export * from "./utility-types/utility-types";

package/dist/esm/mixins/debounce-mixin/DebouncedStore.d.ts

@@ -7,7 +7,7 @@ export declare class DebouncedStore {
     private _options;
     private _isRunningById;
     _queueById: Record<string, DebouncedFunc<((id: Id, action: DebouncedFunctionApp) => void | Promise<void>)>>;
-    add: (id: Id, action: (app?: Application<{}> | undefined) => void | Promise<void>) => void | Promise<void> | undefined;
+    add: (id: Id, action: (app?: Application) => void | Promise<void>) => void | Promise<void> | undefined;
     constructor(app: Application, options?: Partial<DebouncedStoreOptions>);
     private unbounced;
     private debounceById;

package/dist/esm/mixins/debounce-mixin/DebouncedStore.js

@@ -1,4 +1,4 @@
-import _debounce from "lodash/debounce";
+import _debounce from "lodash/debounce.js";
 export const makeDefaultOptions = () => {
     return {
         leading: false,

package/dist/esm/types.d.ts

@@ -36,6 +36,13 @@ export interface CreateRelatedOptions<S = Record<string, any>> {
     data: (item: any, context: HookContext) => Promisable<Record<string, any>>;
     createItemsInDataArraySeparately?: boolean;
 }
+export declare type OnDeleteAction = "cascade" | "set null";
+export interface OnDeleteOptions {
+    keyThere: string;
+    keyHere: string;
+    onDelete: OnDeleteAction;
+    blocking?: boolean;
+}
 export interface InitDebounceMixinOptions {
     default: Partial<DebouncedStoreOptions>;
     blacklist: string[];

package/dist/esm/utility-types/utility-types.d.ts

@@ -0,0 +1,33 @@
+export declare type InferCreateData<S> = S extends {
+    create: (data: infer D, params: any) => any;
+} ? D : never;
+export declare type InferCreateDataSingle<S> = S extends {
+    create: (data: infer D, params: any) => any;
+} ? D extends Array<infer T> ? T : D : never;
+export declare type InferUpdateData<S> = S extends {
+    update: (id: any, data: infer D, params: any) => any;
+} ? D : never;
+export declare type InferPatchData<S> = S extends {
+    patch: (id: any, data: infer D, params: any) => any;
+} ? D : never;
+export declare type InferGetResult<S> = S extends {
+    get: (id: any, params: any) => infer R;
+} ? Awaited<R> : never;
+export declare type InferFindResult<S> = S extends {
+    find: (params: any) => infer R;
+} ? Awaited<R> : never;
+export declare type InferCreateResult<S, D = any> = S extends {
+    create: (data: D, params: any) => infer R;
+} ? Awaited<R> : never;
+export declare type InferCreateResultSingle<S> = S extends {
+    create: (data: any, params: any) => infer R;
+} ? Awaited<R> extends Array<infer T> ? T : Awaited<R> : never;
+export declare type InferUpdateResult<S> = S extends {
+    update: (id: any, data: any, params: any) => infer R;
+} ? Awaited<R> : never;
+export declare type InferPatchResult<S, Id = any> = S extends {
+    patch: (id: Id, data: any, params: any) => infer R;
+} ? Awaited<R> : never;
+export declare type InferRemoveResult<S, Id = any> = S extends {
+    remove: (id: Id, params: any) => infer R;
+} ? Awaited<R> : never;

package/dist/esm/utility-types/utility-types.js

@@ -0,0 +1 @@
+export {};

package/dist/esm/utils/mergeQuery/index.js

@@ -1,10 +1,10 @@
-import _get from "lodash/get";
-import _has from "lodash/has";
-import _isEmpty from "lodash/isEmpty";
-import _isEqual from "lodash/isEqual";
-import _merge from "lodash/merge";
-import _set from "lodash/set";
-import _uniqWith from "lodash/uniqWith";
+import _get from "lodash/get.js";
+import _has from "lodash/has.js";
+import _isEmpty from "lodash/isEmpty.js";
+import _isEqual from "lodash/isEqual.js";
+import _merge from "lodash/merge.js";
+import _set from "lodash/set.js";
+import _uniqWith from "lodash/uniqWith.js";
 import { mergeArrays } from "./mergeArrays";
 import { filterQuery } from "../filterQuery";
 import { Forbidden } from "@feathersjs/errors";

package/dist/esm/utils/pushSet.d.ts

@@ -1,2 +1,2 @@
 import type { Path, PushSetOptions } from "../types";
-export declare const pushSet: (obj: Record<string, unknown>, path: string | Path, val: unknown, options?: PushSetOptions | undefined) => unknown[];
+export declare const pushSet: (obj: Record<string, unknown>, path: string | Path, val: unknown, options?: PushSetOptions) => unknown[];

package/dist/esm/utils/pushSet.js

@@ -1,6 +1,6 @@
-import _isEqual from "lodash/isEqual";
-import _get from "lodash/get";
-import _set from "lodash/set";
+import _isEqual from "lodash/isEqual.js";
+import _get from "lodash/get.js";
+import _set from "lodash/set.js";
 export const pushSet = (obj, path, val, options) => {
     options = options || {};
     let arr = _get(obj, path);

package/dist/hooks/onDelete.d.ts

@@ -0,0 +1,3 @@
+import type { HookContext } from "@feathersjs/feathers";
+import type { OnDeleteOptions } from "../types";
+export declare function onDelete<S = Record<string, any>>(service: keyof S, { keyThere, keyHere, onDelete, blocking }: OnDeleteOptions): (context: HookContext) => Promise<HookContext>;

package/dist/hooks/onDelete.js

@@ -0,0 +1,52 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.onDelete = void 0;
+const feathers_hooks_common_1 = require("feathers-hooks-common");
+const getItemsIsArray_1 = require("../utils/getItemsIsArray");
+function onDelete(service, { keyThere, keyHere = "id", onDelete = "cascade", blocking = true }) {
+    if (!service || !keyThere) {
+        throw "initialize hook 'removeRelated' completely!";
+    }
+    if (!["cascade", "set null"].includes(onDelete)) {
+        throw "onDelete must be 'cascade' or 'set null'";
+    }
+    return (context) => __awaiter(this, void 0, void 0, function* () {
+        (0, feathers_hooks_common_1.checkContext)(context, "after", "remove", "onDelete");
+        const { items } = (0, getItemsIsArray_1.getItemsIsArray)(context);
+        let ids = items.map(x => x[keyHere]).filter(x => !!x);
+        ids = [...new Set(ids)];
+        if (!ids || ids.length <= 0) {
+            return context;
+        }
+        const params = {
+            query: {
+                [keyThere]: {
+                    $in: ids
+                }
+            },
+            paginate: false
+        };
+        let promise;
+        if (onDelete === "cascade") {
+            promise = context.app.service(service).remove(null, params);
+        }
+        else if (onDelete === "set null") {
+            const data = { [keyThere]: null };
+            promise = context.app.service(service).patch(null, data, params);
+        }
+        if (blocking) {
+            yield promise;
+        }
+        return context;
+    });
+}
+exports.onDelete = onDelete;

package/dist/hooks/runPerItem.d.ts

@@ -1,3 +1,3 @@
 import type { HookRunPerItemOptions, ReturnAsyncHook, Promisable } from "../types";
 import type { HookContext } from "@feathersjs/feathers";
-export declare const runPerItem: (actionPerItem: (item: any, context: HookContext) => Promisable<any>, _options?: HookRunPerItemOptions | undefined) => ReturnAsyncHook;
+export declare const runPerItem: (actionPerItem: (item: any, context: HookContext) => Promisable<any>, _options?: HookRunPerItemOptions) => ReturnAsyncHook;

package/dist/hooks/setData.js

@@ -4,9 +4,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.setData = void 0;
-const get_1 = __importDefault(require("lodash/get"));
-const set_1 = __importDefault(require("lodash/set"));
-const has_1 = __importDefault(require("lodash/has"));
+const get_js_1 = __importDefault(require("lodash/get.js"));
+const set_js_1 = __importDefault(require("lodash/set.js"));
+const has_js_1 = __importDefault(require("lodash/has.js"));
 const errors_1 = require("@feathersjs/errors");
 const getItemsIsArray_1 = require("../utils/getItemsIsArray");
 const defaultOptions = {
@@ -18,16 +18,16 @@ function setData(from, to, _options) {
     return (context) => {
         var _a;
         const { items } = (0, getItemsIsArray_1.getItemsIsArray)(context);
-        if (!(0, has_1.default)(context, from)) {
+        if (!(0, has_js_1.default)(context, from)) {
             if (!((_a = context.params) === null || _a === void 0 ? void 0 : _a.provider) || options.allowUndefined === true) {
                 return context;
             }
-            if (!options.overwrite && items.every((item) => (0, has_1.default)(item, to))) {
+            if (!options.overwrite && items.every((item) => (0, has_js_1.default)(item, to))) {
                 return context;
             }
             throw new errors_1.Forbidden(`Expected field ${from.toString()} not available`);
         }
-        const val = (0, get_1.default)(context, from);
+        const val = (0, get_js_1.default)(context, from);
         items.forEach((item) => {
             let overwrite;
             if (typeof options.overwrite === "function") {
@@ -36,10 +36,10 @@ function setData(from, to, _options) {
             else {
                 overwrite = options.overwrite;
             }
-            if (!overwrite && (0, has_1.default)(item, to)) {
+            if (!overwrite && (0, has_js_1.default)(item, to)) {
                 return;
             }
-            (0, set_1.default)(item, to, val);
+            (0, set_js_1.default)(item, to, val);
         });
         return context;
     };

package/dist/index.d.ts

@@ -29,5 +29,7 @@ export { setResultEmpty } from "./utils/setResultEmpty";
 export { markHookForSkip } from "./utils/markHookForSkip";
 export { filterQuery } from "./utils/filterQuery";
 export { getItemsIsArray } from "./utils/getItemsIsArray";
+export { onDelete } from "./hooks/onDelete";
 export { shouldSkip } from "./utils/shouldSkip";
 export * from "./types";
+export * from "./utility-types/utility-types";

package/dist/index.js

@@ -14,7 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.shouldSkip = exports.getItemsIsArray = exports.filterQuery = exports.markHookForSkip = exports.setResultEmpty = exports.pushSet = exports.mergeArrays = exports.mergeQuery = exports.isPaginated = exports.isMulti = exports.getPaginate = exports.addHook = exports.DebouncedStore = exports.debounceMixin = exports.mixins = exports.runPerItem = exports.removeRelated = exports.setData = exports.createRelated = exports.checkMulti = exports.hooks = void 0;
+exports.shouldSkip = exports.onDelete = exports.getItemsIsArray = exports.filterQuery = exports.markHookForSkip = exports.setResultEmpty = exports.pushSet = exports.mergeArrays = exports.mergeQuery = exports.isPaginated = exports.isMulti = exports.getPaginate = exports.addHook = exports.DebouncedStore = exports.debounceMixin = exports.mixins = exports.runPerItem = exports.removeRelated = exports.setData = exports.createRelated = exports.checkMulti = exports.hooks = void 0;
 // hooks
 const checkMulti_1 = require("./hooks/checkMulti");
 Object.defineProperty(exports, "checkMulti", { enumerable: true, get: function () { return checkMulti_1.checkMulti; } });
@@ -25,7 +25,7 @@ Object.defineProperty(exports, "runPerItem", { enumerable: true, get: function (
 exports.hooks = {
     checkMulti: checkMulti_1.checkMulti,
     setData: setData_1.setData,
-    runPerItem: runPerItem_1.runPerItem
+    runPerItem: runPerItem_1.runPerItem,
 };
 var createRelated_1 = require("./hooks/createRelated");
 Object.defineProperty(exports, "createRelated", { enumerable: true, get: function () { return createRelated_1.createRelated; } });
@@ -36,7 +36,7 @@ Object.defineProperty(exports, "debounceMixin", { enumerable: true, get: functio
 Object.defineProperty(exports, "DebouncedStore", { enumerable: true, get: function () { return debounce_mixin_1.DebouncedStore; } });
 exports.mixins = {
     debounceMixin: debounce_mixin_1.debounceMixin,
-    DebouncedStore: debounce_mixin_1.DebouncedStore
+    DebouncedStore: debounce_mixin_1.DebouncedStore,
 };
 var addHook_1 = require("./utils/addHook");
 Object.defineProperty(exports, "addHook", { enumerable: true, get: function () { return addHook_1.addHook; } });
@@ -60,6 +60,9 @@ var filterQuery_1 = require("./utils/filterQuery");
 Object.defineProperty(exports, "filterQuery", { enumerable: true, get: function () { return filterQuery_1.filterQuery; } });
 var getItemsIsArray_1 = require("./utils/getItemsIsArray");
 Object.defineProperty(exports, "getItemsIsArray", { enumerable: true, get: function () { return getItemsIsArray_1.getItemsIsArray; } });
+var onDelete_1 = require("./hooks/onDelete");
+Object.defineProperty(exports, "onDelete", { enumerable: true, get: function () { return onDelete_1.onDelete; } });
 var shouldSkip_1 = require("./utils/shouldSkip");
 Object.defineProperty(exports, "shouldSkip", { enumerable: true, get: function () { return shouldSkip_1.shouldSkip; } });
 __exportStar(require("./types"), exports);
+__exportStar(require("./utility-types/utility-types"), exports);

package/dist/mixins/debounce-mixin/DebouncedStore.d.ts

@@ -7,7 +7,7 @@ export declare class DebouncedStore {
     private _options;
     private _isRunningById;
     _queueById: Record<string, DebouncedFunc<((id: Id, action: DebouncedFunctionApp) => void | Promise<void>)>>;
-    add: (id: Id, action: (app?: Application<{}> | undefined) => void | Promise<void>) => void | Promise<void> | undefined;
+    add: (id: Id, action: (app?: Application) => void | Promise<void>) => void | Promise<void> | undefined;
     constructor(app: Application, options?: Partial<DebouncedStoreOptions>);
     private unbounced;
     private debounceById;

package/dist/mixins/debounce-mixin/DebouncedStore.js

@@ -13,7 +13,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DebouncedStore = exports.makeDefaultOptions = void 0;
-const debounce_1 = __importDefault(require("lodash/debounce"));
+const debounce_js_1 = __importDefault(require("lodash/debounce.js"));
 const makeDefaultOptions = () => {
     return {
         leading: false,
@@ -52,7 +52,7 @@ class DebouncedStore {
             if (typeof this._queueById[id] === "function") {
                 return this._queueById[id](id, action);
             }
-            this._queueById[id] = (0, debounce_1.default)((id, action) => {
+            this._queueById[id] = (0, debounce_js_1.default)((id, action) => {
                 this.unbounced(id, action);
             }, wait, Object.assign(Object.assign({}, options), { leading: false })); // leading required for return promise
             return this._queueById[id](id, action);

package/dist/types.d.ts

@@ -36,6 +36,13 @@ export interface CreateRelatedOptions<S = Record<string, any>> {
     data: (item: any, context: HookContext) => Promisable<Record<string, any>>;
     createItemsInDataArraySeparately?: boolean;
 }
+export declare type OnDeleteAction = "cascade" | "set null";
+export interface OnDeleteOptions {
+    keyThere: string;
+    keyHere: string;
+    onDelete: OnDeleteAction;
+    blocking?: boolean;
+}
 export interface InitDebounceMixinOptions {
     default: Partial<DebouncedStoreOptions>;
     blacklist: string[];

package/dist/utility-types/utility-types.d.ts

@@ -0,0 +1,33 @@
+export declare type InferCreateData<S> = S extends {
+    create: (data: infer D, params: any) => any;
+} ? D : never;
+export declare type InferCreateDataSingle<S> = S extends {
+    create: (data: infer D, params: any) => any;
+} ? D extends Array<infer T> ? T : D : never;
+export declare type InferUpdateData<S> = S extends {
+    update: (id: any, data: infer D, params: any) => any;
+} ? D : never;
+export declare type InferPatchData<S> = S extends {
+    patch: (id: any, data: infer D, params: any) => any;
+} ? D : never;
+export declare type InferGetResult<S> = S extends {
+    get: (id: any, params: any) => infer R;
+} ? Awaited<R> : never;
+export declare type InferFindResult<S> = S extends {
+    find: (params: any) => infer R;
+} ? Awaited<R> : never;
+export declare type InferCreateResult<S, D = any> = S extends {
+    create: (data: D, params: any) => infer R;
+} ? Awaited<R> : never;
+export declare type InferCreateResultSingle<S> = S extends {
+    create: (data: any, params: any) => infer R;
+} ? Awaited<R> extends Array<infer T> ? T : Awaited<R> : never;
+export declare type InferUpdateResult<S> = S extends {
+    update: (id: any, data: any, params: any) => infer R;
+} ? Awaited<R> : never;
+export declare type InferPatchResult<S, Id = any> = S extends {
+    patch: (id: Id, data: any, params: any) => infer R;
+} ? Awaited<R> : never;
+export declare type InferRemoveResult<S, Id = any> = S extends {
+    remove: (id: Id, params: any) => infer R;
+} ? Awaited<R> : never;

package/dist/utility-types/utility-types.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/utils/mergeQuery/index.js

@@ -4,13 +4,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.mergeQuery = void 0;
-const get_1 = __importDefault(require("lodash/get"));
-const has_1 = __importDefault(require("lodash/has"));
-const isEmpty_1 = __importDefault(require("lodash/isEmpty"));
-const isEqual_1 = __importDefault(require("lodash/isEqual"));
-const merge_1 = __importDefault(require("lodash/merge"));
-const set_1 = __importDefault(require("lodash/set"));
-const uniqWith_1 = __importDefault(require("lodash/uniqWith"));
+const get_js_1 = __importDefault(require("lodash/get.js"));
+const has_js_1 = __importDefault(require("lodash/has.js"));
+const isEmpty_js_1 = __importDefault(require("lodash/isEmpty.js"));
+const isEqual_js_1 = __importDefault(require("lodash/isEqual.js"));
+const merge_js_1 = __importDefault(require("lodash/merge.js"));
+const set_js_1 = __importDefault(require("lodash/set.js"));
+const uniqWith_js_1 = __importDefault(require("lodash/uniqWith.js"));
 const mergeArrays_1 = require("./mergeArrays");
 const filterQuery_1 = require("../filterQuery");
 const errors_1 = require("@feathersjs/errors");
@@ -18,14 +18,14 @@ const hasOwnProperty = (obj, key) => {
     return Object.prototype.hasOwnProperty.call(obj, key);
 };
 function handleArray(target, source, key, options) {
-    const targetVal = (0, get_1.default)(target, key);
-    const sourceVal = (0, get_1.default)(source, key);
+    const targetVal = (0, get_js_1.default)(target, key);
+    const sourceVal = (0, get_js_1.default)(source, key);
     if (!sourceVal && !targetVal) {
         return;
     }
-    const handle = (0, get_1.default)(options, ["handle", ...key], options.defaultHandle);
+    const handle = (0, get_js_1.default)(options, ["handle", ...key], options.defaultHandle);
     const arr = (0, mergeArrays_1.mergeArrays)(targetVal, sourceVal, handle, key, options.actionOnEmptyIntersect);
-    (0, set_1.default)(target, key, arr);
+    (0, set_js_1.default)(target, key, arr);
 }
 function handleCircular(target, source, prependKey, options) {
     if (target === null || target === void 0 ? void 0 : target.$or) {
@@ -52,11 +52,11 @@ function handleCircular(target, source, prependKey, options) {
             delete source.$and;
         }
     }
-    if (!(0, has_1.default)(source, prependKey)) {
+    if (!(0, has_js_1.default)(source, prependKey)) {
         return;
     }
-    if (!(0, has_1.default)(target, prependKey)) {
-        (0, set_1.default)(target, prependKey, (0, get_1.default)(source, prependKey));
+    if (!(0, has_js_1.default)(target, prependKey)) {
+        (0, set_js_1.default)(target, prependKey, (0, get_js_1.default)(source, prependKey));
         return;
     }
     const { defaultHandle, actionOnEmptyIntersect } = options;
@@ -64,22 +64,22 @@ function handleCircular(target, source, prependKey, options) {
         return;
     }
     const getTargetVal = () => {
-        return (prependKey.length > 0) ? (0, get_1.default)(target, prependKey) : target;
+        return (prependKey.length > 0) ? (0, get_js_1.default)(target, prependKey) : target;
     };
     const getSourceVal = () => {
-        return (prependKey.length > 0) ? (0, get_1.default)(source, prependKey) : source;
+        return (prependKey.length > 0) ? (0, get_js_1.default)(source, prependKey) : source;
     };
     const targetVal = getTargetVal();
     const sourceVal = getSourceVal();
-    if ((0, isEqual_1.default)(targetVal, sourceVal)) {
+    if ((0, isEqual_js_1.default)(targetVal, sourceVal)) {
         return;
     }
     if (defaultHandle === "source") {
-        (0, set_1.default)(target, prependKey, sourceVal);
+        (0, set_js_1.default)(target, prependKey, sourceVal);
         return;
     }
     if (targetVal === null || sourceVal === null) {
-        (0, set_1.default)(target, prependKey, sourceVal);
+        (0, set_js_1.default)(target, prependKey, sourceVal);
         return;
     }
     const typeOfTargetVal = typeof targetVal;
@@ -87,7 +87,7 @@ function handleCircular(target, source, prependKey, options) {
         if (defaultHandle === "intersect") {
             actionOnEmptyIntersect(target, source, prependKey);
         }
-        (0, set_1.default)(target, prependKey, sourceVal);
+        (0, set_js_1.default)(target, prependKey, sourceVal);
         return;
     }
     const typeOfSourceVal = typeof sourceVal;
@@ -96,7 +96,7 @@ function handleCircular(target, source, prependKey, options) {
     if (isTargetSimple || isSourceSimple) {
         if (isTargetSimple && isSourceSimple) {
             if (defaultHandle === "combine") {
-                (0, set_1.default)(target, prependKey, { $in: [...new Set([targetVal, sourceVal])] });
+                (0, set_js_1.default)(target, prependKey, { $in: [...new Set([targetVal, sourceVal])] });
                 return;
             }
             else if (defaultHandle === "intersect") {
@@ -110,20 +110,20 @@ function handleCircular(target, source, prependKey, options) {
             const targetHasIn = hasOwnProperty(targetVal, "$in");
             const $in = (targetHasIn) ? targetVal["$in"] : sourceVal["$in"];
             const otherVal = (isTargetSimple) ? targetVal : sourceVal;
-            if ($in.length === 1 && (0, isEqual_1.default)($in[0], otherVal)) {
-                (0, set_1.default)(target, prependKey, otherVal);
+            if ($in.length === 1 && (0, isEqual_js_1.default)($in[0], otherVal)) {
+                (0, set_js_1.default)(target, prependKey, otherVal);
                 return;
             }
             else if (defaultHandle === "combine") {
-                if (!$in.some((x) => (0, isEqual_1.default)(x, otherVal))) {
+                if (!$in.some((x) => (0, isEqual_js_1.default)(x, otherVal))) {
                     $in.push(otherVal);
                 }
-                (0, set_1.default)(target, `${prependKey}.$in`, $in);
+                (0, set_js_1.default)(target, `${prependKey}.$in`, $in);
                 return;
             }
             else if (defaultHandle === "intersect") {
-                if ($in.some((x) => (0, isEqual_1.default)(x, otherVal))) {
-                    (0, set_1.default)(target, prependKey, otherVal);
+                if ($in.some((x) => (0, isEqual_js_1.default)(x, otherVal))) {
+                    (0, set_js_1.default)(target, prependKey, otherVal);
                 }
                 else {
                     actionOnEmptyIntersect(target, source, prependKey);
@@ -139,7 +139,7 @@ function handleCircular(target, source, prependKey, options) {
         const key = prependKey[prependKey.length - 1];
         if (key === "$or") {
             if (defaultHandle === "combine") {
-                const newVals = sourceVal.filter((x) => !targetVal.some((y) => (0, isEqual_1.default)(x, y)));
+                const newVals = sourceVal.filter((x) => !targetVal.some((y) => (0, isEqual_js_1.default)(x, y)));
                 targetVal.push(...newVals);
             }
             else if (defaultHandle === "intersect") {
@@ -176,7 +176,7 @@ function handleCircular(target, source, prependKey, options) {
                 return;
             }
             else if (defaultHandle === "intersect") {
-                const newVals = sourceVal.filter((x) => !targetVal.some((y) => (0, isEqual_1.default)(x, y)));
+                const newVals = sourceVal.filter((x) => !targetVal.some((y) => (0, isEqual_js_1.default)(x, y)));
                 targetVal.push(...newVals);
                 return;
             }
@@ -185,29 +185,29 @@ function handleCircular(target, source, prependKey, options) {
             if (defaultHandle === "combine") {
                 let $in = targetVal.concat(sourceVal);
                 $in = [...new Set($in)];
-                (0, set_1.default)(target, prependKey, $in);
+                (0, set_js_1.default)(target, prependKey, $in);
                 return;
             }
             else if (defaultHandle === "intersect") {
-                const $in = targetVal.filter((x) => sourceVal.some((y) => (0, isEqual_1.default)(x, y)));
+                const $in = targetVal.filter((x) => sourceVal.some((y) => (0, isEqual_js_1.default)(x, y)));
                 if ($in.length === 0) {
                     actionOnEmptyIntersect(target, source, prependKey);
                 }
                 else if ($in.length === 1) {
-                    (0, set_1.default)(target, prependKey.slice(0, -1), $in[0]);
+                    (0, set_js_1.default)(target, prependKey.slice(0, -1), $in[0]);
                     return;
                 }
                 else {
-                    (0, set_1.default)(target, prependKey, $in);
+                    (0, set_js_1.default)(target, prependKey, $in);
                 }
             }
             return;
         }
-        (0, set_1.default)(target, prependKey, sourceVal);
+        (0, set_js_1.default)(target, prependKey, sourceVal);
         return;
     }
     if (typeOfTargetVal !== "object" || typeOfSourceVal !== "object") {
-        (0, set_1.default)(target, prependKey, sourceVal);
+        (0, set_js_1.default)(target, prependKey, sourceVal);
         return;
     }
     // both are objects
@@ -265,13 +265,13 @@ function mergeQuery(target, source, options) {
     handleArray(targetFilters, sourceFilters, ["$select"], fullOptions);
     // remaining filters
     delete sourceFilters["$select"];
-    (0, merge_1.default)(targetFilters, sourceFilters);
+    (0, merge_js_1.default)(targetFilters, sourceFilters);
     //#endregion
     //#region '$or' / '$and'
     if ((options === null || options === void 0 ? void 0 : options.useLogicalConjunction) &&
         (options.defaultHandle === "combine" ||
             options.defaultHandle === "intersect") &&
-        !(0, isEmpty_1.default)(targetQuery)) {
+        !(0, isEmpty_js_1.default)(targetQuery)) {
         const logicalOp = (options.defaultHandle === "combine")
             ? "$or"
             : "$and";
@@ -301,13 +301,13 @@ function getParentProp(target, path) {
         return target;
     }
     const pathOneUp = path.slice(0, -1);
-    return (0, get_1.default)(target, pathOneUp);
+    return (0, get_js_1.default)(target, pathOneUp);
 }
 function cleanOr(target) {
     if (!target || !Array.isArray(target) || target.length <= 0) {
         return target;
     }
-    if (target.some(x => (0, isEmpty_1.default)(x))) {
+    if (target.some(x => (0, isEmpty_js_1.default)(x))) {
         return undefined;
     }
     else {
@@ -318,11 +318,11 @@ function cleanAnd(target) {
     if (!target || !Array.isArray(target) || target.length <= 0) {
         return target;
     }
-    if (target.every(x => (0, isEmpty_1.default)(x))) {
+    if (target.every(x => (0, isEmpty_js_1.default)(x))) {
         return undefined;
     }
     else {
-        target = target.filter(x => !(0, isEmpty_1.default)(x));
+        target = target.filter(x => !(0, isEmpty_js_1.default)(x));
         return arrayWithoutDuplicates(target);
     }
 }
@@ -330,5 +330,5 @@ function arrayWithoutDuplicates(target) {
     if (!target || !Array.isArray(target)) {
         return target;
     }
-    return (0, uniqWith_1.default)(target, isEqual_1.default);
+    return (0, uniqWith_js_1.default)(target, isEqual_js_1.default);
 }

package/dist/utils/pushSet.d.ts

@@ -1,2 +1,2 @@
 import type { Path, PushSetOptions } from "../types";
-export declare const pushSet: (obj: Record<string, unknown>, path: string | Path, val: unknown, options?: PushSetOptions | undefined) => unknown[];
+export declare const pushSet: (obj: Record<string, unknown>, path: string | Path, val: unknown, options?: PushSetOptions) => unknown[];

package/dist/utils/pushSet.js

@@ -4,19 +4,19 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.pushSet = void 0;
-const isEqual_1 = __importDefault(require("lodash/isEqual"));
-const get_1 = __importDefault(require("lodash/get"));
-const set_1 = __importDefault(require("lodash/set"));
+const isEqual_js_1 = __importDefault(require("lodash/isEqual.js"));
+const get_js_1 = __importDefault(require("lodash/get.js"));
+const set_js_1 = __importDefault(require("lodash/set.js"));
 const pushSet = (obj, path, val, options) => {
     options = options || {};
-    let arr = (0, get_1.default)(obj, path);
+    let arr = (0, get_js_1.default)(obj, path);
     if (!arr || !Array.isArray(arr)) {
         arr = [val];
-        (0, set_1.default)(obj, path, arr);
+        (0, set_js_1.default)(obj, path, arr);
         return arr;
     }
     else {
-        if (options.unique && arr.some(x => (0, isEqual_1.default)(x, val))) {
+        if (options.unique && arr.some(x => (0, isEqual_js_1.default)(x, val))) {
             return arr;
         }
         arr.push(val);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "feathers-utils",
-  "version": "1.10.0",
+  "version": "1.12.0",
   "description": "Some utils for projects using '@feathersjs/feathers'",
   "author": "fratzinger",
   "repository": {
@@ -39,30 +39,30 @@
     "lint": "eslint . --ext .js,.jsx,.ts,.tsx"
   },
   "dependencies": {
-    "@feathersjs/adapter-commons": "^4.5.12",
-    "@feathersjs/errors": "^4.5.12",
-    "@feathersjs/feathers": "^4.5.12",
-    "feathers-hooks-common": "^5.0.6",
+    "@feathersjs/adapter-commons": "^4.5.15",
+    "@feathersjs/errors": "^4.5.15",
+    "@feathersjs/feathers": "^4.5.15",
+    "feathers-hooks-common": "^6.1.5",
     "lodash": "^4.17.21"
   },
   "devDependencies": {
     "@istanbuljs/nyc-config-typescript": "^1.0.2",
-    "@types/lodash": "^4.14.179",
-    "@types/mocha": "^9.1.0",
-    "@types/node": "^17.0.21",
-    "@typescript-eslint/eslint-plugin": "^5.13.0",
-    "@typescript-eslint/parser": "^5.13.0",
+    "@types/lodash": "^4.14.184",
+    "@types/mocha": "^9.1.1",
+    "@types/node": "^18.7.14",
+    "@typescript-eslint/eslint-plugin": "^5.36.0",
+    "@typescript-eslint/parser": "^5.36.0",
     "cross-env": "^7.0.3",
-    "eslint": "^8.10.0",
-    "eslint-import-resolver-typescript": "^2.5.0",
-    "eslint-plugin-import": "^2.25.4",
-    "eslint-plugin-security": "^1.4.0",
+    "eslint": "^8.23.0",
+    "eslint-import-resolver-typescript": "^3.5.0",
+    "eslint-plugin-import": "^2.26.0",
+    "eslint-plugin-security": "^1.5.0",
     "feathers-memory": "^4.1.0",
-    "mocha": "^9.2.1",
-    "np": "^7.6.0",
+    "mocha": "^10.0.0",
+    "np": "^7.6.2",
     "nyc": "^15.1.0",
     "shx": "^0.3.4",
-    "ts-node": "^10.5.0",
-    "typescript": "^4.6.2"
+    "ts-node": "^10.9.1",
+    "typescript": "^4.8.2"
   }
 }

package/src/hooks/onDelete.ts

@@ -0,0 +1,55 @@
+import type { HookContext } from "@feathersjs/feathers";
+import { checkContext } from "feathers-hooks-common";
+import type { OnDeleteOptions } from "../types";
+import { getItemsIsArray } from "../utils/getItemsIsArray";
+
+export function onDelete<S = Record<string, any>>(
+  service: keyof S,
+  {
+    keyThere,
+    keyHere = "id",
+    onDelete = "cascade",
+    blocking = true
+  }: OnDeleteOptions) {
+  if (!service || !keyThere) {
+    throw "initialize hook 'removeRelated' completely!";
+  }
+  if (!["cascade", "set null"].includes(onDelete)) {
+    throw "onDelete must be 'cascade' or 'set null'";
+  }
+
+  return async (context: HookContext): Promise<HookContext> => {
+    checkContext(context, "after", "remove", "onDelete");
+
+    const { items } = getItemsIsArray(context);
+
+    let ids = items.map(x => x[keyHere]).filter(x => !!x);
+    ids = [...new Set(ids)];
+
+    if (!ids || ids.length <= 0) { return context; }
+
+    const params = {
+      query: {
+        [keyThere]: {
+          $in: ids
+        }
+      },
+      paginate: false
+    };
+
+    let promise;
+
+    if (onDelete === "cascade") {
+      promise = context.app.service(service as string).remove(null, params);
+    } else if (onDelete === "set null") {
+      const data = { [keyThere]: null };
+      promise = context.app.service(service as string).patch(null, data, params);
+    }
+
+    if (blocking) {
+      await promise;
+    }
+
+    return context;
+  };
+}

package/src/hooks/setData.ts

@@ -1,6 +1,6 @@
-import _get from "lodash/get";
-import _set from "lodash/set";
-import _has from "lodash/has";
+import _get from "lodash/get.js";
+import _set from "lodash/set.js";
+import _has from "lodash/has.js";
 
 import { Forbidden } from "@feathersjs/errors";
 import { getItemsIsArray } from "../utils/getItemsIsArray";

package/src/index.ts

@@ -7,7 +7,7 @@ import { runPerItem } from "./hooks/runPerItem";
 export const hooks = {
   checkMulti,
   setData,
-  runPerItem
+  runPerItem,
 };
 
 export { checkMulti };
@@ -20,7 +20,7 @@ import { debounceMixin, DebouncedStore } from "./mixins/debounce-mixin";
 
 export const mixins = {
   debounceMixin,
-  DebouncedStore
+  DebouncedStore,
 };
 
 export { debounceMixin };
@@ -38,7 +38,8 @@ export { setResultEmpty } from "./utils/setResultEmpty";
 export { markHookForSkip } from "./utils/markHookForSkip";
 export { filterQuery } from "./utils/filterQuery";
 export { getItemsIsArray } from "./utils/getItemsIsArray";
+export { onDelete } from "./hooks/onDelete";
 export { shouldSkip } from "./utils/shouldSkip";
 
-
-export * from "./types";
+export * from "./types";
+export * from "./utility-types/utility-types";

package/src/mixins/debounce-mixin/DebouncedStore.ts

@@ -1,4 +1,4 @@
-import _debounce from "lodash/debounce";
+import _debounce from "lodash/debounce.js";
 
 import type { DebouncedFunc } from "lodash";
 import type { Application, Id } from "@feathersjs/feathers";

package/src/types.ts

@@ -50,6 +50,15 @@ export interface CreateRelatedOptions<S = Record<string, any>> {
   createItemsInDataArraySeparately?: boolean
 }
 
+export type OnDeleteAction = "cascade" | "set null";
+
+export interface OnDeleteOptions {
+    keyThere: string
+    keyHere: string
+    onDelete: OnDeleteAction
+    blocking?: boolean
+}
+
 //#endregion
 
 //#region mixins

package/src/utility-types/utility-types.ts

@@ -0,0 +1,69 @@
+export type InferCreateData<S> = S extends {
+  create: (data: infer D, params: any) => any;
+}
+  ? D
+  : never;
+
+export type InferCreateDataSingle<S> = S extends {
+  create: (data: infer D, params: any) => any;
+}
+  ? D extends Array<infer T>
+    ? T
+    : D
+  : never;
+
+export type InferUpdateData<S> = S extends {
+  update: (id: any, data: infer D, params: any) => any;
+}
+  ? D
+  : never;
+
+export type InferPatchData<S> = S extends {
+  patch: (id: any, data: infer D, params: any) => any;
+}
+  ? D
+  : never;
+
+export type InferGetResult<S> = S extends {
+  get: (id: any, params: any) => infer R;
+}
+  ? Awaited<R>
+  : never;
+
+export type InferFindResult<S> = S extends {
+  find: (params: any) => infer R;
+}
+  ? Awaited<R>
+  : never;
+
+export type InferCreateResult<S, D = any> = S extends {
+  create: (data: D, params: any) => infer R;
+}
+  ? Awaited<R>
+  : never;
+
+export type InferCreateResultSingle<S> = S extends {
+  create: (data: any, params: any) => infer R;
+}
+  ? Awaited<R> extends Array<infer T>
+    ? T
+    : Awaited<R>
+  : never;
+
+export type InferUpdateResult<S> = S extends {
+  update: (id: any, data: any, params: any) => infer R;
+}
+  ? Awaited<R>
+  : never;
+
+export type InferPatchResult<S, Id = any> = S extends {
+  patch: (id: Id, data: any, params: any) => infer R;
+}
+  ? Awaited<R>
+  : never;
+
+export type InferRemoveResult<S, Id = any> = S extends {
+  remove: (id: Id, params: any) => infer R;
+}
+  ? Awaited<R>
+  : never;

package/src/utils/mergeQuery/index.ts

@@ -1,10 +1,10 @@
-import _get from "lodash/get";
-import _has from "lodash/has";
-import _isEmpty from "lodash/isEmpty";
-import _isEqual from "lodash/isEqual";
-import _merge from "lodash/merge";
-import _set from "lodash/set";
-import _uniqWith from "lodash/uniqWith";
+import _get from "lodash/get.js";
+import _has from "lodash/has.js";
+import _isEmpty from "lodash/isEmpty.js";
+import _isEqual from "lodash/isEqual.js";
+import _merge from "lodash/merge.js";
+import _set from "lodash/set.js";
+import _uniqWith from "lodash/uniqWith.js";
 
 import { mergeArrays } from "./mergeArrays";
 import { filterQuery } from "../filterQuery";

package/src/utils/pushSet.ts

@@ -1,6 +1,6 @@
-import _isEqual from "lodash/isEqual";
-import _get from "lodash/get";
-import _set from "lodash/set";
+import _isEqual from "lodash/isEqual.js";
+import _get from "lodash/get.js";
+import _set from "lodash/set.js";
 
 import type {
   Path,