feathers-utils 2.0.0-9 → 2.1.0

package/dist/mixins/debounce-mixin/DebouncedStore.js

@@ -1,65 +0,0 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.DebouncedStore = exports.makeDefaultOptions = void 0;
-const debounce_js_1 = __importDefault(require("lodash/debounce.js"));
-const makeDefaultOptions = () => {
-    return {
-        leading: false,
-        maxWait: undefined,
-        trailing: true,
-        wait: 100,
-    };
-};
-exports.makeDefaultOptions = makeDefaultOptions;
-class DebouncedStore {
-    constructor(app, options) {
-        this._app = app;
-        this._options = Object.assign((0, exports.makeDefaultOptions)(), options);
-        this._queueById = {};
-        this._isRunningById = {};
-        //this._waitingById = {};
-        this.add = this.debounceById(this.unbounced, this._options.wait, {
-            leading: this._options.leading,
-            maxWait: this._options.maxWait,
-            trailing: this._options.trailing,
-        });
-    }
-    unbounced(id, action) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (this._queueById[id] === undefined) {
-                return;
-            }
-            delete this._queueById[id];
-            this._isRunningById[id] = true;
-            yield action(this._app);
-            delete this._isRunningById[id];
-        });
-    }
-    debounceById(func, wait, options) {
-        return (id, action) => {
-            if (typeof this._queueById[id] === "function") {
-                return this._queueById[id](id, action);
-            }
-            this._queueById[id] = (0, debounce_js_1.default)((id, action) => {
-                this.unbounced(id, action);
-            }, wait, Object.assign(Object.assign({}, options), { leading: false })); // leading required for return promise
-            return this._queueById[id](id, action);
-        };
-    }
-    cancel(id) {
-        delete this._queueById[id];
-    }
-}
-exports.DebouncedStore = DebouncedStore;

package/dist/mixins/debounce-mixin/debounceMixin.d.ts

@@ -1,3 +0,0 @@
-import type { Application } from "@feathersjs/feathers/lib";
-import type { InitDebounceMixinOptions } from "./types";
-export declare function debounceMixin(options?: Partial<InitDebounceMixinOptions>): (app: Application) => void;

package/dist/mixins/debounce-mixin/debounceMixin.js

@@ -1,23 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.debounceMixin = void 0;
-const DebouncedStore_1 = require("./DebouncedStore");
-function debounceMixin(options) {
-    return (app) => {
-        options = options || {};
-        const defaultOptions = Object.assign((0, DebouncedStore_1.makeDefaultOptions)(), options === null || options === void 0 ? void 0 : options.default);
-        app.mixins.push((service, path) => {
-            // if path is on blacklist, don't add debouncedStore to service
-            if ((options === null || options === void 0 ? void 0 : options.blacklist) && options.blacklist.includes(path))
-                return;
-            // if service already has registered something on `debouncedStore`
-            if (service.debouncedStore) {
-                console.warn(`[feathers-utils] service: '${path}' already has a property 'debouncedStore'. Mixin will skip creating a new debouncedStore`);
-                return;
-            }
-            const serviceOptions = Object.assign({}, defaultOptions, options === null || options === void 0 ? void 0 : options[path]);
-            service.debouncedStore = new DebouncedStore_1.DebouncedStore(app, serviceOptions);
-        });
-    };
-}
-exports.debounceMixin = debounceMixin;

package/dist/mixins/debounce-mixin/index.d.ts

@@ -1,3 +0,0 @@
-export * from "./types";
-export * from "./DebouncedStore";
-export * from "./debounceMixin";

package/dist/mixins/debounce-mixin/index.js

@@ -1,19 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./types"), exports);
-__exportStar(require("./DebouncedStore"), exports);
-__exportStar(require("./debounceMixin"), exports);

package/dist/mixins/debounce-mixin/types.d.ts

@@ -1,13 +0,0 @@
-import type { Application } from "@feathersjs/feathers";
-export interface InitDebounceMixinOptions {
-    default: Partial<DebouncedStoreOptions>;
-    blacklist: string[];
-    [key: string]: unknown;
-}
-export type DebouncedFunctionApp = (app?: Application) => void | Promise<void>;
-export interface DebouncedStoreOptions {
-    leading: boolean;
-    maxWait: number | undefined;
-    trailing: boolean;
-    wait: number;
-}

package/dist/mixins/debounce-mixin/types.js

@@ -1,2 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });

package/dist/mixins/index.d.ts

