Fix style errors.

Author: gkellogg

lib/compact.js

@@ -779,7 +779,9 @@ api.compactIri = ({
           let itemType = '@none';
           if(_isValue(item)) {
             if('@direction' in item) {
-              itemLanguage = `${item['@language']||''}_${item['@direction']}`.toLowerCase();
+              const lang = (item['@language'] || '').toLowerCase();
+              const dir = item['@direction'];
+              itemLanguage = `${lang}_${dir}`;
             } else if('@language' in item) {
               itemLanguage = item['@language'].toLowerCase();
             } else if('@type' in item) {
@@ -821,11 +823,12 @@ api.compactIri = ({
         if('@language' in value && !('@index' in value)) {
           containers.push('@language', '@language@set');
           typeOrLanguageValue = value['@language'];
-          if(value['@direction']) {
-            typeOrLanguageValue = `${typeOrLanguageValue}_${value['@direction']}`
+          const dir = value['@direction'];
+          if(dir) {
+            typeOrLanguageValue = `${typeOrLanguageValue}_${dir}`;
           }
         } else if('@direction' in value && !('@index' in value)) {
-            typeOrLanguageValue = `_${value['@direction']}`
+          typeOrLanguageValue = `_${value['@direction']}`;
         } else if('@type' in value) {
           typeOrLanguage = '@type';
           typeOrLanguageValue = value['@type'];
@@ -968,7 +971,7 @@ api.compactValue = ({activeCtx, activeProperty, value, options}) => {
         return value['@value'];
       }
       if('@language' in value && value['@language'] === language &&
-         '@direction' in value && value['@direction'] == direction) {
+         '@direction' in value && value['@direction'] === direction) {
         return value['@value'];
       }
       if('@language' in value && value['@language'] === language) {

lib/context.js

@@ -467,7 +467,8 @@ api.createTermDefinition = ({
 
   // JSON-LD 1.1 support
   if(api.processingMode(activeCtx, 1.1)) {
-    validKeys.push('@context', '@direction', '@index', '@nest', '@prefix', '@protected');
+    validKeys.push(
+      '@context', '@direction', '@index', '@nest', '@prefix', '@protected');
   }
 
   for(const kw in value) {
@@ -604,7 +605,7 @@ api.createTermDefinition = ({
         // term is an absolute IRI
         mapping['@id'] = term;
       }
-    } else if(term == '@type') {
+    } else if(term === '@type') {
       // Special case, were we've previously determined that container is @set
       mapping['@id'] = term;
     } else {
@@ -1119,29 +1120,26 @@ api.getInitialContext = options => {
           // term is preferred for values using specific language and direction
           const language = mapping['@language'];
           const direction = mapping['@direction'];
-          if(langugage && direction) {
-            _addPreferredTerm(term, entry['@language'], `${language}_${direction}`.toLowerCase());
+          if(language && direction) {
+            _addPreferredTerm(term, entry['@language'],
+              `${language}_${direction}`.toLowerCase());
           } else if(language) {
             _addPreferredTerm(term, entry['@language'], language.toLowerCase());
           } else if(direction) {
             _addPreferredTerm(term, entry['@language'], `_${direction}`);
           } else {
-            _addPreferredTerm(term, entry['@language'], "@null");
+            _addPreferredTerm(term, entry['@language'], '@null');
           }
         } else if('@language' in mapping) {
-          _addPreferredTerm(term, entry['@language'], (mapping['@language'] || '@null').toLowerCase());
+          _addPreferredTerm(term, entry['@language'],
+            (mapping['@language'] || '@null').toLowerCase());
         } else if('@direction' in mapping) {
           if(mapping['@direction']) {
-            _addPreferredTerm(term, entry['@language'], `_${mapping['@direction']}`);
+            _addPreferredTerm(term, entry['@language'],
+              `_${mapping['@direction']}`);
           } else {
             _addPreferredTerm(term, entry['@language'], '@none');
           }
-        //} else if(defaultLanguage && defaultDirection) {
-        //  _addPreferredTerm(term, entry['@language'], `${defaultLanguage}_${defaultDirection}`);
-        //  _addPreferredTerm(term, entry['@type'], '@none');
-        //} else if(defaultLanguage) {
-        //  _addPreferredTerm(term, entry['@language'], defaultLanguage);
-        //  _addPreferredTerm(term, entry['@type'], '@none');
         } else if(defaultDirection) {
           _addPreferredTerm(term, entry['@language'], `_${defaultDirection}`);
           _addPreferredTerm(term, entry['@language'], '@none');

lib/expand.js

@@ -41,6 +41,7 @@ const {
 
 const api = {};
 module.exports = api;
+const REGEX_BCP47 = /^[a-zA-Z]{1,8}(-[a-zA-Z0-9]{1,8})*$/;
 
 /**
  * Recursively expands an element using the given context. Any context in
@@ -423,7 +424,7 @@ async function _expandObject({
   const isJsonType = element[typeKey] &&
     _expandIri(activeCtx,
       (_isArray(element[typeKey]) ? element[typeKey][0] : element[typeKey]),
-      {vocab: true}, options) == '@json';
+      {vocab: true}, options) === '@json';
 
   for(const key of keys) {
     let value = element[key];
@@ -591,7 +592,7 @@ async function _expandObject({
 
       // ensure language tag matches BCP47
       for(const lang of value) {
-        if(_isString(lang) && !lang.match(/^[a-zA-Z]{1,8}(-[a-zA-Z0-9]{1,8})*$/)) {
+        if(_isString(lang) && !lang.match(REGEX_BCP47)) {
           console.warn(`@language must be valid BCP47: ${lang}`);
         }
       }
@@ -623,7 +624,8 @@ async function _expandObject({
       }
 
       _addValue(
-        expandedParent, '@direction', value, {propertyIsArray: options.isFrame});
+        expandedParent, '@direction', value,
+        {propertyIsArray: options.isFrame});
       continue;
     }
 
@@ -713,7 +715,7 @@ async function _expandObject({
     const container = _getContextValue(termCtx, key, '@container') || [];
 
     if(container.includes('@language') && _isObject(value)) {
-      const direction = _getContextValue(termCtx, key, '@direction')
+      const direction = _getContextValue(termCtx, key, '@direction');
       // handle language map container (skip if value is not an object)
       expandedValue = _expandLanguageMap(termCtx, value, direction, options);
     } else if(container.includes('@index') && _isObject(value)) {