@sinclair/typebox 0.32.0-dev-25 → 0.32.0-dev-27

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 (206) hide show
  1. package/build/import/errors/errors.mjs +2 -2
  2. package/build/import/errors/function.d.mts +13 -3
  3. package/build/import/errors/function.mjs +39 -39
  4. package/build/import/index.d.mts +2 -2
  5. package/build/import/type/awaited/awaited.mjs +2 -6
  6. package/build/import/type/composite/composite.d.mts +1 -2
  7. package/build/import/type/composite/composite.mjs +2 -2
  8. package/build/import/type/const/const.mjs +6 -6
  9. package/build/import/type/constructor/constructor.d.mts +1 -1
  10. package/build/import/type/constructor/constructor.mjs +1 -1
  11. package/build/import/type/deref/deref.mjs +1 -2
  12. package/build/import/type/discard/discard.mjs +2 -2
  13. package/build/import/type/enum/enum.mjs +3 -0
  14. package/build/import/type/exclude/exclude-from-mapped-result.d.mts +5 -5
  15. package/build/import/type/exclude/exclude-from-mapped-result.mjs +7 -7
  16. package/build/import/type/exclude/exclude.mjs +0 -1
  17. package/build/import/type/extends/extends-from-mapped-key.d.mts +1 -1
  18. package/build/import/type/extends/extends-from-mapped-key.mjs +4 -5
  19. package/build/import/type/extends/extends-from-mapped-result.d.mts +5 -5
  20. package/build/import/type/extends/extends-from-mapped-result.mjs +7 -7
  21. package/build/import/type/extends/extends.mjs +0 -1
  22. package/build/import/type/extract/extract-from-mapped-result.d.mts +5 -5
  23. package/build/import/type/extract/extract-from-mapped-result.mjs +7 -7
  24. package/build/import/type/extract/extract.d.mts +1 -2
  25. package/build/import/type/extract/extract.mjs +4 -2
  26. package/build/import/type/index.d.mts +1 -1
  27. package/build/import/type/index.mjs +1 -1
  28. package/build/import/type/indexed/indexed-from-mapped-key.d.mts +2 -2
  29. package/build/import/type/indexed/indexed-from-mapped-key.mjs +4 -5
  30. package/build/import/type/indexed/indexed-from-mapped-result.d.mts +2 -2
  31. package/build/import/type/indexed/indexed-from-mapped-result.mjs +1 -1
  32. package/build/import/type/indexed/indexed-property-keys.d.mts +6 -6
  33. package/build/import/type/indexed/indexed-property-keys.mjs +3 -5
  34. package/build/import/type/indexed/indexed.d.mts +1 -1
  35. package/build/import/type/indexed/indexed.mjs +9 -27
  36. package/build/import/type/intersect/intersect-evaluated.mjs +3 -13
  37. package/build/import/type/intrinsic/capitalize.d.mts +2 -2
  38. package/build/import/type/intrinsic/intrinsic-from-mapped-key.d.mts +1 -1
  39. package/build/import/type/intrinsic/intrinsic-from-mapped-key.mjs +4 -5
  40. package/build/import/type/intrinsic/intrinsic.d.mts +2 -3
  41. package/build/import/type/intrinsic/intrinsic.mjs +2 -5
  42. package/build/import/type/intrinsic/lowercase.d.mts +2 -2
  43. package/build/import/type/intrinsic/uncapitalize.d.mts +2 -2
  44. package/build/import/type/intrinsic/uppercase.d.mts +2 -2
  45. package/build/import/type/iterator/iterator.mjs +1 -1
  46. package/build/import/type/keyof/keyof-from-mapped-result.d.mts +3 -3
  47. package/build/import/type/keyof/keyof-from-mapped-result.mjs +4 -4
  48. package/build/import/type/keyof/keyof-property-keys.d.mts +3 -3
  49. package/build/import/type/keyof/keyof-property-keys.mjs +9 -15
  50. package/build/import/type/keyof/keyof.mjs +2 -8
  51. package/build/import/type/mapped/mapped.d.mts +6 -1
  52. package/build/import/type/mapped/mapped.mjs +21 -14
  53. package/build/import/type/not/not.mjs +1 -1
  54. package/build/import/type/object/object.d.mts +1 -1
  55. package/build/import/type/object/object.mjs +0 -1
  56. package/build/import/type/omit/index.d.mts +1 -0
  57. package/build/import/type/omit/index.mjs +1 -0
  58. package/build/import/type/omit/omit-from-mapped-key.mjs +4 -5
  59. package/build/import/type/omit/omit-from-mapped-result.d.mts +11 -0
  60. package/build/import/type/omit/omit-from-mapped-result.mjs +17 -0
  61. package/build/import/type/omit/omit.d.mts +6 -3
  62. package/build/import/type/omit/omit.mjs +11 -9
  63. package/build/import/type/optional/optional-from-mapped-result.d.mts +5 -5
  64. package/build/import/type/optional/optional-from-mapped-result.mjs +7 -7
  65. package/build/import/type/partial/partial-from-mapped-result.d.mts +5 -5
  66. package/build/import/type/partial/partial-from-mapped-result.mjs +4 -4
  67. package/build/import/type/partial/partial.d.mts +2 -3
  68. package/build/import/type/partial/partial.mjs +8 -21
  69. package/build/import/type/pick/index.d.mts +1 -0
  70. package/build/import/type/pick/index.mjs +1 -0
  71. package/build/import/type/pick/pick-from-mapped-key.mjs +4 -5
  72. package/build/import/type/pick/pick-from-mapped-result.d.mts +11 -0
  73. package/build/import/type/pick/pick-from-mapped-result.mjs +17 -0
  74. package/build/import/type/pick/pick.d.mts +5 -2
  75. package/build/import/type/pick/pick.mjs +11 -10
  76. package/build/import/type/promise/promise.mjs +1 -1
  77. package/build/import/type/readonly/readonly-from-mapped-result.d.mts +5 -5
  78. package/build/import/type/readonly/readonly-from-mapped-result.mjs +4 -4
  79. package/build/import/type/record/record.d.mts +2 -2
  80. package/build/import/type/record/record.mjs +3 -0
  81. package/build/import/type/ref/ref.mjs +1 -1
  82. package/build/import/type/required/required-from-mapped-result.d.mts +5 -5
  83. package/build/import/type/required/required-from-mapped-result.mjs +7 -7
  84. package/build/import/type/required/required.d.mts +2 -3
  85. package/build/import/type/required/required.mjs +4 -14
  86. package/build/import/type/rest/rest.d.mts +2 -2
  87. package/build/import/type/rest/rest.mjs +1 -2
  88. package/build/import/type/sets/index.d.mts +1 -0
  89. package/build/import/type/sets/index.mjs +1 -0
  90. package/build/import/type/sets/set.d.mts +24 -0
  91. package/build/import/type/sets/set.mjs +35 -0
  92. package/build/import/type/strict/strict.d.mts +1 -1
  93. package/build/import/type/strict/strict.mjs +1 -1
  94. package/build/import/type/template-literal/syntax.d.mts +1 -1
  95. package/build/import/type/template-literal/template-literal.d.mts +1 -1
  96. package/build/import/type/transform/transform.mjs +1 -1
  97. package/build/import/type/type/json.d.mts +6 -2
  98. package/build/import/type/union/union-evaluated.mjs +3 -14
  99. package/build/require/errors/errors.js +2 -2
  100. package/build/require/errors/function.d.ts +13 -3
  101. package/build/require/errors/function.js +39 -39
  102. package/build/require/index.d.ts +2 -2
  103. package/build/require/type/awaited/awaited.js +2 -6
  104. package/build/require/type/composite/composite.d.ts +1 -2
  105. package/build/require/type/composite/composite.js +5 -6
  106. package/build/require/type/const/const.js +6 -6
  107. package/build/require/type/constructor/constructor.d.ts +1 -1
  108. package/build/require/type/constructor/constructor.js +1 -1
  109. package/build/require/type/deref/deref.js +0 -1
  110. package/build/require/type/discard/discard.js +2 -2
  111. package/build/require/type/enum/enum.js +3 -0
  112. package/build/require/type/exclude/exclude-from-mapped-result.d.ts +5 -5
  113. package/build/require/type/exclude/exclude-from-mapped-result.js +7 -7
  114. package/build/require/type/exclude/exclude.js +0 -1
  115. package/build/require/type/extends/extends-from-mapped-key.d.ts +1 -1
  116. package/build/require/type/extends/extends-from-mapped-key.js +4 -5
  117. package/build/require/type/extends/extends-from-mapped-result.d.ts +5 -5
  118. package/build/require/type/extends/extends-from-mapped-result.js +7 -7
  119. package/build/require/type/extends/extends.js +0 -1
  120. package/build/require/type/extract/extract-from-mapped-result.d.ts +5 -5
  121. package/build/require/type/extract/extract-from-mapped-result.js +7 -7
  122. package/build/require/type/extract/extract.d.ts +1 -2
  123. package/build/require/type/extract/extract.js +4 -3
  124. package/build/require/type/index.d.ts +1 -1
  125. package/build/require/type/index.js +1 -1
  126. package/build/require/type/indexed/indexed-from-mapped-key.d.ts +2 -2
  127. package/build/require/type/indexed/indexed-from-mapped-key.js +4 -5
  128. package/build/require/type/indexed/indexed-from-mapped-result.d.ts +2 -2
  129. package/build/require/type/indexed/indexed-from-mapped-result.js +1 -1
  130. package/build/require/type/indexed/indexed-property-keys.d.ts +6 -6
  131. package/build/require/type/indexed/indexed-property-keys.js +3 -5
  132. package/build/require/type/indexed/indexed.d.ts +1 -1
  133. package/build/require/type/indexed/indexed.js +9 -27
  134. package/build/require/type/intersect/intersect-evaluated.js +3 -13
  135. package/build/require/type/intrinsic/capitalize.d.ts +2 -2
  136. package/build/require/type/intrinsic/intrinsic-from-mapped-key.d.ts +1 -1
  137. package/build/require/type/intrinsic/intrinsic-from-mapped-key.js +4 -5
  138. package/build/require/type/intrinsic/intrinsic.d.ts +2 -3
  139. package/build/require/type/intrinsic/intrinsic.js +2 -5
  140. package/build/require/type/intrinsic/lowercase.d.ts +2 -2
  141. package/build/require/type/intrinsic/uncapitalize.d.ts +2 -2
  142. package/build/require/type/intrinsic/uppercase.d.ts +2 -2
  143. package/build/require/type/iterator/iterator.js +1 -1
  144. package/build/require/type/keyof/keyof-from-mapped-result.d.ts +3 -3
  145. package/build/require/type/keyof/keyof-from-mapped-result.js +4 -4
  146. package/build/require/type/keyof/keyof-property-keys.d.ts +3 -3
  147. package/build/require/type/keyof/keyof-property-keys.js +9 -15
  148. package/build/require/type/keyof/keyof.js +2 -8
  149. package/build/require/type/mapped/mapped.d.ts +6 -1
  150. package/build/require/type/mapped/mapped.js +21 -14
  151. package/build/require/type/not/not.js +1 -1
  152. package/build/require/type/object/object.d.ts +1 -1
  153. package/build/require/type/object/object.js +0 -1
  154. package/build/require/type/omit/index.d.ts +1 -0
  155. package/build/require/type/omit/index.js +1 -0
  156. package/build/require/type/omit/omit-from-mapped-key.js +4 -5
  157. package/build/require/type/omit/omit-from-mapped-result.d.ts +11 -0
  158. package/build/require/type/omit/omit-from-mapped-result.js +22 -0
  159. package/build/require/type/omit/omit.d.ts +6 -3
  160. package/build/require/type/omit/omit.js +10 -8
  161. package/build/require/type/optional/optional-from-mapped-result.d.ts +5 -5
  162. package/build/require/type/optional/optional-from-mapped-result.js +7 -7
  163. package/build/require/type/partial/partial-from-mapped-result.d.ts +5 -5
  164. package/build/require/type/partial/partial-from-mapped-result.js +4 -4
  165. package/build/require/type/partial/partial.d.ts +2 -3
  166. package/build/require/type/partial/partial.js +8 -21
  167. package/build/require/type/pick/index.d.ts +1 -0
  168. package/build/require/type/pick/index.js +1 -0
  169. package/build/require/type/pick/pick-from-mapped-key.js +4 -5
  170. package/build/require/type/pick/pick-from-mapped-result.d.ts +11 -0
  171. package/build/require/type/pick/pick-from-mapped-result.js +22 -0
  172. package/build/require/type/pick/pick.d.ts +5 -2
  173. package/build/require/type/pick/pick.js +10 -9
  174. package/build/require/type/promise/promise.js +1 -1
  175. package/build/require/type/readonly/readonly-from-mapped-result.d.ts +5 -5
  176. package/build/require/type/readonly/readonly-from-mapped-result.js +4 -4
  177. package/build/require/type/record/record.d.ts +2 -2
  178. package/build/require/type/record/record.js +3 -0
  179. package/build/require/type/ref/ref.js +1 -1
  180. package/build/require/type/required/required-from-mapped-result.d.ts +5 -5
  181. package/build/require/type/required/required-from-mapped-result.js +7 -7
  182. package/build/require/type/required/required.d.ts +2 -3
  183. package/build/require/type/required/required.js +4 -14
  184. package/build/require/type/rest/rest.d.ts +2 -2
  185. package/build/require/type/rest/rest.js +1 -3
  186. package/build/require/type/sets/index.d.ts +1 -0
  187. package/build/require/type/{operators → sets}/index.js +1 -1
  188. package/build/require/type/sets/set.d.ts +24 -0
  189. package/build/require/type/sets/set.js +47 -0
  190. package/build/require/type/strict/strict.d.ts +1 -1
  191. package/build/require/type/strict/strict.js +1 -1
  192. package/build/require/type/template-literal/parse.js +1 -1
  193. package/build/require/type/template-literal/syntax.d.ts +1 -1
  194. package/build/require/type/template-literal/template-literal.d.ts +1 -1
  195. package/build/require/type/transform/transform.js +1 -1
  196. package/build/require/type/type/json.d.ts +6 -2
  197. package/build/require/type/union/union-evaluated.js +3 -14
  198. package/package.json +1 -1
  199. package/readme.md +67 -67
  200. package/build/import/type/operators/index.d.mts +0 -1
  201. package/build/import/type/operators/index.mjs +0 -1
  202. package/build/import/type/operators/operators.d.mts +0 -24
  203. package/build/import/type/operators/operators.mjs +0 -77
  204. package/build/require/type/operators/index.d.ts +0 -1
  205. package/build/require/type/operators/operators.d.ts +0 -24
  206. package/build/require/type/operators/operators.js +0 -89