@@ -1 +0,0 @@
-export * from "./debounce-mixin";

package/dist/mixins/index.js

@@ -1,17 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./debounce-mixin"), exports);

package/dist/types.d.ts

@@ -1,3 +0,0 @@
-import type { HookContext } from "@feathersjs/feathers";
-export type Predicate<T = any> = (item: T) => boolean;
-export type PredicateWithContext<T = any> = (item: T, context: HookContext) => boolean;

package/dist/types.js

@@ -1,2 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });

package/dist/typesInternal.d.ts

@@ -1,3 +0,0 @@
-export type MaybeArray<T> = T | T[];
-export type Promisable<T> = T | Promise<T>;
-export type Path = Array<string | number>;

package/dist/typesInternal.js

@@ -1,4 +0,0 @@
-"use strict";
-// here are types that are not meant to be exported!
-// just for internal use of this package
-Object.defineProperty(exports, "__esModule", { value: true });

package/dist/utils/filterQuery.d.ts

@@ -1,8 +0,0 @@
-import type { FilterQueryOptions as PlainFilterQueryOptions, AdapterBase } from "@feathersjs/adapter-commons";
-import type { Query } from "@feathersjs/feathers";
-export interface FilterQueryOptions<T> {
-    service?: AdapterBase<T>;
-    operators?: PlainFilterQueryOptions["operators"];
-    filters?: PlainFilterQueryOptions["filters"];
-}
-export declare function filterQuery<T>(query: Query, _options?: FilterQueryOptions<T>): any;

package/dist/utils/filterQuery.js

@@ -1,46 +0,0 @@
-"use strict";
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.filterQuery = void 0;
-const adapter_commons_1 = require("@feathersjs/adapter-commons");
-function filterQuery(query, _options) {
-    var _a, _b;
-    query = query || {};
-    _options = _options || {};
-    const { service } = _options, options = __rest(_options, ["service"]);
-    if (service) {
-        const operators = options.operators
-            ? options.operators
-            : (_a = service.options) === null || _a === void 0 ? void 0 : _a.operators;
-        const filters = options.filters
-            ? options.filters
-            : (_b = service.options) === null || _b === void 0 ? void 0 : _b.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 (0, adapter_commons_1.filterQuery)(query, optionsForFilterQuery);
-        }
-    }
-    return (0, adapter_commons_1.filterQuery)(query, options);
-}
-exports.filterQuery = filterQuery;

package/dist/utils/getItemsIsArray.d.ts

@@ -1,10 +0,0 @@
-import type { HookContext } from "@feathersjs/feathers";
-export interface GetItemsIsArrayResult<T = any> {
-    items: T[];
-    isArray: boolean;
-}
-/**
- * util to get items from context, return it as an array, no matter if it is an array or not
- * uses `context.result` if existent. uses `context.data` otherwise
- */
-export declare const getItemsIsArray: <T = any, H extends HookContext<import("@feathersjs/feathers").Application<any, any>, any> = HookContext<import("@feathersjs/feathers").Application<any, any>, any>>(context: H) => GetItemsIsArrayResult<T>;

package/dist/utils/getItemsIsArray.js

@@ -1,20 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getItemsIsArray = void 0;
-/**
- * util to get items from context, return it as an array, no matter if it is an array or not
- * uses `context.result` if existent. uses `context.data` otherwise
- */
-const getItemsIsArray = (context) => {
-    let itemOrItems = context.result !== undefined ? context.result : context.data;
-    itemOrItems =
-        itemOrItems && context.method === "find"
-            ? itemOrItems.data || itemOrItems
-            : itemOrItems;
-    const isArray = Array.isArray(itemOrItems);
-    return {
-        items: isArray ? itemOrItems : itemOrItems != null ? [itemOrItems] : [],
-        isArray,
-    };
-};
-exports.getItemsIsArray = getItemsIsArray;

package/dist/utils/getPaginate.d.ts

@@ -1,9 +0,0 @@
-import type { PaginationOptions } from "@feathersjs/adapter-commons";
-import type { HookContext } from "@feathersjs/feathers";
-/**
- * util to get paginate options from context
- * 1. it uses `context.params.paginate` if it exists
- * 2. it uses `service.options.paginate` if it exists
- * 3. it uses `context.params.adapter` if it exists
- */
-export declare const getPaginate: <H extends HookContext<import("@feathersjs/feathers").Application<any, any>, any> = HookContext<import("@feathersjs/feathers").Application<any, any>, any>>(context: H) => PaginationOptions | undefined;

