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

package/dist/fix-country-codes.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../src/fix-country-codes.js"],
-  "sourcesContent": ["// Fix country codes in 008/15-17\n//\n// This is proto. Extend later...\n//\n// Author(s): Nicholas Volk\n\n//import createDebugLogger from 'debug';\n//import {fieldToString, nvdebug} from './utils.js';\n\n\nexport default function () {\n\n  return {\n    description: 'Fix deprecated country codes',\n    validate, fix\n  };\n\n  function fix(record) {\n    //nvdebug(`FIX ME`);\n    const res = {message: [], fix: [], valid: true};\n\n    const [field008] = record.get('008');\n    if (!field008) {\n      return res;\n    }\n\n    fixCountryCode(field008);\n\n    return res;\n  }\n\n  function validate(record) {\n    const res = {message: [], valid: true};\n\n    const [field008] = record.get('008');\n\n    if (!field008) {\n      return res;\n    }\n\n    const originalCountryCode = getCountryCodeFromField008(field008);\n    const modifiedCountryCode = deprecatedCountryCodeToCurrentCountryCode(originalCountryCode);\n    if (originalCountryCode === modifiedCountryCode) {\n      return res;\n    }\n\n    res.message.push(`Modify 008/15-17: '${originalCountryCode}' => '${modifiedCountryCode}'`);\n\n    res.valid = false;\n    return res;\n  }\n\n  function fixCountryCode(field008) {\n    const originalCountryCode = getCountryCodeFromField008(field008);\n    const modifiedCountryCode = deprecatedCountryCodeToCurrentCountryCode(originalCountryCode);\n    if (originalCountryCode !== modifiedCountryCode && modifiedCountryCode.length === 3) {\n      field008.value = `${field008.value.substring(0, 15)}${modifiedCountryCode}${field008.value.substring(18)}`;\n      return;\n    }\n  }\n\n  function getCountryCodeFromField008(field) {\n    return field.value.substring(15, 18); // return 008/15-17\n  }\n\n  function deprecatedCountryCodeToCurrentCountryCode(countryCode) {\n    if (countryCode === 'air') { // Armenia\n      return 'ai ';\n    }\n    if (countryCode === 'ajr') { // Azerbaidzan\n      return 'aj ';\n    }\n    // Australia\n    if (['aca', 'qua', 'tma', 'vra', 'wea', 'xga', 'xna', 'xoa', 'xra'].includes(countryCode)) {\n      return 'at ';\n    }\n\n    // Canada\n    if (['abc', 'bcc', 'cn ', 'mbc', 'nfc', 'nkc', 'nsc', 'ntc', 'nuc', 'onc', 'pic', 'quc', 'snc', 'ykc'].includes(countryCode)) {\n      return 'xxc';\n    }\n    // Great Britain:\n    if (['enk', 'nik', 'stk', 'uik', 'uk ', 'wlk'].includes(countryCode)) {\n      return 'xxk';\n    }\n    // United States:\n    if (['aku', 'alu', 'aru', 'azu', 'cau', 'cou', 'ctu', 'dcu', 'deu', 'flu', 'gau', 'hiu', 'iau', 'idu', 'ilu', 'inu', 'kgr', 'ksu', 'kyu', 'lau', 'mau', 'mdu', 'meu', 'miu', 'mnu', 'mou', 'msu', 'mtu', 'nbu', 'ncu', 'nhu', 'nju', 'nmu', 'nvu', 'nyu', 'ohu', 'oku', 'oru', 'pau', 'riu', 'scu', 'sdu', 'tnu', 'txu', 'us ', 'utu', 'vau', 'vtu', 'wau', 'wiu', 'wvu', 'wyu'].includes(countryCode)) {\n      return 'xxu';\n    }\n    return countryCode;\n  }\n\n}\n"],
-  "mappings": "AAUA,0BAA2B;AAEzB,SAAO;AAAA,IACL,aAAa;AAAA,IACb;AAAA,IAAU;AAAA,EACZ;AAEA,WAAS,IAAI,QAAQ;AAEnB,UAAM,MAAM,EAAC,SAAS,CAAC,GAAG,KAAK,CAAC,GAAG,OAAO,KAAI;AAE9C,UAAM,CAAC,QAAQ,IAAI,OAAO,IAAI,KAAK;AACnC,QAAI,CAAC,UAAU;AACb,aAAO;AAAA,IACT;AAEA,mBAAe,QAAQ;AAEvB,WAAO;AAAA,EACT;AAEA,WAAS,SAAS,QAAQ;AACxB,UAAM,MAAM,EAAC,SAAS,CAAC,GAAG,OAAO,KAAI;AAErC,UAAM,CAAC,QAAQ,IAAI,OAAO,IAAI,KAAK;AAEnC,QAAI,CAAC,UAAU;AACb,aAAO;AAAA,IACT;AAEA,UAAM,sBAAsB,2BAA2B,QAAQ;AAC/D,UAAM,sBAAsB,0CAA0C,mBAAmB;AACzF,QAAI,wBAAwB,qBAAqB;AAC/C,aAAO;AAAA,IACT;AAEA,QAAI,QAAQ,KAAK,sBAAsB,mBAAmB,SAAS,mBAAmB,GAAG;AAEzF,QAAI,QAAQ;AACZ,WAAO;AAAA,EACT;AAEA,WAAS,eAAe,UAAU;AAChC,UAAM,sBAAsB,2BAA2B,QAAQ;AAC/D,UAAM,sBAAsB,0CAA0C,mBAAmB;AACzF,QAAI,wBAAwB,uBAAuB,oBAAoB,WAAW,GAAG;AACnF,eAAS,QAAQ,GAAG,SAAS,MAAM,UAAU,GAAG,EAAE,CAAC,GAAG,mBAAmB,GAAG,SAAS,MAAM,UAAU,EAAE,CAAC;AACxG;AAAA,IACF;AAAA,EACF;AAEA,WAAS,2BAA2B,OAAO;AACzC,WAAO,MAAM,MAAM,UAAU,IAAI,EAAE;AAAA,EACrC;AAEA,WAAS,0CAA0C,aAAa;AAC9D,QAAI,gBAAgB,OAAO;AACzB,aAAO;AAAA,IACT;AACA,QAAI,gBAAgB,OAAO;AACzB,aAAO;AAAA,IACT;AAEA,QAAI,CAAC,OAAO,OAAO,OAAO,OAAO,OAAO,OAAO,OAAO,OAAO,KAAK,EAAE,SAAS,WAAW,GAAG;AACzF,aAAO;AAAA,IACT;AAGA,QAAI,CAAC,OAAO,OAAO,OAAO,OAAO,OAAO,OAAO,OAAO,OAAO,OAAO,OAAO,OAAO,OAAO,OAAO,KAAK,EAAE,SAAS,WAAW,GAAG;AAC5H,aAAO;AAAA,IACT;AAEA,QAAI,CAAC,OAAO,OAAO,OAAO,OAAO,OAAO,KAAK,EAAE,SAAS,WAAW,GAAG;AACpE,aAAO;AAAA,IACT;AAEA,QAAI,CAAC,OAAO,OAAO,OAAO,OAAO,OAAO,OAAO,OAAO,OAAO,OAAO,OAAO,OAAO,OAAO,OAAO,OAAO,OAAO,OAAO,OAAO,OAAO,OAAO,OAAO,OAAO,OAAO,OAAO,OAAO,OAAO,OAAO,OAAO,OAAO,OAAO,OAAO,OAAO,OAAO,OAAO,OAAO,OAAO,OAAO,OAAO,OAAO,OAAO,OAAO,OAAO,OAAO,OAAO,OAAO,OAAO,OAAO,OAAO,OAAO,OAAO,OAAO,OAAO,KAAK,EAAE,SAAS,WAAW,GAAG;AACtY,aAAO;AAAA,IACT;AACA,WAAO;AAAA,EACT;AAEF;",
+  "sourcesContent": ["// Fix country codes in 008/15-17\n//\n// This is proto. Extend later...\n//\n// Author(s): Nicholas Volk\n\nimport createDebugLogger from 'debug';\nimport {nvdebug} from './utils.js';\n\nconst debug = createDebugLogger('@natlibfi/marc-record-validators-melinda:fix-country-codes');\n//const debugData = debug.extend('data');\nconst debugDev = debug.extend('dev');\n\n\nexport default function () {\n\n  return {\n    description: 'Fix deprecated country codes',\n    validate, fix\n  };\n\n  function fix(record) {\n    nvdebug(`FIX ME:`, debugDev);\n    const res = {message: [], fix: [], valid: true};\n\n    const [field008] = record.get('008');\n    if (!field008) {\n      return res;\n    }\n\n    fixCountryCode(field008);\n\n    return res;\n  }\n\n  function validate(record) {\n    const res = {message: [], valid: true};\n\n    const [field008] = record.get('008');\n\n    if (!field008) {\n      return res;\n    }\n\n    const originalCountryCode = getCountryCodeFromField008(field008);\n    const modifiedCountryCode = deprecatedCountryCodeToCurrentCountryCode(originalCountryCode);\n    if (originalCountryCode === modifiedCountryCode) {\n      return res;\n    }\n\n    res.message.push(`Modify 008/15-17: '${originalCountryCode}' => '${modifiedCountryCode}'`);\n\n    res.valid = false;\n    return res;\n  }\n\n  function fixCountryCode(field008) {\n    const originalCountryCode = getCountryCodeFromField008(field008);\n    const modifiedCountryCode = deprecatedCountryCodeToCurrentCountryCode(originalCountryCode);\n    if (originalCountryCode !== modifiedCountryCode && modifiedCountryCode.length === 3) {\n      field008.value = `${field008.value.substring(0, 15)}${modifiedCountryCode}${field008.value.substring(18)}`;\n      return;\n    }\n  }\n\n  function getCountryCodeFromField008(field) {\n    return field.value.substring(15, 18); // return 008/15-17\n  }\n\n  function deprecatedCountryCodeToCurrentCountryCode(countryCode) {\n    if (countryCode === 'air') { // Armenia\n      return 'ai ';\n    }\n    if (countryCode === 'ajr') { // Azerbaidzan\n      return 'aj ';\n    }\n    // Australia\n    if (['aca', 'qua', 'tma', 'vra', 'wea', 'xga', 'xna', 'xoa', 'xra'].includes(countryCode)) {\n      return 'at ';\n    }\n\n    // Canada\n    if (['abc', 'bcc', 'cn ', 'mbc', 'nfc', 'nkc', 'nsc', 'ntc', 'nuc', 'onc', 'pic', 'quc', 'snc', 'ykc'].includes(countryCode)) {\n      return 'xxc';\n    }\n    // Great Britain:\n    if (['enk', 'nik', 'stk', 'uik', 'uk ', 'wlk'].includes(countryCode)) {\n      return 'xxk';\n    }\n    // United States:\n    if (['aku', 'alu', 'aru', 'azu', 'cau', 'cou', 'ctu', 'dcu', 'deu', 'flu', 'gau', 'hiu', 'iau', 'idu', 'ilu', 'inu', 'kgr', 'ksu', 'kyu', 'lau', 'mau', 'mdu', 'meu', 'miu', 'mnu', 'mou', 'msu', 'mtu', 'nbu', 'ncu', 'nhu', 'nju', 'nmu', 'nvu', 'nyu', 'ohu', 'oku', 'oru', 'pau', 'riu', 'scu', 'sdu', 'tnu', 'txu', 'us ', 'utu', 'vau', 'vtu', 'wau', 'wiu', 'wvu', 'wyu'].includes(countryCode)) {\n      return 'xxu';\n    }\n    return countryCode;\n  }\n\n}\n"],
+  "mappings": "AAMA,OAAO,uBAAuB;AAC9B,SAAQ,eAAc;AAEtB,MAAM,QAAQ,kBAAkB,4DAA4D;AAE5F,MAAM,WAAW,MAAM,OAAO,KAAK;AAGnC,0BAA2B;AAEzB,SAAO;AAAA,IACL,aAAa;AAAA,IACb;AAAA,IAAU;AAAA,EACZ;AAEA,WAAS,IAAI,QAAQ;AACnB,YAAQ,WAAW,QAAQ;AAC3B,UAAM,MAAM,EAAC,SAAS,CAAC,GAAG,KAAK,CAAC,GAAG,OAAO,KAAI;AAE9C,UAAM,CAAC,QAAQ,IAAI,OAAO,IAAI,KAAK;AACnC,QAAI,CAAC,UAAU;AACb,aAAO;AAAA,IACT;AAEA,mBAAe,QAAQ;AAEvB,WAAO;AAAA,EACT;AAEA,WAAS,SAAS,QAAQ;AACxB,UAAM,MAAM,EAAC,SAAS,CAAC,GAAG,OAAO,KAAI;AAErC,UAAM,CAAC,QAAQ,IAAI,OAAO,IAAI,KAAK;AAEnC,QAAI,CAAC,UAAU;AACb,aAAO;AAAA,IACT;AAEA,UAAM,sBAAsB,2BAA2B,QAAQ;AAC/D,UAAM,sBAAsB,0CAA0C,mBAAmB;AACzF,QAAI,wBAAwB,qBAAqB;AAC/C,aAAO;AAAA,IACT;AAEA,QAAI,QAAQ,KAAK,sBAAsB,mBAAmB,SAAS,mBAAmB,GAAG;AAEzF,QAAI,QAAQ;AACZ,WAAO;AAAA,EACT;AAEA,WAAS,eAAe,UAAU;AAChC,UAAM,sBAAsB,2BAA2B,QAAQ;AAC/D,UAAM,sBAAsB,0CAA0C,mBAAmB;AACzF,QAAI,wBAAwB,uBAAuB,oBAAoB,WAAW,GAAG;AACnF,eAAS,QAAQ,GAAG,SAAS,MAAM,UAAU,GAAG,EAAE,CAAC,GAAG,mBAAmB,GAAG,SAAS,MAAM,UAAU,EAAE,CAAC;AACxG;AAAA,IACF;AAAA,EACF;AAEA,WAAS,2BAA2B,OAAO;AACzC,WAAO,MAAM,MAAM,UAAU,IAAI,EAAE;AAAA,EACrC;AAEA,WAAS,0CAA0C,aAAa;AAC9D,QAAI,gBAAgB,OAAO;AACzB,aAAO;AAAA,IACT;AACA,QAAI,gBAAgB,OAAO;AACzB,aAAO;AAAA,IACT;AAEA,QAAI,CAAC,OAAO,OAAO,OAAO,OAAO,OAAO,OAAO,OAAO,OAAO,KAAK,EAAE,SAAS,WAAW,GAAG;AACzF,aAAO;AAAA,IACT;AAGA,QAAI,CAAC,OAAO,OAAO,OAAO,OAAO,OAAO,OAAO,OAAO,OAAO,OAAO,OAAO,OAAO,OAAO,OAAO,KAAK,EAAE,SAAS,WAAW,GAAG;AAC5H,aAAO;AAAA,IACT;AAEA,QAAI,CAAC,OAAO,OAAO,OAAO,OAAO,OAAO,KAAK,EAAE,SAAS,WAAW,GAAG;AACpE,aAAO;AAAA,IACT;AAEA,QAAI,CAAC,OAAO,OAAO,OAAO,OAAO,OAAO,OAAO,OAAO,OAAO,OAAO,OAAO,OAAO,OAAO,OAAO,OAAO,OAAO,OAAO,OAAO,OAAO,OAAO,OAAO,OAAO,OAAO,OAAO,OAAO,OAAO,OAAO,OAAO,OAAO,OAAO,OAAO,OAAO,OAAO,OAAO,OAAO,OAAO,OAAO,OAAO,OAAO,OAAO,OAAO,OAAO,OAAO,OAAO,OAAO,OAAO,OAAO,OAAO,OAAO,OAAO,OAAO,OAAO,KAAK,EAAE,SAAS,WAAW,GAAG;AACtY,aAAO;AAAA,IACT;AACA,WAAO;AAAA,EACT;AAEF;",
   "names": []
 }

