@sinclair/typebox 0.32.7 → 0.32.9

package/build/require/type/sets/set.js

@@ -2,13 +2,13 @@
 
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SetUnionMany = exports.SetIntersectMany = exports.SetComplement = exports.SetUnion = exports.SetIntersect = exports.SetDistinct = exports.SetIsSubset = exports.SetIncludes = void 0;
-/** Returns true if element S is in the set of T */
+/** Returns true if element right is in the set of left */
 // prettier-ignore
 function SetIncludes(T, S) {
     return T.includes(S);
 }
 exports.SetIncludes = SetIncludes;
-/** Returns true if T is a subset of S */
+/** Returns true if left is a subset of right */
 function SetIsSubset(T, S) {
     return T.every((L) => SetIncludes(S, L));
 }
@@ -34,10 +34,20 @@ function SetComplement(T, S) {
     return T.filter(L => !S.includes(L));
 }
 exports.SetComplement = SetComplement;
-/** Returns the Intersect of multiple sets */
+// prettier-ignore
+function SetIntersectManyResolve(T, Init) {
+    return T.reduce((Acc, L) => {
+        return SetIntersect(Acc, L);
+    }, Init);
+}
 // prettier-ignore
 function SetIntersectMany(T) {
-    return (T.length === 1 ? T[0] : T.reduce((Acc, L) => [...SetIntersect(Acc, L)], []));
+    return (T.length === 1
+        ? T[0]
+        // Use left to initialize the accumulator for resolve
+        : T.length > 1
+            ? SetIntersectManyResolve(T.slice(1), T[0])
+            : []);
 }
 exports.SetIntersectMany = SetIntersectMany;
 /** Returns the Union of multiple sets */

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

