feathers-utils 3.0.0 → 3.0.2

package/dist/index.cjs

@@ -601,6 +601,13 @@ const validateQueryProperty = (query, operators = []) => {
   };
 };
 
+const toJSON = (context) => {
+  if (context.toJSON) {
+    return context.toJSON();
+  }
+  return context;
+};
+
 function checkMulti() {
   return (context) => {
     if (shouldSkip("checkMulti", context)) {
@@ -823,7 +830,7 @@ function setData(from, to, _options) {
       }
       throw new errors.Forbidden(`Expected field ${from.toString()} not available`);
     }
-    const val = _get__default(context, from);
+    const val = _get__default(toJSON(context), from);
     items.forEach((item) => {
       let overwrite;
       if (typeof options.overwrite === "function") {
@@ -973,4 +980,5 @@ exports.runPerItem = runPerItem;
 exports.setData = setData;
 exports.setResultEmpty = setResultEmpty;
 exports.shouldSkip = shouldSkip;
+exports.toJSON = toJSON;
 exports.validateQueryProperty = validateQueryProperty;

package/dist/index.d.ts

@@ -115,7 +115,7 @@ declare class DebouncedStore {
     private _options;
     private _isRunningById;
     _queueById: Record<string, DebouncedFunc<(id: Id, action: DebouncedFunctionApp) => void | Promise<void>>>;
-    add: (id: Id, action: (app?: Application) => void | Promise<void>) => void | Promise<void> | undefined;
+    add: any;
     constructor(app: Application, options?: Partial<DebouncedStoreOptions>);
     private unbounced;
     private debounceById;
@@ -181,7 +181,7 @@ declare const isPaginated: <H extends HookContext<_feathersjs_feathers.Applicati
 /**
  * util to mark a hook for skip, has to be used with `shouldSkip`
  */
-declare function markHookForSkip<H extends HookContext = HookContext>(hookName: string, type: "all" | MaybeArray<HookType>, context?: H): H | undefined;
+declare function markHookForSkip<H extends HookContext = HookContext>(hookName: string, type: "all" | MaybeArray<HookType>, context?: H): H;
 
 interface PushSetOptions {
     unique?: boolean;
@@ -209,6 +209,8 @@ declare const shouldSkip: <H extends HookContext<_feathersjs_feathers.Applicatio
  */
 declare const validateQueryProperty: (query: any, operators?: string[]) => Query;
 
+declare const toJSON: (context: HookContext) => HookContext<_feathersjs_feathers.Application<any, any>, any>;
+
 declare const filterArray: <T extends string[]>(...keys: T) => { [key in T[number]]: (value: any, options: FilterQueryOptions$1) => any; };
 
 declare const filterObject: <T extends string[]>(...keys: T) => { [key in T[number]]: (value: any, options: FilterQueryOptions$1) => any; };
@@ -259,4 +261,4 @@ type InferRemoveResultFromPath<App extends Application, Path extends string, IdO
 type InferDataFromPath<App extends Application, Path extends string, Method extends "create" | "update" | "patch"> = Method extends "create" ? InferCreateDataFromPath<App, Path> : Method extends "update" ? InferUpdateDataFromPath<App, Path> : Method extends "patch" ? InferPatchDataFromPath<App, Path> : never;
 type InferResultFromPath<App extends Application, Path extends string, Method extends "get" | "find" | "create" | "update" | "patch" | "remove"> = Method extends "get" ? InferGetResultFromPath<App, Path> : Method extends "find" ? InferFindResultFromPath<App, Path> : Method extends "create" ? InferCreateResultFromPath<App, Path> : Method extends "update" ? InferUpdateResultFromPath<App, Path> : Method extends "patch" ? InferPatchResultFromPath<App, Path> : Method extends "remove" ? InferRemoveResultFromPath<App, Path> : never;
 
-export { ActionOnEmptyIntersect, CreateRelatedOptions, DebouncedFunctionApp, DebouncedService, DebouncedStore, DebouncedStoreOptions, FilterQueryOptions, FirstLast, GetItemsIsArrayOptions, GetItemsIsArrayResult, GetService, Handle, HookForEachOptions, HookRunPerItemOptions, HookSetDataOptions, InferCreateData, InferCreateDataFromPath, InferCreateDataSingle, InferCreateDataSingleFromPath, InferCreateResult, InferCreateResultFromPath, InferCreateResultSingle, InferCreateResultSingleFromPath, InferDataFromPath, InferFindResult, InferFindResultFromPath, InferGetResult, InferGetResultFromPath, InferPatchData, InferPatchDataFromPath, InferPatchResult, InferPatchResultFromPath, InferRemoveResult, InferRemoveResultFromPath, InferResultFromPath, InferUpdateData, InferUpdateDataFromPath, InferUpdateResult, InferUpdateResultFromPath, InitDebounceMixinOptions, MergeQueryOptions, OnDeleteAction, OnDeleteOptions, Predicate, PredicateWithContext, PushSetOptions, RemoveRelatedOptions, ShouldSkipOptions, checkMulti, createRelated, debounceMixin, filterArray, filterObject, filterQuery, forEach, getItemsIsArray, getPaginate, isMulti, isPaginated, makeDefaultOptions, markHookForSkip, mergeArrays, mergeQuery, onDelete, parseFields, pushSet, removeRelated, runPerItem, setData, setResultEmpty, shouldSkip, validateQueryProperty };
+export { ActionOnEmptyIntersect, CreateRelatedOptions, DebouncedFunctionApp, DebouncedService, DebouncedStore, DebouncedStoreOptions, FilterQueryOptions, FirstLast, GetItemsIsArrayOptions, GetItemsIsArrayResult, GetService, Handle, HookForEachOptions, HookRunPerItemOptions, HookSetDataOptions, InferCreateData, InferCreateDataFromPath, InferCreateDataSingle, InferCreateDataSingleFromPath, InferCreateResult, InferCreateResultFromPath, InferCreateResultSingle, InferCreateResultSingleFromPath, InferDataFromPath, InferFindResult, InferFindResultFromPath, InferGetResult, InferGetResultFromPath, InferPatchData, InferPatchDataFromPath, InferPatchResult, InferPatchResultFromPath, InferRemoveResult, InferRemoveResultFromPath, InferResultFromPath, InferUpdateData, InferUpdateDataFromPath, InferUpdateResult, InferUpdateResultFromPath, InitDebounceMixinOptions, MergeQueryOptions, OnDeleteAction, OnDeleteOptions, Predicate, PredicateWithContext, PushSetOptions, RemoveRelatedOptions, ShouldSkipOptions, checkMulti, createRelated, debounceMixin, filterArray, filterObject, filterQuery, forEach, getItemsIsArray, getPaginate, isMulti, isPaginated, makeDefaultOptions, markHookForSkip, mergeArrays, mergeQuery, onDelete, parseFields, pushSet, removeRelated, runPerItem, setData, setResultEmpty, shouldSkip, toJSON, validateQueryProperty };

package/dist/index.mjs

@@ -587,6 +587,13 @@ const validateQueryProperty = (query, operators = []) => {
   };
 };
 
+const toJSON = (context) => {
+  if (context.toJSON) {
+    return context.toJSON();
+  }
+  return context;
+};
+
 function checkMulti() {
   return (context) => {
     if (shouldSkip("checkMulti", context)) {
@@ -809,7 +816,7 @@ function setData(from, to, _options) {
       }
       throw new Forbidden(`Expected field ${from.toString()} not available`);
     }
-    const val = _get(context, from);
+    const val = _get(toJSON(context), from);
     items.forEach((item) => {
       let overwrite;
       if (typeof options.overwrite === "function") {
@@ -935,4 +942,4 @@ const filterObject = (...keys) => {
   return result;
 };
 
-export { DebouncedStore, checkMulti, createRelated, debounceMixin, filterArray, filterObject, filterQuery, forEach, getItemsIsArray, getPaginate, isMulti, isPaginated, makeDefaultOptions, markHookForSkip, mergeArrays, mergeQuery, onDelete, parseFields, pushSet, removeRelated, runPerItem, setData, setResultEmpty, shouldSkip, validateQueryProperty };
+export { DebouncedStore, checkMulti, createRelated, debounceMixin, filterArray, filterObject, filterQuery, forEach, getItemsIsArray, getPaginate, isMulti, isPaginated, makeDefaultOptions, markHookForSkip, mergeArrays, mergeQuery, onDelete, parseFields, pushSet, removeRelated, runPerItem, setData, setResultEmpty, shouldSkip, toJSON, validateQueryProperty };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "feathers-utils",
-  "version": "3.0.0",
+  "version": "3.0.2",
   "description": "Some utils for projects using '@feathersjs/feathers'",
   "author": "fratzinger",
   "repository": {
@@ -12,14 +12,15 @@
   },
   "homepage": "https://github.com/fratzinger/feathers-utils",
   "license": "MIT",
-  "type": "module",
   "exports": {
     ".": {
+      "types": "./dist/index.d.ts",
       "import": "./dist/index.mjs",
       "require": "./dist/index.cjs"
     }
   },
   "main": "./dist/index.cjs",
+  "module": "./dist/index.mjs",
   "types": "./dist/index.d.ts",
   "files": [
     "CHANGELOG.md",

package/src/hooks/setData.ts

@@ -8,6 +8,7 @@ import { getItemsIsArray, shouldSkip } from "../utils";
 import type { HookContext } from "@feathersjs/feathers";
 import type { PropertyPath } from "lodash";
 import type { PredicateWithContext } from "../types";
+import { toJSON } from "../utils/toJSON";
 
 export interface HookSetDataOptions {
   allowUndefined?: boolean;
@@ -53,7 +54,7 @@ export function setData<H extends HookContext = HookContext>(
       throw new Forbidden(`Expected field ${from.toString()} not available`);
     }
 
-    const val = _get(context, from);
+    const val = _get(toJSON(context), from);
 
     items.forEach((item: Record<string, unknown>) => {
       let overwrite: boolean;

package/src/utils/index.ts

@@ -9,3 +9,4 @@ export * from "./pushSet";
 export * from "./setResultEmpty";
 export * from "./shouldSkip";
 export * from "./validateQueryProperty";
+export * from "./toJSON";

package/src/utils/toJSON.ts

@@ -0,0 +1,8 @@
+import type { HookContext } from "@feathersjs/feathers";
+
+export const toJSON = (context: HookContext) => {
+  if (context.toJSON) {
+    return context.toJSON();
+  }
+  return context;
+};