Split isPropertyTermScopedContext flag out of options.

- The flag does not need to be passed recursively so it is
  simpler and more efficient to pass it independently.

Author: dlongley

lib/compact.js

@@ -106,7 +106,8 @@ api.compact = ({
     activeCtx = _processContext({
       activeCtx,
       localCtx: ctx,
-      options: {...options, isPropertyTermScopedContext: true}
+      isPropertyTermScopedContext: true,
+      options
     });
   }
 

lib/context.js

@@ -42,10 +42,13 @@ api.cache = new ActiveContextCache();
  * @param activeCtx the current active context.
  * @param localCtx the local context to process.
  * @param options the context processing options.
+ * @param isPropertyTermScopedContext `true` if `localCtx` is a scoped context
+ *   from a property term.
  *
  * @return the new active context.
  */
-api.process = ({activeCtx, localCtx, options}) => {
+api.process = (
+  {activeCtx, localCtx, options, isPropertyTermScopedContext = false}) => {
   // normalize local context to an array of @context objects
   if(_isObject(localCtx) && '@context' in localCtx &&
     _isArray(localCtx['@context'])) {
@@ -80,7 +83,7 @@ api.process = ({activeCtx, localCtx, options}) => {
     if(ctx === null) {
       // We can't nullify if there are protected terms and we're
       // not processing a property term scoped context
-      if(!options.isPropertyTermScopedContext &&
+      if(!isPropertyTermScopedContext &&
         Object.keys(activeCtx.protected).length !== 0) {
         const protectedMode = (options && options.protectedMode) || 'error';
         if(protectedMode === 'error') {
@@ -229,7 +232,8 @@ api.process = ({activeCtx, localCtx, options}) => {
 
     // process all other keys
     for(const key in ctx) {
-      api.createTermDefinition(rval, ctx, key, defined, options);
+      api.createTermDefinition(
+        rval, ctx, key, defined, options, isPropertyTermScopedContext);
     }
 
     // cache result
@@ -253,8 +257,12 @@ api.process = ({activeCtx, localCtx, options}) => {
  * @param {string} [options.protectedMode="error"] - "error" to throw error
  *   on `@protected` constraint violation, "warn" to allow violations and
  *   signal a warning.
+ * @param isPropertyTermScopedContext `true` if `localCtx` is a scoped context
+ *   from a property term.
  */
-api.createTermDefinition = (activeCtx, localCtx, term, defined, options) => {
+api.createTermDefinition = (
+  activeCtx, localCtx, term, defined, options,
+  isPropertyTermScopedContext = false) => {
   if(term in defined) {
     // term already defined
     if(defined[term]) {
@@ -285,7 +293,7 @@ api.createTermDefinition = (activeCtx, localCtx, term, defined, options) => {
   }
 
   // FIXME if(1.1) ... ?
-  if(term in activeCtx.protected && !options.isPropertyTermScopedContext) {
+  if(term in activeCtx.protected && !isPropertyTermScopedContext) {
     const protectedMode = (options && options.protectedMode) || 'error';
     if(protectedMode === 'error') {
       throw new JsonLdError(

lib/expand.js

@@ -562,7 +562,8 @@ function _expandObject({
       termCtx = _processContext({
         activeCtx,
         localCtx: ctx,
-        options: {...options, isPropertyTermScopedContext: true}
+        isPropertyTermScopedContext: true,
+        options
       });
     }