eyeling 1.7.8 → 1.7.10

package/README.md

@@ -216,10 +216,10 @@ Commonly used N3/Turtle features:
 
 - **crypto**: `crypto:md5` `crypto:sha` `crypto:sha256` `crypto:sha512`
 - **list**: `list:append` `list:first` `list:firstRest` `list:in` `list:iterate` `list:last` `list:length` `list:map` `list:member` `list:memberAt` `list:notMember` `list:remove` `list:rest` `list:reverse` `list:sort`
-- **log**: `log:collectAllIn` `log:content` `log:equalTo` `log:forAllIn` `log:impliedBy` `log:implies` `log:notEqualTo` `log:notIncludes` `log:semantics` `log:skolem` `log:uri`
+- **log**: `log:collectAllIn` `log:content` `log:dtlit` `log:equalTo` `log:forAllIn` `log:impliedBy` `log:implies` `log:includes` `log:langlit` `log:notEqualTo` `log:notIncludes` `log:outputString` `log:parsedAsN3` `log:rawType` `log:semantics` `log:semanticsOrError` `log:skolem` `log:uri`
 - **math**: `math:absoluteValue` `math:acos` `math:asin` `math:atan` `math:cos` `math:cosh` `math:degrees` `math:difference` `math:equalTo` `math:exponentiation` `math:greaterThan` `math:integerQuotient` `math:lessThan` `math:negation` `math:notEqualTo` `math:notGreaterThan` `math:notLessThan` `math:product` `math:quotient` `math:remainder` `math:rounded` `math:sin` `math:sinh` `math:sum` `math:tan` `math:tanh`
 - **string**: `string:concatenation` `string:contains` `string:containsIgnoringCase` `string:endsWith` `string:equalIgnoringCase` `string:format` `string:greaterThan` `string:jsonPointer` `string:lessThan` `string:matches` `string:notEqualIgnoringCase` `string:notGreaterThan` `string:notLessThan` `string:notMatches` `string:replace` `string:scrape` `string:startsWith`
-- **time**: `time:localTime`
+- **time**: `time:day` `time:localTime` `time:minute` `time:month` `time:second` `time:timeZone` `time:year`
 
 ## License
 

package/examples/log-pan-rt-soe.n3

@@ -0,0 +1,29 @@
+# =======================================================
+# log:parsedAsN3 log:rawType log:semanticsOrError example
+# =======================================================
+
+@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#> .
+
+:Let :param """
+@prefix : <http://example.org/> .
+:s :p :o .
+""" .
+
+{
+  :Let :param ?txt .
+  ?txt log:parsedAsN3 ?f .
+  ?f   log:rawType ?tParsed .
+
+  <https://www.w3.org/2000/10/swap/test/s2.n3> log:semanticsOrError ?x .
+  ?x log:rawType ?tRemote .
+}
+=>
+{
+  :parsedFormula :is ?f .
+  :parsedType    :is ?tParsed .
+  :remoteValue   :is ?x .
+  :remoteType    :is ?tRemote .
+} .
+

package/examples/output/log-pan-rt-soe.n3

@@ -0,0 +1,9 @@
+@prefix : <http://example.org/> .
+@prefix log: <http://www.w3.org/2000/10/swap/log#> .
+
+:parsedFormula :is {
+    :s :p :o .
+} .
+:parsedType :is log:Formula .
+:remoteValue :is "error(dereference_failed,https://www.w3.org/2000/10/swap/test/s2.n3)" .
+:remoteType :is log:Literal .

package/examples/output/time.n3

@@ -0,0 +1,8 @@
+@prefix : <http://example.org/> .
+
+:out :year 2023 .
+:out :month 4 .
+:out :day 1 .
+:out :minute 6 .
+:out :second 4 .
+:out :tz "Z" .

package/examples/time.n3

