Issue #2812: Reflect explicitly XSD-typed Literals in JSON-LD seriali…

…zation (#2889) * feat: Reflect explicitly XSD-typed Literals in JSON-LD serialization Supplying an XSD type argument to the rdflib.Literal datatype parameter should be reflected in JSON-LD serializations. Closes: #2812 * test: Add/modify tests for XSD-typed JSON-LD serialization Modify test "t#0018" in JSON-LD test-suite: Add XSD types to the expected JSON-LD output. Add test "t#0020" in JSON-LD test-suite: Add another test with mixed explicit typing in the input source. --------- Co-authored-by: Ashley Sommer <[email protected]>
RDFLib · Sep 29, 2024 · 14d1006 · 14d1006
1 parent dc5da9b
commit 14d1006
Show file tree

Hide file tree

Showing 5 changed files with 67 additions and 15 deletions.
diff --git a/rdflib/plugins/serializers/jsonld.py b/rdflib/plugins/serializers/jsonld.py
@@ -393,11 +393,8 @@ def to_raw_value(
             else:
                 v = str(o)
             if o.datatype:
-                if native:
-                    if self.context.active:
-                        return v
-                    else:
-                        return {context.value_key: v}
+                if native and self.context.active:
+                    return v
                 return {
                     context.type_key: context.to_symbol(o.datatype),
                     context.value_key: v,

diff --git a/test/jsonld/test-suite/tests/fromRdf-0018-out.jsonld b/test/jsonld/test-suite/tests/fromRdf-0018-out.jsonld
@@ -1,12 +1,27 @@
 [
-  {
-    "@id": "http://example.com/Subj1",
-    "http://example.com/prop": [
-      { "@value": true },
-      { "@value": false },
-      { "@value": 1 },
-      { "@value": "1.1", "@type": "http://www.w3.org/2001/XMLSchema#decimal"},
-      { "@value": 0.11 }
-    ]
-  }
+    {
+        "@id": "http://example.com/Subj1",
+        "http://example.com/prop": [
+            {
+		"@type": "http://www.w3.org/2001/XMLSchema#boolean",
+		"@value": true
+            },
+            {
+		"@type": "http://www.w3.org/2001/XMLSchema#boolean",
+		"@value": false
+            },
+            {
+		"@type": "http://www.w3.org/2001/XMLSchema#integer",
+		"@value": 1
+            },
+            {
+		"@type": "http://www.w3.org/2001/XMLSchema#decimal",
+		"@value": "1.1"
+            },
+            {
+		"@type": "http://www.w3.org/2001/XMLSchema#double",
+		"@value": 0.11
+            }
+        ]
+    }
 ]
diff --git a/test/jsonld/test-suite/tests/fromRdf-0020-in.nq b/test/jsonld/test-suite/tests/fromRdf-0020-in.nq
@@ -0,0 +1,5 @@
+<http://example.com/Subj1> <http://example.com/prop> "true"^^<http://www.w3.org/2001/XMLSchema#boolean> .
+<http://example.com/Subj1> <http://example.com/prop> "false" .
+<http://example.com/Subj1> <http://example.com/prop> "1" .
+<http://example.com/Subj1> <http://example.com/prop> "1.1"^^<http://www.w3.org/2001/XMLSchema#decimal> .
+<http://example.com/Subj1> <http://example.com/prop> "1.1E-1"^^<http://www.w3.org/2001/XMLSchema#double> .
diff --git a/test/jsonld/test-suite/tests/fromRdf-0020-out.jsonld b/test/jsonld/test-suite/tests/fromRdf-0020-out.jsonld
@@ -0,0 +1,25 @@
+[
+  {
+    "@id": "http://example.com/Subj1",
+    "http://example.com/prop": [
+      {
+        "@type": "http://www.w3.org/2001/XMLSchema#boolean",
+        "@value": true
+      },
+      {
+        "@value": "false"
+      },
+      {
+        "@value": "1"
+      },
+      {
+        "@type": "http://www.w3.org/2001/XMLSchema#decimal",
+        "@value": "1.1"
+      },
+      {
+        "@type": "http://www.w3.org/2001/XMLSchema#double",
+        "@value": 0.11
+      }
+    ]
+  }
+]
diff --git a/test/jsonld/test-suite/tests/fromRdf-manifest.jsonld b/test/jsonld/test-suite/tests/fromRdf-manifest.jsonld
@@ -145,6 +145,16 @@
       },
       "input": "fromRdf-0019-in.nq",
       "expect": "fromRdf-0019-out.jsonld"
+    }, {
+      "@id": "#t0020",
+      "@type": ["jld:PositiveEvaluationTest", "jld:FromRDFTest"],
+      "name": "Mixed explicit XSD typing",
+      "purpose": "Explicitly XSD-typed Literals in the input are reflected in the JSON-LD output.",
+      "option": {
+        "useNativeTypes": true
+      },
+      "input": "fromRdf-0020-in.nq",
+      "expect": "fromRdf-0020-out.jsonld"
     }
   ]
 }