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

package/src/fields-present.test.js

@@ -1,7 +1,7 @@
 import {describe, it} from 'node:test';
 import assert from 'node:assert';
 import {MarcRecord} from '@natlibfi/marc-record';
-import validatorFactory from '../src/fields-present.js';
+import validatorFactory from './fields-present.js';
 
 
 

package/src/fixRelatorTerms.test.js

@@ -1,6 +1,6 @@
 import assert from 'node:assert';
 import {MarcRecord} from '@natlibfi/marc-record';
-import validatorFactory from '../src/fixRelatorTerms.js';
+import validatorFactory from './fixRelatorTerms.js';
 import {READERS} from '@natlibfi/fixura';
 import generateTests from '@natlibfi/fixugen';
 import createDebugLogger from 'debug';

package/src/fixed-fields.test.js

@@ -1,6 +1,6 @@
 import assert from 'node:assert';
 import {MarcRecord} from '@natlibfi/marc-record';
-import validatorFactory from '../src/fixed-fields.js';
+import validatorFactory from './fixed-fields.js';
 import {describe, it} from 'node:test';
 
 
@@ -27,11 +27,13 @@ describe('fixed-fields: language', () => {
       const validator = await validatorFactory([
         {leader: true, length: 6, rules: [{position: [0, 6], pattern: /[abcdefg]/u}]},
         {tag: /^FOO$/u, length: 12, rules: [{position: 0, pattern: /f/u}]},
-        {tag: /^BAR$/u, length: 6, rules: [
-          {position: 0, pattern: /[fb]/u},
-          {position: 1, pattern: /a/u, dependencies: [{position: 0, pattern: /b/u}]},
-          {position: [2, 3], pattern: /u/u, dependencies: [{position: 0, pattern: /[^b]/u}]}
-        ]}
+        {
+          tag: /^BAR$/u, length: 6, rules: [
+            {position: 0, pattern: /[fb]/u},
+            {position: 1, pattern: /a/u, dependencies: [{position: 0, pattern: /b/u}]},
+            {position: [2, 3], pattern: /u/u, dependencies: [{position: 0, pattern: /[^b]/u}]}
+          ]
+        }
       ]);
       const record = new MarcRecord({
         leader: 'bacgfe',
@@ -56,11 +58,13 @@ describe('fixed-fields: language', () => {
       const validator = await validatorFactory([
         {leader: true, length: 6, rules: [{position: [0, 6], pattern: /[abcdefg]/u}]},
         {tag: /^FOO$/u, length: 12, rules: [{position: 0, pattern: /f/u}]},
-        {tag: /^BAR$/u, length: 6, rules: [
-          {position: 0, pattern: /[fb]/u},
-          {position: 1, pattern: /a/u, dependencies: [{position: 0, pattern: /b/u}]},
-          {position: [2, 3], pattern: /u/u, dependencies: [{position: 0, pattern: /[^a]/u}]}
-        ]},
+        {
+          tag: /^BAR$/u, length: 6, rules: [
+            {position: 0, pattern: /[fb]/u},
+            {position: 1, pattern: /a/u, dependencies: [{position: 0, pattern: /b/u}]},
+            {position: [2, 3], pattern: /u/u, dependencies: [{position: 0, pattern: /[^a]/u}]}
+          ]
+        },
         {tag: /^FUB$/u, length: 5}
       ]);
       const record = new MarcRecord({
@@ -83,13 +87,15 @@ describe('fixed-fields: language', () => {
 
       const result = await validator.validate(record);
 
-      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)',
-        'Field BAR has invalid values at positions: 2,3 (Rule index 2)',
-        'Field FUB has invalid length'
-      ]});
+      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)',
+          'Field BAR has invalid values at positions: 2,3 (Rule index 2)',
+          'Field FUB has invalid length'
+        ]
+      });
     });
   });
 });

package/src/identical-fields.test.js

@@ -1,6 +1,6 @@
 import assert from 'node:assert';
 import {MarcRecord} from '@natlibfi/marc-record';
