@sinclair/typebox 0.34.0 → 0.34.2

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.
Files changed (146) hide show
  1. package/build/cjs/syntax/runtime.d.ts +4 -1
  2. package/build/cjs/syntax/runtime.js +3 -1
  3. package/build/cjs/syntax/static.d.ts +3 -3
  4. package/build/cjs/type/array/array.d.ts +1 -1
  5. package/build/cjs/type/awaited/awaited.d.ts +8 -3
  6. package/build/cjs/type/awaited/awaited.js +20 -20
  7. package/build/cjs/type/computed/computed.d.ts +9 -0
  8. package/build/cjs/type/computed/computed.js +10 -0
  9. package/build/cjs/type/computed/index.d.ts +1 -0
  10. package/build/cjs/type/computed/index.js +18 -0
  11. package/build/cjs/type/guard/kind.d.ts +9 -4
  12. package/build/cjs/type/guard/kind.js +10 -0
  13. package/build/cjs/type/guard/type.d.ts +6 -3
  14. package/build/cjs/type/guard/type.js +6 -0
  15. package/build/cjs/type/indexed/indexed-from-mapped-key.d.ts +6 -6
  16. package/build/cjs/type/indexed/indexed-from-mapped-key.js +10 -10
  17. package/build/cjs/type/indexed/indexed-from-mapped-result.d.ts +5 -5
  18. package/build/cjs/type/indexed/indexed-from-mapped-result.js +11 -10
  19. package/build/cjs/type/indexed/indexed-property-keys.d.ts +6 -6
  20. package/build/cjs/type/indexed/indexed-property-keys.js +14 -14
  21. package/build/cjs/type/indexed/indexed.d.ts +34 -20
  22. package/build/cjs/type/indexed/indexed.js +59 -46
  23. package/build/cjs/type/intersect/intersect-evaluated.d.ts +6 -6
  24. package/build/cjs/type/intersect/intersect-evaluated.js +16 -16
  25. package/build/cjs/type/intersect/intersect.d.ts +2 -2
  26. package/build/cjs/type/intersect/intersect.js +6 -6
  27. package/build/cjs/type/keyof/keyof-from-mapped-result.d.ts +6 -6
  28. package/build/cjs/type/keyof/keyof-from-mapped-result.js +10 -10
  29. package/build/cjs/type/keyof/keyof-property-keys.d.ts +7 -7
  30. package/build/cjs/type/keyof/keyof-property-keys.js +22 -22
  31. package/build/cjs/type/keyof/keyof.d.ts +11 -6
  32. package/build/cjs/type/keyof/keyof.js +22 -13
  33. package/build/cjs/type/module/compute.d.ts +54 -0
  34. package/build/cjs/type/module/compute.js +154 -0
  35. package/build/cjs/type/module/infer.d.ts +43 -0
  36. package/build/cjs/type/module/infer.js +3 -0
  37. package/build/cjs/type/module/module.d.ts +8 -52
  38. package/build/cjs/type/module/module.js +14 -11
  39. package/build/cjs/type/not/not.d.ts +1 -1
  40. package/build/cjs/type/not/not.js +2 -2
  41. package/build/cjs/type/omit/omit-from-mapped-key.d.ts +6 -6
  42. package/build/cjs/type/omit/omit-from-mapped-key.js +10 -12
  43. package/build/cjs/type/omit/omit-from-mapped-result.d.ts +5 -5
  44. package/build/cjs/type/omit/omit-from-mapped-result.js +10 -10
  45. package/build/cjs/type/omit/omit.d.ts +26 -14
  46. package/build/cjs/type/omit/omit.js +46 -35
  47. package/build/cjs/type/partial/partial.d.ts +11 -7
  48. package/build/cjs/type/partial/partial.js +36 -24
  49. package/build/cjs/type/pick/pick-from-mapped-key.d.ts +6 -6
  50. package/build/cjs/type/pick/pick-from-mapped-key.js +10 -10
  51. package/build/cjs/type/pick/pick-from-mapped-result.d.ts +5 -5
  52. package/build/cjs/type/pick/pick-from-mapped-result.js +10 -10
  53. package/build/cjs/type/pick/pick.d.ts +25 -15
  54. package/build/cjs/type/pick/pick.js +47 -36
  55. package/build/cjs/type/record/record.d.ts +4 -2
  56. package/build/cjs/type/record/record.js +31 -28
  57. package/build/cjs/type/required/required.d.ts +12 -8
  58. package/build/cjs/type/required/required.js +37 -25
  59. package/build/cjs/type/tuple/tuple.d.ts +1 -1
  60. package/build/cjs/type/tuple/tuple.js +4 -4
  61. package/build/cjs/type/type/javascript.d.ts +10 -10
  62. package/build/cjs/type/type/javascript.js +6 -6
  63. package/build/cjs/type/type/json.d.ts +41 -51
  64. package/build/cjs/type/type/json.js +40 -40
  65. package/build/cjs/type/union/union-evaluated.d.ts +6 -6
  66. package/build/cjs/type/union/union-evaluated.js +11 -10
  67. package/build/cjs/type/union/union.d.ts +1 -1
  68. package/build/cjs/type/union/union.js +4 -4
  69. package/build/cjs/value/check/check.js +3 -3
  70. package/build/cjs/value/transform/decode.js +7 -7
  71. package/build/cjs/value/transform/encode.js +7 -7
  72. package/build/cjs/value/transform/has.js +18 -18
  73. package/build/esm/syntax/runtime.d.mts +4 -1
  74. package/build/esm/syntax/runtime.mjs +3 -1
  75. package/build/esm/syntax/static.d.mts +3 -3
  76. package/build/esm/type/array/array.d.mts +1 -1
  77. package/build/esm/type/awaited/awaited.d.mts +8 -3
  78. package/build/esm/type/awaited/awaited.mjs +20 -20
  79. package/build/esm/type/computed/computed.d.mts +9 -0
  80. package/build/esm/type/computed/computed.mjs +6 -0
  81. package/build/esm/type/computed/index.d.mts +1 -0
  82. package/build/esm/type/computed/index.mjs +1 -0
  83. package/build/esm/type/guard/kind.d.mts +9 -4
  84. package/build/esm/type/guard/kind.mjs +8 -0
  85. package/build/esm/type/guard/type.d.mts +6 -3
  86. package/build/esm/type/guard/type.mjs +5 -0
  87. package/build/esm/type/indexed/indexed-from-mapped-key.d.mts +6 -6
  88. package/build/esm/type/indexed/indexed-from-mapped-key.mjs +10 -10
  89. package/build/esm/type/indexed/indexed-from-mapped-result.d.mts +5 -5
  90. package/build/esm/type/indexed/indexed-from-mapped-result.mjs +11 -10
  91. package/build/esm/type/indexed/indexed-property-keys.d.mts +6 -6
  92. package/build/esm/type/indexed/indexed-property-keys.mjs +14 -14
  93. package/build/esm/type/indexed/indexed.d.mts +34 -20
  94. package/build/esm/type/indexed/indexed.mjs +55 -42
  95. package/build/esm/type/intersect/intersect-evaluated.d.mts +6 -6
  96. package/build/esm/type/intersect/intersect-evaluated.mjs +16 -16
  97. package/build/esm/type/intersect/intersect.d.mts +2 -2
  98. package/build/esm/type/intersect/intersect.mjs +6 -6
  99. package/build/esm/type/keyof/keyof-from-mapped-result.d.mts +6 -6
  100. package/build/esm/type/keyof/keyof-from-mapped-result.mjs +10 -10
  101. package/build/esm/type/keyof/keyof-property-keys.d.mts +7 -7
  102. package/build/esm/type/keyof/keyof-property-keys.mjs +22 -22
  103. package/build/esm/type/keyof/keyof.d.mts +11 -6
  104. package/build/esm/type/keyof/keyof.mjs +22 -13
  105. package/build/esm/type/module/compute.d.mts +54 -0
  106. package/build/esm/type/module/compute.mjs +148 -0
  107. package/build/esm/type/module/infer.d.mts +43 -0
  108. package/build/esm/type/module/infer.mjs +1 -0
  109. package/build/esm/type/module/module.d.mts +8 -52
  110. package/build/esm/type/module/module.mjs +14 -11
  111. package/build/esm/type/not/not.d.mts +1 -1
  112. package/build/esm/type/not/not.mjs +2 -2
  113. package/build/esm/type/omit/omit-from-mapped-key.d.mts +6 -6
  114. package/build/esm/type/omit/omit-from-mapped-key.mjs +10 -12
  115. package/build/esm/type/omit/omit-from-mapped-result.d.mts +5 -5
  116. package/build/esm/type/omit/omit-from-mapped-result.mjs +10 -10
  117. package/build/esm/type/omit/omit.d.mts +26 -14
  118. package/build/esm/type/omit/omit.mjs +43 -32
  119. package/build/esm/type/partial/partial.d.mts +11 -7
  120. package/build/esm/type/partial/partial.mjs +29 -17
  121. package/build/esm/type/pick/pick-from-mapped-key.d.mts +6 -6
  122. package/build/esm/type/pick/pick-from-mapped-key.mjs +10 -10
  123. package/build/esm/type/pick/pick-from-mapped-result.d.mts +5 -5
  124. package/build/esm/type/pick/pick-from-mapped-result.mjs +10 -10
  125. package/build/esm/type/pick/pick.d.mts +25 -15
  126. package/build/esm/type/pick/pick.mjs +43 -32
  127. package/build/esm/type/record/record.d.mts +4 -2
  128. package/build/esm/type/record/record.mjs +15 -12
  129. package/build/esm/type/required/required.d.mts +12 -8
  130. package/build/esm/type/required/required.mjs +33 -21
  131. package/build/esm/type/tuple/tuple.d.mts +1 -1
  132. package/build/esm/type/tuple/tuple.mjs +4 -4
  133. package/build/esm/type/type/javascript.d.mts +10 -10
  134. package/build/esm/type/type/javascript.mjs +6 -6
  135. package/build/esm/type/type/json.d.mts +41 -51
  136. package/build/esm/type/type/json.mjs +40 -40
  137. package/build/esm/type/union/union-evaluated.d.mts +6 -6
  138. package/build/esm/type/union/union-evaluated.mjs +11 -10
  139. package/build/esm/type/union/union.d.mts +1 -1
  140. package/build/esm/type/union/union.mjs +4 -4
  141. package/build/esm/value/check/check.mjs +2 -2
  142. package/build/esm/value/transform/decode.mjs +2 -2
  143. package/build/esm/value/transform/encode.mjs +2 -2
  144. package/build/esm/value/transform/has.mjs +2 -2
  145. package/package.json +1 -1
  146. package/readme.md +30 -19
