@feathersjs/typebox 5.0.5 → 5.0.7
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 +12 -0
- package/lib/index.d.ts +18 -18
- package/lib/index.js.map +1 -1
- package/package.json +5 -5
- package/src/index.ts +19 -13
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,18 @@
|
|
|
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.7](https://github.com/feathersjs/feathers/compare/v5.0.6...v5.0.7) (2023-07-14)
|
|
7
|
+
|
|
8
|
+
**Note:** Version bump only for package @feathersjs/typebox
|
|
9
|
+
|
|
10
|
+
|
|
11
|
+
|
|
12
|
+
|
|
13
|
+
|
|
14
|
+
## [5.0.6](https://github.com/feathersjs/feathers/compare/v5.0.5...v5.0.6) (2023-06-15)
|
|
15
|
+
|
|
16
|
+
**Note:** Version bump only for package @feathersjs/typebox
|
|
17
|
+
|
|
6
18
|
## [5.0.5](https://github.com/feathersjs/feathers/compare/v5.0.4...v5.0.5) (2023-04-28)
|
|
7
19
|
|
|
8
20
|
### Bug Fixes
|
package/lib/index.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { TObject, TInteger, TOptional, TSchema, ObjectOptions } from '@sinclair/typebox';
|
|
1
|
+
import { TObject, TInteger, TOptional, TSchema, ObjectOptions, TIntersect } from '@sinclair/typebox';
|
|
2
2
|
import { Validator, DataValidatorMap, Ajv } from '@feathersjs/schema';
|
|
3
3
|
export * from '@sinclair/typebox';
|
|
4
4
|
export * from './default-schemas';
|
|
@@ -14,7 +14,7 @@ export type TDataSchemaMap = {
|
|
|
14
14
|
* @param validator The AJV validation instance
|
|
15
15
|
* @returns A compiled validation function
|
|
16
16
|
*/
|
|
17
|
-
export declare const getValidator: <T = any, R = T>(schema: TObject, validator: Ajv) => Validator<T, R>;
|
|
17
|
+
export declare const getValidator: <T = any, R = T>(schema: TObject | TIntersect, validator: Ajv) => Validator<T, R>;
|
|
18
18
|
/**
|
|
19
19
|
* Returns compiled validation functions to validate data for the `create`, `update` and `patch`
|
|
20
20
|
* service methods. If not passed explicitly, the `update` validator will be the same as the `create`
|
|
@@ -38,7 +38,7 @@ export declare function StringEnum<T extends string[]>(allowedValues: [...T]): i
|
|
|
38
38
|
* @param schema The TypeBox object schema
|
|
39
39
|
* @returns The `$sort` syntax schema
|
|
40
40
|
*/
|
|
41
|
-
export declare function sortDefinition<T extends TObject>(schema: T): TObject<
|
|
41
|
+
export declare function sortDefinition<T extends TObject>(schema: T): TObject<{ [K in keyof T["properties"]]: TOptional<TInteger>; }>;
|
|
42
42
|
/**
|
|
43
43
|
* Returns the standard Feathers query syntax for a property schema,
|
|
44
44
|
* including operators like `$gt`, `$lt` etc. for a single property
|
|
@@ -49,7 +49,7 @@ export declare function sortDefinition<T extends TObject>(schema: T): TObject<T[
|
|
|
49
49
|
*/
|
|
50
50
|
export declare const queryProperty: <T extends TSchema, X extends {
|
|
51
51
|
[key: string]: TSchema;
|
|
52
|
-
}>(def: T, extension?: X) => TOptional<import("@sinclair/typebox").TUnion<[T, import("@sinclair/typebox").TPartial<
|
|
52
|
+
}>(def: T, extension?: X) => TOptional<import("@sinclair/typebox").TUnion<[T, import("@sinclair/typebox").TPartial<TIntersect<[TObject<{
|
|
53
53
|
$gt: T;
|
|
54
54
|
$gte: T;
|
|
55
55
|
$lt: T;
|
|
@@ -65,9 +65,9 @@ export declare const queryProperty: <T extends TSchema, X extends {
|
|
|
65
65
|
* @param extensions Additional properties to add to a property query
|
|
66
66
|
* @returns The Feathers query syntax schema
|
|
67
67
|
*/
|
|
68
|
-
export declare const queryProperties: <T extends TObject<import("@sinclair/typebox").TProperties>, X extends
|
|
68
|
+
export declare const queryProperties: <T extends TObject<import("@sinclair/typebox").TProperties>, X extends { [K in keyof T["properties"]]?: {
|
|
69
69
|
[key: string]: TSchema;
|
|
70
|
-
}; }
|
|
70
|
+
}; }>(definition: T, extensions?: X) => TOptional<TObject<{ [K_1 in keyof T["properties"]]: TOptional<import("@sinclair/typebox").TUnion<[T["properties"][K_1], import("@sinclair/typebox").TPartial<TIntersect<[TObject<{
|
|
71
71
|
$gt: T["properties"][K_1];
|
|
72
72
|
$gte: T["properties"][K_1];
|
|
73
73
|
$lt: T["properties"][K_1];
|
|
@@ -75,7 +75,7 @@ export declare const queryProperties: <T extends TObject<import("@sinclair/typeb
|
|
|
75
75
|
$ne: T["properties"][K_1];
|
|
76
76
|
$in: import("@sinclair/typebox").TArray<T["properties"][K_1]>;
|
|
77
77
|
$nin: import("@sinclair/typebox").TArray<T["properties"][K_1]>;
|
|
78
|
-
}>, TObject<X[K_1]>]>>]>>; }
|
|
78
|
+
}>, TObject<X[K_1]>]>>]>>; }>>;
|
|
79
79
|
/**
|
|
80
80
|
* Creates a TypeBox schema for the complete Feathers query syntax including `$limit`, $skip`, `$or`
|
|
81
81
|
* and `$sort` and `$select` for the allowed properties.
|
|
@@ -85,14 +85,14 @@ export declare const queryProperties: <T extends TObject<import("@sinclair/typeb
|
|
|
85
85
|
* @param options Options for the TypeBox object schema
|
|
86
86
|
* @returns A TypeBox object representing the complete Feathers query syntax for the given properties
|
|
87
87
|
*/
|
|
88
|
-
export declare const querySyntax: <T extends TObject<import("@sinclair/typebox").TProperties>, X extends
|
|
88
|
+
export declare const querySyntax: <T extends TObject<import("@sinclair/typebox").TProperties>, X extends { [K in keyof T["properties"]]?: {
|
|
89
89
|
[key: string]: TSchema;
|
|
90
|
-
}; }
|
|
90
|
+
}; }>(type: T, extensions?: X, options?: ObjectOptions) => TIntersect<[import("@sinclair/typebox").TPartial<TObject<{
|
|
91
91
|
$limit: import("@sinclair/typebox").TNumber;
|
|
92
92
|
$skip: import("@sinclair/typebox").TNumber;
|
|
93
|
-
$sort: TObject<
|
|
93
|
+
$sort: TObject<{ [K_1 in keyof T["properties"]]: TOptional<TInteger>; }>;
|
|
94
94
|
$select: import("@sinclair/typebox").TUnsafe<(keyof T["properties"])[]>;
|
|
95
|
-
$and: import("@sinclair/typebox").TArray<import("@sinclair/typebox").TUnion<[TOptional<TObject<
|
|
95
|
+
$and: import("@sinclair/typebox").TArray<import("@sinclair/typebox").TUnion<[TOptional<TObject<{ [K_2 in keyof T["properties"]]: TOptional<import("@sinclair/typebox").TUnion<[T["properties"][K_2], import("@sinclair/typebox").TPartial<TIntersect<[TObject<{
|
|
96
96
|
$gt: T["properties"][K_2];
|
|
97
97
|
$gte: T["properties"][K_2];
|
|
98
98
|
$lt: T["properties"][K_2];
|
|
@@ -100,8 +100,8 @@ export declare const querySyntax: <T extends TObject<import("@sinclair/typebox")
|
|
|
100
100
|
$ne: T["properties"][K_2];
|
|
101
101
|
$in: import("@sinclair/typebox").TArray<T["properties"][K_2]>;
|
|
102
102
|
$nin: import("@sinclair/typebox").TArray<T["properties"][K_2]>;
|
|
103
|
-
}>, TObject<X[K_2]>]>>]>>; }
|
|
104
|
-
$or: import("@sinclair/typebox").TArray<TOptional<TObject<
|
|
103
|
+
}>, TObject<X[K_2]>]>>]>>; }>>, TObject<{
|
|
104
|
+
$or: import("@sinclair/typebox").TArray<TOptional<TObject<{ [K_2 in keyof T["properties"]]: TOptional<import("@sinclair/typebox").TUnion<[T["properties"][K_2], import("@sinclair/typebox").TPartial<TIntersect<[TObject<{
|
|
105
105
|
$gt: T["properties"][K_2];
|
|
106
106
|
$gte: T["properties"][K_2];
|
|
107
107
|
$lt: T["properties"][K_2];
|
|
@@ -109,9 +109,9 @@ export declare const querySyntax: <T extends TObject<import("@sinclair/typebox")
|
|
|
109
109
|
$ne: T["properties"][K_2];
|
|
110
110
|
$in: import("@sinclair/typebox").TArray<T["properties"][K_2]>;
|
|
111
111
|
$nin: import("@sinclair/typebox").TArray<T["properties"][K_2]>;
|
|
112
|
-
}>, TObject<X[K_2]>]>>]>>; }
|
|
112
|
+
}>, TObject<X[K_2]>]>>]>>; }>>>;
|
|
113
113
|
}>]>>;
|
|
114
|
-
$or: import("@sinclair/typebox").TArray<TOptional<TObject<
|
|
114
|
+
$or: import("@sinclair/typebox").TArray<TOptional<TObject<{ [K_2 in keyof T["properties"]]: TOptional<import("@sinclair/typebox").TUnion<[T["properties"][K_2], import("@sinclair/typebox").TPartial<TIntersect<[TObject<{
|
|
115
115
|
$gt: T["properties"][K_2];
|
|
116
116
|
$gte: T["properties"][K_2];
|
|
117
117
|
$lt: T["properties"][K_2];
|
|
@@ -119,8 +119,8 @@ export declare const querySyntax: <T extends TObject<import("@sinclair/typebox")
|
|
|
119
119
|
$ne: T["properties"][K_2];
|
|
120
120
|
$in: import("@sinclair/typebox").TArray<T["properties"][K_2]>;
|
|
121
121
|
$nin: import("@sinclair/typebox").TArray<T["properties"][K_2]>;
|
|
122
|
-
}>, TObject<X[K_2]>]>>]>>; }
|
|
123
|
-
}>>, TOptional<TObject<
|
|
122
|
+
}>, TObject<X[K_2]>]>>]>>; }>>>;
|
|
123
|
+
}>>, TOptional<TObject<{ [K_2 in keyof T["properties"]]: TOptional<import("@sinclair/typebox").TUnion<[T["properties"][K_2], import("@sinclair/typebox").TPartial<TIntersect<[TObject<{
|
|
124
124
|
$gt: T["properties"][K_2];
|
|
125
125
|
$gte: T["properties"][K_2];
|
|
126
126
|
$lt: T["properties"][K_2];
|
|
@@ -128,5 +128,5 @@ export declare const querySyntax: <T extends TObject<import("@sinclair/typebox")
|
|
|
128
128
|
$ne: T["properties"][K_2];
|
|
129
129
|
$in: import("@sinclair/typebox").TArray<T["properties"][K_2]>;
|
|
130
130
|
$nin: import("@sinclair/typebox").TArray<T["properties"][K_2]>;
|
|
131
|
-
}>, TObject<X[K_2]>]>>]>>; }
|
|
131
|
+
}>, TObject<X[K_2]>]>>]>>; }>>]>;
|
|
132
132
|
export declare const ObjectIdSchema: () => import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TString<string>, TObject<{}>]>;
|
package/lib/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,+
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@feathersjs/typebox",
|
|
3
3
|
"description": "TypeBox integration for @feathersjs/schema",
|
|
4
|
-
"version": "5.0.
|
|
4
|
+
"version": "5.0.7",
|
|
5
5
|
"homepage": "https://feathersjs.com",
|
|
6
6
|
"main": "lib/",
|
|
7
7
|
"types": "lib/",
|
|
@@ -54,15 +54,15 @@
|
|
|
54
54
|
"access": "public"
|
|
55
55
|
},
|
|
56
56
|
"dependencies": {
|
|
57
|
-
"@feathersjs/schema": "^5.0.
|
|
57
|
+
"@feathersjs/schema": "^5.0.7",
|
|
58
58
|
"@sinclair/typebox": "^0.25.0"
|
|
59
59
|
},
|
|
60
60
|
"devDependencies": {
|
|
61
61
|
"@types/mocha": "^10.0.1",
|
|
62
|
-
"@types/node": "^
|
|
62
|
+
"@types/node": "^20.4.2",
|
|
63
63
|
"mocha": "^10.2.0",
|
|
64
64
|
"shx": "^0.3.4",
|
|
65
|
-
"typescript": "^5.
|
|
65
|
+
"typescript": "^5.1.6"
|
|
66
66
|
},
|
|
67
|
-
"gitHead": "
|
|
67
|
+
"gitHead": "1ab855487d2dfacb114339c634621357bce3a56a"
|
|
68
68
|
}
|
package/src/index.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Type, TObject, TInteger, TOptional, TSchema, ObjectOptions } from '@sinclair/typebox'
|
|
1
|
+
import { Type, TObject, TInteger, TOptional, TSchema, ObjectOptions, TIntersect } from '@sinclair/typebox'
|
|
2
2
|
import { jsonSchema, Validator, DataValidatorMap, Ajv } from '@feathersjs/schema'
|
|
3
3
|
|
|
4
4
|
export * from '@sinclair/typebox'
|
|
@@ -17,7 +17,7 @@ export type TDataSchemaMap = {
|
|
|
17
17
|
* @param validator The AJV validation instance
|
|
18
18
|
* @returns A compiled validation function
|
|
19
19
|
*/
|
|
20
|
-
export const getValidator = <T = any, R = T>(schema: TObject, validator: Ajv): Validator<T, R> =>
|
|
20
|
+
export const getValidator = <T = any, R = T>(schema: TObject | TIntersect, validator: Ajv): Validator<T, R> =>
|
|
21
21
|
jsonSchema.getValidator(schema as any, validator)
|
|
22
22
|
|
|
23
23
|
/**
|
|
@@ -61,13 +61,16 @@ const arrayOfKeys = <T extends TObject>(type: T) => {
|
|
|
61
61
|
* @returns The `$sort` syntax schema
|
|
62
62
|
*/
|
|
63
63
|
export function sortDefinition<T extends TObject>(schema: T) {
|
|
64
|
-
const properties = Object.keys(schema.properties).reduce(
|
|
65
|
-
|
|
64
|
+
const properties = Object.keys(schema.properties).reduce(
|
|
65
|
+
(res, key) => {
|
|
66
|
+
const result = res as any
|
|
66
67
|
|
|
67
|
-
|
|
68
|
+
result[key] = Type.Optional(Type.Integer({ minimum: -1, maximum: 1 }))
|
|
68
69
|
|
|
69
|
-
|
|
70
|
-
|
|
70
|
+
return result
|
|
71
|
+
},
|
|
72
|
+
{} as { [K in keyof T['properties']]: TOptional<TInteger> }
|
|
73
|
+
)
|
|
71
74
|
|
|
72
75
|
return Type.Object(properties, { additionalProperties: false })
|
|
73
76
|
}
|
|
@@ -125,14 +128,17 @@ export const queryProperties = <
|
|
|
125
128
|
definition: T,
|
|
126
129
|
extensions: X = {} as X
|
|
127
130
|
) => {
|
|
128
|
-
const properties = Object.keys(definition.properties).reduce(
|
|
129
|
-
|
|
130
|
-
|
|
131
|
+
const properties = Object.keys(definition.properties).reduce(
|
|
132
|
+
(res, key) => {
|
|
133
|
+
const result = res as any
|
|
134
|
+
const value = definition.properties[key]
|
|
131
135
|
|
|
132
|
-
|
|
136
|
+
result[key] = queryProperty(value, extensions[key])
|
|
133
137
|
|
|
134
|
-
|
|
135
|
-
|
|
138
|
+
return result
|
|
139
|
+
},
|
|
140
|
+
{} as { [K in keyof T['properties']]: QueryProperty<T['properties'][K], X[K]> }
|
|
141
|
+
)
|
|
136
142
|
|
|
137
143
|
return Type.Optional(Type.Object(properties, { additionalProperties: false }))
|
|
138
144
|
}
|