feathers-utils 1.5.11 → 1.6.1

package/.vscode/launch.json

@@ -1,29 +1,28 @@
 {
-    "version": "0.2.0",
-    "configurations": [
-      {
-        "type": "node",
-        "request": "launch",
-        "name": "Mocha Tests",
-        "program": "${workspaceFolder}/node_modules/mocha/bin/mocha",
-        "args": [
-          "--require",
-          "ts-node/register",
-          "--timeout",
-          "999999",
-          "--colors",
-          "--recursive",
-        ],
-        "internalConsoleOptions": "openOnSessionStart",
-        "env": {
-          "NODE_ENV": "test",
-          "TS_NODE_PROJECT": "tsconfig.test.json"
-        },
-        "outputCapture": "std",
-        "skipFiles": [
-          "<node_internals>/**"
-        ]
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "type": "node",
+      "request": "launch",
+      "name": "Mocha Tests",
+      "program": "${workspaceFolder}/node_modules/mocha/bin/mocha",
+      "args": [
+        "--require",
+        "ts-node/register",
+        "--timeout",
+        "999999",
+        "--colors",
+        "--recursive",
+      ],
+      "internalConsoleOptions": "openOnSessionStart",
+      "env": {
+        "NODE_ENV": "test",
+        "TS_NODE_PROJECT": "tsconfig.test.json"
       },
-    ]
-  }
-  
+      "outputCapture": "std",
+      "skipFiles": [
+        "<node_internals>/**"
+      ]
+    }
+  ]
+}

package/dist/hooks/checkMulti.d.ts

@@ -1,3 +1,2 @@
 import type { HookContext } from "@feathersjs/feathers";
-declare function checkMulti(): ((context: HookContext) => HookContext);
-export default checkMulti;
+export declare function checkMulti(): ((context: HookContext) => HookContext);

package/dist/hooks/checkMulti.js

@@ -1,18 +1,16 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.checkMulti = void 0;
 const errors_1 = require("@feathersjs/errors");
