eyeling 1.8.0 → 1.8.2

package/README.md

@@ -114,15 +114,14 @@ npm run test:packlist
 Usage: eyeling [options] <file.n3>
 
 Options:
+  -a, --ast               Print parsed AST as JSON and exit.
+  -e, --enforce-https     Rewrite http:// IRIs to https:// for log dereferencing builtins.
   -h, --help              Show this help and exit.
-  -v, --version           Print version and exit.
   -p, --proof-comments    Enable proof explanations.
-  -n, --no-proof-comments Disable proof explanations (default).
+  -r, --strings           Print log:outputString strings (ordered by key) instead of N3 output.
   -s, --super-restricted  Disable all builtins except => and <=.
-  -a, --ast               Print parsed AST as JSON and exit.
-  --strings               Print log:outputString strings (ordered by key) instead of N3 output.
-  --enforce-https         Rewrite http:// IRIs to https:// for log dereferencing builtins.
-  --stream                Stream derived triples as soon as they are derived.
+  -t, --stream            Stream derived triples as soon as they are derived.
+  -v, --version           Print version and exit.
 ```
 
 By default, `eyeling`:
@@ -136,7 +135,7 @@ By default, `eyeling`:
 
 For each newly derived triple, `eyeling` prints:
 
-1. a proof-style comment block explaining why the triple holds (unless `-n`), and then
+1. a proof-style comment block explaining why the triple holds, and then
 2. the triple itself in N3/Turtle syntax.
 
 The proof comments are compact “local justifications” per derived triple (not a single exported global proof tree).

package/eyeling.js

@@ -7427,7 +7427,17 @@ try {
 
 function main() {
   // Drop "node" and script name; keep only user-provided args
-  const argv = process.argv.slice(2);
+  // Expand combined short options: -pt == -p -t
+  const argvRaw = process.argv.slice(2);
+  const argv = [];
+  for (const a of argvRaw) {
+    if (a === '-' || !a.startsWith('-') || a.startsWith('--') || a.length === 2) {
+      argv.push(a);
+      continue;
+    }
+    // Combined short flags (no flag in eyeling takes a value)
+    for (const ch of a.slice(1)) argv.push('-' + ch);
+  }
   const prog = String(process.argv[1] || 'eyeling')
     .split(/[\/]/)
     .pop();
@@ -7436,15 +7446,14 @@ function main() {
     const msg =
       `Usage: ${prog} [options] <file.n3>\n\n` +
       `Options:\n` +
+      `  -a, --ast               Print parsed AST as JSON and exit.\n` +
+      `  -e, --enforce-https     Rewrite http:// IRIs to https:// for log dereferencing builtins.\n` +
       `  -h, --help              Show this help and exit.\n` +
-      `  -v, --version           Print version and exit.\n` +
       `  -p, --proof-comments    Enable proof explanations.\n` +
-      `  -n, --no-proof-comments Disable proof explanations (default).\n` +
+      `  -r, --strings           Print log:outputString strings (ordered by key) instead of N3 output.\n` +
       `  -s, --super-restricted  Disable all builtins except => and <=.\n` +
-      `  -a, --ast               Print parsed AST as JSON and exit.\n` +
-      `  --strings               Print log:outputString strings (ordered by key) instead of N3 output.\n` +
-      `  --enforce-https         Rewrite http:// IRIs to https:// for log dereferencing builtins.\n` +
-      `  --stream                Stream derived triples as soon as they are derived.\n`;
+      `  -t, --stream            Stream derived triples as soon as they are derived.\n` +
+      `  -v, --version           Print version and exit.\n`;
     (toStderr ? console.error : console.log)(msg);
   }
 
