ata-validator 1.33.3 → 1.34.0

package/compat.d.ts

@@ -36,14 +36,25 @@ declare class Ata {
 }
 
 declare namespace Ata {
-  interface ErrorObject {
+  /** The same class under the name ajv 8 exports it by: `import { Ajv } from 'ata-validator/compat'`. */
+  const Ajv: typeof Ata;
+  type Ajv = Ata;
+  // Generic the way the reference's ErrorObject is, so code that names
+  // `ErrorObject<string, Record<string, any>, unknown>` compiles against this
+  // entry unchanged, and an error from here passes where one from the
+  // reference is expected.
+  interface ErrorObject<K extends string = string, P = Record<string, any>, S = unknown> {
     instancePath: string;
     schemaPath: string;
-    keyword: string;
-    params: Record<string, unknown>;
+    keyword: K;
+    params: P;
     message: string;
     /** Present when `verbose: true`. */
-    parentSchema?: unknown;
+    schema?: S;
+    /** Present when `verbose: true`. */
+    parentSchema?: Record<string, any>;
+    /** Present when `verbose: true`. */
+    data?: unknown;
     /** Present on errors produced under `propertyNames`. */
     propertyName?: string;
     [extra: string]: unknown;

package/compat.js

@@ -432,3 +432,4 @@ Ata.attachDataFrames = function attachDataFrames(errors, text) {
 module.exports = Ata;
 module.exports.default = Ata;
 module.exports.Ata = Ata;
+module.exports.Ajv = Ata;

package/compat.mjs

@@ -1,3 +1,5 @@
 import Ata from './compat.js';
-export { Ata };
+// `Ajv` as well, so the named import ajv 8 documents,
+// `import { Ajv } from 'ajv'`, changes only in the module name.
+export { Ata, Ata as Ajv };
 export default Ata;

package/lib/compat-errors.js

@@ -369,8 +369,25 @@ function createShaper({ Validator, rootId, rootDoc, schemas, options, allErrors,
     return group.length;
   }
 
+  // A `type` error the way the reference words it. ata folds `nullable: true`
+  // into the type union before compiling, so its own error names the union:
+  // `must be integer, null`. The reference names the type as written, adding
+  // `null` only when the written type is already a list, and joins a list
+  // with a bare comma: `must be integer`, `must be string,number,null`. The
+  // node is read from the schema as the caller passed it.
+  function asReferenceType(e) {
+    if (e.keyword !== 'type' || typeof e.message !== 'string' || !e.message.startsWith('must be ')) return e;
+    const ptr = pointerOf(e.schemaPath || '');
+    if (!ptr.endsWith('/type')) return e;
+    const node = walkPointer(rootDoc, ptr.slice(0, -'/type'.length));
+    let t = node && typeof node === 'object' && node.type !== undefined ? node.type : e.params && e.params.type;
+    if (t === undefined) return e;
+    if (node && node.nullable === true && Array.isArray(t) && !t.includes('null')) t = [...t, 'null'];
+    return { ...e, params: { ...e.params, type: t }, message: 'must be ' + (Array.isArray(t) ? t.join(',') : t) };
+  }
+
   return function shapeErrors(errors, data) {
-    const shaped = shape(errors, data, '').map(asReferenceKeyword);
+    const shaped = shape(errors, data, '').map(asReferenceKeyword).map(asReferenceType);
     if (allErrors) return shaped;
     const n = groupEnd(shaped);
     return shaped.slice(0, n);

package/lib/version.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ata-validator",
-  "version": "1.33.3",
+  "version": "1.34.0",
   "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",
@@ -121,13 +121,13 @@
     "LICENSE"
   ],
   "optionalDependencies": {
-    "@ata-validator/native-darwin-arm64": "1.33.3",
-    "@ata-validator/native-darwin-x64": "1.33.3",
-    "@ata-validator/native-linux-arm64-gnu": "1.33.3",
-    "@ata-validator/native-linux-arm64-musl": "1.33.3",
-    "@ata-validator/native-linux-x64-gnu": "1.33.3",
-    "@ata-validator/native-linux-x64-musl": "1.33.3",
-    "@ata-validator/native-win32-x64": "1.33.3"
+    "@ata-validator/native-darwin-arm64": "1.34.0",
+    "@ata-validator/native-darwin-x64": "1.34.0",
+    "@ata-validator/native-linux-arm64-gnu": "1.34.0",
+    "@ata-validator/native-linux-arm64-musl": "1.34.0",
+    "@ata-validator/native-linux-x64-gnu": "1.34.0",
+    "@ata-validator/native-linux-x64-musl": "1.34.0",
+    "@ata-validator/native-win32-x64": "1.34.0"
   },
   "peerDependencies": {
     "yaml": "^2.0.0"