@sinclair/typebox 0.33.12 → 0.33.13

package/build/cjs/value/convert/convert.js

@@ -199,12 +199,8 @@ function FromUnion(schema, references, value) {
     }
     return value;
 }
-function AddReference(references, schema) {
-    references.push(schema);
-    return references;
-}
 function Visit(schema, references, value) {
-    const references_ = (0, index_5.IsString)(schema.$id) ? AddReference(references, schema) : references;
+    const references_ = (0, index_3.Pushref)(schema, references);
     const schema_ = schema;
     switch (schema[index_4.Kind]) {
         case 'Array':

package/build/cjs/value/create/create.js

@@ -387,12 +387,8 @@ function FromKind(schema, references) {
         throw new Error('User defined types must specify a default value');
     }
 }
-function AddReference(references, schema) {
-    references.push(schema);
-    return references;
-}
 function Visit(schema, references) {
-    const references_ = (0, index_1.IsString)(schema.$id) ? AddReference(references, schema) : references;
+    const references_ = (0, index_4.Pushref)(schema, references);
     const schema_ = schema;
     switch (schema_[index_8.Kind]) {
         case 'Any':

package/build/cjs/value/default/default.js

@@ -119,18 +119,14 @@ function FromUnion(schema, references, value) {
     const defaulted = ValueOrDefault(schema, value);
     for (const inner of schema.anyOf) {
         const result = Visit(inner, references, (0, index_2.Clone)(defaulted));
-        if ((0, index_1.Check)(inner, result)) {
+        if ((0, index_1.Check)(inner, references, result)) {
             return result;
         }
     }
     return defaulted;
 }
-function AddReference(references, schema) {
-    references.push(schema);
-    return references;
-}
 function Visit(schema, references, value) {
-    const references_ = (0, index_5.IsString)(schema.$id) ? AddReference(references, schema) : references;
+    const references_ = (0, index_3.Pushref)(schema, references);
     const schema_ = schema;
     switch (schema_[index_4.Kind]) {
         case 'Array':

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

@@ -6,5 +6,7 @@ export declare class TypeDereferenceError extends TypeBoxError {
     readonly schema: TRef | TThis;
     constructor(schema: TRef | TThis);
 }
-/** Dereferences a schema from the references array or throws if not found */
+/** `[Internal]` Pushes a schema onto references if the schema has an $id and does not exist on references */
+export declare function Pushref(schema: TSchema, references: TSchema[]): TSchema[];
+/** `[Internal]` Dereferences a schema from the references array or throws if not found */
 export declare function Deref(schema: TSchema, references: TSchema[]): TSchema;

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

@@ -2,12 +2,14 @@
 
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TypeDereferenceError = void 0;
+exports.Pushref = Pushref;
 exports.Deref = Deref;
 const index_1 = require("../../type/error/index");
 const index_2 = require("../../type/symbols/index");
+const guard_1 = require("../guard/guard");
 class TypeDereferenceError extends index_1.TypeBoxError {
     constructor(schema) {
-        super(`Unable to dereference schema with $id '${schema.$id}'`);
+        super(`Unable to dereference schema with $id '${schema.$ref}'`);
         this.schema = schema;
     }
 }
@@ -18,7 +20,14 @@ function Resolve(schema, references) {
         throw new TypeDereferenceError(schema);
     return Deref(target, references);
 }
-/** Dereferences a schema from the references array or throws if not found */
+/** `[Internal]` Pushes a schema onto references if the schema has an $id and does not exist on references */
+function Pushref(schema, references) {
+    if (!(0, guard_1.IsString)(schema.$id) || references.some((target) => target.$id === schema.$id))
+        return references;
+    references.push(schema);
+    return references;
+}
+/** `[Internal]` Dereferences a schema from the references array or throws if not found */
 function Deref(schema, references) {
     // prettier-ignore
     return (schema[index_2.Kind] === 'This' || schema[index_2.Kind] === 'Ref')

package/build/cjs/value/transform/decode.js

@@ -166,13 +166,9 @@ function FromUnion(schema, references, path, value) {
     }
     return Default(schema, path, value);
 }
-function AddReference(references, schema) {
-    references.push(schema);
-    return references;
-}
 // prettier-ignore
 function Visit(schema, references, path, value) {
-    const references_ = typeof schema.$id === 'string' ? AddReference(references, schema) : references;
+    const references_ = (0, index_4.Pushref)(schema, references);
     const schema_ = schema;
     switch (schema[index_1.Kind]) {
         case 'Array':

package/build/cjs/value/transform/encode.js

@@ -178,13 +178,9 @@ function FromUnion(schema, references, path, value) {
     }
     return Default(schema, path, value);
 }
-function AddReference(references, schema) {
-    references.push(schema);
-    return references;
-}
 // prettier-ignore
 function Visit(schema, references, path, value) {
-    const references_ = typeof schema.$id === 'string' ? AddReference(references, schema) : references;
+    const references_ = (0, index_4.Pushref)(schema, references);
     const schema_ = schema;
     switch (schema[index_1.Kind]) {
         case 'Array':

package/build/cjs/value/transform/has.js

@@ -76,13 +76,9 @@ function FromTuple(schema, references) {
 function FromUnion(schema, references) {
     return (0, type_1.IsTransform)(schema) || schema.anyOf.some((schema) => Visit(schema, references));
 }
-function AddReference(references, schema) {
-    references.push(schema);
-    return references;
-}
 // prettier-ignore
 function Visit(schema, references) {
-    const references_ = (0, index_3.IsString)(schema.$id) ? AddReference(references, schema) : references;
+    const references_ = (0, index_1.Pushref)(schema, references);
     const schema_ = schema;
     if (schema.$id && visited.has(schema.$id))
         return false;

package/build/esm/value/convert/convert.mjs

@@ -1,6 +1,6 @@
 import { Clone } from '../clone/index.mjs';
 import { Check } from '../check/index.mjs';
-import { Deref } from '../deref/index.mjs';
+import { Deref, Pushref } from '../deref/index.mjs';
 import { Kind } from '../../type/symbols/index.mjs';
 // ------------------------------------------------------------------
 // ValueGuard
@@ -195,12 +195,8 @@ function FromUnion(schema, references, value) {
     }
     return value;
 }
-function AddReference(references, schema) {
-    references.push(schema);
-    return references;
-}
 function Visit(schema, references, value) {
-    const references_ = IsString(schema.$id) ? AddReference(references, schema) : references;
+    const references_ = Pushref(schema, references);
     const schema_ = schema;
     switch (schema[Kind]) {
         case 'Array':

package/build/esm/value/create/create.mjs

@@ -1,7 +1,7 @@
-import { HasPropertyKey, IsString } from '../guard/index.mjs';
+import { HasPropertyKey } from '../guard/index.mjs';
 import { Check } from '../check/index.mjs';
 import { Clone } from '../clone/index.mjs';
-import { Deref } from '../deref/index.mjs';
+import { Deref, Pushref } from '../deref/index.mjs';
 import { TemplateLiteralGenerate, IsTemplateLiteralFinite } from '../../type/template-literal/index.mjs';
 import { PatternStringExact, PatternNumberExact } from '../../type/patterns/index.mjs';
 import { TypeRegistry } from '../../type/registry/index.mjs';
@@ -381,12 +381,8 @@ function FromKind(schema, references) {
         throw new Error('User defined types must specify a default value');
     }
 }
-function AddReference(references, schema) {
-    references.push(schema);
-    return references;
-}
 function Visit(schema, references) {
-    const references_ = IsString(schema.$id) ? AddReference(references, schema) : references;
+    const references_ = Pushref(schema, references);
     const schema_ = schema;
     switch (schema_[Kind]) {
         case 'Any':

package/build/esm/value/default/default.mjs

@@ -1,11 +1,11 @@
 import { Check } from '../check/index.mjs';
 import { Clone } from '../clone/index.mjs';
-import { Deref } from '../deref/index.mjs';
+import { Deref, Pushref } from '../deref/index.mjs';
 import { Kind } from '../../type/symbols/index.mjs';
 // ------------------------------------------------------------------
 // ValueGuard
 // ------------------------------------------------------------------
-import { IsString, IsFunction, IsObject, IsArray, IsUndefined, HasPropertyKey } from '../guard/index.mjs';
+import { IsFunction, IsObject, IsArray, IsUndefined, HasPropertyKey } from '../guard/index.mjs';
 // ------------------------------------------------------------------
 // TypeGuard
 // ------------------------------------------------------------------
@@ -115,18 +115,14 @@ function FromUnion(schema, references, value) {
     const defaulted = ValueOrDefault(schema, value);
     for (const inner of schema.anyOf) {
         const result = Visit(inner, references, Clone(defaulted));
-        if (Check(inner, result)) {
+        if (Check(inner, references, result)) {
             return result;
         }
     }
     return defaulted;
 }
-function AddReference(references, schema) {
-    references.push(schema);
-    return references;
-}
 function Visit(schema, references, value) {
-    const references_ = IsString(schema.$id) ? AddReference(references, schema) : references;
+    const references_ = Pushref(schema, references);
     const schema_ = schema;
     switch (schema_[Kind]) {
         case 'Array':

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

@@ -6,5 +6,7 @@ export declare class TypeDereferenceError extends TypeBoxError {
     readonly schema: TRef | TThis;
     constructor(schema: TRef | TThis);
 }
-/** Dereferences a schema from the references array or throws if not found */
+/** `[Internal]` Pushes a schema onto references if the schema has an $id and does not exist on references */
+export declare function Pushref(schema: TSchema, references: TSchema[]): TSchema[];
+/** `[Internal]` Dereferences a schema from the references array or throws if not found */
 export declare function Deref(schema: TSchema, references: TSchema[]): TSchema;

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

@@ -1,8 +1,9 @@
 import { TypeBoxError } from '../../type/error/index.mjs';
 import { Kind } from '../../type/symbols/index.mjs';
+import { IsString } from '../guard/guard.mjs';
 export class TypeDereferenceError extends TypeBoxError {
     constructor(schema) {
-        super(`Unable to dereference schema with $id '${schema.$id}'`);
+        super(`Unable to dereference schema with $id '${schema.$ref}'`);
         this.schema = schema;
     }
 }
@@ -12,7 +13,14 @@ function Resolve(schema, references) {
         throw new TypeDereferenceError(schema);
     return Deref(target, references);
 }
-/** Dereferences a schema from the references array or throws if not found */
+/** `[Internal]` Pushes a schema onto references if the schema has an $id and does not exist on references */
+export function Pushref(schema, references) {
+    if (!IsString(schema.$id) || references.some((target) => target.$id === schema.$id))
+        return references;
+    references.push(schema);
+    return references;
+}
+/** `[Internal]` Dereferences a schema from the references array or throws if not found */
 export function Deref(schema, references) {
     // prettier-ignore
     return (schema[Kind] === 'This' || schema[Kind] === 'Ref')

package/build/esm/value/transform/decode.mjs

@@ -2,7 +2,7 @@ import { TypeSystemPolicy } from '../../system/policy.mjs';
 import { Kind, TransformKind } from '../../type/symbols/index.mjs';
 import { TypeBoxError } from '../../type/error/index.mjs';
 import { KeyOfPropertyKeys, KeyOfPropertyEntries } from '../../type/keyof/index.mjs';
-import { Deref } from '../deref/index.mjs';
+import { Deref, Pushref } from '../deref/index.mjs';
 import { Check } from '../check/index.mjs';
 // ------------------------------------------------------------------
 // ValueGuard
@@ -159,13 +159,9 @@ function FromUnion(schema, references, path, value) {
     }
     return Default(schema, path, value);
 }
-function AddReference(references, schema) {
-    references.push(schema);
-    return references;
-}
 // prettier-ignore
 function Visit(schema, references, path, value) {
-    const references_ = typeof schema.$id === 'string' ? AddReference(references, schema) : references;
+    const references_ = Pushref(schema, references);
     const schema_ = schema;
     switch (schema[Kind]) {
         case 'Array':

package/build/esm/value/transform/encode.mjs

@@ -2,7 +2,7 @@ import { TypeSystemPolicy } from '../../system/policy.mjs';
 import { Kind, TransformKind } from '../../type/symbols/index.mjs';
 import { TypeBoxError } from '../../type/error/index.mjs';
 import { KeyOfPropertyKeys, KeyOfPropertyEntries } from '../../type/keyof/index.mjs';
-import { Deref } from '../deref/index.mjs';
+import { Deref, Pushref } from '../deref/index.mjs';
 import { Check } from '../check/index.mjs';
 // ------------------------------------------------------------------
 // ValueGuard
@@ -171,13 +171,9 @@ function FromUnion(schema, references, path, value) {
     }
     return Default(schema, path, value);
 }
-function AddReference(references, schema) {
-    references.push(schema);
-    return references;
-}
 // prettier-ignore
 function Visit(schema, references, path, value) {
-    const references_ = typeof schema.$id === 'string' ? AddReference(references, schema) : references;
+    const references_ = Pushref(schema, references);
     const schema_ = schema;
     switch (schema[Kind]) {
         case 'Array':

package/build/esm/value/transform/has.mjs

@@ -1,4 +1,4 @@
-import { Deref } from '../deref/index.mjs';
+import { Deref, Pushref } from '../deref/index.mjs';
 import { Kind } from '../../type/symbols/index.mjs';
 // ------------------------------------------------------------------
 // TypeGuard
@@ -7,7 +7,7 @@ import { IsTransform, IsSchema } from '../../type/guard/type.mjs';
 // ------------------------------------------------------------------
 // ValueGuard
 // ------------------------------------------------------------------
-import { IsString, IsUndefined } from '../guard/index.mjs';
+import { IsUndefined } from '../guard/index.mjs';
 // prettier-ignore
 function FromArray(schema, references) {
     return IsTransform(schema) || Visit(schema.items, references);
@@ -72,13 +72,9 @@ function FromTuple(schema, references) {
 function FromUnion(schema, references) {
     return IsTransform(schema) || schema.anyOf.some((schema) => Visit(schema, references));
 }
-function AddReference(references, schema) {
-    references.push(schema);
-    return references;
-}
 // prettier-ignore
 function Visit(schema, references) {
-    const references_ = IsString(schema.$id) ? AddReference(references, schema) : references;
+    const references_ = Pushref(schema, references);
     const schema_ = schema;
     if (schema.$id && visited.has(schema.$id))
         return false;

package/package.json

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