@feathersjs/adapter-commons 5.0.0-pre.18 → 5.0.0-pre.19

package/src/service.ts

@@ -1,14 +1,7 @@
-import { NotImplemented, BadRequest, MethodNotAllowed } from '@feathersjs/errors';
-import { ServiceMethods, Params, Id, NullableId, Paginated } from '@feathersjs/feathers';
-import { filterQuery } from './filter-query';
-
-const callMethod = (self: any, name: any, ...args: any[]) => {
-  if (typeof self[name] !== 'function') {
-    return Promise.reject(new NotImplemented(`Method ${name} not available`));
-  }
-
-  return self[name](...args);
-};
+import { BadRequest, MethodNotAllowed } from '@feathersjs/errors';
+import { Id, NullableId, Paginated, Query } from '@feathersjs/feathers';
+import { AdapterParams, AdapterServiceOptions, InternalServiceMethods, PaginationOptions } from './declarations';
+import { filterQuery } from './query';
 
 const alwaysMulti: { [key: string]: boolean } = {
   find: true,
@@ -16,72 +9,180 @@ const alwaysMulti: { [key: string]: boolean } = {
   update: false
 };
 
-export interface ServiceOptions {
-  events?: string[];
-  multi?: boolean|string[];
-  id?: string;
-  paginate?: {
-    default?: number;
-    max?: number;
+/**
+ * An abstract base class that a database adapter can extend from to implement the
+ * `__find`, `__get`, `__update`, `__patch` and `__remove` methods.
+ */
+export abstract class AdapterBase<
+  T = any,
+  D = Partial<T>,
+  P extends AdapterParams = AdapterParams,
+  O extends AdapterServiceOptions = AdapterServiceOptions
+> implements InternalServiceMethods<T, D, P> {
+  options: O;
+
+  constructor (options: O) {
+    this.options = {
+      id: 'id',
+      events: [],
+      paginate: false,
+      multi: false,
+      filters: {},
+      operators: [],
+      ...options
+    };
+  }
+
+  get id () {
+    return this.options.id;
+  }
+
+  get events () {
+    return this.options.events;
   }
+
   /**
-   * @deprecated renamed to `allow`.
+   * 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.
    */
-  whitelist?: string[];
-  allow?: string[];
-  filters?: string[];
-}
+   allowsMulti (method: string, params: P = {} as P) {
+    const always = alwaysMulti[method];
 
-export interface AdapterOptions<M = any> extends Pick<ServiceOptions, 'multi'|'allow'|'paginate'> {
-  Model?: M;
-}
+    if (typeof always !== 'undefined') {
+      return always;
+    }
 
-export interface AdapterParams<M = any> extends Params {
-  adapter?: Partial<AdapterOptions<M>>;
-}
+    const { multi } = this.getOptions(params);
 
-/**
- * Hook-less (internal) service methods. Directly call database adapter service methods
- * without running any service-level hooks. 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<T = any, D = Partial<T>> {
+    if (multi === true || multi === false) {
+      return multi;
+    }
+
+    return multi.includes(method);
+  }
 
   /**
-   * Retrieve all resources from this service, skipping any service-level hooks.
+   * 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: P): O {
+    const paginate = params.paginate !== undefined ? params.paginate : this.options.paginate;
+
+    return {
+      ...this.options,
+      paginate,
+      ...params.adapter
+    }
+  }
+
+  /**
+   * Sanitize the incoming data, e.g. removing invalid keywords etc.
+   *
+   * @param data The data to sanitize
+   * @param _params Service call parameters
+   * @returns The sanitized data
+   */
+  async sanitizeData<X = Partial<D>> (data: X, _params: P) {
+    return data;
+  }
+
+  /**
+   * 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: P = {} as P): Promise<Query> {
+    const options = this.getOptions(params);
+    const { query, filters } = filterQuery(params.query, options)
+
+    return {
+      ...filters,
+      ...query
+    };
+  }
+
+  abstract $find(_params?: P & { paginate?: PaginationOptions }): Promise<Paginated<T>>;
+  abstract $find(_params?: P & { paginate: false }): Promise<T[]>;
+  abstract $find(params?: P): Promise<T[] | Paginated<T>>;
+
+  /**
+   * Retrieve all resources from this service, skipping any service-level hooks but sanitize the query
+   * with allowed filters and properties by calling `sanitizeQuery`.
    *
    * @param params - Service call parameters {@link Params}
    * @see {@link HookLessServiceMethods}
    * @see {@link https://docs.feathersjs.com/api/services.html#find-params|Feathers API Documentation: .find(params)}
    */
-  _find (params?: AdapterParams): Promise<T | T[] | Paginated<T>>;
+  async _find(_params?: P & { paginate?: PaginationOptions }): Promise<Paginated<T>>;
+  async _find(_params?: P & { paginate: false }): Promise<T[]>;
+  async _find(params?: P): Promise<T | T[] | Paginated<T>>;
+  async _find (params?: P): Promise<T | T[] | Paginated<T>> {
+    const query = await this.sanitizeQuery(params);
+
+    return this.$find({
+      ...params,
+      query
+    });
+  }
+
+  abstract $get(id: Id, params?: P): Promise<T>;
 
   /**
-   * Retrieve a single resource matching the given ID, skipping any service-level hooks.
+   * Retrieve a single resource matching the given ID, skipping any service-level hooks but sanitize the query
+   * with allowed filters and properties by calling `sanitizeQuery`.
    *
    * @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: Id, params?: AdapterParams): Promise<T>;
+  async _get (id: Id, params?: P): Promise<T> {
+    const query = await this.sanitizeQuery(params);
+
+    return this.$get(id, {
+      ...params,
+      query
+    });
+  }
+
+  abstract $create(data: Partial<D>, params?: P): Promise<T>;
+  abstract $create(data: Partial<D>[], params?: P): Promise<T[]>;
+  abstract $create(data: Partial<D> | Partial<D>[], params?: P): Promise<T | T[]>;
 
   /**
-   * Create a new resource for this service, skipping any service-level hooks.
+   * Create a new resource for this service, skipping any service-level hooks, sanitize the data
+   * and check if multiple updates are allowed.
    *
    * @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: D | D[], params?: AdapterParams): Promise<T | T[]>;
+  async _create(data: Partial<D>, params?: P): Promise<T>;
+  async _create(data: Partial<D>[], params?: P): Promise<T[]>;
+  async _create(data: Partial<D> | Partial<D>[], params?: P): Promise<T | T[]>;
+  async _create (data: Partial<D> | Partial<D>[], params?: P): Promise<T | T[]> {
+    if (Array.isArray(data) && !this.allowsMulti('create', params)) {
+      throw new MethodNotAllowed('Can not create multiple entries');
+    }
+
+    const payload = Array.isArray(data)
+      ? (await Promise.all(data.map(current => this.sanitizeData(current, params))))
+      : (await this.sanitizeData(data, params));
+
+    return this.$create(payload, params);
+  }
+
+  abstract $update(id: Id, data: D, params?: P): Promise<T>;
 
   /**
    * Replace any resources matching the given ID with the given data, skipping any service-level hooks.
@@ -92,10 +193,29 @@ export interface InternalServiceMethods<T = any, D = Partial<T>> {
    * @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: Id, data: D, params?: AdapterParams): Promise<T>;
+  async _update (id: Id, data: D, params?: P): Promise<T> {
+    if (id === null || Array.isArray(data)) {
+      throw new BadRequest(
+        'You can not replace multiple instances. Did you mean \'patch\'?'
+      );
+    }
+
+    const payload = await this.sanitizeData(data, params);
+    const query = await this.sanitizeQuery(params);
+
+    return this.$update(id, payload, {
+      ...params,
+      query
+    });
+  }
+
+  abstract $patch(id: null, data: Partial<D>, params?: P): Promise<T[]>;
+  abstract $patch(id: Id, data: Partial<D>, params?: P): Promise<T>;
+  abstract $patch(id: NullableId, data: Partial<D>, params?: P): Promise<T | T[]>;
 
   /**
    * Merge any resources matching the given ID with the given data, skipping any service-level hooks.
+   * Sanitizes the query and data and checks it multiple updates are allowed.
    *
    * @param id - ID of the resource to be patched
    * @param data - Data to merge with the current resource.
@@ -103,134 +223,49 @@ export interface InternalServiceMethods<T = any, D = Partial<T>> {
    * @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: NullableId, data: D, params?: AdapterParams): Promise<T | T[]>;
+  async _patch(id: null, data: Partial<D>, params?: P): Promise<T[]>;
+  async _patch(id: Id, data: Partial<D>, params?: P): Promise<T>;
+  async _patch(id: NullableId, data: Partial<D>, params?: P): Promise<T | T[]>;
+  async _patch (id: NullableId, data: Partial<D>, params?: P): Promise<T | T[]> {
+    if (id === null && !this.allowsMulti('patch', params)) {
+      throw new MethodNotAllowed('Can not patch multiple entries');
+    }
+
+    const query = await this.sanitizeQuery(params);
+    const payload = await this.sanitizeData(data, params);
+
+    return this.$patch(id, payload, {
+      ...params,
+      query
+    });
+  }
+
+  abstract $remove(id: null, params?: P): Promise<T[]>;
+  abstract $remove(id: Id, params?: P): Promise<T>;
+  abstract $remove(id: NullableId, params?: P): Promise<T | T[]>;
 
   /**
    * Remove resources matching the given ID from the this service, skipping any service-level hooks.
+   * Sanitized the query and verifies that multiple updates are allowed.
    *
    * @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: NullableId, params?: AdapterParams): Promise<T | T[]>;
-}
-
-export class AdapterService<
-  T = any,
-  D = Partial<T>,
-  O extends Partial<ServiceOptions> = Partial<ServiceOptions>
-> implements ServiceMethods<T|Paginated<T>, D> {
-  options: ServiceOptions & O;
-
-  constructor (options: O) {
-    this.options = Object.assign({
-      id: 'id',
-      events: [],
-      paginate: {},
-      multi: false,
-      filters: [],
-      allow: []
-    }, options);
-  }
-
-  get id () {
-    return this.options.id;
-  }
-
-  get events () {
-    return this.options.events;
-  }
-
-  filterQuery (params: AdapterParams = {}, opts: any = {}) {
-    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 = filterQuery(query, options);
-
-    return Object.assign(result, { paginate });
-  }
-
-  allowsMulti (method: string, params: AdapterParams = {}) {
-    const always = alwaysMulti[method];
-
-    if (typeof always !== 'undefined') {
-      return always;
-    }
-
-    const { multi: option } = this.getOptions(params);
-
-    if (option === true || option === false) {
-      return option;
-    }
-
-    return option.includes(method);
-  }
-
-  getOptions (params: AdapterParams): ServiceOptions & { model?: any } {
-    return {
-      ...this.options,
-      ...params.adapter
-    }
-  }
-
-  find (params?: AdapterParams): Promise<T[] | Paginated<T>> {
-    return callMethod(this, '_find', params);
-  }
-
-  get (id: Id, params?: AdapterParams): Promise<T> {
-    return callMethod(this, '_get', id, params);
-  }
-
-  create (data: Partial<T>, params?: AdapterParams): Promise<T>;
-  create (data: Partial<T>[], params?: AdapterParams): Promise<T[]>;
-  create (data: Partial<T> | Partial<T>[], params?: AdapterParams): Promise<T | T[]> {
-    if (Array.isArray(data) && !this.allowsMulti('create', params)) {
-      return Promise.reject(new MethodNotAllowed('Can not create multiple entries'));
-    }
-
-    return callMethod(this, '_create', data, params);
-  }
-
-  update (id: Id, data: D, params?: AdapterParams): Promise<T> {
-    if (id === null || Array.isArray(data)) {
-      return Promise.reject(new BadRequest(
-        'You can not replace multiple instances. Did you mean \'patch\'?'
-      ));
-    }
-
-    return callMethod(this, '_update', id, data, params);
-  }
-
-  patch (id: Id, data: Partial<T>, params?: AdapterParams): Promise<T>;
-  patch (id: null, data: Partial<T>, params?: AdapterParams): Promise<T[]>;
-  patch (id: NullableId, data: Partial<T>, params?: AdapterParams): Promise<T | T[]>;
-  patch (id: NullableId, data: Partial<T>, params?: AdapterParams): Promise<T | T[]> {
-    if (id === null && !this.allowsMulti('patch', params)) {
-      return Promise.reject(new MethodNotAllowed('Can not patch multiple entries'));
-    }
-
-    return callMethod(this, '_patch', id, data, params);
-  }
-
-  remove (id: Id, params?: AdapterParams): Promise<T>;
-  remove (id: null, params?: AdapterParams): Promise<T[]>;
-  remove (id: NullableId, params?: AdapterParams): Promise<T | T[]>;
-  remove (id: NullableId, params?: AdapterParams): Promise<T | T[]> {
+  async _remove(id: null, params?: P): Promise<T[]>;
+  async _remove(id: Id, params?: P): Promise<T>;
+  async _remove(id: NullableId, params?: P): Promise<T | T[]>;
+  async _remove (id: NullableId, params?: P): Promise<T | T[]> {
     if (id === null && !this.allowsMulti('remove', params)) {
-      return Promise.reject(new MethodNotAllowed('Can not remove multiple entries'));
+      throw new MethodNotAllowed('Can not remove multiple entries');
     }
 
-    return callMethod(this, '_remove', id, params);
-  }
-
-  async setup () {}
+    const query = await this.sanitizeQuery(params);
 
-  async teardown () {}
+    return this.$remove(id, {
+      ...params,
+      query
+    });
+  }
 }

package/lib/filter-query.d.ts

@@ -1,10 +0,0 @@
-export declare const FILTERS: {
-    $sort: (value: any) => any;
-    $limit: (value: any, options: any) => any;
-    $skip: (value: any) => number;
-    $select: (value: any) => any;
-};
-export declare const OPERATORS: string[];
-export declare function filterQuery(query: any, options?: any): {
-    [key: string]: any;
-};

package/lib/filter-query.js

@@ -1,96 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.filterQuery = exports.OPERATORS = exports.FILTERS = void 0;
-const commons_1 = require("@feathersjs/commons");
-const errors_1 = require("@feathersjs/errors");
-function parse(number) {
-    if (typeof number !== 'undefined') {
-        return Math.abs(parseInt(number, 10));
-    }
-    return undefined;
-}
-// Returns the pagination limit and will take into account the
-// default and max pagination settings
-function getLimit(limit, paginate) {
-    if (paginate && (paginate.default || paginate.max)) {
-        const base = paginate.default || 0;
-        const lower = typeof limit === 'number' && !isNaN(limit) ? limit : base;
-        const upper = typeof paginate.max === 'number' ? paginate.max : Number.MAX_VALUE;
-        return Math.min(lower, upper);
-    }
-    return limit;
-}
-// Makes sure that $sort order is always converted to an actual number
-function convertSort(sort) {
-    if (typeof sort !== 'object' || Array.isArray(sort)) {
-        return sort;
-    }
-    return Object.keys(sort).reduce((result, key) => {
-        result[key] = typeof sort[key] === 'object'
-            ? sort[key] : parseInt(sort[key], 10);
-        return result;
-    }, {});
-}
-function cleanQuery(query, operators, filters) {
-    if (Array.isArray(query)) {
-        return query.map(value => cleanQuery(value, operators, filters));
-    }
-    else if (commons_1._.isObject(query) && query.constructor === {}.constructor) {
-        const result = {};
-        commons_1._.each(query, (value, key) => {
-            if (key[0] === '$') {
-                if (filters[key] !== undefined) {
-                    return;
-                }
-                if (!operators.includes(key)) {
-                    throw new errors_1.BadRequest(`Invalid query parameter ${key}`, query);
-                }
-            }
-            result[key] = cleanQuery(value, operators, filters);
-        });
-        Object.getOwnPropertySymbols(query).forEach(symbol => {
-            // @ts-ignore
-            result[symbol] = query[symbol];
-        });
-        return result;
-    }
-    return query;
-}
-function assignFilters(object, query, filters, options) {
-    if (Array.isArray(filters)) {
-        commons_1._.each(filters, (key) => {
-            if (query[key] !== undefined) {
-                object[key] = query[key];
-            }
-        });
-    }
-    else {
-        commons_1._.each(filters, (converter, key) => {
-            const converted = converter(query[key], options);
-            if (converted !== undefined) {
-                object[key] = converted;
-            }
-        });
-    }
-    return object;
-}
-exports.FILTERS = {
-    $sort: (value) => convertSort(value),
-    $limit: (value, options) => getLimit(parse(value), options.paginate),
-    $skip: (value) => parse(value),
-    $select: (value) => value
-};
-exports.OPERATORS = ['$in', '$nin', '$lt', '$lte', '$gt', '$gte', '$ne', '$or'];
-// Converts Feathers special query parameters and pagination settings
-// and returns them separately a `filters` and the rest of the query
-// as `query`
-function filterQuery(query, options = {}) {
-    const { filters: additionalFilters = {}, operators: additionalOperators = [] } = options;
-    const result = {};
-    result.filters = assignFilters({}, query, exports.FILTERS, options);
-    result.filters = assignFilters(result.filters, query, additionalFilters, options);
-    result.query = cleanQuery(query, exports.OPERATORS.concat(additionalOperators), result.filters);
-    return result;
-}
-exports.filterQuery = filterQuery;
-//# sourceMappingURL=filter-query.js.map

package/lib/filter-query.js.map

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

package/src/filter-query.ts

@@ -1,116 +0,0 @@
-import { _ } from '@feathersjs/commons';
-import { BadRequest } from '@feathersjs/errors';
-
-function parse (number: any) {
-  if (typeof number !== 'undefined') {
-    return Math.abs(parseInt(number, 10));
-  }
-
-  return undefined;
-}
-
-// Returns the pagination limit and will take into account the
-// default and max pagination settings
-function getLimit (limit: any, paginate: any) {
-  if (paginate && (paginate.default || paginate.max)) {
-    const base = paginate.default || 0;
-    const lower = typeof limit === 'number' && !isNaN(limit) ? limit : base;
-    const upper = typeof paginate.max === 'number' ? paginate.max : Number.MAX_VALUE;
-
-    return Math.min(lower, upper);
-  }
-
-  return limit;
-}
-
-// Makes sure that $sort order is always converted to an actual number
-function convertSort (sort: any) {
-  if (typeof sort !== 'object' || Array.isArray(sort)) {
-    return sort;
-  }
-
-  return Object.keys(sort).reduce((result, key) => {
-    result[key] = typeof sort[key] === 'object'
-      ? sort[key] : parseInt(sort[key], 10);
-
-    return result;
-  }, {} as { [key: string]: number });
-}
-
-function cleanQuery (query: any, operators: any, filters: any): any {
-  if (Array.isArray(query)) {
-    return query.map(value => cleanQuery(value, operators, filters));
-  } else if (_.isObject(query) && query.constructor === {}.constructor) {
-    const result: { [key: string]: any } = {};
-
-    _.each(query, (value, key) => {
-      if (key[0] === '$') {
-        if (filters[key] !== undefined) {
-          return;
-        }
-
-        if (!operators.includes(key)) {
-          throw new BadRequest(`Invalid query parameter ${key}`, query);
-        }
-      }
-
-      result[key] = cleanQuery(value, operators, filters);
-    });
-
-    Object.getOwnPropertySymbols(query).forEach(symbol => {
-      // @ts-ignore
-      result[symbol] = query[symbol];
-    });
-
-    return result;
-  }
-
-  return query;
-}
-
-function assignFilters (object: any, query: any, filters: any, options: any) {
-  if (Array.isArray(filters)) {
-    _.each(filters, (key) => {
-      if (query[key] !== undefined) {
-        object[key] = query[key];
-      }
-    });
-  } else {
-    _.each(filters, (converter, key) => {
-      const converted = converter(query[key], options);
-
-      if (converted !== undefined) {
-        object[key] = converted;
-      }
-    });
-  }
-
-  return object;
-}
-
-export const FILTERS = {
-  $sort: (value: any) => convertSort(value),
-  $limit: (value: any, options: any) => getLimit(parse(value), options.paginate),
-  $skip: (value: any) => parse(value),
-  $select: (value: any) => value
-};
-
-export const OPERATORS = ['$in', '$nin', '$lt', '$lte', '$gt', '$gte', '$ne', '$or'];
-
-// Converts Feathers special query parameters and pagination settings
-// and returns them separately a `filters` and the rest of the query
-// as `query`
-export function filterQuery (query: any, options: any = {}) {
-  const {
-    filters: additionalFilters = {},
-    operators: additionalOperators = []
-  } = options;
-  const result: { [key: string]: any } = {};
-
-  result.filters = assignFilters({}, query, FILTERS, options);
-  result.filters = assignFilters(result.filters, query, additionalFilters, options);
-
-  result.query = cleanQuery(query, OPERATORS.concat(additionalOperators), result.filters);
-
-  return result;
-}