@feathersjs/adapter-commons 5.0.0-pre.9 → 5.0.1

package/lib/service.js

@@ -1,38 +1,28 @@
 "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());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AdapterService = void 0;
-const errors_1 = require("@feathersjs/errors");
-const filter_query_1 = require("./filter-query");
-const callMethod = (self, name, ...args) => {
-    if (typeof self[name] !== 'function') {
-        return Promise.reject(new errors_1.NotImplemented(`Method ${name} not available`));
-    }
-    return self[name](...args);
-};
+exports.AdapterBase = exports.VALIDATED = void 0;
+const query_1 = require("./query");
+exports.VALIDATED = Symbol.for('@feathersjs/adapter/sanitized');
 const alwaysMulti = {
     find: true,
     get: false,
     update: false
 };
-class AdapterService {
+/**
+ * An abstract base class that a database adapter can extend from to implement the
+ * `__find`, `__get`, `__update`, `__patch` and `__remove` methods.
+ */
+class AdapterBase {
     constructor(options) {
-        this.options = Object.assign({
+        this.options = {
             id: 'id',
             events: [],
-            paginate: {},
+            paginate: false,
             multi: false,
-            filters: [],
-            allow: []
-        }, options);
+            filters: {},
+            operators: [],
+            ...options
+        };
     }
     get id() {
         return this.options.id;
@@ -40,66 +30,59 @@ class AdapterService {
     get events() {
         return this.options.events;
     }
-    filterQuery(params = {}, opts = {}) {
-        const paginate = typeof params.paginate !== 'undefined'
-            ? params.paginate
-            : this.getOptions(params).paginate;
-        const { query = {} } = params;
-        const options = Object.assign({
-            operators: this.options.whitelist || this.options.allow || [],
-            filters: this.options.filters,
-            paginate
-        }, opts);
-        const result = filter_query_1.filterQuery(query, options);
-        return Object.assign(result, { paginate });
-    }
+    /**
+     * Check if this adapter allows multiple updates for a method.
+     * @param method The method name to check.
+     * @param params The service call params.
+     * @returns Wether or not multiple updates are allowed.
+     */
     allowsMulti(method, params = {}) {
         const always = alwaysMulti[method];
         if (typeof always !== 'undefined') {
             return always;
         }
-        const { multi: option } = this.getOptions(params);
-        if (option === true || option === false) {
-            return option;
+        const { multi } = this.getOptions(params);
+        if (multi === true || !multi) {
+            return multi;
         }
-        return option.includes(method);
+        return multi.includes(method);
     }
+    /**
+     * Returns the combined options for a service call. Options will be merged
+     * with `this.options` and `params.adapter` for dynamic overrides.
+     *
+     * @param params The parameters for the service method call
+     * @returns The actual options for this call
+     */
     getOptions(params) {
-        return Object.assign(Object.assign({}, this.options), params.adapter);
+        const paginate = params.paginate !== undefined ? params.paginate : this.options.paginate;
+        return {
+            ...this.options,
+            paginate,
+            ...params.adapter
+        };
     }
-    find(params) {
-        return callMethod(this, '_find', params);
-    }
-    get(id, params) {
-        return callMethod(this, '_get', id, params);
-    }
-    create(data, params) {
-        if (Array.isArray(data) && !this.allowsMulti('create', params)) {
-            return Promise.reject(new errors_1.MethodNotAllowed('Can not create multiple entries'));
+    /**
+     * Returns a sanitized version of `params.query`, converting filter values
+     * (like $limit and $skip) into the expected type. Will throw an error if
+     * a `$` prefixed filter or operator value that is not allowed in `filters`
+     * or `operators` is encountered.
+     *
+     * @param params The service call parameter.
+     * @returns A new object containing the sanitized query.
+     */
+    async sanitizeQuery(params = {}) {
+        // We don't need legacy query sanitisation if the query has been validated by a schema already
+        if (params.query && params.query[exports.VALIDATED]) {
+            return params.query || {};
         }
-        return callMethod(this, '_create', data, params);
-    }
-    update(id, data, params) {
-        if (id === null || Array.isArray(data)) {
-            return Promise.reject(new errors_1.BadRequest('You can not replace multiple instances. Did you mean \'patch\'?'));
-        }
-        return callMethod(this, '_update', id, data, params);
-    }
-    patch(id, data, params) {
-        if (id === null && !this.allowsMulti('patch', params)) {
-            return Promise.reject(new errors_1.MethodNotAllowed('Can not patch multiple entries'));
-        }
-        return callMethod(this, '_patch', id, data, params);
-    }
-    remove(id, params) {
-        if (id === null && !this.allowsMulti('remove', params)) {
-            return Promise.reject(new errors_1.MethodNotAllowed('Can not remove multiple entries'));
-        }
-        return callMethod(this, '_remove', id, params);
-    }
-    setup() {
-        return __awaiter(this, void 0, void 0, function* () { });
+        const options = this.getOptions(params);
+        const { query, filters } = (0, query_1.filterQuery)(params.query, options);
+        return {
+            ...filters,
+            ...query
+        };
     }
 }
-exports.AdapterService = AdapterService;
+exports.AdapterBase = AdapterBase;
 //# sourceMappingURL=service.js.map

package/lib/service.js.map

@@ -1 +1 @@
-{"version":3,"file":"service.js","sourceRoot":"","sources":["../src/service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"service.js","sourceRoot":"","sources":["../src/service.ts"],"names":[],"mappings":";;;AAOA,mCAAqC;AAExB,QAAA,SAAS,GAAG,MAAM,CAAC,GAAG,CAAC,+BAA+B,CAAC,CAAA;AAEpE,MAAM,WAAW,GAA+B;IAC9C,IAAI,EAAE,IAAI;IACV,GAAG,EAAE,KAAK;IACV,MAAM,EAAE,KAAK;CACd,CAAA;AAED;;;GAGG;AACH,MAAsB,WAAW;IAW/B,YAAY,OAAgB;QAC1B,IAAI,CAAC,OAAO,GAAG;YACb,EAAE,EAAE,IAAI;YACR,MAAM,EAAE,EAAE;YACV,QAAQ,EAAE,KAAK;YACf,KAAK,EAAE,KAAK;YACZ,OAAO,EAAE,EAAE;YACX,SAAS,EAAE,EAAE;YACb,GAAG,OAAO;SACX,CAAA;IACH,CAAC;IAED,IAAI,EAAE;QACJ,OAAO,IAAI,CAAC,OAAO,CAAC,EAAE,CAAA;IACxB,CAAC;IAED,IAAI,MAAM;QACR,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,CAAA;IAC5B,CAAC;IAED;;;;;OAKG;IACH,WAAW,CAAC,MAAc,EAAE,SAAwB,EAAmB;QACrE,MAAM,MAAM,GAAG,WAAW,CAAC,MAAM,CAAC,CAAA;QAElC,IAAI,OAAO,MAAM,KAAK,WAAW,EAAE;YACjC,OAAO,MAAM,CAAA;SACd;QAED,MAAM,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAA;QAEzC,IAAI,KAAK,KAAK,IAAI,IAAI,CAAC,KAAK,EAAE;YAC5B,OAAO,KAAK,CAAA;SACb;QAED,OAAO,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAA;IAC/B,CAAC;IAED;;;;;;OAMG;IACH,UAAU,CAAC,MAAqB;QAC9B,MAAM,QAAQ,GAAG,MAAM,CAAC,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAA;QAExF,OAAO;YACL,GAAG,IAAI,CAAC,OAAO;YACf,QAAQ;YACR,GAAG,MAAM,CAAC,OAAO;SAClB,CAAA;IACH,CAAC;IAED;;;;;;;;OAQG;IACH,KAAK,CAAC,aAAa,CAAC,SAAwB,EAAmB;QAC7D,8FAA8F;QAC9F,IAAI,MAAM,CAAC,KAAK,IAAK,MAAM,CAAC,KAAa,CAAC,iBAAS,CAAC,EAAE;YACpD,OAAO,MAAM,CAAC,KAAK,IAAI,EAAE,CAAA;SAC1B;QAED,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAA;QACvC,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,IAAA,mBAAW,EAAC,MAAM,CAAC,KAAK,EAAE,OAAO,CAAC,CAAA;QAE7D,OAAO;YACL,GAAG,OAAO;YACV,GAAG,KAAK;SACT,CAAA;IACH,CAAC;CA0EF;AAtKD,kCAsKC"}

package/lib/sort.d.ts

@@ -1,4 +1,6 @@
 export declare function compareNSB(a: any, b: any): 1 | -1 | 0;
-export declare function compareArrays(a: any, b: any): any;
-export declare function compare(a: any, b: any, compareStrings?: any): any;
-export declare function sorter($sort: any): (a: any, b: any) => number;
+export declare function compareArrays(a: any[], b: any[]): 1 | -1 | 0;
+export declare function compare(a: any, b: any, compareStrings?: any): 0 | 1 | -1;
+export declare function sorter($sort: {
+    [key: string]: -1 | 1;
+}): (a: any, b: any) => number;

package/lib/sort.js

@@ -14,77 +14,76 @@ function compareNSB(a, b) {
 }
 exports.compareNSB = compareNSB;
 function compareArrays(a, b) {
-    let i;
-    let comp;
-    for (i = 0; i < Math.min(a.length, b.length); i += 1) {
-        comp = exports.compare(a[i], b[i]);
-        if (comp !== 0) {
-            return comp;
+    for (let i = 0, l = Math.min(a.length, b.length); i < l; i++) {
+        const comparison = compare(a[i], b[i]);
+        if (comparison !== 0) {
+            return comparison;
         }
     }
     // Common section was identical, longest one wins
-    return exports.compareNSB(a.length, b.length);
+    return compareNSB(a.length, b.length);
 }
 exports.compareArrays = compareArrays;
-function compare(a, b, compareStrings = exports.compareNSB) {
-    const { compareNSB, compare, compareArrays } = exports;
+function compare(a, b, compareStrings = compareNSB) {
+    if (a === b) {
+        return 0;
+    }
     // undefined
     if (a === undefined) {
-        return b === undefined ? 0 : -1;
+        return -1;
     }
     if (b === undefined) {
-        return a === undefined ? 0 : 1;
+        return 1;
     }
     // null
     if (a === null) {
-        return b === null ? 0 : -1;
+        return -1;
     }
     if (b === null) {
-        return a === null ? 0 : 1;
+        return 1;
     }
     // Numbers
     if (typeof a === 'number') {
         return typeof b === 'number' ? compareNSB(a, b) : -1;
     }
     if (typeof b === 'number') {
-        return typeof a === 'number' ? compareNSB(a, b) : 1;
+        return 1;
     }
     // Strings
     if (typeof a === 'string') {
         return typeof b === 'string' ? compareStrings(a, b) : -1;
     }
     if (typeof b === 'string') {
-        return typeof a === 'string' ? compareStrings(a, b) : 1;
+        return 1;
     }
     // Booleans
     if (typeof a === 'boolean') {
         return typeof b === 'boolean' ? compareNSB(a, b) : -1;
     }
     if (typeof b === 'boolean') {
-        return typeof a === 'boolean' ? compareNSB(a, b) : 1;
+        return 1;
     }
     // Dates
     if (a instanceof Date) {
         return b instanceof Date ? compareNSB(a.getTime(), b.getTime()) : -1;
     }
     if (b instanceof Date) {
-        return a instanceof Date ? compareNSB(a.getTime(), b.getTime()) : 1;
+        return 1;
     }
     // Arrays (first element is most significant and so on)
     if (Array.isArray(a)) {
         return Array.isArray(b) ? compareArrays(a, b) : -1;
     }
     if (Array.isArray(b)) {
-        return Array.isArray(a) ? compareArrays(a, b) : 1;
+        return 1;
     }
     // Objects
     const aKeys = Object.keys(a).sort();
     const bKeys = Object.keys(b).sort();
-    let comp = 0;
-    for (let i = 0; i < Math.min(aKeys.length, bKeys.length); i += 1) {
-        comp = compare(a[aKeys[i]], b[bKeys[i]]);
-        if (comp !== 0) {
-            return comp;
+    for (let i = 0, l = Math.min(aKeys.length, bKeys.length); i < l; i++) {
+        const comparison = compare(a[aKeys[i]], b[bKeys[i]]);
+        if (comparison !== 0) {
+            return comparison;
         }
     }
     return compareNSB(aKeys.length, bKeys.length);
@@ -93,33 +92,22 @@ exports.compare = compare;
 // An in-memory sorting function according to the
 // $sort special query parameter
 function sorter($sort) {
-    let sortLevels = false; // True if $sort has tags with '.' i.e. '{a: 1, b: -1, "c.x.z": 1}'
-    const getVal = (a, sortKeys) => {
-        let keys = sortKeys.map(key => key);
-        let val = a;
-        do {
-            let key = keys.shift();
-            val = val[key];
-        } while (keys.length);
-        return val;
-    };
-    const criteria = Object.keys($sort).map(key => {
+    const get = (value, path) => path.reduce((value, key) => value[key], value);
+    const compares = Object.keys($sort).map((key) => {
         const direction = $sort[key];
-        const keys = key.split('.');
-        sortLevels = keys.length > 1;
-        return { keys, direction };
+        const path = key.split('.');
+        if (path.length === 1) {
+            return (a, b) => direction * compare(a[key], b[key]);
+        }
+        else {
+            return (a, b) => direction * compare(get(a, path), get(b, path));
+        }
     });
     return function (a, b) {
-        let compare;
-        for (const criterion of criteria) {
-            if (sortLevels) {
-                compare = criterion.direction * exports.compare(getVal(a, criterion.keys), getVal(b, criterion.keys));
-            }
-            else {
-                compare = criterion.direction * exports.compare(a[criterion.keys[0]], b[criterion.keys[0]]);
-            }
-            if (compare !== 0) {
-                return compare;
+        for (const compare of compares) {
+            const comparasion = compare(a, b);
+            if (comparasion !== 0) {
+                return comparasion;
             }
         }
         return 0;

package/lib/sort.js.map

@@ -1 +1 @@
-{"version":3,"file":"sort.js","sourceRoot":"","sources":["../src/sort.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"sort.js","sourceRoot":"","sources":["../src/sort.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@feathersjs/adapter-commons",
-  "version": "5.0.0-pre.9",
+  "version": "5.0.1",
   "description": "Shared database adapter utility functions",
   "homepage": "https://feathersjs.com",
   "keywords": [
@@ -13,7 +13,8 @@
   },
   "repository": {
     "type": "git",
-    "url": "git://github.com/feathersjs/feathers.git"
+    "url": "git://github.com/feathersjs/feathers.git",
+    "directory": "packages/adapter-commons"
   },
   "author": {
     "name": "Feathers contributor",
@@ -31,7 +32,8 @@
   "types": "lib/",
   "scripts": {
     "prepublish": "npm run compile",
-    "compile": "shx rm -rf lib/ && tsc",
+    "pack": "npm pack --pack-destination ../generators/test/build",
+    "compile": "shx rm -rf lib/ && tsc && npm run pack",
     "test": "mocha --config ../../.mocharc.json --recursive test/**.test.ts test/**/*.test.ts"
   },
   "directories": {
@@ -48,19 +50,19 @@
     "access": "public"
   },
   "dependencies": {
-    "@feathersjs/commons": "^5.0.0-pre.9",
-    "@feathersjs/errors": "^5.0.0-pre.9",
-    "@feathersjs/feathers": "^5.0.0-pre.9"
+    "@feathersjs/commons": "^5.0.1",
+    "@feathersjs/errors": "^5.0.1",
+    "@feathersjs/feathers": "^5.0.1"
   },
   "devDependencies": {
-    "@types/mocha": "^9.0.0",
+    "@types/mocha": "^10.0.1",
     "@types/mongodb": "^4.0.6",
-    "@types/node": "^16.4.13",
-    "mocha": "^9.0.3",
-    "mongodb": "^4.1.0",
-    "shx": "^0.3.3",
-    "ts-node": "^10.1.0",
-    "typescript": "^4.3.5"
+    "@types/node": "^18.14.6",
+    "mocha": "^10.2.0",
+    "mongodb": "^5.1.0",
+    "shx": "^0.3.4",
+    "ts-node": "^10.9.1",
+    "typescript": "^4.9.5"
   },
-  "gitHead": "3d1721a7286e6a7f37bbc38695fe45084023f13b"
+  "gitHead": "18b7f4ab0a8075572a81d78956ba1205a9795c91"
 }

package/src/declarations.ts

@@ -0,0 +1,162 @@
+import { Query, Params, Paginated, Id, PaginationParams, PaginationOptions } from '@feathersjs/feathers'
+
+export type FilterQueryOptions = {
+  filters?: FilterSettings
+  operators?: string[]
+  paginate?: PaginationParams
+}
+
+export type QueryFilter = (value: any, options: FilterQueryOptions) => any
+
+export type FilterSettings = {
+  [key: string]: QueryFilter | true
+}
+
+// re-export from @feathersjs/feathers to prevent breaking changes
+export { PaginationOptions, PaginationParams }
+
+export interface AdapterServiceOptions {
+  /**
+   * Whether to allow multiple updates for everything (`true`) or specific methods (e.g. `['create', 'remove']`)
+   */
+  multi?: boolean | string[]
+  /**
+   * The name of the id property
+   */
+  id?: string
+  /**
+   * Pagination settings for this service
+   */
+  paginate?: PaginationParams
+  /**
+   * A list of additional property query operators to allow in a query
+   *
+   * @deprecated No longer needed when a query schema is used
+   */
+  operators?: string[]
+  /**
+   * An object of additional top level query filters, e.g. `{ $populate: true }`
+   * Can also be a converter function like `{ $ignoreCase: (value) => value === 'true' ? true : false }`
+   *
+   * @deprecated No longer needed when a query schema is used
+   */
+  filters?: FilterSettings
+  /**
+   * @deprecated Use service `events` option when registering the service with `app.use`.
+   */
+  events?: string[]
+  /**
+   * @deprecated No longer needed when a query schema is used
+   */
+  whitelist?: string[]
+}
+
+export interface AdapterQuery extends Query {
+  $limit?: number
+  $skip?: number
+  $select?: string[]
+  $sort?: { [key: string]: 1 | -1 }
+}
+/**
+ * Additional `params` that can be passed to an adapter service method call.
+ */
+export interface AdapterParams<
+  Q = AdapterQuery,
+  A extends Partial<AdapterServiceOptions> = Partial<AdapterServiceOptions>
+> extends Params<Q> {
+  adapter?: A
+  paginate?: PaginationParams
+}
+
+/**
+ * Hook-less (internal) service methods. Directly call database adapter service methods
+ * without running any service-level hooks or sanitization. This can be useful if you need the raw data
+ * from the service and don't want to trigger any of its hooks.
+ *
+ * Important: These methods are only available internally on the server, not on the client
+ * side and only for the Feathers database adapters.
+ *
+ * These methods do not trigger events.
+ *
+ * @see {@link https://docs.feathersjs.com/guides/migrating.html#hook-less-service-methods}
+ */
+export interface InternalServiceMethods<
+  Result = any,
+  Data = Result,
+  PatchData = Partial<Data>,
+  Params extends AdapterParams = AdapterParams,
+  IdType = Id
+> {
+  /**
+   * Retrieve all resources from this service.
+   * Does not sanitize the query and should only be used on the server.
+   *
+   * @param _params - Service call parameters {@link Params}
+   */
+  _find(_params?: Params & { paginate?: PaginationOptions }): Promise<Paginated<Result>>
+  _find(_params?: Params & { paginate: false }): Promise<Result[]>
+  _find(params?: Params): Promise<Result[] | Paginated<Result>>
+
+  /**
+   * Retrieve a single resource matching the given ID, skipping any service-level hooks.
+   * Does not sanitize the query and should only be used on the server.
+   *
+   * @param id - ID of the resource to locate
+   * @param params - Service call parameters {@link Params}
+   * @see {@link HookLessServiceMethods}
+   * @see {@link https://docs.feathersjs.com/api/services.html#get-id-params|Feathers API Documentation: .get(id, params)}
+   */
+  _get(id: IdType, params?: Params): Promise<Result>
+
+  /**
+   * Create a new resource for this service, skipping any service-level hooks.
+   * Does not sanitize data or checks if multiple updates are allowed and should only be used on the server.
+   *
+   * @param data - Data to insert into this service.
+   * @param params - Service call parameters {@link Params}
+   * @see {@link HookLessServiceMethods}
+   * @see {@link https://docs.feathersjs.com/api/services.html#create-data-params|Feathers API Documentation: .create(data, params)}
+   */
+  _create(data: Data, params?: Params): Promise<Result>
+  _create(data: Data[], params?: Params): Promise<Result[]>
+  _create(data: Data | Data[], params?: Params): Promise<Result | Result[]>
+
+  /**
+   * Completely replace the resource identified by id, skipping any service-level hooks.
+   * Does not sanitize data or query and should only be used on the server.
+   *
+   * @param id - ID of the resource to be updated
+   * @param data - Data to be put in place of the current resource.
+   * @param params - Service call parameters {@link Params}
+   * @see {@link HookLessServiceMethods}
+   * @see {@link https://docs.feathersjs.com/api/services.html#update-id-data-params|Feathers API Documentation: .update(id, data, params)}
+   */
+  _update(id: IdType, data: Data, params?: Params): Promise<Result>
+
+  /**
+   * Merge any resources matching the given ID with the given data, skipping any service-level hooks.
+   * Does not sanitize the data or query and should only be used on the server.
+   *
+   * @param id - ID of the resource to be patched
+   * @param data - Data to merge with the current resource.
+   * @param params - Service call parameters {@link Params}
+   * @see {@link HookLessServiceMethods}
+   * @see {@link https://docs.feathersjs.com/api/services.html#patch-id-data-params|Feathers API Documentation: .patch(id, data, params)}
+   */
+  _patch(id: null, data: PatchData, params?: Params): Promise<Result[]>
+  _patch(id: IdType, data: PatchData, params?: Params): Promise<Result>
+  _patch(id: IdType | null, data: PatchData, params?: Params): Promise<Result | Result[]>
+
+  /**
+   * Remove resources matching the given ID from the this service, skipping any service-level hooks.
+   * Does not sanitize query and should only be used on the server.
+   *
+   * @param id - ID of the resource to be removed
+   * @param params - Service call parameters {@link Params}
+   * @see {@link HookLessServiceMethods}
+   * @see {@link https://docs.feathersjs.com/api/services.html#remove-id-params|Feathers API Documentation: .remove(id, params)}
+   */
+  _remove(id: null, params?: Params): Promise<Result[]>
+  _remove(id: IdType, params?: Params): Promise<Result>
+  _remove(id: IdType | null, params?: Params): Promise<Result | Result[]>
+}

package/src/index.ts

@@ -1,32 +1,29 @@
-import { _ } from '@feathersjs/commons';
+import { _ } from '@feathersjs/commons'
+import { Params } from '@feathersjs/feathers'
 
-export { AdapterService, InternalServiceMethods, ServiceOptions, AdapterParams } from './service';
-export { filterQuery, FILTERS, OPERATORS } from './filter-query';
-export * from './sort';
+export * from './declarations'
+export * from './service'
+export * from './query'
+export * from './sort'
 
 // Return a function that filters a result object or array
 // and picks only the fields passed as `params.query.$select`
 // and additional `otherFields`
-export function select (params: any, ...otherFields: any[]) {
-  const fields = params && params.query && params.query.$select;
+export function select(params: Params, ...otherFields: string[]) {
+  const queryFields: string[] | undefined = params?.query?.$select
 
-  if (Array.isArray(fields) && otherFields.length) {
-    fields.push(...otherFields);
+  if (!queryFields) {
+    return (result: any) => result
   }
 
-  const convert = (result: any) => {
-    if (!Array.isArray(fields)) {
-      return result;
-    }
-
-    return _.pick(result, ...fields);
-  };
+  const resultFields = queryFields.concat(otherFields)
+  const convert = (result: any) => _.pick(result, ...resultFields)
 
   return (result: any) => {
     if (Array.isArray(result)) {
-      return result.map(convert);
+      return result.map(convert)
     }
 
-    return convert(result);
-  };
+    return convert(result)
+  }
 }