@feathersjs/schema 5.0.0-pre.34 → 5.0.0-pre.36

package/CHANGELOG.md

@@ -3,6 +3,23 @@
 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.36](https://github.com/feathersjs/feathers/compare/v5.0.0-pre.35...v5.0.0-pre.36) (2023-01-29)
+
+### Bug Fixes
+
+- **configuration:** Add pool and connection object to SQL database default configuration ([#3023](https://github.com/feathersjs/feathers/issues/3023)) ([092c749](https://github.com/feathersjs/feathers/commit/092c749d43f7da4d019576d1210fe7d3719a44a2))
+- **databases:** Ensure that query sanitization is not necessary when using query schemas ([#3022](https://github.com/feathersjs/feathers/issues/3022)) ([dbf514e](https://github.com/feathersjs/feathers/commit/dbf514e85d1508b95c007462a39b3cadd4ff391d))
+- **schema:** Allow any type in resolver hooks ([#3006](https://github.com/feathersjs/feathers/issues/3006)) ([f01281f](https://github.com/feathersjs/feathers/commit/f01281f7d83262738459585fc3f53f56c0a0deb8))
+- **schema:** Ensure all types of nested data are securely dispatched ([#3005](https://github.com/feathersjs/feathers/issues/3005)) ([e4a9da5](https://github.com/feathersjs/feathers/commit/e4a9da5f3288e8e9f02087754473c7a9dfda6cb1))
+- Update all dependencies ([#3024](https://github.com/feathersjs/feathers/issues/3024)) ([283dc47](https://github.com/feathersjs/feathers/commit/283dc4798d85584bc031e6e54b83b4ea77d1edd0))
+
+# [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))
+- **schema:** Allow to add additional operators to the query syntax ([#2941](https://github.com/feathersjs/feathers/issues/2941)) ([f324940](https://github.com/feathersjs/feathers/commit/f324940d5795b41e8c6fc113defb0beb7ab03a0a))
+
 # [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

package/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2022 Feathers
+Copyright (c) 2023 Feathers Contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/README.md

@@ -18,6 +18,6 @@ Refer to the [Feathers documentation](https://docs.feathersjs.com) for more deta
 
 ## License
 
-Copyright (c) 2022 [Feathers contributors](https://github.com/feathersjs/feathers/graphs/contributors)
+Copyright (c) 2023 [Feathers contributors](https://github.com/feathersjs/feathers/graphs/contributors)
 
 Licensed under the [MIT license](LICENSE).

package/lib/default-schemas.d.ts

@@ -122,8 +122,40 @@ export declare const sqlSettingsSchema: {
         readonly client: {
             readonly type: "string";
         };
+        readonly pool: {
+            readonly type: "object";
+            readonly properties: {
+                readonly min: {
+                    readonly type: "number";
+                };
+                readonly max: {
+                    readonly type: "number";
+                };
+            };
+        };
         readonly connection: {
-            readonly type: "string";
+            readonly oneOf: readonly [{
+                readonly type: "string";
+            }, {
+                readonly type: "object";
+                readonly properties: {
+                    readonly host: {
+                        readonly type: "string";
+                    };
+                    readonly port: {
+                        readonly type: "number";
+                    };
+                    readonly user: {
+                        readonly type: "string";
+                    };
+                    readonly password: {
+                        readonly type: "string";
+                    };
+                    readonly database: {
+                        readonly type: "string";
+                    };
+                };
+            }];
         };
     };
 };
@@ -275,8 +307,40 @@ export declare const defaultAppSettings: {
             readonly client: {
                 readonly type: "string";
             };
+            readonly pool: {
+                readonly type: "object";
+                readonly properties: {
+                    readonly min: {
+                        readonly type: "number";
+                    };
+                    readonly max: {
+                        readonly type: "number";
+                    };
+                };
+            };
             readonly connection: {
-                readonly type: "string";
+                readonly oneOf: readonly [{
+                    readonly type: "string";
+                }, {
+                    readonly type: "object";
+                    readonly properties: {
+                        readonly host: {
+                            readonly type: "string";
+                        };
+                        readonly port: {
+                            readonly type: "number";
+                        };
+                        readonly user: {
+                            readonly type: "string";
+                        };
+                        readonly password: {
+                            readonly type: "string";
+                        };
+                        readonly database: {
+                            readonly type: "string";
+                        };
+                    };
+                }];
             };
         };
     };
@@ -286,8 +350,40 @@ export declare const defaultAppSettings: {
             readonly client: {
                 readonly type: "string";
             };
+            readonly pool: {
+                readonly type: "object";
+                readonly properties: {
+                    readonly min: {
+                        readonly type: "number";
+                    };
+                    readonly max: {
+                        readonly type: "number";
+                    };
+                };
+            };
             readonly connection: {
-                readonly type: "string";
+                readonly oneOf: readonly [{
+                    readonly type: "string";
+                }, {
+                    readonly type: "object";
+                    readonly properties: {
+                        readonly host: {
+                            readonly type: "string";
+                        };
+                        readonly port: {
+                            readonly type: "number";
+                        };
+                        readonly user: {
+                            readonly type: "string";
+                        };
+                        readonly password: {
+                            readonly type: "string";
+                        };
+                        readonly database: {
+                            readonly type: "string";
+                        };
+                    };
+                }];
             };
         };
     };
@@ -297,8 +393,40 @@ export declare const defaultAppSettings: {
             readonly client: {
                 readonly type: "string";
             };
+            readonly pool: {
+                readonly type: "object";
+                readonly properties: {
+                    readonly min: {
+                        readonly type: "number";
+                    };
+                    readonly max: {
+                        readonly type: "number";
+                    };
+                };
+            };
             readonly connection: {
-                readonly type: "string";
+                readonly oneOf: readonly [{
+                    readonly type: "string";
+                }, {
+                    readonly type: "object";
+                    readonly properties: {
+                        readonly host: {
+                            readonly type: "string";
+                        };
+                        readonly port: {
+                            readonly type: "number";
+                        };
+                        readonly user: {
+                            readonly type: "string";
+                        };
+                        readonly password: {
+                            readonly type: "string";
+                        };
+                        readonly database: {
+                            readonly type: "string";
+                        };
+                    };
+                }];
             };
         };
     };
@@ -308,8 +436,40 @@ export declare const defaultAppSettings: {
             readonly client: {
                 readonly type: "string";
             };
+            readonly pool: {
+                readonly type: "object";
+                readonly properties: {
+                    readonly min: {
+                        readonly type: "number";
+                    };
+                    readonly max: {
+                        readonly type: "number";
+                    };
+                };
+            };
             readonly connection: {
-                readonly type: "string";
+                readonly oneOf: readonly [{
+                    readonly type: "string";
+                }, {
+                    readonly type: "object";
+                    readonly properties: {
+                        readonly host: {
+                            readonly type: "string";
+                        };
+                        readonly port: {
+                            readonly type: "number";
+                        };
+                        readonly user: {
+                            readonly type: "string";
+                        };
+                        readonly password: {
+                            readonly type: "string";
+                        };
+                        readonly database: {
+                            readonly type: "string";
+                        };
+                    };
+                }];
             };
         };
     };
@@ -462,8 +622,40 @@ export declare const defaultAppConfiguration: {
                 readonly client: {
                     readonly type: "string";
                 };
+                readonly pool: {
+                    readonly type: "object";
+                    readonly properties: {
+                        readonly min: {
+                            readonly type: "number";
+                        };
+                        readonly max: {
+                            readonly type: "number";
+                        };
+                    };
+                };
                 readonly connection: {
-                    readonly type: "string";
+                    readonly oneOf: readonly [{
+                        readonly type: "string";
+                    }, {
+                        readonly type: "object";
+                        readonly properties: {
+                            readonly host: {
+                                readonly type: "string";
+                            };
+                            readonly port: {
+                                readonly type: "number";
+                            };
+                            readonly user: {
+                                readonly type: "string";
+                            };
+                            readonly password: {
+                                readonly type: "string";
+                            };
+                            readonly database: {
+                                readonly type: "string";
+                            };
+                        };
+                    }];
                 };
             };
         };
@@ -473,8 +665,40 @@ export declare const defaultAppConfiguration: {
                 readonly client: {
                     readonly type: "string";
                 };
+                readonly pool: {
+                    readonly type: "object";
+                    readonly properties: {
+                        readonly min: {
+                            readonly type: "number";
+                        };
+                        readonly max: {
+                            readonly type: "number";
+                        };
+                    };
+                };
                 readonly connection: {
-                    readonly type: "string";
+                    readonly oneOf: readonly [{
+                        readonly type: "string";
+                    }, {
+                        readonly type: "object";
+                        readonly properties: {
+                            readonly host: {
+                                readonly type: "string";
+                            };
+                            readonly port: {
+                                readonly type: "number";
+                            };
+                            readonly user: {
+                                readonly type: "string";
+                            };
+                            readonly password: {
+                                readonly type: "string";
+                            };
+                            readonly database: {
+                                readonly type: "string";
+                            };
+                        };
+                    }];
                 };
             };
         };
@@ -484,8 +708,40 @@ export declare const defaultAppConfiguration: {
                 readonly client: {
                     readonly type: "string";
                 };
+                readonly pool: {
+                    readonly type: "object";
+                    readonly properties: {
+                        readonly min: {
+                            readonly type: "number";
+                        };
+                        readonly max: {
+                            readonly type: "number";
+                        };
+                    };
+                };
                 readonly connection: {
-                    readonly type: "string";
+                    readonly oneOf: readonly [{
+                        readonly type: "string";
+                    }, {
+                        readonly type: "object";
+                        readonly properties: {
+                            readonly host: {
+                                readonly type: "string";
+                            };
+                            readonly port: {
+                                readonly type: "number";
+                            };
+                            readonly user: {
+                                readonly type: "string";
+                            };
+                            readonly password: {
+                                readonly type: "string";
+                            };
+                            readonly database: {
+                                readonly type: "string";
+                            };
+                        };
+                    }];
                 };
             };
         };
@@ -495,8 +751,40 @@ export declare const defaultAppConfiguration: {
                 readonly client: {
                     readonly type: "string";
                 };
+                readonly pool: {
+                    readonly type: "object";
+                    readonly properties: {
+                        readonly min: {
+                            readonly type: "number";
+                        };
+                        readonly max: {
+                            readonly type: "number";
+                        };
+                    };
+                };
                 readonly connection: {
-                    readonly type: "string";
+                    readonly oneOf: readonly [{
+                        readonly type: "string";
+                    }, {
+                        readonly type: "object";
+                        readonly properties: {
+                            readonly host: {
+                                readonly type: "string";
+                            };
+                            readonly port: {
+                                readonly type: "number";
+                            };
+                            readonly user: {
+                                readonly type: "string";
+                            };
+                            readonly password: {
+                                readonly type: "string";
+                            };
+                            readonly database: {
+                                readonly type: "string";
+                            };
+                        };
+                    }];
                 };
             };
         };

package/lib/default-schemas.js

@@ -112,7 +112,28 @@ exports.sqlSettingsSchema = {
     type: 'object',
     properties: {
         client: { type: 'string' },
-        connection: { type: 'string' }
+        pool: {
+            type: 'object',
+            properties: {
+                min: { type: 'number' },
+                max: { type: 'number' }
+            }
+        },
+        connection: {
+            oneOf: [
+                { type: 'string' },
+                {
+                    type: 'object',
+                    properties: {
+                        host: { type: 'string' },
+                        port: { type: 'number' },
+                        user: { type: 'string' },
+                        password: { type: 'string' },
+                        database: { type: 'string' }
+                    }
+                }
+            ]
+        }
     }
 };
 /**

package/lib/default-schemas.js.map

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

package/lib/hooks/resolve.d.ts

@@ -1,14 +1,16 @@
 import { HookContext, NextFunction } from '@feathersjs/feathers';
 import { Resolver } from '../resolver';
 export type ResolverSetting<H extends HookContext> = Resolver<any, H> | Resolver<any, H>[];
-export declare const resolveQuery: <T, H extends HookContext<import("@feathersjs/feathers").Application<any, any>, any>>(...resolvers: Resolver<T, H>[]) => (context: H, next?: NextFunction) => Promise<any>;
-export declare const resolveData: <T, H extends HookContext<import("@feathersjs/feathers").Application<any, any>, any>>(...resolvers: Resolver<T, H>[]) => (context: H, next?: NextFunction) => Promise<any>;
-export declare const resolveResult: <T, H extends HookContext<import("@feathersjs/feathers").Application<any, any>, any>>(...resolvers: Resolver<T, H>[]) => (context: H, next?: NextFunction) => Promise<void>;
+export declare const resolveQuery: <H extends HookContext<import("@feathersjs/feathers").Application<any, any>, any>>(...resolvers: Resolver<any, H>[]) => (context: H, next?: NextFunction) => Promise<any>;
+export declare const resolveData: <H extends HookContext<import("@feathersjs/feathers").Application<any, any>, any>>(...resolvers: Resolver<any, H>[]) => (context: H, next?: NextFunction) => Promise<any>;
+export declare const resolveResult: <H extends HookContext<import("@feathersjs/feathers").Application<any, any>, any>>(...resolvers: Resolver<any, H>[]) => (context: H, next?: NextFunction) => Promise<void>;
 export declare const DISPATCH: unique symbol;
-export declare const getDispatch: (value: any, fallback?: any) => any;
-export declare const resolveDispatch: <T, H extends HookContext<import("@feathersjs/feathers").Application<any, any>, any>>(...resolvers: Resolver<T, H>[]) => (context: H, next?: NextFunction) => Promise<void>;
-export declare const resolveExternal: <T, H extends HookContext<import("@feathersjs/feathers").Application<any, any>, any>>(...resolvers: Resolver<T, H>[]) => (context: H, next?: NextFunction) => Promise<void>;
-export type ResolveAllSettings<H extends HookContext> = {
+export declare const getDispatchValue: (value: any) => any;
+export declare const getDispatch: (value: any) => any;
+export declare const setDispatch: (current: any, dispatch: any) => any;
+export declare const resolveDispatch: <H extends HookContext<import("@feathersjs/feathers").Application<any, any>, any>>(...resolvers: Resolver<any, H>[]) => (context: H, next?: NextFunction) => Promise<void>;
+export declare const resolveExternal: <H extends HookContext<import("@feathersjs/feathers").Application<any, any>, any>>(...resolvers: Resolver<any, H>[]) => (context: H, next?: NextFunction) => Promise<void>;
+type ResolveAllSettings<H extends HookContext> = {
     data?: {
         create: Resolver<any, H>;
         patch: Resolver<any, H>;
@@ -18,4 +20,13 @@ export type ResolveAllSettings<H extends HookContext> = {
     result?: Resolver<any, H>;
     dispatch?: Resolver<any, H>;
 };
+/**
+ * Resolve all resolvers at once.
+ *
+ * @param map The individual resolvers
+ * @returns A combined resolver middleware
+ * @deprecated Use individual data, query and external resolvers and hooks instead.
+ * @see https://dove.feathersjs.com/guides/cli/service.schemas.html
+ */
 export declare const resolveAll: <H extends HookContext<import("@feathersjs/feathers").Application<any, any>, any>>(map: ResolveAllSettings<H>) => (this: any, context: H, next?: import("@feathersjs/hooks").AsyncMiddleware<H>) => Promise<any>;
+export {};

package/lib/hooks/resolve.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.resolveAll = exports.resolveExternal = exports.resolveDispatch = exports.getDispatch = exports.DISPATCH = exports.resolveResult = exports.resolveData = exports.resolveQuery = void 0;
+exports.resolveAll = exports.resolveExternal = exports.resolveDispatch = exports.setDispatch = exports.getDispatch = exports.getDispatchValue = exports.DISPATCH = exports.resolveResult = exports.resolveData = exports.resolveQuery = void 0;
 const hooks_1 = require("@feathersjs/hooks");
 const getContext = (context) => {
     return Object.freeze({
@@ -11,7 +11,7 @@ const getContext = (context) => {
         })
     });
 };
-const getData = (context) => {
+const getResult = (context) => {
     const isPaginated = context.method === 'find' && context.result.data;
     const data = isPaginated ? context.result.data : context.result;
     return { isPaginated, data };
@@ -75,14 +75,14 @@ const resolveResult = (...resolvers) => {
                 resolve,
                 query: {
                     ...query,
-                    $select
+                    ...($select ? { $select } : {})
                 }
             };
             await next();
         }
         const ctx = getContext(context);
         const status = context.params.resolve;
-        const { isPaginated, data } = getData(context);
+        const { isPaginated, data } = getResult(context);
         const result = Array.isArray(data)
             ? await Promise.all(data.map(async (current) => runResolvers(resolvers, current, ctx, status)))
             : await runResolvers(resolvers, data, ctx, status);
@@ -96,26 +96,48 @@ const resolveResult = (...resolvers) => {
 };
 exports.resolveResult = resolveResult;
 exports.DISPATCH = Symbol('@feathersjs/schema/dispatch');
-const getDispatch = (value, fallback = value) => typeof value === 'object' && value !== null && value[exports.DISPATCH] !== undefined ? value[exports.DISPATCH] : fallback;
+const getDispatchValue = (value) => {
+    if (typeof value === 'object' && value !== null) {
+        if (value[exports.DISPATCH] !== undefined) {
+            return value[exports.DISPATCH];
+        }
+        if (Array.isArray(value)) {
+            return value.map((item) => (0, exports.getDispatchValue)(item));
+        }
+    }
+    return value;
+};
+exports.getDispatchValue = getDispatchValue;
+const getDispatch = (value) => typeof value === 'object' && value !== null && value[exports.DISPATCH] ? value[exports.DISPATCH] : null;
 exports.getDispatch = getDispatch;
+const setDispatch = (current, dispatch) => {
+    Object.defineProperty(current, exports.DISPATCH, {
+        value: dispatch,
+        enumerable: false,
+        configurable: false
+    });
+    return dispatch;
+};
+exports.setDispatch = setDispatch;
 const resolveDispatch = (...resolvers) => async (context, next) => {
     if (typeof next === 'function') {
         await next();
     }
     const ctx = getContext(context);
-    const existingDispatch = (0, exports.getDispatch)(context.result, null);
+    const existingDispatch = (0, exports.getDispatch)(context.result);
     if (existingDispatch !== null) {
         context.dispatch = existingDispatch;
     }
     else {
         const status = context.params.resolve;
-        const { isPaginated, data } = getData(context);
+        const { isPaginated, data } = getResult(context);
         const resolveAndGetDispatch = async (current) => {
             const resolved = await runResolvers(resolvers, current, ctx, status);
-            return Object.keys(resolved).reduce((res, key) => {
-                res[key] = (0, exports.getDispatch)(resolved[key]);
+            const currentDispatch = Object.keys(resolved).reduce((res, key) => {
+                res[key] = (0, exports.getDispatchValue)(resolved[key]);
                 return res;
             }, {});
+            return (0, exports.setDispatch)(current, currentDispatch);
         };
         const result = await (Array.isArray(data)
             ? Promise.all(data.map(resolveAndGetDispatch))
@@ -126,17 +148,20 @@ const resolveDispatch = (...resolvers) => async (context, next) => {
                 data: result
             }
             : result;
-        context.dispatch = dispatch;
-        Object.defineProperty(context.result, exports.DISPATCH, {
-            value: dispatch,
-            enumerable: false,
-            configurable: false
-        });
+        context.dispatch = (0, exports.setDispatch)(context.result, dispatch);
     }
 };
 exports.resolveDispatch = resolveDispatch;
 exports.resolveExternal = exports.resolveDispatch;
 const dataMethods = ['create', 'update', 'patch'];
+/**
+ * Resolve all resolvers at once.
+ *
+ * @param map The individual resolvers
+ * @returns A combined resolver middleware
+ * @deprecated Use individual data, query and external resolvers and hooks instead.
+ * @see https://dove.feathersjs.com/guides/cli/service.schemas.html
+ */
 const resolveAll = (map) => {
     const middleware = [];
     middleware.push((0, exports.resolveDispatch)(map.dispatch));

package/lib/hooks/resolve.js.map

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

package/lib/json-schema.d.ts

@@ -29,7 +29,7 @@ export declare const getValidator: <T = any, R = T>(schema: JSONSchemaDefinition
  * @returns A map of validator functions
  */
 export declare const getDataValidator: (def: JSONSchemaDefinition | DataSchemaMap, validator: Ajv) => DataValidatorMap;
-export type PropertyQuery<D extends JSONSchema> = {
+export type PropertyQuery<D extends JSONSchema, X> = {
     anyOf: [
         D,
         {
@@ -49,7 +49,7 @@ export type PropertyQuery<D extends JSONSchema> = {
                     type: 'array';
                     items: D;
                 };
-            };
+            } & X;
         }
     ];
 };
@@ -57,9 +57,12 @@ export type PropertyQuery<D extends JSONSchema> = {
  * Create a Feathers query syntax compatible JSON schema definition for a property definition.
  *
  * @param def The property definition (e.g. `{ type: 'string' }`)
+ * @param extensions Additional properties to add to the query property schema
  * @returns A JSON schema definition for the Feathers query syntax for this property.
  */
-export declare const queryProperty: <T extends import("json-schema-to-ts").JSONSchema7>(def: T) => {
+export declare const queryProperty: <T extends import("json-schema-to-ts").JSONSchema7, X extends {
+    [key: string]: import("json-schema-to-ts").JSONSchema7;
+}>(def: T, extensions?: X) => {
     readonly anyOf: readonly [any, {
         readonly type: "object";
         readonly additionalProperties: false;
@@ -77,29 +80,34 @@ export declare const queryProperty: <T extends import("json-schema-to-ts").JSONS
                 readonly type: "array";
                 readonly items: any;
             };
-        };
+        } & X;
     }];
 };
-export declare const SUPPORTED_TYPES: string[];
 /**
  * Creates Feathers a query syntax compatible JSON schema for multiple properties.
  *
  * @param definitions A map of property definitions
+ * @param extensions Additional properties to add to the query property schema
  * @returns The JSON schema definition for the Feathers query syntax for multiple properties
  */
 export declare const queryProperties: <T extends {
     [key: string]: import("json-schema-to-ts").JSONSchema7;
-}>(definitions: T) => { [K in keyof T]: PropertyQuery<T[K]>; };
+}, X extends { [K in keyof T]?: {
+    [key: string]: import("json-schema-to-ts").JSONSchema7;
+}; }>(definitions: T, extensions?: X) => { [K_1 in keyof T]: PropertyQuery<T[K_1], X[K_1]>; };
 /**
  * Creates a JSON schema for the complete Feathers query syntax including `$limit`, $skip`
  * and `$sort` and `$select` for the allowed properties.
  *
  * @param definition The property definitions to create the query syntax schema for
+ * @param extensions Additional properties to add to the query property schema
  * @returns A JSON schema for the complete query syntax
  */
 export declare const querySyntax: <T extends {
     [key: string]: import("json-schema-to-ts").JSONSchema7;
-}>(definition: T) => {
+}, X extends { [K in keyof T]?: {
+    [key: string]: import("json-schema-to-ts").JSONSchema7;
+}; }>(definition: T, extensions?: X) => {
     readonly $limit: {
         readonly type: "number";
         readonly minimum: 0;
@@ -110,7 +118,7 @@ export declare const querySyntax: <T extends {
     };
     readonly $sort: {
         readonly type: "object";
-        readonly properties: { [K in keyof T]: {
+        readonly properties: { [K_1 in keyof T]: {
             readonly type: 'number';
             readonly enum: [1, -1];
         }; };
@@ -128,7 +136,24 @@ export declare const querySyntax: <T extends {
         readonly items: {
             readonly type: "object";
             readonly additionalProperties: false;
-            readonly properties: { [K_1 in keyof T]: PropertyQuery<T[K_1]>; };
+            readonly properties: { [K_2 in keyof T]: PropertyQuery<T[K_2], X[K_2]>; };
+        };
+    };
+    readonly $and: {
+        readonly type: "array";
+        readonly items: {
+            readonly type: "object";
+            readonly additionalProperties: false;
+            readonly properties: { [K_2 in keyof T]: PropertyQuery<T[K_2], X[K_2]>; } & {
+                readonly $or: {
+                    readonly type: "array";
+                    readonly items: {
+                        readonly type: "object";
+                        readonly additionalProperties: false;
+                        readonly properties: { [K_2 in keyof T]: PropertyQuery<T[K_2], X[K_2]>; };
+                    };
+                };
+            };
         };
     };
-} & { [K_1 in keyof T]: PropertyQuery<T[K_1]>; };
+} & { [K_2 in keyof T]: PropertyQuery<T[K_2], X[K_2]>; };

package/lib/json-schema.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.querySyntax = exports.queryProperties = exports.SUPPORTED_TYPES = exports.queryProperty = exports.getDataValidator = exports.getValidator = void 0;
+exports.querySyntax = exports.queryProperties = exports.queryProperty = exports.getDataValidator = exports.getValidator = void 0;
 const commons_1 = require("@feathersjs/commons");
 /**
  * Returns a compiled validation function for a schema and AJV validator instance.
@@ -44,9 +44,10 @@ exports.getDataValidator = getDataValidator;
  * Create a Feathers query syntax compatible JSON schema definition for a property definition.
  *
  * @param def The property definition (e.g. `{ type: 'string' }`)
+ * @param extensions Additional properties to add to the query property schema
  * @returns A JSON schema definition for the Feathers query syntax for this property.
  */
-const queryProperty = (def) => {
+const queryProperty = (def, extensions = {}) => {
     const definition = commons_1._.omit(def, 'default');
     return {
         anyOf: [
@@ -67,28 +68,29 @@ const queryProperty = (def) => {
                     $nin: {
                         type: 'array',
                         items: definition
-                    }
+                    },
+                    ...extensions
                 }
             }
         ]
     };
 };
 exports.queryProperty = queryProperty;
-exports.SUPPORTED_TYPES = ['string', 'number', 'integer', 'boolean', 'null'];
 /**
  * Creates Feathers a query syntax compatible JSON schema for multiple properties.
  *
  * @param definitions A map of property definitions
+ * @param extensions Additional properties to add to the query property schema
  * @returns The JSON schema definition for the Feathers query syntax for multiple properties
  */
-const queryProperties = (definitions) => Object.keys(definitions).reduce((res, key) => {
+const queryProperties = (definitions, extensions = {}) => Object.keys(definitions).reduce((res, key) => {
     const result = res;
     const definition = definitions[key];
-    const { type, $ref } = definition;
-    if ($ref || !exports.SUPPORTED_TYPES.includes(type)) {
-        throw new Error(`Can not create query syntax schema for property '${key}'. Only types ${exports.SUPPORTED_TYPES.join(', ')} are allowed.`);
+    const { $ref } = definition;
+    if ($ref) {
+        throw new Error(`Can not create query syntax schema for reference property '${key}'`);
     }
-    result[key] = (0, exports.queryProperty)(definition);
+    result[key] = (0, exports.queryProperty)(definition, extensions[key]);
     return result;
 }, {});
 exports.queryProperties = queryProperties;
@@ -97,11 +99,31 @@ exports.queryProperties = queryProperties;
  * and `$sort` and `$select` for the allowed properties.
  *
  * @param definition The property definitions to create the query syntax schema for
+ * @param extensions Additional properties to add to the query property schema
  * @returns A JSON schema for the complete query syntax
  */
-const querySyntax = (definition) => {
+const querySyntax = (definition, extensions = {}) => {
     const keys = Object.keys(definition);
-    const props = (0, exports.queryProperties)(definition);
+    const props = (0, exports.queryProperties)(definition, extensions);
+    const $or = {
+        type: 'array',
+        items: {
+            type: 'object',
+            additionalProperties: false,
+            properties: props
+        }
+    };
+    const $and = {
+        type: 'array',
+        items: {
+            type: 'object',
+            additionalProperties: false,
+            properties: {
+                ...props,
+                $or
+            }
+        }
+    };
     return {
         $limit: {
             type: 'number',
@@ -130,14 +152,8 @@ const querySyntax = (definition) => {
                 ...(keys.length > 0 ? { enum: keys } : {})
             }
         },
-        $or: {
-            type: 'array',
-            items: {
-                type: 'object',
-                additionalProperties: false,
-                properties: props
-            }
-        },
+        $or,
+        $and,
         ...props
     };
 };

package/lib/json-schema.js.map

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

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@feathersjs/schema",
   "description": "A common data schema definition format",
-  "version": "5.0.0-pre.34",
+  "version": "5.0.0-pre.36",
   "homepage": "https://feathersjs.com",
   "main": "lib/",
   "types": "lib/",
@@ -42,7 +42,7 @@
   ],
   "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",
     "mocha": "mocha --config ../../.mocharc.json --recursive test/**.test.ts test/**/*.test.ts",
     "test": "npm run compile && npm run mocha"
@@ -54,24 +54,24 @@
     "access": "public"
   },
   "dependencies": {
-    "@feathersjs/adapter-commons": "^5.0.0-pre.34",
-    "@feathersjs/commons": "^5.0.0-pre.34",
-    "@feathersjs/errors": "^5.0.0-pre.34",
-    "@feathersjs/feathers": "^5.0.0-pre.34",
+    "@feathersjs/adapter-commons": "^5.0.0-pre.36",
+    "@feathersjs/commons": "^5.0.0-pre.36",
+    "@feathersjs/errors": "^5.0.0-pre.36",
+    "@feathersjs/feathers": "^5.0.0-pre.36",
     "@feathersjs/hooks": "^0.7.6",
     "@types/json-schema": "^7.0.11",
-    "ajv": "^8.11.2",
+    "ajv": "^8.12.0",
     "ajv-formats": "^2.1.1",
-    "json-schema-to-ts": "^2.6.1"
+    "json-schema-to-ts": "^2.6.2"
   },
   "devDependencies": {
-    "@feathersjs/memory": "^5.0.0-pre.34",
+    "@feathersjs/memory": "^5.0.0-pre.36",
     "@types/mocha": "^10.0.1",
-    "@types/node": "^18.11.10",
+    "@types/node": "^18.11.18",
     "ajv-formats": "^2.1.1",
-    "mocha": "^10.1.0",
+    "mocha": "^10.2.0",
     "shx": "^0.3.4",
-    "typescript": "^4.9.3"
+    "typescript": "^4.9.4"
   },
-  "gitHead": "42cca600d00f0b3b9d89fa79be30fcd46bc50132"
+  "gitHead": "9a107b463cc80d7f3c28553c908987e05b0b634a"
 }

package/src/default-schemas.ts

@@ -117,7 +117,28 @@ export const sqlSettingsSchema = {
   type: 'object',
   properties: {
     client: { type: 'string' },
-    connection: { type: 'string' }
+    pool: {
+      type: 'object',
+      properties: {
+        min: { type: 'number' },
+        max: { type: 'number' }
+      }
+    },
+    connection: {
+      oneOf: [
+        { type: 'string' },
+        {
+          type: 'object',
+          properties: {
+            host: { type: 'string' },
+            port: { type: 'number' },
+            user: { type: 'string' },
+            password: { type: 'string' },
+            database: { type: 'string' }
+          }
+        }
+      ]
+    }
   }
 } as const
 

package/src/hooks/resolve.ts

@@ -12,7 +12,7 @@ const getContext = <H extends HookContext>(context: H) => {
   })
 }
 
-const getData = <H extends HookContext>(context: H) => {
+const getResult = <H extends HookContext>(context: H) => {
   const isPaginated = context.method === 'find' && context.result.data
   const data = isPaginated ? context.result.data : context.result
 
@@ -39,7 +39,7 @@ const runResolvers = async <T, H extends HookContext>(
 export type ResolverSetting<H extends HookContext> = Resolver<any, H> | Resolver<any, H>[]
 
 export const resolveQuery =
-  <T, H extends HookContext>(...resolvers: Resolver<T, H>[]) =>
+  <H extends HookContext>(...resolvers: Resolver<any, H>[]) =>
   async (context: H, next?: NextFunction) => {
     const ctx = getContext(context)
     const data = context?.params?.query || {}
@@ -56,7 +56,7 @@ export const resolveQuery =
   }
 
 export const resolveData =
-  <T, H extends HookContext>(...resolvers: Resolver<T, H>[]) =>
+  <H extends HookContext>(...resolvers: Resolver<any, H>[]) =>
   async (context: H, next?: NextFunction) => {
     if (context.data !== undefined) {
       const ctx = getContext(context)
@@ -78,10 +78,8 @@ export const resolveData =
     }
   }
 
-export const resolveResult = <T, H extends HookContext>(...resolvers: Resolver<T, H>[]) => {
-  const virtualProperties = new Set(
-    resolvers.reduce((acc, current) => acc.concat(current.virtualNames), [] as (keyof T)[])
-  )
+export const resolveResult = <H extends HookContext>(...resolvers: Resolver<any, H>[]) => {
+  const virtualProperties = new Set(resolvers.reduce((acc, current) => acc.concat(current.virtualNames), []))
 
   return async (context: H, next?: NextFunction) => {
     if (typeof next === 'function') {
@@ -98,7 +96,7 @@ export const resolveResult = <T, H extends HookContext>(...resolvers: Resolver<T
         resolve,
         query: {
           ...query,
-          $select
+          ...($select ? { $select } : {})
         }
       }
 
@@ -107,7 +105,7 @@ export const resolveResult = <T, H extends HookContext>(...resolvers: Resolver<T
 
     const ctx = getContext(context)
     const status = context.params.resolve
-    const { isPaginated, data } = getData(context)
+    const { isPaginated, data } = getResult(context)
 
     const result = Array.isArray(data)
       ? await Promise.all(data.map(async (current) => runResolvers(resolvers, current, ctx, status)))
@@ -123,32 +121,57 @@ export const resolveResult = <T, H extends HookContext>(...resolvers: Resolver<T
 
 export const DISPATCH = Symbol('@feathersjs/schema/dispatch')
 
-export const getDispatch = (value: any, fallback = value) =>
-  typeof value === 'object' && value !== null && value[DISPATCH] !== undefined ? value[DISPATCH] : fallback
+export const getDispatchValue = (value: any): any => {
+  if (typeof value === 'object' && value !== null) {
+    if (value[DISPATCH] !== undefined) {
+      return value[DISPATCH]
+    }
+
+    if (Array.isArray(value)) {
+      return value.map((item) => getDispatchValue(item))
+    }
+  }
+
+  return value
+}
+
+export const getDispatch = (value: any): any =>
+  typeof value === 'object' && value !== null && value[DISPATCH] ? value[DISPATCH] : null
+
+export const setDispatch = (current: any, dispatch: any) => {
+  Object.defineProperty(current, DISPATCH, {
+    value: dispatch,
+    enumerable: false,
+    configurable: false
+  })
+
+  return dispatch
+}
 
 export const resolveDispatch =
-  <T, H extends HookContext>(...resolvers: Resolver<T, H>[]) =>
+  <H extends HookContext>(...resolvers: Resolver<any, H>[]) =>
   async (context: H, next?: NextFunction) => {
     if (typeof next === 'function') {
       await next()
     }
 
     const ctx = getContext(context)
-    const existingDispatch = getDispatch(context.result, null)
+    const existingDispatch = getDispatch(context.result)
 
     if (existingDispatch !== null) {
       context.dispatch = existingDispatch
     } else {
       const status = context.params.resolve
-      const { isPaginated, data } = getData(context)
+      const { isPaginated, data } = getResult(context)
       const resolveAndGetDispatch = async (current: any) => {
-        const resolved: any = await runResolvers(resolvers, current, ctx, status)
-
-        return Object.keys(resolved).reduce((res, key) => {
-          res[key] = getDispatch(resolved[key])
+        const resolved = await runResolvers(resolvers, current, ctx, status)
+        const currentDispatch = Object.keys(resolved).reduce((res, key) => {
+          res[key] = getDispatchValue(resolved[key])
 
           return res
-        }, {} as any)
+        }, {} as Record<string, any>)
+
+        return setDispatch(current, currentDispatch)
       }
 
       const result = await (Array.isArray(data)
@@ -161,18 +184,13 @@ export const resolveDispatch =
           }
         : result
 
-      context.dispatch = dispatch
-      Object.defineProperty(context.result, DISPATCH, {
-        value: dispatch,
-        enumerable: false,
-        configurable: false
-      })
+      context.dispatch = setDispatch(context.result, dispatch)
     }
   }
 
 export const resolveExternal = resolveDispatch
 
-export type ResolveAllSettings<H extends HookContext> = {
+type ResolveAllSettings<H extends HookContext> = {
   data?: {
     create: Resolver<any, H>
     patch: Resolver<any, H>
@@ -185,6 +203,14 @@ export type ResolveAllSettings<H extends HookContext> = {
 
 const dataMethods = ['create', 'update', 'patch'] as const
 
+/**
+ * Resolve all resolvers at once.
+ *
+ * @param map The individual resolvers
+ * @returns A combined resolver middleware
+ * @deprecated Use individual data, query and external resolvers and hooks instead.
+ * @see https://dove.feathersjs.com/guides/cli/service.schemas.html
+ */
 export const resolveAll = <H extends HookContext>(map: ResolveAllSettings<H>) => {
   const middleware = []
 

package/src/json-schema.ts

@@ -63,7 +63,7 @@ export const getDataValidator = (
   }
 }
 
-export type PropertyQuery<D extends JSONSchema> = {
+export type PropertyQuery<D extends JSONSchema, X> = {
   anyOf: [
     D,
     {
@@ -83,7 +83,7 @@ export type PropertyQuery<D extends JSONSchema> = {
           type: 'array'
           items: D
         }
-      }
+      } & X
     }
   ]
 }
@@ -92,9 +92,13 @@ export type PropertyQuery<D extends JSONSchema> = {
  * Create a Feathers query syntax compatible JSON schema definition for a property definition.
  *
  * @param def The property definition (e.g. `{ type: 'string' }`)
+ * @param extensions Additional properties to add to the query property schema
  * @returns A JSON schema definition for the Feathers query syntax for this property.
  */
-export const queryProperty = <T extends JSONSchema>(def: T) => {
+export const queryProperty = <T extends JSONSchema, X extends { [key: string]: JSONSchema }>(
+  def: T,
+  extensions: X = {} as X
+) => {
   const definition = _.omit(def, 'default')
   return {
     anyOf: [
@@ -115,50 +119,78 @@ export const queryProperty = <T extends JSONSchema>(def: T) => {
           $nin: {
             type: 'array',
             items: definition
-          }
+          },
+          ...extensions
         }
       }
     ]
   } as const
 }
 
-export const SUPPORTED_TYPES = ['string', 'number', 'integer', 'boolean', 'null']
-
 /**
  * Creates Feathers a query syntax compatible JSON schema for multiple properties.
  *
  * @param definitions A map of property definitions
+ * @param extensions Additional properties to add to the query property schema
  * @returns The JSON schema definition for the Feathers query syntax for multiple properties
  */
-export const queryProperties = <T extends { [key: string]: JSONSchema }>(definitions: T) =>
+export const queryProperties = <
+  T extends { [key: string]: JSONSchema },
+  X extends { [K in keyof T]?: { [key: string]: JSONSchema } }
+>(
+  definitions: T,
+  extensions: X = {} as X
+) =>
   Object.keys(definitions).reduce((res, key) => {
     const result = res as any
     const definition = definitions[key]
-    const { type, $ref } = definition as any
+    const { $ref } = definition as any
 
-    if ($ref || !SUPPORTED_TYPES.includes(type)) {
-      throw new Error(
-        `Can not create query syntax schema for property '${key}'. Only types ${SUPPORTED_TYPES.join(
-          ', '
-        )} are allowed.`
-      )
+    if ($ref) {
+      throw new Error(`Can not create query syntax schema for reference property '${key}'`)
     }
 
-    result[key] = queryProperty(definition)
+    result[key] = queryProperty(definition as JSONSchemaDefinition, extensions[key as keyof T])
 
     return result
-  }, {} as { [K in keyof T]: PropertyQuery<T[K]> })
+  }, {} as { [K in keyof T]: PropertyQuery<T[K], X[K]> })
 
 /**
  * Creates a JSON schema for the complete Feathers query syntax including `$limit`, $skip`
  * and `$sort` and `$select` for the allowed properties.
  *
  * @param definition The property definitions to create the query syntax schema for
+ * @param extensions Additional properties to add to the query property schema
  * @returns A JSON schema for the complete query syntax
  */
-export const querySyntax = <T extends { [key: string]: JSONSchema }>(definition: T) => {
+export const querySyntax = <
+  T extends { [key: string]: JSONSchema },
+  X extends { [K in keyof T]?: { [key: string]: JSONSchema } }
+>(
+  definition: T,
+  extensions: X = {} as X
+) => {
   const keys = Object.keys(definition)
-  const props = queryProperties(definition)
+  const props = queryProperties(definition, extensions)
+  const $or = {
+    type: 'array',
+    items: {
+      type: 'object',
+      additionalProperties: false,
+      properties: props
+    }
+  } as const
+  const $and = {
+    type: 'array',
+    items: {
+      type: 'object',
+      additionalProperties: false,
+      properties: {
+        ...props,
+        $or
+      }
+    }
+  } as const
 
   return {
     $limit: {
@@ -190,14 +222,8 @@ export const querySyntax = <T extends { [key: string]: JSONSchema }>(definition:
         ...(keys.length > 0 ? { enum: keys as any as (keyof T)[] } : {})
       }
     },
-    $or: {
-      type: 'array',
-      items: {
-        type: 'object',
-        additionalProperties: false,
-        properties: props
-      }
-    },
+    $or,
+    $and,
     ...props
   } as const
 }