package/dist/fix-country-codes.test.js

@@ -3,7 +3,6 @@ import { MarcRecord } from "@natlibfi/marc-record";
 import validatorFactory from "./fix-country-codes.js";
 import { READERS } from "@natlibfi/fixura";
 import generateTests from "@natlibfi/fixugen";
-import createDebugLogger from "debug";
 generateTests({
   callback,
   path: [import.meta.dirname, "..", "test-fixtures", "fix-country-codes"],
@@ -18,18 +17,13 @@ generateTests({
     }
   }
 });
-const debug = createDebugLogger("@natlibfi/marc-record-validators-melinda/fix-country-codes: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;
-  }
+async function callback({ getFixture, fix = false }) {
   const validator = await validatorFactory();
   const record = new MarcRecord(getFixture("record.json"));
   const expectedResult = getFixture("expectedResult.json");

package/dist/fix-country-codes.test.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../src/fix-country-codes.test.js"],
-  "sourcesContent": ["import assert from 'node:assert';\nimport {MarcRecord} from '@natlibfi/marc-record';\nimport validatorFactory from './fix-country-codes.js';\nimport {READERS} from '@natlibfi/fixura';\nimport generateTests from '@natlibfi/fixugen';\nimport createDebugLogger from 'debug';\n\ngenerateTests({\n  callback,\n  path: [import.meta.dirname, '..', 'test-fixtures', 'fix-country-codes'],\n  useMetadataFile: true,\n  recurse: false,\n  fixura: {\n    reader: READERS.JSON\n  },\n  hooks: {\n    before: async () => {\n      testValidatorFactory();\n    }\n  }\n});\nconst debug = createDebugLogger('@natlibfi/marc-record-validators-melinda/fix-country-codes:test');\n\nasync function testValidatorFactory() {\n  const validator = await validatorFactory();\n\n  assert.equal(typeof validator, 'object');\n  assert.equal(typeof validator.description, 'string');\n  assert.equal(typeof validator.validate, 'function');\n}\n\nasync function callback({getFixture, enabled = true, fix = false}) {\n  if (enabled === false) {\n    debug('TEST SKIPPED!');\n    return;\n  }\n\n  const validator = await validatorFactory();\n  const record = new MarcRecord(getFixture('record.json'));\n  const expectedResult = getFixture('expectedResult.json');\n  // console.log(expectedResult); // eslint-disable-line\n\n  if (!fix) {\n    const result = await validator.validate(record);\n    assert.deepEqual(result, expectedResult);\n    return;\n  }\n\n  await validator.fix(record);\n  assert.deepEqual(record, expectedResult);\n}\n"],
-  "mappings": "AAAA,OAAO,YAAY;AACnB,SAAQ,kBAAiB;AACzB,OAAO,sBAAsB;AAC7B,SAAQ,eAAc;AACtB,OAAO,mBAAmB;AAC1B,OAAO,uBAAuB;AAE9B,cAAc;AAAA,EACZ;AAAA,EACA,MAAM,CAAC,YAAY,SAAS,MAAM,iBAAiB,mBAAmB;AAAA,EACtE,iBAAiB;AAAA,EACjB,SAAS;AAAA,EACT,QAAQ;AAAA,IACN,QAAQ,QAAQ;AAAA,EAClB;AAAA,EACA,OAAO;AAAA,IACL,QAAQ,YAAY;AAClB,2BAAqB;AAAA,IACvB;AAAA,EACF;AACF,CAAC;AACD,MAAM,QAAQ,kBAAkB,iEAAiE;AAEjG,eAAe,uBAAuB;AACpC,QAAM,YAAY,MAAM,iBAAiB;AAEzC,SAAO,MAAM,OAAO,WAAW,QAAQ;AACvC,SAAO,MAAM,OAAO,UAAU,aAAa,QAAQ;AACnD,SAAO,MAAM,OAAO,UAAU,UAAU,UAAU;AACpD;AAEA,eAAe,SAAS,EAAC,YAAY,UAAU,MAAM,MAAM,MAAK,GAAG;AACjE,MAAI,YAAY,OAAO;AACrB,UAAM,eAAe;AACrB;AAAA,EACF;AAEA,QAAM,YAAY,MAAM,iBAAiB;AACzC,QAAM,SAAS,IAAI,WAAW,WAAW,aAAa,CAAC;AACvD,QAAM,iBAAiB,WAAW,qBAAqB;AAGvD,MAAI,CAAC,KAAK;AACR,UAAM,SAAS,MAAM,UAAU,SAAS,MAAM;AAC9C,WAAO,UAAU,QAAQ,cAAc;AACvC;AAAA,EACF;AAEA,QAAM,UAAU,IAAI,MAAM;AAC1B,SAAO,UAAU,QAAQ,cAAc;AACzC;",
+  "sourcesContent": ["import assert from 'node:assert';\nimport {MarcRecord} from '@natlibfi/marc-record';\nimport validatorFactory from './fix-country-codes.js';\nimport {READERS} from '@natlibfi/fixura';\nimport generateTests from '@natlibfi/fixugen';\n//import createDebugLogger from 'debug';\n\ngenerateTests({\n  callback,\n  path: [import.meta.dirname, '..', 'test-fixtures', 'fix-country-codes'],\n  useMetadataFile: true,\n  recurse: false,\n  fixura: {\n    reader: READERS.JSON\n  },\n  hooks: {\n    before: async () => {\n      testValidatorFactory();\n    }\n  }\n});\n//const debug = createDebugLogger('@natlibfi/marc-record-validators-melinda/fix-country-codes:test');\n\nasync function testValidatorFactory() {\n  const validator = await validatorFactory();\n\n  assert.equal(typeof validator, 'object');\n  assert.equal(typeof validator.description, 'string');\n  assert.equal(typeof validator.validate, 'function');\n}\n\nasync function callback({getFixture, fix = false}) {\n  const validator = await validatorFactory();\n  const record = new MarcRecord(getFixture('record.json'));\n  const expectedResult = getFixture('expectedResult.json');\n  // console.log(expectedResult); // eslint-disable-line\n\n  if (!fix) {\n    const result = await validator.validate(record);\n    assert.deepEqual(result, expectedResult);\n    return;\n  }\n\n  await validator.fix(record);\n  assert.deepEqual(record, expectedResult);\n}\n"],
+  "mappings": "AAAA,OAAO,YAAY;AACnB,SAAQ,kBAAiB;AACzB,OAAO,sBAAsB;AAC7B,SAAQ,eAAc;AACtB,OAAO,mBAAmB;AAG1B,cAAc;AAAA,EACZ;AAAA,EACA,MAAM,CAAC,YAAY,SAAS,MAAM,iBAAiB,mBAAmB;AAAA,EACtE,iBAAiB;AAAA,EACjB,SAAS;AAAA,EACT,QAAQ;AAAA,IACN,QAAQ,QAAQ;AAAA,EAClB;AAAA,EACA,OAAO;AAAA,IACL,QAAQ,YAAY;AAClB,2BAAqB;AAAA,IACvB;AAAA,EACF;AACF,CAAC;AAGD,eAAe,uBAAuB;AACpC,QAAM,YAAY,MAAM,iBAAiB;AAEzC,SAAO,MAAM,OAAO,WAAW,QAAQ;AACvC,SAAO,MAAM,OAAO,UAAU,aAAa,QAAQ;AACnD,SAAO,MAAM,OAAO,UAAU,UAAU,UAAU;AACpD;AAEA,eAAe,SAAS,EAAC,YAAY,MAAM,MAAK,GAAG;AACjD,QAAM,YAAY,MAAM,iBAAiB;AACzC,QAAM,SAAS,IAAI,WAAW,WAAW,aAAa,CAAC;AACvD,QAAM,iBAAiB,WAAW,qBAAqB;AAGvD,MAAI,CAAC,KAAK;AACR,UAAM,SAAS,MAAM,UAAU,SAAS,MAAM;AAC9C,WAAO,UAAU,QAAQ,cAAc;AACvC;AAAA,EACF;AAEA,QAAM,UAAU,IAAI,MAAM;AAC1B,SAAO,UAAU,QAAQ,cAAc;AACzC;",
   "names": []
 }

package/dist/fix-language-codes.js

@@ -1,9 +1,13 @@
 import clone from "clone";
