Skip to content

Commit 0648ef6

Browse files
gkelloggdavidlehn
authored andcommitted
Fix style errors.
1 parent 1e656fe commit 0648ef6

File tree

3 files changed

+25
-22
lines changed

3 files changed

+25
-22
lines changed

lib/compact.js

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -779,7 +779,9 @@ api.compactIri = ({
779779
let itemType = '@none';
780780
if(_isValue(item)) {
781781
if('@direction' in item) {
782-
itemLanguage = `${item['@language']||''}_${item['@direction']}`.toLowerCase();
782+
const lang = (item['@language'] || '').toLowerCase();
783+
const dir = item['@direction'];
784+
itemLanguage = `${lang}_${dir}`;
783785
} else if('@language' in item) {
784786
itemLanguage = item['@language'].toLowerCase();
785787
} else if('@type' in item) {
@@ -821,11 +823,12 @@ api.compactIri = ({
821823
if('@language' in value && !('@index' in value)) {
822824
containers.push('@language', '@language@set');
823825
typeOrLanguageValue = value['@language'];
824-
if(value['@direction']) {
825-
typeOrLanguageValue = `${typeOrLanguageValue}_${value['@direction']}`
826+
const dir = value['@direction'];
827+
if(dir) {
828+
typeOrLanguageValue = `${typeOrLanguageValue}_${dir}`;
826829
}
827830
} else if('@direction' in value && !('@index' in value)) {
828-
typeOrLanguageValue = `_${value['@direction']}`
831+
typeOrLanguageValue = `_${value['@direction']}`;
829832
} else if('@type' in value) {
830833
typeOrLanguage = '@type';
831834
typeOrLanguageValue = value['@type'];
@@ -968,7 +971,7 @@ api.compactValue = ({activeCtx, activeProperty, value, options}) => {
968971
return value['@value'];
969972
}
970973
if('@language' in value && value['@language'] === language &&
971-
'@direction' in value && value['@direction'] == direction) {
974+
'@direction' in value && value['@direction'] === direction) {
972975
return value['@value'];
973976
}
974977
if('@language' in value && value['@language'] === language) {

lib/context.js

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -467,7 +467,8 @@ api.createTermDefinition = ({
467467

468468
// JSON-LD 1.1 support
469469
if(api.processingMode(activeCtx, 1.1)) {
470-
validKeys.push('@context', '@direction', '@index', '@nest', '@prefix', '@protected');
470+
validKeys.push(
471+
'@context', '@direction', '@index', '@nest', '@prefix', '@protected');
471472
}
472473

473474
for(const kw in value) {
@@ -604,7 +605,7 @@ api.createTermDefinition = ({
604605
// term is an absolute IRI
605606
mapping['@id'] = term;
606607
}
607-
} else if(term == '@type') {
608+
} else if(term === '@type') {
608609
// Special case, were we've previously determined that container is @set
609610
mapping['@id'] = term;
610611
} else {
@@ -1119,29 +1120,26 @@ api.getInitialContext = options => {
11191120
// term is preferred for values using specific language and direction
11201121
const language = mapping['@language'];
11211122
const direction = mapping['@direction'];
1122-
if(langugage && direction) {
1123-
_addPreferredTerm(term, entry['@language'], `${language}_${direction}`.toLowerCase());
1123+
if(language && direction) {
1124+
_addPreferredTerm(term, entry['@language'],
1125+
`${language}_${direction}`.toLowerCase());
11241126
} else if(language) {
11251127
_addPreferredTerm(term, entry['@language'], language.toLowerCase());
11261128
} else if(direction) {
11271129
_addPreferredTerm(term, entry['@language'], `_${direction}`);
11281130
} else {
1129-
_addPreferredTerm(term, entry['@language'], "@null");
1131+
_addPreferredTerm(term, entry['@language'], '@null');
11301132
}
11311133
} else if('@language' in mapping) {
1132-
_addPreferredTerm(term, entry['@language'], (mapping['@language'] || '@null').toLowerCase());
1134+
_addPreferredTerm(term, entry['@language'],
1135+
(mapping['@language'] || '@null').toLowerCase());
11331136
} else if('@direction' in mapping) {
11341137
if(mapping['@direction']) {
1135-
_addPreferredTerm(term, entry['@language'], `_${mapping['@direction']}`);
1138+
_addPreferredTerm(term, entry['@language'],
1139+
`_${mapping['@direction']}`);
11361140
} else {
11371141
_addPreferredTerm(term, entry['@language'], '@none');
11381142
}
1139-
//} else if(defaultLanguage && defaultDirection) {
1140-
// _addPreferredTerm(term, entry['@language'], `${defaultLanguage}_${defaultDirection}`);
1141-
// _addPreferredTerm(term, entry['@type'], '@none');
1142-
//} else if(defaultLanguage) {
1143-
// _addPreferredTerm(term, entry['@language'], defaultLanguage);
1144-
// _addPreferredTerm(term, entry['@type'], '@none');
11451143
} else if(defaultDirection) {
11461144
_addPreferredTerm(term, entry['@language'], `_${defaultDirection}`);
11471145
_addPreferredTerm(term, entry['@language'], '@none');

lib/expand.js

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ const {
4141

4242
const api = {};
4343
module.exports = api;
44+
const REGEX_BCP47 = /^[a-zA-Z]{1,8}(-[a-zA-Z0-9]{1,8})*$/;
4445

4546
/**
4647
* Recursively expands an element using the given context. Any context in
@@ -423,7 +424,7 @@ async function _expandObject({
423424
const isJsonType = element[typeKey] &&
424425
_expandIri(activeCtx,
425426
(_isArray(element[typeKey]) ? element[typeKey][0] : element[typeKey]),
426-
{vocab: true}, options) == '@json';
427+
{vocab: true}, options) === '@json';
427428

428429
for(const key of keys) {
429430
let value = element[key];
@@ -591,7 +592,7 @@ async function _expandObject({
591592

592593
// ensure language tag matches BCP47
593594
for(const lang of value) {
594-
if(_isString(lang) && !lang.match(/^[a-zA-Z]{1,8}(-[a-zA-Z0-9]{1,8})*$/)) {
595+
if(_isString(lang) && !lang.match(REGEX_BCP47)) {
595596
console.warn(`@language must be valid BCP47: ${lang}`);
596597
}
597598
}
@@ -623,7 +624,8 @@ async function _expandObject({
623624
}
624625

625626
_addValue(
626-
expandedParent, '@direction', value, {propertyIsArray: options.isFrame});
627+
expandedParent, '@direction', value,
628+
{propertyIsArray: options.isFrame});
627629
continue;
628630
}
629631

@@ -713,7 +715,7 @@ async function _expandObject({
713715
const container = _getContextValue(termCtx, key, '@container') || [];
714716

715717
if(container.includes('@language') && _isObject(value)) {
716-
const direction = _getContextValue(termCtx, key, '@direction')
718+
const direction = _getContextValue(termCtx, key, '@direction');
717719
// handle language map container (skip if value is not an object)
718720
expandedValue = _expandLanguageMap(termCtx, value, direction, options);
719721
} else if(container.includes('@index') && _isObject(value)) {

0 commit comments

Comments
 (0)