@feathersjs/schema 5.0.0-pre.16 → 5.0.0-pre.19
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +42 -0
- package/LICENSE +1 -1
- package/README.md +2 -2
- package/lib/hooks.d.ts +5 -5
- package/lib/hooks.js +48 -30
- package/lib/hooks.js.map +1 -1
- package/lib/index.js +5 -1
- package/lib/index.js.map +1 -1
- package/lib/query.d.ts +2 -3
- package/lib/query.js +1 -1
- package/lib/resolver.d.ts +2 -2
- package/lib/resolver.js +2 -1
- package/lib/resolver.js.map +1 -1
- package/lib/schema.d.ts +7 -3
- package/lib/schema.js +8 -7
- package/lib/schema.js.map +1 -1
- package/package.json +18 -15
- package/src/hooks.ts +64 -38
- package/src/query.ts +1 -1
- package/src/resolver.ts +6 -4
- package/src/schema.ts +11 -5
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,48 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
+
# [5.0.0-pre.19](https://github.com/feathersjs/feathers/compare/v5.0.0-pre.18...v5.0.0-pre.19) (2022-05-01)
|
|
7
|
+
|
|
8
|
+
|
|
9
|
+
### Features
|
|
10
|
+
|
|
11
|
+
* **schema:** Allow hooks to run resolvers in sequence ([#2609](https://github.com/feathersjs/feathers/issues/2609)) ([d85c507](https://github.com/feathersjs/feathers/commit/d85c507c76d07e48fc8e7e28ff7de0ef435e0ef8))
|
|
12
|
+
* **typescript:** Improve adapter typings ([#2605](https://github.com/feathersjs/feathers/issues/2605)) ([3b2ca0a](https://github.com/feathersjs/feathers/commit/3b2ca0a6a8e03e8390272c4d7e930b4bffdaacf5))
|
|
13
|
+
* **typescript:** Improve params and query typeability ([#2600](https://github.com/feathersjs/feathers/issues/2600)) ([df28b76](https://github.com/feathersjs/feathers/commit/df28b7619161f1df5e700326f52cca1a92dc5d28))
|
|
14
|
+
|
|
15
|
+
|
|
16
|
+
|
|
17
|
+
|
|
18
|
+
|
|
19
|
+
# [5.0.0-pre.18](https://github.com/feathersjs/feathers/compare/v5.0.0-pre.17...v5.0.0-pre.18) (2022-04-11)
|
|
20
|
+
|
|
21
|
+
|
|
22
|
+
### Bug Fixes
|
|
23
|
+
|
|
24
|
+
* **schema:** result resolver correctly resolves paginated find result ([#2594](https://github.com/feathersjs/feathers/issues/2594)) ([6511e45](https://github.com/feathersjs/feathers/commit/6511e45bd0624f1a629530719709f4b27fecbe0b))
|
|
25
|
+
|
|
26
|
+
|
|
27
|
+
### Features
|
|
28
|
+
|
|
29
|
+
* **configuration:** Allow app configuration to be validated against a schema ([#2590](https://github.com/feathersjs/feathers/issues/2590)) ([a268f86](https://github.com/feathersjs/feathers/commit/a268f86da92a8ada14ed11ab456aac0a4bba5bb0))
|
|
30
|
+
|
|
31
|
+
|
|
32
|
+
|
|
33
|
+
|
|
34
|
+
|
|
35
|
+
# [5.0.0-pre.17](https://github.com/feathersjs/feathers/compare/v5.0.0-pre.16...v5.0.0-pre.17) (2022-02-15)
|
|
36
|
+
|
|
37
|
+
|
|
38
|
+
### Bug Fixes
|
|
39
|
+
|
|
40
|
+
* **hooks:** Allow all built-in hooks to be used the async and regular way ([#2559](https://github.com/feathersjs/feathers/issues/2559)) ([8f9f631](https://github.com/feathersjs/feathers/commit/8f9f631e0ce89de349207db72def84e7ab496a4a))
|
|
41
|
+
* **queryProperty:** allow compound oneOf ([#2545](https://github.com/feathersjs/feathers/issues/2545)) ([3077d2d](https://github.com/feathersjs/feathers/commit/3077d2d896a38d579ce4d5b530e21ad332bcf221))
|
|
42
|
+
* **schema:** Properly handle resolver errors ([#2540](https://github.com/feathersjs/feathers/issues/2540)) ([31fbdff](https://github.com/feathersjs/feathers/commit/31fbdff8bd848ac7e0eda56e307ac34b1bfcf17f))
|
|
43
|
+
|
|
44
|
+
|
|
45
|
+
|
|
46
|
+
|
|
47
|
+
|
|
6
48
|
# [5.0.0-pre.16](https://github.com/feathersjs/feathers/compare/v5.0.0-pre.15...v5.0.0-pre.16) (2022-01-12)
|
|
7
49
|
|
|
8
50
|
|
package/LICENSE
CHANGED
package/README.md
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
# @feathersjs/schema
|
|
2
2
|
|
|
3
3
|
[](https://github.com/feathersjs/feathers/actions?query=workflow%3ACI)
|
|
4
|
-
[](https://david-dm.org/feathersjs/feathers?path=packages/schema)
|
|
5
4
|
[](https://www.npmjs.com/package/@feathersjs/schema)
|
|
5
|
+
[](https://discord.gg/qa8kez8QBx)
|
|
6
6
|
|
|
7
7
|
> A common data schema definition format
|
|
8
8
|
|
|
@@ -18,6 +18,6 @@ Refer to the [Feathers documentation](https://docs.feathersjs.com) for more deta
|
|
|
18
18
|
|
|
19
19
|
## License
|
|
20
20
|
|
|
21
|
-
Copyright (c)
|
|
21
|
+
Copyright (c) 2022 [Feathers contributors](https://github.com/feathersjs/feathers/graphs/contributors)
|
|
22
22
|
|
|
23
23
|
Licensed under the [MIT license](LICENSE).
|
package/lib/hooks.d.ts
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { HookContext, NextFunction } from '@feathersjs/feathers';
|
|
2
2
|
import { Resolver } from './resolver';
|
|
3
3
|
import { Schema } from './schema';
|
|
4
|
-
export declare const resolveQuery: <T>(
|
|
5
|
-
export declare const resolveData: <T>(
|
|
6
|
-
export declare const resolveResult: <T>(
|
|
7
|
-
export declare const validateQuery: (schema: Schema<any>) => (context: HookContext, next
|
|
8
|
-
export declare const validateData: (schema: Schema<any>) => (context: HookContext, next
|
|
4
|
+
export declare const resolveQuery: <T>(...resolvers: Resolver<T, HookContext<import("@feathersjs/feathers").Application<any, any>, any>>[]) => (context: HookContext, next?: NextFunction) => Promise<any>;
|
|
5
|
+
export declare const resolveData: <T>(...resolvers: Resolver<T, HookContext<import("@feathersjs/feathers").Application<any, any>, any>>[]) => (context: HookContext, next?: NextFunction) => Promise<any>;
|
|
6
|
+
export declare const resolveResult: <T>(...resolvers: Resolver<T, HookContext<import("@feathersjs/feathers").Application<any, any>, any>>[]) => (context: HookContext, next?: NextFunction) => Promise<void>;
|
|
7
|
+
export declare const validateQuery: (schema: Schema<any>) => (context: HookContext, next?: NextFunction) => Promise<any>;
|
|
8
|
+
export declare const validateData: (schema: Schema<any>) => (context: HookContext, next?: NextFunction) => Promise<any>;
|
package/lib/hooks.js
CHANGED
|
@@ -11,58 +11,72 @@ const getContext = (context) => {
|
|
|
11
11
|
}
|
|
12
12
|
};
|
|
13
13
|
};
|
|
14
|
-
const
|
|
14
|
+
const runResolvers = async (resolvers, data, ctx, status) => {
|
|
15
|
+
let current = data;
|
|
16
|
+
for (const resolver of resolvers) {
|
|
17
|
+
current = await resolver.resolve(current, ctx, status);
|
|
18
|
+
}
|
|
19
|
+
return current;
|
|
20
|
+
};
|
|
21
|
+
const resolveQuery = (...resolvers) => async (context, next) => {
|
|
15
22
|
var _a;
|
|
16
23
|
const ctx = getContext(context);
|
|
17
24
|
const data = ((_a = context === null || context === void 0 ? void 0 : context.params) === null || _a === void 0 ? void 0 : _a.query) || {};
|
|
18
|
-
const query = await
|
|
19
|
-
originalContext: context
|
|
20
|
-
});
|
|
25
|
+
const query = await runResolvers(resolvers, data, ctx);
|
|
21
26
|
context.params = {
|
|
22
27
|
...context.params,
|
|
23
28
|
query
|
|
24
29
|
};
|
|
25
|
-
|
|
30
|
+
if (typeof next === 'function') {
|
|
31
|
+
return next();
|
|
32
|
+
}
|
|
26
33
|
};
|
|
27
34
|
exports.resolveQuery = resolveQuery;
|
|
28
|
-
const resolveData = (
|
|
35
|
+
const resolveData = (...resolvers) => async (context, next) => {
|
|
29
36
|
const ctx = getContext(context);
|
|
30
37
|
const data = context.data;
|
|
31
38
|
const status = {
|
|
32
39
|
originalContext: context
|
|
33
40
|
};
|
|
34
41
|
if (Array.isArray(data)) {
|
|
35
|
-
context.data = await Promise.all(data.map(current =>
|
|
42
|
+
context.data = await Promise.all(data.map(current => runResolvers(resolvers, current, ctx, status)));
|
|
36
43
|
}
|
|
37
44
|
else {
|
|
38
|
-
context.data = await
|
|
45
|
+
context.data = await runResolvers(resolvers, data, ctx, status);
|
|
46
|
+
}
|
|
47
|
+
if (typeof next === 'function') {
|
|
48
|
+
return next();
|
|
39
49
|
}
|
|
40
|
-
return next();
|
|
41
50
|
};
|
|
42
51
|
exports.resolveData = resolveData;
|
|
43
|
-
const resolveResult = (
|
|
52
|
+
const resolveResult = (...resolvers) => async (context, next) => {
|
|
44
53
|
var _a;
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
54
|
+
if (typeof next === 'function') {
|
|
55
|
+
const { $resolve: properties, ...query } = ((_a = context.params) === null || _a === void 0 ? void 0 : _a.query) || {};
|
|
56
|
+
const resolve = {
|
|
57
|
+
originalContext: context,
|
|
58
|
+
...context.params.resolve,
|
|
59
|
+
properties
|
|
60
|
+
};
|
|
61
|
+
context.params = {
|
|
62
|
+
...context.params,
|
|
63
|
+
resolve,
|
|
64
|
+
query
|
|
65
|
+
};
|
|
66
|
+
await next();
|
|
67
|
+
}
|
|
57
68
|
const ctx = getContext(context);
|
|
58
|
-
const
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
69
|
+
const status = context.params.resolve;
|
|
70
|
+
const isPaginated = context.method === 'find' && context.result.data;
|
|
71
|
+
const data = isPaginated ? context.result.data : context.result;
|
|
72
|
+
const result = Array.isArray(data) ?
|
|
73
|
+
await Promise.all(data.map(async (current) => runResolvers(resolvers, current, ctx, status))) :
|
|
74
|
+
await runResolvers(resolvers, data, ctx, status);
|
|
75
|
+
if (isPaginated) {
|
|
76
|
+
context.result.data = result;
|
|
63
77
|
}
|
|
64
78
|
else {
|
|
65
|
-
context.result =
|
|
79
|
+
context.result = result;
|
|
66
80
|
}
|
|
67
81
|
};
|
|
68
82
|
exports.resolveResult = resolveResult;
|
|
@@ -75,7 +89,9 @@ const validateQuery = (schema) => async (context, next) => {
|
|
|
75
89
|
...context.params,
|
|
76
90
|
query
|
|
77
91
|
};
|
|
78
|
-
|
|
92
|
+
if (typeof next === 'function') {
|
|
93
|
+
return next();
|
|
94
|
+
}
|
|
79
95
|
}
|
|
80
96
|
catch (error) {
|
|
81
97
|
throw (error.ajv ? new lib_1.BadRequest(error.message, error.errors) : error);
|
|
@@ -95,7 +111,9 @@ const validateData = (schema) => async (context, next) => {
|
|
|
95
111
|
catch (error) {
|
|
96
112
|
throw (error.ajv ? new lib_1.BadRequest(error.message, error.errors) : error);
|
|
97
113
|
}
|
|
98
|
-
|
|
114
|
+
if (typeof next === 'function') {
|
|
115
|
+
return next();
|
|
116
|
+
}
|
|
99
117
|
};
|
|
100
118
|
exports.validateData = validateData;
|
|
101
119
|
//# sourceMappingURL=hooks.js.map
|
package/lib/hooks.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
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,
|
|
1
|
+
{"version":3,"file":"hooks.js","sourceRoot":"","sources":["../src/hooks.ts"],"names":[],"mappings":"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"}
|
package/lib/index.js
CHANGED
|
@@ -1,7 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
3
|
if (k2 === undefined) k2 = k;
|
|
4
|
-
Object.
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
5
9
|
}) : (function(o, m, k, k2) {
|
|
6
10
|
if (k2 === undefined) k2 = k;
|
|
7
11
|
o[k2] = m[k];
|
package/lib/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"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
CHANGED
|
@@ -1,6 +1,5 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
readonly oneOf: readonly [T, {
|
|
1
|
+
export declare const queryProperty: <T extends import("json-schema-to-ts").JSONSchema7>(definition: T) => {
|
|
2
|
+
readonly anyOf: readonly [T, {
|
|
4
3
|
readonly type: "object";
|
|
5
4
|
readonly additionalProperties: false;
|
|
6
5
|
readonly properties: {
|
package/lib/query.js
CHANGED
package/lib/resolver.d.ts
CHANGED
|
@@ -4,14 +4,14 @@ export declare type PropertyResolverMap<T, C> = {
|
|
|
4
4
|
[key in keyof T]?: PropertyResolver<T, T[key], C>;
|
|
5
5
|
};
|
|
6
6
|
export interface ResolverConfig<T, C> {
|
|
7
|
-
schema?: Schema<
|
|
7
|
+
schema?: Schema<T>;
|
|
8
8
|
validate?: 'before' | 'after' | false;
|
|
9
9
|
properties: PropertyResolverMap<T, C>;
|
|
10
10
|
}
|
|
11
11
|
export interface ResolverStatus<T, C> {
|
|
12
12
|
path: string[];
|
|
13
13
|
originalContext?: C;
|
|
14
|
-
properties?:
|
|
14
|
+
properties?: string[];
|
|
15
15
|
stack: PropertyResolver<T, any, C>[];
|
|
16
16
|
}
|
|
17
17
|
export declare class Resolver<T, C> {
|
package/lib/resolver.js
CHANGED
|
@@ -55,7 +55,8 @@ class Resolver {
|
|
|
55
55
|
}
|
|
56
56
|
}));
|
|
57
57
|
if (hasErrors) {
|
|
58
|
-
|
|
58
|
+
const propertyName = (status === null || status === void 0 ? void 0 : status.properties) ? ` ${status.properties.join('.')}` : '';
|
|
59
|
+
throw new errors_1.BadRequest('Error resolving data' + propertyName, errors);
|
|
59
60
|
}
|
|
60
61
|
return schema && validate === 'after'
|
|
61
62
|
? await schema.validate(result)
|
package/lib/resolver.js.map
CHANGED
|
@@ -1 +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,IAAW,EAAE,OAAO,EAAE,cAAc,CAAC,CAAC;IAC/D,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,
|
|
1
|
+
{"version":3,"file":"resolver.js","sourceRoot":"","sources":["../src/resolver.ts"],"names":[],"mappings":"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"}
|
package/lib/schema.d.ts
CHANGED
|
@@ -1,11 +1,15 @@
|
|
|
1
1
|
import Ajv, { AsyncValidateFunction, ValidateFunction } from 'ajv';
|
|
2
2
|
import { FromSchema, JSONSchema } from 'json-schema-to-ts';
|
|
3
|
-
export declare const
|
|
3
|
+
export declare const DEFAULT_AJV: Ajv;
|
|
4
|
+
export { Ajv };
|
|
4
5
|
export declare type JSONSchemaDefinition = JSONSchema & {
|
|
5
6
|
$id: string;
|
|
6
7
|
$async?: boolean;
|
|
7
8
|
};
|
|
8
|
-
export
|
|
9
|
+
export interface Schema<T> {
|
|
10
|
+
validate<X = T>(...args: Parameters<ValidateFunction<X>>): Promise<X>;
|
|
11
|
+
}
|
|
12
|
+
export declare class SchemaWrapper<S extends JSONSchemaDefinition> implements Schema<FromSchema<S>> {
|
|
9
13
|
definition: S;
|
|
10
14
|
ajv: Ajv;
|
|
11
15
|
validator: AsyncValidateFunction;
|
|
@@ -14,4 +18,4 @@ export declare class Schema<S extends JSONSchemaDefinition> {
|
|
|
14
18
|
validate<T = FromSchema<S>>(...args: Parameters<ValidateFunction<T>>): Promise<T>;
|
|
15
19
|
toJSON(): S;
|
|
16
20
|
}
|
|
17
|
-
export declare function schema<S extends JSONSchemaDefinition>(definition: S, ajv?: Ajv):
|
|
21
|
+
export declare function schema<S extends JSONSchemaDefinition>(definition: S, ajv?: Ajv): SchemaWrapper<S>;
|
package/lib/schema.js
CHANGED
|
@@ -3,14 +3,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.schema = exports.
|
|
6
|
+
exports.schema = exports.SchemaWrapper = exports.Ajv = exports.DEFAULT_AJV = void 0;
|
|
7
7
|
const ajv_1 = __importDefault(require("ajv"));
|
|
8
|
+
exports.Ajv = ajv_1.default;
|
|
8
9
|
const errors_1 = require("@feathersjs/errors");
|
|
9
|
-
exports.
|
|
10
|
+
exports.DEFAULT_AJV = new ajv_1.default({
|
|
10
11
|
coerceTypes: true
|
|
11
12
|
});
|
|
12
|
-
class
|
|
13
|
-
constructor(definition, ajv = exports.
|
|
13
|
+
class SchemaWrapper {
|
|
14
|
+
constructor(definition, ajv = exports.DEFAULT_AJV) {
|
|
14
15
|
this.definition = definition;
|
|
15
16
|
this.ajv = ajv;
|
|
16
17
|
this.validator = this.ajv.compile({
|
|
@@ -31,9 +32,9 @@ class Schema {
|
|
|
31
32
|
return this.definition;
|
|
32
33
|
}
|
|
33
34
|
}
|
|
34
|
-
exports.
|
|
35
|
-
function schema(definition, ajv = exports.
|
|
36
|
-
return new
|
|
35
|
+
exports.SchemaWrapper = SchemaWrapper;
|
|
36
|
+
function schema(definition, ajv = exports.DEFAULT_AJV) {
|
|
37
|
+
return new SchemaWrapper(definition, ajv);
|
|
37
38
|
}
|
|
38
39
|
exports.schema = schema;
|
|
39
40
|
//# sourceMappingURL=schema.js.map
|
package/lib/schema.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schema.js","sourceRoot":"","sources":["../src/schema.ts"],"names":[],"mappings":";;;;;;AAAA,8CAAmE;
|
|
1
|
+
{"version":3,"file":"schema.js","sourceRoot":"","sources":["../src/schema.ts"],"names":[],"mappings":";;;;;;AAAA,8CAAmE;AAQ1D,cARF,aAAG,CAQE;AANZ,+CAAgD;AAEnC,QAAA,WAAW,GAAG,IAAI,aAAG,CAAC;IACjC,WAAW,EAAE,IAAI;CAClB,CAAC,CAAC;AAUH,MAAa,aAAa;IAKxB,YAAoB,UAAa,EAAE,MAAW,mBAAW;QAArC,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,sCA0BC;AAED,SAAgB,MAAM,CAAmC,UAAa,EAAE,MAAW,mBAAW;IAC5F,OAAO,IAAI,aAAa,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC;AAC5C,CAAC;AAFD,wBAEC"}
|
package/package.json
CHANGED
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@feathersjs/schema",
|
|
3
3
|
"description": "A common data schema definition format",
|
|
4
|
-
"version": "5.0.0-pre.
|
|
4
|
+
"version": "5.0.0-pre.19",
|
|
5
5
|
"homepage": "https://feathersjs.com",
|
|
6
6
|
"main": "lib/",
|
|
7
|
+
"types": "lib/",
|
|
7
8
|
"keywords": [
|
|
8
9
|
"feathers",
|
|
9
10
|
"feathers-plugin"
|
|
@@ -15,7 +16,8 @@
|
|
|
15
16
|
},
|
|
16
17
|
"repository": {
|
|
17
18
|
"type": "git",
|
|
18
|
-
"url": "git://github.com/feathersjs/feathers.git"
|
|
19
|
+
"url": "git://github.com/feathersjs/feathers.git",
|
|
20
|
+
"directory": "packages/schema"
|
|
19
21
|
},
|
|
20
22
|
"author": {
|
|
21
23
|
"name": "Feathers contributors",
|
|
@@ -41,7 +43,8 @@
|
|
|
41
43
|
"scripts": {
|
|
42
44
|
"prepublish": "npm run compile",
|
|
43
45
|
"compile": "shx rm -rf lib/ && tsc",
|
|
44
|
-
"
|
|
46
|
+
"mocha": "mocha --config ../../.mocharc.json --recursive test/**.test.ts test/**/*.test.ts",
|
|
47
|
+
"test": "npm run compile && npm run mocha"
|
|
45
48
|
},
|
|
46
49
|
"directories": {
|
|
47
50
|
"lib": "lib"
|
|
@@ -50,21 +53,21 @@
|
|
|
50
53
|
"access": "public"
|
|
51
54
|
},
|
|
52
55
|
"dependencies": {
|
|
53
|
-
"@feathersjs/errors": "^5.0.0-pre.
|
|
54
|
-
"@feathersjs/feathers": "^5.0.0-pre.
|
|
55
|
-
"@types/json-schema": "^7.0.
|
|
56
|
-
"ajv": "^8.
|
|
56
|
+
"@feathersjs/errors": "^5.0.0-pre.19",
|
|
57
|
+
"@feathersjs/feathers": "^5.0.0-pre.19",
|
|
58
|
+
"@types/json-schema": "^7.0.11",
|
|
59
|
+
"ajv": "^8.11.0",
|
|
57
60
|
"json-schema": "^0.4.0",
|
|
58
|
-
"json-schema-to-ts": "^
|
|
61
|
+
"json-schema-to-ts": "^2.3.0"
|
|
59
62
|
},
|
|
60
63
|
"devDependencies": {
|
|
61
|
-
"@feathersjs/memory": "^5.0.0-pre.
|
|
62
|
-
"@types/mocha": "^9.
|
|
63
|
-
"@types/node": "^17.0.
|
|
64
|
+
"@feathersjs/memory": "^5.0.0-pre.19",
|
|
65
|
+
"@types/mocha": "^9.1.1",
|
|
66
|
+
"@types/node": "^17.0.31",
|
|
64
67
|
"ajv-formats": "^2.1.1",
|
|
65
|
-
"mocha": "^
|
|
66
|
-
"shx": "^0.3.
|
|
67
|
-
"typescript": "^4.
|
|
68
|
+
"mocha": "^10.0.0",
|
|
69
|
+
"shx": "^0.3.4",
|
|
70
|
+
"typescript": "^4.6.4"
|
|
68
71
|
},
|
|
69
|
-
"gitHead": "
|
|
72
|
+
"gitHead": "57f3e18bb62735e1869ffafee90286498738fdfa"
|
|
70
73
|
}
|
package/src/hooks.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { HookContext, NextFunction } from '@feathersjs/feathers';
|
|
2
2
|
import { BadRequest } from '../../errors/lib';
|
|
3
|
-
import { Resolver } from './resolver';
|
|
3
|
+
import { Resolver, ResolverStatus } from './resolver';
|
|
4
4
|
import { Schema } from './schema';
|
|
5
5
|
|
|
6
6
|
const getContext = (context: HookContext) => {
|
|
@@ -13,24 +13,39 @@ const getContext = (context: HookContext) => {
|
|
|
13
13
|
}
|
|
14
14
|
}
|
|
15
15
|
|
|
16
|
-
|
|
17
|
-
|
|
16
|
+
const runResolvers = async <T> (
|
|
17
|
+
resolvers: Resolver<T, HookContext>[],
|
|
18
|
+
data: any,
|
|
19
|
+
ctx: HookContext,
|
|
20
|
+
status?: Partial<ResolverStatus<T, HookContext>>
|
|
21
|
+
) => {
|
|
22
|
+
let current: any = data;
|
|
23
|
+
|
|
24
|
+
for (const resolver of resolvers) {
|
|
25
|
+
current = await resolver.resolve(current, ctx, status);
|
|
26
|
+
}
|
|
27
|
+
|
|
28
|
+
return current as T;
|
|
29
|
+
}
|
|
30
|
+
|
|
31
|
+
export const resolveQuery = <T> (...resolvers: Resolver<T, HookContext>[]) =>
|
|
32
|
+
async (context: HookContext, next?: NextFunction) => {
|
|
18
33
|
const ctx = getContext(context);
|
|
19
34
|
const data = context?.params?.query || {};
|
|
20
|
-
const query = await
|
|
21
|
-
originalContext: context
|
|
22
|
-
});
|
|
35
|
+
const query = await runResolvers(resolvers, data, ctx);
|
|
23
36
|
|
|
24
37
|
context.params = {
|
|
25
38
|
...context.params,
|
|
26
39
|
query
|
|
27
40
|
}
|
|
28
41
|
|
|
29
|
-
|
|
42
|
+
if (typeof next === 'function') {
|
|
43
|
+
return next();
|
|
44
|
+
}
|
|
30
45
|
};
|
|
31
46
|
|
|
32
|
-
export const resolveData = <T> (
|
|
33
|
-
async (context: HookContext, next
|
|
47
|
+
export const resolveData = <T> (...resolvers: Resolver<T, HookContext>[]) =>
|
|
48
|
+
async (context: HookContext, next?: NextFunction) => {
|
|
34
49
|
const ctx = getContext(context);
|
|
35
50
|
const data = context.data;
|
|
36
51
|
const status = {
|
|
@@ -39,48 +54,55 @@ export const resolveData = <T> (resolver: Resolver<T, HookContext>) =>
|
|
|
39
54
|
|
|
40
55
|
if (Array.isArray(data)) {
|
|
41
56
|
context.data = await Promise.all(data.map(current =>
|
|
42
|
-
|
|
57
|
+
runResolvers(resolvers, current, ctx, status)
|
|
43
58
|
));
|
|
44
59
|
} else {
|
|
45
|
-
context.data = await
|
|
60
|
+
context.data = await runResolvers(resolvers, data, ctx, status);
|
|
46
61
|
}
|
|
47
62
|
|
|
48
|
-
|
|
63
|
+
if (typeof next === 'function') {
|
|
64
|
+
return next();
|
|
65
|
+
}
|
|
49
66
|
};
|
|
50
67
|
|
|
51
|
-
export const resolveResult = <T> (
|
|
52
|
-
async (context: HookContext, next
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
68
|
+
export const resolveResult = <T> (...resolvers: Resolver<T, HookContext>[]) =>
|
|
69
|
+
async (context: HookContext, next?: NextFunction) => {
|
|
70
|
+
if (typeof next === 'function') {
|
|
71
|
+
const { $resolve: properties, ...query } = context.params?.query || {};
|
|
72
|
+
const resolve = {
|
|
73
|
+
originalContext: context,
|
|
74
|
+
...context.params.resolve,
|
|
75
|
+
properties
|
|
76
|
+
};
|
|
60
77
|
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
78
|
+
context.params = {
|
|
79
|
+
...context.params,
|
|
80
|
+
resolve,
|
|
81
|
+
query
|
|
82
|
+
}
|
|
65
83
|
|
|
66
|
-
|
|
84
|
+
await next();
|
|
85
|
+
}
|
|
67
86
|
|
|
68
87
|
const ctx = getContext(context);
|
|
69
|
-
const
|
|
70
|
-
? context.result.data
|
|
71
|
-
: context.result;
|
|
88
|
+
const status = context.params.resolve;
|
|
72
89
|
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
90
|
+
const isPaginated = context.method === 'find' && context.result.data;
|
|
91
|
+
const data = isPaginated ? context.result.data : context.result;
|
|
92
|
+
|
|
93
|
+
const result = Array.isArray(data) ?
|
|
94
|
+
await Promise.all(data.map(async current => runResolvers(resolvers, current, ctx, status))) :
|
|
95
|
+
await runResolvers(resolvers, data, ctx, status);
|
|
96
|
+
|
|
97
|
+
if (isPaginated) {
|
|
98
|
+
context.result.data = result;
|
|
77
99
|
} else {
|
|
78
|
-
context.result =
|
|
100
|
+
context.result = result;
|
|
79
101
|
}
|
|
80
102
|
};
|
|
81
103
|
|
|
82
104
|
export const validateQuery = (schema: Schema<any>) =>
|
|
83
|
-
async (context: HookContext, next
|
|
105
|
+
async (context: HookContext, next?: NextFunction) => {
|
|
84
106
|
const data = context?.params?.query || {};
|
|
85
107
|
|
|
86
108
|
try {
|
|
@@ -91,14 +113,16 @@ export const validateQuery = (schema: Schema<any>) =>
|
|
|
91
113
|
query
|
|
92
114
|
}
|
|
93
115
|
|
|
94
|
-
|
|
116
|
+
if (typeof next === 'function') {
|
|
117
|
+
return next();
|
|
118
|
+
}
|
|
95
119
|
} catch (error: any) {
|
|
96
120
|
throw (error.ajv ? new BadRequest(error.message, error.errors) : error);
|
|
97
121
|
}
|
|
98
122
|
};
|
|
99
123
|
|
|
100
124
|
export const validateData = (schema: Schema<any>) =>
|
|
101
|
-
async (context: HookContext, next
|
|
125
|
+
async (context: HookContext, next?: NextFunction) => {
|
|
102
126
|
const data = context.data;
|
|
103
127
|
|
|
104
128
|
try {
|
|
@@ -113,5 +137,7 @@ export const validateData = (schema: Schema<any>) =>
|
|
|
113
137
|
throw (error.ajv ? new BadRequest(error.message, error.errors) : error);
|
|
114
138
|
}
|
|
115
139
|
|
|
116
|
-
|
|
140
|
+
if (typeof next === 'function') {
|
|
141
|
+
return next();
|
|
142
|
+
}
|
|
117
143
|
};
|
package/src/query.ts
CHANGED
package/src/resolver.ts
CHANGED
|
@@ -13,7 +13,7 @@ export type PropertyResolverMap<T, C> = {
|
|
|
13
13
|
}
|
|
14
14
|
|
|
15
15
|
export interface ResolverConfig<T, C> {
|
|
16
|
-
schema?: Schema<
|
|
16
|
+
schema?: Schema<T>,
|
|
17
17
|
validate?: 'before'|'after'|false,
|
|
18
18
|
properties: PropertyResolverMap<T, C>
|
|
19
19
|
}
|
|
@@ -21,7 +21,7 @@ export interface ResolverConfig<T, C> {
|
|
|
21
21
|
export interface ResolverStatus<T, C> {
|
|
22
22
|
path: string[];
|
|
23
23
|
originalContext?: C;
|
|
24
|
-
properties?:
|
|
24
|
+
properties?: string[];
|
|
25
25
|
stack: PropertyResolver<T, any, C>[];
|
|
26
26
|
}
|
|
27
27
|
|
|
@@ -70,7 +70,7 @@ export class Resolver<T, C> {
|
|
|
70
70
|
|
|
71
71
|
// Not the most elegant but better performance
|
|
72
72
|
await Promise.all(propertyList.map(async name => {
|
|
73
|
-
const value = data[name];
|
|
73
|
+
const value = (data as any)[name];
|
|
74
74
|
|
|
75
75
|
if (resolvers[name]) {
|
|
76
76
|
try {
|
|
@@ -94,7 +94,9 @@ export class Resolver<T, C> {
|
|
|
94
94
|
}));
|
|
95
95
|
|
|
96
96
|
if (hasErrors) {
|
|
97
|
-
|
|
97
|
+
const propertyName = status?.properties ? ` ${status.properties.join('.')}` : '';
|
|
98
|
+
|
|
99
|
+
throw new BadRequest('Error resolving data' + propertyName, errors);
|
|
98
100
|
}
|
|
99
101
|
|
|
100
102
|
return schema && validate === 'after'
|
package/src/schema.ts
CHANGED
|
@@ -2,18 +2,24 @@ import Ajv, { AsyncValidateFunction, ValidateFunction } from 'ajv';
|
|
|
2
2
|
import { FromSchema, JSONSchema } from 'json-schema-to-ts';
|
|
3
3
|
import { BadRequest } from '@feathersjs/errors';
|
|
4
4
|
|
|
5
|
-
export const
|
|
5
|
+
export const DEFAULT_AJV = new Ajv({
|
|
6
6
|
coerceTypes: true
|
|
7
7
|
});
|
|
8
8
|
|
|
9
|
+
export { Ajv };
|
|
10
|
+
|
|
9
11
|
export type JSONSchemaDefinition = JSONSchema & { $id: string, $async?: boolean };
|
|
10
12
|
|
|
11
|
-
export
|
|
13
|
+
export interface Schema<T> {
|
|
14
|
+
validate <X = T> (...args: Parameters<ValidateFunction<X>>): Promise<X>;
|
|
15
|
+
}
|
|
16
|
+
|
|
17
|
+
export class SchemaWrapper<S extends JSONSchemaDefinition> implements Schema<FromSchema<S>> {
|
|
12
18
|
ajv: Ajv;
|
|
13
19
|
validator: AsyncValidateFunction;
|
|
14
20
|
readonly _type!: FromSchema<S>;
|
|
15
21
|
|
|
16
|
-
constructor (public definition: S, ajv: Ajv =
|
|
22
|
+
constructor (public definition: S, ajv: Ajv = DEFAULT_AJV) {
|
|
17
23
|
this.ajv = ajv;
|
|
18
24
|
this.validator = this.ajv.compile({
|
|
19
25
|
$async: true,
|
|
@@ -36,6 +42,6 @@ export class Schema<S extends JSONSchemaDefinition> {
|
|
|
36
42
|
}
|
|
37
43
|
}
|
|
38
44
|
|
|
39
|
-
export function schema <S extends JSONSchemaDefinition> (definition: S, ajv: Ajv =
|
|
40
|
-
return new
|
|
45
|
+
export function schema <S extends JSONSchemaDefinition> (definition: S, ajv: Ajv = DEFAULT_AJV) {
|
|
46
|
+
return new SchemaWrapper(definition, ajv);
|
|
41
47
|
}
|