feathers-utils 2.1.2 → 3.0.0

package/dist/index.cjs

@@ -15,8 +15,20 @@ const feathersHooksCommon = require('feathers-hooks-common');
 const _debounce = require('lodash/debounce.js');
 const _isObject = require('lodash/isObject.js');
 
+function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e.default : e; }
+
+const _merge__default = /*#__PURE__*/_interopDefaultCompat(_merge);
+const _isEmpty__default = /*#__PURE__*/_interopDefaultCompat(_isEmpty);
+const _get__default = /*#__PURE__*/_interopDefaultCompat(_get);
+const _has__default = /*#__PURE__*/_interopDefaultCompat(_has);
+const _set__default = /*#__PURE__*/_interopDefaultCompat(_set);
+const _uniqWith__default = /*#__PURE__*/_interopDefaultCompat(_uniqWith);
+const _isEqual__default = /*#__PURE__*/_interopDefaultCompat(_isEqual);
+const _debounce__default = /*#__PURE__*/_interopDefaultCompat(_debounce);
+const _isObject__default = /*#__PURE__*/_interopDefaultCompat(_isObject);
+
 function mergeArrays(targetArr, sourceArr, handle, prependKey, actionOnEmptyIntersect) {
-  if (!sourceArr || !targetArr) {
+  if (!sourceArr && !targetArr) {
     return;
   }
   if (handle === "target") {
@@ -33,9 +45,9 @@ function mergeArrays(targetArr, sourceArr, handle, prependKey, actionOnEmptyInte
     const arr = targetArr.concat(sourceArr);
     return [...new Set(arr)];
   } else if (handle === "intersect" || handle === "intersectOrFull") {
-    const targetIsArray = !targetArr || !Array.isArray(targetArr);
-    const sourceIsArray = !sourceArr || !Array.isArray(sourceArr);
-    if ((targetIsArray || sourceIsArray) && handle === "intersect") {
+    const targetIsNotArray = !targetArr || !Array.isArray(targetArr);
+    const sourceIsNotArray = !sourceArr || !Array.isArray(sourceArr);
+    if ((targetIsNotArray || sourceIsNotArray) && handle === "intersect") {
       if (actionOnEmptyIntersect) {
         actionOnEmptyIntersect(
           targetArr,
@@ -45,8 +57,8 @@ function mergeArrays(targetArr, sourceArr, handle, prependKey, actionOnEmptyInte
       }
       return;
     }
-    if (handle === "intersectOrFull") {
-      const val = !targetIsArray ? targetArr : sourceArr;
+    if (targetIsNotArray || sourceIsNotArray) {
+      const val = !targetIsNotArray ? targetArr : sourceArr;
       return val;
     }
     return targetArr.filter((val) => sourceArr.includes(val));
@@ -59,12 +71,12 @@ const hasOwnProperty = (obj, ...keys) => {
 };
 
 function handleArray(target, source, key, options) {
-  const targetVal = _get(target, key);
-  const sourceVal = _get(source, key);
+  const targetVal = _get__default(target, key);
+  const sourceVal = _get__default(source, key);
   if (!sourceVal && !targetVal) {
     return;
   }
-  const handle = _get(
+  const handle = _get__default(
     options,
     ["handle", ...key],
     options.defaultHandle
@@ -76,7 +88,7 @@ function handleArray(target, source, key, options) {
     key,
     options.actionOnEmptyIntersect
   );
-  _set(target, key, arr);
+  _set__default(target, key, arr);
 }
 function handleCircular(target, source, prependKey, options) {
   if (target?.$or) {
@@ -103,11 +115,11 @@ function handleCircular(target, source, prependKey, options) {
       delete source.$and;
     }
   }
-  if (!_has(source, prependKey)) {
+  if (!_has__default(source, prependKey)) {
     return;
   }
-  if (!_has(target, prependKey)) {
-    _set(target, prependKey, _get(source, prependKey));
+  if (!_has__default(target, prependKey)) {
+    _set__default(target, prependKey, _get__default(source, prependKey));
     return;
   }
   const { defaultHandle, actionOnEmptyIntersect } = options;
@@ -115,10 +127,10 @@ function handleCircular(target, source, prependKey, options) {
     return;
   }
   const getTargetVal = () => {
-    return prependKey.length > 0 ? _get(target, prependKey) : target;
+    return prependKey.length > 0 ? _get__default(target, prependKey) : target;
   };
   const getSourceVal = () => {
-    return prependKey.length > 0 ? _get(source, prependKey) : source;
+    return prependKey.length > 0 ? _get__default(source, prependKey) : source;
   };
   const targetVal = getTargetVal();
   const sourceVal = getSourceVal();
@@ -126,11 +138,11 @@ function handleCircular(target, source, prependKey, options) {
     return;
   }
   if (defaultHandle === "source") {
-    _set(target, prependKey, sourceVal);
+    _set__default(target, prependKey, sourceVal);
     return;
   }
   if (targetVal === null || sourceVal === null) {
-    _set(target, prependKey, sourceVal);
+    _set__default(target, prependKey, sourceVal);
     return;
   }
   const typeOfTargetVal = typeof targetVal;
@@ -138,7 +150,7 @@ function handleCircular(target, source, prependKey, options) {
     if (defaultHandle === "intersect") {
       actionOnEmptyIntersect(target, source, prependKey);
     }
-    _set(target, prependKey, sourceVal);
+    _set__default(target, prependKey, sourceVal);
     return;
   }
   const typeOfSourceVal = typeof sourceVal;
@@ -147,7 +159,7 @@ function handleCircular(target, source, prependKey, options) {
   if (isTargetSimple || isSourceSimple) {
     if (isTargetSimple && isSourceSimple) {
       if (defaultHandle === "combine") {
-        _set(target, prependKey, { $in: [.../* @__PURE__ */ new Set([targetVal, sourceVal])] });
+        _set__default(target, prependKey, { $in: [.../* @__PURE__ */ new Set([targetVal, sourceVal])] });
         return;
       } else if (defaultHandle === "intersect") {
         actionOnEmptyIntersect(target, source, prependKey);
@@ -159,17 +171,17 @@ function handleCircular(target, source, prependKey, options) {
       const $in = targetHasIn ? targetVal["$in"] : sourceVal["$in"];
       const otherVal = isTargetSimple ? targetVal : sourceVal;
       if ($in.length === 1 && fastEquals.deepEqual($in[0], otherVal)) {
-        _set(target, prependKey, otherVal);
+        _set__default(target, prependKey, otherVal);
         return;
       } else if (defaultHandle === "combine") {
         if (!$in.some((x) => fastEquals.deepEqual(x, otherVal))) {
           $in.push(otherVal);
         }
-        _set(target, `${prependKey}.$in`, $in);
+        _set__default(target, `${prependKey}.$in`, $in);
         return;
       } else if (defaultHandle === "intersect") {
         if ($in.some((x) => fastEquals.deepEqual(x, otherVal))) {
-          _set(target, prependKey, otherVal);
+          _set__default(target, prependKey, otherVal);
         } else {
           actionOnEmptyIntersect(target, source, prependKey);
         }
@@ -228,7 +240,7 @@ function handleCircular(target, source, prependKey, options) {
       if (defaultHandle === "combine") {
         let $in = targetVal.concat(sourceVal);
         $in = [...new Set($in)];
-        _set(target, prependKey, $in);
+        _set__default(target, prependKey, $in);
         return;
       } else if (defaultHandle === "intersect") {
         const $in = targetVal.filter(
@@ -237,19 +249,19 @@ function handleCircular(target, source, prependKey, options) {
         if ($in.length === 0) {
           actionOnEmptyIntersect(target, source, prependKey);
         } else if ($in.length === 1) {
-          _set(target, prependKey.slice(0, -1), $in[0]);
+          _set__default(target, prependKey.slice(0, -1), $in[0]);
           return;
         } else {
-          _set(target, prependKey, $in);
+          _set__default(target, prependKey, $in);
         }
       }
       return;
     }
-    _set(target, prependKey, sourceVal);
+    _set__default(target, prependKey, sourceVal);
     return;
   }
   if (typeOfTargetVal !== "object" || typeOfSourceVal !== "object") {
-    _set(target, prependKey, sourceVal);
+    _set__default(target, prependKey, sourceVal);
     return;
   }
   const sourceKeys = Object.keys(sourceVal);
@@ -285,13 +297,13 @@ function getParentProp(target, path) {
     return target;
   }
   const pathOneUp = path.slice(0, -1);
-  return _get(target, pathOneUp);
+  return _get__default(target, pathOneUp);
 }
 function cleanOr(target) {
   if (!target || !Array.isArray(target) || target.length <= 0) {
     return target;
   }
-  if (target.some((x) => _isEmpty(x))) {
+  if (target.some((x) => _isEmpty__default(x))) {
     return void 0;
   } else {
     return arrayWithoutDuplicates(target);
@@ -301,10 +313,10 @@ function cleanAnd(target) {
   if (!target || !Array.isArray(target) || target.length <= 0) {
     return target;
   }
-  if (target.every((x) => _isEmpty(x))) {
+  if (target.every((x) => _isEmpty__default(x))) {
     return void 0;
   } else {
-    target = target.filter((x) => !_isEmpty(x));
+    target = target.filter((x) => !_isEmpty__default(x));
     return arrayWithoutDuplicates(target);
   }
 }
@@ -312,7 +324,7 @@ function arrayWithoutDuplicates(target) {
   if (!target || !Array.isArray(target)) {
     return target;
   }
-  return _uniqWith(target, fastEquals.deepEqual);
+  return _uniqWith__default(target, fastEquals.deepEqual);
 }
 function isQueryMoreExplicitThanQuery(target, source) {
   if (!target || !source) {
@@ -404,7 +416,7 @@ function mergeQuery(target, source, _options) {
   }
   handleArray(targetFilters, sourceFilters, ["$select"], options);
   delete sourceFilters["$select"];
-  _merge(targetFilters, sourceFilters);
+  _merge__default(targetFilters, sourceFilters);
   const subsetQuery = isQueryMoreExplicitThanQuery(targetQuery, sourceQuery);
   if (options.defaultHandle === "intersect" && !!subsetQuery && !hasOwnProperty(targetQuery, "$or", "$and") && !hasOwnProperty(sourceQuery, "$or", "$and")) {
     return {
@@ -419,7 +431,7 @@ function mergeQuery(target, source, _options) {
       ...sourceQuery
     };
   }
-  if (options.useLogicalConjunction && (options.defaultHandle === "combine" || options.defaultHandle === "intersect") && !_isEmpty(targetQuery)) {
+  if (options.useLogicalConjunction && (options.defaultHandle === "combine" || options.defaultHandle === "intersect") && !_isEmpty__default(targetQuery)) {
     const logicalOp = options.defaultHandle === "combine" ? "$or" : "$and";
     if (hasOwnProperty(sourceQuery, logicalOp)) {
       const andOr = sourceQuery[logicalOp];
@@ -501,13 +513,13 @@ const isPaginated = (context) => {
 
 const pushSet = (obj, path, val, options) => {
   options = options || {};
-  let arr = _get(obj, path);
+  let arr = _get__default(obj, path);
   if (!arr || !Array.isArray(arr)) {
     arr = [val];
-    _set(obj, path, arr);
+    _set__default(obj, path, arr);
     return arr;
   } else {
-    if (options.unique && arr.some((x) => _isEqual(x, val))) {
+    if (options.unique && arr.some((x) => _isEqual__default(x, val))) {
       return arr;
     }
     arr.push(val);
@@ -802,16 +814,16 @@ function setData(from, to, _options) {
       return context;
     }
     const { items } = getItemsIsArray(context);
-    if (!_has(context, from)) {
+    if (!_has__default(context, from)) {
       if (!context.params?.provider || options.allowUndefined === true) {
         return context;
       }
-      if (!options.overwrite && items.every((item) => _has(item, to))) {
+      if (!options.overwrite && items.every((item) => _has__default(item, to))) {
         return context;
       }
       throw new errors.Forbidden(`Expected field ${from.toString()} not available`);
     }
-    const val = _get(context, from);
+    const val = _get__default(context, from);
     items.forEach((item) => {
       let overwrite;
       if (typeof options.overwrite === "function") {
@@ -819,10 +831,10 @@ function setData(from, to, _options) {
       } else {
         overwrite = options.overwrite;
       }
-      if (!overwrite && _has(item, to)) {
+      if (!overwrite && _has__default(item, to)) {
         return;
       }
-      _set(item, to, val);
+      _set__default(item, to, val);
     });
     return context;
   };
@@ -862,7 +874,7 @@ class DebouncedStore {
       if (typeof this._queueById[id] === "function") {
         return this._queueById[id](id, action);
       }
-      this._queueById[id] = _debounce(
+      this._queueById[id] = _debounce__default(
         (id2, action2) => {
           this.unbounced(id2, action2);
         },
@@ -922,7 +934,7 @@ const filterArray = (...keys) => {
 };
 
 const filterQueryObject = (key) => (obj, { operators }) => {
-  if (obj && !_isObject(obj)) {
+  if (obj && !_isObject__default(obj)) {
     throw new Error(
       `Invalid query parameter: '${key}'. It has to be an object`
     );

package/dist/index.mjs

@@ -14,7 +14,7 @@ import _debounce from 'lodash/debounce.js';
 import _isObject from 'lodash/isObject.js';
 
 function mergeArrays(targetArr, sourceArr, handle, prependKey, actionOnEmptyIntersect) {
-  if (!sourceArr || !targetArr) {
+  if (!sourceArr && !targetArr) {
     return;
   }
   if (handle === "target") {
@@ -31,9 +31,9 @@ function mergeArrays(targetArr, sourceArr, handle, prependKey, actionOnEmptyInte
     const arr = targetArr.concat(sourceArr);
     return [...new Set(arr)];
   } else if (handle === "intersect" || handle === "intersectOrFull") {
-    const targetIsArray = !targetArr || !Array.isArray(targetArr);
-    const sourceIsArray = !sourceArr || !Array.isArray(sourceArr);
-    if ((targetIsArray || sourceIsArray) && handle === "intersect") {
+    const targetIsNotArray = !targetArr || !Array.isArray(targetArr);
+    const sourceIsNotArray = !sourceArr || !Array.isArray(sourceArr);
+    if ((targetIsNotArray || sourceIsNotArray) && handle === "intersect") {
       if (actionOnEmptyIntersect) {
         actionOnEmptyIntersect(
           targetArr,
@@ -43,8 +43,8 @@ function mergeArrays(targetArr, sourceArr, handle, prependKey, actionOnEmptyInte
       }
       return;
     }
-    if (handle === "intersectOrFull") {
-      const val = !targetIsArray ? targetArr : sourceArr;
+    if (targetIsNotArray || sourceIsNotArray) {
+      const val = !targetIsNotArray ? targetArr : sourceArr;
       return val;
     }
     return targetArr.filter((val) => sourceArr.includes(val));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "feathers-utils",
-  "version": "2.1.2",
+  "version": "3.0.0",
   "description": "Some utils for projects using '@feathersjs/feathers'",
   "author": "fratzinger",
   "repository": {
@@ -39,36 +39,39 @@
     "lint": "eslint . --ext .js,.jsx,.ts,.tsx"
   },
   "dependencies": {
-    "@feathersjs/adapter-commons": "5.0.1",
-    "@feathersjs/commons": "^5.0.1",
-    "@feathersjs/errors": "5.0.1",
-    "@feathersjs/feathers": "5.0.1",
+    "@feathersjs/adapter-commons": "^5.0.5",
+    "@feathersjs/commons": "^5.0.5",
+    "@feathersjs/errors": "^5.0.5",
     "fast-equals": "^5.0.1",
-    "feathers-hooks-common": "^7.0.1",
+    "feathers-hooks-common": "^7.0.3",
     "lodash": "^4.17.21"
   },
   "devDependencies": {
-    "@feathersjs/memory": "^5.0.1",
+    "@feathersjs/feathers": "^5.0.5",
+    "@feathersjs/memory": "^5.0.5",
     "@istanbuljs/nyc-config-typescript": "^1.0.2",
-    "@types/lodash": "^4.14.191",
+    "@types/lodash": "^4.14.195",
     "@types/mocha": "^10.0.1",
-    "@types/node": "^18.15.9",
-    "@typescript-eslint/eslint-plugin": "^5.56.0",
-    "@typescript-eslint/parser": "^5.56.0",
-    "@vitest/coverage-c8": "^0.29.7",
+    "@types/node": "^20.2.5",
+    "@typescript-eslint/eslint-plugin": "^5.59.8",
+    "@typescript-eslint/parser": "^5.59.8",
+    "@vitest/coverage-c8": "^0.31.4",
     "cross-env": "^7.0.3",
-    "eslint": "^8.36.0",
+    "eslint": "^8.41.0",
     "eslint-config-prettier": "^8.8.0",
-    "eslint-import-resolver-typescript": "^3.5.3",
+    "eslint-import-resolver-typescript": "^3.5.5",
     "eslint-plugin-import": "^2.27.5",
     "eslint-plugin-prettier": "^4.2.1",
     "eslint-plugin-security": "^1.7.1",
-    "np": "^7.6.4",
+    "np": "^8.0.2",
     "nyc": "^15.1.0",
-    "prettier": "^2.8.7",
+    "prettier": "^2.8.8",
     "shx": "^0.3.4",
-    "typescript": "^5.0.2",
-    "unbuild": "^1.1.2",
-    "vitest": "^0.29.7"
+    "typescript": "^5.1.3",
+    "unbuild": "^1.2.1",
+    "vitest": "^0.31.4"
+  },
+  "peerDependencies": {
+    "@feathersjs/feathers": "^5.0.0"
   }
 }

package/src/utils/mergeQuery/mergeArrays.ts

@@ -8,7 +8,7 @@ export function mergeArrays<T>(
   prependKey?: Path,
   actionOnEmptyIntersect?: ActionOnEmptyIntersect
 ): T[] | undefined {
-  if (!sourceArr || !targetArr) {
+  if (!sourceArr && !targetArr) {
     return;
   }
   if (handle === "target") {
@@ -25,10 +25,10 @@ export function mergeArrays<T>(
     const arr = targetArr.concat(sourceArr);
     return [...new Set(arr)];
   } else if (handle === "intersect" || handle === "intersectOrFull") {
-    const targetIsArray = !targetArr || !Array.isArray(targetArr);
-    const sourceIsArray = !sourceArr || !Array.isArray(sourceArr);
+    const targetIsNotArray = !targetArr || !Array.isArray(targetArr);
+    const sourceIsNotArray = !sourceArr || !Array.isArray(sourceArr);
 
-    if ((targetIsArray || sourceIsArray) && handle === "intersect") {
+    if ((targetIsNotArray || sourceIsNotArray) && handle === "intersect") {
       if (actionOnEmptyIntersect) {
         actionOnEmptyIntersect(
           targetArr as unknown,
@@ -39,12 +39,12 @@ export function mergeArrays<T>(
       return;
     }
 
-    if (handle === "intersectOrFull") {
-      const val = !targetIsArray ? targetArr : sourceArr;
+    if (targetIsNotArray || sourceIsNotArray) {
+      const val = !targetIsNotArray ? targetArr : sourceArr;
       return val;
     }
 
-    return targetArr.filter((val) => sourceArr.includes(val));
+    return targetArr!.filter((val) => sourceArr!.includes(val));
   }
   return undefined;
 }