feathers-utils 6.0.0 → 7.0.1

package/dist/index.mjs

@@ -13,7 +13,7 @@ function defineHooks(hooks) {
 }
 
 function filterQuery(providedQuery) {
-  providedQuery ?? (providedQuery = {});
+  providedQuery ??= {};
   const { $select, $limit, $skip, $sort, ...query } = providedQuery;
   const result = { query };
   if ("$select" in providedQuery) {
@@ -381,12 +381,12 @@ function handleCircular(target, source, prependKey, options) {
   }
 }
 function makeDefaultOptions$1(options) {
-  options ?? (options = {});
-  options.defaultHandle ?? (options.defaultHandle = "combine");
-  options.useLogicalConjunction ?? (options.useLogicalConjunction = false);
-  options.actionOnEmptyIntersect ?? (options.actionOnEmptyIntersect = () => {
+  options ??= {};
+  options.defaultHandle ??= "combine";
+  options.useLogicalConjunction ??= false;
+  options.actionOnEmptyIntersect ??= () => {
     throw new Forbidden("You're not allowed to make this request");
-  });
+  };
   options.handle = options.handle || {};
   if (options.defaultHandle === "intersect") {
     options.handle.$select = options.handle.$select || "intersectOrFull";
@@ -506,7 +506,6 @@ function mergeQuery(target, source, _options) {
 }
 
 const setQueryKeySafely = (params, key, value, operator = "$eq", options) => {
-  var _a;
   const { mutate = false } = options || {};
   if (!mutate) {
     params = structuredClone(params);
@@ -527,7 +526,7 @@ const setQueryKeySafely = (params, key, value, operator = "$eq", options) => {
   if (isPlainObject(params.query[key]) && !(operator in params.query[key])) {
     params.query[key][operator] = value;
   } else {
-    (_a = params.query).$and ?? (_a.$and = []);
+    params.query.$and ??= [];
     params.query.$and.push(
       operator === "$eq" ? { [key]: value } : {
         [key]: {
@@ -718,37 +717,35 @@ function checkMulti() {
   };
 }
 
-function createRelated({
-  service,
-  multi = true,
-  data,
-  createItemsInDataArraySeparately = true
-}) {
-  if (!service || !data) {
-    throw "initialize hook 'createRelated' completely!";
-  }
+function createRelated(options) {
   return async (context) => {
     if (shouldSkip("createRelated", context)) {
       return context;
     }
     checkContext(context, "after", void 0, "createRelated");
     const { items } = getItemsIsArray(context);
-    let dataToCreate = (await Promise.all(items.map(async (item) => data(item, context)))).filter((x) => !!x);
-    if (createItemsInDataArraySeparately) {
-      dataToCreate = dataToCreate.flat();
-    }
-    if (!dataToCreate || dataToCreate.length <= 0) {
-      return context;
-    }
-    if (multi) {
-      await context.app.service(service).create(dataToCreate);
-    } else {
-      await Promise.all(
-        dataToCreate.map(
-          async (item) => context.app.service(service).create(item)
-        )
-      );
-    }
+    const entries = Array.isArray(options) ? options : [options];
+    await Promise.all(
+      entries.map(async (entry) => {
+        const { data, service, createItemsInDataArraySeparately, multi } = entry;
+        let dataToCreate = (await Promise.all(items.map(async (item) => data(item, context)))).filter((x) => !!x);
+        if (createItemsInDataArraySeparately) {
+          dataToCreate = dataToCreate.flat();
+        }
+        if (!dataToCreate || dataToCreate.length <= 0) {
+          return context;
+        }
+        if (multi) {
+          await context.app.service(service).create(dataToCreate);
+        } else {
+          await Promise.all(
+            dataToCreate.map(
+              async (item) => context.app.service(service).create(item)
+            )
+          );
+        }
+      })
+    );
     return context;
   };
 }
@@ -786,46 +783,44 @@ const forEach = (actionPerItem, options) => {
   };
 };
 
-function onDelete(service, {
-  keyThere,
-  keyHere = "id",
-  onDelete: onDelete2 = "cascade",
-  blocking = true
-}) {
-  if (!service || !keyThere) {
-    throw "initialize hook 'removeRelated' completely!";
-  }
-  if (!["cascade", "set null"].includes(onDelete2)) {
-    throw "onDelete must be 'cascade' or 'set null'";
-  }
+function onDelete(options) {
   return async (context) => {
     if (shouldSkip("onDelete", context)) {
       return context;
     }
     checkContext(context, "after", "remove", "onDelete");
     const { items } = getItemsIsArray(context);
-    let ids = items.map((x) => x[keyHere]).filter((x) => !!x);
-    ids = [...new Set(ids)];
-    if (!ids || ids.length <= 0) {
-      return context;
-    }
-    const params = {
-      query: {
-        [keyThere]: {
-          $in: ids
+    const entries = Array.isArray(options) ? options : [options];
+    const promises = [];
+    entries.forEach(
+      async ({ keyHere, keyThere, onDelete: onDelete2, service, blocking }) => {
+        let ids = items.map((x) => x[keyHere]).filter((x) => !!x);
+        ids = [...new Set(ids)];
+        if (!ids || ids.length <= 0) {
+          return context;
         }
-      },
-      paginate: false
-    };
-    let promise;
-    if (onDelete2 === "cascade") {
-      promise = context.app.service(service).remove(null, params);
-    } else if (onDelete2 === "set null") {
-      const data = { [keyThere]: null };
-      promise = context.app.service(service).patch(null, data, params);
-    }
-    if (blocking) {
-      await promise;
+        const params = {
+          query: {
+            [keyThere]: {
+              $in: ids
+            }
+          },
+          paginate: false
+        };
+        let promise = void 0;
+        if (onDelete2 === "cascade") {
+          promise = context.app.service(service).remove(null, params);
+        } else if (onDelete2 === "set null") {
+          const data = { [keyThere]: null };
+          promise = context.app.service(service).patch(null, data, params);
+        }
+        if (blocking && promise) {
+          promises.push(promise);
+        }
+      }
+    );
+    if (promises.length) {
+      await Promise.all(promises);
     }
     return context;
   };
@@ -959,19 +954,18 @@ function defineParamsForServer(keyToHide) {
           return;
         }
         if (whitelist.includes(key)) {
-          if (!clonedParams) {
-            clonedParams = {
-              ...context.params,
-              query: {
-                ...context.params.query
-              }
-            };
+          const currentParams = clonedParams ?? {
+            ...context.params,
+            query: {
+              ...context.params.query
+            }
+          };
+          if (!currentParams.query[keyToHide]) {
+            currentParams.query[keyToHide] = {};
           }
-          if (!clonedParams.query[keyToHide]) {
-            clonedParams.query[keyToHide] = {};
-          }
-          clonedParams.query[keyToHide][key] = clonedParams[key];
-          delete clonedParams[key];
+          currentParams.query[keyToHide][key] = currentParams[key];
+          delete currentParams[key];
+          clonedParams = currentParams;
         }
       });
       if (clonedParams) {
@@ -1028,20 +1022,14 @@ const makeDefaultOptions = () => {
   };
 };
 
-var __defProp = Object.defineProperty;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField = (obj, key, value) => {
-  __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
-  return value;
-};
 class DebouncedStore {
+  _app;
+  _options;
+  _isRunningById;
+  _queueById;
+  //_waitingById: Record<string, WaitingObject>;
+  add;
   constructor(app, options) {
-    __publicField(this, "_app");
-    __publicField(this, "_options");
-    __publicField(this, "_isRunningById");
-    __publicField(this, "_queueById");
-    //_waitingById: Record<string, WaitingObject>;
-    __publicField(this, "add");
     this._app = app;
     this._options = Object.assign(makeDefaultOptions(), options);
     this._queueById = {};
@@ -1084,13 +1072,9 @@ class DebouncedStore {
 function debounceMixin(options) {
   return (app) => {
     options = options || {};
-    const defaultOptions = Object.assign(
-      makeDefaultOptions(),
-      options?.default
-    );
+    const defaultOptions = Object.assign(makeDefaultOptions(), options?.default);
     app.mixins.push((service, path) => {
-      if (options?.blacklist && options.blacklist.includes(path))
-        return;
+      if (options?.blacklist && options.blacklist.includes(path)) return;
       if (service.debouncedStore) {
         console.warn(
           `[feathers-utils] service: '${path}' already has a property 'debouncedStore'. Mixin will skip creating a new debouncedStore`
@@ -1108,9 +1092,7 @@ function debounceMixin(options) {
 
 const filterQueryArray = (key) => (arr, { operators }) => {
   if (arr && !Array.isArray(arr)) {
-    throw new Error(
-      `Invalid query parameter '${key}'. It has to be an array`
-    );
+    throw new Error(`Invalid query parameter '${key}'. It has to be an array`);
   }
   if (Array.isArray(arr)) {
     return arr.map((current) => validateQueryProperty(current, operators));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "feathers-utils",
-  "version": "6.0.0",
+  "version": "7.0.1",
   "description": "Some utils for projects using '@feathersjs/feathers'",
   "author": "fratzinger",
   "repository": {
@@ -22,6 +22,7 @@
   "main": "./dist/index.cjs",
   "module": "./dist/index.mjs",
   "types": "./dist/index.d.ts",
+  "type": "module",
   "files": [
     "CHANGELOG.md",
     "LICENSE",
@@ -30,43 +31,39 @@
     "lib/**",
     "dist/**"
   ],
-  "scripts": {
-    "build": "unbuild",
-    "version": "npm run build",
-    "release": "np",
-    "test": "vitest run",
-    "vitest": "vitest",
-    "coverage": "vitest run --coverage",
-    "lint": "eslint . --ext .js,.jsx,.ts,.tsx"
-  },
   "dependencies": {
-    "@feathersjs/adapter-commons": "^5.0.13",
-    "@feathersjs/errors": "^5.0.13",
-    "@feathersjs/feathers": "^5.0.13",
-    "fast-equals": "^5.0.1",
-    "feathers-hooks-common": "^8.1.1",
+    "@feathersjs/adapter-commons": "^5.0.33",
+    "@feathersjs/errors": "^5.0.33",
+    "@feathersjs/feathers": "^5.0.33",
+    "fast-equals": "^5.2.2",
+    "feathers-hooks-common": "^8.2.1",
     "lodash": "^4.17.21"
   },
   "devDependencies": {
-    "@feathersjs/memory": "^5.0.13",
-    "@types/lodash": "^4.14.202",
-    "@types/node": "^20.10.6",
-    "@typescript-eslint/eslint-plugin": "^6.16.0",
-    "@typescript-eslint/parser": "^6.16.0",
-    "@vitest/coverage-v8": "^1.1.0",
-    "eslint": "^8.56.0",
-    "eslint-config-prettier": "^9.1.0",
-    "eslint-import-resolver-typescript": "^3.6.1",
-    "eslint-plugin-import": "^2.29.1",
-    "eslint-plugin-prettier": "^5.1.2",
-    "np": "^9.2.0",
-    "prettier": "^3.1.1",
+    "@feathers-community/eslint-config": "^0.0.4",
+    "@feathersjs/memory": "^5.0.33",
+    "@tsconfig/node22": "^22.0.0",
+    "@types/lodash": "^4.17.16",
+    "@types/node": "^22.13.9",
+    "@vitest/coverage-v8": "^3.0.7",
+    "eslint": "^9.21.0",
+    "np": "^10.2.0",
+    "prettier": "^3.5.3",
     "shx": "^0.3.4",
-    "typescript": "^5.3.3",
-    "unbuild": "^2.0.0",
-    "vitest": "^1.1.0"
+    "typescript": "^5.8.2",
+    "unbuild": "^3.5.0",
+    "vitest": "^3.0.7"
   },
   "peerDependencies": {
     "@feathersjs/feathers": "^5.0.0"
+  },
+  "scripts": {
+    "build": "unbuild",
+    "version": "npm run build",
+    "release": "np",
+    "test": "vitest run",
+    "vitest": "vitest",
+    "coverage": "vitest run --coverage",
+    "lint": "eslint"
   }
-}
+}

package/src/filters/array.ts

@@ -1,30 +1,28 @@
-import type { FilterQueryOptions } from "@feathersjs/adapter-commons";
-import { validateQueryProperty } from "../utils/validateQueryProperty";
+import type { FilterQueryOptions } from '@feathersjs/adapter-commons'
+import { validateQueryProperty } from '../utils/validateQueryProperty.js'
 
 const filterQueryArray =
   (key: string) =>
   (arr: any, { operators }: FilterQueryOptions) => {
     if (arr && !Array.isArray(arr)) {
-      throw new Error(
-        `Invalid query parameter '${key}'. It has to be an array`,
-      );
+      throw new Error(`Invalid query parameter '${key}'. It has to be an array`)
     }
 
     if (Array.isArray(arr)) {
-      return arr.map((current) => validateQueryProperty(current, operators));
+      return arr.map((current) => validateQueryProperty(current, operators))
     }
 
-    return arr;
-  };
+    return arr
+  }
 
 export const filterArray = <T extends string[]>(...keys: T) => {
   const result: {
-    [key in T[number]]: (value: any, options: FilterQueryOptions) => any;
-  } = {} as any;
+    [key in T[number]]: (value: any, options: FilterQueryOptions) => any
+  } = {} as any
 
   for (const key of keys) {
-    result[key as T[number]] = filterQueryArray(key);
+    result[key as T[number]] = filterQueryArray(key)
   }
 
-  return result;
-};
+  return result
+}

package/src/filters/index.ts

@@ -1,2 +1,2 @@
-export * from "./array";
-export * from "./object";
+export * from './array.js'
+export * from './object.js'

package/src/filters/object.ts

@@ -1,6 +1,6 @@
-import type { FilterQueryOptions } from "@feathersjs/adapter-commons";
-import { validateQueryProperty } from "../utils/validateQueryProperty";
-import { isObject } from "../utils/_utils.internal";
+import type { FilterQueryOptions } from '@feathersjs/adapter-commons'
+import { validateQueryProperty } from '../utils/validateQueryProperty.js'
+import { isObject } from '../utils/_utils.internal.js'
 
 const filterQueryObject =
   (key: string) =>
@@ -8,20 +8,20 @@ const filterQueryObject =
     if (obj && !isObject(obj)) {
       throw new Error(
         `Invalid query parameter: '${key}'. It has to be an object`,
-      );
+      )
     }
 
-    return validateQueryProperty(obj, operators);
-  };
+    return validateQueryProperty(obj, operators)
+  }
 
 export const filterObject = <T extends string[]>(...keys: T) => {
   const result: {
-    [key in T[number]]: (value: any, options: FilterQueryOptions) => any;
-  } = {} as any;
+    [key in T[number]]: (value: any, options: FilterQueryOptions) => any
+  } = {} as any
 
   for (const key of keys) {
-    result[key as T[number]] = filterQueryObject(key);
+    result[key as T[number]] = filterQueryObject(key)
   }
 
-  return result;
-};
+  return result
+}