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

package/src/subfield6Utils.js

@@ -1,8 +1,8 @@
 import createDebugLogger from 'debug';
 // const debug = createDebugLogger('@natlibfi/marc-record-validator-melinda/subfield6Utils');
 
-import {add8s, fieldsGetAllSubfield8LinkingNumbers, getSubfield8LinkingNumber, isValidSubfield8} from './subfield8Utils';
-import {fieldHasSubfield, fieldToString, fieldsToString, nvdebug, subfieldToString} from './utils';
+import {add8s, fieldsGetAllSubfield8LinkingNumbers, getSubfield8LinkingNumber, isValidSubfield8} from './subfield8Utils.js';
+import {fieldHasSubfield, fieldToString, fieldsToString, nvdebug, subfieldToString} from './utils.js';
 
 const debug = createDebugLogger('@natlibfi/melinda-marc-record-merge-reducers:subfield6Utils');
 //const debugData = debug.extend('data');
@@ -99,7 +99,7 @@ export function fieldHasOccurrenceNumber(field, occurrenceNumber) {
 }
 
 export function fieldResetOccurrenceNumber(field, newOccurrenceNumber, oldOccurrenceNumber = undefined) {
-  field.subfields.forEach(subfield => innerReset(subfield)); // eslint-disable-line array-callback-return
+  field.subfields.forEach(subfield => innerReset(subfield));
 
   function innerReset(subfield) {
     // (Optional) Check that this is really the occurrence number we wan't to reseot
@@ -210,7 +210,7 @@ export function fieldSevenToOneOccurrenceNumber(field) {
   if (field.tag !== '880') {
     return;
   }
-  field.subfields.forEach(sf => subfieldSevenToOneOccurrenceNumber(sf)); // eslint-disable-line array-callback-return
+  field.subfields.forEach(sf => subfieldSevenToOneOccurrenceNumber(sf));
 }
 
 
@@ -223,12 +223,11 @@ export function fieldGetOccurrenceNumberPairs(field, candFields) {
     return pairs;
   }
   nvdebug(`${pairs.length} PAIR(S) FOUND FOR '${fieldToString(field)}'`);
-  pairs.forEach(pairedField => nvdebug(`  '${fieldToString(pairedField)}'`)); // eslint-disable-line array-callback-return
+  pairs.forEach(pairedField => nvdebug(`  '${fieldToString(pairedField)}'`));
   return pairs;
 }
 
 export function fieldGetOccurrenceNumbers(field) {
-  /* eslint-disable */
   let occurrenceNumbers = [];
   field.subfields?.forEach(sf => subfieldExtractOccurrenceNumber(sf));
 
@@ -242,12 +241,10 @@ export function fieldGetOccurrenceNumbers(field) {
     }
     occurrenceNumbers.push(occurrenceNumber);
   }
-  /* eslint-enable */
   return occurrenceNumbers;
 }
 
 export function fieldsGetOccurrenceNumbers(fields) {
-  /* eslint-disable */
   let occurrenceNumbers = [];
 
   fields.forEach(f => fieldProcessOccurrenceNumbers(f));
@@ -261,7 +258,6 @@ export function fieldsGetOccurrenceNumbers(fields) {
 
     });
   }
-  /* eslint-enable */
   return occurrenceNumbers;
 }
 
@@ -482,7 +478,7 @@ export function get6s(field, candidateFields) { // NB! Convert field to fields!!
 
   const relevantFields = candidateFields.filter(f => occurrenceNumbers.some(o => fieldHasOccurrenceNumber(f, o)));
   nvdebug(`${fieldToString(field)}: $6-RELFIELDS FOUND: ${relevantFields.length}...`);
-  relevantFields.forEach(f => nvdebug(fieldToString(f))); // eslint-disable-line array-callback-return
+  relevantFields.forEach(f => nvdebug(fieldToString(f)));
   return relevantFields;
 }
 

package/src/subfield8Utils.js

