@natlibfi/marc-record-validators-melinda 12.0.0 → 12.0.1

package/dist/update-field-540.test.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../src/update-field-540.test.js"],
-  "sourcesContent": ["import assert from 'node:assert';\nimport {MarcRecord} from '@natlibfi/marc-record';\nimport validatorFactory from './update-field-540.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', 'update-field-540'],\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/update-field-540:test');\n\nasync function testValidatorFactory() {\n  const validator = await validatorFactory();\n\n  assert(validator)\n    .to.be.an('object')\n    .that.has.any.keys('description', 'validate');\n\n  assert(validator.description).to.be.a('string');\n  assert(validator.validate).to.be.a('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,kBAAkB;AAAA,EACrE,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,gEAAgE;AAEhG,eAAe,uBAAuB;AACpC,QAAM,YAAY,MAAM,iBAAiB;AAEzC,SAAO,SAAS,EACb,GAAG,GAAG,GAAG,QAAQ,EACjB,KAAK,IAAI,IAAI,KAAK,eAAe,UAAU;AAE9C,SAAO,UAAU,WAAW,EAAE,GAAG,GAAG,EAAE,QAAQ;AAC9C,SAAO,UAAU,QAAQ,EAAE,GAAG,GAAG,EAAE,UAAU;AAC/C;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 './update-field-540.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', 'update-field-540'],\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/update-field-540:test');\n\nasync function testValidatorFactory() {\n  const validator = await validatorFactory();\n\n  assert(validator)\n    .to.be.an('object')\n    .that.has.any.keys('description', 'validate');\n\n  assert(validator.description).to.be.a('string');\n  assert(validator.validate).to.be.a('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,kBAAkB;AAAA,EACrE,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,SAAS,EACb,GAAG,GAAG,GAAG,QAAQ,EACjB,KAAK,IAAI,IAAI,KAAK,eAAe,UAAU;AAE9C,SAAO,UAAU,WAAW,EAAE,GAAG,GAAG,EAAE,QAAQ;AAC9C,SAAO,UAAU,QAAQ,EAAE,GAAG,GAAG,EAAE,UAAU;AAC/C;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/urn.test.js

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

package/dist/urn.test.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../src/urn.test.js"],
-  "sourcesContent": ["import assert from 'node:assert';\nimport {MarcRecord} from '@natlibfi/marc-record';\nimport validatorFactory from './urn.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', 'urn'],\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/urn: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 = true, isLegalDeposit = false}) {\n  if (enabled === false) {\n    debug('TEST SKIPPED!');\n    return;\n  }\n\n  const validator = await validatorFactory(isLegalDeposit);\n  const record = new MarcRecord(getFixture('input.json'));\n  const expectedResult = getFixture('result.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,KAAK;AAAA,EACxD,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,mDAAmD;AAEnF,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,MAAM,iBAAiB,MAAK,GAAG;AACxF,MAAI,YAAY,OAAO;AACrB,UAAM,eAAe;AACrB;AAAA,EACF;AAEA,QAAM,YAAY,MAAM,iBAAiB,cAAc;AACvD,QAAM,SAAS,IAAI,WAAW,WAAW,YAAY,CAAC;AACtD,QAAM,iBAAiB,WAAW,aAAa;AAG/C,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 './urn.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', 'urn'],\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/urn: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 = true, isLegalDeposit = false}) {\n  const validator = await validatorFactory(isLegalDeposit);\n  const record = new MarcRecord(getFixture('input.json'));\n  const expectedResult = getFixture('result.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,KAAK;AAAA,EACxD,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,MAAM,iBAAiB,MAAK,GAAG;AACxE,QAAM,YAAY,MAAM,iBAAiB,cAAc;AACvD,QAAM,SAAS,IAAI,WAAW,WAAW,YAAY,CAAC;AACtD,QAAM,iBAAiB,WAAW,aAAa;AAG/C,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/package.json

@@ -14,7 +14,7 @@
     "url": "https://github.com/NatLibFi/marc-record-validators-melinda"
   },
   "license": "MIT",
-  "version": "12.0.0",
+  "version": "12.0.1",
   "main": "./dist/index.js",
   "publishConfig": {
     "access": "public"
@@ -29,22 +29,24 @@
     "lint:dev": "eslint --fix ./src",
     "test": "npm run lint && npm run test:base",
     "test:base": "node --test --test-force-exit --experimental-test-coverage --test-reporter=spec './src/*.test.js' './src/**/*.test.js'",
+    "test:only": "npm run lint && npm run test:base:only",
+    "test:base:only": "node --test --test-only --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"
   },
   "dependencies": {
     "@natlibfi/iso9-1995": "^1.0.0",
     "@natlibfi/issn-verify": "^2.0.0",
-    "@natlibfi/marc-record": "^10.0.0",
-    "@natlibfi/marc-record-serializers": "^11.0.0",
+    "@natlibfi/marc-record": "^10.0.1",
+    "@natlibfi/marc-record-serializers": "^11.0.1",
     "@natlibfi/marc-record-validate": "^9.0.0",
-    "@natlibfi/melinda-commons": "^14.0.0",
+    "@natlibfi/melinda-commons": "^14.0.1",
     "@natlibfi/sfs-4900": "^2.0.0",
     "@natlibfi/sru-client": "^7.0.0",
     "cld3-asm": "^4.0.0",
     "clone": "^2.1.2",
     "debug": "^4.4.3",
-    "isbn3": "^2.0.0",
+    "isbn3": "^2.0.1",
     "langs": "^2.0.0",
     "undici": "^7.16.0",
     "xml2js": "^0.6.2",
@@ -57,7 +59,7 @@
     "@natlibfi/fixugen": "^3.0.0",
     "@natlibfi/fixura": "^4.0.0",
     "cross-env": "^10.1.0",
-    "esbuild": "^0.25.12",
+    "esbuild": "^0.27.1",
     "eslint": "^9.39.1",
     "fetch-mock": "^12.6.0"
   },

package/src/disambiguateSeriesStatements.test.js

@@ -3,7 +3,7 @@ import {MarcRecord} from '@natlibfi/marc-record';
 import validatorFactory from './disambiguateSeriesStatements.js';
 import {READERS} from '@natlibfi/fixura';
 import generateTests from '@natlibfi/fixugen';
-import createDebugLogger from 'debug';
+//import createDebugLogger from 'debug';
 
 generateTests({
   callback,
@@ -19,7 +19,7 @@ generateTests({
     }
   }
 });
-const debug = createDebugLogger('@natlibfi/marc-record-validators-melinda/disambiguateSeriesStatements:test');
+//const debug = createDebugLogger('@natlibfi/marc-record-validators-melinda/disambiguateSeriesStatements:test');
 
 async function testValidatorFactory() {
   const validator = await validatorFactory();
@@ -29,12 +29,7 @@ async function testValidatorFactory() {
   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/src/drop-terms.js

@@ -0,0 +1,162 @@
+// Author(s): Nicholas Volk
+
+import clone from 'clone';
+import createDebugLogger from 'debug';
+import {fieldToString, nvdebug} from './utils.js';
+import {getLexiconAndLanguage, getTermData, isLabel, isValidSubfield0} from './translate-terms.js';
+
+const debug = createDebugLogger('@natlibfi/marc-record-validators-melinda:drop-terms');
+
+
+const defaultConfig = {
+  'constraints': [
+    {'tag': '648', 'lex': 'yso/fin'},
+    {'tag': '648', 'lex': 'yso/swe'},
+    {'tag': '650', 'lex': 'yso/fin'},
+    {'tag': '650', 'lex': 'yso/swe'},
+    {'tag': '651', 'lex': 'yso/fin'},
+    {'tag': '651', 'lex': 'yso/swe'},
+    {'tag': '655', 'lex': 'slm/fin'},
+    {'tag': '655', 'lex': 'slm/swe'}
+  ],
+  'keep invalid url': false, // If not true, removes illegal subfield $0. The whole field removal is later decided by 'keep 0-less'
+  'keep invalid label': false, // label ($a) is neither pref Label nor altLabel => remove whole field
+  'remove altLabel': false,
+  'remove 0-less': true
+};
+
+export default function (config = defaultConfig) {
+
+  return {
+    description: 'Drop yso and slm terms that do not match their identifiers. Use for incoming records only! Not for records already in Melinda!',
+    validate, fix
+  };
+
+  async function fix(record, validateMode = false) {
+    const clonedFields = record.fields.map(f => clone(f));
+
+    const results = await processFields(clonedFields);
+
+    const removables = results.map((f, i) => !f ? record.fields[i] : undefined).filter(f => f);
+    const modMessages = results.map((f, i) => getMod(f, i)).filter(f => f);
+    const removalMessages = removables.map(f => `Remove '${fieldToString(f)}'`);
+    const allMessages = [...modMessages, ...removalMessages];
+
+    if (validateMode) {
+      if (allMessages.length === 0) {
+        return {'message': [], 'valid': true};
+      }
+      return {'message': allMessages, 'valid': false};
+    }
+
+    removables.forEach(f => record.removeField(f));
+
+    return {message: [], fix: allMessages, valid: true};
+
+    function getMod(field, index) {
+      if (!field) {
+        return undefined;
+      }
+      const before = fieldToString(record.fields[index]);
+      const after = fieldToString(results[index]);
+      if (before !== after) {
+        if (!validateMode) {
+          record.fields[index] = field;
+        }
+        return `Modify '${before}' => '${after}'`;
+      }
+      return undefined;
+    }
+  }
+
+  function isPotentialField(f) {
+    if (!config || !config.constraints) {
+      return false;
+    }
+    return config.constraints.some(c => c.tag === f.tag && f.subfields?.some(sf => sf.code === '2' && sf.value === c.lex));
+  }
+
+  async function validate(record) {
+    return fix(record, true);
+  }
+
+
+  async function processFields(fields, results = []) {
+    const [currField, ...remainingFields] = fields;
+    if (!currField) {
+      return results;
+    }
+
+    if (!isPotentialField(currField)) { // Not interested in this field
+      return processFields(remainingFields, [...results, currField]);
+    }
+
+    removeSyntacticallyIllegalSubfield0s(currField); // iff config wants them to be removed...
+
+    const removable = await isRemovableField(currField);
+
+    return processFields(remainingFields, [...results, removable ? undefined : currField]);
+  }
+
+  function removeSyntacticallyIllegalSubfield0s(field) {
+    if (config['keep invalid url']) {
+      return;
+    }
+
+    const lexData = getLexiconAndLanguage(field);
+    if (!lexData.lang) { // This is an error of sorts. Should we proceed and remove $0s?
+      return;
+    }
+
+    field.subfields = field.subfields.filter(sf => sf.code !== '0' || isValidSubfield0(sf, lexData.lex));
+  }
+
+  async function isRemovableField(field) {
+    // nvdebug(`FOO===== ${fieldToString(field)}`);
+
+
+    // $0-less field:
+    if (!field.subfields.some(sf => sf.code === '0')) {
+      return config['remove 0-less'];
+    }
+
+    const subfield0 = field.subfields.find(sf => sf.code === '0');
+    const data = await getTermData(subfield0.value);
+    // NB! No data might be a BUG! This might delete all incoming terms if Finto is down... (we should distinguish between a miss and a failure)
+    // However, if we use this validator only for incoming records, it's fine enough.
+
+    if (data) {
+      const subfieldA = field.subfields.find(sf => sf.code === 'a');
+      if (subfieldA) {
+        const lexData = getLexiconAndLanguage(field);
+
+        // $a is the pref label. All is fine!
+        if (isLabel(data.prefLabel, subfieldA.value, lexData.lang)) {
+          debug(`altLabel found: ${subfieldA.value}`);
+          return false;
+        }
+        if (isLabel(data.altLabel, subfieldA.value, lexData.lang)) {
+          debug(`altLabel found: ${subfieldA.value}`);
+          // Oddly enough this could remove altLabel but keep totally invalid labels...
+          return config['remove altLabel'];
+        }
+        debug(`a-2-0 mismatch: ${fieldToString(field)}`);
+      }
+    }
+
+
+    if (config['keep invalid label']) {
+      // We keep the label $a. However, we can get rid of $0 if we want to (semantic reasons)
+      if (!config['keep invalid url']) {
+        nvdebug(`=============== 0-removal`);
+        field.subfields = field.subfields.filter(sf => sf.code !== '0');
+      }
+      return false;
+    }
+    return true;
+
+  }
+
+
+}
+

package/src/drop-terms.test.js

@@ -0,0 +1,81 @@
+import assert from 'node:assert/strict';
+//import createDebugLogger from 'debug';
+import fetchMock from 'fetch-mock';
+
+import validatorFactory from './drop-terms.js';
+
+import {MarcRecord} from '@natlibfi/marc-record';
+import {READERS} from '@natlibfi/fixura';
+import generateTests from '@natlibfi/fixugen';
+
+
+import {fakeData} from '../test-fixtures/translate-terms-data.js';
+
+
+const uris = [
+  'http://www.yso.fi/onto/yso/p444',
+  'http://www.yso.fi/onto/yso/p500',
+  'http://www.yso.fi/onto/yso/p13299',
+  'http://www.yso.fi/onto/yso/p111739',
+  'http://www.yso.fi/onto/yso/p6197061979',
+  'http://www.yso.fi/onto/yso/p6196061969',
+  'http://urn.fi/URN:NBN:fi:au:slm:s161'
+];
+
+const useMock = 1;
+
+
+generateTests({
+  callback,
+  path: [import.meta.dirname, '..', 'test-fixtures', 'drop-terms'],
+  useMetadataFile: true,
+  recurse: false,
+  fixura: {
+    reader: READERS.JSON
+  },
+  hooks: {
+    before: async () => {
+
+      if (useMock) {
+        fetchMock.mockGlobal()
+        .get(`https://api.finto.fi/rest/v1/data?uri=${uris[0]}&format=application%2Fjson`, {status: 200, headers: {}, body: fakeData})
+        .get(`https://api.finto.fi/rest/v1/data?uri=${uris[1]}&format=application%2Fjson`, {status: 200, headers: {}, body: fakeData})
+        .get(`https://api.finto.fi/rest/v1/data?uri=${uris[2]}&format=application%2Fjson`, {status: 200, headers: {}, body: fakeData})
+        .get(`https://api.finto.fi/rest/v1/data?uri=${uris[3]}&format=application%2Fjson`, {status: 200, headers: {}, body: fakeData})
+        .get(`https://api.finto.fi/rest/v1/data?uri=${uris[4]}&format=application%2Fjson`, {status: 200, headers: {}, body: fakeData})
+        .get(`https://api.finto.fi/rest/v1/data?uri=${uris[5]}&format=application%2Fjson`, {status: 200, headers: {}, body: fakeData})
+        .get(`https://api.finto.fi/rest/v1/data?uri=${uris[6]}&format=application%2Fjson`, {status: 200, headers: {}, body: fakeData});
+      }
+
+      testValidatorFactory();
+    }
+  }
+});
+
+//const debug = createDebugLogger('@natlibfi/marc-record-validators-melinda/drop-terms:test');
+
+async function testValidatorFactory() {
+  const validator = await validatorFactory();
+
+  assert.equal(typeof validator, 'object');
+  assert.equal(typeof validator.description, 'string');
+  assert.equal(typeof validator.validate, 'function');
+}
+
+async function callback({getFixture, fix = false, config = undefined}) {
+  const validator = await validatorFactory(config);
+  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);
+    const originalRecord = new MarcRecord(getFixture('record.json'));
+    assert.deepEqual(record, originalRecord); // Validation should not change the record
+    return;
+  }
+  const expectedResult2 = new MarcRecord(expectedResult);
+  await validator.fix(record);
+  assert.deepEqual(record, expectedResult2);
+}

package/src/field-008-18-34-character-groups.test.js

@@ -3,7 +3,7 @@ import {MarcRecord} from '@natlibfi/marc-record';
 import validatorFactory from './field-008-18-34-character-groups.js';
 import {READERS} from '@natlibfi/fixura';
 import generateTests from '@natlibfi/fixugen';
-import createDebugLogger from 'debug';
+//import createDebugLogger from 'debug';
 
 generateTests({
   callback,
@@ -19,7 +19,7 @@ generateTests({
     }
   }
 });
-const debug = createDebugLogger('@natlibfi/marc-record-validators-melinda/field-008-18-34-character-groups:test');
+//const debug = createDebugLogger('@natlibfi/marc-record-validators-melinda/field-008-18-34-character-groups:test');
 
 async function testValidatorFactory() {
   const validator = await validatorFactory();
@@ -30,12 +30,7 @@ async function testValidatorFactory() {
   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/src/field-505-separators.test.js

@@ -3,7 +3,7 @@ import {MarcRecord} from '@natlibfi/marc-record';
 import validatorFactory from './field-505-separators.js';
 import {READERS} from '@natlibfi/fixura';
 import generateTests from '@natlibfi/fixugen';
-import createDebugLogger from 'debug';
+//import createDebugLogger from 'debug';
 
 generateTests({
   callback,
@@ -19,7 +19,7 @@ generateTests({
     }
   }
 });
-const debug = createDebugLogger('@natlibfi/marc-record-validators-melinda/field-505-separators:test');
+//const debug = createDebugLogger('@natlibfi/marc-record-validators-melinda/field-505-separators:test');
 
 async function testValidatorFactory() {
   const validator = await validatorFactory();
@@ -29,12 +29,7 @@ async function testValidatorFactory() {
   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 recordFixture = getFixture('record.json');

package/src/field-521-fix.test.js

@@ -3,7 +3,7 @@ import {MarcRecord} from '@natlibfi/marc-record';
 import validatorFactory from './field-521-fix.js';
 import {READERS} from '@natlibfi/fixura';
 import generateTests from '@natlibfi/fixugen';
-import createDebugLogger from 'debug';
+//import createDebugLogger from 'debug';
 
 generateTests({
   callback,
@@ -19,7 +19,7 @@ generateTests({
     }
   }
 });
-const debug = createDebugLogger('@natlibfi/marc-record-validators-melinda/fix521:test');
+//const debug = createDebugLogger('@natlibfi/marc-record-validators-melinda/fix521:test');
 
 async function testValidatorFactory() {
   const validator = await validatorFactory();
@@ -29,12 +29,7 @@ async function testValidatorFactory() {
   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/src/fix-33X.test.js

@@ -22,7 +22,7 @@ generateTests({
 async function testValidatorFactory() {
   const validator = await validatorFactory();
 
-  assert.equal(typeof validator, 'objecr');
+  assert.equal(typeof validator, 'object');
   assert.equal(typeof validator.description, 'string');
   assert.equal(typeof validator.validate, 'function');
   assert.equal(typeof validator.fix, 'function');

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

@@ -3,7 +3,7 @@ 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';
+//import createDebugLogger from 'debug';
 
 generateTests({
   callback,
@@ -19,7 +19,7 @@ generateTests({
     }
   }
 });
-const debug = createDebugLogger('@natlibfi/marc-record-validators-melinda/fix-country-codes:test');
+//const debug = createDebugLogger('@natlibfi/marc-record-validators-melinda/fix-country-codes:test');
 
 async function testValidatorFactory() {
   const validator = await validatorFactory();
@@ -29,12 +29,7 @@ async function testValidatorFactory() {
   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/src/fix-sami-041.js

@@ -0,0 +1,113 @@
+// Author(s): Nicholas Volk
+
+//import createDebugLogger from 'debug';
+import clone from 'clone';
+
+import {fieldToString} from './utils.js';
+
+// const debug = createDebugLogger('@natlibfi/marc-record-validators-melinda:fix-sami-041');
+
+
+
+export default function () {
+  /* 'sma': eteläsaame, 'sme': pohjoissaame, 'smj': luulajansaame, 'smn': inarinsaame, 'sms': koltansaame */
+  const samiLanguages = ['sma', 'sme', 'smj', 'smn', 'sms'];
+  const relevantSubfieldCodes = ['a', 'd']; // Subfield codes that should also have 'smi' if a sami langauge is used. Confirmed by A.R. via Slack 2025-12-05
+
+  return {
+    description: 'Add corresponing \'smi\' subfield before a specific sami language subfields, if needed',
+    validate, fix
+  };
+
+  function fix(record, validateMode = false) {
+    const relevantFields = record.fields.filter(f => isRelevantField(f, validateMode)).map(f => validateMode ? clone(f) : f); // NV! relevant fields are cloned in validation mode!
+    // Nothing to do:
+    if (relevantFields.length === 0) {
+      if (validateMode) {
+        return {message: [], valid: true};
+      }
+      return {message: [], fix: [], valid: true};
+    }
+
+    const relevantFieldsAsStrings = relevantFields.map(f => fieldToString(f)); // get original values
+
+    relevantFields.forEach(f => processField(f));
+    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) {
+        return [];
+      }
+      const currLang = f008.value.substr(35, 3);
+      if (!samiLanguages.includes(currLang)) { // NB! If original 008/35-37 was not a sami language, we don't change anything!
+        return [];
+      }
+      const origValue = f008.value;
+      const firstRelevantSubfield = relevantFields[0].subfields.find(sf => sf.code === 'a' || sf.code === 'd'); // NB! don't use relevantSubfieldCodes here!
+      if (firstRelevantSubfield.value === 'smi') { // First relevant subfield is 
+        f008.value = `${f008.value.substr(0, 35)}smi${f008.value.substr(38)}`;
+      }
+      return createReport([origValue], [f008.value]);
+    }
+  }
+
+  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);
+  }
+
+  function processField(f) {
+    f.subfields = prosessSubfields(f.subfields);
+    return f;
+  }
+
+  function prosessSubfields(incomingSubfields, outgoingSubfields = []) {
+    const [currSubfield, ...otherSubfields] = incomingSubfields;
+    if (!currSubfield) {
+      return outgoingSubfields;
+    }
+    if (!isRelevantSamiSubfield(currSubfield, [...outgoingSubfields, ...otherSubfields])) {
+      return prosessSubfields(otherSubfields, [...outgoingSubfields, currSubfield]);
+    }
+
+    const smiSubfield = {
+      code: currSubfield.code,
+      value: 'smi'
+    };
+    return prosessSubfields(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)); // it's ok to pass sf in f.subfields also
+  }
+
+  function isRelevantSamiSubfield(sf, otherSubfields) {
+    if (!relevantSubfieldCodes.includes(sf.code) || !samiLanguages.includes(sf.value)) {
+      return false;
+    }
+    if (otherSubfields.some(sf2 => sf2.code === sf.code && sf2.value === 'smi')) {
+      return false;
+    }
+    return true;
+  }
+}
+