Update Changelog.

Author: gkellogg

CHANGELOG.md

@@ -8,6 +8,9 @@
 - Compacting multiple nodes in a graph container places them in `@included`.
 - Indexing on `@type` requires `@type` to be either `@id` or `@vocab`, and
   defaults to `@id`.
+- Expanding/compacting type scoped contexts uses context before applying
+  new versions to look for type scopes.
+- 
 
 ### Changed
 - Default processing mode changed to json-ld-1.1. Allows a 1.1 context to be
@@ -20,6 +23,9 @@
 - Don't use terms with `"@prefix": false` or expanded term definitions to
   construct compact IRIs.
 - `@type` may be used as a term definition only if `"@container": "@set"`.
+- Improve support for term propagation.
+- Context propagation no longer strictly related to use for property-scoped
+  or term-scoped contexts and can be overridden.
 
 ### Removed
 - **BREAKING**: Remove callback API support. This includes removing support

lib/compact.js

@@ -169,7 +169,8 @@ api.compact = async ({
     }
 
     // apply property-scoped context after reverting term-scoped context
-    const propertyScopedCtx = _getContextValue(inputCtx, activeProperty, '@context');
+    const propertyScopedCtx =
+      _getContextValue(inputCtx, activeProperty, '@context');
     if(!_isUndefined(propertyScopedCtx)) {
       activeCtx = await _processContext({
         activeCtx,
@@ -235,7 +236,7 @@ api.compact = async ({
         const alias = api.compactIri(
           {activeCtx, iri: '@id', relativeTo: {vocab: true}});
 
-          rval[alias] = compactedValue;
+        rval[alias] = compactedValue;
         continue;
       }
 
@@ -259,7 +260,7 @@ api.compact = async ({
           activeCtx, alias, '@container') || [];
 
         // treat as array for @type if @container includes @set
-        const typeAsSet = 
+        const typeAsSet =
           container.includes('@set') &&
           _processingMode(activeCtx, 1.1);
         const isArray =

lib/context.js

@@ -43,7 +43,7 @@ api.cache = new ActiveContextCache();
  * @param localCtx the local context to process.
  * @param options the context processing options.
  * @param propagate `true` if `false`, retains any previously defined term,
- *   which can be rolled back when the descending into a new node object changes.
+ *   which can be rolled back when the descending into a new node object.
  * @param overrideProtected `false` allows protected terms to be modified.
  *
  * @return a Promise that resolves to the new active context.
@@ -480,7 +480,9 @@ api.createTermDefinition = ({
       const prefix = term.substr(0, colon);
       if(localCtx.hasOwnProperty(prefix)) {
         // define parent prefix
-        api.createTermDefinition({activeCtx, localCtx, term: prefix, defined, options});
+        api.createTermDefinition({
+          activeCtx, localCtx, term: prefix, defined, options
+        });
       }
 
       if(activeCtx.mappings.has(prefix)) {
@@ -785,7 +787,9 @@ function _expandIri(activeCtx, value, relativeTo, localCtx, defined, options) {
   // define term dependency if not defined
   if(localCtx && localCtx.hasOwnProperty(value) &&
     defined.get(value) !== true) {
-    api.createTermDefinition({activeCtx, localCtx, term: value, defined, options});
+    api.createTermDefinition({
+      activeCtx, localCtx, term: value, defined, options
+    });
   }
 
   relativeTo = relativeTo || {};
@@ -817,7 +821,9 @@ function _expandIri(activeCtx, value, relativeTo, localCtx, defined, options) {
 
     // prefix dependency not defined, define it
     if(localCtx && localCtx.hasOwnProperty(prefix)) {
-      api.createTermDefinition({activeCtx, localCtx, term: prefix, defined, options});
+      api.createTermDefinition({
+        activeCtx, localCtx, term: prefix, defined, options
+      });
     }
 
     // use mapping if prefix is defined

lib/expand.js

@@ -158,7 +158,8 @@ api.expand = async ({
     activeCtx, activeProperty, {vocab: true}, options);
 
   // Get any property-scoped context for activeProperty
-  const propertyScopedCtx = _getContextValue(activeCtx, activeProperty, '@context');
+  const propertyScopedCtx =
+    _getContextValue(activeCtx, activeProperty, '@context');
 
   // second, determine if any type-scoped context should be reverted; it
   // should only be reverted when the following are all true: