@sinclair/typebox 0.32.30 → 0.32.32

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

@@ -3,6 +3,7 @@ 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';
+import { type TEnum, type TEnumRecord } from '../enum/index';
 import { type TFunction } from '../function/index';
 import { type TIndexPropertyKeys } from '../indexed/index';
 import { type TIntersect } from '../intersect/index';
@@ -31,7 +32,7 @@ type FromProperties<K extends PropertyKey, T extends TProperties, R extends TPro
     [K2 in keyof T]: FromSchemaType<K, T[K2]>;
 }>> = R;
 declare function FromProperties<K extends PropertyKey, T extends TProperties>(K: K, T: T): FromProperties<K, T>;
-type FromSchemaType<K extends PropertyKey, T extends TSchema> = (T extends TReadonly<infer S> ? TReadonly<FromSchemaType<K, S>> : T extends TOptional<infer S> ? TOptional<FromSchemaType<K, S>> : T extends TMappedResult<infer P> ? TFromMappedResult<K, P> : T extends TMappedKey<infer P> ? TFromMappedKey<K, P> : T extends TConstructor<infer S extends TSchema[], infer R extends TSchema> ? TConstructor<TFromRest<K, S>, FromSchemaType<K, R>> : T extends TFunction<infer S extends TSchema[], infer R extends TSchema> ? TFunction<TFromRest<K, S>, FromSchemaType<K, R>> : T extends TAsyncIterator<infer S> ? TAsyncIterator<FromSchemaType<K, S>> : T extends TIterator<infer S> ? TIterator<FromSchemaType<K, S>> : T extends TIntersect<infer S> ? TIntersect<TFromRest<K, S>> : T extends TUnion<infer S> ? TUnion<TFromRest<K, S>> : T extends TTuple<infer S> ? TTuple<TFromRest<K, S>> : T extends TObject<infer S> ? TObject<FromProperties<K, S>> : T extends TArray<infer S> ? TArray<FromSchemaType<K, S>> : T extends TPromise<infer S> ? TPromise<FromSchemaType<K, S>> : T);
+type FromSchemaType<K extends PropertyKey, T extends TSchema> = (T extends TReadonly<infer S extends TSchema> ? TReadonly<FromSchemaType<K, S>> : T extends TOptional<infer S extends TSchema> ? TOptional<FromSchemaType<K, S>> : T extends TMappedResult<infer P extends TProperties> ? TFromMappedResult<K, P> : T extends TMappedKey<infer P extends PropertyKey[]> ? TFromMappedKey<K, P> : T extends TConstructor<infer S extends TSchema[], infer R extends TSchema> ? TConstructor<TFromRest<K, S>, FromSchemaType<K, R>> : T extends TFunction<infer S extends TSchema[], infer R extends TSchema> ? TFunction<TFromRest<K, S>, FromSchemaType<K, R>> : T extends TAsyncIterator<infer S extends TSchema> ? TAsyncIterator<FromSchemaType<K, S>> : T extends TIterator<infer S extends TSchema> ? TIterator<FromSchemaType<K, S>> : T extends TIntersect<infer S extends TSchema[]> ? TIntersect<TFromRest<K, S>> : T extends TEnum<infer S extends TEnumRecord> ? TEnum<S> : T extends TUnion<infer S extends TSchema[]> ? TUnion<TFromRest<K, S>> : T extends TTuple<infer S extends TSchema[]> ? TTuple<TFromRest<K, S>> : T extends TObject<infer S extends TProperties> ? TObject<FromProperties<K, S>> : T extends TArray<infer S extends TSchema> ? TArray<FromSchemaType<K, S>> : T extends TPromise<infer S extends TSchema> ? TPromise<FromSchemaType<K, S>> : T);
 declare function FromSchemaType<K extends PropertyKey, T extends TSchema>(K: K, T: T): FromSchemaType<K, T>;
 export type TMappedFunctionReturnType<K extends PropertyKey[], T extends TSchema, Acc extends TProperties = {}> = (K extends [infer L extends PropertyKey, ...infer R extends PropertyKey[]] ? TMappedFunctionReturnType<R, T, Acc & {
     [_ in L]: FromSchemaType<L, T>;

package/build/cjs/value/cast/cast.js

@@ -45,8 +45,9 @@ function ScoreUnion(schema, references, value) {
     }
 }
 function SelectUnion(union, references, value) {
-    let [select, best] = [union.anyOf[0], 0];
-    for (const schema of union.anyOf) {
+    const schemas = union.anyOf.map((schema) => (0, index_7.Deref)(schema, references));
+    let [select, best] = [schemas[0], 0];
+    for (const schema of schemas) {
         const score = ScoreUnion(schema, references, value);
         if (score > best) {
             select = schema;

package/build/cjs/value/deref/deref.d.ts

@@ -7,4 +7,4 @@ export declare class TypeDereferenceError extends TypeBoxError {
     constructor(schema: TRef | TThis);
 }
 /** Dereferences a schema from the references array or throws if not found */
-export declare function Deref(schema: TRef | TThis, references: TSchema[]): TSchema;
+export declare function Deref(schema: TSchema, references: TSchema[]): TSchema;

package/build/cjs/value/deref/deref.js

@@ -3,6 +3,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Deref = exports.TypeDereferenceError = void 0;
 const index_1 = require("../../type/error/index");
+const index_2 = require("../../type/symbols/index");
 class TypeDereferenceError extends index_1.TypeBoxError {
     constructor(schema) {
         super(`Unable to dereference schema with $id '${schema.$id}'`);
@@ -10,11 +11,17 @@ class TypeDereferenceError extends index_1.TypeBoxError {
     }
 }
 exports.TypeDereferenceError = TypeDereferenceError;
+function Resolve(schema, references) {
+    const target = references.find((target) => target.$id === schema.$ref);
+    if (target === undefined)
+        throw new TypeDereferenceError(schema);
+    return Deref(target, references);
+}
 /** Dereferences a schema from the references array or throws if not found */
 function Deref(schema, references) {
-    const index = references.findIndex((target) => target.$id === schema.$ref);
-    if (index === -1)
-        throw new TypeDereferenceError(schema);
-    return references[index];
+    // prettier-ignore
+    return (schema[index_2.Kind] === 'This' || schema[index_2.Kind] === 'Ref')
+        ? Resolve(schema, references)
+        : schema;
 }
 exports.Deref = Deref;

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

@@ -3,6 +3,7 @@ import type { Ensure, Evaluate, Assert } from '../helpers/index.mjs';
 import { type TArray } from '../array/index.mjs';
 import { type TAsyncIterator } from '../async-iterator/index.mjs';
 import { type TConstructor } from '../constructor/index.mjs';
+import { type TEnum, type TEnumRecord } from '../enum/index.mjs';
 import { type TFunction } from '../function/index.mjs';
 import { type TIndexPropertyKeys } from '../indexed/index.mjs';
 import { type TIntersect } from '../intersect/index.mjs';
@@ -31,7 +32,7 @@ type FromProperties<K extends PropertyKey, T extends TProperties, R extends TPro
     [K2 in keyof T]: FromSchemaType<K, T[K2]>;
 }>> = R;
 declare function FromProperties<K extends PropertyKey, T extends TProperties>(K: K, T: T): FromProperties<K, T>;
-type FromSchemaType<K extends PropertyKey, T extends TSchema> = (T extends TReadonly<infer S> ? TReadonly<FromSchemaType<K, S>> : T extends TOptional<infer S> ? TOptional<FromSchemaType<K, S>> : T extends TMappedResult<infer P> ? TFromMappedResult<K, P> : T extends TMappedKey<infer P> ? TFromMappedKey<K, P> : T extends TConstructor<infer S extends TSchema[], infer R extends TSchema> ? TConstructor<TFromRest<K, S>, FromSchemaType<K, R>> : T extends TFunction<infer S extends TSchema[], infer R extends TSchema> ? TFunction<TFromRest<K, S>, FromSchemaType<K, R>> : T extends TAsyncIterator<infer S> ? TAsyncIterator<FromSchemaType<K, S>> : T extends TIterator<infer S> ? TIterator<FromSchemaType<K, S>> : T extends TIntersect<infer S> ? TIntersect<TFromRest<K, S>> : T extends TUnion<infer S> ? TUnion<TFromRest<K, S>> : T extends TTuple<infer S> ? TTuple<TFromRest<K, S>> : T extends TObject<infer S> ? TObject<FromProperties<K, S>> : T extends TArray<infer S> ? TArray<FromSchemaType<K, S>> : T extends TPromise<infer S> ? TPromise<FromSchemaType<K, S>> : T);
+type FromSchemaType<K extends PropertyKey, T extends TSchema> = (T extends TReadonly<infer S extends TSchema> ? TReadonly<FromSchemaType<K, S>> : T extends TOptional<infer S extends TSchema> ? TOptional<FromSchemaType<K, S>> : T extends TMappedResult<infer P extends TProperties> ? TFromMappedResult<K, P> : T extends TMappedKey<infer P extends PropertyKey[]> ? TFromMappedKey<K, P> : T extends TConstructor<infer S extends TSchema[], infer R extends TSchema> ? TConstructor<TFromRest<K, S>, FromSchemaType<K, R>> : T extends TFunction<infer S extends TSchema[], infer R extends TSchema> ? TFunction<TFromRest<K, S>, FromSchemaType<K, R>> : T extends TAsyncIterator<infer S extends TSchema> ? TAsyncIterator<FromSchemaType<K, S>> : T extends TIterator<infer S extends TSchema> ? TIterator<FromSchemaType<K, S>> : T extends TIntersect<infer S extends TSchema[]> ? TIntersect<TFromRest<K, S>> : T extends TEnum<infer S extends TEnumRecord> ? TEnum<S> : T extends TUnion<infer S extends TSchema[]> ? TUnion<TFromRest<K, S>> : T extends TTuple<infer S extends TSchema[]> ? TTuple<TFromRest<K, S>> : T extends TObject<infer S extends TProperties> ? TObject<FromProperties<K, S>> : T extends TArray<infer S extends TSchema> ? TArray<FromSchemaType<K, S>> : T extends TPromise<infer S extends TSchema> ? TPromise<FromSchemaType<K, S>> : T);
 declare function FromSchemaType<K extends PropertyKey, T extends TSchema>(K: K, T: T): FromSchemaType<K, T>;
 export type TMappedFunctionReturnType<K extends PropertyKey[], T extends TSchema, Acc extends TProperties = {}> = (K extends [infer L extends PropertyKey, ...infer R extends PropertyKey[]] ? TMappedFunctionReturnType<R, T, Acc & {
     [_ in L]: FromSchemaType<L, T>;

package/build/esm/value/cast/cast.mjs

@@ -41,8 +41,9 @@ function ScoreUnion(schema, references, value) {
     }
 }
 function SelectUnion(union, references, value) {
-    let [select, best] = [union.anyOf[0], 0];
-    for (const schema of union.anyOf) {
+    const schemas = union.anyOf.map((schema) => Deref(schema, references));
+    let [select, best] = [schemas[0], 0];
+    for (const schema of schemas) {
         const score = ScoreUnion(schema, references, value);
         if (score > best) {
             select = schema;

package/build/esm/value/deref/deref.d.mts

@@ -7,4 +7,4 @@ export declare class TypeDereferenceError extends TypeBoxError {
     constructor(schema: TRef | TThis);
 }
 /** Dereferences a schema from the references array or throws if not found */
-export declare function Deref(schema: TRef | TThis, references: TSchema[]): TSchema;
+export declare function Deref(schema: TSchema, references: TSchema[]): TSchema;

package/build/esm/value/deref/deref.mjs

@@ -1,4 +1,5 @@
 import { TypeBoxError } from '../../type/error/index.mjs';
+import { Kind } from '../../type/symbols/index.mjs';
 export class TypeDereferenceError extends TypeBoxError {
     schema;
     constructor(schema) {
@@ -6,10 +7,16 @@ export class TypeDereferenceError extends TypeBoxError {
         this.schema = schema;
     }
 }
+function Resolve(schema, references) {
+    const target = references.find((target) => target.$id === schema.$ref);
+    if (target === undefined)
+        throw new TypeDereferenceError(schema);
+    return Deref(target, references);
+}
 /** Dereferences a schema from the references array or throws if not found */
 export function Deref(schema, references) {
-    const index = references.findIndex((target) => target.$id === schema.$ref);
-    if (index === -1)
-        throw new TypeDereferenceError(schema);
-    return references[index];
+    // prettier-ignore
+    return (schema[Kind] === 'This' || schema[Kind] === 'Ref')
+        ? Resolve(schema, references)
+        : schema;
 }

package/package.json

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