eyeling 1.6.10 → 1.6.12

package/eyeling.js

@@ -36,6 +36,12 @@ const STRING_NS = 'http://www.w3.org/2000/10/swap/string#';
 const SKOLEM_NS = 'https://eyereasoner.github.io/.well-known/genid/';
 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; }
+}
+
 function isRdfJsonDatatype(dt) {
   // dt comes from literalParts() and may be expanded or prefixed depending on parsing/printing.
   return dt === null || dt === RDF_JSON_DT || dt === 'rdf:JSON';
@@ -251,6 +257,61 @@ function isNameChar(c) {
   return /[0-9A-Za-z_\-:]/.test(c);
 }
 
+function decodeN3StringEscapes(s) {
+  let out = '';
+  for (let i = 0; i < s.length; i++) {
+    const c = s[i];
+    if (c !== '\\') {
+      out += c;
+      continue;
+    }
+    if (i + 1 >= s.length) {
+      out += '\\';
+      continue;
+    }
+    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 'u': {
+        const hex = s.slice(i + 1, i + 5);
+        if (/^[0-9A-Fa-f]{4}$/.test(hex)) {
+          out += String.fromCharCode(parseInt(hex, 16));
+          i += 4;
+        } else {
+          out += '\\u';
+        }
+        break;
+      }
+
+      case 'U': {
+        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);
+          else out += '\\U' + hex;
+          i += 8;
+        } else {
+          out += '\\U';
+        }
+        break;
+      }
+
+      default:
+        // preserve unknown escapes
+        out += '\\' + e;
+    }
+  }
+  return out;
+}
+
 function lex(inputText) {
   const chars = Array.from(inputText);
   const n = chars.length;
@@ -384,7 +445,9 @@ function lex(inputText) {
           sChars.push(cc);
         }
         if (!closed) throw new Error('Unterminated long string literal """..."""');
-        const s = '"""' + sChars.join('') + '"""';
+        const raw = '"""' + sChars.join('') + '"""';
+        const decoded = decodeN3StringEscapes(stripQuotes(raw));
+        const s = JSON.stringify(decoded); // canonical short quoted form
         tokens.push(new Token('Literal', s));
         continue;
       }
@@ -407,7 +470,9 @@ function lex(inputText) {
         if (cc === '"') break;
         sChars.push(cc);
       }
-      const s = '"' + sChars.join('') + '"';
+      const raw = '"' + sChars.join('') + '"';
+      const decoded = decodeN3StringEscapes(stripQuotes(raw));
+      const s = JSON.stringify(decoded); // canonical short quoted form
       tokens.push(new Token('Literal', s));
       continue;
     }
@@ -864,9 +929,9 @@ class Parser {
     }
 
     if (typ === 'IriRef') {
-      return new Iri(val || '');
+      const base = this.prefixes.map[''] || '';
+      return new Iri(resolveIriRef(val || '', base));
     }
-
     if (typ === 'Ident') {
       const name = val || '';
       if (name === 'a') {
@@ -4296,9 +4361,10 @@ function evalBuiltin(goal, subst, facts, backRules, depth, varGen) {
       return s2 !== null ? [s2] : [];
     }
 
-    // If neither side is sufficiently instantiated (both vars, or wrong types),
-    // we don't enumerate URIs; the builtin just fails.
-    return [];
+    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.10",
+  "version": "1.6.12",
   "description": "A minimal Notation3 (N3) reasoner in JavaScript.",
   "main": "./index.js",
   "keywords": [