ata-validator 1.30.0 → 1.30.2

package/lib/js-compiler.js

@@ -1838,6 +1838,13 @@ function genCode(schema, v, lines, ctx, knownType) {
     ctx.regExpMap = new Map();
   }
 
+  // Bookkeeping about THIS node, so it stays in this call. On `ctx` it outlived
+  // the node: a sibling that set one made the next node skip a check it owed,
+  // and `propertyNames` then vanished from the emitted program. Same class as
+  // the deferred additionalProperties bug, so same answer, a local.
+  let ppHandledPropertyNames = false
+  let earlyKeyCount = false
+
   // $ref — guard against circular references
   // In 2020-12 with unevaluated*, $ref can coexist with siblings — don't early return
   // Only when THIS schema has unevaluated keywords directly (not via $ref target)
@@ -1865,7 +1872,15 @@ function genCode(schema, v, lines, ctx, knownType) {
           fnName = '_def' + ctx.defFns.size + '_' + defName.replace(/[^A-Za-z0-9_]/g, '_')
           ctx.defFns.set(defName, fnName)
           const bodyLines = []
+          // The def is compiled as its own function over its own `d`, so the
+          // checks _deferOrInline holds back belong at the end of this body.
+          // The list hangs off ctx, so without the swap they are flushed into
+          // whatever function is compiling, carrying this def's key set.
+          const outerDeferred = ctx.deferredChecks
+          ctx.deferredChecks = null
           genCode(ctx.rootDefs[defName], 'd', bodyLines, ctx)
+          if (ctx.deferredChecks) for (const dc of ctx.deferredChecks) bodyLines.push(dc)
+          ctx.deferredChecks = outerDeferred
           // Entered through the cycle guard: see emitGuardState. In the fast
           // pass the wrapper only counts depth; the set is used by the second,
           // guarded pass that runs when data turns out to point back at
@@ -2054,7 +2069,7 @@ function genCode(schema, v, lines, ctx, knownType) {
         } else {
           lines.push(`if(Object.keys(${v}).length!==${propCount})return false`)
         }
-        ctx._earlyKeyCount = true // flag to skip deferred check
+        earlyKeyCount = true // this node emitted its key count already
       }
     }
   }
