ata-validator 1.61.0 → 1.61.1

package/lib/verify.js

@@ -195,8 +195,72 @@ function mutate (doc, r) {
   }
 }
 
-// Documents for `schema`: `count` made, half of them with one rule broken.
-function generate (schema, count, seed) {
+// The values on either side of each bound the schema states, for the value
+// at one place: a module that wrote a bound off by one (`< 12` for a minimum
+// of 13) answers every random document as the runtime does, and differs only
+// here. A bound is where a hand edit, a stale module or a generator bug shows.
+function boundaryValues (schema, type) {
+  const out = []
+  const int = type === 'integer'
+  const step = int ? 1 : 0.5
+  const num = (b) => typeof b === 'number' && Number.isFinite(b)
+  if (type === 'integer' || type === 'number') {
+    if (num(schema.minimum)) out.push(schema.minimum, schema.minimum - step)
+    if (num(schema.maximum)) out.push(schema.maximum, schema.maximum + step)
+    if (num(schema.exclusiveMinimum)) out.push(schema.exclusiveMinimum, schema.exclusiveMinimum + step)
+    if (num(schema.exclusiveMaximum)) out.push(schema.exclusiveMaximum, schema.exclusiveMaximum - step)
+    if (num(schema.multipleOf) && schema.multipleOf > 0) out.push(schema.multipleOf, schema.multipleOf * 1.5)
+  }
+  if (type === 'string') {
+    const str = (n) => 'abcdefghij'.repeat(Math.ceil(n / 10) + 1).slice(0, n)
+    if (num(schema.minLength)) { out.push(str(schema.minLength)); if (schema.minLength > 0) out.push(str(schema.minLength - 1)) }
+    if (num(schema.maxLength) && schema.maxLength < 4096) out.push(str(schema.maxLength), str(schema.maxLength + 1))
+  }
+  return out
+}
+
+// Documents that differ from a valid one at a single place, by a value on
+// either side of a bound stated there: properties, nested objects, the first
+// element of an array, through local references. At most `limit` of them.
+function boundaryDocs (schema, r, defs, limit, accepts) {
+  // A base the runtime accepts, where the caller can say, so that a bound
+  // read wrong changes the verdict and not only the error list.
+  let base = makeValid(schema, r, defs, 0)
+  if (accepts) for (let i = 0; i < 50 && base !== undefined && !accepts(base); i++) base = makeValid(schema, r, defs, 0)
+  if (base === undefined) return []
+  const out = []
+  const visit = (sub, path, depth) => {
+    if (out.length >= limit || depth > 8 || !sub || typeof sub !== 'object') return
+    if (typeof sub.$ref === 'string') { const t = resolveLocal(sub.$ref, defs); if (t !== undefined) visit(t, path, depth + 1); return }
+    if (Array.isArray(sub.allOf)) { visit(mergeAllOf(sub), path, depth + 1); return }
+    const types = Array.isArray(sub.type) ? sub.type : sub.type !== undefined ? [sub.type] : []
+    for (const t of types.length ? types : ['integer', 'number', 'string']) {
+      for (const val of boundaryValues(sub, t)) {
+        if (out.length >= limit) return
+        const d = clone(base)
+        if (path.length === 0) { out.push(val); continue }
+        let o = d
+        for (let i = 0; i < path.length - 1; i++) {
+          if (o[path[i]] === undefined || o[path[i]] === null || typeof o[path[i]] !== 'object') o[path[i]] = typeof path[i + 1] === 'number' ? [] : {}
+          o = o[path[i]]
+        }
+        o[path[path.length - 1]] = val
+        out.push(d)
+      }
+    }
+    if (sub.properties && typeof sub.properties === 'object') {
+      for (const k of Object.keys(sub.properties)) if (k !== '__proto__') visit(sub.properties[k], [...path, k], depth + 1)
+    }
+    const item = Array.isArray(sub.prefixItems) ? sub.prefixItems[0] : sub.items && typeof sub.items === 'object' && !Array.isArray(sub.items) ? sub.items : null
+    if (item) visit(item, [...path, 0], depth + 1)
+  }
+  visit(schema, [], 0)
+  return out
+}
+
+// Documents for `schema`: `count` made, half of them with one rule broken,
+// then the documents on either side of each bound (up to `count` more).
+function generate (schema, count, seed, accepts) {
   const r = rng(seed)
   const defs = { $defs: schema && schema.$defs, definitions: schema && schema.definitions }
   const docs = []
@@ -205,6 +269,7 @@ function generate (schema, count, seed) {
     if (i % 2 === 1 && d !== undefined) d = mutate(clone(d), r)
     docs.push(d)
   }
+  for (const d of boundaryDocs(schema, r, defs, count, accepts)) docs.push(d)
   return docs
 }
 
@@ -256,7 +321,7 @@ async function verifyOne ({ schemaFile, moduleFile, schema, generate: count = 20
   if (mod.schemaHash !== undefined && mod.schemaHash !== hash) report.stale = true
   let runtime
   try { runtime = new Validator(schema, {}) } catch (e) { report.error = `schema does not compile: ${e.message}`; return report }
-  const docs = generate(schema, count, seed).map((d, i) => ({ source: `generated #${i + 1}`, doc: d }))
+  const docs = generate(schema, count, seed, (d) => { try { return runtime.isValidObject(clone(d)) } catch { return false } }).map((d, i) => ({ source: `generated #${i + 1}`, doc: d }))
   report.generated = docs.length
   const sampleDocs = readSamples(samples)
   report.samples = sampleDocs.length

package/lib/version.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ata-validator",
-  "version": "1.61.0",
+  "version": "1.61.1",
   "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.",
   "type": "commonjs",
   "main": "index.js",
@@ -60,6 +60,25 @@
       "import": "./compiled-verdict.mjs",
       "require": "./compiled-verdict.js"
     },
+    "./compiled-object": {
+      "types": "./compiled-object.d.ts",
+      "import": "./compiled-object.mjs",
+      "require": "./compiled-object.js"
+    },
+    "./compiled-plain": {
+      "types": "./compiled-plain.d.ts",
+      "import": "./compiled-plain.mjs",
+      "require": "./compiled-plain.js"
+    },
+    "./compiled-bare": {
+      "types": "./compiled-bare.d.ts",
+      "import": "./compiled-bare.mjs",
+      "require": "./compiled-bare.js"
+    },
+    "./compiled-bare-rich": {
+      "types": "./compiled-bare-rich.d.ts",
+      "default": "./lib/compiled-bare-rich.js"
+    },
     "./lite": {
       "types": "./lite.d.ts",
       "import": "./lite.mjs",
@@ -89,7 +108,12 @@
     "./lib/aot.js": "./lib/aot.browser.js",
     "./lib/buffer-gate.js": "./lib/buffer-gate.browser.js",
     "./lib/interpreter.js": "./lib/interpreter.browser.js",
-    "./lib/aot-order.js": false
+    "./lib/aot-order.js": false,
+    "./lib/compiled-defaults.js": "./lib/compiled-defaults.browser.js",
+    "./lib/native-message.js": "./lib/native.browser.js",
+    "./lib/native-codes.js": "./lib/native.browser.js",
+    "./lib/email-literal.js": false,
+    "./lib/native-positions.js": "./lib/native.browser.js"
   },
   "scripts": {
     "prepublishOnly": "node tests/test_pack_purity.js && ATA_ALLOW_DOC_PLACEHOLDERS=1 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",
@@ -173,6 +197,16 @@
     "compiled-verdict.js",
     "compiled-verdict.mjs",
     "compiled-verdict.d.ts",
+    "compiled-object.js",
+    "compiled-object.mjs",
+    "compiled-object.d.ts",
+    "compiled-plain.js",
+    "compiled-plain.mjs",
+    "compiled-plain.d.ts",
+    "compiled-bare.js",
+    "compiled-bare.mjs",
+    "compiled-bare.d.ts",
+    "compiled-bare-rich.d.ts",
     "lite.js",
     "lite.mjs",
     "lite.d.ts",
@@ -187,13 +221,13 @@
     "codegen.d.ts"
   ],
   "optionalDependencies": {
-    "@ata-validator/native-darwin-arm64": "1.61.0",
-    "@ata-validator/native-darwin-x64": "1.61.0",
-    "@ata-validator/native-linux-arm64-gnu": "1.61.0",
-    "@ata-validator/native-linux-arm64-musl": "1.61.0",
-    "@ata-validator/native-linux-x64-gnu": "1.61.0",
-    "@ata-validator/native-linux-x64-musl": "1.61.0",
-    "@ata-validator/native-win32-x64": "1.61.0"
+    "@ata-validator/native-darwin-arm64": "1.61.1",
+    "@ata-validator/native-darwin-x64": "1.61.1",
+    "@ata-validator/native-linux-arm64-gnu": "1.61.1",
+    "@ata-validator/native-linux-arm64-musl": "1.61.1",
+    "@ata-validator/native-linux-x64-gnu": "1.61.1",
+    "@ata-validator/native-linux-x64-musl": "1.61.1",
+    "@ata-validator/native-win32-x64": "1.61.1"
   },
   "peerDependencies": {
     "yaml": "^2.0.0"