-import { fieldToString } from "./utils.js";
+import { fieldToString, nvdebug } from "./utils.js";
+import createDebugLogger from "debug";
+const debug = createDebugLogger("@natlibfi/marc-record-validators-melinda:fix-language-codes");
+const debugDev = debug.extend("dev");
 const description = "Fix language codes";
 export default function() {
   return { description, validate, fix };
   function fix(record) {
+    nvdebug(`FIX ME`, debugDev);
     const res = { message: [], fix: [], valid: true };
     const [field008] = record.get("008");
     if (!field008) {

package/dist/fix-language-codes.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../src/fix-language-codes.js"],
-  "sourcesContent": ["import clone from 'clone';\nimport {fieldToString} from './utils.js';\n// Fix language codes in 008/35-37 and 041 (does not sync them)\n//\n// Author(s): Nicholas Volk\n\n//import createDebugLogger from 'debug';\n//import {fieldToString, nvdebug} from './utils.js';\n\nconst description = 'Fix language codes';\n\nexport default function () {\n\n  return {description, validate, fix};\n\n  function fix(record) {\n    //nvdebug(`FIX ME`);\n    const res = {message: [], fix: [], valid: true};\n\n    const [field008] = record.get('008');\n    if (!field008) {\n      return res;\n    }\n\n    fixLanguageField008(field008);\n\n    const f041 = record.get('041');\n    f041.forEach(f => fixField041(f));\n\n    return res;\n  }\n\n\n  function validate(record) {\n    const res = {message: [], valid: true};\n\n    validateField008(record, res);\n\n    const f041 = record.get('041');\n\n    f041.forEach(f => validateField041(f, res));\n\n    res.valid = !(res.message.length >= 1);\n    return res;\n  }\n\n  function validateField008(record, res) {\n    const [field008] = record.get('008');\n\n    if (!field008) {\n      return;\n    }\n\n    const originalLanguage = getLanguageFromField008(field008);\n    const modifiedLanguage = deprecatedLanguageToCurrentLanguage(originalLanguage);\n    if (originalLanguage === modifiedLanguage) {\n      return;\n    }\n\n    res.message.push(`Modify 008/35-37: '${originalLanguage}' => '${modifiedLanguage}'`);\n    res.valid = false;\n  }\n\n\n  function isRelevantField041SubfieldCode(subfield) {\n    return 'abdefghijkmnpqrt'.includes(subfield.code);\n  }\n\n\n  function validateField041(field, res) {\n\n    const clonedField = clone(field);\n    fixField041(clonedField);\n\n    const originalString = fieldToString(field);\n    const modifiedString = fieldToString(clonedField);\n\n    if (originalString === modifiedString) {\n      return;\n    }\n    const msg = `${originalString} => ${modifiedString}`;\n    res.message.push(msg);\n\n  }\n\n\n  function fixLanguageField008(field008) {\n    const originalLanguage = getLanguageFromField008(field008);\n    const modifiedLanguage = deprecatedLanguageToCurrentLanguage(originalLanguage);\n    if (originalLanguage !== modifiedLanguage && modifiedLanguage.length === 3) {\n      field008.value = `${field008.value.substring(0, 35)}${modifiedLanguage}${field008.value.substring(38)}`;\n      return;\n    }\n  }\n\n  function fixField041(field) {\n    if (field.subfields.some(sf => sf.code === '2')) {\n      return;\n    }\n\n    field.subfields.forEach(sf => fixField041Subfield(sf));\n\n    function fixField041Subfield(subfield) {\n      if (!isRelevantField041SubfieldCode(subfield)) {\n        return;\n      }\n      subfield.value = deprecatedLanguageToCurrentLanguage(subfield.value);\n    }\n  }\n\n  function getLanguageFromField008(field) {\n    return field.value.substring(35, 38); // return 008/35-37\n  }\n\n  function deprecatedLanguageToCurrentLanguage(language) {\n    if (language === 'nno' || language === 'nob') { // Nynorsk ja bokm\u00E5l\n      return 'nor'; // Norwegian\n    }\n    return language;\n  }\n\n}\n"],
-  "mappings": "AAAA,OAAO,WAAW;AAClB,SAAQ,qBAAoB;AAQ5B,MAAM,cAAc;AAEpB,0BAA2B;AAEzB,SAAO,EAAC,aAAa,UAAU,IAAG;AAElC,WAAS,IAAI,QAAQ;AAEnB,UAAM,MAAM,EAAC,SAAS,CAAC,GAAG,KAAK,CAAC,GAAG,OAAO,KAAI;AAE9C,UAAM,CAAC,QAAQ,IAAI,OAAO,IAAI,KAAK;AACnC,QAAI,CAAC,UAAU;AACb,aAAO;AAAA,IACT;AAEA,wBAAoB,QAAQ;AAE5B,UAAM,OAAO,OAAO,IAAI,KAAK;AAC7B,SAAK,QAAQ,OAAK,YAAY,CAAC,CAAC;AAEhC,WAAO;AAAA,EACT;AAGA,WAAS,SAAS,QAAQ;AACxB,UAAM,MAAM,EAAC,SAAS,CAAC,GAAG,OAAO,KAAI;AAErC,qBAAiB,QAAQ,GAAG;AAE5B,UAAM,OAAO,OAAO,IAAI,KAAK;AAE7B,SAAK,QAAQ,OAAK,iBAAiB,GAAG,GAAG,CAAC;AAE1C,QAAI,QAAQ,EAAE,IAAI,QAAQ,UAAU;AACpC,WAAO;AAAA,EACT;AAEA,WAAS,iBAAiB,QAAQ,KAAK;AACrC,UAAM,CAAC,QAAQ,IAAI,OAAO,IAAI,KAAK;AAEnC,QAAI,CAAC,UAAU;AACb;AAAA,IACF;AAEA,UAAM,mBAAmB,wBAAwB,QAAQ;AACzD,UAAM,mBAAmB,oCAAoC,gBAAgB;AAC7E,QAAI,qBAAqB,kBAAkB;AACzC;AAAA,IACF;AAEA,QAAI,QAAQ,KAAK,sBAAsB,gBAAgB,SAAS,gBAAgB,GAAG;AACnF,QAAI,QAAQ;AAAA,EACd;AAGA,WAAS,+BAA+B,UAAU;AAChD,WAAO,mBAAmB,SAAS,SAAS,IAAI;AAAA,EAClD;AAGA,WAAS,iBAAiB,OAAO,KAAK;AAEpC,UAAM,cAAc,MAAM,KAAK;AAC/B,gBAAY,WAAW;AAEvB,UAAM,iBAAiB,cAAc,KAAK;AAC1C,UAAM,iBAAiB,cAAc,WAAW;AAEhD,QAAI,mBAAmB,gBAAgB;AACrC;AAAA,IACF;AACA,UAAM,MAAM,GAAG,cAAc,OAAO,cAAc;AAClD,QAAI,QAAQ,KAAK,GAAG;AAAA,EAEtB;AAGA,WAAS,oBAAoB,UAAU;AACrC,UAAM,mBAAmB,wBAAwB,QAAQ;AACzD,UAAM,mBAAmB,oCAAoC,gBAAgB;AAC7E,QAAI,qBAAqB,oBAAoB,iBAAiB,WAAW,GAAG;AAC1E,eAAS,QAAQ,GAAG,SAAS,MAAM,UAAU,GAAG,EAAE,CAAC,GAAG,gBAAgB,GAAG,SAAS,MAAM,UAAU,EAAE,CAAC;AACrG;AAAA,IACF;AAAA,EACF;AAEA,WAAS,YAAY,OAAO;AAC1B,QAAI,MAAM,UAAU,KAAK,QAAM,GAAG,SAAS,GAAG,GAAG;AAC/C;AAAA,IACF;AAEA,UAAM,UAAU,QAAQ,QAAM,oBAAoB,EAAE,CAAC;AAErD,aAAS,oBAAoB,UAAU;AACrC,UAAI,CAAC,+BAA+B,QAAQ,GAAG;AAC7C;AAAA,MACF;AACA,eAAS,QAAQ,oCAAoC,SAAS,KAAK;AAAA,IACrE;AAAA,EACF;AAEA,WAAS,wBAAwB,OAAO;AACtC,WAAO,MAAM,MAAM,UAAU,IAAI,EAAE;AAAA,EACrC;AAEA,WAAS,oCAAoC,UAAU;AACrD,QAAI,aAAa,SAAS,aAAa,OAAO;AAC5C,aAAO;AAAA,IACT;AACA,WAAO;AAAA,EACT;AAEF;",
+  "sourcesContent": ["import clone from 'clone';\nimport {fieldToString, nvdebug} from './utils.js';\nimport createDebugLogger from 'debug';\n\n// Fix language codes in 008/35-37 and 041 (does not sync them)\n//\n// Author(s): Nicholas Volk\n\nconst debug = createDebugLogger('@natlibfi/marc-record-validators-melinda:fix-language-codes');\n//const debugData = debug.extend('data');\nconst debugDev = debug.extend('dev');\n\nconst description = 'Fix language codes';\n\n// eslint-disable-next-line max-lines-per-function\nexport default function () {\n\n  return {description, validate, fix};\n\n  function fix(record) {\n    nvdebug(`FIX ME`, debugDev);\n    const res = {message: [], fix: [], valid: true};\n\n    const [field008] = record.get('008');\n    if (!field008) {\n      return res;\n    }\n\n    fixLanguageField008(field008);\n\n    const f041 = record.get('041');\n    f041.forEach(f => fixField041(f));\n\n    return res;\n  }\n\n\n  function validate(record) {\n    const res = {message: [], valid: true};\n\n    validateField008(record, res);\n\n    const f041 = record.get('041');\n\n    f041.forEach(f => validateField041(f, res));\n\n    res.valid = !(res.message.length >= 1);\n    return res;\n  }\n\n  function validateField008(record, res) {\n    const [field008] = record.get('008');\n\n    if (!field008) {\n      return;\n    }\n\n    const originalLanguage = getLanguageFromField008(field008);\n    const modifiedLanguage = deprecatedLanguageToCurrentLanguage(originalLanguage);\n    if (originalLanguage === modifiedLanguage) {\n      return;\n    }\n\n    res.message.push(`Modify 008/35-37: '${originalLanguage}' => '${modifiedLanguage}'`);\n    res.valid = false;\n  }\n\n\n  function isRelevantField041SubfieldCode(subfield) {\n    return 'abdefghijkmnpqrt'.includes(subfield.code);\n  }\n\n\n  function validateField041(field, res) {\n\n    const clonedField = clone(field);\n    fixField041(clonedField);\n\n    const originalString = fieldToString(field);\n    const modifiedString = fieldToString(clonedField);\n\n    if (originalString === modifiedString) {\n      return;\n    }\n    const msg = `${originalString} => ${modifiedString}`;\n    res.message.push(msg);\n\n  }\n\n\n  function fixLanguageField008(field008) {\n    const originalLanguage = getLanguageFromField008(field008);\n    const modifiedLanguage = deprecatedLanguageToCurrentLanguage(originalLanguage);\n    if (originalLanguage !== modifiedLanguage && modifiedLanguage.length === 3) {\n      field008.value = `${field008.value.substring(0, 35)}${modifiedLanguage}${field008.value.substring(38)}`;\n      return;\n    }\n  }\n\n  function fixField041(field) {\n    if (field.subfields.some(sf => sf.code === '2')) {\n      return;\n    }\n\n    field.subfields.forEach(sf => fixField041Subfield(sf));\n\n    function fixField041Subfield(subfield) {\n      if (!isRelevantField041SubfieldCode(subfield)) {\n        return;\n      }\n      subfield.value = deprecatedLanguageToCurrentLanguage(subfield.value);\n    }\n  }\n\n  function getLanguageFromField008(field) {\n    return field.value.substring(35, 38); // return 008/35-37\n  }\n\n  function deprecatedLanguageToCurrentLanguage(language) {\n    if (language === 'nno' || language === 'nob') { // Nynorsk ja bokm\u00E5l\n      return 'nor'; // Norwegian\n    }\n    return language;\n  }\n\n}\n"],
+  "mappings": "AAAA,OAAO,WAAW;AAClB,SAAQ,eAAe,eAAc;AACrC,OAAO,uBAAuB;AAM9B,MAAM,QAAQ,kBAAkB,6DAA6D;AAE7F,MAAM,WAAW,MAAM,OAAO,KAAK;AAEnC,MAAM,cAAc;AAGpB,0BAA2B;AAEzB,SAAO,EAAC,aAAa,UAAU,IAAG;AAElC,WAAS,IAAI,QAAQ;AACnB,YAAQ,UAAU,QAAQ;AAC1B,UAAM,MAAM,EAAC,SAAS,CAAC,GAAG,KAAK,CAAC,GAAG,OAAO,KAAI;AAE9C,UAAM,CAAC,QAAQ,IAAI,OAAO,IAAI,KAAK;AACnC,QAAI,CAAC,UAAU;AACb,aAAO;AAAA,IACT;AAEA,wBAAoB,QAAQ;AAE5B,UAAM,OAAO,OAAO,IAAI,KAAK;AAC7B,SAAK,QAAQ,OAAK,YAAY,CAAC,CAAC;AAEhC,WAAO;AAAA,EACT;AAGA,WAAS,SAAS,QAAQ;AACxB,UAAM,MAAM,EAAC,SAAS,CAAC,GAAG,OAAO,KAAI;AAErC,qBAAiB,QAAQ,GAAG;AAE5B,UAAM,OAAO,OAAO,IAAI,KAAK;AAE7B,SAAK,QAAQ,OAAK,iBAAiB,GAAG,GAAG,CAAC;AAE1C,QAAI,QAAQ,EAAE,IAAI,QAAQ,UAAU;AACpC,WAAO;AAAA,EACT;AAEA,WAAS,iBAAiB,QAAQ,KAAK;AACrC,UAAM,CAAC,QAAQ,IAAI,OAAO,IAAI,KAAK;AAEnC,QAAI,CAAC,UAAU;AACb;AAAA,IACF;AAEA,UAAM,mBAAmB,wBAAwB,QAAQ;AACzD,UAAM,mBAAmB,oCAAoC,gBAAgB;AAC7E,QAAI,qBAAqB,kBAAkB;AACzC;AAAA,IACF;AAEA,QAAI,QAAQ,KAAK,sBAAsB,gBAAgB,SAAS,gBAAgB,GAAG;AACnF,QAAI,QAAQ;AAAA,EACd;AAGA,WAAS,+BAA+B,UAAU;AAChD,WAAO,mBAAmB,SAAS,SAAS,IAAI;AAAA,EAClD;AAGA,WAAS,iBAAiB,OAAO,KAAK;AAEpC,UAAM,cAAc,MAAM,KAAK;AAC/B,gBAAY,WAAW;AAEvB,UAAM,iBAAiB,cAAc,KAAK;AAC1C,UAAM,iBAAiB,cAAc,WAAW;AAEhD,QAAI,mBAAmB,gBAAgB;AACrC;AAAA,IACF;AACA,UAAM,MAAM,GAAG,cAAc,OAAO,cAAc;AAClD,QAAI,QAAQ,KAAK,GAAG;AAAA,EAEtB;AAGA,WAAS,oBAAoB,UAAU;AACrC,UAAM,mBAAmB,wBAAwB,QAAQ;AACzD,UAAM,mBAAmB,oCAAoC,gBAAgB;AAC7E,QAAI,qBAAqB,oBAAoB,iBAAiB,WAAW,GAAG;AAC1E,eAAS,QAAQ,GAAG,SAAS,MAAM,UAAU,GAAG,EAAE,CAAC,GAAG,gBAAgB,GAAG,SAAS,MAAM,UAAU,EAAE,CAAC;AACrG;AAAA,IACF;AAAA,EACF;AAEA,WAAS,YAAY,OAAO;AAC1B,QAAI,MAAM,UAAU,KAAK,QAAM,GAAG,SAAS,GAAG,GAAG;AAC/C;AAAA,IACF;AAEA,UAAM,UAAU,QAAQ,QAAM,oBAAoB,EAAE,CAAC;AAErD,aAAS,oBAAoB,UAAU;AACrC,UAAI,CAAC,+BAA+B,QAAQ,GAAG;AAC7C;AAAA,MACF;AACA,eAAS,QAAQ,oCAAoC,SAAS,KAAK;AAAA,IACrE;AAAA,EACF;AAEA,WAAS,wBAAwB,OAAO;AACtC,WAAO,MAAM,MAAM,UAAU,IAAI,EAAE;AAAA,EACrC;AAEA,WAAS,oCAAoC,UAAU;AACrD,QAAI,aAAa,SAAS,aAAa,OAAO;AAC5C,aAAO;AAAA,IACT;AACA,WAAO;AAAA,EACT;AAEF;",
   "names": []
 }

package/dist/fix-sami-041.js

@@ -0,0 +1,109 @@
+import createDebugLogger from "debug";
+import clone from "clone";
+import { fieldToString, nvdebug } from "./utils.js";
+const debug = createDebugLogger("@natlibfi/marc-record-validators-melinda:fix-sami-041");
+const debugDev = debug.extend("dev");
+export default function() {
+  const samiLanguages = ["sma", "sme", "smj", "smn", "sms"];
+  const subfieldCodesUsingSmi = ["a", "d"];
+  return {
+    description: "Add corresponding 'smi' subfield before a specific sami language subfields and update 008/35-37, if needed",
+    validate,
+    fix
+  };
+  function getRelevantSubfieldCodes(record) {
+    if (record && record.leader && record.leader[6]) {
+      nvdebug(` LDR/06 is '${record.leader[6]}'`, debugDev);
+      if (["i", "j"].includes(record.leader[6])) {
+        return ["d"];
+      }
+      return ["a"];
+    }
+    return ["a", "d"];
+  }
+  function fix(record, validateMode = false) {
+    nvdebug(`Start ${validateMode ? "validator" : "fixer"}`, debugDev);
+    const relevantSubfieldCodes = getRelevantSubfieldCodes(record);
+    nvdebug(` Relevant subfield codes are '${relevantSubfieldCodes.join("', '")}'`, debugDev);
+    const relevantFields = record.fields.filter((f) => isRelevantField(f, relevantSubfieldCodes)).map((f) => validateMode ? clone(f) : f);
+    if (relevantFields.length === 0) {
+      nvdebug(` No relevant f041 fields found`, debugDev);
+      if (validateMode) {
+        return { message: [], valid: true };
+      }
+      return { message: [], fix: [], valid: true };
+    }
+    const relevantFieldsAsStrings = relevantFields.map((f) => fieldToString(f));
+    relevantFields.forEach((f) => processField(f, relevantSubfieldCodes));
+    const modFieldsAsStrings = relevantFields.map((f) => fieldToString(f));
+    const report = [...updateAndReport008(), ...createReport(relevantFieldsAsStrings, modFieldsAsStrings)];
+    if (validateMode) {
+      return { "message": report, "valid": false };
+    }
+    return { message: [], fix: report, valid: true };
+    function updateAndReport008() {
+      const [f008] = record.get("008").map((f) => validateMode ? clone(f) : f);
+      if (!f008) {
+        nvdebug(" WARNING: no f008 found"), debugDev;
+        return [];
+      }
+      const currLang = f008.value.substr(35, 3);
+      if (!samiLanguages.includes(currLang)) {
+        nvdebug(` Existing 008/35-37 '${currLang}' is not a sami language. No need to update 008/35-37`, debugDev);
+        return [];
+      }
+      const origValue = f008.value;
+      const firstRelevantSubfield = relevantFields[0].subfields.find((sf) => relevantSubfieldCodes.includes(sf.code));
+      if (firstRelevantSubfield.value !== "smi") {
+        nvdebug(` First relevant subfield is '$${firstRelevantSubfield.code} ${firstRelevantSubfield.value}'. No need to update 008/35-37`, debugDev);
+        return [];
+      }
+      f008.value = `${f008.value.substr(0, 35)}smi${f008.value.substr(38)}`;
+      nvdebug(` Update 008/35-37: '${currLang}' => 'smi'`, debugDev);
+      return createReport([origValue], [f008.value]);
+    }
+    function processField(f) {
+      f.subfields = processSubfields(f.subfields, []);
+    }
+    function processSubfields(incomingSubfields, outgoingSubfields = []) {
+      const [currSubfield, ...otherSubfields] = incomingSubfields;
+      if (!currSubfield) {
+        return outgoingSubfields;
+      }
+      if (!isRelevantSamiSubfield(currSubfield, [...outgoingSubfields, ...otherSubfields])) {
+        return processSubfields(otherSubfields, [...outgoingSubfields, currSubfield]);
+      }
+      const smiSubfield = {
+        code: currSubfield.code,
+        value: "smi"
+      };
+      nvdebug(` f041: Add '$${currSubfield.code} smi' before '${currSubfield.value}'`, debugDev);
+      return processSubfields(otherSubfields, [...outgoingSubfields, smiSubfield, currSubfield]);
+    }
+    function isRelevantField(f) {
+      if (f.tag !== "041" || !f.subfields || f.subfields.some((sf) => sf.code === "2")) {
+        return false;
+      }
+      return f.subfields.some((sf) => isRelevantSamiSubfield(sf, f.subfields));
+    }
+    function isRelevantSamiSubfield(sf, otherSubfields) {
+      if (!subfieldCodesUsingSmi.includes(sf.code) || !samiLanguages.includes(sf.value)) {
+        return false;
+      }
+      if (otherSubfields.some((sf2) => sf2.code === sf.code && sf2.value === "smi")) {
+        return false;
+      }
+      return true;
+    }
+  }
+  function createReport(origArray, modArray) {
+    return origArray.map((entry, index) => createEntry(entry, index));
+    function createEntry(item, index) {
+      return `'${item}' => '${modArray[index]}'`;
+    }
+  }
+  function validate(record) {
+    return fix(record, true);
+  }
+}
+//# sourceMappingURL=fix-sami-041.js.map

package/dist/fix-sami-041.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../src/fix-sami-041.js"],
+  "sourcesContent": ["// Author(s): Nicholas Volk\n\nimport createDebugLogger from 'debug';\nimport clone from 'clone';\n\nimport {fieldToString, nvdebug} from './utils.js';\n\nconst debug = createDebugLogger('@natlibfi/marc-record-validators-melinda:fix-sami-041');\n//const debugData = debug.extend('data');\nconst debugDev = debug.extend('dev');\n\n\n// eslint-disable-next-line max-lines-per-function\nexport default function () {\n  /* 'sma': etel\u00E4saame, 'sme': pohjoissaame, 'smj': luulajansaame, 'smn': inarinsaame, 'sms': koltansaame */\n  const samiLanguages = ['sma', 'sme', 'smj', 'smn', 'sms'];\n  const subfieldCodesUsingSmi = ['a', 'd'];\n\n  return {\n    description: 'Add corresponding \\'smi\\' subfield before a specific sami language subfields and update 008/35-37, if needed',\n    validate, fix\n  };\n\n  function getRelevantSubfieldCodes(record) { // Maybe this should be an exportable utility function...\n    if (record && record.leader && record.leader[6]) {\n     nvdebug(` LDR/06 is '${record.leader[6]}'`, debugDev);\n      // We should test this properly...\n      if (['i', 'j'].includes(record.leader[6])) { // Check type of record: sound recordings use 'd'\n        return ['d'];\n      }\n      return ['a'];\n    }\n\n    return ['a', 'd']; // B\u00E5de-och\n  }\n\n\n  function fix(record, validateMode = false) {\n   nvdebug(`Start ${validateMode ? 'validator' : 'fixer'}`, debugDev);\n    const relevantSubfieldCodes = getRelevantSubfieldCodes(record);\n   nvdebug(` Relevant subfield codes are '${relevantSubfieldCodes.join(\"', '\")}'`, debugDev);\n    const relevantFields = record.fields.filter(f => isRelevantField(f, relevantSubfieldCodes)).map(f => validateMode ? clone(f) : f); // NV! relevant fields are cloned in validation mode!\n    // Nothing to do:\n    if (relevantFields.length === 0) {\n     nvdebug(` No relevant f041 fields found`, debugDev);\n      if (validateMode) {\n        return {message: [], valid: true};\n      }\n      return {message: [], fix: [], valid: true};\n    }\n\n    const relevantFieldsAsStrings = relevantFields.map(f => fieldToString(f)); // get original values\n\n    relevantFields.forEach(f => processField(f, relevantSubfieldCodes));\n    const modFieldsAsStrings = relevantFields.map(f => fieldToString(f));\n    const report = [...updateAndReport008(), ...createReport(relevantFieldsAsStrings, modFieldsAsStrings)];\n\n    if (validateMode) {\n      return {'message': report, 'valid': false};\n    }\n\n    return {message: [], fix: report, valid: true};\n\n    function updateAndReport008() { // Update 008/35-37 if necessary + report it\n      const [f008] = record.get('008').map(f => validateMode ? clone(f) : f);\n\n      if (!f008) {\n       nvdebug(' WARNING: no f008 found'), debugDev;\n        return [];\n      }\n      const currLang = f008.value.substr(35, 3);\n      if (!samiLanguages.includes(currLang)) { // NB! If original 008/35-37 was not a sami language, we don't change anything!\n       nvdebug(` Existing 008/35-37 '${currLang}' is not a sami language. No need to update 008/35-37`, debugDev);\n        return [];\n      }\n      const origValue = f008.value;\n      const firstRelevantSubfield = relevantFields[0].subfields.find(sf => relevantSubfieldCodes.includes(sf.code));\n      if (firstRelevantSubfield.value !== 'smi') {\n        nvdebug(` First relevant subfield is '\\$${firstRelevantSubfield.code} ${firstRelevantSubfield.value}'. No need to update 008/35-37`, debugDev);\n        return [];\n      }\n      f008.value = `${f008.value.substr(0, 35)}smi${f008.value.substr(38)}`;\n     nvdebug(` Update 008/35-37: '${currLang}' => 'smi'`, debugDev);\n      return createReport([origValue], [f008.value]);\n    }\n\n    function processField(f) {\n      f.subfields = processSubfields(f.subfields, []);\n    }\n\n    function processSubfields(incomingSubfields, outgoingSubfields = []) {\n      const [currSubfield, ...otherSubfields] = incomingSubfields;\n      if (!currSubfield) {\n        return outgoingSubfields;\n      }\n      if (!isRelevantSamiSubfield(currSubfield, [...outgoingSubfields, ...otherSubfields])) {\n        return processSubfields(otherSubfields, [...outgoingSubfields, currSubfield]);\n      }\n\n      const smiSubfield = {\n        code: currSubfield.code,\n        value: 'smi'\n      };\n     nvdebug(` f041: Add '\\$${currSubfield.code} smi' before '${currSubfield.value}'`, debugDev);\n\n      return processSubfields(otherSubfields, [...outgoingSubfields, smiSubfield, currSubfield]);\n    }\n\n    function isRelevantField(f) {\n      if (f.tag !== '041' || !f.subfields || f.subfields.some(sf => sf.code === '2')) {\n        return false;\n      }\n      return f.subfields.some(sf => isRelevantSamiSubfield(sf, f.subfields)); // it's ok to pass sf in f.subfields also\n    }\n\n    function isRelevantSamiSubfield(sf, otherSubfields) {\n      // NB! preceding 'smi' is added to all $a and $d fields, regardless of the LDR/06 value! (However, copying 041$a/d -> 008/35-37 depends on LDR/06)\n      if (!subfieldCodesUsingSmi.includes(sf.code) || !samiLanguages.includes(sf.value)) {\n        return false;\n      }\n      if (otherSubfields.some(sf2 => sf2.code === sf.code && sf2.value === 'smi')) { // fail if 'smi' already exists\n        return false;\n      }\n      //debug(` '\\${sf.code} ${sf.value}' requires preceding 'smi'`);\n      return true;\n    }\n  }\n\n  function createReport(origArray, modArray) {\n    return origArray.map((entry, index) => createEntry(entry, index));\n\n    function createEntry(item, index) {\n      return `'${item}' => '${modArray[index]}'`;\n    }\n  }\n\n  function validate(record) {\n    return fix(record, true);\n  }\n\n\n\n\n\n\n}\n\n"],
+  "mappings": "AAEA,OAAO,uBAAuB;AAC9B,OAAO,WAAW;AAElB,SAAQ,eAAe,eAAc;AAErC,MAAM,QAAQ,kBAAkB,uDAAuD;AAEvF,MAAM,WAAW,MAAM,OAAO,KAAK;AAInC,0BAA2B;AAEzB,QAAM,gBAAgB,CAAC,OAAO,OAAO,OAAO,OAAO,KAAK;AACxD,QAAM,wBAAwB,CAAC,KAAK,GAAG;AAEvC,SAAO;AAAA,IACL,aAAa;AAAA,IACb;AAAA,IAAU;AAAA,EACZ;AAEA,WAAS,yBAAyB,QAAQ;AACxC,QAAI,UAAU,OAAO,UAAU,OAAO,OAAO,CAAC,GAAG;AAChD,cAAQ,eAAe,OAAO,OAAO,CAAC,CAAC,KAAK,QAAQ;AAEnD,UAAI,CAAC,KAAK,GAAG,EAAE,SAAS,OAAO,OAAO,CAAC,CAAC,GAAG;AACzC,eAAO,CAAC,GAAG;AAAA,MACb;AACA,aAAO,CAAC,GAAG;AAAA,IACb;AAEA,WAAO,CAAC,KAAK,GAAG;AAAA,EAClB;AAGA,WAAS,IAAI,QAAQ,eAAe,OAAO;AAC1C,YAAQ,SAAS,eAAe,cAAc,OAAO,IAAI,QAAQ;AAChE,UAAM,wBAAwB,yBAAyB,MAAM;AAC9D,YAAQ,iCAAiC,sBAAsB,KAAK,MAAM,CAAC,KAAK,QAAQ;AACvF,UAAM,iBAAiB,OAAO,OAAO,OAAO,OAAK,gBAAgB,GAAG,qBAAqB,CAAC,EAAE,IAAI,OAAK,eAAe,MAAM,CAAC,IAAI,CAAC;AAEhI,QAAI,eAAe,WAAW,GAAG;AAChC,cAAQ,kCAAkC,QAAQ;AACjD,UAAI,cAAc;AAChB,eAAO,EAAC,SAAS,CAAC,GAAG,OAAO,KAAI;AAAA,MAClC;AACA,aAAO,EAAC,SAAS,CAAC,GAAG,KAAK,CAAC,GAAG,OAAO,KAAI;AAAA,IAC3C;AAEA,UAAM,0BAA0B,eAAe,IAAI,OAAK,cAAc,CAAC,CAAC;AAExE,mBAAe,QAAQ,OAAK,aAAa,GAAG,qBAAqB,CAAC;AAClE,UAAM,qBAAqB,eAAe,IAAI,OAAK,cAAc,CAAC,CAAC;AACnE,UAAM,SAAS,CAAC,GAAG,mBAAmB,GAAG,GAAG,aAAa,yBAAyB,kBAAkB,CAAC;AAErG,QAAI,cAAc;AAChB,aAAO,EAAC,WAAW,QAAQ,SAAS,MAAK;AAAA,IAC3C;AAEA,WAAO,EAAC,SAAS,CAAC,GAAG,KAAK,QAAQ,OAAO,KAAI;AAE7C,aAAS,qBAAqB;AAC5B,YAAM,CAAC,IAAI,IAAI,OAAO,IAAI,KAAK,EAAE,IAAI,OAAK,eAAe,MAAM,CAAC,IAAI,CAAC;AAErE,UAAI,CAAC,MAAM;AACV,gBAAQ,yBAAyB,GAAG;AACnC,eAAO,CAAC;AAAA,MACV;AACA,YAAM,WAAW,KAAK,MAAM,OAAO,IAAI,CAAC;AACxC,UAAI,CAAC,cAAc,SAAS,QAAQ,GAAG;AACtC,gBAAQ,wBAAwB,QAAQ,yDAAyD,QAAQ;AACxG,eAAO,CAAC;AAAA,MACV;AACA,YAAM,YAAY,KAAK;AACvB,YAAM,wBAAwB,eAAe,CAAC,EAAE,UAAU,KAAK,QAAM,sBAAsB,SAAS,GAAG,IAAI,CAAC;AAC5G,UAAI,sBAAsB,UAAU,OAAO;AACzC,gBAAQ,iCAAkC,sBAAsB,IAAI,IAAI,sBAAsB,KAAK,kCAAkC,QAAQ;AAC7I,eAAO,CAAC;AAAA,MACV;AACA,WAAK,QAAQ,GAAG,KAAK,MAAM,OAAO,GAAG,EAAE,CAAC,MAAM,KAAK,MAAM,OAAO,EAAE,CAAC;AACpE,cAAQ,uBAAuB,QAAQ,cAAc,QAAQ;AAC5D,aAAO,aAAa,CAAC,SAAS,GAAG,CAAC,KAAK,KAAK,CAAC;AAAA,IAC/C;AAEA,aAAS,aAAa,GAAG;AACvB,QAAE,YAAY,iBAAiB,EAAE,WAAW,CAAC,CAAC;AAAA,IAChD;AAEA,aAAS,iBAAiB,mBAAmB,oBAAoB,CAAC,GAAG;AACnE,YAAM,CAAC,cAAc,GAAG,cAAc,IAAI;AAC1C,UAAI,CAAC,cAAc;AACjB,eAAO;AAAA,MACT;AACA,UAAI,CAAC,uBAAuB,cAAc,CAAC,GAAG,mBAAmB,GAAG,cAAc,CAAC,GAAG;AACpF,eAAO,iBAAiB,gBAAgB,CAAC,GAAG,mBAAmB,YAAY,CAAC;AAAA,MAC9E;AAEA,YAAM,cAAc;AAAA,QAClB,MAAM,aAAa;AAAA,QACnB,OAAO;AAAA,MACT;AACD,cAAQ,gBAAiB,aAAa,IAAI,iBAAiB,aAAa,KAAK,KAAK,QAAQ;AAEzF,aAAO,iBAAiB,gBAAgB,CAAC,GAAG,mBAAmB,aAAa,YAAY,CAAC;AAAA,IAC3F;AAEA,aAAS,gBAAgB,GAAG;AAC1B,UAAI,EAAE,QAAQ,SAAS,CAAC,EAAE,aAAa,EAAE,UAAU,KAAK,QAAM,GAAG,SAAS,GAAG,GAAG;AAC9E,eAAO;AAAA,MACT;AACA,aAAO,EAAE,UAAU,KAAK,QAAM,uBAAuB,IAAI,EAAE,SAAS,CAAC;AAAA,IACvE;AAEA,aAAS,uBAAuB,IAAI,gBAAgB;AAElD,UAAI,CAAC,sBAAsB,SAAS,GAAG,IAAI,KAAK,CAAC,cAAc,SAAS,GAAG,KAAK,GAAG;AACjF,eAAO;AAAA,MACT;AACA,UAAI,eAAe,KAAK,SAAO,IAAI,SAAS,GAAG,QAAQ,IAAI,UAAU,KAAK,GAAG;AAC3E,eAAO;AAAA,MACT;AAEA,aAAO;AAAA,IACT;AAAA,EACF;AAEA,WAAS,aAAa,WAAW,UAAU;AACzC,WAAO,UAAU,IAAI,CAAC,OAAO,UAAU,YAAY,OAAO,KAAK,CAAC;AAEhE,aAAS,YAAY,MAAM,OAAO;AAChC,aAAO,IAAI,IAAI,SAAS,SAAS,KAAK,CAAC;AAAA,IACzC;AAAA,EACF;AAEA,WAAS,SAAS,QAAQ;AACxB,WAAO,IAAI,QAAQ,IAAI;AAAA,EACzB;AAOF;",
+  "names": []
+}

package/dist/fix-sami-041.test.js

@@ -0,0 +1,40 @@
+import assert from "node:assert/strict";
+import validatorFactory from "./fix-sami-041.js";
+import { MarcRecord } from "@natlibfi/marc-record";
+import { READERS } from "@natlibfi/fixura";
+import generateTests from "@natlibfi/fixugen";
+generateTests({
+  callback,
+  path: [import.meta.dirname, "..", "test-fixtures", "fix-sami-041"],
+  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");
+}
+async function callback({ getFixture, fix = false }) {
+  const validator = await validatorFactory();
+  const record = new MarcRecord(getFixture("record.json"));
+  const expectedResult = getFixture("expectedResult.json");
+  if (!fix) {
+    const result = await validator.validate(record);
+    assert.deepEqual(result, expectedResult);
+    const originalRecord = new MarcRecord(getFixture("record.json"));
+    assert.deepEqual(record, originalRecord);
+    return;
+  }
+  await validator.fix(record);
+  assert.deepEqual(record, new MarcRecord(expectedResult));
+}
+//# sourceMappingURL=fix-sami-041.test.js.map

package/dist/fix-sami-041.test.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../src/fix-sami-041.test.js"],
+  "sourcesContent": ["import assert from 'node:assert/strict';\n//import createDebugLogger from 'debug';\n\nimport validatorFactory from './fix-sami-041.js';\n\nimport {MarcRecord} from '@natlibfi/marc-record';\nimport {READERS} from '@natlibfi/fixura';\nimport generateTests from '@natlibfi/fixugen';\n\ngenerateTests({\n  callback,\n  path: [import.meta.dirname, '..', 'test-fixtures', 'fix-sami-041'],\n  useMetadataFile: true,\n  recurse: false,\n  fixura: {\n    reader: READERS.JSON\n  },\n  hooks: {\n    before: async () => {\n      testValidatorFactory();\n    }\n  }\n});\n\n//const debug = createDebugLogger('@natlibfi/marc-record-validators-melinda/drop-terms:test');\n\nasync function testValidatorFactory() {\n  const validator = await validatorFactory();\n\n  assert.equal(typeof validator, 'object');\n  assert.equal(typeof validator.description, 'string');\n  assert.equal(typeof validator.validate, 'function');\n}\n\nasync function callback({getFixture, fix = false}) {\n  const validator = await validatorFactory();\n  const record = new MarcRecord(getFixture('record.json'));\n  const expectedResult = getFixture('expectedResult.json');\n  //const expectedResult = new MarcRecord(getFixture('expectedResult.json'));\n  // console.log(expectedResult); // eslint-disable-line\n\n  if (!fix) {\n    const result = await validator.validate(record);\n    assert.deepEqual(result, expectedResult);\n    const originalRecord = new MarcRecord(getFixture('record.json'));\n    assert.deepEqual(record, originalRecord); // The record should now change in validation-only\n    return;\n  }\n\n  await validator.fix(record);\n  assert.deepEqual(record, new MarcRecord(expectedResult));\n}\n"],
+  "mappings": "AAAA,OAAO,YAAY;AAGnB,OAAO,sBAAsB;AAE7B,SAAQ,kBAAiB;AACzB,SAAQ,eAAc;AACtB,OAAO,mBAAmB;AAE1B,cAAc;AAAA,EACZ;AAAA,EACA,MAAM,CAAC,YAAY,SAAS,MAAM,iBAAiB,cAAc;AAAA,EACjE,iBAAiB;AAAA,EACjB,SAAS;AAAA,EACT,QAAQ;AAAA,IACN,QAAQ,QAAQ;AAAA,EAClB;AAAA,EACA,OAAO;AAAA,IACL,QAAQ,YAAY;AAClB,2BAAqB;AAAA,IACvB;AAAA,EACF;AACF,CAAC;AAID,eAAe,uBAAuB;AACpC,QAAM,YAAY,MAAM,iBAAiB;AAEzC,SAAO,MAAM,OAAO,WAAW,QAAQ;AACvC,SAAO,MAAM,OAAO,UAAU,aAAa,QAAQ;AACnD,SAAO,MAAM,OAAO,UAAU,UAAU,UAAU;AACpD;AAEA,eAAe,SAAS,EAAC,YAAY,MAAM,MAAK,GAAG;AACjD,QAAM,YAAY,MAAM,iBAAiB;AACzC,QAAM,SAAS,IAAI,WAAW,WAAW,aAAa,CAAC;AACvD,QAAM,iBAAiB,WAAW,qBAAqB;AAIvD,MAAI,CAAC,KAAK;AACR,UAAM,SAAS,MAAM,UAAU,SAAS,MAAM;AAC9C,WAAO,UAAU,QAAQ,cAAc;AACvC,UAAM,iBAAiB,IAAI,WAAW,WAAW,aAAa,CAAC;AAC/D,WAAO,UAAU,QAAQ,cAAc;AACvC;AAAA,EACF;AAEA,QAAM,UAAU,IAAI,MAAM;AAC1B,SAAO,UAAU,QAAQ,IAAI,WAAW,cAAc,CAAC;AACzD;",
+  "names": []
+}

package/dist/fixRelatorTerms.js

@@ -43,6 +43,8 @@ const relatorTerms = [
   { "code": "drt", "eng": "director", "fin": "ohjaaja", "swe": "regiss\xF6r" },
   { "code": "edt", "eng": "editor", "fin": "toimittaja", "swe": "redakt\xF6r" },
   { "code": "ill", "eng": "illustrator", "fin": "kuvittaja", "swe": "illustrat\xF6r" },
+  { "code": "ive", "eng": "interviewee", "fin": "haastateltava", "swe": "intervjuobjekt" },
+  { "code": "ivr", "eng": "interviewer", "fin": "haastattelija", "swe": "intervjuare" },
   { "code": "lyr", "eng": "lyricist", "fin": "sanoittaja", "swe": "s\xE5ngtext" },
   { "code": "nrt", "eng": "narrator", "fin": "kertoja", "swe": "ber\xE4ttare" },
   // berättare/inläsare

package/dist/fixRelatorTerms.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../src/fixRelatorTerms.js"],
-  "sourcesContent": ["import clone from 'clone';\nimport {fieldFixPunctuation} from './punctuation2.js';\nimport {fieldToString, getCatalogingLanguage, nvdebug, subfieldToString} from './utils.js';\nimport createDebugLogger from 'debug';\n\n// Currently mainly translates X00$e values, so that we don't have \"$a Name, $e kirjoittaja, $e f\u00F6rfattare.\".\n// Later on we could try and handle $4 stuff here as well.\n\n\nconst debug = createDebugLogger('@natlibfi/marc-record-validators-melinda:fixRelatorterms');\n//const debugData = debug.extend('data');\nconst debugDev = debug.extend('dev');\n\nexport default function () {\n  return {\n    description: 'Fix $e subfields in field [1678][01]0 and 720',\n    validate, fix\n  };\n\n  function fix(record) {\n    const res = {message: [], fix: [], valid: true};\n\n    const language = getCatalogingLanguage(record);\n\n    record.fields.forEach(field => {\n      fieldFixRelatorTerms(field, language, language);\n    });\n\n    return res;\n  }\n\n  function validate(record) {\n    const res = {message: []};\n\n    const language = getCatalogingLanguage(record);\n\n    record.fields.forEach(field => {\n      const clonedField = clone(field);\n      // Rather hackily/abnormally use language as both fromLanguage and toLanguage.\n      // fromLanguage is used to expand \"esitt.\" => \"esitt\u00E4j\u00E4\".\n      // toLanguage is used by translations (fixes \"f\u00F6rfattere\" to \"kirjoittaja\", if 040$b is \"fin\")\n      fieldFixRelatorTerms(field, language, language);\n      const clonedFieldAsString = fieldToString(clonedField);\n      const fieldAsString = fieldToString(field);\n      if (fieldAsString !== clonedFieldAsString) {\n        res.message.push(`${fieldAsString} => ${clonedFieldAsString}`);\n      }\n    });\n\n    res.valid = !(res.message.length >= 1);\n    return res;\n  }\n}\n\n\n/*\nexport default () => (base, source) => {\n  recordTranslateRelatorTerms(base);\n  recordTranslateRelatorTerms(source);\n  recordHandleRelatorTermAbbreviations(base);\n  recordHandleRelatorTermAbbreviations(source);\n  const result = {base, source};\n  return result;\n};\n*/\n\n\n// Partial source: https://marc21.kansalliskirjasto.fi/funktiot_koodit.htm\n// https://wiki.helsinki.fi/display/MARC21svenska/Funktions-+och+relationskoder+-+alfabetiskt+efter+funktion\n// New, better source: https://id.kb.se/find?q=relator&_sort=_sortKeyByLang.en\n\n\n// NB! How to handle German sex-based Verfasser/Verfasserin pairs?\nconst relatorTerms = [\n  {'code': 'arr', 'eng': 'arranger', 'fin': 'sovittaja', 'swe': 'arrang\u00F6r av musikalisk komposition'},\n  {'code': 'art', 'eng': 'artist', 'fin': 'taiteilija', 'swe': 'konstn\u00E4r'},\n  {'code': 'aui', 'eng': 'author of introduction', 'fin': 'esipuheen tekij\u00E4'},\n  {'code': 'aut', 'eng': 'author', 'fin': 'kirjoittaja', 'swe': 'f\u00F6rfattare'},\n  {'code': 'cmp', 'eng': 'composer', 'fin': 's\u00E4velt\u00E4j\u00E4', 'swe': 'komposit\u00F6r'},\n  {'code': 'drt', 'eng': 'director', 'fin': 'ohjaaja', 'swe': 'regiss\u00F6r'},\n  {'code': 'edt', 'eng': 'editor', 'fin': 'toimittaja', 'swe': 'redakt\u00F6r'},\n  {'code': 'ill', 'eng': 'illustrator', 'fin': 'kuvittaja', 'swe': 'illustrat\u00F6r'},\n  {'code': 'lyr', 'eng': 'lyricist', 'fin': 'sanoittaja', 'swe': 's\u00E5ngtext'},\n  {'code': 'nrt', 'eng': 'narrator', 'fin': 'kertoja', 'swe': 'ber\u00E4ttare'}, // ber\u00E4ttare/inl\u00E4sare\n  {'code': 'pbl', 'eng': 'publisher', 'fin': 'julkaisija', 'swe': 'utgivare'},\n  {'code': 'pht', 'eng': 'photographer', 'fin': 'valokuvaaja', 'swe': 'fotograf'},\n  {'code': 'prf', 'eng': 'performer', 'fin': 'esitt\u00E4j\u00E4', 'swe': 'framf\u00F6rande'},\n  {'code': 'pro', 'eng': 'producer', 'fin': 'tuottaja', 'swe': 'producent'},\n  {'code': 'trl', 'eng': 'translator', 'fin': 'k\u00E4\u00E4nt\u00E4j\u00E4', 'swe': '\u00F6vers\u00E4ttare'},\n  {'code': '__FAKE_VALUE1__', 'fin': 'sarjakuvantekij\u00E4', 'swe': 'serieskapare'}\n];\n\n/*\nfunction recordNormalizeRelatorTerms(record, defaultLanguageCode = undef) {\n  const languageCode = defaultLanguageCode ? defaultLanguageCode : getCatalogingLanguage(record);\n  if  (!languageCode || ['eng', 'fin', 'swe'].includes(languageCode)) {\n    return;\n  }\n\n}\n*/\n\n\nconst finnishAbbreviations = {\n  'esitt.': 'esitt\u00E4j\u00E4',\n  'k\u00E4\u00E4nt.': 'k\u00E4\u00E4nt\u00E4j\u00E4',\n  'n\u00E4ytt.': 'n\u00E4yttelij\u00E4',\n  'san.': 'sanoittaja',\n  'sov.': 'sovittaja',\n  's\u00E4v.': 's\u00E4velt\u00E4j\u00E4',\n  'toim.': 'toimittaja',\n  // Quick and dirty implementation of https://github.com/NatLibFi/USEMARCON-BOOKWHERE-RDA/blob/master/bw_rda_kyril.rul#L651\n  // As per M.I./Slavica\n  '\u0445\u0443\u0434\u043E\u0436.': 'kuvittaja',\n  '\u043F\u0435\u0440.': 'k\u00E4\u00E4nt\u00E4j\u00E4',\n  '\u0441\u043E\u0441\u0442.': 'toimittaja', // might also be 'kokoaja'\n  '\u0440\u0435\u0434.': 'toimittaja'\n};\n\nfunction subfieldHandleRelatorTermAbbreviation(subfield, language) {\n  if (subfield.code !== 'e') {\n    return;\n  }\n  nvdebug(`Relator cand subfield: '${subfieldToString(subfield)}', lang: ${language ? language : 'NULL'}`, debugDev);\n  if (!language || language === 'mul') {\n    subfieldHandleRelatorTermAbbreviation(subfield, 'fin');\n    // Maybe later add Swedish here...\n    return;\n  }\n  const value = subfield.value.replace(/,$/u, '');\n  const punc = value === subfield.value ? '' : ',';\n\n  const lcValue = value.toLowerCase(); // Check \u00C5, \u00C4, \u00D6...\n\n  // NB: Policy: if no language or multi-language: apply all rules! (Not much overlap I hope...)\n  if (!language || language === 'fin' || language === 'mul') {\n    nvdebug(`Relator try Finnish for '${lcValue}}'...`, debugDev);\n    if (lcValue in finnishAbbreviations) {\n      const hit = `${finnishAbbreviations[lcValue]}${punc}`;\n      nvdebug(`Relator hit: ${hit}`, debugDev);\n      // NB! 'esitt.' => 'esitt\u00E4j\u00E4'\n      subfield.value = hit;\n      return;\n    }\n  }\n}\n\n\nfunction isRelatorField(field) {\n  // Tag list might be incomplete!\n  return field.tag.match(/^(?:100|110|600|610|700|710|720|800|810)$/u);\n}\n\nfunction fieldHandleRelatorTermAbbreviations(field, language) {\n  if (!isRelatorField(field)) {\n    return;\n  }\n\n  const originalValue = fieldToString(field);\n  field.subfields.forEach(sf => subfieldHandleRelatorTermAbbreviation(sf, language));\n  const modifiedValue = fieldToString(field);\n  if (modifiedValue === originalValue) {\n    return;\n  }\n  // Changes have happened... Try to punctuate.\n  // (NB! We need punctuation as a module, if we are to make abbr expansion a marc-record-validators-melinda validator/fixer)\n  fieldFixPunctuation(field);\n}\n\nfunction termIsInGivenLanguage(term, language) {\n  return relatorTerms.some(row => language in row && row[language] === term);\n}\n\nfunction anyToLanguage(originalTerm) {\n  // Sometimes there's no 040$b or 040$b and, say, 040$b and 700$e value don't correlate\n  if (termIsInGivenLanguage(originalTerm, 'fin')) {\n    return 'fin';\n  }\n  if (termIsInGivenLanguage(originalTerm, 'swe')) {\n    return 'swe';\n  }\n  if (termIsInGivenLanguage(originalTerm, 'eng')) {\n    return 'eng';\n  }\n  return null;\n}\n\nfunction translateRelatorTerm(originalTerm, defaultFromLanguage, toLanguage) {\n\n  // originalTerm is supposed to be normal version (abbrs have been expanded), possibly with punctuation\n  const term = originalTerm.replace(/[,.]$/u, '');\n  nvdebug(`Try to translate '${term}' from ${defaultFromLanguage} to ${toLanguage}`, debugDev);\n\n  // Kind of hacky... If term is in toLanguage, do nothing. defaultFromLanguage (040$b) isn't that reliable.\n  if (termIsInGivenLanguage(term, toLanguage)) {\n    return originalTerm;\n  }\n  // defaultFomLanguage (typically 040$b) isn't that reliable:\n  const fromLanguage = defaultFromLanguage === null || !termIsInGivenLanguage(term, defaultFromLanguage) ? anyToLanguage(term) : defaultFromLanguage;\n\n  const [candRow] = relatorTerms.filter(row => fromLanguage in row && toLanguage in row && row[fromLanguage] === term);\n  if (candRow) {\n    const punc = term === originalTerm ? '' : originalTerm.slice(-1);\n    const translation = `${candRow[toLanguage]}${punc}`;\n    nvdebug(`Translate relator term: ${originalTerm} => ${translation}`, debugDev);\n    return translation;\n  }\n  return originalTerm;\n}\n\nfunction subfieldTranslateRelatorTerm(subfield, fromLanguage, toLanguage) {\n  if (subfield.code !== 'e') {\n    return;\n  }\n  subfield.value = translateRelatorTerm(subfield.value, fromLanguage, toLanguage);\n}\n\nexport function fieldFixRelatorTerms(field, fromLanguage, toLanguage) {\n  // fromLanguage can not be relied upon.\n  if (!isRelatorField(field)/* || fromLanguage === toLanguage*/) {\n    return;\n  }\n  fieldHandleRelatorTermAbbreviations(field, fromLanguage);\n\n  field.subfields.forEach(sf => subfieldTranslateRelatorTerm(sf, fromLanguage, toLanguage));\n}\n\n\nexport function recordFixRelatorTerms(record, defaultToLanguage = null, defaultFromLanguage = null) { // WAS: translateRecord()\n  const fromLanguage = defaultFromLanguage ? defaultFromLanguage : getCatalogingLanguage(record);\n  const toLanguage = defaultToLanguage ? defaultToLanguage : getCatalogingLanguage(record);\n\n  record.fields.forEach(field => translateField(field, fromLanguage, toLanguage));\n\n  function translateField(field, from, to) {\n    fieldFixRelatorTerms(field, from, to);\n  }\n}\n\n\n"],
-  "mappings": "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",
+  "sourcesContent": ["import clone from 'clone';\nimport {fieldFixPunctuation} from './punctuation2.js';\nimport {fieldToString, getCatalogingLanguage, nvdebug, subfieldToString} from './utils.js';\nimport createDebugLogger from 'debug';\n\n// Currently mainly translates X00$e values, so that we don't have \"$a Name, $e kirjoittaja, $e f\u00F6rfattare.\".\n// Later on we could try and handle $4 stuff here as well.\n\n\nconst debug = createDebugLogger('@natlibfi/marc-record-validators-melinda:fixRelatorterms');\n//const debugData = debug.extend('data');\nconst debugDev = debug.extend('dev');\n\nexport default function () {\n  return {\n    description: 'Fix $e subfields in field [1678][01]0 and 720',\n    validate, fix\n  };\n\n  function fix(record) {\n    const res = {message: [], fix: [], valid: true};\n\n    const language = getCatalogingLanguage(record);\n\n    record.fields.forEach(field => {\n      fieldFixRelatorTerms(field, language, language);\n    });\n\n    return res;\n  }\n\n  function validate(record) {\n    const res = {message: []};\n\n    const language = getCatalogingLanguage(record);\n\n    record.fields.forEach(field => {\n      const clonedField = clone(field);\n      // Rather hackily/abnormally use language as both fromLanguage and toLanguage.\n      // fromLanguage is used to expand \"esitt.\" => \"esitt\u00E4j\u00E4\".\n      // toLanguage is used by translations (fixes \"f\u00F6rfattere\" to \"kirjoittaja\", if 040$b is \"fin\")\n      fieldFixRelatorTerms(field, language, language);\n      const clonedFieldAsString = fieldToString(clonedField);\n      const fieldAsString = fieldToString(field);\n      if (fieldAsString !== clonedFieldAsString) {\n        res.message.push(`${fieldAsString} => ${clonedFieldAsString}`);\n      }\n    });\n\n    res.valid = !(res.message.length >= 1);\n    return res;\n  }\n}\n\n\n/*\nexport default () => (base, source) => {\n  recordTranslateRelatorTerms(base);\n  recordTranslateRelatorTerms(source);\n  recordHandleRelatorTermAbbreviations(base);\n  recordHandleRelatorTermAbbreviations(source);\n  const result = {base, source};\n  return result;\n};\n*/\n\n\n// Partial source: https://marc21.kansalliskirjasto.fi/funktiot_koodit.htm\n// https://wiki.helsinki.fi/display/MARC21svenska/Funktions-+och+relationskoder+-+alfabetiskt+efter+funktion\n// New, better source: https://id.kb.se/find?q=relator&_sort=_sortKeyByLang.en\n\n// NOTE: There are problematic relatorterms that do not diffrentiate between agent+work vs agent+ekspression relation\n// ie. teoksen haastattelija vs haastattelija (ekspressio)\n// current solution ignores them and handles just \"plain\" relator terms\n\n// NB! How to handle German sex-based Verfasser/Verfasserin pairs?\nconst relatorTerms = [\n  {'code': 'arr', 'eng': 'arranger', 'fin': 'sovittaja', 'swe': 'arrang\u00F6r av musikalisk komposition'},\n  {'code': 'art', 'eng': 'artist', 'fin': 'taiteilija', 'swe': 'konstn\u00E4r'},\n  {'code': 'aui', 'eng': 'author of introduction', 'fin': 'esipuheen tekij\u00E4'},\n  {'code': 'aut', 'eng': 'author', 'fin': 'kirjoittaja', 'swe': 'f\u00F6rfattare'},\n  {'code': 'cmp', 'eng': 'composer', 'fin': 's\u00E4velt\u00E4j\u00E4', 'swe': 'komposit\u00F6r'},\n  {'code': 'drt', 'eng': 'director', 'fin': 'ohjaaja', 'swe': 'regiss\u00F6r'},\n  {'code': 'edt', 'eng': 'editor', 'fin': 'toimittaja', 'swe': 'redakt\u00F6r'},\n  {'code': 'ill', 'eng': 'illustrator', 'fin': 'kuvittaja', 'swe': 'illustrat\u00F6r'},\n  {'code': 'ive', 'eng': 'interviewee', 'fin': 'haastateltava', 'swe': 'intervjuobjekt'},\n  {'code': 'ivr', 'eng': 'interviewer', 'fin': 'haastattelija', 'swe': 'intervjuare'},\n  {'code': 'lyr', 'eng': 'lyricist', 'fin': 'sanoittaja', 'swe': 's\u00E5ngtext'},\n  {'code': 'nrt', 'eng': 'narrator', 'fin': 'kertoja', 'swe': 'ber\u00E4ttare'}, // ber\u00E4ttare/inl\u00E4sare\n  {'code': 'pbl', 'eng': 'publisher', 'fin': 'julkaisija', 'swe': 'utgivare'},\n  {'code': 'pht', 'eng': 'photographer', 'fin': 'valokuvaaja', 'swe': 'fotograf'},\n  {'code': 'prf', 'eng': 'performer', 'fin': 'esitt\u00E4j\u00E4', 'swe': 'framf\u00F6rande'},\n  {'code': 'pro', 'eng': 'producer', 'fin': 'tuottaja', 'swe': 'producent'},\n  {'code': 'trl', 'eng': 'translator', 'fin': 'k\u00E4\u00E4nt\u00E4j\u00E4', 'swe': '\u00F6vers\u00E4ttare'},\n  {'code': '__FAKE_VALUE1__', 'fin': 'sarjakuvantekij\u00E4', 'swe': 'serieskapare'}\n];\n\n/*\nfunction recordNormalizeRelatorTerms(record, defaultLanguageCode = undef) {\n  const languageCode = defaultLanguageCode ? defaultLanguageCode : getCatalogingLanguage(record);\n  if  (!languageCode || ['eng', 'fin', 'swe'].includes(languageCode)) {\n    return;\n  }\n\n}\n*/\n\n\nconst finnishAbbreviations = {\n  'esitt.': 'esitt\u00E4j\u00E4',\n  'k\u00E4\u00E4nt.': 'k\u00E4\u00E4nt\u00E4j\u00E4',\n  'n\u00E4ytt.': 'n\u00E4yttelij\u00E4',\n  'san.': 'sanoittaja',\n  'sov.': 'sovittaja',\n  's\u00E4v.': 's\u00E4velt\u00E4j\u00E4',\n  'toim.': 'toimittaja',\n  // Quick and dirty implementation of https://github.com/NatLibFi/USEMARCON-BOOKWHERE-RDA/blob/master/bw_rda_kyril.rul#L651\n  // As per M.I./Slavica\n  '\u0445\u0443\u0434\u043E\u0436.': 'kuvittaja',\n  '\u043F\u0435\u0440.': 'k\u00E4\u00E4nt\u00E4j\u00E4',\n  '\u0441\u043E\u0441\u0442.': 'toimittaja', // might also be 'kokoaja'\n  '\u0440\u0435\u0434.': 'toimittaja'\n};\n\nfunction subfieldHandleRelatorTermAbbreviation(subfield, language) {\n  if (subfield.code !== 'e') {\n    return;\n  }\n  nvdebug(`Relator cand subfield: '${subfieldToString(subfield)}', lang: ${language ? language : 'NULL'}`, debugDev);\n  if (!language || language === 'mul') {\n    subfieldHandleRelatorTermAbbreviation(subfield, 'fin');\n    // Maybe later add Swedish here...\n    return;\n  }\n  const value = subfield.value.replace(/,$/u, '');\n  const punc = value === subfield.value ? '' : ',';\n\n  const lcValue = value.toLowerCase(); // Check \u00C5, \u00C4, \u00D6...\n\n  // NB: Policy: if no language or multi-language: apply all rules! (Not much overlap I hope...)\n  if (!language || language === 'fin' || language === 'mul') {\n    nvdebug(`Relator try Finnish for '${lcValue}}'...`, debugDev);\n    if (lcValue in finnishAbbreviations) {\n      const hit = `${finnishAbbreviations[lcValue]}${punc}`;\n      nvdebug(`Relator hit: ${hit}`, debugDev);\n      // NB! 'esitt.' => 'esitt\u00E4j\u00E4'\n      subfield.value = hit;\n      return;\n    }\n  }\n}\n\n\nfunction isRelatorField(field) {\n  // Tag list might be incomplete!\n  return field.tag.match(/^(?:100|110|600|610|700|710|720|800|810)$/u);\n}\n\nfunction fieldHandleRelatorTermAbbreviations(field, language) {\n  if (!isRelatorField(field)) {\n    return;\n  }\n\n  const originalValue = fieldToString(field);\n  field.subfields.forEach(sf => subfieldHandleRelatorTermAbbreviation(sf, language));\n  const modifiedValue = fieldToString(field);\n  if (modifiedValue === originalValue) {\n    return;\n  }\n  // Changes have happened... Try to punctuate.\n  // (NB! We need punctuation as a module, if we are to make abbr expansion a marc-record-validators-melinda validator/fixer)\n  fieldFixPunctuation(field);\n}\n\nfunction termIsInGivenLanguage(term, language) {\n  return relatorTerms.some(row => language in row && row[language] === term);\n}\n\nfunction anyToLanguage(originalTerm) {\n  // Sometimes there's no 040$b or 040$b and, say, 040$b and 700$e value don't correlate\n  if (termIsInGivenLanguage(originalTerm, 'fin')) {\n    return 'fin';\n  }\n  if (termIsInGivenLanguage(originalTerm, 'swe')) {\n    return 'swe';\n  }\n  if (termIsInGivenLanguage(originalTerm, 'eng')) {\n    return 'eng';\n  }\n  return null;\n}\n\nfunction translateRelatorTerm(originalTerm, defaultFromLanguage, toLanguage) {\n\n  // originalTerm is supposed to be normal version (abbrs have been expanded), possibly with punctuation\n  const term = originalTerm.replace(/[,.]$/u, '');\n  nvdebug(`Try to translate '${term}' from ${defaultFromLanguage} to ${toLanguage}`, debugDev);\n\n  // Kind of hacky... If term is in toLanguage, do nothing. defaultFromLanguage (040$b) isn't that reliable.\n  if (termIsInGivenLanguage(term, toLanguage)) {\n    return originalTerm;\n  }\n  // defaultFomLanguage (typically 040$b) isn't that reliable:\n  const fromLanguage = defaultFromLanguage === null || !termIsInGivenLanguage(term, defaultFromLanguage) ? anyToLanguage(term) : defaultFromLanguage;\n\n  const [candRow] = relatorTerms.filter(row => fromLanguage in row && toLanguage in row && row[fromLanguage] === term);\n  if (candRow) {\n    const punc = term === originalTerm ? '' : originalTerm.slice(-1);\n    const translation = `${candRow[toLanguage]}${punc}`;\n    nvdebug(`Translate relator term: ${originalTerm} => ${translation}`, debugDev);\n    return translation;\n  }\n  return originalTerm;\n}\n\nfunction subfieldTranslateRelatorTerm(subfield, fromLanguage, toLanguage) {\n  if (subfield.code !== 'e') {\n    return;\n  }\n  subfield.value = translateRelatorTerm(subfield.value, fromLanguage, toLanguage);\n}\n\nexport function fieldFixRelatorTerms(field, fromLanguage, toLanguage) {\n  // fromLanguage can not be relied upon.\n  if (!isRelatorField(field)/* || fromLanguage === toLanguage*/) {\n    return;\n  }\n  fieldHandleRelatorTermAbbreviations(field, fromLanguage);\n\n  field.subfields.forEach(sf => subfieldTranslateRelatorTerm(sf, fromLanguage, toLanguage));\n}\n\n\nexport function recordFixRelatorTerms(record, defaultToLanguage = null, defaultFromLanguage = null) { // WAS: translateRecord()\n  const fromLanguage = defaultFromLanguage ? defaultFromLanguage : getCatalogingLanguage(record);\n  const toLanguage = defaultToLanguage ? defaultToLanguage : getCatalogingLanguage(record);\n\n  record.fields.forEach(field => translateField(field, fromLanguage, toLanguage));\n\n  function translateField(field, from, to) {\n    fieldFixRelatorTerms(field, from, to);\n  }\n}\n\n\n"],
+  "mappings": "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",
   "names": []
 }

package/dist/fixRelatorTerms.test.js

@@ -3,7 +3,6 @@ import { MarcRecord } from "@natlibfi/marc-record";
 import validatorFactory from "./fixRelatorTerms.js";
 import { READERS } from "@natlibfi/fixura";
 import generateTests from "@natlibfi/fixugen";
-import createDebugLogger from "debug";
 generateTests({
   callback,
   path: [import.meta.dirname, "..", "test-fixtures", "fix-relator-terms"],
@@ -18,18 +17,13 @@ generateTests({
     }
   }
 });
-const debug = createDebugLogger("@natlibfi/marc-record-validators-melinda/fixRelatorTerms: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;
-  }
+async function callback({ getFixture, fix = false }) {
   const validator = await validatorFactory();
   const record = new MarcRecord(getFixture("record.json"));
   const expectedResult = getFixture("expectedResult.json");

package/dist/fixRelatorTerms.test.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../src/fixRelatorTerms.test.js"],
-  "sourcesContent": ["import assert from 'node:assert';\nimport {MarcRecord} from '@natlibfi/marc-record';\nimport validatorFactory from './fixRelatorTerms.js';\nimport {READERS} from '@natlibfi/fixura';\nimport generateTests from '@natlibfi/fixugen';\nimport createDebugLogger from 'debug';\n\ngenerateTests({\n  callback,\n  path: [import.meta.dirname, '..', 'test-fixtures', 'fix-relator-terms'],\n  useMetadataFile: true,\n  recurse: false,\n  fixura: {\n    reader: READERS.JSON\n  },\n  hooks: {\n    before: async () => {\n      testValidatorFactory();\n    }\n  }\n});\n\nconst debug = createDebugLogger('@natlibfi/marc-record-validators-melinda/fixRelatorTerms:test');\n\nasync function testValidatorFactory() {\n  const validator = await validatorFactory();\n\n  assert.equal(typeof validator, 'object');\n  assert.equal(typeof validator.description, 'string');\n  assert.equal(typeof validator.validate, 'function');\n}\n\nasync function callback({getFixture, enabled = true, fix = false}) {\n  if (enabled === false) {\n    debug('TEST SKIPPED!');\n    return;\n  }\n\n  const validator = await validatorFactory();\n  const record = new MarcRecord(getFixture('record.json'));\n  const expectedResult = getFixture('expectedResult.json');\n  // console.log(expectedResult); // eslint-disable-line\n\n  if (!fix) {\n    const result = await validator.validate(record);\n    assert.deepEqual(result, expectedResult);\n    return;\n  }\n\n  await validator.fix(record);\n  assert.deepEqual(record, expectedResult);\n}\n"],
-  "mappings": "AAAA,OAAO,YAAY;AACnB,SAAQ,kBAAiB;AACzB,OAAO,sBAAsB;AAC7B,SAAQ,eAAc;AACtB,OAAO,mBAAmB;AAC1B,OAAO,uBAAuB;AAE9B,cAAc;AAAA,EACZ;AAAA,EACA,MAAM,CAAC,YAAY,SAAS,MAAM,iBAAiB,mBAAmB;AAAA,EACtE,iBAAiB;AAAA,EACjB,SAAS;AAAA,EACT,QAAQ;AAAA,IACN,QAAQ,QAAQ;AAAA,EAClB;AAAA,EACA,OAAO;AAAA,IACL,QAAQ,YAAY;AAClB,2BAAqB;AAAA,IACvB;AAAA,EACF;AACF,CAAC;AAED,MAAM,QAAQ,kBAAkB,+DAA+D;AAE/F,eAAe,uBAAuB;AACpC,QAAM,YAAY,MAAM,iBAAiB;AAEzC,SAAO,MAAM,OAAO,WAAW,QAAQ;AACvC,SAAO,MAAM,OAAO,UAAU,aAAa,QAAQ;AACnD,SAAO,MAAM,OAAO,UAAU,UAAU,UAAU;AACpD;AAEA,eAAe,SAAS,EAAC,YAAY,UAAU,MAAM,MAAM,MAAK,GAAG;AACjE,MAAI,YAAY,OAAO;AACrB,UAAM,eAAe;AACrB;AAAA,EACF;AAEA,QAAM,YAAY,MAAM,iBAAiB;AACzC,QAAM,SAAS,IAAI,WAAW,WAAW,aAAa,CAAC;AACvD,QAAM,iBAAiB,WAAW,qBAAqB;AAGvD,MAAI,CAAC,KAAK;AACR,UAAM,SAAS,MAAM,UAAU,SAAS,MAAM;AAC9C,WAAO,UAAU,QAAQ,cAAc;AACvC;AAAA,EACF;AAEA,QAAM,UAAU,IAAI,MAAM;AAC1B,SAAO,UAAU,QAAQ,cAAc;AACzC;",
+  "sourcesContent": ["import assert from 'node:assert';\nimport {MarcRecord} from '@natlibfi/marc-record';\nimport validatorFactory from './fixRelatorTerms.js';\nimport {READERS} from '@natlibfi/fixura';\nimport generateTests from '@natlibfi/fixugen';\n//import createDebugLogger from 'debug';\n\ngenerateTests({\n  callback,\n  path: [import.meta.dirname, '..', 'test-fixtures', 'fix-relator-terms'],\n  useMetadataFile: true,\n  recurse: false,\n  fixura: {\n    reader: READERS.JSON\n  },\n  hooks: {\n    before: async () => {\n      testValidatorFactory();\n    }\n  }\n});\n\n//const debug = createDebugLogger('@natlibfi/marc-record-validators-melinda/fixRelatorTerms:test');\n\nasync function testValidatorFactory() {\n  const validator = await validatorFactory();\n\n  assert.equal(typeof validator, 'object');\n  assert.equal(typeof validator.description, 'string');\n  assert.equal(typeof validator.validate, 'function');\n}\n\nasync function callback({getFixture, fix = false}) {\n  const validator = await validatorFactory();\n  const record = new MarcRecord(getFixture('record.json'));\n  const expectedResult = getFixture('expectedResult.json');\n  // console.log(expectedResult); // eslint-disable-line\n\n  if (!fix) {\n    const result = await validator.validate(record);\n    assert.deepEqual(result, expectedResult);\n    return;\n  }\n\n  await validator.fix(record);\n  assert.deepEqual(record, expectedResult);\n}\n"],
+  "mappings": "AAAA,OAAO,YAAY;AACnB,SAAQ,kBAAiB;AACzB,OAAO,sBAAsB;AAC7B,SAAQ,eAAc;AACtB,OAAO,mBAAmB;AAG1B,cAAc;AAAA,EACZ;AAAA,EACA,MAAM,CAAC,YAAY,SAAS,MAAM,iBAAiB,mBAAmB;AAAA,EACtE,iBAAiB;AAAA,EACjB,SAAS;AAAA,EACT,QAAQ;AAAA,IACN,QAAQ,QAAQ;AAAA,EAClB;AAAA,EACA,OAAO;AAAA,IACL,QAAQ,YAAY;AAClB,2BAAqB;AAAA,IACvB;AAAA,EACF;AACF,CAAC;AAID,eAAe,uBAAuB;AACpC,QAAM,YAAY,MAAM,iBAAiB;AAEzC,SAAO,MAAM,OAAO,WAAW,QAAQ;AACvC,SAAO,MAAM,OAAO,UAAU,aAAa,QAAQ;AACnD,SAAO,MAAM,OAAO,UAAU,UAAU,UAAU;AACpD;AAEA,eAAe,SAAS,EAAC,YAAY,MAAM,MAAK,GAAG;AACjD,QAAM,YAAY,MAAM,iBAAiB;AACzC,QAAM,SAAS,IAAI,WAAW,WAAW,aAAa,CAAC;AACvD,QAAM,iBAAiB,WAAW,qBAAqB;AAGvD,MAAI,CAAC,KAAK;AACR,UAAM,SAAS,MAAM,UAAU,SAAS,MAAM;AAC9C,WAAO,UAAU,QAAQ,cAAc;AACvC;AAAA,EACF;AAEA,QAAM,UAAU,IAAI,MAAM;AAC1B,SAAO,UAAU,QAAQ,cAAc;AACzC;",
   "names": []
 }

package/dist/index.js

@@ -21,6 +21,7 @@ import Fix33X from "./fix-33X.js";
 import FixCountryCodes from "./fix-country-codes.js";
 import FixLanguageCodes from "./fix-language-codes.js";
 import FixRelatorTerms from "./fixRelatorTerms.js";
+import FixSami041 from "./fix-sami-041.js";
 import FixedFields from "./fixed-fields.js";
 import IdenticalFields from "./identical-fields.js";
 import IndicatorFixes from "./indicator-fixes.js";
@@ -39,6 +40,7 @@ import NormalizeUTF8Diacritics from "./normalize-utf8-diacritics.js";
 import Punctuation from "./punctuation/index.js";
 import Punctuation2 from "./punctuation2.js";
 import ReindexSubfield6OccurenceNumbers from "./reindexSubfield6OccurenceNumbers.js";
+import Remove041zxx from "./remove-041-zxx.js";
 import RemoveDuplicateDataFields from "./removeDuplicateDataFields.js";
 import RemoveInferiorDataFields from "./removeInferiorDataFields.js";
 import ResolvableExtReferences from "./resolvable-ext-references-melinda.js";
@@ -51,6 +53,7 @@ import SortTags from "./sort-tags.js";
 import SubfieldValueNormalizations from "./subfieldValueNormalizations.js";
 import SubfieldExclusion from "./subfield-exclusion.js";
 import Sync007And300 from "./sync-007-and-300.js";
+import SyncLanguage from "./sync-language.js";
 import TranslateTerms from "./translate-terms.js";
 import TypeOfDateF008 from "./typeOfDate-008.js";
 import UnicodeDecomposition from "./unicode-decomposition.js";
@@ -62,12 +65,14 @@ import { mergeField } from "./merge-fields/mergeField.js";
 import {
   fieldGetOccurrenceNumberPairs,
   fieldGetUnambiguousOccurrenceNumber,
+  fieldHasValidSubfield6,
   fieldToNormalizedString,
   fieldsToNormalizedString,
   get6s,
+  isSubfield6Pair,
   isValidSubfield6,
-  recordGetMaxSubfield6OccurrenceNumberAsInteger,
   intToOccurrenceNumberString,
+  recordGetMaxSubfield6OccurrenceNumberAsInteger,
   resetSubfield6Tag,
   subfield6ResetOccurrenceNumber,
   subfield6GetOccurrenceNumber,
@@ -77,13 +82,13 @@ import { getSubfield8LinkingNumber, isValidSubfield8, recordGetAllSubfield8Linki
 import { recordFixRelatorTerms } from "./fixRelatorTerms.js";
 import { fieldTrimSubfieldValues } from "./normalizeFieldForComparison.js";
 import { baseHasEqualOrHigherEncodingLevel, deleteAllPrepublicationNotesFromField500InNonPubRecord, encodingLevelIsBetterThanPrepublication, getEncodingLevel, isEnnakkotietoField, isEnnakkotietoSubfield } from "./prepublicationUtils.js";
-import { melindaFieldSpecs } from "@natlibfi/marc-record-validators-melinda/dist/melindaCustomMergeFields.js";
+import { melindaFieldSpecs } from "./melindaCustomMergeFields.js";
 import { cloneAndRemovePunctuation } from "./normalizeFieldForComparison.js";
 import { removeWorsePrepubField500s, removeWorsePrepubField594s } from "./prepublicationUtils.js";
 import { fieldFixPunctuation } from "./punctuation2.js";
 import { recordResetSubfield6OccurrenceNumbers } from "./reindexSubfield6OccurenceNumbers.js";
 import { sortAdjacentSubfields } from "./sortSubfields.js";
-import { fieldsToString } from "./utils.js";
+import { fieldHasSubfield, fieldToString, fieldsToString, isContentSubfieldCode, tagIsRepeatable } from "./utils.js";
 export {
   AccessRights,
   AddMissingField041,
@@ -108,6 +113,7 @@ export {
   FixCountryCodes,
   FixLanguageCodes,
   FixRelatorTerms,
+  FixSami041,
   FixedFields,
   IdenticalFields,
   IndicatorFixes,
@@ -126,6 +132,7 @@ export {
   Punctuation2,
   ResolveOrphanedSubfield6s,
   ReindexSubfield6OccurenceNumbers,
+  Remove041zxx,
   RemoveDuplicateDataFields,
   RemoveInferiorDataFields,
   ResolvableExtReferences,
@@ -136,8 +143,9 @@ export {
   SubfieldExclusion,
   SubfieldValueNormalizations,
   Sync007And300,
-  TypeOfDateF008,
+  SyncLanguage,
   TranslateTerms,
+  TypeOfDateF008,
   UnicodeDecomposition,
   UpdateField540,
   Urn,
@@ -146,12 +154,16 @@ export {
   getEncodingLevel,
   cloneAndRemovePunctuation,
   fieldFixPunctuation,
+  fieldHasSubfield,
   fieldToNormalizedString,
+  fieldToString,
   fieldTrimSubfieldValues,
   fieldsToNormalizedString,
   fieldsToString,
+  isContentSubfieldCode,
   recordFixRelatorTerms,
   sortAdjacentSubfields,
+  tagIsRepeatable,
   baseHasEqualOrHigherEncodingLevel,
   deleteAllPrepublicationNotesFromField500InNonPubRecord,
   encodingLevelIsBetterThanPrepublication,
@@ -162,7 +174,9 @@ export {
   fieldGetOccurrenceNumberPairs,
   get6s,
   fieldGetUnambiguousOccurrenceNumber,
+  fieldHasValidSubfield6,
   intToOccurrenceNumberString,
+  isSubfield6Pair,
   isValidSubfield6,
   recordGetMaxSubfield6OccurrenceNumberAsInteger,
   recordResetSubfield6OccurrenceNumbers,