@sinclair/typebox 0.25.1 → 0.25.3

package/compiler/compiler.js

@@ -375,7 +375,7 @@ var TypeCompiler;
         }
     }
     function CreateExpression(schema, value) {
-        return [...Visit(schema, value)].join(' && ');
+        return `(${[...Visit(schema, value)].join(' && ')})`;
     }
     function CreateFunctionName($id) {
         return `check_${$id.replace(/-/g, '_')}`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sinclair/typebox",
-  "version": "0.25.1",
+  "version": "0.25.3",
   "description": "JSONSchema Type Builder with Static Type Resolution for TypeScript",
   "keywords": [
     "typescript",

package/value/cast.js

@@ -32,50 +32,9 @@ const Types = require("../typebox");
 const create_1 = require("./create");
 const check_1 = require("./check");
 const clone_1 = require("./clone");
-var UnionValueCast;
-(function (UnionValueCast) {
-    // ----------------------------------------------------------------------------------------------
-    // The following will score a schema against a value. For objects, the score is the tally of
-    // points awarded for each property of the value. Property points are (1.0 / propertyCount)
-    // to prevent large property counts biasing results. Properties that match literal values are
-    // maximally awarded as literals are typically used as union discriminator fields.
-    // ----------------------------------------------------------------------------------------------
-    function Score(schema, references, value) {
-        if (schema[Types.Kind] === 'Object' && typeof value === 'object' && value !== null) {
-            const object = schema;
-            const keys = Object.keys(value);
-            const entries = globalThis.Object.entries(object.properties);
-            const [point, max] = [1 / entries.length, entries.length];
-            return entries.reduce((acc, [key, schema]) => {
-                const literal = schema[Types.Kind] === 'Literal' && schema.const === value[key] ? max : 0;
-                const checks = check_1.ValueCheck.Check(schema, references, value[key]) ? point : 0;
-                const exists = keys.includes(key) ? point : 0;
-                return acc + (literal + checks + exists);
-            }, 0);
-        }
-        else {
-            return check_1.ValueCheck.Check(schema, references, value) ? 1 : 0;
-        }
-    }
-    function Select(union, references, value) {
-        let [select, best] = [union.anyOf[0], 0];
-        for (const schema of union.anyOf) {
-            const score = Score(schema, references, value);
-            if (score > best) {
-                select = schema;
-                best = score;
-            }
-        }
-        return select;
-    }
-    function Create(union, references, value) {
-        return check_1.ValueCheck.Check(union, references, value) ? clone_1.ValueClone.Clone(value) : ValueCast.Cast(Select(union, references, value), references, value);
-    }
-    UnionValueCast.Create = Create;
-})(UnionValueCast || (UnionValueCast = {}));
-// -----------------------------------------------------------
+// ----------------------------------------------------------------------------------------------
 // Errors
-// -----------------------------------------------------------
+// ----------------------------------------------------------------------------------------------
 class ValueCastReferenceTypeError extends Error {
     constructor(schema) {
         super(`ValueCast: Cannot locate referenced schema with $id '${schema.$ref}'`);
@@ -112,11 +71,58 @@ class ValueCastUnknownTypeError extends Error {
     }
 }
 exports.ValueCastUnknownTypeError = ValueCastUnknownTypeError;
+// ----------------------------------------------------------------------------------------------
+// The following will score a schema against a value. For objects, the score is the tally of
+// points awarded for each property of the value. Property points are (1.0 / propertyCount)
+// to prevent large property counts biasing results. Properties that match literal values are
+// maximally awarded as literals are typically used as union discriminator fields.
+// ----------------------------------------------------------------------------------------------
+var UnionCastCreate;
+(function (UnionCastCreate) {
+    function Score(schema, references, value) {
+        if (schema[Types.Kind] === 'Object' && typeof value === 'object' && value !== null) {
+            const object = schema;
+            const keys = Object.keys(value);
+            const entries = globalThis.Object.entries(object.properties);
+            const [point, max] = [1 / entries.length, entries.length];
+            return entries.reduce((acc, [key, schema]) => {
+                const literal = schema[Types.Kind] === 'Literal' && schema.const === value[key] ? max : 0;
+                const checks = check_1.ValueCheck.Check(schema, references, value[key]) ? point : 0;
+                const exists = keys.includes(key) ? point : 0;
+                return acc + (literal + checks + exists);
+            }, 0);
+        }
+        else {
+            return check_1.ValueCheck.Check(schema, references, value) ? 1 : 0;
+        }
+    }
+    function Select(union, references, value) {
+        let [select, best] = [union.anyOf[0], 0];
+        for (const schema of union.anyOf) {
+            const score = Score(schema, references, value);
+            if (score > best) {
+                select = schema;
+                best = score;
+            }
+        }
+        return select;
+    }
+    function Create(union, references, value) {
+        if (union.default !== undefined) {
+            return union.default;
+        }
+        else {
+            const schema = Select(union, references, value);
+            return ValueCast.Cast(schema, references, value);
+        }
+    }
+    UnionCastCreate.Create = Create;
+})(UnionCastCreate || (UnionCastCreate = {}));
 var ValueCast;
 (function (ValueCast) {
-    // -----------------------------------------------------------
+    // ----------------------------------------------------------------------------------------------
     // Guards
-    // -----------------------------------------------------------
+    // ----------------------------------------------------------------------------------------------
     function IsArray(value) {
         return typeof value === 'object' && globalThis.Array.isArray(value);
     }
@@ -144,9 +150,9 @@ var ValueCast;
     function IsValueFalse(value) {
         return value === false || (IsNumber(value) && value === 0) || (IsBigInt(value) && value === 0n) || (IsString(value) && (value.toLowerCase() === 'false' || value === '0'));
     }
-    // -----------------------------------------------------------
+    // ----------------------------------------------------------------------------------------------
     // Convert
-    // -----------------------------------------------------------
+    // ----------------------------------------------------------------------------------------------
     function TryConvertString(value) {
         return IsValueToString(value) ? value.toString() : value;
     }
@@ -159,11 +165,11 @@ var ValueCast;
     function TryConvertBoolean(value) {
         return IsValueTrue(value) ? true : IsValueFalse(value) ? false : value;
     }
-    // -----------------------------------------------------------
+    // ----------------------------------------------------------------------------------------------
     // Cast
-    // -----------------------------------------------------------
+    // ----------------------------------------------------------------------------------------------
     function Any(schema, references, value) {
-        return check_1.ValueCheck.Check(schema, references, value) ? value : create_1.ValueCreate.Create(schema, references);
+        return check_1.ValueCheck.Check(schema, references, value) ? clone_1.ValueClone.Clone(value) : create_1.ValueCreate.Create(schema, references);
     }
     function Array(schema, references, value) {
         if (check_1.ValueCheck.Check(schema, references, value))
@@ -198,9 +204,6 @@ var ValueCast;
     function Date(schema, references, value) {
         return check_1.ValueCheck.Check(schema, references, value) ? clone_1.ValueClone.Clone(value) : create_1.ValueCreate.Create(schema, references);
     }
-    function Enum(schema, references, value) {
-        return check_1.ValueCheck.Check(schema, references, value) ? value : create_1.ValueCreate.Create(schema, references);
-    }
     function Function(schema, references, value) {
         return check_1.ValueCheck.Check(schema, references, value) ? value : create_1.ValueCreate.Create(schema, references);
     }
@@ -209,13 +212,13 @@ var ValueCast;
         return check_1.ValueCheck.Check(schema, references, conversion) ? conversion : create_1.ValueCreate.Create(schema, references);
     }
     function Literal(schema, references, value) {
-        return check_1.ValueCheck.Check(schema, references, value) ? value : create_1.ValueCreate.Create(schema, references);
+        return check_1.ValueCheck.Check(schema, references, value) ? clone_1.ValueClone.Clone(value) : create_1.ValueCreate.Create(schema, references);
     }
     function Never(schema, references, value) {
         throw new ValueCastNeverTypeError(schema);
     }
     function Null(schema, references, value) {
-        return check_1.ValueCheck.Check(schema, references, value) ? value : create_1.ValueCreate.Create(schema, references);
+        return check_1.ValueCheck.Check(schema, references, value) ? clone_1.ValueClone.Clone(value) : create_1.ValueCreate.Create(schema, references);
     }
     function Number(schema, references, value) {
         const conversion = TryConvertNumber(value);
@@ -289,19 +292,19 @@ var ValueCast;
         return schema.items.map((schema, index) => Visit(schema, references, value[index]));
     }
     function Undefined(schema, references, value) {
-        return check_1.ValueCheck.Check(schema, references, value) ? value : create_1.ValueCreate.Create(schema, references);
+        return check_1.ValueCheck.Check(schema, references, value) ? clone_1.ValueClone.Clone(value) : create_1.ValueCreate.Create(schema, references);
     }
     function Union(schema, references, value) {
-        return UnionValueCast.Create(schema, references, value);
+        return check_1.ValueCheck.Check(schema, references, value) ? clone_1.ValueClone.Clone(value) : UnionCastCreate.Create(schema, references, value);
     }
     function Uint8Array(schema, references, value) {
-        return check_1.ValueCheck.Check(schema, references, value) ? value : create_1.ValueCreate.Create(schema, references);
+        return check_1.ValueCheck.Check(schema, references, value) ? clone_1.ValueClone.Clone(value) : create_1.ValueCreate.Create(schema, references);
     }
     function Unknown(schema, references, value) {
-        return check_1.ValueCheck.Check(schema, references, value) ? value : create_1.ValueCreate.Create(schema, references);
+        return check_1.ValueCheck.Check(schema, references, value) ? clone_1.ValueClone.Clone(value) : create_1.ValueCreate.Create(schema, references);
     }
     function Void(schema, references, value) {
-        return check_1.ValueCheck.Check(schema, references, value) ? value : create_1.ValueCreate.Create(schema, references);
+        return check_1.ValueCheck.Check(schema, references, value) ? clone_1.ValueClone.Clone(value) : create_1.ValueCreate.Create(schema, references);
     }
     function Visit(schema, references, value) {
         const anyReferences = schema.$id === undefined ? references : [schema, ...references];
@@ -317,8 +320,6 @@ var ValueCast;
                 return Constructor(anySchema, anyReferences, value);
             case 'Date':
                 return Date(anySchema, anyReferences, value);
-            case 'Enum':
-                return Enum(anySchema, anyReferences, value);
             case 'Function':
                 return Function(anySchema, anyReferences, value);
             case 'Integer':

package/value/create.js

@@ -110,17 +110,6 @@ var ValueCreate;
             return new globalThis.Date(0);
         }
     }
-    function Enum(schema, references) {
-        if (schema.default !== undefined) {
-            return schema.default;
-        }
-        else if (schema.anyOf.length === 0) {
-            throw new Error('ValueCreate.Enum: Cannot create default enum value as this enum has no items');
-        }
-        else {
-            return schema.anyOf[0].const;
-        }
-    }
     function Function(schema, references) {
         if (schema.default !== undefined) {
             return schema.default;
@@ -318,8 +307,6 @@ var ValueCreate;
                 return Constructor(anySchema, anyReferences);
             case 'Date':
                 return Date(anySchema, anyReferences);
-            case 'Enum':
-                return Enum(anySchema, anyReferences);
             case 'Function':
                 return Function(anySchema, anyReferences);
             case 'Integer':