package/dist/utils/getPaginate.js

@@ -1,22 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getPaginate = void 0;
-/**
- * util to get paginate options from context
- * 1. it uses `context.params.paginate` if it exists
- * 2. it uses `service.options.paginate` if it exists
- * 3. it uses `context.params.adapter` if it exists
- */
-const getPaginate = (context) => {
-    var _a;
-    if (Object.prototype.hasOwnProperty.call(context.params, "paginate")) {
-        return context.params.paginate || undefined;
-    }
-    if (context.params.paginate === false) {
-        return undefined;
-    }
-    let options = ((_a = context.service) === null || _a === void 0 ? void 0 : _a.options) || {};
-    options = Object.assign(Object.assign({}, options), context.params.adapter);
-    return options.paginate || undefined;
-};
-exports.getPaginate = getPaginate;

package/dist/utils/index.d.ts

@@ -1,11 +0,0 @@
-export * from "./mergeQuery";
-export * from "./filterQuery";
-export * from "./getItemsIsArray";
-export * from "./getPaginate";
-export * from "./isMulti";
-export * from "./isPaginated";
-export * from "./markHookForSkip";
-export * from "./pushSet";
-export * from "./setResultEmpty";
-export * from "./shouldSkip";
-export * from "./validateQueryProperty";

package/dist/utils/index.js

@@ -1,27 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./mergeQuery"), exports);
-__exportStar(require("./filterQuery"), exports);
-__exportStar(require("./getItemsIsArray"), exports);
-__exportStar(require("./getPaginate"), exports);
-__exportStar(require("./isMulti"), exports);
-__exportStar(require("./isPaginated"), exports);
-__exportStar(require("./markHookForSkip"), exports);
-__exportStar(require("./pushSet"), exports);
-__exportStar(require("./setResultEmpty"), exports);
-__exportStar(require("./shouldSkip"), exports);
-__exportStar(require("./validateQueryProperty"), exports);

package/dist/utils/isMulti.d.ts

@@ -1,11 +0,0 @@
-import type { HookContext } from "@feathersjs/feathers";
-/**
- * util to check if a hook is a multi hook:
- * - find: true
- * - get: false
- * - create: `context.data` is an array
- * - update: false
- * - patch: `context.id == null`
- * - remove: `context.id == null`
- */
-export declare const isMulti: <H extends HookContext<import("@feathersjs/feathers").Application<any, any>, any> = HookContext<import("@feathersjs/feathers").Application<any, any>, any>>(context: H) => boolean;

package/dist/utils/isMulti.js

@@ -1,30 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.isMulti = void 0;
-/**
- * util to check if a hook is a multi hook:
- * - find: true
- * - get: false
- * - create: `context.data` is an array
- * - update: false
- * - patch: `context.id == null`
- * - remove: `context.id == null`
- */
-const isMulti = (context) => {
-    const { method } = context;
-    if (method === "find") {
-        return true;
-    }
-    else if (["patch", "remove"].includes(method)) {
-        return context.id == null;
-    }
-    else if (method === "create") {
-        const items = context.type === "before" ? context.data : context.result;
-        return Array.isArray(items);
-    }
-    else if (["get", "update"].includes(method)) {
-        return false;
-    }
-    return false;
-};
-exports.isMulti = isMulti;

package/dist/utils/isPaginated.d.ts

@@ -1,5 +0,0 @@
-import type { HookContext } from "@feathersjs/feathers";
-/**
- * util to check if a hook is a paginated hook using `getPaginate`
- */
-export declare const isPaginated: <H extends HookContext<import("@feathersjs/feathers").Application<any, any>, any> = HookContext<import("@feathersjs/feathers").Application<any, any>, any>>(context: H) => boolean;

package/dist/utils/isPaginated.js

@@ -1,15 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.isPaginated = void 0;
-const getPaginate_1 = require("./getPaginate");
-/**
- * util to check if a hook is a paginated hook using `getPaginate`
- */
-const isPaginated = (context) => {
-    if (context.params.paginate === false || context.method !== "find") {
-        return false;
-    }
-    const paginate = (0, getPaginate_1.getPaginate)(context);
-    return !!paginate;
-};
-exports.isPaginated = isPaginated;

package/dist/utils/markHookForSkip.d.ts