@@ -0,0 +1,54 @@
1
+ import { Ensure, Evaluate } from '../helpers/index.mjs';
2
+ import { type TSchema } from '../schema/index.mjs';
3
+ import { type TArray } from '../array/index.mjs';
4
+ import { type TAwaited } from '../awaited/index.mjs';
5
+ import { type TAsyncIterator } from '../async-iterator/index.mjs';
6
+ import { TComputed } from '../computed/index.mjs';
7
+ import { type TConstructor } from '../constructor/index.mjs';
8
+ import { type TIndex } from '../indexed/index.mjs';
9
+ import { type TFunction } from '../function/index.mjs';
10
+ import { type TIntersect, type TIntersectEvaluated } from '../intersect/index.mjs';
11
+ import { type TIterator } from '../iterator/index.mjs';
12
+ import { type TKeyOf } from '../keyof/index.mjs';
13
+ import { type TObject, type TProperties } from '../object/index.mjs';
14
+ import { type TOmit } from '../omit/index.mjs';
15
+ import { type TPick } from '../pick/index.mjs';
16
+ import { type TNever } from '../never/index.mjs';
17
+ import { TPartial } from '../partial/index.mjs';
18
+ import { type TRecordOrObject } from '../record/index.mjs';
19
+ import { type TRef } from '../ref/index.mjs';
20
+ import { TRequired } from '../required/index.mjs';
21
+ import { type TTuple } from '../tuple/index.mjs';
22
+ import { type TUnion, type TUnionEvaluated } from '../union/index.mjs';
23
+ 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);
24
+ 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;
25
+ type TFromAwaited<Parameters extends TSchema[]> = (Parameters extends [infer T0 extends TSchema] ? TAwaited<T0> : never);
26
+ type TFromIndex<Parameters extends TSchema[]> = (Parameters extends [infer T0 extends TSchema, infer T1 extends TSchema] ? TIndex<T0, T1> : never);
27
+ type TFromKeyOf<Parameters extends TSchema[]> = (Parameters extends [infer T0 extends TSchema] ? TKeyOf<T0> : never);
28
+ type TFromPartial<Parameters extends TSchema[]> = (Parameters extends [infer T0 extends TSchema] ? TPartial<T0> : never);
29
+ type TFromOmit<Parameters extends TSchema[]> = (Parameters extends [infer T0 extends TSchema, infer T1 extends TSchema] ? TOmit<T0, T1> : never);
30
+ type TFromPick<Parameters extends TSchema[]> = (Parameters extends [infer T0 extends TSchema, infer T1 extends TSchema] ? TPick<T0, T1> : never);
31
+ type TFromRecord<Parameters extends TSchema[]> = (Parameters extends [infer T0 extends TSchema, infer T1 extends TSchema] ? TRecordOrObject<T0, T1> : never);
32
+ type TFromRequired<Parameters extends TSchema[]> = (Parameters extends [infer T0 extends TSchema] ? TRequired<T0> : never);
33
+ type TFromComputed<ModuleProperties extends TProperties, Target extends string, Parameters extends TSchema[], Dereferenced extends TSchema[] = TDerefParameters<ModuleProperties, Parameters>> = (Target extends 'Awaited' ? TFromAwaited<Dereferenced> : Target extends 'Index' ? TFromIndex<Dereferenced> : Target extends 'KeyOf' ? TFromKeyOf<Dereferenced> : Target extends 'Partial' ? TFromPartial<Dereferenced> : Target extends 'Omit' ? TFromOmit<Dereferenced> : Target extends 'Pick' ? TFromPick<Dereferenced> : Target extends 'Record' ? TFromRecord<Dereferenced> : Target extends 'Required' ? TFromRequired<Dereferenced> : TNever);
34
+ type TFromObject<ModuleProperties extends TProperties, Properties extends TProperties> = Ensure<TObject<Evaluate<{
35
+ [Key in keyof Properties]: TFromType<ModuleProperties, Properties[Key]>;
36
+ }>>>;
37
+ type TFromConstructor<ModuleProperties extends TProperties, Parameters extends TSchema[], InstanceType extends TSchema> = (TConstructor<TFromRest<ModuleProperties, Parameters>, TFromType<ModuleProperties, InstanceType>>);
38
+ type TFromFunction<ModuleProperties extends TProperties, Parameters extends TSchema[], ReturnType extends TSchema> = Ensure<Ensure<TFunction<TFromRest<ModuleProperties, Parameters>, TFromType<ModuleProperties, ReturnType>>>>;
39
+ type TFromTuple<ModuleProperties extends TProperties, Types extends TSchema[]> = (Ensure<TTuple<TFromRest<ModuleProperties, Types>>>);
40
+ type TFromIntersect<ModuleProperties extends TProperties, Types extends TSchema[]> = (Ensure<TIntersectEvaluated<TFromRest<ModuleProperties, Types>>>);
41
+ type TFromUnion<ModuleProperties extends TProperties, Types extends TSchema[]> = (Ensure<TUnionEvaluated<TFromRest<ModuleProperties, Types>>>);
42
+ type TFromArray<ModuleProperties extends TProperties, Type extends TSchema> = (Ensure<TArray<TFromType<ModuleProperties, Type>>>);
43
+ type TFromAsyncIterator<ModuleProperties extends TProperties, Type extends TSchema> = (TAsyncIterator<TFromType<ModuleProperties, Type>>);
44
+ type TFromIterator<ModuleProperties extends TProperties, Type extends TSchema> = (TIterator<TFromType<ModuleProperties, Type>>);
45
+ type TFromRest<ModuleProperties extends TProperties, Types extends TSchema[], Result extends TSchema[] = []> = (Types extends [infer Left extends TSchema, ...infer Right extends TSchema[]] ? TFromRest<ModuleProperties, Right, [...Result, TFromType<ModuleProperties, Left>]> : Result);
46
+ export type TFromType<ModuleProperties extends TProperties, Type extends TSchema> = (Type extends TComputed<infer T extends string, infer S extends TSchema[]> ? TFromComputed<ModuleProperties, T, S> : Type extends TObject<infer S extends TProperties> ? TFromObject<ModuleProperties, S> : Type extends TConstructor<infer S extends TSchema[], infer R extends TSchema> ? TFromConstructor<ModuleProperties, S, R> : Type extends TFunction<infer S extends TSchema[], infer R extends TSchema> ? TFromFunction<ModuleProperties, S, R> : Type extends TTuple<infer S extends TSchema[]> ? TFromTuple<ModuleProperties, S> : Type extends TIntersect<infer S extends TSchema[]> ? TFromIntersect<ModuleProperties, S> : Type extends TUnion<infer S extends TSchema[]> ? TFromUnion<ModuleProperties, S> : Type extends TArray<infer S extends TSchema> ? TFromArray<ModuleProperties, S> : Type extends TAsyncIterator<infer S extends TSchema> ? TFromAsyncIterator<ModuleProperties, S> : Type extends TIterator<infer S extends TSchema> ? TFromIterator<ModuleProperties, S> : Type);
47
+ export declare function FromType<ModuleProperties extends TProperties, Type extends TSchema>(moduleProperties: ModuleProperties, type: Type): TFromType<ModuleProperties, Type>;
48
+ export type TComputeType<ModuleProperties extends TProperties, Key extends PropertyKey> = (Key extends keyof ModuleProperties ? TFromType<ModuleProperties, ModuleProperties[Key]> : TNever);
49
+ export declare function ComputeType<ModuleProperties extends TProperties, Key extends PropertyKey>(moduleProperties: ModuleProperties, key: Key): TComputeType<ModuleProperties, Key>;
50
+ export type TComputeModuleProperties<ModuleProperties extends TProperties> = Evaluate<{
51
+ [Key in keyof ModuleProperties]: TComputeType<ModuleProperties, Key>;
52
+ }>;
53
+ export declare function ComputeModuleProperties<ModuleProperties extends TProperties>(moduleProperties: ModuleProperties): TComputeModuleProperties<ModuleProperties>;
54
+ export {};
@@ -0,0 +1,148 @@
1
+ import { CreateType } from '../create/index.mjs';
2
+ import { Array } from '../array/index.mjs';
3
+ import { Awaited } from '../awaited/index.mjs';
4
+ import { AsyncIterator } from '../async-iterator/index.mjs';
5
+ import { Constructor } from '../constructor/index.mjs';
6
+ import { Index } from '../indexed/index.mjs';
7
+ import { Function } from '../function/index.mjs';
8
+ import { Intersect } from '../intersect/index.mjs';
9
+ import { Iterator } from '../iterator/index.mjs';
10
+ import { KeyOf } from '../keyof/index.mjs';
11
+ import { Object } from '../object/index.mjs';
12
+ import { Omit } from '../omit/index.mjs';
13
+ import { Pick } from '../pick/index.mjs';
14
+ import { Never } from '../never/index.mjs';
15
+ import { Partial } from '../partial/index.mjs';
16
+ import { Record } from '../record/index.mjs';
17
+ import { Required } from '../required/index.mjs';
18
+ import { Tuple } from '../tuple/index.mjs';
19
+ import { Union } from '../union/index.mjs';
20
+ // ------------------------------------------------------------------
21
+ // KindGuard
22
+ // ------------------------------------------------------------------
23
+ import * as KindGuard from '../guard/kind.mjs';
24
+ // prettier-ignore
25
+ function DerefParameters(moduleProperties, types) {
26
+ return types.map((type) => {
27
+ return KindGuard.IsRef(type)
28
+ ? Deref(moduleProperties, type.$ref)
29
+ : FromType(moduleProperties, type);
30
+ });
31
+ }
32
+ // prettier-ignore
33
+ function Deref(moduleProperties, ref) {
34
+ return (ref in moduleProperties
35
+ ? KindGuard.IsRef(moduleProperties[ref])
36
+ ? Deref(moduleProperties, moduleProperties[ref].$ref)
37
+ : FromType(moduleProperties, moduleProperties[ref])
38
+ : Never());
39
+ }
40
+ // prettier-ignore
41
+ function FromAwaited(parameters) {
42
+ return Awaited(parameters[0]);
43
+ }
44
+ // prettier-ignore
45
+ function FromIndex(parameters) {
46
+ return Index(parameters[0], parameters[1]);
47
+ }
48
+ // prettier-ignore
49
+ function FromKeyOf(parameters) {
50
+ return KeyOf(parameters[0]);
51
+ }
52
+ // prettier-ignore
53
+ function FromPartial(parameters) {
54
+ return Partial(parameters[0]);
55
+ }
56
+ // prettier-ignore
57
+ function FromOmit(parameters) {
58
+ return Omit(parameters[0], parameters[1]);
59
+ }
60
+ // prettier-ignore
61
+ function FromPick(parameters) {
62
+ return Pick(parameters[0], parameters[1]);
63
+ }
64
+ // prettier-ignore
65
+ function FromRecord(parameters) {
66
+ return Record(parameters[0], parameters[1]);
67
+ }
68
+ // prettier-ignore
69
+ function FromRequired(parameters) {
70
+ return Required(parameters[0]);
71
+ }
72
+ // prettier-ignore
73
+ function FromComputed(moduleProperties, target, parameters) {
74
+ const dereferenced = DerefParameters(moduleProperties, parameters);
75
+ return (target === 'Awaited' ? FromAwaited(dereferenced) :
76
+ target === 'Index' ? FromIndex(dereferenced) :
77
+ target === 'KeyOf' ? FromKeyOf(dereferenced) :
78
+ target === 'Partial' ? FromPartial(dereferenced) :
79
+ target === 'Omit' ? FromOmit(dereferenced) :
80
+ target === 'Pick' ? FromPick(dereferenced) :
81
+ target === 'Record' ? FromRecord(dereferenced) :
82
+ target === 'Required' ? FromRequired(dereferenced) :
83
+ Never());
84
+ }
85
+ function FromObject(moduleProperties, properties) {
86
+ return Object(globalThis.Object.keys(properties).reduce((result, key) => {
87
+ return { ...result, [key]: FromType(moduleProperties, properties[key]) };
88
+ }, {}));
89
+ }
90
+ // prettier-ignore
91
+ function FromConstructor(moduleProperties, parameters, instanceType) {
92
+ return Constructor(FromRest(moduleProperties, parameters), FromType(moduleProperties, instanceType));
93
+ }
94
+ // prettier-ignore
95
+ function FromFunction(moduleProperties, parameters, returnType) {
96
+ return Function(FromRest(moduleProperties, parameters), FromType(moduleProperties, returnType));
97
+ }
98
+ function FromTuple(moduleProperties, types) {
99
+ return Tuple(FromRest(moduleProperties, types));
100
+ }
101
+ function FromIntersect(moduleProperties, types) {
102
+ return Intersect(FromRest(moduleProperties, types));
103
+ }
104
+ function FromUnion(moduleProperties, types) {
105
+ return Union(FromRest(moduleProperties, types));
106
+ }
107
+ function FromArray(moduleProperties, type) {
108
+ return Array(FromType(moduleProperties, type));
109
+ }
110
+ function FromAsyncIterator(moduleProperties, type) {
111
+ return AsyncIterator(FromType(moduleProperties, type));
112
+ }
113
+ function FromIterator(moduleProperties, type) {
114
+ return Iterator(FromType(moduleProperties, type));
115
+ }
116
+ function FromRest(moduleProperties, types) {
117
+ return types.map((type) => FromType(moduleProperties, type));
118
+ }
119
+ // prettier-ignore
120
+ export function FromType(moduleProperties, type) {
121
+ return (
122
+ // Note: The 'as never' is required due to excessive resolution of TIndex. In fact TIndex, TPick, TOmit and
123
+ // all need re-implementation to remove the PropertyKey[] selector. Reimplementation of these types should
124
+ // be a priority as there is a potential for the current inference to break on TS compiler changes.
125
+ KindGuard.IsComputed(type) ? CreateType(FromComputed(moduleProperties, type.target, type.parameters)) :
126
+ KindGuard.IsObject(type) ? CreateType(FromObject(moduleProperties, type.properties), type) :
127
+ KindGuard.IsConstructor(type) ? CreateType(FromConstructor(moduleProperties, type.parameters, type.returns), type) :
128
+ KindGuard.IsFunction(type) ? CreateType(FromFunction(moduleProperties, type.parameters, type.returns), type) :
129
+ KindGuard.IsTuple(type) ? CreateType(FromTuple(moduleProperties, type.items || []), type) :
130
+ KindGuard.IsIntersect(type) ? CreateType(FromIntersect(moduleProperties, type.allOf), type) :
131
+ KindGuard.IsUnion(type) ? CreateType(FromUnion(moduleProperties, type.anyOf), type) :
132
+ KindGuard.IsArray(type) ? CreateType(FromArray(moduleProperties, type.items), type) :
133
+ KindGuard.IsAsyncIterator(type) ? CreateType(FromAsyncIterator(moduleProperties, type.items), type) :
134
+ KindGuard.IsIterator(type) ? CreateType(FromIterator(moduleProperties, type.items), type) :
135
+ type);
136
+ }
137
+ // prettier-ignore
138
+ export function ComputeType(moduleProperties, key) {
139
+ return (key in moduleProperties
140
+ ? FromType(moduleProperties, moduleProperties[key])
141
+ : Never());
142
+ }
143
+ // prettier-ignore
144
+ export function ComputeModuleProperties(moduleProperties) {
145
+ return globalThis.Object.getOwnPropertyNames(moduleProperties).reduce((result, key) => {
146
+ return { ...result, [key]: ComputeType(moduleProperties, key) };
147
+ }, {});
148
+ }
@@ -0,0 +1,43 @@
1
+ import { Ensure, Evaluate } from '../helpers/index.mjs';
2
+ import { TSchema } from '../schema/index.mjs';
3
+ import { TArray } from '../array/index.mjs';
4
+ import { TAsyncIterator } from '../async-iterator/index.mjs';
5
+ import { TConstructor } from '../constructor/index.mjs';
6
+ import { TFunction } from '../function/index.mjs';
7
+ import { TIntersect } from '../intersect/index.mjs';
8
+ import { TIterator } from '../iterator/index.mjs';
9
+ import { TObject, TProperties } from '../object/index.mjs';
10
+ import { TOptional } from '../optional/index.mjs';
11
+ import { TReadonly } from '../readonly/index.mjs';
12
+ import { TRef } from '../ref/index.mjs';
13
+ import { TTuple } from '../tuple/index.mjs';
14
+ import { TUnion } from '../union/index.mjs';
15
+ import { Static } from '../static/index.mjs';
16
+ type TInferArray<ModuleProperties extends TProperties, Type extends TSchema> = (Ensure<Array<TInfer<ModuleProperties, Type>>>);
17
+ type TInferAsyncIterator<ModuleProperties extends TProperties, Type extends TSchema> = (Ensure<AsyncIterableIterator<TInfer<ModuleProperties, Type>>>);
18
+ type TInferConstructor<ModuleProperties extends TProperties, Parameters extends TSchema[], InstanceType extends TSchema> = Ensure<new (...args: TInferTuple<ModuleProperties, Parameters>) => TInfer<ModuleProperties, InstanceType>>;
19
+ type TInferFunction<ModuleProperties extends TProperties, Parameters extends TSchema[], ReturnType extends TSchema> = Ensure<(...args: TInferTuple<ModuleProperties, Parameters>) => TInfer<ModuleProperties, ReturnType>>;
20
+ type TInferIterator<ModuleProperties extends TProperties, Type extends TSchema> = (Ensure<IterableIterator<TInfer<ModuleProperties, Type>>>);
21
+ type TInferIntersect<ModuleProperties extends TProperties, Types extends TSchema[], Result extends unknown = unknown> = (Types extends [infer L extends TSchema, ...infer R extends TSchema[]] ? TInferIntersect<ModuleProperties, R, Result & TInfer<ModuleProperties, L>> : Result);
22
+ type ReadonlyOptionalPropertyKeys<Properties extends TProperties> = {
23
+ [K in keyof Properties]: Properties[K] extends TReadonly<TSchema> ? (Properties[K] extends TOptional<Properties[K]> ? K : never) : never;
24
+ }[keyof Properties];
25
+ type ReadonlyPropertyKeys<Source extends TProperties> = {
26
+ [K in keyof Source]: Source[K] extends TReadonly<TSchema> ? (Source[K] extends TOptional<Source[K]> ? never : K) : never;
27
+ }[keyof Source];
28
+ type OptionalPropertyKeys<Source extends TProperties> = {
29
+ [K in keyof Source]: Source[K] extends TOptional<TSchema> ? (Source[K] extends TReadonly<Source[K]> ? never : K) : never;
30
+ }[keyof Source];
31
+ type RequiredPropertyKeys<Source extends TProperties> = keyof Omit<Source, ReadonlyOptionalPropertyKeys<Source> | ReadonlyPropertyKeys<Source> | OptionalPropertyKeys<Source>>;
32
+ type InferPropertiesWithModifiers<Properties extends TProperties, Source extends Record<keyof any, unknown>> = Evaluate<(Readonly<Partial<Pick<Source, ReadonlyOptionalPropertyKeys<Properties>>>> & Readonly<Pick<Source, ReadonlyPropertyKeys<Properties>>> & Partial<Pick<Source, OptionalPropertyKeys<Properties>>> & Required<Pick<Source, RequiredPropertyKeys<Properties>>>)>;
33
+ type InferProperties<ModuleProperties extends TProperties, Properties extends TProperties> = InferPropertiesWithModifiers<Properties, {
34
+ [K in keyof Properties]: TInfer<ModuleProperties, Properties[K]>;
35
+ }>;
36
+ type TInferObject<ModuleProperties extends TProperties, Properties extends TProperties> = (InferProperties<ModuleProperties, Properties>);
37
+ 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);
38
+ type TInferRef<ModuleProperties extends TProperties, Ref extends string> = (Ref extends keyof ModuleProperties ? TInfer<ModuleProperties, ModuleProperties[Ref]> : unknown);
39
+ 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);
40
+ 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 TRef<infer Ref extends string> ? TInferRef<ModuleProperties, Ref> : Type extends TTuple<infer Types extends TSchema[]> ? TInferTuple<ModuleProperties, Types> : Type extends TUnion<infer Types extends TSchema[]> ? TInferUnion<ModuleProperties, Types> : Static<Type>);
41
+ /** Inference Path for Imports. This type is used to compute TImport `static` */
42
+ export type TInferFromModuleKey<ModuleProperties extends TProperties, Key extends PropertyKey> = (Key extends keyof ModuleProperties ? TInfer<ModuleProperties, ModuleProperties[Key]> : never);
43
+ export {};
@@ -0,0 +1 @@
1
+ export {};
@@ -1,48 +1,9 @@
1
- import { Ensure } from '../helpers/index.mjs';
2
1
  import { Kind } from '../symbols/index.mjs';