@@ -7465,11 +7474,11 @@ function main() {
 
   const showAst = argv.includes('--ast') || argv.includes('-a');
 
-  const outputStringsMode = argv.includes('--strings');
-  const streamMode = argv.includes('--stream');
+  const outputStringsMode = argv.includes('--strings') || argv.includes('-r');
+  const streamMode = argv.includes('--stream') || argv.includes('-t');
 
   // --enforce-https: rewrite http:// -> https:// for log dereferencing builtins
-  if (argv.includes('--enforce-https')) {
+  if (argv.includes('--enforce-https') || argv.includes('-e')) {
     enforceHttpsEnabled = true;
   }
 
@@ -7478,12 +7487,6 @@ function main() {
     proofCommentsEnabled = true;
   }
 
-  // --no-proof-comments / -n: disable proof explanations (default)
-  // Keep this after --proof-comments so -n wins if both are present.
-  if (argv.includes('--no-proof-comments') || argv.includes('-n')) {
-    proofCommentsEnabled = false;
-  }
-
   // --super-restricted / -s: disable all builtins except => / <=
   if (argv.includes('--super-restricted') || argv.includes('-s')) {
     superRestrictedMode = true;

package/package.json

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

package/test/api.test.js

@@ -7,7 +7,9 @@ const { reason } = require('..');
 const { reasonStream } = require('../eyeling.js');
 
 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: '' };
+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}`);
@@ -353,7 +355,10 @@ ${U('a')} ${U('p')} ${U('b')}.
     name: '17 heavier reachability: branching graph reach closure',
     opt: { proofComments: false, maxBuffer: 200 * 1024 * 1024 },
     input: reachabilityGraphN3(12),
-    expect: [new RegExp(`${EX}g0>\\s+<${EX}reach>\\s+<${EX}g12>\\s*\\.`), new RegExp(`${EX}g2>\\s+<${EX}reach>\\s+<${EX}g10>\\s*\\.`)],
+    expect: [
+      new RegExp(`${EX}g0>\\s+<${EX}reach>\\s+<${EX}g12>\\s*\\.`),
+      new RegExp(`${EX}g2>\\s+<${EX}reach>\\s+<${EX}g10>\\s*\\.`),
+    ],
   },
   {
     name: '18 heavier taxonomy: diamond subclass inference',
@@ -381,7 +386,10 @@ ${U('a')} ${U('p')} ${U('b')}.
     name: '21 heavier equivalence: sameAs propagation (with symmetric sameAs)',
     opt: { proofComments: false },
     input: sameAsN3(),
-    expect: [new RegExp(`${EX}b>\\s+<${EX}p>\\s+<${EX}o>\\s*\\.`), new RegExp(`${EX}b>\\s+<${EX}sameAs>\\s+<${EX}a>\\s*\\.`)],
+    expect: [
+      new RegExp(`${EX}b>\\s+<${EX}p>\\s+<${EX}o>\\s*\\.`),
+      new RegExp(`${EX}b>\\s+<${EX}sameAs>\\s+<${EX}a>\\s*\\.`),
+    ],
   },
   {
     name: '22 heavier closure: transitive property via generic rule',
@@ -393,7 +401,10 @@ ${U('c')} ${U('sub')} ${U('d')}.
 ${U('d')} ${U('sub')} ${U('e')}.
 ${transitiveClosureN3('sub')}
 `,
-    expect: [new RegExp(`${EX}a>\\s+<${EX}sub>\\s+<${EX}e>\\s*\\.`), new RegExp(`${EX}b>\\s+<${EX}sub>\\s+<${EX}d>\\s*\\.`)],
+    expect: [
+      new RegExp(`${EX}a>\\s+<${EX}sub>\\s+<${EX}e>\\s*\\.`),
+      new RegExp(`${EX}b>\\s+<${EX}sub>\\s+<${EX}d>\\s*\\.`),
+    ],
   },
   {
     name: '23 heavier social: symmetric + reachFriend closure',
@@ -408,7 +419,10 @@ ${transitiveClosureN3('sub')}
     name: '24 heavier volume: 400 facts, simple rewrite rule p -> q',
     opt: { proofComments: false, maxBuffer: 200 * 1024 * 1024 },
     input: bigFactsN3(400),
-    expect: [new RegExp(`${EX}x>\\s+<${EX}q>\\s+<${EX}o0>\\s*\\.`), new RegExp(`${EX}x>\\s+<${EX}q>\\s+<${EX}o399>\\s*\\.`)],
+    expect: [
+      new RegExp(`${EX}x>\\s+<${EX}q>\\s+<${EX}o0>\\s*\\.`),
+      new RegExp(`${EX}x>\\s+<${EX}q>\\s+<${EX}o399>\\s*\\.`),
+    ],
   },
   {
     name: '25 heavier negative entailment: batch + forbidden => false (expect exit 2)',
@@ -494,7 +508,10 @@ ${U('c')} ${U('p')} ${U('d')}.
 
 { ?s ${U('p')} ?o. } => { ?s ${U('q')} ?o. }.
 `,
-    expect: [new RegExp(`${EX}a>\\s+<${EX}q>\\s+<${EX}b>\\s*\\.`), new RegExp(`${EX}c>\\s+<${EX}q>\\s+<${EX}d>\\s*\\.`)],
+    expect: [
+      new RegExp(`${EX}a>\\s+<${EX}q>\\s+<${EX}b>\\s*\\.`),
+      new RegExp(`${EX}c>\\s+<${EX}q>\\s+<${EX}d>\\s*\\.`),
+    ],
   },
 
   {
@@ -540,7 +557,10 @@ ${U('s')} ${U('p')} ${U('o')}.
 
 { ${U('s')} ${U('p')} ${U('o')}. } => { ${U('s')} ${U('q')} ${U('o')}. ${U('s')} ${U('r')} ${U('o')}. }.
 `,
-    expect: [new RegExp(`${EX}s>\\s+<${EX}q>\\s+<${EX}o>\\s*\\.`), new RegExp(`${EX}s>\\s+<${EX}r>\\s+<${EX}o>\\s*\\.`)],
+    expect: [
+      new RegExp(`${EX}s>\\s+<${EX}q>\\s+<${EX}o>\\s*\\.`),
+      new RegExp(`${EX}s>\\s+<${EX}r>\\s+<${EX}o>\\s*\\.`),
+    ],
   },
 
   {

package/test/examples.test.js

@@ -7,7 +7,9 @@ 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: '' };
+const C = TTY
+  ? { g: '\x1b[32m', r: '\x1b[31m', y: '\x1b[33m', dim: '\x1b[2m', n: '\x1b[0m' }
+  : { g: '', r: '', y: '', dim: '', n: '' };
 const msTag = (ms) => `${C.dim}(${ms} ms)${C.n}`;
 
 function ok(msg) {

package/test/package.test.js

@@ -7,7 +7,9 @@ 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: '' };
+const C = TTY
+  ? { g: '\x1b[32m', r: '\x1b[31m', y: '\x1b[33m', dim: '\x1b[2m', n: '\x1b[0m' }
+  : { g: '', r: '', y: '', dim: '', n: '' };
 
 function info(msg) {
   console.log(`${C.y}==${C.n} ${msg}`);
@@ -110,7 +112,9 @@ function main() {
     ok('API works');
 
     info('CLI smoke test');
-    const bin = isWin() ? path.join(tmp, 'node_modules', '.bin', 'eyeling.cmd') : path.join(tmp, 'node_modules', '.bin', 'eyeling');
+    const bin = isWin()
+      ? path.join(tmp, 'node_modules', '.bin', 'eyeling.cmd')
+      : path.join(tmp, 'node_modules', '.bin', 'eyeling');
     runChecked(bin, ['-v'], { cwd: tmp, stdio: 'inherit' });
     ok('CLI works');