eyeling 1.29.2 → 1.30.0

package/test/examples.test.js

@@ -152,6 +152,27 @@ function resolveExampleTrigInput(root, inputFile) {
   return { abs, rel };
 }
 
+function resolveExampleRdfSurfaceInput(root, inputFile) {
+  const stem = path.basename(inputFile, path.extname(inputFile));
+  const rel = path.join('input', `${stem}.ttl`);
+  const abs = path.join(root, 'examples', rel);
+  if (!fs.existsSync(abs)) return null;
+  const text = fs.readFileSync(abs, 'utf8');
+  if (!text.includes('%not[')) return null;
+  return { abs, rel };
+}
+
+
+function exampleOptionFlags(sourceText) {
+  const m = String(sourceText || '').match(/^[ \t]*#\s*eyeling-options:\s*(.*?)\s*$/m);
+  if (!m) return [];
+  return m[1].trim().split(/\s+/).filter(Boolean);
+}
+
+function addUniqueFlag(args, flag) {
+  if (!args.includes(flag)) args.push(flag);
+}
+
 function resolveExampleBuiltinPath(root, inputFile) {
   const stem = path.basename(inputFile, path.extname(inputFile));
   const rel = path.join('examples', 'builtin', `${stem}.js`);
@@ -160,10 +181,13 @@ function resolveExampleBuiltinPath(root, inputFile) {
   return { abs, rel };
 }
 
-function runExampleToFile({ root, examplesDir, eyelingJsPath, nodePath, file, generatedPath, proof = false }) {
+function runExampleToFile({ root, examplesDir, eyelingJsPath, nodePath, file, generatedPath, proof = false, sourceText = '' }) {
   const builtin = resolveExampleBuiltinPath(root, file);
   const trigInput = resolveExampleTrigInput(root, file);
-  const rdfMode = !!trigInput;
+  const rdfSurfaceInput = resolveExampleRdfSurfaceInput(root, file);
+  const optionFlags = exampleOptionFlags(sourceText);
+  const rdfSurfacesMode = !!rdfSurfaceInput || optionFlags.includes('--rdf-surfaces');
+  const rdfMode = !!trigInput || rdfSurfacesMode || optionFlags.includes('--rdf') || optionFlags.includes('-r');
   const modeFlag = proof ? '-p' : '-d';
   const outFd = fs.openSync(generatedPath, 'w');
 
@@ -171,7 +195,12 @@ function runExampleToFile({ root, examplesDir, eyelingJsPath, nodePath, file, ge
     if (builtin) {
       const args = [eyelingJsPath, modeFlag];
       if (rdfMode) args.push('-r');
-      args.push('--builtin', builtin.rel, path.join('examples', file));
+      for (const flag of optionFlags) addUniqueFlag(args, flag);
+      if (rdfSurfacesMode) addUniqueFlag(args, '--rdf-surfaces');
+      args.push('--builtin');
+      args.push(builtin.rel);
+      if (rdfSurfaceInput) args.push(path.join('examples', rdfSurfaceInput.rel));
+      args.push(path.join('examples', file));
       if (trigInput) args.push(path.join('examples', trigInput.rel));
       return cp.spawnSync(nodePath, args, {
         cwd: root,
@@ -183,6 +212,9 @@ function runExampleToFile({ root, examplesDir, eyelingJsPath, nodePath, file, ge
 
     const args = [eyelingJsPath, modeFlag];
     if (rdfMode) args.push('-r');
+    for (const flag of optionFlags) addUniqueFlag(args, flag);
+    if (rdfSurfacesMode) addUniqueFlag(args, '--rdf-surfaces');
+    if (rdfSurfaceInput) args.push(rdfSurfaceInput.rel);
     args.push(file);
     if (trigInput) args.push(trigInput.rel);
     return cp.spawnSync(nodePath, args, {
@@ -290,7 +322,7 @@ function main() {
     //   node eyeling.js --builtin examples/builtin/foo.js examples/foo.n3
     // A matching examples/input/<stem>.trig sidecar is external RDF/TriG
     // evidence for this example, so include it and run in -r mode automatically.
-    const r = runExampleToFile({ root, examplesDir, eyelingJsPath, nodePath, file, generatedPath });
+    const r = runExampleToFile({ root, examplesDir, eyelingJsPath, nodePath, file, generatedPath, sourceText: n3Text });
 
     const rc = r.status == null ? 1 : r.status;
 
@@ -358,7 +390,7 @@ function main() {
     const expectedRc = expectedExitCode(n3Text);
     const tmpDir = mkTmpDir();
     const generatedPath = path.join(tmpDir, 'generated.n3');
-    const r = runExampleToFile({ root, examplesDir, eyelingJsPath, nodePath, file, generatedPath, proof: true });
+    const r = runExampleToFile({ root, examplesDir, eyelingJsPath, nodePath, file, generatedPath, proof: true, sourceText: n3Text });
     const rc = r.status == null ? 1 : r.status;
     const ms = Date.now() - start;
 

package/test/rdf_surfaces.test.js

@@ -0,0 +1,204 @@
+#!/usr/bin/env node
+'use strict';
+
+const assert = require('node:assert/strict');
+const cp = require('node:child_process');
+const path = require('node:path');
+
+const { reason } = require('../index.js');
+const { C, failResult, pass } = require('./report');
+
+const ROOT = path.resolve(__dirname, '..');
+const EYELING = path.join(ROOT, 'eyeling.js');
+
+function runCli(input, args = ['--rdf-surfaces']) {
+  return cp.spawnSync(process.execPath, [EYELING, ...args, '-'], {
+    input,
+    encoding: 'utf8',
+    maxBuffer: 20 * 1024 * 1024,
+  });
+}
+
+function runExample(name) {
+  return cp.spawnSync(
+    process.execPath,
+    [EYELING, '--rdf-surfaces', path.join(ROOT, 'examples', 'input', `${name}.ttl`), path.join(ROOT, 'examples', `${name}.n3`)],
+    { encoding: 'utf8', maxBuffer: 20 * 1024 * 1024 },
+  );
+}
+
+const inlineCases = [
+  {
+    name: 'slide32-style surface derives subclass instance',
+    input: `
+@prefix ex: <http://example.org/> .
+@prefix log: <http://www.w3.org/2000/10/swap/log#> .
+
+ex:Brussels a ex:City .
+
+%not[ _:x
+_:x a ex:City .
+%not[
+_:x a ex:HumanCommunity .
+%]
+%]
+
+{ ?s a ex:HumanCommunity . } log:query { ?s a ex:HumanCommunity . } .
+`,
+    expect: '@prefix ex: <http://example.org/> .\n\nex:Brussels a ex:HumanCommunity .',
+  },
+  {
+    name: 'slide33 range-style surface derives object type',
+    input: `
+@prefix ex: <http://example.org/> .
+@prefix log: <http://www.w3.org/2000/10/swap/log#> .
+
+ex:alice ex:parent ex:bob .
+
+%not[ _:x _:y
+_:x ex:parent _:y .
+%not[
+_:y a ex:Person .
+%]
+%]
+
+{ ?s a ex:Person . } log:query { ?s a ex:Person . } .
+`,
+    expect: '@prefix ex: <http://example.org/> .\n\nex:bob a ex:Person .',
+  },
+  {
+    name: 'slide33 allValuesFrom forward surface derives filler type',
+    input: `
+@prefix ex: <http://example.org/> .
+@prefix log: <http://www.w3.org/2000/10/swap/log#> .
+
+ex:box a ex:AllowedContainer .
+ex:box ex:contains ex:item42 .
+
+%not[ _:x _:y
+_:x a ex:AllowedContainer .
+_:x ex:contains _:y .
+%not[
+_:y a ex:AllowedItem .
+%]
+%]
+
+{ ?s a ex:AllowedItem . } log:query { ?s a ex:AllowedItem . } .
+`,
+    expect: '@prefix ex: <http://example.org/> .\n\nex:item42 a ex:AllowedItem .',
+  },
+  {
+    name: 'slide33 allValuesFrom reverse surface derives restricted class',
+    input: `
+@prefix ex: <http://example.org/> .
+@prefix log: <http://www.w3.org/2000/10/swap/log#> .
+
+ex:box ex:contains ex:item42 .
+ex:item42 a ex:AllowedItem .
+
+%not[ _:x
+%not[ _:y
+_:x ex:contains _:y .
+%not[
+_:y a ex:AllowedItem .
+%]
+%]
+%not[
+_:x a ex:AllowedContainer .
+%]
+%]
+
+{ ?s a ex:AllowedContainer . } log:query { ?s a ex:AllowedContainer . } .
+`,
+    expect: '@prefix ex: <http://example.org/> .\n\nex:box a ex:AllowedContainer .',
+  },
+];
+
+const exampleCases = [
+  ['rdf-surfaces-city', '@prefix ex: <http://example.org/> .\n\nex:Brussels a ex:HumanCommunity .'],
+  ['rdf-surfaces-range', '@prefix ex: <http://example.org/> .\n\nex:bob a ex:Person .'],
+  ['rdf-surfaces-domain', '@prefix ex: <http://example.org/> .\n\nex:alice a ex:Member .'],
+  ['rdf-surfaces-property-chain', '@prefix ex: <http://example.org/> .\n\nex:alice ex:grandparent ex:carol .'],
+  [
+    'rdf-surfaces-ancestor',
+    '@prefix ex: <http://example.org/> .\n\nex:ann ex:ancestor ex:bob .\nex:bob ex:ancestor ex:cat .\nex:ann ex:ancestor ex:cat .',
+  ],
+  ['rdf-surfaces-multi-premise', '@prefix ex: <http://example.org/> .\n\nex:case123 a ex:PriorityCase .'],
+  ['rdf-surfaces-all-values-from', '@prefix ex: <http://example.org/> .\n\nex:item42 a ex:AllowedItem .'],
+  ['rdf-surfaces-all-values-from-reverse', '@prefix ex: <http://example.org/> .\n\nex:box a ex:AllowedContainer .'],
+  ['rdf-surfaces-rdfs-range-codex', '@prefix ex: <http://example.org/> .\n\nex:bob a ex:Person .'],
+  ['rdf-surfaces-rdfs-subclass-codex', '@prefix ex: <http://example.org/> .\n\nex:Brussels a ex:HumanCommunity .'],
+  [
+    'rdf-surfaces-owl-all-values-from-codex',
+    '@prefix ex: <http://example.org/> .\n\nex:item43 a ex:AllowedItem .\nex:item42 a ex:AllowedItem .\nex:box a ex:AllowedContainer .\nex:crate a ex:AllowedContainer .',
+  ],
+];
+
+let seq = 0;
+let failed = 0;
+
+for (const tc of inlineCases) {
+  const n = ++seq;
+  const t0 = Date.now();
+  try {
+    const r = runCli(tc.input);
+    assert.equal(r.status, 0, r.stderr || r.stdout);
+    assert.equal(r.stdout.trim(), tc.expect);
+    pass(n, tc.name, Date.now() - t0);
+  } catch (e) {
+    failed++;
+    failResult(n, tc.name, Date.now() - t0);
+    console.error(`${C.dim}${e && e.stack ? e.stack : String(e)}${C.n}`);
+  }
+}
+
+for (const [name, expect] of exampleCases) {
+  const n = ++seq;
+  const t0 = Date.now();
+  try {
+    const r = runExample(name);
+    assert.equal(r.status, 0, r.stderr || r.stdout);
+    assert.equal(r.stdout.trim(), expect);
+    pass(n, `example split input/query ${name}`, Date.now() - t0);
+  } catch (e) {
+    failed++;
+    failResult(n, `example split input/query ${name}`, Date.now() - t0);
+    console.error(`${C.dim}${e && e.stack ? e.stack : String(e)}${C.n}`);
+  }
+}
+
+{
+  const n = ++seq;
+  const t0 = Date.now();
+  try {
+    const out = reason({ rdfSurfaces: true }, inlineCases[0].input).trim();
+    assert.equal(out, inlineCases[0].expect);
+    pass(n, 'API rdfSurfaces option implies RDF compatibility', Date.now() - t0);
+  } catch (e) {
+    failed++;
+    failResult(n, 'API rdfSurfaces option implies RDF compatibility', Date.now() - t0);
+    console.error(`${C.dim}${e && e.stack ? e.stack : String(e)}${C.n}`);
+  }
+}
+
+{
+  const n = ++seq;
+  const t0 = Date.now();
+  try {
+    const r = runCli(`
+@prefix ex: <http://example.org/> .
+ex:bad a ex:Impossible .
+%not[ _:x
+_:x a ex:Impossible .
+%]
+`);
+    assert.equal(r.status, 65, r.stderr || r.stdout);
+    pass(n, 'top-level negative surface without child is an inference fuse', Date.now() - t0);
+  } catch (e) {
+    failed++;
+    failResult(n, 'top-level negative surface without child is an inference fuse', Date.now() - t0);
+    console.error(`${C.dim}${e && e.stack ? e.stack : String(e)}${C.n}`);
+  }
+}
+
+if (failed) process.exit(1);