ata-validator 0.4.13 → 0.4.14

package/lib/js-compiler.js

@@ -523,6 +523,11 @@ function compileToJSCodegen(schema) {
   genCode(schema, 'd', lines, ctx)
   if (lines.length === 0) return () => true
 
+  // Append deferred checks (additionalProperties) at the end
+  if (ctx.deferredChecks) {
+    for (const dc of ctx.deferredChecks) lines.push(dc)
+  }
+
   const checkStr = lines.join('\n  ')
 
   // Regex and helpers are passed as closure variables (not re-created per call)
@@ -634,7 +639,7 @@ function genCode(schema, v, lines, ctx, knownType) {
           case 'string': return `typeof ${v}==='string'`
           case 'number': return `(typeof ${v}==='number'&&isFinite(${v}))`
           case 'integer': return `Number.isInteger(${v})`
-          case 'boolean': return `typeof ${v}==='boolean'`
+          case 'boolean': return `(${v}===true||${v}===false)`
           case 'null': return `${v}===null`
           default: return 'true'
         }
@@ -676,13 +681,18 @@ function genCode(schema, v, lines, ctx, knownType) {
   // Collect required keys so property checks can skip 'in' guard
   const requiredSet = new Set(schema.required || [])
 
-  // required: direct property access (faster than destructuring in V8)
-  const hoisted = {} // key -> access expression (no local vars)
+  // required: skip explicit check if property has a type constraint
+  // (type check on undefined returns false anyway: Number.isInteger(undefined) === false)
+  const hoisted = {} // key -> access expression
   if (schema.required && schema.properties && isObj) {
     const reqChecks = []
     for (const key of schema.required) {
       hoisted[key] = `${v}[${JSON.stringify(key)}]`
-      reqChecks.push(`${v}[${JSON.stringify(key)}]===undefined`)
+      const prop = schema.properties[key]
+      const hasTypeCheck = prop && (prop.type || prop.enum || prop.const !== undefined)
+      if (!hasTypeCheck) {
+        reqChecks.push(`${v}[${JSON.stringify(key)}]===undefined`)
+      }
     }
     if (reqChecks.length > 0) {
       lines.push(`if(${reqChecks.join('||')})return false`)
@@ -745,18 +755,20 @@ function genCode(schema, v, lines, ctx, knownType) {
     lines.push(isArr ? `{${inner}}` : `if(Array.isArray(${v})){${inner}}`)
   }
 
-  // additionalProperties
+  // additionalProperties -- deferred to end of function for better V8 optimization
+  // (type checks run first in hot path, expensive prop count check last)
   if (schema.additionalProperties === false && schema.properties) {
     const propCount = Object.keys(schema.properties).length
     if (!schema.patternProperties) {
-      // Fast path: known property count, just check length
-      const inner = `if(Object.getOwnPropertyNames(${v}).length!==${propCount})return false`
-      lines.push(isObj ? inner : `if(typeof ${v}==='object'&&${v}!==null&&!Array.isArray(${v})){${inner}}`)
+      const inner = `var _n=0;for(var _k in ${v})_n++;if(_n!==${propCount})return false`
+      if (!ctx.deferredChecks) ctx.deferredChecks = []
+      ctx.deferredChecks.push(isObj ? inner : `if(typeof ${v}==='object'&&${v}!==null&&!Array.isArray(${v})){${inner}}`)
     } else {
       const allowed = Object.keys(schema.properties).map(k => `'${esc(k)}'`).join(',')
       const ci = ctx.varCounter++
       const inner = `const _k${ci}=Object.keys(${v});const _a${ci}=new Set([${allowed}]);for(let _i=0;_i<_k${ci}.length;_i++)if(!_a${ci}.has(_k${ci}[_i]))return false`
-      lines.push(isObj ? `{${inner}}` : `if(typeof ${v}==='object'&&${v}!==null&&!Array.isArray(${v})){${inner}}`)
+      if (!ctx.deferredChecks) ctx.deferredChecks = []
+      ctx.deferredChecks.push(isObj ? `{${inner}}` : `if(typeof ${v}==='object'&&${v}!==null&&!Array.isArray(${v})){${inner}}`)
     }
   }
 
@@ -987,7 +999,7 @@ function genCodeE(schema, v, pathExpr, lines, ctx) {
         case 'string': return `typeof ${v}==='string'`
         case 'number': return `(typeof ${v}==='number'&&isFinite(${v}))`
         case 'integer': return `Number.isInteger(${v})`
-        case 'boolean': return `typeof ${v}==='boolean'`
+        case 'boolean': return `(${v}===true||${v}===false)`
         case 'null': return `${v}===null`
         default: return 'true'
       }
@@ -1314,7 +1326,7 @@ function genCodeC(schema, v, pathExpr, lines, ctx) {
         case 'string': return `typeof ${v}==='string'`
         case 'number': return `(typeof ${v}==='number'&&isFinite(${v}))`
         case 'integer': return `Number.isInteger(${v})`
-        case 'boolean': return `typeof ${v}==='boolean'`
+        case 'boolean': return `(${v}===true||${v}===false)`
         case 'null': return `${v}===null`
         default: return 'true'
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ata-validator",
-  "version": "0.4.13",
+  "version": "0.4.14",
   "description": "Ultra-fast JSON Schema validator. Beats ajv on every valid-path benchmark: 1.1x–2.7x faster validate(obj), 151x faster compilation, 5.9x faster parallel batch. Speculative validation with V8-optimized JS codegen, simdjson, multi-core. Standard Schema V1 compatible.",
   "main": "index.js",
   "types": "index.d.ts",