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

package/package.json

@@ -1,6 +1,7 @@
 {
   "name": "@natlibfi/marc-record-validators-melinda",
   "description": "MARC record validators used in Melinda",
+  "type": "module",
   "author": {
     "name": "The National Library of Finland"
   },
@@ -14,128 +15,55 @@
     "url": "git@github.com:natlibfi/marc-record-validators-melinda.git"
   },
   "license": "MIT",
-  "version": "11.6.7",
+  "version": "12.0.0-alpha.1",
   "main": "./dist/index.js",
   "publishConfig": {
     "access": "public"
   },
   "engines": {
-    "node": ">=20"
+    "node": ">=22"
   },
   "scripts": {
     "prepare": "npm run build",
-    "build": "babel ./src --source-maps --copy-files --delete-dir-on-start --out-dir=dist",
+    "build": "esbuild \"src/**/*.js\" --sourcemap --platform=node --outdir=dist",
     "lint": "eslint ./src",
     "lint:dev": "eslint --fix ./src",
     "test": "npm run lint && npm run test:base",
-    "test:base": "cross-env NODE_ENV=test nyc mocha",
-    "test:dev": "npm run lint:dev && cross-env NODE_ENV=test nyc mocha",
-    "dev": "nodemon",
-    "dev:debug": "cross-env LOG_LEVEL=debug DEBUG=@natlibfi/* NODE_ENV=test nodemon",
-    "coverage": "npm run cover:unit && npm run cover:report",
-    "cover:unit": "nyc --silent npm run test:base",
-    "cover:report": "nyc report"
+    "test:base": "node --test --test-force-exit --experimental-test-coverage --test-reporter=spec './src/*.test.js' './src/**/*.test.js'",
+    "dev:test": "cross-env DEBUG=@natlibfi/* NODE_ENV=test node --watch --test --experimental-test-coverage --test-reporter=spec './src/*.test.js' './src/**/*.test.js'",
+    "dev:debug": "cross-env LOG_LEVEL=debug DEBUG=@natlibfi/* NODE_ENV=test"
   },
   "comment-sfs4900": "Package sfs-4900 npm version is 1.1.0, github 1.1.3.",
   "dependencies": {
     "@natlibfi/issn-verify": "^1.0.6",
-    "@natlibfi/marc-record": "^9.1.6",
-    "@natlibfi/marc-record-serializers": "^10.1.6",
+    "@natlibfi/marc-record": "^10.0.0-alpha.1",
+    "@natlibfi/marc-record-serializers": "^11.0.0-alpha.2",
     "@natlibfi/marc-record-validate": "^8.0.14",
-    "@natlibfi/melinda-commons": "^13.0.21",
-    "@natlibfi/sfs-4900": "github:NatLibFi/sfs-4900",
-    "@natlibfi/sru-client": "^6.0.18",
+    "@natlibfi/melinda-commons": "^14.0.0-alpha.3",
+    "@natlibfi/sfs-4900": "^2.0.0-alpha.3",
+    "@natlibfi/iso9-1995": "^1.0.0-alpha.2",
+    "@natlibfi/sru-client": "^7.0.0-alpha.1",
     "cld3-asm": "^4.0.0",
     "clone": "^2.1.2",
     "debug": "^4.4.0",
+    "esbuild": "^0.25.9",
     "isbn3": "^1.2.13",
-    "iso9_1995": "^0.0.2",
     "langs": "^2.0.0",
-    "node-fetch": "^2.7.0",
     "xml2js": "^0.6.2",
     "xregexp": "^5.1.2"
   },
   "peerDependencies": {
-    "@natlibfi/marc-record-validate": "^8.0.14"
+    "@natlibfi/marc-record-validate": "^9.0.0-alpha.1"
   },
   "devDependencies": {
-    "@babel/cli": "^7.28.0",
-    "@babel/core": "^7.28.0",
-    "@babel/preset-env": "^7.28.0",
-    "@babel/register": "^7.27.1",
-    "@babel/runtime": "^7.28.2",
-    "@natlibfi/fixugen": "^2.0.15",
-    "@natlibfi/fixura": "^3.0.14",
-    "babel-plugin-istanbul": "^7.0.0",
-    "babel-plugin-rewire": "^1.2.0",
-    "chai": "^4.5.0",
-    "chai-as-promised": "^7.1.2",
-    "cross-env": "^7.0.3",
-    "eslint": "^9.33.0",
-    "fetch-mock": "^11.1.5",
-    "mocha": "^11.7.1",
-    "nyc": "^17.1.0"
+    "@natlibfi/fixugen": "^3.0.0-alpha.5",
+    "@natlibfi/fixura": "^4.0.0-alpha.12",
+    "cross-env": "^10.0.0",
+    "eslint": "^9.35.0",
+    "fetch-mock": "^12.5.4"
   },
   "overrides": {
     "nanoid": "^3.3.8"
   },