@@ -1,7 +1,7 @@
 // import createDebugLogger from 'debug';
 // const debug = createDebugLogger('@natlibfi/marc-record-validator-melinda/subfield8Utils');
 
-import {fieldToString, nvdebug} from './utils';
+import {fieldToString, nvdebug} from './utils.js';
 
 const sf8Regexp = /^([1-9][0-9]*)(?:\.[0-9]+)?(?:\\[acprux])?$/u;
 
@@ -77,9 +77,9 @@ export function add8s(fields, record) {
   }
 
   nvdebug(`Linking number(s): ${linkingNumbers.join(', ')}`);
-  linkingNumbers.forEach(number => collectLinkingNumberFields(number)); // eslint-disable-line array-callback-return
+  linkingNumbers.forEach(number => collectLinkingNumberFields(number));
 
-  fields.forEach(f => nvdebug(`AFTER ADDING 8s: '${fieldToString(f)}'`)); // eslint-disable-line array-callback-return
+  fields.forEach(f => nvdebug(`AFTER ADDING 8s: '${fieldToString(f)}'`));
 
   return fields;
 
@@ -88,7 +88,7 @@ export function add8s(fields, record) {
     fields = fields.filter(f => !fieldHasLinkingNumber(f, linkingNumber));
     // Add them and their "sisters" back:
     const addableFields = record.fields.filter(f => fieldHasLinkingNumber(f, linkingNumber));
-    addableFields.forEach(f => nvdebug(`(RE-?)ADD ${fieldToString(f)}`));  // eslint-disable-line array-callback-return
+    addableFields.forEach(f => nvdebug(`(RE-?)ADD ${fieldToString(f)}`));
     fields = fields.concat(addableFields);
 
   }

package/src/subfieldValueNormalizations.js

@@ -1,8 +1,8 @@
 //import createDebugLogger from 'debug';
 import clone from 'clone';
-import {fieldHasSubfield, fieldToString, getCatalogingLanguage} from './utils';
-import {fieldFixPunctuation} from './punctuation2';
-import {fieldGetUnambiguousTag} from './subfield6Utils';
+import {fieldHasSubfield, fieldToString, getCatalogingLanguage} from './utils.js';
+import {fieldFixPunctuation} from './punctuation2.js';
+import {fieldGetUnambiguousTag} from './subfield6Utils.js';
 
 // NB! You should probably run punctuation fixes after this validator!
 

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

@@ -1,33 +1,33 @@
-import {expect} from 'chai';
+import assert from 'node:assert';
 import {MarcRecord} from '@natlibfi/marc-record';
