@natlibfi/marc-record-validators-melinda 11.6.6 → 11.6.7-alpha.1

package/src/subfieldValueNormalizations.js

@@ -22,7 +22,7 @@ export default function () {
       normalizeSubfieldValues(field, catLang);
     });
 
-    // message.valid = !(message.message.length >= 1); // eslint-disable-line functional/immutable-data
+    // message.valid = !(message.message.length >= 1);
     return res;
   }
 
@@ -34,7 +34,7 @@ export default function () {
       validateField(field, res, catLang);
     });
 
-    res.valid = !(res.message.length >= 1); // eslint-disable-line functional/immutable-data
+    res.valid = !(res.message.length >= 1);
     return res;
   }
 
@@ -47,7 +47,7 @@ export default function () {
     const normalizedField = normalizeSubfieldValues(clone(field), catLang);
     const mod = fieldToString(normalizedField);
     if (orig !== mod) { // Fail as the input is "broken"/"crap"/sumthing
-      res.message.push(`'${orig}' requires subfield internal mods/normalization`); // eslint-disable-line functional/immutable-data
+      res.message.push(`'${orig}' requires subfield internal mods/normalization`);
       return;
     }
     return;
@@ -57,7 +57,6 @@ export default function () {
 
 function handleInitials(value, subfieldCode, field) {
   // MRA-267/273
-  /* eslint-disable */
   if (field.ind1 === '1' && subfieldCode === 'a' && ['100', '600', '700', '800'].includes(field.tag) && !fieldHasSubfield(field, '0')) {
     // Fix MRA-267/273 (partial): Handle the most common case(s). (And extend them rules later on if the need arises):
     // No longest initial sequence I've seen is six (in a Sri Lankan name).
@@ -69,7 +68,6 @@ function handleInitials(value, subfieldCode, field) {
 
   return value;
 
-  /* eslint-enable */
   function initialsInRow(str) {
     // initial space confirms us that it's an initial
     return str.match(/ (?:[A-Z]|Å|Ä|Ö)\.(?:[A-Z]|Å|Ä|Ö)/u);
@@ -120,7 +118,7 @@ function getNormalizedValue(subfield, field, catLang) {
   function handleMovies(value) {
     if (subfield.code === 'a' && ['130', '630', '730'].includes(field.tag)) {
       // MRA-614: "(elokuva, 2000)" => "(elokuva : 2000)""
-      return value.replace(/\((elokuva), (19[0-9][0-9]|20[0-2][0-9])\)/u, '($1 : $2)'); // eslint-disable-line prefer-named-capture-group
+      return value.replace(/\((elokuva), (19[0-9][0-9]|20[0-2][0-9])\)/u, '($1 : $2)');
     }
     return value;
   }
@@ -157,7 +155,7 @@ function normalizeSubfieldValues(field, catLang) {
     if (!field.subfields[index].value) {
       return;
     }
-    field.subfields[index].value = getNormalizedValue(subfield, field, catLang); // eslint-disable-line functional/immutable-data
+    field.subfields[index].value = getNormalizedValue(subfield, field, catLang);
   });
   return field;
 }

package/src/sync-007-and-300.js

@@ -14,7 +14,7 @@ export default function () {
 
   function fix(record) {
     const res = {message: [], fix: [], valid: true};
-    record.fields.forEach(f => fixField(f, record));
+    record.fields.forEach(f => fixField(f, record)); // eslint-disable-line array-callback-return
     return res;
   }
 
@@ -25,7 +25,7 @@ export default function () {
       validateField(field, res, record);
     });
 
-    res.valid = !(res.message.length >= 1); // eslint-disable-line functional/immutable-data
+    res.valid = !(res.message.length >= 1);
     return res;
   }
 
@@ -38,13 +38,13 @@ export default function () {
     const normalizedField = fixField(clone(field), record);
     const mod = fieldToString(normalizedField);
     if (orig !== mod) { // Fail as the input is "broken"/"crap"/sumthing
-      res.message.push(`FIXABLE: '${orig}' => '${mod}'`); // eslint-disable-line functional/immutable-data
+      res.message.push(`FIXABLE: '${orig}' => '${mod}'`);
       return;
     }
 
     /*
     if (fieldHasUnfixableStuff(field)) {
-      res.message.push(`CAN'T BE FIXED AUTOMATICALLY: '${orig}'`); // eslint-disable-line functional/immutable-data
+      res.message.push(`CAN'T BE FIXED AUTOMATICALLY: '${orig}'`);
       return;
     }
     */
@@ -91,17 +91,17 @@ export default function () {
     if (!fieldIsBluray007(field)) {
       return;
     }
-    //field.value = field.value.substring(0, 4) + 's' + field.value.substring(5); // eslint-disable-line functional/immutable-data
+    //field.value = field.value.substring(0, 4) + 's' + field.value.substring(5);
     //field.value = field.value.replace(/^(?:v...)s/u, `${1}v`); // eslint-disable-line functional/immutable-data, no-template-curly-in-string
-    field.value = `${field.value.substring(0, 4)}v${field.value.substring(5)}`; // eslint-disable-line functional/immutable-data
+    field.value = `${field.value.substring(0, 4)}v${field.value.substring(5)}`;
   }
 
   function convert007DvdToBluray(field) {
     if (!fieldIsDvd007(field)) {
       return;
     }
-    //field.value = field.value.replace(/^(?:v...)v/u, `${1}s`); // eslint-disable-line functional/immutable-data
-    field.value = `${field.value.substring(0, 4)}s${field.value.substring(5)}`; // eslint-disable-line functional/immutable-data
+    //field.value = field.value.replace(/^(?:v...)v/u, `${1}s`);
+    field.value = `${field.value.substring(0, 4)}s${field.value.substring(5)}`;
   }
 
   function fixField(field, record) {

package/src/translate-terms.js

@@ -23,9 +23,9 @@ export default function () {
   async function fix(record) {
     const newFields = await getFields(record, defaultTags, []);
 
-    newFields.forEach(nf => nvdebug(`Add new field '${fieldToString(nf)}'`, debug));
+    newFields.forEach(nf => nvdebug(`Add new field '${fieldToString(nf)}'`, debug)); // eslint-disable-line array-callback-return
 
-    newFields.forEach(nf => record.insertField(nf));
+    newFields.forEach(nf => record.insertField(nf)); // eslint-disable-line array-callback-return
 
     const newFieldsAsStrings = newFields.map(f => fieldToString(f));
 
@@ -78,13 +78,11 @@ export default function () {
   async function deriveMissingFields(record, tag) {
     const pairlessFields = getPairlessFinnishAndSwedishFields(record, tag);
 
-    /* eslint-disable */
     // Dunno how to handle loop+promise combo in our normal coding style. Spent half a day trying... (I reckon it takes like 2 minuts to do this properly...)
     let prefLabels = [];
     for (let i=0; i < pairlessFields.length; i += 1) {
       prefLabels[i] = await getPrefLabel(pairlessFields[i]);
     }
-    /* eslint-enable */
 
     const missingFields = pairlessFields.map((f, i) => pairField(f, prefLabels[i]));
     return missingFields.filter(f => f);
@@ -176,7 +174,7 @@ export default function () {
       return termCache[uri];
     }
     const tmp = await getTermDataFromFinto(uri);
-    termCache[uri] = tmp; // eslint-disable-line functional/immutable-data, require-atomic-updates
+    termCache[uri] = tmp;
     return tmp;
   }
 

package/src/typeOfDate-008.js

@@ -1,6 +1,6 @@
 import createDebugLogger from 'debug';
 
-const debug = createDebugLogger('@natlibfi/marc-record-validators-melinda/typeOfDate-008');  // eslint-disable-line
+const debug = createDebugLogger('@natlibfi/marc-record-validators-melinda/typeOfDate-008');
 
 export default function () {
   return {
@@ -24,12 +24,12 @@ export default function () {
 
   function fix(record) {
     //  LDR/06=t ja 11-14=####, niin LDR/06 muutetaan s:ksi
-    const [f008] = record.pop(/008/u); // eslint-disable-line functional/immutable-data
+    const [f008] = record.pop(/008/u);
     const c06 = f008.value.substring(6, 7);
     const c1114 = f008.value.substring(11, 15);
     // if 008 06 = s, and 11-14 = #### (not year/digits)
     if (c06 === 't' && !(/[0-9u]{4}/u).test(c1114)) {
-      f008.value = `${f008.value.substring(0, 6)}s${f008.value.substring(7)}`; // eslint-disable-line functional/immutable-data
+      f008.value = `${f008.value.substring(0, 6)}s${f008.value.substring(7)}`;
       record.insertField(f008);
       return true;
     }

package/src/unicode-decomposition.js

@@ -122,7 +122,7 @@ export default function () {
       field.subfields
         .filter(subfield => PATTERN.test(subfield.value))
         .forEach(subfield => {
-          subfield.value = convert(subfield.value); // eslint-disable-line functional/immutable-data
+          subfield.value = convert(subfield.value);
         });
     });
   }

package/src/update-field-540.js

@@ -44,9 +44,9 @@ const licences = [
 ];
 
 function findSubfieldIndex(field, subfield) {
-  subfield.nvtmp = 1; // eslint-disable-line functional/immutable-data
+  subfield.nvtmp = 1;
   const index = field.subfields.findIndex(sf => sf.nvtmp === 1);
-  delete subfield.nvtmp; // eslint-disable-line functional/immutable-data
+  delete subfield.nvtmp;
   return index;
 }
 
@@ -69,9 +69,9 @@ function validUrlInSubfieldU(subfieldU, license) {
 
 function fixC(field, subfieldC) {
   // MELINDA-2431_
-  subfieldC.code = 'f'; // eslint-disable-line functional/immutable-data
+  subfieldC.code = 'f';
   const index = findSubfieldIndex(field, subfieldC);
-  field.subfields.splice(index + 1, 0, {'code': '2', 'value': 'cc'}); // eslint-disable-line functional/immutable-data
+  field.subfields.splice(index + 1, 0, {'code': '2', 'value': 'cc'});
 }
 
 function fieldHasOldCcLicense(field, fix) {
@@ -84,9 +84,9 @@ function fieldHasOldCcLicense(field, fix) {
     return false;
   }
   //nvdebug(` Found valid license`);
-  if (fix) { // eslint-disable-line functional/no-conditional-statements
+  if (fix) {
     const subfieldsC = field.subfields.filter(sf => validLicenseInSubfieldC(sf, validLicense));
-    subfieldsC.forEach(c => fixC(field, c));
+    subfieldsC.forEach(c => fixC(field, c)); // eslint-disable-line array-callback-return
   }
 
   return true;

package/src/urn.js

@@ -45,7 +45,7 @@ export default function (isLegalDeposit = false, useMelindaTemp = true) {
     // We add the URN even if we're not getting the legalDeposit - where does this URN resolve?
     // We probably should not do these additions
 
-    if (f856sUrn.length === 0) { // eslint-disable-line functional/no-conditional-statements
+    if (f856sUrn.length === 0) {
       const {code, value, generated} = await createURNSubfield(record);
 
       if (generated && useMelindaTemp) {
@@ -69,7 +69,9 @@ export default function (isLegalDeposit = false, useMelindaTemp = true) {
       });
 
       return true;
-    } else if (isLegalDeposit) { // eslint-disable-line functional/no-conditional-statements
+    }
+
+    if (isLegalDeposit) {
 
       // We add here legal deposit information to all URN-f856s - we probably should not do this
       // We should add extra f856 URN / URNs for legal deposits that already have a open (non-legal-deposit) URN
@@ -78,16 +80,16 @@ export default function (isLegalDeposit = false, useMelindaTemp = true) {
 
       f856sUrn.forEach(f => {
         // Change phrase from old to new if field with old phrase is found
-        if (f.subfields.some(sf => hasOld856LdPhrase(sf))) { // eslint-disable-line functional/no-conditional-statements
-          f.subfields // eslint-disable-line functional/immutable-data
+        if (f.subfields.some(sf => hasOld856LdPhrase(sf))) {
+          f.subfields
             .find(sf => hasOld856LdPhrase(sf))
             .value = 'Käytettävissä vapaakappaletyöasemilla';
         }
 
         // Create subfields if necessary
         ldSubfields.forEach(ldsf => {
-          if (!f.subfields.some(sf => sf.code === ldsf.code && sf.value === ldsf.value && !hasOld856LdPhrase(sf))) { // eslint-disable-line functional/no-conditional-statements
-            f.subfields.push(ldsf); // eslint-disable-line functional/immutable-data
+          if (!f.subfields.some(sf => sf.code === ldsf.code && sf.value === ldsf.value && !hasOld856LdPhrase(sf))) {
+            f.subfields.push(ldsf);
           }
         });
       });

package/src/utils.js

@@ -18,7 +18,7 @@ export function isElectronicMaterial(record) {
 }
 
 export function nvdebug(message, func = undefined) {
-  if (func) { // eslint-disable-line functional/no-conditional-statements
+  if (func) {
     func(message);
   }
   //console.info(message); // eslint-disable-line no-console
@@ -55,11 +55,11 @@ export function recordToString(record) {
 }
 
 export function removeSubfield(record, tag, subfieldCode) {
-  record.fields = record.fields.map(field => { // eslint-disable-line functional/immutable-data
+  record.fields = record.fields.map(field => {
     if (field.tag !== tag || !field.subfields) { // Don't procss irrelevant fields
       return field;
     }
-    field.subfields = field.subfields.filter(sf => sf.code !== subfieldCode); // eslint-disable-line functional/immutable-data
+    field.subfields = field.subfields.filter(sf => sf.code !== subfieldCode);
     if (field.subfields.length === 0) {
       return false;
     }
@@ -68,12 +68,12 @@ export function removeSubfield(record, tag, subfieldCode) {
 }
 
 export function recordRemoveValuelessSubfields(record) {
-  record.fields = record.fields.map(field => { // eslint-disable-line functional/immutable-data
+  record.fields = record.fields.map(field => {
     if (!field.subfields) { // Keep control fields
       return field;
     }
     // Remove empty subfields from datafields:
-    field.subfields = field.subfields.filter(sf => sf.value); // eslint-disable-line functional/immutable-data
+    field.subfields = field.subfields.filter(sf => sf.value);
 
     if (field.subfields && field.subfields.length === 0) {
       return false; // Return false instead of a field if field has no subfields left. These will soon be filtered out.
@@ -99,7 +99,7 @@ export function fieldsToString(fields) {
 }
 
 export function nvdebugFieldArray(fields, prefix = '  ', func = undefined) {
-  fields.forEach(field => nvdebug(`${prefix}${fieldToString(field)}`, func));
+  fields.forEach(field => nvdebug(`${prefix}${fieldToString(field)}`, func)); // eslint-disable-line array-callback-return
 }
 
 export function isControlSubfieldCode(subfieldCode) {
@@ -146,7 +146,7 @@ export function fieldHasNSubfields(field, subfieldCode/*, subfieldValue = null*/
 }
 
 export function removeCopyright(value) {
-  return value.replace(/^(?:c|p|©|℗|Cop\. ?) ?((?:1[0-9][0-9][0-9]|20[012][0-9])\.?)$/ui, '$1'); // eslint-disable-line prefer-named-capture-group
+  return value.replace(/^(?:c|p|©|℗|Cop\. ?) ?((?:1[0-9][0-9][0-9]|20[012][0-9])\.?)$/ui, '$1');
 }
 
 function isNonStandardNonrepeatableSubfield(tag, subfieldCode) {
@@ -217,7 +217,7 @@ export function marc21GetTagsLegalInd2Value(tag) {
 }
 
 export function nvdebugSubfieldArray(subfields, prefix = '  ', func = undefined) {
-  subfields.forEach(subfield => nvdebug(`${prefix}${subfieldToString(subfield)}`, func));
+  subfields.forEach(subfield => nvdebug(`${prefix}${subfieldToString(subfield)}`, func)); // eslint-disable-line array-callback-return
 }
 
 export function subfieldsAreIdentical(subfieldA, subfieldB) {

package/.eslintignore

@@ -1 +0,0 @@
-coverage/