eyeling 1.5.32 → 1.5.33

package/examples/output/math-builtins-tests.n3

@@ -1,5 +1,6 @@
 @prefix : <http://example.org/math-tests#> .
 @prefix math: <http://www.w3.org/2000/10/swap/math#> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 
 # ----------------------------------------------------------------------
 # Proof for derived triple:
@@ -3431,16 +3432,16 @@
 # Proof for derived triple:
 #   :test-rounded-1 a :MathBuiltinTest .
 # It holds because the following instance of the rule body is provable:
-#   "3.3"^^<http://www.w3.org/2001/XMLSchema#double> math:rounded 3 .
+#   "3.3"^^xsd:double math:rounded 3 .
 #   3 math:equalTo 3 .
 # via the schematic forward rule:
 #   {
-#     "3.3"^^<http://www.w3.org/2001/XMLSchema#double> math:rounded ?r .
+#     "3.3"^^xsd:double math:rounded ?r .
 #     ?r math:equalTo 3 .
 #   } => {
 #     :test-rounded-1 a :MathBuiltinTest .
 #     :test-rounded-1 :builtin math:rounded .
-#     :test-rounded-1 :input "3.3"^^<http://www.w3.org/2001/XMLSchema#double> .
+#     :test-rounded-1 :input "3.3"^^xsd:double .
 #     :test-rounded-1 :expected 3 .
 #     :test-rounded-1 :actual ?r .
 #     :test-rounded-1 :status :pass .
@@ -3456,16 +3457,16 @@
 # Proof for derived triple:
 #   :test-rounded-1 :builtin math:rounded .
 # It holds because the following instance of the rule body is provable:
-#   "3.3"^^<http://www.w3.org/2001/XMLSchema#double> math:rounded 3 .
+#   "3.3"^^xsd:double math:rounded 3 .
 #   3 math:equalTo 3 .
 # via the schematic forward rule:
 #   {
-#     "3.3"^^<http://www.w3.org/2001/XMLSchema#double> math:rounded ?r .
+#     "3.3"^^xsd:double math:rounded ?r .
 #     ?r math:equalTo 3 .
 #   } => {
 #     :test-rounded-1 a :MathBuiltinTest .
 #     :test-rounded-1 :builtin math:rounded .
-#     :test-rounded-1 :input "3.3"^^<http://www.w3.org/2001/XMLSchema#double> .
+#     :test-rounded-1 :input "3.3"^^xsd:double .
 #     :test-rounded-1 :expected 3 .
 #     :test-rounded-1 :actual ?r .
 #     :test-rounded-1 :status :pass .
@@ -3479,18 +3480,18 @@
 
 # ----------------------------------------------------------------------
 # Proof for derived triple:
-#   :test-rounded-1 :input "3.3"^^<http://www.w3.org/2001/XMLSchema#double> .
+#   :test-rounded-1 :input "3.3"^^xsd:double .
 # It holds because the following instance of the rule body is provable:
-#   "3.3"^^<http://www.w3.org/2001/XMLSchema#double> math:rounded 3 .
+#   "3.3"^^xsd:double math:rounded 3 .
 #   3 math:equalTo 3 .
 # via the schematic forward rule:
 #   {
-#     "3.3"^^<http://www.w3.org/2001/XMLSchema#double> math:rounded ?r .
+#     "3.3"^^xsd:double math:rounded ?r .
 #     ?r math:equalTo 3 .
 #   } => {
 #     :test-rounded-1 a :MathBuiltinTest .
 #     :test-rounded-1 :builtin math:rounded .
-#     :test-rounded-1 :input "3.3"^^<http://www.w3.org/2001/XMLSchema#double> .
+#     :test-rounded-1 :input "3.3"^^xsd:double .
 #     :test-rounded-1 :expected 3 .
 #     :test-rounded-1 :actual ?r .
 #     :test-rounded-1 :status :pass .
@@ -3500,22 +3501,22 @@
 # Therefore the derived triple above is entailed by the rules and facts.
 # ----------------------------------------------------------------------
 
-:test-rounded-1 :input "3.3"^^<http://www.w3.org/2001/XMLSchema#double> .
+:test-rounded-1 :input "3.3"^^xsd:double .
 
 # ----------------------------------------------------------------------
 # Proof for derived triple:
 #   :test-rounded-1 :expected 3 .
 # It holds because the following instance of the rule body is provable:
-#   "3.3"^^<http://www.w3.org/2001/XMLSchema#double> math:rounded 3 .
+#   "3.3"^^xsd:double math:rounded 3 .
 #   3 math:equalTo 3 .
 # via the schematic forward rule:
 #   {
-#     "3.3"^^<http://www.w3.org/2001/XMLSchema#double> math:rounded ?r .
+#     "3.3"^^xsd:double math:rounded ?r .
 #     ?r math:equalTo 3 .
 #   } => {
 #     :test-rounded-1 a :MathBuiltinTest .
 #     :test-rounded-1 :builtin math:rounded .
-#     :test-rounded-1 :input "3.3"^^<http://www.w3.org/2001/XMLSchema#double> .
+#     :test-rounded-1 :input "3.3"^^xsd:double .
 #     :test-rounded-1 :expected 3 .
 #     :test-rounded-1 :actual ?r .
 #     :test-rounded-1 :status :pass .
@@ -3531,16 +3532,16 @@
 # Proof for derived triple:
 #   :test-rounded-1 :actual 3 .
 # It holds because the following instance of the rule body is provable:
