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

package/build/require/type/mapped/mapped.d.ts

@@ -1,5 +1,5 @@
 import type { TSchema } from '../schema/index';
-import type { Ensure, Evaluate } from '../helpers/index';
+import type { Ensure, Evaluate, Assert } from '../helpers/index';
 import { type TArray } from '../array/index';
 import { type TAsyncIterator } from '../async-iterator/index';
 import { type TConstructor } from '../constructor/index';
@@ -8,19 +8,22 @@ import { type TIndexPropertyKeys } from '../indexed/index';
 import { type TIntersect } from '../intersect/index';
 import { type TIterator } from '../iterator/index';
 import { type TLiteral, type TLiteralValue } from '../literal/index';
-import { type TNever } from '../never/index';
 import { type TObject, type TProperties, type ObjectOptions } from '../object/index';
 import { type TOptional } from '../optional/index';
 import { type TPromise } from '../promise/index';
 import { type TReadonly } from '../readonly/index';
 import { type TTuple } from '../tuple/index';
 import { type TUnion } from '../union/index';
-import type { TMappedResult } from './mapped-result';
+import { type TMappedResult } from './mapped-result';
 import type { TMappedKey } from './mapped-key';
-type FromMappedResult<K extends PropertyKey, P extends TProperties> = (K extends keyof P ? FromSchemaType<K, P[K]> : TNever);
+type FromMappedResult<K extends PropertyKey, P extends TProperties> = (K extends keyof P ? FromSchemaType<K, P[K]> : TMappedResult<P>);
 declare function FromMappedResult<K extends PropertyKey, P extends TProperties>(K: K, P: P): FromMappedResult<K, P>;
-type FromMappedKey<K extends PropertyKey, _ extends PropertyKey[]> = (K extends TLiteralValue ? TLiteral<K> : TLiteral<'never'>);
-declare function FromMappedKey<K extends PropertyKey, P extends PropertyKey[]>(K: K, _: [...P]): TLiteral<TLiteralValue>;
+type MappedKeyToMappedResultProperties<K extends PropertyKey, P extends PropertyKey[]> = (P extends [infer L extends PropertyKey, ...infer R extends PropertyKey[]] ? {
+    [_ in L]: TLiteral<Assert<L, TLiteralValue>>;
+} & MappedKeyToMappedResultProperties<K, R> : {});
+declare function MappedKeyToMappedResultProperties<K extends PropertyKey, P extends PropertyKey[]>(K: K, P: [...P]): MappedKeyToMappedResultProperties<K, P>;
+type FromMappedKey<K extends PropertyKey, P extends PropertyKey[], R extends TProperties = MappedKeyToMappedResultProperties<K, P>> = (FromMappedResult<K, R>);
+declare function FromMappedKey<K extends PropertyKey, P extends PropertyKey[]>(K: K, P: [...P]): FromMappedResult<K, MappedKeyToMappedResultProperties<K, P>>;
 type FromRest<K extends PropertyKey, T extends TSchema[]> = T extends [infer L extends TSchema, ...infer R extends TSchema[]] ? [FromSchemaType<K, L>, ...FromRest<K, R>] : [];
 declare function FromRest<K extends PropertyKey, T extends TSchema[]>(K: K, T: [...T]): FromRest<K, T>;
 type FromProperties<K extends PropertyKey, T extends TProperties, R extends TProperties = Evaluate<{

package/build/require/type/mapped/mapped.js

@@ -13,21 +13,28 @@ const index_7 = require("../indexed/index");
 const index_8 = require("../intersect/index");
 const index_9 = require("../iterator/index");
 const index_10 = require("../literal/index");
-const index_11 = require("../never/index");
-const index_12 = require("../object/index");
-const index_13 = require("../optional/index");
-const index_14 = require("../promise/index");
-const index_15 = require("../readonly/index");
-const index_16 = require("../tuple/index");
-const index_17 = require("../union/index");
+const index_11 = require("../object/index");
+const index_12 = require("../optional/index");
+const index_13 = require("../promise/index");
+const index_14 = require("../readonly/index");
+const index_15 = require("../tuple/index");
+const index_16 = require("../union/index");
+const mapped_result_1 = require("./mapped-result");
 const type_3 = require("../guard/type");
 function FromMappedResult(K, P) {
     return (K in P
         ? FromSchemaType(K, P[K])
-        : (0, index_11.Never)());
+        : (0, mapped_result_1.MappedResult)(P));
 }