@@ -0,0 +1,29 @@
+# =======================
+# time: builtins examples
+# =======================
+
+@prefix : <http://example.org/> .
+@prefix time: <http://www.w3.org/2000/10/swap/time#> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+
+:Let :dt "2023-04-01T18:06:04Z"^^xsd:dateTime .
+
+{
+  :Let :dt ?d .
+  ?d time:year ?y ;
+     time:month ?m ;
+     time:day ?day ;
+     time:minute ?min ;
+     time:second ?sec ;
+     time:timeZone ?tz .
+}
+=>
+{
+  :out :year ?y ;
+       :month ?m ;
+       :day ?day ;
+       :minute ?min ;
+       :second ?sec ;
+       :tz ?tz .
+} .
+

package/eyeling.js

@@ -89,14 +89,13 @@ const jsonPointerCache = new Map();
 // Key is the dereferenced document IRI *without* fragment.
 const __logContentCache = new Map(); // iri -> string | null (null means fetch/read failed)
 const __logSemanticsCache = new Map(); // iri -> GraphTerm | null (null means parse failed)
+const __logSemanticsOrErrorCache = new Map(); // iri -> Term (GraphTerm | Literal) for log:semanticsOrError
 const __logConclusionCache = new WeakMap(); // GraphTerm -> GraphTerm (deductive closure)
 
 // Environment detection (Node vs Browser/Worker).
 // Eyeling is primarily synchronous, so we use sync XHR in browsers for log:content/log:semantics.
 // Note: Browser fetches are subject to CORS; use CORS-enabled resources or a proxy.