@@ -2270,8 +2285,7 @@ function genCode(schema, v, lines, ctx, knownType) {
       // A key that is neither declared nor matched by any pattern is
       // additional: rejected outright, or run through the additionalProperties
       // schema when there is one.
-      ctx._ppHandledAdditional = true
-      ctx._ppHandledPropertyNames = !!pn
+      ppHandledPropertyNames = !!pn
       const propKeys = Object.keys(schema.properties || {})
       let apCheck = null
       if (apSchema) {
@@ -2329,7 +2343,7 @@ function genCode(schema, v, lines, ctx, knownType) {
       lines.push(`}}`)
     } else {
       // No additionalProperties: validate matching keys + propertyNames
-      ctx._ppHandledPropertyNames = !!pn
+      ppHandledPropertyNames = !!pn
       lines.push(`${guard}{for(const ${kVar} in ${v}){`)
       // propertyNames checks (merged)
       if (pn) {
@@ -2381,7 +2395,7 @@ function genCode(schema, v, lines, ctx, knownType) {
   }
 
   // propertyNames — only emit if not already merged into patternProperties loop
-  if (schema.propertyNames && typeof schema.propertyNames === 'object' && !ctx._ppHandledPropertyNames) {
+  if (schema.propertyNames && typeof schema.propertyNames === 'object' && !ppHandledPropertyNames) {
     const pn = schema.propertyNames
     const ki = ctx.varCounter++
     const guard = isObj ? '' : `if(typeof ${v}==='object'&&${v}!==null&&!Array.isArray(${v}))`
@@ -2612,7 +2626,7 @@ function genCode(schema, v, lines, ctx, knownType) {
         let inner
         if (allRequired && propCount > 0) {
           // TRICK 1: required covers all — key count check only
-          if (!ctx._earlyKeyCount) {
+          if (!earlyKeyCount) {
             // Adaptive: for-in for <=15 keys, Object.keys for >15
             inner = propCount <= 15
               ? `var _n=0;for(var _k in ${v})_n++;if(_n!==${propCount})return false`
@@ -4283,6 +4297,8 @@ function compileToJSCombined(schema, VALID_RESULT, schemaMap, userFormats) {
 // If type check fails → push error, skip property checks (they'd crash).
 function genCodeC(schema, v, pathExpr, lines, ctx, schemaPrefix) {
   if (!schemaPrefix) schemaPrefix = '#'
+  // Per-node, for the reason spelled out in genCode.
+  let ppHandledPropertyNames = false
   if (schema === false) {
     // Leading semicolon: the previous generated line may end in an
     // expression, and a line starting with `(` would be parsed as a call.
@@ -4684,7 +4700,7 @@ function genCodeC(schema, v, pathExpr, lines, ctx, schemaPrefix) {
     const kVar = `_k${pi}`
 
     if (schema.additionalProperties === false && schema.properties) {
-      ctx._ppHandledPropertyNamesC = !!pn
+      ppHandledPropertyNames = !!pn
       const propKeys = Object.keys(schema.properties)
       // Inline key comparison for small property sets
       const keyCheck = propKeys.length <= 8
@@ -4732,7 +4748,7 @@ function genCodeC(schema, v, pathExpr, lines, ctx, schemaPrefix) {
       lines.push(`if(!_m${pi}){${fail('additionalProperties', 'additionalProperties', `{additionalProperty:${kVar}}`, "'must NOT have additional properties'")}}`)
       lines.push(`}}`)
     } else {
-      ctx._ppHandledPropertyNamesC = !!pn
+      ppHandledPropertyNames = !!pn
       lines.push(`${guard}{for(const ${kVar} in ${v}){`)
       if (pn) {
         if (pn.minLength !== undefined) lines.push(`if(${kVar}.length<${pn.minLength}){${fail('minLength', 'propertyNames/minLength', `{limit:${pn.minLength}}`, `'must NOT have fewer than ${pn.minLength} characters'`)}}`)
@@ -4781,7 +4797,7 @@ function genCodeC(schema, v, pathExpr, lines, ctx, schemaPrefix) {
   }
 
   // propertyNames — skip if already merged into patternProperties loop
-  if (schema.propertyNames && typeof schema.propertyNames === 'object' && !ctx._ppHandledPropertyNamesC) {
+  if (schema.propertyNames && typeof schema.propertyNames === 'object' && !ppHandledPropertyNames) {
     const pn = schema.propertyNames
     const ki = ctx.varCounter++
     lines.push(`if(typeof ${v}==='object'&&${v}!==null&&!Array.isArray(${v})){for(const _k${ki} in ${v}){`)

package/lib/version.js

@@ -7,4 +7,4 @@
 //
 // Kept in lockstep with package.json by `tests/test_version_sync.js`.
 
-module.exports = '1.30.0';
+module.exports = '1.30.2';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ata-validator",
-  "version": "1.30.0",
+  "version": "1.30.2",
   "description": "JSON Schema validation that compiles for speed and still runs where code generation is blocked. Compiled and interpreted engines answer identically at 100% of the official suite. TypeScript inference, Standard Schema V1, and a build step that emits dependency-free modules.",
   "main": "index.js",
   "module": "index.mjs",
@@ -51,7 +51,7 @@
     "release:check": "node scripts/regen-safe-regex-source.js && node tests/test_pack_purity.js && node scripts/check-doc-coverage.js && node tests/test_error_codes_lock.js && node tests/test_safe_regex_source_sync.js && node tests/test_version_sync.js",
     "build": "cmake-js build --target ata",
     "rebuild": "cmake-js rebuild --target ata",
-    "test": "node test.js && node tests/test_removed_aot_methods.js && node tests/test_no_native.js && node tests/test_no_eval.js && node tests/test_property_dependencies.js && node tests/test_v1_dialect.js && node tests/test_buffer_path_parity.js && node tests/test_buffer_gate.js && node tests/test_scanner_differential.js && node tests/test_validate_json_scanner_cost.js && node tests/test_buffer_reject_cost.js && node tests/test_nan_verdict.js && node tests/test_remove_additional_nested.js && node tests/test_exclusive_bounds.js && node tests/test_engine_differential.js && node tests/test_error_shape_differential.js && node tests/test_output_format.js && node tests/test_retry_message.js && node tests/test_describe_schema.js && node tests/test_aot_parse.js && node tests/test_draft7_semantics.js && node tests/test_metaschema_ref.js && node tests/test_pure_js_unsupported.js && node tests/test_native_load_order.js && node tests/test_pack_purity.js && node tests/test_make_native_package.js && node tests/test_browser_nofs.js && node tests/test_browser_imports_guard.js && node tests/test_version_sync.js && node tests/test_native_loaded.js && node tests/test_safe_regex_source_sync.js && node tests/test_t_builder.js && node tests/test_async_refine.js && node tests/test_safe_regex.js && node tests/test_safe_regex_integration.js && node tests/test_aot_build.js && node tests/test_aot_differential.js && node tests/test_aot_cli_build.js && node tests/test_aot_cli_smoke.js && node tests/test_bundle_standalone.js && node tests/test_standalone_anyof.js && node tests/test_standalone_formats.js && node tests/test_aot_format_mode.js && node tests/test_aot_additional_props_errors.js && node tests/test_id_anchor_refs.js && node tests/test_engine_routing.js && node tests/test_engine_option.js && node tests/test_compile_cache_order.js && node tests/test_engine_diagnostic.js && node tests/test_format_engine_parity.js && node tests/test_error_accumulator_collision.js && node tests/test_uri_helper_parity.js && node tests/test_formats_single_pass.js && node tests/test_email_format_cost.js && node tests/test_format_single_error.js && node tests/test_defs_pointer_alias.js && node tests/test_cross_doc_root_ref.js && node tests/test_codegen_entrypoint_agreement.js && node tests/test_hybrid_agreement.js && node tests/test_codegen_edge_shapes.js && node tests/test_ajv_errors.js && node tests/test_custom_keywords.js && node tests/test_strict_schema.js && node tests/test_aot_external_checks.js && node tests/test_ajv_parity.js && node tests/test_user_format_error_path.js && node tests/test_unevaluated_error_path.js && node tests/test_unevaluated_error_shape.js && node tests/test_pattern_properties_errors.js && node tests/test_additional_properties_scaling.js && node tests/test_additional_props_combined_cost.js && node tests/test_no_input_mutation.js && node tests/test_typed_validator_runner.js && node tests/test_define_schema.js && node tests/test_error_codes_lock.js && node tests/test_error_code_lookup.js && node tests/test_error_order.js && node tests/test_error_order_ordinal.js && node tests/test_rejection_shape.js && node tests/test_lazy_normalization.js && node tests/test_value_equality.js && node tests/test_vocabulary.js && node tests/test_schema_scan.js && node tests/test_lazy_errors.js && node tests/test_single_pass_errors.js && node tests/test_lazy_json_errors.js && node tests/test_lazy_instance.js && node tests/test_cyclic_input.js && node tests/test_native_error_codes.js && node tests/test_verdict_preprocess.js && node tests/test_defaults_own_keys.js && node tests/test_plan_compiler.js && node tests/test_nullable.js && node tests/test_validate_and_parse.js && node tests/test_validate_data.js && node tests/test_enrich_error.js && node tests/test_enrich_received.js && node tests/test_rich_errors_optout.js && node tests/test_error_messages.js && node tests/test_source_positions.js && node tests/fuzz_positions.js && node tests/test_malformed_json_termination.js && node tests/test_data_positions.js && node tests/test_targeted_positions.js && node tests/test_position_map_cost.js && node tests/test_targeted_positions_cost.js && node tests/test_aot_staleness.js && node tests/test_file_positions.js && node tests/test_aot_positions_cost.js && node tests/test_schema_hash.js && node tests/test_render_shared.js && node tests/test_renderers.js && node tests/test_additive_fields.js && node tests/test_diagnostic_source.js && node tests/test_diagnose.js && node tests/test_correlate.js && node tests/test_diagnostics_score.js && node tests/test_runtime_error_dx.js && node tests/test_aot_error_dx.js && node tests/test_abort_early.js && node tests/test_branch_collapse.js && node tests/test_suggestions.js && node tests/test_cli_validate.js && node tests/test_cli_version.js && node benchmark/bench_aot_size.mjs",
+    "test": "node test.js && node tests/test_removed_aot_methods.js && node tests/test_no_native.js && node tests/test_no_eval.js && node tests/test_property_dependencies.js && node tests/test_v1_dialect.js && node tests/test_buffer_path_parity.js && node tests/test_buffer_gate.js && node tests/test_scanner_differential.js && node tests/test_validate_json_scanner_cost.js && node tests/test_buffer_reject_cost.js && node tests/test_nan_verdict.js && node tests/test_remove_additional_nested.js && node tests/test_exclusive_bounds.js && node tests/test_engine_differential.js && node tests/test_error_shape_differential.js && node tests/test_output_format.js && node tests/test_retry_message.js && node tests/test_describe_schema.js && node tests/test_aot_parse.js && node tests/test_draft7_semantics.js && node tests/test_metaschema_ref.js && node tests/test_pure_js_unsupported.js && node tests/test_native_load_order.js && node tests/test_pack_purity.js && node tests/test_make_native_package.js && node tests/test_browser_nofs.js && node tests/test_browser_imports_guard.js && node tests/test_version_sync.js && node tests/test_native_loaded.js && node tests/test_safe_regex_source_sync.js && node tests/test_t_builder.js && node tests/test_async_refine.js && node tests/test_safe_regex.js && node tests/test_safe_regex_integration.js && node tests/test_aot_build.js && node tests/test_aot_differential.js && node tests/test_aot_cli_build.js && node tests/test_aot_cli_smoke.js && node tests/test_bundle_standalone.js && node tests/test_standalone_anyof.js && node tests/test_standalone_formats.js && node tests/test_aot_format_mode.js && node tests/test_aot_additional_props_errors.js && node tests/test_id_anchor_refs.js && node tests/test_engine_routing.js && node tests/test_engine_option.js && node tests/test_compile_cache_order.js && node tests/test_engine_diagnostic.js && node tests/test_format_engine_parity.js && node tests/test_error_accumulator_collision.js && node tests/test_uri_helper_parity.js && node tests/test_formats_single_pass.js && node tests/test_email_format_cost.js && node tests/test_format_single_error.js && node tests/test_defs_pointer_alias.js && node tests/test_cross_doc_root_ref.js && node tests/test_codegen_entrypoint_agreement.js && node tests/test_hybrid_agreement.js && node tests/test_codegen_edge_shapes.js && node tests/test_deferred_def_scope.js && node tests/test_node_scoped_ctx_flags.js && node tests/test_ajv_errors.js && node tests/test_custom_keywords.js && node tests/test_strict_schema.js && node tests/test_aot_external_checks.js && node tests/test_ajv_parity.js && node tests/test_user_format_error_path.js && node tests/test_unevaluated_error_path.js && node tests/test_unevaluated_error_shape.js && node tests/test_pattern_properties_errors.js && node tests/test_additional_properties_scaling.js && node tests/test_additional_props_combined_cost.js && node tests/test_no_input_mutation.js && node tests/test_typed_validator_runner.js && node tests/test_define_schema.js && node tests/test_error_codes_lock.js && node tests/test_error_code_lookup.js && node tests/test_error_order.js && node tests/test_error_order_ordinal.js && node tests/test_rejection_shape.js && node tests/test_lazy_normalization.js && node tests/test_value_equality.js && node tests/test_vocabulary.js && node tests/test_schema_scan.js && node tests/test_lazy_errors.js && node tests/test_single_pass_errors.js && node tests/test_lazy_json_errors.js && node tests/test_lazy_instance.js && node tests/test_cyclic_input.js && node tests/test_native_error_codes.js && node tests/test_verdict_preprocess.js && node tests/test_defaults_own_keys.js && node tests/test_plan_compiler.js && node tests/test_nullable.js && node tests/test_validate_and_parse.js && node tests/test_validate_data.js && node tests/test_enrich_error.js && node tests/test_enrich_received.js && node tests/test_rich_errors_optout.js && node tests/test_error_messages.js && node tests/test_source_positions.js && node tests/fuzz_positions.js && node tests/test_malformed_json_termination.js && node tests/test_data_positions.js && node tests/test_targeted_positions.js && node tests/test_position_map_cost.js && node tests/test_targeted_positions_cost.js && node tests/test_aot_staleness.js && node tests/test_file_positions.js && node tests/test_aot_positions_cost.js && node tests/test_schema_hash.js && node tests/test_render_shared.js && node tests/test_renderers.js && node tests/test_additive_fields.js && node tests/test_diagnostic_source.js && node tests/test_diagnose.js && node tests/test_correlate.js && node tests/test_diagnostics_score.js && node tests/test_runtime_error_dx.js && node tests/test_aot_error_dx.js && node tests/test_abort_early.js && node tests/test_branch_collapse.js && node tests/test_suggestions.js && node tests/test_cli_validate.js && node tests/test_cli_version.js && node benchmark/bench_aot_size.mjs",
     "bench:size": "node benchmark/bench_aot_size.mjs",
     "test:suite": "node tests/run_suite.js && node tests/run_suite.js draft7 && node tests/run_suite.js v1",
     "test:compat": "node tests/test_compat.js",
@@ -121,13 +121,13 @@
     "LICENSE"
   ],
   "optionalDependencies": {
-    "@ata-validator/native-darwin-arm64": "1.30.0",
-    "@ata-validator/native-darwin-x64": "1.30.0",
-    "@ata-validator/native-linux-arm64-gnu": "1.30.0",
-    "@ata-validator/native-linux-arm64-musl": "1.30.0",
-    "@ata-validator/native-linux-x64-gnu": "1.30.0",
-    "@ata-validator/native-linux-x64-musl": "1.30.0",
-    "@ata-validator/native-win32-x64": "1.30.0"
+    "@ata-validator/native-darwin-arm64": "1.30.2",
+    "@ata-validator/native-darwin-x64": "1.30.2",
+    "@ata-validator/native-linux-arm64-gnu": "1.30.2",
+    "@ata-validator/native-linux-arm64-musl": "1.30.2",
+    "@ata-validator/native-linux-x64-gnu": "1.30.2",
+    "@ata-validator/native-linux-x64-musl": "1.30.2",
+    "@ata-validator/native-win32-x64": "1.30.2"
   },
   "peerDependencies": {
     "yaml": "^2.0.0"