@natlibfi/marc-record-validators-melinda 12.1.0-alpha.1 → 13.0.0

package/src/cyrillux-usemarcon-replacement.js

@@ -1,3 +1,5 @@
+/* eslint-disable max-lines */
+
 /*
 *  cyrillux-usemarcon-replacement.js -- implement and improve https://github.com/NatLibFi/USEMARCON-Cyrillux/tree/master
 *
@@ -6,6 +8,7 @@
 */
 
 import clone from 'clone';
+import createDebugLogger from 'debug';
 import {MarcRecord} from '@natlibfi/marc-record';
 import {default as fix33X} from './fix-33X.js';
 import {default as add041} from './addMissingField041.js';
@@ -19,11 +22,11 @@ import {default as fixIndicators} from './indicator-fixes.js';
 import {default as fixPunctuation} from './punctuation2.js';
 import {default as fixQualifyingInformation} from './normalize-qualifying-information.js';
 import {sortAdjacentSubfields} from './sortSubfields.js';
-
-// import createDebugLogger from 'debug';
 import {fieldHasSubfield, nvdebug, recordRemoveValuelessSubfields, recordToString, removeSubfield} from './utils.js';
 
-// const debug = createDebugLogger('@natlibfi/marc-record-validators-melinda/punctuation2');
+const debug = createDebugLogger('@natlibfi/marc-record-validators-melinda/cyrillux-usermarcon-replacement');
+//const debugData = debug.extend('data');
+const debugDev = debug.extend('dev');
 
 const description = 'Replacement for Cyrillux usemarcon rules';
 
@@ -32,13 +35,14 @@ const description = 'Replacement for Cyrillux usemarcon rules';
 const dropTags = ['001', '003', '010', '012', '014', '015', '016', '017', '019', '025', '029', '032', '035', '036', '037', '038', '042', '044', '049', '051', '061', '068', '071', '074', '079', '090', '091', '092', '094', '095', '096', '097', '099', '249', '261', '262', '350', '400', '411', '541', '561', '562', '574', '575', '577', '578', '583', '584', '589', '590', '591', '592', '593', '594', '595', '596', '597', '598', '599', '653', '698', '741', '742', '744', '751', '761', '790', '841', '842', '843', '844', '845', '850', '852', '853', '854', '855', '858', '859', '863', '864', '865', '866', '867', '868', '876', '877', '878', '882', '886', '887', '888', '890', '899'];
 
 
