@sinclair/typebox 0.32.0-dev-12 → 0.32.0-dev-14

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 (128) hide show
  1. package/build/import/index.d.mts +5 -5
  2. package/build/import/index.mjs +3 -3
  3. package/build/import/type/composite/composite.d.mts +2 -2
  4. package/build/import/type/extends/extends-mapped-result-from-result.d.mts +13 -0
  5. package/build/import/type/extends/extends-mapped-result-from-result.mjs +14 -0
  6. package/build/import/type/extends/extends-mapped-result.d.mts +13 -9
  7. package/build/import/type/extends/extends-mapped-result.mjs +15 -8
  8. package/build/import/type/extends/extends.d.mts +4 -4
  9. package/build/import/type/extends/extends.mjs +4 -4
  10. package/build/import/type/extends/index.d.mts +1 -1
  11. package/build/import/type/extends/index.mjs +1 -1
  12. package/build/import/type/guard/type.d.mts +47 -46
  13. package/build/import/type/guard/type.mjs +294 -293
  14. package/build/import/type/indexed/index.d.mts +2 -2
  15. package/build/import/type/indexed/index.mjs +2 -2
  16. package/build/import/type/indexed/{indexed-mapped.d.mts → indexed-mapped-result.d.mts} +4 -4
  17. package/build/import/type/indexed/{indexed-mapped.mjs → indexed-mapped-result.mjs} +3 -3
  18. package/build/import/type/indexed/indexed-property-keys.d.mts +3 -3
  19. package/build/import/type/indexed/indexed-property-keys.mjs +2 -2
  20. package/build/import/type/indexed/{indexed-type.d.mts → indexed-result.d.mts} +2 -2
  21. package/build/import/type/indexed/{indexed-type.mjs → indexed-result.mjs} +1 -1
  22. package/build/import/type/indexed/indexed.d.mts +6 -6
  23. package/build/import/type/indexed/indexed.mjs +6 -6
  24. package/build/import/type/intrinsic/capitalize.d.mts +4 -0
  25. package/build/import/type/intrinsic/capitalize.mjs +5 -0
  26. package/build/import/type/intrinsic/index.d.mts +5 -0
  27. package/build/import/type/intrinsic/index.mjs +5 -0
  28. package/build/import/type/intrinsic/intrinsic-mapped-result.d.mts +15 -0
  29. package/build/import/type/intrinsic/intrinsic-mapped-result.mjs +21 -0
  30. package/build/import/type/intrinsic/intrinsic.d.mts +9 -14
  31. package/build/import/type/intrinsic/intrinsic.mjs +10 -21
  32. package/build/import/type/intrinsic/lowercase.d.mts +4 -0
  33. package/build/import/type/intrinsic/lowercase.mjs +5 -0
  34. package/build/import/type/intrinsic/uncapitalize.d.mts +4 -0
  35. package/build/import/type/intrinsic/uncapitalize.mjs +5 -0
  36. package/build/import/type/intrinsic/uppercase.d.mts +4 -0
  37. package/build/import/type/intrinsic/uppercase.mjs +5 -0
  38. package/build/import/type/mapped/index.d.mts +2 -0
  39. package/build/import/type/mapped/index.mjs +2 -0
  40. package/build/import/type/mapped/mapped-key.d.mts +8 -0
  41. package/build/import/type/mapped/mapped-key.mjs +7 -0
  42. package/build/import/type/mapped/mapped-result.d.mts +9 -0
  43. package/build/import/type/mapped/mapped-result.mjs +7 -0
  44. package/build/import/type/mapped/mapped.d.mts +24 -31
  45. package/build/import/type/mapped/mapped.mjs +33 -36
  46. package/build/import/type/omit/index.d.mts +1 -0
  47. package/build/import/type/omit/index.mjs +1 -0
  48. package/build/import/type/omit/omit-mapped-result.d.mts +15 -0
  49. package/build/import/type/omit/omit-mapped-result.mjs +20 -0
  50. package/build/import/type/omit/omit.d.mts +5 -2
  51. package/build/import/type/omit/omit.mjs +12 -6
  52. package/build/import/type/pick/index.d.mts +1 -0
  53. package/build/import/type/pick/index.mjs +1 -0
  54. package/build/import/type/pick/pick-mapped-result.d.mts +15 -0
  55. package/build/import/type/pick/pick-mapped-result.mjs +20 -0
  56. package/build/import/type/pick/pick.d.mts +5 -2
  57. package/build/import/type/pick/pick.mjs +12 -6
  58. package/build/import/type/record/record.mjs +4 -4
  59. package/build/import/type/type/json.d.mts +15 -13
  60. package/build/import/value/transform/decode.mjs +2 -2
  61. package/build/import/value/transform/encode.mjs +2 -2
  62. package/build/require/index.d.ts +5 -5
  63. package/build/require/index.js +7 -6
  64. package/build/require/type/composite/composite.d.ts +2 -2
  65. package/build/require/type/extends/extends-mapped-result-from-result.d.ts +13 -0
  66. package/build/require/type/extends/extends-mapped-result-from-result.js +18 -0
  67. package/build/require/type/extends/extends-mapped-result.d.ts +13 -9
  68. package/build/require/type/extends/extends-mapped-result.js +17 -10
  69. package/build/require/type/extends/extends.d.ts +4 -4
  70. package/build/require/type/extends/extends.js +3 -3
  71. package/build/require/type/extends/index.d.ts +1 -1
  72. package/build/require/type/extends/index.js +1 -1
  73. package/build/require/type/guard/type.d.ts +47 -46
  74. package/build/require/type/guard/type.js +252 -250
  75. package/build/require/type/indexed/index.d.ts +2 -2
  76. package/build/require/type/indexed/index.js +2 -2
  77. package/build/require/type/indexed/{indexed-mapped.d.ts → indexed-mapped-result.d.ts} +4 -4
  78. package/build/require/type/indexed/{indexed-mapped.js → indexed-mapped-result.js} +5 -5
  79. package/build/require/type/indexed/indexed-property-keys.d.ts +3 -3
  80. package/build/require/type/indexed/indexed-property-keys.js +4 -4
  81. package/build/require/type/indexed/{indexed-type.d.ts → indexed-result.d.ts} +2 -2
  82. package/build/require/type/indexed/{indexed-type.js → indexed-result.js} +3 -3
  83. package/build/require/type/indexed/indexed.d.ts +6 -6
  84. package/build/require/type/indexed/indexed.js +5 -5
  85. package/build/require/type/intrinsic/capitalize.d.ts +4 -0
  86. package/build/require/type/intrinsic/capitalize.js +9 -0
  87. package/build/require/type/intrinsic/index.d.ts +5 -0
  88. package/build/require/type/intrinsic/index.js +5 -0
  89. package/build/require/type/intrinsic/intrinsic-mapped-result.d.ts +15 -0
  90. package/build/require/type/intrinsic/intrinsic-mapped-result.js +25 -0
  91. package/build/require/type/intrinsic/intrinsic.d.ts +9 -14
  92. package/build/require/type/intrinsic/intrinsic.js +10 -25
  93. package/build/require/type/intrinsic/lowercase.d.ts +4 -0
  94. package/build/require/type/intrinsic/lowercase.js +9 -0
  95. package/build/require/type/intrinsic/uncapitalize.d.ts +4 -0
  96. package/build/require/type/intrinsic/uncapitalize.js +9 -0
  97. package/build/require/type/intrinsic/uppercase.d.ts +4 -0
  98. package/build/require/type/intrinsic/uppercase.js +9 -0
  99. package/build/require/type/mapped/index.d.ts +2 -0
  100. package/build/require/type/mapped/index.js +2 -0
  101. package/build/require/type/mapped/mapped-key.d.ts +8 -0
  102. package/build/require/type/mapped/mapped-key.js +11 -0
  103. package/build/require/type/mapped/mapped-result.d.ts +9 -0
  104. package/build/require/type/mapped/mapped-result.js +11 -0
  105. package/build/require/type/mapped/mapped.d.ts +24 -31
  106. package/build/require/type/mapped/mapped.js +45 -52
  107. package/build/require/type/omit/index.d.ts +1 -0
  108. package/build/require/type/omit/index.js +1 -0
  109. package/build/require/type/omit/omit-mapped-result.d.ts +15 -0
  110. package/build/require/type/omit/omit-mapped-result.js +24 -0
  111. package/build/require/type/omit/omit.d.ts +5 -2
  112. package/build/require/type/omit/omit.js +10 -4
  113. package/build/require/type/pick/index.d.ts +1 -0
  114. package/build/require/type/pick/index.js +1 -0
  115. package/build/require/type/pick/pick-mapped-result.d.ts +15 -0
  116. package/build/require/type/pick/pick-mapped-result.js +24 -0
  117. package/build/require/type/pick/pick.d.ts +5 -2
  118. package/build/require/type/pick/pick.js +10 -4
  119. package/build/require/type/record/record.js +2 -2
  120. package/build/require/type/type/json.d.ts +15 -13
  121. package/build/require/value/transform/decode.js +1 -1
  122. package/build/require/value/transform/encode.js +1 -1
  123. package/package.json +1 -1
  124. package/readme.md +115 -47
  125. package/build/import/type/extends/extends-mapped.d.mts +0 -17
  126. package/build/import/type/extends/extends-mapped.mjs +0 -21
  127. package/build/require/type/extends/extends-mapped.d.ts +0 -17
  128. package/build/require/type/extends/extends-mapped.js +0 -25
