@feathersjs/schema 5.0.0-pre.21 → 5.0.0-pre.24
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 +44 -0
- package/lib/hooks/index.js.map +1 -1
- package/lib/hooks/resolve.d.ts +14 -7
- package/lib/hooks/resolve.js +37 -25
- package/lib/hooks/resolve.js.map +1 -1
- package/lib/hooks/validate.js +3 -3
- package/lib/hooks/validate.js.map +1 -1
- package/lib/index.js.map +1 -1
- package/lib/query.d.ts +10 -10
- package/lib/query.js +32 -26
- package/lib/query.js.map +1 -1
- package/lib/resolver.js +4 -8
- package/lib/resolver.js.map +1 -1
- package/lib/schema.js +1 -1
- package/lib/schema.js.map +1 -1
- package/package.json +10 -9
- package/src/hooks/index.ts +2 -2
- package/src/hooks/resolve.ts +102 -81
- package/src/hooks/validate.ts +18 -18
- package/src/index.ts +8 -8
- package/src/query.ts +73 -64
- package/src/resolver.ts +61 -59
- package/src/schema.ts +27 -27
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,50 @@
|
|
|
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.24](https://github.com/feathersjs/feathers/compare/v5.0.0-pre.23...v5.0.0-pre.24) (2022-06-21)
|
|
7
|
+
|
|
8
|
+
|
|
9
|
+
### Bug Fixes
|
|
10
|
+
|
|
11
|
+
* **schema:** Fix dispatch resovler hook to convert actually resolved data ([#2663](https://github.com/feathersjs/feathers/issues/2663)) ([f7e87db](https://github.com/feathersjs/feathers/commit/f7e87dbb9a0bc8d89aee47318dddbaa4d6ba5b91))
|
|
12
|
+
|
|
13
|
+
|
|
14
|
+
### Features
|
|
15
|
+
|
|
16
|
+
* **cli:** Add typed client to a generated app ([#2669](https://github.com/feathersjs/feathers/issues/2669)) ([5b801b5](https://github.com/feathersjs/feathers/commit/5b801b5017ddc3eaa95622b539f51d605916bc86))
|
|
17
|
+
|
|
18
|
+
|
|
19
|
+
|
|
20
|
+
|
|
21
|
+
|
|
22
|
+
# [5.0.0-pre.23](https://github.com/feathersjs/feathers/compare/v5.0.0-pre.22...v5.0.0-pre.23) (2022-06-06)
|
|
23
|
+
|
|
24
|
+
|
|
25
|
+
### Bug Fixes
|
|
26
|
+
|
|
27
|
+
* **schema:** Always resolve dispatch in resolveAll and add getDispatch method ([#2645](https://github.com/feathersjs/feathers/issues/2645)) ([145b366](https://github.com/feathersjs/feathers/commit/145b366435695438fbc8db9fdb161162ca9049ad))
|
|
28
|
+
* **schema:** remove `default` from queryProperty schemas ([#2646](https://github.com/feathersjs/feathers/issues/2646)) ([940a2b6](https://github.com/feathersjs/feathers/commit/940a2b6868d2f77f81edb1661f6417ec2ea6e372))
|
|
29
|
+
|
|
30
|
+
|
|
31
|
+
### Features
|
|
32
|
+
|
|
33
|
+
* **core:** Rename async hooks to around hooks, allow usual registration format ([#2652](https://github.com/feathersjs/feathers/issues/2652)) ([2a485a0](https://github.com/feathersjs/feathers/commit/2a485a07929184261f27437fc0fdfe5a44694834))
|
|
34
|
+
|
|
35
|
+
|
|
36
|
+
|
|
37
|
+
|
|
38
|
+
|
|
39
|
+
# [5.0.0-pre.22](https://github.com/feathersjs/feathers/compare/v5.0.0-pre.21...v5.0.0-pre.22) (2022-05-24)
|
|
40
|
+
|
|
41
|
+
|
|
42
|
+
### Bug Fixes
|
|
43
|
+
|
|
44
|
+
* **schema:** Allows resolveData with different resolvers based on method ([#2644](https://github.com/feathersjs/feathers/issues/2644)) ([be71fa2](https://github.com/feathersjs/feathers/commit/be71fa2fe260e05b7dcc0d5f439e33f2e9ec2434))
|
|
45
|
+
|
|
46
|
+
|
|
47
|
+
|
|
48
|
+
|
|
49
|
+
|
|
6
50
|
# [5.0.0-pre.21](https://github.com/feathersjs/feathers/compare/v5.0.0-pre.20...v5.0.0-pre.21) (2022-05-23)
|
|
7
51
|
|
|
8
52
|
|
package/lib/hooks/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/hooks/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/hooks/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,4CAAyB;AACzB,6CAA0B"}
|
package/lib/hooks/resolve.d.ts
CHANGED
|
@@ -1,14 +1,21 @@
|
|
|
1
1
|
import { HookContext, NextFunction } from '@feathersjs/feathers';
|
|
2
2
|
import { Resolver } from '../resolver';
|
|
3
|
+
export declare type ResolverSetting<H extends HookContext> = Resolver<any, H> | Resolver<any, H>[];
|
|
4
|
+
export declare type DataResolvers<H extends HookContext> = {
|
|
5
|
+
create: Resolver<any, H>;
|
|
6
|
+
patch: Resolver<any, H>;
|
|
7
|
+
update: Resolver<any, H>;
|
|
8
|
+
};
|
|
9
|
+
export declare type ResolveAllSettings<H extends HookContext> = {
|
|
10
|
+
data?: DataResolvers<H>;
|
|
11
|
+
query?: Resolver<any, H>;
|
|
12
|
+
result?: Resolver<any, H>;
|
|
13
|
+
dispatch?: Resolver<any, H>;
|
|
14
|
+
};
|
|
3
15
|
export declare const DISPATCH: unique symbol;
|
|
16
|
+
export declare const getDispatch: (value: any) => any;
|
|
4
17
|
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>;
|
|
5
|
-
export declare const resolveData: <
|
|
18
|
+
export declare const resolveData: <H extends HookContext<import("@feathersjs/feathers").Application<any, any>, any>>(settings: DataResolvers<H> | Resolver<any, H>) => (context: H, next?: NextFunction) => Promise<any>;
|
|
6
19
|
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>;
|
|
7
20
|
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>;
|
|
8
|
-
export declare type ResolveAllSettings<H extends HookContext> = {
|
|
9
|
-
data?: Resolver<any, H> | Resolver<any, H>[];
|
|
10
|
-
query?: Resolver<any, H> | Resolver<any, H>[];
|
|
11
|
-
result?: Resolver<any, H> | Resolver<any, H>[];
|
|
12
|
-
dispatch?: Resolver<any, H> | Resolver<any, H>[];
|
|
13
|
-
};
|
|
14
21
|
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>;
|
package/lib/hooks/resolve.js
CHANGED
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.resolveAll = exports.resolveDispatch = exports.resolveResult = exports.resolveData = exports.resolveQuery = exports.DISPATCH = void 0;
|
|
3
|
+
exports.resolveAll = exports.resolveDispatch = exports.resolveResult = exports.resolveData = exports.resolveQuery = exports.getDispatch = exports.DISPATCH = void 0;
|
|
4
4
|
const hooks_1 = require("@feathersjs/hooks");
|
|
5
|
+
const resolver_1 = require("../resolver");
|
|
5
6
|
const getContext = (context) => {
|
|
6
7
|
return {
|
|
7
8
|
...context,
|
|
@@ -19,11 +20,15 @@ const getData = (context) => {
|
|
|
19
20
|
const runResolvers = async (resolvers, data, ctx, status) => {
|
|
20
21
|
let current = data;
|
|
21
22
|
for (const resolver of resolvers) {
|
|
22
|
-
|
|
23
|
+
if (resolver && typeof resolver.resolve === 'function') {
|
|
24
|
+
current = await resolver.resolve(current, ctx, status);
|
|
25
|
+
}
|
|
23
26
|
}
|
|
24
27
|
return current;
|
|
25
28
|
};
|
|
26
29
|
exports.DISPATCH = Symbol('@feathersjs/schema/dispatch');
|
|
30
|
+
const getDispatch = (value) => typeof value === 'object' && value !== null && value[exports.DISPATCH] !== undefined ? value[exports.DISPATCH] : value;
|
|
31
|
+
exports.getDispatch = getDispatch;
|
|
27
32
|
const resolveQuery = (...resolvers) => async (context, next) => {
|
|
28
33
|
var _a;
|
|
29
34
|
const ctx = getContext(context);
|
|
@@ -38,15 +43,16 @@ const resolveQuery = (...resolvers) => async (context, next) => {
|
|
|
38
43
|
}
|
|
39
44
|
};
|
|
40
45
|
exports.resolveQuery = resolveQuery;
|
|
41
|
-
const resolveData = (
|
|
46
|
+
const resolveData = (settings) => async (context, next) => {
|
|
42
47
|
if (context.method === 'create' || context.method === 'patch' || context.method === 'update') {
|
|
48
|
+
const resolvers = settings instanceof resolver_1.Resolver ? [settings] : [settings[context.method]];
|
|
43
49
|
const ctx = getContext(context);
|
|
44
50
|
const data = context.data;
|
|
45
51
|
const status = {
|
|
46
52
|
originalContext: context
|
|
47
53
|
};
|
|
48
54
|
if (Array.isArray(data)) {
|
|
49
|
-
context.data = await Promise.all(data.map(current => runResolvers(resolvers, current, ctx, status)));
|
|
55
|
+
context.data = await Promise.all(data.map((current) => runResolvers(resolvers, current, ctx, status)));
|
|
50
56
|
}
|
|
51
57
|
else {
|
|
52
58
|
context.data = await runResolvers(resolvers, data, ctx, status);
|
|
@@ -76,9 +82,9 @@ const resolveResult = (...resolvers) => async (context, next) => {
|
|
|
76
82
|
const ctx = getContext(context);
|
|
77
83
|
const status = context.params.resolve;
|
|
78
84
|
const { isPaginated, data } = getData(context);
|
|
79
|
-
const result = Array.isArray(data)
|
|
80
|
-
await Promise.all(data.map(async (current) => runResolvers(resolvers, current, ctx, status)))
|
|
81
|
-
await runResolvers(resolvers, data, ctx, status);
|
|
85
|
+
const result = Array.isArray(data)
|
|
86
|
+
? await Promise.all(data.map(async (current) => runResolvers(resolvers, current, ctx, status)))
|
|
87
|
+
: await runResolvers(resolvers, data, ctx, status);
|
|
82
88
|
if (isPaginated) {
|
|
83
89
|
context.result.data = result;
|
|
84
90
|
}
|
|
@@ -94,20 +100,22 @@ const resolveDispatch = (...resolvers) => async (context, next) => {
|
|
|
94
100
|
const ctx = getContext(context);
|
|
95
101
|
const status = context.params.resolve;
|
|
96
102
|
const { isPaginated, data } = getData(context);
|
|
97
|
-
const
|
|
103
|
+
const resolveAndGetDispatch = async (current) => {
|
|
98
104
|
const resolved = await runResolvers(resolvers, current, ctx, status);
|
|
99
105
|
return Object.keys(resolved).reduce((res, key) => {
|
|
100
|
-
|
|
101
|
-
const hasDispatch = typeof value === 'object' && value !== null && value[exports.DISPATCH] !== undefined;
|
|
102
|
-
res[key] = hasDispatch ? value[exports.DISPATCH] : value;
|
|
106
|
+
res[key] = (0, exports.getDispatch)(resolved[key]);
|
|
103
107
|
return res;
|
|
104
108
|
}, {});
|
|
105
109
|
};
|
|
106
|
-
const result = await (Array.isArray(data)
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
110
|
+
const result = await (Array.isArray(data)
|
|
111
|
+
? Promise.all(data.map(resolveAndGetDispatch))
|
|
112
|
+
: resolveAndGetDispatch(data));
|
|
113
|
+
const dispatch = isPaginated
|
|
114
|
+
? {
|
|
115
|
+
...context.result,
|
|
116
|
+
data: result
|
|
117
|
+
}
|
|
118
|
+
: result;
|
|
111
119
|
context.dispatch = dispatch;
|
|
112
120
|
Object.defineProperty(context.result, exports.DISPATCH, {
|
|
113
121
|
value: dispatch,
|
|
@@ -116,15 +124,19 @@ const resolveDispatch = (...resolvers) => async (context, next) => {
|
|
|
116
124
|
});
|
|
117
125
|
};
|
|
118
126
|
exports.resolveDispatch = resolveDispatch;
|
|
119
|
-
const
|
|
120
|
-
const
|
|
121
|
-
|
|
127
|
+
const resolveAll = (map) => {
|
|
128
|
+
const middleware = [];
|
|
129
|
+
middleware.push((0, exports.resolveDispatch)(map.dispatch));
|
|
130
|
+
if (map.result) {
|
|
131
|
+
middleware.push((0, exports.resolveResult)(map.result));
|
|
132
|
+
}
|
|
133
|
+
if (map.query) {
|
|
134
|
+
middleware.push((0, exports.resolveQuery)(map.query));
|
|
135
|
+
}
|
|
136
|
+
if (map.data) {
|
|
137
|
+
middleware.push((0, exports.resolveData)(map.data));
|
|
138
|
+
}
|
|
139
|
+
return (0, hooks_1.compose)(middleware);
|
|
122
140
|
};
|
|
123
|
-
const resolveAll = (map) => (0, hooks_1.compose)([
|
|
124
|
-
(0, exports.resolveDispatch)(...getResolvers(map, 'dispatch')),
|
|
125
|
-
(0, exports.resolveResult)(...getResolvers(map, 'result')),
|
|
126
|
-
(0, exports.resolveQuery)(...getResolvers(map, 'query')),
|
|
127
|
-
(0, exports.resolveData)(...getResolvers(map, 'data'))
|
|
128
|
-
]);
|
|
129
141
|
exports.resolveAll = resolveAll;
|
|
130
142
|
//# sourceMappingURL=resolve.js.map
|
package/lib/hooks/resolve.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolve.js","sourceRoot":"","sources":["../../src/hooks/resolve.ts"],"names":[],"mappings":";;;AACA,
|
|
1
|
+
{"version":3,"file":"resolve.js","sourceRoot":"","sources":["../../src/hooks/resolve.ts"],"names":[],"mappings":"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"}
|
package/lib/hooks/validate.js
CHANGED
|
@@ -16,7 +16,7 @@ const validateQuery = (schema) => async (context, next) => {
|
|
|
16
16
|
}
|
|
17
17
|
}
|
|
18
18
|
catch (error) {
|
|
19
|
-
throw
|
|
19
|
+
throw error.ajv ? new lib_1.BadRequest(error.message, error.errors) : error;
|
|
20
20
|
}
|
|
21
21
|
};
|
|
22
22
|
exports.validateQuery = validateQuery;
|
|
@@ -24,14 +24,14 @@ const validateData = (schema) => async (context, next) => {
|
|
|
24
24
|
const data = context.data;
|
|
25
25
|
try {
|
|
26
26
|
if (Array.isArray(data)) {
|
|
27
|
-
context.data = await Promise.all(data.map(current => schema.validate(current)));
|
|
27
|
+
context.data = await Promise.all(data.map((current) => schema.validate(current)));
|
|
28
28
|
}
|
|
29
29
|
else {
|
|
30
30
|
context.data = await schema.validate(data);
|
|
31
31
|
}
|
|
32
32
|
}
|
|
33
33
|
catch (error) {
|
|
34
|
-
throw
|
|
34
|
+
throw error.ajv ? new lib_1.BadRequest(error.message, error.errors) : error;
|
|
35
35
|
}
|
|
36
36
|
if (typeof next === 'function') {
|
|
37
37
|
return next();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validate.js","sourceRoot":"","sources":["../../src/hooks/validate.ts"],"names":[],"mappings":";;;AACA,
|
|
1
|
+
{"version":3,"file":"validate.js","sourceRoot":"","sources":["../../src/hooks/validate.ts"],"names":[],"mappings":";;;AACA,6CAAgD;AAGzC,MAAM,aAAa,GACxB,CAAwB,MAAmB,EAAE,EAAE,CAC/C,KAAK,EAAE,OAAU,EAAE,IAAmB,EAAE,EAAE;;IACxC,MAAM,IAAI,GAAG,CAAA,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,MAAM,0CAAE,KAAK,KAAI,EAAE,CAAA;IAEzC,IAAI;QACF,MAAM,KAAK,GAAG,MAAM,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;QAEzC,OAAO,CAAC,MAAM,GAAG;YACf,GAAG,OAAO,CAAC,MAAM;YACjB,KAAK;SACN,CAAA;QAED,IAAI,OAAO,IAAI,KAAK,UAAU,EAAE;YAC9B,OAAO,IAAI,EAAE,CAAA;SACd;KACF;IAAC,OAAO,KAAU,EAAE;QACnB,MAAM,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,gBAAU,CAAC,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,CAAA;KACtE;AACH,CAAC,CAAA;AAnBU,QAAA,aAAa,iBAmBvB;AAEI,MAAM,YAAY,GACvB,CAAwB,MAAmB,EAAE,EAAE,CAC/C,KAAK,EAAE,OAAU,EAAE,IAAmB,EAAE,EAAE;IACxC,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAA;IAEzB,IAAI;QACF,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YACvB,OAAO,CAAC,IAAI,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAA;SAClF;aAAM;YACL,OAAO,CAAC,IAAI,GAAG,MAAM,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;SAC3C;KACF;IAAC,OAAO,KAAU,EAAE;QACnB,MAAM,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,gBAAU,CAAC,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,CAAA;KACtE;IAED,IAAI,OAAO,IAAI,KAAK,UAAU,EAAE;QAC9B,OAAO,IAAI,EAAE,CAAA;KACd;AACH,CAAC,CAAA;AAlBU,QAAA,YAAY,gBAkBtB"}
|
package/lib/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAEA,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAEA,2CAAwB;AACxB,6CAA0B;AAC1B,0CAAuB;AACvB,0CAAuB"}
|
package/lib/query.d.ts
CHANGED
|
@@ -23,23 +23,23 @@ export declare type PropertyQuery<D extends JSONSchema> = {
|
|
|
23
23
|
}
|
|
24
24
|
];
|
|
25
25
|
};
|
|
26
|
-
export declare const queryProperty: <T extends import("json-schema-to-ts").JSONSchema7>(
|
|
27
|
-
readonly anyOf: readonly [
|
|
26
|
+
export declare const queryProperty: <T extends import("json-schema-to-ts").JSONSchema7>(def: T) => {
|
|
27
|
+
readonly anyOf: readonly [any, {
|
|
28
28
|
readonly type: "object";
|
|
29
29
|
readonly additionalProperties: false;
|
|
30
30
|
readonly properties: {
|
|
31
|
-
readonly $gt:
|
|
32
|
-
readonly $gte:
|
|
33
|
-
readonly $lt:
|
|
34
|
-
readonly $lte:
|
|
35
|
-
readonly $ne:
|
|
31
|
+
readonly $gt: any;
|
|
32
|
+
readonly $gte: any;
|
|
33
|
+
readonly $lt: any;
|
|
34
|
+
readonly $lte: any;
|
|
35
|
+
readonly $ne: any;
|
|
36
36
|
readonly $in: {
|
|
37
37
|
readonly type: "array";
|
|
38
|
-
readonly items:
|
|
38
|
+
readonly items: any;
|
|
39
39
|
};
|
|
40
40
|
readonly $nin: {
|
|
41
41
|
readonly type: "array";
|
|
42
|
-
readonly items:
|
|
42
|
+
readonly items: any;
|
|
43
43
|
};
|
|
44
44
|
};
|
|
45
45
|
}];
|
|
@@ -48,7 +48,7 @@ export declare const queryProperties: <T extends {
|
|
|
48
48
|
[key: string]: import("json-schema-to-ts").JSONSchema7;
|
|
49
49
|
}>(definition: T) => { [K in keyof T]: PropertyQuery<T[K]>; };
|
|
50
50
|
export declare const querySyntax: <T extends {
|
|
51
|
-
[key: string]:
|
|
51
|
+
[key: string]: any;
|
|
52
52
|
}>(definition: T) => {
|
|
53
53
|
readonly $limit: {
|
|
54
54
|
readonly type: "number";
|
package/lib/query.js
CHANGED
|
@@ -1,34 +1,39 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.querySyntax = exports.queryProperties = exports.queryProperty = void 0;
|
|
4
|
-
const
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
4
|
+
const commons_1 = require("@feathersjs/commons");
|
|
5
|
+
const queryProperty = (def) => {
|
|
6
|
+
const definition = commons_1._.omit(def, 'default');
|
|
7
|
+
return {
|
|
8
|
+
anyOf: [
|
|
9
|
+
definition,
|
|
10
|
+
{
|
|
11
|
+
type: 'object',
|
|
12
|
+
additionalProperties: false,
|
|
13
|
+
properties: {
|
|
14
|
+
$gt: definition,
|
|
15
|
+
$gte: definition,
|
|
16
|
+
$lt: definition,
|
|
17
|
+
$lte: definition,
|
|
18
|
+
$ne: definition,
|
|
19
|
+
$in: {
|
|
20
|
+
type: 'array',
|
|
21
|
+
items: definition
|
|
22
|
+
},
|
|
23
|
+
$nin: {
|
|
24
|
+
type: 'array',
|
|
25
|
+
items: definition
|
|
26
|
+
}
|
|
23
27
|
}
|
|
24
28
|
}
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
}
|
|
29
|
+
]
|
|
30
|
+
};
|
|
31
|
+
};
|
|
28
32
|
exports.queryProperty = queryProperty;
|
|
29
33
|
const queryProperties = (definition) => Object.keys(definition).reduce((res, key) => {
|
|
30
|
-
|
|
31
|
-
|
|
34
|
+
const result = res;
|
|
35
|
+
result[key] = (0, exports.queryProperty)(definition[key]);
|
|
36
|
+
return result;
|
|
32
37
|
}, {});
|
|
33
38
|
exports.queryProperties = queryProperties;
|
|
34
39
|
const querySyntax = (definition) => ({
|
|
@@ -43,11 +48,12 @@ const querySyntax = (definition) => ({
|
|
|
43
48
|
$sort: {
|
|
44
49
|
type: 'object',
|
|
45
50
|
properties: Object.keys(definition).reduce((res, key) => {
|
|
46
|
-
|
|
51
|
+
const result = res;
|
|
52
|
+
result[key] = {
|
|
47
53
|
type: 'number',
|
|
48
54
|
enum: [1, -1]
|
|
49
55
|
};
|
|
50
|
-
return
|
|
56
|
+
return result;
|
|
51
57
|
}, {})
|
|
52
58
|
},
|
|
53
59
|
$select: {
|
package/lib/query.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"query.js","sourceRoot":"","sources":["../src/query.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"query.js","sourceRoot":"","sources":["../src/query.ts"],"names":[],"mappings":";;;AAAA,iDAAuC;AA4BhC,MAAM,aAAa,GAAG,CAAuB,GAAM,EAAE,EAAE;IAC5D,MAAM,UAAU,GAAG,WAAC,CAAC,IAAI,CAAC,GAAG,EAAE,SAAS,CAAC,CAAA;IACzC,OAAO;QACL,KAAK,EAAE;YACL,UAAU;YACV;gBACE,IAAI,EAAE,QAAQ;gBACd,oBAAoB,EAAE,KAAK;gBAC3B,UAAU,EAAE;oBACV,GAAG,EAAE,UAAU;oBACf,IAAI,EAAE,UAAU;oBAChB,GAAG,EAAE,UAAU;oBACf,IAAI,EAAE,UAAU;oBAChB,GAAG,EAAE,UAAU;oBACf,GAAG,EAAE;wBACH,IAAI,EAAE,OAAO;wBACb,KAAK,EAAE,UAAU;qBAClB;oBACD,IAAI,EAAE;wBACJ,IAAI,EAAE,OAAO;wBACb,KAAK,EAAE,UAAU;qBAClB;iBACF;aACF;SACF;KACO,CAAA;AACZ,CAAC,CAAA;AA1BY,QAAA,aAAa,iBA0BzB;AAEM,MAAM,eAAe,GAAG,CAA0C,UAAa,EAAE,EAAE,CACxF,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;IAC1C,MAAM,MAAM,GAAG,GAAU,CAAA;IAEzB,MAAM,CAAC,GAAG,CAAC,GAAG,IAAA,qBAAa,EAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAA;IAE5C,OAAO,MAAM,CAAA;AACf,CAAC,EAAE,EAA6C,CAAC,CAAA;AAPtC,QAAA,eAAe,mBAOuB;AAE5C,MAAM,WAAW,GAAG,CAAmC,UAAa,EAAE,EAAE,CAC7E,CAAC;IACC,MAAM,EAAE;QACN,IAAI,EAAE,QAAQ;QACd,OAAO,EAAE,CAAC;KACX;IACD,KAAK,EAAE;QACL,IAAI,EAAE,QAAQ;QACd,OAAO,EAAE,CAAC;KACX;IACD,KAAK,EAAE;QACL,IAAI,EAAE,QAAQ;QACd,UAAU,EAAE,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;YACtD,MAAM,MAAM,GAAG,GAAU,CAAA;YAEzB,MAAM,CAAC,GAAG,CAAC,GAAG;gBACZ,IAAI,EAAE,QAAQ;gBACd,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;aACd,CAAA;YAED,OAAO,MAAM,CAAA;QACf,CAAC,EAAE,EAA6E,CAAC;KAClF;IACD,OAAO,EAAE;QACP,IAAI,EAAE,OAAO;QACb,KAAK,EAAE;YACL,IAAI,EAAE,QAAQ;YACd,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,UAAU,CAAuB;SACpD;KACF;IACD,GAAG,IAAA,uBAAe,EAAC,UAAU,CAAC;CACrB,CAAA,CAAA;AA/BA,QAAA,WAAW,eA+BX"}
|
package/lib/resolver.js
CHANGED
|
@@ -34,8 +34,8 @@ class Resolver {
|
|
|
34
34
|
const data = schema && validate === 'before' ? await schema.validate(payload) : payload;
|
|
35
35
|
const propertyList = (Array.isArray(status === null || status === void 0 ? void 0 : status.properties)
|
|
36
36
|
? status === null || status === void 0 ? void 0 : status.properties
|
|
37
|
-
// By default get all data and resolver keys but remove duplicates
|
|
38
|
-
|
|
37
|
+
: // By default get all data and resolver keys but remove duplicates
|
|
38
|
+
[...new Set(Object.keys(data).concat(Object.keys(resolvers)))]);
|
|
39
39
|
const result = {};
|
|
40
40
|
const errors = {};
|
|
41
41
|
let hasErrors = false;
|
|
@@ -51,9 +51,7 @@ class Resolver {
|
|
|
51
51
|
}
|
|
52
52
|
catch (error) {
|
|
53
53
|
// TODO add error stacks
|
|
54
|
-
const convertedError = typeof error.toJSON === 'function'
|
|
55
|
-
? error.toJSON()
|
|
56
|
-
: { message: error.message || error };
|
|
54
|
+
const convertedError = typeof error.toJSON === 'function' ? error.toJSON() : { message: error.message || error };
|
|
57
55
|
errors[name] = convertedError;
|
|
58
56
|
hasErrors = true;
|
|
59
57
|
}
|
|
@@ -66,9 +64,7 @@ class Resolver {
|
|
|
66
64
|
const propertyName = (status === null || status === void 0 ? void 0 : status.properties) ? ` ${status.properties.join('.')}` : '';
|
|
67
65
|
throw new errors_1.BadRequest('Error resolving data' + (propertyName ? ` ${propertyName}` : ''), errors);
|
|
68
66
|
}
|
|
69
|
-
return schema && validate === 'after'
|
|
70
|
-
? await schema.validate(result)
|
|
71
|
-
: result;
|
|
67
|
+
return schema && validate === 'after' ? await schema.validate(result) : result;
|
|
72
68
|
}
|
|
73
69
|
}
|
|
74
70
|
exports.Resolver = Resolver;
|
package/lib/resolver.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolver.js","sourceRoot":"","sources":["../src/resolver.ts"],"names":[],"mappings":";;;AAAA,+
|
|
1
|
+
{"version":3,"file":"resolver.js","sourceRoot":"","sources":["../src/resolver.ts"],"names":[],"mappings":"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"}
|
package/lib/schema.js
CHANGED
package/lib/schema.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schema.js","sourceRoot":"","sources":["../src/schema.ts"],"names":[],"mappings":";;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"schema.js","sourceRoot":"","sources":["../src/schema.ts"],"names":[],"mappings":";;;;;;AAAA,8CAAkE;AAQzD,cARF,aAAG,CAQE;AANZ,+CAA+C;AAElC,QAAA,WAAW,GAAG,IAAI,aAAG,CAAC;IACjC,WAAW,EAAE,IAAI;CAClB,CAAC,CAAA;AAeF,MAAa,aAAa;IAKxB,YAAmB,UAAa,EAAE,MAAW,mBAAW;QAArC,eAAU,GAAV,UAAU,CAAG;QAC9B,IAAI,CAAC,GAAG,GAAG,GAAG,CAAA;QACd,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC;YAChC,MAAM,EAAE,IAAI;YACZ,GAAI,IAAI,CAAC,UAAkB;SAC5B,CAA0B,CAAA;IAC7B,CAAC;IAED,IAAI,UAAU;QACZ,OAAO,IAAI,CAAC,UAAU,CAAC,UAA6B,CAAA;IACtD,CAAC;IAED,IAAI,QAAQ;QACV,OAAO,IAAI,CAAC,UAAU,CAAC,QAAyB,CAAA;IAClD,CAAC;IAED,KAAK,CAAC,QAAQ,CAAoB,GAAG,IAAqC;QACxE,IAAI;YACF,MAAM,SAAS,GAAG,CAAC,MAAM,IAAI,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC,CAAM,CAAA;YAEtD,OAAO,SAAS,CAAA;SACjB;QAAC,OAAO,KAAU,EAAE;YACnB,MAAM,IAAI,mBAAU,CAAC,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,MAAM,CAAC,CAAA;SAClD;IACH,CAAC;IAED,MAAM;QACJ,OAAO,IAAI,CAAC,UAAU,CAAA;IACxB,CAAC;CACF;AAlCD,sCAkCC;AAED,SAAgB,MAAM,CAAiC,UAAa,EAAE,MAAW,mBAAW;IAC1F,OAAO,IAAI,aAAa,CAAC,UAAU,EAAE,GAAG,CAAC,CAAA;AAC3C,CAAC;AAFD,wBAEC"}
|
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.24",
|
|
5
5
|
"homepage": "https://feathersjs.com",
|
|
6
6
|
"main": "lib/",
|
|
7
7
|
"types": "lib/",
|
|
@@ -53,22 +53,23 @@
|
|
|
53
53
|
"access": "public"
|
|
54
54
|
},
|
|
55
55
|
"dependencies": {
|
|
56
|
-
"@feathersjs/
|
|
57
|
-
"@feathersjs/
|
|
58
|
-
"@feathersjs/
|
|
56
|
+
"@feathersjs/commons": "^5.0.0-pre.24",
|
|
57
|
+
"@feathersjs/errors": "^5.0.0-pre.24",
|
|
58
|
+
"@feathersjs/feathers": "^5.0.0-pre.24",
|
|
59
|
+
"@feathersjs/hooks": "^0.7.5",
|
|
59
60
|
"@types/json-schema": "^7.0.11",
|
|
60
61
|
"ajv": "^8.11.0",
|
|
61
62
|
"json-schema": "^0.4.0",
|
|
62
|
-
"json-schema-to-ts": "^2.3
|
|
63
|
+
"json-schema-to-ts": "^2.5.3"
|
|
63
64
|
},
|
|
64
65
|
"devDependencies": {
|
|
65
|
-
"@feathersjs/memory": "^5.0.0-pre.
|
|
66
|
+
"@feathersjs/memory": "^5.0.0-pre.24",
|
|
66
67
|
"@types/mocha": "^9.1.1",
|
|
67
|
-
"@types/node": "^17.0.
|
|
68
|
+
"@types/node": "^17.0.40",
|
|
68
69
|
"ajv-formats": "^2.1.1",
|
|
69
70
|
"mocha": "^10.0.0",
|
|
70
71
|
"shx": "^0.3.4",
|
|
71
|
-
"typescript": "^4.
|
|
72
|
+
"typescript": "^4.7.3"
|
|
72
73
|
},
|
|
73
|
-
"gitHead": "
|
|
74
|
+
"gitHead": "72779fa2938f43d7b345b6861ff0035481a07de3"
|
|
74
75
|
}
|
package/src/hooks/index.ts
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export * from './resolve'
|
|
2
|
-
export * from './validate'
|
|
1
|
+
export * from './resolve'
|
|
2
|
+
export * from './validate'
|