feathers-utils 2.0.0-0 → 2.0.0-2

package/dist/hooks/createRelated.js

@@ -0,0 +1,39 @@
+"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.createRelated = void 0;
+const feathers_hooks_common_1 = require("feathers-hooks-common");
+const getItemsIsArray_1 = require("../utils/getItemsIsArray");
+function createRelated({ service, multi = true, data, createItemsInDataArraySeparately = true }) {
+    if (!service || !data) {
+        throw "initialize hook 'createRelated' completely!";
+    }
+    return (context) => __awaiter(this, void 0, void 0, function* () {
+        // @ts-expect-error wait for feathers-hooks-common to update
+        (0, feathers_hooks_common_1.checkContext)(context, "after", undefined, "createRelated");
+        const { items } = (0, getItemsIsArray_1.getItemsIsArray)(context);
+        let dataToCreate = (yield Promise.all(items.map((item) => __awaiter(this, void 0, void 0, function* () { return data(item, context); })))).filter(x => !!x);
+        if (createItemsInDataArraySeparately) {
+            dataToCreate = dataToCreate.flat();
+        }
+        if (!dataToCreate || dataToCreate.length <= 0) {
+            return context;
+        }
+        if (multi) {
+            yield context.app.service(service).create(dataToCreate);
+        }
+        else {
+            yield Promise.all(dataToCreate.map((item) => __awaiter(this, void 0, void 0, function* () { return context.app.service(service).create(item); })));
+        }
+        return context;
+    });
+}
+exports.createRelated = createRelated;

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,53 @@
+"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* () {
+        // @ts-expect-error wait for feathers-hooks-common to update
+        (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/removeRelated.d.ts

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

package/dist/hooks/removeRelated.js

@@ -0,0 +1,43 @@
+"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.removeRelated = void 0;
+const feathers_hooks_common_1 = require("feathers-hooks-common");
+const getItemsIsArray_1 = require("../utils/getItemsIsArray");
+function removeRelated({ service, keyThere, keyHere = "id", blocking = true }) {
+    if (!service || !keyThere) {
+        throw "initialize hook 'removeRelated' completely!";
+    }
+    return (context) => __awaiter(this, void 0, void 0, function* () {
+        // @ts-expect-error wait for feathers-hooks-common to update
+        (0, feathers_hooks_common_1.checkContext)(context, "after", "remove", "removeRelated");
+        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;
+        }
+        // feathers does not accept `paginate: false` for remove, but some adapters need it to work properly
+        const promise = context.app.service(service).remove(null, {
+            query: {
+                [keyThere]: {
+                    $in: ids
+                }
+            },
+            paginate: false
+        });
+        if (blocking) {
+            yield promise;
+        }
+        return context;
+    });
+}
+exports.removeRelated = removeRelated;

package/dist/hooks/runPerItem.d.ts

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

package/dist/hooks/runPerItem.js

@@ -10,23 +10,23 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.runPerItem = void 0;
-const feathers_hooks_common_1 = require("feathers-hooks-common");
 const shouldSkip_1 = require("../utils/shouldSkip");
+const getItemsIsArray_1 = require("../utils/getItemsIsArray");
 const makeOptions = (options) => {
     options = options || {};
     return Object.assign({
         wait: true
     }, options);
 };
