ata-validator 1.42.0 → 1.43.0

package/index.js

@@ -503,7 +503,7 @@ function installCodegenPaths (ctx) {
 // The verdict function alone, for isValidObject() before a full compile: the
 // error and combined generators are left for the first rejection.
 installCodegenPaths.compileVerdict = function compileVerdict () {
-  const { compileCacheKey, _compileCache, _bindVerdict, _rememberInstance } = core._internals;
+  const { compileCacheKey, _compileCache, _compileCacheSet, _bindVerdict, _rememberInstance } = core._internals;
   if (!this._schemaStr) this._schemaStr = JSON.stringify(this._schemaObj);
   const sm = this._schemaMap.size > 0 ? this._schemaMap : null;
   const mapKey = compileCacheKey(this._schemaStr, this._schemaMap);
@@ -532,7 +532,7 @@ installCodegenPaths.compileVerdict = function compileVerdict () {
     // validator that later reuses this entry reports the same engine it
     // would have compiled to.
     if (!uf && !this._keywords) {
-      if (!cached) _compileCache.set(mapKey, { jsFn, combined: undefined, errFn: undefined, isCodegen: !!_cg, full: false });
+      if (!cached) _compileCacheSet(mapKey, { jsFn, combined: undefined, errFn: undefined, isCodegen: !!_cg, full: false });
       else cached.jsFn = jsFn;
     }
   }

package/lib/branch-collapse.js

@@ -44,6 +44,21 @@ function __ataScore (errs) {
 // `title`, or the titles in `titles` when given (the generated code passes
 // each branch's result as it is rather than copying it to add one).
 // Returns the single error to report, or null when the keyword is satisfied.
+// oneOf passed by more than one branch; generated code builds it from a count.
+function __ataMulti (passIdx, total, pp, sp, o) {
+  const multi = {
+    code: 'ATA4002',
+    keyword: 'oneOf',
+    instancePath: pp || '',
+    path: pp || '',
+    schemaPath: sp,
+    message: 'value matched ' + passIdx.length + ' of ' + total + ' oneOf variants, expected exactly one',
+    params: { passingSchemas: passIdx },
+  };
+  if (o !== null) Object.defineProperty(multi, '_o', { value: o });
+  return multi;
+}
+
 function __ataCollapse (kw, br, pp, sp, o, titles) {
   let passN = 0;
   for (let i = 0; i < br.length; i++) if (br[i].valid) passN++;
@@ -53,17 +68,7 @@ function __ataCollapse (kw, br, pp, sp, o, titles) {
     if (pass.length > 1) {
       const passIdx = [];
       for (let i = 0; i < br.length; i++) if (br[i].valid) passIdx.push(i);
-      const multi = {
-        code: 'ATA4002',
-        keyword: 'oneOf',
-        instancePath: pp || '',
-        path: pp || '',
-        schemaPath: sp,
-        message: 'value matched ' + pass.length + ' of ' + br.length + ' oneOf variants, expected exactly one',
-        params: { passingSchemas: passIdx },
-      };
-      if (o !== null) Object.defineProperty(multi, '_o', { value: o });
-      return multi;
+      return __ataMulti(passIdx, br.length, pp, sp, o);
     }
   } else if (pass.length >= 1) {
     return null;
@@ -97,12 +102,13 @@ function collapseBranches ({ keyword, branchResults, parentPath, parentSchemaPat
   return __ataCollapse(keyword, branchResults, parentPath, parentSchemaPath, ordinal === undefined ? null : ordinal);
 }
 
-// The three declarations as source, for the generated code to carry. Derived
+// The four declarations as source, for the generated code to carry. Derived
 // from the functions above rather than written out again, so a fix to one
 // cannot miss the other. `tests/test_branch_collapse.js` runs both.
 function embedSource () {
   return 'const __ATA_SEVERITY=' + JSON.stringify(__ATA_SEVERITY) + ';' +
     'const __ataScore=' + __ataScore.toString() + ';' +
+    'const __ataMulti=' + __ataMulti.toString() + ';' +
     'const __ataCollapse=' + __ataCollapse.toString() + ';';
 }
 

package/lib/enrich-site.js

@@ -30,7 +30,7 @@ function errorSite (keyword, schemaPath, params, format) {
   };
 }
 
-function makeRich (site, path, params, message, value, root) {
+function makeRich (site, path, params, message, value, root, spPrefix) {
   // As resolveAt: a root that is null, undefined, '' or NaN resolves nothing.
   const at = (!root && root !== 0 && root !== false) ? MISSING : value;
   const out = {
@@ -40,7 +40,7 @@ function makeRich (site, path, params, message, value, root) {
     path,
     expected: site.expected === NO_EXPECTED ? expectedFor({ keyword: site.keyword, params }) : site.expected,
     received: at === MISSING ? undefined : reprValue(at),
-    schemaPath: site.schemaPath,
+    schemaPath: spPrefix === undefined ? site.schemaPath : spPrefix + site.schemaPath,
     docUrl: site.docUrl,
     instancePath: path,
     dataPath: path,