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

package/src/cyrillux.js

@@ -1,15 +1,14 @@
 //import createDebugLogger from 'debug';
 import clone from 'clone';
-import {fieldHasSubfield, fieldToString, fieldsToString, isControlSubfieldCode, nvdebug} from './utils';
-import * as iso9 from 'iso9_1995';
-import {fieldGetMaxSubfield6OccurrenceNumberAsInteger, fieldGetOccurrenceNumberPairs, fieldGetUnambiguousOccurrenceNumber, intToOccurrenceNumberString, recordGetMaxSubfield6OccurrenceNumberAsInteger, resetSubfield6Tag} from './subfield6Utils';
-
 import XRegExp from 'xregexp';
+import * as iso9 from '@natlibfi/iso9-1995';
 import * as sfs4900 from '@natlibfi/sfs-4900';
-import {default as sortFields} from './sortFields';
-import {default as reindexSubfield6OccurenceNumbers} from './reindexSubfield6OccurenceNumbers';
-import {fieldStripPunctuation} from './punctuation2';
-import {getLanguageCode} from './addMissingField041';
+import {fieldHasSubfield, fieldToString, fieldsToString, isControlSubfieldCode, 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';
 
 const iso9Trans = 'ISO9 <TRANS>';
 const cyrillicTrans = 'CYRILLIC <TRANS>';
@@ -158,16 +157,24 @@ export default function (config = {}) {
     if (!subfieldRequiresTransliteration(subfield)) {
       return {code: subfield.code, value: subfield.value}; // just clone
     }
-    const value = iso9.convertToLatin(subfield.value);
 
-    return {code: subfield.code, value};
+    const conversionResult = iso9.convertToLatin(subfield.value);
+
+    return {code: subfield.code, value: conversionResult.result};
   }
 
   function mapSubfieldToSfs4900(subfield, lang = 'rus') {
     const inputLang = lang === 'ukr' ? 'ukr' : 'rus'; // Support 'ukr' and 'rus', default to 'rus'
-    const value = subfieldRequiresTransliteration(subfield) ? sfs4900.convertToLatin(subfield.value, inputLang).result : subfield.value;
+    if (!subfieldRequiresTransliteration(subfield)) {
+      return {code: subfield.code, value: subfield.value};
+    }
+    const conversionResult = sfs4900.convertToLatin(subfield.value, inputLang);
+
+    console.log(JSON.stringify(conversionResult));
+    const result = conversionResult.result;
+    console.log(JSON.stringify(result));
     //console.log(`VAL: ${subfield.value} => ${value} using ${lang}`); // eslint-disable-line no-console
-    return {code: subfield.code, value};
+    return {code: subfield.code, value: result};
   }
 
   function mapField(field, occurrenceNumber, iso9 = true, lang = 'rus') {

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

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

@@ -1,10 +1,10 @@
 import createDebugLogger from 'debug';
-import {fieldToString, nvdebug, subfieldToString} from './utils';
+import {fieldToString, nvdebug, subfieldToString} from './utils.js';
 import {MARCXML} from '@natlibfi/marc-record-serializers';
 import {Error} from '@natlibfi/melinda-commons';
 import clone from 'clone';
 import {default as createNatlibfiSruClient} from '@natlibfi/sru-client';
-import {fieldFixPunctuation} from './punctuation2';
+import {fieldFixPunctuation} from './punctuation2.js';
 
 //const {default: createNatlibfiSruClient} = natlibfiSruClient;
 

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

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

@@ -6,7 +6,7 @@ export default function () {
         .get(/^700$/u)
         .some(f => f.subfields.every(sf => sf.code === 'e' && (/,,/u).test(sf.value)))
     }),
-    fix: record => record.get(/^700$/u).forEach(f => f.subfields.filter(sf => sf.code === 'e').forEach(sf => { // eslint-disable-line array-callback-return
+    fix: record => record.get(/^700$/u).forEach(f => f.subfields.filter(sf => sf.code === 'e').forEach(sf => {
       sf.value = sf.value.replace(/,,/u, ',');
     }))
   };

package/src/{double-commas.spec.js → double-commas.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/double-commas';
+import validatorFactory from '../src/double-commas.js';
+import {describe, it} from 'node:test';
 
 describe('double-commas', () => {
   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', () => {
@@ -22,7 +20,7 @@ describe('double-commas', () => {
       });
       const result = await validator.validate(record);
 
-      expect(result).to.eql({valid: true});
+      assert.deepEqual(result, {valid: true});
     });
     it('Finds the record invalid', async () => {
       const validator = await validatorFactory();
@@ -31,7 +29,7 @@ describe('double-commas', () => {
       });
       const result = await validator.validate(record);
 
-      expect(result).to.eql({valid: false});
+      assert.deepEqual(result, {valid: false});
     });
   });
 
@@ -43,7 +41,7 @@ describe('double-commas', () => {
       });
       await validator.fix(record);
 
-      expect(record.fields).to.eql([
+      assert.deepEqual(record.fields, [
         {
           tag: '700',
           ind1: ' ',

package/src/duplicates-ind1.js

@@ -20,7 +20,7 @@ export default function (tagPattern) {
     iterateFields(record)
       .filter(item => item.validation === false)
       .map(({validation, ...item}) => item) // eslint-disable-line no-unused-vars
-      .forEach(({obj}) => record.removeField(obj)); // eslint-disable-line array-callback-return
+      .forEach(({obj}) => record.removeField(obj));
   }
 
   function iterateFields(record) {

package/src/{duplicates-ind1.spec.js → duplicates-ind1.test.js}

@@ -1,6 +1,6 @@
-import {expect} from 'chai';
+import assert from 'node:assert';
 import {MarcRecord} from '@natlibfi/marc-record';
-import validatorFactory from './duplicates-ind1';
+import validatorFactory from './duplicates-ind1.js';
 
 import {READERS} from '@natlibfi/fixura';
 import generateTests from '@natlibfi/fixugen';
@@ -8,14 +8,16 @@ import createDebugLogger from 'debug';
 
 generateTests({
   callback,
-  path: [__dirname, '..', 'test-fixtures', 'duplicates-ind1'],
+  path: [import.meta.dirname, '..', 'test-fixtures', 'duplicates-ind1'],
   useMetadataFile: true,
   recurse: false,
   fixura: {
     reader: READERS.JSON
   },
-  mocha: {
-    before: () => testValidatorFactory()
+  hooks: {
+    before: async () => {
+      testValidatorFactory();
+    }
   }
 });
 
@@ -24,12 +26,9 @@ const debug = createDebugLogger('@natlibfi/marc-record-validators-melinda/duplic
 async function testValidatorFactory() {
   const validator = await validatorFactory(/^500$/u);
 
-  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, tagPattern, fix = false}) {
@@ -39,10 +38,10 @@ async function callback({getFixture, tagPattern, fix = false}) {
 
   if (!fix) {
     const result = await validator.validate(record);
-    return expect(result).to.eql(expectedResult);
+    return assert.deepEqual(result, expectedResult);
   }
 
   const fixedRecord = await validator.fix(record);
   debug(fixedRecord);
-  expect(record.fields).to.eql(expectedResult);
+  assert.deepEqual(record.fields, expectedResult);
 }

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

@@ -1,6 +1,7 @@
-import {expect} from 'chai';
+import assert from 'node:assert';
 import {MarcRecord} from '@natlibfi/marc-record';
-import validatorFactory from '../src/empty-fields';
+import validatorFactory from '../src/empty-fields.js';
+import {after, before, describe, it} from 'node:test';
 
 before(() => {
   MarcRecord.setValidationOptions({subfields: false, subfieldValues: false});
@@ -14,12 +15,9 @@ describe('empty-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', () => {
@@ -38,7 +36,7 @@ describe('empty-fields', () => {
         ]
       });
       const result = await validator.validate(record);
-      expect(result).to.to.have.property('valid', true);
+      assert.deepEqual(result.valid, true);
     });
 
     it('Finds a missing subfield value', async () => {
@@ -57,7 +55,7 @@ describe('empty-fields', () => {
       });
       const result = await validator.validate(record);
 
-      expect(result).to.eql({valid: false, messages: ['Field 245 has missing subfield values: a']});
+      assert.deepEqual(result, {valid: false, messages: ['Field 245 has missing subfield values: a']});
     });
 
     it('Finds an empty subfield array', async () => {
@@ -72,7 +70,7 @@ describe('empty-fields', () => {
       });
       const result = await validator.validate(record);
 
-      expect(result).to.eql({valid: false, messages: ['Field 500 has no subfields']});
+      assert.deepEqual(result, {valid: false, messages: ['Field 500 has no subfields']});
     });
   });
 
@@ -97,7 +95,7 @@ describe('empty-fields', () => {
       });
       await validator.fix(record);
 
-      expect(record.fields).to.eql([
+      assert.deepEqual(record.fields, [
         {
           tag: '245',
           ind1: ' ',
@@ -128,7 +126,7 @@ describe('empty-fields', () => {
       });
       await validator.fix(record);
 
-      expect(record.fields).to.eql([
+      assert.deepEqual(record.fields, [
         {
           tag: '001',
           value: '1234567'

package/src/ending-punctuation.js

@@ -27,7 +27,7 @@
 */
 
 // Import {validPuncMarks, finnishTerms, confSpec} from './ending-punctuation-conf.js';
-import {validPuncMarks, finnishTerms, confSpec} from './ending-punctuation-conf';
+import {validPuncMarks, finnishTerms, confSpec} from './ending-punctuation-conf.js';
 import createDebugLogger from 'debug';
 
 const debug = createDebugLogger('@natlibfi/marc-record-validator-melinda/ending-punctuation');