@@ -4,7 +4,9 @@ import { type TRecursive } from '../recursive/index.mjs';
4
4
  import { type TIntersect } from '../intersect/index.mjs';
5
5
  import { type TUnion } from '../union/index.mjs';
6
6
  import { type TObject, type TProperties } from '../object/index.mjs';
7
- import { IndexedPropertyKeys } from '../indexed/index.mjs';
7
+ import { type TIndexPropertyKeys } from '../indexed/index.mjs';
8
+ import { TMappedKey } from '../mapped/index.mjs';
9
+ import { type TOmitMappedResult } from './omit-mapped-result.mjs';
8
10
  type FromIntersect<T extends TSchema[], K extends PropertyKey[]> = T extends [infer L extends TSchema, ...infer R extends TSchema[]] ? [OmitResolve<L, K>, ...FromIntersect<R, K>] : [];
9
11
  declare function FromIntersect<T extends TSchema[], K extends PropertyKey[]>(T: T, K: K): FromIntersect<T, K>;
10
12
  type FromUnion<T extends TSchema[], K extends PropertyKey[]> = T extends [infer L extends TSchema, ...infer R extends TSchema[]] ? [OmitResolve<L, K>, ...FromUnion<R, K>] : [];
@@ -14,6 +16,7 @@ declare function FromProperties<T extends TProperties, K extends PropertyKey[]>(
14
16
  export type OmitResolve<T extends TProperties, K extends PropertyKey[]> = T extends TRecursive<infer S> ? TRecursive<OmitResolve<S, K>> : T extends TIntersect<infer S> ? TIntersect<FromIntersect<S, K>> : T extends TUnion<infer S> ? TUnion<FromUnion<S, K>> : T extends TObject<infer S> ? TObject<FromProperties<S, K>> : TObject<{}>;
15
17
  export declare function OmitResolve<T extends TSchema, K extends PropertyKey[]>(T: T, K: [...K]): OmitResolve<T, K>;
16
18
  export type TOmit<T extends TSchema, K extends PropertyKey[]> = OmitResolve<T, K>;
17
- export declare function Omit<T extends TSchema, K extends TSchema, I extends PropertyKey[] = IndexedPropertyKeys<K>>(T: T, K: K, options?: SchemaOptions): TOmit<T, I>;
19
+ export declare function Omit<T extends TSchema, K extends TMappedKey>(T: T, K: K): TOmitMappedResult<T, K>;
20
+ export declare function Omit<T extends TSchema, K extends TSchema, I extends PropertyKey[] = TIndexPropertyKeys<K>>(T: T, K: K, options?: SchemaOptions): TOmit<T, I>;
18
21
  export declare function Omit<T extends TSchema, K extends PropertyKey[]>(T: T, K: readonly [...K], options?: SchemaOptions): TOmit<T, K>;
19
22
  export {};
@@ -1,11 +1,12 @@
1
1
  import { Intersect } from '../intersect/index.mjs';
2
2
  import { Union } from '../union/index.mjs';
3
3
  import { Object } from '../object/index.mjs';
4
- import { IndexedPropertyKeys } from '../indexed/index.mjs';
4
+ import { IndexPropertyKeys } from '../indexed/index.mjs';
5
5
  import { Discard } from '../discard/index.mjs';
6
6
  import { TransformKind } from '../symbols/index.mjs';
7
7
  import { CloneType } from '../clone/type.mjs';
8
- import { TIntersect as IsIntersectType, TUnion as IsUnionType, TObject as IsObjectType, TSchema as IsSchemaType } from '../guard/type.mjs';
8
+ import { OmitMappedResult } from './omit-mapped-result.mjs';
9
+ import { TMappedKey as IsMappedKeyType, TIntersect as IsIntersectType, TUnion as IsUnionType, TObject as IsObjectType, TSchema as IsSchemaType } from '../guard/type.mjs';
9
10
  function FromIntersect(T, K) {
10
11
  return T.map((T) => OmitResolve(T, K));
11
12
  }
@@ -28,8 +29,13 @@ export function OmitResolve(T, K) {
28
29
  Object({}));
29
30
  }
30
31
  export function Omit(T, K, options = {}) {
31
- const I = IsSchemaType(K) ? IndexedPropertyKeys(K) : K;
32
- const D = Discard(T, [TransformKind, '$id', 'required']);
33
- const R = CloneType(OmitResolve(T, I), options);
34
- return { ...D, ...R };
32
+ if (IsMappedKeyType(K)) {
33
+ return OmitMappedResult(T, K);
34
+ }
35
+ else {
36
+ const I = IsSchemaType(K) ? IndexPropertyKeys(K) : K;
37
+ const D = Discard(T, [TransformKind, '$id', 'required']);
38
+ const R = CloneType(OmitResolve(T, I), options);
39
+ return { ...D, ...R };
40
+ }
35
41
  }
@@ -1 +1,2 @@
1
+ export * from './pick-mapped-result.mjs';
1
2
  export * from './pick.mjs';
@@ -1 +1,2 @@
1
+ export * from './pick-mapped-result.mjs';
1
2
  export * from './pick.mjs';
