@feathersjs/schema 5.0.12 → 5.0.13
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 +4 -0
- package/lib/hooks/validate.js.map +1 -1
- package/lib/json-schema.d.ts +6 -6
- package/package.json +10 -10
- package/src/hooks/validate.ts +2 -2
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,10 @@
|
|
|
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.13](https://github.com/feathersjs/feathers/compare/v5.0.12...v5.0.13) (2023-12-29)
|
|
7
|
+
|
|
8
|
+
**Note:** Version bump only for package @feathersjs/schema
|
|
9
|
+
|
|
6
10
|
## [5.0.12](https://github.com/feathersjs/feathers/compare/v5.0.11...v5.0.12) (2023-11-28)
|
|
7
11
|
|
|
8
12
|
### Bug Fixes
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validate.js","sourceRoot":"","sources":["../../src/hooks/validate.ts"],"names":[],"mappings":";;;AACA,+CAA+C;AAC/C,iEAAuD;AAIhD,MAAM,aAAa,GAAG,CAAwB,MAA+B,EAAE,EAAE;IACtF,MAAM,SAAS,GAAc,OAAO,MAAM,KAAK,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;IAEjG,OAAO,KAAK,EAAE,OAAU,EAAE,IAAmB,EAAE,EAAE;;QAC/C,MAAM,IAAI,GAAG,CAAA,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,MAAM,0CAAE,KAAK,KAAI,EAAE,CAAA;QAEzC,IAAI,CAAC;YACH,MAAM,KAAK,GAAG,MAAM,SAAS,CAAC,IAAI,CAAC,CAAA;YAEnC,MAAM,CAAC,cAAc,CAAC,KAAK,EAAE,2BAAS,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAA;YAExD,OAAO,CAAC,MAAM,GAAG;gBACf,GAAG,OAAO,CAAC,MAAM;gBACjB,KAAK;aACN,CAAA;QACH,CAAC;QAAC,OAAO,KAAU,EAAE,CAAC;YACpB,MAAM,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,mBAAU,CAAC,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,CAAA;QACvE,CAAC;QAED,IAAI,OAAO,IAAI,KAAK,UAAU,EAAE,CAAC;YAC/B,OAAO,IAAI,EAAE,CAAA;QACf,CAAC;IACH,CAAC,CAAA;AACH,CAAC,CAAA;AAvBY,QAAA,aAAa,iBAuBzB;AAEM,MAAM,YAAY,GAAG,CAAwB,MAAkD,EAAE,EAAE;IACxG,OAAO,KAAK,EAAE,OAAU,EAAE,IAAmB,EAAE,EAAE;QAC/C,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAA;QACzB,MAAM,SAAS,GACb,OAAQ,MAAsB,CAAC,QAAQ,KAAK,UAAU;YACpD,CAAC,CAAE,MAAsB,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC;YAC/C,CAAC,CAAC,OAAO,MAAM,KAAK,UAAU;
|
|
1
|
+
{"version":3,"file":"validate.js","sourceRoot":"","sources":["../../src/hooks/validate.ts"],"names":[],"mappings":";;;AACA,+CAA+C;AAC/C,iEAAuD;AAIhD,MAAM,aAAa,GAAG,CAAwB,MAA+B,EAAE,EAAE;IACtF,MAAM,SAAS,GAAc,OAAO,MAAM,KAAK,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;IAEjG,OAAO,KAAK,EAAE,OAAU,EAAE,IAAmB,EAAE,EAAE;;QAC/C,MAAM,IAAI,GAAG,CAAA,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,MAAM,0CAAE,KAAK,KAAI,EAAE,CAAA;QAEzC,IAAI,CAAC;YACH,MAAM,KAAK,GAAG,MAAM,SAAS,CAAC,IAAI,CAAC,CAAA;YAEnC,MAAM,CAAC,cAAc,CAAC,KAAK,EAAE,2BAAS,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAA;YAExD,OAAO,CAAC,MAAM,GAAG;gBACf,GAAG,OAAO,CAAC,MAAM;gBACjB,KAAK;aACN,CAAA;QACH,CAAC;QAAC,OAAO,KAAU,EAAE,CAAC;YACpB,MAAM,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,mBAAU,CAAC,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,CAAA;QACvE,CAAC;QAED,IAAI,OAAO,IAAI,KAAK,UAAU,EAAE,CAAC;YAC/B,OAAO,IAAI,EAAE,CAAA;QACf,CAAC;IACH,CAAC,CAAA;AACH,CAAC,CAAA;AAvBY,QAAA,aAAa,iBAuBzB;AAEM,MAAM,YAAY,GAAG,CAAwB,MAAkD,EAAE,EAAE;IACxG,OAAO,KAAK,EAAE,OAAU,EAAE,IAAmB,EAAE,EAAE;QAC/C,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAA;QACzB,MAAM,SAAS,GACb,OAAQ,MAAsB,CAAC,QAAQ,KAAK,UAAU;YACpD,CAAC,CAAE,MAAsB,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC;YAC/C,CAAC,CAAC,OAAO,MAAM,KAAK,UAAU;gBAC5B,CAAC,CAAC,MAAM;gBACR,CAAC,CAAE,MAAc,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;QAEvC,IAAI,SAAS,EAAE,CAAC;YACd,IAAI,CAAC;gBACH,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;oBACxB,OAAO,CAAC,IAAI,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,CAAA;gBAC7E,CAAC;qBAAM,CAAC;oBACN,OAAO,CAAC,IAAI,GAAG,MAAM,SAAS,CAAC,IAAI,CAAC,CAAA;gBACtC,CAAC;gBAED,MAAM,CAAC,cAAc,CAAC,OAAO,CAAC,IAAI,EAAE,2BAAS,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAA;YACjE,CAAC;YAAC,OAAO,KAAU,EAAE,CAAC;gBACpB,MAAM,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,mBAAU,CAAC,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,CAAA;YACvE,CAAC;QACH,CAAC;QAED,IAAI,OAAO,IAAI,KAAK,UAAU,EAAE,CAAC;YAC/B,OAAO,IAAI,EAAE,CAAA;QACf,CAAC;IACH,CAAC,CAAA;AACH,CAAC,CAAA;AA5BY,QAAA,YAAY,gBA4BxB"}
|
package/lib/json-schema.d.ts
CHANGED
|
@@ -60,8 +60,8 @@ export type PropertyQuery<D extends JSONSchema, X> = {
|
|
|
60
60
|
* @param extensions Additional properties to add to the query property schema
|
|
61
61
|
* @returns A JSON schema definition for the Feathers query syntax for this property.
|
|
62
62
|
*/
|
|
63
|
-
export declare const queryProperty: <T extends import("json-schema-to-ts").JSONSchema7, X extends {
|
|
64
|
-
[key: string]: import("json-schema-to-ts").JSONSchema7;
|
|
63
|
+
export declare const queryProperty: <T extends import("json-schema-to-ts/lib/types/definitions").JSONSchema7, X extends {
|
|
64
|
+
[key: string]: import("json-schema-to-ts/lib/types/definitions").JSONSchema7;
|
|
65
65
|
}>(def: T, extensions?: X) => {
|
|
66
66
|
readonly anyOf: readonly [any, {
|
|
67
67
|
readonly type: "object";
|
|
@@ -85,9 +85,9 @@ export declare const queryProperty: <T extends import("json-schema-to-ts").JSONS
|
|
|
85
85
|
* @returns The JSON schema definition for the Feathers query syntax for multiple properties
|
|
86
86
|
*/
|
|
87
87
|
export declare const queryProperties: <T extends {
|
|
88
|
-
[key: string]: import("json-schema-to-ts").JSONSchema7;
|
|
88
|
+
[key: string]: import("json-schema-to-ts/lib/types/definitions").JSONSchema7;
|
|
89
89
|
}, X extends { [K in keyof T]?: {
|
|
90
|
-
[key: string]: import("json-schema-to-ts").JSONSchema7;
|
|
90
|
+
[key: string]: import("json-schema-to-ts/lib/types/definitions").JSONSchema7;
|
|
91
91
|
}; }>(definitions: T, extensions?: X) => { [K_1 in keyof T]: PropertyQuery<T[K_1], X[K_1]>; };
|
|
92
92
|
/**
|
|
93
93
|
* Creates a JSON schema for the complete Feathers query syntax including `$limit`, $skip`
|
|
@@ -98,9 +98,9 @@ export declare const queryProperties: <T extends {
|
|
|
98
98
|
* @returns A JSON schema for the complete query syntax
|
|
99
99
|
*/
|
|
100
100
|
export declare const querySyntax: <T extends {
|
|
101
|
-
[key: string]: import("json-schema-to-ts").JSONSchema7;
|
|
101
|
+
[key: string]: import("json-schema-to-ts/lib/types/definitions").JSONSchema7;
|
|
102
102
|
}, X extends { [K in keyof T]?: {
|
|
103
|
-
[key: string]: import("json-schema-to-ts").JSONSchema7;
|
|
103
|
+
[key: string]: import("json-schema-to-ts/lib/types/definitions").JSONSchema7;
|
|
104
104
|
}; }>(definition: T, extensions?: X) => {
|
|
105
105
|
readonly $limit: {
|
|
106
106
|
readonly type: "number";
|
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.
|
|
4
|
+
"version": "5.0.13",
|
|
5
5
|
"homepage": "https://feathersjs.com",
|
|
6
6
|
"main": "lib/",
|
|
7
7
|
"types": "lib/",
|
|
@@ -54,27 +54,27 @@
|
|
|
54
54
|
"access": "public"
|
|
55
55
|
},
|
|
56
56
|
"dependencies": {
|
|
57
|
-
"@feathersjs/adapter-commons": "^5.0.
|
|
58
|
-
"@feathersjs/commons": "^5.0.
|
|
59
|
-
"@feathersjs/errors": "^5.0.
|
|
60
|
-
"@feathersjs/feathers": "^5.0.
|
|
57
|
+
"@feathersjs/adapter-commons": "^5.0.13",
|
|
58
|
+
"@feathersjs/commons": "^5.0.13",
|
|
59
|
+
"@feathersjs/errors": "^5.0.13",
|
|
60
|
+
"@feathersjs/feathers": "^5.0.13",
|
|
61
61
|
"@feathersjs/hooks": "^0.8.1",
|
|
62
62
|
"@types/json-schema": "^7.0.15",
|
|
63
63
|
"ajv": "^8.12.0",
|
|
64
64
|
"ajv-formats": "^2.1.1",
|
|
65
|
-
"json-schema-to-ts": "^
|
|
65
|
+
"json-schema-to-ts": "^3.0.0"
|
|
66
66
|
},
|
|
67
67
|
"devDependencies": {
|
|
68
|
-
"@feathersjs/memory": "^5.0.
|
|
68
|
+
"@feathersjs/memory": "^5.0.13",
|
|
69
69
|
"@types/mocha": "^10.0.6",
|
|
70
|
-
"@types/node": "^20.10.
|
|
70
|
+
"@types/node": "^20.10.5",
|
|
71
71
|
"ajv-formats": "^2.1.1",
|
|
72
72
|
"mocha": "^10.2.0",
|
|
73
73
|
"shx": "^0.3.4",
|
|
74
|
-
"typescript": "^5.
|
|
74
|
+
"typescript": "^5.3.2"
|
|
75
75
|
},
|
|
76
76
|
"peerDependencies": {
|
|
77
77
|
"typescript": ">=5.3"
|
|
78
78
|
},
|
|
79
|
-
"gitHead": "
|
|
79
|
+
"gitHead": "486f4e781015f05944f3200da277a9e50759f513"
|
|
80
80
|
}
|
package/src/hooks/validate.ts
CHANGED
|
@@ -36,8 +36,8 @@ export const validateData = <H extends HookContext>(schema: Schema<any> | DataVa
|
|
|
36
36
|
typeof (schema as Schema<any>).validate === 'function'
|
|
37
37
|
? (schema as Schema<any>).validate.bind(schema)
|
|
38
38
|
: typeof schema === 'function'
|
|
39
|
-
|
|
40
|
-
|
|
39
|
+
? schema
|
|
40
|
+
: (schema as any)[context.method]
|
|
41
41
|
|
|
42
42
|
if (validator) {
|
|
43
43
|
try {
|