@feathersjs/adapter-commons 5.0.0-pre.33 → 5.0.0-pre.35

package/CHANGELOG.md

@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [5.0.0-pre.35](https://github.com/feathersjs/feathers/compare/v5.0.0-pre.34...v5.0.0-pre.35) (2023-01-12)
+
+### Features
+
+- **generators:** Move core code generators to shared generators package ([#2982](https://github.com/feathersjs/feathers/issues/2982)) ([0328d22](https://github.com/feathersjs/feathers/commit/0328d2292153870bc43958f73d2c6f288a8cec17))
+
+# [5.0.0-pre.34](https://github.com/feathersjs/feathers/compare/v5.0.0-pre.33...v5.0.0-pre.34) (2022-12-14)
+
+### Bug Fixes
+
+- **adapter-commons:** multiple type definition issues ([#2876](https://github.com/feathersjs/feathers/issues/2876)) ([4ff1ed0](https://github.com/feathersjs/feathers/commit/4ff1ed084eb2b2cb687de27a28c96a0dad4530b7))
+
+### Features
+
+- **adapter:** Add patch data type to adapters and refactor AdapterBase usage ([#2906](https://github.com/feathersjs/feathers/issues/2906)) ([9ddc2e6](https://github.com/feathersjs/feathers/commit/9ddc2e6b028f026f939d6af68125847e5c6734b4))
+
 # [5.0.0-pre.33](https://github.com/feathersjs/feathers/compare/v5.0.0-pre.32...v5.0.0-pre.33) (2022-11-08)
 
 **Note:** Version bump only for package @feathersjs/adapter-commons

package/lib/declarations.d.ts

@@ -1,18 +1,18 @@
-import { Query, Params, Paginated, Id, NullableId } from '@feathersjs/feathers';
-export declare type FilterQueryOptions = {
+import { Query, Params, Paginated, Id } from '@feathersjs/feathers';
+export type FilterQueryOptions = {
     filters?: FilterSettings;
     operators?: string[];
     paginate?: PaginationParams;
 };
-export declare type QueryFilter = (value: any, options: FilterQueryOptions) => any;
-export declare type FilterSettings = {
+export type QueryFilter = (value: any, options: FilterQueryOptions) => any;
+export type FilterSettings = {
     [key: string]: QueryFilter | true;
 };
 export interface PaginationOptions {
     default?: number;
     max?: number;
 }
-export declare type PaginationParams = false | PaginationOptions;
+export type PaginationParams = false | PaginationOptions;
 export interface AdapterServiceOptions {
     /**
      * Whether to allow multiple updates for everything (`true`) or specific methods (e.g. `['create', 'remove']`)
@@ -28,11 +28,15 @@ export interface AdapterServiceOptions {
     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;
     /**
@@ -40,7 +44,7 @@ export interface AdapterServiceOptions {
      */
     events?: string[];
     /**
-     * @deprecated renamed to `operators`.
+     * @deprecated No longer needed when a query schema is used
      */
     whitelist?: string[];
 }
@@ -71,20 +75,20 @@ export interface AdapterParams<Q = AdapterQuery, A extends Partial<AdapterServic
  *
  * @see {@link https://docs.feathersjs.com/guides/migrating.html#hook-less-service-methods}
  */
-export interface InternalServiceMethods<T = any, D = Partial<T>, P extends AdapterParams = AdapterParams> {
+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?: P & {
+    _find(_params?: Params & {
         paginate?: PaginationOptions;
-    }): Promise<Paginated<T>>;
-    $find(_params?: P & {
+    }): Promise<Paginated<Result>>;
+    _find(_params?: Params & {
         paginate: false;
-    }): Promise<T[]>;
-    $find(params?: P): Promise<T[] | Paginated<T>>;
+    }): 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.
@@ -94,7 +98,7 @@ export interface InternalServiceMethods<T = any, D = Partial<T>, P extends Adapt
      * @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?: P): Promise<T>;
+    _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.
@@ -104,9 +108,9 @@ export interface InternalServiceMethods<T = any, D = Partial<T>, P extends Adapt
      * @see {@link HookLessServiceMethods}
      * @see {@link https://docs.feathersjs.com/api/services.html#create-data-params|Feathers API Documentation: .create(data, params)}
      */
-    $create(data: Partial<D>, params?: P): Promise<T>;
-    $create(data: Partial<D>[], params?: P): Promise<T[]>;
-    $create(data: Partial<D> | Partial<D>[], params?: P): Promise<T | T[]>;
+    _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.
@@ -117,7 +121,7 @@ export interface InternalServiceMethods<T = any, D = Partial<T>, P extends Adapt
      * @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?: P): Promise<T>;
+    _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.
@@ -128,9 +132,9 @@ export interface InternalServiceMethods<T = any, D = Partial<T>, P extends Adapt
      * @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: Partial<D>, params?: P): Promise<T[]>;
-    $patch(id: Id, data: Partial<D>, params?: P): Promise<T>;
-    $patch(id: NullableId, data: Partial<D>, params?: P): Promise<T | T[]>;
+    _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.
@@ -140,7 +144,7 @@ export interface InternalServiceMethods<T = any, D = Partial<T>, P extends Adapt
      * @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?: P): Promise<T[]>;
-    $remove(id: Id, params?: P): Promise<T>;
-    $remove(id: NullableId, params?: P): Promise<T | T[]>;
+    _remove(id: null, params?: Params): Promise<Result[]>;
+    _remove(id: IdType, params?: Params): Promise<Result>;
+    _remove(id: IdType | null, params?: Params): Promise<Result | Result[]>;
 }

package/lib/service.d.ts

@@ -1,12 +1,13 @@
-import { Id, NullableId, Paginated, Query } from '@feathersjs/feathers';
+import { Id, Paginated, Query } from '@feathersjs/feathers';
 import { AdapterParams, AdapterServiceOptions, InternalServiceMethods, PaginationOptions } from './declarations';
+export declare const VALIDATED: unique symbol;
 /**
  * An abstract base class that a database adapter can extend from to implement the
  * `__find`, `__get`, `__update`, `__patch` and `__remove` methods.
  */
-export declare 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);
+export declare abstract class AdapterBase<Result = any, Data = Result, PatchData = Partial<Data>, ServiceParams extends AdapterParams = AdapterParams, Options extends AdapterServiceOptions = AdapterServiceOptions, IdType = Id> implements InternalServiceMethods<Result, Data, PatchData, ServiceParams, IdType> {
+    options: Options;
+    constructor(options: Options);
     get id(): string;
     get events(): string[];
     /**
@@ -15,7 +16,7 @@ export declare abstract class AdapterBase<T = any, D = Partial<T>, P extends Ada
      * @param params The service call params.
      * @returns Wether or not multiple updates are allowed.
      */
-    allowsMulti(method: string, params?: P): boolean;
+    allowsMulti(method: string, params?: ServiceParams): boolean | string[];
     /**
      * Returns the combined options for a service call. Options will be merged
      * with `this.options` and `params.adapter` for dynamic overrides.
@@ -23,15 +24,7 @@ export declare abstract class AdapterBase<T = any, D = Partial<T>, P extends Ada
      * @param params The parameters for the service method call
      * @returns The actual options for this call
      */
-    getOptions(params: P): O;
-    /**
-     * 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
-     */
-    sanitizeData<X = Partial<D>>(data: X, _params: P): Promise<X>;
+    getOptions(params: ServiceParams): Options;
     /**
      * Returns a sanitized version of `params.query`, converting filter values
      * (like $limit and $skip) into the expected type. Will throw an error if
@@ -41,95 +34,76 @@ export declare abstract class AdapterBase<T = any, D = Partial<T>, P extends Ada
      * @param params The service call parameter.
      * @returns A new object containing the sanitized query.
      */
-    sanitizeQuery(params?: P): Promise<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>>;
+    sanitizeQuery(params?: ServiceParams): Promise<Query>;
     /**
-     * Retrieve all resources from this service, skipping any service-level hooks but sanitize the query
-     * with allowed filters and properties by calling `sanitizeQuery`.
+     * 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}
-     * @see {@link HookLessServiceMethods}
-     * @see {@link https://docs.feathersjs.com/api/services.html#find-params|Feathers API Documentation: .find(params)}
+     * @param _params - Service call parameters {@link ServiceParams}
      */
-    _find(_params?: P & {
+    abstract _find(_params?: ServiceParams & {
         paginate?: PaginationOptions;
-    }): Promise<Paginated<T>>;
-    _find(_params?: P & {
+    }): Promise<Paginated<Result>>;
+    abstract _find(_params?: ServiceParams & {
         paginate: false;
-    }): Promise<T[]>;
-    _find(params?: P): Promise<T | T[] | Paginated<T>>;
-    abstract $get(id: Id, params?: P): Promise<T>;
+    }): Promise<Result[]>;
+    abstract _find(params?: ServiceParams): Promise<Result[] | Paginated<Result>>;
     /**
-     * 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`.
+     * 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}
+     * @param params - Service call parameters {@link ServiceParams}
      * @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?: P): Promise<T>;
-    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[]>;
+    abstract _get(id: IdType, params?: ServiceParams): Promise<Result>;
     /**
-     * Create a new resource for this service, skipping any service-level hooks, sanitize the data
-     * and check if multiple updates are allowed.
+     * Create a new resource for this service, skipping any service-level hooks.
+     * Does not check 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}
+     * @param params - Service call parameters {@link ServiceParams}
      * @see {@link HookLessServiceMethods}
      * @see {@link https://docs.feathersjs.com/api/services.html#create-data-params|Feathers API Documentation: .create(data, params)}
      */
-    _create(data: Partial<D>, params?: P): Promise<T>;
-    _create(data: Partial<D>[], params?: P): Promise<T[]>;
-    _create(data: Partial<D> | Partial<D>[], params?: P): Promise<T | T[]>;
-    abstract $update(id: Id, data: D, params?: P): Promise<T>;
+    abstract _create(data: Data, params?: ServiceParams): Promise<Result>;
+    abstract _create(data: Data[], params?: ServiceParams): Promise<Result[]>;
+    abstract _create(data: Data | Data[], params?: ServiceParams): Promise<Result | Result[]>;
     /**
-     * Replace any resources matching the given ID with the given data, skipping any service-level hooks.
+     * Completely replace the resource identified by 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 be updated
      * @param data - Data to be put in place of the current resource.
-     * @param params - Service call parameters {@link Params}
+     * @param params - Service call parameters {@link ServiceParams}
      * @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?: P): Promise<T>;
-    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[]>;
+    abstract _update(id: IdType, data: Data, params?: ServiceParams): Promise<Result>;
     /**
      * 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.
+     * Does not sanitize the 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}
+     * @param params - Service call parameters {@link ServiceParams}
      * @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: Partial<D>, params?: P): Promise<T[]>;
-    _patch(id: Id, data: Partial<D>, params?: P): Promise<T>;
-    _patch(id: NullableId, data: Partial<D>, params?: P): Promise<T | T[]>;
-    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[]>;
+    abstract _patch(id: null, data: PatchData, params?: ServiceParams): Promise<Result[]>;
+    abstract _patch(id: IdType, data: PatchData, params?: ServiceParams): Promise<Result>;
+    abstract _patch(id: IdType | null, data: PatchData, params?: ServiceParams): Promise<Result | Result[]>;
     /**
      * 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.
+     * 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}
+     * @param params - Service call parameters {@link ServiceParams}
      * @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?: P): Promise<T[]>;
-    _remove(id: Id, params?: P): Promise<T>;
-    _remove(id: NullableId, params?: P): Promise<T | T[]>;
+    abstract _remove(id: null, params?: ServiceParams): Promise<Result[]>;
+    abstract _remove(id: IdType, params?: ServiceParams): Promise<Result>;
+    abstract _remove(id: IdType | null, params?: ServiceParams): Promise<Result | Result[]>;
 }

package/lib/service.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AdapterBase = void 0;
-const errors_1 = require("@feathersjs/errors");
+exports.AdapterBase = exports.VALIDATED = void 0;
 const query_1 = require("./query");
+exports.VALIDATED = Symbol('@feathersjs/adapter/sanitized');
 const alwaysMulti = {
     find: true,
     get: false,
@@ -42,7 +42,7 @@ class AdapterBase {
             return always;
         }
         const { multi } = this.getOptions(params);
-        if (multi === true || multi === false) {
+        if (multi === true || !multi) {
             return multi;
         }
         return multi.includes(method);
@@ -62,16 +62,6 @@ class AdapterBase {
             ...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(data, _params) {
-        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
@@ -82,6 +72,10 @@ class AdapterBase {
      * @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 || {};
+        }
         const options = this.getOptions(params);
         const { query, filters } = (0, query_1.filterQuery)(params.query, options);
         return {
@@ -89,79 +83,6 @@ class AdapterBase {
             ...query
         };
     }
-    async _find(params) {
-        const query = await this.sanitizeQuery(params);
-        return this.$find({
-            ...params,
-            query
-        });
-    }
-    /**
-     * 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)}
-     */
-    async _get(id, params) {
-        const query = await this.sanitizeQuery(params);
-        return this.$get(id, {
-            ...params,
-            query
-        });
-    }
-    async _create(data, params) {
-        if (Array.isArray(data) && !this.allowsMulti('create', params)) {
-            throw new errors_1.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);
-    }
-    /**
-     * Replace any resources matching the given ID with the given data, skipping any service-level hooks.
-     *
-     * @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)}
-     */
-    async _update(id, data, params) {
-        if (id === null || Array.isArray(data)) {
-            throw new errors_1.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
-        });
-    }
-    async _patch(id, data, params) {
-        if (id === null && !this.allowsMulti('patch', params)) {
-            throw new errors_1.MethodNotAllowed('Can not patch multiple entries');
-        }
-        const { $limit, ...query } = await this.sanitizeQuery(params);
-        const payload = await this.sanitizeData(data, params);
-        return this.$patch(id, payload, {
-            ...params,
-            query
-        });
-    }
-    async _remove(id, params) {
-        if (id === null && !this.allowsMulti('remove', params)) {
-            throw new errors_1.MethodNotAllowed('Can not remove multiple entries');
-        }
-        const { $limit, ...query } = await this.sanitizeQuery(params);
-        return this.$remove(id, {
-            ...params,
-            query
-        });
-    }
 }
 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,+BAA+B,CAAC,CAAA;AAEhE,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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@feathersjs/adapter-commons",
-  "version": "5.0.0-pre.33",
+  "version": "5.0.0-pre.35",
   "description": "Shared database adapter utility functions",
   "homepage": "https://feathersjs.com",
   "keywords": [
@@ -32,7 +32,7 @@
   "types": "lib/",
   "scripts": {
     "prepublish": "npm run compile",
-    "pack": "npm pack --pack-destination ../cli/test/build",
+    "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"
   },
@@ -50,19 +50,19 @@
     "access": "public"
   },
   "dependencies": {
-    "@feathersjs/commons": "^5.0.0-pre.33",
-    "@feathersjs/errors": "^5.0.0-pre.33",
-    "@feathersjs/feathers": "^5.0.0-pre.33"
+    "@feathersjs/commons": "^5.0.0-pre.35",
+    "@feathersjs/errors": "^5.0.0-pre.35",
+    "@feathersjs/feathers": "^5.0.0-pre.35"
   },
   "devDependencies": {
-    "@types/mocha": "^10.0.0",
+    "@types/mocha": "^10.0.1",
     "@types/mongodb": "^4.0.6",
-    "@types/node": "^18.11.9",
-    "mocha": "^10.1.0",
-    "mongodb": "^4.11.0",
+    "@types/node": "^18.11.18",
+    "mocha": "^10.2.0",
+    "mongodb": "^4.13.0",
     "shx": "^0.3.4",
     "ts-node": "^10.9.1",
-    "typescript": "^4.8.4"
+    "typescript": "^4.9.4"
   },
-  "gitHead": "89f516bcb1457e23a02c6212e9cd8bacc4d267d4"
+  "gitHead": "c641598d9a4de3ceda10f56cf2af288a4236b15e"
 }

package/src/declarations.ts

@@ -1,4 +1,4 @@
-import { Query, Params, Paginated, Id, NullableId } from '@feathersjs/feathers'
+import { Query, Params, Paginated, Id } from '@feathersjs/feathers'
 
 export type FilterQueryOptions = {
   filters?: FilterSettings
@@ -34,11 +34,15 @@ export interface AdapterServiceOptions {
   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
   /**
@@ -46,7 +50,7 @@ export interface AdapterServiceOptions {
    */
   events?: string[]
   /**
-   * @deprecated renamed to `operators`.
+   * @deprecated No longer needed when a query schema is used
    */
   whitelist?: string[]
 }
@@ -80,16 +84,22 @@ export interface AdapterParams<
  *
  * @see {@link https://docs.feathersjs.com/guides/migrating.html#hook-less-service-methods}
  */
-export interface InternalServiceMethods<T = any, D = Partial<T>, P extends AdapterParams = AdapterParams> {
+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?: P & { paginate?: PaginationOptions }): Promise<Paginated<T>>
-  $find(_params?: P & { paginate: false }): Promise<T[]>
-  $find(params?: P): Promise<T[] | Paginated<T>>
+  _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.
@@ -100,7 +110,7 @@ export interface InternalServiceMethods<T = any, D = Partial<T>, P extends Adapt
    * @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?: P): Promise<T>
+  _get(id: IdType, params?: Params): Promise<Result>
 
   /**
    * Create a new resource for this service, skipping any service-level hooks.
@@ -111,9 +121,9 @@ export interface InternalServiceMethods<T = any, D = Partial<T>, P extends Adapt
    * @see {@link HookLessServiceMethods}
    * @see {@link https://docs.feathersjs.com/api/services.html#create-data-params|Feathers API Documentation: .create(data, params)}
    */
-  $create(data: Partial<D>, params?: P): Promise<T>
-  $create(data: Partial<D>[], params?: P): Promise<T[]>
-  $create(data: Partial<D> | Partial<D>[], params?: P): Promise<T | T[]>
+  _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.
@@ -125,7 +135,7 @@ export interface InternalServiceMethods<T = any, D = Partial<T>, P extends Adapt
    * @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?: P): Promise<T>
+  _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.
@@ -137,9 +147,9 @@ export interface InternalServiceMethods<T = any, D = Partial<T>, P extends Adapt
    * @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: Partial<D>, params?: P): Promise<T[]>
-  $patch(id: Id, data: Partial<D>, params?: P): Promise<T>
-  $patch(id: NullableId, data: Partial<D>, params?: P): Promise<T | T[]>
+  _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.
@@ -150,7 +160,7 @@ export interface InternalServiceMethods<T = any, D = Partial<T>, P extends Adapt
    * @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?: P): Promise<T[]>
-  $remove(id: Id, params?: P): Promise<T>
-  $remove(id: NullableId, params?: P): Promise<T | T[]>
+  _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/service.ts

@@ -1,5 +1,4 @@
-import { BadRequest, MethodNotAllowed } from '@feathersjs/errors'
-import { Id, NullableId, Paginated, Query } from '@feathersjs/feathers'
+import { Id, Paginated, Query } from '@feathersjs/feathers'
 import {
   AdapterParams,
   AdapterServiceOptions,
@@ -8,6 +7,8 @@ import {
 } from './declarations'
 import { filterQuery } from './query'
 
+export const VALIDATED = Symbol('@feathersjs/adapter/sanitized')
+
 const alwaysMulti: { [key: string]: boolean } = {
   find: true,
   get: false,
@@ -19,15 +20,17 @@ const alwaysMulti: { [key: string]: boolean } = {
  * `__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>
+  Result = any,
+  Data = Result,
+  PatchData = Partial<Data>,
+  ServiceParams extends AdapterParams = AdapterParams,
+  Options extends AdapterServiceOptions = AdapterServiceOptions,
+  IdType = Id
+> implements InternalServiceMethods<Result, Data, PatchData, ServiceParams, IdType>
 {
-  options: O
+  options: Options
 
-  constructor(options: O) {
+  constructor(options: Options) {
     this.options = {
       id: 'id',
       events: [],
@@ -53,7 +56,7 @@ export abstract class AdapterBase<
    * @param params The service call params.
    * @returns Wether or not multiple updates are allowed.
    */
-  allowsMulti(method: string, params: P = {} as P) {
+  allowsMulti(method: string, params: ServiceParams = {} as ServiceParams) {
     const always = alwaysMulti[method]
 
     if (typeof always !== 'undefined') {
@@ -62,7 +65,7 @@ export abstract class AdapterBase<
 
     const { multi } = this.getOptions(params)
 
-    if (multi === true || multi === false) {
+    if (multi === true || !multi) {
       return multi
     }
 
@@ -76,7 +79,7 @@ export abstract class AdapterBase<
    * @param params The parameters for the service method call
    * @returns The actual options for this call
    */
-  getOptions(params: P): O {
+  getOptions(params: ServiceParams): Options {
     const paginate = params.paginate !== undefined ? params.paginate : this.options.paginate
 
     return {
@@ -86,17 +89,6 @@ export abstract class AdapterBase<
     }
   }
 
-  /**
-   * 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
@@ -106,7 +98,12 @@ export abstract class AdapterBase<
    * @param params The service call parameter.
    * @returns A new object containing the sanitized query.
    */
-  async sanitizeQuery(params: P = {} as P): Promise<Query> {
+  async sanitizeQuery(params: ServiceParams = {} as ServiceParams): Promise<Query> {
+    // We don't need legacy query sanitisation if the query has been validated by a schema already
+    if (params.query && (params.query as any)[VALIDATED]) {
+      return params.query || {}
+    }
+
     const options = this.getOptions(params)
     const { query, filters } = filterQuery(params.query, options)
 
@@ -116,160 +113,76 @@ export abstract class AdapterBase<
     }
   }
 
-  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`.
+   * 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}
-   * @see {@link HookLessServiceMethods}
-   * @see {@link https://docs.feathersjs.com/api/services.html#find-params|Feathers API Documentation: .find(params)}
+   * @param _params - Service call parameters {@link ServiceParams}
    */
-  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>
+  abstract _find(_params?: ServiceParams & { paginate?: PaginationOptions }): Promise<Paginated<Result>>
+  abstract _find(_params?: ServiceParams & { paginate: false }): Promise<Result[]>
+  abstract _find(params?: ServiceParams): Promise<Result[] | Paginated<Result>>
 
   /**
-   * 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`.
+   * 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}
+   * @param params - Service call parameters {@link ServiceParams}
    * @see {@link HookLessServiceMethods}
    * @see {@link https://docs.feathersjs.com/api/services.html#get-id-params|Feathers API Documentation: .get(id, params)}
    */
-  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[]>
+  abstract _get(id: IdType, params?: ServiceParams): Promise<Result>
 
   /**
-   * Create a new resource for this service, skipping any service-level hooks, sanitize the data
-   * and check if multiple updates are allowed.
+   * Create a new resource for this service, skipping any service-level hooks.
+   * Does not check 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}
+   * @param params - Service call parameters {@link ServiceParams}
    * @see {@link HookLessServiceMethods}
    * @see {@link https://docs.feathersjs.com/api/services.html#create-data-params|Feathers API Documentation: .create(data, params)}
    */
-  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>
+  abstract _create(data: Data, params?: ServiceParams): Promise<Result>
+  abstract _create(data: Data[], params?: ServiceParams): Promise<Result[]>
+  abstract _create(data: Data | Data[], params?: ServiceParams): Promise<Result | Result[]>
 
   /**
-   * Replace any resources matching the given ID with the given data, skipping any service-level hooks.
+   * Completely replace the resource identified by 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 be updated
    * @param data - Data to be put in place of the current resource.
-   * @param params - Service call parameters {@link Params}
+   * @param params - Service call parameters {@link ServiceParams}
    * @see {@link HookLessServiceMethods}
    * @see {@link https://docs.feathersjs.com/api/services.html#update-id-data-params|Feathers API Documentation: .update(id, data, params)}
    */
-  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[]>
+  abstract _update(id: IdType, data: Data, params?: ServiceParams): Promise<Result>
 
   /**
    * 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.
+   * Does not sanitize the 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}
+   * @param params - Service call parameters {@link ServiceParams}
    * @see {@link HookLessServiceMethods}
    * @see {@link https://docs.feathersjs.com/api/services.html#patch-id-data-params|Feathers API Documentation: .patch(id, data, params)}
    */
-  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 { $limit, ...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[]>
+  abstract _patch(id: null, data: PatchData, params?: ServiceParams): Promise<Result[]>
+  abstract _patch(id: IdType, data: PatchData, params?: ServiceParams): Promise<Result>
+  abstract _patch(id: IdType | null, data: PatchData, params?: ServiceParams): Promise<Result | Result[]>
 
   /**
    * 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.
+   * 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}
+   * @param params - Service call parameters {@link ServiceParams}
    * @see {@link HookLessServiceMethods}
    * @see {@link https://docs.feathersjs.com/api/services.html#remove-id-params|Feathers API Documentation: .remove(id, params)}
    */
-  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)) {
-      throw new MethodNotAllowed('Can not remove multiple entries')
-    }
-
-    const { $limit, ...query } = await this.sanitizeQuery(params)
-
-    return this.$remove(id, {
-      ...params,
-      query
-    })
-  }
+  abstract _remove(id: null, params?: ServiceParams): Promise<Result[]>
+  abstract _remove(id: IdType, params?: ServiceParams): Promise<Result>
+  abstract _remove(id: IdType | null, params?: ServiceParams): Promise<Result | Result[]>
 }