-import validatorFactory from './subfieldValueNormalizations';
+import validatorFactory from './subfieldValueNormalizations.js';
 import {READERS} from '@natlibfi/fixura';
 import generateTests from '@natlibfi/fixugen';
 import createDebugLogger from 'debug';
 
 generateTests({
   callback,
-  path: [__dirname, '..', 'test-fixtures', 'normalize-subfield-value'],
+  path: [import.meta.dirname, '..', 'test-fixtures', 'normalize-subfield-value'],
   useMetadataFile: true,
   recurse: false,
   fixura: {
     reader: READERS.JSON
   },
-  mocha: {
-    before: () => testValidatorFactory()
+  hooks: {
+    before: async () => {
+      testValidatorFactory();
+    }
   }
 });
+
 const debug = createDebugLogger('@natlibfi/marc-record-validators-melinda/subfieldValueNormalizations: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, 'string');
+  assert.equal(typeof validator, 'function');
 }
 
 async function callback({getFixture, enabled = true, fix = false}) {
@@ -37,16 +37,20 @@ async function callback({getFixture, enabled = true, fix = false}) {
   }
 
   const validator = await validatorFactory();
-  const record = new MarcRecord(getFixture('record.json'));
+
+  const recordFixture = getFixture('record.json');
+
+  const record = recordFixture._validationOptions ? new MarcRecord(recordFixture, recordFixture._validationOptions) : new MarcRecord(recordFixture);
+  //const record = new MarcRecord(recordFixture, {"subfields": false}); // works
   const expectedResult = getFixture('expectedResult.json');
   // console.log(expectedResult); // eslint-disable-line
 
   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/sync-007-and-300.js

@@ -1,5 +1,5 @@
 //import createDebugLogger from 'debug';
-import {fieldToString} from './utils';
+import {fieldToString} from './utils.js';
 import clone from 'clone';
 
 //const debug = createDebugLogger('@natlibfi/marc-record-validators-melinda/sanitize-vocabulary-source-codes);
@@ -14,7 +14,7 @@ export default function () {
 
   function fix(record) {
     const res = {message: [], fix: [], valid: true};
-    record.fields.forEach(f => fixField(f, record)); // eslint-disable-line array-callback-return
+    record.fields.forEach(f => fixField(f, record));
     return res;
   }
 

package/src/{sync-007-and-300.spec.js → sync-007-and-300.test.js}

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

@@ -1,6 +1,6 @@
 import clone from 'clone';
 import createDebugLogger from 'debug';
-import {fieldHasSubfield, fieldToString, nvdebug} from './utils';
+import {fieldHasSubfield, fieldToString, nvdebug} from './utils.js';
 
 
 const debug = createDebugLogger('@natlibfi/marc-record-validators-melinda:translate-terms');
@@ -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)); // eslint-disable-line array-callback-return
+    newFields.forEach(nf => nvdebug(`Add new field '${fieldToString(nf)}'`, debug));
 
-    newFields.forEach(nf => record.insertField(nf)); // eslint-disable-line array-callback-return
+    newFields.forEach(nf => record.insertField(nf));
 
     const newFieldsAsStrings = newFields.map(f => fieldToString(f));
 

package/src/translate-terms.test.js

@@ -0,0 +1,75 @@
+import assert from 'node:assert';
+import createDebugLogger from 'debug';
+import fetchMock from 'fetch-mock';
+
+import validatorFactory from './translate-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/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'
+];
+
+
+
+generateTests({
+  callback,
+  path: [import.meta.dirname, '..', 'test-fixtures', 'translate-terms'],
+  useMetadataFile: true,
+  recurse: false,
+  fixura: {
+    reader: READERS.JSON
+  },
+  hooks: {
+    before: async () => {
+
+      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});
+
+
+      testValidatorFactory();
+    }
+  }
+});
+
+const debug = createDebugLogger('@natlibfi/marc-record-validators-melinda/translate-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, enabled = true, fix = false}) {
+  if (enabled === false) {
+    debug('TEST SKIPPED!');
+    return;
+  }
+
+  const validator = await validatorFactory();
+  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);
+    return;
+  }
+
+  await validator.fix(record);
+  assert.deepEqual(record, expectedResult);
+}

package/src/{typeOfDate-008.spec.js → typeOfDate-008.test.js}

@@ -1,20 +1,22 @@
-import {expect} from 'chai';
+import assert from 'node:assert';
 import {MarcRecord} from '@natlibfi/marc-record';
