eyeling 1.6.13 → 1.6.14

package/examples/output/witch.n3

@@ -1,115 +1,8 @@
 @prefix : <https://eyereasoner.github.io/eye/reasoning/witch#> .
 
-# ----------------------------------------------------------------------
-# Proof for derived triple:
-#   :DUCK a :ISMADEOFWOOD .
-# It holds because the following instance of the rule body is provable:
-#   :DUCK a :FLOATS .
-# via the schematic forward rule:
-#   {
-#     ?x a :FLOATS .
-#   } => {
-#     ?x a :ISMADEOFWOOD .
-#   } .
-# with substitution (on rule variables):
-#   ?x = :DUCK
-# Therefore the derived triple above is entailed by the rules and facts.
-# ----------------------------------------------------------------------
-
 :DUCK a :ISMADEOFWOOD .
-
-# ----------------------------------------------------------------------
-# Proof for derived triple:
-#   :GIRL a :FLOATS .
-# It holds because the following instance of the rule body is provable:
-#   :DUCK a :FLOATS .
-#   :DUCK :SAMEWEIGHT :GIRL .
-# via the schematic forward rule:
-#   {
-#     ?x a :FLOATS .
-#     ?x :SAMEWEIGHT ?y .
-#   } => {
-#     ?y a :FLOATS .
-#   } .
-# with substitution (on rule variables):
-#   ?x = :DUCK
-#   ?y = :GIRL
-# Therefore the derived triple above is entailed by the rules and facts.
-# ----------------------------------------------------------------------
-
 :GIRL a :FLOATS .
-
-# ----------------------------------------------------------------------
-# Proof for derived triple:
-#   :DUCK a :BURNS .
-# It holds because the following instance of the rule body is provable:
-#   :DUCK a :ISMADEOFWOOD .
-# via the schematic forward rule:
-#   {
-#     ?x a :ISMADEOFWOOD .
-#   } => {
-#     ?x a :BURNS .
-#   } .
-# with substitution (on rule variables):
-#   ?x = :DUCK
-# Therefore the derived triple above is entailed by the rules and facts.
-# ----------------------------------------------------------------------
-
 :DUCK a :BURNS .
-
-# ----------------------------------------------------------------------
-# Proof for derived triple:
-#   :GIRL a :ISMADEOFWOOD .
-# It holds because the following instance of the rule body is provable:
-#   :GIRL a :FLOATS .
-# via the schematic forward rule:
-#   {
-#     ?x a :FLOATS .
-#   } => {
-#     ?x a :ISMADEOFWOOD .
-#   } .
-# with substitution (on rule variables):
-#   ?x = :GIRL
-# Therefore the derived triple above is entailed by the rules and facts.
-# ----------------------------------------------------------------------
-
 :GIRL a :ISMADEOFWOOD .
-
-# ----------------------------------------------------------------------
-# Proof for derived triple:
-#   :GIRL a :BURNS .
-# It holds because the following instance of the rule body is provable:
-#   :GIRL a :ISMADEOFWOOD .
-# via the schematic forward rule:
-#   {
-#     ?x a :ISMADEOFWOOD .
-#   } => {
-#     ?x a :BURNS .
-#   } .
-# with substitution (on rule variables):
-#   ?x = :GIRL
-# Therefore the derived triple above is entailed by the rules and facts.
-# ----------------------------------------------------------------------
-
 :GIRL a :BURNS .
-
-# ----------------------------------------------------------------------
-# Proof for derived triple:
-#   :GIRL a :WITCH .
-# It holds because the following instance of the rule body is provable:
-#   :GIRL a :BURNS .
-#   :GIRL a :WOMAN .
-# via the schematic forward rule:
-#   {
-#     ?x a :BURNS .
-#     ?x a :WOMAN .
-#   } => {
-#     ?x a :WITCH .
-#   } .
-# with substitution (on rule variables):
-#   ?x = :GIRL
-# Therefore the derived triple above is entailed by the rules and facts.
-# ----------------------------------------------------------------------
-
 :GIRL a :WITCH .
-

package/examples/output/zebra.n3

@@ -1,114 +1,3 @@
 @prefix : <http://eulersharp.sourceforge.net/2005/11swap/zebra#> .
 