-const runPerItem = (actionPerItem, options) => {
-    options = makeOptions(options);
+const runPerItem = (
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+actionPerItem, _options) => {
+    const options = makeOptions(_options);
     return (context) => __awaiter(void 0, void 0, void 0, function* () {
         if ((0, shouldSkip_1.shouldSkip)("runForItems", context)) {
             return context;
         }
-        //@ts-expect-error type error because feathers-hooks-common is feathers@4
-        let items = (0, feathers_hooks_common_1.getItems)(context);
-        items = (Array.isArray(items)) ? items : [items];
+        const { items } = (0, getItemsIsArray_1.getItemsIsArray)(context);
         const promises = items.map((item) => __awaiter(void 0, void 0, void 0, function* () {
             yield actionPerItem(item, context);
         }));

package/dist/hooks/setData.d.ts

@@ -1,4 +1,3 @@
-import type { HookContext } from "@feathersjs/feathers";
-import type { HookSetDataOptions } from "../types";
 import type { PropertyPath } from "lodash";
-export declare function setData(from: PropertyPath, to: PropertyPath, _options?: HookSetDataOptions): ((context: HookContext) => HookContext);
+import type { HookSetDataOptions, ReturnSyncHook } from "../types";
+export declare function setData(from: PropertyPath, to: PropertyPath, _options?: HookSetDataOptions): ReturnSyncHook;

package/dist/hooks/setData.js

@@ -4,11 +4,11 @@ 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 feathers_hooks_common_1 = require("feathers-hooks-common");
+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 = {
     allowUndefined: false,
     overwrite: true
@@ -17,24 +17,29 @@ function setData(from, to, _options) {
     const options = Object.assign({}, defaultOptions, _options);
     return (context) => {
         var _a;
-        //@ts-expect-error type error because feathers-hooks-common is feathers@4
-        let items = (0, feathers_hooks_common_1.getItems)(context);
-        items = (Array.isArray(items)) ? items : [items];
-        if (!(0, has_1.default)(context, from)) {
+        const { items } = (0, getItemsIsArray_1.getItemsIsArray)(context);
+        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) => {
-            if (!options.overwrite && (0, has_1.default)(item, to)) {
+            let overwrite;
+            if (typeof options.overwrite === "function") {
+                overwrite = options.overwrite(item, context);
+            }
+            else {
+                overwrite = options.overwrite;
+            }
+            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

@@ -4,10 +4,12 @@ import { runPerItem } from "./hooks/runPerItem";
 export declare const hooks: {
     checkMulti: typeof checkMulti;
     setData: typeof setData;
-    runPerItem: (actionPerItem: (item: any, context: import("@feathersjs/feathers/lib").HookContext<import("@feathersjs/feathers/lib").Application<any, any>, any>) => any, options: import("./types").HookRunPerItemOptions) => (context: import("@feathersjs/feathers/lib").HookContext<import("@feathersjs/feathers/lib").Application<any, any>, any>) => Promise<import("@feathersjs/feathers/lib").HookContext<import("@feathersjs/feathers/lib").Application<any, any>, any>>;
+    runPerItem: (actionPerItem: (item: any, context: import("@feathersjs/feathers/lib").HookContext<import("@feathersjs/feathers/lib").Application<any, any>, any>) => any, _options?: import("./types").HookRunPerItemOptions | undefined) => import("./types").ReturnAsyncHook;
 };
 export { checkMulti };
+export { createRelated } from "./hooks/createRelated";
 export { setData };
+export { removeRelated } from "./hooks/removeRelated";
 export { runPerItem };
 import { debounceMixin, DebouncedService, DebouncedStore } from "./mixins/debounce-mixin";
 export declare const mixins: {
@@ -25,6 +27,10 @@ export { mergeArrays } from "./utils/mergeQuery/mergeArrays";
 export { pushSet } from "./utils/pushSet";
 export { setResultEmpty } from "./utils/setResultEmpty";
 export { markHookForSkip } from "./utils/markHookForSkip";
-export { shouldSkip } from "./utils/shouldSkip";
 export { filterQuery } from "./utils/filterQuery";
+export { getItemsIsArray } from "./utils/getItemsIsArray";
+export { onDelete } from "./hooks/onDelete";
+export { shouldSkip } from "./utils/shouldSkip";
+export { validateQueryProperty } from "./utils/validateQueryProperty";
+export { filterArray } from "./filters/array";
 export * from "./types";

package/dist/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -10,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.filterQuery = exports.shouldSkip = exports.markHookForSkip = exports.setResultEmpty = exports.pushSet = exports.mergeArrays = exports.mergeQuery = exports.isPaginated = exports.isMulti = exports.getPaginate = exports.DebouncedStore = exports.debounceMixin = exports.mixins = exports.runPerItem = exports.setData = exports.checkMulti = exports.hooks = void 0;
+exports.filterArray = exports.validateQueryProperty = 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.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; } });
@@ -23,6 +27,10 @@ exports.hooks = {
     setData: setData_1.setData,
     runPerItem: runPerItem_1.runPerItem
 };
+var createRelated_1 = require("./hooks/createRelated");
+Object.defineProperty(exports, "createRelated", { enumerable: true, get: function () { return createRelated_1.createRelated; } });
+var removeRelated_1 = require("./hooks/removeRelated");
+Object.defineProperty(exports, "removeRelated", { enumerable: true, get: function () { return removeRelated_1.removeRelated; } });
 const debounce_mixin_1 = require("./mixins/debounce-mixin");
 Object.defineProperty(exports, "debounceMixin", { enumerable: true, get: function () { return debounce_mixin_1.debounceMixin; } });
 Object.defineProperty(exports, "DebouncedStore", { enumerable: true, get: function () { return debounce_mixin_1.DebouncedStore; } });
@@ -46,8 +54,17 @@ var setResultEmpty_1 = require("./utils/setResultEmpty");
 Object.defineProperty(exports, "setResultEmpty", { enumerable: true, get: function () { return setResultEmpty_1.setResultEmpty; } });
 var markHookForSkip_1 = require("./utils/markHookForSkip");
 Object.defineProperty(exports, "markHookForSkip", { enumerable: true, get: function () { return markHookForSkip_1.markHookForSkip; } });
-var shouldSkip_1 = require("./utils/shouldSkip");
-Object.defineProperty(exports, "shouldSkip", { enumerable: true, get: function () { return shouldSkip_1.shouldSkip; } });
 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; } });
+var validateQueryProperty_1 = require("./utils/validateQueryProperty");
+Object.defineProperty(exports, "validateQueryProperty", { enumerable: true, get: function () { return validateQueryProperty_1.validateQueryProperty; } });
+// query filters
+var array_1 = require("./filters/array");
+Object.defineProperty(exports, "filterArray", { enumerable: true, get: function () { return array_1.filterArray; } });
 __exportStar(require("./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<any, any> | 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/mixins/debounce-mixin/index.d.ts

@@ -2,7 +2,7 @@ import { DebouncedStore } from "./DebouncedStore";
 import type { Application, FeathersService } from "@feathersjs/feathers";
 import type { InitDebounceMixinOptions } from "../../types";
 export declare type DebouncedService = FeathersService & {
-    debouncedStore?: DebouncedStore;
+    debouncedStore: DebouncedStore;
 };
 export declare function debounceMixin(options?: Partial<InitDebounceMixinOptions>): ((app: Application) => void);
 export { DebouncedStore };

package/dist/types.d.ts

@@ -1,13 +1,19 @@
-import type { Application } from "@feathersjs/feathers";
-import type { AdapterService } from "@feathersjs/adapter-commons";
+import type { Application, HookContext } from "@feathersjs/feathers";
+import type { AdapterBase, FilterQueryOptions as PlainFilterQueryOptions } from "@feathersjs/adapter-commons";
 export declare type Path = Array<string | number>;
+export declare type MaybeArray<T> = T | T[];
+export declare type Promisable<T> = T | Promise<T>;
 export declare type HookType = "before" | "after" | "error";
 export declare type ServiceMethodName = "find" | "get" | "create" | "update" | "patch" | "remove";
+export declare type ReturnSyncHook = (context: HookContext) => HookContext;
+export declare type ReturnAsyncHook = (context: HookContext) => Promise<HookContext>;
 export declare type Handle = "target" | "source" | "combine" | "intersect" | "intersectOrFull";
 export declare type FirstLast = "first" | "last";
+export declare type Predicate<T = any> = (item: T) => boolean;
+export declare type PredicateWithContext<T = any> = (item: T, context: HookContext) => boolean;
 export interface HookSetDataOptions {
     allowUndefined?: boolean;
-    overwrite?: boolean;
+    overwrite?: boolean | PredicateWithContext;
 }
 export interface AddHookOptions {
     types: HookType[];
@@ -19,6 +25,25 @@ export interface AddHookOptions {
 export interface HookRunPerItemOptions {
     wait?: boolean;
 }
+export interface RemoveRelatedOptions<S = Record<string, any>> {
+    service: keyof S;
+    keyThere: string;
+    keyHere: string;
+    blocking?: boolean;
+}
+export interface CreateRelatedOptions<S = Record<string, any>> {
+    service: keyof S;
+    multi?: boolean;
+    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[];
@@ -44,17 +69,11 @@ export interface MergeQueryOptions<T> extends FilterQueryOptions<T> {
     };
 }
 export interface FilterQueryOptions<T> {
-    service?: AdapterService<T>;
-    operators?: string[];
-    filters?: string[];
-}
-export interface PlainFilterQueryOptions {
-    operators?: string[];
-    filters?: string[];
-}
-export interface FilterQueryResult {
-    filters: Record<string, unknown>;
-    query: Record<string, unknown>;
-    paginate?: unknown;
-    [key: string]: unknown;
+    service?: AdapterBase<T>;
+    operators?: PlainFilterQueryOptions["operators"];
+    filters?: PlainFilterQueryOptions["filters"];
+}
+export interface GetItemsIsArrayOptions<T = any> {
+    items: T[];
+    isArray: boolean;
 }

package/dist/utils/filterQuery.d.ts

@@ -1,3 +1,3 @@
-import type { FilterQueryOptions, FilterQueryResult } from "../types";
 import type { Query } from "@feathersjs/feathers";
-export declare function filterQuery<T>(query: Query, options?: FilterQueryOptions<T>): FilterQueryResult;
+import type { FilterQueryOptions } from "../types";
+export declare function filterQuery<T>(query: Query, _options?: FilterQueryOptions<T>): any;

package/dist/utils/filterQuery.js

@@ -1,16 +1,27 @@
 "use strict";
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.filterQuery = void 0;
 const adapter_commons_1 = require("@feathersjs/adapter-commons");
-function filterQuery(query, options) {
+function filterQuery(query, _options) {
     var _a, _b;
     query = query || {};
-    options = options || {};
-    if (options === null || options === void 0 ? void 0 : options.service) {
-        const { service } = options;
+    _options = _options || {};
+    const { service } = _options, options = __rest(_options, ["service"]);
+    if (service) {
         const operators = options.operators
             ? options.operators
-            : (_a = service.options) === null || _a === void 0 ? void 0 : _a.whitelist;
+            : (_a = service.options) === null || _a === void 0 ? void 0 : _a.operators;
         const filters = options.filters
             ? options.filters
             : (_b = service.options) === null || _b === void 0 ? void 0 : _b.filters;
@@ -21,7 +32,9 @@ function filterQuery(query, options) {
         if (filters) {
             optionsForFilterQuery.filters = filters;
         }
-        if (typeof (service === null || service === void 0 ? void 0 : service.filterQuery) === "function") {
+        // @ts-expect-error service has no filterQuery method
+        if (service && "filterQuery" in service && typeof service.filterQuery === "function") {
+            // @ts-expect-error service has no filterQuery method
             return service.filterQuery({ query }, optionsForFilterQuery);
         }
         else {

package/dist/utils/getItemsIsArray.d.ts

@@ -0,0 +1,3 @@
+import type { HookContext } from "@feathersjs/feathers";
+import type { GetItemsIsArrayOptions } from "..";
+export declare const getItemsIsArray: <T = any>(context: HookContext) => GetItemsIsArrayOptions<T>;

package/dist/utils/getItemsIsArray.js

@@ -0,0 +1,22 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getItemsIsArray = void 0;
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+const getItemsIsArray = (context) => {
+    let itemOrItems = context.type === "before"
+        ? context.data
+        : context.result;
+    itemOrItems = itemOrItems && context.method === "find"
+        ? (itemOrItems.data || itemOrItems)
+        : itemOrItems;
+    const isArray = Array.isArray(itemOrItems);
+    return {
+        items: (isArray)
+            ? itemOrItems
+            : (itemOrItems != null)
+                ? [itemOrItems]
+                : [],
+        isArray
+    };
+};
+exports.getItemsIsArray = getItemsIsArray;

package/dist/utils/getPaginate.d.ts

@@ -1,4 +1,4 @@
-import { HookContext } from "@feathersjs/feathers";
+import type { HookContext } from "@feathersjs/feathers";
 interface PaginationOptions {
     default: number;
     max: number;

package/dist/utils/isPaginated.d.ts

@@ -1,2 +1,2 @@
-import { HookContext } from "@feathersjs/feathers";
+import type { HookContext } from "@feathersjs/feathers";
 export declare const isPaginated: (context: HookContext) => boolean;

package/dist/utils/markHookForSkip.d.ts

@@ -1,3 +1,3 @@
 import type { HookContext } from "@feathersjs/feathers";
-import type { HookType } from "feathers-hooks-common/types";
-export declare function markHookForSkip<T>(hookName: string, type: "all" | HookType | HookType[], context?: Partial<HookContext<T>>): Partial<HookContext<T>>;
+import type { HookType, MaybeArray } from "../types";
+export declare function markHookForSkip<T>(hookName: string, type: "all" | MaybeArray<HookType>, context?: Partial<HookContext<T>>): Partial<HookContext<T>>;