@@ -5,11 +5,10 @@ function MappedIndexPropertyKey(T, K, options) {
5
5
  return { [K]: Index(T, [K], options) };
6
6
  }
7
7
  // prettier-ignore
8
- function MappedIndexPropertyKeys(T, K, options, Acc = {}) {
9
- const [L, ...R] = K;
10
- return (K.length > 0
11
- ? MappedIndexPropertyKeys(T, R, options, { ...Acc, ...MappedIndexPropertyKey(T, L, options) })
12
- : Acc);
8
+ function MappedIndexPropertyKeys(T, K, options) {
9
+ return K.reduce((Acc, L) => {
10
+ return { ...Acc, ...MappedIndexPropertyKey(T, L, options) };
11
+ }, {});
13
12
  }
14
13
  // prettier-ignore
15
14
  function MappedIndexProperties(T, K, options) {
@@ -1,12 +1,12 @@
1
1
  import type { TSchema, SchemaOptions } from '../schema/index.mjs';
2
2
  import type { TProperties } from '../object/index.mjs';
3
3
  import { type TMappedResult } from '../mapped/index.mjs';
4
+ import { type TIndexPropertyKeys } from './indexed-property-keys.mjs';
4
5
  import { type TIndex } from './index.mjs';
5
- import { TIndexPropertyKeys } from './indexed-property-keys.mjs';
6
6
  type TFromProperties<T extends TSchema, P extends TProperties> = ({
7
7
  [K2 in keyof P]: TIndex<T, TIndexPropertyKeys<P[K2]>>;
8
8
  });
9
- type TFromMappedResult<T extends TSchema, K extends TMappedResult> = (TFromProperties<T, K['properties']>);
9
+ type TFromMappedResult<T extends TSchema, R extends TMappedResult> = (TFromProperties<T, R['properties']>);
10
10
  export type TIndexFromMappedResult<T extends TSchema, R extends TMappedResult, P extends TProperties = TFromMappedResult<T, R>> = (TMappedResult<P>);
11
11
  export declare function IndexFromMappedResult<T extends TSchema, R extends TMappedResult, P extends TProperties = TFromMappedResult<T, R>>(T: T, R: R, options: SchemaOptions): TMappedResult<P>;
12
12
  export {};
@@ -1,6 +1,6 @@
1
1
  import { MappedResult } from '../mapped/index.mjs';
2
- import { Index } from './index.mjs';
3
2
  import { IndexPropertyKeys } from './indexed-property-keys.mjs';
3
+ import { Index } from './index.mjs';
4
4
  // prettier-ignore
5
5
  function FromProperties(T, P, options) {
6
6
  return globalThis.Object.getOwnPropertyNames(P).reduce((Acc, K2) => {
@@ -1,9 +1,9 @@
1
- import { type TTemplateLiteral, TTemplateLiteralGenerate } from '../template-literal/index.mjs';
2
- import { type TLiteral, type TLiteralValue } from '../literal/index.mjs';
3
- import { type TInteger } from '../integer/index.mjs';
4
- import { type TNumber } from '../number/index.mjs';
5
- import { type TSchema } from '../schema/index.mjs';
6
- import { type TUnion } from '../union/index.mjs';
1
+ import { type TTemplateLiteralGenerate, type TTemplateLiteral } from '../template-literal/index.mjs';
2
+ import type { TLiteral, TLiteralValue } from '../literal/index.mjs';
3
+ import type { TInteger } from '../integer/index.mjs';
4
+ import type { TNumber } from '../number/index.mjs';
5
+ import type { TSchema } from '../schema/index.mjs';
6
+ import type { TUnion } from '../union/index.mjs';
7
7
  type TFromTemplateLiteral<T extends TTemplateLiteral, R extends string[] = TTemplateLiteralGenerate<T>> = (R);
8
8
  type TFromUnion<T extends TSchema[], Acc extends string[] = []> = (T extends [infer L extends TSchema, ...infer R extends TSchema[]] ? TFromUnion<R, [...TIndexPropertyKeys<L>, ...Acc]> : Acc);
9
9
  type TFromLiteral<T extends TLiteralValue> = (T extends PropertyKey ? [`${T}`] : []);
@@ -2,7 +2,6 @@ import { TemplateLiteralGenerate } from '../template-literal/index.mjs';
2
2
  // ------------------------------------------------------------------
3
3
  // TypeGuard
4
4
  // ------------------------------------------------------------------
5
- // prettier-ignore
6
5
  import { IsTemplateLiteral, IsUnion, IsLiteral, IsNumber, IsInteger } from '../guard/type.mjs';
7
6
  // prettier-ignore
8
7
  function FromTemplateLiteral(T) {
@@ -11,10 +10,9 @@ function FromTemplateLiteral(T) {
11
10
  }
12
11
  // prettier-ignore
13
12
  function FromUnion(T) {
14
- const [L, ...R] = T;
15
- return (T.length > 0
16
- ? [...IndexPropertyKeys(L), ...FromUnion(R)]
17
- : []);
13
+ return T.reduce((Acc, L) => {
14
+ return [...Acc, ...IndexPropertyKeys(L)];
15
+ }, []);
18
16
  }
19
17
  // prettier-ignore
20
18
  function FromLiteral(T) {
@@ -16,7 +16,7 @@ import { type TIndexFromMappedResult } from './indexed-from-mapped-result.mjs';
16
16
  type TFromRest<T extends TSchema[], K extends PropertyKey, Acc extends TSchema[] = []> = (T extends [infer L extends TSchema, ...infer R extends TSchema[]] ? TFromRest<R, K, [...Acc, Assert<TFromKey<L, K>, TSchema>]> : Acc);
17
17
  type TFromIntersectRest<T extends TSchema[], Acc extends TSchema[] = []> = (T extends [infer L extends TSchema, ...infer R extends TSchema[]] ? L extends TNever ? TFromIntersectRest<R, [...Acc]> : TFromIntersectRest<R, [...Acc, L]> : Acc);
18
18
  type TFromIntersect<T extends TSchema[], K extends PropertyKey> = (TIntersectEvaluated<TFromIntersectRest<TFromRest<T, K>>>);
19
- type TFromUnionRest<T extends TSchema[], Acc extends TSchema[] = T> = (T extends [infer L extends TSchema, ...infer R extends TSchema[]] ? L extends TNever ? [] : TFromUnionRest<R, Acc> : Acc);
19
+ type TFromUnionRest<T extends TSchema[]> = T;
20
20
  type TFromUnion<T extends TSchema[], K extends PropertyKey> = (TUnionEvaluated<TFromUnionRest<TFromRest<T, K>>>);
21
21
  type TFromTuple<T extends TSchema[], K extends PropertyKey> = (K extends keyof T ? T[K] : K extends '[number]' ? TUnionEvaluated<T> : TNever);
22
22
  type TFromArray<T extends TSchema, K extends PropertyKey> = (K extends '[number]' ? T : TNever);
@@ -10,33 +10,20 @@ import { IndexFromMappedResult } from './indexed-from-mapped-result.mjs';
10
10
  // ------------------------------------------------------------------
11
11
  import { IsArray, IsIntersect, IsObject, IsMappedKey, IsMappedResult, IsNever, IsSchema, IsTuple, IsUnion } from '../guard/type.mjs';
12
12
  // prettier-ignore
13
- function FromRest(T, K, Acc = []) {
14
- const [L, ...R] = T;
15
- return (T.length > 0
16
- ? FromRest(R, K, [...Acc, FromKey(L, K)])
17
- : Acc);
13
+ function FromRest(T, K) {
14
+ return T.map(L => FromKey(L, K));
18
15
  }
19
16
  // prettier-ignore
20
- function FromIntersectRest(T, Acc = []) {
21
- const [L, ...R] = T;
22
- return (T.length > 0
23
- ? IsNever(L)
24
- ? FromIntersectRest(R, [...Acc])
25
- : FromIntersectRest(R, [...Acc, L])
26
- : Acc);
17
+ function FromIntersectRest(T) {
18
+ return T.filter(L => !IsNever(L));
27
19
  }
28
20
  // prettier-ignore
29
21
  function FromIntersect(T, K) {
30
22
  return (IntersectEvaluated(FromIntersectRest(FromRest(T, K))));
31
23
  }
32
24
  // prettier-ignore
33
- function FromUnionRest(T, Acc = T) {
34
- const [L, ...R] = T;
35
- return (T.length > 0
36
- ? IsNever(L)
37
- ? []
38
- : FromUnionRest(R, Acc)
39
- : Acc);
25
+ function FromUnionRest(T) {
26
+ return T; // review this
40
27
  }
41
28
  // prettier-ignore
42
29
  function FromUnion(T, K) {
@@ -56,9 +43,7 @@ function FromArray(T, K) {
56
43
  }
57
44
  // prettier-ignore
58
45
  function FromProperty(T, K) {
59
- return (K in T
60
- ? T[K]
61
- : Never());
46
+ return (K in T ? T[K] : Never());
62
47
  }
63
48
  // prettier-ignore
64
49
  function FromKey(T, K) {
@@ -70,11 +55,8 @@ function FromKey(T, K) {
70
55
  Never());
71
56
  }
72
57
  // prettier-ignore
73
- function FromKeys(T, K, Acc = []) {
74
- const [L, ...R] = K;
75
- return (K.length > 0
76
- ? FromKeys(T, R, [...Acc, FromKey(T, L)])
77
- : Acc);
58
+ function FromKeys(T, K) {
59
+ return K.map(L => FromKey(T, L));
78
60
  }
79
61
  // prettier-ignore
80
62
  function FromSchema(T, K) {
@@ -11,25 +11,15 @@ import { IntersectCreate } from './intersect-create.mjs';
11
11
  import { IsOptional, IsTransform, } from '../guard/type.mjs';
12
12
  // prettier-ignore
13
13
  function IsIntersectOptional(T) {
14
- const [L, ...R] = T;
15
- return (T.length > 0
16
- ? IsOptional(L)
17
- ? IsIntersectOptional(R)
18
- : false
19
- : true);
14
+ return T.every(L => IsOptional(L));
20
15
  }
21
16
  // prettier-ignore
22
17
  function RemoveOptionalFromType(T) {
23
18
  return (Discard(T, [OptionalKind]));
24
19
  }
25
20
  // prettier-ignore
26
- function RemoveOptionalFromRest(T, Acc = []) {
27
- const [L, ...R] = T;
28
- return (T.length > 0
29
- ? IsOptional(L)
30
- ? RemoveOptionalFromRest(R, [...Acc, RemoveOptionalFromType(L)])
31
- : RemoveOptionalFromRest(R, [...Acc, L])
32
- : Acc);
21
+ function RemoveOptionalFromRest(T) {
22
+ return T.map(L => IsOptional(L) ? RemoveOptionalFromType(L) : L);
33
23
  }
34
24
  // prettier-ignore
35
25
  function ResolveIntersect(T, options) {
@@ -1,5 +1,5 @@
1
- import { TSchema, SchemaOptions } from '../schema/index.mjs';
2
- import { TIntrinsic } from './intrinsic.mjs';
1
+ import type { TSchema, SchemaOptions } from '../schema/index.mjs';
2
+ import { type TIntrinsic } from './intrinsic.mjs';
3
3
  export type TCapitalize<T extends TSchema> = TIntrinsic<T, 'Capitalize'>;
4
4
  /** `[Json]` Intrinsic function to Capitalize LiteralString types */
5
5
  export declare function Capitalize<T extends TSchema>(T: T, options?: SchemaOptions): TCapitalize<T>;
@@ -3,7 +3,7 @@ import type { TProperties } from '../object/index.mjs';
3
3
  import { Assert } from '../helpers/index.mjs';
4
4
  import { type TMappedResult, type TMappedKey } from '../mapped/index.mjs';
5
5
  import { type TIntrinsic, type IntrinsicMode } from './intrinsic.mjs';
6
- import { TLiteral, TLiteralValue } from '../literal/index.mjs';
6
+ import { type TLiteral, type TLiteralValue } from '../literal/index.mjs';
7
7
  type TMappedIntrinsicPropertyKey<K extends PropertyKey, M extends IntrinsicMode> = {
8
8
  [_ in K]: TIntrinsic<TLiteral<Assert<K, TLiteralValue>>, M>;
9
9
  };
@@ -8,11 +8,10 @@ function MappedIntrinsicPropertyKey(K, M, options) {
8
8
  };
9
9
  }
10
10
  // prettier-ignore
11
- function MappedIntrinsicPropertyKeys(K, M, options, Acc = {}) {
12
- const [L, ...R] = K;
13
- return (K.length > 0
14
- ? MappedIntrinsicPropertyKeys(R, M, options, { ...Acc, ...MappedIntrinsicPropertyKey(L, M, options) })
15
- : Acc);
11
+ function MappedIntrinsicPropertyKeys(K, M, options) {
12
+ return K.reduce((Acc, L) => {
13
+ return { ...Acc, ...MappedIntrinsicPropertyKey(L, M, options) };
14
+ }, {});
16
15
  }
17
16
  // prettier-ignore
18
17
  function MappedIntrinsicProperties(T, M, options) {
@@ -7,9 +7,8 @@ import { type TMappedKey } from '../mapped/index.mjs';
7
7
  export type IntrinsicMode = 'Uppercase' | 'Lowercase' | 'Capitalize' | 'Uncapitalize';
8
8
  type TFromTemplateLiteral<T extends TTemplateLiteralKind[], M extends IntrinsicMode> = M extends IntrinsicMode ? T extends [infer L extends TTemplateLiteralKind, ...infer R extends TTemplateLiteralKind[]] ? [TIntrinsic<L, M>, ...TFromTemplateLiteral<R, M>] : T : T;
9
9
  type TFromLiteralValue<T, M extends IntrinsicMode> = (T extends string ? M extends 'Uncapitalize' ? Uncapitalize<T> : M extends 'Capitalize' ? Capitalize<T> : M extends 'Uppercase' ? Uppercase<T> : M extends 'Lowercase' ? Lowercase<T> : string : T);
10
- type FromRest<T extends TSchema[], M extends IntrinsicMode, Acc extends TSchema[] = []> = T extends [infer L extends TSchema, ...infer R extends TSchema[]] ? FromRest<R, M, [...Acc, TIntrinsic<L, M>]> : Acc;
11
- declare function FromRest<T extends TSchema[], M extends IntrinsicMode>(T: [...T], M: M, Acc?: TSchema[]): FromRest<T, M>;
12
- export type TIntrinsic<T extends TSchema, M extends IntrinsicMode> = T extends TMappedKey ? TIntrinsicFromMappedKey<T, M> : T extends TTemplateLiteral<infer S> ? TTemplateLiteral<TFromTemplateLiteral<S, M>> : T extends TUnion<infer S> ? TUnion<FromRest<S, M>> : T extends TLiteral<infer S> ? TLiteral<TFromLiteralValue<S, M>> : T;
10
+ type TFromRest<T extends TSchema[], M extends IntrinsicMode, Acc extends TSchema[] = []> = T extends [infer L extends TSchema, ...infer R extends TSchema[]] ? TFromRest<R, M, [...Acc, TIntrinsic<L, M>]> : Acc;
11
+ export type TIntrinsic<T extends TSchema, M extends IntrinsicMode> = T extends TMappedKey ? TIntrinsicFromMappedKey<T, M> : T extends TTemplateLiteral<infer S> ? TTemplateLiteral<TFromTemplateLiteral<S, M>> : T extends TUnion<infer S> ? TUnion<TFromRest<S, M>> : T extends TLiteral<infer S> ? TLiteral<TFromLiteralValue<S, M>> : T;
13
12
  /** Applies an intrinsic string manipulation to the given type. */
14
13
  export declare function Intrinsic<T extends TMappedKey, M extends IntrinsicMode>(schema: T, mode: M, options?: SchemaOptions): TIntrinsicFromMappedKey<T, M>;
15
14
  /** Applies an intrinsic string manipulation to the given type. */
@@ -45,11 +45,8 @@ function FromLiteralValue(value, mode) {
45
45
  value) : value.toString());
46
46
  }
47
47
  // prettier-ignore
48
- function FromRest(T, M, Acc = []) {
49
- const [L, ...R] = T;
50
- return (T.length > 0
51
- ? FromRest(R, M, [...Acc, Intrinsic(L, M)])
52
- : Acc);
48
+ function FromRest(T, M) {
49
+ return T.map(L => Intrinsic(L, M));
53
50
  }
54
51
  /** Applies an intrinsic string manipulation to the given type. */
55
52
  export function Intrinsic(schema, mode, options = {}) {
@@ -1,5 +1,5 @@
1
- import { TSchema, SchemaOptions } from '../schema/index.mjs';
2
- import { TIntrinsic } from './intrinsic.mjs';
1
+ import type { TSchema, SchemaOptions } from '../schema/index.mjs';
2
+ import { type TIntrinsic } from './intrinsic.mjs';
3
3
  export type TLowercase<T extends TSchema> = TIntrinsic<T, 'Lowercase'>;
4
4
  /** `[Json]` Intrinsic function to Lowercase LiteralString types */
5
5
  export declare function Lowercase<T extends TSchema>(T: T, options?: SchemaOptions): TLowercase<T>;
@@ -1,5 +1,5 @@
1
- import { TSchema, SchemaOptions } from '../schema/index.mjs';
2
- import { TIntrinsic } from './intrinsic.mjs';
1
+ import type { TSchema, SchemaOptions } from '../schema/index.mjs';
2
+ import { type TIntrinsic } from './intrinsic.mjs';
3
3
  export type TUncapitalize<T extends TSchema> = TIntrinsic<T, 'Uncapitalize'>;
4
4
  /** `[Json]` Intrinsic function to Uncapitalize LiteralString types */
5
5
  export declare function Uncapitalize<T extends TSchema>(T: T, options?: SchemaOptions): TUncapitalize<T>;
@@ -1,5 +1,5 @@
1
- import { TSchema, SchemaOptions } from '../schema/index.mjs';
2
- import { TIntrinsic } from './intrinsic.mjs';
1
+ import type { TSchema, SchemaOptions } from '../schema/index.mjs';
2
+ import { type TIntrinsic } from './intrinsic.mjs';
3
3
  export type TUppercase<T extends TSchema> = TIntrinsic<T, 'Uppercase'>;
4
4
  /** `[Json]` Intrinsic function to Uppercase LiteralString types */
5
5
  export declare function Uppercase<T extends TSchema>(T: T, options?: SchemaOptions): TUppercase<T>;
@@ -1,5 +1,5 @@
1
- import { Kind } from '../symbols/index.mjs';
2
1
  import { CloneType } from '../clone/type.mjs';
2
+ import { Kind } from '../symbols/index.mjs';
3
3
  /** `[JavaScript]` Creates an Iterator type */
4
4
  export function Iterator(items, options = {}) {
5
5
  return {
@@ -5,7 +5,7 @@ import { type TKeyOf } from './keyof.mjs';
5
5
  type TFromProperties<K extends TProperties> = ({
6
6
  [K2 in keyof K]: TKeyOf<K[K2]>;
7
7
  });
8
- type TFromMappedResult<K extends TMappedResult> = (TFromProperties<K['properties']>);
9
- export type TKeyOfFromMappedResult<T extends TMappedResult, P extends TProperties = TFromMappedResult<T>> = (TMappedResult<P>);
10
- export declare function KeyOfFromMappedResult<T extends TMappedResult, P extends TProperties = TFromMappedResult<T>>(T: T, options: SchemaOptions): TMappedResult<P>;
8
+ type TFromMappedResult<R extends TMappedResult> = (TFromProperties<R['properties']>);
9
+ export type TKeyOfFromMappedResult<R extends TMappedResult, P extends TProperties = TFromMappedResult<R>> = (TMappedResult<P>);
10
+ export declare function KeyOfFromMappedResult<R extends TMappedResult, P extends TProperties = TFromMappedResult<R>>(R: R, options: SchemaOptions): TMappedResult<P>;
11
11
  export {};
@@ -7,11 +7,11 @@ function FromProperties(K, options) {
7
7
  }, {});
8
8
  }
9
9
  // prettier-ignore
10
- function FromMappedResult(K, options) {
11
- return FromProperties(K.properties, options);
10
+ function FromMappedResult(R, options) {
11
+ return FromProperties(R.properties, options);
12
12
  }
13
13
  // prettier-ignore
14
- export function KeyOfFromMappedResult(T, options) {
15
- const P = FromMappedResult(T, options);
14
+ export function KeyOfFromMappedResult(R, options) {
15
+ const P = FromMappedResult(R, options);
16
16
  return MappedResult(P);
17
17
  }
@@ -6,11 +6,11 @@ import type { TUnion } from '../union/index.mjs';
6
6
  import type { TTuple } from '../tuple/index.mjs';
7
7
  import type { TArray } from '../array/index.mjs';
8
8
  import type { TObject, TProperties } from '../object/index.mjs';
9
- import { OperatorUnionMany, OperatorIntersectMany } from '../operators/index.mjs';
9
+ import { type TSetUnionMany, type TSetIntersectMany } from '../sets/index.mjs';
10
10
  type TFromRest<T extends TSchema[], Acc extends PropertyKey[][] = []> = (T extends [infer L extends TSchema, ...infer R extends TSchema[]] ? TFromRest<R, [...Acc, TKeyOfPropertyKeys<L>]> : Acc);
11
- type FromIntersect<T extends TSchema[], C extends PropertyKey[][] = TFromRest<T>, R extends PropertyKey[] = OperatorUnionMany<C>> = R;
11
+ type FromIntersect<T extends TSchema[], C extends PropertyKey[][] = TFromRest<T>, R extends PropertyKey[] = TSetUnionMany<C>> = R;
12
12
  declare function FromIntersect<T extends TSchema[]>(T: [...T]): FromIntersect<T>;
13
- type FromUnion<T extends TSchema[], C extends PropertyKey[][] = TFromRest<T>, R extends PropertyKey[] = OperatorIntersectMany<C>> = R;
13
+ type FromUnion<T extends TSchema[], C extends PropertyKey[][] = TFromRest<T>, R extends PropertyKey[] = TSetIntersectMany<C>> = R;
14
14
  declare function FromUnion<T extends TSchema[]>(T: [...T]): FromUnion<T>;
15
15
  type TFromTuple<T extends TSchema[], I extends string = ZeroString, Acc extends PropertyKey[] = []> = T extends [infer _ extends TSchema, ...infer R extends TSchema[]] ? TFromTuple<R, Increment<I>, [...Acc, I]> : Acc;
16
16
  type TFromArray<_ extends TSchema> = ([
@@ -1,35 +1,29 @@
1
- import { Increment } from '../helpers/index.mjs';
2
- import { OperatorUnionMany, OperatorIntersectMany } from '../operators/index.mjs';
1
+ import { SetUnionMany, SetIntersectMany } from '../sets/index.mjs';
3
2
  // ------------------------------------------------------------------
4
3
  // TypeGuard
5
4
  // ------------------------------------------------------------------
6
- // prettier-ignore
7
5
  import { IsIntersect, IsUnion, IsTuple, IsArray, IsObject, IsRecord } from '../guard/type.mjs';
8
6
  // prettier-ignore
9
- function FromRest(T, Acc = []) {
10
- const [L, ...R] = T;
11
- return (T.length > 0
12
- ? FromRest(R, [...Acc, KeyOfPropertyKeys(L)])
13
- : Acc);
7
+ function FromRest(T) {
8
+ return T.reduce((Acc, L) => {
9
+ return [...Acc, KeyOfPropertyKeys(L)];
10
+ }, []);
14
11
  }
15
12
  // prettier-ignore
16
13
  function FromIntersect(T) {
17
14
  const C = FromRest(T);
18
- const R = OperatorUnionMany(C);
15
+ const R = SetUnionMany(C);
19
16
  return R;
20
17
  }
21
18
  // prettier-ignore
22
19
  function FromUnion(T) {
23
20
  const C = FromRest(T);
24
- const R = OperatorIntersectMany(C);
21
+ const R = SetIntersectMany(C);
25
22
  return R;
26
23
  }
27
24
  // prettier-ignore
28
- function FromTuple(T, I = '0', Acc = []) {
29
- const [_, ...R] = T;
30
- return (T.length > 0
31
- ? FromTuple(R, Increment(I), [...Acc, I])
32
- : Acc);
25
+ function FromTuple(T) {
26
+ return T.map((_, I) => I.toString());
33
27
  }
34
28
  // prettier-ignore
35
29
  function FromArray(_) {
@@ -7,16 +7,10 @@ import { KeyOfFromMappedResult } from './keyof-from-mapped-result.mjs';
7
7
  // ------------------------------------------------------------------
8
8
  // TypeGuard
9
9
  // ------------------------------------------------------------------
10
- // prettier-ignore
11
10
  import { IsMappedResult } from '../guard/type.mjs';
12
11
  // prettier-ignore
13
- function FromPropertyKeys(T, Acc = []) {
14
- const [L, ...R] = T;
15
- return (T.length > 0
16
- ? L === '[number]'
17
- ? FromPropertyKeys(R, [...Acc, Number()])
18
- : FromPropertyKeys(R, [...Acc, Literal(L)])
19
- : Acc);
12
+ function FromPropertyKeys(T) {
13
+ return T.map(L => L === '[number]' ? Number() : Literal(L));
20
14
  }
21
15
  /** `[Json]` Creates a KeyOf type */
22
16
  export function KeyOf(T, options = {}) {
@@ -14,12 +14,17 @@ import { type TPromise } from '../promise/index.mjs';
14
14
  import { type TReadonly } from '../readonly/index.mjs';
15
15
  import { type TTuple } from '../tuple/index.mjs';
16
16
  import { type TUnion } from '../union/index.mjs';
17
+ import { type TSetIncludes } from '../sets/index.mjs';
17
18
  import { type TMappedResult } from './mapped-result.mjs';
18
19
  import type { TMappedKey } from './mapped-key.mjs';
19
20
  type TFromMappedResult<K extends PropertyKey, P extends TProperties> = (K extends keyof P ? FromSchemaType<K, P[K]> : TMappedResult<P>);
20
- type TMappedKeyToMappedResultProperties<K extends PropertyKey, P extends PropertyKey[], Acc extends TProperties = {}> = (P extends [infer L extends PropertyKey, ...infer R extends PropertyKey[]] ? TMappedKeyToMappedResultProperties<K, R, Acc & {
21
+ type TMappedKeyToKnownMappedResultProperties<K extends PropertyKey> = {
22
+ [_ in K]: TLiteral<Assert<K, TLiteralValue>>;
23
+ };
24
+ type TMappedKeyToUnknownMappedResultProperties<P extends PropertyKey[], Acc extends TProperties = {}> = (P extends [infer L extends PropertyKey, ...infer R extends PropertyKey[]] ? TMappedKeyToUnknownMappedResultProperties<R, Acc & {
21
25
  [_ in L]: TLiteral<Assert<L, TLiteralValue>>;
22
26
  }> : Acc);
27
+ type TMappedKeyToMappedResultProperties<K extends PropertyKey, P extends PropertyKey[]> = (TSetIncludes<P, K> extends true ? TMappedKeyToKnownMappedResultProperties<K> : TMappedKeyToUnknownMappedResultProperties<P>);
23
28
  type TFromMappedKey<K extends PropertyKey, P extends PropertyKey[], R extends TProperties = TMappedKeyToMappedResultProperties<K, P>> = (TFromMappedResult<K, R>);
24
29
  type TFromRest<K extends PropertyKey, T extends TSchema[], Acc extends TSchema[] = []> = (T extends [infer L extends TSchema, ...infer R extends TSchema[]] ? TFromRest<K, R, [...Acc, FromSchemaType<K, L>]> : Acc);
25
30
  type FromProperties<K extends PropertyKey, T extends TProperties, R extends TProperties = Evaluate<{
@@ -16,6 +16,8 @@ import { Promise } from '../promise/index.mjs';
16
16
  import { Readonly } from '../readonly/index.mjs';
17
17
  import { Tuple } from '../tuple/index.mjs';
18
18
  import { Union } from '../union/index.mjs';
19
+ // operator
20
+ import { SetIncludes } from '../sets/index.mjs';
19
21
  // mapping types
20
22
  import { MappedResult } from './mapped-result.mjs';
21
23
  // ------------------------------------------------------------------
@@ -30,11 +32,20 @@ function FromMappedResult(K, P) {
30
32
  : MappedResult(P));
31
33
  }
32
34
  // prettier-ignore
33
- function MappedKeyToMappedResultProperties(K, P, Acc = {}) {
34
- const [L, ...R] = P;
35
- return (P.length > 0
36
- ? MappedKeyToMappedResultProperties(K, R, { ...Acc, [L]: Literal(L) })
37
- : Acc);
35
+ function MappedKeyToKnownMappedResultProperties(K) {
36
+ return { [K]: Literal(K) };
37
+ }
38
+ // prettier-ignore
39
+ function MappedKeyToUnknownMappedResultProperties(P) {
40
+ return P.reduce((Acc, L) => {
41
+ return { ...Acc, [L]: Literal(L) };
42
+ }, {});
43
+ }
44
+ // prettier-ignore
45
+ function MappedKeyToMappedResultProperties(K, P) {
46
+ return (SetIncludes(P, K)
47
+ ? MappedKeyToKnownMappedResultProperties(K)
48
+ : MappedKeyToUnknownMappedResultProperties(P));
38
49
  }
39
50
  // prettier-ignore
40
51
  function FromMappedKey(K, P) {
@@ -42,11 +53,8 @@ function FromMappedKey(K, P) {
42
53
  return FromMappedResult(K, R);
43
54
  }
44
55
  // prettier-ignore
45
- function FromRest(K, T, Acc = []) {
46
- const [L, ...R] = T;
47
- return (T.length > 0
48
- ? FromRest(K, R, [...Acc, FromSchemaType(K, L)])
49
- : Acc);
56
+ function FromRest(K, T) {
57
+ return T.map(L => FromSchemaType(K, L));
50
58
  }
51
59
  // prettier-ignore
52
60
  function FromProperties(K, T) {
@@ -78,10 +86,9 @@ function FromSchemaType(K, T) {
78
86
  }
79
87
  // prettier-ignore
80
88
  function FromMappedFunctionReturnType(K, T, Acc = {}) {
81
- const [L, ...R] = K;
82
- return (K.length > 0
83
- ? FromMappedFunctionReturnType(R, T, { ...Acc, [L]: FromSchemaType(L, T) })
84
- : Acc);
89
+ return K.reduce((Acc, L) => {
90
+ return { ...Acc, [L]: FromSchemaType(L, T) };
91
+ }, {});
85
92
  }
86
93
  /** `[Json]` Creates a Mapped object type */
87
94
  export function Mapped(key, map, options = {}) {
@@ -1,5 +1,5 @@
1
- import { Kind } from '../symbols/index.mjs';
2
1
  import { CloneType } from '../clone/type.mjs';
2
+ import { Kind } from '../symbols/index.mjs';
3
3
  /** `[Json]` Creates a Not type */
4
4
  export function Not(schema, options) {
5
5
  return {
@@ -15,7 +15,7 @@ type OptionalPropertyKeys<T extends TProperties> = {
15
15
  }[keyof T];
16
16
  type RequiredPropertyKeys<T extends TProperties> = keyof Omit<T, ReadonlyOptionalPropertyKeys<T> | ReadonlyPropertyKeys<T> | OptionalPropertyKeys<T>>;
17
17
  type ObjectStaticProperties<T extends TProperties, R extends Record<keyof any, unknown>> = Evaluate<(Readonly<Partial<Pick<R, ReadonlyOptionalPropertyKeys<T>>>> & Readonly<Pick<R, ReadonlyPropertyKeys<T>>> & Partial<Pick<R, OptionalPropertyKeys<T>>> & Required<Pick<R, RequiredPropertyKeys<T>>>)>;
18
- export type ObjectStatic<T extends TProperties, P extends unknown[]> = ObjectStaticProperties<T, {
18
+ type ObjectStatic<T extends TProperties, P extends unknown[]> = ObjectStaticProperties<T, {
19
19
  [K in keyof T]: Static<T[K], P>;
20
20
  }>;
21
21
  export type TPropertyKey = string | number;
@@ -3,7 +3,6 @@ import { Kind } from '../symbols/index.mjs';
3
3
  // ------------------------------------------------------------------
4
4
  // TypeGuard
5
5
  // ------------------------------------------------------------------
6
- // prettier-ignore
7
6
  import { IsOptional, IsSchema } from '../guard/type.mjs';
8
7
  /** `[Json]` Creates an Object type */
9
8
  export function _Object(properties, options = {}) {
@@ -1,2 +1,3 @@
1
1
  export * from './omit-from-mapped-key.mjs';
2
+ export * from './omit-from-mapped-result.mjs';
2
3
  export * from './omit.mjs';
@@ -1,2 +1,3 @@
1
1
  export * from './omit-from-mapped-key.mjs';
2
+ export * from './omit-from-mapped-result.mjs';
2
3
  export * from './omit.mjs';
@@ -7,11 +7,10 @@ function FromPropertyKey(T, K, options) {
7
7
  };
8
8
  }
9
9
  // prettier-ignore
10
- function FromPropertyKeys(T, K, options, Acc = {}) {
11
- const [LK, ...RK] = K;
12
- return (K.length > 0
13
- ? FromPropertyKeys(T, RK, options, { ...Acc, ...FromPropertyKey(T, LK, options) })
14
- : Acc);
10
+ function FromPropertyKeys(T, K, options) {
11
+ return K.reduce((Acc, LK) => {
12
+ return { ...Acc, ...FromPropertyKey(T, LK, options) };
13
+ }, {});
15
14
  }
16
15
  // prettier-ignore
17
16
  function FromMappedKey(T, K, options) {
@@ -0,0 +1,11 @@
1
+ import type { SchemaOptions } from '../schema/index.mjs';
2
+ import type { TProperties } from '../object/index.mjs';
3
+ import { type TMappedResult } from '../mapped/index.mjs';
4
+ import { type TOmit } from './omit.mjs';
5
+ type TFromProperties<P extends TProperties, K extends PropertyKey[]> = ({
6
+ [K2 in keyof P]: TOmit<P[K2], K>;
7
+ });
8
+ type TFromMappedResult<R extends TMappedResult, K extends PropertyKey[]> = (TFromProperties<R['properties'], K>);
9
+ export type TOmitFromMappedResult<T extends TMappedResult, K extends PropertyKey[], P extends TProperties = TFromMappedResult<T, K>> = (TMappedResult<P>);
10
+ export declare function OmitFromMappedResult<R extends TMappedResult, K extends PropertyKey[], P extends TProperties = TFromMappedResult<R, K>>(R: R, K: [...K], options: SchemaOptions): TMappedResult<P>;
11
+ export {};
@@ -0,0 +1,17 @@
1
+ import { MappedResult } from '../mapped/index.mjs';
2
+ import { Omit } from './omit.mjs';
3
+ // prettier-ignore
4
+ function FromProperties(P, K, options) {
5
+ return globalThis.Object.getOwnPropertyNames(P).reduce((Acc, K2) => {
6
+ return { ...Acc, [K2]: Omit(P[K2], K, options) };
7
+ }, {});
8
+ }
9
+ // prettier-ignore
10
+ function FromMappedResult(R, K, options) {
11
+ return FromProperties(R.properties, K, options);
12
+ }
13
+ // prettier-ignore
14
+ export function OmitFromMappedResult(R, K, options) {
15
+ const P = FromMappedResult(R, K, options);
16
+ return MappedResult(P);
17
+ }
@@ -1,20 +1,23 @@
1
1
  import type { TSchema, SchemaOptions } from '../schema/index.mjs';
2
2
  import type { TupleToUnion, Evaluate } from '../helpers/index.mjs';
3
3
  import { type TRecursive } from '../recursive/index.mjs';
4
+ import type { TMappedKey, TMappedResult } from '../mapped/index.mjs';
4
5
  import { type TIntersect } from '../intersect/index.mjs';
5
6
  import { type TUnion } from '../union/index.mjs';
6
7
  import { type TObject, type TProperties } from '../object/index.mjs';
7
8
  import { type TIndexPropertyKeys } from '../indexed/index.mjs';
8
- import { TMappedKey } from '../mapped/index.mjs';
9
9
  import { type TOmitFromMappedKey } from './omit-from-mapped-key.mjs';
10
+ import { type TOmitFromMappedResult } from './omit-from-mapped-result.mjs';
10
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, TOmitResolve<L, K>]> : Acc);
11
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, TOmitResolve<L, K>]> : Acc);
12
13
  type TFromProperties<T extends TProperties, K extends PropertyKey[], I extends PropertyKey = TupleToUnion<K>> = Evaluate<Omit<T, I>>;
13
14
  export type TOmitResolve<T extends TProperties, K extends PropertyKey[]> = T extends TRecursive<infer S> ? TRecursive<TOmitResolve<S, K>> : T extends TIntersect<infer S> ? TIntersect<TFromIntersect<S, K>> : T extends TUnion<infer S> ? TUnion<TFromUnion<S, K>> : T extends TObject<infer S> ? TObject<TFromProperties<S, K>> : TObject<{}>;
14
15
  export declare function OmitResolve<T extends TSchema, K extends PropertyKey[]>(T: T, K: [...K]): TOmitResolve<T, K>;
15
16
  export type TOmit<T extends TSchema, K extends PropertyKey[]> = TOmitResolve<T, K>;
16
- /** `[Json]` Constructs a type whose keys are picked from the given type */
17
- export declare function Omit<T extends TSchema, K extends TMappedKey>(T: T, K: K): TOmitFromMappedKey<T, K>;
17
+ /** `[Json]` Constructs a type whose keys are omitted from the given type */
18
+ export declare function Omit<T extends TMappedResult, K extends PropertyKey[]>(T: T, K: [...K], options?: SchemaOptions): TOmitFromMappedResult<T, K>;
19
+ /** `[Json]` Constructs a type whose keys are omitted from the given type */
20
+ export declare function Omit<T extends TSchema, K extends TMappedKey>(T: T, K: K, options?: SchemaOptions): TOmitFromMappedKey<T, K>;
18
21
  /** `[Json]` Constructs a type whose keys are omitted from the given type */
19
22
  export declare function Omit<T extends TSchema, K extends TSchema, I extends PropertyKey[] = TIndexPropertyKeys<K>>(T: T, K: K, options?: SchemaOptions): TOmit<T, I>;
20
23
  /** `[Json]` Constructs a type whose keys are omitted from the given type */