- Always pass typeScopedContext to _expandObject.

- Allow a keyword to exist when expanding in _expandObject when the key is `@included` or `@type`.

Author: gkellogg

CHANGELOG.md

@@ -1,5 +1,9 @@
 # jsonld ChangeLog
 
+### Fixed
+- Always pass typeScopedContext to _expandObject.
+- Allow a keyword to exist when expanding in _expandObject when the key is `@included` or `@type`.
+
 ## 2.0.2 - 2020-01-17
 
 ### Fixed

lib/expand.js

@@ -458,7 +458,9 @@ async function _expandObject({
           'property.', 'jsonld.SyntaxError',
           {code: 'invalid reverse property map', value});
       }
-      if(expandedProperty in expandedParent) {
+      if(expandedProperty in expandedParent &&
+        expandedProperty !== '@included' &&
+        expandedProperty !== '@type') {
         throw new JsonLdError(
           'Invalid JSON-LD syntax; colliding keywords detected.',
           'jsonld.SyntaxError',
@@ -821,6 +823,7 @@ async function _expandObject({
         expandedParent,
         options,
         insideList,
+        typeScopedContext,
         typeKey,
         expansionMap});
     }

tests/test-common.js

@@ -127,8 +127,6 @@ const TEST_TYPES = {
         /expand-manifest.jsonld#tin07$/,
         /expand-manifest.jsonld#tin08$/,
         /expand-manifest.jsonld#tin09$/,
-        // @nest
-        /expand-manifest.jsonld#tn008$/,
         // keywords
         /expand-manifest.jsonld#tpr30$/,
         /expand-manifest.jsonld#tpr31$/,
@@ -390,8 +388,6 @@ const TEST_TYPES = {
         /toRdf-manifest.jsonld#tin04$/,
         /toRdf-manifest.jsonld#tin05$/,
         /toRdf-manifest.jsonld#tin06$/,
-        // @next
-        /toRdf-manifest.jsonld#tn008$/,
         // keywords
         /toRdf-manifest.jsonld#tpr30$/,
         /toRdf-manifest.jsonld#tpr31$/,