@sinclair/typebox 0.34.6 → 0.34.8

package/build/cjs/type/module/compute.d.ts

@@ -13,9 +13,11 @@ import { type TIterator } from '../iterator/index';
 import { type TKeyOf } from '../keyof/index';
 import { type TObject, type TProperties } from '../object/index';
 import { type TOmit } from '../omit/index';
+import { type TOptional } from '../optional/index';
 import { type TPick } from '../pick/index';
 import { type TNever } from '../never/index';
 import { TPartial } from '../partial/index';
+import { type TReadonly } from '../readonly/index';
 import { type TRecordOrObject } from '../record/index';
 import { type TRef } from '../ref/index';
 import { TRequired } from '../required/index';
@@ -44,7 +46,7 @@ type TFromArray<ModuleProperties extends TProperties, Type extends TSchema> = (E
 type TFromAsyncIterator<ModuleProperties extends TProperties, Type extends TSchema> = (TAsyncIterator<TFromType<ModuleProperties, Type>>);
 type TFromIterator<ModuleProperties extends TProperties, Type extends TSchema> = (TIterator<TFromType<ModuleProperties, Type>>);
 type TFromRest<ModuleProperties extends TProperties, Types extends TSchema[], Result extends TSchema[] = []> = (Types extends [infer Left extends TSchema, ...infer Right extends TSchema[]] ? TFromRest<ModuleProperties, Right, [...Result, TFromType<ModuleProperties, Left>]> : Result);
-export type TFromType<ModuleProperties extends TProperties, Type extends TSchema> = (Type extends TArray<infer Type extends TSchema> ? TFromArray<ModuleProperties, Type> : Type extends TAsyncIterator<infer Type extends TSchema> ? TFromAsyncIterator<ModuleProperties, Type> : Type extends TComputed<infer Target extends string, infer Parameters extends TSchema[]> ? TFromComputed<ModuleProperties, Target, Parameters> : Type extends TConstructor<infer Parameters extends TSchema[], infer InstanceType extends TSchema> ? TFromConstructor<ModuleProperties, Parameters, InstanceType> : Type extends TFunction<infer Parameters extends TSchema[], infer ReturnType extends TSchema> ? TFromFunction<ModuleProperties, Parameters, ReturnType> : Type extends TIntersect<infer Types extends TSchema[]> ? TFromIntersect<ModuleProperties, Types> : Type extends TIterator<infer Type extends TSchema> ? TFromIterator<ModuleProperties, Type> : Type extends TObject<infer Properties extends TProperties> ? TFromObject<ModuleProperties, Properties> : Type extends TTuple<infer Types extends TSchema[]> ? TFromTuple<ModuleProperties, Types> : Type extends TEnum<infer _ extends TEnumRecord> ? Type : Type extends TUnion<infer Types extends TSchema[]> ? TFromUnion<ModuleProperties, Types> : Type);
+export type TFromType<ModuleProperties extends TProperties, Type extends TSchema> = (Type extends TOptional<infer Type extends TSchema> ? TOptional<TFromType<ModuleProperties, Type>> : Type extends TReadonly<infer Type extends TSchema> ? TReadonly<TFromType<ModuleProperties, Type>> : Type extends TArray<infer Type extends TSchema> ? TFromArray<ModuleProperties, Type> : Type extends TAsyncIterator<infer Type extends TSchema> ? TFromAsyncIterator<ModuleProperties, Type> : Type extends TComputed<infer Target extends string, infer Parameters extends TSchema[]> ? TFromComputed<ModuleProperties, Target, Parameters> : Type extends TConstructor<infer Parameters extends TSchema[], infer InstanceType extends TSchema> ? TFromConstructor<ModuleProperties, Parameters, InstanceType> : Type extends TFunction<infer Parameters extends TSchema[], infer ReturnType extends TSchema> ? TFromFunction<ModuleProperties, Parameters, ReturnType> : Type extends TIntersect<infer Types extends TSchema[]> ? TFromIntersect<ModuleProperties, Types> : Type extends TIterator<infer Type extends TSchema> ? TFromIterator<ModuleProperties, Type> : Type extends TObject<infer Properties extends TProperties> ? TFromObject<ModuleProperties, Properties> : Type extends TTuple<infer Types extends TSchema[]> ? TFromTuple<ModuleProperties, Types> : Type extends TEnum<infer _ extends TEnumRecord> ? Type : Type extends TUnion<infer Types extends TSchema[]> ? TFromUnion<ModuleProperties, Types> : Type);
 export declare function FromType<ModuleProperties extends TProperties, Type extends TSchema>(moduleProperties: ModuleProperties, type: Type): TFromType<ModuleProperties, Type>;
 export type TComputeType<ModuleProperties extends TProperties, Key extends PropertyKey> = (Key extends keyof ModuleProperties ? TFromType<ModuleProperties, ModuleProperties[Key]> : TNever);
 export declare function ComputeType<ModuleProperties extends TProperties, Key extends PropertyKey>(moduleProperties: ModuleProperties, key: Key): TComputeType<ModuleProperties, Key>;

package/build/cjs/type/module/compute.js

@@ -5,24 +5,26 @@ exports.FromType = FromType;
 exports.ComputeType = ComputeType;
 exports.ComputeModuleProperties = ComputeModuleProperties;
 const index_1 = require("../create/index");
-const index_2 = require("../array/index");
-const index_3 = require("../awaited/index");
-const index_4 = require("../async-iterator/index");
-const index_5 = require("../constructor/index");
-const index_6 = require("../indexed/index");
-const index_7 = require("../function/index");
-const index_8 = require("../intersect/index");
-const index_9 = require("../iterator/index");
-const index_10 = require("../keyof/index");
-const index_11 = require("../object/index");
-const index_12 = require("../omit/index");
-const index_13 = require("../pick/index");
-const index_14 = require("../never/index");
-const index_15 = require("../partial/index");
-const index_16 = require("../record/index");
-const index_17 = require("../required/index");
-const index_18 = require("../tuple/index");
-const index_19 = require("../union/index");
+const index_2 = require("../discard/index");
+const index_3 = require("../array/index");
+const index_4 = require("../awaited/index");
+const index_5 = require("../async-iterator/index");
+const index_6 = require("../constructor/index");
+const index_7 = require("../indexed/index");
+const index_8 = require("../function/index");
+const index_9 = require("../intersect/index");
+const index_10 = require("../iterator/index");
+const index_11 = require("../keyof/index");
+const index_12 = require("../object/index");
+const index_13 = require("../omit/index");
+const index_14 = require("../pick/index");
+const index_15 = require("../never/index");
+const index_16 = require("../partial/index");
+const index_17 = require("../record/index");
+const index_18 = require("../required/index");
+const index_19 = require("../tuple/index");
+const index_20 = require("../union/index");
+const index_21 = require("../symbols/index");
 // ------------------------------------------------------------------
 // KindGuard
 // ------------------------------------------------------------------
@@ -41,39 +43,39 @@ function Deref(moduleProperties, ref) {
         ? KindGuard.IsRef(moduleProperties[ref])
             ? Deref(moduleProperties, moduleProperties[ref].$ref)
             : FromType(moduleProperties, moduleProperties[ref])
-        : (0, index_14.Never)());
+        : (0, index_15.Never)());
 }
 // prettier-ignore
 function FromAwaited(parameters) {
-    return (0, index_3.Awaited)(parameters[0]);
+    return (0, index_4.Awaited)(parameters[0]);
 }
 // prettier-ignore
 function FromIndex(parameters) {
-    return (0, index_6.Index)(parameters[0], parameters[1]);
+    return (0, index_7.Index)(parameters[0], parameters[1]);
 }
 // prettier-ignore
 function FromKeyOf(parameters) {
-    return (0, index_10.KeyOf)(parameters[0]);
+    return (0, index_11.KeyOf)(parameters[0]);
 }
 // prettier-ignore
 function FromPartial(parameters) {
-    return (0, index_15.Partial)(parameters[0]);
+    return (0, index_16.Partial)(parameters[0]);
 }
 // prettier-ignore
 function FromOmit(parameters) {
-    return (0, index_12.Omit)(parameters[0], parameters[1]);
+    return (0, index_13.Omit)(parameters[0], parameters[1]);
 }
 // prettier-ignore
 function FromPick(parameters) {
-    return (0, index_13.Pick)(parameters[0], parameters[1]);
+    return (0, index_14.Pick)(parameters[0], parameters[1]);
 }
 // prettier-ignore
 function FromRecord(parameters) {
-    return (0, index_16.Record)(parameters[0], parameters[1]);
+    return (0, index_17.Record)(parameters[0], parameters[1]);
 }
 // prettier-ignore
 function FromRequired(parameters) {
-    return (0, index_17.Required)(parameters[0]);
+    return (0, index_18.Required)(parameters[0]);
 }
 // prettier-ignore
 function FromComputed(moduleProperties, target, parameters) {
@@ -86,64 +88,69 @@ function FromComputed(moduleProperties, target, parameters) {
                         target === 'Pick' ? FromPick(dereferenced) :
                             target === 'Record' ? FromRecord(dereferenced) :
                                 target === 'Required' ? FromRequired(dereferenced) :
-                                    (0, index_14.Never)());
+                                    (0, index_15.Never)());
 }
 function FromObject(moduleProperties, properties) {
-    return (0, index_11.Object)(globalThis.Object.keys(properties).reduce((result, key) => {
+    return (0, index_12.Object)(globalThis.Object.keys(properties).reduce((result, key) => {
         return { ...result, [key]: FromType(moduleProperties, properties[key]) };
     }, {}));
 }
 // prettier-ignore
 function FromConstructor(moduleProperties, parameters, instanceType) {
-    return (0, index_5.Constructor)(FromRest(moduleProperties, parameters), FromType(moduleProperties, instanceType));
+    return (0, index_6.Constructor)(FromRest(moduleProperties, parameters), FromType(moduleProperties, instanceType));
 }
 // prettier-ignore
 function FromFunction(moduleProperties, parameters, returnType) {
-    return (0, index_7.Function)(FromRest(moduleProperties, parameters), FromType(moduleProperties, returnType));
+    return (0, index_8.Function)(FromRest(moduleProperties, parameters), FromType(moduleProperties, returnType));
 }
 function FromTuple(moduleProperties, types) {
-    return (0, index_18.Tuple)(FromRest(moduleProperties, types));
+    return (0, index_19.Tuple)(FromRest(moduleProperties, types));
 }
 function FromIntersect(moduleProperties, types) {
-    return (0, index_8.Intersect)(FromRest(moduleProperties, types));
+    return (0, index_9.Intersect)(FromRest(moduleProperties, types));
 }
 function FromUnion(moduleProperties, types) {
-    return (0, index_19.Union)(FromRest(moduleProperties, types));
+    return (0, index_20.Union)(FromRest(moduleProperties, types));
 }
 function FromArray(moduleProperties, type) {
-    return (0, index_2.Array)(FromType(moduleProperties, type));
+    return (0, index_3.Array)(FromType(moduleProperties, type));
 }
 function FromAsyncIterator(moduleProperties, type) {
-    return (0, index_4.AsyncIterator)(FromType(moduleProperties, type));
+    return (0, index_5.AsyncIterator)(FromType(moduleProperties, type));
 }
 function FromIterator(moduleProperties, type) {
-    return (0, index_9.Iterator)(FromType(moduleProperties, type));
+    return (0, index_10.Iterator)(FromType(moduleProperties, type));
 }
 function FromRest(moduleProperties, types) {
     return types.map((type) => FromType(moduleProperties, type));
 }
 // prettier-ignore
 function FromType(moduleProperties, type) {
-    return (KindGuard.IsArray(type) ? (0, index_1.CreateType)(FromArray(moduleProperties, type.items), type) :
-        KindGuard.IsAsyncIterator(type) ? (0, index_1.CreateType)(FromAsyncIterator(moduleProperties, type.items), type) :
-            // Note: The 'as never' is required due to excessive resolution of TIndex. In fact TIndex, TPick, TOmit and
-            // all need re-implementation to remove the PropertyKey[] selector. Reimplementation of these types should
-            // be a priority as there is a potential for the current inference to break on TS compiler changes.
-            KindGuard.IsComputed(type) ? (0, index_1.CreateType)(FromComputed(moduleProperties, type.target, type.parameters)) :
-                KindGuard.IsConstructor(type) ? (0, index_1.CreateType)(FromConstructor(moduleProperties, type.parameters, type.returns), type) :
-                    KindGuard.IsFunction(type) ? (0, index_1.CreateType)(FromFunction(moduleProperties, type.parameters, type.returns), type) :
-                        KindGuard.IsIntersect(type) ? (0, index_1.CreateType)(FromIntersect(moduleProperties, type.allOf), type) :
-                            KindGuard.IsIterator(type) ? (0, index_1.CreateType)(FromIterator(moduleProperties, type.items), type) :
-                                KindGuard.IsObject(type) ? (0, index_1.CreateType)(FromObject(moduleProperties, type.properties), type) :
-                                    KindGuard.IsTuple(type) ? (0, index_1.CreateType)(FromTuple(moduleProperties, type.items || []), type) :
-                                        KindGuard.IsUnion(type) ? (0, index_1.CreateType)(FromUnion(moduleProperties, type.anyOf), type) :
-                                            type);
+    return (
+    // Modifier Unwrap - Reapplied via CreateType Options
+    KindGuard.IsOptional(type) ? (0, index_1.CreateType)(FromType(moduleProperties, (0, index_2.Discard)(type, [index_21.OptionalKind])), type) :
+        KindGuard.IsReadonly(type) ? (0, index_1.CreateType)(FromType(moduleProperties, (0, index_2.Discard)(type, [index_21.ReadonlyKind])), type) :
+            // Traveral
+            KindGuard.IsArray(type) ? (0, index_1.CreateType)(FromArray(moduleProperties, type.items), type) :
+                KindGuard.IsAsyncIterator(type) ? (0, index_1.CreateType)(FromAsyncIterator(moduleProperties, type.items), type) :
+                    // Note: The 'as never' is required due to excessive resolution of TIndex. In fact TIndex, TPick, TOmit and
+                    // all need re-implementation to remove the PropertyKey[] selector. Reimplementation of these types should
+                    // be a priority as there is a potential for the current inference to break on TS compiler changes.
+                    KindGuard.IsComputed(type) ? (0, index_1.CreateType)(FromComputed(moduleProperties, type.target, type.parameters)) :
+                        KindGuard.IsConstructor(type) ? (0, index_1.CreateType)(FromConstructor(moduleProperties, type.parameters, type.returns), type) :
+                            KindGuard.IsFunction(type) ? (0, index_1.CreateType)(FromFunction(moduleProperties, type.parameters, type.returns), type) :
+                                KindGuard.IsIntersect(type) ? (0, index_1.CreateType)(FromIntersect(moduleProperties, type.allOf), type) :
+                                    KindGuard.IsIterator(type) ? (0, index_1.CreateType)(FromIterator(moduleProperties, type.items), type) :
+                                        KindGuard.IsObject(type) ? (0, index_1.CreateType)(FromObject(moduleProperties, type.properties), type) :
+                                            KindGuard.IsTuple(type) ? (0, index_1.CreateType)(FromTuple(moduleProperties, type.items || []), type) :
+                                                KindGuard.IsUnion(type) ? (0, index_1.CreateType)(FromUnion(moduleProperties, type.anyOf), type) :
+                                                    type);
 }
 // prettier-ignore
 function ComputeType(moduleProperties, key) {
     return (key in moduleProperties
         ? FromType(moduleProperties, moduleProperties[key])
-        : (0, index_14.Never)());
+        : (0, index_15.Never)());
 }
 // prettier-ignore
 function ComputeModuleProperties(moduleProperties) {

package/build/cjs/type/ref/ref.d.ts

@@ -1,9 +1,28 @@
 import type { TSchema, SchemaOptions } from '../schema/index';
 import { Kind } from '../symbols/index';
+import { TUnsafe } from '../unsafe/index';
+import { Static } from '../static/index';
 export interface TRef<Ref extends string = string> extends TSchema {
     [Kind]: 'Ref';
     static: unknown;
     $ref: Ref;
 }
-/** `[Json]` Creates a Ref type. The referenced type must contain a $id */
+export type TRefUnsafe<Type extends TSchema> = TUnsafe<Static<Type>>;
+/** `[Json]` Creates a Ref type.*/
 export declare function Ref<Ref extends string>($ref: Ref, options?: SchemaOptions): TRef<Ref>;
+/**
+ * @deprecated `[Json]` Creates a Ref type. The referenced type MUST contain a $id. The Ref(TSchema) signature was
+ * deprecated on 0.34.0 in support of a new type referencing model (Module). Existing implementations using Ref(TSchema)
+ * can migrate using the following. The Ref(TSchema) validation behavior of Ref will be preserved how the construction
+ * of legacy Ref(TSchema) will require wrapping in TUnsafe (where TUnsafe is used for inference only)
+ *
+ * ```typescript
+ * const R = Type.Ref(T)
+ * ```
+ * to
+ *
+ * ```typescript
+ * const R = Type.Unsafe<Static<T>>(T.$id)
+ * ```
+ */
+export declare function Ref<Type extends TSchema>(type: Type, options?: SchemaOptions): TRefUnsafe<Type>;

package/build/cjs/type/ref/ref.js

@@ -2,9 +2,13 @@
 
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Ref = Ref;
+const index_1 = require("../error/index");
 const type_1 = require("../create/type");
-const index_1 = require("../symbols/index");
+const index_2 = require("../symbols/index");
 /** `[Json]` Creates a Ref type. The referenced type must contain a $id */
-function Ref($ref, options) {
-    return (0, type_1.CreateType)({ [index_1.Kind]: 'Ref', $ref }, options);
+function Ref(...args) {
+    const [$ref, options] = typeof args[0] === 'string' ? [args[0], args[1]] : [args[0].$id, args[1]];
+    if (typeof $ref !== 'string')
+        throw new index_1.TypeBoxError('Ref: $ref must be a string');
+    return (0, type_1.CreateType)({ [index_2.Kind]: 'Ref', $ref }, options);
 }

package/build/cjs/type/type/json.d.ts

@@ -29,7 +29,7 @@ import { type TReadonlyWithFlag, type TReadonlyFromMappedResult } from '../reado
 import { type TReadonlyOptional } from '../readonly-optional/index';
 import { type TRecordOrObject } from '../record/index';
 import { type TRecursive, type TThis } from '../recursive/index';
-import { type TRef } from '../ref/index';
+import { type TRef, type TRefUnsafe } from '../ref/index';
 import { type TRequired, type TRequiredFromMappedResult } from '../required/index';
 import { type TRest } from '../rest/index';
 import { type TSchema, type SchemaOptions } from '../schema/index';
@@ -142,8 +142,24 @@ export declare class JsonTypeBuilder {
     Record<Key extends TSchema, Value extends TSchema>(key: Key, value: Value, options?: ObjectOptions): TRecordOrObject<Key, Value>;
     /** `[Json]` Creates a Recursive type */
     Recursive<T extends TSchema>(callback: (thisType: TThis) => T, options?: SchemaOptions): TRecursive<T>;
-    /** `[Json]` Creates a Ref type. */
+    /** `[Json]` Creates a Ref type.*/
     Ref<Ref extends string>($ref: Ref, options?: SchemaOptions): TRef<Ref>;
+    /**
+     * @deprecated `[Json]` Creates a Ref type. The referenced type MUST contain a $id. The Ref(TSchema) signature was
+     * deprecated on 0.34.0 in support of a new type referencing model (Module). Existing implementations using Ref(TSchema)
+     * can migrate using the following. The Ref(TSchema) validation behavior of Ref will be preserved how the construction
+     * of legacy Ref(TSchema) will require wrapping in TUnsafe (where TUnsafe is used for inference only)
+     *
+     * ```typescript
+     * const R = Type.Ref(T)
+     * ```
+     * to
+     *
+     * ```typescript
+     * const R = Type.Unsafe<Static<T>>(T.$id)
+     * ```
+     */
+    Ref<Type extends TSchema>(type: Type, options?: SchemaOptions): TRefUnsafe<Type>;
     /** `[Json]` Constructs a type where all properties are required */
     Required<MappedResult extends TMappedResult>(type: MappedResult, options?: SchemaOptions): TRequiredFromMappedResult<MappedResult>;
     /** `[Json]` Constructs a type where all properties are required */

package/build/cjs/type/type/json.js

@@ -174,9 +174,9 @@ class JsonTypeBuilder {
     Recursive(callback, options) {
         return (0, index_30.Recursive)(callback, options);
     }
-    /** `[Json]` Creates a Ref type. */
-    Ref($ref, options) {
-        return (0, index_31.Ref)($ref, options);
+    /** `[Json]` Creates a Ref type. The referenced type must contain a $id */
+    Ref(...args) {
+        return (0, index_31.Ref)(args[0], args[1]);
     }
     /** `[Json]` Constructs a type where all properties are required */
     Required(type, options) {

package/build/esm/type/module/compute.d.mts

@@ -13,9 +13,11 @@ import { type TIterator } from '../iterator/index.mjs';
 import { type TKeyOf } from '../keyof/index.mjs';
 import { type TObject, type TProperties } from '../object/index.mjs';
 import { type TOmit } from '../omit/index.mjs';
+import { type TOptional } from '../optional/index.mjs';
 import { type TPick } from '../pick/index.mjs';
 import { type TNever } from '../never/index.mjs';
 import { TPartial } from '../partial/index.mjs';
+import { type TReadonly } from '../readonly/index.mjs';
 import { type TRecordOrObject } from '../record/index.mjs';
 import { type TRef } from '../ref/index.mjs';
 import { TRequired } from '../required/index.mjs';
@@ -44,7 +46,7 @@ type TFromArray<ModuleProperties extends TProperties, Type extends TSchema> = (E
 type TFromAsyncIterator<ModuleProperties extends TProperties, Type extends TSchema> = (TAsyncIterator<TFromType<ModuleProperties, Type>>);
 type TFromIterator<ModuleProperties extends TProperties, Type extends TSchema> = (TIterator<TFromType<ModuleProperties, Type>>);
 type TFromRest<ModuleProperties extends TProperties, Types extends TSchema[], Result extends TSchema[] = []> = (Types extends [infer Left extends TSchema, ...infer Right extends TSchema[]] ? TFromRest<ModuleProperties, Right, [...Result, TFromType<ModuleProperties, Left>]> : Result);
-export type TFromType<ModuleProperties extends TProperties, Type extends TSchema> = (Type extends TArray<infer Type extends TSchema> ? TFromArray<ModuleProperties, Type> : Type extends TAsyncIterator<infer Type extends TSchema> ? TFromAsyncIterator<ModuleProperties, Type> : Type extends TComputed<infer Target extends string, infer Parameters extends TSchema[]> ? TFromComputed<ModuleProperties, Target, Parameters> : Type extends TConstructor<infer Parameters extends TSchema[], infer InstanceType extends TSchema> ? TFromConstructor<ModuleProperties, Parameters, InstanceType> : Type extends TFunction<infer Parameters extends TSchema[], infer ReturnType extends TSchema> ? TFromFunction<ModuleProperties, Parameters, ReturnType> : Type extends TIntersect<infer Types extends TSchema[]> ? TFromIntersect<ModuleProperties, Types> : Type extends TIterator<infer Type extends TSchema> ? TFromIterator<ModuleProperties, Type> : Type extends TObject<infer Properties extends TProperties> ? TFromObject<ModuleProperties, Properties> : Type extends TTuple<infer Types extends TSchema[]> ? TFromTuple<ModuleProperties, Types> : Type extends TEnum<infer _ extends TEnumRecord> ? Type : Type extends TUnion<infer Types extends TSchema[]> ? TFromUnion<ModuleProperties, Types> : Type);
+export type TFromType<ModuleProperties extends TProperties, Type extends TSchema> = (Type extends TOptional<infer Type extends TSchema> ? TOptional<TFromType<ModuleProperties, Type>> : Type extends TReadonly<infer Type extends TSchema> ? TReadonly<TFromType<ModuleProperties, Type>> : Type extends TArray<infer Type extends TSchema> ? TFromArray<ModuleProperties, Type> : Type extends TAsyncIterator<infer Type extends TSchema> ? TFromAsyncIterator<ModuleProperties, Type> : Type extends TComputed<infer Target extends string, infer Parameters extends TSchema[]> ? TFromComputed<ModuleProperties, Target, Parameters> : Type extends TConstructor<infer Parameters extends TSchema[], infer InstanceType extends TSchema> ? TFromConstructor<ModuleProperties, Parameters, InstanceType> : Type extends TFunction<infer Parameters extends TSchema[], infer ReturnType extends TSchema> ? TFromFunction<ModuleProperties, Parameters, ReturnType> : Type extends TIntersect<infer Types extends TSchema[]> ? TFromIntersect<ModuleProperties, Types> : Type extends TIterator<infer Type extends TSchema> ? TFromIterator<ModuleProperties, Type> : Type extends TObject<infer Properties extends TProperties> ? TFromObject<ModuleProperties, Properties> : Type extends TTuple<infer Types extends TSchema[]> ? TFromTuple<ModuleProperties, Types> : Type extends TEnum<infer _ extends TEnumRecord> ? Type : Type extends TUnion<infer Types extends TSchema[]> ? TFromUnion<ModuleProperties, Types> : Type);
 export declare function FromType<ModuleProperties extends TProperties, Type extends TSchema>(moduleProperties: ModuleProperties, type: Type): TFromType<ModuleProperties, Type>;
 export type TComputeType<ModuleProperties extends TProperties, Key extends PropertyKey> = (Key extends keyof ModuleProperties ? TFromType<ModuleProperties, ModuleProperties[Key]> : TNever);
 export declare function ComputeType<ModuleProperties extends TProperties, Key extends PropertyKey>(moduleProperties: ModuleProperties, key: Key): TComputeType<ModuleProperties, Key>;

package/build/esm/type/module/compute.mjs

@@ -1,4 +1,5 @@
 import { CreateType } from '../create/index.mjs';
+import { Discard } from '../discard/index.mjs';
 import { Array } from '../array/index.mjs';
 import { Awaited } from '../awaited/index.mjs';
 import { AsyncIterator } from '../async-iterator/index.mjs';
@@ -17,6 +18,7 @@ import { Record } from '../record/index.mjs';
 import { Required } from '../required/index.mjs';
 import { Tuple } from '../tuple/index.mjs';
 import { Union } from '../union/index.mjs';
+import { OptionalKind, ReadonlyKind } from '../symbols/index.mjs';
 // ------------------------------------------------------------------
 // KindGuard
 // ------------------------------------------------------------------
@@ -118,20 +120,25 @@ function FromRest(moduleProperties, types) {
 }
 // prettier-ignore
 export function FromType(moduleProperties, type) {
-    return (KindGuard.IsArray(type) ? CreateType(FromArray(moduleProperties, type.items), type) :
-        KindGuard.IsAsyncIterator(type) ? CreateType(FromAsyncIterator(moduleProperties, type.items), type) :
-            // Note: The 'as never' is required due to excessive resolution of TIndex. In fact TIndex, TPick, TOmit and
-            // all need re-implementation to remove the PropertyKey[] selector. Reimplementation of these types should
-            // be a priority as there is a potential for the current inference to break on TS compiler changes.
-            KindGuard.IsComputed(type) ? CreateType(FromComputed(moduleProperties, type.target, type.parameters)) :
-                KindGuard.IsConstructor(type) ? CreateType(FromConstructor(moduleProperties, type.parameters, type.returns), type) :
-                    KindGuard.IsFunction(type) ? CreateType(FromFunction(moduleProperties, type.parameters, type.returns), type) :
-                        KindGuard.IsIntersect(type) ? CreateType(FromIntersect(moduleProperties, type.allOf), type) :
-                            KindGuard.IsIterator(type) ? CreateType(FromIterator(moduleProperties, type.items), type) :
-                                KindGuard.IsObject(type) ? CreateType(FromObject(moduleProperties, type.properties), type) :
-                                    KindGuard.IsTuple(type) ? CreateType(FromTuple(moduleProperties, type.items || []), type) :
-                                        KindGuard.IsUnion(type) ? CreateType(FromUnion(moduleProperties, type.anyOf), type) :
-                                            type);
+    return (
+    // Modifier Unwrap - Reapplied via CreateType Options
+    KindGuard.IsOptional(type) ? CreateType(FromType(moduleProperties, Discard(type, [OptionalKind])), type) :
+        KindGuard.IsReadonly(type) ? CreateType(FromType(moduleProperties, Discard(type, [ReadonlyKind])), type) :
+            // Traveral
+            KindGuard.IsArray(type) ? CreateType(FromArray(moduleProperties, type.items), type) :
+                KindGuard.IsAsyncIterator(type) ? CreateType(FromAsyncIterator(moduleProperties, type.items), type) :
+                    // Note: The 'as never' is required due to excessive resolution of TIndex. In fact TIndex, TPick, TOmit and
+                    // all need re-implementation to remove the PropertyKey[] selector. Reimplementation of these types should
+                    // be a priority as there is a potential for the current inference to break on TS compiler changes.
+                    KindGuard.IsComputed(type) ? CreateType(FromComputed(moduleProperties, type.target, type.parameters)) :
+                        KindGuard.IsConstructor(type) ? CreateType(FromConstructor(moduleProperties, type.parameters, type.returns), type) :
+                            KindGuard.IsFunction(type) ? CreateType(FromFunction(moduleProperties, type.parameters, type.returns), type) :
+                                KindGuard.IsIntersect(type) ? CreateType(FromIntersect(moduleProperties, type.allOf), type) :
+                                    KindGuard.IsIterator(type) ? CreateType(FromIterator(moduleProperties, type.items), type) :
+                                        KindGuard.IsObject(type) ? CreateType(FromObject(moduleProperties, type.properties), type) :
+                                            KindGuard.IsTuple(type) ? CreateType(FromTuple(moduleProperties, type.items || []), type) :
+                                                KindGuard.IsUnion(type) ? CreateType(FromUnion(moduleProperties, type.anyOf), type) :
+                                                    type);
 }
 // prettier-ignore
 export function ComputeType(moduleProperties, key) {

package/build/esm/type/ref/ref.d.mts

@@ -1,9 +1,28 @@
 import type { TSchema, SchemaOptions } from '../schema/index.mjs';
 import { Kind } from '../symbols/index.mjs';
+import { TUnsafe } from '../unsafe/index.mjs';
+import { Static } from '../static/index.mjs';
 export interface TRef<Ref extends string = string> extends TSchema {
     [Kind]: 'Ref';
     static: unknown;
     $ref: Ref;
 }
-/** `[Json]` Creates a Ref type. The referenced type must contain a $id */
+export type TRefUnsafe<Type extends TSchema> = TUnsafe<Static<Type>>;
+/** `[Json]` Creates a Ref type.*/
 export declare function Ref<Ref extends string>($ref: Ref, options?: SchemaOptions): TRef<Ref>;
+/**
+ * @deprecated `[Json]` Creates a Ref type. The referenced type MUST contain a $id. The Ref(TSchema) signature was
+ * deprecated on 0.34.0 in support of a new type referencing model (Module). Existing implementations using Ref(TSchema)
+ * can migrate using the following. The Ref(TSchema) validation behavior of Ref will be preserved how the construction
+ * of legacy Ref(TSchema) will require wrapping in TUnsafe (where TUnsafe is used for inference only)
+ *
+ * ```typescript
+ * const R = Type.Ref(T)
+ * ```
+ * to
+ *
+ * ```typescript
+ * const R = Type.Unsafe<Static<T>>(T.$id)
+ * ```
+ */
+export declare function Ref<Type extends TSchema>(type: Type, options?: SchemaOptions): TRefUnsafe<Type>;

package/build/esm/type/ref/ref.mjs

@@ -1,6 +1,10 @@
+import { TypeBoxError } from '../error/index.mjs';
 import { CreateType } from '../create/type.mjs';
 import { Kind } from '../symbols/index.mjs';
 /** `[Json]` Creates a Ref type. The referenced type must contain a $id */
-export function Ref($ref, options) {
+export function Ref(...args) {
+    const [$ref, options] = typeof args[0] === 'string' ? [args[0], args[1]] : [args[0].$id, args[1]];
+    if (typeof $ref !== 'string')
+        throw new TypeBoxError('Ref: $ref must be a string');
     return CreateType({ [Kind]: 'Ref', $ref }, options);
 }

package/build/esm/type/type/json.d.mts

@@ -29,7 +29,7 @@ import { type TReadonlyWithFlag, type TReadonlyFromMappedResult } from '../reado
 import { type TReadonlyOptional } from '../readonly-optional/index.mjs';
 import { type TRecordOrObject } from '../record/index.mjs';
 import { type TRecursive, type TThis } from '../recursive/index.mjs';
-import { type TRef } from '../ref/index.mjs';
+import { type TRef, type TRefUnsafe } from '../ref/index.mjs';
 import { type TRequired, type TRequiredFromMappedResult } from '../required/index.mjs';
 import { type TRest } from '../rest/index.mjs';
 import { type TSchema, type SchemaOptions } from '../schema/index.mjs';
@@ -142,8 +142,24 @@ export declare class JsonTypeBuilder {
     Record<Key extends TSchema, Value extends TSchema>(key: Key, value: Value, options?: ObjectOptions): TRecordOrObject<Key, Value>;
     /** `[Json]` Creates a Recursive type */
     Recursive<T extends TSchema>(callback: (thisType: TThis) => T, options?: SchemaOptions): TRecursive<T>;
-    /** `[Json]` Creates a Ref type. */
+    /** `[Json]` Creates a Ref type.*/
     Ref<Ref extends string>($ref: Ref, options?: SchemaOptions): TRef<Ref>;
+    /**
+     * @deprecated `[Json]` Creates a Ref type. The referenced type MUST contain a $id. The Ref(TSchema) signature was
+     * deprecated on 0.34.0 in support of a new type referencing model (Module). Existing implementations using Ref(TSchema)
+     * can migrate using the following. The Ref(TSchema) validation behavior of Ref will be preserved how the construction
+     * of legacy Ref(TSchema) will require wrapping in TUnsafe (where TUnsafe is used for inference only)
+     *
+     * ```typescript
+     * const R = Type.Ref(T)
+     * ```
+     * to
+     *
+     * ```typescript
+     * const R = Type.Unsafe<Static<T>>(T.$id)
+     * ```
+     */
+    Ref<Type extends TSchema>(type: Type, options?: SchemaOptions): TRefUnsafe<Type>;
     /** `[Json]` Constructs a type where all properties are required */
     Required<MappedResult extends TMappedResult>(type: MappedResult, options?: SchemaOptions): TRequiredFromMappedResult<MappedResult>;
     /** `[Json]` Constructs a type where all properties are required */

package/build/esm/type/type/json.mjs

@@ -170,9 +170,9 @@ export class JsonTypeBuilder {
     Recursive(callback, options) {
         return Recursive(callback, options);
     }
-    /** `[Json]` Creates a Ref type. */
-    Ref($ref, options) {
-        return Ref($ref, options);
+    /** `[Json]` Creates a Ref type. The referenced type must contain a $id */
+    Ref(...args) {
+        return Ref(args[0], args[1]);
     }
     /** `[Json]` Constructs a type where all properties are required */
     Required(type, options) {

package/package.json

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

package/readme.md

@@ -337,7 +337,7 @@ The following table lists the supported Json types. These types are fully compat
 │   }),                          │   y: number                 │     required: ['x'],           │
 │   Type.Object({                │ }                           │     properties: {              │
 │     y: Type.Number()           │                             │       x: {                     │
-│   ])                           │                             │         type: 'number'         │
+│   })                           │                             │         type: 'number'         │
 │ ])                             │                             │       }                        │
 │                                │                             │     }                          │
 │                                │                             │   }, {                         │
@@ -534,15 +534,7 @@ The following table lists the supported Json types. These types are fully compat
 │                                │                             │ }                              │
 │                                │                             │                                │
 ├────────────────────────────────┼─────────────────────────────┼────────────────────────────────┤
-│ const T = Type.Object({        │ type T = {                  │ const R = {                    │
-│    x: Type.Number(),           │   x: number,                │   $ref: 'T'                    │
-│    y: Type.Number()            │   y: number                 │ }                              │
-│ }, { $id: 'T' })               | }                           │                                │
-│                                │                             │                                │
-│ const R = Type.Ref(T)          │ type R = T                  │                                │
-│                                │                             │                                │
-│                                │                             │                                │
-│                                │                             │                                │
+│ const R = Type.Ref('T')        │ type R = unknown            │ const R = { $ref: 'T' }        │
 │                                │                             │                                │
 └────────────────────────────────┴─────────────────────────────┴────────────────────────────────┘
 ```