-const __IS_NODE =
-  typeof process !== 'undefined' &&
-  !!(process.versions && process.versions.node);
+const __IS_NODE = typeof process !== 'undefined' && !!(process.versions && process.versions.node);
 
 function __hasXmlHttpRequest() {
   return typeof XMLHttpRequest !== 'undefined';
@@ -106,10 +105,7 @@ function __resolveBrowserUrl(ref) {
   if (!ref) return ref;
   // If already absolute, keep as-is.
   if (/^[A-Za-z][A-Za-z0-9+.-]*:/.test(ref)) return ref;
-  const base =
-    (typeof document !== 'undefined' && document.baseURI) ||
-    (typeof location !== 'undefined' && location.href) ||
-    '';
+  const base = (typeof document !== 'undefined' && document.baseURI) || (typeof location !== 'undefined' && location.href) || '';
   try {
     return new URL(ref, base).toString();
   } catch {
@@ -123,10 +119,7 @@ function __fetchHttpTextSyncBrowser(url) {
     const xhr = new XMLHttpRequest();
     xhr.open('GET', url, false); // synchronous
     try {
-      xhr.setRequestHeader(
-        'Accept',
-        'text/n3, text/turtle, application/n-triples, application/n-quads, text/plain;q=0.1, */*;q=0.01'
-      );
+      xhr.setRequestHeader('Accept', 'text/n3, text/turtle, application/n-triples, application/n-quads, text/plain;q=0.1, */*;q=0.01');
     } catch {
       // Some environments restrict setting headers (ignore).
     }
@@ -231,7 +224,7 @@ function __fetchHttpTextViaSubprocess(url) {
   `;
   const r = cp.spawnSync(process.execPath, ['-e', script, url], {
     encoding: 'utf8',
-    maxBuffer: 32 * 1024 * 1024
+    maxBuffer: 32 * 1024 * 1024,
   });
   if (r.status !== 0) return null;
   return r.stdout;
@@ -296,8 +289,8 @@ function __derefSemanticsSync(iriNoFrag) {
     return null;
   }
   try {
-    const baseIri = (typeof key === 'string' && key) ? key : iriNoFrag;
-      const formula = __parseSemanticsToFormula(text, baseIri);
+    const baseIri = typeof key === 'string' && key ? key : iriNoFrag;
+    const formula = __parseSemanticsToFormula(text, baseIri);
     __logSemanticsCache.set(key, formula);
     return formula;
   } catch {
@@ -386,8 +379,6 @@ function __computeConclusionFromFormula(formula) {
   return out;
 }
 
-
-
 // Controls whether human-readable proof comments are printed.
 let proofCommentsEnabled = false;
 // Super restricted mode: disable *all* builtins except => / <= (log:implies / log:impliedBy)
@@ -2971,6 +2962,23 @@ function stripQuotes(lex) {
   return lex;
 }
 
+function termToJsXsdStringNoLang(t) {
+  // Strict xsd:string extraction *without* language tags.
+  // Accept:
+  //   - plain string literals ("...")
+  //   - "..."^^xsd:string
+  // Reject:
+  //   - language-tagged strings ("..."@en)
+  //   - any other datatype
+  if (!(t instanceof Literal)) return null;
+  if (literalHasLangTag(t.value)) return null;
+
+  const [lex, dt] = literalParts(t.value);
+  if (!isQuotedLexical(lex)) return null;
+  if (dt !== null && dt !== XSD_NS + 'string' && dt !== 'xsd:string') return null;
+  return decodeN3StringEscapes(stripQuotes(lex));
+}
+
 function termToJsString(t) {
   // Strict string extraction for SWAP/N3 string builtins:
   //   - accept plain string literals ("...") and language-tagged ones ("..."@en)
@@ -3471,6 +3479,33 @@ function parseXsdDatetimeTerm(t) {
   return d; // Date in local/UTC, we only use timestamp
 }
 
+function parseXsdDateTimeLexParts(t) {
+  // Parse *lexical* components of an xsd:dateTime literal without timezone normalization.
+  // Returns { yearStr, month, day, minute, second, tz } or null.
+  if (!(t instanceof Literal)) return null;
+  const [lex, dt] = literalParts(t.value);
+  if (dt !== XSD_NS + 'dateTime') return null;
+  const val = stripQuotes(lex);
+
+  // xsd:dateTime lexical: YYYY-MM-DDThh:mm:ss(.s+)?(Z|(+|-)hh:mm)?
+  const m = /^(-?\d{4,})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2})(?:\.\d+)?(Z|[+-]\d{2}:\d{2})?$/.exec(val);
+  if (!m) return null;
+
+  const yearStr = m[1];
+  const month = parseInt(m[2], 10);
+  const day = parseInt(m[3], 10);
+  const minute = parseInt(m[5], 10);
+  const second = parseInt(m[6], 10);
+  const tz = m[7] || null;
+
+  if (!(month >= 1 && month <= 12)) return null;
+  if (!(day >= 1 && day <= 31)) return null;
+  if (!(minute >= 0 && minute <= 59)) return null;
+  if (!(second >= 0 && second <= 59)) return null;
+
+  return { yearStr, month, day, minute, second, tz };
+}
+
 function parseDatetimeLike(t) {
   const d = parseXsdDateTerm(t);
   if (d !== null) return d;
@@ -4561,6 +4596,162 @@ function evalBuiltin(goal, subst, facts, backRules, depth, varGen) {
   // 4.3 time: builtins
   // -----------------------------------------------------------------
 
+  // time:day
+  // Gets as object the integer day component of the subject xsd:dateTime.
+  // Schema: $s+ time:day $o-
+  if (pv === TIME_NS + 'day') {
+    const parts = parseXsdDateTimeLexParts(g.s);
+    if (!parts) return [];
+    const out = internLiteral(String(parts.day));
+
+    if (g.o instanceof Var) {
+      const s2 = { ...subst };
+      s2[g.o.name] = out;
+      return [s2];
+    }
+    if (g.o instanceof Blank) return [{ ...subst }];
+
+    const oi = parseIntLiteral(g.o);
+    if (oi !== null) {
+      try {
+        if (oi === BigInt(parts.day)) return [{ ...subst }];
+      } catch {}
+    }
+
+    const s2 = unifyTerm(g.o, out, subst);
+    return s2 !== null ? [s2] : [];
+  }
+
+  // time:minute
+  // Gets as object the integer minutes component of the subject xsd:dateTime.
+  // Schema: $s+ time:minute $o-
+  if (pv === TIME_NS + 'minute') {
+    const parts = parseXsdDateTimeLexParts(g.s);
+    if (!parts) return [];
+    const out = internLiteral(String(parts.minute));
+
+    if (g.o instanceof Var) {
+      const s2 = { ...subst };
+      s2[g.o.name] = out;
+      return [s2];
+    }
+    if (g.o instanceof Blank) return [{ ...subst }];
+
+    const oi = parseIntLiteral(g.o);
+    if (oi !== null) {
+      try {
+        if (oi === BigInt(parts.minute)) return [{ ...subst }];
+      } catch {}
+    }
+
+    const s2 = unifyTerm(g.o, out, subst);
+    return s2 !== null ? [s2] : [];
+  }
+
+  // time:month
+  // Gets as object the integer month component of the subject xsd:dateTime.
+  // Schema: $s+ time:month $o-
+  if (pv === TIME_NS + 'month') {
+    const parts = parseXsdDateTimeLexParts(g.s);
+    if (!parts) return [];
+    const out = internLiteral(String(parts.month));
+
+    if (g.o instanceof Var) {
+      const s2 = { ...subst };
+      s2[g.o.name] = out;
+      return [s2];
+    }
+    if (g.o instanceof Blank) return [{ ...subst }];
+
+    const oi = parseIntLiteral(g.o);
+    if (oi !== null) {
+      try {
+        if (oi === BigInt(parts.month)) return [{ ...subst }];
+      } catch {}
+    }
+
+    const s2 = unifyTerm(g.o, out, subst);
+    return s2 !== null ? [s2] : [];
+  }
+
+  // time:second
+  // Gets as object the integer seconds component of the subject xsd:dateTime.
+  // Schema: $s+ time:second $o-
+  if (pv === TIME_NS + 'second') {
+    const parts = parseXsdDateTimeLexParts(g.s);
+    if (!parts) return [];
+    const out = internLiteral(String(parts.second));
+
+    if (g.o instanceof Var) {
+      const s2 = { ...subst };
+      s2[g.o.name] = out;
+      return [s2];
+    }
+    if (g.o instanceof Blank) return [{ ...subst }];
+
+    const oi = parseIntLiteral(g.o);
+    if (oi !== null) {
+      try {
+        if (oi === BigInt(parts.second)) return [{ ...subst }];
+      } catch {}
+    }
+
+    const s2 = unifyTerm(g.o, out, subst);
+    return s2 !== null ? [s2] : [];
+  }
+
+  // time:timeZone
+  // Gets as object the trailing timezone offset of the subject xsd:dateTime (e.g., "-05:00" or "Z").
+  // Schema: $s+ time:timeZone $o-
+  if (pv === TIME_NS + 'timeZone') {
+    const parts = parseXsdDateTimeLexParts(g.s);
+    if (!parts) return [];
+    if (parts.tz === null) return [];
+    const out = internLiteral(`"${parts.tz}"`);
+
+    if (g.o instanceof Var) {
+      const s2 = { ...subst };
+      s2[g.o.name] = out;
+      return [s2];
+    }
+    if (g.o instanceof Blank) return [{ ...subst }];
+
+    if (termsEqual(g.o, out)) return [{ ...subst }];
+
+    // Also accept explicitly typed xsd:string literals.
+    if (g.o instanceof Literal) {
+      const [lexO, dtO] = literalParts(g.o.value);
+      if (dtO === XSD_NS + 'string' && stripQuotes(lexO) === parts.tz) return [{ ...subst }];
+    }
+    return [];
+  }
+
+  // time:year
+  // Gets as object the integer year component of the subject xsd:dateTime.
+  // Schema: $s+ time:year $o-
+  if (pv === TIME_NS + 'year') {
+    const parts = parseXsdDateTimeLexParts(g.s);
+    if (!parts) return [];
+    const out = internLiteral(String(parts.yearStr));
+
+    if (g.o instanceof Var) {
+      const s2 = { ...subst };
+      s2[g.o.name] = out;
+      return [s2];
+    }
+    if (g.o instanceof Blank) return [{ ...subst }];
+
+    const oi = parseIntLiteral(g.o);
+    if (oi !== null) {
+      try {
+        if (oi === BigInt(parts.yearStr)) return [{ ...subst }];
+      } catch {}
+    }
+
+    const s2 = unifyTerm(g.o, out, subst);
+    return s2 !== null ? [s2] : [];
+  }
+
   // time:localTime
   // "" time:localTime ?D.  binds ?D to “now” as xsd:dateTime.
   if (pv === TIME_NS + 'localTime') {
@@ -5003,30 +5194,29 @@ function evalBuiltin(goal, subst, facts, backRules, depth, varGen) {
     return s2 !== null ? [s2] : [];
   }
 
+  // log:conclusion
+  // Schema: $s+ log:conclusion $o?
+  // $o is the deductive closure of the subject formula $s (including rule inferences).
+  if (pv === LOG_NS + 'conclusion') {
+    // Accept 'true' as the empty formula.
+    let inFormula = null;
+    if (g.s instanceof GraphTerm) inFormula = g.s;
+    else if (g.s instanceof Literal && g.s.value === 'true') inFormula = new GraphTerm([]);
+    else return [];
 
-// log:conclusion
-// Schema: $s+ log:conclusion $o?
-// $o is the deductive closure of the subject formula $s (including rule inferences).
-if (pv === LOG_NS + 'conclusion') {
-  // Accept 'true' as the empty formula.
-  let inFormula = null;
-  if (g.s instanceof GraphTerm) inFormula = g.s;
-  else if (g.s instanceof Literal && g.s.value === 'true') inFormula = new GraphTerm([]);
-  else return [];
+    const conclusion = __computeConclusionFromFormula(inFormula);
+    if (!(conclusion instanceof GraphTerm)) return [];
 
-  const conclusion = __computeConclusionFromFormula(inFormula);
-  if (!(conclusion instanceof GraphTerm)) return [];
+    if (g.o instanceof Var) {
+      const s2 = { ...subst };
+      s2[g.o.name] = conclusion;
+      return [s2];
+    }
+    if (g.o instanceof Blank) return [{ ...subst }];
 
-  if (g.o instanceof Var) {
-    const s2 = { ...subst };
-    s2[g.o.name] = conclusion;
-    return [s2];
+    const s2 = unifyTerm(g.o, conclusion, subst);
+    return s2 !== null ? [s2] : [];
   }
-  if (g.o instanceof Blank) return [{ ...subst }];
-
-  const s2 = unifyTerm(g.o, conclusion, subst);
-  return s2 !== null ? [s2] : [];
-}
 
   // log:content
   // Schema: $s+ log:content $o?
@@ -5074,6 +5264,108 @@ if (pv === LOG_NS + 'conclusion') {
     return s2 !== null ? [s2] : [];
   }
 
+  // log:semanticsOrError
+  // Schema: $s+ log:semanticsOrError $o?
+  // Like log:semantics, but yields an xsd:string error message on failure.
+  if (pv === LOG_NS + 'semanticsOrError') {
+    const iri = iriValue(g.s);
+    if (iri === null) return [];
+
+    const docIri = __stripFragment(iri);
+    const norm = __normalizeDerefIri(docIri);
+    const key = typeof norm === 'string' && norm ? norm : docIri;
+
+    let term = null;
+
+    if (__logSemanticsOrErrorCache.has(key)) {
+      term = __logSemanticsOrErrorCache.get(key);
+    } else {
+      // If we already successfully computed log:semantics, reuse it.
+      const formula = __derefSemanticsSync(docIri);
+
+      if (formula instanceof GraphTerm) {
+        term = formula;
+      } else {
+        // Try to get an informative error.
+        const txt = __derefTextSync(docIri);
+        if (typeof txt !== 'string') {
+          term = makeStringLiteral(`error(dereference_failed,${docIri})`);
+        } else {
+          try {
+            const baseIri = typeof key === 'string' && key ? key : docIri;
+            term = __parseSemanticsToFormula(txt, baseIri);
+            // Keep the semantics cache consistent.
+            __logSemanticsCache.set(key, term);
+          } catch (e) {
+            const msg = e && e.message ? e.message : String(e);
+            term = makeStringLiteral(`error(parse_error,${msg})`);
+          }
+        }
+      }
+
+      __logSemanticsOrErrorCache.set(key, term);
+    }
+
+    if (g.o instanceof Var) {
+      const s2 = { ...subst };
+      s2[g.o.name] = term;
+      return [s2];
+    }
+    if (g.o instanceof Blank) return [{ ...subst }];
+
+    const s2 = unifyTerm(g.o, term, subst);
+    return s2 !== null ? [s2] : [];
+  }
+
+  // log:parsedAsN3
+  // Schema: $s+ log:parsedAsN3 $o-
+  // Parses the subject xsd:string as N3 and returns it as a formula.
+  if (pv === LOG_NS + 'parsedAsN3') {
+    const txt = termToJsXsdStringNoLang(g.s);
+    if (txt === null) return [];
+
+    let formula;
+    try {
+      // No external base is specified in the builtin definition; the parsed
+      // string may contain its own @base / @prefix directives.
+      formula = __parseSemanticsToFormula(txt, '');
+    } catch {
+      return [];
+    }
+
+    if (g.o instanceof Var) {
+      const s2 = { ...subst };
+      s2[g.o.name] = formula;
+      return [s2];
+    }
+    if (g.o instanceof Blank) return [{ ...subst }];
+
+    const s2 = unifyTerm(g.o, formula, subst);
+    return s2 !== null ? [s2] : [];
+  }
+
+  // log:rawType
+  // Schema: $s+ log:rawType $o-
+  // Returns one of log:Formula, log:Literal, rdf:List, or log:Other.
+  if (pv === LOG_NS + 'rawType') {
+    if (g.s instanceof Var) return [];
+
+    let ty;
+    if (g.s instanceof GraphTerm) ty = internIri(LOG_NS + 'Formula');
+    else if (g.s instanceof Literal) ty = internIri(LOG_NS + 'Literal');
+    else if (g.s instanceof ListTerm || g.s instanceof OpenListTerm) ty = internIri(RDF_NS + 'List');
+    else ty = internIri(LOG_NS + 'Other');
+
+    if (g.o instanceof Var) {
+      const s2 = { ...subst };
+      s2[g.o.name] = ty;
+      return [s2];
+    }
+    if (g.o instanceof Blank) return [{ ...subst }];
+
+    const s2 = unifyTerm(g.o, ty, subst);
+    return s2 !== null ? [s2] : [];
+  }
 
   // log:dtlit
   // Schema: ( $s.1? $s.2? )? log:dtlit $o?
@@ -5314,7 +5606,6 @@ if (pv === LOG_NS + 'conclusion') {
     return [{ ...subst }];
   }
 
-
   // log:collectAllIn (scoped)
   if (pv === LOG_NS + 'collectAllIn') {
     if (!(g.s instanceof ListTerm) || g.s.elems.length !== 3) return [];
@@ -6453,7 +6744,6 @@ function __collectOutputStringsFromFacts(facts, prefixes) {
   return pairs.map((p) => p.text).join('');
 }
 
-
 function main() {
   // Drop "node" and script name; keep only user-provided args
   const argv = process.argv.slice(2);

package/package.json

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