eyelang 1.7.4 → 1.7.6

package/test/conformance/expected-warnings/negation/warning_preserves_multiple_stdout_answers.txt

@@ -0,0 +1,3 @@
+eyelang warning: unstratified negation
+  p/1 depends negatively on q/1
+  q/1 depends negatively on p/1

package/test/conformance/proofs/proofs/bindings_nested_term.eye

@@ -0,0 +1,4 @@
+% Reference 12: proof bindings preserve nested compound terms.
+materialize(answer, 1).
+source(pair(a, [b, c])).
+answer(?term) :- source(?term).

package/test/conformance/proofs/proofs/builtin_numeric.eye

@@ -0,0 +1,3 @@
+% Reference 12: built-ins are proof leaves identified by builtin(Name, Arity).
+materialize(answer, 1).
+answer(?x) :- add(2, 3, ?x).

package/test/conformance/proofs/proofs/conjunction_order.eye

@@ -0,0 +1,5 @@
+% Reference 12: proof output records conjunction children in source goal order.
+materialize(answer, 1).
+left(ok).
+right(ok).
+answer(ok) :- left(ok), right(ok).

package/test/conformance/proofs/proofs/iri_atom.eye

@@ -0,0 +1,4 @@
+% Reference 12: proof output preserves angle-bracket IRI atom read-back.
+materialize(label, 2).
+name(<urn:example:a>, "Alice").
+label(?iri, ?name) :- name(?iri, ?name).

package/test/conformance/proofs/proofs/list_builtin.eye

@@ -0,0 +1,3 @@
+% Reference 12: proof output preserves list read-back for built-in goals.
+materialize(answer, 1).
+answer(?x) :- member(?x, [a, b]), eq(?x, b).

package/test/conformance/proofs/proofs/once_child.eye

@@ -0,0 +1,5 @@
+% Reference 12: once/1 proof output includes the proof for the selected child goal.
+materialize(answer, 1).
+choice(a).
+choice(b).
+answer(?x) :- once(choice(?x)).

package/test/conformance/proofs/proofs/rule_fact.eye

@@ -0,0 +1,4 @@
+% Reference 12: proof output records the source rule and source fact used for an answer.
+materialize(answer, 1).
+seed(ok).
+answer(?x) :- seed(?x).

package/test/conformance/proofs/proofs/table_recursive.eye

@@ -0,0 +1,7 @@
+% Reference 12: tabled recursive proofs still explain the successful derivation path.
+materialize(path, 2).
+table(path, 2).
+edge(a, b).
+edge(b, c).
+path(?x, ?y) :- edge(?x, ?y).
+path(?x, ?z) :- edge(?x, ?y), path(?y, ?z).

package/test/conformance/warnings/negation/stratified_negative_unknown_after_positive_quiet.eye

@@ -0,0 +1,3 @@
+materialize(answer, 1).
+item(a).
+answer(?x) :- item(?x), not(missing(?x)).

package/test/conformance/warnings/negation/stratified_two_level_quiet.eye

@@ -0,0 +1,5 @@
+materialize(answer, 1).
+base(a).
+blocked(b).
+allowed(?x) :- base(?x), not(blocked(?x)).
+answer(?x) :- allowed(?x).

package/test/conformance/warnings/negation/unstratified_positive_prefix.eye

@@ -0,0 +1,5 @@
+materialize(answer, 1).
+p(a) :- helper(a).
+helper(a) :- not(q(a)).
+q(a) :- p(a).
+answer(ok).

package/test/conformance/warnings/negation/unstratified_two_arity_cycle.eye

@@ -0,0 +1,4 @@
+materialize(answer, 1).
+p(a, b) :- not(q(a, b)).
+q(a, b) :- not(p(a, b)).
+answer(ok).

package/test/conformance/warnings/negation/unstratified_two_independent_cycles.eye

@@ -0,0 +1,6 @@
+materialize(answer, 1).
+p(a) :- not(q(a)).
+q(a) :- not(p(a)).
+r(a) :- not(s(a)).
+s(a) :- not(r(a)).
+answer(ok).

