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

package/src/{modernize-502.spec.js → modernize-502.test.js}

@@ -1,20 +1,22 @@
-import {expect} from 'chai';
+import assert from 'node:assert';
 import {MarcRecord} from '@natlibfi/marc-record';
-import validatorFactory from './modernize-502';
+import validatorFactory from './modernize-502.js';
 import {READERS} from '@natlibfi/fixura';
 import generateTests from '@natlibfi/fixugen';
 //import createDebugLogger from 'debug';
 
 generateTests({
   callback,
-  path: [__dirname, '..', 'test-fixtures', 'modernize-502'],
+  path: [import.meta.dirname, '..', 'test-fixtures', 'modernize-502'],
   useMetadataFile: true,
   recurse: false,
   fixura: {
     reader: READERS.JSON
   },
-  mocha: {
-    before: () => testValidatorFactory()
+  hooks: {
+    before: async () => {
+      testValidatorFactory();
+    }
   }
 });
 
@@ -23,12 +25,9 @@ generateTests({
 async function testValidatorFactory() {
   const validator = await validatorFactory();
 
-  expect(validator)
-    .to.be.an('object')
-    .that.has.any.keys('description', 'validate');
-
-  expect(validator.description).to.be.a('string');
-  expect(validator.validate).to.be.a('function');
+  assert.equal(typeof validator, 'object');
+  assert.equal(typeof validator.description, 'string');
+  assert.equal(typeof validator.validate, 'function');
 }
 
 async function callback({getFixture, fix = false}) {
@@ -39,10 +38,10 @@ async function callback({getFixture, fix = false}) {
 
   if (!fix) {
     const result = await validator.validate(record);
-    expect(result).to.eql(expectedResult);
+    assert.deepEqual(result, expectedResult);
     return;
   }
 
   await validator.fix(record);
-  expect(record).to.eql(expectedResult);
+  assert.deepEqual(record, expectedResult);
 }

package/src/multiple-subfield-0.js

@@ -2,7 +2,7 @@
 // import clone from 'clone';
 // const debug = createDebugLogger('@natlibfi/marc-record-validators-melinda:multiple-subfield-0');
 
-import {fieldHasSubfield, fieldToString} from './utils';
+import {fieldHasSubfield, fieldToString} from './utils.js';
 
 const asteriNamePrefixes = ['(FI-ASTERI-N)', '(FIN11)', 'http://urn.fi/URN:NBN:fi:au:finaf:', 'https://urn.fi/URN:NBN:fi:au:finaf:'];
 
@@ -16,14 +16,14 @@ export default function () {
   function fix(record) {
     function fixField(field) {
       const removableSubfields = fieldGetDeletableSubfields(field);
-      removableSubfields.forEach(sf => record.removeSubfield(sf, field)); // eslint-disable-line array-callback-return
+      removableSubfields.forEach(sf => record.removeSubfield(sf, field));
     }
 
     const res = {message: [], fix: [], valid: true};
 
     const relevantFields = getRelevantFields(record);
 
-    relevantFields.forEach(field => fixField(field)); // eslint-disable-line array-callback-return
+    relevantFields.forEach(field => fixField(field));
 
     // message.valid = !(message.message.length >= 1);
     return res;

package/src/{multiple-subfield-0.spec.js → multiple-subfield-0.test.js}

@@ -1,33 +1,33 @@
-import {expect} from 'chai';
+import assert from 'node:assert';
 import {MarcRecord} from '@natlibfi/marc-record';
-import validatorFactory from './multiple-subfield-0';
+import validatorFactory from './multiple-subfield-0.js';
 import {READERS} from '@natlibfi/fixura';
 import generateTests from '@natlibfi/fixugen';
 import createDebugLogger from 'debug';
 
 generateTests({
   callback,
-  path: [__dirname, '..', 'test-fixtures', 'subfield0'],
+  path: [import.meta.dirname, '..', 'test-fixtures', 'subfield0'],
   useMetadataFile: true,
   recurse: false,
   fixura: {
     reader: READERS.JSON
   },
-  mocha: {
-    before: () => testValidatorFactory()
+  hooks: {
+    before: async () => {
+      testValidatorFactory();
+    }
   }
 });
+
 const debug = createDebugLogger('@natlibfi/marc-record-validators-melinda/multiple-subfield-0:test');
 
 async function testValidatorFactory() {
   const validator = await validatorFactory();
 
-  expect(validator)
-    .to.be.an('object')
-    .that.has.any.keys('description', 'validate');
-
-  expect(validator.description).to.be.a('string');
-  expect(validator.validate).to.be.a('function');
+  assert.equal(typeof validator, 'object');
+  assert.equal(typeof validator.description, 'string');
+  assert.equal(typeof validator.validate, 'function');
 }
 
 async function callback({getFixture, enabled = true, fix = false}) {
@@ -43,10 +43,10 @@ async function callback({getFixture, enabled = true, fix = false}) {
 
   if (!fix) {
     const result = await validator.validate(record);
-    expect(result).to.eql(expectedResult);
+    assert.deepEqual(result, expectedResult);
     return;
   }
 
   await validator.fix(record);
-  expect(record).to.eql(expectedResult);
+  assert.deepEqual(record, expectedResult);
 }

package/src/{non-breaking-space.spec.js → non-breaking-space.test.js}

@@ -1,31 +1,30 @@
-import {expect} from 'chai';
+import assert from 'node:assert';
 import {MarcRecord} from '@natlibfi/marc-record';
-import validatorFactory from './non-breaking-space';
+import validatorFactory from './non-breaking-space.js';
 import {READERS} from '@natlibfi/fixura';
 import generateTests from '@natlibfi/fixugen';
 
 generateTests({
   callback,
-  path: [__dirname, '..', 'test-fixtures', 'non-breaking-space'],
+  path: [import.meta.dirname, '..', 'test-fixtures', 'non-breaking-space'],
   useMetadataFile: true,
   recurse: false,
   fixura: {
     reader: READERS.JSON
   },
-  mocha: {
-    before: () => testValidatorFactory()
+  hooks: {
+    before: async () => {
+      testValidatorFactory();
+    }
   }
 });
 
 async function testValidatorFactory() {
   const validator = await validatorFactory();
 
-  expect(validator)
-    .to.be.an('object')
-    .that.has.any.keys('description', 'validate');
-
-  expect(validator.description).to.be.a('string');
-  expect(validator.validate).to.be.a('function');
+  assert.equal(validator, 'object');
+  assert.equal(validator.description, 'string');
+  assert.equal(validator.validate, 'function');
 }
 
 async function callback({getFixture, fix = false}) {
@@ -35,10 +34,10 @@ async function callback({getFixture, fix = false}) {
 
   if (!fix) {
     const result = await validator.validate(record);
-    expect(result).to.eql(expectedResult);
+    assert.deepEqual(result, expectedResult);
     return;
   }
 
   await validator.fix(record);
-  expect(record).to.eql(expectedResult);
+  assert.deepEqual(record, expectedResult);
 }

package/src/normalize-dashes.js

@@ -1,6 +1,6 @@
 //import createDebugLogger from 'debug';
 import clone from 'clone';
-import {fieldToString, isControlSubfieldCode, nvdebug} from './utils';
+import {fieldToString, isControlSubfieldCode, nvdebug} from './utils.js';
 
 // Author(s): Nicholas Volk
 export default function () {
@@ -54,7 +54,7 @@ function fixDashes(field) {
 
   nvdebug(`Dashing ${fieldToString(field)}`);
 
-  field.subfields.forEach(sf => subfieldFixDashes(sf)); // eslint-disable-line array-callback-return
+  field.subfields.forEach(sf => subfieldFixDashes(sf));
 
   return field;
 

package/src/{normalize-dashes.spec.js → normalize-dashes.test.js}

@@ -1,20 +1,22 @@
-import {expect} from 'chai';
+import assert from 'node:assert';
 import {MarcRecord} from '@natlibfi/marc-record';
-import validatorFactory from './normalize-dashes';
+import validatorFactory from './normalize-dashes.js';
 import {READERS} from '@natlibfi/fixura';
 import generateTests from '@natlibfi/fixugen';
 import createDebugLogger from 'debug';
 
 generateTests({
   callback,
-  path: [__dirname, '..', 'test-fixtures', 'normalize-dashes'],
+  path: [import.meta.dirname, '..', 'test-fixtures', 'normalize-dashes'],
   useMetadataFile: true,
   recurse: false,
   fixura: {
     reader: READERS.JSON
   },
-  mocha: {
-    before: () => testValidatorFactory()
+  hooks: {
+    before: async () => {
+      testValidatorFactory();
+    }
   }
 });
 const debug = createDebugLogger('@natlibfi/marc-record-validators-melinda/normalize-dashes:test');
@@ -22,12 +24,9 @@ const debug = createDebugLogger('@natlibfi/marc-record-validators-melinda/normal
 async function testValidatorFactory() {
   const validator = await validatorFactory();
 
-  expect(validator)
-    .to.be.an('object')
-    .that.has.any.keys('description', 'validate');
-
-  expect(validator.description).to.be.a('string');
-  expect(validator.validate).to.be.a('function');
+  assert.equal(typeof validator, 'object');
+  assert.equal(typeof validator.description, 'string');
+  assert.equal(typeof validator.validate, 'function');
 }
 
 async function callback({getFixture, enabled = true, fix = false}) {
@@ -43,10 +42,10 @@ async function callback({getFixture, enabled = true, fix = false}) {
 
   if (!fix) {
     const result = await validator.validate(record);
-    expect(result).to.eql(expectedResult);
+    assert.deepEqual(result, expectedResult);
     return;
   }
 
   await validator.fix(record);
-  expect(record).to.eql(expectedResult);
+  assert.deepEqual(record, expectedResult);
 }

package/src/normalize-identifiers.js

@@ -1,7 +1,7 @@
 // Relocated from melinda-marc-record-merge-reducers (and renamed)
 //import createDebugLogger from 'debug';
 import clone from 'clone';
-import {fieldToString} from './utils';
+import {fieldToString} from './utils.js';
 //const debug = createDebugLogger('@natlibfi/marc-record-validators-melinda:normalize-identifiers');
 
 /*

package/src/{normalize-identifiers.spec.js → normalize-identifiers.test.js}

@@ -1,20 +1,22 @@
-import {expect} from 'chai';
+import assert from 'node:assert';
 import {MarcRecord} from '@natlibfi/marc-record';
-import validatorFactory from './normalize-identifiers';
+import validatorFactory from './normalize-identifiers.js';
 import {READERS} from '@natlibfi/fixura';
 import generateTests from '@natlibfi/fixugen';
 import createDebugLogger from 'debug';
 
 generateTests({
   callback,
-  path: [__dirname, '..', 'test-fixtures', 'normalize-identifiers'],
+  path: [import.meta.dirname, '..', 'test-fixtures', 'normalize-identifiers'],
   useMetadataFile: true,
   recurse: false,
   fixura: {
     reader: READERS.JSON
   },
-  mocha: {
-    before: () => testValidatorFactory()
+  hooks: {
+    before: async () => {
+      testValidatorFactory();
+    }
   }
 });
 const debug = createDebugLogger('@natlibfi/marc-record-validators-melinda/normalize-identifiers:test');
@@ -22,12 +24,9 @@ const debug = createDebugLogger('@natlibfi/marc-record-validators-melinda/normal
 async function testValidatorFactory() {
   const validator = await validatorFactory();
 
-  expect(validator)
-    .to.be.an('object')
-    .that.has.any.keys('description', 'validate');
-
-  expect(validator.description).to.be.a('string');
-  expect(validator.validate).to.be.a('function');
+  assert.equal(typeof validator, 'object');
+  assert.equal(typeof validator.description, 'string');
+  assert.equal(typeof validator.validate, 'function');
 }
 
 async function callback({getFixture, enabled = true, fix = false}) {
@@ -43,10 +42,10 @@ async function callback({getFixture, enabled = true, fix = false}) {
 
   if (!fix) {
     const result = await validator.validate(record);
-    expect(result).to.eql(expectedResult);
+    assert.deepEqual(result, expectedResult);
     return;
   }
 
   await validator.fix(record);
-  expect(record).to.eql(expectedResult);
+  assert.deepEqual(record, expectedResult);
 }

package/src/normalize-qualifying-information.js

@@ -1,6 +1,6 @@
 //import createDebugLogger from 'debug';
 import clone from 'clone';
-import {fieldToString} from './utils';
+import {fieldToString} from './utils.js';
 
 // Author(s): Nicholas Volk
 export default function () {
@@ -51,7 +51,7 @@ function normalizeQualifyingInformationField(field) {
     return;
   }
 
-  field.subfields.forEach(sf => fixSubfield(sf)); // eslint-disable-line array-callback-return
+  field.subfields.forEach(sf => fixSubfield(sf));
   return;
 
   function fixSubfield(sf) {

package/src/{normalize-qualifying-information.spec.js → normalize-qualifying-information.test.js}

@@ -1,20 +1,22 @@
-import {expect} from 'chai';
+import assert from 'node:assert';
 import {MarcRecord} from '@natlibfi/marc-record';
-import validatorFactory from './normalize-qualifying-information';
+import validatorFactory from './normalize-qualifying-information.js';
 import {READERS} from '@natlibfi/fixura';
 import generateTests from '@natlibfi/fixugen';
 import createDebugLogger from 'debug';
 
 generateTests({
   callback,
-  path: [__dirname, '..', 'test-fixtures', 'normalize-qualifying-information'],
+  path: [import.meta.dirname, '..', 'test-fixtures', 'normalize-qualifying-information'],
   useMetadataFile: true,
   recurse: false,
   fixura: {
     reader: READERS.JSON
   },
-  mocha: {
-    before: () => testValidatorFactory()
+  hooks: {
+    before: async () => {
+      testValidatorFactory();
+    }
   }
 });
 const debug = createDebugLogger('@natlibfi/marc-record-validators-melinda/normalize-qualifying-information:test');
@@ -22,12 +24,9 @@ const debug = createDebugLogger('@natlibfi/marc-record-validators-melinda/normal
 async function testValidatorFactory() {
   const validator = await validatorFactory();
 
-  expect(validator)
-    .to.be.an('object')
-    .that.has.any.keys('description', 'validate');
-
-  expect(validator.description).to.be.a('string');
-  expect(validator.validate).to.be.a('function');
+  assert.equal(typeof validator, 'object');
+  assert.equal(typeof validator.description, 'string');
+  assert.equal(typeof validator.validate, 'function');
 }
 
 async function callback({getFixture, enabled = true, fix = false}) {
@@ -43,10 +42,10 @@ async function callback({getFixture, enabled = true, fix = false}) {
 
   if (!fix) {
     const result = await validator.validate(record);
-    expect(result).to.eql(expectedResult);
+    assert.deepEqual(result, expectedResult);
     return;
   }
 
   await validator.fix(record);
-  expect(record).to.eql(expectedResult);
+  assert.deepEqual(record, expectedResult);
 }

package/src/normalize-utf8-diacritics.js

@@ -1,7 +1,7 @@
 //import createDebugLogger from 'debug';
 import clone from 'clone';
-import {convert as nongenericNormalization} from './unicode-decomposition';
-import {fieldToString} from './utils';
+import {convert as nongenericNormalization} from './unicode-decomposition.js';
+import {fieldToString} from './utils.js';
 
 // Note that https://github.com/NatLibFi/marc-record-validators-melinda/blob/master/src/unicode-decomposition.js contains
 // similar functionalities. It's less generic and lacks diacritic removal but has it advantages as well.

package/src/{normalize-utf8-diacritics.spec.js → normalize-utf8-diacritics.test.js}

@@ -1,33 +1,33 @@
-import {expect} from 'chai';
+import assert from 'node:assert';
 import {MarcRecord} from '@natlibfi/marc-record';
-import validatorFactory from './normalize-utf8-diacritics';
+import validatorFactory from './normalize-utf8-diacritics.js';
 import {READERS} from '@natlibfi/fixura';
 import generateTests from '@natlibfi/fixugen';
 import createDebugLogger from 'debug';
 
 generateTests({
   callback,
-  path: [__dirname, '..', 'test-fixtures', 'normalize-utf8-diacritics'],
+  path: [import.meta.dirname, '..', 'test-fixtures', 'normalize-utf8-diacritics'],
   useMetadataFile: true,
   recurse: false,
   fixura: {
     reader: READERS.JSON
   },
-  mocha: {
-    before: () => testValidatorFactory()
+  hooks: {
+    before: async () => {
+      testValidatorFactory();
+    }
   }
 });
+
 const debug = createDebugLogger('@natlibfi/marc-record-validators-melinda/normalize-utf8-diacritics:test');
 
 async function testValidatorFactory() {
   const validator = await validatorFactory();
 
-  expect(validator)
-    .to.be.an('object')
-    .that.has.any.keys('description', 'validate');
-
-  expect(validator.description).to.be.a('string');
-  expect(validator.validate).to.be.a('function');
+  assert.equal(typeof validator, 'object');
+  assert.equal(typeof validator.description, 'string');
+  assert.equal(typeof validator.validate, 'function');
 }
 
 async function callback({getFixture, enabled = true, fix = false}) {
@@ -43,10 +43,10 @@ async function callback({getFixture, enabled = true, fix = false}) {
 
   if (!fix) {
     const result = await validator.validate(record);
-    expect(result).to.eql(expectedResult);
+    assert.deepEqual(result, expectedResult);
     return;
   }
 
   await validator.fix(record);
-  expect(record).to.eql(expectedResult);
+  assert.deepEqual(record, expectedResult);
 }

package/src/normalizeFieldForComparison.js

@@ -7,12 +7,12 @@
   Thus it is here. However, most of the testing is done via merge-reducers...
 */
 import clone from 'clone';
-import {fieldStripPunctuation} from './punctuation2';
+import {fieldStripPunctuation} from './punctuation2.js';
 import {fieldToString, isControlSubfieldCode} from './utils.js';
 
-import {fieldNormalizeControlNumbers/*, normalizeControlSubfieldValue*/} from './normalize-identifiers';
+import {fieldNormalizeControlNumbers/*, normalizeControlSubfieldValue*/} from './normalize-identifiers.js';
 import createDebugLogger from 'debug';
-import {normalizePartData, subfieldContainsPartData} from './normalizeSubfieldValueForComparison';
+import {normalizePartData, subfieldContainsPartData} from './normalizeSubfieldValueForComparison.js';
 
 const debug = createDebugLogger('@natlibfi/melinda-marc-record-merge-reducers:normalizeFieldForComparison');
 //const debugData = debug.extend('data');
@@ -124,7 +124,7 @@ function fieldLowercase(field) {
     return;
   }
 
-  field.subfields.forEach(sf => subfieldLowercase(sf, field.tag)); // eslint-disable-line array-callback-return
+  field.subfields.forEach(sf => subfieldLowercase(sf, field.tag));
 
   function skipFieldLowercase(field) {
     if (skipAllFieldNormalizations(field.tag)) {
@@ -144,7 +144,7 @@ function hack490SubfieldA(field) {
   if (field.tag !== '490') {
     return;
   }
-  field.subfields.forEach(sf => removeSarja(sf)); // eslint-disable-line array-callback-return
+  field.subfields.forEach(sf => removeSarja(sf));
 
   // NB! This won't work, if the punctuation has not been stripped beforehand!
   function removeSarja(subfield) {
@@ -185,7 +185,7 @@ function normalizeISBN(field) {
 
   //nvdebug(`ISBN-field? ${fieldToString(field)}`);
   const relevantSubfields = field.subfields.filter(sf => tagAndSubfieldCodeReferToIsbn(field.tag, sf.code) && looksLikeIsbn(sf.value));
-  relevantSubfields.forEach(sf => normalizeIsbnSubfield(sf)); // eslint-disable-line array-callback-return
+  relevantSubfields.forEach(sf => normalizeIsbnSubfield(sf));
 
   function normalizeIsbnSubfield(sf) {
     //nvdebug(` ISBN-subfield? ${subfieldToString(sf)}`);

package/src/normalizeSubfieldValueForComparison.js

@@ -1,4 +1,4 @@
-import {nvdebug} from './utils';
+import {nvdebug} from './utils.js';
 import createDebugLogger from 'debug';
 
 // Normalizes at least 490$v and 773$g which contain information such as "Raita 5" vs "5", and "Osa 3" vs "Osa III".

package/src/prepublicationUtils.js

@@ -1,4 +1,4 @@
-import {fieldHasSubfield, nvdebug, nvdebugFieldArray} from './utils';
+import {fieldHasSubfield, nvdebug, nvdebugFieldArray} from './utils.js';
 import createDebugLogger from 'debug';
 
 const debug = createDebugLogger('@natlibfi/marc-record-validators-melinda:prepublicationUtils');
@@ -178,7 +178,7 @@ export function deleteAllPrepublicationNotesFromField500InNonPubRecord(record) {
 
 
   nvdebug(`Delete all ${f500.length} instance(s) of field 500`, debugDev);
-  f500.forEach(field => record.removeField(field)); // eslint-disable-line array-callback-return
+  f500.forEach(field => record.removeField(field));
 }
 
 
@@ -188,7 +188,7 @@ export function removeWorsePrepubField500s(record) {
   nvdebugFieldArray(fields, '  Candidates for non-best 500 b4 filtering: ', debugDev);
   const nonBest = fields.filter(field => fields.some(field2 => firstFieldHasBetterPrepubEncodingLevel(field2, field)));
   nvdebugFieldArray(nonBest, '  Remove non-best 500: ', debugDev);
-  nonBest.forEach(field => record.removeField(field)); // eslint-disable-line array-callback-return
+  nonBest.forEach(field => record.removeField(field));
 }
 
 
@@ -198,7 +198,7 @@ export function removeWorsePrepubField594s(record) {
   nvdebugFieldArray(fields594, '  Candidates for non-best 594 b4 filtering: ', debugDev);
   const nonBest = fields594.filter(field => fields594.some(field2 => firstFieldHasBetterPrepubEncodingLevel(field2, field)));
   nvdebugFieldArray(nonBest, '  Remove non-best 594: ', debugDev);
-  nonBest.forEach(field => record.removeField(field)); // eslint-disable-line array-callback-return
+  nonBest.forEach(field => record.removeField(field));
 }
 
 

package/src/punctuation/index.js

@@ -1,6 +1,6 @@
 import {MarcRecord} from '@natlibfi/marc-record';
 import createDebug from 'debug';
-import {autRules, bibRules} from './rules';
+import {autRules, bibRules} from './rules/index.js';
 
 const debug = createDebug('@natlibfi/marc-record-validator-melinda/punctuation:dev');
 

package/src/punctuation/rules/index.js

@@ -1,5 +1,5 @@
-import bibRules from './bib';
-import autRules from './aut';
+import bibRules from './bib.js';
+import autRules from './aut.js';
 
 export {
   bibRules,

package/src/{punctuation.spec.js → punctuation.test.js}

@@ -1,20 +1,22 @@
-import {expect} from 'chai';
+import assert from 'node:assert';
 import {MarcRecord} from '@natlibfi/marc-record';
-import validatorFactory from './punctuation/';
+import validatorFactory from './punctuation/index.js';
 import {READERS} from '@natlibfi/fixura';
 import generateTests from '@natlibfi/fixugen';
 import createDebugLogger from 'debug';
 
 generateTests({
   callback,
-  path: [__dirname, '..', 'test-fixtures', 'punctuation'],
+  path: [import.meta.dirname, '..', 'test-fixtures', 'punctuation'],
   useMetadataFile: true,
   recurse: false,
   fixura: {
     reader: READERS.JSON
   },
-  mocha: {
-    before: () => testValidatorFactory()
+  hooks: {
+    before: async () => {
+      testValidatorFactory();
+    }
   }
 });
 const debug = createDebugLogger('@natlibfi/marc-record-validators-melinda/punctuation:test');
@@ -22,12 +24,9 @@ const debug = createDebugLogger('@natlibfi/marc-record-validators-melinda/punctu
 async function testValidatorFactory() {
   const validator = await validatorFactory();
 
-  expect(validator)
-    .to.be.an('object')
-    .that.has.any.keys('description', 'validate');
-
-  expect(validator.description).to.be.a('string');
-  expect(validator.validate).to.be.a('function');
+  assert.equal(typeof validator, 'object');
+  assert.equal(typeof validator.description, 'string');
+  assert.equal(typeof validator.validate, 'function');
 }
 
 async function callback({getFixture, enabled = true, fix = false}) {
@@ -43,10 +42,10 @@ async function callback({getFixture, enabled = true, fix = false}) {
 
   if (!fix) {
     const result = await validator.validate(record);
-    expect(result).to.eql(expectedResult);
+    assert.deepEqual(result, expectedResult);
     return;
   }
 
   await validator.fix(record);
-  expect(record).to.eql(expectedResult);
+  assert.deepEqual(record, expectedResult);
 }