@sinclair/typebox 0.34.8 → 0.34.10
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/build/cjs/compiler/compiler.d.ts +4 -0
- package/build/cjs/compiler/compiler.js +8 -0
- package/build/cjs/syntax/runtime.d.ts +1 -1
- package/build/cjs/type/indexed/indexed-from-mapped-result.js +1 -2
- package/build/cjs/type/indexed/indexed-property-keys.d.ts +3 -3
- package/build/cjs/type/indexed/indexed-property-keys.js +7 -7
- package/build/cjs/type/indexed/indexed.d.ts +33 -35
- package/build/cjs/type/indexed/indexed.js +40 -39
- package/build/cjs/type/module/compute.d.ts +3 -3
- package/build/cjs/type/module/compute.js +0 -3
- package/build/cjs/type/module/infer.d.ts +3 -1
- package/build/cjs/type/record/record.d.ts +1 -1
- package/build/cjs/type/type/json.d.ts +11 -5
- package/build/cjs/value/parse/parse.d.ts +20 -4
- package/build/cjs/value/parse/parse.js +73 -17
- package/build/esm/compiler/compiler.d.mts +4 -0
- package/build/esm/compiler/compiler.mjs +8 -0
- package/build/esm/syntax/runtime.d.mts +1 -1
- package/build/esm/type/indexed/indexed-from-mapped-result.mjs +1 -2
- package/build/esm/type/indexed/indexed-property-keys.d.mts +3 -3
- package/build/esm/type/indexed/indexed-property-keys.mjs +7 -7
- package/build/esm/type/indexed/indexed.d.mts +33 -35
- package/build/esm/type/indexed/indexed.mjs +39 -39
- package/build/esm/type/module/compute.d.mts +3 -3
- package/build/esm/type/module/compute.mjs +0 -3
- package/build/esm/type/module/infer.d.mts +3 -1
- package/build/esm/type/record/record.d.mts +1 -1
- package/build/esm/type/type/json.d.mts +11 -5
- package/build/esm/value/parse/parse.d.mts +20 -4
- package/build/esm/value/parse/parse.mjs +70 -16
- package/package.json +1 -1
- package/readme.md +43 -77
|
@@ -4,11 +4,11 @@ import type { TInteger } from '../integer/index.mjs';
|
|
|
4
4
|
import type { TNumber } from '../number/index.mjs';
|
|
5
5
|
import type { TSchema } from '../schema/index.mjs';
|
|
6
6
|
import type { TUnion } from '../union/index.mjs';
|
|
7
|
-
type TFromTemplateLiteral<TemplateLiteral extends TTemplateLiteral,
|
|
7
|
+
type TFromTemplateLiteral<TemplateLiteral extends TTemplateLiteral, Keys extends string[] = TTemplateLiteralGenerate<TemplateLiteral>> = (Keys);
|
|
8
8
|
type TFromUnion<Types extends TSchema[], Result extends string[] = []> = (Types extends [infer Left extends TSchema, ...infer Right extends TSchema[]] ? TFromUnion<Right, [...Result, ...TIndexPropertyKeys<Left>]> : Result);
|
|
9
9
|
type TFromLiteral<LiteralValue extends TLiteralValue> = (LiteralValue extends PropertyKey ? [`${LiteralValue}`] : []);
|
|
10
|
-
export type TIndexPropertyKeys<Type extends TSchema
|
|
11
|
-
])
|
|
10
|
+
export type TIndexPropertyKeys<Type extends TSchema> = (Type extends TTemplateLiteral ? TFromTemplateLiteral<Type> : Type extends TUnion<infer Types extends TSchema[]> ? TFromUnion<Types> : Type extends TLiteral<infer Value extends TLiteralValue> ? TFromLiteral<Value> : Type extends TNumber ? ['[number]'] : Type extends TInteger ? ['[number]'] : [
|
|
11
|
+
]);
|
|
12
12
|
/** Returns a tuple of PropertyKeys derived from the given TSchema */
|
|
13
13
|
export declare function IndexPropertyKeys<Type extends TSchema>(type: Type): TIndexPropertyKeys<Type>;
|
|
14
14
|
export {};
|
|
@@ -5,19 +5,19 @@ import { TemplateLiteralGenerate } from '../template-literal/index.mjs';
|
|
|
5
5
|
import { IsTemplateLiteral, IsUnion, IsLiteral, IsNumber, IsInteger } from '../guard/kind.mjs';
|
|
6
6
|
// prettier-ignore
|
|
7
7
|
function FromTemplateLiteral(templateLiteral) {
|
|
8
|
-
const
|
|
9
|
-
return
|
|
8
|
+
const keys = TemplateLiteralGenerate(templateLiteral);
|
|
9
|
+
return keys.map(key => key.toString());
|
|
10
10
|
}
|
|
11
11
|
// prettier-ignore
|
|
12
|
-
function FromUnion(
|
|
12
|
+
function FromUnion(types) {
|
|
13
13
|
const result = [];
|
|
14
|
-
for (const
|
|
15
|
-
result.push(...IndexPropertyKeys(
|
|
14
|
+
for (const type of types)
|
|
15
|
+
result.push(...IndexPropertyKeys(type));
|
|
16
16
|
return result;
|
|
17
17
|
}
|
|
18
18
|
// prettier-ignore
|
|
19
|
-
function FromLiteral(
|
|
20
|
-
return ([
|
|
19
|
+
function FromLiteral(literalValue) {
|
|
20
|
+
return ([literalValue.toString()] // TS 5.4 observes TLiteralValue as not having a toString()
|
|
21
21
|
);
|
|
22
22
|
}
|
|
23
23
|
/** Returns a tuple of PropertyKeys derived from the given TSchema */
|
|
@@ -1,54 +1,52 @@
|
|
|
1
1
|
import { type TSchema, SchemaOptions } from '../schema/index.mjs';
|
|
2
|
-
import { type TComputed } from '../computed/index.mjs';
|
|
3
|
-
import { type TLiteral, type TLiteralValue } from '../literal/index.mjs';
|
|
4
|
-
import { type TObject, type TProperties } from '../object/index.mjs';
|
|
5
2
|
import { type Assert } from '../helpers/index.mjs';
|
|
3
|
+
import { type TComputed } from '../computed/index.mjs';
|
|
6
4
|
import { type TNever } from '../never/index.mjs';
|
|
7
|
-
import { type
|
|
5
|
+
import { type TArray } from '../array/index.mjs';
|
|
8
6
|
import { type TIntersect } from '../intersect/index.mjs';
|
|
9
|
-
import { TMappedResult, type TMappedKey } from '../mapped/index.mjs';
|
|
7
|
+
import { type TMappedResult, type TMappedKey } from '../mapped/index.mjs';
|
|
8
|
+
import { type TObject, type TProperties } from '../object/index.mjs';
|
|
10
9
|
import { type TUnion } from '../union/index.mjs';
|
|
11
|
-
import { type
|
|
12
|
-
import { type TArray } from '../array/index.mjs';
|
|
10
|
+
import { type TRecursive } from '../recursive/index.mjs';
|
|
13
11
|
import { type TRef } from '../ref/index.mjs';
|
|
12
|
+
import { type TTuple } from '../tuple/index.mjs';
|
|
14
13
|
import { type TIntersectEvaluated } from '../intersect/index.mjs';
|
|
15
14
|
import { type TUnionEvaluated } from '../union/index.mjs';
|
|
16
15
|
import { type TIndexPropertyKeys } from './indexed-property-keys.mjs';
|
|
17
16
|
import { type TIndexFromMappedKey } from './indexed-from-mapped-key.mjs';
|
|
18
17
|
import { type TIndexFromMappedResult } from './indexed-from-mapped-result.mjs';
|
|
19
|
-
type TFromRest<
|
|
18
|
+
type TFromRest<Types extends TSchema[], Key extends PropertyKey, Result extends TSchema[] = []> = (Types extends [infer Left extends TSchema, ...infer Right extends TSchema[]] ? TFromRest<Right, Key, [...Result, Assert<TIndexFromPropertyKey<Left, Key>, TSchema>]> : Result);
|
|
20
19
|
type TFromIntersectRest<Types extends TSchema[], Result extends TSchema[] = []> = (Types extends [infer Left extends TSchema, ...infer Right extends TSchema[]] ? Left extends TNever ? TFromIntersectRest<Right, [...Result]> : TFromIntersectRest<Right, [...Result, Left]> : Result);
|
|
21
20
|
type TFromIntersect<Types extends TSchema[], Key extends PropertyKey> = (TIntersectEvaluated<TFromIntersectRest<TFromRest<Types, Key>>>);
|
|
22
21
|
type TFromUnionRest<Types extends TSchema[], Result extends TSchema[] = []> = Types extends [infer Left extends TSchema, ...infer Right extends TSchema[]] ? Left extends TNever ? [] : TFromUnionRest<Right, [Left, ...Result]> : Result;
|
|
23
22
|
type TFromUnion<Types extends TSchema[], Key extends PropertyKey> = (TUnionEvaluated<TFromUnionRest<TFromRest<Types, Key>>>);
|
|
24
|
-
type TFromTuple<Types extends TSchema[], Key extends PropertyKey
|
|
23
|
+
type TFromTuple<Types extends TSchema[], Key extends PropertyKey> = (Key extends keyof Types ? Types[Key] : Key extends '[number]' ? TUnionEvaluated<Types> : TNever);
|
|
25
24
|
type TFromArray<Type extends TSchema, Key extends PropertyKey> = (Key extends '[number]' ? Type : TNever);
|
|
26
|
-
type AssertPropertyKey<T
|
|
27
|
-
type TFromProperty<Properties extends TProperties, Key extends PropertyKey
|
|
28
|
-
export type TIndexFromPropertyKey<Type extends TSchema, Key extends PropertyKey> = (Type extends TRecursive<infer
|
|
29
|
-
export declare function IndexFromPropertyKey<Type extends TSchema, Key extends PropertyKey>(type: Type,
|
|
25
|
+
type AssertPropertyKey<T> = Assert<T, string | number>;
|
|
26
|
+
type TFromProperty<Properties extends TProperties, Key extends PropertyKey> = (Key extends keyof Properties ? Properties[Key] : `${AssertPropertyKey<Key>}` extends `${AssertPropertyKey<keyof Properties>}` ? Properties[AssertPropertyKey<Key>] : TNever);
|
|
27
|
+
export type TIndexFromPropertyKey<Type extends TSchema, Key extends PropertyKey> = (Type extends TRecursive<infer Type extends TSchema> ? TIndexFromPropertyKey<Type, Key> : Type extends TIntersect<infer Types extends TSchema[]> ? TFromIntersect<Types, Key> : Type extends TUnion<infer Types extends TSchema[]> ? TFromUnion<Types, Key> : Type extends TTuple<infer Types extends TSchema[]> ? TFromTuple<Types, Key> : Type extends TArray<infer Type extends TSchema> ? TFromArray<Type, Key> : Type extends TObject<infer Properties extends TProperties> ? TFromProperty<Properties, Key> : TNever);
|
|
28
|
+
export declare function IndexFromPropertyKey<Type extends TSchema, Key extends PropertyKey>(type: Type, propertyKey: Key): TIndexFromPropertyKey<Type, Key>;
|
|
30
29
|
export type TIndexFromPropertyKeys<Type extends TSchema, PropertyKeys extends PropertyKey[], Result extends TSchema[] = []> = (PropertyKeys extends [infer Left extends PropertyKey, ...infer Right extends PropertyKey[]] ? TIndexFromPropertyKeys<Type, Right, [...Result, Assert<TIndexFromPropertyKey<Type, Left>, TSchema>]> : Result);
|
|
31
30
|
export declare function IndexFromPropertyKeys<Type extends TSchema, PropertyKeys extends PropertyKey[]>(type: Type, propertyKeys: [...PropertyKeys]): TIndexFromPropertyKeys<Type, PropertyKeys>;
|
|
32
|
-
type
|
|
33
|
-
|
|
34
|
-
type
|
|
35
|
-
|
|
36
|
-
export type TIndex<Type extends TSchema,
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
]
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
]
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
export declare function Index<Type extends TSchema, Key extends TSchema>(type: Type, key: Key, options?: SchemaOptions): TIndex<Type, Key>;
|
|
31
|
+
type FromSchema<Type extends TSchema, PropertyKeys extends PropertyKey[]> = (TUnionEvaluated<TIndexFromPropertyKeys<Type, PropertyKeys>>);
|
|
32
|
+
declare function FromSchema<Type extends TSchema, PropertyKeys extends PropertyKey[]>(type: Type, propertyKeys: [...PropertyKeys]): FromSchema<Type, PropertyKeys>;
|
|
33
|
+
export type TIndexFromComputed<Type extends TSchema, Key extends TSchema> = (TComputed<'Index', [Type, Key]>);
|
|
34
|
+
export declare function IndexFromComputed<Type extends TSchema, Key extends TSchema>(type: Type, key: Key): TIndexFromComputed<Type, Key>;
|
|
35
|
+
export type TIndex<Type extends TSchema, PropertyKeys extends PropertyKey[]> = (FromSchema<Type, PropertyKeys>);
|
|
36
|
+
/** `[Json]` Returns an Indexed property type for the given keys */
|
|
37
|
+
export declare function Index<Type extends TRef, Key extends TSchema>(type: Type, key: Key, options?: SchemaOptions): TIndexFromComputed<Type, Key>;
|
|
38
|
+
/** `[Json]` Returns an Indexed property type for the given keys */
|
|
39
|
+
export declare function Index<Type extends TSchema, Key extends TRef>(type: Type, key: Key, options?: SchemaOptions): TIndexFromComputed<Type, Key>;
|
|
40
|
+
/** `[Json]` Returns an Indexed property type for the given keys */
|
|
41
|
+
export declare function Index<Type extends TRef, Key extends TRef>(type: Type, key: Key, options?: SchemaOptions): TIndexFromComputed<Type, Key>;
|
|
42
|
+
/** `[Json]` Returns an Indexed property type for the given keys */
|
|
43
|
+
export declare function Index<Type extends TSchema, MappedResult extends TMappedResult>(type: Type, mappedResult: MappedResult, options?: SchemaOptions): TIndexFromMappedResult<Type, MappedResult>;
|
|
44
|
+
/** `[Json]` Returns an Indexed property type for the given keys */
|
|
45
|
+
export declare function Index<Type extends TSchema, MappedResult extends TMappedResult>(type: Type, mappedResult: MappedResult, options?: SchemaOptions): TIndexFromMappedResult<Type, MappedResult>;
|
|
46
|
+
/** `[Json]` Returns an Indexed property type for the given keys */
|
|
47
|
+
export declare function Index<Type extends TSchema, MappedKey extends TMappedKey>(type: Type, mappedKey: MappedKey, options?: SchemaOptions): TIndexFromMappedKey<Type, MappedKey>;
|
|
48
|
+
/** `[Json]` Returns an Indexed property type for the given keys */
|
|
49
|
+
export declare function Index<Type extends TSchema, Key extends TSchema, PropertyKeys extends PropertyKey[] = TIndexPropertyKeys<Key>>(T: Type, K: Key, options?: SchemaOptions): TIndex<Type, PropertyKeys>;
|
|
50
|
+
/** `[Json]` Returns an Indexed property type for the given keys */
|
|
51
|
+
export declare function Index<Type extends TSchema, PropertyKeys extends PropertyKey[]>(type: Type, propertyKeys: readonly [...PropertyKeys], options?: SchemaOptions): TIndex<Type, PropertyKeys>;
|
|
54
52
|
export {};
|
|
@@ -1,27 +1,23 @@
|
|
|
1
1
|
import { CreateType } from '../create/type.mjs';
|
|
2
|
+
import { TypeBoxError } from '../error/index.mjs';
|
|
2
3
|
import { Computed } from '../computed/index.mjs';
|
|
3
|
-
import { Literal } from '../literal/index.mjs';
|
|
4
4
|
import { Never } from '../never/index.mjs';
|
|
5
5
|
import { IntersectEvaluated } from '../intersect/index.mjs';
|
|
6
6
|
import { UnionEvaluated } from '../union/index.mjs';
|
|
7
|
-
// ------------------------------------------------------------------
|
|
8
|
-
// Infrastructure
|
|
9
|
-
// ------------------------------------------------------------------
|
|
10
7
|
import { IndexPropertyKeys } from './indexed-property-keys.mjs';
|
|
11
8
|
import { IndexFromMappedKey } from './indexed-from-mapped-key.mjs';
|
|
12
9
|
import { IndexFromMappedResult } from './indexed-from-mapped-result.mjs';
|
|
13
10
|
// ------------------------------------------------------------------
|
|
14
|
-
//
|
|
11
|
+
// TypeGuard
|
|
15
12
|
// ------------------------------------------------------------------
|
|
16
|
-
import { IsArray, IsIntersect, IsObject, IsMappedKey, IsMappedResult, IsNever, IsSchema, IsTuple, IsUnion,
|
|
17
|
-
import { IsArray as IsArrayValue } from '../guard/value.mjs';
|
|
13
|
+
import { IsArray, IsIntersect, IsObject, IsMappedKey, IsMappedResult, IsNever, IsSchema, IsTuple, IsUnion, IsRef } from '../guard/kind.mjs';
|
|
18
14
|
// prettier-ignore
|
|
19
15
|
function FromRest(types, key) {
|
|
20
|
-
return types.map(
|
|
16
|
+
return types.map(type => IndexFromPropertyKey(type, key));
|
|
21
17
|
}
|
|
22
18
|
// prettier-ignore
|
|
23
19
|
function FromIntersectRest(types) {
|
|
24
|
-
return types.filter(
|
|
20
|
+
return types.filter(type => !IsNever(type));
|
|
25
21
|
}
|
|
26
22
|
// prettier-ignore
|
|
27
23
|
function FromIntersect(types, key) {
|
|
@@ -39,53 +35,57 @@ function FromUnion(types, key) {
|
|
|
39
35
|
}
|
|
40
36
|
// prettier-ignore
|
|
41
37
|
function FromTuple(types, key) {
|
|
42
|
-
return (key
|
|
43
|
-
key
|
|
38
|
+
return (key in types ? types[key] :
|
|
39
|
+
key === '[number]' ? UnionEvaluated(types) :
|
|
44
40
|
Never());
|
|
45
41
|
}
|
|
46
42
|
// prettier-ignore
|
|
47
43
|
function FromArray(type, key) {
|
|
48
|
-
|
|
49
|
-
|
|
44
|
+
return (key === '[number]'
|
|
45
|
+
? type
|
|
46
|
+
: Never());
|
|
50
47
|
}
|
|
51
48
|
// prettier-ignore
|
|
52
|
-
function FromProperty(properties,
|
|
53
|
-
return (
|
|
49
|
+
function FromProperty(properties, propertyKey) {
|
|
50
|
+
return (propertyKey in properties ? properties[propertyKey] : Never());
|
|
54
51
|
}
|
|
55
52
|
// prettier-ignore
|
|
56
|
-
export function IndexFromPropertyKey(type,
|
|
57
|
-
return (IsIntersect(type) ? FromIntersect(type.allOf,
|
|
58
|
-
IsUnion(type) ? FromUnion(type.anyOf,
|
|
59
|
-
IsTuple(type) ? FromTuple(type.items ?? [],
|
|
60
|
-
IsArray(type) ? FromArray(type.items,
|
|
61
|
-
IsObject(type) ? FromProperty(type.properties,
|
|
53
|
+
export function IndexFromPropertyKey(type, propertyKey) {
|
|
54
|
+
return (IsIntersect(type) ? FromIntersect(type.allOf, propertyKey) :
|
|
55
|
+
IsUnion(type) ? FromUnion(type.anyOf, propertyKey) :
|
|
56
|
+
IsTuple(type) ? FromTuple(type.items ?? [], propertyKey) :
|
|
57
|
+
IsArray(type) ? FromArray(type.items, propertyKey) :
|
|
58
|
+
IsObject(type) ? FromProperty(type.properties, propertyKey) :
|
|
62
59
|
Never());
|
|
63
60
|
}
|
|
64
61
|
// prettier-ignore
|
|
65
62
|
export function IndexFromPropertyKeys(type, propertyKeys) {
|
|
66
|
-
return propertyKeys.map(
|
|
63
|
+
return propertyKeys.map(propertyKey => IndexFromPropertyKey(type, propertyKey));
|
|
67
64
|
}
|
|
68
65
|
// prettier-ignore
|
|
69
|
-
function
|
|
70
|
-
|
|
71
|
-
return UnionEvaluated(result);
|
|
66
|
+
function FromSchema(type, propertyKeys) {
|
|
67
|
+
return (UnionEvaluated(IndexFromPropertyKeys(type, propertyKeys)));
|
|
72
68
|
}
|
|
73
69
|
// prettier-ignore
|
|
74
|
-
function
|
|
75
|
-
|
|
76
|
-
return UnionEvaluated(result);
|
|
70
|
+
export function IndexFromComputed(type, key) {
|
|
71
|
+
return Computed('Index', [type, key]);
|
|
77
72
|
}
|
|
78
73
|
/** `[Json]` Returns an Indexed property type for the given keys */
|
|
79
|
-
// prettier-ignore
|
|
80
74
|
export function Index(type, key, options) {
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
75
|
+
// computed-type
|
|
76
|
+
if (IsRef(type) || IsRef(key)) {
|
|
77
|
+
const error = `Index types using Ref parameters require both Type and Key to be of TSchema`;
|
|
78
|
+
if (!IsSchema(type) || !IsSchema(key))
|
|
79
|
+
throw new TypeBoxError(error);
|
|
80
|
+
return Computed('Index', [type, key]);
|
|
81
|
+
}
|
|
82
|
+
// mapped-types
|
|
83
|
+
if (IsMappedResult(key))
|
|
84
|
+
return IndexFromMappedResult(type, key, options);
|
|
85
|
+
if (IsMappedKey(key))
|
|
86
|
+
return IndexFromMappedKey(type, key, options);
|
|
87
|
+
// prettier-ignore
|
|
88
|
+
return CreateType(IsSchema(key)
|
|
89
|
+
? FromSchema(type, IndexPropertyKeys(key))
|
|
90
|
+
: FromSchema(type, key), options);
|
|
91
91
|
}
|
|
@@ -5,8 +5,8 @@ import { type TAwaited } from '../awaited/index.mjs';
|
|
|
5
5
|
import { type TAsyncIterator } from '../async-iterator/index.mjs';
|
|
6
6
|
import { TComputed } from '../computed/index.mjs';
|
|
7
7
|
import { type TConstructor } from '../constructor/index.mjs';
|
|
8
|
-
import { type TIndex } from '../indexed/index.mjs';
|
|
9
|
-
import { TEnum, TEnumRecord } from '../enum/index.mjs';
|
|
8
|
+
import { type TIndex, type TIndexPropertyKeys } from '../indexed/index.mjs';
|
|
9
|
+
import { TEnum, type TEnumRecord } from '../enum/index.mjs';
|
|
10
10
|
import { type TFunction } from '../function/index.mjs';
|
|
11
11
|
import { type TIntersect, type TIntersectEvaluated } from '../intersect/index.mjs';
|
|
12
12
|
import { type TIterator } from '../iterator/index.mjs';
|
|
@@ -26,7 +26,7 @@ import { type TUnion, type TUnionEvaluated } from '../union/index.mjs';
|
|
|
26
26
|
type TDerefParameters<ModuleProperties extends TProperties, Types extends TSchema[], Result extends TSchema[] = []> = (Types extends [infer Left extends TSchema, ...infer Right extends TSchema[]] ? Left extends TRef<infer Key extends string> ? TDerefParameters<ModuleProperties, Right, [...Result, TDeref<ModuleProperties, Key>]> : TDerefParameters<ModuleProperties, Right, [...Result, TFromType<ModuleProperties, Left>]> : Result);
|
|
27
27
|
type TDeref<ModuleProperties extends TProperties, Ref extends string, Result extends TSchema = (Ref extends keyof ModuleProperties ? ModuleProperties[Ref] extends TRef<infer Ref2 extends string> ? TDeref<ModuleProperties, Ref2> : TFromType<ModuleProperties, ModuleProperties[Ref]> : TNever)> = Result;
|
|
28
28
|
type TFromAwaited<Parameters extends TSchema[]> = (Parameters extends [infer T0 extends TSchema] ? TAwaited<T0> : never);
|
|
29
|
-
type TFromIndex<Parameters extends TSchema[]> = (Parameters extends [infer T0 extends TSchema, infer T1 extends TSchema] ? TIndex<T0, T1
|
|
29
|
+
type TFromIndex<Parameters extends TSchema[]> = (Parameters extends [infer T0 extends TSchema, infer T1 extends TSchema] ? TIndex<T0, TIndexPropertyKeys<T1>> extends infer Result extends TSchema ? Result : never : never);
|
|
30
30
|
type TFromKeyOf<Parameters extends TSchema[]> = (Parameters extends [infer T0 extends TSchema] ? TKeyOf<T0> : never);
|
|
31
31
|
type TFromPartial<Parameters extends TSchema[]> = (Parameters extends [infer T0 extends TSchema] ? TPartial<T0> : never);
|
|
32
32
|
type TFromOmit<Parameters extends TSchema[]> = (Parameters extends [infer T0 extends TSchema, infer T1 extends TSchema] ? TOmit<T0, T1> : never);
|
|
@@ -127,9 +127,6 @@ export function FromType(moduleProperties, type) {
|
|
|
127
127
|
// Traveral
|
|
128
128
|
KindGuard.IsArray(type) ? CreateType(FromArray(moduleProperties, type.items), type) :
|
|
129
129
|
KindGuard.IsAsyncIterator(type) ? CreateType(FromAsyncIterator(moduleProperties, type.items), type) :
|
|
130
|
-
// Note: The 'as never' is required due to excessive resolution of TIndex. In fact TIndex, TPick, TOmit and
|
|
131
|
-
// all need re-implementation to remove the PropertyKey[] selector. Reimplementation of these types should
|
|
132
|
-
// be a priority as there is a potential for the current inference to break on TS compiler changes.
|
|
133
130
|
KindGuard.IsComputed(type) ? CreateType(FromComputed(moduleProperties, type.target, type.parameters)) :
|
|
134
131
|
KindGuard.IsConstructor(type) ? CreateType(FromConstructor(moduleProperties, type.parameters, type.returns), type) :
|
|
135
132
|
KindGuard.IsFunction(type) ? CreateType(FromFunction(moduleProperties, type.parameters, type.returns), type) :
|
|
@@ -37,7 +37,9 @@ type InferProperties<ModuleProperties extends TProperties, Properties extends TP
|
|
|
37
37
|
}>;
|
|
38
38
|
type TInferObject<ModuleProperties extends TProperties, Properties extends TProperties> = (InferProperties<ModuleProperties, Properties>);
|
|
39
39
|
type TInferTuple<ModuleProperties extends TProperties, Types extends TSchema[], Result extends unknown[] = []> = (Types extends [infer L extends TSchema, ...infer R extends TSchema[]] ? TInferTuple<ModuleProperties, R, [...Result, TInfer<ModuleProperties, L>]> : Result);
|
|
40
|
-
type TInferRecord<ModuleProperties extends TProperties, Key extends TSchema, Type extends TSchema, InferredKey extends PropertyKey = TInfer<ModuleProperties, Key> extends infer Key extends PropertyKey ? Key : never, InferedType extends unknown = TInfer<ModuleProperties, Type>> =
|
|
40
|
+
type TInferRecord<ModuleProperties extends TProperties, Key extends TSchema, Type extends TSchema, InferredKey extends PropertyKey = TInfer<ModuleProperties, Key> extends infer Key extends PropertyKey ? Key : never, InferedType extends unknown = TInfer<ModuleProperties, Type>> = Ensure<{
|
|
41
|
+
[_ in InferredKey]: InferedType;
|
|
42
|
+
}>;
|
|
41
43
|
type TInferRef<ModuleProperties extends TProperties, Ref extends string> = (Ref extends keyof ModuleProperties ? TInfer<ModuleProperties, ModuleProperties[Ref]> : unknown);
|
|
42
44
|
type TInferUnion<ModuleProperties extends TProperties, Types extends TSchema[], Result extends unknown = never> = (Types extends [infer L extends TSchema, ...infer R extends TSchema[]] ? TInferUnion<ModuleProperties, R, Result | TInfer<ModuleProperties, L>> : Result);
|
|
43
45
|
type TInfer<ModuleProperties extends TProperties, Type extends TSchema> = (Type extends TArray<infer Type extends TSchema> ? TInferArray<ModuleProperties, Type> : Type extends TAsyncIterator<infer Type extends TSchema> ? TInferAsyncIterator<ModuleProperties, Type> : Type extends TConstructor<infer Parameters extends TSchema[], infer InstanceType extends TSchema> ? TInferConstructor<ModuleProperties, Parameters, InstanceType> : Type extends TFunction<infer Parameters extends TSchema[], infer ReturnType extends TSchema> ? TInferFunction<ModuleProperties, Parameters, ReturnType> : Type extends TIntersect<infer Types extends TSchema[]> ? TInferIntersect<ModuleProperties, Types> : Type extends TIterator<infer Type extends TSchema> ? TInferIterator<ModuleProperties, Type> : Type extends TObject<infer Properties extends TProperties> ? TInferObject<ModuleProperties, Properties> : Type extends TRecord<infer Key extends TSchema, infer Type extends TSchema> ? TInferRecord<ModuleProperties, Key, Type> : Type extends TRef<infer Ref extends string> ? TInferRef<ModuleProperties, Ref> : Type extends TTuple<infer Types extends TSchema[]> ? TInferTuple<ModuleProperties, Types> : Type extends TEnum<infer _ extends TEnumRecord> ? Static<Type> : Type extends TUnion<infer Types extends TSchema[]> ? TInferUnion<ModuleProperties, Types> : Static<Type>);
|
|
@@ -52,7 +52,7 @@ export interface TRecord<Key extends TSchema = TSchema, Type extends TSchema = T
|
|
|
52
52
|
};
|
|
53
53
|
additionalProperties: TAdditionalProperties;
|
|
54
54
|
}
|
|
55
|
-
export type TRecordOrObject<Key extends TSchema, Type extends TSchema> = (Type extends TComputed<infer Target extends string, infer Parameters extends TSchema[]> ? TComputed<'Record', [Key, TComputed<Target, Parameters>]> : Key extends TComputed<infer Target extends string, infer Parameters extends TSchema[]> ? TComputed<'Record', [TComputed<Target, Parameters>, Type]> : Key extends TRef<infer Ref extends string> ? TComputed<'Record', [TRef<Ref>, Type]> : Key extends TTemplateLiteral ? TFromTemplateLiteralKey<Key, Type> : Key extends TEnum<infer Enum extends TEnumRecord> ? TFromEnumKey<Enum, Type> : Key extends TUnion<infer Types extends TSchema[]> ? TFromUnionKey<Types, Type> : Key extends TLiteral<infer Value extends TLiteralValue> ? TFromLiteralKey<Value, Type> : Key extends TInteger ? TFromIntegerKey<Key, Type> : Key extends TNumber ? TFromNumberKey<Key, Type> : Key extends TRegExp ? TFromRegExpKey<Key, Type> : Key extends TString ? TFromStringKey<Key, Type> : Key extends TAny ? TFromAnyKey<Key, Type> : Key extends TNever ? TFromNeverKey<Key, Type> :
|
|
55
|
+
export type TRecordOrObject<Key extends TSchema, Type extends TSchema> = (Type extends TComputed<infer Target extends string, infer Parameters extends TSchema[]> ? TComputed<'Record', [Key, TComputed<Target, Parameters>]> : Key extends TComputed<infer Target extends string, infer Parameters extends TSchema[]> ? TComputed<'Record', [TComputed<Target, Parameters>, Type]> : Key extends TRef<infer Ref extends string> ? TComputed<'Record', [TRef<Ref>, Type]> : Key extends TTemplateLiteral ? TFromTemplateLiteralKey<Key, Type> : Key extends TEnum<infer Enum extends TEnumRecord> ? TFromEnumKey<Enum, Type> : Key extends TUnion<infer Types extends TSchema[]> ? TFromUnionKey<Types, Type> : Key extends TLiteral<infer Value extends TLiteralValue> ? TFromLiteralKey<Value, Type> : Key extends TInteger ? TFromIntegerKey<Key, Type> : Key extends TNumber ? TFromNumberKey<Key, Type> : Key extends TRegExp ? TFromRegExpKey<Key, Type> : Key extends TString ? TFromStringKey<Key, Type> : Key extends TAny ? TFromAnyKey<Key, Type> : Key extends TNever ? TFromNeverKey<Key, Type> : TNever);
|
|
56
56
|
/** `[Json]` Creates a Record type */
|
|
57
57
|
export declare function Record<Key extends TSchema, Type extends TSchema>(key: Key, type: Type, options?: ObjectOptions): TRecordOrObject<Key, Type>;
|
|
58
58
|
export {};
|
|
@@ -7,7 +7,7 @@ import { type TEnum, type TEnumKey, type TEnumValue } from '../enum/index.mjs';
|
|
|
7
7
|
import { type TExclude, type TExcludeFromMappedResult, type TExcludeFromTemplateLiteral } from '../exclude/index.mjs';
|
|
8
8
|
import { type TExtends, type TExtendsFromMappedKey, type TExtendsFromMappedResult } from '../extends/index.mjs';
|
|
9
9
|
import { type TExtract, type TExtractFromMappedResult, type TExtractFromTemplateLiteral } from '../extract/index.mjs';
|
|
10
|
-
import { TIndex, type TIndexPropertyKeys } from '../indexed/index.mjs';
|
|
10
|
+
import { TIndex, type TIndexPropertyKeys, type TIndexFromMappedKey, type TIndexFromMappedResult, type TIndexFromComputed } from '../indexed/index.mjs';
|
|
11
11
|
import { type IntegerOptions, type TInteger } from '../integer/index.mjs';
|
|
12
12
|
import { Intersect, type IntersectOptions } from '../intersect/index.mjs';
|
|
13
13
|
import { type TCapitalize, type TUncapitalize, type TLowercase, type TUppercase } from '../intrinsic/index.mjs';
|
|
@@ -93,13 +93,19 @@ export declare class JsonTypeBuilder {
|
|
|
93
93
|
/** `[Json]` Constructs a type by extracting from type all union members that are assignable to union */
|
|
94
94
|
Extract<L extends TSchema, R extends TSchema>(type: L, union: R, options?: SchemaOptions): TExtract<L, R>;
|
|
95
95
|
/** `[Json]` Returns an Indexed property type for the given keys */
|
|
96
|
-
Index<Type extends
|
|
96
|
+
Index<Type extends TRef, Key extends TSchema>(type: Type, key: Key, options?: SchemaOptions): TIndexFromComputed<Type, Key>;
|
|
97
97
|
/** `[Json]` Returns an Indexed property type for the given keys */
|
|
98
|
-
Index<Type extends TSchema, Key extends
|
|
98
|
+
Index<Type extends TSchema, Key extends TRef>(type: Type, key: Key, options?: SchemaOptions): TIndexFromComputed<Type, Key>;
|
|
99
99
|
/** `[Json]` Returns an Indexed property type for the given keys */
|
|
100
|
-
Index<Type extends
|
|
100
|
+
Index<Type extends TRef, Key extends TRef>(type: Type, key: Key, options?: SchemaOptions): TIndexFromComputed<Type, Key>;
|
|
101
101
|
/** `[Json]` Returns an Indexed property type for the given keys */
|
|
102
|
-
Index<Type extends TSchema,
|
|
102
|
+
Index<Type extends TSchema, MappedResult extends TMappedResult>(type: Type, mappedResult: MappedResult, options?: SchemaOptions): TIndexFromMappedResult<Type, MappedResult>;
|
|
103
|
+
/** `[Json]` Returns an Indexed property type for the given keys */
|
|
104
|
+
Index<Type extends TSchema, MappedKey extends TMappedKey>(type: Type, mappedKey: MappedKey, options?: SchemaOptions): TIndexFromMappedKey<Type, MappedKey>;
|
|
105
|
+
/** `[Json]` Returns an Indexed property type for the given keys */
|
|
106
|
+
Index<Type extends TSchema, Key extends TSchema, PropertyKeys extends PropertyKey[] = TIndexPropertyKeys<Key>>(T: Type, K: Key, options?: SchemaOptions): TIndex<Type, PropertyKeys>;
|
|
107
|
+
/** `[Json]` Returns an Indexed property type for the given keys */
|
|
108
|
+
Index<Type extends TSchema, PropertyKeys extends PropertyKey[]>(type: Type, propertyKeys: readonly [...PropertyKeys], options?: SchemaOptions): TIndex<Type, PropertyKeys>;
|
|
103
109
|
/** `[Json]` Creates an Integer type */
|
|
104
110
|
Integer(options?: IntegerOptions): TInteger;
|
|
105
111
|
/** `[Json]` Creates an Intersect type */
|
|
@@ -1,6 +1,22 @@
|
|
|
1
|
+
import { TypeBoxError } from '../../type/error/index.mjs';
|
|
1
2
|
import { TSchema } from '../../type/schema/index.mjs';
|
|
2
3
|
import { StaticDecode } from '../../type/static/index.mjs';
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
export
|
|
4
|
+
export declare class ParseError extends TypeBoxError {
|
|
5
|
+
constructor(message: string);
|
|
6
|
+
}
|
|
7
|
+
export type TParseOperation = 'Clone' | 'Clean' | 'Default' | 'Convert' | 'Assert' | 'Decode' | 'Encode' | ({} & string);
|
|
8
|
+
export type TParseFunction = (type: TSchema, references: TSchema[], value: unknown) => unknown;
|
|
9
|
+
export declare namespace ParseRegistry {
|
|
10
|
+
function Delete(key: string): void;
|
|
11
|
+
function Set(key: string, callback: TParseFunction): void;
|
|
12
|
+
function Get(key: string): TParseFunction | undefined;
|
|
13
|
+
}
|
|
14
|
+
export declare const ParseDefault: readonly ["Clone", "Clean", "Default", "Convert", "Assert", "Decode"];
|
|
15
|
+
/** Parses a value using the default parse pipeline. Will throws an `AssertError` if invalid. */
|
|
16
|
+
export declare function Parse<Type extends TSchema, Output = StaticDecode<Type>, Result extends Output = Output>(schema: Type, references: TSchema[], value: unknown): Result;
|
|
17
|
+
/** Parses a value using the default parse pipeline. Will throws an `AssertError` if invalid. */
|
|
18
|
+
export declare function Parse<Type extends TSchema, Output = StaticDecode<Type>, Result extends Output = Output>(schema: Type, value: unknown): Result;
|
|
19
|
+
/** Parses a value using the specified operations. */
|
|
20
|
+
export declare function Parse<Type extends TSchema>(operations: TParseOperation[], schema: Type, references: TSchema[], value: unknown): unknown;
|
|
21
|
+
/** Parses a value using the specified operations. */
|
|
22
|
+
export declare function Parse<Type extends TSchema>(operations: TParseOperation[], schema: Type, value: unknown): unknown;
|
|
@@ -1,25 +1,79 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import {
|
|
3
|
-
import {
|
|
4
|
-
import {
|
|
5
|
-
import {
|
|
1
|
+
import { TypeBoxError } from '../../type/error/index.mjs';
|
|
2
|
+
import { TransformDecode, TransformEncode, HasTransform } from '../transform/index.mjs';
|
|
3
|
+
import { Assert } from '../assert/index.mjs';
|
|
4
|
+
import { Default } from '../default/index.mjs';
|
|
5
|
+
import { Convert } from '../convert/index.mjs';
|
|
6
|
+
import { Clean } from '../clean/index.mjs';
|
|
6
7
|
import { Clone } from '../clone/index.mjs';
|
|
8
|
+
// ------------------------------------------------------------------
|
|
9
|
+
// Guards
|
|
10
|
+
// ------------------------------------------------------------------
|
|
11
|
+
import { IsArray, IsUndefined } from '../guard/index.mjs';
|
|
12
|
+
// ------------------------------------------------------------------
|
|
13
|
+
// Error
|
|
14
|
+
// ------------------------------------------------------------------
|
|
15
|
+
export class ParseError extends TypeBoxError {
|
|
16
|
+
constructor(message) {
|
|
17
|
+
super(message);
|
|
18
|
+
}
|
|
19
|
+
}
|
|
20
|
+
// prettier-ignore
|
|
21
|
+
export var ParseRegistry;
|
|
22
|
+
(function (ParseRegistry) {
|
|
23
|
+
const registry = new Map([
|
|
24
|
+
['Clone', (_type, _references, value) => Clone(value)],
|
|
25
|
+
['Clean', (type, references, value) => Clean(type, references, value)],
|
|
26
|
+
['Default', (type, references, value) => Default(type, references, value)],
|
|
27
|
+
['Convert', (type, references, value) => Convert(type, references, value)],
|
|
28
|
+
['Assert', (type, references, value) => { Assert(type, references, value); return value; }],
|
|
29
|
+
['Decode', (type, references, value) => (HasTransform(type, references) ? TransformDecode(type, references, value) : value)],
|
|
30
|
+
['Encode', (type, references, value) => (HasTransform(type, references) ? TransformEncode(type, references, value) : value)],
|
|
31
|
+
]);
|
|
32
|
+
// Deletes an entry from the registry
|
|
33
|
+
function Delete(key) {
|
|
34
|
+
registry.delete(key);
|
|
35
|
+
}
|
|
36
|
+
ParseRegistry.Delete = Delete;
|
|
37
|
+
// Sets an entry in the registry
|
|
38
|
+
function Set(key, callback) {
|
|
39
|
+
registry.set(key, callback);
|
|
40
|
+
}
|
|
41
|
+
ParseRegistry.Set = Set;
|
|
42
|
+
// Gets an entry in the registry
|
|
43
|
+
function Get(key) {
|
|
44
|
+
return registry.get(key);
|
|
45
|
+
}
|
|
46
|
+
ParseRegistry.Get = Get;
|
|
47
|
+
})(ParseRegistry || (ParseRegistry = {}));
|
|
48
|
+
// ------------------------------------------------------------------
|
|
49
|
+
// Default Parse Sequence
|
|
50
|
+
// ------------------------------------------------------------------
|
|
7
51
|
// prettier-ignore
|
|
8
|
-
const
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
52
|
+
export const ParseDefault = [
|
|
53
|
+
'Clone',
|
|
54
|
+
'Clean',
|
|
55
|
+
'Default',
|
|
56
|
+
'Convert',
|
|
57
|
+
'Assert',
|
|
58
|
+
'Decode'
|
|
15
59
|
];
|
|
16
60
|
// ------------------------------------------------------------------
|
|
17
61
|
// ParseValue
|
|
18
62
|
// ------------------------------------------------------------------
|
|
19
|
-
function ParseValue(
|
|
20
|
-
return
|
|
63
|
+
function ParseValue(operations, type, references, value) {
|
|
64
|
+
return operations.reduce((value, operationKey) => {
|
|
65
|
+
const operation = ParseRegistry.Get(operationKey);
|
|
66
|
+
if (IsUndefined(operation))
|
|
67
|
+
throw new ParseError(`Unable to find Parse operation '${operationKey}'`);
|
|
68
|
+
return operation(type, references, value);
|
|
69
|
+
}, value);
|
|
21
70
|
}
|
|
22
|
-
/** Parses a value
|
|
71
|
+
/** Parses a value */
|
|
23
72
|
export function Parse(...args) {
|
|
24
|
-
|
|
73
|
+
// prettier-ignore
|
|
74
|
+
const [operations, schema, references, value] = (args.length === 4 ? [args[0], args[1], args[2], args[3]] :
|
|
75
|
+
args.length === 3 ? IsArray(args[0]) ? [args[0], args[1], [], args[2]] : [ParseDefault, args[0], args[1], args[2]] :
|
|
76
|
+
args.length === 2 ? [ParseDefault, args[0], [], args[1]] :
|
|
77
|
+
(() => { throw new ParseError('Invalid Arguments'); })());
|
|
78
|
+
return ParseValue(operations, schema, references, value);
|
|
25
79
|
}
|