-  "nvolkComment": "cld3-asm 4.0.0 uses emscripten-wasm-loader ^3.0.3 which uses problematic, non-secure nanoid version 2.X.X",
-  "eslintConfig": {
-    "extends": [
-      "@natlibfi/melinda-backend"
-    ]
-  },
-  "babel": {
-    "presets": [
-      [
-        "@babel/preset-env",
-        {
-          "targets": "maintained node versions"
-        }
-      ]
-    ],
-    "env": {
-      "test": {
-        "plugins": [
-          "rewire",
-          "istanbul"
-        ]
-      }
-    }
-  },
-  "mocha": {
-    "spec": [
-      "src/*.spec.js",
-      "src/**/*.spec.js"
-    ],
-    "require": [
-      "@babel/register"
-    ],
-    "inline-diffs": true,
-    "maxDiffSize": 25000,
-    "bail": true,
-    "exit": true
-  },
-  "nodemonConfig": {
-    "exec": "npm run test:dev",
-    "watch": [
-      "src/*",
-      "test-fixtures/*"
-    ]
-  },
-  "nyc": {
-    "exclude": [
-      "src/*.spec.js",
-      "src/**/*.spec.js"
-    ],
-    "reporter": [
-      "text"
-    ],
-    "sourceMap": false,
-    "instrument": false,
-    "lines": 80,
-    "statements": 80,
-    "functions": 80,
-    "branches": 80
-  }
+  "nvolkComment": "cld3-asm 4.0.0 uses emscripten-wasm-loader ^3.0.3 which uses problematic, non-secure nanoid version 2.X.X"
 }

package/src/access-rights.js

