Update spec and add tests for limiting @type-scoped terms to their typed object.

tests/compact-manifest.jsonld

@@ -989,7 +989,7 @@
     }, {
       "@id": "#tc009",
       "@type": ["jld:PositiveEvaluationTest", "jld:CompactTest"],
-      "name": "deep @context affects nested nodes",
+      "name": "deep @type-scoped @context does NOT affect nested nodes",
       "purpose": "scoped context on @type",
       "input": "compact/c009-in.jsonld",
       "context": "compact/c009-context.jsonld",
@@ -1022,6 +1022,123 @@
       "context": "compact/c012-context.jsonld",
       "expect": "compact/c012-out.jsonld",
       "option": {"processingMode": "json-ld-1.1", "specVersion": "json-ld-1.1"}
+    }, {
+      "@id": "#tc013",
+      "@type": ["jld:PositiveEvaluationTest", "jld:CompactTest"],
+      "name": "deep property-term scoped @context in @type-scoped @context affects nested nodes",
+      "purpose": "scoped context on @type",
+      "input": "compact/c013-in.jsonld",
+      "context": "compact/c013-context.jsonld",
+      "expect": "compact/c013-out.jsonld",
+      "option": {"processingMode": "json-ld-1.1", "specVersion": "json-ld-1.1"}    
+    }, {
+      "@id": "#tc014",
+      "@type": ["jld:PositiveEvaluationTest", "jld:CompactTest"],
+      "name": "type-scoped context nullification",
+      "purpose": "type-scoped context nullification",
+      "input": "compact/c014-in.jsonld",
+      "context": "compact/c014-context.jsonld",
+      "expect": "compact/c014-out.jsonld",
+      "option": {"processingMode": "json-ld-1.1", "specVersion": "json-ld-1.1"}
+    }, {
+      "@id": "#tc015",
+      "@type": ["jld:PositiveEvaluationTest", "jld:CompactTest"],
+      "name": "type-scoped base",
+      "purpose": "type-scoped base",
+      "input": "compact/c015-in.jsonld",
+      "context": "compact/c015-context.jsonld",
+      "expect": "compact/c015-out.jsonld",
+      "option": {"processingMode": "json-ld-1.1", "specVersion": "json-ld-1.1"}
+    }, {
+      "@id": "#tc016",
+      "@type": ["jld:PositiveEvaluationTest", "jld:CompactTest"],
+      "name": "type-scoped vocab",
+      "purpose": "type-scoped vocab",
+      "input": "compact/c016-in.jsonld",
+      "context": "compact/c016-context.jsonld",
+      "expect": "compact/c016-out.jsonld",
+      "option": {"processingMode": "json-ld-1.1", "specVersion": "json-ld-1.1"}
+    }, {
+      "@id": "#tc017",
+      "@type": ["jld:PositiveEvaluationTest", "jld:CompactTest"],
+      "name": "multiple type-scoped contexts are properly reverted",
+      "purpose": "multiple type-scoped contexts are property reverted",
+      "input": "compact/c017-in.jsonld",
+      "context": "compact/c017-context.jsonld",
+      "expect": "compact/c017-out.jsonld",
+      "option": {"processingMode": "json-ld-1.1", "specVersion": "json-ld-1.1"}
+    }, {
+      "@id": "#tc018",
+      "@type": ["jld:PositiveEvaluationTest", "jld:CompactTest"],
+      "name": "multiple type-scoped types resolved against previous context",
+      "purpose": "multiple type-scoped types resolved against previous context",
+      "input": "compact/c018-in.jsonld",
+      "context": "compact/c018-context.jsonld",
+      "expect": "compact/c018-out.jsonld",
+      "option": {"processingMode": "json-ld-1.1", "specVersion": "json-ld-1.1"}
+    }, {
+      "@id": "#tc019",
+      "@type": ["jld:PositiveEvaluationTest", "jld:CompactTest"],
+      "name": "type-scoped context with multiple property scoped terms",
+      "purpose": "type-scoped context with multiple property scoped terms",
+      "input": "compact/c019-in.jsonld",
+      "context": "compact/c019-context.jsonld",
+      "expect": "compact/c019-out.jsonld",
+      "option": {"processingMode": "json-ld-1.1", "specVersion": "json-ld-1.1"}
+    }, {
+      "@id": "#tc020",
+      "@type": ["jld:PositiveEvaluationTest", "jld:CompactTest"],
+      "name": "type-scoped value",
+      "purpose": "type-scoped value",
+      "input": "compact/c020-in.jsonld",
+      "context": "compact/c020-context.jsonld",
+      "expect": "compact/c020-out.jsonld",
+      "option": {"processingMode": "json-ld-1.1", "specVersion": "json-ld-1.1"}
+    }, {
+      "@id": "#tc021",
+      "@type": ["jld:PositiveEvaluationTest", "jld:CompactTest"],
+      "name": "type-scoped value mix",
+      "purpose": "type-scoped value mix",
+      "input": "compact/c021-in.jsonld",
+      "context": "compact/c021-context.jsonld",
+      "expect": "compact/c021-out.jsonld",
+      "option": {"processingMode": "json-ld-1.1", "specVersion": "json-ld-1.1"}
+    }, {
+      "@id": "#tc022",
+      "@type": ["jld:PositiveEvaluationTest", "jld:CompactTest"],
+      "name": "type-scoped property-scoped contexts including @type:@vocab",
+      "purpose": "type-scoped property-scoped contexts including @type:@vocab",
+      "input": "compact/c022-in.jsonld",
+      "context": "compact/c022-context.jsonld",
+      "expect": "compact/c022-out.jsonld",
+      "option": {"processingMode": "json-ld-1.1", "specVersion": "json-ld-1.1"}
+    }, {
+      "@id": "#tc023",
+      "@type": ["jld:PositiveEvaluationTest", "jld:CompactTest"],
+      "name": "composed type-scoped property-scoped contexts including @type:@vocab",
+      "purpose": "composed type-scoped property-scoped contexts including @type:@vocab",
+      "input": "compact/c023-in.jsonld",
+      "context": "compact/c023-context.jsonld",
+      "expect": "compact/c023-out.jsonld",
+      "option": {"processingMode": "json-ld-1.1", "specVersion": "json-ld-1.1"}
+    }, {
+      "@id": "#tc024",
+      "@type": ["jld:PositiveEvaluationTest", "jld:CompactTest"],
+      "name": "type-scoped + property-scoped + values evaluates against previous context",
+      "purpose": "type-scoped + property-scoped + values evaluates against previous context",
+      "input": "compact/c024-in.jsonld",
+      "context": "compact/c024-context.jsonld",
+      "expect": "compact/c024-out.jsonld",
+      "option": {"processingMode": "json-ld-1.1", "specVersion": "json-ld-1.1"}
+    }, {
+      "@id": "#tc025",
+      "@type": ["jld:PositiveEvaluationTest", "jld:CompactTest"],
+      "name": "type-scoped + graph container",
+      "purpose": "type-scoped + graph container",
+      "input": "compact/c025-in.jsonld",
+      "context": "compact/c025-context.jsonld",
+      "expect": "compact/c025-out.jsonld",
+      "option": {"processingMode": "json-ld-1.1", "specVersion": "json-ld-1.1"}
     }, {
       "@id": "#te001",
       "@type": [ "jld:NegativeEvaluationTest", "jld:CompactTest" ],
@@ -1676,8 +1793,8 @@
       "name": "Check illegal overriding of protected term from type-scoped context",
       "purpose": "Check error when overriding a protected term from type-scoped context.",
       "option": {"specVersion": "json-ld-1.1"},
-      "input": "compact/pr02-in.jsonld",
-      "context": "compact/pr02-context.jsonld",
+      "input": "compact/pr03-in.jsonld",
+      "context": "compact/pr03-context.jsonld",
       "expect": "protected term redefinition"
     }, {
       "@id": "#tpr04",
@@ -1688,6 +1805,15 @@
       "input": "compact/pr04-in.jsonld",
       "context": "compact/pr04-context.jsonld",
       "expect": "compact/pr04-out.jsonld"
+    }, {
+      "@id": "#tpr05",
+      "@type": ["jld:PositiveEvaluationTest", "jld:CompactTest"],
+      "name": "Check legal overriding of type-scoped protected term from nested node",
+      "purpose": "Check legal overriding of type-scoped protected term from nested node.",
+      "option": {"specVersion": "json-ld-1.1"},
+      "input": "compact/pr05-in.jsonld",
+      "context": "compact/pr05-context.jsonld",
+      "expect": "compact/pr05-out.jsonld"
     }, {
       "@id": "#tr001",
       "@type": ["jld:PositiveEvaluationTest", "jld:CompactTest"],

tests/compact/c009-out.jsonld

@@ -4,5 +4,5 @@
     "Foo": {"@context": {"baz": {"@type": "@vocab"}}}
   },
   "@type": "Foo",
