ata-validator 1.61.2 → 1.62.0

package/lib/js-compiler-errors.js

@@ -9,7 +9,7 @@ const { compileFunction } = require('./compile-fn')
 // the first call that compiles errors. Everything here was written as part
 // of js-compiler.js and reads its helpers from that module's _internal.
 const core = require('./js-compiler')
-const { ownHead, plainFlag, hasConstraints, assertEmitted, prepareForCodegen, sharedCodegenGate, codegenSafe, isSimplePN, hasUnresolvableRef, needsBaseTracking, _cpLen, sharedRt, DECLINE, bindRt, compileSafe, emitGuardState, withPlain, REF_NEUTRAL_SIBLINGS, resolveCrossSchemaRef, enumCondition, enumOperand, emitDeq, emitConstant, ownGuard, ownKeyExpr, multipleOfBad, compilePatternInline, useSafeEngine, reFlags, FORMAT_CODEGEN, PROTO_NAMES, setOwn, nestedGenCode, compileToJSCodegen, SKIP_VALUE_KEYS, skipString, CYCLE_DEPTH, cyclicDefNames, sharedDefNames, reFlagArg, hoistOnce, PTR_ESC_HELPER, unevalContributions, emitUq, uqSources, safeReClosure, fastPrefixCheck, replaceTopLevel, refTargetFor, genCode, addLocalAnnotations, addTopApplicatorAnnotations, protoIs, ANNOT_APPLICATORS, SIZE_SKIPS, emitRootGuard, emitGuardedRun, keyLoopEligible, SAME_KEYS_HELPER, seqTag } = core._internal
+const { ownHead, plainFlag, hasConstraints, assertEmitted, prepareForCodegen, sharedCodegenGate, codegenSafe, isSimplePN, hasUnresolvableRef, needsBaseTracking, _cpLen, sharedRt, DECLINE, bindRt, compileSafe, emitGuardState, withPlain, REF_NEUTRAL_SIBLINGS, resolveCrossSchemaRef, enumCondition, enumOperand, emitDeq, emitConstant, ownGuard, ownKeyExpr, multipleOfBad, compilePatternInline, useSafeEngine, reFlags, FORMAT_CODEGEN, PROTO_NAMES, setOwn, nestedGenCode, compileToJSCodegen, SKIP_VALUE_KEYS, skipString, CYCLE_DEPTH, cyclicDefNames, sharedDefNames, reFlagArg, hoistOnce, PTR_ESC_HELPER, unevalContributions, emitUq, uqSources, safeReClosure, fastPrefixCheck, replaceTopLevel, refTargetFor, genCode, addLocalAnnotations, addTopApplicatorAnnotations, protoIs, ANNOT_APPLICATORS, SIZE_SKIPS, emitRootGuard, emitGuardedRun, keyLoopEligible, SAME_KEYS_HELPER, seqTag, numLit, userFormatFn, bindUserFormat, formatNameOf } = core._internal
 
 
 function emitPtrEsc(ctx) {
@@ -105,9 +105,15 @@ function buildErrorLiteral (opts) {
     if (hit) {
       // Support both {line,col,text} (raw output of buildPositionMap) and
       // [line,col,text] (compact form passed by callers that pre-flattened).
-      const line = Array.isArray(hit) ? hit[0] : hit.line
-      const col = Array.isArray(hit) ? hit[1] : hit.col
-      const text = Array.isArray(hit) ? hit[2] : hit.text
+      // The row comes from the caller's `sourceMap` option and is written
+      // into source, so a line or column that is not an integer is written
+      // as 0 and the text only as a JSON string: a string line ran as code.
+      const rawLine = Array.isArray(hit) ? hit[0] : hit.line
+      const rawCol = Array.isArray(hit) ? hit[1] : hit.col
+      const rawText = Array.isArray(hit) ? hit[2] : hit.text
+      const line = Number.isInteger(rawLine) ? rawLine : 0
+      const col = Number.isInteger(rawCol) ? rawCol : 0
+      const text = typeof rawText === 'string' ? rawText : ''
       if (sourceMap.frames && text.length > FRAME_INLINE_MAX) {
         // A long source line is written once at module scope (see
         // sourceFrameDecls in aot-impl.js) and the literal names it. Inlined,
@@ -419,13 +425,7 @@ function compileToJSCodegenWithErrors(schema, schemaMap, userFormats, sourceOpts
     fn._sharedHelpers = ctx.shared ? ctx.shared.slice() : []
     fn._usesSafeRe = !!ctx.usesSafeRe
     if (cvars.length) {
-      fn._formatClosures = cvars.map((name, i) => {
-        let format = null
-        for (const key of Object.keys(ctx.userFormats)) {
-          if (ctx.userFormats[key] === cvals[i]) { format = key; break }
-        }
-        return { name, fn: cvals[i], format }
-      })
+      fn._formatClosures = cvars.map((name, i) => ({ name, fn: cvals[i], format: formatNameOf(ctx, name) }))
     }
     return fn
   } catch (e) {
@@ -1183,26 +1183,26 @@ function genCodeENode(schema, v, pathExpr, lines, ctx, schemaPrefix) {
 
   // numeric
   if (schema.minimum !== undefined) {
-    const c = isNum ? `${v}<${schema.minimum}` : `typeof ${v}==='number'&&${v}<${schema.minimum}`
-    lines.push(`if(${c}){${fail('minimum', 'minimum', `{comparison:'>=',limit:${schema.minimum}}`, `'must be >= ${schema.minimum}'`)}}`)
+    const c = isNum ? `${v}<${numLit(schema.minimum)}` : `typeof ${v}==='number'&&${v}<${numLit(schema.minimum)}`
+    lines.push(`if(${c}){${fail('minimum', 'minimum', `{comparison:'>=',limit:${numLit(schema.minimum)}}`, `'must be >= ${numLit(schema.minimum)}'`)}}`)
   }
   if (schema.maximum !== undefined) {
-    const c = isNum ? `${v}>${schema.maximum}` : `typeof ${v}==='number'&&${v}>${schema.maximum}`
-    lines.push(`if(${c}){${fail('maximum', 'maximum', `{comparison:'<=',limit:${schema.maximum}}`, `'must be <= ${schema.maximum}'`)}}`)
+    const c = isNum ? `${v}>${numLit(schema.maximum)}` : `typeof ${v}==='number'&&${v}>${numLit(schema.maximum)}`
+    lines.push(`if(${c}){${fail('maximum', 'maximum', `{comparison:'<=',limit:${numLit(schema.maximum)}}`, `'must be <= ${numLit(schema.maximum)}'`)}}`)
   }
   if (schema.exclusiveMinimum !== undefined) {
-    const c = isNum ? `${v}<=${schema.exclusiveMinimum}` : `typeof ${v}==='number'&&${v}<=${schema.exclusiveMinimum}`
-    lines.push(`if(${c}){${fail('exclusiveMinimum', 'exclusiveMinimum', `{comparison:'>',limit:${schema.exclusiveMinimum}}`, `'must be > ${schema.exclusiveMinimum}'`)}}`)
+    const c = isNum ? `${v}<=${numLit(schema.exclusiveMinimum)}` : `typeof ${v}==='number'&&${v}<=${numLit(schema.exclusiveMinimum)}`
+    lines.push(`if(${c}){${fail('exclusiveMinimum', 'exclusiveMinimum', `{comparison:'>',limit:${numLit(schema.exclusiveMinimum)}}`, `'must be > ${numLit(schema.exclusiveMinimum)}'`)}}`)
   }
   if (schema.exclusiveMaximum !== undefined) {
-    const c = isNum ? `${v}>=${schema.exclusiveMaximum}` : `typeof ${v}==='number'&&${v}>=${schema.exclusiveMaximum}`
-    lines.push(`if(${c}){${fail('exclusiveMaximum', 'exclusiveMaximum', `{comparison:'<',limit:${schema.exclusiveMaximum}}`, `'must be < ${schema.exclusiveMaximum}'`)}}`)
+    const c = isNum ? `${v}>=${numLit(schema.exclusiveMaximum)}` : `typeof ${v}==='number'&&${v}>=${numLit(schema.exclusiveMaximum)}`
+    lines.push(`if(${c}){${fail('exclusiveMaximum', 'exclusiveMaximum', `{comparison:'<',limit:${numLit(schema.exclusiveMaximum)}}`, `'must be < ${numLit(schema.exclusiveMaximum)}'`)}}`)
   }
   if (schema.multipleOf !== undefined) {
-    const m = schema.multipleOf
+    const m = numLit(schema.multipleOf)
     const ci = ctx.varCounter++
     // Use tolerance-based check for floating point (matches C++ behavior)
-    lines.push(`{if(typeof ${v}==='number'&&${multipleOfBad(v, m)}){${fail('multipleOf', 'multipleOf', `{multipleOf:${m}}`, `'must be multiple of ${m}'`)}}}`)
+    lines.push(`{if(typeof ${v}==='number'&&${multipleOfBad(v, schema.multipleOf)}){${fail('multipleOf', 'multipleOf', `{multipleOf:${m}}`, `'must be multiple of ${m}'`)}}}`)
   }
 
   // string length — same s.length fast paths as the boolean codegen above.
@@ -1210,13 +1210,13 @@ function genCodeENode(schema, v, pathExpr, lines, ctx, schemaPrefix) {
   // 2*M <= length <= X passes without scanning. Only call _cpLen in the
   // uncertain band (caches it so it isn't called twice when both bounds are set).
   if (schema.minLength !== undefined) {
-    const M = schema.minLength
+    const M = +numLit(schema.minLength)
     const inner = `${v}.length<${M}||(${v}.length<${M * 2}&&_cpLen(${v})<${M})`
     const c = isStr ? inner : `typeof ${v}==='string'&&(${inner})`
     lines.push(`if(${c}){${fail('minLength', 'minLength', `{limit:${M}}`, `'must NOT have fewer than ${M} characters'`)}}`)
   }
   if (schema.maxLength !== undefined) {
-    const X = schema.maxLength
+    const X = +numLit(schema.maxLength)
     const inner = `${v}.length>${X * 2}||(${v}.length>${X}&&_cpLen(${v})>${X})`
     const c = isStr ? inner : `typeof ${v}==='string'&&(${inner})`
     lines.push(`if(${c}){${fail('maxLength', 'maxLength', `{limit:${X}}`, `'must NOT have more than ${X} characters'`)}}`)
@@ -1243,8 +1243,11 @@ function genCodeENode(schema, v, pathExpr, lines, ctx, schemaPrefix) {
       lines.push(`if(${c}){${fail('pattern', 'pattern', `{pattern:${JSON.stringify(schema.pattern)}}`, JSON.stringify(`must match pattern "${schema.pattern}"`))}}`)
     }
   }
-  if (schema.format) {
-    const fc = FORMAT_CODEGEN[schema.format]
+  // The caller's function for the format wins over the built-in check, as
+  // the interpreted engine reads the option; a format named '' is a name.
+  if (typeof schema.format === 'string') {
+    const uf = userFormatFn(ctx.userFormats, schema.format)
+    const fc = uf === null && Object.hasOwn(FORMAT_CODEGEN, schema.format) ? FORMAT_CODEGEN[schema.format] : null
     const fmtSp = `${schemaPrefix}/format`
     const fmtLit = buildErrorLiteral({ keyword: 'format', format: schema.format, schemaPath: fmtSp, sourceMap: ctx.sourceMap })
     const failPush = `_e.push({code:'${fmtLit.codeStr}',keyword:'format',instancePath:${pathExpr||'""'},schemaPath:'${fmtSp}'${ordinalField(ctx, `${fmtSp}`)},params:{format:'${esc(schema.format)}'},message:'must match format "${esc(schema.format)}"',docUrl:'${fmtLit.docUrl}'${fmtLit.frame}});if(!_all)return{valid:false,errors:_e}`
@@ -1256,17 +1259,12 @@ function genCodeENode(schema, v, pathExpr, lines, ctx, schemaPrefix) {
       const ri = ctx.varCounter++
       const fmtCode = fc(v, isStr, ctx).replace(/return false/g, `{${failPush};break _fmt${ri}}`)
       lines.push(`_fmt${ri}:{${fmtCode}}`)
-    } else if (ctx.userFormats && typeof ctx.userFormats[schema.format] === 'function') {
+    } else if (uf !== null) {
       // User-supplied format checker on the error path: the same closure
       // plumbing as the boolean codegen. The function is bound as a parameter
       // of the compiled error function; bundle output serializes it via
       // Function#toString separately.
-      const safeName = schema.format.replace(/[^a-zA-Z0-9_]/g, '_')
-      const closureName = `_uf_${safeName}`
-      if (ctx.closureVars && !ctx.closureVars.includes(closureName)) {
-        ctx.closureVars.push(closureName)
-        ctx.closureVals.push(ctx.userFormats[schema.format])
-      }
+      const closureName = bindUserFormat(ctx, schema.format, uf)
       const guard = isStr ? '' : `typeof ${v}==='string'&&`
       lines.push(`if(${guard}!${closureName}(${v})){${failPush}}`)
     }
@@ -1274,12 +1272,12 @@ function genCodeENode(schema, v, pathExpr, lines, ctx, schemaPrefix) {
 
   // array size
   if (schema.minItems !== undefined) {
-    const c = isArr ? `${v}.length<${schema.minItems}` : `Array.isArray(${v})&&${v}.length<${schema.minItems}`
-    lines.push(`if(${c}){${fail('minItems', 'minItems', `{limit:${schema.minItems}}`, `'must NOT have fewer than ${schema.minItems} items'`)}}`)
+    const c = isArr ? `${v}.length<${numLit(schema.minItems)}` : `Array.isArray(${v})&&${v}.length<${numLit(schema.minItems)}`
+    lines.push(`if(${c}){${fail('minItems', 'minItems', `{limit:${numLit(schema.minItems)}}`, `'must NOT have fewer than ${numLit(schema.minItems)} items'`)}}`)
   }
   if (schema.maxItems !== undefined) {
-    const c = isArr ? `${v}.length>${schema.maxItems}` : `Array.isArray(${v})&&${v}.length>${schema.maxItems}`
-    lines.push(`if(${c}){${fail('maxItems', 'maxItems', `{limit:${schema.maxItems}}`, `'must NOT have more than ${schema.maxItems} items'`)}}`)
+    const c = isArr ? `${v}.length>${numLit(schema.maxItems)}` : `Array.isArray(${v})&&${v}.length>${numLit(schema.maxItems)}`
+    lines.push(`if(${c}){${fail('maxItems', 'maxItems', `{limit:${numLit(schema.maxItems)}}`, `'must NOT have more than ${numLit(schema.maxItems)} items'`)}}`)
   }
 
   // uniqueItems — tiered: small primitive arrays use nested loop (no allocation)
@@ -1287,10 +1285,10 @@ function genCodeENode(schema, v, pathExpr, lines, ctx, schemaPrefix) {
 
   // object size
   if (schema.minProperties !== undefined) {
-    lines.push(`if(typeof ${v}==='object'&&${v}!==null&&!Array.isArray(${v})&&Object.keys(${v}).length<${schema.minProperties}){${fail('minProperties', 'minProperties', `{limit:${schema.minProperties}}`, `'must NOT have fewer than ${schema.minProperties} properties'`)}}`)
+    lines.push(`if(typeof ${v}==='object'&&${v}!==null&&!Array.isArray(${v})&&Object.keys(${v}).length<${numLit(schema.minProperties)}){${fail('minProperties', 'minProperties', `{limit:${numLit(schema.minProperties)}}`, `'must NOT have fewer than ${numLit(schema.minProperties)} properties'`)}}`)
   }
   if (schema.maxProperties !== undefined) {
-    lines.push(`if(typeof ${v}==='object'&&${v}!==null&&!Array.isArray(${v})&&Object.keys(${v}).length>${schema.maxProperties}){${fail('maxProperties', 'maxProperties', `{limit:${schema.maxProperties}}`, `'must NOT have more than ${schema.maxProperties} properties'`)}}`)
+    lines.push(`if(typeof ${v}==='object'&&${v}!==null&&!Array.isArray(${v})&&Object.keys(${v}).length>${numLit(schema.maxProperties)}){${fail('maxProperties', 'maxProperties', `{limit:${numLit(schema.maxProperties)}}`, `'must NOT have more than ${numLit(schema.maxProperties)} properties'`)}}`)
   }
 
   // additionalProperties: false. A key matched by any patternProperties
@@ -1608,10 +1606,10 @@ function genPropertyNamesE(schema, v, pathExpr, lines, ctx, schemaPrefix, fail)
     return
   }
   if (pn.minLength !== undefined) {
-    lines.push(`if(_k${ki}.length<${pn.minLength}){${fail('minLength', 'propertyNames/minLength', `{limit:${pn.minLength}}`, `'must NOT have fewer than ${pn.minLength} characters'`)}}`)
+    lines.push(`if(_k${ki}.length<${numLit(pn.minLength)}){${fail('minLength', 'propertyNames/minLength', `{limit:${numLit(pn.minLength)}}`, `'must NOT have fewer than ${numLit(pn.minLength)} characters'`)}}`)
   }
   if (pn.maxLength !== undefined) {
-    lines.push(`if(_k${ki}.length>${pn.maxLength}){${fail('maxLength', 'propertyNames/maxLength', `{limit:${pn.maxLength}}`, `'must NOT have more than ${pn.maxLength} characters'`)}}`)
+    lines.push(`if(_k${ki}.length>${numLit(pn.maxLength)}){${fail('maxLength', 'propertyNames/maxLength', `{limit:${numLit(pn.maxLength)}}`, `'must NOT have more than ${numLit(pn.maxLength)} characters'`)}}`)
   }
   if (pn.pattern) {
     const pattern = JSON.stringify(pn.pattern);
@@ -1653,8 +1651,8 @@ function genContainsE(schema, v, pathExpr, lines, ctx, schemaPrefix, fail) {
   const subLines = []
   nestedGenCode(schema.contains, `_cv`, subLines, ctx)
   const fnBody = subLines.length === 0 ? `return true` : `${subLines.join(';')};return true`
-  const minC = schema.minContains !== undefined ? schema.minContains : 1
-  const maxC = schema.maxContains
+  const minC = schema.minContains !== undefined ? numLit(schema.minContains) : 1
+  const maxC = schema.maxContains !== undefined ? numLit(schema.maxContains) : undefined
   lines.push(`if(Array.isArray(${v})){const _cf${ci}=function(_cv){${fnBody}};let _cc${ci}=0;for(let _ci${ci}=0;_ci${ci}<${v}.length;_ci${ci}++){if(_cf${ci}(${v}[_ci${ci}]))_cc${ci}++}`)
   lines.push(`if(_cc${ci}<${minC}){${fail('contains', 'contains', `{minContains:${minC}}`, `'must contain at least ${minC} valid item(s)'`)}}`)
   if (maxC !== undefined) {
@@ -2494,25 +2492,25 @@ function genCodeCNode(schema, v, pathExpr, lines, ctx, schemaPrefix) {
   }
 
   // numeric — skip type guard if known
-  if (schema.minimum !== undefined) { const c = isNum ? `${v}<${schema.minimum}` : `typeof ${v}==='number'&&${v}<${schema.minimum}`; lines.push(`if(${c}){${fail('minimum', 'minimum', `{comparison:'>=',limit:${schema.minimum}}`, `'must be >= ${schema.minimum}'`)}}`) }
-  if (schema.maximum !== undefined) { const c = isNum ? `${v}>${schema.maximum}` : `typeof ${v}==='number'&&${v}>${schema.maximum}`; lines.push(`if(${c}){${fail('maximum', 'maximum', `{comparison:'<=',limit:${schema.maximum}}`, `'must be <= ${schema.maximum}'`)}}`) }
-  if (schema.exclusiveMinimum !== undefined) { const c = isNum ? `${v}<=${schema.exclusiveMinimum}` : `typeof ${v}==='number'&&${v}<=${schema.exclusiveMinimum}`; lines.push(`if(${c}){${fail('exclusiveMinimum', 'exclusiveMinimum', `{comparison:'>',limit:${schema.exclusiveMinimum}}`, `'must be > ${schema.exclusiveMinimum}'`)}}`) }
-  if (schema.exclusiveMaximum !== undefined) { const c = isNum ? `${v}>=${schema.exclusiveMaximum}` : `typeof ${v}==='number'&&${v}>=${schema.exclusiveMaximum}`; lines.push(`if(${c}){${fail('exclusiveMaximum', 'exclusiveMaximum', `{comparison:'<',limit:${schema.exclusiveMaximum}}`, `'must be < ${schema.exclusiveMaximum}'`)}}`) }
+  if (schema.minimum !== undefined) { const c = isNum ? `${v}<${numLit(schema.minimum)}` : `typeof ${v}==='number'&&${v}<${numLit(schema.minimum)}`; lines.push(`if(${c}){${fail('minimum', 'minimum', `{comparison:'>=',limit:${numLit(schema.minimum)}}`, `'must be >= ${numLit(schema.minimum)}'`)}}`) }
+  if (schema.maximum !== undefined) { const c = isNum ? `${v}>${numLit(schema.maximum)}` : `typeof ${v}==='number'&&${v}>${numLit(schema.maximum)}`; lines.push(`if(${c}){${fail('maximum', 'maximum', `{comparison:'<=',limit:${numLit(schema.maximum)}}`, `'must be <= ${numLit(schema.maximum)}'`)}}`) }
+  if (schema.exclusiveMinimum !== undefined) { const c = isNum ? `${v}<=${numLit(schema.exclusiveMinimum)}` : `typeof ${v}==='number'&&${v}<=${numLit(schema.exclusiveMinimum)}`; lines.push(`if(${c}){${fail('exclusiveMinimum', 'exclusiveMinimum', `{comparison:'>',limit:${numLit(schema.exclusiveMinimum)}}`, `'must be > ${numLit(schema.exclusiveMinimum)}'`)}}`) }
+  if (schema.exclusiveMaximum !== undefined) { const c = isNum ? `${v}>=${numLit(schema.exclusiveMaximum)}` : `typeof ${v}==='number'&&${v}>=${numLit(schema.exclusiveMaximum)}`; lines.push(`if(${c}){${fail('exclusiveMaximum', 'exclusiveMaximum', `{comparison:'<',limit:${numLit(schema.exclusiveMaximum)}}`, `'must be < ${numLit(schema.exclusiveMaximum)}'`)}}`) }
   if (schema.multipleOf !== undefined) {
-    const m = schema.multipleOf
+    const m = numLit(schema.multipleOf)
     const ci = ctx.varCounter++
-    lines.push(`{if(typeof ${v}==='number'&&${multipleOfBad(v, m)}){${fail('multipleOf', 'multipleOf', `{multipleOf:${m}}`, `'must be multiple of ${m}'`)}}}`)
+    lines.push(`{if(typeof ${v}==='number'&&${multipleOfBad(v, schema.multipleOf)}){${fail('multipleOf', 'multipleOf', `{multipleOf:${m}}`, `'must be multiple of ${m}'`)}}}`)
   }
 
   // string length — s.length fast paths, _cpLen only in the uncertain band.
   if (schema.minLength !== undefined) {
-    const M = schema.minLength
+    const M = +numLit(schema.minLength)
     const inner = `${v}.length<${M}||(${v}.length<${M * 2}&&_cpLen(${v})<${M})`
     const c = isStr ? inner : `typeof ${v}==='string'&&(${inner})`
     lines.push(`if(${c}){${fail('minLength', 'minLength', `{limit:${M}}`, `'must NOT have fewer than ${M} characters'`)}}`)
   }
   if (schema.maxLength !== undefined) {
-    const X = schema.maxLength
+    const X = +numLit(schema.maxLength)
     const inner = `${v}.length>${X * 2}||(${v}.length>${X}&&_cpLen(${v})>${X})`
     const c = isStr ? inner : `typeof ${v}==='string'&&(${inner})`
     lines.push(`if(${c}){${fail('maxLength', 'maxLength', `{limit:${X}}`, `'must NOT have more than ${X} characters'`)}}`)
@@ -2531,36 +2529,32 @@ function genCodeCNode(schema, v, pathExpr, lines, ctx, schemaPrefix) {
       lines.push(`if(${c}){${fail('pattern', 'pattern', `{pattern:${JSON.stringify(schema.pattern)}}`, JSON.stringify(`must match pattern "${schema.pattern}"`))}}`)
     }
   }
-  if (schema.format) {
-    const fc = FORMAT_CODEGEN[schema.format]
+  if (typeof schema.format === 'string') {
+    const uf = userFormatFn(ctx.userFormats, schema.format)
+    const fc = uf === null && Object.hasOwn(FORMAT_CODEGEN, schema.format) ? FORMAT_CODEGEN[schema.format] : null
     if (fc) {
       // Same rule as the error codegen: one violation, one error. The first
       // failing statement pushes and leaves the labeled block.
       const ri = ctx.varCounter++
       const code = fc(v, isStr, ctx).replace(/return false/g, `{${fail('format', 'format', `{format:'${esc(schema.format)}'}`, `'must match format "${esc(schema.format)}"'`)};break _fmt${ri}}`)
       lines.push(`_fmt${ri}:{${code}}`)
-    } else if (ctx.userFormats && typeof ctx.userFormats[schema.format] === 'function') {
-      const safeName = schema.format.replace(/[^a-zA-Z0-9_]/g, '_')
-      const closureName = `_uf_${safeName}`
-      if (!ctx.closureVars.includes(closureName)) {
-        ctx.closureVars.push(closureName)
-        ctx.closureVals.push(ctx.userFormats[schema.format])
-      }
+    } else if (uf !== null) {
+      const closureName = bindUserFormat(ctx, schema.format, uf)
       const guard = isStr ? '' : `typeof ${v}==='string'&&`
       lines.push(`if(${guard}!${closureName}(${v})){${fail('format', 'format', `{format:'${esc(schema.format)}'}`, `'must match format "${esc(schema.format)}"'`)}}`)
     }
   }
 
   // array size
-  if (schema.minItems !== undefined) { const c = isArr ? `${v}.length<${schema.minItems}` : `Array.isArray(${v})&&${v}.length<${schema.minItems}`; lines.push(`if(${c}){${fail('minItems', 'minItems', `{limit:${schema.minItems}}`, `'must NOT have fewer than ${schema.minItems} items'`)}}`) }
-  if (schema.maxItems !== undefined) { const c = isArr ? `${v}.length>${schema.maxItems}` : `Array.isArray(${v})&&${v}.length>${schema.maxItems}`; lines.push(`if(${c}){${fail('maxItems', 'maxItems', `{limit:${schema.maxItems}}`, `'must NOT have more than ${schema.maxItems} items'`)}}`) }
+  if (schema.minItems !== undefined) { const c = isArr ? `${v}.length<${numLit(schema.minItems)}` : `Array.isArray(${v})&&${v}.length<${numLit(schema.minItems)}`; lines.push(`if(${c}){${fail('minItems', 'minItems', `{limit:${numLit(schema.minItems)}}`, `'must NOT have fewer than ${numLit(schema.minItems)} items'`)}}`) }
+  if (schema.maxItems !== undefined) { const c = isArr ? `${v}.length>${numLit(schema.maxItems)}` : `Array.isArray(${v})&&${v}.length>${numLit(schema.maxItems)}`; lines.push(`if(${c}){${fail('maxItems', 'maxItems', `{limit:${numLit(schema.maxItems)}}`, `'must NOT have more than ${numLit(schema.maxItems)} items'`)}}`) }
 
   // uniqueItems — tiered: small primitive arrays use nested loop (no allocation)
   if (schema.uniqueItems) genUniqueItemsC(schema, v, pathExpr, lines, ctx, schemaPrefix, fail, isArr)
 
   // object size
-  if (schema.minProperties !== undefined) lines.push(`if(typeof ${v}==='object'&&${v}!==null&&!Array.isArray(${v})&&Object.keys(${v}).length<${schema.minProperties}){${fail('minProperties', 'minProperties', `{limit:${schema.minProperties}}`, `'must NOT have fewer than ${schema.minProperties} properties'`)}}`)
-  if (schema.maxProperties !== undefined) lines.push(`if(typeof ${v}==='object'&&${v}!==null&&!Array.isArray(${v})&&Object.keys(${v}).length>${schema.maxProperties}){${fail('maxProperties', 'maxProperties', `{limit:${schema.maxProperties}}`, `'must NOT have more than ${schema.maxProperties} properties'`)}}`)
+  if (schema.minProperties !== undefined) lines.push(`if(typeof ${v}==='object'&&${v}!==null&&!Array.isArray(${v})&&Object.keys(${v}).length<${numLit(schema.minProperties)}){${fail('minProperties', 'minProperties', `{limit:${numLit(schema.minProperties)}}`, `'must NOT have fewer than ${numLit(schema.minProperties)} properties'`)}}`)
+  if (schema.maxProperties !== undefined) lines.push(`if(typeof ${v}==='object'&&${v}!==null&&!Array.isArray(${v})&&Object.keys(${v}).length>${numLit(schema.maxProperties)}){${fail('maxProperties', 'maxProperties', `{limit:${numLit(schema.maxProperties)}}`, `'must NOT have more than ${numLit(schema.maxProperties)} properties'`)}}`)
 
   // additionalProperties — skip if patternProperties present (handled in unified loop below)
   // Small property sets: direct === chain (no Set allocation)
@@ -2846,7 +2840,11 @@ function annotNames (node, ctx, names, seen, top) {
     for (const k of ANNOT_BLOCKERS) if (node[k] !== undefined) return false
     if (!top && node.unevaluatedProperties !== undefined && node.unevaluatedProperties !== true) return false
     const add = (key) => { if (!names.has(key)) { if (names.size >= ANNOT_NAME_MAX) return false; names.set(key, names.size) } return true }
-    if (node.properties && typeof node.properties === 'object') for (const k of Object.keys(node.properties)) if (!add(k)) return false
+    // One table holds the declared names, the patterns as '/' + pattern
+    // and the all bit: a declared name that starts with '/' or equals the
+    // all bit's key would be read as one of those (a property named '/x'
+    // let 'axb' through as if it matched /x/), so the inline form declines.
+    if (node.properties && typeof node.properties === 'object') for (const k of Object.keys(node.properties)) if (k[0] === '/' || k === ALL_BIT_KEY || !add(k)) return false
     if (node.patternProperties && typeof node.patternProperties === 'object') for (const pat of Object.keys(node.patternProperties)) if (!add('/' + pat)) return false
     if ((!top && node.additionalProperties !== undefined) || (!top && node.unevaluatedProperties === true)) if (!add(ALL_BIT_KEY)) return false
     let subs
@@ -3475,8 +3473,8 @@ function genPatternPropertiesC(schema, v, pathExpr, lines, ctx, schemaPrefix, fa
     lines.push(`${guard}{${ownHead(ctx, v, kVar, 'const')}{`)
     // propertyNames checks (merged)
     if (pn) {
-      if (pn.minLength !== undefined) lines.push(`if(${kVar}.length<${pn.minLength}){${fail('minLength', 'propertyNames/minLength', `{limit:${pn.minLength}}`, `'must NOT have fewer than ${pn.minLength} characters'`)}}`)
-      if (pn.maxLength !== undefined) lines.push(`if(${kVar}.length>${pn.maxLength}){${fail('maxLength', 'propertyNames/maxLength', `{limit:${pn.maxLength}}`, `'must NOT have more than ${pn.maxLength} characters'`)}}`)
+      if (pn.minLength !== undefined) lines.push(`if(${kVar}.length<${numLit(pn.minLength)}){${fail('minLength', 'propertyNames/minLength', `{limit:${numLit(pn.minLength)}}`, `'must NOT have fewer than ${numLit(pn.minLength)} characters'`)}}`)
+      if (pn.maxLength !== undefined) lines.push(`if(${kVar}.length>${numLit(pn.maxLength)}){${fail('maxLength', 'propertyNames/maxLength', `{limit:${numLit(pn.maxLength)}}`, `'must NOT have more than ${numLit(pn.maxLength)} characters'`)}}`)
       if (pn.pattern) {
         const fast = fastPrefixCheck(pn.pattern, kVar)
         if (fast) {
@@ -3511,8 +3509,8 @@ function genPatternPropertiesC(schema, v, pathExpr, lines, ctx, schemaPrefix, fa
     handledPropertyNames = !!pn
     lines.push(`${guard}{${ownHead(ctx, v, kVar, 'const')}{`)
     if (pn) {
-      if (pn.minLength !== undefined) lines.push(`if(${kVar}.length<${pn.minLength}){${fail('minLength', 'propertyNames/minLength', `{limit:${pn.minLength}}`, `'must NOT have fewer than ${pn.minLength} characters'`)}}`)
-      if (pn.maxLength !== undefined) lines.push(`if(${kVar}.length>${pn.maxLength}){${fail('maxLength', 'propertyNames/maxLength', `{limit:${pn.maxLength}}`, `'must NOT have more than ${pn.maxLength} characters'`)}}`)
+      if (pn.minLength !== undefined) lines.push(`if(${kVar}.length<${numLit(pn.minLength)}){${fail('minLength', 'propertyNames/minLength', `{limit:${numLit(pn.minLength)}}`, `'must NOT have fewer than ${numLit(pn.minLength)} characters'`)}}`)
+      if (pn.maxLength !== undefined) lines.push(`if(${kVar}.length>${numLit(pn.maxLength)}){${fail('maxLength', 'propertyNames/maxLength', `{limit:${numLit(pn.maxLength)}}`, `'must NOT have more than ${numLit(pn.maxLength)} characters'`)}}`)
       if (pn.pattern) {
         const fast = fastPrefixCheck(pn.pattern, kVar)
         if (fast) {
@@ -3570,10 +3568,10 @@ function genPropertyNamesC(schema, v, pathExpr, lines, ctx, schemaPrefix, fail)
     return
   }
   if (pn.minLength !== undefined) {
-    lines.push(`if(_k${ki}.length<${pn.minLength}){${fail('minLength', 'propertyNames/minLength', `{limit:${pn.minLength}}`, `'must NOT have fewer than ${pn.minLength} characters'`)}}`)
+    lines.push(`if(_k${ki}.length<${numLit(pn.minLength)}){${fail('minLength', 'propertyNames/minLength', `{limit:${numLit(pn.minLength)}}`, `'must NOT have fewer than ${numLit(pn.minLength)} characters'`)}}`)
   }
   if (pn.maxLength !== undefined) {
-    lines.push(`if(_k${ki}.length>${pn.maxLength}){${fail('maxLength', 'propertyNames/maxLength', `{limit:${pn.maxLength}}`, `'must NOT have more than ${pn.maxLength} characters'`)}}`)
+    lines.push(`if(_k${ki}.length>${numLit(pn.maxLength)}){${fail('maxLength', 'propertyNames/maxLength', `{limit:${numLit(pn.maxLength)}}`, `'must NOT have more than ${numLit(pn.maxLength)} characters'`)}}`)
   }
   if (pn.pattern) {
     const ri = ctx.varCounter++
@@ -3607,8 +3605,8 @@ function genContainsC(schema, v, pathExpr, lines, ctx, schemaPrefix, fail) {
   const subLines = []
   nestedGenCode(schema.contains, `_cv`, subLines, ctx)
   const fnBody = subLines.length === 0 ? `return true` : `${subLines.join(';')};return true`
-  const minC = schema.minContains !== undefined ? schema.minContains : 1
-  const maxC = schema.maxContains
+  const minC = schema.minContains !== undefined ? numLit(schema.minContains) : 1
+  const maxC = schema.maxContains !== undefined ? numLit(schema.maxContains) : undefined
   lines.push(`if(Array.isArray(${v})){const _cf${ci}=function(_cv){${fnBody}};let _cc${ci}=0;for(let _ci${ci}=0;_ci${ci}<${v}.length;_ci${ci}++){if(_cf${ci}(${v}[_ci${ci}]))_cc${ci}++}`)
   lines.push(`if(_cc${ci}<${minC}){${fail('contains', 'contains', `{minContains:${minC}}`, `'must contain at least ${minC} valid item(s)'`)}}`)
   if (maxC !== undefined) lines.push(`if(_cc${ci}>${maxC}){${fail('contains', 'contains', `{minContains:${minC},maxContains:${maxC}}`, `'must NOT contain more than ${maxC} valid item(s)'`)}}`)