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

package/src/{fix-33X.spec.js → fix-33X.test.js}

@@ -1,32 +1,31 @@
-import {expect} from 'chai';
+import assert from 'node:assert';
 import {MarcRecord} from '@natlibfi/marc-record';
-import validatorFactory from './fix-33X';
+import validatorFactory from './fix-33X.js';
 import {READERS} from '@natlibfi/fixura';
 import generateTests from '@natlibfi/fixugen';
 
 generateTests({
   callback,
-  path: [__dirname, '..', 'test-fixtures', 'fix-33X'],
+  path: [import.meta.dirname, '..', 'test-fixtures', 'fix-33X'],
   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');
-  expect(validator.fix).to.be.a('function');
+  assert.equal(typeof validator, 'objecr');
+  assert.equal(typeof validator.description, 'string');
+  assert.equal(typeof validator.validate, 'function');
+  assert.equal(typeof validator.fix, 'function');
 }
 
 async function callback({getFixture, fix = false}) {
@@ -37,10 +36,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/fix-country-codes.js

@@ -5,7 +5,7 @@
 // Author(s): Nicholas Volk
 
 //import createDebugLogger from 'debug';
-//import {fieldToString, nvdebug} from './utils';
+//import {fieldToString, nvdebug} from './utils.js';
 
 
 export default function () {

package/src/{fix-country-codes.spec.js → fix-country-codes.test.js}

@@ -1,20 +1,22 @@
-import {expect} from 'chai';
+import assert from 'node:assert';
 import {MarcRecord} from '@natlibfi/marc-record';
-import validatorFactory from './fix-country-codes';
+import validatorFactory from './fix-country-codes.js';
 import {READERS} from '@natlibfi/fixura';
 import generateTests from '@natlibfi/fixugen';
 import createDebugLogger from 'debug';
 
 generateTests({
   callback,
-  path: [__dirname, '..', 'test-fixtures', 'fix-country-codes'],
+  path: [import.meta.dirname, '..', 'test-fixtures', 'fix-country-codes'],
   useMetadataFile: true,
   recurse: false,
   fixura: {
     reader: READERS.JSON
   },
-  mocha: {
-    before: () => testValidatorFactory()
+  hooks: {
+    before: async () => {
+      testValidatorFactory();
+    }
   }
 });
 const debug = createDebugLogger('@natlibfi/marc-record-validators-melinda/fix-country-codes:test');
@@ -22,12 +24,9 @@ const debug = createDebugLogger('@natlibfi/marc-record-validators-melinda/fix-co
 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/fix-language-codes.js

@@ -1,11 +1,11 @@
 import clone from 'clone';
-import {fieldToString} from './utils';
+import {fieldToString} from './utils.js';
 // Fix language codes in 008/35-37 and 041 (does not sync them)
 //
 // Author(s): Nicholas Volk
 
 //import createDebugLogger from 'debug';
-//import {fieldToString, nvdebug} from './utils';
+//import {fieldToString, nvdebug} from './utils.js';
 
 const description = 'Fix language codes';
 
@@ -25,7 +25,7 @@ export default function () {
     fixLanguageField008(field008);
 
     const f041 = record.get('041');
-    f041.forEach(f => fixField041(f)); // eslint-disable-line array-callback-return
+    f041.forEach(f => fixField041(f));
 
     return res;
   }
@@ -38,7 +38,7 @@ export default function () {
 
     const f041 = record.get('041');
 
-    f041.forEach(f => validateField041(f, res)); // eslint-disable-line array-callback-return
+    f041.forEach(f => validateField041(f, res));
 
     res.valid = !(res.message.length >= 1);
     return res;
@@ -98,7 +98,7 @@ export default function () {
       return;
     }
 
-    field.subfields.forEach(sf => fixField041Subfield(sf)); // eslint-disable-line array-callback-return
+    field.subfields.forEach(sf => fixField041Subfield(sf));
 
     function fixField041Subfield(subfield) {
       if (!isRelevantField041SubfieldCode(subfield)) {

package/src/{fix-language-codes.spec.js → fix-language-codes.test.js}

@@ -1,31 +1,30 @@
-import {expect} from 'chai';
+import assert from 'node:assert';
 import {MarcRecord} from '@natlibfi/marc-record';
-import validatorFactory from './fix-language-codes';
+import validatorFactory from './fix-language-codes.js';
 import {READERS} from '@natlibfi/fixura';
 import generateTests from '@natlibfi/fixugen';
 
 generateTests({
   callback,
-  path: [__dirname, '..', 'test-fixtures', 'fix-language-codes'],
+  path: [import.meta.dirname, '..', 'test-fixtures', 'fix-language-codes'],
   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(typeof validator, 'object');
+  assert.equal(typeof validator.description, 'string');
+  assert.equal(typeof validator.validate, 'function');
 }
 
 async function callback({getFixture, fix = false}) {
@@ -36,10 +35,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/fixRelatorTerms.js

@@ -1,6 +1,6 @@
 import clone from 'clone';
-import {fieldFixPunctuation} from './punctuation2';
-import {fieldToString, getCatalogingLanguage, nvdebug, subfieldToString} from './utils';
+import {fieldFixPunctuation} from './punctuation2.js';
+import {fieldToString, getCatalogingLanguage, nvdebug, subfieldToString} from './utils.js';
 import createDebugLogger from 'debug';
 
 // Currently mainly translates X00$e values, so that we don't have "$a Name, $e kirjoittaja, $e författare.".
@@ -157,7 +157,7 @@ function fieldHandleRelatorTermAbbreviations(field, language) {
   }
 
   const originalValue = fieldToString(field);
-  field.subfields.forEach(sf => subfieldHandleRelatorTermAbbreviation(sf, language)); // eslint-disable-line array-callback-return
+  field.subfields.forEach(sf => subfieldHandleRelatorTermAbbreviation(sf, language));
   const modifiedValue = fieldToString(field);
   if (modifiedValue === originalValue) {
     return;
@@ -222,7 +222,7 @@ export function fieldFixRelatorTerms(field, fromLanguage, toLanguage) {
   }
   fieldHandleRelatorTermAbbreviations(field, fromLanguage);
 
-  field.subfields.forEach(sf => subfieldTranslateRelatorTerm(sf, fromLanguage, toLanguage)); // eslint-disable-line array-callback-return
+  field.subfields.forEach(sf => subfieldTranslateRelatorTerm(sf, fromLanguage, toLanguage));
 }
 
 
@@ -230,7 +230,7 @@ export function recordFixRelatorTerms(record, defaultToLanguage = null, defaultF
   const fromLanguage = defaultFromLanguage ? defaultFromLanguage : getCatalogingLanguage(record);
   const toLanguage = defaultToLanguage ? defaultToLanguage : getCatalogingLanguage(record);
 
-  record.fields.forEach(field => translateField(field, fromLanguage, toLanguage)); // eslint-disable-line array-callback-return
+  record.fields.forEach(field => translateField(field, fromLanguage, toLanguage));
 
   function translateField(field, from, to) {
     fieldFixRelatorTerms(field, from, to);

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

@@ -1,33 +1,33 @@
-import {expect} from 'chai';
+import assert from 'node:assert';
 import {MarcRecord} from '@natlibfi/marc-record';
-import validatorFactory from './fixRelatorTerms';
+import validatorFactory from '../src/fixRelatorTerms.js';
 import {READERS} from '@natlibfi/fixura';
 import generateTests from '@natlibfi/fixugen';
 import createDebugLogger from 'debug';
 
 generateTests({
   callback,
-  path: [__dirname, '..', 'test-fixtures', 'fix-relator-terms'],
+  path: [import.meta.dirname, '..', 'test-fixtures', 'fix-relator-terms'],
   useMetadataFile: true,
   recurse: false,
   fixura: {
     reader: READERS.JSON
   },
-  mocha: {
-    before: () => testValidatorFactory()
+  hooks: {
+    before: async () => {
+      testValidatorFactory();
+    }
   }
 });
+
 const debug = createDebugLogger('@natlibfi/marc-record-validators-melinda/fixRelatorTerms: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/{fixed-fields.spec.js → fixed-fields.test.js}

@@ -1,28 +1,24 @@
-import chai from 'chai';
-import chaiAsPromised from 'chai-as-promised';
+import assert from 'node:assert';
 import {MarcRecord} from '@natlibfi/marc-record';
-import validatorFactory from '../src/fixed-fields';
+import validatorFactory from '../src/fixed-fields.js';
+import {describe, it} from 'node:test';
 
-const {expect} = chai;
-chai.use(chaiAsPromised);
 
 describe('fixed-fields: language', () => {
   it('Creates a validator', async () => {
     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');
   });
 
   it('Throws an error when configuration is not provided', () => {
     try {
       validatorFactory();
     } catch (error) {
-      expect(error).to.be.an('error').with.property('message', 'No configuration provided');
+      assert.equal(error instanceof Error, true);
+      assert.equal(error.message, 'No configuration provided');
     }
   });
 
@@ -52,7 +48,8 @@ describe('fixed-fields: language', () => {
       });
       const result = await validator.validate(record);
 
-      expect(result).to.be.an('object').and.to.include({valid: true});
+      assert.equal(typeof result, 'object');
+      assert.partialDeepStrictEqual(result, {valid: true});
     });
 
     it('Finds the record invalid', async () => {
@@ -86,7 +83,7 @@ describe('fixed-fields: language', () => {
 
       const result = await validator.validate(record);
 
-      expect(result).to.eql({valid: false, messages: [
+      assert.deepEqual(result, {valid: false, messages: [
         'Leader has invalid values at positions: 3 (Rule index 0)',
         'Field FOO has invalid values at positions: 0 (Rule index 0)',
         'Field BAR has invalid values at positions: 1 (Rule index 1)',

package/src/identical-fields.js

@@ -23,7 +23,7 @@ export default function () {
   function fix(record) {
     record.fields
       .filter(tag => !uniqWith(record.fields).includes(tag))
-      .forEach(tag => record.removeField(tag)); // eslint-disable-line array-callback-return
+      .forEach(tag => record.removeField(tag));
   }
 
   function uniqWith(fields) {

package/src/{identical-fields.spec.js → identical-fields.test.js}

@@ -1,17 +1,15 @@
-import {expect} from 'chai';
+import assert from 'node:assert';
 import {MarcRecord} from '@natlibfi/marc-record';
-import validatorFactory from '../src/identical-fields';
+import validatorFactory from '../src/identical-fields.js';
+import {describe, it} from 'node:test';
 
 describe('identical-fields', () => {
   it('Creates a validator', async () => {
     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');
   });
 
   describe('#validate', () => {
@@ -32,7 +30,7 @@ describe('identical-fields', () => {
       });
       const result = await validator.validate(record);
 
-      expect(result).to.eql({valid: true, messages: []});
+      assert.deepEqual(result, {valid: true, messages: []});
     });
     it('Finds the record invalid', async () => {
       const validator = await validatorFactory();
@@ -80,7 +78,7 @@ describe('identical-fields', () => {
 
       const result = await validator.validate(record);
 
-      expect(result).to.eql({valid: false, messages: ['Field 800 has duplicates', 'Field 700 has duplicates']});
+      assert.deepEqual(result, {valid: false, messages: ['Field 800 has duplicates', 'Field 700 has duplicates']});
     });
   });
 
@@ -111,7 +109,7 @@ describe('identical-fields', () => {
       });
       await validator.fix(record);
 
-      expect(record.fields).to.eql([
+      assert.deepEqual(record.fields, [
         {
           tag: '700',
           ind1: ' ',

package/src/indicator-fixes.js

@@ -2,7 +2,7 @@
 //import createDebugLogger from 'debug';
 //const debug = createDebugLogger('@natlibfi/marc-record-validators-melinda:normalizeIdentifiers');
 
-import {fieldToString} from './utils';
+import {fieldToString} from './utils.js';
 
 
 export default function () {
@@ -35,7 +35,7 @@ export default function () {
     const clonedFields = JSON.parse(JSON.stringify(record.fields));
     recordNormalizeIndicators(record);
 
-    record.fields.forEach((field, index) => compareFields(field, index)); // eslint-disable-line array-callback-return
+    record.fields.forEach((field, index) => compareFields(field, index));
 
     function compareFields(field, index) {
       const origFieldAsString = fieldToString(clonedFields[index]);
@@ -235,7 +235,7 @@ export function recordNormalizeIndicators(record) {
   // Language is used to handle non-filing indicators
   const languages = getLanguages(record);
 
-  record.fields.forEach(field => fieldNormalizeIndicators(field, record, languages)); // eslint-disable-line array-callback-return
+  record.fields.forEach(field => fieldNormalizeIndicators(field, record, languages));
 
 }
 

package/src/{indicator-fixes.spec.js → indicator-fixes.test.js}

@@ -1,19 +1,19 @@
-import {expect} from 'chai';
+import assert from 'node:assert';
 import {MarcRecord} from '@natlibfi/marc-record';
-import validatorFactory from './indicator-fixes';
+import validatorFactory from './indicator-fixes.js';
 import {READERS} from '@natlibfi/fixura';
 import generateTests from '@natlibfi/fixugen';
 import createDebugLogger from 'debug';
 
 generateTests({
   callback,
-  path: [__dirname, '..', 'test-fixtures', 'indicator-fixes'],
+  path: [import.meta.dirname, '..', 'test-fixtures', 'indicator-fixes'],
   useMetadataFile: true,
   recurse: false,
   fixura: {
     reader: READERS.JSON
   },
-  mocha: {
+  hooks: {
     before: () => testValidatorFactory()
   }
 });
@@ -22,12 +22,9 @@ const debug = createDebugLogger('@natlibfi/marc-record-validators-melinda/indica
 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 +40,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/isbn-issn.js

@@ -173,7 +173,7 @@ export default ({hyphenateISBN = false, handleInvalid = false} = {}) => {
   function fix(record) {
     getRelevantFields(record).forEach(field => {
       if (field.tag === '020') {
-        field.subfields.forEach(subfield => fixField020Subfield(field, subfield)); // eslint-disable-line array-callback-return
+        field.subfields.forEach(subfield => fixField020Subfield(field, subfield));
         return;
       }
       // 022 ISSN: