@feathersjs/schema 5.0.0-pre.16 → 5.0.0-pre.17
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 +13 -0
- package/LICENSE +1 -1
- package/README.md +1 -2
- package/lib/hooks.d.ts +5 -5
- package/lib/hooks.js +27 -16
- package/lib/hooks.js.map +1 -1
- package/lib/query.d.ts +1 -1
- package/lib/query.js +1 -1
- package/lib/resolver.d.ts +2 -3
- package/lib/resolver.js +2 -1
- package/lib/resolver.js.map +1 -1
- package/package.json +12 -12
- package/src/hooks.ts +32 -21
- package/src/query.ts +1 -1
- package/src/resolver.ts +7 -4
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,19 @@
|
|
|
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.17](https://github.com/feathersjs/feathers/compare/v5.0.0-pre.16...v5.0.0-pre.17) (2022-02-15)
|
|
7
|
+
|
|
8
|
+
|
|
9
|
+
### Bug Fixes
|
|
10
|
+
|
|
11
|
+
* **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))
|
|
12
|
+
* **queryProperty:** allow compound oneOf ([#2545](https://github.com/feathersjs/feathers/issues/2545)) ([3077d2d](https://github.com/feathersjs/feathers/commit/3077d2d896a38d579ce4d5b530e21ad332bcf221))
|
|
13
|
+
* **schema:** Properly handle resolver errors ([#2540](https://github.com/feathersjs/feathers/issues/2540)) ([31fbdff](https://github.com/feathersjs/feathers/commit/31fbdff8bd848ac7e0eda56e307ac34b1bfcf17f))
|
|
14
|
+
|
|
15
|
+
|
|
16
|
+
|
|
17
|
+
|
|
18
|
+
|
|
6
19
|
# [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
20
|
|
|
8
21
|
|
package/LICENSE
CHANGED
package/README.md
CHANGED
|
@@ -1,7 +1,6 @@
|
|
|
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)
|
|
6
5
|
|
|
7
6
|
> A common data schema definition format
|
|
@@ -18,6 +17,6 @@ Refer to the [Feathers documentation](https://docs.feathersjs.com) for more deta
|
|
|
18
17
|
|
|
19
18
|
## License
|
|
20
19
|
|
|
21
|
-
Copyright (c)
|
|
20
|
+
Copyright (c) 2022 [Feathers contributors](https://github.com/feathersjs/feathers/graphs/contributors)
|
|
22
21
|
|
|
23
22
|
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>(resolver: Resolver<T, HookContext<import("@feathersjs/feathers").Application<any, any>, any>>) => (context: HookContext, next
|
|
5
|
-
export declare const resolveData: <T>(resolver: Resolver<T, HookContext<import("@feathersjs/feathers").Application<any, any>, any>>) => (context: HookContext, next
|
|
6
|
-
export declare const resolveResult: <T>(resolver: Resolver<T, HookContext<import("@feathersjs/feathers").Application<any, any>, any>>) => (context: HookContext, next
|
|
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>(resolver: Resolver<T, HookContext<import("@feathersjs/feathers").Application<any, any>, any>>) => (context: HookContext, next?: NextFunction) => Promise<any>;
|
|
5
|
+
export declare const resolveData: <T>(resolver: Resolver<T, HookContext<import("@feathersjs/feathers").Application<any, any>, any>>) => (context: HookContext, next?: NextFunction) => Promise<any>;
|
|
6
|
+
export declare const resolveResult: <T>(resolver: 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
|
@@ -22,7 +22,9 @@ const resolveQuery = (resolver) => async (context, next) => {
|
|
|
22
22
|
...context.params,
|
|
23
23
|
query
|
|
24
24
|
};
|
|
25
|
-
|
|
25
|
+
if (typeof next === 'function') {
|
|
26
|
+
return next();
|
|
27
|
+
}
|
|
26
28
|
};
|
|
27
29
|
exports.resolveQuery = resolveQuery;
|
|
28
30
|
const resolveData = (resolver) => async (context, next) => {
|
|
@@ -37,24 +39,29 @@ const resolveData = (resolver) => async (context, next) => {
|
|
|
37
39
|
else {
|
|
38
40
|
context.data = await resolver.resolve(data, ctx, status);
|
|
39
41
|
}
|
|
40
|
-
|
|
42
|
+
if (typeof next === 'function') {
|
|
43
|
+
return next();
|
|
44
|
+
}
|
|
41
45
|
};
|
|
42
46
|
exports.resolveData = resolveData;
|
|
43
47
|
const resolveResult = (resolver) => async (context, next) => {
|
|
44
48
|
var _a;
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
49
|
+
if (typeof next === 'function') {
|
|
50
|
+
const { $resolve: properties, ...query } = ((_a = context.params) === null || _a === void 0 ? void 0 : _a.query) || {};
|
|
51
|
+
const resolve = {
|
|
52
|
+
originalContext: context,
|
|
53
|
+
...context.params.resolve,
|
|
54
|
+
properties
|
|
55
|
+
};
|
|
56
|
+
context.params = {
|
|
57
|
+
...context.params,
|
|
58
|
+
resolve,
|
|
59
|
+
query
|
|
60
|
+
};
|
|
61
|
+
await next();
|
|
62
|
+
}
|
|
57
63
|
const ctx = getContext(context);
|
|
64
|
+
const status = context.params.resolve;
|
|
58
65
|
const data = context.method === 'find' && context.result.data
|
|
59
66
|
? context.result.data
|
|
60
67
|
: context.result;
|
|
@@ -75,7 +82,9 @@ const validateQuery = (schema) => async (context, next) => {
|
|
|
75
82
|
...context.params,
|
|
76
83
|
query
|
|
77
84
|
};
|
|
78
|
-
|
|
85
|
+
if (typeof next === 'function') {
|
|
86
|
+
return next();
|
|
87
|
+
}
|
|
79
88
|
}
|
|
80
89
|
catch (error) {
|
|
81
90
|
throw (error.ajv ? new lib_1.BadRequest(error.message, error.errors) : error);
|
|
@@ -95,7 +104,9 @@ const validateData = (schema) => async (context, next) => {
|
|
|
95
104
|
catch (error) {
|
|
96
105
|
throw (error.ajv ? new lib_1.BadRequest(error.message, error.errors) : error);
|
|
97
106
|
}
|
|
98
|
-
|
|
107
|
+
if (typeof next === 'function') {
|
|
108
|
+
return next();
|
|
109
|
+
}
|
|
99
110
|
};
|
|
100
111
|
exports.validateData = validateData;
|
|
101
112
|
//# 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,QAAkC,EAAE,EAAE,CACrE,KAAK,EAAE,OAAoB,EAAE,
|
|
1
|
+
{"version":3,"file":"hooks.js","sourceRoot":"","sources":["../src/hooks.ts"],"names":[],"mappings":"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"}
|
package/lib/query.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { JSONSchema } from 'json-schema-to-ts';
|
|
2
2
|
export declare const queryProperty: <T extends JSONSchema>(definition: T) => {
|
|
3
|
-
readonly
|
|
3
|
+
readonly anyOf: readonly [T, {
|
|
4
4
|
readonly type: "object";
|
|
5
5
|
readonly additionalProperties: false;
|
|
6
6
|
readonly properties: {
|
package/lib/query.js
CHANGED
package/lib/resolver.d.ts
CHANGED
|
@@ -1,17 +1,16 @@
|
|
|
1
|
-
import { Schema } from './schema';
|
|
2
1
|
export declare type PropertyResolver<T, V, C> = (value: V | undefined, obj: T, context: C, status: ResolverStatus<T, C>) => Promise<V | undefined>;
|
|
3
2
|
export declare type PropertyResolverMap<T, C> = {
|
|
4
3
|
[key in keyof T]?: PropertyResolver<T, T[key], C>;
|
|
5
4
|
};
|
|
6
5
|
export interface ResolverConfig<T, C> {
|
|
7
|
-
schema?:
|
|
6
|
+
schema?: any;
|
|
8
7
|
validate?: 'before' | 'after' | false;
|
|
9
8
|
properties: PropertyResolverMap<T, C>;
|
|
10
9
|
}
|
|
11
10
|
export interface ResolverStatus<T, C> {
|
|
12
11
|
path: string[];
|
|
13
12
|
originalContext?: C;
|
|
14
|
-
properties?:
|
|
13
|
+
properties?: string[];
|
|
15
14
|
stack: PropertyResolver<T, any, C>[];
|
|
16
15
|
}
|
|
17
16
|
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;
|
|
1
|
+
{"version":3,"file":"resolver.js","sourceRoot":"","sources":["../src/resolver.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
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.17",
|
|
5
5
|
"homepage": "https://feathersjs.com",
|
|
6
6
|
"main": "lib/",
|
|
7
7
|
"keywords": [
|
|
@@ -50,21 +50,21 @@
|
|
|
50
50
|
"access": "public"
|
|
51
51
|
},
|
|
52
52
|
"dependencies": {
|
|
53
|
-
"@feathersjs/errors": "^5.0.0-pre.
|
|
54
|
-
"@feathersjs/feathers": "^5.0.0-pre.
|
|
53
|
+
"@feathersjs/errors": "^5.0.0-pre.17",
|
|
54
|
+
"@feathersjs/feathers": "^5.0.0-pre.17",
|
|
55
55
|
"@types/json-schema": "^7.0.9",
|
|
56
|
-
"ajv": "^8.
|
|
56
|
+
"ajv": "^8.10.0",
|
|
57
57
|
"json-schema": "^0.4.0",
|
|
58
|
-
"json-schema-to-ts": "^1.6.
|
|
58
|
+
"json-schema-to-ts": "^1.6.5"
|
|
59
59
|
},
|
|
60
60
|
"devDependencies": {
|
|
61
|
-
"@feathersjs/memory": "^5.0.0-pre.
|
|
62
|
-
"@types/mocha": "^9.
|
|
63
|
-
"@types/node": "^17.0.
|
|
61
|
+
"@feathersjs/memory": "^5.0.0-pre.17",
|
|
62
|
+
"@types/mocha": "^9.1.0",
|
|
63
|
+
"@types/node": "^17.0.15",
|
|
64
64
|
"ajv-formats": "^2.1.1",
|
|
65
|
-
"mocha": "^9.
|
|
66
|
-
"shx": "^0.3.
|
|
67
|
-
"typescript": "^4.5.
|
|
65
|
+
"mocha": "^9.2.0",
|
|
66
|
+
"shx": "^0.3.4",
|
|
67
|
+
"typescript": "^4.5.5"
|
|
68
68
|
},
|
|
69
|
-
"gitHead": "
|
|
69
|
+
"gitHead": "d828748e57b40abfaa15710663afed417de14a1d"
|
|
70
70
|
}
|
package/src/hooks.ts
CHANGED
|
@@ -14,7 +14,7 @@ const getContext = (context: HookContext) => {
|
|
|
14
14
|
}
|
|
15
15
|
|
|
16
16
|
export const resolveQuery = <T> (resolver: Resolver<T, HookContext>) =>
|
|
17
|
-
async (context: HookContext, next
|
|
17
|
+
async (context: HookContext, next?: NextFunction) => {
|
|
18
18
|
const ctx = getContext(context);
|
|
19
19
|
const data = context?.params?.query || {};
|
|
20
20
|
const query = await resolver.resolve(data, ctx, {
|
|
@@ -26,11 +26,13 @@ export const resolveQuery = <T> (resolver: Resolver<T, HookContext>) =>
|
|
|
26
26
|
query
|
|
27
27
|
}
|
|
28
28
|
|
|
29
|
-
|
|
29
|
+
if (typeof next === 'function') {
|
|
30
|
+
return next();
|
|
31
|
+
}
|
|
30
32
|
};
|
|
31
33
|
|
|
32
34
|
export const resolveData = <T> (resolver: Resolver<T, HookContext>) =>
|
|
33
|
-
async (context: HookContext, next
|
|
35
|
+
async (context: HookContext, next?: NextFunction) => {
|
|
34
36
|
const ctx = getContext(context);
|
|
35
37
|
const data = context.data;
|
|
36
38
|
const status = {
|
|
@@ -45,27 +47,32 @@ export const resolveData = <T> (resolver: Resolver<T, HookContext>) =>
|
|
|
45
47
|
context.data = await resolver.resolve(data, ctx, status);
|
|
46
48
|
}
|
|
47
49
|
|
|
48
|
-
|
|
50
|
+
if (typeof next === 'function') {
|
|
51
|
+
return next();
|
|
52
|
+
}
|
|
49
53
|
};
|
|
50
54
|
|
|
51
55
|
export const resolveResult = <T> (resolver: Resolver<T, HookContext>) =>
|
|
52
|
-
async (context: HookContext, next
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
56
|
+
async (context: HookContext, next?: NextFunction) => {
|
|
57
|
+
if (typeof next === 'function') {
|
|
58
|
+
const { $resolve: properties, ...query } = context.params?.query || {};
|
|
59
|
+
const resolve = {
|
|
60
|
+
originalContext: context,
|
|
61
|
+
...context.params.resolve,
|
|
62
|
+
properties
|
|
63
|
+
};
|
|
60
64
|
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
+
context.params = {
|
|
66
|
+
...context.params,
|
|
67
|
+
resolve,
|
|
68
|
+
query
|
|
69
|
+
}
|
|
65
70
|
|
|
66
|
-
|
|
71
|
+
await next();
|
|
72
|
+
}
|
|
67
73
|
|
|
68
74
|
const ctx = getContext(context);
|
|
75
|
+
const status = context.params.resolve;
|
|
69
76
|
const data = context.method === 'find' && context.result.data
|
|
70
77
|
? context.result.data
|
|
71
78
|
: context.result;
|
|
@@ -80,7 +87,7 @@ export const resolveResult = <T> (resolver: Resolver<T, HookContext>) =>
|
|
|
80
87
|
};
|
|
81
88
|
|
|
82
89
|
export const validateQuery = (schema: Schema<any>) =>
|
|
83
|
-
async (context: HookContext, next
|
|
90
|
+
async (context: HookContext, next?: NextFunction) => {
|
|
84
91
|
const data = context?.params?.query || {};
|
|
85
92
|
|
|
86
93
|
try {
|
|
@@ -91,14 +98,16 @@ export const validateQuery = (schema: Schema<any>) =>
|
|
|
91
98
|
query
|
|
92
99
|
}
|
|
93
100
|
|
|
94
|
-
|
|
101
|
+
if (typeof next === 'function') {
|
|
102
|
+
return next();
|
|
103
|
+
}
|
|
95
104
|
} catch (error: any) {
|
|
96
105
|
throw (error.ajv ? new BadRequest(error.message, error.errors) : error);
|
|
97
106
|
}
|
|
98
107
|
};
|
|
99
108
|
|
|
100
109
|
export const validateData = (schema: Schema<any>) =>
|
|
101
|
-
async (context: HookContext, next
|
|
110
|
+
async (context: HookContext, next?: NextFunction) => {
|
|
102
111
|
const data = context.data;
|
|
103
112
|
|
|
104
113
|
try {
|
|
@@ -113,5 +122,7 @@ export const validateData = (schema: Schema<any>) =>
|
|
|
113
122
|
throw (error.ajv ? new BadRequest(error.message, error.errors) : error);
|
|
114
123
|
}
|
|
115
124
|
|
|
116
|
-
|
|
125
|
+
if (typeof next === 'function') {
|
|
126
|
+
return next();
|
|
127
|
+
}
|
|
117
128
|
};
|
package/src/query.ts
CHANGED
package/src/resolver.ts
CHANGED
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import { BadRequest } from '@feathersjs/errors';
|
|
2
|
-
import { Schema } from './schema';
|
|
3
2
|
|
|
4
3
|
export type PropertyResolver<T, V, C> = (
|
|
5
4
|
value: V|undefined,
|
|
@@ -13,7 +12,9 @@ export type PropertyResolverMap<T, C> = {
|
|
|
13
12
|
}
|
|
14
13
|
|
|
15
14
|
export interface ResolverConfig<T, C> {
|
|
16
|
-
|
|
15
|
+
// TODO this should be `Schema<any>` but has recently produced an error, see
|
|
16
|
+
// https://github.com/ThomasAribart/json-schema-to-ts/issues/53
|
|
17
|
+
schema?: any,
|
|
17
18
|
validate?: 'before'|'after'|false,
|
|
18
19
|
properties: PropertyResolverMap<T, C>
|
|
19
20
|
}
|
|
@@ -21,7 +22,7 @@ export interface ResolverConfig<T, C> {
|
|
|
21
22
|
export interface ResolverStatus<T, C> {
|
|
22
23
|
path: string[];
|
|
23
24
|
originalContext?: C;
|
|
24
|
-
properties?:
|
|
25
|
+
properties?: string[];
|
|
25
26
|
stack: PropertyResolver<T, any, C>[];
|
|
26
27
|
}
|
|
27
28
|
|
|
@@ -94,7 +95,9 @@ export class Resolver<T, C> {
|
|
|
94
95
|
}));
|
|
95
96
|
|
|
96
97
|
if (hasErrors) {
|
|
97
|
-
|
|
98
|
+
const propertyName = status?.properties ? ` ${status.properties.join('.')}` : '';
|
|
99
|
+
|
|
100
|
+
throw new BadRequest('Error resolving data' + propertyName, errors);
|
|
98
101
|
}
|
|
99
102
|
|
|
100
103
|
return schema && validate === 'after'
|