ata-validator 1.8.2 → 1.10.0

package/lib/levenshtein.js

@@ -2,14 +2,25 @@
 
 // Bounded Levenshtein. Returns Infinity if distance > maxDistance.
 // Single-row DP. O(n*m) worst case but typical strings are <30 chars.
+// Two rows of scratch, reused across calls. The function is not recursive
+// and the library is single-threaded, so nothing else is using them; growing
+// them once beats allocating two arrays on every comparison, which the
+// reject-path profile showed as most of this function's cost.
+let scratchA = new Int32Array(64);
+let scratchB = new Int32Array(64);
+
 function levenshtein (a, b, maxDistance) {
   const max = maxDistance == null ? Infinity : maxDistance;
   if (a === b) return 0;
   if (Math.abs(a.length - b.length) > max) return Infinity;
   if (a.length === 0) return b.length;
   if (b.length === 0) return a.length;
-  let prev = new Array(b.length + 1);
-  let curr = new Array(b.length + 1);
+  if (scratchA.length < b.length + 1) {
+    scratchA = new Int32Array(b.length + 1);
+    scratchB = new Int32Array(b.length + 1);
+  }
+  let prev = scratchA;
+  let curr = scratchB;
   for (let j = 0; j <= b.length; j++) prev[j] = j;
   for (let i = 1; i <= a.length; i++) {
     curr[0] = i;

package/lib/render-compact.js

@@ -1,31 +1,41 @@
 'use strict';
 
-const { color, ANSI, resolveColor, pathToDotted, trimCwd } = require('./render-shared');
+const { color, ANSI, resolveColor, trimCwd } = require('./render-shared');
+const { toDiagnostics } = require('./diagnose');
+
+const { getDiagnosticSource } = require('./diagnostic-source');
 
 function renderCompact (errors, opts) {
   if (!Array.isArray(errors) || errors.length === 0) return '';
   opts = opts || {};
   const useColor = resolveColor(opts.color || 'auto');
   const cwd = opts.cwd;
+  const carried = getDiagnosticSource(errors) || {};
+  const source = opts.data !== undefined ? Object.assign({}, carried, { data: opts.data }) : carried;
+  const diags = toDiagnostics(errors, source);
   const lines = [];
 
-  for (const err of errors) {
+  for (const d of diags) {
     let prefix = '';
-    if (err.schemaSource) {
-      const f = trimCwd(err.schemaSource.file, cwd);
-      prefix = color(useColor, ANSI.cyan, `${f}:${err.schemaSource.line}:${err.schemaSource.col}`) + ' - ';
+    const raw = d.mergedFrom[0];
+    if (raw && raw.schemaSource) {
+      const f = trimCwd(raw.schemaSource.file, cwd);
+      prefix = color(useColor, ANSI.cyan, `${f}:${raw.schemaSource.line}:${raw.schemaSource.col}`) + ' - ';
     }
-    const codeStr = color(useColor, ANSI.red + ANSI.bold, `error ${err.code}`);
-    const pathStr = color(useColor, ANSI.cyan, pathToDotted(err.path));
-    const got = err.received != null ? `got ${err.received}` : '';
-    const sugg = err.suggestion ? color(useColor, ANSI.yellow, `, ${err.suggestion.text}`) : '';
+    const codeStr = color(useColor, ANSI.red + ANSI.bold, d.code ? `error ${d.code}` : 'error');
+    const pathStr = color(useColor, ANSI.cyan, d.dotted);
+    const got = raw && raw.received != null ? `got ${raw.received}` : '';
+    const sugg = d.help ? color(useColor, ANSI.yellow, `, ${d.help}`) : '';
     const tail = got || sugg ? ` (${got}${sugg})` : '';
-    lines.push(`${prefix}${codeStr}: ${pathStr} ${err.message}${tail}`);
+    lines.push(`${prefix}${codeStr}: ${pathStr} ${d.headline}${tail}`);
   }
 
   const n = errors.length;
+  const shown = diags.length;
   lines.push('');
-  lines.push(`Found ${n} error${n === 1 ? '' : 's'} in ${opts.context || 'input'}.`);
+  let summary = `Found ${n} error${n === 1 ? '' : 's'} in ${opts.context || 'input'}`;
+  if (shown !== n) summary += `, shown as ${shown} diagnostic${shown === 1 ? '' : 's'}`;
+  lines.push(summary + '.');
   if (!(process.stdout && process.stdout.isTTY)) {
     lines.push('(run with --pretty for source frames)');
   }

package/lib/render-pretty.js

@@ -1,60 +1,93 @@
 'use strict';
 
 const { color, ANSI, resolveColor, trimCwd, truncateLine, terminalWidth } = require('./render-shared');
+const { toDiagnostics } = require('./diagnose');
 
+const { getDiagnosticSource } = require('./diagnostic-source');
+
+function sourceFor (errors, opts) {
+  const carried = getDiagnosticSource(errors) || {};
+  if (opts.data !== undefined) return Object.assign({}, carried, { data: opts.data });
+  return carried;
+}
+
+// Never wider than the terminal. The old form repeated the caret for the
+// full span of the value, which for a root-level error was the whole
+// document drawn under a one-character line.
 function caretLine (col, length, gutter) {
   const pad = ' '.repeat(gutter);
   const lead = ' '.repeat(Math.max(0, col - 1));
-  const carets = '^'.repeat(Math.max(1, length || 1));
+  const carets = '^'.repeat(Math.max(1, Math.min(length || 1, terminalWidth())));
   return pad + '| ' + lead + carets;
 }
 
-function renderOne (err, useColor, opts) {
+// What sits beside the caret. For a value error, the value that was found.
+// For a missing property there is no value to show, and the useful fact is
+// what was expected. For errors about the container's shape or about which
+// branch matched, printing the whole container is noise, so nothing.
+const NO_SUFFIX = new Set(['additionalProperties', 'unevaluatedProperties', 'unevaluatedItems', 'dependentRequired', 'propertyNames', 'oneOf', 'anyOf', 'allOf', 'not']);
+function caretSuffix (d, raw, useColor) {
+  if (!raw) return '';
+  if (raw.keyword === 'required') {
+    return raw.expected ? '  ' + color(useColor, ANSI.dim, `expected ${raw.expected}`) : '';
+  }
+  // A composition error anchored inside the closest branch has a value there.
+  if (d.found != null && (raw.keyword === 'oneOf' || raw.keyword === 'anyOf')) {
+    return '  ' + color(useColor, ANSI.dim, `found ${d.found}`);
+  }
+  if (NO_SUFFIX.has(raw.keyword)) return '';
+  return d.found != null ? '  ' + color(useColor, ANSI.dim, `found ${d.found}`) : '';
+}
+
+function renderOne (d, useColor, opts) {
   const lines = [];
-  const cwd = opts.cwd;
   const width = terminalWidth();
   const gutter = 3;
 
-  // Headline
-  const headline = `${err.message}`;
-  lines.push(color(useColor, ANSI.red + ANSI.bold, `error[${err.code}]: `) + headline);
+  // Headline carries the code when there is one. A code-less error, which the
+  // LazyRejection fallback can produce, must not render as "error[undefined]".
+  const label = d.code ? `error[${d.code}]: ` : 'error: ';
+  lines.push(color(useColor, ANSI.red + ANSI.bold, label) + d.headline);
 
-  // Schema source frame
-  if (err.schemaSource) {
-    const f = trimCwd(err.schemaSource.file, cwd);
-    lines.push(`  --> ${color(useColor, ANSI.cyan, `${f}:${err.schemaSource.line}:${err.schemaSource.col}`)}`);
+  // Schema source frame, when the Validator was built with a `source` option.
+  // This is the part that makes the output read like a compiler, and it must
+  // survive the rewrite: it points at the rule, where the data frame below
+  // points at the value.
+  const raw = d.mergedFrom[0];
+  if (raw && raw.schemaSource) {
+    const f = trimCwd(raw.schemaSource.file, opts.cwd);
+    lines.push(`  --> ${color(useColor, ANSI.cyan, `${f}:${raw.schemaSource.line}:${raw.schemaSource.col}`)}`);
     lines.push('   |');
-    const ln = String(err.schemaSource.line).padStart(2, ' ');
-    const srcText = truncateLine(err.schemaSource.text, width - 8);
-    lines.push(` ${ln} | ${srcText}`);
-    const inlineHint = err.expected ? '  ' + color(useColor, ANSI.dim, `expected ${err.expected}`) : '';
-    lines.push(caretLine(err.schemaSource.col, 1, gutter) + inlineHint);
+    const sln = String(raw.schemaSource.line).padStart(2, ' ');
+    lines.push(` ${sln} | ${truncateLine(raw.schemaSource.text, width - 8)}`);
+    const inlineHint = raw.expected ? '  ' + color(useColor, ANSI.dim, `expected ${raw.expected}`) : '';
+    lines.push(caretLine(raw.schemaSource.col, 1, gutter) + inlineHint);
     lines.push('   |');
   }
 
-  // Data frame
-  if (err.dataFrame) {
-    lines.push(`  --> ${color(useColor, ANSI.dim, `input, byte ${err.dataFrame.byteOffset}`)}`);
+  // Data location, always, even without a frame. This is the single most
+  // common reason today's output cannot be acted on.
+  if (d.frame) {
+    const where = `input:${d.frame.line}:${d.frame.col}`;
+    lines.push(`  --> ${color(useColor, ANSI.cyan, where)}  ${color(useColor, ANSI.dim, '(' + d.dotted + ')')}`);
     lines.push('   |');
-    const ln = String(err.dataFrame.line).padStart(2, ' ');
-    const srcText = truncateLine(err.dataFrame.text, width - 8);
-    lines.push(` ${ln} | ${srcText}`);
-    const got = err.received != null ? '  ' + color(useColor, ANSI.dim, `got ${err.received}`) : '';
-    lines.push(caretLine(err.dataFrame.col, err.dataFrame.length, gutter) + got);
+    const ln = String(d.frame.line).padStart(2, ' ');
+    lines.push(` ${ln} | ${truncateLine(d.frame.text, width - 8)}`);
+    lines.push(caretLine(d.frame.col, d.frame.length, gutter) + caretSuffix(d, raw, useColor));
     lines.push('   |');
+  } else {
+    lines.push(`  --> ${color(useColor, ANSI.cyan, 'at ' + d.dotted)}`);
   }
 
-  if (err.suggestion) {
-    lines.push('   = ' + color(useColor, ANSI.yellow, 'help: ') + err.suggestion.text);
-  }
-  if (err.branchErrors && err.branchErrors.length) {
-    const variant = (err.params && err.params.closestName) || 'closest variant';
-    const n = err.branchErrors.length;
+  if (d.help) lines.push('   = ' + color(useColor, ANSI.yellow, 'help: ') + d.help);
+  if (d.branchErrors && d.branchErrors.length) {
+    const variant = (raw && raw.params && raw.params.closestName) || 'closest variant';
+    const n = d.branchErrors.length;
     lines.push('   = ' + color(useColor, ANSI.dim, 'note: ') + `closest match was ${variant} with ${n} error${n === 1 ? '' : 's'}:`);
-    renderBranchErrors(err.branchErrors, 1, lines, useColor);
+    renderBranchErrors(d.branchErrors, 1, lines, useColor);
   }
-  if (err.docUrl) {
-    lines.push('   = ' + color(useColor, ANSI.dim, 'note: see ') + err.docUrl);
+  for (const note of d.notes) {
+    lines.push('   = ' + color(useColor, ANSI.dim, 'note: ') + note);
   }
   return lines.join('\n');
 }
@@ -70,7 +103,12 @@ function renderBranchErrors (subs, depth, lines, useColor) {
   const max = 3;
   const shown = subs.slice(0, max);
   for (const sub of shown) {
-    lines.push('       ' + color(useColor, ANSI.dim, `${sub.keyword}: ${sub.message || ''}`));
+    // Observation first when the branch error carries one; the rule otherwise.
+    let text = sub.message || '';
+    if (sub.expected !== undefined) {
+      text = `expected ${sub.expected}` + (sub.received !== undefined ? `, found ${sub.received}` : '');
+    }
+    lines.push('       ' + color(useColor, ANSI.dim, `${sub.keyword}: ${text}`));
     if (sub.branchErrors && sub.branchErrors.length) renderBranchErrors(sub.branchErrors, depth + 1, lines, useColor);
   }
   if (subs.length > max) {
@@ -85,17 +123,28 @@ function renderPretty (errors, opts) {
   const maxErrors = opts.maxErrors != null ? opts.maxErrors : 20;
   const context = opts.context || 'input';
 
+  const diags = toDiagnostics(errors, sourceFor(errors, opts));
+
   const blocks = [];
-  const limit = maxErrors === 0 ? errors.length : Math.min(maxErrors, errors.length);
-  for (let i = 0; i < limit; i++) {
-    blocks.push(renderOne(errors[i], useColor, opts));
-  }
+  const limit = maxErrors === 0 ? diags.length : Math.min(maxErrors, diags.length);
+  for (let i = 0; i < limit; i++) blocks.push(renderOne(diags[i], useColor, opts));
+
   let out = blocks.join('\n\n');
-  if (limit < errors.length) {
-    out += `\n\n... and ${errors.length - limit} more errors (run with --pretty --max-errors=0 to see all)`;
+  if (limit < diags.length) {
+    out += `\n\n... and ${diags.length - limit} more errors (run with --pretty --max-errors=0 to see all)`;
   }
+  // The count never drifts from errors.length. When correlation collapsed a
+  // pair the second clause says so, so the reader can reconcile the two.
   const n = errors.length;
-  out += `\n\n` + color(useColor, ANSI.red + ANSI.bold, `error: `) + `${n} schema violation${n === 1 ? '' : 's'} in ${context}`;
+  const shown = diags.length;
+  let summary = `${n} schema violation${n === 1 ? '' : 's'} in ${context}`;
+  if (shown !== n) summary += `, shown as ${shown} diagnostic${shown === 1 ? '' : 's'}`;
+  out += '\n\n' + color(useColor, ANSI.red + ANSI.bold, 'error: ') + summary;
+  // Said once, not under every block. The reader needs to know their line
+  // numbers will not match a file, and needs to be told one time.
+  if (diags.some((d) => d.frame && d.frame.synthesized)) {
+    out += '\n' + color(useColor, ANSI.dim, 'note: frames were reconstructed from the value, not from your input text; line numbers refer to that reconstruction');
+  }
   return out;
 }
 

package/lib/version.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ata-validator",
-  "version": "1.8.2",
+  "version": "1.10.0",
   "description": "JSON Schema validation with first-class TypeScript and zero runtime cost. AOT compile to per-schema ESM modules with zero validator dependency. Generic Validator<T> for TypeBox/Zod/Valibot composition. Optional runtime API. Standard Schema V1 compatible.",
   "main": "index.js",
   "module": "index.mjs",
@@ -44,7 +44,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_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_diagnostic.js && node tests/test_format_engine_parity.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_ajv_errors.js && node tests/test_pattern_properties_errors.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_value_equality.js && node tests/test_vocabulary.js && node tests/test_schema_scan.js && node tests/test_lazy_errors.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_data_positions.js && node tests/test_render_shared.js && node tests/test_renderers.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_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_diagnostic.js && node tests/test_format_engine_parity.js && node tests/test_formats_single_pass.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_pattern_properties_errors.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_value_equality.js && node tests/test_vocabulary.js && node tests/test_schema_scan.js && node tests/test_lazy_errors.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_data_positions.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",
@@ -112,13 +112,13 @@
     "LICENSE"
   ],
   "optionalDependencies": {
-    "@ata-validator/native-darwin-arm64": "1.8.2",
-    "@ata-validator/native-darwin-x64": "1.8.2",
-    "@ata-validator/native-linux-x64-gnu": "1.8.2",
-    "@ata-validator/native-linux-arm64-gnu": "1.8.2",
-    "@ata-validator/native-linux-x64-musl": "1.8.2",
-    "@ata-validator/native-linux-arm64-musl": "1.8.2",
-    "@ata-validator/native-win32-x64": "1.8.2"
+    "@ata-validator/native-darwin-arm64": "1.10.0",
+    "@ata-validator/native-darwin-x64": "1.10.0",
+    "@ata-validator/native-linux-x64-gnu": "1.10.0",
+    "@ata-validator/native-linux-arm64-gnu": "1.10.0",
+    "@ata-validator/native-linux-x64-musl": "1.10.0",
+    "@ata-validator/native-linux-arm64-musl": "1.10.0",
+    "@ata-validator/native-win32-x64": "1.10.0"
   },
   "peerDependencies": {
     "yaml": "^2.0.0"