-import validatorFactory from '../src/identical-fields.js';
+import validatorFactory from './identical-fields.js';
 import {describe, it} from 'node:test';
 
 describe('identical-fields', () => {

package/src/isbn-issn.js

@@ -1,5 +1,5 @@
 import ISBN from 'isbn3';
-import validateISSN from '@natlibfi/issn-verify';
+import {issn as validateISSN} from '@natlibfi/issn-verify';
 
 // handleInvalid: move invalid 020$a to 020$z, and invalid 022$a to 022$y
 export default ({hyphenateISBN = false, handleInvalid = false} = {}) => {

package/src/isbn-issn.test.js

@@ -1,6 +1,6 @@
 import assert from 'node:assert';
 import {MarcRecord} from '@natlibfi/marc-record';
-import validatorFactory from '../src/isbn-issn.js';
+import validatorFactory from './isbn-issn.js';
 import {describe, it} from 'node:test';
 
 describe('isbn-issn', () => {
@@ -186,11 +186,13 @@ describe('isbn-issn', () => {
       });
       const result = await validator.validate(record);
 
-      assert.deepEqual(result, {valid: false, messages: [
-        'ISBN (9789519155470) is not valid',
-        'ISBN (9068-31-372-X) is not valid',
-        'ISBN (386006004X) is not valid'
-      ]});
+      assert.deepEqual(result, {
+        valid: false, messages: [
+          'ISBN (9789519155470) is not valid',
+          'ISBN (9068-31-372-X) is not valid',
+          'ISBN (386006004X) is not valid'
+        ]
+      });
     });
 
     it.skip('Finds the record invalid (Missing ISBN)');

package/src/item-language.test.js

@@ -1,6 +1,6 @@
 import assert from 'node:assert';
 import {MarcRecord} from '@natlibfi/marc-record';
-import validatorFactory from '../src/item-language.js';
+import validatorFactory from './item-language.js';
 import {describe, it} from 'node:test';
 
 describe('item-language', () => {
@@ -17,7 +17,7 @@ describe('item-language', () => {
       assert.equal(err instanceof Error, true);
       assert.equal(err.message, 'No tagPattern provided');
       return true;
-     });
+    });
     //await assert(validatorFactory()).to.be.rejectedWith(Error, 'No tagPattern provided');
   });
 

package/src/normalizeFieldForComparison.js

@@ -19,6 +19,9 @@ const debug = createDebugLogger('@natlibfi/melinda-marc-record-merge-reducers:no
 const debugDev = debug.extend('dev');
 
 export function isEnnakkotietoSubfieldG(subfield) {
+  if (valuelessSubfield(subfield)) {
+    return false;
+  }
   if (subfield.code !== 'g') {
     return false;
   }
@@ -116,6 +119,9 @@ function subfieldValueLowercase(value, subfieldCode, tag) {
 }
 
 function subfieldLowercase(sf, tag) {
+  if (valuelessSubfield(sf)) {
+    return;
+  }
   sf.value = subfieldValueLowercase(sf.value, sf.code, tag);
 }
 
@@ -148,6 +154,10 @@ function hack490SubfieldA(field) {
 
   // NB! This won't work, if the punctuation has not been stripped beforehand!
   function removeSarja(subfield) {
+    if (valuelessSubfield(subfield)) {
+      return;
+    }
+
     if (subfield.code !== 'a') {
       return;
     }
@@ -188,6 +198,9 @@ function normalizeISBN(field) {
   relevantSubfields.forEach(sf => normalizeIsbnSubfield(sf));
 
   function normalizeIsbnSubfield(sf) {
+    if (valuelessSubfield(sf)) {
+      return;
+    }
     //nvdebug(` ISBN-subfield? ${subfieldToString(sf)}`);
     sf.value = sf.value.replace(/-/ug, '');
     sf.value = sf.value.replace(/x/u, 'X');
@@ -202,6 +215,9 @@ function fieldSpecificHacks(field) {
 
 export function fieldTrimSubfieldValues(field) {
   field.subfields?.forEach((sf) => {
+    if (valuelessSubfield(sf)) {
+      return;
+    }
     sf.value = sf.value.replace(/^[ \t\n]+/u, '');
     sf.value = sf.value.replace(/[ \t\n]+$/u, '');
     sf.value = sf.value.replace(/[ \t\n]+/gu, ' ');
@@ -212,6 +228,9 @@ function fieldRemoveDecomposedDiacritics(field) {
   // Raison d'être/motivation: "Sirén" and diacriticless "Siren" might refer to a same surname, so this normalization
   // allows us to compare authors and avoid duplicate fields.
   field.subfields.forEach((sf) => {
+    if (valuelessSubfield(sf)) {
+        return;
+    }
     sf.value = removeDecomposedDiacritics(sf.value);
   });
 }
@@ -297,6 +316,9 @@ export function cloneAndNormalizeFieldForComparison(field) {
     return clonedField;
   }
   clonedField.subfields.forEach((sf) => { // Do this for all fields or some fields?
+    if (valuelessSubfield(sf)) {
+      return;
+    }
     sf.value = normalizeSubfieldValue(sf.value, sf.code, field.tag);
     sf.value = removeCharsThatDontCarryMeaning(sf.value, field.tag, sf.code);
   });
@@ -318,3 +340,7 @@ function fieldSkipNormalization(field) {
   }
   return false;
 }
+
+function valuelessSubfield(sf) {
+  return sf.value === undefined;
+}

package/src/punctuation2.test.js

@@ -1,6 +1,6 @@
 import assert from 'node:assert';
 import {MarcRecord} from '@natlibfi/marc-record';
-import validatorFactory from '../src/punctuation2.js';
+import validatorFactory from './punctuation2.js';
 import {READERS} from '@natlibfi/fixura';
 import generateTests from '@natlibfi/fixugen';
 import createDebugLogger from 'debug';

package/src/removeDuplicateDataFields.test.js

@@ -1,6 +1,6 @@
 import assert from 'node:assert';
 import {MarcRecord} from '@natlibfi/marc-record';
-import validatorFactory from '../src/removeDuplicateDataFields.js';
+import validatorFactory from './removeDuplicateDataFields.js';
 import {READERS} from '@natlibfi/fixura';
 import generateTests from '@natlibfi/fixugen';
 import createDebugLogger from 'debug';

package/src/resolvable-ext-references-melinda.test.js

@@ -3,7 +3,7 @@ import assert from 'node:assert';
 //import chaiAsPromised from 'chai-as-promised';
 import {MarcRecord} from '@natlibfi/marc-record';
 import fetchMock from 'fetch-mock';
-import * as testContext from '../src/resolvable-ext-references-melinda.js';
+import * as testContext from './resolvable-ext-references-melinda.js';
 import {fixture5000, fixture9550, fixture1000} from '../test-fixtures/resolvable-ext-references-melinda.js';
 import {afterEach, beforeEach, describe, it} from 'node:test';
 
@@ -27,9 +27,9 @@ describe('resolvable-ext-references-melinda', () => {
 
   beforeEach(() => {
     fetchMock.mockGlobal(); // replace fetch with fetch-mock's implementation
-    fetchMock.get(`${endpoint}${queryParam}5000`, { status: 200, headers: {}, body: fixture5000 })
-      .get(`${endpoint}${queryParam}9550`, { status: 200, headers: {}, body: fixture9550 })
-      .get(`${endpoint}${queryParam}1000`, { status: 200, headers: {}, body: fixture1000 });
+    fetchMock.get(`${endpoint}${queryParam}5000`, {status: 200, headers: {}, body: fixture5000})
+      .get(`${endpoint}${queryParam}9550`, {status: 200, headers: {}, body: fixture9550})
+      .get(`${endpoint}${queryParam}1000`, {status: 200, headers: {}, body: fixture1000});
 
   });
 
@@ -50,7 +50,7 @@ describe('resolvable-ext-references-melinda', () => {
     }
     catch (err) {
       assert.equal(err instanceof Error, true);
-      assert.match(err.message, /^Cannot read propert/u) ;
+      assert.match(err.message, /^Cannot read propert/u);
     }
     //await assert(validator.validate()).to.be.rejectedWith(Error, /^Cannot read propert/u);
   });

package/src/sort-tags.test.js

@@ -1,6 +1,6 @@
 import assert from 'node:assert';
 import {MarcRecord} from '@natlibfi/marc-record';
-import validatorFactory from '../src/sort-tags.js';
+import validatorFactory from './sort-tags.js';
 import {describe, it} from 'node:test';
 
 describe('sort-tags', () => {

package/src/subfield-exclusion.test.js

@@ -1,6 +1,6 @@
 import assert from 'node:assert';
 import {MarcRecord} from '@natlibfi/marc-record';
-import validatorFactory from '../src/subfield-exclusion.js';
+import validatorFactory from './subfield-exclusion.js';
 import {describe, it} from 'node:test';
 
 //chai.use(chaiAsPromised);

package/src/unicode-decomposition.test.js

@@ -1,6 +1,6 @@
 import assert from 'node:assert';
 import {MarcRecord} from '@natlibfi/marc-record';
-import validatorFactory from '../src/unicode-decomposition.js';
+import validatorFactory from './unicode-decomposition.js';
 import {describe, it} from 'node:test';
 
 describe('unicode-decomposition', () => {

package/src/update-field-540.test.js

@@ -1,6 +1,6 @@
 import assert from 'node:assert';
 import {MarcRecord} from '@natlibfi/marc-record';
-import validatorFactory from '../src/update-field-540.js';
+import validatorFactory from './update-field-540.js';
 import {READERS} from '@natlibfi/fixura';
 import generateTests from '@natlibfi/fixugen';
 import createDebugLogger from 'debug';

package/src/urn.test.js

@@ -1,6 +1,6 @@
 import assert from 'node:assert';
 import {MarcRecord} from '@natlibfi/marc-record';
-import validatorFactory from '../src/urn.js';
+import validatorFactory from './urn.js';
 import {READERS} from '@natlibfi/fixura';
 import generateTests from '@natlibfi/fixugen';
 import createDebugLogger from 'debug';