feathers-utils 1.7.2 → 2.0.0-0

package/dist/esm/hooks/runPerItem.js

@@ -12,6 +12,7 @@ export const runPerItem = (actionPerItem, options) => {
         if (shouldSkip("runForItems", context)) {
             return context;
         }
+        //@ts-expect-error type error because feathers-hooks-common is feathers@4
         let items = getItems(context);
         items = (Array.isArray(items)) ? items : [items];
         const promises = items.map(async (item) => {

package/dist/esm/hooks/setData.js

@@ -10,6 +10,7 @@ const defaultOptions = {
 export function setData(from, to, _options) {
     const options = Object.assign({}, defaultOptions, _options);
     return (context) => {
+        //@ts-expect-error type error because feathers-hooks-common is feathers@4
         let items = getItems(context);
         items = (Array.isArray(items)) ? items : [items];
         if (!_has(context, from)) {

package/dist/esm/index.d.ts

@@ -4,19 +4,19 @@ import { runPerItem } from "./hooks/runPerItem";
 export declare const hooks: {
     checkMulti: typeof checkMulti;
     setData: typeof setData;
-    runPerItem: (actionPerItem: (item: any, context: import("@feathersjs/feathers").HookContext<any, import("@feathersjs/feathers").Service<any>>) => any, options: import("./types").HookRunPerItemOptions) => (context: import("@feathersjs/feathers").HookContext<any, import("@feathersjs/feathers").Service<any>>) => Promise<import("@feathersjs/feathers").HookContext<any, import("@feathersjs/feathers").Service<any>>>;
+    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>>;
 };
 export { checkMulti };
 export { setData };
 export { runPerItem };
-import { debounceMixin, DebouncedStore } from "./mixins/debounce-mixin";
+import { debounceMixin, DebouncedService, DebouncedStore } from "./mixins/debounce-mixin";
 export declare const mixins: {
     debounceMixin: typeof debounceMixin;
     DebouncedStore: typeof DebouncedStore;
 };
 export { debounceMixin };
+export { DebouncedService };
 export { DebouncedStore };
-export { addHook } from "./utils/addHook";
 export { getPaginate } from "./utils/getPaginate";
 export { isMulti } from "./utils/isMulti";
 export { isPaginated } from "./utils/isPaginated";

package/dist/esm/index.js

@@ -17,7 +17,6 @@ export const mixins = {
 };
 export { debounceMixin };
 export { DebouncedStore };
-export { addHook } from "./utils/addHook";
 export { getPaginate } from "./utils/getPaginate";
 export { isMulti } from "./utils/isMulti";
 export { isPaginated } from "./utils/isPaginated";

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<any, any> | undefined) => void | Promise<void>) => void | Promise<void> | undefined;
     constructor(app: Application, options?: Partial<DebouncedStoreOptions>);
     private unbounced;
     private debounceById;

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

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

package/dist/esm/types.d.ts

@@ -1,4 +1,5 @@
-import type { Application, Service } from "@feathersjs/feathers";
+import type { Application } from "@feathersjs/feathers";
+import type { AdapterService } from "@feathersjs/adapter-commons";
 export declare type Path = Array<string | number>;
 export declare type HookType = "before" | "after" | "error";
 export declare type ServiceMethodName = "find" | "get" | "create" | "update" | "patch" | "remove";
@@ -43,7 +44,7 @@ export interface MergeQueryOptions<T> extends FilterQueryOptions<T> {
     };
 }
 export interface FilterQueryOptions<T> {
-    service?: Service<T>;
+    service?: AdapterService<T>;
     operators?: string[];
     filters?: string[];
 }

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

@@ -1,2 +1,7 @@
-import { HookContext, PaginationOptions } from "@feathersjs/feathers";
+import { HookContext } from "@feathersjs/feathers";
+interface PaginationOptions {
+    default: number;
+    max: number;
+}
 export declare const getPaginate: (context: HookContext) => PaginationOptions | undefined;
+export {};

package/dist/hooks/checkMulti.js

@@ -6,11 +6,11 @@ const shouldSkip_1 = require("../utils/shouldSkip");
 const isMulti_1 = require("../utils/isMulti");
 function checkMulti() {
     return (context) => {
-        if (shouldSkip_1.shouldSkip("checkMulti", context)) {
+        if ((0, shouldSkip_1.shouldSkip)("checkMulti", context)) {
             return context;
         }
         const { service, method } = context;
-        if (!service.allowsMulti || !isMulti_1.isMulti(context) || method === "find") {
+        if (!service.allowsMulti || !(0, isMulti_1.isMulti)(context) || method === "find") {
             return context;
         }
         if (!service.allowsMulti(method)) {

package/dist/hooks/runPerItem.js

@@ -21,10 +21,11 @@ const makeOptions = (options) => {
 const runPerItem = (actionPerItem, options) => {
     options = makeOptions(options);
     return (context) => __awaiter(void 0, void 0, void 0, function* () {
-        if (shouldSkip_1.shouldSkip("runForItems", context)) {
+        if ((0, shouldSkip_1.shouldSkip)("runForItems", context)) {
             return context;
         }
-        let items = feathers_hooks_common_1.getItems(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 promises = items.map((item) => __awaiter(void 0, void 0, void 0, function* () {
             yield actionPerItem(item, context);

package/dist/hooks/setData.js

@@ -17,23 +17,24 @@ function setData(from, to, _options) {
     const options = Object.assign({}, defaultOptions, _options);
     return (context) => {
         var _a;
-        let items = feathers_hooks_common_1.getItems(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];
-        if (!has_1.default(context, from)) {
+        if (!(0, has_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) => has_1.default(item, to))) {
+            if (!options.overwrite && items.every((item) => (0, has_1.default)(item, to))) {
                 return context;
             }
             throw new errors_1.Forbidden(`Expected field ${from.toString()} not available`);
         }
-        const val = get_1.default(context, from);
+        const val = (0, get_1.default)(context, from);
         items.forEach((item) => {
-            if (!options.overwrite && has_1.default(item, to)) {
+            if (!options.overwrite && (0, has_1.default)(item, to)) {
                 return;
             }
-            set_1.default(item, to, val);
+            (0, set_1.default)(item, to, val);
         });
         return context;
     };

package/dist/index.d.ts

@@ -4,19 +4,19 @@ import { runPerItem } from "./hooks/runPerItem";
 export declare const hooks: {
     checkMulti: typeof checkMulti;
     setData: typeof setData;
-    runPerItem: (actionPerItem: (item: any, context: import("@feathersjs/feathers").HookContext<any, import("@feathersjs/feathers").Service<any>>) => any, options: import("./types").HookRunPerItemOptions) => (context: import("@feathersjs/feathers").HookContext<any, import("@feathersjs/feathers").Service<any>>) => Promise<import("@feathersjs/feathers").HookContext<any, import("@feathersjs/feathers").Service<any>>>;
+    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>>;
 };
 export { checkMulti };
 export { setData };
 export { runPerItem };
-import { debounceMixin, DebouncedStore } from "./mixins/debounce-mixin";
+import { debounceMixin, DebouncedService, DebouncedStore } from "./mixins/debounce-mixin";
 export declare const mixins: {
     debounceMixin: typeof debounceMixin;
     DebouncedStore: typeof DebouncedStore;
 };
 export { debounceMixin };
+export { DebouncedService };
 export { DebouncedStore };
-export { addHook } from "./utils/addHook";
 export { getPaginate } from "./utils/getPaginate";
 export { isMulti } from "./utils/isMulti";
 export { isPaginated } from "./utils/isPaginated";

package/dist/index.js

@@ -10,7 +10,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.addHook = exports.DebouncedStore = exports.debounceMixin = exports.mixins = exports.runPerItem = exports.setData = exports.checkMulti = exports.hooks = void 0;
+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;
 // hooks
 const checkMulti_1 = require("./hooks/checkMulti");
 Object.defineProperty(exports, "checkMulti", { enumerable: true, get: function () { return checkMulti_1.checkMulti; } });
@@ -30,8 +30,6 @@ exports.mixins = {
     debounceMixin: debounce_mixin_1.debounceMixin,
     DebouncedStore: debounce_mixin_1.DebouncedStore
 };
-var addHook_1 = require("./utils/addHook");
-Object.defineProperty(exports, "addHook", { enumerable: true, get: function () { return addHook_1.addHook; } });
 var getPaginate_1 = require("./utils/getPaginate");
 Object.defineProperty(exports, "getPaginate", { enumerable: true, get: function () { return getPaginate_1.getPaginate; } });
 var isMulti_1 = require("./utils/isMulti");

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<any, any> | undefined) => void | Promise<void>) => void | Promise<void> | undefined;
     constructor(app: Application, options?: Partial<DebouncedStoreOptions>);
     private unbounced;
     private debounceById;

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

@@ -26,7 +26,7 @@ exports.makeDefaultOptions = makeDefaultOptions;
 class DebouncedStore {
     constructor(app, options) {
         this._app = app;
-        this._options = Object.assign(exports.makeDefaultOptions(), options);
+        this._options = Object.assign((0, exports.makeDefaultOptions)(), options);
         this._queueById = {};
         this._isRunningById = {};
         //this._waitingById = {};
@@ -52,7 +52,7 @@ class DebouncedStore {
             if (typeof this._queueById[id] === "function") {
                 return this._queueById[id](id, action);
             }
-            this._queueById[id] = debounce_1.default((id, action) => {
+            this._queueById[id] = (0, debounce_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

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

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

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "DebouncedStore", { enumerable: true, get: functi
 function debounceMixin(options) {
     return (app) => {
         options = options || {};
-        const defaultOptions = Object.assign(DebouncedStore_1.makeDefaultOptions(), options === null || options === void 0 ? void 0 : options.default);
+        const defaultOptions = Object.assign((0, DebouncedStore_1.makeDefaultOptions)(), options === null || options === void 0 ? void 0 : options.default);
         app.mixins.push((service, path) => {
             // if path is on blacklist, don't add debouncedStore to service
             if ((options === null || options === void 0 ? void 0 : options.blacklist) && options.blacklist.includes(path))

package/dist/types.d.ts

@@ -1,4 +1,5 @@
-import type { Application, Service } from "@feathersjs/feathers";
+import type { Application } from "@feathersjs/feathers";
+import type { AdapterService } from "@feathersjs/adapter-commons";
 export declare type Path = Array<string | number>;
 export declare type HookType = "before" | "after" | "error";
 export declare type ServiceMethodName = "find" | "get" | "create" | "update" | "patch" | "remove";
@@ -43,7 +44,7 @@ export interface MergeQueryOptions<T> extends FilterQueryOptions<T> {
     };
 }
 export interface FilterQueryOptions<T> {
-    service?: Service<T>;
+    service?: AdapterService<T>;
     operators?: string[];
     filters?: string[];
 }

package/dist/utils/filterQuery.js

@@ -25,9 +25,9 @@ function filterQuery(query, options) {
             return service.filterQuery({ query }, optionsForFilterQuery);
         }
         else {
-            return adapter_commons_1.filterQuery(query, optionsForFilterQuery);
+            return (0, adapter_commons_1.filterQuery)(query, optionsForFilterQuery);
         }
     }
-    return adapter_commons_1.filterQuery(query, options);
+    return (0, adapter_commons_1.filterQuery)(query, options);
 }
 exports.filterQuery = filterQuery;

package/dist/utils/getPaginate.d.ts

@@ -1,2 +1,7 @@
-import { HookContext, PaginationOptions } from "@feathersjs/feathers";
+import { HookContext } from "@feathersjs/feathers";
+interface PaginationOptions {
+    default: number;
+    max: number;
+}
 export declare const getPaginate: (context: HookContext) => PaginationOptions | undefined;
+export {};

package/dist/utils/isPaginated.js

@@ -6,7 +6,7 @@ const isPaginated = (context) => {
     if (context.params.paginate === false) {
         return false;
     }
-    const paginate = getPaginate_1.getPaginate(context);
+    const paginate = (0, getPaginate_1.getPaginate)(context);
     return !!paginate;
 };
 exports.isPaginated = isPaginated;

package/dist/utils/markHookForSkip.js

@@ -10,7 +10,7 @@ function markHookForSkip(hookName, type, context) {
         const combinedName = (t === "all")
             ? hookName
             : `${type}:${hookName}`;
-        pushSet_1.pushSet(params, ["skipHooks"], combinedName, { unique: true });
+        (0, pushSet_1.pushSet)(params, ["skipHooks"], combinedName, { unique: true });
     });
     context.params = params;
     return context;

package/dist/utils/mergeQuery/index.js

@@ -18,14 +18,14 @@ const hasOwnProperty = (obj, key) => {
     return Object.prototype.hasOwnProperty.call(obj, key);
 };
 function handleArray(target, source, key, options) {
-    const targetVal = get_1.default(target, key);
-    const sourceVal = get_1.default(source, key);
+    const targetVal = (0, get_1.default)(target, key);
+    const sourceVal = (0, get_1.default)(source, key);
     if (!sourceVal && !targetVal) {
         return;
     }
-    const handle = get_1.default(options, ["handle", ...key], options.defaultHandle);
-    const arr = mergeArrays_1.mergeArrays(targetVal, sourceVal, handle, key, options.actionOnEmptyIntersect);
-    set_1.default(target, key, arr);
+    const handle = (0, get_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);
 }
 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 (!has_1.default(source, prependKey)) {
+    if (!(0, has_1.default)(source, prependKey)) {
         return;
     }
-    if (!has_1.default(target, prependKey)) {
-        set_1.default(target, prependKey, get_1.default(source, prependKey));
+    if (!(0, has_1.default)(target, prependKey)) {
+        (0, set_1.default)(target, prependKey, (0, get_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) ? get_1.default(target, prependKey) : target;
+        return (prependKey.length > 0) ? (0, get_1.default)(target, prependKey) : target;
     };
     const getSourceVal = () => {
-        return (prependKey.length > 0) ? get_1.default(source, prependKey) : source;
+        return (prependKey.length > 0) ? (0, get_1.default)(source, prependKey) : source;
     };
     const targetVal = getTargetVal();
     const sourceVal = getSourceVal();
-    if (isEqual_1.default(targetVal, sourceVal)) {
+    if ((0, isEqual_1.default)(targetVal, sourceVal)) {
         return;
     }
     if (defaultHandle === "source") {
-        set_1.default(target, prependKey, sourceVal);
+        (0, set_1.default)(target, prependKey, sourceVal);
         return;
     }
     if (targetVal === null || sourceVal === null) {
-        set_1.default(target, prependKey, sourceVal);
+        (0, set_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);
         }
-        set_1.default(target, prependKey, sourceVal);
+        (0, set_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") {
-                set_1.default(target, prependKey, { $in: [...new Set([targetVal, sourceVal])] });
+                (0, set_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 && isEqual_1.default($in[0], otherVal)) {
-                set_1.default(target, prependKey, otherVal);
+            if ($in.length === 1 && (0, isEqual_1.default)($in[0], otherVal)) {
+                (0, set_1.default)(target, prependKey, otherVal);
                 return;
             }
             else if (defaultHandle === "combine") {
-                if (!$in.some((x) => isEqual_1.default(x, otherVal))) {
+                if (!$in.some((x) => (0, isEqual_1.default)(x, otherVal))) {
                     $in.push(otherVal);
                 }
-                set_1.default(target, `${prependKey}.$in`, $in);
+                (0, set_1.default)(target, `${prependKey}.$in`, $in);
                 return;
             }
             else if (defaultHandle === "intersect") {
-                if ($in.some((x) => isEqual_1.default(x, otherVal))) {
-                    set_1.default(target, prependKey, otherVal);
+                if ($in.some((x) => (0, isEqual_1.default)(x, otherVal))) {
+                    (0, set_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) => isEqual_1.default(x, y)));
+                const newVals = sourceVal.filter((x) => !targetVal.some((y) => (0, isEqual_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) => isEqual_1.default(x, y)));
+                const newVals = sourceVal.filter((x) => !targetVal.some((y) => (0, isEqual_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)];
-                set_1.default(target, prependKey, $in);
+                (0, set_1.default)(target, prependKey, $in);
                 return;
             }
             else if (defaultHandle === "intersect") {
-                const $in = targetVal.filter((x) => sourceVal.some((y) => isEqual_1.default(x, y)));
+                const $in = targetVal.filter((x) => sourceVal.some((y) => (0, isEqual_1.default)(x, y)));
                 if ($in.length === 0) {
                     actionOnEmptyIntersect(target, source, prependKey);
                 }
                 else if ($in.length === 1) {
-                    set_1.default(target, prependKey.slice(0, -1), $in[0]);
+                    (0, set_1.default)(target, prependKey.slice(0, -1), $in[0]);
                     return;
                 }
                 else {
-                    set_1.default(target, prependKey, $in);
+                    (0, set_1.default)(target, prependKey, $in);
                 }
             }
             return;
         }
-        set_1.default(target, prependKey, sourceVal);
+        (0, set_1.default)(target, prependKey, sourceVal);
         return;
     }
     if (typeOfTargetVal !== "object" || typeOfSourceVal !== "object") {
-        set_1.default(target, prependKey, sourceVal);
+        (0, set_1.default)(target, prependKey, sourceVal);
         return;
     }
     // both are objects
@@ -235,7 +235,7 @@ function makeDefaultOptions(options) {
 }
 function mergeQuery(target, source, options) {
     const fullOptions = makeDefaultOptions(options);
-    const { filters: targetFilters, query: targetQuery } = filterQuery_1.filterQuery(target, {
+    const { filters: targetFilters, query: targetQuery } = (0, filterQuery_1.filterQuery)(target, {
         operators: fullOptions.operators,
         service: fullOptions.service
     });
@@ -244,7 +244,7 @@ function mergeQuery(target, source, options) {
     }
     let { 
     // eslint-disable-next-line prefer-const
-    filters: sourceFilters, query: sourceQuery } = filterQuery_1.filterQuery(source, {
+    filters: sourceFilters, query: sourceQuery } = (0, filterQuery_1.filterQuery)(source, {
         operators: fullOptions.operators,
         service: fullOptions.service
     });
@@ -265,13 +265,13 @@ function mergeQuery(target, source, options) {
     handleArray(targetFilters, sourceFilters, ["$select"], fullOptions);
     // remaining filters
     delete sourceFilters["$select"];
-    merge_1.default(targetFilters, sourceFilters);
+    (0, merge_1.default)(targetFilters, sourceFilters);
     //#endregion
     //#region '$or' / '$and'
     if ((options === null || options === void 0 ? void 0 : options.useLogicalConjunction) &&
         (options.defaultHandle === "combine" ||
             options.defaultHandle === "intersect") &&
-        !isEmpty_1.default(targetQuery)) {
+        !(0, isEmpty_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 get_1.default(target, pathOneUp);
+    return (0, get_1.default)(target, pathOneUp);
 }
 function cleanOr(target) {
     if (!target || !Array.isArray(target) || target.length <= 0) {
         return target;
     }
-    if (target.some(x => isEmpty_1.default(x))) {
+    if (target.some(x => (0, isEmpty_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 => isEmpty_1.default(x))) {
+    if (target.every(x => (0, isEmpty_1.default)(x))) {
         return undefined;
     }
     else {
-        target = target.filter(x => !isEmpty_1.default(x));
+        target = target.filter(x => !(0, isEmpty_1.default)(x));
         return arrayWithoutDuplicates(target);
     }
 }
@@ -330,5 +330,5 @@ function arrayWithoutDuplicates(target) {
     if (!target || !Array.isArray(target)) {
         return target;
     }
-    return uniqWith_1.default(target, isEqual_1.default);
+    return (0, uniqWith_1.default)(target, isEqual_1.default);
 }

package/dist/utils/pushSet.js

@@ -9,14 +9,14 @@ const get_1 = __importDefault(require("lodash/get"));
 const set_1 = __importDefault(require("lodash/set"));
 const pushSet = (obj, path, val, options) => {
     options = options || {};
-    let arr = get_1.default(obj, path);
+    let arr = (0, get_1.default)(obj, path);
     if (!arr || !Array.isArray(arr)) {
         arr = [val];
-        set_1.default(obj, path, arr);
+        (0, set_1.default)(obj, path, arr);
         return arr;
     }
     else {
-        if (options.unique && arr.some(x => isEqual_1.default(x, val))) {
+        if (options.unique && arr.some(x => (0, isEqual_1.default)(x, val))) {
             return arr;
         }
         arr.push(val);

package/dist/utils/setResultEmpty.js

@@ -7,9 +7,9 @@ const setResultEmpty = (context) => {
     if (context.result) {
         return context;
     }
-    const multi = __1.isMulti(context);
+    const multi = (0, __1.isMulti)(context);
     if (multi) {
-        if (context.method === "find" && isPaginated_1.isPaginated(context)) {
+        if (context.method === "find" && (0, isPaginated_1.isPaginated)(context)) {
             context.result = {
                 total: 0,
                 skip: 0,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "feathers-utils",
-  "version": "1.7.2",
+  "version": "2.0.0-0",
   "description": "Some utils for projects using '@feathersjs/feathers'",
   "author": "fratzinger",
   "repository": {
@@ -31,10 +31,10 @@
     "lint": "eslint . --ext .js,.jsx,.ts,.tsx"
   },
   "dependencies": {
-    "@feathersjs/adapter-commons": "^4.5.11",
-    "@feathersjs/errors": "^4.5.11",
-    "@feathersjs/feathers": "^4.5.11",
-    "feathers-hooks-common": "^5.0.5",
+    "@feathersjs/adapter-commons": "5.0.0-pre.15",
+    "@feathersjs/errors": "5.0.0-pre.15",
+    "@feathersjs/feathers": "5.0.0-pre.15",
+    "feathers-hooks-common": "^5.0.6",
     "lodash": "^4.17.21",
     "type-fest": "^2.5.4"
   },

package/src/hooks/runPerItem.ts

@@ -22,6 +22,8 @@ export const runPerItem = (
   options = makeOptions(options);
   return async (context: HookContext): Promise<HookContext> => {
     if (shouldSkip("runForItems", context)) { return context; }
+    
+    //@ts-expect-error type error because feathers-hooks-common is feathers@4
     let items = getItems(context);
     items = (Array.isArray(items)) ? items : [items];
 

package/src/hooks/setData.ts

@@ -26,6 +26,7 @@ export function setData(
   const options: Required<HookSetDataOptions> = Object.assign({}, defaultOptions, _options);
   return (context: HookContext): HookContext => {
 
+    //@ts-expect-error type error because feathers-hooks-common is feathers@4
     let items = getItems(context);
     items = (Array.isArray(items)) ? items : [items];
 

package/src/index.ts

@@ -13,7 +13,7 @@ export { checkMulti };
 export { setData };
 export { runPerItem };
 
-import { debounceMixin, DebouncedStore } from "./mixins/debounce-mixin";
+import { debounceMixin, DebouncedService, DebouncedStore } from "./mixins/debounce-mixin";
 
 export const mixins = {
   debounceMixin,
@@ -21,9 +21,9 @@ export const mixins = {
 };
 
 export { debounceMixin };
+export { DebouncedService };
 export { DebouncedStore };
 
-export { addHook } from "./utils/addHook";
 export { getPaginate } from "./utils/getPaginate";
 export { isMulti } from "./utils/isMulti";
 export { isPaginated } from "./utils/isPaginated";
@@ -37,4 +37,4 @@ export { shouldSkip } from "./utils/shouldSkip";
 
 export { filterQuery } from "./utils/filterQuery";
 
-export * from "./types";
+export * from "./types";

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

@@ -3,18 +3,22 @@ import {
   makeDefaultOptions
 } from "./DebouncedStore";
 
-import type { Application } from "@feathersjs/feathers";
+import type { Application, FeathersService } from "@feathersjs/feathers";
 
 import type {
   InitDebounceMixinOptions,
   DebouncedStoreOptions,
 } from "../../types";
 
+export type DebouncedService = FeathersService & {
+  debouncedStore?: DebouncedStore;
+};
+
 export function debounceMixin(options?: Partial<InitDebounceMixinOptions>): ((app: Application) => void) {
   return (app: Application): void => {
     options = options || {};
     const defaultOptions = Object.assign(makeDefaultOptions(), options?.default);
-    app.mixins.push((service, path) => {
+    app.mixins.push((service: DebouncedService, path) => {
       // if path is on blacklist, don't add debouncedStore to service
       if (options?.blacklist && options.blacklist.includes(path)) return;
       // if service already has registered something on `debouncedStore`
@@ -29,4 +33,4 @@ export function debounceMixin(options?: Partial<InitDebounceMixinOptions>): ((ap
   };
 }
 
-export { DebouncedStore };
+export { DebouncedStore };

package/src/types.ts

@@ -1,4 +1,5 @@
-import type { Application, Service } from "@feathersjs/feathers";
+import type { Application } from "@feathersjs/feathers";
+import type { AdapterService } from "@feathersjs/adapter-commons";
 
 export type Path = Array<string|number>;
 export type HookType = "before" | "after" | "error";
@@ -69,7 +70,7 @@ export interface MergeQueryOptions<T> extends FilterQueryOptions<T> {
 }
 
 export interface FilterQueryOptions<T> {
-  service?: Service<T>
+  service?: AdapterService<T>
   operators?: string[],
   filters?: string[],
 }
@@ -86,4 +87,4 @@ export interface FilterQueryResult {
   [key: string]: unknown
 }
 
-//#endregion
+//#endregion

package/src/utils/filterQuery.ts

@@ -25,10 +25,10 @@ export function filterQuery<T>(query: Query, options?: FilterQueryOptions<T>): F
     if (operators) { optionsForFilterQuery.operators = operators; }
     if (filters) { optionsForFilterQuery.filters = filters; }
     if (typeof service?.filterQuery === "function") {
-      return service.filterQuery({ query }, optionsForFilterQuery);
+      return service.filterQuery({ query }, optionsForFilterQuery) as FilterQueryResult;
     } else {
       return plainFilterQuery(query, optionsForFilterQuery) as FilterQueryResult;
     }
   }
   return plainFilterQuery(query, options) as FilterQueryResult;
-}
+}

package/src/utils/getPaginate.ts

@@ -1,4 +1,11 @@
-import { HookContext, PaginationOptions } from "@feathersjs/feathers";
+import { HookContext } from "@feathersjs/feathers";
+
+// TODO: seems like this does no longer exist in feathers
+interface PaginationOptions {
+  default: number;
+  max: number;
+}
+
 
 export const getPaginate = (
   context: HookContext
@@ -6,6 +13,7 @@ export const getPaginate = (
   if (Object.prototype.hasOwnProperty.call(context.params, "paginate")) {
     return context.params.paginate as PaginationOptions || undefined;
   }
+  
   if (context.params.paginate === false) { return undefined; }
   let options = context.service.options || {};
   
@@ -15,4 +23,4 @@ export const getPaginate = (
   };
   
   return options.paginate || undefined;
-};
+};

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

@@ -1,3 +0,0 @@
-import type { Application } from "@feathersjs/feathers";
-import type { AddHookOptions } from "../types";
-export declare const addHook: (app: Application, hook: unknown, options: AddHookOptions) => void;

package/dist/esm/utils/addHook.js

@@ -1,36 +0,0 @@
-const defaultOptions = () => {
-    return {
-        whitelist: ["*"],
-        blacklist: []
-    };
-};
-export const addHook = (app, hook, options) => {
-    options = Object.assign(defaultOptions(), options);
-    const { types, methods, whitelist, blacklist, orderByType } = options;
-    if (types.some(x => !(Object.keys(orderByType).includes(x)))) {
-        throw new Error("'feathers-utils/addHook': some types in 'orderByType' are undefined");
-    }
-    if (Object.keys(orderByType).some(type => !((["first", "last"]).includes(orderByType[type])))) {
-        throw new Error("'feathers-utils/addHook': only allowed values for 'orderByType' are 'first' or 'last'");
-    }
-    const allServices = app.services;
-    for (const servicePath in allServices) {
-        if (!Object.prototype.hasOwnProperty.call(allServices, servicePath)) {
-            continue;
-        }
-        const service = app.service(servicePath);
-        if (blacklist && blacklist.includes(servicePath)) {
-            continue;
-        }
-        if (whitelist && !whitelist.includes("*") && !whitelist.includes(servicePath)) {
-            continue;
-        }
-        types.forEach(type => {
-            const order = orderByType[type];
-            const unshiftOrPush = (order === "first") ? "unshift" : "push";
-            methods.forEach(method => {
-                service.__hooks[type][method][unshiftOrPush](hook);
-            });
-        });
-    }
-};

package/dist/utils/addHook.d.ts

@@ -1,3 +0,0 @@
-import type { Application } from "@feathersjs/feathers";
-import type { AddHookOptions } from "../types";
-export declare const addHook: (app: Application, hook: unknown, options: AddHookOptions) => void;

package/dist/utils/addHook.js

@@ -1,40 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.addHook = void 0;
-const defaultOptions = () => {
-    return {
-        whitelist: ["*"],
-        blacklist: []
-    };
-};
-const addHook = (app, hook, options) => {
-    options = Object.assign(defaultOptions(), options);
-    const { types, methods, whitelist, blacklist, orderByType } = options;
-    if (types.some(x => !(Object.keys(orderByType).includes(x)))) {
-        throw new Error("'feathers-utils/addHook': some types in 'orderByType' are undefined");
-    }
-    if (Object.keys(orderByType).some(type => !((["first", "last"]).includes(orderByType[type])))) {
-        throw new Error("'feathers-utils/addHook': only allowed values for 'orderByType' are 'first' or 'last'");
-    }
-    const allServices = app.services;
-    for (const servicePath in allServices) {
-        if (!Object.prototype.hasOwnProperty.call(allServices, servicePath)) {
-            continue;
-        }
-        const service = app.service(servicePath);
-        if (blacklist && blacklist.includes(servicePath)) {
-            continue;
-        }
-        if (whitelist && !whitelist.includes("*") && !whitelist.includes(servicePath)) {
-            continue;
-        }
-        types.forEach(type => {
-            const order = orderByType[type];
-            const unshiftOrPush = (order === "first") ? "unshift" : "push";
-            methods.forEach(method => {
-                service.__hooks[type][method][unshiftOrPush](hook);
-            });
-        });
-    }
-};
-exports.addHook = addHook;

package/src/utils/addHook.ts

@@ -1,49 +0,0 @@
-import type { Application } from "@feathersjs/feathers";
-import type { AddHookOptions, HookType } from "../types";
-
-const defaultOptions = (): Partial<AddHookOptions> => {
-  return {
-    whitelist: ["*"],
-    blacklist: []
-  };
-};
-
-export const addHook = (app: Application, hook: unknown, options: AddHookOptions): void => {
-  options = Object.assign(defaultOptions(), options);
-
-  const {
-    types,
-    methods,
-    whitelist,
-    blacklist,
-    orderByType
-  } = options;
-
-  if (types.some(
-    x => !(Object.keys(orderByType).includes(x)))
-  ) {
-    throw new Error("'feathers-utils/addHook': some types in 'orderByType' are undefined");
-  }
-  if (
-    (Object.keys(orderByType) as HookType[]).some(
-      type => !((["first", "last"]).includes(orderByType[type])))
-  ) {
-    throw new Error("'feathers-utils/addHook': only allowed values for 'orderByType' are 'first' or 'last'");
-  }
-
-  const allServices = app.services;
-
-  for (const servicePath in allServices) {
-    if(!Object.prototype.hasOwnProperty.call(allServices, servicePath)) { continue; }
-    const service = app.service(servicePath);
-    if (blacklist && blacklist.includes(servicePath)) { continue; }
-    if (whitelist && !whitelist.includes("*") && !whitelist.includes(servicePath)) { continue; }
-    types.forEach(type => {
-      const order = orderByType[type];
-      const unshiftOrPush = (order === "first") ? "unshift" : "push";
-      methods.forEach(method => {
-        service.__hooks[type][method][unshiftOrPush](hook);
-      });
-    });
-  }
-};