3
2
  import { SchemaOptions, TSchema } from '../schema/index.mjs';
4
- import { TObject, TProperties } from '../object/index.mjs';
5
- import { TConstructor } from '../constructor/index.mjs';
6
- import { TFunction } from '../function/index.mjs';
7
- import { TTuple } from '../tuple/index.mjs';
8
- import { TIntersect } from '../intersect/index.mjs';
9
- import { TUnion } from '../union/index.mjs';
10
- import { TArray } from '../array/index.mjs';
11
- import { TAsyncIterator } from '../async-iterator/index.mjs';
12
- import { TIterator } from '../iterator/index.mjs';
13
- import { TLiteral, TLiteralValue } from '../literal/index.mjs';
14
- import { TAny } from '../any/index.mjs';
15
- import { TBigInt } from '../bigint/index.mjs';
16
- import { TBoolean } from '../boolean/index.mjs';
17
- import { TDate } from '../date/index.mjs';
18
- import { TInteger } from '../integer/index.mjs';
19
- import { TNever } from '../never/index.mjs';
20
- import { TNumber } from '../number/index.mjs';
21
- import { TNull } from '../null/index.mjs';
22
- import { TRef } from '../ref/index.mjs';
23
- import { TRegExp } from '../regexp/index.mjs';
24
- import { TString } from '../string/index.mjs';
25
- import { TSymbol } from '../symbol/index.mjs';
26
- import { TTemplateLiteral, TTemplateLiteralKind } from '../template-literal/index.mjs';
27
- import { TUint8Array } from '../uint8array/index.mjs';
28
- import { TUndefined } from '../undefined/index.mjs';
29
- import { TUnknown } from '../unknown/index.mjs';
30
- import { TVoid } from '../void/index.mjs';
3
+ import { TProperties } from '../object/index.mjs';
31
4
  import { Static } from '../static/index.mjs';