@@ -1,7 +0,0 @@
-import type { HookContext } from "@feathersjs/feathers";
-import type { HookType } from "feathers-hooks-common";
-import type { MaybeArray } from "../typesInternal";
-/**
- * util to mark a hook for skip, has to be used with `shouldSkip`
- */
-export declare function markHookForSkip<H extends HookContext = HookContext>(hookName: string, type: "all" | MaybeArray<HookType>, context?: H): H | undefined;

package/dist/utils/markHookForSkip.js

@@ -1,22 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.markHookForSkip = void 0;
-const pushSet_1 = require("./pushSet");
-/**
- * util to mark a hook for skip, has to be used with `shouldSkip`
- */
-function markHookForSkip(hookName, type, context) {
-    // @ts-expect-error context is not of type 'H'
-    context = context || {};
-    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-    const params = context.params || {};
-    const types = Array.isArray(type) ? type : [type];
-    types.forEach((t) => {
-        const combinedName = t === "all" ? hookName : `${type}:${hookName}`;
-        (0, pushSet_1.pushSet)(params, ["skipHooks"], combinedName, { unique: true });
-    });
-    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-    context.params = params;
-    return context;
-}
-exports.markHookForSkip = markHookForSkip;

package/dist/utils/mergeQuery/index.d.ts

@@ -1,3 +0,0 @@
-export * from "./mergeArrays";
-export * from "./mergeQuery";
-export * from "./types";

package/dist/utils/mergeQuery/index.js

@@ -1,19 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./mergeArrays"), exports);
-__exportStar(require("./mergeQuery"), exports);
-__exportStar(require("./types"), exports);

package/dist/utils/mergeQuery/mergeArrays.d.ts

@@ -1,3 +0,0 @@
-import type { Path } from "../../typesInternal";
-import type { Handle, ActionOnEmptyIntersect } from "./types";
-export declare function mergeArrays<T>(targetArr: T[], sourceArr: T[], handle: Handle, prependKey?: Path, actionOnEmptyIntersect?: ActionOnEmptyIntersect): T[] | undefined;

package/dist/utils/mergeQuery/mergeArrays.js

@@ -1,41 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.mergeArrays = void 0;
-function mergeArrays(targetArr, sourceArr, handle, prependKey, actionOnEmptyIntersect) {
-    if (!sourceArr && !targetArr) {
-        return;
-    }
-    if (handle === "target") {
-        return targetArr;
-    }
-    else if (handle === "source") {
-        return sourceArr;
-    }
-    else if (handle === "combine") {
-        if (!sourceArr || !Array.isArray(sourceArr)) {
-            return targetArr;
-        }
-        if (!targetArr || !Array.isArray(targetArr)) {
-            return sourceArr;
-        }
-        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") {
-            if (actionOnEmptyIntersect) {
-                actionOnEmptyIntersect(targetArr, sourceArr, prependKey || []);
-            }
-            return;
-        }
-        if (handle === "intersectOrFull") {
-            const val = !targetIsArray ? targetArr : sourceArr;
-            return val;
-        }
-        return targetArr.filter((val) => sourceArr.includes(val));
-    }
-    return undefined;
-}
-exports.mergeArrays = mergeArrays;

package/dist/utils/mergeQuery/mergeQuery.d.ts

@@ -1,3 +0,0 @@
-import type { Query } from "@feathersjs/feathers";
-import type { MergeQueryOptions } from "./types";
-export declare function mergeQuery<T>(target: Query, source: Query, options?: Partial<MergeQueryOptions<T>>): Query;

package/dist/utils/mergeQuery/mergeQuery.js

