eyeling 1.23.1 → 1.23.3

package/lib/cli.js

@@ -208,6 +208,8 @@ function main() {
         parseN3Text(text, {
           baseIri: __sourceLabelToBaseIri(sourceLabel),
           label: sourceLabel,
+          collectUsedPrefixes: true,
+          keepSourceArtifacts: false,
         }),
       );
     } catch (e) {
@@ -225,8 +227,6 @@ function main() {
   const frules = mergedDocument.frules;
   const brules = mergedDocument.brules;
   const qrules = mergedDocument.logQueryRules;
-  const tokenSets = parsedSources.map((source) => ({ tokens: source.tokens, prefixes: source.prefixes }));
-
   if (showAst) {
     function astReplacer(unusedJsonKey, value) {
       if (value instanceof Set) return Array.from(value);
@@ -282,75 +282,6 @@ function main() {
   // In --stream mode we print prefixes *before* any derivations happen.
   // To keep the header small and stable, emit only prefixes that are actually
   // used (as QNames) in the *input* N3 program.
-  function prefixesUsedInInputTokens(toks2, prefEnv) {
-    const used = new Set();
-
-    function maybeAddFromQName(name) {
-      if (typeof name !== 'string') return;
-      if (!name.includes(':')) return;
-      if (name.startsWith('_:')) return; // blank node
-
-      // Split only on the first ':'
-      const idx = name.indexOf(':');
-      const p = name.slice(0, idx); // may be '' for ":foo"
-
-      // Ignore things like "http://..." unless that prefix is actually defined.
-      if (!Object.prototype.hasOwnProperty.call(prefEnv.map, p)) return;
-
-      used.add(p);
-    }
-
-    for (let i = 0; i < toks2.length; i++) {
-      const t = toks2[i];
-
-      // Skip @prefix ... .
-      if (t.typ === 'AtPrefix') {
-        while (i < toks2.length && toks2[i].typ !== 'Dot' && toks2[i].typ !== 'EOF') i++;
-        continue;
-      }
-      // Skip @base ... .
-      if (t.typ === 'AtBase') {
-        while (i < toks2.length && toks2[i].typ !== 'Dot' && toks2[i].typ !== 'EOF') i++;
-        continue;
-      }
-
-      // Skip SPARQL/Turtle PREFIX pfx: <iri>
-      if (
-        t.typ === 'Ident' &&
-        typeof t.value === 'string' &&
-        t.value.toLowerCase() === 'prefix' &&
-        toks2[i + 1] &&
-        toks2[i + 1].typ === 'Ident' &&
-        typeof toks2[i + 1].value === 'string' &&
-        toks2[i + 1].value.endsWith(':') &&
-        toks2[i + 2] &&
-        (toks2[i + 2].typ === 'IriRef' || toks2[i + 2].typ === 'Ident')
-      ) {
-        i += 2;
-        continue;
-      }
-
-      // Skip SPARQL BASE <iri>
-      if (
-        t.typ === 'Ident' &&
-        typeof t.value === 'string' &&
-        t.value.toLowerCase() === 'base' &&
-        toks2[i + 1] &&
-        toks2[i + 1].typ === 'IriRef'
-      ) {
-        i += 1;
-        continue;
-      }
-
-      // Count QNames in identifiers (including datatypes like xsd:integer).
-      if (t.typ === 'Ident') {
-        maybeAddFromQName(t.value);
-      }
-    }
-
-    return used;
-  }
-
   function restrictPrefixEnv(prefEnv, usedSet) {
     const m = {};
     for (const p of usedSet) {
@@ -368,10 +299,7 @@ function main() {
   const mayAutoRenderOutputStrings = programMayProduceOutputStrings(triples, frules, qrules);
 
   if (streamMode && !hasQueries && !mayAutoRenderOutputStrings) {
-    const usedInInput = new Set();
-    for (const source of tokenSets) {
-      for (const pfx of prefixesUsedInInputTokens(source.tokens, source.prefixes)) usedInInput.add(pfx);
-    }
+    const usedInInput = mergedDocument.usedPrefixes instanceof Set ? new Set(mergedDocument.usedPrefixes) : new Set();
     const outPrefixes = restrictPrefixEnv(prefixes, usedInInput);
 
     // Ensure log:trace uses the same compact prefix set as the output.

package/lib/engine.js

@@ -610,10 +610,6 @@ const { evalBuiltin, isBuiltinPred } = makeBuiltins({
   termsEqualNoIntDecimal,
 });
 
-try {
-  registerBuiltinModule(require('./builtin-sudoku'), './builtin-sudoku');
-} catch (_) {}
-
 // Initialize proof/output helpers (implemented in lib/explain.js).
 const { printExplanation, collectOutputStringsFromFacts } = makeExplain({
   applySubstTerm,

package/lib/multisource.js

@@ -31,13 +31,101 @@ function emptyParsedDocument() {
   };
 }
 
+function prefixesUsedInTokens(tokens, prefEnv) {
+  const used = new Set();
+  const toks = Array.isArray(tokens) ? tokens : [];
+  const prefixes = prefEnv && prefEnv.map ? prefEnv.map : {};
+
+  function maybeAddFromQName(name) {
+    if (typeof name !== 'string') return;
+    if (!name.includes(':')) return;
+    if (name.startsWith('_:')) return; // blank node
+
+    // Split only on the first ':'; the empty prefix is valid for ":foo".
+    const idx = name.indexOf(':');
+    const p = name.slice(0, idx);
+
+    // Ignore strings like "http://..." unless that prefix is actually defined.
+    if (!Object.prototype.hasOwnProperty.call(prefixes, p)) return;
+
+    used.add(p);
+  }
+
+  for (let i = 0; i < toks.length; i++) {
+    const t = toks[i];
+    if (!t) continue;
+
+    // Skip @prefix ... .
+    if (t.typ === 'AtPrefix') {
+      while (i < toks.length && toks[i].typ !== 'Dot' && toks[i].typ !== 'EOF') i++;
+      continue;
+    }
+
+    // Skip @base ... .
+    if (t.typ === 'AtBase') {
+      while (i < toks.length && toks[i].typ !== 'Dot' && toks[i].typ !== 'EOF') i++;
+      continue;
+    }
+
+    // Skip SPARQL/Turtle PREFIX pfx: <iri>
+    if (
+      t.typ === 'Ident' &&
+      typeof t.value === 'string' &&
+      t.value.toLowerCase() === 'prefix' &&
+      toks[i + 1] &&
+      toks[i + 1].typ === 'Ident' &&
+      typeof toks[i + 1].value === 'string' &&
+      toks[i + 1].value.endsWith(':') &&
+      toks[i + 2] &&
+      (toks[i + 2].typ === 'IriRef' || toks[i + 2].typ === 'Ident')
+    ) {
+      i += 2;
+      continue;
+    }
+
+    // Skip SPARQL BASE <iri>
+    if (
+      t.typ === 'Ident' &&
+      typeof t.value === 'string' &&
+      t.value.toLowerCase() === 'base' &&
+      toks[i + 1] &&
+      toks[i + 1].typ === 'IriRef'
+    ) {
+      i += 1;
+      continue;
+    }
+
+    // Count QNames in identifiers, including datatypes like xsd:integer.
+    if (t.typ === 'Ident') maybeAddFromQName(t.value);
+  }
+
+  return used;
+}
+
 function parseN3Text(text, opts = {}) {
-  const { baseIri = '', label = '<input>' } = opts || {};
+  const { baseIri = '', label = '<input>', keepSourceArtifacts = true, collectUsedPrefixes = false } = opts || {};
   const tokens = lex(text);
   const parser = new Parser(tokens);
   if (baseIri) parser.prefixes.setBase(baseIri);
   const [prefixes, triples, frules, brules, logQueryRules] = parser.parseDocument();
-  return { prefixes, triples, frules, brules, logQueryRules, tokens, text, label };
+
+  const doc = { prefixes, triples, frules, brules, logQueryRules, label };
+
+  if (collectUsedPrefixes) {
+    Object.defineProperty(doc, 'usedPrefixes', {
+      value: prefixesUsedInTokens(tokens, prefixes),
+      enumerable: false,
+      writable: false,
+      configurable: true,
+    });
+  }
+
+  if (keepSourceArtifacts) {
+    doc.tokens = tokens;
+    doc.text = text;
+  }
+
+  return doc;
 }
 
 function sourceBlankPrefix(sourceIndex) {
@@ -96,16 +184,27 @@ function scopeBlankNodesInDocument(doc, sourceIndex) {
     return out;
   }
 
-  return {
+  const out = {
     prefixes: doc.prefixes,
     triples: (doc.triples || []).map(cloneTriple),
     frules: (doc.frules || []).map(cloneRule),
     brules: (doc.brules || []).map(cloneRule),
     logQueryRules: (doc.logQueryRules || []).map(cloneRule),
-    tokens: doc.tokens,
-    text: doc.text,
     label: doc.label,
   };
+
+  if (doc.usedPrefixes instanceof Set) {
+    Object.defineProperty(out, 'usedPrefixes', {
+      value: new Set(doc.usedPrefixes),
+      enumerable: false,
+      writable: false,
+      configurable: true,
+    });
+  }
+  if (Object.prototype.hasOwnProperty.call(doc, 'tokens')) out.tokens = doc.tokens;
+  if (Object.prototype.hasOwnProperty.call(doc, 'text')) out.text = doc.text;
+
+  return out;
 }
 
 function mergePrefixEnvs(target, source) {
@@ -124,9 +223,10 @@ function mergePrefixEnvs(target, source) {
 function mergeParsedDocuments(docs, opts = {}) {
   const documents = Array.isArray(docs) ? docs : [];
   const scopeBlankNodes = typeof opts.scopeBlankNodes === 'boolean' ? opts.scopeBlankNodes : documents.length > 1;
+  const keepSources = !!opts.keepSources || !!opts.keepSourceArtifacts;
 
   const merged = emptyParsedDocument();
-  const mergedSources = [];
+  const mergedSources = keepSources ? [] : null;
 
   for (let i = 0; i < documents.length; i++) {
     const originalDoc = documents[i] || emptyParsedDocument();
@@ -137,15 +237,30 @@ function mergeParsedDocuments(docs, opts = {}) {
     merged.frules.push(...(doc.frules || []));
     merged.brules.push(...(doc.brules || []));
     merged.logQueryRules.push(...(doc.logQueryRules || []));
-    mergedSources.push(doc);
+
+    if (doc.usedPrefixes instanceof Set) {
+      if (!(merged.usedPrefixes instanceof Set)) {
+        Object.defineProperty(merged, 'usedPrefixes', {
+          value: new Set(),
+          enumerable: false,
+          writable: false,
+          configurable: true,
+        });
+      }
+      for (const pfx of doc.usedPrefixes) merged.usedPrefixes.add(pfx);
+    }
+
+    if (keepSources) mergedSources.push(doc);
   }
 
-  Object.defineProperty(merged, 'sources', {
-    value: mergedSources,
-    enumerable: false,
-    writable: false,
-    configurable: true,
-  });
+  if (keepSources) {
+    Object.defineProperty(merged, 'sources', {
+      value: mergedSources,
+      enumerable: false,
+      writable: false,
+      configurable: true,
+    });
+  }
 
   return merged;
 }
@@ -177,14 +292,17 @@ function parseN3SourceList(input, opts = {}) {
   if (!isN3SourceListInput(input)) return null;
   const sources = input.sources.map(normalizeN3SourceItem);
   const defaultBaseIri = typeof opts.baseIri === 'string' ? opts.baseIri : '';
-  const parsed = sources.map((source, index) =>
+  const parsed = sources.map((source) =>
     parseN3Text(source.text, {
       label: source.label,
       baseIri: source.baseIri || (sources.length === 1 ? defaultBaseIri : ''),
+      collectUsedPrefixes: true,
+      keepSourceArtifacts: !!opts.keepSourceArtifacts,
     }),
   );
   return mergeParsedDocuments(parsed, {
     scopeBlankNodes: typeof input.scopeBlankNodes === 'boolean' ? input.scopeBlankNodes : parsed.length > 1,
+    keepSources: !!opts.keepSourceArtifacts,
   });
 }
 
@@ -193,6 +311,7 @@ module.exports = {
   parseN3Text,
   mergeParsedDocuments,
   scopeBlankNodesInDocument,
+  prefixesUsedInTokens,
   isN3SourceListInput,
   parseN3SourceList,
 };

package/package.json

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

package/test/examples.test.js

@@ -96,6 +96,14 @@ function resolveExpectedPath(outputDir, inputFile) {
   return path.join(outputDir, candidates[0]);
 }
 
+function resolveExampleBuiltinPath(root, inputFile) {
+  const stem = path.basename(inputFile, path.extname(inputFile));
+  const rel = path.join('examples', 'builtin', `${stem}.js`);
+  const abs = path.join(root, rel);
+  if (!fs.existsSync(abs)) return null;
+  return { abs, rel };
+}
+
 function main() {
   const suiteStart = Date.now();
 
@@ -170,17 +178,32 @@ function main() {
     const tmpDir = mkTmpDir();
     const generatedPath = path.join(tmpDir, 'generated.n3');
 
-    // Run eyeling on this file (cwd examplesDir so relative behavior matches old script)
+    // Run eyeling on this file. If examples/builtin/<stem>.js exists,
+    // load it for the matching examples/<stem>.n3 file. Builtin-backed examples
+    // run from the repository root so the command shape matches documented usage:
+    //   node eyeling.js --builtin examples/builtin/foo.js examples/foo.n3
+    const builtin = resolveExampleBuiltinPath(root, file);
     const outFd = fs.openSync(generatedPath, 'w');
-
-    const r = cp.spawnSync(nodePath, [eyelingJsPath, '-d', file], {
-      cwd: examplesDir,
-      stdio: ['ignore', outFd, 'pipe'], // stdout -> file, stderr captured
-      maxBuffer: 200 * 1024 * 1024,
-      encoding: 'utf8',
-    });
-
-    fs.closeSync(outFd);
+    let r;
+    try {
+      if (builtin) {
+        r = cp.spawnSync(nodePath, [eyelingJsPath, '-d', '--builtin', builtin.rel, path.join('examples', file)], {
+          cwd: root,
+          stdio: ['ignore', outFd, 'pipe'], // stdout -> file, stderr captured
+          maxBuffer: 200 * 1024 * 1024,
+          encoding: 'utf8',
+        });
+      } else {
+        r = cp.spawnSync(nodePath, [eyelingJsPath, '-d', file], {
+          cwd: examplesDir,
+          stdio: ['ignore', outFd, 'pipe'], // stdout -> file, stderr captured
+          maxBuffer: 200 * 1024 * 1024,
+          encoding: 'utf8',
+        });
+      }
+    } finally {
+      fs.closeSync(outFd);
+    }
 
     const rc = r.status == null ? 1 : r.status;