@sinclair/typebox 0.25.15 → 0.25.17

package/compiler/compiler.js

@@ -175,7 +175,12 @@ var TypeCompiler;
         yield `(${value} === null)`;
     }
     function* Number(schema, value) {
-        yield `(typeof ${value} === 'number' && !isNaN(${value}))`;
+        if (index_2.TypeSystem.AllowNaN) {
+            yield `(typeof ${value} === 'number')`;
+        }
+        else {
+            yield `(typeof ${value} === 'number' && !isNaN(${value}))`;
+        }
         if (IsNumber(schema.multipleOf))
             yield `(${value} % ${schema.multipleOf} === 0)`;
         if (IsNumber(schema.exclusiveMinimum))
@@ -188,12 +193,12 @@ var TypeCompiler;
             yield `(${value} <= ${schema.maximum})`;
     }
     function* Object(schema, value) {
-        if (index_2.TypeSystem.Kind === 'json-schema') {
-            yield `(typeof ${value} === 'object' && ${value} !== null && !Array.isArray(${value}))`;
-        }
-        else if (index_2.TypeSystem.Kind === 'structural') {
+        if (index_2.TypeSystem.AllowArrayObjects) {
             yield `(typeof ${value} === 'object' && ${value} !== null)`;
         }
+        else {
+            yield `(typeof ${value} === 'object' && ${value} !== null && !Array.isArray(${value}))`;
+        }
         if (IsNumber(schema.minProperties))
             yield `(Object.getOwnPropertyNames(${value}).length >= ${schema.minProperties})`;
         if (IsNumber(schema.maxProperties))
@@ -233,12 +238,12 @@ var TypeCompiler;
         yield `(typeof value === 'object' && typeof ${value}.then === 'function')`;
     }
     function* Record(schema, value) {
-        if (index_2.TypeSystem.Kind === 'json-schema') {
-            yield `(typeof ${value} === 'object' && ${value} !== null && !Array.isArray(${value}) && !(${value} instanceof Date))`;
-        }
-        else if (index_2.TypeSystem.Kind === 'structural') {
+        if (index_2.TypeSystem.AllowArrayObjects) {
             yield `(typeof ${value} === 'object' && ${value} !== null && !(${value} instanceof Date))`;
         }
+        else {
+            yield `(typeof ${value} === 'object' && ${value} !== null && !(${value} instanceof Date) && !Array.isArray(${value}))`;
+        }
         const [keyPattern, valueSchema] = globalThis.Object.entries(schema.patternProperties)[0];
         const local = PushLocal(`new RegExp(/${keyPattern}/)`);
         yield `(Object.getOwnPropertyNames(${value}).every(key => ${local}.test(key)))`;
@@ -267,7 +272,7 @@ var TypeCompiler;
         if (IsNumber(schema.maxLength))
             yield `(${value}.length <= ${schema.maxLength})`;
         if (schema.pattern !== undefined) {
-            const local = PushLocal(`new RegExp(/${schema.pattern}/);`);
+            const local = PushLocal(`${new RegExp(schema.pattern)};`);
             yield `(${local}.test(${value}))`;
         }
         if (schema.format !== undefined) {

package/errors/errors.js

@@ -163,10 +163,7 @@ var ValueErrors;
     }
     function* Integer(schema, references, path, value) {
         if (!(typeof value === 'number' && globalThis.Number.isInteger(value))) {
-            return yield { type: ValueErrorType.Number, schema, path, value, message: `Expected number` };
-        }
-        if (!globalThis.Number.isInteger(value)) {
-            yield { type: ValueErrorType.Integer, schema, path, value, message: `Expected integer` };
+            return yield { type: ValueErrorType.Integer, schema, path, value, message: `Expected integer` };
         }
         if (IsNumber(schema.multipleOf) && !(value % schema.multipleOf === 0)) {
             yield { type: ValueErrorType.IntegerMultipleOf, schema, path, value, message: `Expected integer to be a multiple of ${schema.multipleOf}` };
@@ -199,8 +196,15 @@ var ValueErrors;
         }
     }
     function* Number(schema, references, path, value) {
-        if (!(typeof value === 'number' && !isNaN(value))) {
-            return yield { type: ValueErrorType.Number, schema, path, value, message: `Expected number` };
+        if (index_1.TypeSystem.AllowNaN) {
+            if (!(typeof value === 'number')) {
+                return yield { type: ValueErrorType.Number, schema, path, value, message: `Expected number` };
+            }
+        }
+        else {
+            if (!(typeof value === 'number' && !isNaN(value))) {
+                return yield { type: ValueErrorType.Number, schema, path, value, message: `Expected number` };
+            }
         }
         if (IsNumber(schema.multipleOf) && !(value % schema.multipleOf === 0)) {
             yield { type: ValueErrorType.NumberMultipleOf, schema, path, value, message: `Expected number to be a multiple of ${schema.multipleOf}` };
@@ -219,13 +223,13 @@ var ValueErrors;
         }
     }
     function* Object(schema, references, path, value) {
-        if (index_1.TypeSystem.Kind === 'json-schema') {
-            if (!(typeof value === 'object' && value !== null && !globalThis.Array.isArray(value))) {
+        if (index_1.TypeSystem.AllowArrayObjects) {
+            if (!(typeof value === 'object' && value !== null)) {
                 return yield { type: ValueErrorType.Object, schema, path, value, message: `Expected object` };
             }
         }
-        else if (index_1.TypeSystem.Kind === 'structural') {
-            if (!(typeof value === 'object' && value !== null)) {
+        else {
+            if (!(typeof value === 'object' && value !== null && !globalThis.Array.isArray(value))) {
                 return yield { type: ValueErrorType.Object, schema, path, value, message: `Expected object` };
             }
         }
@@ -276,13 +280,13 @@ var ValueErrors;
         }
     }
     function* Record(schema, references, path, value) {
-        if (index_1.TypeSystem.Kind === 'json-schema') {
-            if (!(typeof value === 'object' && value !== null && !globalThis.Array.isArray(value) && !(value instanceof globalThis.Date))) {
+        if (index_1.TypeSystem.AllowArrayObjects) {
+            if (!(typeof value === 'object' && value !== null && !(value instanceof globalThis.Date))) {
                 return yield { type: ValueErrorType.Object, schema, path, value, message: `Expected object` };
             }
         }
-        else if (index_1.TypeSystem.Kind === 'structural') {
-            if (!(typeof value === 'object' && value !== null && !(value instanceof globalThis.Date))) {
+        else {
+            if (!(typeof value === 'object' && value !== null && !(value instanceof globalThis.Date) && !globalThis.Array.isArray(value))) {
                 return yield { type: ValueErrorType.Object, schema, path, value, message: `Expected object` };
             }
         }

package/package.json

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

package/system/system.d.ts

@@ -1,18 +1,10 @@
-export declare class InvalidTypeSystemError extends Error {
-    constructor(typeSystem: string);
-}
-export type TypeSystemKind = 'json-schema' | 'structural';
-declare class TypeSystemSettings {
-    private kind;
-    constructor();
+export declare namespace TypeSystem {
+    /**
+     * Sets whether arrays should be treated as kinds of objects. The default is `false`
+     */
+    let AllowArrayObjects: boolean;
     /**
-     * `Experimental` Sets the type system kind used by TypeBox. By default TypeBox uses `json-schema` assertion
-     * rules to verify JavaScript values. If setting the type system to `structural`, TypeBox will use TypeScript
-     * structural checking rules enabling Arrays to be validated as Objects.
+     * Sets whether numeric checks should consider NaN a valid number type. The default is `false`
      */
-    get Kind(): TypeSystemKind;
-    set Kind(value: TypeSystemKind);
+    let AllowNaN: boolean;
 }
-/** TypeBox TypeSystem Settings */
-export declare const TypeSystem: TypeSystemSettings;
-export {};

package/system/system.js

@@ -27,31 +27,15 @@ THE SOFTWARE.
 
 ---------------------------------------------------------------------------*/
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TypeSystem = exports.InvalidTypeSystemError = void 0;
-class InvalidTypeSystemError extends Error {
-    constructor(typeSystem) {
-        super(`TypeSystemSettings: Unknown TypeSystem '${typeSystem}'`);
-    }
-}
-exports.InvalidTypeSystemError = InvalidTypeSystemError;
-class TypeSystemSettings {
-    constructor() {
-        this.kind = 'json-schema';
-    }
+exports.TypeSystem = void 0;
+var TypeSystem;
+(function (TypeSystem) {
     /**
-     * `Experimental` Sets the type system kind used by TypeBox. By default TypeBox uses `json-schema` assertion
-     * rules to verify JavaScript values. If setting the type system to `structural`, TypeBox will use TypeScript
-     * structural checking rules enabling Arrays to be validated as Objects.
+     * Sets whether arrays should be treated as kinds of objects. The default is `false`
      */
-    get Kind() {
-        return this.kind;
-    }
-    set Kind(value) {
-        if (!(value === 'json-schema' || value === 'structural')) {
-            throw new InvalidTypeSystemError(value);
-        }
-        this.kind = value;
-    }
-}
-/** TypeBox TypeSystem Settings */
-exports.TypeSystem = new TypeSystemSettings();
+    TypeSystem.AllowArrayObjects = false;
+    /**
+     * Sets whether numeric checks should consider NaN a valid number type. The default is `false`
+     */
+    TypeSystem.AllowNaN = false;
+})(TypeSystem = exports.TypeSystem || (exports.TypeSystem = {}));

package/value/check.js

@@ -103,9 +103,6 @@ var ValueCheck;
         if (!(typeof value === 'number' && globalThis.Number.isInteger(value))) {
             return false;
         }
-        if (!globalThis.Number.isInteger(value)) {
-            return false;
-        }
         if (IsNumber(schema.multipleOf) && !(value % schema.multipleOf === 0)) {
             return false;
         }
@@ -133,8 +130,15 @@ var ValueCheck;
         return value === null;
     }
     function Number(schema, references, value) {
-        if (!(typeof value === 'number' && !isNaN(value))) {
-            return false;
+        if (index_1.TypeSystem.AllowNaN) {
+            if (!(typeof value === 'number')) {
+                return false;
+            }
+        }
+        else {
+            if (!(typeof value === 'number' && !isNaN(value))) {
+                return false;
+            }
         }
         if (IsNumber(schema.multipleOf) && !(value % schema.multipleOf === 0)) {
             return false;
@@ -154,13 +158,13 @@ var ValueCheck;
         return true;
     }
     function Object(schema, references, value) {
-        if (index_1.TypeSystem.Kind === 'json-schema') {
-            if (!(typeof value === 'object' && value !== null && !globalThis.Array.isArray(value))) {
+        if (index_1.TypeSystem.AllowArrayObjects) {
+            if (!(typeof value === 'object' && value !== null)) {
                 return false;
             }
         }
-        else if (index_1.TypeSystem.Kind === 'structural') {
-            if (!(typeof value === 'object' && value !== null)) {
+        else {
+            if (!(typeof value === 'object' && value !== null && !globalThis.Array.isArray(value))) {
                 return false;
             }
         }
@@ -215,13 +219,13 @@ var ValueCheck;
         return typeof value === 'object' && typeof value.then === 'function';
     }
     function Record(schema, references, value) {
-        if (index_1.TypeSystem.Kind === 'json-schema') {
-            if (!(typeof value === 'object' && value !== null && !globalThis.Array.isArray(value) && !(value instanceof globalThis.Date))) {
+        if (index_1.TypeSystem.AllowArrayObjects) {
+            if (!(typeof value === 'object' && value !== null && !(value instanceof globalThis.Date))) {
                 return false;
             }
         }
-        else if (index_1.TypeSystem.Kind === 'structural') {
-            if (!(typeof value === 'object' && value !== null && !(value instanceof globalThis.Date))) {
+        else {
+            if (!(typeof value === 'object' && value !== null && !(value instanceof globalThis.Date) && !globalThis.Array.isArray(value))) {
                 return false;
             }
         }