@@ -1,77 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.mergeQuery = void 0;
-const merge_js_1 = __importDefault(require("lodash/merge.js"));
-const isEmpty_js_1 = __importDefault(require("lodash/isEmpty.js"));
-const utils_1 = require("./utils");
-const filterQuery_1 = require("../filterQuery");
-function mergeQuery(target, source, options) {
-    const fullOptions = (0, utils_1.makeDefaultOptions)(options);
-    const { filters: targetFilters, query: targetQuery } = (0, filterQuery_1.filterQuery)(target, {
-        operators: fullOptions.operators,
-        filters: fullOptions.filters,
-        service: fullOptions.service,
-    });
-    (0, utils_1.moveProperty)(targetFilters, targetQuery, "$or");
-    (0, utils_1.moveProperty)(targetFilters, targetQuery, "$and");
-    if (target.$limit) {
-        targetFilters.$limit = target.$limit;
-    }
-    let { 
-    // eslint-disable-next-line prefer-const
-    filters: sourceFilters, query: sourceQuery, } = (0, filterQuery_1.filterQuery)(source, {
-        operators: fullOptions.operators,
-        filters: fullOptions.filters,
-        service: fullOptions.service,
-    });
-    (0, utils_1.moveProperty)(sourceFilters, sourceQuery, "$or");
-    (0, utils_1.moveProperty)(sourceFilters, sourceQuery, "$and");
-    if (source.$limit) {
-        sourceFilters.$limit = source.$limit;
-    }
-    //#region filters
-    if (target &&
-        !Object.prototype.hasOwnProperty.call(target, "$limit") &&
-        Object.prototype.hasOwnProperty.call(targetFilters, "$limit")) {
-        delete targetFilters.$limit;
-    }
-    if (source &&
-        !Object.prototype.hasOwnProperty.call(source, "$limit") &&
-        Object.prototype.hasOwnProperty.call(sourceFilters, "$limit")) {
-        delete sourceFilters.$limit;
-    }
-    (0, utils_1.handleArray)(targetFilters, sourceFilters, ["$select"], fullOptions);
-    // remaining filters
-    delete sourceFilters["$select"];
-    (0, merge_js_1.default)(targetFilters, sourceFilters);
-    //#endregion
-    //#region '$or' / '$and'
-    if ((options === null || options === void 0 ? void 0 : options.useLogicalConjunction) &&
-        (options.defaultHandle === "combine" ||
-            options.defaultHandle === "intersect") &&
-        !(0, isEmpty_js_1.default)(targetQuery)) {
-        const logicalOp = options.defaultHandle === "combine" ? "$or" : "$and";
-        if (Object.prototype.hasOwnProperty.call(sourceQuery, logicalOp)) {
-            // omit '$or'/'$and' and put all other props into '$or'/'$and'
-            const andOr = sourceQuery[logicalOp];
-            delete sourceQuery[logicalOp];
-            andOr.push(sourceQuery);
-            sourceQuery = { [logicalOp]: andOr };
-        }
-        else {
-            sourceQuery = { [logicalOp]: [sourceQuery] };
-        }
-    }
-    //#endregion
-    const keys = Object.keys(sourceQuery);
-    for (let i = 0, n = keys.length; i < n; i++) {
-        const key = keys[i];
-        (0, utils_1.handleCircular)(targetQuery, sourceQuery, [key], fullOptions);
-    }
-    const result = Object.assign({}, targetFilters, targetQuery);
-    return result;
-}
-exports.mergeQuery = mergeQuery;

package/dist/utils/mergeQuery/types.d.ts

@@ -1,13 +0,0 @@
-import type { Path } from "../../typesInternal";
-import type { FilterQueryOptions } from "../filterQuery";
-export type Handle = "target" | "source" | "combine" | "intersect" | "intersectOrFull";
-export type FirstLast = "first" | "last";
-export type ActionOnEmptyIntersect = (target: unknown, source: unknown, prependKey: Path) => void;
-export interface MergeQueryOptions<T> extends FilterQueryOptions<T> {
-    defaultHandle: Handle;
-    actionOnEmptyIntersect: ActionOnEmptyIntersect;
-    useLogicalConjunction: boolean;
-    handle?: {
-        [key: string]: Handle;
-    };
-}

package/dist/utils/mergeQuery/types.js

@@ -1,2 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });

package/dist/utils/mergeQuery/utils.d.ts

@@ -1,11 +0,0 @@
-import type { Path } from "../../typesInternal";
-import type { MergeQueryOptions } from "./types";
-export declare const hasOwnProperty: (obj: Record<string, unknown>, key: string) => boolean;
-export declare function handleArray<T>(target: Record<string, unknown>, source: Record<string, unknown>, key: Path, options: MergeQueryOptions<T>): void;
-export declare function handleCircular<T>(target: Record<string, unknown>, source: Record<string, unknown>, prependKey: Path, options: MergeQueryOptions<T>): void;
-export declare function makeDefaultOptions<T>(options?: Partial<MergeQueryOptions<T>>): MergeQueryOptions<T>;
-export declare function moveProperty(source: Record<string, any>, target: Record<string, any>, key: string): void;
-export declare function getParentProp(target: Record<string, unknown>, path: Path): any;
-export declare function cleanOr(target: Record<string, unknown>[]): Record<string, unknown>[] | undefined;
-export declare function cleanAnd(target: Record<string, unknown>[]): Record<string, unknown>[] | undefined;
-export declare function arrayWithoutDuplicates<T>(target: T[]): T[];