-function FromMappedKey(K, _) {
-    return (0, index_10.Literal)(K);
+function MappedKeyToMappedResultProperties(K, P) {
+    const [L, ...R] = P;
+    return (P.length > 0
+        ? { [L]: (0, index_10.Literal)(L), ...MappedKeyToMappedResultProperties(K, R) }
+        : {});
+}
+function FromMappedKey(K, P) {
+    const R = MappedKeyToMappedResultProperties(K, P);
+    return FromMappedResult(K, R);
 }
 function FromRest(K, T) {
     const [L, ...R] = T;
@@ -41,8 +48,8 @@ function FromProperties(K, T) {
     }, {});
 }
 function FromSchemaType(K, T) {
-    return ((0, type_3.TOptional)(T) ? (0, index_13.Optional)(FromSchemaType(K, (0, index_2.Discard)(T, [index_1.OptionalKind]))) :
-        (0, type_3.TReadonly)(T) ? (0, index_15.Readonly)(FromSchemaType(K, (0, index_2.Discard)(T, [index_1.ReadonlyKind]))) :
+    return ((0, type_3.TOptional)(T) ? (0, index_12.Optional)(FromSchemaType(K, (0, index_2.Discard)(T, [index_1.OptionalKind]))) :
+        (0, type_3.TReadonly)(T) ? (0, index_14.Readonly)(FromSchemaType(K, (0, index_2.Discard)(T, [index_1.ReadonlyKind]))) :
             (0, type_3.TMappedResult)(T) ? FromMappedResult(K, T.properties) :
                 (0, type_3.TMappedKey)(T) ? FromMappedKey(K, T.keys) :
                     (0, type_3.TConstructor)(T) ? (0, index_5.Constructor)(FromRest(K, T.parameters), FromSchemaType(K, T.returns)) :
@@ -50,11 +57,11 @@ function FromSchemaType(K, T) {
                             (0, type_3.TAsyncIterator)(T) ? (0, index_4.AsyncIterator)(FromSchemaType(K, T.items)) :
                                 (0, type_3.TIterator)(T) ? (0, index_9.Iterator)(FromSchemaType(K, T.items)) :
                                     (0, type_3.TIntersect)(T) ? (0, index_8.Intersect)(FromRest(K, T.allOf)) :
-                                        (0, type_3.TUnion)(T) ? (0, index_17.Union)(FromRest(K, T.anyOf)) :
-                                            (0, type_3.TTuple)(T) ? (0, index_16.Tuple)(FromRest(K, T.items ?? [])) :
-                                                (0, type_3.TObject)(T) ? (0, index_12.Object)(FromProperties(K, T.properties)) :
+                                        (0, type_3.TUnion)(T) ? (0, index_16.Union)(FromRest(K, T.anyOf)) :
+                                            (0, type_3.TTuple)(T) ? (0, index_15.Tuple)(FromRest(K, T.items ?? [])) :
+                                                (0, type_3.TObject)(T) ? (0, index_11.Object)(FromProperties(K, T.properties)) :
                                                     (0, type_3.TArray)(T) ? (0, index_3.Array)(FromSchemaType(K, T.items)) :
-                                                        (0, type_3.TPromise)(T) ? (0, index_14.Promise)(FromSchemaType(K, T.item)) :
+                                                        (0, type_3.TPromise)(T) ? (0, index_13.Promise)(FromSchemaType(K, T.item)) :
                                                             T);
 }
 function FromMappedFunctionReturnType(K, T) {
@@ -67,6 +74,6 @@ function Mapped(key, map, options = {}) {
     const K = (0, type_1.TSchema)(key) ? (0, index_7.IndexPropertyKeys)(key) : key;
     const RT = map({ [index_1.Kind]: 'MappedKey', keys: K });
     const R = FromMappedFunctionReturnType(K, RT);
-    return (0, type_2.CloneType)((0, index_12.Object)(R), options);
+    return (0, type_2.CloneType)((0, index_11.Object)(R), options);
 }
 exports.Mapped = Mapped;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sinclair/typebox",
-  "version": "0.32.0-dev-13",
+  "version": "0.32.0-dev-14",
   "description": "Json Schema Type Builder with Static Type Resolution for TypeScript",
   "keywords": [
     "typescript",