@@ -1,4 +1,4 @@
-import {isElectronicMaterial} from './utils';
+import {isElectronicMaterial} from './utils.js';
 
 export default function (isViolaRecord = false) {
   const sf506 = [{code: 'a', value: /aineisto on käytettävissä vapaakappaletyöasemilla/ui}];

package/src/{access-rights.spec.js → access-rights.test.js}

@@ -1,6 +1,8 @@
-import {expect} from 'chai';
+import assert from 'node:assert';
+import {describe, it} from 'node:test';
 import {MarcRecord} from '@natlibfi/marc-record';
-import validatorFactory from '../src/access-rights';
+import validatorFactory from '../src/access-rights.js';
+
 
 describe('access-rights', async () => {
   // Fields
@@ -88,12 +90,9 @@ describe('access-rights', async () => {
   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');
   });
 
   // Tests
@@ -102,13 +101,13 @@ describe('access-rights', async () => {
     return {
       validate: async (valid, ...recfields) => {
         const result = await validator.validate(new MarcRecord({fields: recfields}));
-        expect(result).to.eql({valid});
+        assert.deepEqual(result, {valid});
       },
 
       fix: async (recfields, resfields) => {
         const record = new MarcRecord({fields: recfields});
         await validator.fix(record);
-        expect(record.fields).to.eql(resfields);
+        assert.deepEqual(record.fields, resfields);
       }
     };
   })();

package/src/addMissingField041.js

@@ -1,5 +1,5 @@
 //import createDebugLogger from 'debug';
-import {fieldToString, nvdebug} from './utils';
+import {fieldToString, nvdebug} from './utils.js';
 
 const description = 'Add missing 041 field based on 008/35-37';
 

package/src/{addMissingField336.spec.js → addMissingField041.test.js}

@@ -1,32 +1,31 @@
-import {expect} from 'chai';
+import assert from 'node:assert';
 import {MarcRecord} from '@natlibfi/marc-record';
-import validatorFactory from './addMissingField336';
+import validatorFactory from './addMissingField041.js';
 import {READERS} from '@natlibfi/fixura';
 import generateTests from '@natlibfi/fixugen';
 
 generateTests({
   callback,
-  path: [__dirname, '..', 'test-fixtures', 'addMissingField336'],
+  path: [import.meta.dirname, '..', 'test-fixtures', 'addMissingField041'],
   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}) {
@@ -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/addMissingField336.js

@@ -1,6 +1,6 @@
 //import createDebugLogger from 'debug';
-import {fieldToString, getCatalogingLanguage, nvdebug} from './utils';
-import {getFormOfItem, map336CodeToTerm} from './field33XUtils';
+import {fieldToString, getCatalogingLanguage, nvdebug} from './utils.js';
+import {getFormOfItem, map336CodeToTerm} from './field33XUtils.js';
 
 const description = 'Add missing 336 field(s)';
 
@@ -21,7 +21,7 @@ export default function () {
     // 336 ## ‡a tietokoneohjelma ‡b cop ‡2 rdacontent
     const res = {message: [], fix: [], valid: true};
     if (newFields.length) {
-      newFields.forEach(f => record.insertField(f)); // eslint-disable-line array-callback-return
+      newFields.forEach(f => record.insertField(f));
       return res;
     }
     return res;

package/src/{addMissingField041.spec.js → addMissingField336.test.js}

@@ -1,32 +1,31 @@
-import {expect} from 'chai';
+import assert from 'node:assert';
 import {MarcRecord} from '@natlibfi/marc-record';
-import validatorFactory from './addMissingField041';
+import validatorFactory from './addMissingField336.js';
 import {READERS} from '@natlibfi/fixura';
 import generateTests from '@natlibfi/fixugen';
 
 generateTests({
   callback,
-  path: [__dirname, '..', 'test-fixtures', 'addMissingField041'],
+  path: [import.meta.dirname, '..', 'test-fixtures', 'addMissingField336'],
   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}) {
@@ -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/addMissingField337.js

@@ -1,6 +1,6 @@
 //import createDebugLogger from 'debug';
-import {fieldToString, getCatalogingLanguage, nvdebug} from './utils';
-import {getFormOfItem, map337CodeToTerm} from './field33XUtils';
+import {fieldToString, getCatalogingLanguage, nvdebug} from './utils.js';
+import {getFormOfItem, map337CodeToTerm} from './field33XUtils.js';
 
 const description = 'Add missing 337 field(s)';
 

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

@@ -1,32 +1,31 @@
-import {expect} from 'chai';
+import assert from 'node:assert';
 import {MarcRecord} from '@natlibfi/marc-record';
-import validatorFactory from './addMissingField337';
+import validatorFactory from '../src/addMissingField337.js';
 import {READERS} from '@natlibfi/fixura';
 import generateTests from '@natlibfi/fixugen';
 
 generateTests({
   callback,
-  path: [__dirname, '..', 'test-fixtures', 'addMissingField337'],
+  path: [import.meta.dirname, '..', 'test-fixtures', 'addMissingField337'],
   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}) {
@@ -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/addMissingField338.js

@@ -1,6 +1,6 @@
 //import createDebugLogger from 'debug';
-import {fieldHasSubfield, fieldToString, getCatalogingLanguage, nvdebug} from './utils';
-import {getFormOfItem, map338CodeToTerm} from './field33XUtils';
+import {fieldHasSubfield, fieldToString, getCatalogingLanguage, nvdebug} from './utils.js';
+import {getFormOfItem, map338CodeToTerm} from './field33XUtils.js';
 
 // Based mostly on USEMARCON-RDA. However, many things have been rethought, modernized etc.
 const description = 'Add missing 338 field(s)';

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

@@ -1,32 +1,31 @@
-import {expect} from 'chai';
+import assert from 'node:assert';
 import {MarcRecord} from '@natlibfi/marc-record';
-import validatorFactory from './addMissingField338';
+import validatorFactory from '../src/addMissingField338.js';
 import {READERS} from '@natlibfi/fixura';
 import generateTests from '@natlibfi/fixugen';
 
 generateTests({
   callback,
-  path: [__dirname, '..', 'test-fixtures', 'addMissingField338'],
+  path: [import.meta.dirname, '..', 'test-fixtures', 'addMissingField338'],
   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(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/cyrillux-usemarcon-replacement.js

@@ -7,21 +7,21 @@
 
 import clone from 'clone';
 import {MarcRecord} from '@natlibfi/marc-record';
-import {default as fix33X} from './fix-33X';
-import {default as add041} from './addMissingField041';
-import {default as add336} from './addMissingField336';
-import {default as add337} from './addMissingField337';
-import {default as add338} from './addMissingField338';
-import {default as fixCountryCodes} from './fix-country-codes';
-import {default as fixLanguageCodes} from './fix-language-codes';
-import {default as fixRelatorTerms} from './fixRelatorTerms';
-import {default as fixIndicators} from './indicator-fixes';
-import {default as fixPunctuation} from './punctuation2';
-import {default as fixQualifyingInformation} from './normalize-qualifying-information';
-import {sortAdjacentSubfields} from './sortSubfields';
+import {default as fix33X} from './fix-33X.js';
+import {default as add041} from './addMissingField041.js';
+import {default as add336} from './addMissingField336.js';
+import {default as add337} from './addMissingField337.js';
+import {default as add338} from './addMissingField338.js';
+import {default as fixCountryCodes} from './fix-country-codes.js';
+import {default as fixLanguageCodes} from './fix-language-codes.js';
+import {default as fixRelatorTerms} from './fixRelatorTerms.js';
+import {default as fixIndicators} from './indicator-fixes.js';
+import {default as fixPunctuation} from './punctuation2.js';
+import {default as fixQualifyingInformation} from './normalize-qualifying-information.js';
+import {sortAdjacentSubfields} from './sortSubfields.js';
 
 // import createDebugLogger from 'debug';
-import {fieldHasSubfield, nvdebug, recordRemoveValuelessSubfields, recordToString, removeSubfield} from './utils';
+import {fieldHasSubfield, nvdebug, recordRemoveValuelessSubfields, recordToString, removeSubfield} from './utils.js';
 
 // const debug = createDebugLogger('@natlibfi/marc-record-validators-melinda/punctuation2');
 
@@ -121,7 +121,7 @@ export default function () {
 
     // Field 028: use $b$a, not $a$b:
     const f028 = record.fields.filter(f => f.tag === '028');
-    f028.forEach(f => sortAdjacentSubfields(f)); // eslint-disable-line array-callback-return
+    f028.forEach(f => sortAdjacentSubfields(f));
 
     add041().fix(record);
 
@@ -187,7 +187,7 @@ function fixField040(record) {
     return;
   }
 
-  f040.forEach(f => fixField040Subfields(f)); // eslint-disable-line array-callback-return
+  f040.forEach(f => fixField040Subfields(f));
 
   function fixField040Subfields(field) {
     field.subfields = field.subfields.filter(sf => !['b', 'e'].includes(sf.code));
@@ -203,7 +203,7 @@ export function removeFromOldCatalog(field) {
     return;
   }
   // See https://catalog.loc.gov/vwebv/ui/en_US/htdocs/help/faqs.html for motivation
-  field.subfields?.forEach(sf => removeFromOldCatalogFromSubfield(sf)); // eslint-disable-line array-callback-return
+  field.subfields?.forEach(sf => removeFromOldCatalogFromSubfield(sf));
 
   function removeFromOldCatalogFromSubfield(subfield) {
     if (!subfield.value.includes('[from old catalog]')) {
@@ -303,7 +303,7 @@ function field260To264s(field, record) { // might be generic... if so, move to u
     return false;
   }
 
-  field.subfields?.forEach(sf => field260To264Normalization(sf)); // eslint-disable-line array-callback-return
+  field.subfields?.forEach(sf => field260To264Normalization(sf));
 
   function field260To264Normalization(subfield) {
     subfield.value = field260To264Normalization2(subfield);
@@ -380,7 +380,7 @@ function translateFieldToFinnish(field) {
   if (!['020', '300'].includes(field.tag)) {
     return;
   }
-  field.subfields?.forEach(sf => translateSubfieldToFinnish(sf));  // eslint-disable-line array-callback-return
+  field.subfields?.forEach(sf => translateSubfieldToFinnish(sf));
 
   function translateSubfieldToFinnish(subfield) {
     if (field.tag === '020' && ['a', 'q', 'z'].includes(subfield.code)) {

package/src/cyrillux-usemarcon-replacement.test.js

@@ -0,0 +1,55 @@
+import assert from 'node:assert';
+import {after, before} from 'node:test';
+import {MarcRecord} from '@natlibfi/marc-record';
+import validatorFactory from './cyrillux-usemarcon-replacement.js';
+import {READERS} from '@natlibfi/fixura';
+import generateTests from '@natlibfi/fixugen';
+
+before(() => {
+  MarcRecord.setValidationOptions({subfields: false, subfieldValues: false});
+});
+
+after(() => {
+  MarcRecord.setValidationOptions({});
+});
+
+generateTests({
+  callback,
+  path: [import.meta.dirname, '..', 'test-fixtures', 'cyrillux-usemarcon-replacement'],
+  useMetadataFile: true,
+  recurse: false,
+  fixura: {
+    reader: READERS.JSON
+  },
+  hooks: {
+    before: async () => {
+      testValidatorFactory();
+    }
+  }
+});
+
+
+async function testValidatorFactory() {
+  const validator = await validatorFactory();
+
+  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}) {
+  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);
+}