32
- type InferImport<Properties extends TProperties, Key extends keyof Properties, ModuleProperties extends TProperties> = (Infer<Properties[Key], ModuleProperties>);
33
- type InferRef<Ref extends string, Properties extends TProperties> = (Ref extends keyof Properties ? Infer<Properties[Ref], Properties> : never);
34
- type InferObject<Properties extends TProperties, ModuleProperties extends TProperties> = {
35
- [K in keyof Properties]: Infer<Properties[K], ModuleProperties>;
36
- } & {};
37
- type InferConstructor<Parameters extends TSchema[], InstanceType extends TSchema, Properties extends TProperties> = Ensure<new (...args: InferTuple<Parameters, Properties>) => Infer<InstanceType, Properties>>;
38
- type InferFunction<Parameters extends TSchema[], ReturnType extends TSchema, Properties extends TProperties> = Ensure<(...args: InferTuple<Parameters, Properties>) => Infer<ReturnType, Properties>>;
39
- type InferTuple<Types extends TSchema[], Properties extends TProperties, Result extends unknown[] = []> = (Types extends [infer L extends TSchema, ...infer R extends TSchema[]] ? InferTuple<R, Properties, [...Result, Infer<L, Properties>]> : Result);
40
- type InferIntersect<Types extends TSchema[], Properties extends TProperties, Result extends unknown = unknown> = (Types extends [infer L extends TSchema, ...infer R extends TSchema[]] ? InferIntersect<R, Properties, Result & Infer<L, Properties>> : Result);
41
- type InferUnion<Types extends TSchema[], Properties extends TProperties, Result extends unknown = never> = (Types extends [infer L extends TSchema, ...infer R extends TSchema[]] ? InferUnion<R, Properties, Result | Infer<L, Properties>> : Result);
42
- type InferArray<Type extends TSchema, Module extends TProperties> = (Ensure<Array<Infer<Type, Module>>>);
43
- type InferAsyncIterator<Type extends TSchema, Properties extends TProperties> = (Ensure<AsyncIterableIterator<Infer<Type, Properties>>>);
44
- type InferIterator<Type extends TSchema, Properties extends TProperties> = (Ensure<IterableIterator<Infer<Type, Properties>>>);
45
- type Infer<Type extends TSchema, Properties extends TProperties = {}> = (Type extends TImport<infer S extends TProperties, infer K extends string> ? InferImport<S, K, S> : Type extends TRef<infer S extends string> ? InferRef<S, Properties> : Type extends TObject<infer S extends TProperties> ? InferObject<S, Properties> : Type extends TConstructor<infer S extends TSchema[], infer R extends TSchema> ? InferConstructor<S, R, Properties> : Type extends TFunction<infer S extends TSchema[], infer R extends TSchema> ? InferFunction<S, R, Properties> : Type extends TTuple<infer S extends TSchema[]> ? InferTuple<S, Properties> : Type extends TIntersect<infer S extends TSchema[]> ? InferIntersect<S, Properties> : Type extends TUnion<infer S extends TSchema[]> ? InferUnion<S, Properties> : Type extends TArray<infer S extends TSchema> ? InferArray<S, Properties> : Type extends TAsyncIterator<infer S extends TSchema> ? InferAsyncIterator<S, Properties> : Type extends TIterator<infer S extends TSchema> ? InferIterator<S, Properties> : Type extends TTemplateLiteral<infer S extends TTemplateLiteralKind[]> ? Static<TTemplateLiteral<S>> : Type extends TLiteral<infer S extends TLiteralValue> ? S : Type extends TAny ? any : Type extends TBigInt ? bigint : Type extends TBoolean ? boolean : Type extends TDate ? Date : Type extends TInteger ? number : Type extends TNever ? never : Type extends TNumber ? number : Type extends TRegExp ? string : Type extends TString ? string : Type extends TSymbol ? symbol : Type extends TNull ? null : Type extends TUint8Array ? Uint8Array : Type extends TUndefined ? undefined : Type extends TUnknown ? unknown : Type extends TVoid ? void : never);
5
+ import { TComputeModuleProperties } from './compute.mjs';
6
+ import { TInferFromModuleKey } from './infer.mjs';
46
7
  export interface TDefinitions<ModuleProperties extends TProperties> extends TSchema {
47
8
  static: {
48
9
  [K in keyof ModuleProperties]: Static<ModuleProperties[K]>;
@@ -51,21 +12,16 @@ export interface TDefinitions<ModuleProperties extends TProperties> extends TSch
51
12
  }
52
13
  export interface TImport<ModuleProperties extends TProperties = {}, Key extends keyof ModuleProperties = keyof ModuleProperties> extends TSchema {
53
14
  [Kind]: 'Import';
54
- static: InferImport<ModuleProperties, Key, ModuleProperties>;
15
+ static: TInferFromModuleKey<ModuleProperties, Key>;
55
16
  $defs: ModuleProperties;
56
17
  $ref: Key;
57
18
  }
58
- export declare class TModule<Properties extends TProperties> {
19
+ export declare class TModule<ModuleProperties extends TProperties, ComputedModuleProperties extends TProperties = TComputeModuleProperties<ModuleProperties>> {
59
20
  private readonly $defs;
60
- private readonly options;
61
- constructor($defs: Properties, options?: SchemaOptions);
62
- /** `[Json]` Returns the Type definitions for this module */
63
- Defs(): TDefinitions<Properties>;
21
+ constructor($defs: ModuleProperties);
64
22
  /** `[Json]` Imports a Type by Key. */
65
- Import<Key extends keyof Properties>(key: Key, options?: SchemaOptions): TImport<Properties, Key>;
66
- /** `[Internal]` For each definition, assign an `$id` property. */
67
- private ResolveDefinitionsWithIdentifiers;
23
+ Import<Key extends keyof ComputedModuleProperties>(key: Key, options?: SchemaOptions): TImport<ComputedModuleProperties, Key>;
24
+ private WithIdentifiers;
68
25
  }
69
26
  /** `[Json]` Creates a Type Definition Module. */
70
27
  export declare function Module<Properties extends TProperties>(properties: Properties): TModule<Properties>;
71
- export {};
@@ -1,25 +1,28 @@
1
1
  import { CreateType } from '../create/index.mjs';
2
2
  import { Kind } from '../symbols/index.mjs';
3
3
  // ------------------------------------------------------------------
4
+ // Module Infrastructure Types
5
+ // ------------------------------------------------------------------
6
+ import { ComputeModuleProperties } from './compute.mjs';
7
+ // ------------------------------------------------------------------
4
8
  // Module
5
9
  // ------------------------------------------------------------------
6
10
  // prettier-ignore
7
11
  export class TModule {
8
- constructor($defs, options = {}) {
9
- this.$defs = $defs;
10
- this.options = options;
11
- }
12
- /** `[Json]` Returns the Type definitions for this module */
13
- Defs() {
14
- return CreateType({ $defs: this.ResolveDefinitionsWithIdentifiers() }, this.options);
12
+ constructor($defs) {
13
+ const computed = ComputeModuleProperties($defs);
14
+ const identified = this.WithIdentifiers(computed);
15
+ this.$defs = identified;
15
16
  }
16
17
  /** `[Json]` Imports a Type by Key. */
17
18
  Import(key, options) {
18
- return CreateType({ [Kind]: 'Import', $defs: this.ResolveDefinitionsWithIdentifiers(), $ref: key }, options);
19
+ return CreateType({ [Kind]: 'Import', $defs: this.$defs, $ref: key }, options);
19
20
  }
20
- /** `[Internal]` For each definition, assign an `$id` property. */
21
- ResolveDefinitionsWithIdentifiers() {
22
- return globalThis.Object.getOwnPropertyNames(this.$defs).reduce((Result, Key) => ({ ...Result, [Key]: { ...this.$defs[Key], $id: Key } }), {});
21
+ // prettier-ignore
22
+ WithIdentifiers($defs) {
23
+ return globalThis.Object.getOwnPropertyNames($defs).reduce((result, key) => {
24
+ return { ...result, [key]: { ...$defs[key], $id: key } };
25
+ }, {});
23
26
  }
24
27
  }
25
28
  /** `[Json]` Creates a Type Definition Module. */
@@ -7,4 +7,4 @@ export interface TNot<T extends TSchema = TSchema> extends TSchema {
7
7
  not: T;
8
8
  }
9
9
  /** `[Json]` Creates a Not type */
10
- export declare function Not<T extends TSchema>(not: T, options?: SchemaOptions): TNot<T>;
10
+ export declare function Not<Type extends TSchema>(type: Type, options?: SchemaOptions): TNot<Type>;
@@ -1,6 +1,6 @@
1
1
  import { CreateType } from '../create/type.mjs';
2
2
  import { Kind } from '../symbols/index.mjs';
3
3
  /** `[Json]` Creates a Not type */
4
- export function Not(not, options) {
5
- return CreateType({ [Kind]: 'Not', not }, options);
4
+ export function Not(type, options) {
5
+ return CreateType({ [Kind]: 'Not', not: type }, options);
6
6
  }
@@ -2,11 +2,11 @@ import type { TSchema, SchemaOptions } from '../schema/index.mjs';
2
2
  import type { TProperties } from '../object/index.mjs';
3
3
  import { type TMappedResult, type TMappedKey } from '../mapped/index.mjs';
4
4
  import { type TOmit } from './omit.mjs';
5
- type TFromPropertyKey<T extends TSchema, K extends PropertyKey> = {
6
- [_ in K]: TOmit<T, [K]>;
5
+ type TFromPropertyKey<Type extends TSchema, Key extends PropertyKey> = {
6
+ [_ in Key]: TOmit<Type, [Key]>;
7
7
  };
8
- type TFromPropertyKeys<T extends TSchema, K extends PropertyKey[], Acc extends TProperties = {}> = (K extends [infer LK extends PropertyKey, ...infer RK extends PropertyKey[]] ? TFromPropertyKeys<T, RK, Acc & TFromPropertyKey<T, LK>> : Acc);
9
- type TFromMappedKey<T extends TSchema, K extends TMappedKey> = (TFromPropertyKeys<T, K['keys']>);
10
- export type TOmitFromMappedKey<T extends TSchema, K extends TMappedKey, P extends TProperties = TFromMappedKey<T, K>> = (TMappedResult<P>);
11
- export declare function OmitFromMappedKey<T extends TSchema, K extends TMappedKey, P extends TProperties = TFromMappedKey<T, K>>(T: T, K: K, options?: SchemaOptions): TMappedResult<P>;
8
+ type TFromPropertyKeys<Type extends TSchema, PropertyKeys extends PropertyKey[], Result extends TProperties = {}> = (PropertyKeys extends [infer LK extends PropertyKey, ...infer RK extends PropertyKey[]] ? TFromPropertyKeys<Type, RK, Result & TFromPropertyKey<Type, LK>> : Result);
9
+ type TFromMappedKey<Type extends TSchema, MappedKey extends TMappedKey> = (TFromPropertyKeys<Type, MappedKey['keys']>);
10
+ export type TOmitFromMappedKey<Type extends TSchema, MappedKey extends TMappedKey, Properties extends TProperties = TFromMappedKey<Type, MappedKey>> = (TMappedResult<Properties>);
11
+ export declare function OmitFromMappedKey<Type extends TSchema, MappedKey extends TMappedKey, Properties extends TProperties = TFromMappedKey<Type, MappedKey>>(type: Type, mappedKey: MappedKey, options?: SchemaOptions): TMappedResult<Properties>;
12
12
  export {};
@@ -2,23 +2,21 @@ import { MappedResult } from '../mapped/index.mjs';
2
2
  import { Omit } from './omit.mjs';
3
3
  import { Clone } from '../clone/value.mjs';
4
4
  // prettier-ignore
5
- function FromPropertyKey(T, K, options) {
6
- return {
7
- [K]: Omit(T, [K], Clone(options))
8
- };
5
+ function FromPropertyKey(type, key, options) {
6
+ return { [key]: Omit(type, [key], Clone(options)) };
9
7
  }
10
8
  // prettier-ignore
11
- function FromPropertyKeys(T, K, options) {
12
- return K.reduce((Acc, LK) => {
13
- return { ...Acc, ...FromPropertyKey(T, LK, options) };
9
+ function FromPropertyKeys(type, propertyKeys, options) {
10
+ return propertyKeys.reduce((Acc, LK) => {
11
+ return { ...Acc, ...FromPropertyKey(type, LK, options) };
14
12
  }, {});
15
13
  }
16
14
  // prettier-ignore
17
- function FromMappedKey(T, K, options) {
18
- return FromPropertyKeys(T, K.keys, options);
15
+ function FromMappedKey(type, mappedKey, options) {
16
+ return FromPropertyKeys(type, mappedKey.keys, options);
19
17
  }
20
18
  // prettier-ignore
21
- export function OmitFromMappedKey(T, K, options) {
22
- const P = FromMappedKey(T, K, options);
23
- return MappedResult(P);
19
+ export function OmitFromMappedKey(type, mappedKey, options) {
20
+ const properties = FromMappedKey(type, mappedKey, options);
21
+ return MappedResult(properties);
24
22
  }
@@ -3,10 +3,10 @@ import type { Ensure, Evaluate } from '../helpers/index.mjs';
3
3
  import type { TProperties } from '../object/index.mjs';
4
4
  import { type TMappedResult } from '../mapped/index.mjs';
5
5
  import { type TOmit } from './omit.mjs';
6
- type TFromProperties<P extends TProperties, K extends PropertyKey[]> = ({
7
- [K2 in keyof P]: TOmit<P[K2], K>;
6
+ type TFromProperties<Properties extends TProperties, PropertyKeys extends PropertyKey[]> = ({
7
+ [K2 in keyof Properties]: TOmit<Properties[K2], PropertyKeys>;
8
8
  });
9
- type TFromMappedResult<R extends TMappedResult, K extends PropertyKey[]> = (Evaluate<TFromProperties<R['properties'], K>>);
10
- export type TOmitFromMappedResult<T extends TMappedResult, K extends PropertyKey[], P extends TProperties = TFromMappedResult<T, K>> = (Ensure<TMappedResult<P>>);
11
- export declare function OmitFromMappedResult<R extends TMappedResult, K extends PropertyKey[], P extends TProperties = TFromMappedResult<R, K>>(R: R, K: [...K], options?: SchemaOptions): TMappedResult<P>;
9
+ type TFromMappedResult<MappedResult extends TMappedResult, PropertyKeys extends PropertyKey[]> = (Evaluate<TFromProperties<MappedResult['properties'], PropertyKeys>>);
10
+ export type TOmitFromMappedResult<MappedResult extends TMappedResult, PropertyKeys extends PropertyKey[], Properties extends TProperties = TFromMappedResult<MappedResult, PropertyKeys>> = (Ensure<TMappedResult<Properties>>);
11
+ export declare function OmitFromMappedResult<MappedResult extends TMappedResult, PropertyKeys extends PropertyKey[], Properties extends TProperties = TFromMappedResult<MappedResult, PropertyKeys>>(mappedResult: MappedResult, propertyKeys: [...PropertyKeys], options?: SchemaOptions): TMappedResult<Properties>;
12
12
  export {};
@@ -2,18 +2,18 @@ import { MappedResult } from '../mapped/index.mjs';
2
2
  import { Omit } from './omit.mjs';
3
3
  import { Clone } from '../clone/value.mjs';
4
4
  // prettier-ignore
5
- function FromProperties(P, K, options) {
6
- const Acc = {};
7
- for (const K2 of globalThis.Object.getOwnPropertyNames(P))
8
- Acc[K2] = Omit(P[K2], K, Clone(options));
9
- return Acc;
5
+ function FromProperties(properties, propertyKeys, options) {
6
+ const result = {};
7
+ for (const K2 of globalThis.Object.getOwnPropertyNames(properties))
8
+ result[K2] = Omit(properties[K2], propertyKeys, Clone(options));
9
+ return result;
10
10
  }
11
11
  // prettier-ignore
12
- function FromMappedResult(R, K, options) {
13
- return FromProperties(R.properties, K, options);
12
+ function FromMappedResult(mappedResult, propertyKeys, options) {
13
+ return FromProperties(mappedResult.properties, propertyKeys, options);
14
14
  }
15
15
  // prettier-ignore
16
- export function OmitFromMappedResult(R, K, options) {
17
- const P = FromMappedResult(R, K, options);
18
- return MappedResult(P);
16
+ export function OmitFromMappedResult(mappedResult, propertyKeys, options) {
17
+ const properties = FromMappedResult(mappedResult, propertyKeys, options);
18
+ return MappedResult(properties);
19
19
  }
@@ -2,23 +2,35 @@ import type { SchemaOptions, TSchema } from '../schema/index.mjs';
2
2
  import type { TupleToUnion, Evaluate, Ensure } from '../helpers/index.mjs';
3
3
  import { type TRecursive } from '../recursive/index.mjs';
4
4
  import type { TMappedKey, TMappedResult } from '../mapped/index.mjs';
5
+ import { TComputed } from '../computed/index.mjs';
6
+ import { TLiteral, TLiteralValue } from '../literal/index.mjs';
7
+ import { type TIndexPropertyKeys } from '../indexed/index.mjs';
5
8
  import { type TIntersect } from '../intersect/index.mjs';
6
9
  import { type TUnion } from '../union/index.mjs';
7
10
  import { type TObject, type TProperties } from '../object/index.mjs';
8
- import { type TIndexPropertyKeys } from '../indexed/index.mjs';
11
+ import { type TRef } from '../ref/index.mjs';
9
12
  import { type TOmitFromMappedKey } from './omit-from-mapped-key.mjs';
10
13
  import { type TOmitFromMappedResult } from './omit-from-mapped-result.mjs';
11
- type TFromIntersect<T extends TSchema[], K extends PropertyKey[], Acc extends TSchema[] = []> = (T extends [infer L extends TSchema, ...infer R extends TSchema[]] ? TFromIntersect<R, K, [...Acc, TOmit<L, K>]> : Acc);
12
- type TFromUnion<T extends TSchema[], K extends PropertyKey[], Acc extends TSchema[] = []> = (T extends [infer L extends TSchema, ...infer R extends TSchema[]] ? TFromUnion<R, K, [...Acc, TOmit<L, K>]> : Acc);
13
- type TFromProperties<T extends TProperties, K extends PropertyKey[], I extends PropertyKey = TupleToUnion<K>> = Evaluate<Omit<T, I>>;
14
- type TFromObject<T extends TObject, K extends PropertyKey[], Properties extends TProperties = T['properties']> = Ensure<TObject<(TFromProperties<Properties, K>)>>;
15
- export type TOmit<T extends TProperties, K extends PropertyKey[]> = (T extends TRecursive<infer S extends TSchema> ? TRecursive<TOmit<S, K>> : T extends TIntersect<infer S extends TSchema[]> ? TIntersect<TFromIntersect<S, K>> : T extends TUnion<infer S extends TSchema[]> ? TUnion<TFromUnion<S, K>> : T extends TObject<infer S extends TProperties> ? TFromObject<TObject<S>, K> : TObject<{}>);
16
- /** `[Json]` Constructs a type whose keys are omitted from the given type */
17
- export declare function Omit<T extends TMappedResult, K extends PropertyKey[]>(T: T, K: [...K], options?: SchemaOptions): TOmitFromMappedResult<T, K>;
18
- /** `[Json]` Constructs a type whose keys are omitted from the given type */
19
- export declare function Omit<T extends TSchema, K extends TMappedKey>(T: T, K: K, options?: SchemaOptions): TOmitFromMappedKey<T, K>;
20
- /** `[Json]` Constructs a type whose keys are omitted from the given type */
21
- export declare function Omit<T extends TSchema, K extends TSchema, I extends PropertyKey[] = TIndexPropertyKeys<K>>(T: T, K: K, options?: SchemaOptions): TOmit<T, I>;
22
- /** `[Json]` Constructs a type whose keys are omitted from the given type */
23
- export declare function Omit<T extends TSchema, K extends PropertyKey[]>(T: T, K: readonly [...K], options?: SchemaOptions): TOmit<T, K>;
14
+ type TFromIntersect<Types extends TSchema[], PropertyKeys extends PropertyKey[], Result extends TSchema[] = []> = (Types extends [infer L extends TSchema, ...infer R extends TSchema[]] ? TFromIntersect<R, PropertyKeys, [...Result, TOmit<L, PropertyKeys>]> : Result);
15
+ type TFromUnion<T extends TSchema[], K extends PropertyKey[], Result extends TSchema[] = []> = (T extends [infer L extends TSchema, ...infer R extends TSchema[]] ? TFromUnion<R, K, [...Result, TOmit<L, K>]> : Result);
16
+ type TFromProperties<Properties extends TProperties, PropertyKeys extends PropertyKey[], UnionKey extends PropertyKey = TupleToUnion<PropertyKeys>> = (Evaluate<Omit<Properties, UnionKey>>);
17
+ type TFromObject<Type extends TObject, PropertyKeys extends PropertyKey[], Properties extends TProperties = Type['properties']> = Ensure<TObject<(TFromProperties<Properties, PropertyKeys>)>>;
18
+ type TUnionFromPropertyKeys<PropertyKeys extends PropertyKey[], Result extends TLiteral[] = []> = (PropertyKeys extends [infer Key extends PropertyKey, ...infer Rest extends PropertyKey[]] ? Key extends TLiteralValue ? TUnionFromPropertyKeys<Rest, [...Result, TLiteral<Key>]> : TUnionFromPropertyKeys<Rest, [...Result]> : TUnion<Result>);
19
+ export type TOmitResolve<Properties extends TProperties, PropertyKeys extends PropertyKey[]> = (Properties extends TRecursive<infer Types extends TSchema> ? TRecursive<TOmitResolve<Types, PropertyKeys>> : Properties extends TIntersect<infer Types extends TSchema[]> ? TIntersect<TFromIntersect<Types, PropertyKeys>> : Properties extends TUnion<infer Types extends TSchema[]> ? TUnion<TFromUnion<Types, PropertyKeys>> : Properties extends TObject<infer Types extends TProperties> ? TFromObject<TObject<Types>, PropertyKeys> : TObject<{}>);
20
+ type TResolvePropertyKeys<Key extends TSchema | PropertyKey[]> = Key extends TSchema ? TIndexPropertyKeys<Key> : Key;
21
+ type TResolveTypeKey<Key extends TSchema | PropertyKey[]> = Key extends PropertyKey[] ? TUnionFromPropertyKeys<Key> : Key;
22
+ export type TOmit<Type extends TSchema, Key extends TSchema | PropertyKey[], IsTypeRef extends boolean = Type extends TRef ? true : false, IsKeyRef extends boolean = Key extends TRef ? true : false> = (Type extends TMappedResult ? TOmitFromMappedResult<Type, TResolvePropertyKeys<Key>> : Key extends TMappedKey ? TOmitFromMappedKey<Type, Key> : [
23
+ IsTypeRef,
24
+ IsKeyRef
25
+ ] extends [true, true] ? TComputed<'Omit', [Type, TResolveTypeKey<Key>]> : [
26
+ IsTypeRef,
27
+ IsKeyRef
28
+ ] extends [false, true] ? TComputed<'Omit', [Type, TResolveTypeKey<Key>]> : [
29
+ IsTypeRef,
30
+ IsKeyRef
31
+ ] extends [true, false] ? TComputed<'Omit', [Type, TResolveTypeKey<Key>]> : TOmitResolve<Type, TResolvePropertyKeys<Key>>);
32
+ /** `[Json]` Constructs a type whose keys are picked from the given type */
33
+ export declare function Omit<Type extends TSchema, Key extends PropertyKey[]>(type: Type, key: readonly [...Key], options?: SchemaOptions): TOmit<Type, Key>;
34
+ /** `[Json]` Constructs a type whose keys are picked from the given type */
35
+ export declare function Omit<Type extends TSchema, Key extends TSchema>(type: Type, key: Key, options?: SchemaOptions): TOmit<Type, Key>;
24
36
  export {};