@@ -0,0 +1,15 @@
1
+ import type { TSchema } from '../schema/index.mjs';
2
+ import type { TProperties } from '../object/index.mjs';
3
+ import { type TMappedResult, type TMappedKey } from '../mapped/index.mjs';
4
+ import { type TPick } from './pick.mjs';
5
+ type MappedPickPropertyKey<T extends TSchema, K extends PropertyKey> = {
6
+ [_ in K]: TPick<T, [K]>;
7
+ };
8
+ declare function MappedPickPropertyKey<T extends TSchema, K extends PropertyKey>(T: T, K: K): MappedPickPropertyKey<T, K>;
9
+ type MappedPickPropertyKeys<T extends TSchema, K extends PropertyKey[]> = (K extends [infer LK extends PropertyKey, ...infer RK extends PropertyKey[]] ? MappedPickPropertyKey<T, LK> & MappedPickPropertyKeys<T, RK> : {});
10
+ declare function MappedPickPropertyKeys<T extends TSchema, K extends PropertyKey[]>(T: T, K: [...K]): MappedPickPropertyKeys<T, K>;
11
+ type MappedPickProperties<T extends TSchema, K extends TMappedKey> = (MappedPickPropertyKeys<T, K['keys']>);
12
+ declare function MappedPickProperties<T extends TSchema, K extends TMappedKey>(T: T, K: K): MappedPickProperties<T, K>;
13
+ export type TPickMappedResult<T extends TSchema, K extends TMappedKey, P extends TProperties = MappedPickProperties<T, K>> = (TMappedResult<P>);
14
+ export declare function PickMappedResult<T extends TSchema, K extends TMappedKey, P extends TProperties = MappedPickProperties<T, K>>(T: T, K: K): TMappedResult<P>;
15
+ export {};
@@ -0,0 +1,20 @@
1
+ import { MappedResult } from '../mapped/index.mjs';
2
+ import { Pick } from './pick.mjs';
3
+ function MappedPickPropertyKey(T, K) {
4
+ return {
5
+ [K]: Pick(T, [K])
6
+ };
7
+ }
8
+ function MappedPickPropertyKeys(T, K) {
9
+ const [LK, ...RK] = K;
10
+ return (K.length > 0
11
+ ? { ...MappedPickPropertyKey(T, LK), ...MappedPickPropertyKeys(T, RK) }
12
+ : {});
13
+ }
14
+ function MappedPickProperties(T, K) {
15
+ return MappedPickPropertyKeys(T, K.keys);
16
+ }
17
+ export function PickMappedResult(T, K) {
18
+ const P = MappedPickProperties(T, K);
19
+ return MappedResult(P);
20
+ }
@@ -4,7 +4,9 @@ import { type TRecursive } from '../recursive/index.mjs';
4
4
  import { type TIntersect } from '../intersect/index.mjs';
5
5
  import { type TUnion } from '../union/index.mjs';
6
6
  import { type TObject, type TProperties } from '../object/index.mjs';
7
- import { IndexedPropertyKeys } from '../indexed/index.mjs';
7
+ import { type TIndexPropertyKeys } from '../indexed/index.mjs';
8
+ import { TMappedKey } from '../mapped/index.mjs';
9
+ import { type TPickMappedResult } from './pick-mapped-result.mjs';
8
10
  type FromIntersect<T extends TSchema[], K extends PropertyKey[]> = T extends [infer L extends TSchema, ...infer R extends TSchema[]] ? [PickResolve<L, K>, ...FromIntersect<R, K>] : [];
9
11
  declare function FromIntersect<T extends TSchema[], K extends PropertyKey[]>(T: T, K: K): FromIntersect<T, K>;
10
12
  type FromUnion<T extends TSchema[], K extends PropertyKey[]> = T extends [infer L extends TSchema, ...infer R extends TSchema[]] ? [PickResolve<L, K>, ...FromUnion<R, K>] : [];
@@ -14,6 +16,7 @@ declare function FromProperties<T extends TProperties, K extends PropertyKey[]>(
14
16
  export type PickResolve<T extends TProperties, K extends PropertyKey[]> = T extends TRecursive<infer S> ? TRecursive<PickResolve<S, K>> : T extends TIntersect<infer S> ? TIntersect<FromIntersect<S, K>> : T extends TUnion<infer S> ? TUnion<FromUnion<S, K>> : T extends TObject<infer S> ? TObject<FromProperties<S, K>> : TObject<{}>;
15
17
  export declare function PickResolve<T extends TSchema, K extends PropertyKey[]>(T: T, K: [...K]): PickResolve<T, K>;
16
18
  export type TPick<T extends TSchema, K extends PropertyKey[]> = PickResolve<T, K>;
17
- export declare function Pick<T extends TSchema, K extends TSchema, I extends PropertyKey[] = IndexedPropertyKeys<K>>(T: T, K: K, options?: SchemaOptions): TPick<T, I>;
19
+ export declare function Pick<T extends TSchema, K extends TMappedKey>(T: T, K: K): TPickMappedResult<T, K>;
20
+ export declare function Pick<T extends TSchema, K extends TSchema, I extends PropertyKey[] = TIndexPropertyKeys<K>>(T: T, K: K, options?: SchemaOptions): TPick<T, I>;
18
21
  export declare function Pick<T extends TSchema, K extends PropertyKey[]>(T: T, K: readonly [...K], options?: SchemaOptions): TPick<T, K>;
19
22
  export {};
@@ -1,11 +1,12 @@
1
1
  import { Intersect } from '../intersect/index.mjs';
2
2
  import { Union } from '../union/index.mjs';
3
3
  import { Object } from '../object/index.mjs';
4
- import { IndexedPropertyKeys } from '../indexed/index.mjs';
4
+ import { IndexPropertyKeys } from '../indexed/index.mjs';
5
5
  import { Discard } from '../discard/index.mjs';
6
6
  import { TransformKind } from '../symbols/index.mjs';
7
7
  import { CloneType } from '../clone/type.mjs';
8
- import { TIntersect as IsIntersectType, TUnion as IsUnionType, TObject as IsObjectType, TSchema as IsSchemaType } from '../guard/type.mjs';
8
+ import { PickMappedResult } from './pick-mapped-result.mjs';
9
+ import { TMappedKey as IsMappedKeyType, TIntersect as IsIntersectType, TUnion as IsUnionType, TObject as IsObjectType, TSchema as IsSchemaType, } from '../guard/type.mjs';
9
10
  function FromIntersect(T, K) {
10
11
  return T.map((T) => PickResolve(T, K));
11
12
  }
@@ -24,8 +25,13 @@ export function PickResolve(T, K) {
24
25
  Object({}));
25
26
  }
26
27
  export function Pick(T, K, options = {}) {
27
- const I = IsSchemaType(K) ? IndexedPropertyKeys(K) : K;
28
- const D = Discard(T, [TransformKind, '$id', 'required']);
29
- const R = CloneType(PickResolve(T, I), options);
30
- return { ...D, ...R };
28
+ if (IsMappedKeyType(K)) {
29
+ return PickMappedResult(T, K);
30
+ }
31
+ else {
32
+ const I = IsSchemaType(K) ? IndexPropertyKeys(K) : K;
33
+ const D = Discard(T, [TransformKind, '$id', 'required']);
34
+ const R = CloneType(PickResolve(T, I), options);
35
+ return { ...D, ...R };
36
+ }
31
37
  }
@@ -3,11 +3,11 @@ import { Never } from '../never/index.mjs';
3
3
  import { Union } from '../union/index.mjs';
4
4
  import { IsTemplateLiteralFinite, TemplateLiteralParseExact } from '../template-literal/index.mjs';
5
5
  import { PatternStringExact, PatternNumberExact } from '../patterns/index.mjs';
6
- import { IndexedPropertyKeys } from '../indexed/index.mjs';
6
+ import { IndexPropertyKeys } from '../indexed/index.mjs';
7
7
  import { Kind, Hint } from '../symbols/index.mjs';
8
8
  import { CloneType } from '../clone/type.mjs';
9
9
  import { IsUndefined } from '../guard/value.mjs';
10
- import { TUnion as IsUnionType, TTemplateLiteral as IsTemplateLiteralType, TLiteral as IsLiteralType, TString as IsStringType, TInteger as IsIntegerType, TNumber as IsNumberType } from '../guard/type.mjs';
10
+ import { TInteger as IsIntegerType, TLiteral as IsLiteralType, TNumber as IsNumberType, TString as IsStringType, TTemplateLiteral as IsTemplateLiteralType, TUnion as IsUnionType, } from '../guard/type.mjs';
11
11
  function FromPattern(pattern, T) {
12
12
  return { [Kind]: 'Record', type: 'object', patternProperties: { [pattern]: CloneType(T) } };
13
13
  }