-# ----------------------------------------------------------------------
-# Proof for derived triple:
-#   :german :eats :fish .
-# It holds because the following instance of the rule body is provable:
-#   ((:yellow :norwegian :cats :water :dunhill) (:blue :dane :horse :tea :blends) (:red :brit :birds :milk :pallmall) (:green :german :fish :coffee :prince) (:white :swede :dogs :beer :bluemasters)) log:equalTo ((:yellow :norwegian :cats :water :dunhill) (:blue :dane :horse :tea :blends) (:red :brit :birds :milk :pallmall) (:green :german :fish :coffee :prince) (:white :swede :dogs :beer :bluemasters)) .
-#   ((:yellow :norwegian :cats :water :dunhill) (:blue :dane :horse :tea :blends) (:red :brit :birds :milk :pallmall) (:green :german :fish :coffee :prince) (:white :swede :dogs :beer :bluemasters)) :pair ((:blue :dane :horse :tea :blends) (:yellow :norwegian :cats :water :dunhill)) .
-#   ((:yellow :norwegian :cats :water :dunhill) (:blue :dane :horse :tea :blends) (:red :brit :birds :milk :pallmall) (:green :german :fish :coffee :prince) (:white :swede :dogs :beer :bluemasters)) :pair ((:blue :dane :horse :tea :blends) (:yellow :norwegian :cats :water :dunhill)) .
-#   ((:yellow :norwegian :cats :water :dunhill) (:blue :dane :horse :tea :blends) (:red :brit :birds :milk :pallmall) (:green :german :fish :coffee :prince) (:white :swede :dogs :beer :bluemasters)) :sublist ((:green :german :fish :coffee :prince) (:white :swede :dogs :beer :bluemasters)) .
-#   ((:yellow :norwegian :cats :water :dunhill) (:blue :dane :horse :tea :blends) (:red :brit :birds :milk :pallmall) (:green :german :fish :coffee :prince) (:white :swede :dogs :beer :bluemasters)) :pair ((:blue :dane :horse :tea :blends) (:yellow :norwegian :cats :water :dunhill)) .
-#   ((:yellow :norwegian :cats :water :dunhill) (:blue :dane :horse :tea :blends) (:red :brit :birds :milk :pallmall) (:green :german :fish :coffee :prince) (:white :swede :dogs :beer :bluemasters)) list:member (:red :brit :birds :milk :pallmall) .
-#   ((:yellow :norwegian :cats :water :dunhill) (:blue :dane :horse :tea :blends) (:red :brit :birds :milk :pallmall) (:green :german :fish :coffee :prince) (:white :swede :dogs :beer :bluemasters)) list:member (:white :swede :dogs :beer :bluemasters) .
-#   ((:yellow :norwegian :cats :water :dunhill) (:blue :dane :horse :tea :blends) (:red :brit :birds :milk :pallmall) (:green :german :fish :coffee :prince) (:white :swede :dogs :beer :bluemasters)) list:member (:blue :dane :horse :tea :blends) .
-#   ((:yellow :norwegian :cats :water :dunhill) (:blue :dane :horse :tea :blends) (:red :brit :birds :milk :pallmall) (:green :german :fish :coffee :prince) (:white :swede :dogs :beer :bluemasters)) list:member (:red :brit :birds :milk :pallmall) .
-#   ((:yellow :norwegian :cats :water :dunhill) (:blue :dane :horse :tea :blends) (:red :brit :birds :milk :pallmall) (:green :german :fish :coffee :prince) (:white :swede :dogs :beer :bluemasters)) list:member (:yellow :norwegian :cats :water :dunhill) .
-#   ((:yellow :norwegian :cats :water :dunhill) (:blue :dane :horse :tea :blends) (:red :brit :birds :milk :pallmall) (:green :german :fish :coffee :prince) (:white :swede :dogs :beer :bluemasters)) list:member (:white :swede :dogs :beer :bluemasters) .
-#   ((:yellow :norwegian :cats :water :dunhill) (:blue :dane :horse :tea :blends) (:red :brit :birds :milk :pallmall) (:green :german :fish :coffee :prince) (:white :swede :dogs :beer :bluemasters)) list:member (:green :german :fish :coffee :prince) .
-#   ((:yellow :norwegian :cats :water :dunhill) (:blue :dane :horse :tea :blends) (:red :brit :birds :milk :pallmall) (:green :german :fish :coffee :prince) (:white :swede :dogs :beer :bluemasters)) list:member (:green :german :fish :coffee :prince) .
-# via the schematic forward rule:
-#   {
-#     ?L log:equalTo ((?A1 :norwegian ?A2 ?A3 ?A4) (:blue ?A5 ?A6 ?A7 ?A8) (?A9 ?A10 ?A11 :milk ?A12) ?A13 ?A14) .
-#     ?L :pair ((?A15 ?A16 ?A17 ?A18 :blends) (?A19 ?A20 :cats ?A21 ?A22)) .
-#     ?L :pair ((?A23 ?A24 :horse ?A25 ?A26) (?A27 ?A28 ?A29 ?A30 :dunhill)) .
-#     ?L :sublist ((:green ?A31 ?A32 :coffee ?A33) (:white ?A34 ?A35 ?A36 ?A37)) .
-#     ?L :pair ((?A38 ?A39 ?A40 ?A41 :blends) (?A42 ?A43 ?A44 :water ?A45)) .
-#     ?L list:member (:red :brit ?A46 ?A47 ?A48) .
-#     ?L list:member (?A49 :swede :dogs ?A50 ?A51) .
-#     ?L list:member (?A52 :dane ?A53 :tea ?A54) .
-#     ?L list:member (?A55 ?A56 :birds ?A57 :pallmall) .
-#     ?L list:member (:yellow ?A58 ?A59 ?A60 :dunhill) .
-#     ?L list:member (?A61 ?A62 ?A63 :beer :bluemasters) .
-#     ?L list:member (?A64 :german ?A65 ?A66 :prince) .
-#     ?L list:member (?A67 ?B :fish ?A69 ?A70) .
-#   } => {
-#     ?B :eats :fish .
-#   } .
-# with substitution (on rule variables):
-#   ?A1 = :yellow
-#   ?A10 = :brit
-#   ?A11 = :birds
-#   ?A12 = :pallmall
-#   ?A13 = (:green :german :fish :coffee :prince)
-#   ?A14 = (:white :swede :dogs :beer :bluemasters)
-#   ?A15 = :blue
-#   ?A16 = :dane
-#   ?A17 = :horse
-#   ?A18 = :tea
-#   ?A19 = :yellow
-#   ?A2 = :cats
-#   ?A20 = :norwegian
-#   ?A21 = :water
-#   ?A22 = :dunhill
-#   ?A23 = :blue
-#   ?A24 = :dane
-#   ?A25 = :tea
-#   ?A26 = :blends
-#   ?A27 = :yellow
-#   ?A28 = :norwegian
-#   ?A29 = :cats
-#   ?A3 = :water
-#   ?A30 = :water
-#   ?A31 = :german
-#   ?A32 = :fish
-#   ?A33 = :prince
-#   ?A34 = :swede
-#   ?A35 = :dogs
-#   ?A36 = :beer
-#   ?A37 = :bluemasters
-#   ?A38 = :blue
-#   ?A39 = :dane
-#   ?A4 = :dunhill
-#   ?A40 = :horse
-#   ?A41 = :tea
-#   ?A42 = :yellow
-#   ?A43 = :norwegian
-#   ?A44 = :cats
-#   ?A45 = :dunhill
-#   ?A46 = :birds
-#   ?A47 = :milk
-#   ?A48 = :pallmall
-#   ?A49 = :white
-#   ?A5 = :dane
-#   ?A50 = :beer
-#   ?A51 = :bluemasters
-#   ?A52 = :blue
-#   ?A53 = :horse
-#   ?A54 = :blends
-#   ?A55 = :red
-#   ?A56 = :brit
-#   ?A57 = :milk
-#   ?A58 = :norwegian
-#   ?A59 = :cats
-#   ?A6 = :horse
-#   ?A60 = :water
-#   ?A61 = :white
-#   ?A62 = :swede
-#   ?A63 = :dogs
-#   ?A64 = :green
-#   ?A65 = :fish
-#   ?A66 = :coffee
-#   ?A67 = :green
-#   ?A69 = :coffee
-#   ?A7 = :tea
-#   ?A70 = :prince
-#   ?A8 = :blends
-#   ?A9 = :red
-#   ?B = :german
-#   ?L = ((:yellow :norwegian :cats :water :dunhill) (:blue :dane :horse :tea :blends) (:red :brit :birds :milk :pallmall) (:green :german :fish :coffee :prince) (:white :swede :dogs :beer :bluemasters))
-# Therefore the derived triple above is entailed by the rules and facts.
-# ----------------------------------------------------------------------
-
 :german :eats :fish .