-  "bar": {"baz": "buzz"}
-}
+  "bar": {"baz": {"@id": "http://example/buzz"}}
+}

tests/compact/c013-context.jsonld

@@ -0,0 +1,14 @@
+{
+  "@context": {
+    "@vocab": "http://example/",
+    "Foo": {
+      "@context": {
+        "bar": {
+          "@context": {
+            "baz": {"@type": "@vocab"}
+          }
+        }
+      }
+    }
+  }
+}

tests/compact/c013-in.jsonld

@@ -0,0 +1,8 @@
+[
+  {
+    "@type": ["http://example/Foo"],
+    "http://example/bar": [{
+      "http://example/baz": [{"@id": "http://example/buzz"}]
+    }]
+  }
+]

tests/compact/c013-out.jsonld

@@ -0,0 +1,16 @@
+{
+  "@context": {
+    "@vocab": "http://example/",
+    "Foo": {
+      "@context": {
+        "bar": {
+          "@context": {
+            "baz": {"@type": "@vocab"}
+          }
+        }
+      }
+    }
+  },
+  "@type": "Foo",
+  "bar": {"baz": "buzz"}
+}

tests/compact/c014-context.jsonld

@@ -0,0 +1,11 @@
+{
+  "@context": {
+    "@vocab": "http://example/",
+    "foo": "http://example/foo",
+    "Type": {
+      "@context": [
+        null
+      ]
+    }
+  }
+}