+// eslint-disable-next-line max-lines-per-function
 export default function () {
   return {
     description, fix, validate
   };
 
   function fix(record) {
-    nvdebug(`${description}: fix`);
+    nvdebug(`${description}: fix`, debugDev);
     realFix(record);
     const res = {message: [], fix: [], valid: true};
     return res;
@@ -156,7 +160,7 @@ export default function () {
 
   // Validation is currently done in subparts
   function validate(record) {
-    nvdebug(`${description}: validate`);
+    nvdebug(`${description}: validate`, debugDev);
     const originalString = recordToString(record);
     const clonedRecord = new MarcRecord(record, {subfieldValues: false});
     realFix(clonedRecord);

package/src/cyrillux.js

@@ -3,17 +3,23 @@ import clone from 'clone';
 import XRegExp from 'xregexp';
 import * as iso9 from '@natlibfi/iso9-1995';
 import * as sfs4900 from '@natlibfi/sfs-4900';
-import {fieldHasSubfield, fieldToString, fieldsToString, isControlSubfieldCode, nvdebug} from './utils.js';
+import {fieldHasSubfield, fieldToString, fieldsToString, isContentSubfieldCode, nvdebug} from './utils.js';
 import {fieldGetMaxSubfield6OccurrenceNumberAsInteger, fieldGetOccurrenceNumberPairs, fieldGetUnambiguousOccurrenceNumber, intToOccurrenceNumberString, recordGetMaxSubfield6OccurrenceNumberAsInteger, resetSubfield6Tag} from './subfield6Utils.js';
 import {default as sortFields} from './sortFields.js';
 import {default as reindexSubfield6OccurenceNumbers} from './reindexSubfield6OccurenceNumbers.js';
 import {fieldStripPunctuation} from './punctuation2.js';
 import {getLanguageCode} from './addMissingField041.js';
+import createDebugLogger from 'debug';
+
+const debug = createDebugLogger('@natlibfi/marc-record-validators-melinda/cyrillux');
+//const debugData = debug.extend('data');
+const debugDev = debug.extend('dev');
 
 const iso9Trans = 'ISO9 <TRANS>';
 const cyrillicTrans = 'CYRILLIC <TRANS>';
 const sfs4900Trans = 'SFS4900 <TRANS>';
 
+// eslint-disable-next-line max-lines-per-function
 export default function (config = {}) {
   // console.log(`CONFIG=${JSON.stringify(config)}`); // eslint-disable-line no-console
 
@@ -111,17 +117,22 @@ export default function (config = {}) {
   }
 
   function fieldContainsCyrillicCharacters(field) { // based on melinda-ui-cyrillux
-    return field.subfields && field.subfields.some(sf => subfieldRequiresTransliteration(sf));
+    return field.subfields && field.subfields.some(sf => subfieldRequiresTransliteration(sf, field.tag));
   }
 
-  function subfieldRequiresTransliteration(subfield) {
-    if (isControlSubfieldCode(subfield.code)) {
+  function subfieldRequiresTransliteration(subfield, tag = undefined) {
+    if (!isContentSubfieldCode(subfield.code, tag)) {
       return false;
     }
     return containsCyrillicCharacters(subfield.value);
   }
 
   function tagCanBeTransliterated(tag) {
+    // Use this to filter out "(0..)" etc
+    if (config.tagPattern && !tag.match(config.tagPattern)) {
+      return false;
+    }
+    // These are hard-coded, and will fail anyway:
     return !['336', '337', '338', '880'].includes(tag);
   }
 
@@ -130,7 +141,7 @@ export default function (config = {}) {
     // Discussion: We should probably also skip others like 05X-08X, 648, 650, 651, and 655, but this needs thinking...
     // Also I'd like to convert do CYRILLIC->ISO-9 in field 300 (and others?) without 880 mappings... (<- not implemented)
 
-    // nvdebug(`fieldCanBeTransliterated('${fieldToString(field)}') in...`);
+    // nvdebug(`fieldCanBeTransliterated('${fieldToString(field)}') in...`, debugDev);
     if (!tagCanBeTransliterated(field.tag)) {
       return false;
     }
@@ -153,8 +164,8 @@ export default function (config = {}) {
   }
 
 
-  function mapSubfieldToIso9(subfield) {
-    if (!subfieldRequiresTransliteration(subfield)) {
+  function mapSubfieldToIso9(subfield, tag) {
+    if (!subfieldRequiresTransliteration(subfield, tag)) {
       return {code: subfield.code, value: subfield.value}; // just clone
     }
 
@@ -163,17 +174,17 @@ export default function (config = {}) {
     return {code: subfield.code, value: conversionResult.result};
   }
 
-  function mapSubfieldToSfs4900(subfield, lang = 'rus') {
+  function mapSubfieldToSfs4900(subfield, tag, lang = 'rus') {
     const inputLang = lang === 'ukr' ? 'ukr' : 'rus'; // Support 'ukr' and 'rus', default to 'rus'
-    if (!subfieldRequiresTransliteration(subfield)) {
+    if (!subfieldRequiresTransliteration(subfield, tag)) {
       return {code: subfield.code, value: subfield.value};
     }
     const conversionResult = sfs4900.convertToLatin(subfield.value, inputLang);
 
-    console.log(JSON.stringify(conversionResult));
+    nvdebug(`${JSON.stringify(conversionResult)}`, debugDev);
     const result = conversionResult.result;
-    console.log(JSON.stringify(result));
-    //console.log(`VAL: ${subfield.value} => ${value} using ${lang}`); // eslint-disable-line no-console
+    nvdebug(`${JSON.stringify(result)}`, debugDev);
+    //nvdebug(`VAL: ${subfield.value} => ${value} using ${lang}`, debugDev);
     return {code: subfield.code, value: result};
   }
 
@@ -185,7 +196,7 @@ export default function (config = {}) {
     const transliterationFunc = iso9 ? mapSubfieldToIso9 : mapSubfieldToSfs4900;
 
     // NB! iso9 won't use lang
-    const subfields = field.subfields.filter(sf => sf.code !== '6').map(sf => transliterationFunc(sf, lang));
+    const subfields = field.subfields.filter(sf => sf.code !== '6').map(sf => transliterationFunc(sf, field.tag, lang));
 
     const newField = {tag: field.tag, ind1: field.ind1, ind2: field.ind2, subfields: [subfield6, ...subfields, ...subfield9]};
 
@@ -211,7 +222,7 @@ export default function (config = {}) {
     }
     // Just converts the field to ISO-9 latinitsa, does not create any field-880s, so don't bother with $6 or $9 either
     if (!config.retainCyrillic && !config.preferSFS4900) {
-      const subfields = field.subfields.map(sf => mapSubfieldToIso9(sf));
+      const subfields = field.subfields.map(sf => mapSubfieldToIso9(sf, field.tag));
       return {tag: field.tag, ind1: field.ind1, ind2: field.ind2, subfields};
     }
 
@@ -225,7 +236,7 @@ export default function (config = {}) {
     }
     // Just converts the field to SFS-4900 latinitsa, does not create any field-880s, so don't bother with $6 or $9 either
     if (!config.retainCyrillic && config.preferSFS4900) {
-      const subfields = field.subfields.map(sf => mapSubfieldToSfs4900(sf, lang));
+      const subfields = field.subfields.map(sf => mapSubfieldToSfs4900(sf, field.tag, lang));
       return {tag: field.tag, ind1: field.ind1, ind2: field.ind2, subfields};
     }
 
@@ -251,7 +262,7 @@ export default function (config = {}) {
     if (!config.retainCyrillic) {
       return undefined;
     }
-    nvdebug(`Derive CYR 880 from ${fieldToString(field)}`);
+    nvdebug(`Derive CYR 880 from ${fieldToString(field)}`, debugDev);
     const newSubfield6 = deriveSubfield6(field.tag, field.subfields, occurrenceNumber);
     const newSubfield9 = fieldHasSubfield(field, '9', cyrillicTrans) ? [] : [{code: '9', value: cyrillicTrans}];
     const subfields = [
@@ -261,7 +272,7 @@ export default function (config = {}) {
     ];
 
     const newField = {tag: '880', ind1: field.ind1, ind2: field.ind2, subfields};
-    nvdebug(`   New CYR 880      ${fieldToString(newField)}`);
+    nvdebug(`   New CYR 880      ${fieldToString(newField)}`, debugDev);
     return newField;
   }
 
@@ -312,8 +323,8 @@ export default function (config = {}) {
 
     // Paired field: $9 CYRILLIC <TRANS> is the only legal <TRANS>
     const [pairedField] = existingPairedFields;
-    nvdebug(`LOOKING FOR SFS4900 PAIR: ${fieldToString(field)}`);
-    nvdebug(`     HAVING PAIRED FIELD: ${fieldToString(pairedField)}`);
+    nvdebug(`LOOKING FOR SFS4900 PAIR: ${fieldToString(field)}`, debugDev);
+    nvdebug(`     HAVING PAIRED FIELD: ${fieldToString(pairedField)}`, debugDev);
     if (!fieldContainsCyrillicCharacters(pairedField)) {
       return false;
     }
@@ -327,7 +338,7 @@ export default function (config = {}) {
     const languageCode = getLanguageCode(record);
     const field2 = fieldToString(createFieldForSfs4900Comparison(mapFieldToSfs4900(pairedField, occurrenceNumberAsString, languageCode), field.tag));
     const field1 = fieldToString(createFieldForSfs4900Comparison(field, field.tag));
-    nvdebug(`COMPARE CONTENTS:\n  '${field1}' vs\n  '${field2}': ${field1 === field2 ? 'OK' : 'FAIL'}`);
+    nvdebug(`COMPARE CONTENTS:\n  '${field1}' vs\n  '${field2}': ${field1 === field2 ? 'OK' : 'FAIL'}`, debugDev);
     return field1 === field2;
   }
 
@@ -372,17 +383,17 @@ export default function (config = {}) {
       return [originalField];
     }
 
-    // nvdebug(`PROCESSING: ${fieldToString(originalField)}`);
+    // nvdebug(`PROCESSING: ${fieldToString(originalField)}`, debugDev);
 
     const newOccurrenceNumberAsInt = getNewOccurrenceNumber(originalField, record, maxCreatedOccurrenceNumber);
     const newOccurrenceNumberAsString = intToOccurrenceNumberString(newOccurrenceNumberAsInt);
     const languageCode = getLanguageCode(record);
 
-    // nvdebug(`NEW OCCURRENCE NUMBER: '${newOccurrenceNumberAsString}'`);
+    // nvdebug(`NEW OCCURRENCE NUMBER: '${newOccurrenceNumberAsString}'`, debugDev);
 
     const existingPairedFields = fieldGetOccurrenceNumberPairs(originalField, record.get('880'));
 
-    // nvdebug(`NUMBER OF PAIRED 880 FIELDS: ${existingPairedFields.length}`);
+    // nvdebug(`NUMBER OF PAIRED 880 FIELDS: ${existingPairedFields.length}`, debugDev);
 
     const newMainField = mapFieldToIso9(originalField, newOccurrenceNumberAsString); // ISO-9
     const newCyrillicField = retainCyrillic(existingPairedFields) ? mapFieldToCyrillicField880(originalField, newOccurrenceNumberAsString) : undefined; // CYRILLIC

package/src/dataProvenanceUtils.js

@@ -0,0 +1,21 @@
+export function tagToDataProvenanceSubfieldCode(tag) {
+    if ( ['533', '800', '810', '811', '830'].includes(tag)) {
+        return 'y';
+    }
+    if ( tag === '856' || tag === '857' ) {
+        return 'e';
+    }
+
+    if ( tag.match(/^7[678]/u) ) {
+        return 'l'
+    }
+
+    if ( tag.match(/^00/u)) {
+        return undefined;
+    }
+    return '7';
+}
+
+export function isDataProvenanceSubfieldCode(subfieldCode, tag) {
+    return subfieldCode === tagToDataProvenanceSubfieldCode(tag);
+}

package/src/disambiguateSeriesStatements.js

@@ -9,6 +9,8 @@ import {fieldFixPunctuation} from './punctuation2.js';
 //const {default: createNatlibfiSruClient} = natlibfiSruClient;
 
 const debug = createDebugLogger('@natlibfi/marc-record-validators-melinda:disambiguateSeriesStatements');
+//const debugData = debug.extend('data');
+const debugDev = debug.extend('dev');
 
 const ELECTRONIC = 1;
 const PRINTED = 2;
@@ -16,6 +18,7 @@ const NEITHER_OR_UNKNOWN = 0;
 const SRU_API_URL = 'https://sru.api.melinda.kansalliskirjasto.fi/bib';
 
 // Author(s): Nicholas Volk
+// eslint-disable-next-line max-lines-per-function
 export default function () {
   const sruClient = createSruClient(SRU_API_URL);
 
@@ -79,7 +82,7 @@ export default function () {
     }
 
     const deletableStrings = deletableXs.map(sf => subfieldToString(sf));
-    nvdebug(`Field has removable ISSNS: '${deletableStrings.join(', ')}`, debug);
+    nvdebug(`Field has removable ISSNS: '${deletableStrings.join(', ')}`, debugDev);
 
     // fixer:
     if (reallyFix) {

package/src/disambiguateSeriesStatements.test.js

@@ -3,7 +3,7 @@ import {MarcRecord} from '@natlibfi/marc-record';
 import validatorFactory from './disambiguateSeriesStatements.js';
 import {READERS} from '@natlibfi/fixura';
 import generateTests from '@natlibfi/fixugen';
-import createDebugLogger from 'debug';
+//import createDebugLogger from 'debug';
 
 generateTests({
   callback,
@@ -19,7 +19,7 @@ generateTests({
     }
   }
 });
-const debug = createDebugLogger('@natlibfi/marc-record-validators-melinda/disambiguateSeriesStatements:test');
+//const debug = createDebugLogger('@natlibfi/marc-record-validators-melinda/disambiguateSeriesStatements:test');
 
 async function testValidatorFactory() {
   const validator = await validatorFactory();
@@ -29,12 +29,7 @@ async function testValidatorFactory() {
   assert.equal(typeof validator.validate, 'function');
 }
 
-async function callback({getFixture, enabled = true, fix = false}) {
-  if (enabled === false) {
-    debug('TEST SKIPPED!');
-    return;
-  }
-
+async function callback({getFixture, fix = false}) {
   const validator = await validatorFactory();
   const record = new MarcRecord(getFixture('record.json'));
   const expectedResult = getFixture('expectedResult.json');

package/src/drop-terms.js

@@ -0,0 +1,164 @@
+// Author(s): Nicholas Volk
+
+import clone from 'clone';
+import createDebugLogger from 'debug';
+import {fieldToString, nvdebug} from './utils.js';
+import {getLexiconAndLanguage, getTermData, isLabel, isValidSubfield0} from './translate-terms.js';
+
+const debug = createDebugLogger('@natlibfi/marc-record-validators-melinda:drop-terms');
+//const debugData = debug.extend('data');
+const debugDev = debug.extend('dev');
+
+const defaultConfig = {
+  'constraints': [
+    {'tag': '648', 'lex': 'yso/fin'},
+    {'tag': '648', 'lex': 'yso/swe'},
+    {'tag': '650', 'lex': 'yso/fin'},
+    {'tag': '650', 'lex': 'yso/swe'},
+    {'tag': '651', 'lex': 'yso/fin'},
+    {'tag': '651', 'lex': 'yso/swe'},
+    {'tag': '655', 'lex': 'slm/fin'},
+    {'tag': '655', 'lex': 'slm/swe'}
+  ],
+  'keep invalid url': false, // If not true, removes illegal subfield $0. The whole field removal is later decided by 'keep 0-less'
+  'keep invalid label': false, // label ($a) is neither pref Label nor altLabel => remove whole field
+  'remove altLabel': false,
+  'remove 0-less': true
+};
+
+// eslint-disable-next-line max-lines-per-function
+export default function (config = defaultConfig) {
+
+  return {
+    description: 'Drop yso and slm terms that do not match their identifiers. Use for incoming records only! Not for records already in Melinda!',
+    validate, fix
+  };
+
+  async function fix(record, validateMode = false) {
+    const clonedFields = record.fields.map(f => clone(f));
+
+    const results = await processFields(clonedFields);
+
+    const removables = results.map((f, i) => !f ? record.fields[i] : undefined).filter(f => f);
+    const modMessages = results.map((f, i) => getMod(f, i)).filter(f => f);
+    const removalMessages = removables.map(f => `Remove '${fieldToString(f)}'`);
+    const allMessages = [...modMessages, ...removalMessages];
+
+    if (validateMode) {
+      if (allMessages.length === 0) {
+        return {'message': [], 'valid': true};
+      }
+      return {'message': allMessages, 'valid': false};
+    }
+
+    removables.forEach(f => record.removeField(f));
+
+    return {message: [], fix: allMessages, valid: true};
+
+    function getMod(field, index) {
+      if (!field) {
+        return undefined;
+      }
+      const before = fieldToString(record.fields[index]);
+      const after = fieldToString(results[index]);
+      if (before !== after) {
+        if (!validateMode) {
+          record.fields[index] = field;
+        }
+        return `Modify '${before}' => '${after}'`;
+      }
+      return undefined;
+    }
+  }
+
+  function isPotentialField(f) {
+    if (!config || !config.constraints) {
+      return false;
+    }
+    return config.constraints.some(c => c.tag === f.tag && f.subfields?.some(sf => sf.code === '2' && sf.value === c.lex));
+  }
+
+  async function validate(record) {
+    return fix(record, true);
+  }
+
+
+  async function processFields(fields, results = []) {
+    const [currField, ...remainingFields] = fields;
+    if (!currField) {
+      return results;
+    }
+
+    if (!isPotentialField(currField)) { // Not interested in this field
+      return processFields(remainingFields, [...results, currField]);
+    }
+
+    removeSyntacticallyIllegalSubfield0s(currField); // iff config wants them to be removed...
+
+    const removable = await isRemovableField(currField);
+
+    return processFields(remainingFields, [...results, removable ? undefined : currField]);
+  }
+
+  function removeSyntacticallyIllegalSubfield0s(field) {
+    if (config['keep invalid url']) {
+      return;
+    }
+
+    const lexData = getLexiconAndLanguage(field);
+    if (!lexData.lang) { // This is an error of sorts. Should we proceed and remove $0s?
+      return;
+    }
+
+    field.subfields = field.subfields.filter(sf => sf.code !== '0' || isValidSubfield0(sf, lexData.lex));
+  }
+
+  async function isRemovableField(field) {
+    // nvdebug(`FOO===== ${fieldToString(field)}`, debugDev);
+
+
+    // $0-less field:
+    if (!field.subfields.some(sf => sf.code === '0')) {
+      return config['remove 0-less'];
+    }
+
+    const subfield0 = field.subfields.find(sf => sf.code === '0');
+    const data = await getTermData(subfield0.value);
+    // NB! No data might be a BUG! This might delete all incoming terms if Finto is down... (we should distinguish between a miss and a failure)
+    // However, if we use this validator only for incoming records, it's fine enough.
+
+    if (data) {
+      const subfieldA = field.subfields.find(sf => sf.code === 'a');
+      if (subfieldA) {
+        const lexData = getLexiconAndLanguage(field);
+
+        // $a is the pref label. All is fine!
+        if (isLabel(data.prefLabel, subfieldA.value, lexData.lang)) {
+          nvdebug(`altLabel found: ${subfieldA.value}`, debugDev);
+          return false;
+        }
+        if (isLabel(data.altLabel, subfieldA.value, lexData.lang)) {
+          nvdebug(`altLabel found: ${subfieldA.value}`, debugDev);
+          // Oddly enough this could remove altLabel but keep totally invalid labels...
+          return config['remove altLabel'];
+        }
+        nvdebug(`a-2-0 mismatch: ${fieldToString(field)}`, debugDev);
+      }
+    }
+
+
+    if (config['keep invalid label']) {
+      // We keep the label $a. However, we can get rid of $0 if we want to (semantic reasons)
+      if (!config['keep invalid url']) {
+        nvdebug(`=============== 0-removal`, debugDev);
+        field.subfields = field.subfields.filter(sf => sf.code !== '0');
+      }
+      return false;
+    }
+    return true;
+
+  }
+
+
+}
+

package/src/drop-terms.test.js

@@ -0,0 +1,81 @@
+import assert from 'node:assert/strict';
+//import createDebugLogger from 'debug';
+import fetchMock from 'fetch-mock';
+
+import validatorFactory from './drop-terms.js';
+
+import {MarcRecord} from '@natlibfi/marc-record';
+import {READERS} from '@natlibfi/fixura';
+import generateTests from '@natlibfi/fixugen';
+
+
+import {fakeData} from '../test-fixtures/translate-terms-data.js';
+
+
+const uris = [
+  'http://www.yso.fi/onto/yso/p444',
+  'http://www.yso.fi/onto/yso/p500',
+  'http://www.yso.fi/onto/yso/p13299',
+  'http://www.yso.fi/onto/yso/p111739',
+  'http://www.yso.fi/onto/yso/p6197061979',
+  'http://www.yso.fi/onto/yso/p6196061969',
+  'http://urn.fi/URN:NBN:fi:au:slm:s161'
+];
+
+const useMock = 1;
+
+
+generateTests({
+  callback,
+  path: [import.meta.dirname, '..', 'test-fixtures', 'drop-terms'],
+  useMetadataFile: true,
+  recurse: false,
+  fixura: {
+    reader: READERS.JSON
+  },
+  hooks: {
+    before: async () => {
+
+      if (useMock) {
+        fetchMock.mockGlobal()
+        .get(`https://api.finto.fi/rest/v1/data?uri=${uris[0]}&format=application%2Fjson`, {status: 200, headers: {}, body: fakeData})
+        .get(`https://api.finto.fi/rest/v1/data?uri=${uris[1]}&format=application%2Fjson`, {status: 200, headers: {}, body: fakeData})
+        .get(`https://api.finto.fi/rest/v1/data?uri=${uris[2]}&format=application%2Fjson`, {status: 200, headers: {}, body: fakeData})
+        .get(`https://api.finto.fi/rest/v1/data?uri=${uris[3]}&format=application%2Fjson`, {status: 200, headers: {}, body: fakeData})
+        .get(`https://api.finto.fi/rest/v1/data?uri=${uris[4]}&format=application%2Fjson`, {status: 200, headers: {}, body: fakeData})
+        .get(`https://api.finto.fi/rest/v1/data?uri=${uris[5]}&format=application%2Fjson`, {status: 200, headers: {}, body: fakeData})
+        .get(`https://api.finto.fi/rest/v1/data?uri=${uris[6]}&format=application%2Fjson`, {status: 200, headers: {}, body: fakeData});
+      }
+
+      testValidatorFactory();
+    }
+  }
+});
+
+//const debug = createDebugLogger('@natlibfi/marc-record-validators-melinda/drop-terms:test');
+
+async function testValidatorFactory() {
+  const validator = await validatorFactory();
+
+  assert.equal(typeof validator, 'object');
+  assert.equal(typeof validator.description, 'string');
+  assert.equal(typeof validator.validate, 'function');
+}
+
+async function callback({getFixture, fix = false, config = undefined}) {
+  const validator = await validatorFactory(config);
+  const record = new MarcRecord(getFixture('record.json'));
+  const expectedResult = getFixture('expectedResult.json');
+  // console.log(expectedResult); // eslint-disable-line
+
+  if (!fix) {
+    const result = await validator.validate(record);
+    assert.deepEqual(result, expectedResult);
+    const originalRecord = new MarcRecord(getFixture('record.json'));
+    assert.deepEqual(record, originalRecord); // Validation should not change the record
+    return;
+  }
+  const expectedResult2 = new MarcRecord(expectedResult);
+  await validator.fix(record);
+  assert.deepEqual(record, expectedResult2);
+}

package/src/field-008-18-34-character-groups.test.js

@@ -3,7 +3,7 @@ import {MarcRecord} from '@natlibfi/marc-record';
 import validatorFactory from './field-008-18-34-character-groups.js';
 import {READERS} from '@natlibfi/fixura';
 import generateTests from '@natlibfi/fixugen';
-import createDebugLogger from 'debug';
+//import createDebugLogger from 'debug';
 
 generateTests({
   callback,
@@ -19,7 +19,7 @@ generateTests({
     }
   }
 });
-const debug = createDebugLogger('@natlibfi/marc-record-validators-melinda/field-008-18-34-character-groups:test');
+//const debug = createDebugLogger('@natlibfi/marc-record-validators-melinda/field-008-18-34-character-groups:test');
 
 async function testValidatorFactory() {
   const validator = await validatorFactory();
@@ -30,12 +30,7 @@ async function testValidatorFactory() {
   assert.equal(typeof validator.validate, 'function');
 }
 
-async function callback({getFixture, enabled = true, fix = false}) {
-  if (enabled === false) {
-    debug('TEST SKIPPED!');
-    return;
-  }
-
+async function callback({getFixture, fix = false}) {
   const validator = await validatorFactory();
   const record = new MarcRecord(getFixture('record.json'));
   const expectedResult = getFixture('expectedResult.json');

package/src/field-505-separators.test.js

@@ -3,7 +3,7 @@ import {MarcRecord} from '@natlibfi/marc-record';
 import validatorFactory from './field-505-separators.js';
 import {READERS} from '@natlibfi/fixura';
 import generateTests from '@natlibfi/fixugen';
-import createDebugLogger from 'debug';
+//import createDebugLogger from 'debug';
 
 generateTests({
   callback,
@@ -19,7 +19,7 @@ generateTests({
     }
   }
 });
-const debug = createDebugLogger('@natlibfi/marc-record-validators-melinda/field-505-separators:test');
+//const debug = createDebugLogger('@natlibfi/marc-record-validators-melinda/field-505-separators:test');
 
 async function testValidatorFactory() {
   const validator = await validatorFactory();
@@ -29,12 +29,7 @@ async function testValidatorFactory() {
   assert.equal(typeof validator.validate, 'function');
 }
 
-async function callback({getFixture, enabled = true, fix = false}) {
-  if (enabled === false) {
-    debug('TEST SKIPPED!');
-    return;
-  }
-
+async function callback({getFixture, fix = false}) {
   const validator = await validatorFactory();
 
   const recordFixture = getFixture('record.json');

package/src/field-521-fix.test.js

@@ -3,7 +3,7 @@ import {MarcRecord} from '@natlibfi/marc-record';
 import validatorFactory from './field-521-fix.js';
 import {READERS} from '@natlibfi/fixura';
 import generateTests from '@natlibfi/fixugen';
-import createDebugLogger from 'debug';
+//import createDebugLogger from 'debug';
 
 generateTests({
   callback,
@@ -19,7 +19,7 @@ generateTests({
     }
   }
 });
-const debug = createDebugLogger('@natlibfi/marc-record-validators-melinda/fix521:test');
+//const debug = createDebugLogger('@natlibfi/marc-record-validators-melinda/fix521:test');
 
 async function testValidatorFactory() {
   const validator = await validatorFactory();
@@ -29,12 +29,7 @@ async function testValidatorFactory() {
   assert.equal(typeof validator.validate, 'function');
 }
 
-async function callback({getFixture, enabled = true, fix = false}) {
-  if (enabled === false) {
-    debug('TEST SKIPPED!');
-    return;
-  }
-
+async function callback({getFixture, fix = false}) {
   const validator = await validatorFactory();
   const record = new MarcRecord(getFixture('record.json'));
   const expectedResult = getFixture('expectedResult.json');