-

package/eyeling.js

@@ -39,7 +39,11 @@ const RDF_JSON_DT = RDF_NS + 'JSON';
 function resolveIriRef(ref, base) {
   if (!base) return ref;
   if (/^[A-Za-z][A-Za-z0-9+.-]*:/.test(ref)) return ref; // already absolute
-  try { return new URL(ref, base).toString(); } catch { return ref; }
+  try {
+    return new URL(ref, base).toString();
+  } catch {
+    return ref;
+  }
 }
 
 function isRdfJsonDatatype(dt) {
@@ -271,14 +275,30 @@ function decodeN3StringEscapes(s) {
     }
     const e = s[++i];
     switch (e) {
-      case 't': out += '\t'; break;
-      case 'n': out += '\n'; break;
-      case 'r': out += '\r'; break;
-      case 'b': out += '\b'; break;
-      case 'f': out += '\f'; break;
-      case '"': out += '"'; break;
-      case "'": out += "'"; break;
-      case '\\': out += '\\'; break;
+      case 't':
+        out += '\t';
+        break;
+      case 'n':
+        out += '\n';
+        break;
+      case 'r':
+        out += '\r';
+        break;
+      case 'b':
+        out += '\b';
+        break;
+      case 'f':
+        out += '\f';
+        break;
+      case '"':
+        out += '"';
+        break;
+      case "'":
+        out += "'";
+        break;
+      case '\\':
+        out += '\\';
+        break;
 
       case 'u': {
         const hex = s.slice(i + 1, i + 5);
@@ -295,7 +315,7 @@ function decodeN3StringEscapes(s) {
         const hex = s.slice(i + 1, i + 9);
         if (/^[0-9A-Fa-f]{8}$/.test(hex)) {
           const cp = parseInt(hex, 16);
-          if (cp >= 0 && cp <= 0x10FFFF) out += String.fromCodePoint(cp);
+          if (cp >= 0 && cp <= 0x10ffff) out += String.fromCodePoint(cp);
           else out += '\\U' + hex;
           i += 8;
         } else {
@@ -2343,9 +2363,14 @@ function stripQuotes(lex) {
 }
 
 function termToJsString(t) {
-  // Accept any Literal and interpret its lexical form as a JS string.
+  // Strict string extraction for SWAP/N3 string builtins:
+  //   - accept plain string literals ("...") and language-tagged ones ("..."@en)
+  //   - accept "..."^^xsd:string
+  //   - reject any other datatype (e.g., "x"^^xsd:integer, "x"^^xsd:foobar)
   if (!(t instanceof Literal)) return null;
-  const [lex, _dt] = literalParts(t.value);
+  const [lex, dt] = literalParts(t.value);
+  if (!isQuotedLexical(lex)) return null;
+  if (dt !== null && dt !== XSD_NS + 'string' && dt !== 'xsd:string') return null;
   return stripQuotes(lex);
 }
 
@@ -4198,13 +4223,11 @@ function evalBuiltin(goal, subst, facts, backRules, depth, varGen) {
         const [sLex, sDt0] = literalParts(a.value);
 
         // $s.1 must be xsd:string (plain or ^^xsd:string), not language-tagged.
-        const okString =
-          (sDt0 === null && isPlainStringLiteralValue(a.value)) || sDt0 === XSD_NS + 'string';
+        const okString = (sDt0 === null && isPlainStringLiteralValue(a.value)) || sDt0 === XSD_NS + 'string';
         if (okString) {
           const dtIri = b.value;
           // For xsd:string, prefer the plain string literal form.
-          const outLit =
-            dtIri === XSD_NS + 'string' ? new Literal(sLex) : new Literal(`${sLex}^^<${dtIri}>`);
+          const outLit = dtIri === XSD_NS + 'string' ? new Literal(sLex) : new Literal(`${sLex}^^<${dtIri}>`);
           const s2 = unifyTerm(goal.o, outLit, subst);
           if (s2 !== null) results.push(s2);
         }
@@ -4214,6 +4237,62 @@ function evalBuiltin(goal, subst, facts, backRules, depth, varGen) {
     return results;
   }
 
+  // log:langlit
+  // Schema: ( $s.1? $s.2? )? log:langlit $o?
+  // true iff $o is a language-tagged literal with string value $s.1 and language tag $s.2
+  if (g.p instanceof Iri && g.p.value === LOG_NS + 'langlit') {
+    // Fully unbound (both arguments '?'-mode): treat as satisfiable, succeed once.
+    if (g.s instanceof Var && g.o instanceof Var) return [{ ...subst }];
+    const results = [];
+    const LANG_RE = /^[A-Za-z]+(?:-[A-Za-z0-9]+)*$/; // (same notion as literalParts/literalHasLangTag)
+
+    function extractLangTag(litVal) {
+      if (typeof litVal !== 'string') return null;
+      if (!literalHasLangTag(litVal)) return null;
+      const lastQuote = litVal.lastIndexOf('"');
+      if (lastQuote < 0) return null;
+      const after = lastQuote + 1;
+      if (after >= litVal.length || litVal[after] !== '@') return null;
+      const tag = litVal.slice(after + 1);
+      if (!LANG_RE.test(tag)) return null;
+      return tag;
+    }
+
+    // Direction 1: object language-tagged literal -> subject list (string, langtag)
+    if (g.o instanceof Literal) {
+      const tag = extractLangTag(g.o.value);
+      if (tag !== null) {
+        const [oLex] = literalParts(g.o.value); // strips @lang into lexical part
+        const strLit = isQuotedLexical(oLex) ? new Literal(oLex) : makeStringLiteral(String(oLex));
+        const langLit = makeStringLiteral(tag);
+        const subjList = new ListTerm([strLit, langLit]);
+        const s2 = unifyTerm(goal.s, subjList, subst);
+        if (s2 !== null) results.push(s2);
+      }
+    }
+
+    // Direction 2: subject list -> object language-tagged literal
+    if (g.s instanceof ListTerm && g.s.elems.length === 2) {
+      const a = g.s.elems[0]; // string
+      const b = g.s.elems[1]; // lang tag string
+      if (a instanceof Literal && b instanceof Literal) {
+        const [sLex, sDt0] = literalParts(a.value);
+        const okString = (sDt0 === null && isPlainStringLiteralValue(a.value)) || sDt0 === XSD_NS + 'string';
+        const [langLex, langDt0] = literalParts(b.value);
+        const okLang = (langDt0 === null && isPlainStringLiteralValue(b.value)) || langDt0 === XSD_NS + 'string';
+        if (okString && okLang) {
+          const tag = stripQuotes(langLex);
+          if (LANG_RE.test(tag)) {
+            const outLit = new Literal(`${sLex}@${tag}`);
+            const s2 = unifyTerm(goal.o, outLit, subst);
+            if (s2 !== null) results.push(s2);
+          }
+        }
+      }
+    }
+    return results;
+  }
+
   // log:implies — expose internal forward rules as data
   if (g.p instanceof Iri && g.p.value === LOG_NS + 'implies') {
     const allFw = backRules.__allForwardRules || [];
@@ -4390,8 +4469,8 @@ function evalBuiltin(goal, subst, facts, backRules, depth, varGen) {
       return s2 !== null ? [s2] : [];
     }
 
-    const sOk = (g.s instanceof Var) || (g.s instanceof Blank) || (g.s instanceof Iri);
-    const oOk = (g.o instanceof Var) || (g.o instanceof Blank) || (g.o instanceof Literal);
+    const sOk = g.s instanceof Var || g.s instanceof Blank || g.s instanceof Iri;
+    const oOk = g.o instanceof Var || g.o instanceof Blank || g.o instanceof Literal;
     if (!sOk || !oOk) return [];
     return [{ ...subst }];
   }

package/package.json

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

package/test/examples.test.js

@@ -172,7 +172,7 @@ function main() {
     // Run eyeling on this file (cwd examplesDir so relative behavior matches old script)
     const outFd = fs.openSync(generatedPath, 'w');
 
-    const r = cp.spawnSync(nodePath, [eyelingJsPath, file], {
+    const r = cp.spawnSync(nodePath, [eyelingJsPath, '-n', file], {
       cwd: examplesDir,
       stdio: ['ignore', outFd, 'pipe'], // stdout -> file, stderr captured
       maxBuffer: 200 * 1024 * 1024,