@@ -71,7 +71,7 @@ export declare class JsonTypeBuilder {
     /** `[Json]` Intrinsic function to Capitalize LiteralString types */
     Capitalize<T extends TSchema>(schema: T, options?: SchemaOptions): TCapitalize<T>;
     /** `[Json]` Creates a Composite object type */
-    Composite<T extends TObject[]>(objects: [...T], options?: ObjectOptions): TComposite<T>;
+    Composite<T extends TSchema[]>(schemas: [...T], options?: ObjectOptions): TComposite<T>;
     /** `[JavaScript]` Creates a readonly const type from the given value. */
     Const</* const (not supported in 4.0) */ T>(value: T, options?: SchemaOptions): TConst<T>;
     /** `[Json]` Creates a dereferenced type */

package/build/require/type/type/json.js

@@ -87,8 +87,8 @@ class JsonTypeBuilder {
         return (0, index_14.Capitalize)(schema, options);
     }
     /** `[Json]` Creates a Composite object type */
-    Composite(objects, options) {
-        return (0, index_4.Composite)(objects, options); // (error) TS 5.4.0-dev - review TComposite implementation
+    Composite(schemas, options) {
+        return (0, index_4.Composite)(schemas, options); // (error) TS 5.4.0-dev - review TComposite implementation
     }
     /** `[JavaScript]` Creates a readonly const type from the given value. */
     Const(value, options = {}) {

package/build/require/value/cast/cast.js

@@ -57,7 +57,7 @@ function SelectUnion(union, references, value) {
 }
 function CastUnion(union, references, value) {
     if ('default' in union) {
-        return union.default;
+        return typeof value === 'function' ? union.default : (0, index_6.Clone)(union.default);
     }
     else {
         const schema = SelectUnion(union, references, value);

package/build/require/value/create/create.js

@@ -4,16 +4,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Create = exports.ValueCreateError = void 0;
 const index_1 = require("../guard/index");
 const index_2 = require("../check/index");
-const index_3 = require("../deref/index");
-const index_4 = require("../../type/template-literal/index");
-const index_5 = require("../../type/patterns/index");
-const index_6 = require("../../type/registry/index");
-const index_7 = require("../../type/symbols/index");
-const index_8 = require("../../type/error/index");
+const index_3 = require("../clone/index");
+const index_4 = require("../deref/index");
+const index_5 = require("../../type/template-literal/index");
+const index_6 = require("../../type/patterns/index");
+const index_7 = require("../../type/registry/index");
+const index_8 = require("../../type/symbols/index");
+const index_9 = require("../../type/error/index");
 // ------------------------------------------------------------------
 // Errors
 // ------------------------------------------------------------------
-class ValueCreateError extends index_8.TypeBoxError {
+class ValueCreateError extends index_9.TypeBoxError {
     constructor(schema, message) {
         super(message);
         this.schema = schema;
@@ -21,11 +22,17 @@ class ValueCreateError extends index_8.TypeBoxError {
 }
 exports.ValueCreateError = ValueCreateError;
 // ------------------------------------------------------------------
+// Default
+// ------------------------------------------------------------------
+function FromDefault(value) {
+    return typeof value === 'function' ? value : (0, index_3.Clone)(value);
+}
+// ------------------------------------------------------------------
 // Create
 // ------------------------------------------------------------------
 function FromAny(schema, references) {
     if ((0, index_1.HasPropertyKey)(schema, 'default')) {
-        return schema.default;
+        return FromDefault(schema.default);
     }
     else {
         return {};
@@ -39,7 +46,7 @@ function FromArray(schema, references) {
         throw new ValueCreateError(schema, 'Array with the contains constraint requires a default value');
     }
     else if ('default' in schema) {
-        return schema.default;
+        return FromDefault(schema.default);
     }
     else if (schema.minItems !== undefined) {
         return Array.from({ length: schema.minItems }).map((item) => {
@@ -52,7 +59,7 @@ function FromArray(schema, references) {
 }
 function FromAsyncIterator(schema, references) {
     if ((0, index_1.HasPropertyKey)(schema, 'default')) {
-        return schema.default;
+        return FromDefault(schema.default);
     }
     else {
         return (async function* () { })();
@@ -60,7 +67,7 @@ function FromAsyncIterator(schema, references) {
 }
 function FromBigInt(schema, references) {
     if ((0, index_1.HasPropertyKey)(schema, 'default')) {
-        return schema.default;
+        return FromDefault(schema.default);
     }
     else {
         return BigInt(0);
@@ -68,7 +75,7 @@ function FromBigInt(schema, references) {
 }
 function FromBoolean(schema, references) {
     if ((0, index_1.HasPropertyKey)(schema, 'default')) {
-        return schema.default;
+        return FromDefault(schema.default);
     }
     else {
         return false;
@@ -76,7 +83,7 @@ function FromBoolean(schema, references) {
 }
 function FromConstructor(schema, references) {
     if ((0, index_1.HasPropertyKey)(schema, 'default')) {
-        return schema.default;
+        return FromDefault(schema.default);
     }
     else {
         const value = Visit(schema.returns, references);
@@ -98,7 +105,7 @@ function FromConstructor(schema, references) {
 }
 function FromDate(schema, references) {
     if ((0, index_1.HasPropertyKey)(schema, 'default')) {
-        return schema.default;
+        return FromDefault(schema.default);
     }
     else if (schema.minimumTimestamp !== undefined) {
         return new Date(schema.minimumTimestamp);
@@ -109,7 +116,7 @@ function FromDate(schema, references) {
 }
 function FromFunction(schema, references) {
     if ((0, index_1.HasPropertyKey)(schema, 'default')) {
-        return schema.default;
+        return FromDefault(schema.default);
     }
     else {
         return () => Visit(schema.returns, references);
@@ -117,7 +124,7 @@ function FromFunction(schema, references) {
 }
 function FromInteger(schema, references) {
     if ((0, index_1.HasPropertyKey)(schema, 'default')) {
-        return schema.default;
+        return FromDefault(schema.default);
     }
     else if (schema.minimum !== undefined) {
         return schema.minimum;
@@ -128,7 +135,7 @@ function FromInteger(schema, references) {
 }
 function FromIntersect(schema, references) {
     if ((0, index_1.HasPropertyKey)(schema, 'default')) {
-        return schema.default;
+        return FromDefault(schema.default);
     }
     else {
         // --------------------------------------------------------------
@@ -149,7 +156,7 @@ function FromIntersect(schema, references) {
 }
 function FromIterator(schema, references) {
     if ((0, index_1.HasPropertyKey)(schema, 'default')) {
-        return schema.default;
+        return FromDefault(schema.default);
     }
     else {
         return (function* () { })();
@@ -157,7 +164,7 @@ function FromIterator(schema, references) {
 }
 function FromLiteral(schema, references) {
     if ((0, index_1.HasPropertyKey)(schema, 'default')) {
-        return schema.default;
+        return FromDefault(schema.default);
     }
     else {
         return schema.const;
@@ -165,7 +172,7 @@ function FromLiteral(schema, references) {
 }
 function FromNever(schema, references) {
     if ((0, index_1.HasPropertyKey)(schema, 'default')) {
-        return schema.default;
+        return FromDefault(schema.default);
     }
     else {
         throw new ValueCreateError(schema, 'Never types cannot be created. Consider using a default value.');
@@ -173,7 +180,7 @@ function FromNever(schema, references) {
 }
 function FromNot(schema, references) {
     if ((0, index_1.HasPropertyKey)(schema, 'default')) {
-        return schema.default;
+        return FromDefault(schema.default);
     }
     else {
         throw new ValueCreateError(schema, 'Not types must have a default value');
@@ -181,7 +188,7 @@ function FromNot(schema, references) {
 }
 function FromNull(schema, references) {
     if ((0, index_1.HasPropertyKey)(schema, 'default')) {
-        return schema.default;
+        return FromDefault(schema.default);
     }
     else {
         return null;
@@ -189,7 +196,7 @@ function FromNull(schema, references) {
 }
 function FromNumber(schema, references) {
     if ((0, index_1.HasPropertyKey)(schema, 'default')) {
-        return schema.default;
+        return FromDefault(schema.default);
     }
     else if (schema.minimum !== undefined) {
         return schema.minimum;
@@ -200,11 +207,11 @@ function FromNumber(schema, references) {
 }
 function FromObject(schema, references) {
     if ((0, index_1.HasPropertyKey)(schema, 'default')) {
-        return schema.default;
+        return FromDefault(schema.default);
     }
     else {
         const required = new Set(schema.required);
-        return (schema.default ||
+        return (FromDefault(schema.default) ||
             Object.entries(schema.properties).reduce((acc, [key, schema]) => {
                 return required.has(key) ? { ...acc, [key]: Visit(schema, references) } : { ...acc };
             }, {}));
@@ -212,7 +219,7 @@ function FromObject(schema, references) {
 }
 function FromPromise(schema, references) {
     if ((0, index_1.HasPropertyKey)(schema, 'default')) {
-        return schema.default;
+        return FromDefault(schema.default);
     }
     else {
         return Promise.resolve(Visit(schema.item, references));
@@ -221,9 +228,9 @@ function FromPromise(schema, references) {
 function FromRecord(schema, references) {
     const [keyPattern, valueSchema] = Object.entries(schema.patternProperties)[0];
     if ((0, index_1.HasPropertyKey)(schema, 'default')) {
-        return schema.default;
+        return FromDefault(schema.default);
     }
-    else if (!(keyPattern === index_5.PatternStringExact || keyPattern === index_5.PatternNumberExact)) {
+    else if (!(keyPattern === index_6.PatternStringExact || keyPattern === index_6.PatternNumberExact)) {
         const propertyKeys = keyPattern.slice(1, keyPattern.length - 1).split('|');
         return propertyKeys.reduce((acc, key) => {
             return { ...acc, [key]: Visit(valueSchema, references) };
@@ -235,15 +242,15 @@ function FromRecord(schema, references) {
 }
 function FromRef(schema, references) {
     if ((0, index_1.HasPropertyKey)(schema, 'default')) {
-        return schema.default;
+        return FromDefault(schema.default);
     }
     else {
-        return Visit((0, index_3.Deref)(schema, references), references);
+        return Visit((0, index_4.Deref)(schema, references), references);
     }
 }
 function FromRegExp(schema, references) {
     if ((0, index_1.HasPropertyKey)(schema, 'default')) {
-        return schema.default;
+        return FromDefault(schema.default);
     }
     else {
         throw new ValueCreateError(schema, 'RegExp types cannot be created. Consider using a default value.');
@@ -255,7 +262,7 @@ function FromString(schema, references) {
             throw new ValueCreateError(schema, 'String types with patterns must specify a default value');
         }
         else {
-            return schema.default;
+            return FromDefault(schema.default);
         }
     }
     else if (schema.format !== undefined) {
@@ -263,12 +270,12 @@ function FromString(schema, references) {
             throw new ValueCreateError(schema, 'String types with formats must specify a default value');
         }
         else {
-            return schema.default;
+            return FromDefault(schema.default);
         }
     }
     else {
         if ((0, index_1.HasPropertyKey)(schema, 'default')) {
-            return schema.default;
+            return FromDefault(schema.default);
         }
         else if (schema.minLength !== undefined) {
             // prettier-ignore
@@ -281,7 +288,7 @@ function FromString(schema, references) {
 }
 function FromSymbol(schema, references) {
     if ((0, index_1.HasPropertyKey)(schema, 'default')) {
-        return schema.default;
+        return FromDefault(schema.default);
     }
     else if ('value' in schema) {
         return Symbol.for(schema.value);
@@ -292,26 +299,26 @@ function FromSymbol(schema, references) {
 }
 function FromTemplateLiteral(schema, references) {
     if ((0, index_1.HasPropertyKey)(schema, 'default')) {
-        return schema.default;
+        return FromDefault(schema.default);
     }
-    if (!(0, index_4.IsTemplateLiteralFinite)(schema))
+    if (!(0, index_5.IsTemplateLiteralFinite)(schema))
         throw new ValueCreateError(schema, 'Can only create template literals that produce a finite variants. Consider using a default value.');
-    const generated = (0, index_4.TemplateLiteralGenerate)(schema);
+    const generated = (0, index_5.TemplateLiteralGenerate)(schema);
     return generated[0];
 }
 function FromThis(schema, references) {
     if (recursiveDepth++ > recursiveMaxDepth)
         throw new ValueCreateError(schema, 'Cannot create recursive type as it appears possibly infinite. Consider using a default.');
     if ((0, index_1.HasPropertyKey)(schema, 'default')) {
-        return schema.default;
+        return FromDefault(schema.default);
     }
     else {
-        return Visit((0, index_3.Deref)(schema, references), references);
+        return Visit((0, index_4.Deref)(schema, references), references);
     }
 }
 function FromTuple(schema, references) {
     if ((0, index_1.HasPropertyKey)(schema, 'default')) {
-        return schema.default;
+        return FromDefault(schema.default);
     }
     if (schema.items === undefined) {
         return [];
@@ -322,7 +329,7 @@ function FromTuple(schema, references) {
 }
 function FromUndefined(schema, references) {
     if ((0, index_1.HasPropertyKey)(schema, 'default')) {
-        return schema.default;
+        return FromDefault(schema.default);
     }
     else {
         return undefined;
@@ -330,7 +337,7 @@ function FromUndefined(schema, references) {
 }
 function FromUnion(schema, references) {
     if ((0, index_1.HasPropertyKey)(schema, 'default')) {
-        return schema.default;
+        return FromDefault(schema.default);
     }
     else if (schema.anyOf.length === 0) {
         throw new Error('ValueCreate.Union: Cannot create Union with zero variants');
@@ -341,7 +348,7 @@ function FromUnion(schema, references) {
 }
 function FromUint8Array(schema, references) {
     if ((0, index_1.HasPropertyKey)(schema, 'default')) {
-        return schema.default;
+        return FromDefault(schema.default);
     }
     else if (schema.minByteLength !== undefined) {
         return new Uint8Array(schema.minByteLength);
@@ -352,7 +359,7 @@ function FromUint8Array(schema, references) {
 }
 function FromUnknown(schema, references) {
     if ((0, index_1.HasPropertyKey)(schema, 'default')) {
-        return schema.default;
+        return FromDefault(schema.default);
     }
     else {
         return {};
@@ -360,7 +367,7 @@ function FromUnknown(schema, references) {
 }
 function FromVoid(schema, references) {
     if ((0, index_1.HasPropertyKey)(schema, 'default')) {
-        return schema.default;
+        return FromDefault(schema.default);
     }
     else {
         return void 0;
@@ -368,7 +375,7 @@ function FromVoid(schema, references) {
 }
 function FromKind(schema, references) {
     if ((0, index_1.HasPropertyKey)(schema, 'default')) {
-        return schema.default;
+        return FromDefault(schema.default);
     }
     else {
         throw new Error('User defined types must specify a default value');
@@ -377,7 +384,7 @@ function FromKind(schema, references) {
 function Visit(schema, references) {
     const references_ = (0, index_1.IsString)(schema.$id) ? [...references, schema] : references;
     const schema_ = schema;
-    switch (schema_[index_7.Kind]) {
+    switch (schema_[index_8.Kind]) {
         case 'Any':
             return FromAny(schema_, references_);
         case 'Array':
@@ -441,7 +448,7 @@ function Visit(schema, references) {
         case 'Void':
             return FromVoid(schema_, references_);
         default:
-            if (!index_6.TypeRegistry.Has(schema_[index_7.Kind]))
+            if (!index_7.TypeRegistry.Has(schema_[index_8.Kind]))
                 throw new ValueCreateError(schema_, 'Unknown type');
             return FromKind(schema_, references_);
     }

package/package.json

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

package/readme.md

@@ -53,7 +53,7 @@ type T = Static<typeof T>                            // type T = {
 
 TypeBox is a runtime type builder that creates in-memory Json Schema objects that infer as TypeScript types. The schematics produced by this library are designed to match the static type checking rules of the TypeScript compiler. TypeBox offers a unified type that can be statically checked by TypeScript and runtime asserted using standard Json Schema validation.
 
-This library is designed to be a runtime type system providing similar capabilities to TypeScript's programmable type system. It can be used as a simple tool to build up complex schematics or integrated into REST and RPC services to help validate data received over the wire.
+This library is designed to allow Json Schema to compose with the same flexibility as TypeScript's programmable type system. It can be used as a simple tool to build up complex schematics or integrated into REST and RPC services to help validate data received over the wire.
 
 License MIT
 
@@ -1814,4 +1814,4 @@ The following table lists esbuild compiled and minified sizes for each TypeBox m
 
 ## Contribute
 
-TypeBox is open to community contribution. Please ensure you submit an open issue before submitting your pull request. The TypeBox project preferences open community discussion prior to accepting new features.
+TypeBox is open to community contribution. Please ensure you submit an open issue before submitting your pull request. The TypeBox project prefers open community discussion before accepting new features.