-const shouldSkip_1 = __importDefault(require("../utils/shouldSkip"));
-const isMulti_1 = __importDefault(require("../utils/isMulti"));
+const shouldSkip_1 = require("../utils/shouldSkip");
+const isMulti_1 = require("../utils/isMulti");
 function checkMulti() {
     return (context) => {
-        if (shouldSkip_1.default("checkMulti", context)) {
+        if (shouldSkip_1.shouldSkip("checkMulti", context)) {
             return context;
         }
         const { service, method } = context;
-        if (!service.allowsMulti || !isMulti_1.default(context) || method === "find") {
+        if (!service.allowsMulti || !isMulti_1.isMulti(context) || method === "find") {
             return context;
         }
         if (!service.allowsMulti(method)) {
@@ -21,4 +19,4 @@ function checkMulti() {
         return context;
     };
 }
-exports.default = checkMulti;
+exports.checkMulti = checkMulti;

package/dist/hooks/runPerItem.d.ts

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

package/dist/hooks/runPerItem.js

@@ -8,12 +8,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.runPerItem = void 0;
 const feathers_hooks_common_1 = require("feathers-hooks-common");
-const shouldSkip_1 = __importDefault(require("../utils/shouldSkip"));
+const shouldSkip_1 = require("../utils/shouldSkip");
 const makeOptions = (options) => {
     options = options || {};
     return Object.assign({
@@ -23,7 +21,7 @@ const makeOptions = (options) => {
 const runPerItem = (actionPerItem, options) => {
     options = makeOptions(options);
     return (context) => __awaiter(void 0, void 0, void 0, function* () {
-        if (shouldSkip_1.default("runForItems", context)) {
+        if (shouldSkip_1.shouldSkip("runForItems", context)) {
             return context;
         }
         let items = feathers_hooks_common_1.getItems(context);
@@ -37,4 +35,4 @@ const runPerItem = (actionPerItem, options) => {
         return context;
     });
 };
-exports.default = runPerItem;
+exports.runPerItem = runPerItem;

package/dist/hooks/setData.d.ts

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

package/dist/hooks/setData.js

@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": 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"));
@@ -18,13 +19,16 @@ function setData(from, to, _options) {
         var _a;
         let items = feathers_hooks_common_1.getItems(context);
         items = (Array.isArray(items)) ? items : [items];
-        const val = get_1.default(context, from);
-        if (val === undefined) {
+        if (!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))) {
+                return context;
+            }
             throw new errors_1.Forbidden(`Expected field ${from.toString()} not available`);
         }
+        const val = get_1.default(context, from);
         items.forEach((item) => {
             if (!options.overwrite && has_1.default(item, to)) {
                 return;
@@ -34,4 +38,4 @@ function setData(from, to, _options) {
         return context;
     };
 }
-exports.default = setData;
+exports.setData = setData;

package/dist/index.d.ts

@@ -1,6 +1,6 @@
-import checkMulti from "./hooks/checkMulti";
-import setData from "./hooks/setData";
-import runPerItem from "./hooks/runPerItem";
+import { checkMulti } from "./hooks/checkMulti";
+import { setData } from "./hooks/setData";
+import { runPerItem } from "./hooks/runPerItem";
 export declare const hooks: {
     checkMulti: typeof checkMulti;
     setData: typeof setData;
@@ -9,25 +9,19 @@ export declare const hooks: {
 export { checkMulti };
 export { setData };
 export { runPerItem };
-import debounceMixin, { DebouncedStore } from "./mixins/debounce-mixin";
+import { debounceMixin, DebouncedStore } from "./mixins/debounce-mixin";
 export declare const mixins: {
     debounceMixin: typeof debounceMixin;
     DebouncedStore: typeof DebouncedStore;
 };
-import addHook from "./utils/addHook";
-import isMulti from "./utils/isMulti";
-import mergeQuery from "./utils/mergeQuery/index";
-import mergeArrays from "./utils/mergeQuery/mergeArrays";
-import pushSet from "./utils/pushSet";
-import markHookForSkip from "./utils/markHookForSkip";
-import shouldSkip from "./utils/shouldSkip";
-import filterQuery from "./utils/filterQuery";
-export { addHook };
-export { isMulti };
-export { mergeQuery };
-export { mergeArrays };
-export { pushSet };
-export { markHookForSkip };
-export { shouldSkip };
-export { filterQuery };
+export { debounceMixin };
+export { DebouncedStore };
+export { addHook } from "./utils/addHook";
+export { isMulti } from "./utils/isMulti";
+export { mergeQuery } from "./utils/mergeQuery/index";
+export { mergeArrays } from "./utils/mergeQuery/mergeArrays";
+export { pushSet } from "./utils/pushSet";
+export { markHookForSkip } from "./utils/markHookForSkip";
+export { shouldSkip } from "./utils/shouldSkip";
+export { filterQuery } from "./utils/filterQuery";
 export * from "./types";

package/dist/index.js

@@ -6,57 +6,44 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
 }));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 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);
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.filterQuery = exports.shouldSkip = exports.markHookForSkip = exports.pushSet = exports.mergeArrays = exports.mergeQuery = exports.isMulti = exports.addHook = exports.mixins = exports.runPerItem = exports.setData = exports.checkMulti = exports.hooks = void 0;
+exports.filterQuery = exports.shouldSkip = exports.markHookForSkip = exports.pushSet = exports.mergeArrays = exports.mergeQuery = exports.isMulti = exports.addHook = exports.DebouncedStore = exports.debounceMixin = exports.mixins = exports.runPerItem = exports.setData = exports.checkMulti = exports.hooks = void 0;
 // hooks
-const checkMulti_1 = __importDefault(require("./hooks/checkMulti"));
-exports.checkMulti = checkMulti_1.default;
-const setData_1 = __importDefault(require("./hooks/setData"));
-exports.setData = setData_1.default;
-const runPerItem_1 = __importDefault(require("./hooks/runPerItem"));
-exports.runPerItem = runPerItem_1.default;
+const checkMulti_1 = require("./hooks/checkMulti");
+Object.defineProperty(exports, "checkMulti", { enumerable: true, get: function () { return checkMulti_1.checkMulti; } });
+const setData_1 = require("./hooks/setData");
+Object.defineProperty(exports, "setData", { enumerable: true, get: function () { return setData_1.setData; } });
+const runPerItem_1 = require("./hooks/runPerItem");
+Object.defineProperty(exports, "runPerItem", { enumerable: true, get: function () { return runPerItem_1.runPerItem; } });
 exports.hooks = {
-    checkMulti: checkMulti_1.default,
-    setData: setData_1.default,
-    runPerItem: runPerItem_1.default
+    checkMulti: checkMulti_1.checkMulti,
+    setData: setData_1.setData,
+    runPerItem: runPerItem_1.runPerItem
 };
-const debounce_mixin_1 = __importStar(require("./mixins/debounce-mixin"));
+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; } });
 exports.mixins = {
-    debounceMixin: debounce_mixin_1.default,
+    debounceMixin: debounce_mixin_1.debounceMixin,
     DebouncedStore: debounce_mixin_1.DebouncedStore
 };
-const addHook_1 = __importDefault(require("./utils/addHook"));
-exports.addHook = addHook_1.default;
-const isMulti_1 = __importDefault(require("./utils/isMulti"));
-exports.isMulti = isMulti_1.default;
-const index_1 = __importDefault(require("./utils/mergeQuery/index"));
-exports.mergeQuery = index_1.default;
-const mergeArrays_1 = __importDefault(require("./utils/mergeQuery/mergeArrays"));
-exports.mergeArrays = mergeArrays_1.default;
-const pushSet_1 = __importDefault(require("./utils/pushSet"));
-exports.pushSet = pushSet_1.default;
-const markHookForSkip_1 = __importDefault(require("./utils/markHookForSkip"));
-exports.markHookForSkip = markHookForSkip_1.default;
-const shouldSkip_1 = __importDefault(require("./utils/shouldSkip"));
-exports.shouldSkip = shouldSkip_1.default;
-const filterQuery_1 = __importDefault(require("./utils/filterQuery"));
-exports.filterQuery = filterQuery_1.default;
+var addHook_1 = require("./utils/addHook");
+Object.defineProperty(exports, "addHook", { enumerable: true, get: function () { return addHook_1.addHook; } });
+var isMulti_1 = require("./utils/isMulti");
+Object.defineProperty(exports, "isMulti", { enumerable: true, get: function () { return isMulti_1.isMulti; } });
+var index_1 = require("./utils/mergeQuery/index");
+Object.defineProperty(exports, "mergeQuery", { enumerable: true, get: function () { return index_1.mergeQuery; } });
+var mergeArrays_1 = require("./utils/mergeQuery/mergeArrays");
+Object.defineProperty(exports, "mergeArrays", { enumerable: true, get: function () { return mergeArrays_1.mergeArrays; } });
+var pushSet_1 = require("./utils/pushSet");
+Object.defineProperty(exports, "pushSet", { enumerable: true, get: function () { return pushSet_1.pushSet; } });
+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; } });
 __exportStar(require("./types"), exports);

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

@@ -2,15 +2,14 @@ import type { DebouncedFunc } from "lodash";
 import type { Application, Id } from "@feathersjs/feathers";
 import { DebouncedFunctionApp, DebouncedStoreOptions } from "../../types";
 export declare const makeDefaultOptions: () => DebouncedStoreOptions;
-declare class DebouncedStore {
+export declare class DebouncedStore {
     private _app;
     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;
-    constructor(app: Application, options: Partial<DebouncedStoreOptions>);
+    constructor(app: Application, options?: Partial<DebouncedStoreOptions>);
     private unbounced;
     private debounceById;
     cancel(id: Id): void;
 }
-export default DebouncedStore;

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

@@ -12,7 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.makeDefaultOptions = void 0;
+exports.DebouncedStore = exports.makeDefaultOptions = void 0;
 const debounce_1 = __importDefault(require("lodash/debounce"));
 const makeDefaultOptions = () => {
     return {
@@ -62,4 +62,4 @@ class DebouncedStore {
         delete this._queueById[id];
     }
 }
-exports.default = DebouncedStore;
+exports.DebouncedStore = DebouncedStore;

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

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

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

@@ -1,28 +1,9 @@
 "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]; } });
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DebouncedStore = void 0;
-const DebouncedStore_1 = __importStar(require("./DebouncedStore"));
-exports.DebouncedStore = DebouncedStore_1.default;
-function initDebounceMixin(options) {
+exports.DebouncedStore = exports.debounceMixin = void 0;
+const DebouncedStore_1 = require("./DebouncedStore");
+Object.defineProperty(exports, "DebouncedStore", { enumerable: true, get: function () { return DebouncedStore_1.DebouncedStore; } });
+function debounceMixin(options) {
     return (app) => {
         options = options || {};
         const defaultOptions = Object.assign(DebouncedStore_1.makeDefaultOptions(), options === null || options === void 0 ? void 0 : options.default);
@@ -36,8 +17,8 @@ function initDebounceMixin(options) {
                 return;
             }
             const serviceOptions = Object.assign({}, defaultOptions, options === null || options === void 0 ? void 0 : options[path]);
-            service.debouncedStore = new DebouncedStore_1.default(app, serviceOptions);
+            service.debouncedStore = new DebouncedStore_1.DebouncedStore(app, serviceOptions);
         });
     };
 }
-exports.default = initDebounceMixin;
+exports.debounceMixin = debounceMixin;

package/dist/utils/addHook.d.ts

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

package/dist/utils/addHook.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.addHook = void 0;
 const defaultOptions = () => {
     return {
         whitelist: ["*"],
@@ -36,4 +37,4 @@ const addHook = (app, hook, options) => {
         });
     }
 };
-exports.default = addHook;
+exports.addHook = addHook;

package/dist/utils/filterQuery.d.ts

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

package/dist/utils/filterQuery.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.filterQuery = void 0;
 const adapter_commons_1 = require("@feathersjs/adapter-commons");
 function filterQuery(query, options) {
     var _a, _b;
@@ -29,4 +30,4 @@ function filterQuery(query, options) {
     }
     return adapter_commons_1.filterQuery(query, options);
 }
-exports.default = filterQuery;
+exports.filterQuery = filterQuery;

package/dist/utils/isMulti.d.ts

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

package/dist/utils/isMulti.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.isMulti = void 0;
 const isMulti = (context) => {
     const { method } = context;
     if (method === "find") {
@@ -18,4 +19,4 @@ const isMulti = (context) => {
     }
     return false;
 };
-exports.default = isMulti;
+exports.isMulti = isMulti;

package/dist/utils/markHookForSkip.d.ts

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

package/dist/utils/markHookForSkip.js

@@ -1,9 +1,7 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-const pushSet_1 = __importDefault(require("./pushSet"));
+exports.markHookForSkip = void 0;
+const pushSet_1 = require("./pushSet");
 function markHookForSkip(hookName, type, context) {
     context = context || {};
     const params = context.params || {};
@@ -12,9 +10,9 @@ function markHookForSkip(hookName, type, context) {
         const combinedName = (t === "all")
             ? hookName
             : `${type}:${hookName}`;
-        pushSet_1.default(params, ["skipHooks"], combinedName, { unique: true });
+        pushSet_1.pushSet(params, ["skipHooks"], combinedName, { unique: true });
     });
     context.params = params;
     return context;
 }
-exports.default = markHookForSkip;
+exports.markHookForSkip = markHookForSkip;

package/dist/utils/mergeQuery/index.d.ts

@@ -1,4 +1,3 @@
 import type { Query } from "@feathersjs/feathers";
 import type { MergeQueryOptions } from "../../types";
-declare function mergeQuery<T>(target: Query, source: Query, options?: Partial<MergeQueryOptions<T>>): Query;
-export default mergeQuery;
+export declare function mergeQuery<T>(target: Query, source: Query, options?: Partial<MergeQueryOptions<T>>): Query;

package/dist/utils/mergeQuery/index.js

@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": 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"));
@@ -10,8 +11,8 @@ 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 mergeArrays_1 = __importDefault(require("./mergeArrays"));
-const filterQuery_1 = __importDefault(require("../filterQuery"));
+const mergeArrays_1 = require("./mergeArrays");
+const filterQuery_1 = require("../filterQuery");
 const errors_1 = require("@feathersjs/errors");
 const hasOwnProperty = (obj, key) => {
     return Object.prototype.hasOwnProperty.call(obj, key);
@@ -23,7 +24,7 @@ function handleArray(target, source, key, options) {
         return;
     }
     const handle = get_1.default(options, ["handle", ...key], options.defaultHandle);
-    const arr = mergeArrays_1.default(targetVal, sourceVal, handle, key, options.actionOnEmptyIntersect);
+    const arr = mergeArrays_1.mergeArrays(targetVal, sourceVal, handle, key, options.actionOnEmptyIntersect);
     set_1.default(target, key, arr);
 }
 function handleCircular(target, source, prependKey, options) {
@@ -234,7 +235,7 @@ function makeDefaultOptions(options) {
 }
 function mergeQuery(target, source, options) {
     const fullOptions = makeDefaultOptions(options);
-    const { filters: targetFilters, query: targetQuery } = filterQuery_1.default(target, {
+    const { filters: targetFilters, query: targetQuery } = filterQuery_1.filterQuery(target, {
         operators: fullOptions.operators,
         service: fullOptions.service
     });
@@ -243,7 +244,7 @@ function mergeQuery(target, source, options) {
     }
     let { 
     // eslint-disable-next-line prefer-const
-    filters: sourceFilters, query: sourceQuery } = filterQuery_1.default(source, {
+    filters: sourceFilters, query: sourceQuery } = filterQuery_1.filterQuery(source, {
         operators: fullOptions.operators,
         service: fullOptions.service
     });
@@ -294,6 +295,7 @@ function mergeQuery(target, source, options) {
     const result = Object.assign({}, targetFilters, targetQuery);
     return result;
 }
+exports.mergeQuery = mergeQuery;
 function getParentProp(target, path) {
     if (path.length <= 1) {
         return target;
@@ -330,4 +332,3 @@ function arrayWithoutDuplicates(target) {
     }
     return uniqWith_1.default(target, isEqual_1.default);
 }
-exports.default = mergeQuery;

package/dist/utils/mergeQuery/mergeArrays.d.ts

@@ -1,3 +1,2 @@
 import type { Handle, ActionOnEmptyIntersect, Path } from "../../types";
-declare function mergeArrays<T>(targetArr: T[], sourceArr: T[], handle: Handle, prependKey?: Path, actionOnEmptyIntersect?: ActionOnEmptyIntersect): T[] | undefined;
-export default mergeArrays;
+export declare function mergeArrays<T>(targetArr: T[], sourceArr: T[], handle: Handle, prependKey?: Path, actionOnEmptyIntersect?: ActionOnEmptyIntersect): T[] | undefined;

package/dist/utils/mergeQuery/mergeArrays.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.mergeArrays = void 0;
 function mergeArrays(targetArr, sourceArr, handle, prependKey, actionOnEmptyIntersect) {
     if (!sourceArr && !targetArr) {
         return;
@@ -37,4 +38,4 @@ function mergeArrays(targetArr, sourceArr, handle, prependKey, actionOnEmptyInte
     }
     return undefined;
 }
-exports.default = mergeArrays;
+exports.mergeArrays = mergeArrays;

package/dist/utils/pushSet.d.ts

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

package/dist/utils/pushSet.js

@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": 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"));
@@ -22,4 +23,4 @@ const pushSet = (obj, path, val, options) => {
         return arr;
     }
 };
-exports.default = pushSet;
+exports.pushSet = pushSet;

package/dist/utils/shouldSkip.d.ts

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

package/dist/utils/shouldSkip.js

@@ -2,6 +2,7 @@
 // Kudos to @DaddyWarbucks! This is a cheeky copy of his awesome library: 'feathers-fletching'.
 // Definitely check it out! https://daddywarbucks.github.io/feathers-fletching/overview.html
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.shouldSkip = void 0;
 const errors_1 = require("@feathersjs/errors");
 const shouldSkip = (hookName, context) => {
     if (!context.params || !context.params.skipHooks) {
@@ -29,4 +30,4 @@ const shouldSkip = (hookName, context) => {
     }
     return false;
 };
-exports.default = shouldSkip;
+exports.shouldSkip = shouldSkip;

package/package.json

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

package/src/hooks/checkMulti.ts

@@ -1,10 +1,10 @@
 import { MethodNotAllowed } from "@feathersjs/errors";
-import shouldSkip from "../utils/shouldSkip";
-import isMulti from "../utils/isMulti";
+import { shouldSkip } from "../utils/shouldSkip";
+import { isMulti } from "../utils/isMulti";
 
 import type { HookContext } from "@feathersjs/feathers";
 
-function checkMulti(): ((context: HookContext) => HookContext) {
+export function checkMulti(): ((context: HookContext) => HookContext) {
   return (context: HookContext): HookContext => {
     if (shouldSkip("checkMulti", context)) { return context; }
     const { service, method } = context;
@@ -17,5 +17,3 @@ function checkMulti(): ((context: HookContext) => HookContext) {
     return context;
   };
 }
-
-export default checkMulti;

package/src/hooks/runPerItem.ts

@@ -1,6 +1,6 @@
 import { getItems } from "feathers-hooks-common";
 
-import shouldSkip from "../utils/shouldSkip";
+import { shouldSkip } from "../utils/shouldSkip";
 
 import type { HookRunPerItemOptions } from "../types";
 import type { HookContext } from "@feathersjs/feathers";
@@ -14,7 +14,7 @@ const makeOptions = (
   }, options);
 };
 
-const runPerItem = (
+export const runPerItem = (
   actionPerItem: (item: unknown, context: HookContext) => Promise<unknown>, 
   options: HookRunPerItemOptions
 ): ((context: HookContext) => Promise<HookContext>) => {
@@ -34,6 +34,4 @@ const runPerItem = (
 
     return context;
   };
-};
-
-export default runPerItem;
+};

package/src/hooks/setData.ts

@@ -11,15 +11,16 @@ import type { HookContext } from "@feathersjs/feathers";
 import type {
   HookSetDataOptions
 } from "../types";
+import type { PropertyPath } from "lodash";
 
 const defaultOptions: Required<HookSetDataOptions> = {
   allowUndefined: false,
   overwrite: true
 };
 
-function setData(
-  from: string[], 
-  to: string[], 
+export function setData(
+  from: PropertyPath, 
+  to: PropertyPath, 
   _options?: HookSetDataOptions
 ): ((context: HookContext) => HookContext) {
   const options: Required<HookSetDataOptions> = Object.assign({}, defaultOptions, _options);
@@ -28,24 +29,26 @@ function setData(
     let items = getItems(context);
     items = (Array.isArray(items)) ? items : [items];
 
-    const val = _get(context, from);
-
-    if (val === undefined) {
+    if (!_has(context, from)) {
       if (!context.params?.provider || options.allowUndefined === true) {
         return context;
       }
 
+      if (!options.overwrite && items.every((item: Record<string, unknown>) => _has(item, to))) {
+        return context;
+      }
+
       throw new Forbidden(`Expected field ${from.toString()} not available`);
     }
 
+    const val = _get(context, from);
+
     items.forEach((item: Record<string, unknown>) => {
       if (!options.overwrite && _has(item, to)) { return; }
-      
+
       _set(item, to, val);
     });
 
     return context;
   };
-}
-
-export default setData;
+}

package/src/index.ts

@@ -1,7 +1,7 @@
 // hooks
-import checkMulti from "./hooks/checkMulti";
-import setData from "./hooks/setData";
-import runPerItem from "./hooks/runPerItem";
+import { checkMulti } from "./hooks/checkMulti";
+import { setData } from "./hooks/setData";
+import { runPerItem } from "./hooks/runPerItem";
 
 export const hooks = {
   checkMulti,
@@ -13,34 +13,25 @@ export { checkMulti };
 export { setData };
 export { runPerItem };
 
-import debounceMixin, { DebouncedStore } from "./mixins/debounce-mixin";
+import { debounceMixin, DebouncedStore } from "./mixins/debounce-mixin";
 
 export const mixins = {
   debounceMixin,
   DebouncedStore
 };
 
-import addHook from "./utils/addHook";
-import isMulti from "./utils/isMulti";
-import mergeQuery from "./utils/mergeQuery/index";
-import mergeArrays from "./utils/mergeQuery/mergeArrays";
-import pushSet from "./utils/pushSet";
+export { debounceMixin };
+export { DebouncedStore };
 
-import markHookForSkip from "./utils/markHookForSkip";
-import shouldSkip from "./utils/shouldSkip";
+export { addHook } from "./utils/addHook";
+export { isMulti } from "./utils/isMulti";
+export { mergeQuery } from "./utils/mergeQuery/index";
+export { mergeArrays } from "./utils/mergeQuery/mergeArrays";
+export { pushSet } from "./utils/pushSet";
 
-import filterQuery from "./utils/filterQuery";
+export { markHookForSkip } from "./utils/markHookForSkip";
+export { shouldSkip } from "./utils/shouldSkip";
 
-
-export { addHook };
-export { isMulti };
-export { mergeQuery };
-export { mergeArrays };
-export { pushSet };
-
-export { markHookForSkip };
-export { shouldSkip };
-
-export { filterQuery };
+export { filterQuery } from "./utils/filterQuery";
 
 export * from "./types";

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

@@ -17,14 +17,14 @@ export const makeDefaultOptions = (): DebouncedStoreOptions => {
   };
 };
 
-class DebouncedStore {
+export class DebouncedStore {
     private _app: Application;
     private _options: DebouncedStoreOptions;
     private _isRunningById: Record<string, unknown>;
     _queueById: Record<string, DebouncedFunc<((id: Id, action: DebouncedFunctionApp) => void | Promise<void>)>>;
     //_waitingById: Record<string, WaitingObject>;
     add;
-    constructor(app: Application, options: Partial<DebouncedStoreOptions>) {
+    constructor(app: Application, options?: Partial<DebouncedStoreOptions>) {
       this._app = app;
       this._options = Object.assign(makeDefaultOptions(), options);
       this._queueById = {};
@@ -72,6 +72,4 @@ class DebouncedStore {
     cancel(id: Id): void {
       delete this._queueById[id];
     }
-}
-
-export default DebouncedStore;
+}

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

@@ -1,4 +1,5 @@
-import DebouncedStore, {
+import {
+  DebouncedStore,
   makeDefaultOptions
 } from "./DebouncedStore";
 
@@ -9,7 +10,7 @@ import type {
   DebouncedStoreOptions,
 } from "../../types";
 
-export default function initDebounceMixin(options?: Partial<InitDebounceMixinOptions>): ((app: Application) => void) {
+export function debounceMixin(options?: Partial<InitDebounceMixinOptions>): ((app: Application) => void) {
   return (app: Application): void => {
     options = options || {};
     const defaultOptions = Object.assign(makeDefaultOptions(), options?.default);

package/src/types.ts

@@ -1,4 +1,4 @@
-import type { Application, HookContext, Params, Service } from "@feathersjs/feathers";
+import type { Application, Service } from "@feathersjs/feathers";
 
 export type Path = Array<string|number>;
 export type HookType = "before" | "after" | "error";

package/src/utils/addHook.ts

@@ -8,7 +8,7 @@ const defaultOptions = (): Partial<AddHookOptions> => {
   };
 };
 
-const addHook = (app: Application, hook: unknown, options: AddHookOptions): void => {
+export const addHook = (app: Application, hook: unknown, options: AddHookOptions): void => {
   options = Object.assign(defaultOptions(), options);
 
   const {
@@ -46,6 +46,4 @@ const addHook = (app: Application, hook: unknown, options: AddHookOptions): void
       });
     });
   }
-};
-
-export default addHook;
+};

package/src/utils/filterQuery.ts

@@ -10,7 +10,7 @@ import type {
 
 import type { Query } from "@feathersjs/feathers";
 
-function filterQuery<T>(query: Query, options?: FilterQueryOptions<T>): FilterQueryResult {
+export function filterQuery<T>(query: Query, options?: FilterQueryOptions<T>): FilterQueryResult {
   query = query || {};
   options = options || {};
   if (options?.service) {
@@ -31,6 +31,4 @@ function filterQuery<T>(query: Query, options?: FilterQueryOptions<T>): FilterQu
     }
   }
   return plainFilterQuery(query, options) as FilterQueryResult;
-}
-
-export default filterQuery;
+}

package/src/utils/isMulti.ts

@@ -1,6 +1,6 @@
 import type { HookContext } from "@feathersjs/feathers";
 
-const isMulti = (context: HookContext): boolean => {
+export const isMulti = (context: HookContext): boolean => {
   const { method } = context;
   if (method === "find") {
     return true;
@@ -14,6 +14,4 @@ const isMulti = (context: HookContext): boolean => {
     return false;
   }
   return false;
-};
-
-export default isMulti;
+};

package/src/utils/markHookForSkip.ts

@@ -1,9 +1,9 @@
-import pushSet from "./pushSet";
+import { pushSet } from "./pushSet";
 
 import type { HookContext } from "@feathersjs/feathers";
 import type { HookType } from "feathers-hooks-common/types";
 
-function markHookForSkip<T>(
+export function markHookForSkip<T>(
   hookName: string, 
   type: "all" | HookType | HookType[], 
   context?: Partial<HookContext<T>>
@@ -21,6 +21,4 @@ function markHookForSkip<T>(
   
   context.params = params;
   return context;
-}
-
-export default markHookForSkip;
+}

package/src/utils/mergeQuery/index.ts

@@ -6,8 +6,8 @@ import _merge from "lodash/merge";
 import _set from "lodash/set";
 import _uniqWith from "lodash/uniqWith";
 
-import mergeArrays from "./mergeArrays";
-import filterQuery from "../filterQuery";
+import { mergeArrays } from "./mergeArrays";
+import { filterQuery } from "../filterQuery";
 
 import { Forbidden } from "@feathersjs/errors";
 
@@ -249,7 +249,7 @@ function makeDefaultOptions<T>(options?: Partial<MergeQueryOptions<T>>): MergeQu
   return options as MergeQueryOptions<T>;
 }
 
-function mergeQuery<T>(target: Query, source: Query, options?: Partial<MergeQueryOptions<T>>): Query {
+export function mergeQuery<T>(target: Query, source: Query, options?: Partial<MergeQueryOptions<T>>): Query {
   const fullOptions = makeDefaultOptions(options);
   const {
     filters: targetFilters, 
@@ -364,6 +364,4 @@ function cleanAnd(target: Record<string, unknown>[]): Record<string, unknown>[]
 function arrayWithoutDuplicates<T>(target: T[]): T[] {
   if (!target || !Array.isArray(target)) { return target; }
   return _uniqWith(target, _isEqual);
-}
-
-export default mergeQuery;
+}

package/src/utils/mergeQuery/mergeArrays.ts

@@ -4,7 +4,7 @@ import type {
   Path
 } from "../../types";
 
-function mergeArrays<T> (
+export function mergeArrays<T> (
   targetArr: T[], 
   sourceArr: T[], 
   handle: Handle, 
@@ -40,6 +40,4 @@ function mergeArrays<T> (
     return targetArr.filter(val => sourceArr.includes(val));
   }
   return undefined;
-}
-
-export default mergeArrays;
+}

package/src/utils/pushSet.ts

@@ -7,7 +7,7 @@ import type {
   PushSetOptions
 } from "../types";
 
-const pushSet = (obj: Record<string, unknown>, path: string | Path, val: unknown, options?: PushSetOptions): unknown[] => {
+export const pushSet = (obj: Record<string, unknown>, path: string | Path, val: unknown, options?: PushSetOptions): unknown[] => {
   options = options || {};
   let arr = _get(obj, path);
   if (!arr || !Array.isArray(arr)) {
@@ -19,6 +19,4 @@ const pushSet = (obj: Record<string, unknown>, path: string | Path, val: unknown
     arr.push(val);
     return arr;
   }
-};
-
-export default pushSet;
+};

package/src/utils/shouldSkip.ts

@@ -5,7 +5,7 @@ import { GeneralError } from "@feathersjs/errors";
 
 import type { HookContext } from "@feathersjs/feathers";
 
-const shouldSkip = (hookName: string, context: HookContext): boolean => {
+export const shouldSkip = (hookName: string, context: HookContext): boolean => {
   if (!context.params || !context.params.skipHooks) {
     return false;
   }
@@ -38,6 +38,4 @@ const shouldSkip = (hookName: string, context: HookContext): boolean => {
   }
 
   return false;
-};
-
-export default shouldSkip;
+};

package/test/hooks/checkMulti.test.ts

@@ -1,5 +1,5 @@
 import assert from "assert";
-import checkMulti from "../../src/hooks/checkMulti";
+import { checkMulti } from "../../src";
 
 describe("hook - checkMulti", function() {
   it("passes if 'allowsMulti' not defined", function() {

package/test/hooks/setData.test.ts

@@ -1,5 +1,5 @@
 import assert from "assert";
-import setData from "../../src/hooks/setData";
+import { setData } from "../../src";
 
 describe("hook - setData", function() {
   it("sets userId for single item", function() {
@@ -190,6 +190,33 @@ describe("hook - setData", function() {
     });
   });
 
+  it("passes if 'external' is set and context.user.id is undefined but overwrite: false", function() {
+    const methodsByType = {
+      "before": ["create", "update", "patch", "remove"],
+      "after": ["find", "get", "create", "update", "patch", "remove"]
+    };
+    Object.keys(methodsByType).forEach(type => {
+      methodsByType[type].forEach(method => {
+        const context = {
+          method,
+          type,
+          params: {
+            provider: "socket.io"
+          }
+        };
+
+        const dataOrResult = (type === "before") ? "data" : "result";
+        context[dataOrResult] = { userId: 1 };
+
+        assert.doesNotThrow(
+          //@ts-ignore
+          () => setData("params.user.id", "userId", { overwrite: false })(context),
+          `'${type}/${method}': passes`
+        );
+      });
+    });
+  });
+
   describe("overwrite: false", function() {
     it("sets userId for single item", function() {
       const methodsByType = {

package/test/mixins/debounce-mixin.test.ts

@@ -1,7 +1,7 @@
 import assert from "assert";
 import feathers from "@feathersjs/feathers";
 import createService from "feathers-memory";
-import makeMixin from "../../src/mixins/debounce-mixin";
+import { debounceMixin as makeMixin } from "../../src";
 import { performance } from "perf_hooks";
 
 const mockApp = () => {

package/test/utils/addHook.test.ts

@@ -2,7 +2,7 @@ import assert from "assert";
 import feathers from "@feathersjs/feathers";
 import createService from "feathers-memory";
 
-import addHook from "../../src/utils/addHook";
+import { addHook } from "../../src";
 
 import { HookType, ServiceMethodName } from "../../src/types";
 

package/test/utils/isMulti.test.ts

@@ -1,5 +1,5 @@
 import assert from "assert";
-import isMulti from "../../src/utils/isMulti";
+import { isMulti } from "../../src";
 
 describe("util - isMulti", function() {
   it("returns true", function() {

package/test/utils/markHookForSkip.test.ts

@@ -1,8 +1,7 @@
 import assert from "assert";
 import feathers from "@feathersjs/feathers";
 import { Service } from "feathers-memory";
-import shouldSkip from "../../src/utils/shouldSkip";
-import markHookForSkip from "../../src/utils/markHookForSkip";
+import { shouldSkip, markHookForSkip } from "../../src";
 
 describe("util - markHookForSkip", function() {
   it("returns hook object", function() {

package/test/utils/mergeQuery.test.ts

@@ -1,5 +1,5 @@
 import assert from"assert";
-import mergeQuery from "../../src/utils/mergeQuery";
+import { mergeQuery } from "../../src";
 import feathers from "@feathersjs/feathers";
 import { Service } from "feathers-memory";
 

package/test/utils/pushSet.test.ts

@@ -1,5 +1,5 @@
 import assert from "assert";
-import pushSet from "../../src/utils/pushSet";
+import { pushSet } from "../../src";
 
 describe("util - pushSet", function() {
   it("pushes to existing array", function() {

package/test/utils/shouldSkip.test.ts

@@ -1,5 +1,5 @@
 import assert from "assert";
-import shouldSkip from "../../src/utils/shouldSkip";
+import { shouldSkip } from "../../src";
 
 describe("util - shouldSkip", function() {
   it("returns false if skipHooks not defined", function() {