Allow context nullification in scoped ctx to clear protections

rubensworks · Mar 16, 2020 · 20c6834 · 20c6834
1 parent 922e301
commit 20c6834
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 6 deletions.
diff --git a/lib/ParsingContext.ts b/lib/ParsingContext.ts
@@ -189,15 +189,19 @@ export class ParsingContext {
           || scopedContext[key]['@context']['@propagate']; // Propagation is true by default
 
         if (propagate !== false || i === keysOriginal.length - 1 - offset) {
-          if (propagate !== false) {
-            this.contextTree.setContext(keysOriginal.slice(0, i + offset), Promise.resolve(scopedContext));
-          }
           context = scopedContext;
 
           // Clean up final context
           delete context['@propagate'];
           context[key] = { ...context[key] };
+          if ('@id' in contextKeyEntry) {
+            context[key]['@id'] = contextKeyEntry['@id'];
+          }
           delete context[key]['@context'];
+
+          if (propagate !== false) {
+            this.contextTree.setContext(keysOriginal.slice(0, i + offset), Promise.resolve(context));
+          }
         }
       }
     }

diff --git a/lib/Util.ts b/lib/Util.ts
@@ -213,7 +213,8 @@ export class Util {
 
       // Handle local context in the value
       if ('@context' in value) {
-        context = await this.parsingContext.parseContext(value['@context'], context);
+        context = await this.parsingContext.parseContext(value['@context'],
+          await this.parsingContext.getContext(keys, 0));
       }
 
       // In all other cases, we have a hash

diff --git a/test/JsonLdParser-test.ts b/test/JsonLdParser-test.ts
@@ -9370,7 +9370,7 @@ describe('JsonLdParser', () => {
             ERROR_CODES.PROTECTED_TERM_REDIFINITION));
         });
 
-        it('should not error on protected term overrides in before a property scoped-context', async () => {
+        it('should not error on protected term overrides before a property scoped-context', async () => {
           const stream = streamifyString(`
 {
   "@context": {
@@ -9396,7 +9396,7 @@ describe('JsonLdParser', () => {
           ]);
         });
 
-        it('should error on protected term overrides in after a property scoped-context', async () => {
+        it('should error on protected term overrides after a property scoped-context', async () => {
           const stream = streamifyString(`
 {
   "@context": {
@@ -9420,6 +9420,32 @@ describe('JsonLdParser', () => {
             ERROR_CODES.PROTECTED_TERM_REDIFINITION));
         });
 
+        it('should not error on protected term, context null in a property scoped-context, and override', async () => {
+          const stream = streamifyString(`
+{
+  "@context": {
+    "@protected": true,
+    "foo": "http://ex.org/foo",
+    "scope": {
+      "@id": "http://ex.org/scope",
+      "@context": null
+    }
+  },
+  "scope": {
+    "@context": {
+      "foo": "http://ex.2.org/foo"
+    },
+    "foo": "bar"
+  }
+}`);
+          return expect(await arrayifyStream(stream.pipe(parser))).toBeRdfIsomorphic([
+            quad(blankNode(''), namedNode('http://ex.org/scope'),
+              blankNode('b1')),
+            quad(blankNode('b1'), namedNode('http://ex.2.org/foo'),
+              literal('bar')),
+          ]);
+        });
+
       });
 
       // MARKER: Add tests for new features here, wrapped in new describe blocks.

diff --git a/test/Util-test.ts b/test/Util-test.ts
@@ -288,6 +288,7 @@ describe('Util', () => {
 
         it('with a relative @id and empty local @context with @base in parent context', async () => {
           context = { '@base': 'http://ex.org/' };
+          util.parsingContext.contextTree.setContext([], Promise.resolve({ '@base': 'http://ex.org/' }));
           return expect(await util.valueToTerm(context, 'key', { '@context': {}, '@id': 'abc' }, 0, []))
             .toEqualRdfTermArray([namedNode('http://ex.org/abc')]);
         });