diff --git a/tests/expand-manifest.html b/tests/expand-manifest.html
index 2e462a28..fdb3c34c 100644
--- a/tests/expand-manifest.html
+++ b/tests/expand-manifest.html
@@ -5614,7 +5614,7 @@
Type
jld:PositiveEvaluationTest, jld:ExpandTest
Purpose
-Tests included maps.
+Tests included blocks.
input
expand/in01-in.jsonld
@@ -5642,7 +5642,7 @@
Type
jld:PositiveEvaluationTest, jld:ExpandTest
Purpose
-Tests included maps.
+Tests included blocks.
input
expand/in02-in.jsonld
@@ -5670,7 +5670,7 @@
Type
jld:PositiveEvaluationTest, jld:ExpandTest
Purpose
-Tests included maps.
+Tests included blocks.
input
expand/in03-in.jsonld
@@ -5698,7 +5698,7 @@
Type
jld:PositiveEvaluationTest, jld:ExpandTest
Purpose
-Tests included maps.
+Tests included blocks.
input
expand/in04-in.jsonld
@@ -5726,7 +5726,7 @@
Type
jld:PositiveEvaluationTest, jld:ExpandTest
Purpose
-Tests included maps.
+Tests included blocks.
input
expand/in05-in.jsonld
@@ -5754,7 +5754,7 @@
Type
jld:PositiveEvaluationTest, jld:ExpandTest
Purpose
-Tests included maps.
+Tests included blocks.
input
expand/in06-in.jsonld
@@ -5782,7 +5782,7 @@
Type
jld:NegativeEvaluationTest, jld:ExpandTest
Purpose
-Tests included maps.
+Tests included blocks.
input
expand/in07-in.jsonld
@@ -5810,7 +5810,7 @@
Type
jld:NegativeEvaluationTest, jld:ExpandTest
Purpose
-Tests included maps.
+Tests included blocks.
input
expand/in08-in.jsonld
@@ -5838,7 +5838,7 @@
Type
jld:NegativeEvaluationTest, jld:ExpandTest
Purpose
-Tests included maps.
+Tests included blocks.
input
expand/in09-in.jsonld
@@ -6416,24 +6416,24 @@
-
-Test tjs13 Expand JSON literal with aliased @type
+
+Test tjs21 Expand JSON literal with @context
- id
-- #tjs13
+- #tjs21
- Type
- jld:PositiveEvaluationTest, jld:ExpandTest
- Purpose
-- Tests expanding JSON literal with aliased @type.
+- Tests expanding JSON literal with a @context.
- input
-
-expand/js13-in.jsonld
+expand/js21-in.jsonld
- expect
-
-expand/js13-out.jsonld
+expand/js21-out.jsonld
- Options
-
@@ -6444,24 +6444,24 @@
-
-Test tjs14 Expand JSON literal with aliased @value
+
+Test tjs22 Expand JSON literal (null) aleady in expanded form.
- id
-- #tjs14
+- #tjs22
- Type
- jld:PositiveEvaluationTest, jld:ExpandTest
- Purpose
-- Tests expanding JSON literal with aliased @value.
+- Tests expanding property with @type @json to a JSON literal (null).
- input
-
-expand/js14-in.jsonld
+expand/js22-in.jsonld
- expect
-
-expand/js14-out.jsonld
+expand/js22-out.jsonld
- Options
-
@@ -6472,24 +6472,24 @@
-
-Test tjs21 Expand JSON literal with @context
+
+Test tjs23 Expand JSON literal (empty array).
- id
-- #tjs21
+- #tjs23
- Type
- jld:PositiveEvaluationTest, jld:ExpandTest
- Purpose
-- Tests expanding JSON literal with a @context.
+- Tests expanding property with @type @json to a JSON literal (empty array).
- input
-
-expand/js21-in.jsonld
+expand/js23-in.jsonld
- expect
-
-expand/js21-out.jsonld
+expand/js23-out.jsonld
- Options
-
@@ -7147,7 +7147,7 @@
-Test tm013 index map with @none
+Test tm013 graph index map with @none
@@ -7175,7 +7175,7 @@
-Test tm014 index map with alias @none
+Test tm014 graph index map with alias @none
@@ -7203,7 +7203,7 @@
-Test tm015 index map with alias @none
+Test tm015 graph id index map with aliased @none
@@ -7212,7 +7212,7 @@
- Type
- jld:PositiveEvaluationTest, jld:ExpandTest
- Purpose
-- index on @graph and @index
+- index on @graph and @id with @none
- input
-
expand/m015-in.jsonld
@@ -7231,7 +7231,7 @@
-Test tm016 index map with alias @none
+Test tm016 graph id index map with aliased @none
@@ -7240,7 +7240,7 @@
- Type
- jld:PositiveEvaluationTest, jld:ExpandTest
- Purpose
-- index on @graph and @index
+- index on @graph and @id with @none
- input
-
expand/m016-in.jsonld
diff --git a/tests/expand-manifest.jsonld b/tests/expand-manifest.jsonld
index 899e96a1..4e8d9b74 100644
--- a/tests/expand-manifest.jsonld
+++ b/tests/expand-manifest.jsonld
@@ -1935,6 +1935,22 @@
"input": "expand/js21-in.jsonld",
"expect": "expand/js21-out.jsonld",
"option": {"specVersion": "json-ld-1.1"}
+ }, {
+ "@id": "#tjs22",
+ "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"],
+ "name": "Expand JSON literal (null) aleady in expanded form.",
+ "purpose": "Tests expanding property with @type @json to a JSON literal (null).",
+ "input": "expand/js22-in.jsonld",
+ "expect": "expand/js22-out.jsonld",
+ "option": {"specVersion": "json-ld-1.1"}
+ }, {
+ "@id": "#tjs23",
+ "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"],
+ "name": "Expand JSON literal (empty array).",
+ "purpose": "Tests expanding property with @type @json to a JSON literal (empty array).",
+ "input": "expand/js23-in.jsonld",
+ "expect": "expand/js23-out.jsonld",
+ "option": {"specVersion": "json-ld-1.1"}
}, {
"@id": "#tl001",
"@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"],
diff --git a/tests/expand/0122-out.jsonld b/tests/expand/0122-out.jsonld
index 6972a175..cf6aa365 100644
--- a/tests/expand/0122-out.jsonld
+++ b/tests/expand/0122-out.jsonld
@@ -1,5 +1,5 @@
[{
"http://example.org/vocab/at": [{"@id": "http://example.org/@"}],
"http://example.org/vocab/foo.bar": [{"@id": "http://example.org/@foo.bar"}],
- "http://example.org/vocab/ignoreme": [{"@id": ""}]
+ "http://example.org/vocab/ignoreme": [{"@id": null}]
}]
\ No newline at end of file
diff --git a/tests/expand/js22-in.jsonld b/tests/expand/js22-in.jsonld
new file mode 100644
index 00000000..7d2d4320
--- /dev/null
+++ b/tests/expand/js22-in.jsonld
@@ -0,0 +1,3 @@
+{
+ "http://example.org/vocab#null": {"@value": null, "@type": "@json"}
+}
\ No newline at end of file
diff --git a/tests/expand/js22-out.jsonld b/tests/expand/js22-out.jsonld
new file mode 100644
index 00000000..5efe8b14
--- /dev/null
+++ b/tests/expand/js22-out.jsonld
@@ -0,0 +1,6 @@
+[{
+ "http://example.org/vocab#null": [{
+ "@value": null,
+ "@type": "@json"
+ }]
+}]
\ No newline at end of file
diff --git a/tests/expand/js23-in.jsonld b/tests/expand/js23-in.jsonld
new file mode 100644
index 00000000..d45cd202
--- /dev/null
+++ b/tests/expand/js23-in.jsonld
@@ -0,0 +1,3 @@
+{
+ "http://example.org/vocab#null": {"@value": [], "@type": "@json"}
+}
\ No newline at end of file
diff --git a/tests/expand/js23-out.jsonld b/tests/expand/js23-out.jsonld
new file mode 100644
index 00000000..d08dd980
--- /dev/null
+++ b/tests/expand/js23-out.jsonld
@@ -0,0 +1,6 @@
+[{
+ "http://example.org/vocab#null": [{
+ "@value": [],
+ "@type": "@json"
+ }]
+}]
\ No newline at end of file
diff --git a/tests/toRdf-manifest.html b/tests/toRdf-manifest.html
index a6b0424b..79831cdf 100644
--- a/tests/toRdf-manifest.html
+++ b/tests/toRdf-manifest.html
@@ -6177,6 +6177,62 @@
+
+Test tjs22 Transform JSON literal (null) aleady in expanded form.
+
+
+
+- id
+- #tjs22
+- Type
+- jld:PositiveEvaluationTest, jld:ToRDFTest
+- Purpose
+- Tests transforming property with @type @json to a JSON literal (null).
+- input
+-
+toRdf/js22-in.jsonld
+
+- expect
+-
+toRdf/js22-out.nq
+
+- Options
+-
+
+- specVersion
+- json-ld-1.1
+
+
+
+
+
+Test tjs23 Transform JSON literal (empty array).
+
+
+
+- id
+- #tjs23
+- Type
+- jld:PositiveEvaluationTest, jld:ToRDFTest
+- Purpose
+- Tests transforming property with @type @json to a JSON literal (empty array).
+- input
+-
+toRdf/js23-in.jsonld
+
+- expect
+-
+toRdf/js23-out.nq
+
+- Options
+-
+
+- specVersion
+- json-ld-1.1
+
+
+
+
Test tli01 @list containing @list
diff --git a/tests/toRdf-manifest.jsonld b/tests/toRdf-manifest.jsonld
index 29b57d1c..84ce61d7 100644
--- a/tests/toRdf-manifest.jsonld
+++ b/tests/toRdf-manifest.jsonld
@@ -1884,6 +1884,22 @@
"input": "toRdf/js21-in.jsonld",
"expect": "toRdf/js21-out.nq",
"option": {"specVersion": "json-ld-1.1"}
+ }, {
+ "@id": "#tjs22",
+ "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"],
+ "name": "Transform JSON literal (null) aleady in expanded form.",
+ "purpose": "Tests transforming property with @type @json to a JSON literal (null).",
+ "input": "toRdf/js22-in.jsonld",
+ "expect": "toRdf/js22-out.nq",
+ "option": {"specVersion": "json-ld-1.1"}
+ }, {
+ "@id": "#tjs23",
+ "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"],
+ "name": "Transform JSON literal (empty array).",
+ "purpose": "Tests transforming property with @type @json to a JSON literal (empty array).",
+ "input": "toRdf/js23-in.jsonld",
+ "expect": "toRdf/js23-out.nq",
+ "option": {"specVersion": "json-ld-1.1"}
}, {
"@id": "#tli01",
"@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"],
diff --git a/tests/toRdf/js22-in.jsonld b/tests/toRdf/js22-in.jsonld
new file mode 100644
index 00000000..7d2d4320
--- /dev/null
+++ b/tests/toRdf/js22-in.jsonld
@@ -0,0 +1,3 @@
+{
+ "http://example.org/vocab#null": {"@value": null, "@type": "@json"}
+}
\ No newline at end of file
diff --git a/tests/toRdf/js22-out.nq b/tests/toRdf/js22-out.nq
new file mode 100644
index 00000000..de3cac89
--- /dev/null
+++ b/tests/toRdf/js22-out.nq
@@ -0,0 +1 @@
+_:b0 "null"^^ .
diff --git a/tests/toRdf/js23-in.jsonld b/tests/toRdf/js23-in.jsonld
new file mode 100644
index 00000000..d45cd202
--- /dev/null
+++ b/tests/toRdf/js23-in.jsonld
@@ -0,0 +1,3 @@
+{
+ "http://example.org/vocab#null": {"@value": [], "@type": "@json"}
+}
\ No newline at end of file
diff --git a/tests/toRdf/js23-out.nq b/tests/toRdf/js23-out.nq
new file mode 100644
index 00000000..e30de539
--- /dev/null
+++ b/tests/toRdf/js23-out.nq
@@ -0,0 +1 @@
+_:b0 "[]"^^ .