@@ -18,11 +18,11 @@ function FromKeys(keys, T) {
18
18
  function FromTemplateLiteralKey(K, T) {
19
19
  const expression = TemplateLiteralParseExact(K.pattern);
20
20
  return (IsTemplateLiteralFinite(expression)
21
- ? FromKeys(IndexedPropertyKeys(K), T)
21
+ ? FromKeys(IndexPropertyKeys(K), T)
22
22
  : FromPattern(K.pattern, T));
23
23
  }
24
24
  function FromUnionKey(K, T) {
25
- return FromKeys(IndexedPropertyKeys(Union(K)), T);
25
+ return FromKeys(IndexPropertyKeys(Union(K)), T);
26
26
  }
27
27
  function FromLiteralKey(K, T) {
28
28
  return FromKeys([K.toString()], T);
@@ -6,25 +6,25 @@ import { type TConst } from '../const/index.mjs';
6
6
  import { type TDeref } from '../deref/index.mjs';
7
7
  import { type TEnum, type TEnumKey, type TEnumValue } from '../enum/index.mjs';
8
8
  import { type TExclude } from '../exclude/index.mjs';
9
- import { type TExtends, type MappedExtends, type MappedResultExtends } from '../extends/index.mjs';
9
+ import { type TExtends, type TExtendsMappedResult, type TExtendsMappedResultFromResult } from '../extends/index.mjs';
10
10
  import { type TExtract } from '../extract/index.mjs';
11
- import { TIndex, type IndexedPropertyKeys, type TMappedIndex } from '../indexed/index.mjs';
11
+ import { TIndex, type TIndexPropertyKeys, type TIndexMappedResult } from '../indexed/index.mjs';
12
12
  import { type IntegerOptions, type TInteger } from '../integer/index.mjs';
13
13
  import { type IntersectOptions, type IntersectResolve } from '../intersect/index.mjs';
14
14
  import { type TCapitalize, type TUncapitalize, type TLowercase, type TUppercase } from '../intrinsic/index.mjs';
15
15
  import { type TKeyOf } from '../keyof/index.mjs';
16
16
  import { type TLiteral, type TLiteralValue } from '../literal/index.mjs';
17
- import { type MappedFunction, type TMapped, type TMappedResult } from '../mapped/index.mjs';
17
+ import { type TMappedFunction, type TMapped, type TMappedResult } from '../mapped/index.mjs';
18
18
  import { type TNever } from '../never/index.mjs';
19
19
  import { type TNot } from '../not/index.mjs';
20
20
  import { type TNull } from '../null/index.mjs';
21
21
  import { type TMappedKey } from '../mapped/index.mjs';
22
22
  import { type TNumber, type NumberOptions } from '../number/index.mjs';
23
23
  import { type TObject, type TProperties, type ObjectOptions } from '../object/index.mjs';
24
- import { type TOmit } from '../omit/index.mjs';
24
+ import { type TOmit, type TOmitMappedResult } from '../omit/index.mjs';
25
25
  import { type TOptional } from '../optional/index.mjs';
26
26
  import { type TPartial } from '../partial/index.mjs';
27
- import { type TPick } from '../pick/index.mjs';
27
+ import { type TPick, type TPickMappedResult } from '../pick/index.mjs';
28
28
  import { type TReadonly } from '../readonly/index.mjs';
29
29
  import { type TReadonlyOptional } from '../readonly-optional/index.mjs';
30
30
  import { type RecordResolve } from '../record/index.mjs';
@@ -53,30 +53,32 @@ export declare class JsonTypeBuilder {
53
53
  Const<T>(value: T, options?: SchemaOptions): TConst<T>;
54
54
  Deref<T extends TSchema>(schema: T, references: TSchema[]): TDeref<T>;
55
55
  Enum<V extends TEnumValue, T extends Record<TEnumKey, V>>(item: T, options?: SchemaOptions): TEnum<T>;
56
- Extends<L extends TMappedResult, R extends TSchema, T extends TSchema, F extends TSchema>(L: L, R: R, T: T, F: F, options?: SchemaOptions): MappedResultExtends<L, R, T, F>;
57
- Extends<L extends TMappedKey, R extends TSchema, T extends TSchema, F extends TSchema>(L: L, R: R, T: T, F: F, options?: SchemaOptions): MappedExtends<L, R, T, F>;
56
+ Extends<L extends TMappedResult, R extends TSchema, T extends TSchema, F extends TSchema>(L: L, R: R, T: T, F: F, options?: SchemaOptions): TExtendsMappedResultFromResult<L, R, T, F>;
57
+ Extends<L extends TMappedKey, R extends TSchema, T extends TSchema, F extends TSchema>(L: L, R: R, T: T, F: F, options?: SchemaOptions): TExtendsMappedResult<L, R, T, F>;
58
58
  Extends<L extends TSchema, R extends TSchema, T extends TSchema, F extends TSchema>(L: L, R: R, T: T, F: F, options?: SchemaOptions): TExtends<L, R, T, F>;
59
59
  Exclude<L extends TSchema, R extends TSchema>(unionType: L, excludedMembers: R, options?: SchemaOptions): TExclude<L, R>;
60
60
  Extract<L extends TSchema, R extends TSchema>(type: L, union: R, options?: SchemaOptions): TExtract<L, R>;
61
- Index<T extends TSchema, K extends TMappedKey>(T: T, K: K): TMappedIndex<T, K>;
62
- Index<T extends TSchema, K extends TSchema, I extends PropertyKey[] = IndexedPropertyKeys<K>>(T: T, K: K, options?: SchemaOptions): TIndex<T, I>;
61
+ Index<T extends TSchema, K extends TMappedKey>(T: T, K: K): TIndexMappedResult<T, K>;
62
+ Index<T extends TSchema, K extends TSchema, I extends PropertyKey[] = TIndexPropertyKeys<K>>(T: T, K: K, options?: SchemaOptions): TIndex<T, I>;
63
63
  Index<T extends TSchema, K extends PropertyKey[]>(T: T, K: readonly [...K], options?: SchemaOptions): TIndex<T, K>;
64
64
  Integer(options?: IntegerOptions): TInteger;
65
65
  Intersect<T extends TSchema[]>(T: [...T], options?: IntersectOptions): IntersectResolve<T>;
66
66
  KeyOf<T extends TSchema>(schema: T, options?: SchemaOptions): TKeyOf<T>;
67
67
  Literal<T extends TLiteralValue>(value: T, options?: SchemaOptions): TLiteral<T>;
68
68
  Lowercase<T extends TSchema>(schema: T, options?: SchemaOptions): TLowercase<T>;
69
- Mapped<K extends TSchema, I extends PropertyKey[] = IndexedPropertyKeys<K>, F extends MappedFunction<I> = MappedFunction<I>, R extends TMapped<I, F> = TMapped<I, F>>(key: K, map: F, options?: ObjectOptions): R;
70
- Mapped<K extends PropertyKey[], F extends MappedFunction<K> = MappedFunction<K>, R extends TMapped<K, F> = TMapped<K, F>>(key: [...K], map: F, options?: ObjectOptions): R;
69
+ Mapped<K extends TSchema, I extends PropertyKey[] = TIndexPropertyKeys<K>, F extends TMappedFunction<I> = TMappedFunction<I>, R extends TMapped<I, F> = TMapped<I, F>>(key: K, map: F, options?: ObjectOptions): R;
70
+ Mapped<K extends PropertyKey[], F extends TMappedFunction<K> = TMappedFunction<K>, R extends TMapped<K, F> = TMapped<K, F>>(key: [...K], map: F, options?: ObjectOptions): R;
71
71
  Never(options?: SchemaOptions): TNever;
72
72
  Not<T extends TSchema>(schema: T, options?: SchemaOptions): TNot<T>;
73
73
  Null(options?: SchemaOptions): TNull;
74
74
  Number(options?: NumberOptions): TNumber;
75
75
  Object<T extends TProperties>(properties: T, options?: ObjectOptions): TObject<T>;
76
- Omit<T extends TSchema, K extends TSchema, I extends PropertyKey[] = IndexedPropertyKeys<K>>(T: T, K: K, options?: SchemaOptions): TOmit<T, I>;
76
+ Omit<T extends TSchema, K extends TMappedKey>(T: T, K: K): TOmitMappedResult<T, K>;
77
+ Omit<T extends TSchema, K extends TSchema, I extends PropertyKey[] = TIndexPropertyKeys<K>>(T: T, K: K, options?: SchemaOptions): TOmit<T, I>;
77
78
  Omit<T extends TSchema, K extends PropertyKey[]>(T: T, K: readonly [...K], options?: SchemaOptions): TOmit<T, K>;
78
79
  Partial<T extends TSchema>(schema: T, options?: ObjectOptions): TPartial<T>;
79
- Pick<T extends TSchema, K extends TSchema, I extends PropertyKey[] = IndexedPropertyKeys<K>>(T: T, K: K, options?: SchemaOptions): TPick<T, I>;
80
+ Pick<T extends TSchema, K extends TMappedKey>(T: T, K: K): TPickMappedResult<T, K>;
81
+ Pick<T extends TSchema, K extends TSchema, I extends PropertyKey[] = TIndexPropertyKeys<K>>(T: T, K: K, options?: SchemaOptions): TPick<T, I>;
80
82
  Pick<T extends TSchema, K extends PropertyKey[]>(T: T, K: readonly [...K], options?: SchemaOptions): TPick<T, K>;
81
83
  Record<K extends TSchema, T extends TSchema>(key: K, schema: T, options?: ObjectOptions): RecordResolve<K, T>;
82
84
  Recursive<T extends TSchema>(callback: (thisType: TThis) => T, options?: SchemaOptions): TRecursive<T>;
@@ -2,7 +2,7 @@ import { TTransform as IsTransformType, TSchema as IsSchemaType } from '../../ty
2
2
  import { Kind, TransformKind } from '../../type/symbols/index.mjs';
3
3
  import { IsPlainObject, IsArray, IsValueType } from '../guard/index.mjs';
4
4
  import { KeyOfPropertyKeys } from '../../type/keyof/index.mjs';
5
- import { IndexedType } from '../../type/indexed/index.mjs';
5
+ import { Index } from '../../type/indexed/index.mjs';
6
6
  import { Deref } from '../deref/index.mjs';
7
7
  import { Check } from '../check/index.mjs';
8
8
  export class TransformDecodeCheckError extends Error {
@@ -44,7 +44,7 @@ function TIntersect(schema, references, value) {
44
44
  const knownKeys = KeyOfPropertyKeys(schema);
45
45
  const knownProperties = knownKeys.reduce((value, key) => {
46
46
  return (key in value)
47
- ? { ...value, [key]: Visit(IndexedType(schema, [key]), references, value[key]) }
47
+ ? { ...value, [key]: Visit(Index(schema, [key]), references, value[key]) }
48
48
  : value;
49
49
  }, value);
50
50
  if (!IsTransformType(schema.unevaluatedProperties)) {
@@ -2,7 +2,7 @@ import { TTransform as IsTransformType, TSchema as IsSchemaType } from '../../ty
2
2
  import { Kind, TransformKind } from '../../type/symbols/index.mjs';
3
3
  import { IsPlainObject, IsArray, IsValueType } from '../guard/index.mjs';
4
4
  import { KeyOfPropertyKeys } from '../../type/keyof/index.mjs';
5
- import { IndexedType } from '../../type/indexed/index.mjs';
5
+ import { Index } from '../../type/indexed/index.mjs';
6
6
  import { Deref } from '../deref/index.mjs';
7
7
  import { Check } from '../check/index.mjs';
8
8
  export class TransformEncodeCheckError extends Error {
@@ -46,7 +46,7 @@ function TIntersect(schema, references, value) {
46
46
  const knownKeys = KeyOfPropertyKeys(schema);
47
47
  const knownProperties = knownKeys.reduce((value, key) => {
48
48
  return key in defaulted
49
- ? { ...value, [key]: Visit(IndexedType(schema, [key]), references, value[key]) }
49
+ ? { ...value, [key]: Visit(Index(schema, [key]), references, value[key]) }
50
50
  : value;
51
51
  }, defaulted);
52
52
  if (!IsTransformType(schema.unevaluatedProperties)) {
@@ -21,25 +21,25 @@ export { Extends, type TExtends, ExtendsCheck, ExtendsResult, ExtendsUndefinedCh
21
21
  export { Extract, type TExtract } from './type/extract/index';
22
22
  export { Function, type TFunction } from './type/function/index';
23
23
  export { Increment, type Assert, type AssertType, type AssertRest, type AssertProperties, type Ensure, type Evaluate, type TupleToIntersect, type TupleToUnion, type UnionToTuple } from './type/helpers/index';
24
- export { Index, type TIndex, type TMappedIndex, IndexedPropertyKeys, IndexedType, MappedIndex } from './type/indexed/index';
24
+ export { Index, IndexPropertyKeys, IndexMappedResult, type TIndex, type TIndexPropertyKeys, type TIndexMappedResult } from './type/indexed/index';
25
25
  export { InstanceType, type TInstanceType } from './type/instance-type/index';
26
26
  export { Integer, type TInteger, type IntegerOptions } from './type/integer/index';
27
27
  export { Intersect, type TIntersect, type IntersectOptions } from './type/intersect/index';
28
28
  export { Iterator, type TIterator } from './type/iterator/index';
29
- export { Capitalize, type TCapitalize, Lowercase, type TLowercase, Uncapitalize, type TUncapitalize, Uppercase, type TUppercase, IntrinsicResolve } from './type/intrinsic/index';
29
+ export { Intrinsic, type TIntrinsic, Capitalize, type TCapitalize, Lowercase, type TLowercase, Uncapitalize, type TUncapitalize, Uppercase, type TUppercase } from './type/intrinsic/index';
30
30
  export { KeyOf, type TKeyOf, KeyOfPropertyKeys, KeyOfPattern } from './type/keyof/index';
31
31
  export { Literal, type TLiteral } from './type/literal/index';
32
- export { Mapped, type MappedKey as TMappedKey, type MappedFunction, type TMapped as TMappedResult } from './type/mapped/index';
32
+ export { Mapped, MappedKey, MappedResult, type TMapped, type TMappedKey, type TMappedResult, type TMappedFunction } from './type/mapped/index';
33
33
  export { Never, type TNever } from './type/never/index';
34
34
  export { Not, type TNot } from './type/not/index';
35
35
  export { Null, type TNull } from './type/null/index';
36
36
  export { Number, type TNumber, type NumberOptions } from './type/number/index';
37
37
  export { Object, type TObject, type TProperties, type ObjectOptions } from './type/object/index';
38
- export { Omit, type TOmit } from './type/omit/index';
38
+ export { Omit, type TOmit, type TOmitMappedResult } from './type/omit/index';
39
39
  export { Optional, type TOptional } from './type/optional/index';
40
40
  export { Parameters, type TParameters } from './type/parameters/index';
41
41
  export { Partial, type TPartial } from './type/partial/index';
42
- export { Pick, type TPick } from './type/pick/index';
42
+ export { Pick, type TPick, type TPickMappedResult } from './type/pick/index';
43
43
  export { Promise, type TPromise } from './type/promise/index';
44
44
  export { Readonly, type TReadonly } from './type/readonly/index';
45
45
  export { ReadonlyOptional, type TReadonlyOptional } from './type/readonly-optional/index';
@@ -1,7 +1,7 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.Uppercase = exports.Uncapitalize = exports.Lowercase = exports.Capitalize = exports.Iterator = exports.Intersect = exports.Integer = exports.InstanceType = exports.MappedIndex = exports.IndexedType = exports.IndexedPropertyKeys = exports.Index = exports.Increment = exports.Function = exports.Extract = exports.ExtendsUndefinedCheck = exports.ExtendsResult = exports.ExtendsCheck = exports.Extends = exports.Exclude = exports.Enum = exports.Deref = exports.Date = exports.ConstructorParameters = exports.Constructor = exports.Const = exports.Composite = exports.Boolean = exports.BigInt = exports.Awaited = exports.AsyncIterator = exports.Array = exports.Any = exports.CloneRest = exports.CloneType = exports.ValueGuard = exports.TypeGuard = exports.FormatRegistry = exports.TypeRegistry = exports.PatternStringExact = exports.PatternString = exports.PatternNumberExact = exports.PatternNumber = exports.PatternBooleanExact = exports.PatternBoolean = exports.TransformKind = exports.OptionalKind = exports.ReadonlyKind = exports.Hint = exports.Kind = void 0;
4
- exports.JavaScriptTypeBuilder = exports.JsonTypeBuilder = exports.Type = exports.Void = exports.Unsafe = exports.Unknown = exports.Union = exports.Undefined = exports.Uint8Array = exports.Tuple = exports.TransformEncodeBuilder = exports.TransformDecodeBuilder = exports.Transform = exports.TemplateLiteralGenerate = exports.TemplateLiteralParseExact = exports.TemplateLiteralParse = exports.IsTemplateLiteralFinite = exports.TemplateLiteral = exports.Symbol = exports.String = exports.Strict = exports.ReturnType = exports.Rest = exports.Required = exports.RegExp = exports.Ref = exports.Recursive = exports.Record = exports.ReadonlyOptional = exports.Readonly = exports.Promise = exports.Pick = exports.Partial = exports.Parameters = exports.Optional = exports.Omit = exports.Object = exports.Number = exports.Null = exports.Not = exports.Never = exports.Mapped = exports.Literal = exports.KeyOfPattern = exports.KeyOfPropertyKeys = exports.KeyOf = exports.IntrinsicResolve = void 0;
3
+ exports.Uppercase = exports.Uncapitalize = exports.Lowercase = exports.Capitalize = exports.Intrinsic = exports.Iterator = exports.Intersect = exports.Integer = exports.InstanceType = exports.IndexMappedResult = exports.IndexPropertyKeys = exports.Index = exports.Increment = exports.Function = exports.Extract = exports.ExtendsUndefinedCheck = exports.ExtendsResult = exports.ExtendsCheck = exports.Extends = exports.Exclude = exports.Enum = exports.Deref = exports.Date = exports.ConstructorParameters = exports.Constructor = exports.Const = exports.Composite = exports.Boolean = exports.BigInt = exports.Awaited = exports.AsyncIterator = exports.Array = exports.Any = exports.CloneRest = exports.CloneType = exports.ValueGuard = exports.TypeGuard = exports.FormatRegistry = exports.TypeRegistry = exports.PatternStringExact = exports.PatternString = exports.PatternNumberExact = exports.PatternNumber = exports.PatternBooleanExact = exports.PatternBoolean = exports.TransformKind = exports.OptionalKind = exports.ReadonlyKind = exports.Hint = exports.Kind = void 0;
4
+ exports.JavaScriptTypeBuilder = exports.JsonTypeBuilder = exports.Type = exports.Void = exports.Unsafe = exports.Unknown = exports.Union = exports.Undefined = exports.Uint8Array = exports.Tuple = exports.TransformEncodeBuilder = exports.TransformDecodeBuilder = exports.Transform = exports.TemplateLiteralGenerate = exports.TemplateLiteralParseExact = exports.TemplateLiteralParse = exports.IsTemplateLiteralFinite = exports.TemplateLiteral = exports.Symbol = exports.String = exports.Strict = exports.ReturnType = exports.Rest = exports.Required = exports.RegExp = exports.Ref = exports.Recursive = exports.Record = exports.ReadonlyOptional = exports.Readonly = exports.Promise = exports.Pick = exports.Partial = exports.Parameters = exports.Optional = exports.Omit = exports.Object = exports.Number = exports.Null = exports.Not = exports.Never = exports.MappedResult = exports.MappedKey = exports.Mapped = exports.Literal = exports.KeyOfPattern = exports.KeyOfPropertyKeys = exports.KeyOf = void 0;
5
5
  var index_1 = require("./type/symbols/index");
6
6
  Object.defineProperty(exports, "Kind", { enumerable: true, get: function () { return index_1.Kind; } });
7
7
  Object.defineProperty(exports, "Hint", { enumerable: true, get: function () { return index_1.Hint; } });
@@ -65,9 +65,8 @@ var index_22 = require("./type/helpers/index");
65
65
  Object.defineProperty(exports, "Increment", { enumerable: true, get: function () { return index_22.Increment; } });
66
66
  var index_23 = require("./type/indexed/index");
67
67
  Object.defineProperty(exports, "Index", { enumerable: true, get: function () { return index_23.Index; } });
68
- Object.defineProperty(exports, "IndexedPropertyKeys", { enumerable: true, get: function () { return index_23.IndexedPropertyKeys; } });
69
- Object.defineProperty(exports, "IndexedType", { enumerable: true, get: function () { return index_23.IndexedType; } });
70
- Object.defineProperty(exports, "MappedIndex", { enumerable: true, get: function () { return index_23.MappedIndex; } });
68
+ Object.defineProperty(exports, "IndexPropertyKeys", { enumerable: true, get: function () { return index_23.IndexPropertyKeys; } });
69
+ Object.defineProperty(exports, "IndexMappedResult", { enumerable: true, get: function () { return index_23.IndexMappedResult; } });
71
70
  var index_24 = require("./type/instance-type/index");
72
71
  Object.defineProperty(exports, "InstanceType", { enumerable: true, get: function () { return index_24.InstanceType; } });
73
72
  var index_25 = require("./type/integer/index");
@@ -77,11 +76,11 @@ Object.defineProperty(exports, "Intersect", { enumerable: true, get: function ()
77
76
  var index_27 = require("./type/iterator/index");
78
77
  Object.defineProperty(exports, "Iterator", { enumerable: true, get: function () { return index_27.Iterator; } });
79
78
  var index_28 = require("./type/intrinsic/index");
79
+ Object.defineProperty(exports, "Intrinsic", { enumerable: true, get: function () { return index_28.Intrinsic; } });
80
80
  Object.defineProperty(exports, "Capitalize", { enumerable: true, get: function () { return index_28.Capitalize; } });
81
81
  Object.defineProperty(exports, "Lowercase", { enumerable: true, get: function () { return index_28.Lowercase; } });
82
82
  Object.defineProperty(exports, "Uncapitalize", { enumerable: true, get: function () { return index_28.Uncapitalize; } });
83
83
  Object.defineProperty(exports, "Uppercase", { enumerable: true, get: function () { return index_28.Uppercase; } });
84
- Object.defineProperty(exports, "IntrinsicResolve", { enumerable: true, get: function () { return index_28.IntrinsicResolve; } });
85
84
  var index_29 = require("./type/keyof/index");
86
85
  Object.defineProperty(exports, "KeyOf", { enumerable: true, get: function () { return index_29.KeyOf; } });
87
86
  Object.defineProperty(exports, "KeyOfPropertyKeys", { enumerable: true, get: function () { return index_29.KeyOfPropertyKeys; } });
@@ -90,6 +89,8 @@ var index_30 = require("./type/literal/index");
90
89
  Object.defineProperty(exports, "Literal", { enumerable: true, get: function () { return index_30.Literal; } });
91
90
  var index_31 = require("./type/mapped/index");
92
91
  Object.defineProperty(exports, "Mapped", { enumerable: true, get: function () { return index_31.Mapped; } });
92
+ Object.defineProperty(exports, "MappedKey", { enumerable: true, get: function () { return index_31.MappedKey; } });
93
+ Object.defineProperty(exports, "MappedResult", { enumerable: true, get: function () { return index_31.MappedResult; } });
93
94
  var index_32 = require("./type/never/index");
94
95
  Object.defineProperty(exports, "Never", { enumerable: true, get: function () { return index_32.Never; } });
95
96
  var index_33 = require("./type/not/index");
@@ -1,10 +1,10 @@
1
1
  import type { UnionToTuple, Assert, Evaluate } from '../helpers/index';
2
2
  import { type TObject, type ObjectOptions } from '../object/index';
3
3
  import { type TIntersect } from '../intersect/index';
4
- import { IndexedType } from '../indexed/index';
4
+ import { type TIndex } from '../indexed/index';
5
5
  type CompositeKeys<T extends TObject[]> = T extends [infer L extends TObject, ...infer R extends TObject[]] ? keyof L['properties'] | CompositeKeys<R> : never;
6
6
  type CompositeIndex<T extends TIntersect<TObject[]>, K extends string[]> = K extends [infer L extends string, ...infer R extends string[]] ? {
7
- [_ in L]: IndexedType<T, [L]>;
7
+ [_ in L]: TIndex<T, [L]>;
8
8
  } & CompositeIndex<T, R> : {};
9
9
  type CompositeReduce<T extends TObject[]> = UnionToTuple<CompositeKeys<T>> extends infer K ? Evaluate<CompositeIndex<TIntersect<T>, Assert<K, string[]>>> : {};
10
10
  export type CompositeResolve<T extends TObject[]> = TIntersect<T> extends TIntersect ? TObject<CompositeReduce<T>> : TObject<{}>;
@@ -0,0 +1,13 @@
1
+ import type { TSchema } from '../schema/index';
2
+ import type { TProperties } from '../object/index';
3
+ import { type TMappedResult } from '../mapped/index';
4
+ import { type TExtends } from './extends';
5
+ type MappedResultExtendsPropertyKeys<K extends TProperties, U extends TSchema, L extends TSchema, R extends TSchema> = ({
6
+ [K2 in keyof K]: TExtends<K[K2], U, L, R>;
7
+ });
8
+ declare function MappedResultExtendsPropertyKeys<K extends TProperties, U extends TSchema, L extends TSchema, R extends TSchema>(K: K, U: U, L: L, R: R): MappedResultExtendsPropertyKeys<K, U, L, R>;
9
+ type MappedResultExtendsProperties<K extends TMappedResult, U extends TSchema, L extends TSchema, R extends TSchema> = (MappedResultExtendsPropertyKeys<K['properties'], U, L, R>);
10
+ declare function MappedResultExtendsProperties<K extends TMappedResult, U extends TSchema, L extends TSchema, R extends TSchema>(K: K, U: U, L: L, R: R): MappedResultExtendsProperties<K, U, L, R>;
11
+ export type TExtendsMappedResultFromResult<T extends TMappedResult, U extends TSchema, L extends TSchema, R extends TSchema, P extends TProperties = MappedResultExtendsProperties<T, U, L, R>> = (TMappedResult<P>);
12
+ export declare function ExtendsMappedResultFromResult<T extends TMappedResult, U extends TSchema, L extends TSchema, R extends TSchema, P extends TProperties = MappedResultExtendsProperties<T, U, L, R>>(T: T, U: U, L: L, R: R): TMappedResult<P>;
13
+ export {};
@@ -0,0 +1,18 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.ExtendsMappedResultFromResult = void 0;
4
+ const index_1 = require("../mapped/index");
5
+ const extends_1 = require("./extends");
6
+ function MappedResultExtendsPropertyKeys(K, U, L, R) {
7
+ return globalThis.Object.getOwnPropertyNames(K).reduce((Acc, K2) => {
8
+ return { ...Acc, [K2]: (0, extends_1.Extends)(K[K2], U, L, R) };
9
+ }, {});
10
+ }
11
+ function MappedResultExtendsProperties(K, U, L, R) {
12
+ return MappedResultExtendsPropertyKeys(K.properties, U, L, R);
13
+ }
14
+ function ExtendsMappedResultFromResult(T, U, L, R) {
15
+ const P = MappedResultExtendsProperties(T, U, L, R);
16
+ return (0, index_1.MappedResult)(P);
17
+ }
18
+ exports.ExtendsMappedResultFromResult = ExtendsMappedResultFromResult;
@@ -1,13 +1,17 @@
1
1
  import type { TSchema } from '../schema/index';
2
2
  import type { TProperties } from '../object/index';
3
- import { type TMappedResult } from '../mapped/index';
3
+ import type { Assert } from '../helpers/index';
4
+ import { type TMappedResult, type TMappedKey } from '../mapped/index';
5
+ import { TLiteral, TLiteralValue } from '../literal/index';
4
6
  import { type TExtends } from './extends';
5
- type MappedResultExtendsPropertyKeys<K extends TProperties, U extends TSchema, L extends TSchema, R extends TSchema> = ({
6
- [K2 in keyof K]: TExtends<K[K2], U, L, R>;
7
- });
8
- declare function MappedResultExtendsPropertyKeys<K extends TProperties, U extends TSchema, L extends TSchema, R extends TSchema>(K: K, U: U, L: L, R: R): MappedResultExtendsPropertyKeys<K, U, L, R>;
9
- type MappedResultExtendsProperties<K extends TMappedResult, U extends TSchema, L extends TSchema, R extends TSchema> = (MappedResultExtendsPropertyKeys<K['properties'], U, L, R>);
10
- declare function MappedResultExtendsProperties<K extends TMappedResult, U extends TSchema, L extends TSchema, R extends TSchema>(K: K, U: U, L: L, R: R): MappedResultExtendsProperties<K, U, L, R>;
11
- export type MappedResultExtends<T extends TMappedResult, U extends TSchema, L extends TSchema, R extends TSchema, P extends TProperties = MappedResultExtendsProperties<T, U, L, R>> = (TMappedResult<P>);
12
- export declare function MappedResultExtends<T extends TMappedResult, U extends TSchema, L extends TSchema, R extends TSchema, P extends TProperties = MappedResultExtendsProperties<T, U, L, R>>(T: T, U: U, L: L, R: R): TMappedResult<P>;
7
+ type MappedExtendsPropertyKey<K extends PropertyKey, U extends TSchema, L extends TSchema, R extends TSchema> = {
8
+ [_ in K]: TExtends<TLiteral<Assert<K, TLiteralValue>>, U, L, R>;
9
+ };
10
+ declare function MappedExtendsPropertyKey<K extends PropertyKey, U extends TSchema, L extends TSchema, R extends TSchema>(K: K, U: U, L: L, R: R): MappedExtendsPropertyKey<K, U, L, R>;
11
+ type MappedExtendsPropertyKeys<K extends PropertyKey[], U extends TSchema, L extends TSchema, R extends TSchema> = (K extends [infer LK extends PropertyKey, ...infer RK extends PropertyKey[]] ? MappedExtendsPropertyKey<LK, U, L, R> & MappedExtendsPropertyKeys<RK, U, L, R> : {});
12
+ declare function MappedExtendsPropertyKeys<K extends PropertyKey[], U extends TSchema, L extends TSchema, R extends TSchema>(K: [...K], U: U, L: L, R: R): MappedExtendsPropertyKeys<K, U, L, R>;
13
+ type MappedExtendsProperties<K extends TMappedKey, U extends TSchema, L extends TSchema, R extends TSchema> = (MappedExtendsPropertyKeys<K['keys'], U, L, R>);
14
+ declare function MappedExtendsProperties<K extends TMappedKey, U extends TSchema, L extends TSchema, R extends TSchema>(K: K, U: U, L: L, R: R): MappedExtendsProperties<K, U, L, R>;
15
+ export type TExtendsMappedResult<T extends TMappedKey, U extends TSchema, L extends TSchema, R extends TSchema, P extends TProperties = MappedExtendsProperties<T, U, L, R>> = (TMappedResult<P>);
16
+ export declare function ExtendsMappedResult<T extends TMappedKey, U extends TSchema, L extends TSchema, R extends TSchema, P extends TProperties = MappedExtendsProperties<T, U, L, R>>(T: T, U: U, L: L, R: R): TMappedResult<P>;
13
17
  export {};
@@ -1,18 +1,25 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.MappedResultExtends = void 0;
3
+ exports.ExtendsMappedResult = void 0;
4
4
  const index_1 = require("../mapped/index");
5
+ const index_2 = require("../literal/index");
5
6
  const extends_1 = require("./extends");
6
- function MappedResultExtendsPropertyKeys(K, U, L, R) {
7
- return globalThis.Object.getOwnPropertyNames(K).reduce((Acc, K2) => {
8
- return { ...Acc, [K2]: (0, extends_1.Extends)(K[K2], U, L, R) };
9
- }, {});
7
+ function MappedExtendsPropertyKey(K, U, L, R) {
8
+ return {
9
+ [K]: (0, extends_1.Extends)((0, index_2.Literal)(K), U, L, R)
10
+ };
10
11
  }
11
- function MappedResultExtendsProperties(K, U, L, R) {
12
- return MappedResultExtendsPropertyKeys(K.properties, U, L, R);
12
+ function MappedExtendsPropertyKeys(K, U, L, R) {
13
+ const [LK, ...RK] = K;
14
+ return (K.length > 0
15
+ ? { ...MappedExtendsPropertyKey(LK, U, L, R), ...MappedExtendsPropertyKeys(RK, U, L, R) }
16
+ : {});
13
17
  }
14
- function MappedResultExtends(T, U, L, R) {
15
- const P = MappedResultExtendsProperties(T, U, L, R);
18
+ function MappedExtendsProperties(K, U, L, R) {
19
+ return MappedExtendsPropertyKeys(K.keys, U, L, R);
20
+ }
21
+ function ExtendsMappedResult(T, U, L, R) {
22
+ const P = MappedExtendsProperties(T, U, L, R);
16
23
  return (0, index_1.MappedResult)(P);
17
24
  }
18
- exports.MappedResultExtends = MappedResultExtends;
25
+ exports.ExtendsMappedResult = ExtendsMappedResult;
@@ -3,12 +3,12 @@ import type { Static } from '../static/index';
3
3
  import { type TUnion } from '../union/index';
4
4
  import { TMappedKey, TMappedResult } from '../mapped/index';
5
5
  import { UnionToTuple } from '../helpers/index';
6
- import { MappedExtends } from './extends-mapped';
7
- import { MappedResultExtends } from './extends-mapped-result';
6
+ import { type TExtendsMappedResult } from './extends-mapped-result';
7
+ import { type TExtendsMappedResultFromResult } from './extends-mapped-result-from-result';
8
8
  type ExtendsResolve<L extends TSchema, R extends TSchema, T extends TSchema, U extends TSchema> = ((Static<L> extends Static<R> ? T : U) extends infer O extends TSchema ? UnionToTuple<O> extends [infer X extends TSchema, infer Y extends TSchema] ? TUnion<[X, Y]> : O : never);
9
9
  declare function ExtendsResolve<L extends TSchema, R extends TSchema, T extends TSchema, U extends TSchema>(left: L, right: R, trueType: T, falseType: U): ExtendsResolve<L, R, T, U>;
10
10
  export type TExtends<L extends TSchema, R extends TSchema, T extends TSchema, F extends TSchema> = ExtendsResolve<L, R, T, F>;
11
- export declare function Extends<L extends TMappedResult, R extends TSchema, T extends TSchema, F extends TSchema>(L: L, R: R, T: T, F: F, options?: SchemaOptions): MappedResultExtends<L, R, T, F>;
12
- export declare function Extends<L extends TMappedKey, R extends TSchema, T extends TSchema, F extends TSchema>(L: L, R: R, T: T, F: F, options?: SchemaOptions): MappedExtends<L, R, T, F>;
11
+ export declare function Extends<L extends TMappedResult, R extends TSchema, T extends TSchema, F extends TSchema>(L: L, R: R, T: T, F: F, options?: SchemaOptions): TExtendsMappedResultFromResult<L, R, T, F>;
12
+ export declare function Extends<L extends TMappedKey, R extends TSchema, T extends TSchema, F extends TSchema>(L: L, R: R, T: T, F: F, options?: SchemaOptions): TExtendsMappedResult<L, R, T, F>;
13
13
  export declare function Extends<L extends TSchema, R extends TSchema, T extends TSchema, F extends TSchema>(L: L, R: R, T: T, F: F, options?: SchemaOptions): TExtends<L, R, T, F>;
14
14
  export {};
@@ -5,8 +5,8 @@ const type_1 = require("../guard/type");
5
5
  const index_1 = require("../union/index");
6
6
  const extends_check_1 = require("./extends-check");
7
7
  const type_2 = require("../clone/type");
8
- const extends_mapped_1 = require("./extends-mapped");
9
8
  const extends_mapped_result_1 = require("./extends-mapped-result");
9
+ const extends_mapped_result_from_result_1 = require("./extends-mapped-result-from-result");
10
10
  function ExtendsResolve(left, right, trueType, falseType) {
11
11
  const R = (0, extends_check_1.ExtendsCheck)(left, right);
12
12
  return (R === extends_check_1.ExtendsResult.Union ? (0, index_1.Union)([trueType, falseType]) :
@@ -14,8 +14,8 @@ function ExtendsResolve(left, right, trueType, falseType) {
14
14
  falseType);
15
15
  }
16
16
  function Extends(L, R, T, F, options = {}) {
17
- return ((0, type_1.TMappedResult)(L) ? (0, type_2.CloneType)((0, extends_mapped_result_1.MappedResultExtends)(L, R, T, F), options) :
18
- (0, type_1.TMappedKey)(L) ? (0, type_2.CloneType)((0, extends_mapped_1.MappedExtends)(L, R, T, F), options) :
17
+ return ((0, type_1.TMappedResult)(L) ? (0, type_2.CloneType)((0, extends_mapped_result_from_result_1.ExtendsMappedResultFromResult)(L, R, T, F), options) :
18
+ (0, type_1.TMappedKey)(L) ? (0, type_2.CloneType)((0, extends_mapped_result_1.ExtendsMappedResult)(L, R, T, F), options) :
19
19
  (0, type_2.CloneType)(ExtendsResolve(L, R, T, F), options));
20
20
  }
21
21
  exports.Extends = Extends;
@@ -1,5 +1,5 @@
1
1
  export * from './extends-check';
2
+ export * from './extends-mapped-result-from-result';
2
3
  export * from './extends-mapped-result';
3
- export * from './extends-mapped';
4
4
  export * from './extends-undefined';
5
5
  export * from './extends';
@@ -15,7 +15,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
15
15
  };
16
16
  Object.defineProperty(exports, "__esModule", { value: true });
17
17
  __exportStar(require("./extends-check"), exports);
18
+ __exportStar(require("./extends-mapped-result-from-result"), exports);
18
19
  __exportStar(require("./extends-mapped-result"), exports);
19
- __exportStar(require("./extends-mapped"), exports);
20
20
  __exportStar(require("./extends-undefined"), exports);
21
21
  __exportStar(require("./extends"), exports);