ata-validator 1.43.0 → 1.45.0

package/lib/validator-core.js

@@ -604,8 +604,10 @@ function resolveSchemaForPreprocess(schema, schemaMap) {
     if (p && typeof p === 'object' && p.$ref && !p.type) {
       const t = resolveRefForPreprocess(p.$ref, schemaMap)
       if (t && typeof t === 'object') {
-        if (!cloned) { cloned = Object.assign({}, s); cloned.properties = Object.assign({}, s.properties) }
-        cloned.properties[key] = t
+        // Spread and defineProperty: a property named "__proto__" stays an own
+        // key of the copy (assignment would set the copy's prototype).
+        if (!cloned) { cloned = { ...s }; cloned.properties = { ...s.properties } }
+        Object.defineProperty(cloned.properties, key, { value: t, writable: true, enumerable: true, configurable: true })
       }
     }
   }
@@ -775,6 +777,7 @@ class Validator {
     // to attach dataFrame entries to each enriched error.
     this._posCache = null; // created by _pos() on first use, only the JSON text path needs it
     this._lastRawInput = null;
+    this._lastParsed = undefined;
     // undefined: not built yet. null: this schema has no scanner.
     this._scanner = undefined;
     // Checks a wrapper registered through _extendChecks. Declared here so
@@ -815,7 +818,7 @@ class Validator {
   }
 
   _pos() {
-    return this._posCache || (this._posCache = require('./data-position-cache').createCache());
+    return this._posCache || (this._posCache = require('./data-position-cache').createCache(_codegen !== null && _codegen.nativePositions ? _codegen.nativePositions() : null));
   }
 
   _ensureVocabularies() {
@@ -847,7 +850,12 @@ class Validator {
     // "validate this schema against its dialect" needs no network and no
     // caller-supplied registry. Only schemas that mention json-schema.org in a
     // reference pay for the lookup.
-    if (this._schemaStr.includes('json-schema.org/draft')) {
+    // A reference, not `$schema`: nearly every schema names its dialect, and
+    // matching that loaded the vendored meta-schemas into every validator's
+    // map, 27 entries that made its compile cache key a 30 KB string, rebuilt
+    // in 20 microseconds at each compile, and sent every compile through the
+    // external-document checks.
+    if (this._schemaStr.includes('json-schema.org/') && /"\$(?:ref|dynamicRef|recursiveRef)":"[^"]*json-schema\.org\//.test(this._schemaStr)) {
       const { METASCHEMAS } = require('./metaschemas');
       this._ownSchemaMap();
       for (const [id, meta] of METASCHEMAS) {
@@ -1104,6 +1112,17 @@ class Validator {
       _bindVerdict(this, this._fastVerdict
         ? this._fastVerdict
         : (data) => run(data).valid);
+      // Parsed, then the verdict first and the errors only for a document that
+      // fails: collecting them on every document cost an accepted 5 MB one 9 ms
+      // over JSON.parse and validate(). At this layer, below the presentation
+      // that the text path wraps around it: going through validate() as it
+      // stands once every layer is in place handed the text path errors
+      // already presented, and they lost their source anchor.
+      const runText = options.abortEarly
+        ? run
+        : (preprocess
+            ? (data) => { preprocess(data); return interp.isValid(data) ? VALID_RESULT : interp.validate(data); }
+            : (data) => (interp.isValid(data) ? VALID_RESULT : interp.validate(data)));
       this.validateJSON = (jsonStr) => {
         let data;
         try {
@@ -1112,9 +1131,19 @@ class Validator {
           if (!(e instanceof SyntaxError)) throw e;
           return _jsonSyntaxRejection(e);
         }
-        return run(data);
+        this._lastParsed = data;
+        return runText(data);
+      };
+      this.isValidJSON = (jsonStr) => {
+        let data;
+        try {
+          data = JSON.parse(jsonStr);
+        } catch (e) {
+          if (!(e instanceof SyntaxError)) throw e;
+          return false;
+        }
+        return this.isValidObject(data);
       };
-      this.isValidJSON = (jsonStr) => this.validateJSON(jsonStr).valid;
     }
 
     // Error presentation, one lazy layer: declaration-order sorting, rich
@@ -1163,21 +1192,38 @@ class Validator {
           // rejection it builds. Cleared as soon as it returns: the rejection
           // carries the text itself, so nothing outlives the call.
           this._lastRawInput = jsonStr;
-          let result;
+          this._lastParsed = undefined;
+          let result, parsed;
           try {
             result = innerJson(jsonStr);
           } finally {
             this._lastRawInput = null;
+            parsed = this._lastParsed;
+            this._lastParsed = undefined;
           }
           // Every diagnostic the text path adds is deferred. Deciding here
           // whether there is anything to add would mean reading `result.errors`,
           // and on the codegen path that realizes the inner lazy layer, which is
           // the document walk this exists to avoid.
           if (result && result.valid === false) {
-            return new LazyJsonRejection(result, jsonStr, this, enrich);
+            return new LazyJsonRejection(result, jsonStr, this, enrich, parsed);
           }
           return result;
         };
+      } else if (this.validateJSON) {
+        // Without enrichment the text path still presents its errors as
+        // validate() does, in declaration order: on generated code they came
+        // out in the order the function found them, so the same document gave
+        // its errors in one order from validate() and another from here.
+        const innerJson = this.validateJSON;
+        this.validateJSON = (jsonStr) => {
+          this._lastParsed = undefined;
+          const result = innerJson(jsonStr);
+          const parsed = this._lastParsed;
+          this._lastParsed = undefined;
+          if (!(result && result.valid === false && parsed !== undefined)) return result;
+          return present(result, parsed);
+        };
       }
     }
 
@@ -1211,10 +1257,12 @@ class Validator {
     // errorMessage keep the validate hot path untouched. Layered after rich
     // enrichment so `code`/`keyword`/`path` are already final and only the
     // human-facing message changes.
+    // The module loads only for a schema that has the keyword: loading it
+    // to ask was a file read on every process's first compile.
     {
-      const emLib = require('./error-messages');
       const schemaStr = this._schemaStr || (this._schemaObj ? JSON.stringify(this._schemaObj) : '');
-      if (emLib.schemaHasErrorMessages(schemaStr)) {
+      if (schemaStr.indexOf('"errorMessage"') !== -1) {
+        const emLib = require('./error-messages');
         const root = this._schemaObj;
         const wrap = (inner) => (arg) => {
           const result = inner(arg);
@@ -2184,7 +2232,15 @@ for (const [name, pick] of [
   });
 }
 
+// Cold start: an interpreted twin answers a large schema's first calls where
+// the code generator is registered (see coldTwin in index.js). Lite has none.
+Validator.prototype._coldTwin = function () {
+  return _codegen === null || _codegen.coldTwin === undefined ? null : _codegen.coldTwin(this, Validator);
+};
+
 _defineLazyMethod('validate', (self) => (data) => {
+  const t = self._coldTwin();
+  if (t !== null) return t.validate(data);
   self._ensureCompiled();
   return self.validate(data);
 });
@@ -2195,6 +2251,7 @@ _defineLazyMethod('isValidObject', (self) => {
   // again on every call, about 200 ns, ten times the check.
   let bound = false;
   return (data) => {
+  if (!bound) { const t = self._coldTwin(); if (t !== null) return t.isValidObject(data); }
   if (bound) return self.isValidObject(data);
   bound = true;
   // A validator that rewrites its input goes through the full compile, which
@@ -2234,10 +2291,14 @@ _defineLazyMethod('isValidObject', (self) => {
   };
 });
 _defineLazyMethod('validateJSON', (self) => (jsonStr) => {
+  const t = self._coldTwin();
+  if (t !== null) return t.validateJSON(jsonStr);
   self._ensureCompiled();
   return self.validateJSON(jsonStr);
 });
 _defineLazyMethod('isValidJSON', (self) => (jsonStr) => {
+  const t = self._coldTwin();
+  if (t !== null) return t.isValidJSON(jsonStr);
   self._ensureCompiled();
   return self.isValidJSON(jsonStr);
 });

package/lib/version.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ata-validator",
-  "version": "1.43.0",
+  "version": "1.45.0",
   "description": "JSON Schema validator that compiles to plain JavaScript, still runs where code generation is blocked, and can be compiled away at build time. Passes the full official test suite.",
   "main": "index.js",
   "module": "index.mjs",
@@ -64,7 +64,7 @@
     "release:check": "node tests/test_pack_purity.js && node scripts/check-doc-coverage.js && node tests/test_error_codes_lock.js && node tests/test_safe_regex_embed.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_number_text_parity.js && node tests/test_text_path_errors.js && node tests/test_compiled_parity.js && node tests/test_compiled_extension_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_error_list_differential.js && node tests/test_output_format.js && node tests/test_standard_json_schema.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.js && node tests/test_browser_nofs.js && node tests/test_browser_imports_guard.js && node tests/test_esm_exports.js && node tests/test_version_sync.js && node tests/test_native_loaded.js && node tests/test_native_lazy.js && node tests/test_buffer_apis_without_native.js && node tests/test_cold_start_modules.js && node tests/test_safe_regex_embed.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_regex_ecma_whitespace.js && node tests/test_regex_native_linear.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_uri_fast_path.js && node tests/test_extend_verdict.js && node tests/test_ipv4_regex.js && node tests/test_ipv6_fast_path.js && node tests/test_nested_recursion_decline.js && node tests/test_generator_error_content.js && node tests/test_inherited_key_presence.js && node tests/test_proto_accessor.js && node tests/test_hybrid_tier.js && node tests/test_first_rejection_builds_one.js && node tests/test_container_local.js && node tests/test_one_shot_validate.js && node tests/test_fixed_pattern_inline.js && node tests/test_plan_source.js && node tests/test_fused_remove_additional.js && node tests/test_runtime_parse.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_encoded_refs.js && node tests/test_cross_doc_root_ref.js && node tests/test_codegen_entrypoint_agreement.js && node tests/test_schema_code_injection.js && node tests/test_aot_html_safe.js && node tests/test_ref_annotation_siblings.js && node tests/test_gate_wrapped_schemas.js && node tests/test_pattern_message_escape.js && node tests/test_nested_defaults_engines.js && node tests/test_nested_coercion_parity.js && node tests/test_preprocess_cache.js && node tests/test_large_schema_codegen.js && node tests/test_base_uri.js && node tests/test_hoisted_def_recursion.js && node tests/test_alias_definitions.js && node tests/test_property_names_ref.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_fast_slot_exhaustion.js && node tests/test_ajv_errors.js && node tests/test_custom_keywords.js && node tests/test_custom_keyword_codegen.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_unevaluated_differential.js && node tests/fuzz_differential.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_ref_error_order.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_error_read_paths.js && node tests/test_unique_items_error_pair.js && node tests/test_rich_errors_generated.js && node tests/test_captured_verdict_stub.js && node tests/test_generated_returns_rewrite.js && node tests/test_deep_pointer_refs.js && node tests/test_uneval_props_dynamic.js && node tests/test_one_pass_no_fallback.js && node tests/test_scanner_size_cap.js && node tests/test_scanner_index_keys.js && node tests/test_both_defs_containers.js && node tests/test_uneval_branch_counts.js && node tests/test_branch_verdicts.js && node tests/test_shared_definitions.js && node tests/test_compile_cache_bound.js && node tests/test_uneval_items_dynamic.js && node tests/test_escaped_property_names.js && node tests/test_ref_siblings_combined.js && node tests/test_unicode_property_patterns.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_lite_parity.js && node tests/test_lite_bundle_size.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_render_without_process.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_aot_source_frames.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 tests/test_collect_evaluated.js && node tests/test_differential_tiers.js && node tests/test_draft7.js && node tests/test_dual_path.js && node tests/test_keywords_codegen.js && node tests/test_ref_cross.js && node tests/test_shape_classifier.js && node tests/test_tier0.js && node benchmark/bench_aot_size.mjs",
+    "test": "node tests/run.js",
     "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",
@@ -143,13 +143,13 @@
     "LICENSE"
   ],
   "optionalDependencies": {
-    "@ata-validator/native-darwin-arm64": "1.43.0",
-    "@ata-validator/native-darwin-x64": "1.43.0",
-    "@ata-validator/native-linux-arm64-gnu": "1.43.0",
-    "@ata-validator/native-linux-arm64-musl": "1.43.0",
-    "@ata-validator/native-linux-x64-gnu": "1.43.0",
-    "@ata-validator/native-linux-x64-musl": "1.43.0",
-    "@ata-validator/native-win32-x64": "1.43.0"
+    "@ata-validator/native-darwin-arm64": "1.45.0",
+    "@ata-validator/native-darwin-x64": "1.45.0",
+    "@ata-validator/native-linux-arm64-gnu": "1.45.0",
+    "@ata-validator/native-linux-arm64-musl": "1.45.0",
+    "@ata-validator/native-linux-x64-gnu": "1.45.0",
+    "@ata-validator/native-linux-x64-musl": "1.45.0",
+    "@ata-validator/native-win32-x64": "1.45.0"
   },
   "peerDependencies": {
     "yaml": "^2.0.0"