-import validatorFactory from './typeOfDate-008';
+import validatorFactory from './typeOfDate-008.js';
 import {READERS} from '@natlibfi/fixura';
 import generateTests from '@natlibfi/fixugen';
 import createDebugLogger from 'debug';
 
 generateTests({
   callback,
-  path: [__dirname, '..', 'test-fixtures', 'typeOfDate-008'],
+  path: [import.meta.dirname, '..', 'test-fixtures', 'typeOfDate-008'],
   useMetadataFile: true,
   recurse: false,
   fixura: {
     reader: READERS.JSON
   },
-  mocha: {
-    before: () => testValidatorFactory()
+  hooks: {
+    before: async () => {
+      testValidatorFactory();
+    }
   }
 });
 const debug = createDebugLogger('@natlibfi/marc-record-validators-melinda/typeOfDate-008:test');  // eslint-disable-line
@@ -22,12 +24,9 @@ const debug = createDebugLogger('@natlibfi/marc-record-validators-melinda/typeOf
 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}) {
@@ -38,10 +37,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/{unicode-decomposition.spec.js → unicode-decomposition.test.js}

@@ -1,21 +1,15 @@
-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/unicode-decomposition';
-
-const {expect} = chai;
-chai.use(chaiAsPromised);
+import validatorFactory from '../src/unicode-decomposition.js';
+import {describe, it} from 'node:test';
 
 describe('unicode-decomposition', () => {
   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', () => {
@@ -35,7 +29,7 @@ describe('unicode-decomposition', () => {
         ]
       });
       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 () => {
@@ -57,7 +51,7 @@ describe('unicode-decomposition', () => {
       });
       const result = await validator.validate(record);
 
-      expect(result).to.eql({valid: false, messages: ['The following subfields are not properly decomposed: a']});
+      assert.deepEqual(result, {valid: false, messages: ['The following subfields are not properly decomposed: a']});
     });
 
     describe('#fix', () => {
@@ -100,8 +94,8 @@ describe('unicode-decomposition', () => {
         };
         await validator.fix(record);
 
-        expect(recordOriginal).to.not.eql(record);
-        expect(record.fields).to.eql([fieldModified]);
+        assert.notDeepEqual(recordOriginal, record);
+        assert.deepEqual(record.fields, [fieldModified]);
       });
     });
   });

package/src/update-field-540.js

@@ -1,5 +1,5 @@
 //import createDebugLogger from 'debug';
-import {fieldToString} from './utils';
+import {fieldToString} from './utils.js';
 
 //const debug = createDebugLogger('@natlibfi/marc-record-validators-melinda/update-field-540');
 
@@ -86,7 +86,7 @@ function fieldHasOldCcLicense(field, fix) {
   //nvdebug(` Found valid license`);
   if (fix) {
     const subfieldsC = field.subfields.filter(sf => validLicenseInSubfieldC(sf, validLicense));
-    subfieldsC.forEach(c => fixC(field, c)); // eslint-disable-line array-callback-return
+    subfieldsC.forEach(c => fixC(field, c));
   }
 
   return true;

package/src/{update-field-540.spec.js → update-field-540.test.js}

@@ -1,33 +1,36 @@
-import {expect} from 'chai';
+import assert from 'node:assert';
 import {MarcRecord} from '@natlibfi/marc-record';
-import validatorFactory from './update-field-540';
+import validatorFactory from '../src/update-field-540.js';
 import {READERS} from '@natlibfi/fixura';
 import generateTests from '@natlibfi/fixugen';
 import createDebugLogger from 'debug';
 
 generateTests({
   callback,
-  path: [__dirname, '..', 'test-fixtures', 'update-field-540'],
+  path: [import.meta.dirname, '..', 'test-fixtures', 'update-field-540'],
   useMetadataFile: true,
   recurse: false,
   fixura: {
     reader: READERS.JSON
   },
-  mocha: {
-    before: () => testValidatorFactory()
+  hooks: {
+    before: async () => {
+      testValidatorFactory();
+    }
   }
 });
+
 const debug = createDebugLogger('@natlibfi/marc-record-validators-melinda/update-field-540:test');
 
 async function testValidatorFactory() {
   const validator = await validatorFactory();
 
-  expect(validator)
+  assert(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(validator.description).to.be.a('string');
+  assert(validator.validate).to.be.a('function');
 }
 
 async function callback({getFixture, enabled = true, fix = false}) {
@@ -43,10 +46,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/urn.js

@@ -1,5 +1,5 @@
-import fetch from 'node-fetch';
-import {isElectronicMaterial} from './utils';
+//import fetch from 'node-fetch';
+import {isElectronicMaterial} from './utils.js';
 import createDebugLogger from 'debug';
 
 const URN_GENERATOR_URL = 'https://generator.urn.fi/cgi-bin/urn_generator.cgi?type=nbn';

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

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