eyeling 1.24.2 → 1.24.4

package/see/see.js

@@ -284,11 +284,28 @@ class Parser {
   eof() {
     return this.pos >= this.tokens.length;
   }
-  peek(value = undefined) {
-    const tok = this.tokens[this.pos];
+  peek(value = undefined, offset = 0) {
+    const tok = this.tokens[this.pos + offset];
     if (value === undefined) return tok;
     return tok && tok.type === value;
   }
+  isTermToken(tok) {
+    return tok && ['qname', 'iri', 'var', 'string', 'number', 'boolean', '<<(', '(', '{', '['].includes(tok.type);
+  }
+  isNamedGraphStart() {
+    const tok = this.peek();
+    if (tok?.type === 'qname' && /^GRAPH$/i.test(tok.value)) {
+      return this.isTermToken(this.peek(undefined, 1)) && this.peek('{', 2);
+    }
+    return (tok?.type === 'qname' || tok?.type === 'iri') && this.peek('{', 1);
+  }
+  parseNamedGraphFact() {
+    if (this.peek()?.type === 'qname' && /^GRAPH$/i.test(this.peek().value)) this.next();
+    const name = this.parseTerm('fact', []);
+    const atoms = this.parseFormula('fact');
+    this.accept('.');
+    return { s: name, p: I('log:nameOf'), o: { kind: 'formula', atoms } };
+  }
   next() {
     if (this.eof()) throw new Error('Unexpected end of input');
     return this.tokens[this.pos++];
@@ -338,6 +355,10 @@ class Parser {
         this.skipVersion();
         continue;
       }
+      if (this.isNamedGraphStart()) {
+        facts.push(this.parseNamedGraphFact());
+        continue;
+      }
       if (this.peek('{')) {
         const lhs = this.parseFormula('body');
         if (this.accept('=>')) {
@@ -366,6 +387,9 @@ class Parser {
             this.accept('.');
             rules.push({ kind: 'backward', id: rules.length + 1, body: rhs, head: lhs });
           }
+        } else if (this.peek('.') || this.eof()) {
+          this.accept('.');
+          facts.push(...lhs);
         } else {
           const subject = { kind: 'formula', atoms: lhs };
           const triples = this.parseStatementRest('fact', subject);
@@ -530,7 +554,7 @@ function compilationStats(program) {
 
 // Source facts are emitted as RDF 1.2 TriG.  Formulas that appear as objects are
 // lifted into named graphs so the generated runner can load evidence directly
-// from .trig without going through an intermediate n3gen conversion step.
+// from .trig without going through an intermediate conversion step.
 function trigString(value) {
   return JSON.stringify(String(value));
 }

package/test/api.test.js

@@ -2541,12 +2541,24 @@ _:b a ex:Person ; ex:name "B" .
   },
 
   {
-    name: 'RDF 1.2 triple terms are accepted as N3 singleton graph terms',
+    name: 'RDF 1.2 triple terms require explicit RDF compatibility mode',
     opt: { proofComments: false },
     input: `VERSION "1.2"
 @prefix : <http://example.org/triple-terms#> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 
+:observation rdf:reifies <<( :sensor :reports :overheating )>> .
+`,
+    expectError: true,
+  },
+
+  {
+    name: 'RDF 1.2 triple terms are accepted in RDF compatibility mode',
+    opt: { proofComments: false, rdf: true },
+    input: `VERSION "1.2"
+@prefix : <http://example.org/triple-terms#> .
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+
 :observation rdf:reifies <<( :sensor :reports :overheating )>> .
 :overheating :requires :inspection .
 
@@ -2557,10 +2569,64 @@ _:b a ex:Person ; ex:name "B" .
   ?observation :entails <<( ?device :needs ?action )>> .
 } .
 `,
-    expect: [/:observation\s+:entails\s+\{\s+:sensor\s+:needs\s+:inspection\s*\.\s*\}\s*\./m],
+    expect: [/:observation\s+:entails\s+<<\(\s+:sensor\s+:needs\s+:inspection\s*\)>>\s*\./m],
+  },
+
+  {
+    name: 'RDF mode serializes only valid triple terms as RDF 1.2 triple terms',
+    opt: { proofComments: false, rdf: true },
+    input: `@prefix log: <http://www.w3.org/2000/10/swap/log#> .
+@prefix math: <http://www.w3.org/2000/10/swap/math#> .
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix : <http://example.org/ns#> .
+
+{
+  (1 3) math:sum ?X .
+}
+=>
+{
+  <<(?X a :Answer)>> a :Result.
+}.
+`,
+    expect: [/\{\s*4\s+a\s+:Answer\s*\.\s*\}\s+a\s+:Result\s*\./m],
+    notExpect: [/<<\(\s*4\s+a\s+:Answer\s*\)>>/m],
+  },
+
+  {
+    name: 'RDF dataset named graphs round-trip as TriG in RDF compatibility mode',
+    opt: { proofComments: false, rdf: true },
+    input: `VERSION "1.2"
+@prefix : <http://example.org/dataset#> .
+@prefix log: <http://www.w3.org/2000/10/swap/log#> .
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+
+# Ordinary TriG default-graph triples remain ordinary N3 facts.
+:sensor :reports :overheating .
+:overheating :requires :inspection .
+
+# A TriG named graph block is accepted and normalized to a graph term.
+:factoryDataset {
+  :observation rdf:reifies <<( :sensor :reports :overheating )>> .
+}
+
+{
+  :sensor :reports ?condition .
+  ?condition :requires ?action .
+} => {
+  :workOrder :entails <<( :sensor :needs ?action )>> .
+  :audit log:nameOf {
+    :workOrder :basedOn :factoryDataset .
+  } .
+} .
+`,
+    expect: [
+      /:workOrder\s+:entails\s+<<\(\s+:sensor\s+:needs\s+:inspection\s*\)>>\s*\./m,
+      /:audit\s+\{[\s\S]*:workOrder\s+:basedOn\s+:factoryDataset\s*\.[\s\S]*\}/m,
+    ],
   },
 ];
 
+
 let passed = 0;
 let failed = 0;
 

package/test/n3gen.test.js

@@ -1,166 +0,0 @@
-#!/usr/bin/env node
-'use strict';
-
-// Convert examples/input/*.{ttl,trig} -> examples/*.n3 using n3gen.js
-//
-// For reproducibility and to avoid mutating tracked files during tests, generated output
-// is always written to a temporary file and compared against examples/<name>.n3.
-
-const fs = require('node:fs');
-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: '' };
-
-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}`);
-}
-
-function run(cmd, args, opts = {}) {
-  return cp.spawnSync(cmd, args, {
-    encoding: 'utf8',
-    maxBuffer: 200 * 1024 * 1024,
-    ...opts,
-  });
-}
-
-function mkTmpDir() {
-  return fs.mkdtempSync(path.join(os.tmpdir(), 'eyeling-n3-'));
-}
-
-function rmrf(p) {
-  try {
-    fs.rmSync(p, { recursive: true, force: true });
-  } catch {}
-}
-
-function showDiff({ examplesDir, expectedPath, generatedPath }) {
-  const d = run('diff', ['-u', expectedPath, generatedPath], { cwd: examplesDir });
-  if (d.stdout) process.stdout.write(d.stdout);
-  if (d.stderr) process.stderr.write(d.stderr);
-}
-
-function main() {
-  const suiteStart = Date.now();
-
-  // test/n3gen.test.js -> repo root is one level up
-  const root = path.resolve(__dirname, '..');
-  const examplesDir = path.join(root, 'examples');
-  const inputDir = path.join(examplesDir, 'input');
-  const n3GenJsPath = path.join(root, 'tools/n3gen.js');
-  const nodePath = process.execPath;
-
-  if (!fs.existsSync(examplesDir)) {
-    fail(`Cannot find examples directory: ${examplesDir}`);
-    process.exit(1);
-  }
-  if (!fs.existsSync(inputDir)) {
-    fail(`Cannot find examples/input directory: ${inputDir}`);
-    process.exit(1);
-  }
-  if (!fs.existsSync(n3GenJsPath)) {
-    fail(`Cannot find n3gen.js: ${n3GenJsPath}`);
-    process.exit(1);
-  }
-
-  const inputs = fs
-    .readdirSync(inputDir)
-    .filter((f) => /\.(ttl|trig)$/i.test(f))
-    .sort((a, b) => a.localeCompare(b));
-
-  info(`Running n3 conversions for ${inputs.length} inputs`);
-  console.log(`${C.dim}node ${process.version}${C.n}`);
-
-  if (inputs.length === 0) {
-    ok('No .ttl/.trig files found in examples/input/');
-    process.exit(0);
-  }
-
-  let passed = 0;
-  let failed = 0;
-
-  for (let i = 0; i < inputs.length; i++) {
-    const idx = String(i + 1).padStart(2, '0');
-    const inFile = inputs[i];
-    const start = Date.now();
-
-    const inPath = path.join(inputDir, inFile);
-    const base = inFile.replace(/\.(ttl|trig)$/i, '');
-    const outFile = `${base}.n3`;
-
-    const expectedPath = path.join(examplesDir, outFile);
-
-    if (!fs.existsSync(expectedPath)) {
-      const ms = Date.now() - start;
-      fail(`${idx} ${inFile} -> ${outFile} (${ms} ms)`);
-      fail(`Missing expected examples/${outFile}`);
-      failed++;
-      continue;
-    }
-
-    const tmpDir = mkTmpDir();
-    const generatedPath = path.join(tmpDir, outFile);
-
-    // Run converter (stdout -> file; stderr captured)
-    const outFd = fs.openSync(generatedPath, 'w');
-    const r = cp.spawnSync(nodePath, [n3GenJsPath, inPath], {
-      cwd: root,
-      stdio: ['ignore', outFd, 'pipe'],
-      encoding: 'utf8',
-      maxBuffer: 200 * 1024 * 1024,
-    });
-    fs.closeSync(outFd);
-
-    const rc = r.status == null ? 1 : r.status;
-    const ms = Date.now() - start;
-
-    if (rc !== 0) {
-      fail(`${idx} ${inFile} -> ${outFile} (${ms} ms)`);
-      fail(`Converter exit code ${rc}`);
-      if (r.stderr) process.stderr.write(String(r.stderr));
-      failed++;
-      rmrf(tmpDir);
-      continue;
-    }
-
-    // Compare output (always compare expected vs generated temp file)
-    const d = run('diff', ['-u', expectedPath, generatedPath], { cwd: examplesDir });
-    const diffOk = d.status === 0;
-
-    if (diffOk) {
-      ok(`${idx} ${inFile} -> ${outFile} (${ms} ms)`);
-      passed++;
-    } else {
-      fail(`${idx} ${inFile} -> ${outFile} (${ms} ms)`);
-      fail('Output differs');
-      showDiff({ examplesDir, expectedPath, generatedPath });
-      failed++;
-    }
-
-    rmrf(tmpDir);
-  }
-
-  console.log('');
-  const suiteMs = Date.now() - suiteStart;
-  info(`Total elapsed: ${suiteMs} ms (${(suiteMs / 1000).toFixed(2)} s)`);
-
-  if (failed === 0) {
-    ok(`All n3 conversions passed (${passed}/${inputs.length})`);
-    process.exit(0);
-  } else {
-    fail(`Some n3 conversions failed (${passed}/${inputs.length})`);
-    process.exit(2);
-  }
-}
-
-main();