Minor cleanup.

Author: gkellogg

lib/context.js

@@ -413,7 +413,6 @@ api.createTermDefinition = (activeCtx, localCtx, term, defined) => {
 
     // JSON-LD 1.1 support
     if(api.processingMode(activeCtx, 1.1)) {
-      // TODO: @id and @type
       validContainers.push('@graph', '@id', '@type');
 
       // check container length
@@ -547,13 +546,10 @@ api.createTermDefinition = (activeCtx, localCtx, term, defined) => {
  */
 api.expandIri = (activeCtx, value, relativeTo, localCtx, defined) => {
   // already expanded
-  if(value === null || api.isKeyword(value)) {
+  if(value === null || !_isString(value) || api.isKeyword(value)) {
     return value;
   }
 
-  // ensure value is interpreted as a string
-  value = String(value);
-
   // define term dependency if not defined
   if(localCtx && value in localCtx && defined[value] !== true) {
     api.createTermDefinition(activeCtx, localCtx, value, defined);
@@ -865,7 +861,7 @@ api.getAllContexts = async (input, options) => {
  * Processing Mode check.
  *
  * @param activeCtx the current active context.
- * @param version the or numeric version to check.
+ * @param version the string or numeric version to check.
  *
  * @return boolean.
  */

lib/expand.js

@@ -533,7 +533,7 @@ function _expandObject({
     } else if(container.includes('@type') && _isObject(value)) {
       // handle type container (skip if value is not an object)
       expandedValue = _expandIndexMap({
-        activeCtx,
+        activeCtx: termCtx,
         options,
         activeProperty: key,
         value,