eyeling 1.21.9 → 1.22.0

package/eyeling.js

@@ -809,6 +809,56 @@ function __builtinCollectVarsInTriples(triples, out) {
   for (const tr of triples) __builtinCollectVarsInTriple(tr, out);
 }
 
+function __existentializeBlankTerm(t, mapping, varGen) {
+  if (t instanceof Blank) {
+    let v = mapping[t.label];
+    if (v === undefined) {
+      const n = Array.isArray(varGen) && typeof varGen[0] === 'number' ? varGen[0]++ : Object.keys(mapping).length + 1;
+      v = new Var(`__qb_${n}`);
+      mapping[t.label] = v;
+    }
+    return v;
+  }
+  if (t instanceof ListTerm) return t;
+  if (t instanceof OpenListTerm) return t;
+  if (t instanceof GraphTerm) {
+    let changed = false;
+    const triples = t.triples.map((tr) => {
+      const s2 = __existentializeBlankTerm(tr.s, mapping, varGen);
+      const p2 = __existentializeBlankTerm(tr.p, mapping, varGen);
+      const o2 = __existentializeBlankTerm(tr.o, mapping, varGen);
+      if (s2 !== tr.s || p2 !== tr.p || o2 !== tr.o) changed = true;
+      return s2 === tr.s && p2 === tr.p && o2 === tr.o ? tr : new Triple(s2, p2, o2);
+    });
+    return changed ? new GraphTerm(triples) : t;
+  }
+  return t;
+}
+
+function __existentializeBlankTriples(triples, varGen) {
+  const mapping = Object.create(null);
+  let changed = false;
+  const out = triples.map((tr) => {
+    const s2 = __existentializeBlankTerm(tr.s, mapping, varGen);
+    const p2 = __existentializeBlankTerm(tr.p, mapping, varGen);
+    const o2 = __existentializeBlankTerm(tr.o, mapping, varGen);
+    if (s2 !== tr.s || p2 !== tr.p || o2 !== tr.o) changed = true;
+    return s2 === tr.s && p2 === tr.p && o2 === tr.o ? tr : new Triple(s2, p2, o2);
+  });
+  return changed ? out : triples;
+}
+
+function __prepareQuotedPatternTriples(rawTriples, subst, varGen) {
+  const ex = __existentializeBlankTriples(Array.from(rawTriples), varGen);
+  let changed = false;
+  const out = ex.map((tr) => {
+    const tr2 = applySubstTriple(tr, subst);
+    if (tr2 !== tr) changed = true;
+    return tr2;
+  });
+  return changed ? out : ex;
+}
+
 function literalHasLangTag(lit) {
   // True iff the literal is a quoted string literal with a language tag suffix,
   // e.g. "hello"@en or """hello"""@en.
@@ -4001,7 +4051,8 @@ function evalBuiltin(goal, subst, facts, backRules, depth, varGen, maxResults) {
     const keepVars = new Set();
     if (g.s instanceof GraphTerm) __builtinCollectVarsInTriples(g.s.triples, keepVars);
 
-    const goalVariants = __expandScopedVarPredicateGoals(Array.from(g.o.triples));
+    const goalTriples = __prepareQuotedPatternTriples(goal.o.triples, subst, varGen);
+    const goalVariants = __expandScopedVarPredicateGoals(goalTriples);
     const out = [];
     for (const variant of goalVariants) {
       const sols = proveGoals(
@@ -4083,7 +4134,7 @@ function evalBuiltin(goal, subst, facts, backRules, depth, varGen, maxResults) {
 
     const visited2 = [];
     const sols = proveGoals(
-      Array.from(g.o.triples),
+      __prepareQuotedPatternTriples(goal.o.triples, subst, varGen),
       { ...subst },
       scopeFacts,
       scopeBackRules,
@@ -4177,15 +4228,12 @@ function evalBuiltin(goal, subst, facts, backRules, depth, varGen, maxResults) {
     }
 
     const visited2 = [];
-    const sols = proveGoals(
-      Array.from(clauseTerm.triples),
-      {},
-      scopeFacts,
-      scopeBackRules,
-      depth + 1,
-      visited2,
-      varGen,
-    );
+    const rawClauseTerm = goal.s instanceof ListTerm ? goal.s.elems[1] : clauseTerm;
+    const clauseGoals =
+      rawClauseTerm instanceof GraphTerm
+        ? __prepareQuotedPatternTriples(rawClauseTerm.triples, subst, varGen)
+        : __prepareQuotedPatternTriples(clauseTerm.triples, subst, varGen);
+    const sols = proveGoals(clauseGoals, {}, scopeFacts, scopeBackRules, depth + 1, visited2, varGen);
 
     const collected = sols.map((sBody) => applySubstTerm(valueTempl, sBody));
     const collectedList = new ListTerm(collected);
@@ -4238,28 +4286,23 @@ function evalBuiltin(goal, subst, facts, backRules, depth, varGen, maxResults) {
       scopeFacts = snap;
     }
 
+    const rawWhereClause = goal.s instanceof ListTerm ? goal.s.elems[0] : whereClause;
+    const rawThenClause = goal.s instanceof ListTerm ? goal.s.elems[1] : thenClause;
+    const whereGoals =
+      rawWhereClause instanceof GraphTerm
+        ? __prepareQuotedPatternTriples(rawWhereClause.triples, subst, varGen)
+        : __prepareQuotedPatternTriples(whereClause.triples, subst, varGen);
+    const thenGoals =
+      rawThenClause instanceof GraphTerm
+        ? __prepareQuotedPatternTriples(rawThenClause.triples, subst, varGen)
+        : __prepareQuotedPatternTriples(thenClause.triples, subst, varGen);
+
     const visited1 = [];
-    const sols1 = proveGoals(
-      Array.from(whereClause.triples),
-      {},
-      scopeFacts,
-      scopeBackRules,
-      depth + 1,
-      visited1,
-      varGen,
-    );
+    const sols1 = proveGoals(whereGoals, {}, scopeFacts, scopeBackRules, depth + 1, visited1, varGen);
 
     for (const s1 of sols1) {
       const visited2 = [];
-      const sols2 = proveGoals(
-        Array.from(thenClause.triples),
-        s1,
-        scopeFacts,
-        scopeBackRules,
-        depth + 1,
-        visited2,
-        varGen,
-      );
+      const sols2 = proveGoals(thenGoals, s1, scopeFacts, scopeBackRules, depth + 1, visited2, varGen);
       if (!sols2.length) return [];
     }
     return [outSubst];
@@ -12696,14 +12739,26 @@ function liftBlankRuleVars(premise, conclusion) {
     return new Var(name);
   }
 
+  function copyQuotedTerm(t) {
+    // Quoted formulas are data terms with their own local blank scope.
+    // Copy them structurally so later in-place rewrites cannot mutate shared AST,
+    // but do not lift their blank nodes into rule-body variables.
+    if (t instanceof ListTerm) return new ListTerm(t.elems.map(copyQuotedTerm));
+    if (t instanceof OpenListTerm) return new OpenListTerm(t.prefix.map(copyQuotedTerm), t.tailVar);
+    if (t instanceof GraphTerm) {
+      const triples = t.triples.map(
+        (tr) => new Triple(copyQuotedTerm(tr.s), copyQuotedTerm(tr.p), copyQuotedTerm(tr.o)),
+      );
+      return new GraphTerm(triples);
+    }
+    return t;
+  }
+
   function convertTerm(t) {
     if (t instanceof Blank) return blankToVar(t.label);
     if (t instanceof ListTerm) return new ListTerm(t.elems.map(convertTerm));
     if (t instanceof OpenListTerm) return new OpenListTerm(t.prefix.map(convertTerm), t.tailVar);
-    if (t instanceof GraphTerm) {
-      const triples = t.triples.map((tr) => new Triple(convertTerm(tr.s), convertTerm(tr.p), convertTerm(tr.o)));
-      return new GraphTerm(triples);
-    }
+    if (t instanceof GraphTerm) return copyQuotedTerm(t);
     return t;
   }
 

package/lib/builtins.js

@@ -330,6 +330,56 @@ function __builtinCollectVarsInTriples(triples, out) {
   for (const tr of triples) __builtinCollectVarsInTriple(tr, out);
 }
 
+function __existentializeBlankTerm(t, mapping, varGen) {
+  if (t instanceof Blank) {
+    let v = mapping[t.label];
+    if (v === undefined) {
+      const n = Array.isArray(varGen) && typeof varGen[0] === 'number' ? varGen[0]++ : Object.keys(mapping).length + 1;
+      v = new Var(`__qb_${n}`);
+      mapping[t.label] = v;
+    }
+    return v;
+  }
+  if (t instanceof ListTerm) return t;
+  if (t instanceof OpenListTerm) return t;
+  if (t instanceof GraphTerm) {
+    let changed = false;
+    const triples = t.triples.map((tr) => {
+      const s2 = __existentializeBlankTerm(tr.s, mapping, varGen);
+      const p2 = __existentializeBlankTerm(tr.p, mapping, varGen);
+      const o2 = __existentializeBlankTerm(tr.o, mapping, varGen);
+      if (s2 !== tr.s || p2 !== tr.p || o2 !== tr.o) changed = true;
+      return s2 === tr.s && p2 === tr.p && o2 === tr.o ? tr : new Triple(s2, p2, o2);
+    });
+    return changed ? new GraphTerm(triples) : t;
+  }
+  return t;
+}
+
+function __existentializeBlankTriples(triples, varGen) {
+  const mapping = Object.create(null);
+  let changed = false;
+  const out = triples.map((tr) => {
+    const s2 = __existentializeBlankTerm(tr.s, mapping, varGen);
+    const p2 = __existentializeBlankTerm(tr.p, mapping, varGen);
+    const o2 = __existentializeBlankTerm(tr.o, mapping, varGen);
+    if (s2 !== tr.s || p2 !== tr.p || o2 !== tr.o) changed = true;
+    return s2 === tr.s && p2 === tr.p && o2 === tr.o ? tr : new Triple(s2, p2, o2);
+  });
+  return changed ? out : triples;
+}
+
+function __prepareQuotedPatternTriples(rawTriples, subst, varGen) {
+  const ex = __existentializeBlankTriples(Array.from(rawTriples), varGen);
+  let changed = false;
+  const out = ex.map((tr) => {
+    const tr2 = applySubstTriple(tr, subst);
+    if (tr2 !== tr) changed = true;
+    return tr2;
+  });
+  return changed ? out : ex;
+}
+
 function literalHasLangTag(lit) {
   // True iff the literal is a quoted string literal with a language tag suffix,
   // e.g. "hello"@en or """hello"""@en.
@@ -3522,7 +3572,8 @@ function evalBuiltin(goal, subst, facts, backRules, depth, varGen, maxResults) {
     const keepVars = new Set();
     if (g.s instanceof GraphTerm) __builtinCollectVarsInTriples(g.s.triples, keepVars);
 
-    const goalVariants = __expandScopedVarPredicateGoals(Array.from(g.o.triples));
+    const goalTriples = __prepareQuotedPatternTriples(goal.o.triples, subst, varGen);
+    const goalVariants = __expandScopedVarPredicateGoals(goalTriples);
     const out = [];
     for (const variant of goalVariants) {
       const sols = proveGoals(
@@ -3604,7 +3655,7 @@ function evalBuiltin(goal, subst, facts, backRules, depth, varGen, maxResults) {
 
     const visited2 = [];
     const sols = proveGoals(
-      Array.from(g.o.triples),
+      __prepareQuotedPatternTriples(goal.o.triples, subst, varGen),
       { ...subst },
       scopeFacts,
       scopeBackRules,
@@ -3698,15 +3749,12 @@ function evalBuiltin(goal, subst, facts, backRules, depth, varGen, maxResults) {
     }
 
     const visited2 = [];
-    const sols = proveGoals(
-      Array.from(clauseTerm.triples),
-      {},
-      scopeFacts,
-      scopeBackRules,
-      depth + 1,
-      visited2,
-      varGen,
-    );
+    const rawClauseTerm = goal.s instanceof ListTerm ? goal.s.elems[1] : clauseTerm;
+    const clauseGoals =
+      rawClauseTerm instanceof GraphTerm
+        ? __prepareQuotedPatternTriples(rawClauseTerm.triples, subst, varGen)
+        : __prepareQuotedPatternTriples(clauseTerm.triples, subst, varGen);
+    const sols = proveGoals(clauseGoals, {}, scopeFacts, scopeBackRules, depth + 1, visited2, varGen);
 
     const collected = sols.map((sBody) => applySubstTerm(valueTempl, sBody));
     const collectedList = new ListTerm(collected);
@@ -3759,28 +3807,23 @@ function evalBuiltin(goal, subst, facts, backRules, depth, varGen, maxResults) {
       scopeFacts = snap;
     }
 
+    const rawWhereClause = goal.s instanceof ListTerm ? goal.s.elems[0] : whereClause;
+    const rawThenClause = goal.s instanceof ListTerm ? goal.s.elems[1] : thenClause;
+    const whereGoals =
+      rawWhereClause instanceof GraphTerm
+        ? __prepareQuotedPatternTriples(rawWhereClause.triples, subst, varGen)
+        : __prepareQuotedPatternTriples(whereClause.triples, subst, varGen);
+    const thenGoals =
+      rawThenClause instanceof GraphTerm
+        ? __prepareQuotedPatternTriples(rawThenClause.triples, subst, varGen)
+        : __prepareQuotedPatternTriples(thenClause.triples, subst, varGen);
+
     const visited1 = [];
-    const sols1 = proveGoals(
-      Array.from(whereClause.triples),
-      {},
-      scopeFacts,
-      scopeBackRules,
-      depth + 1,
-      visited1,
-      varGen,
-    );
+    const sols1 = proveGoals(whereGoals, {}, scopeFacts, scopeBackRules, depth + 1, visited1, varGen);
 
     for (const s1 of sols1) {
       const visited2 = [];
-      const sols2 = proveGoals(
-        Array.from(thenClause.triples),
-        s1,
-        scopeFacts,
-        scopeBackRules,
-        depth + 1,
-        visited2,
-        varGen,
-      );
+      const sols2 = proveGoals(thenGoals, s1, scopeFacts, scopeBackRules, depth + 1, visited2, varGen);
       if (!sols2.length) return [];
     }
     return [outSubst];

package/lib/rules.js

@@ -25,14 +25,26 @@ function liftBlankRuleVars(premise, conclusion) {
     return new Var(name);
   }
 
+  function copyQuotedTerm(t) {
+    // Quoted formulas are data terms with their own local blank scope.
+    // Copy them structurally so later in-place rewrites cannot mutate shared AST,
+    // but do not lift their blank nodes into rule-body variables.
+    if (t instanceof ListTerm) return new ListTerm(t.elems.map(copyQuotedTerm));
+    if (t instanceof OpenListTerm) return new OpenListTerm(t.prefix.map(copyQuotedTerm), t.tailVar);
+    if (t instanceof GraphTerm) {
+      const triples = t.triples.map(
+        (tr) => new Triple(copyQuotedTerm(tr.s), copyQuotedTerm(tr.p), copyQuotedTerm(tr.o)),
+      );
+      return new GraphTerm(triples);
+    }
+    return t;
+  }
+
   function convertTerm(t) {
     if (t instanceof Blank) return blankToVar(t.label);
     if (t instanceof ListTerm) return new ListTerm(t.elems.map(convertTerm));
     if (t instanceof OpenListTerm) return new OpenListTerm(t.prefix.map(convertTerm), t.tailVar);
-    if (t instanceof GraphTerm) {
-      const triples = t.triples.map((tr) => new Triple(convertTerm(tr.s), convertTerm(tr.p), convertTerm(tr.o)));
-      return new GraphTerm(triples);
-    }
+    if (t instanceof GraphTerm) return copyQuotedTerm(t);
     return t;
   }
 

package/package.json

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

package/test/api.test.js

@@ -2035,6 +2035,123 @@ _:x :hates { _:foo :making :mess }.
     },
     expect: [/:x :value "world" \./m],
   },
+
+  {
+    name: '241 regression: quoted-formula blanks in rule bodies stay blank through log:conjunction',
+    opt: { proofComments: false },
+    input: `@prefix log: <http://www.w3.org/2000/10/swap/log#> .
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix : <http://example.org/ns#> .
+
+{
+  ( { ?S a :Subject } { [] a :Thing } ) log:conjunction ?Z.
+}
+=>
+{
+  :result :is ?Z.
+}.
+`,
+    expect: [/:result\s+:is\s+\{[\s\S]*\?S\s+a\s+:Subject\s*\.[\s\S]*_:(?:b\d+)\s+a\s+:Thing\s*\.[\s\S]*\}\s*\./m],
+    notExpect: [/\?_b\d+\s+a\s+:Thing\s*\./],
+  },
+  {
+    name: '242 regression: log:includes existentializes blank nodes inside quoted formula patterns',
+    opt: { proofComments: false },
+    input: `@prefix : <http://example.org/> .
+@prefix log: <http://www.w3.org/2000/10/swap/log#> .
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+
+:doc :graph {
+  :perm :duty [
+    :action :inform ;
+    :constraint [
+      :kind :notice ;
+      :days 3
+    ]
+  ]
+} .
+
+{
+  :doc :graph ?G .
+  ?G log:includes {
+    :perm :duty [
+      :action :inform ;
+      :constraint [
+        :kind :notice ;
+        :days ?D
+      ]
+    ]
+  } .
+}
+=>
+{
+  :result :days ?D ;
+          :status :matched .
+}.
+`,
+    expect: [
+      /:result\s+:days\s+3(?:\s*\^\^<http:\/\/www\.w3\.org\/2001\/XMLSchema#integer>)?\s*\./,
+      /:result\s+:status\s+:matched\s*\./,
+    ],
+  },
+  {
+    name: '243a regression: collectAllIn treats quoted-formula blanks existentially',
+    opt: { proofComments: false },
+    input: `@prefix : <http://example.org/> .
+@prefix log: <http://www.w3.org/2000/10/swap/log#> .
+
+:a :p [ :q 1 ] .
+:b :p [ :q 2 ] .
+
+{
+  ( ?s { ?s :p [ :q 1 ] . } ?xs ) log:collectAllIn _:scope .
+  ?xs log:equalTo ( :a ) .
+}
+=>
+{
+  :test :is true .
+}.
+`,
+    expect: [/:(?:test)\s+:(?:is)\s+true\s*\./],
+  },
+
+  {
+    name: '243 regression: quoted formulas remain isolated from collectAllIn rule-body rewrites',
+    opt: { proofComments: false },
+    input: `@prefix :     <http://example.org/jade-eigen-loom#> .
+@prefix math: <http://www.w3.org/2000/10/swap/math#> .
+@prefix list: <http://www.w3.org/2000/10/swap/list#> .
+@prefix log:  <http://www.w3.org/2000/10/swap/log#> .
+
+:PCA1 :points (
+  [ :id 1 ; :x 2.0  ; :y 1.0  ]
+  [ :id 2 ; :x 3.0  ; :y 2.0  ]
+  [ :id 3 ; :x 4.0  ; :y 3.2  ]
+  [ :id 4 ; :x 5.0  ; :y 5.1  ]
+  [ :id 5 ; :x 6.0  ; :y 7.9  ]
+  [ :id 6 ; :x 7.0  ; :y 13.0 ]
+  [ :id 7 ; :x 20.0 ; :y -3.0 ]
+) .
+
+{
+  :PCA1 :points ?pts .
+  ?pts list:length ?n .
+  ( ?x { ?pts list:member ?p . ?p :x ?x . } ?xs ) log:collectAllIn _:m1 .
+  ?xs math:sum ?sumX .
+  (?sumX ?n) math:quotient ?meanX .
+}
+=>
+{
+  :result :xs ?xs ; :sumX ?sumX ; :meanX ?meanX .
+}.
+`,
+    expect: [
+      /:result\s+:xs\s+\(2\.0 3\.0 4\.0 5\.0 6\.0 7\.0 20\.0\)\s*\./,
+      /:result\s+:sumX\s+"47"\^\^xsd:decimal\s*\./,
+      /:result\s+:meanX\s+"6\.714285714285714"\^\^xsd:decimal\s*\./,
+    ],
+    notExpect: [/:result\s+:sumX\s+"329"\^\^xsd:decimal\s*\./, /:result\s+:meanX\s+"47"\^\^xsd:decimal\s*\./],
+  },
 ];
 
 let passed = 0;

package/test/arcling.test.js

@@ -3,12 +3,10 @@
 const fs = require('node:fs');
 const path = require('node:path');
 const assert = require('node:assert/strict');
-const { pathToFileURL } = require('node:url');
+const { execFileSync } = 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: '', r: '', y: '', dim: '', n: '' } : { g: '', r: '', y: '', dim: '', n: '' };
 const msTag = (ms) => `${C.dim}(${ms} ms)${C.n}`;
 
 function ok(msg) {
@@ -48,10 +46,19 @@ function listCaseDirs(baseDir) {
     .sort();
 }
 
+function findModelPath(caseDir, base) {
+  const candidates = [path.join(caseDir, `${base}.model.go`), path.join(caseDir, `${base}.model.mjs`)];
+
+  for (const candidate of candidates) {
+    if (fs.existsSync(candidate)) return candidate;
+  }
+
+  throw new Error(`Missing required arcling model artifact for ${base}`);
+}
+
 function findCaseFiles(caseDir) {
   const base = path.basename(caseDir);
-
-  const modelPath = path.join(caseDir, `${base}.model.mjs`);
+  const modelPath = findModelPath(caseDir, base);
   const dataPath = path.join(caseDir, `${base}.data.json`);
   const expectedPath = path.join(caseDir, `${base}.expected.json`);
 
@@ -64,15 +71,28 @@ function findCaseFiles(caseDir) {
   return { base, modelPath, dataPath, expectedPath };
 }
 
-async function loadEvaluate(modelPath) {
-  const moduleUrl = pathToFileURL(modelPath).href;
-  const mod = await import(moduleUrl);
+function runModelJson(modelPath, dataPath) {
+  const ext = path.extname(modelPath);
+
+  if (ext === '.go') {
+    const stdout = execFileSync('go', ['run', modelPath, dataPath, '--json'], {
+      cwd: path.dirname(modelPath),
+      encoding: 'utf8',
+      stdio: ['ignore', 'pipe', 'pipe'],
+    });
+    return JSON.parse(stdout);
+  }
 
-  if (typeof mod.evaluate !== 'function') {
-    throw new Error(`Model does not export evaluate(data): ${modelPath}`);
+  if (ext === '.mjs') {
+    const stdout = execFileSync(process.execPath, [modelPath, dataPath, '--json'], {
+      cwd: path.dirname(modelPath),
+      encoding: 'utf8',
+      stdio: ['ignore', 'pipe', 'pipe'],
+    });
+    return JSON.parse(stdout);
   }
 
-  return mod.evaluate;
+  throw new Error(`Unsupported arcling model extension: ${modelPath}`);
 }
 
 function assertArcTextShape(arcText, label) {
@@ -84,17 +104,15 @@ function assertArcTextShape(arcText, label) {
 
 async function runCase(caseDir) {
   const { base, modelPath, dataPath, expectedPath } = findCaseFiles(caseDir);
-
-  const evaluate = await loadEvaluate(modelPath);
   const data = readJson(dataPath);
   const expected = readJson(expectedPath);
-  const actual = await evaluate(data);
+  const actual = runModelJson(modelPath, dataPath);
 
   assert.equal(actual.allChecksPass, true, `${base}: expected allChecksPass === true`);
   assertArcTextShape(actual.arcText, base);
   assert.deepStrictEqual(actual, expected, `${base}: actual result does not match expected JSON`);
 
-  return base;
+  return { base, caseName: data.caseName, modelPath };
 }
 
 async function main() {