eyeling 1.6.9 → 1.6.11

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';
@@ -864,9 +870,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') {
@@ -4065,6 +4071,61 @@ function evalBuiltin(goal, subst, facts, backRules, depth, varGen) {
     return [{ ...subst }];
   }
 
+  // log:dtlit
+  // Schema: ( $s.1? $s.2? )? log:dtlit $o?
+  // true iff $o is a datatyped literal with string value $s.1 and datatype IRI $s.2
+  if (g.p instanceof Iri && g.p.value === LOG_NS + 'dtlit') {
+    // Fully unbound (both arguments '?'-mode): treat as satisfiable, succeed once.
+    // Required by notation3tests "success-fullUnbound-*".
+    if (g.s instanceof Var && g.o instanceof Var) return [{ ...subst }];
+
+    const results = [];
+
+    // Direction 1: object literal -> subject list (string, datatype)
+    if (g.o instanceof Literal) {
+      const [oLex, oDt0] = literalParts(g.o.value);
+      let oDt = oDt0;
+
+      // literalParts() strips @lang into the lexical part and leaves dt null,
+      // but RDF 1.1 language-tagged strings have datatype rdf:langString.
+      if (oDt === null) {
+        if (literalHasLangTag(g.o.value)) oDt = RDF_NS + 'langString';
+        else if (isPlainStringLiteralValue(g.o.value)) oDt = XSD_NS + 'string';
+      }
+
+      if (oDt !== null) {
+        const strLit = isQuotedLexical(oLex) ? new Literal(oLex) : makeStringLiteral(String(oLex));
+        const subjList = new ListTerm([strLit, new Iri(oDt)]);
+        const s2 = unifyTerm(goal.s, subjList, subst);
+        if (s2 !== null) results.push(s2);
+      }
+    }
+
+    // Direction 2: subject list -> object literal
+    if (g.s instanceof ListTerm && g.s.elems.length === 2) {
+      const a = g.s.elems[0];
+      const b = g.s.elems[1];
+
+      if (a instanceof Literal && b instanceof Iri) {
+        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';
+        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 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 || [];
@@ -4241,9 +4302,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.9",
+  "version": "1.6.11",
   "description": "A minimal Notation3 (N3) reasoner in JavaScript.",
   "main": "./index.js",
   "keywords": [