eyeling 1.28.6 → 1.28.8

package/lib/builtins.js

@@ -1168,7 +1168,7 @@ function parseIntegerDatatypeValue(lexical, dt) {
 }
 
 function parseDecimalDatatypeValue(lexical) {
-  const parsed = parseXsdDecimalToBigIntScale(String(lexical));
+  const parsed = parseXsdDecimalToBigIntScale(String(lexical), { trim: false });
   if (!parsed) return null;
   const canonicalLex = canonicalDecimalLexFromParts(parsed.num, parsed.scale);
   return {
@@ -1294,58 +1294,93 @@ function parseAnyUriDatatypeValue(lexical) {
   };
 }
 
-function isLeapYearNumber(year) {
-  if (year % 400 === 0) return true;
-  if (year % 100 === 0) return false;
-  return year % 4 === 0;
+function isLeapYearBigInt(year) {
+  if (year % 400n === 0n) return true;
+  if (year % 100n === 0n) return false;
+  return year % 4n === 0n;
 }
 
-function daysInMonthNumber(year, month) {
-  if (month === 2) return isLeapYearNumber(year) ? 29 : 28;
+function daysInMonthBigInt(year, month) {
+  if (month === 2) return isLeapYearBigInt(year) ? 29 : 28;
   return [4, 6, 9, 11].includes(month) ? 30 : 31;
 }
 
-function floorDivNumber(a, b) {
-  return Math.floor(a / b);
+function floorDivBigInt(a, b) {
+  let q = a / b;
+  const r = a % b;
+  if (r !== 0n && ((r > 0n) !== (b > 0n))) q -= 1n;
+  return q;
 }
 
-function daysFromCivilNumber(year, month, day) {
+function daysFromCivilBigInt(year, month, day) {
   let y = year;
-  y -= month <= 2 ? 1 : 0;
-  const era = floorDivNumber(y, 400);
-  const yoe = y - era * 400;
-  const mp = month + (month > 2 ? -3 : 9);
-  const doy = Math.floor((153 * mp + 2) / 5) + day - 1;
-  const doe = yoe * 365 + Math.floor(yoe / 4) - Math.floor(yoe / 100) + doy;
-  return era * 146097 + doe - 719468;
+  if (month <= 2) y -= 1n;
+  const era = floorDivBigInt(y, 400n);
+  const yoe = y - era * 400n;
+  const mp = BigInt(month + (month > 2 ? -3 : 9));
+  const doy = (153n * mp + 2n) / 5n + BigInt(day) - 1n;
+  const doe = yoe * 365n + yoe / 4n - yoe / 100n + doy;
+  return era * 146097n + doe - 719468n;
+}
+
+function civilFromDaysBigInt(days) {
+  const z = days + 719468n;
+  const era = floorDivBigInt(z, 146097n);
+  const doe = z - era * 146097n;
+  const yoe = (doe - doe / 1460n + doe / 36524n - doe / 146096n) / 365n;
+  let year = yoe + era * 400n;
+  const doy = doe - (365n * yoe + yoe / 4n - yoe / 100n);
+  const mp = (5n * doy + 2n) / 153n;
+  const day = doy - (153n * mp + 2n) / 5n + 1n;
+  const month = mp < 10n ? mp + 3n : mp - 9n;
+  if (month <= 2n) year += 1n;
+  return { year, month: Number(month), day: Number(day) };
+}
+
+function isValidXsdYearLex(s) {
+  const body = s.startsWith('-') ? s.slice(1) : s;
+  if (!/^\d{4,}$/.test(body)) return false;
+  return body.length === 4 || body[0] !== '0';
+}
+
+function canonicalYearLex(year) {
+  if (year < 0n) return `-${(-year).toString().padStart(4, '0')}`;
+  return year.toString().padStart(4, '0');
+}
+
+function formatDateTimeLocalKey(year, month, day, hour, minute, second, frac) {
+  return `${canonicalYearLex(year)}-${String(month).padStart(2, '0')}-${String(day).padStart(2, '0')}T${String(hour).padStart(2, '0')}:${String(minute).padStart(2, '0')}:${String(second).padStart(2, '0')}${frac ? `.${frac}` : ''}`;
 }
 
 function parseDateTimeDatatypeValue(lexical, dt) {
   const s = String(lexical);
   const m = /^(-?\d{4,})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2})(?:\.(\d+))?(Z|[+-]\d{2}:\d{2})?$/.exec(s);
-  if (!m) return null;
+  if (!m || !isValidXsdYearLex(m[1])) return null;
 
-  const year = Number(m[1]);
-  const month = Number(m[2]);
+  const year = BigInt(m[1]);
+  let month = Number(m[2]);
   let day = Number(m[3]);
   let hour = Number(m[4]);
   const minute = Number(m[5]);
   const second = Number(m[6]);
   let frac = m[7] || '';
   const tz = m[8] || null;
-  if (!Number.isSafeInteger(year)) return null;
   if (dt === XSD_DATETIME_STAMP_DT && !tz) return null;
   if (!(month >= 1 && month <= 12)) return null;
-  if (!(day >= 1 && day <= daysInMonthNumber(year, month))) return null;
+  if (!(day >= 1 && day <= daysInMonthBigInt(year, month))) return null;
   if (!(minute >= 0 && minute <= 59)) return null;
   if (!(second >= 0 && second <= 59)) return null;
+
+  let dayCount = daysFromCivilBigInt(year, month, day);
+  let normalizedYear = year;
   if (hour === 24) {
     if (minute !== 0 || second !== 0 || /[1-9]/.test(frac)) return null;
     hour = 0;
-    const d = new Date(Date.UTC(year, month - 1, day));
-    d.setUTCFullYear(year);
-    d.setUTCDate(d.getUTCDate() + 1);
-    day = d.getUTCDate();
+    dayCount += 1n;
+    const civil = civilFromDaysBigInt(dayCount);
+    normalizedYear = civil.year;
+    month = civil.month;
+    day = civil.day;
   } else if (!(hour >= 0 && hour <= 23)) {
     return null;
   }
@@ -1368,11 +1403,10 @@ function parseDateTimeDatatypeValue(lexical, dt) {
     }
   }
 
-  const dayCount = daysFromCivilNumber(year, month, day);
-  let totalSeconds = BigInt(dayCount) * 86400n + BigInt(hour * 3600 + minute * 60 + second);
+  let totalSeconds = dayCount * 86400n + BigInt(hour * 3600 + minute * 60 + second);
   if (offsetMinutes !== null) totalSeconds -= BigInt(offsetMinutes * 60);
 
-  const localKey = `${m[1]}-${m[2]}-${String(day).padStart(2, '0')}T${String(hour).padStart(2, '0')}:${m[5]}:${m[6]}${frac ? `.${frac}` : ''}`;
+  const localKey = formatDateTimeLocalKey(normalizedYear, month, day, hour, minute, second, frac);
   const canonicalLex = canonicalDateTimeLex(totalSeconds, fracNum, fracScale, offsetMinutes !== null, localKey);
   return {
     family: 'dateTime',
@@ -1392,15 +1426,14 @@ function canonicalDateTimeLex(totalSeconds, fracNum, fracScale, hasTimezone, loc
   const frac = fracScale > 0 ? `.${fracNum.toString().padStart(fracScale, '0')}` : '';
   if (!hasTimezone) return localKey;
 
-  const minSafeSeconds = BigInt(Math.ceil(Number.MIN_SAFE_INTEGER / 1000));
-  const maxSafeSeconds = BigInt(Math.floor(Number.MAX_SAFE_INTEGER / 1000));
-  if (totalSeconds < minSafeSeconds || totalSeconds > maxSafeSeconds) return `${localKey}Z`;
-
-  const d = new Date(Number(totalSeconds) * 1000);
-  if (Number.isNaN(d.getTime())) return `${localKey}Z`;
-  let iso = d.toISOString().replace(/\.000Z$/, 'Z');
-  if (frac) iso = iso.replace('Z', `${frac}Z`);
-  return iso;
+  const secondsPerDay = 86400n;
+  const dayCount = floorDivBigInt(totalSeconds, secondsPerDay);
+  const secondOfDay = totalSeconds - dayCount * secondsPerDay;
+  const civil = civilFromDaysBigInt(dayCount);
+  const hour = Number(secondOfDay / 3600n);
+  const minute = Number((secondOfDay % 3600n) / 60n);
+  const second = Number(secondOfDay % 60n);
+  return formatDateTimeLocalKey(civil.year, civil.month, civil.day, hour, minute, second, frac) + 'Z';
 }
 
 function parseLangStringDatatypeValue(t, lexical) {
@@ -1518,7 +1551,31 @@ function evalDatatypeInspectionBuiltin(g, subst, kind) {
   return evalBindBuiltinObject(g.o, valueTerm, subst);
 }
 
+function booleanTermValue(t) {
+  const info = parseBooleanLiteralInfo(t);
+  return info ? info.value : null;
+}
+
+function makeBooleanLiteral(value) {
+  return internLiteral(value ? 'true' : 'false');
+}
+
+function evalDatatypeValidityBooleanResult(outTerm, result, subst) {
+  if (outTerm instanceof Var || outTerm instanceof Blank) return evalBindBuiltinObject(outTerm, makeBooleanLiteral(result), subst);
+  const expected = booleanTermValue(outTerm);
+  return expected === result ? [__cloneSubst(subst)] : [];
+}
+
 function evalDatatypeValidityBuiltin(g, subst, positive) {
+  if (g.s instanceof ListTerm && g.s.elems.length === 2) {
+    const [lit, dtTerm] = g.s.elems;
+    if (!(lit instanceof Literal) || !(dtTerm instanceof Iri)) return [];
+    const dt = dtTerm.value;
+    if (!isSupportedDatatypeIri(dt)) return [];
+    const ok = parseDatatypeValueForDatatype(lit, dt) !== null;
+    return evalDatatypeValidityBooleanResult(g.o, positive ? ok : !ok, subst);
+  }
+
   if (!(g.s instanceof Literal)) return [];
 
   let dt = null;
@@ -1712,8 +1769,9 @@ function formatNum(n) {
   return String(n);
 }
 
-function parseXsdDecimalToBigIntScale(s) {
-  let t = String(s).trim();
+function parseXsdDecimalToBigIntScale(s, options = null) {
+  let t = String(s);
+  if (!options || options.trim !== false) t = t.trim();
   let sign = 1n;
 
   if (t.startsWith('+')) t = t.slice(1);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eyeling",
-  "version": "1.28.6",
+  "version": "1.28.8",
   "description": "A minimal Notation3 (N3) reasoner in JavaScript.",
   "main": "./index.js",
   "keywords": [

package/test/api.test.js

@@ -66,29 +66,12 @@ function reasonQuiet(opt, input) {
   throw err;
 }
 
-const TTY = process.stdout.isTTY;
-const C = TTY
-  ? { g: '\x1b[32m', r: '\x1b[31m', y: '\x1b[33m', dim: '\x1b[2m', n: '\x1b[0m' }
-  : { g: '', r: '', y: '', dim: '', n: '' };
-
-function ok(msg) {
-  console.log(`${C.g}OK ${C.n} ${msg}`);
-}
-function info(msg) {
-  console.log(`${C.y}==${C.n} ${msg}`);
-}
-function fail(msg) {
-  console.error(`${C.r}FAIL${C.n} ${msg}`);
-}
+const { detail, failResult, info, pass } = require('./report');
 
 function unnumberedName(name) {
   return String(name).replace(/^\d+[a-z]*\s+/i, '');
 }
 
-function numberedName(index, name) {
-  return `${String(index + 1).padStart(3, '0')} ${unnumberedName(name)}`;
-}
-
 function msNow() {
   return Date.now();
 }
@@ -3172,7 +3155,8 @@ let failed = 0;
   info(`Running ${cases.length} API tests (independent of examples/)`);
 
   for (const [index, tc] of cases.entries()) {
-    const testName = numberedName(index, tc.name);
+    const testNr = index + 1;
+    const testName = unnumberedName(tc.name);
     const start = msNow();
     try {
       const out = typeof tc.run === 'function' ? await tc.run() : reasonQuiet(tc.opt, tc.input);
@@ -3187,19 +3171,19 @@ let failed = 0;
       if (typeof tc.check === 'function') tc.check(out, tc);
 
       const dur = msNow() - start;
-      ok(`${testName} ${C.dim}(${dur} ms)${C.n}`);
+      pass(testNr, testName, dur);
       passed++;
     } catch (e) {
       const dur = msNow() - start;
 
       if (tc.expectErrorCode != null) {
         if (e && typeof e === 'object' && 'code' in e && e.code === tc.expectErrorCode) {
-          ok(`${testName} ${C.dim}(expected exit ${tc.expectErrorCode}, ${dur} ms)${C.n}`);
+          pass(testNr, `${testName} (expected exit ${tc.expectErrorCode})`, dur);
           passed++;
           continue;
         }
-        fail(`${testName} ${C.dim}(${dur} ms)${C.n}`);
-        fail(
+        failResult(testNr, testName, dur);
+        detail(
           `Expected exit code ${tc.expectErrorCode}, got: ${e && e.code != null ? e.code : 'unknown'}\n${
             e && e.stderr ? e.stderr : e && e.stack ? e.stack : String(e)
           }`,
@@ -3209,26 +3193,26 @@ let failed = 0;
       }
 
       if (tc.expectError) {
-        ok(`${testName} ${C.dim}(expected error, ${dur} ms)${C.n}`);
+        pass(testNr, `${testName} (expected error)`, dur);
         passed++;
         continue;
       }
 
-      fail(`${testName} ${C.dim}(${dur} ms)${C.n}`);
-      fail(e && e.stack ? e.stack : String(e));
+      failResult(testNr, testName, dur);
+      detail(e && e.stack ? e.stack : String(e));
       failed++;
     }
   }
 
   console.log('');
   const suiteMs = Date.now() - suiteStart;
-  console.log(`${C.y}==${C.n} Total elapsed: ${suiteMs} ms (${(suiteMs / 1000).toFixed(2)} s)`);
+  info(`Total elapsed: ${suiteMs} ms (${(suiteMs / 1000).toFixed(2)} s)`);
 
   if (failed === 0) {
-    ok(`All API tests passed (${passed}/${cases.length})`);
+    info(`All API tests passed (${passed}/${cases.length})`);
     process.exit(0);
   } else {
-    fail(`Some API tests failed (${passed}/${cases.length})`);
+    info(`Some API tests failed (${passed}/${cases.length})`);
     process.exit(1);
   }
 })();

package/test/builtins.test.js

@@ -2,20 +2,7 @@
 
 const assert = require('node:assert/strict');
 
-const TTY = process.stdout.isTTY;
-const C = TTY
-  ? { g: '\x1b[32m', r: '\x1b[31m', y: '\x1b[33m', dim: '\x1b[2m', n: '\x1b[0m' }
-  : { g: '', r: '', y: '', dim: '', n: '' };
-
-function ok(msg) {
-  console.log(`${C.g}OK ${C.n} ${msg}`);
-}
-function info(msg) {
-  console.log(`${C.y}==${C.n} ${msg}`);
-}
-function fail(msg) {
-  console.error(`${C.r}FAIL${C.n} ${msg}`);
-}
+const { detail, failResult, info, pass } = require('./report');
 
 const builtins = require('../lib/builtins');
 require('../lib/engine');
@@ -183,17 +170,25 @@ const cases = [
 { "2147483648"^^xsd:int dt:invalidForDatatype xsd:int . } => { :invalid :int true } .
 { "2"^^xsd:boolean dt:invalidForDatatype xsd:boolean . } => { :invalid :boolean true } .
 { "2026-02-31T00:00:00Z"^^xsd:dateTime dt:invalidForDatatype xsd:dateTime . } => { :invalid :dateTime true } .
+{ " 1.0 "^^xsd:decimal dt:invalidForDatatype xsd:decimal . } => { :invalid :decimalWhitespace true } .
+{ "02026-06-10T12:00:00Z"^^xsd:dateTime dt:invalidForDatatype xsd:dateTime . } => { :invalid :dateTimeYear true } .
 
 { "01"^^xsd:integer dt:sameValueAs "1.0"^^xsd:decimal . } => { :same :numeric true } .
 { "true"^^xsd:boolean dt:sameValueAs "1"^^xsd:boolean . } => { :same :boolean true } .
 { "2026-06-10T12:00:00Z"^^xsd:dateTime dt:sameValueAs "2026-06-10T14:00:00+02:00"^^xsd:dateTime . } => { :same :dateTime true } .
+{ "2026-12-31T24:00:00Z"^^xsd:dateTime dt:sameValueAs "2027-01-01T00:00:00Z"^^xsd:dateTime . } => { :same :midnightRollover true } .
 { "AQID"^^xsd:base64Binary dt:sameValueAs "010203"^^xsd:hexBinary . } => { :same :binary true } .
 { "11"^^xsd:integer dt:differentValueFrom "12"^^xsd:integer . } => { :different :numeric true } .
 
+{ ("1"^^xsd:integer xsd:integer) dt:validForDatatype true . } => { :tuple :valid true } .
+{ ("abc"^^xsd:integer xsd:integer) dt:validForDatatype false . } => { :tuple :invalidBoolean true } .
+{ ("abc"^^xsd:integer xsd:integer) dt:invalidForDatatype ?invalid . } => { :tuple :invalidResult ?invalid } .
+
 { "01"^^xsd:integer dt:canonicalLiteral ?ci . } => { :canonical :integer ?ci } .
 { "1"^^xsd:boolean dt:canonicalLiteral ?cb . } => { :canonical :boolean ?cb } .
 { " a\t b "^^xsd:token dt:canonicalLiteral ?ct . } => { :canonical :token ?ct } .
 { "2026-06-10T14:00:00+02:00"^^xsd:dateTime dt:canonicalLiteral ?cd . } => { :canonical :dateTime ?cd } .
+{ "2026-12-31T24:00:00Z"^^xsd:dateTime dt:canonicalLiteral ?cm . } => { :canonical :midnightRollover ?cm } .
 `);
 
       assert.match(out, /:integer :datatype xsd:integer \./);
@@ -205,15 +200,22 @@ const cases = [
       assert.match(out, /:invalid :int true \./);
       assert.match(out, /:invalid :boolean true \./);
       assert.match(out, /:invalid :dateTime true \./);
+      assert.match(out, /:invalid :decimalWhitespace true \./);
+      assert.match(out, /:invalid :dateTimeYear true \./);
       assert.match(out, /:same :numeric true \./);
       assert.match(out, /:same :boolean true \./);
       assert.match(out, /:same :dateTime true \./);
+      assert.match(out, /:same :midnightRollover true \./);
       assert.match(out, /:same :binary true \./);
       assert.match(out, /:different :numeric true \./);
+      assert.match(out, /:tuple :valid true \./);
+      assert.match(out, /:tuple :invalidBoolean true \./);
+      assert.match(out, /:tuple :invalidResult true \./);
       assert.match(out, /:canonical :integer "1"\^\^xsd:integer \./);
       assert.match(out, /:canonical :boolean true \./);
       assert.match(out, /:canonical :token "a b"\^\^xsd:token \./);
       assert.match(out, /:canonical :dateTime "2026-06-10T12:00:00Z"\^\^xsd:dateTime \./);
+      assert.match(out, /:canonical :midnightRollover "2027-01-01T00:00:00Z"\^\^xsd:dateTime \./);
     },
   },
 
@@ -226,25 +228,25 @@ let failed = 0;
   const suiteStart = Date.now();
   info(`Running ${cases.length} builtin contract tests`);
 
-  for (const tc of cases) {
+  for (const [index, tc] of cases.entries()) {
     const start = Date.now();
     try {
       tc.run();
-      ok(`${tc.name} ${C.dim}(${Date.now() - start} ms)${C.n}`);
+      pass(index + 1, tc.name, Date.now() - start);
       passed++;
     } catch (e) {
-      fail(`${tc.name} ${C.dim}(${Date.now() - start} ms)${C.n}`);
-      fail(e && e.stack ? e.stack : String(e));
+      failResult(index + 1, tc.name, Date.now() - start);
+      detail(e && e.stack ? e.stack : String(e));
       failed++;
     }
   }
 
   console.log('');
-  console.log(`${C.y}==${C.n} Total elapsed: ${Date.now() - suiteStart} ms`);
+  info(`Total elapsed: ${Date.now() - suiteStart} ms`);
   if (failed === 0) {
-    ok(`All builtin contract tests passed (${passed}/${cases.length})`);
+    info(`All builtin contract tests passed (${passed}/${cases.length})`);
     process.exit(0);
   }
-  fail(`Some builtin contract tests failed (${passed}/${cases.length})`);
+  info(`Some builtin contract tests failed (${passed}/${cases.length})`);
   process.exit(1);
 })();

package/test/examples.test.js

@@ -6,21 +6,7 @@ const os = require('node:os');
 const path = require('node:path');
 const cp = require('node:child_process');
 
-const TTY = process.stdout.isTTY;
-const C = TTY
-  ? { g: '\x1b[32m', r: '\x1b[31m', y: '\x1b[33m', dim: '\x1b[2m', n: '\x1b[0m' }
-  : { g: '', r: '', y: '', dim: '', n: '' };
-const msTag = (ms) => `${C.dim}(${ms} ms)${C.n}`;
-
-function ok(msg) {
-  console.log(`${C.g}OK${C.n}  ${msg}`);
-}
-function fail(msg) {
-  console.error(`${C.r}FAIL${C.n} ${msg}`);
-}
-function info(msg) {
-  console.log(`${C.y}==${C.n} ${msg}`);
-}
+const { C, detail, failResult, info, pass } = require('./report');
 
 function run(cmd, args, opts = {}) {
   return cp.spawnSync(cmd, args, {
@@ -224,11 +210,11 @@ function main() {
   const nodePath = process.execPath;
 
   if (!fs.existsSync(examplesDir)) {
-    fail(`Cannot find examples directory: ${examplesDir}`);
+    failResult(1, `Cannot find examples directory: ${examplesDir}`, 0);
     process.exit(1);
   }
   if (!fs.existsSync(eyelingJsPath)) {
-    fail(`Cannot find eyeling.js: ${eyelingJsPath}`);
+    failResult(1, `Cannot find eyeling.js: ${eyelingJsPath}`, 0);
     process.exit(1);
   }
 
@@ -252,21 +238,19 @@ function main() {
   console.log(`${C.dim}${getEyelingVersion(nodePath, eyelingJsPath, root)}; node ${process.version}${C.n}`);
 
   if (totalTests === 0) {
-    ok(proofOnly ? 'No proof goldens found in examples/proof/' : 'No .n3 files found in examples/');
+    info(proofOnly ? 'No proof goldens found in examples/proof/' : 'No .n3 files found in examples/');
     process.exit(0);
   }
 
   let passed = 0;
   let failed = 0;
 
-  // Pretty, stable numbering (e.g., 001..100 when running 100 tests)
-  const idxWidth = String(files.length).length;
-  const proofIdxWidth = String(Math.max(proofFiles.length, 1)).length;
-  const proofLabel = proofOnly ? '' : 'proof ';
+  let sequence = 0;
 
   for (let i = 0; i < files.length; i++) {
-    const idx = String(i + 1).padStart(idxWidth, '0');
+    const testNr = ++sequence;
     const file = files[i];
+    const testName = file;
 
     const start = Date.now();
 
@@ -278,8 +262,8 @@ function main() {
       n3Text = fs.readFileSync(filePath, 'utf8');
     } catch (e) {
       const ms = Date.now() - start;
-      fail(`${idx} ${file} ${msTag(ms)}`);
-      fail(`Cannot read input: ${e.message}`);
+      failResult(testNr, testName, ms);
+      detail(`Cannot read input: ${e.message}`);
       failed++;
       continue;
     }
@@ -291,8 +275,8 @@ function main() {
     // comparable across environments.
     if (!fs.existsSync(expectedPath)) {
       const ms = Date.now() - start;
-      fail(`${idx} ${file} ${msTag(ms)}`);
-      fail(`Missing expected output for ${path.basename(file, path.extname(file))}.*`);
+      failResult(testNr, testName, ms);
+      detail(`Missing expected output for ${path.basename(file, path.extname(file))}.*`);
       failed++;
       continue;
     }
@@ -324,18 +308,18 @@ function main() {
 
     if (diffOk && rcOk) {
       if (expectedRc === 0) {
-        ok(`${idx} ${file} ${msTag(ms)}`);
+        pass(testNr, testName, ms);
       } else {
-        ok(`${idx} ${file} (expected exit ${expectedRc}) ${msTag(ms)}`);
+        pass(testNr, `${testName} (expected exit ${expectedRc})`, ms);
       }
       passed++;
     } else {
-      fail(`${idx} ${file} ${msTag(ms)}`);
+      failResult(testNr, testName, ms);
       if (!rcOk) {
-        fail(`Exit code ${rc}, expected ${expectedRc}`);
+        detail(`Exit code ${rc}, expected ${expectedRc}`);
       }
       if (!diffOk) {
-        fail('Output differs');
+        detail('Output differs');
       }
 
       // Show diffs, because this is a test runner
@@ -353,8 +337,9 @@ function main() {
 
 
   for (let i = 0; i < proofFiles.length; i++) {
-    const idx = String(i + 1).padStart(proofIdxWidth, '0');
+    const testNr = ++sequence;
     const file = proofFiles[i];
+    const testName = proofOnly ? file : `proof ${file}`;
     const start = Date.now();
     const filePath = path.join(examplesDir, file);
     const expectedPath = path.join(proofDir, file);
@@ -364,8 +349,8 @@ function main() {
       n3Text = fs.readFileSync(filePath, 'utf8');
     } catch (e) {
       const ms = Date.now() - start;
-      fail(`${proofLabel}${idx} ${file} ${msTag(ms)}`);
-      fail(`Cannot read proof input: ${e.message}`);
+      failResult(testNr, testName, ms);
+      detail(`Cannot read proof input: ${e.message}`);
       failed++;
       continue;
     }
@@ -388,18 +373,18 @@ function main() {
 
     if (diffOk && rcOk) {
       if (expectedRc === 0) {
-        ok(`${proofLabel}${idx} ${file} ${msTag(ms)}`);
+        pass(testNr, testName, ms);
       } else {
-        ok(`${proofLabel}${idx} ${file} (expected exit ${expectedRc}) ${msTag(ms)}`);
+        pass(testNr, `${testName} (expected exit ${expectedRc})`, ms);
       }
       passed++;
     } else {
-      fail(`${proofLabel}${idx} ${file} ${msTag(ms)}`);
+      failResult(testNr, testName, ms);
       if (!rcOk) {
-        fail(`Exit code ${rc}, expected ${expectedRc}`);
+        detail(`Exit code ${rc}, expected ${expectedRc}`);
       }
       if (!diffOk) {
-        fail('Proof output differs');
+        detail('Proof output differs');
       }
       showDiff({
         examplesDir,
@@ -417,12 +402,12 @@ function main() {
   info(`Total elapsed: ${suiteMs} ms (${(suiteMs / 1000).toFixed(2)} s)`);
 
   if (failed === 0) {
-    ok(proofOnly
+    info(proofOnly
       ? `All proof golden tests passed (${passed}/${totalTests})`
       : `All examples tests passed (${passed}/${totalTests})`);
     process.exit(0);
   } else {
-    fail(proofOnly
+    info(proofOnly
       ? `Some proof golden tests failed (${passed}/${totalTests})`
       : `Some examples tests failed (${passed}/${totalTests})`);
     // keep exit code 2 (matches historical behavior of examples/test)

package/test/extra.test.js

@@ -5,21 +5,7 @@ const fs = require('node:fs');
 const path = require('node:path');
 const cp = require('node:child_process');
 
-const TTY = process.stdout.isTTY;
-const C = TTY
-  ? { g: '\x1b[32m', r: '\x1b[31m', y: '\x1b[33m', dim: '\x1b[2m', n: '\x1b[0m' }
-  : { g: '', r: '', y: '', dim: '', n: '' };
-const msTag = (ms) => `${C.dim}(${ms} ms)${C.n}`;
-
-function ok(msg) {
-  console.log(`${C.g}OK${C.n}  ${msg}`);
-}
-function fail(msg) {
-  console.error(`${C.r}FAIL${C.n} ${msg}`);
-}
-function info(msg) {
-  console.log(`${C.y}==${C.n} ${msg}`);
-}
+const { C, detail, failResult, info, pass } = require('./report');
 
 function main() {
   const suiteStart = Date.now();
@@ -29,7 +15,7 @@ function main() {
   const nodePath = process.execPath;
 
   if (!fs.existsSync(extraDir)) {
-    fail(`Cannot find examples/extra directory: ${extraDir}`);
+    failResult(1, `Cannot find examples/extra directory: ${extraDir}`, 0);
     process.exit(1);
   }
 
@@ -44,16 +30,14 @@ function main() {
   console.log(`${C.dim}node ${process.version}${C.n}`);
 
   if (files.length === 0) {
-    ok('No .js files found in examples/extra/');
+    info('No .js files found in examples/extra/');
     process.exit(0);
   }
 
   let passed = 0;
   let failed = 0;
-  const idxWidth = String(files.length).length;
-
   for (let i = 0; i < files.length; i += 1) {
-    const idx = String(i + 1).padStart(idxWidth, '0');
+    const testNr = i + 1;
     const file = files[i];
     const start = Date.now();
 
@@ -74,11 +58,11 @@ function main() {
     const ms = Date.now() - start;
 
     if (rc === 0) {
-      ok(`${idx} ${file} -> output/${path.basename(outputPath)} ${msTag(ms)}`);
+      pass(testNr, `${file} -> output/${path.basename(outputPath)}`, ms);
       passed += 1;
     } else {
-      fail(`${idx} ${file} ${msTag(ms)}`);
-      fail(`Exit code ${rc}`);
+      failResult(testNr, file, ms);
+      detail(`Exit code ${rc}`);
       if (r.stderr) process.stderr.write(r.stderr);
       failed += 1;
     }
@@ -89,11 +73,11 @@ function main() {
   info(`Total elapsed: ${suiteMs} ms (${(suiteMs / 1000).toFixed(2)} s)`);
 
   if (failed === 0) {
-    ok(`All extra examples passed (${passed}/${files.length})`);
+    info(`All extra examples passed (${passed}/${files.length})`);
     process.exit(0);
   }
 
-  fail(`Some extra examples failed (${passed}/${files.length})`);
+  info(`Some extra examples failed (${passed}/${files.length})`);
   process.exit(2);
 }