Adds/updates annotations on triple terms.

gkellogg · gkellogg · commit 6142c6ff5cef · 2025-05-19T09:27:45.000-07:00
diff --git a/tests/expand-manifest.jsonld b/tests/expand-manifest.jsonld
@@ -357,13 +357,31 @@
       "expectErrorCode": "invalid annotation",
       "requires": "JSON-LD-star",
       "option": {"specVersion": "json-ld-star", "rdfstar": true}
+    }, {
+      "@id": "#tst28",
+      "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"],
+      "name": "Annotation on reifier 1",
+      "purpose": "Node with @annotation property on reifier",
+      "input": "expand/st28-in.jsonld",
+      "expect": "expand/st28-out.jsonld",
+      "requires": "JSON-LD-star",
+      "option": {"specVersion": "json-ld-star", "rdfstar": true}
     }, {
       "@id": "#tst29",
-      "@type": ["jld:NegativeEvaluationTest", "jld:ExpandTest"],
-      "name": "Embedded annotation node 1",
-      "purpose": "Node with @annotation property on embedded object",
+      "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"],
+      "name": "Annotation on triple term 2",
+      "purpose": "Node with @annotation property on triple term",
       "input": "expand/st29-in.jsonld",
-      "expectErrorCode": "invalid triple term",
+      "expect": "expand/st29-out.jsonld",
+      "requires": "JSON-LD-star",
+      "option": {"specVersion": "json-ld-star", "rdfstar": true}
+    }, {
+      "@id": "#tst29r",
+      "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"],
+      "name": "Annotation on reification 2",
+      "purpose": "Node with @annotation property on reification",
+      "input": "expand/st29r-in.jsonld",
+      "expect": "expand/st29r-out.jsonld",
       "requires": "JSON-LD-star",
       "option": {"specVersion": "json-ld-star", "rdfstar": true}
     }, {
diff --git a/tests/expand/st28-in.jsonld b/tests/expand/st28-in.jsonld
@@ -0,0 +1,11 @@
+{
+  "@id": "_:rei",
+  "@reifies": {
+    "@id": "ex:rei",
+    "ex:prop": {"@id": "_:value"}
+  },
+  "ex:prop": {
+    "@value": "value2",
+    "@annotation": {"ex:certainty": 0.8}
+  }
+}
diff --git a/tests/expand/st28-out.jsonld b/tests/expand/st28-out.jsonld
@@ -0,0 +1,11 @@
+[{
+  "@id": "_:rei",
+  "@reifies": [{
+    "@id": "ex:rei",
+    "ex:prop": [{"@id": "_:value"}]
+  }],
+  "ex:prop": [{
+    "@value": "value2",
+    "@annotation": [{"ex:certainty": [{"@value": 0.8}]}]
+  }]
+}]
diff --git a/tests/expand/st29-out.jsonld b/tests/expand/st29-out.jsonld
@@ -0,0 +1,10 @@
+[{
+  "@id": "ex:subj",
+  "ex:value": [{
+    "@triple": {
+      "@id": "ex:rei",
+      "ex:prop": [{"@value": "value"}]
+    },
+    "@annotation": [{"ex:certainty": [{"@value": 0.8}]}]
+  }]
+}]
diff --git a/tests/expand/st29r-in.jsonld b/tests/expand/st29r-in.jsonld
@@ -0,0 +1,10 @@
+{
+  "@id": "ex:subj",
+  "ex:value": {
+    "@reifies": {
+      "@id": "ex:rei",
+      "ex:prop": "value"
+    },
+    "@annotation": {"ex:certainty": 0.8}
+  }
+}
diff --git a/tests/expand/st29r-out.jsonld b/tests/expand/st29r-out.jsonld
@@ -0,0 +1,10 @@
+[{
+  "@id": "ex:subj",
+  "ex:value": [{
+    "@reifies": [{
+      "@id": "ex:rei",
+      "ex:prop": [{"@value": "value"}]
+    }],
+    "@annotation": [{"ex:certainty": [{"@value": 0.8}]}]
+  }]
+}]
diff --git a/tests/flatten-manifest.jsonld b/tests/flatten-manifest.jsonld
@@ -180,16 +180,16 @@
     }, {
       "@id": "#tst28",
       "@type": ["jld:PositiveEvaluationTest", "jld:FlattenTest"],
-      "name": "Embedded annotation node 1",
-      "purpose": "Node with @annotation property on triple term",
+      "name": "Annotation on reifier 1",
+      "purpose": "Node with @annotation property on reifier",
       "input": "flatten/st28-in.jsonld",
       "expect": "flatten/st28-out.jsonld",
       "requires": "JSON-LD-star",
       "option": {"specVersion": "json-ld-star", "rdfstar": true}
     }, {
       "@id": "#tst28n",
       "@type": ["jld:PositiveEvaluationTest", "jld:FlattenTest"],
-      "name": "Embedded annotation node 1 (with @annotation)",
+      "name": "Annotation on triple term 2",
       "purpose": "Node with @annotation property on triple term",
       "input": "flatten/st28-in.jsonld",
       "expect": "flatten/st28n-out.jsonld",
@@ -198,21 +198,39 @@
     }, {
       "@id": "#tst29",
       "@type": ["jld:PositiveEvaluationTest", "jld:FlattenTest"],
-      "name": "Embedded annotation node 2",
-      "purpose": "Node with @annotation property on embedded object",
+      "name": "Annotation on triple term 2",
+      "purpose": "Node with @annotation property on triple term",
       "input": "flatten/st29-in.jsonld",
       "expect": "flatten/st29-out.jsonld",
       "requires": "JSON-LD-star",
       "option": {"specVersion": "json-ld-star", "rdfstar": true}
     }, {
       "@id": "#tst29n",
       "@type": ["jld:PositiveEvaluationTest", "jld:FlattenTest"],
-      "name": "Embedded annotation node 2 (with @annotation)",
-      "purpose": "Node with @annotation property on embedded object",
+      "name": "Annotation on triple term 2 (with @annotation)",
+      "purpose": "Node with @annotation property on triple term",
       "input": "flatten/st29-in.jsonld",
       "expect": "flatten/st29n-out.jsonld",
       "requires": "JSON-LD-star",
       "option": {"specVersion": "json-ld-star", "rdfstar": true, "createAnnotations": true}
+    }, {
+      "@id": "#tst29r",
+      "@type": ["jld:PositiveEvaluationTest", "jld:FlattenTest"],
+      "name": "Annotation on reification 2",
+      "purpose": "Node with @annotation property on reification",
+      "input": "flatten/st29r-in.jsonld",
+      "expect": "flatten/st29r-out.jsonld",
+      "requires": "JSON-LD-star",
+      "option": {"specVersion": "json-ld-star", "rdfstar": true}
+    }, {
+      "@id": "#tst29rn",
+      "@type": ["jld:PositiveEvaluationTest", "jld:FlattenTest"],
+      "name": "Annotation on reification 2 (with @annotation)",
+      "purpose": "Node with @annotation property on reification",
+      "input": "flatten/st29r-in.jsonld",
+      "expect": "flatten/st29rn-out.jsonld",
+      "requires": "JSON-LD-star",
+      "option": {"specVersion": "json-ld-star", "rdfstar": true, "createAnnotations": true}
     }, {
       "@id": "#tst32",
       "@type": ["jld:PositiveEvaluationTest", "jld:FlattenTest"],
diff --git a/tests/flatten/st29-in.jsonld b/tests/flatten/st29-in.jsonld
@@ -1,7 +1,7 @@
 {
   "@id": "ex:subj",
   "ex:value": {
-    "@reifies": {
+    "@triple": {
       "@id": "ex:rei",
       "ex:prop": "value"
     },
diff --git a/tests/flatten/st29-out.jsonld b/tests/flatten/st29-out.jsonld
@@ -1,17 +1,21 @@
 [{
   "@id": "ex:subj",
-  "ex:value": [{"@id": "_:b0"}]
-}, {
-  "@id": "_:b0",
-  "@reifies": [{
-    "@id": "ex:rei",
-    "ex:prop": [{"@value": "value"}]
+  "ex:value": [{
+    "@triple": {
+      "@id": "ex:rei",
+      "ex:prop": [{"@value": "value"}]
+    }
   }]
 }, {
-  "@id": "_:b2",
+  "@id": "_:b1",
   "@reifies": [{
     "@id": "ex:subj",
-    "ex:value": [{"@id": "_:b0"}]
+    "ex:value": [{
+      "@triple": {
+        "@id": "ex:rei",
+        "ex:prop": [{"@value": "value"}]
+      }
+    }]
   }],
   "ex:certainty": [{"@value": 0.8}]
-}]
+}]
diff --git a/tests/flatten/st29n-out.jsonld b/tests/flatten/st29n-out.jsonld
@@ -1,17 +1,13 @@
 [{
   "@id": "ex:subj",
   "ex:value": [{
-    "@id": "_:b0",
+    "@triple": {
+      "@id": "ex:rei",
+      "ex:prop": [{"@value": "value"}]
+    },
     "@annotation": [{
-      "@id": "_:b2",
+      "@id": "_:b1",
       "ex:certainty": [{"@value": 0.8}]
     }]
   }]
-},
-{
-  "@id": "_:b0",
-  "@reifies": [{
-    "@id": "ex:rei",
-    "ex:prop": [{"@value": "value"}]
-  }]
 }]
diff --git a/tests/flatten/st29r-in.jsonld b/tests/flatten/st29r-in.jsonld
@@ -0,0 +1,10 @@
+{
+  "@id": "ex:subj",
+  "ex:value": {
+    "@reifies": {
+      "@id": "ex:rei",
+      "ex:prop": "value"
+    },
+    "@annotation": {"ex:certainty": 0.8}
+  }
+}
diff --git a/tests/flatten/st29r-out.jsonld b/tests/flatten/st29r-out.jsonld
@@ -0,0 +1,17 @@
+[{
+  "@id": "ex:subj",
+  "ex:value": [{"@id": "_:b0"}]
+}, {
+  "@id": "_:b0",
+  "@reifies": [{
+    "@id": "ex:rei",
+    "ex:prop": [{"@value": "value"}]
+  }]
+}, {
+  "@id": "_:b2",
+  "@reifies": [{
+    "@id": "ex:subj",
+    "ex:value": [{"@id": "_:b0"}]
+  }],
+  "ex:certainty": [{"@value": 0.8}]
+}]
diff --git a/tests/flatten/st29rn-out.jsonld b/tests/flatten/st29rn-out.jsonld
@@ -0,0 +1,19 @@
+[{
+  "@id": "ex:subj",
+  "ex:value": [{
+    "@id": "_:b0",
+    "@annotation": [{
+      "@id": "_:b2",
+      "ex:certainty": [{"@value": 0.8}]
+    }]
+  }]
+},
+{
+  "@id": "_:b0",
+  "@reifies": [
+    {
+      "@id": "ex:rei",
+      "ex:prop": [{"@value": "value"}]
+    }
+  ]
+}]
diff --git a/tests/fromRdf-manifest.jsonld b/tests/fromRdf-manifest.jsonld
@@ -135,7 +135,7 @@
     }, {
       "@id": "#tst28",
       "@type": ["jld:PositiveEvaluationTest", "jld:FromRDFTest"],
-      "name": "Embedded annotation node 1 (with @annotation)",
+      "name": "Annotation on reifier 1 (with @annotation)",
       "purpose": "Node with @annotation property on embedded subject",
       "input": "fromRdf/st28-in.nq",
       "expect": "fromRdf/st28-out.jsonld",
diff --git a/tests/toRdf-manifest.jsonld b/tests/toRdf-manifest.jsonld
@@ -360,19 +360,28 @@
     }, {
       "@id": "#tst28",
       "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"],
-      "name": "Embedded annotation node 1",
-      "purpose": "Node with @annotation property on embedded subject",
+      "name": "Annotation on reifier 1",
+      "purpose": "Node with @annotation property on reifier",
       "input": "toRdf/st28-in.jsonld",
       "expect": "toRdf/st28-out.nq",
       "requires": "JSON-LD-star",
       "option": {"specVersion": "json-ld-star", "rdfstar": true}
     }, {
       "@id": "#tst29",
-      "@type": ["jld:NegativeEvaluationTest", "jld:ToRDFTest"],
-      "name": "Embedded annotation node 1",
-      "purpose": "Node with @annotation property on embedded object",
+      "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"],
+      "name": "Annotation on triple term 2",
+      "purpose": "Node with @annotation property on triple term",
       "input": "toRdf/st29-in.jsonld",
-      "expectErrorCode": "invalid triple term",
+      "expect": "toRdf/st29-out.nq",
+      "requires": "JSON-LD-star",
+      "option": {"specVersion": "json-ld-star", "rdfstar": true}
+    }, {
+      "@id": "#tst29r",
+      "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"],
+      "name": "Annotation on reification 2",
+      "purpose": "Node with @annotation property on reification",
+      "input": "toRdf/st29r-in.jsonld",
+      "expect": "toRdf/st29r-out.nq",
       "requires": "JSON-LD-star",
       "option": {"specVersion": "json-ld-star", "rdfstar": true}
     }, {
diff --git a/tests/toRdf/st28-in.jsonld b/tests/toRdf/st28-in.jsonld
@@ -1,4 +1,5 @@
 {
+  "@id": "_:rei",
   "@reifies": {
     "@id": "ex:rei",
     "ex:prop": {"@id": "_:value"}
diff --git a/tests/toRdf/st29-out.nq b/tests/toRdf/st29-out.nq
@@ -0,0 +1,3 @@
+<ex:subj> <ex:value> <<(<ex:rei> <ex:prop> "value")>> .
+_:b1 <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<(<ex:subj> <ex:value> <<(<ex:rei> <ex:prop> "value")>>)>> .
+_:b1 <ex:certainty> "8.0E-1"^^<http://www.w3.org/2001/XMLSchema#double> .
diff --git a/tests/toRdf/st29r-in.jsonld b/tests/toRdf/st29r-in.jsonld
@@ -0,0 +1,10 @@
+{
+  "@id": "ex:subj",
+  "ex:value": {
+    "@reifies": {
+      "@id": "ex:rei",
+      "ex:prop": "value"
+    },
+    "@annotation": {"ex:certainty": 0.8}
+  }
+}
diff --git a/tests/toRdf/st29r-out.nq b/tests/toRdf/st29r-out.nq
@@ -0,0 +1,4 @@
+<ex:subj> <ex:value> _:b0 .
+_:b0 <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<(<ex:rei> <ex:prop> "value")>> .
+_:b1 <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<(<ex:subj> <ex:value> _:b0)>> .
+_:b1 <ex:certainty> "8.0E-1"^^<http://www.w3.org/2001/XMLSchema#double> .

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"@id": "ex:subj",`
`3`	`3`	`"ex:value": {`
`4`		`- "@reifies": {`
	`4`	`+ "@triple": {`
`5`	`5`	`"@id": "ex:rei",`
`6`	`6`	`"ex:prop": "value"`
`7`	`7`	`},`