feathers-utils 3.1.2 → 4.0.0

package/dist/index.cjs

@@ -8,7 +8,6 @@ const _has = require('lodash/has.js');
 const _set = require('lodash/set.js');
 const _uniqWith = require('lodash/uniqWith.js');
 const fastEquals = require('fast-equals');
-const adapterCommons = require('@feathersjs/adapter-commons');
 const _isEqual = require('lodash/isEqual.js');
 const commons = require('@feathersjs/commons');
 const feathersHooksCommon = require('feathers-hooks-common');
@@ -284,15 +283,6 @@ function makeDefaultOptions$1(options) {
   }
   return options;
 }
-function moveProperty(from, to, ...keys) {
-  keys.forEach((key) => {
-    if (!hasOwnProperty(from, key)) {
-      return;
-    }
-    to[key] = from[key];
-    delete from[key];
-  });
-}
 function getParentProp(target, path) {
   if (path.length <= 1) {
     return target;
@@ -362,59 +352,29 @@ function areQueriesOverlapping(target, source) {
   return false;
 }
 
-function filterQuery(query, _options) {
-  query = query || {};
-  _options = _options || {};
-  const { service, ...options } = _options;
-  if (service) {
-    const operators = options.operators ? options.operators : service.options?.operators;
-    const filters = options.filters ? options.filters : service.options?.filters;
-    const optionsForFilterQuery = {};
-    if (operators) {
-      optionsForFilterQuery.operators = operators;
-    }
-    if (filters) {
-      optionsForFilterQuery.filters = filters;
-    }
-    if (service && "filterQuery" in service && typeof service.filterQuery === "function") {
-      return service.filterQuery({ query }, optionsForFilterQuery);
-    } else {
-      return adapterCommons.filterQuery(query, optionsForFilterQuery);
-    }
+function filterQuery(providedQuery) {
+  providedQuery ?? (providedQuery = {});
+  const { $select, $limit, $skip, $sort, ...query } = providedQuery;
+  const result = { query };
+  if ("$select" in providedQuery) {
+    result.$select = $select;
+  }
+  if ("$limit" in providedQuery) {
+    result.$limit = $limit;
+  }
+  if ("$skip" in providedQuery) {
+    result.$skip = $skip;
   }
-  return adapterCommons.filterQuery(query, options);
+  if ("$sort" in providedQuery) {
+    result.$sort = $sort;
+  }
+  return result;
 }
 
 function mergeQuery(target, source, _options) {
   const options = makeDefaultOptions$1(_options);
-  const { filters: targetFilters, query: targetQuery } = filterQuery(target, {
-    operators: options.operators,
-    filters: options.filters,
-    service: options.service
-  });
-  moveProperty(targetFilters, targetQuery, "$or", "$and");
-  if ("$limit" in target) {
-    targetFilters.$limit = target.$limit;
-  }
-  let {
-    // eslint-disable-next-line prefer-const
-    filters: sourceFilters,
-    query: sourceQuery
-  } = filterQuery(source, {
-    operators: options.operators,
-    filters: options.filters,
-    service: options.service
-  });
-  moveProperty(sourceFilters, sourceQuery, "$or", "$and");
-  if (source.$limit) {
-    sourceFilters.$limit = source.$limit;
-  }
-  if (target && !hasOwnProperty(target, "$limit") && hasOwnProperty(targetFilters, "$limit")) {
-    delete targetFilters.$limit;
-  }
-  if (source && !hasOwnProperty(source, "$limit") && hasOwnProperty(sourceFilters, "$limit")) {
-    delete sourceFilters.$limit;
-  }
+  const { query: targetQuery, ...targetFilters } = filterQuery(target);
+  let { query: sourceQuery, ...sourceFilters } = filterQuery(source);
   handleArray(targetFilters, sourceFilters, ["$select"], options);
   delete sourceFilters["$select"];
   _merge__default(targetFilters, sourceFilters);
@@ -459,12 +419,14 @@ const getItemsIsArray = (context, options) => {
   let itemOrItems;
   if (from === "automatic") {
     itemOrItems = context.type === "before" ? context.data : context.result;
-    itemOrItems = itemOrItems && context.method === "find" ? itemOrItems.data || itemOrItems : itemOrItems;
   } else if (from === "data") {
     itemOrItems = context.data;
   } else if (from === "result") {
     itemOrItems = context.result;
   }
+  if ((from === "automatic" || from === "result") && context.type === "after") {
+    itemOrItems = itemOrItems && context.method === "find" ? itemOrItems.data || itemOrItems : itemOrItems;
+  }
   const isArray = Array.isArray(itemOrItems);
   return {
     items: isArray ? itemOrItems : itemOrItems != null ? [itemOrItems] : [],

package/dist/index.d.cts

@@ -2,7 +2,7 @@ import * as _feathersjs_feathers from '@feathersjs/feathers';
 import { HookContext, Application, Id, Query, Params } from '@feathersjs/feathers';
 import { HookContext as HookContext$1, Application as Application$1 } from '@feathersjs/feathers/lib';
 import { PropertyPath, DebouncedFunc } from 'lodash';
-import { AdapterBase, FilterQueryOptions as FilterQueryOptions$1, PaginationOptions } from '@feathersjs/adapter-commons';
+import { PaginationOptions, FilterQueryOptions } from '@feathersjs/adapter-commons';
 import { HookType } from 'feathers-hooks-common';
 
 /**
@@ -26,8 +26,9 @@ interface CreateRelatedOptions<S = Record<string, any>> {
  */
 declare function createRelated<S = Record<string, any>, H extends HookContext = HookContext>({ service, multi, data, createItemsInDataArraySeparately, }: CreateRelatedOptions<S>): (context: H) => Promise<H>;
 
+type GetItemsIsArrayFrom = "data" | "result" | "automatic";
 type GetItemsIsArrayOptions = {
-    from: "data" | "result" | "automatic";
+    from?: GetItemsIsArrayFrom;
 };
 interface GetItemsIsArrayResult<T = any> {
     items: T[];
@@ -124,17 +125,10 @@ declare class DebouncedStore {
 
 declare function debounceMixin(options?: Partial<InitDebounceMixinOptions>): (app: Application$1) => void;
 
-interface FilterQueryOptions<T> {
-    service?: AdapterBase<T>;
-    operators?: FilterQueryOptions$1["operators"];
-    filters?: FilterQueryOptions$1["filters"];
-}
-declare function filterQuery<T>(query: Query, _options?: FilterQueryOptions<T>): any;
-
 type Handle = "target" | "source" | "combine" | "intersect" | "intersectOrFull";
 type FirstLast = "first" | "last";
 type ActionOnEmptyIntersect = (target: unknown, source: unknown, prependKey: Path) => void;
-interface MergeQueryOptions<T> extends FilterQueryOptions<T> {
+interface MergeQueryOptions {
     defaultHandle: Handle;
     actionOnEmptyIntersect: ActionOnEmptyIntersect;
     useLogicalConjunction: boolean;
@@ -152,7 +146,22 @@ declare function mergeArrays<T>(targetArr: T[] | undefined, sourceArr: T[] | und
  * @param _options
  * @returns Query
  */
-declare function mergeQuery<T = any>(target: Query, source: Query, _options?: Partial<MergeQueryOptions<T>>): Query;
+declare function mergeQuery(target: Query, source: Query, _options?: Partial<MergeQueryOptions>): Query;
+
+type FilterQueryResult<Q extends Query> = {
+    $select: Q["$select"] extends any ? Q["$select"] : never;
+    $limit: Q["$limit"] extends any ? Q["$limit"] : never;
+    $skip: Q["$skip"] extends any ? Q["$skip"] : never;
+    $sort: Q["$sort"] extends any ? Q["$sort"] : never;
+    query: Omit<Q, "$select" | "$limit" | "$skip" | "$sort">;
+};
+/**
+ * Extracts $select, $limit, $skip, $sort from a query and returns the rest as a query object.
+ *
+ * @param providedQuery
+ * @returns
+ */
+declare function filterQuery<Q extends Query>(providedQuery?: Q): FilterQueryResult<Q>;
 
 /**
  * util to get paginate options from context
@@ -216,9 +225,9 @@ type SetQueryKeySafelyOptions = {
 };
 declare const setQueryKeySafely: <P extends Params<_feathersjs_feathers.Query> = Params<_feathersjs_feathers.Query>>(params: P, key: string, value: any, operator?: string, options?: SetQueryKeySafelyOptions) => P;
 
-declare const filterArray: <T extends string[]>(...keys: T) => { [key in T[number]]: (value: any, options: FilterQueryOptions$1) => any; };
+declare const filterArray: <T extends string[]>(...keys: T) => { [key in T[number]]: (value: any, options: FilterQueryOptions) => any; };
 
-declare const filterObject: <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) => any; };
 
 type Single<T> = T extends Array<infer U> ? U : T;
 type AsArray<T> = T extends any[] ? T : [T];
@@ -266,4 +275,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 { type ActionOnEmptyIntersect, type CreateRelatedOptions, type DebouncedFunctionApp, type DebouncedService, DebouncedStore, type DebouncedStoreOptions, type FilterQueryOptions, type FirstLast, type GetItemsIsArrayOptions, type GetItemsIsArrayResult, type GetService, type Handle, type HookForEachOptions, type HookRunPerItemOptions, type HookSetDataOptions, type InferCreateData, type InferCreateDataFromPath, type InferCreateDataSingle, type InferCreateDataSingleFromPath, type InferCreateResult, type InferCreateResultFromPath, type InferCreateResultSingle, type InferCreateResultSingleFromPath, type InferDataFromPath, type InferFindResult, type InferFindResultFromPath, type InferGetResult, type InferGetResultFromPath, type InferPatchData, type InferPatchDataFromPath, type InferPatchResult, type InferPatchResultFromPath, type InferRemoveResult, type InferRemoveResultFromPath, type InferResultFromPath, type InferUpdateData, type InferUpdateDataFromPath, type InferUpdateResult, type InferUpdateResultFromPath, type InitDebounceMixinOptions, type MergeQueryOptions, type OnDeleteAction, type OnDeleteOptions, type Predicate, type PredicateWithContext, type PushSetOptions, type RemoveRelatedOptions, type SetQueryKeySafelyOptions, type ShouldSkipOptions, checkMulti, createRelated, debounceMixin, filterArray, filterObject, filterQuery, forEach, getItemsIsArray, getPaginate, isMulti, isPaginated, makeDefaultOptions, markHookForSkip, mergeArrays, mergeQuery, onDelete, parseFields, pushSet, removeRelated, runPerItem, setData, setQueryKeySafely, setResultEmpty, shouldSkip, toJSON, validateQueryProperty };
+export { type ActionOnEmptyIntersect, type CreateRelatedOptions, type DebouncedFunctionApp, type DebouncedService, DebouncedStore, type DebouncedStoreOptions, type FirstLast, type GetItemsIsArrayFrom, type GetItemsIsArrayOptions, type GetItemsIsArrayResult, type GetService, type Handle, type HookForEachOptions, type HookRunPerItemOptions, type HookSetDataOptions, type InferCreateData, type InferCreateDataFromPath, type InferCreateDataSingle, type InferCreateDataSingleFromPath, type InferCreateResult, type InferCreateResultFromPath, type InferCreateResultSingle, type InferCreateResultSingleFromPath, type InferDataFromPath, type InferFindResult, type InferFindResultFromPath, type InferGetResult, type InferGetResultFromPath, type InferPatchData, type InferPatchDataFromPath, type InferPatchResult, type InferPatchResultFromPath, type InferRemoveResult, type InferRemoveResultFromPath, type InferResultFromPath, type InferUpdateData, type InferUpdateDataFromPath, type InferUpdateResult, type InferUpdateResultFromPath, type InitDebounceMixinOptions, type MergeQueryOptions, type OnDeleteAction, type OnDeleteOptions, type Predicate, type PredicateWithContext, type PushSetOptions, type RemoveRelatedOptions, type SetQueryKeySafelyOptions, type ShouldSkipOptions, checkMulti, createRelated, debounceMixin, filterArray, filterObject, filterQuery, forEach, getItemsIsArray, getPaginate, isMulti, isPaginated, makeDefaultOptions, markHookForSkip, mergeArrays, mergeQuery, onDelete, parseFields, pushSet, removeRelated, runPerItem, setData, setQueryKeySafely, setResultEmpty, shouldSkip, toJSON, validateQueryProperty };

package/dist/index.d.mts

@@ -2,7 +2,7 @@ import * as _feathersjs_feathers from '@feathersjs/feathers';
 import { HookContext, Application, Id, Query, Params } from '@feathersjs/feathers';
 import { HookContext as HookContext$1, Application as Application$1 } from '@feathersjs/feathers/lib';
 import { PropertyPath, DebouncedFunc } from 'lodash';
-import { AdapterBase, FilterQueryOptions as FilterQueryOptions$1, PaginationOptions } from '@feathersjs/adapter-commons';
+import { PaginationOptions, FilterQueryOptions } from '@feathersjs/adapter-commons';
 import { HookType } from 'feathers-hooks-common';
 
 /**
@@ -26,8 +26,9 @@ interface CreateRelatedOptions<S = Record<string, any>> {
  */
 declare function createRelated<S = Record<string, any>, H extends HookContext = HookContext>({ service, multi, data, createItemsInDataArraySeparately, }: CreateRelatedOptions<S>): (context: H) => Promise<H>;
 
+type GetItemsIsArrayFrom = "data" | "result" | "automatic";
 type GetItemsIsArrayOptions = {
-    from: "data" | "result" | "automatic";
+    from?: GetItemsIsArrayFrom;
 };
 interface GetItemsIsArrayResult<T = any> {
     items: T[];
@@ -124,17 +125,10 @@ declare class DebouncedStore {
 
 declare function debounceMixin(options?: Partial<InitDebounceMixinOptions>): (app: Application$1) => void;
 
-interface FilterQueryOptions<T> {
-    service?: AdapterBase<T>;
-    operators?: FilterQueryOptions$1["operators"];
-    filters?: FilterQueryOptions$1["filters"];
-}
-declare function filterQuery<T>(query: Query, _options?: FilterQueryOptions<T>): any;
-
 type Handle = "target" | "source" | "combine" | "intersect" | "intersectOrFull";
 type FirstLast = "first" | "last";
 type ActionOnEmptyIntersect = (target: unknown, source: unknown, prependKey: Path) => void;
-interface MergeQueryOptions<T> extends FilterQueryOptions<T> {
+interface MergeQueryOptions {
     defaultHandle: Handle;
     actionOnEmptyIntersect: ActionOnEmptyIntersect;
     useLogicalConjunction: boolean;
@@ -152,7 +146,22 @@ declare function mergeArrays<T>(targetArr: T[] | undefined, sourceArr: T[] | und
  * @param _options
  * @returns Query
  */
-declare function mergeQuery<T = any>(target: Query, source: Query, _options?: Partial<MergeQueryOptions<T>>): Query;
+declare function mergeQuery(target: Query, source: Query, _options?: Partial<MergeQueryOptions>): Query;
+
+type FilterQueryResult<Q extends Query> = {
+    $select: Q["$select"] extends any ? Q["$select"] : never;
+    $limit: Q["$limit"] extends any ? Q["$limit"] : never;
+    $skip: Q["$skip"] extends any ? Q["$skip"] : never;
+    $sort: Q["$sort"] extends any ? Q["$sort"] : never;
+    query: Omit<Q, "$select" | "$limit" | "$skip" | "$sort">;
+};
+/**
+ * Extracts $select, $limit, $skip, $sort from a query and returns the rest as a query object.
+ *
+ * @param providedQuery
+ * @returns
+ */
+declare function filterQuery<Q extends Query>(providedQuery?: Q): FilterQueryResult<Q>;
 
 /**
  * util to get paginate options from context
@@ -216,9 +225,9 @@ type SetQueryKeySafelyOptions = {
 };
 declare const setQueryKeySafely: <P extends Params<_feathersjs_feathers.Query> = Params<_feathersjs_feathers.Query>>(params: P, key: string, value: any, operator?: string, options?: SetQueryKeySafelyOptions) => P;
 
-declare const filterArray: <T extends string[]>(...keys: T) => { [key in T[number]]: (value: any, options: FilterQueryOptions$1) => any; };
+declare const filterArray: <T extends string[]>(...keys: T) => { [key in T[number]]: (value: any, options: FilterQueryOptions) => any; };
 
-declare const filterObject: <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) => any; };
 
 type Single<T> = T extends Array<infer U> ? U : T;
 type AsArray<T> = T extends any[] ? T : [T];
@@ -266,4 +275,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 { type ActionOnEmptyIntersect, type CreateRelatedOptions, type DebouncedFunctionApp, type DebouncedService, DebouncedStore, type DebouncedStoreOptions, type FilterQueryOptions, type FirstLast, type GetItemsIsArrayOptions, type GetItemsIsArrayResult, type GetService, type Handle, type HookForEachOptions, type HookRunPerItemOptions, type HookSetDataOptions, type InferCreateData, type InferCreateDataFromPath, type InferCreateDataSingle, type InferCreateDataSingleFromPath, type InferCreateResult, type InferCreateResultFromPath, type InferCreateResultSingle, type InferCreateResultSingleFromPath, type InferDataFromPath, type InferFindResult, type InferFindResultFromPath, type InferGetResult, type InferGetResultFromPath, type InferPatchData, type InferPatchDataFromPath, type InferPatchResult, type InferPatchResultFromPath, type InferRemoveResult, type InferRemoveResultFromPath, type InferResultFromPath, type InferUpdateData, type InferUpdateDataFromPath, type InferUpdateResult, type InferUpdateResultFromPath, type InitDebounceMixinOptions, type MergeQueryOptions, type OnDeleteAction, type OnDeleteOptions, type Predicate, type PredicateWithContext, type PushSetOptions, type RemoveRelatedOptions, type SetQueryKeySafelyOptions, type ShouldSkipOptions, checkMulti, createRelated, debounceMixin, filterArray, filterObject, filterQuery, forEach, getItemsIsArray, getPaginate, isMulti, isPaginated, makeDefaultOptions, markHookForSkip, mergeArrays, mergeQuery, onDelete, parseFields, pushSet, removeRelated, runPerItem, setData, setQueryKeySafely, setResultEmpty, shouldSkip, toJSON, validateQueryProperty };
+export { type ActionOnEmptyIntersect, type CreateRelatedOptions, type DebouncedFunctionApp, type DebouncedService, DebouncedStore, type DebouncedStoreOptions, type FirstLast, type GetItemsIsArrayFrom, type GetItemsIsArrayOptions, type GetItemsIsArrayResult, type GetService, type Handle, type HookForEachOptions, type HookRunPerItemOptions, type HookSetDataOptions, type InferCreateData, type InferCreateDataFromPath, type InferCreateDataSingle, type InferCreateDataSingleFromPath, type InferCreateResult, type InferCreateResultFromPath, type InferCreateResultSingle, type InferCreateResultSingleFromPath, type InferDataFromPath, type InferFindResult, type InferFindResultFromPath, type InferGetResult, type InferGetResultFromPath, type InferPatchData, type InferPatchDataFromPath, type InferPatchResult, type InferPatchResultFromPath, type InferRemoveResult, type InferRemoveResultFromPath, type InferResultFromPath, type InferUpdateData, type InferUpdateDataFromPath, type InferUpdateResult, type InferUpdateResultFromPath, type InitDebounceMixinOptions, type MergeQueryOptions, type OnDeleteAction, type OnDeleteOptions, type Predicate, type PredicateWithContext, type PushSetOptions, type RemoveRelatedOptions, type SetQueryKeySafelyOptions, type ShouldSkipOptions, checkMulti, createRelated, debounceMixin, filterArray, filterObject, filterQuery, forEach, getItemsIsArray, getPaginate, isMulti, isPaginated, makeDefaultOptions, markHookForSkip, mergeArrays, mergeQuery, onDelete, parseFields, pushSet, removeRelated, runPerItem, setData, setQueryKeySafely, setResultEmpty, shouldSkip, toJSON, validateQueryProperty };

package/dist/index.d.ts

@@ -2,7 +2,7 @@ import * as _feathersjs_feathers from '@feathersjs/feathers';
 import { HookContext, Application, Id, Query, Params } from '@feathersjs/feathers';
 import { HookContext as HookContext$1, Application as Application$1 } from '@feathersjs/feathers/lib';
 import { PropertyPath, DebouncedFunc } from 'lodash';
-import { AdapterBase, FilterQueryOptions as FilterQueryOptions$1, PaginationOptions } from '@feathersjs/adapter-commons';
+import { PaginationOptions, FilterQueryOptions } from '@feathersjs/adapter-commons';
 import { HookType } from 'feathers-hooks-common';
 
 /**
@@ -26,8 +26,9 @@ interface CreateRelatedOptions<S = Record<string, any>> {
  */
 declare function createRelated<S = Record<string, any>, H extends HookContext = HookContext>({ service, multi, data, createItemsInDataArraySeparately, }: CreateRelatedOptions<S>): (context: H) => Promise<H>;
 
+type GetItemsIsArrayFrom = "data" | "result" | "automatic";
 type GetItemsIsArrayOptions = {
-    from: "data" | "result" | "automatic";
+    from?: GetItemsIsArrayFrom;
 };
 interface GetItemsIsArrayResult<T = any> {
     items: T[];
@@ -124,17 +125,10 @@ declare class DebouncedStore {
 
 declare function debounceMixin(options?: Partial<InitDebounceMixinOptions>): (app: Application$1) => void;
 
-interface FilterQueryOptions<T> {
-    service?: AdapterBase<T>;
-    operators?: FilterQueryOptions$1["operators"];
-    filters?: FilterQueryOptions$1["filters"];
-}
-declare function filterQuery<T>(query: Query, _options?: FilterQueryOptions<T>): any;
-
 type Handle = "target" | "source" | "combine" | "intersect" | "intersectOrFull";
 type FirstLast = "first" | "last";
 type ActionOnEmptyIntersect = (target: unknown, source: unknown, prependKey: Path) => void;
-interface MergeQueryOptions<T> extends FilterQueryOptions<T> {
+interface MergeQueryOptions {
     defaultHandle: Handle;
     actionOnEmptyIntersect: ActionOnEmptyIntersect;
     useLogicalConjunction: boolean;
@@ -152,7 +146,22 @@ declare function mergeArrays<T>(targetArr: T[] | undefined, sourceArr: T[] | und
  * @param _options
  * @returns Query
  */
-declare function mergeQuery<T = any>(target: Query, source: Query, _options?: Partial<MergeQueryOptions<T>>): Query;
+declare function mergeQuery(target: Query, source: Query, _options?: Partial<MergeQueryOptions>): Query;
+
+type FilterQueryResult<Q extends Query> = {
+    $select: Q["$select"] extends any ? Q["$select"] : never;
+    $limit: Q["$limit"] extends any ? Q["$limit"] : never;
+    $skip: Q["$skip"] extends any ? Q["$skip"] : never;
+    $sort: Q["$sort"] extends any ? Q["$sort"] : never;
+    query: Omit<Q, "$select" | "$limit" | "$skip" | "$sort">;
+};
+/**
+ * Extracts $select, $limit, $skip, $sort from a query and returns the rest as a query object.
+ *
+ * @param providedQuery
+ * @returns
+ */
+declare function filterQuery<Q extends Query>(providedQuery?: Q): FilterQueryResult<Q>;
 
 /**
  * util to get paginate options from context
@@ -216,9 +225,9 @@ type SetQueryKeySafelyOptions = {
 };
 declare const setQueryKeySafely: <P extends Params<_feathersjs_feathers.Query> = Params<_feathersjs_feathers.Query>>(params: P, key: string, value: any, operator?: string, options?: SetQueryKeySafelyOptions) => P;
 
-declare const filterArray: <T extends string[]>(...keys: T) => { [key in T[number]]: (value: any, options: FilterQueryOptions$1) => any; };
+declare const filterArray: <T extends string[]>(...keys: T) => { [key in T[number]]: (value: any, options: FilterQueryOptions) => any; };
 
-declare const filterObject: <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) => any; };
 
 type Single<T> = T extends Array<infer U> ? U : T;
 type AsArray<T> = T extends any[] ? T : [T];
@@ -266,4 +275,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 { type ActionOnEmptyIntersect, type CreateRelatedOptions, type DebouncedFunctionApp, type DebouncedService, DebouncedStore, type DebouncedStoreOptions, type FilterQueryOptions, type FirstLast, type GetItemsIsArrayOptions, type GetItemsIsArrayResult, type GetService, type Handle, type HookForEachOptions, type HookRunPerItemOptions, type HookSetDataOptions, type InferCreateData, type InferCreateDataFromPath, type InferCreateDataSingle, type InferCreateDataSingleFromPath, type InferCreateResult, type InferCreateResultFromPath, type InferCreateResultSingle, type InferCreateResultSingleFromPath, type InferDataFromPath, type InferFindResult, type InferFindResultFromPath, type InferGetResult, type InferGetResultFromPath, type InferPatchData, type InferPatchDataFromPath, type InferPatchResult, type InferPatchResultFromPath, type InferRemoveResult, type InferRemoveResultFromPath, type InferResultFromPath, type InferUpdateData, type InferUpdateDataFromPath, type InferUpdateResult, type InferUpdateResultFromPath, type InitDebounceMixinOptions, type MergeQueryOptions, type OnDeleteAction, type OnDeleteOptions, type Predicate, type PredicateWithContext, type PushSetOptions, type RemoveRelatedOptions, type SetQueryKeySafelyOptions, type ShouldSkipOptions, checkMulti, createRelated, debounceMixin, filterArray, filterObject, filterQuery, forEach, getItemsIsArray, getPaginate, isMulti, isPaginated, makeDefaultOptions, markHookForSkip, mergeArrays, mergeQuery, onDelete, parseFields, pushSet, removeRelated, runPerItem, setData, setQueryKeySafely, setResultEmpty, shouldSkip, toJSON, validateQueryProperty };
+export { type ActionOnEmptyIntersect, type CreateRelatedOptions, type DebouncedFunctionApp, type DebouncedService, DebouncedStore, type DebouncedStoreOptions, type FirstLast, type GetItemsIsArrayFrom, type GetItemsIsArrayOptions, type GetItemsIsArrayResult, type GetService, type Handle, type HookForEachOptions, type HookRunPerItemOptions, type HookSetDataOptions, type InferCreateData, type InferCreateDataFromPath, type InferCreateDataSingle, type InferCreateDataSingleFromPath, type InferCreateResult, type InferCreateResultFromPath, type InferCreateResultSingle, type InferCreateResultSingleFromPath, type InferDataFromPath, type InferFindResult, type InferFindResultFromPath, type InferGetResult, type InferGetResultFromPath, type InferPatchData, type InferPatchDataFromPath, type InferPatchResult, type InferPatchResultFromPath, type InferRemoveResult, type InferRemoveResultFromPath, type InferResultFromPath, type InferUpdateData, type InferUpdateDataFromPath, type InferUpdateResult, type InferUpdateResultFromPath, type InitDebounceMixinOptions, type MergeQueryOptions, type OnDeleteAction, type OnDeleteOptions, type Predicate, type PredicateWithContext, type PushSetOptions, type RemoveRelatedOptions, type SetQueryKeySafelyOptions, type ShouldSkipOptions, checkMulti, createRelated, debounceMixin, filterArray, filterObject, filterQuery, forEach, getItemsIsArray, getPaginate, isMulti, isPaginated, makeDefaultOptions, markHookForSkip, mergeArrays, mergeQuery, onDelete, parseFields, pushSet, removeRelated, runPerItem, setData, setQueryKeySafely, setResultEmpty, shouldSkip, toJSON, validateQueryProperty };

package/dist/index.mjs

@@ -6,7 +6,6 @@ import _has from 'lodash/has.js';
 import _set from 'lodash/set.js';
 import _uniqWith from 'lodash/uniqWith.js';
 import { deepEqual } from 'fast-equals';
-import { filterQuery as filterQuery$1 } from '@feathersjs/adapter-commons';
 import _isEqual from 'lodash/isEqual.js';
 import { _ } from '@feathersjs/commons';
 import { checkContext } from 'feathers-hooks-common';
@@ -270,15 +269,6 @@ function makeDefaultOptions$1(options) {
   }
   return options;
 }
-function moveProperty(from, to, ...keys) {
-  keys.forEach((key) => {
-    if (!hasOwnProperty(from, key)) {
-      return;
-    }
-    to[key] = from[key];
-    delete from[key];
-  });
-}
 function getParentProp(target, path) {
   if (path.length <= 1) {
     return target;
@@ -348,59 +338,29 @@ function areQueriesOverlapping(target, source) {
   return false;
 }
 
-function filterQuery(query, _options) {
-  query = query || {};
-  _options = _options || {};
-  const { service, ...options } = _options;
-  if (service) {
-    const operators = options.operators ? options.operators : service.options?.operators;
-    const filters = options.filters ? options.filters : service.options?.filters;
-    const optionsForFilterQuery = {};
-    if (operators) {
-      optionsForFilterQuery.operators = operators;
-    }
-    if (filters) {
-      optionsForFilterQuery.filters = filters;
-    }
-    if (service && "filterQuery" in service && typeof service.filterQuery === "function") {
-      return service.filterQuery({ query }, optionsForFilterQuery);
-    } else {
-      return filterQuery$1(query, optionsForFilterQuery);
-    }
+function filterQuery(providedQuery) {
+  providedQuery ?? (providedQuery = {});
+  const { $select, $limit, $skip, $sort, ...query } = providedQuery;
+  const result = { query };
+  if ("$select" in providedQuery) {
+    result.$select = $select;
+  }
+  if ("$limit" in providedQuery) {
+    result.$limit = $limit;
+  }
+  if ("$skip" in providedQuery) {
+    result.$skip = $skip;
+  }
+  if ("$sort" in providedQuery) {
+    result.$sort = $sort;
   }
-  return filterQuery$1(query, options);
+  return result;
 }
 
 function mergeQuery(target, source, _options) {
   const options = makeDefaultOptions$1(_options);
-  const { filters: targetFilters, query: targetQuery } = filterQuery(target, {
-    operators: options.operators,
-    filters: options.filters,
-    service: options.service
-  });
-  moveProperty(targetFilters, targetQuery, "$or", "$and");
-  if ("$limit" in target) {
-    targetFilters.$limit = target.$limit;
-  }
-  let {
-    // eslint-disable-next-line prefer-const
-    filters: sourceFilters,
-    query: sourceQuery
-  } = filterQuery(source, {
-    operators: options.operators,
-    filters: options.filters,
-    service: options.service
-  });
-  moveProperty(sourceFilters, sourceQuery, "$or", "$and");
-  if (source.$limit) {
-    sourceFilters.$limit = source.$limit;
-  }
-  if (target && !hasOwnProperty(target, "$limit") && hasOwnProperty(targetFilters, "$limit")) {
-    delete targetFilters.$limit;
-  }
-  if (source && !hasOwnProperty(source, "$limit") && hasOwnProperty(sourceFilters, "$limit")) {
-    delete sourceFilters.$limit;
-  }
+  const { query: targetQuery, ...targetFilters } = filterQuery(target);
+  let { query: sourceQuery, ...sourceFilters } = filterQuery(source);
   handleArray(targetFilters, sourceFilters, ["$select"], options);
   delete sourceFilters["$select"];
   _merge(targetFilters, sourceFilters);
@@ -445,12 +405,14 @@ const getItemsIsArray = (context, options) => {
   let itemOrItems;
   if (from === "automatic") {
     itemOrItems = context.type === "before" ? context.data : context.result;
-    itemOrItems = itemOrItems && context.method === "find" ? itemOrItems.data || itemOrItems : itemOrItems;
   } else if (from === "data") {
     itemOrItems = context.data;
   } else if (from === "result") {
     itemOrItems = context.result;
   }
+  if ((from === "automatic" || from === "result") && context.type === "after") {
+    itemOrItems = itemOrItems && context.method === "find" ? itemOrItems.data || itemOrItems : itemOrItems;
+  }
   const isArray = Array.isArray(itemOrItems);
   return {
     items: isArray ? itemOrItems : itemOrItems != null ? [itemOrItems] : [],

package/package.json

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

package/src/utils/filterQuery.ts

@@ -1,45 +1,98 @@
-import { filterQuery as plainFilterQuery } from "@feathersjs/adapter-commons";
+import type { Query } from "@feathersjs/feathers";
 
-import type {
-  FilterQueryOptions as PlainFilterQueryOptions,
-  AdapterBase,
-} from "@feathersjs/adapter-commons";
+type FilterQueryResult<Q extends Query> = {
+  $select: Q["$select"] extends any ? Q["$select"] : never;
+  $limit: Q["$limit"] extends any ? Q["$limit"] : never;
+  $skip: Q["$skip"] extends any ? Q["$skip"] : never;
+  $sort: Q["$sort"] extends any ? Q["$sort"] : never;
+  query: Omit<Q, "$select" | "$limit" | "$skip" | "$sort">;
+};
 
-import type { Query } from "@feathersjs/feathers";
+/**
+ * Extracts $select, $limit, $skip, $sort from a query and returns the rest as a query object.
+ *
+ * @param providedQuery
+ * @returns
+ */
+export function filterQuery<Q extends Query>(
+  providedQuery?: Q,
+): FilterQueryResult<Q> {
+  providedQuery ??= {} as Q;
+  const { $select, $limit, $skip, $sort, ...query } = providedQuery;
 
-export interface FilterQueryOptions<T> {
-  service?: AdapterBase<T>;
-  operators?: PlainFilterQueryOptions["operators"];
-  filters?: PlainFilterQueryOptions["filters"];
-}
+  const result: FilterQueryResult<Q> = { query } as any;
+
+  if ("$select" in providedQuery) {
+    result.$select = $select;
+  }
+
+  if ("$limit" in providedQuery) {
+    result.$limit = $limit;
+  }
+
+  if ("$skip" in providedQuery) {
+    result.$skip = $skip;
+  }
 
-export function filterQuery<T>(query: Query, _options?: FilterQueryOptions<T>) {
-  query = query || {};
-  _options = _options || {};
-  const { service, ...options } = _options;
-  if (service) {
-    const operators = options.operators
-      ? options.operators
-      : service.options?.operators;
-    const filters = options.filters
-      ? options.filters
-      : service.options?.filters;
-    const optionsForFilterQuery: PlainFilterQueryOptions = {};
-    if (operators) {
-      optionsForFilterQuery.operators = operators;
-    }
-    if (filters) {
-      optionsForFilterQuery.filters = filters;
-    }
-    if (
-      service &&
-      "filterQuery" in service &&
-      typeof service.filterQuery === "function"
-    ) {
-      return service.filterQuery({ query }, optionsForFilterQuery);
-    } else {
-      return plainFilterQuery(query, optionsForFilterQuery);
-    }
+  if ("$sort" in providedQuery) {
+    result.$sort = $sort;
   }
-  return plainFilterQuery(query, options);
+
+  return result;
+}
+
+if (import.meta.vitest) {
+  const { it, expect } = import.meta.vitest;
+
+  it("should filter query", () => {
+    const query = {
+      $select: ["a"],
+      $limit: 10,
+      $skip: 10,
+      $sort: {
+        a: 1,
+      },
+      a: 1,
+      b: 2,
+    };
+
+    expect(filterQuery(query)).toEqual({
+      $select: ["a"],
+      $limit: 10,
+      $skip: 10,
+      $sort: {
+        a: 1,
+      },
+      query: {
+        a: 1,
+        b: 2,
+      },
+    });
+  });
+
+  it("should not include filters if not provided", () => {
+    const query = {
+      a: 1,
+      b: 2,
+    };
+
+    expect(filterQuery(query)).toEqual({
+      query: {
+        a: 1,
+        b: 2,
+      },
+    });
+  });
+
+  it("sets empty query object if empty object is provided", () => {
+    expect(filterQuery({})).toEqual({
+      query: {},
+    });
+  });
+
+  it("sets empty query object if undefined is provided", () => {
+    expect(filterQuery(undefined)).toEqual({
+      query: {},
+    });
+  });
 }

package/src/utils/getItemsIsArray.ts

@@ -1,7 +1,9 @@
 import type { HookContext } from "@feathersjs/feathers";
 
+export type GetItemsIsArrayFrom = "data" | "result" | "automatic";
+
 export type GetItemsIsArrayOptions = {
-  from: "data" | "result" | "automatic";
+  from?: GetItemsIsArrayFrom;
 };
 
 export interface GetItemsIsArrayResult<T = any> {
@@ -20,16 +22,19 @@ export const getItemsIsArray = <T = any, H extends HookContext = HookContext>(
 
   if (from === "automatic") {
     itemOrItems = context.type === "before" ? context.data : context.result;
-    itemOrItems =
-      itemOrItems && context.method === "find"
-        ? itemOrItems.data || itemOrItems
-        : itemOrItems;
   } else if (from === "data") {
     itemOrItems = context.data;
   } else if (from === "result") {
     itemOrItems = context.result;
   }
 
+  if ((from === "automatic" || from === "result") && context.type === "after") {
+    itemOrItems =
+      itemOrItems && context.method === "find"
+        ? itemOrItems.data || itemOrItems
+        : itemOrItems;
+  }
+
   const isArray = Array.isArray(itemOrItems);
   return {
     items: isArray ? itemOrItems : itemOrItems != null ? [itemOrItems] : [],

package/src/utils/mergeQuery/mergeQuery.ts

@@ -7,7 +7,6 @@ import {
   handleCircular,
   isQueryMoreExplicitThanQuery,
   makeDefaultOptions,
-  moveProperty,
 } from "./utils";
 import type { MergeQueryOptions } from "./types";
 import { filterQuery } from "../filterQuery";
@@ -20,58 +19,19 @@ import { hasOwnProperty } from "../internal.utils";
  * @param _options
  * @returns Query
  */
-export function mergeQuery<T = any>(
+export function mergeQuery(
   target: Query,
   source: Query,
-  _options?: Partial<MergeQueryOptions<T>>,
+  _options?: Partial<MergeQueryOptions>,
 ): Query {
   const options = makeDefaultOptions(_options);
-  const { filters: targetFilters, query: targetQuery } = filterQuery(target, {
-    operators: options.operators,
-    filters: options.filters,
-    service: options.service,
-  });
 
-  moveProperty(targetFilters, targetQuery, "$or", "$and");
+  const { query: targetQuery, ...targetFilters } = filterQuery(target);
 
-  if ("$limit" in target) {
-    targetFilters.$limit = target.$limit;
-  }
-
-  let {
-    // eslint-disable-next-line prefer-const
-    filters: sourceFilters,
-    query: sourceQuery,
-  } = filterQuery(source, {
-    operators: options.operators,
-    filters: options.filters,
-    service: options.service,
-  });
-
-  moveProperty(sourceFilters, sourceQuery, "$or", "$and");
-
-  if (source.$limit) {
-    sourceFilters.$limit = source.$limit;
-  }
+  // eslint-disable-next-line prefer-const
+  let { query: sourceQuery, ...sourceFilters } = filterQuery(source);
 
   //#region filters
-
-  if (
-    target &&
-    !hasOwnProperty(target, "$limit") &&
-    hasOwnProperty(targetFilters, "$limit")
-  ) {
-    delete targetFilters.$limit;
-  }
-
-  if (
-    source &&
-    !hasOwnProperty(source, "$limit") &&
-    hasOwnProperty(sourceFilters, "$limit")
-  ) {
-    delete sourceFilters.$limit;
-  }
-
   handleArray(targetFilters, sourceFilters, ["$select"], options);
   // remaining filters
   delete sourceFilters["$select"];

package/src/utils/mergeQuery/types.ts

@@ -1,5 +1,4 @@
 import type { Path } from "../../typesInternal";
-import type { FilterQueryOptions } from "../filterQuery";
 
 export type Handle =
   | "target"
@@ -15,7 +14,7 @@ export type ActionOnEmptyIntersect = (
   prependKey: Path,
 ) => void;
 
-export interface MergeQueryOptions<T> extends FilterQueryOptions<T> {
+export interface MergeQueryOptions {
   defaultHandle: Handle;
   actionOnEmptyIntersect: ActionOnEmptyIntersect;
   useLogicalConjunction: boolean;

package/src/utils/mergeQuery/utils.ts

@@ -12,11 +12,11 @@ import { deepEqual as _isEqual } from "fast-equals";
 import type { Query } from "@feathersjs/feathers";
 import { hasOwnProperty } from "../internal.utils";
 
-export function handleArray<T>(
+export function handleArray(
   target: Record<string, unknown>,
   source: Record<string, unknown>,
   key: Path,
-  options: MergeQueryOptions<T>,
+  options: MergeQueryOptions,
 ): void {
   const targetVal = _get(target, key);
   const sourceVal = _get(source, key);
@@ -38,11 +38,11 @@ export function handleArray<T>(
   _set(target, key, arr);
 }
 
-export function handleCircular<T>(
+export function handleCircular(
   target: Record<string, unknown>,
   source: Record<string, unknown>,
   prependKey: Path,
-  options: MergeQueryOptions<T>,
+  options: MergeQueryOptions,
 ): void {
   if (target?.$or) {
     target.$or = cleanOr(target.$or as Record<string, unknown>[]);
@@ -257,10 +257,10 @@ export function handleCircular<T>(
   }
 }
 
-export function makeDefaultOptions<T>(
-  options?: Partial<MergeQueryOptions<T>>,
-): MergeQueryOptions<T> {
-  options ??= {} as MergeQueryOptions<T>;
+export function makeDefaultOptions(
+  options?: Partial<MergeQueryOptions>,
+): MergeQueryOptions {
+  options ??= {} as MergeQueryOptions;
   options.defaultHandle ??= "combine";
   options.useLogicalConjunction ??= false;
   options.actionOnEmptyIntersect ??= () => {
@@ -270,7 +270,7 @@ export function makeDefaultOptions<T>(
   if (options.defaultHandle === "intersect") {
     options.handle.$select = options.handle.$select || "intersectOrFull";
   }
-  return options as MergeQueryOptions<T>;
+  return options as MergeQueryOptions;
 }
 
 export function moveProperty(