@feathersjs/schema 0.0.1-alpha.4 → 5.0.0-pre.15

package/CHANGELOG.md

@@ -3,43 +3,55 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## [0.0.1-alpha.4](https://github.com/feathersjs/schema/compare/v0.0.1-alpha.3...v0.0.1-alpha.4) (2020-02-08)
+# [5.0.0-pre.15](https://github.com/feathersjs/feathers/compare/v5.0.0-pre.14...v5.0.0-pre.15) (2021-11-27)
 
 
 ### Bug Fixes
 
-* Fix getting and resolving schemas from undefined objects ([#14](https://github.com/feathersjs/schema/issues/14)) ([511752e](https://github.com/feathersjs/schema/commit/511752e7992fc0100acd1189638a2bd8178abc70))
+* **typescript:** Overall typing improvements ([#2478](https://github.com/feathersjs/feathers/issues/2478)) ([b8eb804](https://github.com/feathersjs/feathers/commit/b8eb804158556d9651a8607e3c3fda15e0bfd110))
 
 
 
 
 
-## [0.0.1-alpha.2](https://github.com/feathersjs/schema/compare/v0.0.1-alpha.1...v0.0.1-alpha.2) (2019-12-18)
+# [5.0.0-pre.14](https://github.com/feathersjs/feathers/compare/v5.0.0-pre.13...v5.0.0-pre.14) (2021-10-13)
 
+**Note:** Version bump only for package @feathersjs/schema
 
-### Features
 
-* Add @feathersjs/schema-hooks ([#5](https://github.com/feathersjs/schema/issues/5)) ([09c3e9f](https://github.com/feathersjs/schema/commit/09c3e9f5c22103a805d473d0db5d7bf7dc7cee13))
+
+
+
+# [5.0.0-pre.13](https://github.com/feathersjs/feathers/compare/v5.0.0-pre.12...v5.0.0-pre.13) (2021-10-13)
+
+**Note:** Version bump only for package @feathersjs/schema
+
+
+
+
+
+# [5.0.0-pre.12](https://github.com/feathersjs/feathers/compare/v5.0.0-pre.11...v5.0.0-pre.12) (2021-10-12)
+
+**Note:** Version bump only for package @feathersjs/schema
 
 
 
 
 
-## [0.0.1-alpha.1](https://github.com/feathersjs/schema/compare/v0.0.1-alpha.0...v0.0.1-alpha.1) (2019-12-13)
+# [5.0.0-pre.11](https://github.com/feathersjs/feathers/compare/v5.0.0-pre.10...v5.0.0-pre.11) (2021-10-06)
 
 
 ### Features
 
-* Allow references by name and prevent circular resolvers ([#3](https://github.com/feathersjs/schema/issues/3)) ([bb34edd](https://github.com/feathersjs/schema/commit/bb34edd36f47b375871ddbde86a089ae65391dda))
-* First cut of working Sequelize model converter ([#4](https://github.com/feathersjs/schema/issues/4)) ([3187896](https://github.com/feathersjs/schema/commit/3187896304cf32043f5b5b569e2976b986e5eca4))
+* **schema:** Allow resolvers to validate a schema ([#2465](https://github.com/feathersjs/feathers/issues/2465)) ([7d9590b](https://github.com/feathersjs/feathers/commit/7d9590bbe12b94b8b5a7987684f5d4968e426481))
 
 
 
 
 
-## 0.0.1-alpha.0 (2019-12-05)
+# [5.0.0-pre.10](https://github.com/feathersjs/feathers/compare/v5.0.0-pre.9...v5.0.0-pre.10) (2021-09-19)
 
 
 ### Features
 
-* First version of schema prototype ([#2](https://github.com/feathersjs/schema/issues/2)) ([e11f86e](https://github.com/feathersjs/schema/commit/e11f86e3a43f667e8c4bcb987fa5f917cbf156a5))
+* **schema:** Initial version of schema definitions and resolvers ([#2441](https://github.com/feathersjs/feathers/issues/2441)) ([c57a5cd](https://github.com/feathersjs/feathers/commit/c57a5cd56699a121647be4506d8f967e6d72ecae))

package/LICENSE

@@ -1,6 +1,6 @@
-MIT License
+The MIT License (MIT)
 
-Copyright (c) 2019 Feathers
+Copyright (c) 2021 Feathers
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -19,3 +19,4 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
+

package/README.md

@@ -0,0 +1,23 @@
+# @feathersjs/schema
+
+[![CI](https://github.com/feathersjs/feathers/workflows/CI/badge.svg)](https://github.com/feathersjs/feathers/actions?query=workflow%3ACI)
+[![Dependency Status](https://img.shields.io/david/feathersjs/feathers.svg?style=flat-square&path=packages/socketio)](https://david-dm.org/feathersjs/feathers?path=packages/schema)
+[![Download Status](https://img.shields.io/npm/dm/@feathersjs/schema.svg?style=flat-square)](https://www.npmjs.com/package/@feathersjs/schema)
+
+> A common data schema definition format
+
+## Installation
+
+```
+npm install @feathersjs/schema --save
+```
+
+## Documentation
+
+Refer to the [Feathers documentation](https://docs.feathersjs.com) for more details.
+
+## License
+
+Copyright (c) 2021 [Feathers contributors](https://github.com/feathersjs/feathers/graphs/contributors)
+
+Licensed under the [MIT license](LICENSE).

package/lib/hooks.d.ts

@@ -0,0 +1,8 @@
+import { HookContext, NextFunction } from '@feathersjs/feathers';
+import { Resolver } from './resolver';
+import { Schema } from './schema';
+export declare const resolveQuery: <T>(resolver: Resolver<T, HookContext<import("@feathersjs/feathers").Application<any, any>, any>>) => (context: HookContext, next: NextFunction) => Promise<any>;
+export declare const resolveData: <T>(resolver: Resolver<T, HookContext<import("@feathersjs/feathers").Application<any, any>, any>>) => (context: HookContext, next: NextFunction) => Promise<any>;
+export declare const resolveResult: <T>(resolver: Resolver<T, HookContext<import("@feathersjs/feathers").Application<any, any>, any>>) => (context: HookContext, next: NextFunction) => Promise<void>;
+export declare const validateQuery: (schema: Schema<any>) => (context: HookContext, next: NextFunction) => Promise<any>;
+export declare const validateData: (schema: Schema<any>) => (context: HookContext, next: NextFunction) => Promise<any>;

package/lib/hooks.js

@@ -0,0 +1,101 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.validateData = exports.validateQuery = exports.resolveResult = exports.resolveData = exports.resolveQuery = void 0;
+const lib_1 = require("../../errors/lib");
+const getContext = (context) => {
+    return {
+        ...context,
+        params: {
+            ...context.params,
+            query: {}
+        }
+    };
+};
+const resolveQuery = (resolver) => async (context, next) => {
+    var _a;
+    const ctx = getContext(context);
+    const data = ((_a = context === null || context === void 0 ? void 0 : context.params) === null || _a === void 0 ? void 0 : _a.query) || {};
+    const query = await resolver.resolve(data, ctx, {
+        originalContext: context
+    });
+    context.params = {
+        ...context.params,
+        query
+    };
+    return next();
+};
+exports.resolveQuery = resolveQuery;
+const resolveData = (resolver) => async (context, next) => {
+    const ctx = getContext(context);
+    const data = context.data;
+    const status = {
+        originalContext: context
+    };
+    if (Array.isArray(data)) {
+        context.data = await Promise.all(data.map(current => resolver.resolve(current, ctx, status)));
+    }
+    else {
+        context.data = await resolver.resolve(data, ctx, status);
+    }
+    return next();
+};
+exports.resolveData = resolveData;
+const resolveResult = (resolver) => async (context, next) => {
+    var _a;
+    const { $resolve: properties, ...query } = ((_a = context.params) === null || _a === void 0 ? void 0 : _a.query) || {};
+    const { resolve } = context.params;
+    const status = {
+        originalContext: context,
+        ...resolve,
+        properties
+    };
+    context.params = {
+        ...context.params,
+        query
+    };
+    await next();
+    const ctx = getContext(context);
+    const data = context.method === 'find' && context.result.data
+        ? context.result.data
+        : context.result;
+    if (Array.isArray(data)) {
+        context.result = await Promise.all(data.map(current => resolver.resolve(current, ctx, status)));
+    }
+    else {
+        context.result = await resolver.resolve(data, ctx, status);
+    }
+};
+exports.resolveResult = resolveResult;
+const validateQuery = (schema) => async (context, next) => {
+    var _a;
+    const data = ((_a = context === null || context === void 0 ? void 0 : context.params) === null || _a === void 0 ? void 0 : _a.query) || {};
+    try {
+        const query = await schema.validate(data);
+        context.params = {
+            ...context.params,
+            query
+        };
+        return next();
+    }
+    catch (error) {
+        throw (error.ajv ? new lib_1.BadRequest(error.message, error.errors) : error);
+    }
+};
+exports.validateQuery = validateQuery;
+const validateData = (schema) => async (context, next) => {
+    const data = context.data;
+    try {
+        if (Array.isArray(data)) {
+            context.data = await Promise.all(data.map(current => schema.validate(current)));
+        }
+        else {
+            context.data = await schema.validate(data);
+        }
+    }
+    catch (error) {
+        throw (error.ajv ? new lib_1.BadRequest(error.message, error.errors) : error);
+    }
+    return next();
+};
+exports.validateData = validateData;
+//# sourceMappingURL=hooks.js.map

package/lib/hooks.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"hooks.js","sourceRoot":"","sources":["../src/hooks.ts"],"names":[],"mappings":";;;AACA,0CAA8C;AAI9C,MAAM,UAAU,GAAG,CAAC,OAAoB,EAAE,EAAE;IAC1C,OAAO;QACL,GAAG,OAAO;QACV,MAAM,EAAE;YACN,GAAG,OAAO,CAAC,MAAM;YACjB,KAAK,EAAE,EAAE;SACV;KACF,CAAA;AACH,CAAC,CAAA;AAEM,MAAM,YAAY,GAAG,CAAK,QAAkC,EAAE,EAAE,CACrE,KAAK,EAAE,OAAoB,EAAE,IAAkB,EAAE,EAAE;;IACjD,MAAM,GAAG,GAAG,UAAU,CAAC,OAAO,CAAC,CAAC;IAChC,MAAM,IAAI,GAAG,CAAA,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,MAAM,0CAAE,KAAK,KAAI,EAAE,CAAC;IAC1C,MAAM,KAAK,GAAG,MAAM,QAAQ,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,EAAE;QAC9C,eAAe,EAAE,OAAO;KACzB,CAAC,CAAC;IAEH,OAAO,CAAC,MAAM,GAAG;QACf,GAAG,OAAO,CAAC,MAAM;QACjB,KAAK;KACN,CAAA;IAED,OAAO,IAAI,EAAE,CAAC;AAChB,CAAC,CAAC;AAdS,QAAA,YAAY,gBAcrB;AAEG,MAAM,WAAW,GAAG,CAAK,QAAkC,EAAE,EAAE,CACpE,KAAK,EAAE,OAAoB,EAAE,IAAkB,EAAE,EAAE;IACjD,MAAM,GAAG,GAAG,UAAU,CAAC,OAAO,CAAC,CAAC;IAChC,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IAC1B,MAAM,MAAM,GAAG;QACb,eAAe,EAAE,OAAO;KACzB,CAAC;IAEF,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;QACvB,OAAO,CAAC,IAAI,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAClD,QAAQ,CAAC,OAAO,CAAC,OAAO,EAAE,GAAG,EAAE,MAAM,CAAC,CACvC,CAAC,CAAC;KACJ;SAAM;QACL,OAAO,CAAC,IAAI,GAAG,MAAM,QAAQ,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC;KAC1D;IAED,OAAO,IAAI,EAAE,CAAC;AAChB,CAAC,CAAC;AAjBS,QAAA,WAAW,eAiBpB;AAEG,MAAM,aAAa,GAAG,CAAK,QAAkC,EAAE,EAAE,CACtE,KAAK,EAAE,OAAoB,EAAE,IAAkB,EAAE,EAAE;;IACjD,MAAM,EAAE,QAAQ,EAAE,UAAU,EAAE,GAAG,KAAK,EAAE,GAAG,CAAA,MAAA,OAAO,CAAC,MAAM,0CAAE,KAAK,KAAI,EAAE,CAAC;IACvE,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC;IACnC,MAAM,MAAM,GAAG;QACb,eAAe,EAAE,OAAO;QACxB,GAAG,OAAO;QACV,UAAU;KACX,CAAC;IAEF,OAAO,CAAC,MAAM,GAAG;QACf,GAAG,OAAO,CAAC,MAAM;QACjB,KAAK;KACN,CAAA;IAED,MAAM,IAAI,EAAE,CAAC;IAEb,MAAM,GAAG,GAAG,UAAU,CAAC,OAAO,CAAC,CAAC;IAChC,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,KAAK,MAAM,IAAI,OAAO,CAAC,MAAM,CAAC,IAAI;QAC3D,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI;QACrB,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC;IAEnB,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;QACvB,OAAO,CAAC,MAAM,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CACpD,QAAQ,CAAC,OAAO,CAAC,OAAO,EAAE,GAAG,EAAE,MAAM,CAAC,CACvC,CAAC,CAAC;KACJ;SAAM;QACL,OAAO,CAAC,MAAM,GAAG,MAAM,QAAQ,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC;KAC5D;AACH,CAAC,CAAC;AA7BS,QAAA,aAAa,iBA6BtB;AAEG,MAAM,aAAa,GAAG,CAAC,MAAmB,EAAE,EAAE,CACnD,KAAK,EAAE,OAAoB,EAAE,IAAkB,EAAE,EAAE;;IACjD,MAAM,IAAI,GAAG,CAAA,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,MAAM,0CAAE,KAAK,KAAI,EAAE,CAAC;IAE1C,IAAI;QACF,MAAM,KAAK,GAAG,MAAM,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QAE1C,OAAO,CAAC,MAAM,GAAG;YACf,GAAG,OAAO,CAAC,MAAM;YACjB,KAAK;SACN,CAAA;QAED,OAAO,IAAI,EAAE,CAAC;KACf;IAAC,OAAO,KAAU,EAAE;QACnB,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,gBAAU,CAAC,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;KACzE;AACH,CAAC,CAAC;AAhBS,QAAA,aAAa,iBAgBtB;AAEG,MAAM,YAAY,GAAG,CAAC,MAAmB,EAAE,EAAE,CAClD,KAAK,EAAE,OAAoB,EAAE,IAAkB,EAAE,EAAE;IACjD,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IAE1B,IAAI;QACF,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YACvB,OAAO,CAAC,IAAI,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAClD,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,CACzB,CAAC,CAAC;SACJ;aAAM;YACL,OAAO,CAAC,IAAI,GAAG,MAAM,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;SAC5C;KACF;IAAC,OAAO,KAAU,EAAE;QACnB,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,gBAAU,CAAC,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;KACzE;IAED,OAAO,IAAI,EAAE,CAAC;AAChB,CAAC,CAAC;AAjBS,QAAA,YAAY,gBAiBrB"}

package/lib/index.d.ts

@@ -1,9 +1,13 @@
-import { SchemaMeta, SchemaProperties, Schema } from './core';
-import { propertyDecorator } from './decorator';
-export * from './core';
-export * from './decorator';
-export * from './resolve';
-export declare const property: typeof propertyDecorator;
-export declare function schema(schemaMeta: Partial<SchemaMeta>, schemaProperties: SchemaProperties): Schema;
-export declare function schema(target: any, schemaMeta: Partial<SchemaMeta>, schemaProperties: SchemaProperties): Schema;
-export declare function schema(schemaMeta: Partial<SchemaMeta>): (target: any) => void;
+import { ResolverStatus } from './resolver';
+export * from './schema';
+export * from './resolver';
+export * from './hooks';
+export * from './query';
+export declare type Infer<S extends {
+    _type: any;
+}> = S['_type'];
+declare module '@feathersjs/feathers/lib/declarations' {
+    interface Params {
+        resolve?: ResolverStatus<any, HookContext>;
+    }
+}

package/lib/index.js

@@ -1,23 +1,17 @@
 "use strict";
-function __export(m) {
-    for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
-}
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-const core_1 = require("./core");
-const decorator_1 = require("./decorator");
-__export(require("./core"));
-__export(require("./decorator"));
-__export(require("./resolve"));
-exports.property = decorator_1.propertyDecorator;
-function schema(...args) {
-    if (args.length === 1) {
-        return decorator_1.schemaDecorator(args[0]);
-    }
-    const target = args.length === 3 ? args.shift() : null;
-    const [schemaMeta, schemaProperties] = args;
-    const schema = new core_1.Schema(schemaMeta, schemaProperties);
-    core_1.setSchema(schema, target);
-    return schema;
-}
-exports.schema = schema;
+__exportStar(require("./schema"), exports);
+__exportStar(require("./resolver"), exports);
+__exportStar(require("./hooks"), exports);
+__exportStar(require("./query"), exports);
 //# sourceMappingURL=index.js.map

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;AAAA,iCAAyE;AACzE,2CAAiE;AAEjE,4BAAuB;AACvB,iCAA4B;AAC5B,+BAA0B;AAEb,QAAA,QAAQ,GAAG,6BAAiB,CAAC;AAK1C,SAAgB,MAAM,CAAE,GAAG,IAAW;IACpC,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE;QACrB,OAAO,2BAAe,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;KACjC;IAED,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;IACvD,MAAM,CAAE,UAAU,EAAE,gBAAgB,CAAE,GAAG,IAAI,CAAC;IAC9C,MAAM,MAAM,GAAG,IAAI,aAAM,CAAC,UAAU,EAAE,gBAAgB,CAAC,CAAC;IAExD,gBAAS,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAE1B,OAAO,MAAM,CAAC;AAChB,CAAC;AAZD,wBAYC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAEA,2CAAyB;AACzB,6CAA2B;AAC3B,0CAAwB;AACxB,0CAAwB"}

package/lib/query.d.ts

@@ -0,0 +1,29 @@
+import { JSONSchema } from 'json-schema-to-ts';
+export declare const queryProperty: <T extends JSONSchema>(definition: T) => {
+    readonly oneOf: readonly [T, {
+        readonly type: "object";
+        readonly additionalProperties: false;
+        readonly properties: {
+            readonly $gt: T;
+            readonly $gte: T;
+            readonly $lt: T;
+            readonly $lte: T;
+            readonly $ne: T;
+            readonly $in: {
+                readonly type: "array";
+                readonly items: T;
+            };
+            readonly $nin: {
+                readonly type: "array";
+                readonly items: 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

@@ -0,0 +1,37 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.queryArray = exports.queryProperty = void 0;
+const queryProperty = (definition) => ({
+    oneOf: [
+        definition,
+        {
+            type: 'object',
+            additionalProperties: false,
+            properties: {
+                $gt: definition,
+                $gte: definition,
+                $lt: definition,
+                $lte: definition,
+                $ne: definition,
+                $in: {
+                    type: 'array',
+                    items: definition
+                },
+                $nin: {
+                    type: 'array',
+                    items: 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

@@ -0,0 +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"}

package/lib/resolver.d.ts

@@ -0,0 +1,24 @@
+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 PropertyResolverMap<T, C> = {
+    [key in keyof T]?: PropertyResolver<T, T[key], C>;
+};
+export interface ResolverConfig<T, C> {
+    schema?: Schema<any>;
+    validate?: 'before' | 'after' | false;
+    properties: PropertyResolverMap<T, C>;
+}
+export interface ResolverStatus<T, C> {
+    path: string[];
+    originalContext?: C;
+    properties?: (keyof T)[];
+    stack: PropertyResolver<T, any, C>[];
+}
+export declare class Resolver<T, C> {
+    options: ResolverConfig<T, C>;
+    readonly _type: T;
+    constructor(options: ResolverConfig<T, C>);
+    resolveProperty<D, K extends keyof T>(name: K, data: D, context: C, status?: Partial<ResolverStatus<T, C>>): Promise<T[K]>;
+    resolve<D>(_data: D, context: C, status?: Partial<ResolverStatus<T, C>>): Promise<T>;
+}
+export declare function resolve<T, C>(options: ResolverConfig<T, C>): Resolver<T, C>;

package/lib/resolver.js

@@ -0,0 +1,70 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolve = exports.Resolver = void 0;
+const errors_1 = require("@feathersjs/errors");
+class Resolver {
+    constructor(options) {
+        this.options = options;
+    }
+    async resolveProperty(name, data, context, status = {}) {
+        const resolver = this.options.properties[name];
+        const value = data[name];
+        const { path = [], stack = [] } = status || {};
+        // This prevents circular dependencies
+        if (stack.includes(resolver)) {
+            return undefined;
+        }
+        const resolverStatus = {
+            ...status,
+            path: [...path, name],
+            stack: [...stack, resolver]
+        };
+        return resolver(value, data, context, resolverStatus);
+    }
+    async resolve(_data, context, status) {
+        const { properties: resolvers, schema, validate } = this.options;
+        const data = schema && validate === 'before' ? await schema.validate(_data) : _data;
+        const propertyList = (Array.isArray(status === null || status === void 0 ? void 0 : status.properties)
+            ? status === null || status === void 0 ? void 0 : status.properties
+            // By default get all data and resolver keys but remove duplicates
+            : [...new Set(Object.keys(data).concat(Object.keys(resolvers)))]);
+        const result = {};
+        const errors = {};
+        let hasErrors = false;
+        // Not the most elegant but better performance
+        await Promise.all(propertyList.map(async (name) => {
+            const value = data[name];
+            if (resolvers[name]) {
+                try {
+                    const resolved = await this.resolveProperty(name, data, context, status);
+                    if (resolved !== undefined) {
+                        result[name] = resolved;
+                    }
+                }
+                catch (error) {
+                    // TODO add error stacks
+                    const convertedError = typeof error.toJSON === 'function'
+                        ? error.toJSON()
+                        : { message: error.message || error };
+                    errors[name] = convertedError;
+                    hasErrors = true;
+                }
+            }
+            else if (value !== undefined) {
+                result[name] = value;
+            }
+        }));
+        if (hasErrors) {
+            throw new errors_1.BadRequest(`Error resolving data ${status === null || status === void 0 ? void 0 : status.properties.join('.')}`, errors);
+        }
+        return schema && validate === 'after'
+            ? await schema.validate(result)
+            : result;
+    }
+}
+exports.Resolver = Resolver;
+function resolve(options) {
+    return new Resolver(options);
+}
+exports.resolve = resolve;
+//# sourceMappingURL=resolver.js.map

package/lib/resolver.js.map

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

package/lib/schema.d.ts

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

package/lib/schema.js

@@ -0,0 +1,42 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.schema = exports.Schema = exports.AJV = void 0;
+const ajv_1 = __importDefault(require("ajv"));
+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({
+            $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);
+    }
+    toJSON() {
+        return this.definition;
+    }
+}
+exports.Schema = Schema;
+function schema(definition) {
+    return new Schema(definition);
+}
+exports.schema = schema;
+//# sourceMappingURL=schema.js.map

package/lib/schema.js.map

@@ -0,0 +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"}

package/package.json

@@ -1,39 +1,47 @@
 {
   "name": "@feathersjs/schema",
-  "version": "0.0.1-alpha.4",
-  "description": "Core Feathers schema",
+  "description": "A common data schema definition format",
+  "version": "5.0.0-pre.15",
   "homepage": "https://feathersjs.com",
+  "main": "lib/",
   "keywords": [
-    "feathers"
+    "feathers",
+    "feathers-plugin"
   ],
   "license": "MIT",
   "funding": {
-    "type": "opencollective",
-    "url": "https://opencollective.com/feathers"
+    "type": "github",
+    "url": "https://github.com/sponsors/daffl"
   },
   "repository": {
     "type": "git",
-    "url": "git://github.com/feathersjs/schema.git"
+    "url": "git://github.com/feathersjs/feathers.git"
   },
   "author": {
-    "name": "Feathers contributor",
+    "name": "Feathers contributors",
     "email": "hello@feathersjs.com",
     "url": "https://feathersjs.com"
   },
   "contributors": [],
   "bugs": {
-    "url": "https://github.com/feathersjs/schema/issues"
+    "url": "https://github.com/feathersjs/feathers/issues"
   },
   "engines": {
     "node": ">= 12"
   },
-  "main": "lib/",
-  "types": "lib/",
+  "files": [
+    "CHANGELOG.md",
+    "LICENSE",
+    "README.md",
+    "src/**",
+    "lib/**",
+    "*.d.ts",
+    "*.js"
+  ],
   "scripts": {
     "prepublish": "npm run compile",
     "compile": "shx rm -rf lib/ && tsc",
-    "test": "npm run compile && npm run mocha",
-    "mocha": "mocha --opts ../../mocha.opts --recursive test/**.test.ts test/**/*.test.ts"
+    "test": "mocha --config ../../.mocharc.json --recursive test/**.test.ts test/**/*.test.ts"
   },
   "directories": {
     "lib": "lib"
@@ -42,17 +50,20 @@
     "access": "public"
   },
   "dependencies": {
-    "@hapi/joi": "^17.0.2",
-    "@types/hapi__joi": "^16.0.3",
-    "reflect-metadata": "^0.1.13"
+    "@feathersjs/errors": "^5.0.0-pre.15",
+    "@feathersjs/feathers": "^5.0.0-pre.15",
+    "@types/json-schema": "^7.0.9",
+    "ajv": "^8.6.3",
+    "json-schema": "^0.3.0",
+    "json-schema-to-ts": "^1.6.4"
   },
   "devDependencies": {
-    "@types/mocha": "^5.2.7",
-    "@types/node": "^13.1.6",
-    "mocha": "^7.0.1",
-    "shx": "^0.3.2",
-    "ts-node": "^8.4.1",
-    "typescript": "^3.6.4"
-  },
-  "gitHead": "b89b2115449d82b94a5c54017330d6ba17f2f8f8"
+    "@feathersjs/memory": "^5.0.0-pre.15",
+    "@types/mocha": "^9.0.0",
+    "@types/node": "^16.11.6",
+    "mocha": "^9.1.3",
+    "shx": "^0.3.3",
+    "typescript": "^4.4.4"
+  },
+  "gitHead": "8008bf4f8529a2a40b6a2f976c1f43ae13675693"
 }