eyeling 1.13.2 → 1.13.4

package/tools/n3gen.js

@@ -1032,7 +1032,7 @@ class TurtleParser {
     if (typ === 'Var') return new Var(val || '');
     if (typ === 'LParen') return this.parseList();
     if (typ === 'LBracket') return this.parseBlank();
-    if (typ === 'LBrace') return this.parseGraph(); // N3 graph term
+    if (typ === 'LBrace') throw new Error('N3 graph terms { ... } are not supported in Turtle/TriG input');
     if (typ === 'StarOpen') return this.parseStarTerm();
 
     throw new Error(`Unexpected term token: ${tok.toString()}`);
@@ -1239,7 +1239,18 @@ class TurtleParser {
     const o = invert ? subject : obj;
 
     // asserted triple
-    out.push(new Triple(s, verb, o));
+    // Special-case RDF 1.2 explicit triple reification:
+    //   _:r rdf:reifies <<( s p o )>> .
+    // Emit as:
+    //   _:r log:nameOf { s p o . } .
+    // This matches the mapping we already use for reifiedTriple sugar and annotations.
+    let assertedVerb = verb;
+    let assertedObj = o;
+    if (!invert && verb instanceof Iri && verb.value === RDF_NS + 'reifies' && obj instanceof GraphTerm) {
+      assertedVerb = internIri(log.nameOf);
+      assertedObj = obj;
+    }
+    out.push(new Triple(s, assertedVerb, assertedObj));
 
     // optional reifier and/or annotation blocks
     let reifier = null;
@@ -1257,7 +1268,7 @@ class TurtleParser {
     }
 
     if (reifier) {
-      const tripleTerm = new GraphTerm([new Triple(s, verb, o)]);
+      const tripleTerm = new GraphTerm([new Triple(s, assertedVerb, assertedObj)]);
       this.emitReifies(reifier, tripleTerm);
       if (this.pendingTriples.length) {
         out.push(...this.pendingTriples);
@@ -1790,8 +1801,23 @@ function renderPrefixPrologue(prefixes) {
 function ensureSkolemPrefix(prefixes, skolemMap) {
   if (!skolemMap || skolemMap.size === 0) return prefixes;
 
-  // If initSkolemForInput() was not called (library usage), fall back to a fresh UUID.
-  if (!SKOLEM_PREFIX_IRI) SKOLEM_PREFIX_IRI = `${SKOLEM_ROOT}${crypto.randomUUID()}#`;
+  // Make skolem: prefix IRI deterministic.
+  //
+  // Preferred: initSkolemForInput(text) sets SKOLEM_UUID / SKOLEM_PREFIX_IRI
+  // deterministically from the input text (CLI and turtleToN3/trigToN3).
+  //
+  // Fallback (library/advanced usage): derive a stable UUID from the *set of
+  // blank-node labels that actually require skolemization* (plus @base if any).
+  // This removes the last source of non-determinism (crypto.randomUUID()).
+  if (!SKOLEM_UUID) {
+    const base = prefixes ? prefixes.baseIri || '' : '';
+    const labels = [...skolemMap.keys()].sort().join('\n');
+    const seed = ['n3gen-skolem', SKOLEM_ROOT, base, labels, ''].join('\n');
+    const uuid = _deterministicUuidFromText(seed);
+    SKOLEM_PREFIX_IRI = `${SKOLEM_ROOT}${uuid}#`;
+  } else if (!SKOLEM_PREFIX_IRI) {
+    SKOLEM_PREFIX_IRI = `${SKOLEM_ROOT}${SKOLEM_UUID}#`;
+  }
 
   const baseMap = prefixes && prefixes.map ? prefixes.map : {};
   const newMap = { ...baseMap, [SKOLEM_PREFIX]: SKOLEM_PREFIX_IRI };
@@ -2043,7 +2069,7 @@ function writeN3LogNameOf({ datasetQuads, prefixes }) {
 }
 
 // ---------------------------------------------------------------------------
-// Roundtrip: TriG <-> N3 (log:nameOf mapping)
+// Parsing + N3 output (Turtle/TriG -> N3)
 // ---------------------------------------------------------------------------
 
 function parseTriG(text) {
@@ -2079,11 +2105,15 @@ function writeN3Triples({ triples, prefixes }) {
 }
 
 function turtleToN3(ttlText) {
+  // Ensure deterministic per-input Skolem prefix IRI even when used as a library.
+  initSkolemForInput(ttlText);
   const { triples, prefixes } = parseTurtle(ttlText);
   return writeN3Triples({ triples, prefixes });
 }
 
 function trigToN3(trigText) {
+  // Ensure deterministic per-input Skolem prefix IRI even when used as a library.
+  initSkolemForInput(trigText);
   const { quads, prefixes } = parseTriG(trigText);
   return writeN3LogNameOf({ datasetQuads: quads, prefixes });
 }
@@ -2117,7 +2147,6 @@ async function main() {
   const ext = path.extname(inputFile).toLowerCase();
 
   const text = await fs.readFile(inputFile, 'utf8');
-  initSkolemForInput(text);
 
   if (ext === '.ttl') {
     process.stdout.write(turtleToN3(text));