typebox 1.1.29 → 1.1.31

package/build/type/action/awaited.d.mts

@@ -7,5 +7,9 @@ export type TAwaitedDeferred<Type extends TSchema> = (TDeferred<'Awaited', [Type
 export declare function AwaitedDeferred<Type extends TSchema>(type: Type, options?: TSchemaOptions): TAwaitedDeferred<Type>;
 /** Applies an Awaited action to a type. */
 export type TAwaited<Type extends TSchema> = (TAwaitedAction<Type>);
-/** Applies an Awaited action to a type. */
+/**
+ * Applies an Awaited action to a type.
+ *
+ * @deprecated This action is being removed in the next version of TypeBox.
+ */
 export declare function Awaited<Type extends TSchema>(type: Type, options?: TSchemaOptions): TAwaited<Type>;

package/build/type/action/awaited.mjs

@@ -5,7 +5,11 @@ import { AwaitedAction } from '../engine/awaited/instantiate.mjs';
 export function AwaitedDeferred(type, options = {}) {
     return Deferred('Awaited', [type], options);
 }
-/** Applies an Awaited action to a type. */
+/**
+ * Applies an Awaited action to a type.
+ *
+ * @deprecated This action is being removed in the next version of TypeBox.
+ */
 export function Awaited(type, options = {}) {
     return AwaitedAction(type, options);
 }

package/build/type/engine/indexed/from-object.d.mts

@@ -1,14 +1,16 @@
 import { type TProperties } from '../../types/properties.mjs';
 import { type TSchema } from '../../types/schema.mjs';
 import { type TNumber } from '../../types/number.mjs';
+import { type TNever } from '../../types/never.mjs';
 import { type TPropertyKeys } from '../../types/properties.mjs';
 import { type TEvaluateUnion } from '../evaluate/evaluate.mjs';
 import { type TToIndexableKeys } from '../indexable/to-indexable-keys.mjs';
-type TSelectProperty<Properties extends TProperties, Key extends string, CanonicalKey extends string = keyof Properties extends string | number ? `${keyof Properties}` : never, Result extends TSchema[] = Key extends CanonicalKey ? [Properties[Key]] : []> = Result;
-type TSelectProperties<Properties extends TProperties, Keys extends string[], Result extends TSchema[] = []> = (Keys extends [infer Left extends string, ...infer Right extends string[]] ? TSelectProperties<Properties, Right, [...Result, ...TSelectProperty<Properties, Left>]> : Result);
-type TFromIndexer<Properties extends TProperties, Indexer extends TSchema, Keys extends string[] = TToIndexableKeys<Indexer>, Variants extends TSchema[] = TSelectProperties<Properties, Keys>, Result extends TSchema = TEvaluateUnion<Variants>> = Result;
+import { type TExpandThis } from '../this/expand-this.mjs';
+type TIndexProperty<Properties extends TProperties, Key extends string, CanonicalKey extends string = keyof Properties extends string | number ? `${keyof Properties}` : never, SelectedType extends TSchema = Key extends CanonicalKey ? Properties[Key] : TNever, Result extends TSchema = TExpandThis<Properties, SelectedType>> = Result;
+type TIndexProperties<Properties extends TProperties, Keys extends string[], Result extends TSchema[] = []> = (Keys extends [infer Left extends string, ...infer Right extends string[]] ? TIndexProperties<Properties, Right, [...Result, TIndexProperty<Properties, Left>]> : Result);
+type TFromIndexer<Properties extends TProperties, Indexer extends TSchema, Keys extends string[] = TToIndexableKeys<Indexer>, Variants extends TSchema[] = TIndexProperties<Properties, Keys>, Result extends TSchema = TEvaluateUnion<Variants>> = Result;
 type TNumericKeys<Keys extends string[], Result extends string[] = []> = (Keys extends [infer Left extends string, ...infer Right extends string[]] ? Left extends `${infer _ extends number}` ? TNumericKeys<Right, [...Result, Left]> : TNumericKeys<Right, Result> : Result);
-type TFromIndexerNumber<Properties extends TProperties, Keys extends string[] = TPropertyKeys<Properties>, NumericKeys extends string[] = TNumericKeys<Keys>, Variants extends TSchema[] = TSelectProperties<Properties, NumericKeys>, Result extends TSchema = TEvaluateUnion<Variants>> = Result;
+type TFromIndexerNumber<Properties extends TProperties, Keys extends string[] = TPropertyKeys<Properties>, NumericKeys extends string[] = TNumericKeys<Keys>, Variants extends TSchema[] = TIndexProperties<Properties, NumericKeys>, Result extends TSchema = TEvaluateUnion<Variants>> = Result;
 export type TFromObject<Properties extends TProperties, Indexer extends TSchema, Result extends TSchema = Indexer extends TNumber ? TFromIndexerNumber<Properties> : TFromIndexer<Properties, Indexer>> = Result;
 export declare function FromObject<Properties extends TProperties, Indexer extends TSchema>(properties: Properties, indexer: Indexer): TFromObject<Properties, Indexer>;
 export {};

package/build/type/engine/indexed/from-object.mjs

@@ -1,21 +1,24 @@
 // deno-fmt-ignore-file
 import { IsNumber } from '../../types/number.mjs';
+import { Never } from '../../types/never.mjs';
 import { PropertyKeys } from '../../types/properties.mjs';
 import { EvaluateUnion } from '../evaluate/evaluate.mjs';
 import { ToIndexableKeys } from '../indexable/to-indexable-keys.mjs';
 import { IntegerKey } from '../../types/record.mjs';
-function SelectProperty(properties, key) {
-    const result = key in properties ? [properties[key]] : [];
+import { ExpandThis } from '../this/expand-this.mjs';
+function IndexProperty(properties, key) {
+    const selectedType = key in properties ? properties[key] : Never();
+    const result = ExpandThis(properties, selectedType);
     return result;
 }
-function SelectProperties(properties, keys) {
+function IndexProperties(properties, keys) {
     return keys.reduce((result, left) => {
-        return [...result, ...SelectProperty(properties, left)];
+        return [...result, IndexProperty(properties, left)];
     }, []);
 }
 function FromIndexer(properties, indexer) {
     const keys = ToIndexableKeys(indexer);
-    const variants = SelectProperties(properties, keys);
+    const variants = IndexProperties(properties, keys);
     const result = EvaluateUnion(variants);
     return result;
 }
@@ -27,7 +30,7 @@ function NumericKeys(keys) {
 function FromIndexerNumber(properties) {
     const keys = PropertyKeys(properties);
     const numericKeys = NumericKeys(keys);
-    const variants = SelectProperties(properties, numericKeys);
+    const variants = IndexProperties(properties, numericKeys);
     const result = EvaluateUnion(variants);
     return result;
 }

package/build/type/engine/this/expand-this.d.mts

@@ -0,0 +1,19 @@
+import { type TArray } from '../../types/array.mjs';
+import { type TAsyncIterator } from '../../types/async-iterator.mjs';
+import { type TConstructor } from '../../types/constructor.mjs';
+import { type TFunction } from '../../types/function.mjs';
+import { type TIterator } from '../../types/iterator.mjs';
+import { type TIntersect } from '../../types/intersect.mjs';
+import { type TObject } from '../../types/object.mjs';
+import { type TProperties } from '../../types/properties.mjs';
+import { type TSchema } from '../../types/schema.mjs';
+import { type TPromise } from '../../types/promise.mjs';
+import { type TTuple } from '../../types/tuple.mjs';
+import { type TThis } from '../../types/this.mjs';
+import { type TUnion } from '../../types/union.mjs';
+type TFromTypes<Properties extends TProperties, Types extends TSchema[], Result extends TSchema[] = []> = (Types extends [infer Left extends TSchema, ...infer Right extends TSchema[]] ? TFromTypes<Properties, Right, [...Result, TFromType<Properties, Left>]> : Result);
+export type TFromType<Properties extends TProperties, Type extends TSchema> = (Type extends TArray<infer Type extends TSchema> ? TArray<TFromType<Properties, Type>> : Type extends TAsyncIterator<infer Type extends TSchema> ? TAsyncIterator<TFromType<Properties, Type>> : Type extends TConstructor<infer Parameters extends TSchema[], infer InstanceType extends TSchema> ? TConstructor<TFromTypes<Properties, Parameters>, TFromType<Properties, InstanceType>> : Type extends TFunction<infer Parameters extends TSchema[], infer ReturnType extends TSchema> ? TFunction<TFromTypes<Properties, Parameters>, TFromType<Properties, ReturnType>> : Type extends TIterator<infer Type extends TSchema> ? TIterator<TFromType<Properties, Type>> : Type extends TPromise<infer Type extends TSchema> ? TPromise<TFromType<Properties, Type>> : Type extends TTuple<infer Types extends TSchema[]> ? TTuple<TFromTypes<Properties, Types>> : Type extends TUnion<infer Types extends TSchema[]> ? TUnion<TFromTypes<Properties, Types>> : Type extends TIntersect<infer Types extends TSchema[]> ? TIntersect<TFromTypes<Properties, Types>> : Type extends TThis ? TObject<Properties> : Type);
+export declare function FromType<Properties extends TProperties, Type extends TSchema>(properties: Properties, type: Type): TFromType<Properties, Type>;
+export type TExpandThis<Properties extends TProperties, Type extends TSchema, Result extends TSchema = TFromType<Properties, Type>> = Result;
+export declare function ExpandThis<Properties extends TProperties, Type extends TSchema>(properties: TProperties, type: Type): TExpandThis<Properties, Type>;
+export {};

package/build/type/engine/this/expand-this.mjs

@@ -0,0 +1,32 @@
+// deno-fmt-ignore-file
+import { IsArray, Array } from '../../types/array.mjs';
+import { IsAsyncIterator, AsyncIterator } from '../../types/async-iterator.mjs';
+import { IsConstructor, Constructor } from '../../types/constructor.mjs';
+import { IsFunction, Function } from '../../types/function.mjs';
+import { IsIterator, Iterator } from '../../types/iterator.mjs';
+import { IsIntersect, Intersect } from '../../types/intersect.mjs';
+import { Object } from '../../types/object.mjs';
+import { IsPromise, Promise } from '../../types/promise.mjs';
+import { IsTuple, Tuple } from '../../types/tuple.mjs';
+import { IsThis } from '../../types/this.mjs';
+import { IsUnion, Union } from '../../types/union.mjs';
+function FromTypes(properties, types) {
+    return types.map(type => FromType(properties, type));
+}
+export function FromType(properties, type) {
+    return (IsArray(type) ? Array(FromType(properties, type.items)) :
+        IsAsyncIterator(type) ? AsyncIterator(FromType(properties, type.iteratorItems)) :
+            IsConstructor(type) ? Constructor(FromTypes(properties, type.parameters), FromType(properties, type.instanceType)) :
+                IsFunction(type) ? Function(FromTypes(properties, type.parameters), FromType(properties, type.returnType)) :
+                    IsIterator(type) ? Iterator(FromType(properties, type.iteratorItems)) :
+                        IsPromise(type) ? Promise(FromType(properties, type.item)) :
+                            IsTuple(type) ? Tuple(FromTypes(properties, type.items)) :
+                                IsUnion(type) ? Union(FromTypes(properties, type.anyOf)) :
+                                    IsIntersect(type) ? Intersect(FromTypes(properties, type.allOf)) :
+                                        IsThis(type) ? Object(properties) :
+                                            type);
+}
+export function ExpandThis(properties, type) {
+    const result = FromType(properties, type);
+    return result;
+}

package/build/type/types/async-iterator.d.mts

@@ -8,7 +8,11 @@ export interface TAsyncIterator<Type extends TSchema = TSchema> extends TSchema
     type: 'asyncIterator';
     iteratorItems: Type;
 }
-/** Creates a AsyncIterator type. */
+/**
+ * Creates a AsyncIterator type.
+ *
+ * @deprecated This type is being removed in the next version of TypeBox. A fallback will be provided under examples.
+ */
 export declare function AsyncIterator<Type extends TSchema>(iteratorItems: Type, options?: TSchemaOptions): TAsyncIterator<Type>;
 /** Returns true if the given value is a TAsyncIterator */
 export declare function IsAsyncIterator(value: unknown): value is TAsyncIterator;

package/build/type/types/async-iterator.mjs

@@ -4,7 +4,11 @@ import { IsKind } from './schema.mjs';
 // ------------------------------------------------------------------
 // Factory
 // ------------------------------------------------------------------
-/** Creates a AsyncIterator type. */
+/**
+ * Creates a AsyncIterator type.
+ *
+ * @deprecated This type is being removed in the next version of TypeBox. A fallback will be provided under examples.
+ */
 export function AsyncIterator(iteratorItems, options) {
     return Memory.Create({ '~kind': 'AsyncIterator' }, { type: 'asyncIterator', iteratorItems }, options);
 }

package/build/type/types/iterator.d.mts

@@ -8,7 +8,11 @@ export interface TIterator<Type extends TSchema = TSchema> extends TSchema {
     type: 'iterator';
     iteratorItems: Type;
 }
-/** Creates a Iterator type. */
+/**
+ * Creates a Iterator type.
+ *
+ * @deprecated This type is being removed in the next version of TypeBox. A fallback will be provided under examples.
+ */
 export declare function Iterator<Type extends TSchema>(iteratorItems: Type, options?: TSchemaOptions): TIterator<Type>;
 /** Returns true if the given value is TIterator. */
 export declare function IsIterator(value: unknown): value is TIterator;

package/build/type/types/iterator.mjs

@@ -4,7 +4,11 @@ import { IsKind } from './schema.mjs';
 // ------------------------------------------------------------------
 // Factory
 // ------------------------------------------------------------------
-/** Creates a Iterator type. */
+/**
+ * Creates a Iterator type.
+ *
+ * @deprecated This type is being removed in the next version of TypeBox. A fallback will be provided under examples.
+ */
 export function Iterator(iteratorItems, options) {
     return Memory.Create({ '~kind': 'Iterator' }, { type: 'iterator', iteratorItems }, options);
 }

package/build/type/types/promise.d.mts

@@ -8,7 +8,11 @@ export interface TPromise<Type extends TSchema = TSchema> extends TSchema {
     type: 'promise';
     item: Type;
 }
-/** Creates a Promise type. */
+/**
+ * Creates a Promise type.
+ *
+ * @deprecated This type is being removed in the next version of TypeBox. A fallback will be provided under examples.
+ */
 export declare function _Promise_<Type extends TSchema>(item: Type, options?: TSchemaOptions): TPromise<Type>;
 export { _Promise_ as Promise };
 /** Returns true if the given type is TPromise. */

package/build/type/types/promise.mjs

@@ -4,7 +4,11 @@ import { IsKind } from './schema.mjs';
 // ------------------------------------------------------------------
 // Factory
 // ------------------------------------------------------------------
-/** Creates a Promise type. */
+/**
+ * Creates a Promise type.
+ *
+ * @deprecated This type is being removed in the next version of TypeBox. A fallback will be provided under examples.
+ */
 export function _Promise_(item, options) {
     return Memory.Create({ ['~kind']: 'Promise' }, { type: 'promise', item }, options);
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "typebox",
   "description": "Json Schema Type Builder with Static Type Resolution for TypeScript",
-  "version": "1.1.29",
+  "version": "1.1.31",
   "keywords": [
     "typescript",
     "jsonschema"
@@ -16,37 +16,37 @@
   "types": "./build/index.d.mts",
   "module": "./build/index.mjs",
   "exports": {
+    "./value": {
+      "import": "./build/value/index.mjs",
+      "default": "./build/value/index.mjs"
+    },
     "./guard": {
       "import": "./build/guard/index.mjs",
       "default": "./build/guard/index.mjs"
     },
-    "./error": {
-      "import": "./build/error/index.mjs",
-      "default": "./build/error/index.mjs"
-    },
-    "./compile": {
-      "import": "./build/compile/index.mjs",
-      "default": "./build/compile/index.mjs"
+    "./schema": {
+      "import": "./build/schema/index.mjs",
+      "default": "./build/schema/index.mjs"
     },
     "./system": {
       "import": "./build/system/index.mjs",
       "default": "./build/system/index.mjs"
     },
-    "./format": {
-      "import": "./build/format/index.mjs",
-      "default": "./build/format/index.mjs"
-    },
     "./type": {
       "import": "./build/type/index.mjs",
       "default": "./build/type/index.mjs"
     },
-    "./schema": {
-      "import": "./build/schema/index.mjs",
-      "default": "./build/schema/index.mjs"
+    "./compile": {
+      "import": "./build/compile/index.mjs",
+      "default": "./build/compile/index.mjs"
     },
-    "./value": {
-      "import": "./build/value/index.mjs",
-      "default": "./build/value/index.mjs"
+    "./error": {
+      "import": "./build/error/index.mjs",
+      "default": "./build/error/index.mjs"
+    },
+    "./format": {
+      "import": "./build/format/index.mjs",
+      "default": "./build/format/index.mjs"
     },
     ".": {
       "import": "./build/index.mjs",
@@ -55,29 +55,29 @@
   },
   "typesVersions": {
     "*": {
+      "value": [
+        "./build/value/index.d.mts"
+      ],
       "guard": [
         "./build/guard/index.d.mts"
       ],
-      "error": [
-        "./build/error/index.d.mts"
-      ],
-      "compile": [
-        "./build/compile/index.d.mts"
+      "schema": [
+        "./build/schema/index.d.mts"
       ],
       "system": [
         "./build/system/index.d.mts"
       ],
-      "format": [
-        "./build/format/index.d.mts"
-      ],
       "type": [
         "./build/type/index.d.mts"
       ],
-      "schema": [
-        "./build/schema/index.d.mts"
+      "compile": [
+        "./build/compile/index.d.mts"
       ],
-      "value": [
-        "./build/value/index.d.mts"
+      "error": [
+        "./build/error/index.d.mts"
+      ],
+      "format": [
+        "./build/format/index.d.mts"
       ],
       ".": [
         "./build/index.d.mts"

package/readme.md

@@ -80,7 +80,6 @@ The following creates a User type and infers with Static.
 ```typescript
 import Type from 'typebox'
 
-
 // Type
 
 const User = Type.Object({                       // const User = {
@@ -100,7 +99,6 @@ const User = Type.Object({                       // const User = {
                                                  //   ]
                                                  // }
 
-
 // Static
 
 type User = Type.Static<typeof User>              // type User = {
@@ -124,7 +122,6 @@ The following uses the Script function to parse TypeScript interfaces into JSON
 ```typescript
 import Type from 'typebox'
 
-
 // Script
 
 const { User, UserUpdate } = Type.Script(`
@@ -145,7 +142,6 @@ const { User, UserUpdate } = Type.Script(`
 
 `)
 
-
 // Reflect
 
 console.log(User)                                // {
@@ -172,7 +168,6 @@ console.log(UserUpdate)                          // {
                                                  //   required: ['id']
                                                  // }
 
-
 // Static
 
 type User = Type.Static<typeof User>              // type User = {
@@ -205,7 +200,6 @@ The following uses the Schema submodule to compile a TypeBox type.
 ```typescript
 import Schema from 'typebox/schema'
 
-
 // Compile
 
 const User = Schema.Compile(Type.Object({        // const User = Validator<Type.TObject<{
@@ -214,7 +208,6 @@ const User = Schema.Compile(Type.Object({        // const User = Validator<Type.
   email: Type.String({ format: 'email' })        //   email: Type.TString;
 }))                                              // }>, { ... }>
 
-
 // Parse
 
 const user = User.Parse({                        // const user: {