feathers-utils 2.1.0 → 2.1.2

package/dist/index.cjs

@@ -16,7 +16,7 @@ const _debounce = require('lodash/debounce.js');
 const _isObject = require('lodash/isObject.js');
 
 function mergeArrays(targetArr, sourceArr, handle, prependKey, actionOnEmptyIntersect) {
-  if (!sourceArr && !targetArr) {
+  if (!sourceArr || !targetArr) {
     return;
   }
   if (handle === "target") {

package/dist/index.d.ts

@@ -143,7 +143,7 @@ interface MergeQueryOptions<T> extends FilterQueryOptions<T> {
     };
 }
 
-declare function mergeArrays<T>(targetArr: T[], sourceArr: T[], handle: Handle, prependKey?: Path, actionOnEmptyIntersect?: ActionOnEmptyIntersect): T[] | undefined;
+declare function mergeArrays<T>(targetArr: T[] | undefined, sourceArr: T[] | undefined, handle: Handle, prependKey?: Path, actionOnEmptyIntersect?: ActionOnEmptyIntersect): T[] | undefined;
 
 /**
  * Merges two queries into one.
@@ -202,7 +202,7 @@ type ShouldSkipOptions = {
 /**
  * util to detect if a hook should be skipped
  */
-declare const shouldSkip: <H extends HookContext<_feathersjs_feathers.Application<any, any>, any> = HookContext<_feathersjs_feathers.Application<any, any>, any>, O extends ShouldSkipOptions = ShouldSkipOptions>(hookName: string, context: H, options?: O | undefined) => boolean;
+declare const shouldSkip: <H extends HookContext<_feathersjs_feathers.Application<any, any>, any> = HookContext<_feathersjs_feathers.Application<any, any>, any>>(hookName: string, context: H, options?: ShouldSkipOptions) => boolean;
 
 /**
  * util to validate a query for operators

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") {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "feathers-utils",
-  "version": "2.1.0",
+  "version": "2.1.2",
   "description": "Some utils for projects using '@feathersjs/feathers'",
   "author": "fratzinger",
   "repository": {
@@ -39,36 +39,36 @@
     "lint": "eslint . --ext .js,.jsx,.ts,.tsx"
   },
   "dependencies": {
-    "@feathersjs/adapter-commons": "5.0.0",
-    "@feathersjs/commons": "^5.0.0",
-    "@feathersjs/errors": "5.0.0",
-    "@feathersjs/feathers": "5.0.0",
+    "@feathersjs/adapter-commons": "5.0.1",
+    "@feathersjs/commons": "^5.0.1",
+    "@feathersjs/errors": "5.0.1",
+    "@feathersjs/feathers": "5.0.1",
     "fast-equals": "^5.0.1",
-    "feathers-hooks-common": "^7.0.0",
+    "feathers-hooks-common": "^7.0.1",
     "lodash": "^4.17.21"
   },
   "devDependencies": {
-    "@feathersjs/memory": "^5.0.0",
+    "@feathersjs/memory": "^5.0.1",
     "@istanbuljs/nyc-config-typescript": "^1.0.2",
     "@types/lodash": "^4.14.191",
     "@types/mocha": "^10.0.1",
-    "@types/node": "^18.14.1",
-    "@typescript-eslint/eslint-plugin": "^5.53.0",
-    "@typescript-eslint/parser": "^5.53.0",
-    "@vitest/coverage-c8": "^0.29.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",
     "cross-env": "^7.0.3",
-    "eslint": "^8.34.0",
-    "eslint-config-prettier": "^8.6.0",
+    "eslint": "^8.36.0",
+    "eslint-config-prettier": "^8.8.0",
     "eslint-import-resolver-typescript": "^3.5.3",
     "eslint-plugin-import": "^2.27.5",
     "eslint-plugin-prettier": "^4.2.1",
     "eslint-plugin-security": "^1.7.1",
-    "np": "^7.6.3",
+    "np": "^7.6.4",
     "nyc": "^15.1.0",
-    "prettier": "^2.8.4",
+    "prettier": "^2.8.7",
     "shx": "^0.3.4",
-    "typescript": "^4.9.5",
+    "typescript": "^5.0.2",
     "unbuild": "^1.1.2",
-    "vitest": "^0.29.1"
+    "vitest": "^0.29.7"
   }
 }

package/src/utils/mergeQuery/mergeArrays.ts

@@ -2,13 +2,13 @@ import type { Path } from "../../typesInternal";
 import type { Handle, ActionOnEmptyIntersect } from "./types";
 
 export function mergeArrays<T>(
-  targetArr: T[],
-  sourceArr: T[],
+  targetArr: T[] | undefined,
+  sourceArr: T[] | undefined,
   handle: Handle,
   prependKey?: Path,
   actionOnEmptyIntersect?: ActionOnEmptyIntersect
 ): T[] | undefined {
-  if (!sourceArr && !targetArr) {
+  if (!sourceArr || !targetArr) {
     return;
   }
   if (handle === "target") {

package/src/utils/shouldSkip.ts

@@ -12,13 +12,10 @@ export type ShouldSkipOptions = {
 /**
  * util to detect if a hook should be skipped
  */
-export const shouldSkip = <
-  H extends HookContext = HookContext,
-  O extends ShouldSkipOptions = ShouldSkipOptions
->(
+export const shouldSkip = <H extends HookContext = HookContext>(
   hookName: string,
   context: H,
-  options?: O
+  options?: ShouldSkipOptions
 ): boolean => {
   if (!context.params || !context.params.skipHooks || options?.notSkippable) {
     return false;