@feathersjs/schema 5.0.0-pre.15 → 5.0.0-pre.16

package/CHANGELOG.md

@@ -3,6 +3,24 @@
 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.16](https://github.com/feathersjs/feathers/compare/v5.0.0-pre.15...v5.0.0-pre.16) (2022-01-12)
+
+
+### Bug Fixes
+
+* **schema:** Do not error for schemas without properties ([#2519](https://github.com/feathersjs/feathers/issues/2519)) ([96fdb47](https://github.com/feathersjs/feathers/commit/96fdb47d45fd88a8039aa9cc9ec8aebd98672b95))
+* **schema:** Fix resolver data type and use new validation feature in test fixture ([#2523](https://github.com/feathersjs/feathers/issues/2523)) ([1093f12](https://github.com/feathersjs/feathers/commit/1093f124b60524cbd9050fcf07ddaf1d558973da))
+
+
+### Features
+
+* **schema:** Allow to use custom AJV and test with ajv-formats ([#2513](https://github.com/feathersjs/feathers/issues/2513)) ([ecfa4df](https://github.com/feathersjs/feathers/commit/ecfa4df29f029f6ca8517cacf518c14b46ffeb4e))
+* **schema:** Improve schema typing, validation and extensibility ([#2521](https://github.com/feathersjs/feathers/issues/2521)) ([8c1b350](https://github.com/feathersjs/feathers/commit/8c1b35052792e82d13be03c06583534284fbae82))
+
+
+
+
+
 # [5.0.0-pre.15](https://github.com/feathersjs/feathers/compare/v5.0.0-pre.14...v5.0.0-pre.15) (2021-11-27)
 
 

package/lib/query.d.ts

@@ -20,10 +20,3 @@ export declare const queryProperty: <T extends JSONSchema>(definition: T) => {
         };
     }];
 };
-export declare const queryArray: <T extends readonly string[]>(fields: T) => {
-    readonly type: "array";
-    readonly items: {
-        readonly type: "string";
-        readonly enum: T;
-    };
-};

package/lib/query.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.queryArray = exports.queryProperty = void 0;
+exports.queryProperty = void 0;
 const queryProperty = (definition) => ({
     oneOf: [
         definition,
@@ -26,12 +26,4 @@ const queryProperty = (definition) => ({
     ]
 });
 exports.queryProperty = queryProperty;
-const queryArray = (fields) => ({
-    type: 'array',
-    items: {
-        type: 'string',
-        enum: fields
-    }
-});
-exports.queryArray = queryArray;
 //# sourceMappingURL=query.js.map

package/lib/query.js.map

@@ -1 +1 @@
-{"version":3,"file":"query.js","sourceRoot":"","sources":["../src/query.ts"],"names":[],"mappings":";;;AAEO,MAAM,aAAa,GAAG,CAAwB,UAAa,EAAE,EAAE,CAAC,CAAC;IACtE,KAAK,EAAE;QACL,UAAU;QACV;YACE,IAAI,EAAE,QAAQ;YACd,oBAAoB,EAAE,KAAK;YAC3B,UAAU,EAAE;gBACV,GAAG,EAAE,UAAU;gBACf,IAAI,EAAE,UAAU;gBAChB,GAAG,EAAE,UAAU;gBACf,IAAI,EAAE,UAAU;gBAChB,GAAG,EAAE,UAAU;gBACf,GAAG,EAAE;oBACH,IAAI,EAAE,OAAO;oBACb,KAAK,EAAE,UAAU;iBAClB;gBACD,IAAI,EAAE;oBACJ,IAAI,EAAE,OAAO;oBACb,KAAK,EAAE,UAAU;iBAClB;aACF;SACF;KACF;CACQ,CAAA,CAAC;AAvBC,QAAA,aAAa,iBAuBd;AAEL,MAAM,UAAU,GAAG,CAA+B,MAAS,EAAE,EAAE,CAAC,CAAC;IACtE,IAAI,EAAE,OAAO;IACb,KAAK,EAAE;QACL,IAAI,EAAE,QAAQ;QACd,IAAI,EAAE,MAAM;KACb;CACQ,CAAA,CAAC;AANC,QAAA,UAAU,cAMX"}
+{"version":3,"file":"query.js","sourceRoot":"","sources":["../src/query.ts"],"names":[],"mappings":";;;AAEO,MAAM,aAAa,GAAG,CAAwB,UAAa,EAAE,EAAE,CAAC,CAAC;IACtE,KAAK,EAAE;QACL,UAAU;QACV;YACE,IAAI,EAAE,QAAQ;YACd,oBAAoB,EAAE,KAAK;YAC3B,UAAU,EAAE;gBACV,GAAG,EAAE,UAAU;gBACf,IAAI,EAAE,UAAU;gBAChB,GAAG,EAAE,UAAU;gBACf,IAAI,EAAE,UAAU;gBAChB,GAAG,EAAE,UAAU;gBACf,GAAG,EAAE;oBACH,IAAI,EAAE,OAAO;oBACb,KAAK,EAAE,UAAU;iBAClB;gBACD,IAAI,EAAE;oBACJ,IAAI,EAAE,OAAO;oBACb,KAAK,EAAE,UAAU;iBAClB;aACF;SACF;KACF;CACQ,CAAA,CAAC;AAvBC,QAAA,aAAa,iBAuBd"}

package/lib/resolver.d.ts

@@ -1,5 +1,5 @@
 import { Schema } from './schema';
-export declare type PropertyResolver<T, V, C> = (value: V | undefined, obj: any, context: C, status: ResolverStatus<T, C>) => Promise<V | undefined>;
+export declare type PropertyResolver<T, V, C> = (value: V | undefined, obj: T, context: C, status: ResolverStatus<T, C>) => Promise<V | undefined>;
 export declare type PropertyResolverMap<T, C> = {
     [key in keyof T]?: PropertyResolver<T, T[key], C>;
 };

package/lib/resolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"resolver.js","sourceRoot":"","sources":["../src/resolver.ts"],"names":[],"mappings":";;;AAAA,+CAAgD;AA2BhD,MAAa,QAAQ;IAGnB,YAAoB,OAA6B;QAA7B,YAAO,GAAP,OAAO,CAAsB;IACjD,CAAC;IAED,KAAK,CAAC,eAAe,CACnB,IAAO,EACP,IAAO,EACP,OAAU,EACV,SAAwC,EAAE;QAE1C,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QAC/C,MAAM,KAAK,GAAI,IAAY,CAAC,IAAI,CAAC,CAAC;QAClC,MAAM,EAAE,IAAI,GAAG,EAAE,EAAE,KAAK,GAAG,EAAE,EAAE,GAAG,MAAM,IAAI,EAAE,CAAC;QAE/C,sCAAsC;QACtC,IAAI,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE;YAC5B,OAAO,SAAS,CAAC;SAClB;QAED,MAAM,cAAc,GAAG;YACrB,GAAG,MAAM;YACT,IAAI,EAAE,CAAC,GAAG,IAAI,EAAE,IAAc,CAAC;YAC/B,KAAK,EAAE,CAAC,GAAG,KAAK,EAAE,QAAQ,CAAC;SAC5B,CAAA;QAED,OAAO,QAAQ,CAAC,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,cAAc,CAAC,CAAC;IACxD,CAAC;IAED,KAAK,CAAC,OAAO,CAAK,KAAQ,EAAE,OAAU,EAAE,MAAsC;QAC5E,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC;QACjE,MAAM,IAAI,GAAG,MAAM,IAAI,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;QACpF,MAAM,YAAY,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,UAAU,CAAC;YACrD,CAAC,CAAC,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,UAAU;YACpB,kEAAkE;YAClE,CAAC,CAAC,CAAC,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAClD,CAAC;QAEjB,MAAM,MAAM,GAAQ,EAAE,CAAC;QACvB,MAAM,MAAM,GAAQ,EAAE,CAAC;QACvB,IAAI,SAAS,GAAG,KAAK,CAAC;QAEtB,8CAA8C;QAC9C,MAAM,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,KAAK,EAAC,IAAI,EAAC,EAAE;YAC9C,MAAM,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC;YAEzB,IAAI,SAAS,CAAC,IAAI,CAAC,EAAE;gBACnB,IAAI;oBACF,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;oBAEzE,IAAI,QAAQ,KAAK,SAAS,EAAE;wBAC1B,MAAM,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC;qBACzB;iBACF;gBAAC,OAAO,KAAU,EAAE;oBACnB,wBAAwB;oBACxB,MAAM,cAAc,GAAG,OAAO,KAAK,CAAC,MAAM,KAAK,UAAU;wBACvD,CAAC,CAAC,KAAK,CAAC,MAAM,EAAE;wBAChB,CAAC,CAAC,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,IAAI,KAAK,EAAE,CAAC;oBAExC,MAAM,CAAC,IAAI,CAAC,GAAG,cAAc,CAAC;oBAC9B,SAAS,GAAG,IAAI,CAAC;iBAClB;aACF;iBAAM,IAAI,KAAK,KAAK,SAAS,EAAE;gBAC9B,MAAM,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC;aACtB;QACH,CAAC,CAAC,CAAC,CAAC;QAEJ,IAAI,SAAS,EAAE;YACb,MAAM,IAAI,mBAAU,CAAC,wBAAwB,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;SACtF;QAED,OAAO,MAAM,IAAI,QAAQ,KAAK,OAAO;YACnC,CAAC,CAAC,MAAM,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC;YAC/B,CAAC,CAAC,MAAM,CAAC;IACb,CAAC;CACF;AA5ED,4BA4EC;AAED,SAAgB,OAAO,CAAS,OAA6B;IAC3D,OAAO,IAAI,QAAQ,CAAO,OAAO,CAAC,CAAC;AACrC,CAAC;AAFD,0BAEC"}
+{"version":3,"file":"resolver.js","sourceRoot":"","sources":["../src/resolver.ts"],"names":[],"mappings":"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"}

package/lib/schema.d.ts

@@ -1,18 +1,17 @@
-import Ajv, { AsyncValidateFunction } from 'ajv';
-import { JSONSchema6 } from 'json-schema';
+import Ajv, { AsyncValidateFunction, ValidateFunction } from 'ajv';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
 export declare const AJV: Ajv;
 export declare type JSONSchemaDefinition = JSONSchema & {
     $id: string;
+    $async?: boolean;
 };
 export declare class Schema<S extends JSONSchemaDefinition> {
+    definition: S;
     ajv: Ajv;
-    validate: AsyncValidateFunction<FromSchema<S>>;
-    definition: JSONSchema6;
-    propertyNames: string[];
+    validator: AsyncValidateFunction;
     readonly _type: FromSchema<S>;
     constructor(definition: S, ajv?: Ajv);
-    extend<D extends JSONSchemaDefinition>(definition: D): Schema<D & S>;
-    toJSON(): JSONSchema6;
+    validate<T = FromSchema<S>>(...args: Parameters<ValidateFunction<T>>): Promise<T>;
+    toJSON(): S;
 }
-export declare function schema<S extends JSONSchemaDefinition>(definition: S): Schema<S>;
+export declare function schema<S extends JSONSchemaDefinition>(definition: S, ajv?: Ajv): Schema<S>;

package/lib/schema.js

@@ -5,38 +5,35 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.schema = exports.Schema = exports.AJV = void 0;
 const ajv_1 = __importDefault(require("ajv"));
+const errors_1 = require("@feathersjs/errors");
 exports.AJV = new ajv_1.default({
     coerceTypes: true
 });
 class Schema {
     constructor(definition, ajv = exports.AJV) {
-        this.ajv = ajv;
         this.definition = definition;
-        this.propertyNames = Object.keys(this.definition.properties);
-        this.validate = this.ajv.compile({
+        this.ajv = ajv;
+        this.validator = this.ajv.compile({
             $async: true,
             ...this.definition
         });
     }
-    extend(definition) {
-        const def = definition;
-        const extended = {
-            ...this.definition,
-            ...def,
-            properties: {
-                ...this.definition.properties,
-                ...def.properties
-            }
-        };
-        return new Schema(extended, this.ajv);
+    async validate(...args) {
+        try {
+            const validated = await this.validator(...args);
+            return validated;
+        }
+        catch (error) {
+            throw new errors_1.BadRequest(error.message, error.errors);
+        }
     }
     toJSON() {
         return this.definition;
     }
 }
 exports.Schema = Schema;
-function schema(definition) {
-    return new Schema(definition);
+function schema(definition, ajv = exports.AJV) {
+    return new Schema(definition, ajv);
 }
 exports.schema = schema;
 //# sourceMappingURL=schema.js.map

package/lib/schema.js.map

@@ -1 +1 @@
-{"version":3,"file":"schema.js","sourceRoot":"","sources":["../src/schema.ts"],"names":[],"mappings":";;;;;;AAAA,8CAAiD;AAIpC,QAAA,GAAG,GAAG,IAAI,aAAG,CAAC;IACzB,WAAW,EAAE,IAAI;CAClB,CAAC,CAAC;AAIH,MAAa,MAAM;IAOjB,YAAa,UAAa,EAAE,MAAW,WAAG;QACxC,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QACf,IAAI,CAAC,UAAU,GAAG,UAAyB,CAAC;QAC5C,IAAI,CAAC,aAAa,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,CAAA;QAC5D,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC;YAC/B,MAAM,EAAE,IAAI;YACZ,GAAG,IAAI,CAAC,UAAU;SACnB,CAAC,CAAC;IACL,CAAC;IAED,MAAM,CAAmC,UAAa;QACpD,MAAM,GAAG,GAAG,UAAyB,CAAC;QACtC,MAAM,QAAQ,GAAG;YACf,GAAG,IAAI,CAAC,UAAU;YAClB,GAAG,GAAG;YACN,UAAU,EAAE;gBACV,GAAG,IAAI,CAAC,UAAU,CAAC,UAAU;gBAC7B,GAAG,GAAG,CAAC,UAAU;aAClB;SACO,CAAC;QAEX,OAAO,IAAI,MAAM,CAAU,QAAe,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;IACxD,CAAC;IAED,MAAM;QACJ,OAAO,IAAI,CAAC,UAAU,CAAC;IACzB,CAAC;CACF;AAlCD,wBAkCC;AAED,SAAgB,MAAM,CAAmC,UAAa;IACpE,OAAO,IAAI,MAAM,CAAC,UAAU,CAAC,CAAC;AAChC,CAAC;AAFD,wBAEC"}
+{"version":3,"file":"schema.js","sourceRoot":"","sources":["../src/schema.ts"],"names":[],"mappings":";;;;;;AAAA,8CAAmE;AAEnE,+CAAgD;AAEnC,QAAA,GAAG,GAAG,IAAI,aAAG,CAAC;IACzB,WAAW,EAAE,IAAI;CAClB,CAAC,CAAC;AAIH,MAAa,MAAM;IAKjB,YAAoB,UAAa,EAAE,MAAW,WAAG;QAA7B,eAAU,GAAV,UAAU,CAAG;QAC/B,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QACf,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC;YAChC,MAAM,EAAE,IAAI;YACZ,GAAI,IAAI,CAAC,UAAkB;SAC5B,CAA0B,CAAC;IAC9B,CAAC;IAED,KAAK,CAAC,QAAQ,CAAsB,GAAG,IAAqC;QAC1E,IAAI;YACF,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,GAAG,IAAI,CAAM,CAAC;YAErD,OAAO,SAAS,CAAC;SAClB;QAAC,OAAO,KAAU,EAAE;YACnB,MAAM,IAAI,mBAAU,CAAC,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;SACnD;IACH,CAAC;IAED,MAAM;QACJ,OAAO,IAAI,CAAC,UAAU,CAAC;IACzB,CAAC;CACF;AA1BD,wBA0BC;AAED,SAAgB,MAAM,CAAmC,UAAa,EAAE,MAAW,WAAG;IACpF,OAAO,IAAI,MAAM,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC;AACrC,CAAC;AAFD,wBAEC"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@feathersjs/schema",
   "description": "A common data schema definition format",
-  "version": "5.0.0-pre.15",
+  "version": "5.0.0-pre.16",
   "homepage": "https://feathersjs.com",
   "main": "lib/",
   "keywords": [
@@ -50,20 +50,21 @@
     "access": "public"
   },
   "dependencies": {
-    "@feathersjs/errors": "^5.0.0-pre.15",
-    "@feathersjs/feathers": "^5.0.0-pre.15",
+    "@feathersjs/errors": "^5.0.0-pre.16",
+    "@feathersjs/feathers": "^5.0.0-pre.16",
     "@types/json-schema": "^7.0.9",
-    "ajv": "^8.6.3",
-    "json-schema": "^0.3.0",
+    "ajv": "^8.8.2",
+    "json-schema": "^0.4.0",
     "json-schema-to-ts": "^1.6.4"
   },
   "devDependencies": {
-    "@feathersjs/memory": "^5.0.0-pre.15",
+    "@feathersjs/memory": "^5.0.0-pre.16",
     "@types/mocha": "^9.0.0",
-    "@types/node": "^16.11.6",
+    "@types/node": "^17.0.5",
+    "ajv-formats": "^2.1.1",
     "mocha": "^9.1.3",
     "shx": "^0.3.3",
-    "typescript": "^4.4.4"
+    "typescript": "^4.5.4"
   },
-  "gitHead": "8008bf4f8529a2a40b6a2f976c1f43ae13675693"
+  "gitHead": "f0cd227a82d159b528193bd33747c97684a48773"
 }

package/src/query.ts

@@ -24,11 +24,3 @@ export const queryProperty = <T extends JSONSchema> (definition: T) => ({
     }
   ]
 } as const);
-
-export const queryArray = <T extends readonly string[]> (fields: T) => ({
-  type: 'array',
-  items: {
-    type: 'string',
-    enum: fields
-  }
-} as const);

package/src/resolver.ts

@@ -3,7 +3,7 @@ import { Schema } from './schema';
 
 export type PropertyResolver<T, V, C> = (
   value: V|undefined,
-  obj: any,
+  obj: T,
   context: C,
   status: ResolverStatus<T, C>
 ) => Promise<V|undefined>;
@@ -52,7 +52,7 @@ export class Resolver<T, C> {
       stack: [...stack, resolver]
     }
 
-    return resolver(value, data, context, resolverStatus);
+    return resolver(value, data as any, context, resolverStatus);
   }
 
   async resolve<D> (_data: D, context: C, status?: Partial<ResolverStatus<T, C>>): Promise<T> {

package/src/schema.ts

@@ -1,42 +1,34 @@
-import Ajv, { AsyncValidateFunction } from 'ajv';
-import { JSONSchema6 } from 'json-schema';
+import Ajv, { AsyncValidateFunction, ValidateFunction } from 'ajv';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
+import { BadRequest } from '@feathersjs/errors';
 
 export const AJV = new Ajv({
   coerceTypes: true
 });
 
-export type JSONSchemaDefinition = JSONSchema & { $id: string };
+export type JSONSchemaDefinition = JSONSchema & { $id: string, $async?: boolean };
 
 export class Schema<S extends JSONSchemaDefinition> {
   ajv: Ajv;
-  validate: AsyncValidateFunction<FromSchema<S>>;
-  definition: JSONSchema6;
-  propertyNames: string[];
+  validator: AsyncValidateFunction;
   readonly _type!: FromSchema<S>;
 
-  constructor (definition: S, ajv: Ajv = AJV) {
+  constructor (public definition: S, ajv: Ajv = AJV) {
     this.ajv = ajv;
-    this.definition = definition as JSONSchema6;
-    this.propertyNames = Object.keys(this.definition.properties)
-    this.validate = this.ajv.compile({
+    this.validator = this.ajv.compile({
       $async: true,
-      ...this.definition
-    });
+      ...(this.definition as any)
+    }) as AsyncValidateFunction;
   }
 
-  extend <D extends JSONSchemaDefinition> (definition: D) {
-    const def = definition as JSONSchema6;
-    const extended = {
-      ...this.definition,
-      ...def,
-      properties: {
-        ...this.definition.properties,
-        ...def.properties
-      }
-    } as const;
-
-    return new Schema <D & S> (extended as any, this.ajv);
+  async validate <T = FromSchema<S>> (...args: Parameters<ValidateFunction<T>>) {
+    try {
+      const validated = await this.validator(...args) as T;
+
+      return validated;
+    } catch (error: any) {
+      throw new BadRequest(error.message, error.errors);
+    }
   }
 
   toJSON () {
@@ -44,6 +36,6 @@ export class Schema<S extends JSONSchemaDefinition> {
   }
 }
 
-export function schema <S extends JSONSchemaDefinition> (definition: S) {
-  return new Schema(definition);
+export function schema <S extends JSONSchemaDefinition> (definition: S, ajv: Ajv = AJV) {
+  return new Schema(definition, ajv);
 }