package/test/conformance/warnings/negation/unstratified_with_iri_predicates.eye

@@ -0,0 +1,4 @@
+materialize(answer, 1).
+p(<urn:example:a>) :- not(q(<urn:example:a>)).
+q(<urn:example:a>) :- not(p(<urn:example:a>)).
+answer(ok).

package/test/conformance/warnings/negation/warning_preserves_multiple_stdout_answers.eye

@@ -0,0 +1,5 @@
+materialize(answer, 1).
+p(a) :- not(q(a)).
+q(a) :- not(p(a)).
+answer(a).
+answer(b).

package/test/run-conformance-report.mjs

@@ -7,12 +7,14 @@ import path from 'node:path';
 import { fileURLToPath } from 'node:url';
 
 const root = path.resolve(path.dirname(fileURLToPath(import.meta.url)));
+const packageRoot = path.resolve(root, '..');
 const conformanceRoot = path.join(root, 'conformance');
 
 const KINDS = [
   { kind: 'cases', expectedKind: 'expected', expectedExt: '.eye', column: 'positive' },
   { kind: 'errors', expectedKind: 'expected-errors', expectedExt: '.txt', column: 'errors' },
   { kind: 'warnings', expectedKind: 'expected-warnings', expectedExt: '.eye', column: 'warnings' },
+  { kind: 'proofs', expectedKind: 'expected-proofs', expectedExt: '.eye', column: 'proofs' },
 ];
 
 export function buildConformanceReport() {
@@ -45,8 +47,9 @@ export function buildConformanceReport() {
     positive: acc.positive + row.positive,
     errors: acc.errors + row.errors,
     warnings: acc.warnings + row.warnings,
+    proofs: acc.proofs + row.proofs,
     total: acc.total + row.total,
-  }), { positive: 0, errors: 0, warnings: 0, total: 0 });
+  }), { positive: 0, errors: 0, warnings: 0, proofs: 0, total: 0 });
 
   return { rows, total, issues: issues.sort() };
 }
@@ -57,14 +60,14 @@ export function formatConformanceReport(report = buildConformanceReport()) {
     '',
     'This report summarizes the file-based conformance corpus under `test/conformance/`.',
     '',
-    '| Category | Positive | Errors | Warnings | Total |',
-    '|---|---:|---:|---:|---:|',
+    '| Category | Positive | Errors | Warnings | Proofs | Total |',
+    '|---|---:|---:|---:|---:|---:|',
   ];
 
   for (const row of report.rows) {
-    lines.push(`| ${row.category} | ${row.positive} | ${row.errors} | ${row.warnings} | ${row.total} |`);
+    lines.push(`| ${row.category} | ${row.positive} | ${row.errors} | ${row.warnings} | ${row.proofs} | ${row.total} |`);
   }