tests/compact/c014-in.jsonld

@@ -0,0 +1,8 @@
+[{
+  "http://example/foo": [{
+    "@value": "will-exist"
+  }],
+  "http://example/p": [{
+    "@type": ["http://example/Type"]
+  }]
+}]

tests/compact/c014-out.jsonld

@@ -0,0 +1,15 @@
+{
+  "@context": {
+    "@vocab": "http://example/",
+    "foo": "http://example/foo",
+    "Type": {
+      "@context": [
+        null
+      ]
+    }
+  },
+  "foo": "will-exist",
+  "p": {
+    "@type": "Type"
+  }
+}

tests/compact/c015-context.jsonld

@@ -0,0 +1,12 @@
+{
+  "@context": {
+    "@base": "http://example/base-base",
+    "@vocab": "http://example/",
+    "foo": "http://example/foo",
+    "Type": {
+      "@context": {
+        "@base": "http://example/typed-base"
+      }
+    }
+  }
+}

tests/compact/c015-in.jsonld

@@ -0,0 +1,16 @@
+[{
+  "@id": "http://example/base-base#base-id",
+  "http://example/p": [{
+    "@id": "http://example/typed-base#typed-id",
+    "@type": ["http://example/Type"],
+    "http://example/subjectReference": [{
+      "@id": "http://example/typed-base#subject-reference-id"
+    }],
+    "http://example/nestedNode": [{
+      "@id": "http://example/base-base#nested-id",
+      "http://example/foo": [{
+        "@value": "bar"
+      }]
+    }]
+  }]
+}]

tests/compact/c015-out.jsonld

@@ -0,0 +1,24 @@
+{
+  "@context": {
+    "@base": "http://example/base-base",
+    "@vocab": "http://example/",
+    "foo": "http://example/foo",
+    "Type": {
+      "@context": {
+        "@base": "http://example/typed-base"
+      }
+    }
+  },
+  "@id": "#base-id",
+  "p": {
+    "@id": "#typed-id",
+    "@type": "Type",
+    "subjectReference": {
+      "@id": "#subject-reference-id"
+    },
+    "nestedNode": {
+      "@id": "#nested-id",
+      "foo": "bar"
+    }
+  }
+}

tests/compact/c016-context.jsonld

@@ -0,0 +1,10 @@
+{
+  "@context": {
+    "@vocab": "http://example.org/",
+    "Type": {
+      "@context": {
+        "@vocab": "http://example.com/"
+      }
+    }
+  }
+}

tests/compact/c016-in.jsonld

@@ -0,0 +1,16 @@
+[{
+  "http://example.org/foo": [{
+    "@value": "org"
+  }],
+  "http://example.org/p": [{
+    "@type": ["http://example.org/Type"],
+    "http://example.com/foo": [{
+      "@value": "com"
+    }],
+    "http://example.com/nested": [{
+      "http://example.org/nested-prop": [{
+        "@value": "org"
+      }]
+    }]
+  }]
+}]

tests/compact/c016-out.jsonld

@@ -0,0 +1,18 @@
+{
+  "@context": {
+    "@vocab": "http://example.org/",
+    "Type": {
+      "@context": {
+        "@vocab": "http://example.com/"
+      }
+    }
+  },
+  "foo": "org",
+  "p": {
+    "@type": "Type",
+    "foo": "com",
+    "nested": {
+      "nested-prop": "org"
+    }
+  }
+}

tests/compact/c017-context.jsonld

@@ -0,0 +1,19 @@
+{
+  "@context": {
+    "@vocab": "http://example/",
+    "Bar": {
+      "@context": [
+        {
+          "prop": "http://example/bar-prop"
+        }
+      ]
+    },
+    "Foo": {
+      "@context": [
+        {
+          "prop": "http://example/foo-prop"
+        }
+      ]
+    }
+  }
+}

tests/compact/c017-in.jsonld

@@ -0,0 +1,14 @@
+[{
+  "@type": [
+    "http://example/Foo",
+    "http://example/Bar"
+  ],
+  "http://example/foo-prop": [{
+    "@value": "foo"
+  }],
+  "http://example/nested": [{
+    "http://example/prop": [{
+      "@value": "vocab"
+    }]
+  }]
+}]