@sinclair/typebox 0.25.6 → 0.25.7

package/compiler/compiler.js

@@ -105,6 +105,9 @@ exports.TypeCompilerUnknownTypeError = TypeCompilerUnknownTypeError;
 /** Compiles Types for Runtime Type Checking */
 var TypeCompiler;
 (function (TypeCompiler) {
+    function IsNumber(value) {
+        return typeof value === 'number';
+    }
     // -------------------------------------------------------------------
     // Types
     // -------------------------------------------------------------------
@@ -113,11 +116,11 @@ var TypeCompiler;
     }
     function* Array(schema, value) {
         const expression = CreateExpression(schema.items, 'value');
-        if (schema.minItems !== undefined)
+        if (IsNumber(schema.minItems))
             yield `(${value}.length >= ${schema.minItems})`;
-        if (schema.maxItems !== undefined)
+        if (IsNumber(schema.maxItems))
             yield `(${value}.length <= ${schema.maxItems})`;
-        if (schema.uniqueItems !== undefined)
+        if (schema.uniqueItems === true)
             yield `(new Set(${value}).size === ${value}.length)`;
         yield `(Array.isArray(${value}) && ${value}.every(value => ${expression}))`;
     }
@@ -129,13 +132,13 @@ var TypeCompiler;
     }
     function* Date(schema, value) {
         yield `(${value} instanceof Date)`;
-        if (schema.exclusiveMinimumTimestamp !== undefined)
+        if (IsNumber(schema.exclusiveMinimumTimestamp))
             yield `(${value}.getTime() > ${schema.exclusiveMinimumTimestamp})`;
-        if (schema.exclusiveMaximumTimestamp !== undefined)
+        if (IsNumber(schema.exclusiveMaximumTimestamp))
             yield `(${value}.getTime() < ${schema.exclusiveMaximumTimestamp})`;
-        if (schema.minimumTimestamp !== undefined)
+        if (IsNumber(schema.minimumTimestamp))
             yield `(${value}.getTime() >= ${schema.minimumTimestamp})`;
-        if (schema.maximumTimestamp !== undefined)
+        if (IsNumber(schema.maximumTimestamp))
             yield `(${value}.getTime() <= ${schema.maximumTimestamp})`;
     }
     function* Function(schema, value) {
@@ -143,15 +146,15 @@ var TypeCompiler;
     }
     function* Integer(schema, value) {
         yield `(typeof ${value} === 'number' && Number.isInteger(${value}))`;
-        if (schema.multipleOf !== undefined)
+        if (IsNumber(schema.multipleOf))
             yield `(${value} % ${schema.multipleOf} === 0)`;
-        if (schema.exclusiveMinimum !== undefined)
+        if (IsNumber(schema.exclusiveMinimum))
             yield `(${value} > ${schema.exclusiveMinimum})`;
-        if (schema.exclusiveMaximum !== undefined)
+        if (IsNumber(schema.exclusiveMaximum))
             yield `(${value} < ${schema.exclusiveMaximum})`;
-        if (schema.minimum !== undefined)
+        if (IsNumber(schema.minimum))
             yield `(${value} >= ${schema.minimum})`;
-        if (schema.maximum !== undefined)
+        if (IsNumber(schema.maximum))
             yield `(${value} <= ${schema.maximum})`;
     }
     function* Literal(schema, value) {
@@ -170,22 +173,22 @@ var TypeCompiler;
     }
     function* Number(schema, value) {
         yield `(typeof ${value} === 'number')`;
-        if (schema.multipleOf !== undefined)
+        if (IsNumber(schema.multipleOf))
             yield `(${value} % ${schema.multipleOf} === 0)`;
-        if (schema.exclusiveMinimum !== undefined)
+        if (IsNumber(schema.exclusiveMinimum))
             yield `(${value} > ${schema.exclusiveMinimum})`;
-        if (schema.exclusiveMaximum !== undefined)
+        if (IsNumber(schema.exclusiveMaximum))
             yield `(${value} < ${schema.exclusiveMaximum})`;
-        if (schema.minimum !== undefined)
+        if (IsNumber(schema.minimum))
             yield `(${value} >= ${schema.minimum})`;
-        if (schema.maximum !== undefined)
+        if (IsNumber(schema.maximum))
             yield `(${value} <= ${schema.maximum})`;
     }
     function* Object(schema, value) {
         yield `(typeof ${value} === 'object' && ${value} !== null && !Array.isArray(${value}))`;
-        if (schema.minProperties !== undefined)
+        if (IsNumber(schema.minProperties))
             yield `(Object.keys(${value}).length >= ${schema.minProperties})`;
-        if (schema.maxProperties !== undefined)
+        if (IsNumber(schema.maxProperties))
             yield `(Object.keys(${value}).length <= ${schema.maxProperties})`;
         const propertyKeys = globalThis.Object.keys(schema.properties);
         if (schema.additionalProperties === false) {
@@ -246,12 +249,10 @@ var TypeCompiler;
     }
     function* String(schema, value) {
         yield `(typeof ${value} === 'string')`;
-        if (schema.minLength !== undefined) {
+        if (IsNumber(schema.minLength))
             yield `(${value}.length >= ${schema.minLength})`;
-        }
-        if (schema.maxLength !== undefined) {
+        if (IsNumber(schema.maxLength))
             yield `(${value}.length <= ${schema.maxLength})`;
-        }
         if (schema.pattern !== undefined) {
             const local = PushLocal(`new RegExp(/${schema.pattern}/);`);
             yield `(${local}.test(${value}))`;
@@ -279,9 +280,9 @@ var TypeCompiler;
     }
     function* Uint8Array(schema, value) {
         yield `(${value} instanceof Uint8Array)`;
-        if (schema.maxByteLength)
+        if (IsNumber(schema.maxByteLength))
             yield `(${value}.length <= ${schema.maxByteLength})`;
-        if (schema.minByteLength)
+        if (IsNumber(schema.minByteLength))
             yield `(${value}.length >= ${schema.minByteLength})`;
     }
     function* Unknown(schema, value) {

package/package.json

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

package/value/check.js

@@ -39,6 +39,9 @@ class ValueCheckUnknownTypeError extends Error {
 exports.ValueCheckUnknownTypeError = ValueCheckUnknownTypeError;
 var ValueCheck;
 (function (ValueCheck) {
+    function IsNumber(value) {
+        return typeof value === 'number';
+    }
     function Any(schema, references, value) {
         return true;
     }
@@ -46,10 +49,10 @@ var ValueCheck;
         if (!globalThis.Array.isArray(value)) {
             return false;
         }
-        if (schema.minItems !== undefined && !(value.length >= schema.minItems)) {
+        if (IsNumber(schema.minItems) && !(value.length >= schema.minItems)) {
             return false;
         }
-        if (schema.maxItems !== undefined && !(value.length <= schema.maxItems)) {
+        if (IsNumber(schema.maxItems) && !(value.length <= schema.maxItems)) {
             return false;
         }
         if (schema.uniqueItems === true && !(new Set(value).size === value.length)) {
@@ -67,16 +70,16 @@ var ValueCheck;
         if (!(value instanceof globalThis.Date)) {
             return false;
         }
-        if (schema.exclusiveMinimumTimestamp && !(value.getTime() > schema.exclusiveMinimumTimestamp)) {
+        if (IsNumber(schema.exclusiveMinimumTimestamp) && !(value.getTime() > schema.exclusiveMinimumTimestamp)) {
             return false;
         }
-        if (schema.exclusiveMaximumTimestamp && !(value.getTime() < schema.exclusiveMaximumTimestamp)) {
+        if (IsNumber(schema.exclusiveMaximumTimestamp) && !(value.getTime() < schema.exclusiveMaximumTimestamp)) {
             return false;
         }
-        if (schema.minimumTimestamp && !(value.getTime() >= schema.minimumTimestamp)) {
+        if (IsNumber(schema.minimumTimestamp) && !(value.getTime() >= schema.minimumTimestamp)) {
             return false;
         }
-        if (schema.maximumTimestamp && !(value.getTime() <= schema.maximumTimestamp)) {
+        if (IsNumber(schema.maximumTimestamp) && !(value.getTime() <= schema.maximumTimestamp)) {
             return false;
         }
         return true;
@@ -91,19 +94,19 @@ var ValueCheck;
         if (!globalThis.Number.isInteger(value)) {
             return false;
         }
-        if (schema.multipleOf !== undefined && !(value % schema.multipleOf === 0)) {
+        if (IsNumber(schema.multipleOf) && !(value % schema.multipleOf === 0)) {
             return false;
         }
-        if (schema.exclusiveMinimum !== undefined && !(value > schema.exclusiveMinimum)) {
+        if (IsNumber(schema.exclusiveMinimum) && !(value > schema.exclusiveMinimum)) {
             return false;
         }
-        if (schema.exclusiveMaximum !== undefined && !(value < schema.exclusiveMaximum)) {
+        if (IsNumber(schema.exclusiveMaximum) && !(value < schema.exclusiveMaximum)) {
             return false;
         }
-        if (schema.minimum !== undefined && !(value >= schema.minimum)) {
+        if (IsNumber(schema.minimum) && !(value >= schema.minimum)) {
             return false;
         }
-        if (schema.maximum !== undefined && !(value <= schema.maximum)) {
+        if (IsNumber(schema.maximum) && !(value <= schema.maximum)) {
             return false;
         }
         return true;
@@ -121,19 +124,19 @@ var ValueCheck;
         if (!(typeof value === 'number')) {
             return false;
         }
-        if (schema.multipleOf && !(value % schema.multipleOf === 0)) {
+        if (IsNumber(schema.multipleOf) && !(value % schema.multipleOf === 0)) {
             return false;
         }
-        if (schema.exclusiveMinimum && !(value > schema.exclusiveMinimum)) {
+        if (IsNumber(schema.exclusiveMinimum) && !(value > schema.exclusiveMinimum)) {
             return false;
         }
-        if (schema.exclusiveMaximum && !(value < schema.exclusiveMaximum)) {
+        if (IsNumber(schema.exclusiveMaximum) && !(value < schema.exclusiveMaximum)) {
             return false;
         }
-        if (schema.minimum && !(value >= schema.minimum)) {
+        if (IsNumber(schema.minimum) && !(value >= schema.minimum)) {
             return false;
         }
-        if (schema.maximum && !(value <= schema.maximum)) {
+        if (IsNumber(schema.maximum) && !(value <= schema.maximum)) {
             return false;
         }
         return true;
@@ -142,10 +145,10 @@ var ValueCheck;
         if (!(typeof value === 'object' && value !== null && !globalThis.Array.isArray(value))) {
             return false;
         }
-        if (schema.minProperties !== undefined && !(globalThis.Object.keys(value).length >= schema.minProperties)) {
+        if (IsNumber(schema.minProperties) && !(globalThis.Object.keys(value).length >= schema.minProperties)) {
             return false;
         }
-        if (schema.maxProperties !== undefined && !(globalThis.Object.keys(value).length <= schema.maxProperties)) {
+        if (IsNumber(schema.maxProperties) && !(globalThis.Object.keys(value).length <= schema.maxProperties)) {
             return false;
         }
         const propertyKeys = globalThis.Object.keys(schema.properties);
@@ -223,11 +226,11 @@ var ValueCheck;
         if (!(typeof value === 'string')) {
             return false;
         }
-        if (schema.minLength !== undefined) {
+        if (IsNumber(schema.minLength)) {
             if (!(value.length >= schema.minLength))
                 return false;
         }
-        if (schema.maxLength !== undefined) {
+        if (IsNumber(schema.maxLength)) {
             if (!(value.length <= schema.maxLength))
                 return false;
         }
@@ -273,10 +276,10 @@ var ValueCheck;
         if (!(value instanceof globalThis.Uint8Array)) {
             return false;
         }
-        if (schema.maxByteLength && !(value.length <= schema.maxByteLength)) {
+        if (IsNumber(schema.maxByteLength) && !(value.length <= schema.maxByteLength)) {
             return false;
         }
-        if (schema.minByteLength && !(value.length >= schema.minByteLength)) {
+        if (IsNumber(schema.minByteLength) && !(value.length >= schema.minByteLength)) {
             return false;
         }
         return true;