-  lines.push(`| **Total** | **${report.total.positive}** | **${report.total.errors}** | **${report.total.warnings}** | **${report.total.total}** |`);
+  lines.push(`| **Total** | **${report.total.positive}** | **${report.total.errors}** | **${report.total.warnings}** | **${report.total.proofs}** | **${report.total.total}** |`);
 
   if (report.issues.length > 0) {
     lines.push('', '## Corpus issues', '');
@@ -95,7 +98,7 @@ function categoryOf(file) {
 function ensureCategory(categories, category) {
   let counts = categories.get(category);
   if (!counts) {
-    counts = { positive: 0, errors: 0, warnings: 0, total: 0 };
+    counts = { positive: 0, errors: 0, warnings: 0, proofs: 0, total: 0 };
     categories.set(category, counts);
   }
   return counts;
@@ -103,6 +106,15 @@ function ensureCategory(categories, category) {
 
 if (process.argv[1] != null && path.resolve(process.argv[1]) === fileURLToPath(import.meta.url)) {
   const report = buildConformanceReport();
-  process.stdout.write(formatConformanceReport(report));
+  const text = formatConformanceReport(report);
+  const outputPath = process.argv[2] ?? null;
+  if (outputPath == null) {
+    process.stdout.write(text);
+  } else {
+    const resolved = path.resolve(packageRoot, outputPath);
+    fs.mkdirSync(path.dirname(resolved), { recursive: true });
+    fs.writeFileSync(resolved, text);
+    process.stdout.write(`wrote ${path.relative(packageRoot, resolved)}\n`);
+  }
   if (report.issues.length > 0) process.exit(1);
 }

package/test/run-conformance.mjs

@@ -20,6 +20,7 @@ export function runConformance(reporter = new TestReporter(), requestedFilter =
   for (const file of listCaseFiles('cases', filter)) runCaseFile(reporter, file);
   for (const file of listCaseFiles('errors', filter)) runErrorFile(reporter, file);
   for (const file of listCaseFiles('warnings', filter)) runWarningFile(reporter, file);
+  for (const file of listCaseFiles('proofs', filter)) runProofFile(reporter, file);
   reporter.sectionTotal(`conformance ${label}`);
 }
 
@@ -70,6 +71,11 @@ function runWarningFile(reporter, file) {
   reporter.test(`warning/${name}`, () => runWarningCase(name, file));
 }
 
+function runProofFile(reporter, file) {
+  const name = file.slice(0, -4);
+  reporter.test(`proof/${name}`, () => runProofCase(name, file));
+}
+
 function runCase(name, file) {
   const casesDir = path.join(root, 'conformance', 'cases');
   const expectedDir = path.join(root, 'conformance', 'expected');
@@ -122,6 +128,29 @@ function runWarningCase(name, file) {
   compareExpectedFile(expectedStderr, result.stderr, name, 'warning stderr');
 }
 
+function runProofCase(name, file) {
+  const proofsDir = path.join(root, 'conformance', 'proofs');
+  const expectedDir = path.join(root, 'conformance', 'expected-proofs');
+  const programFile = path.join(proofsDir, file);
+  const expected = path.join(expectedDir, `${name}.eye`);
+  const text = fs.readFileSync(programFile, 'utf8');
+  const result = spawnSync(process.execPath, [cliBin, '--proof', '-'], {
+    cwd: packageRoot,
+    input: text,
+    encoding: 'utf8',
+  });
+
+  if (result.status !== 0) {
+    throw new Error(`proof case ${name} exited with ${result.status}\n${result.stderr}`.trimEnd());
+  }
+  if (result.stderr !== '') {
+    throw new Error(`proof case ${name} wrote unexpected stderr\n${result.stderr}`.trimEnd());
+  }
+
+  compareExpectedFile(expected, result.stdout, name, 'proof output');
+  Program.parse(result.stdout);
+}
+
 function compareExpectedFile(expected, actual, name, kind) {
   if (!fs.existsSync(expected)) {
     throw new Error(`missing expected ${kind} file: ${path.relative(root, expected)}`);

package/test/run-regression.mjs

@@ -371,13 +371,23 @@ function documentationSyncCases() {
       run: () => {
         const report = buildConformanceReport();
         assertArrayEqual(report.issues, [], 'conformance report issues');
-        assertEqual(report.total.total >= 150, true, 'conformance case count');
-        assertEqual(report.total.positive + report.total.errors + report.total.warnings, report.total.total, 'conformance total');
+        assertEqual(report.total.total >= 250, true, 'conformance case count');
+        assertEqual(report.total.positive + report.total.errors + report.total.warnings + report.total.proofs, report.total.total, 'conformance total');
         const text = formatConformanceReport(report);
         assertIncludes(text, '| variables |', 'report');
+        assertIncludes(text, '| Proofs |', 'report');
         assertIncludes(text, '| **Total** |', 'report');
       },
     },
+
+    {
+      name: 'committed conformance report is current',
+      run: () => {
+        const reportFile = path.join(packageRoot, 'conformance-report.md');
+        assertEqual(fs.existsSync(reportFile), true, 'conformance-report.md exists');
+        assertEqual(fs.readFileSync(reportFile, 'utf8'), formatConformanceReport(buildConformanceReport()), 'conformance-report.md');
+      },
+    },
     {
       name: 'source-checkout setup docs match package bin',
       run: () => {