-#   "3.3"^^<http://www.w3.org/2001/XMLSchema#double> math:rounded 3 .
+#   "3.3"^^xsd:double math:rounded 3 .
 #   3 math:equalTo 3 .
 # via the schematic forward rule:
 #   {
-#     "3.3"^^<http://www.w3.org/2001/XMLSchema#double> math:rounded ?r .
+#     "3.3"^^xsd:double math:rounded ?r .
 #     ?r math:equalTo 3 .
 #   } => {
 #     :test-rounded-1 a :MathBuiltinTest .
 #     :test-rounded-1 :builtin math:rounded .
-#     :test-rounded-1 :input "3.3"^^<http://www.w3.org/2001/XMLSchema#double> .
+#     :test-rounded-1 :input "3.3"^^xsd:double .
 #     :test-rounded-1 :expected 3 .
 #     :test-rounded-1 :actual ?r .
 #     :test-rounded-1 :status :pass .
@@ -3556,16 +3557,16 @@
 # Proof for derived triple:
 #   :test-rounded-1 :status :pass .
 # It holds because the following instance of the rule body is provable:
-#   "3.3"^^<http://www.w3.org/2001/XMLSchema#double> math:rounded 3 .
+#   "3.3"^^xsd:double math:rounded 3 .
 #   3 math:equalTo 3 .
 # via the schematic forward rule:
 #   {
-#     "3.3"^^<http://www.w3.org/2001/XMLSchema#double> math:rounded ?r .
+#     "3.3"^^xsd:double math:rounded ?r .
 #     ?r math:equalTo 3 .
 #   } => {
 #     :test-rounded-1 a :MathBuiltinTest .
 #     :test-rounded-1 :builtin math:rounded .
-#     :test-rounded-1 :input "3.3"^^<http://www.w3.org/2001/XMLSchema#double> .
+#     :test-rounded-1 :input "3.3"^^xsd:double .
 #     :test-rounded-1 :expected 3 .
 #     :test-rounded-1 :actual ?r .
 #     :test-rounded-1 :status :pass .

package/eyeling.js

@@ -34,6 +34,28 @@ const LIST_NS = "http://www.w3.org/2000/10/swap/list#";
 const LOG_NS = "http://www.w3.org/2000/10/swap/log#";
 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 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";
+}
+
+function termToJsonText(t) {
+  if (!(t instanceof Literal)) return null;
+  const [lex, dt] = literalParts(t.value);
+  if (!isRdfJsonDatatype(dt)) return null;
+  // decode escapes for short literals; long literals are taken verbatim
+  return termToJsStringDecoded(t);
+}
+
+function makeRdfJsonLiteral(jsonText) {
+  // Prefer a readable long literal when safe; fall back to short if needed.
+  if (!jsonText.includes('"""')) {
+    return new Literal('"""' + jsonText + '"""^^<' + RDF_JSON_DT + '>');
+  }
+  return new Literal(JSON.stringify(jsonText) + '^^<' + RDF_JSON_DT + '>');
+}
 
 // For a single reasoning run, this maps a canonical representation
 // of the subject term in log:skolem to a Skolem IRI.
@@ -552,6 +574,9 @@ function collectIrisInTerm(t) {
   const out = [];
   if (t instanceof Iri) {
     out.push(t.value);
+  } else if (t instanceof Literal) {
+    const [_lex, dt] = literalParts(t.value);
+    if (dt) out.push(dt); // so rdf/xsd prefixes are emitted when only used in ^^...
   } else if (t instanceof ListTerm) {
     for (const x of t.elems) out.push(...collectIrisInTerm(x));
   } else if (t instanceof OpenListTerm) {
@@ -1951,10 +1976,7 @@ function jsonToTerm(v) {
   if (Array.isArray(v)) return new ListTerm(v.map(jsonToTerm));
 
   if (v && typeof v === "object") {
-    // IMPORTANT: long literal so it can be parsed again via termToJsString()
-    // without needing escape decoding.
-    const raw = JSON.stringify(v);
-    return new Literal('"""' + raw + '"""');
+    return makeRdfJsonLiteral(JSON.stringify(v));
   }
   return null;
 }
@@ -3566,8 +3588,9 @@ function evalBuiltin(goal, subst, facts, backRules, depth, varGen) {
   // Schema: ( $jsonText $pointer ) string:jsonPointer $value
   if (g.p instanceof Iri && g.p.value === STRING_NS + "jsonPointer") {
     if (!(g.s instanceof ListTerm) || g.s.elems.length !== 2) return [];
-    const jsonText = termToJsString(g.s.elems[0]);
-    const ptr = termToJsString(g.s.elems[1]);
+
+    const jsonText = termToJsonText(g.s.elems[0]);     // <-- changed
+    const ptr      = termToJsStringDecoded(g.s.elems[1]);
     if (jsonText === null || ptr === null) return [];
 
     const valTerm = jsonPointerLookup(jsonText, ptr);
@@ -4174,7 +4197,13 @@ function termToN3(t, pref) {
     if (i.startsWith("_:")) return i;
     return `<${i}>`;
   }
-  if (t instanceof Literal) return t.value;
+ if (t instanceof Literal) {
+   const [lex, dt] = literalParts(t.value);
+   if (!dt) return t.value; // keep numbers, booleans, lang-tagged strings, etc.
+   const qdt = pref.shrinkIri(dt);
+   if (qdt !== null) return `${lex}^^${qdt}`;   // e.g. ^^rdf:JSON
+   return `${lex}^^<${dt}>`;                   // fallback
+ }
   if (t instanceof Var) return `?${t.name}`;
   if (t instanceof Blank) return t.label;
   if (t instanceof ListTerm) {

package/package.json

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