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

package/dist/normalize-qualifying-information.js

@@ -1,50 +1,33 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = _default;
-var _clone = _interopRequireDefault(require("clone"));
-var _utils = require("./utils");
-function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-//import createDebugLogger from 'debug';
-
-// Author(s): Nicholas Volk
-function _default() {
+import clone from "clone";
+import { fieldToString } from "./utils.js";
+export default function() {
   return {
     // Fixes MELINDA-8740
-    description: 'Normalize qualifying information (020$q, 015$q, 024$q, 028$q)',
+    description: "Normalize qualifying information (020$q, 015$q, 024$q, 028$q)",
     validate,
     fix
   };
   function fix(record) {
-    record.fields.forEach(field => {
+    record.fields.forEach((field) => {
       normalizeQualifyingInformationField(field);
     });
-    const res = {
-      message: [],
-      fix: [],
-      valid: true
-    };
+    const res = { message: [], fix: [], valid: true };
     return res;
   }
   function validate(record) {
-    const res = {
-      message: []
-    };
-    record.fields?.forEach(field => {
+    const res = { message: [] };
+    record.fields?.forEach((field) => {
       validateField(field, res);
     });
     res.valid = !(res.message.length >= 1);
     return res;
   }
   function validateField(field, res) {
-    const orig = (0, _utils.fieldToString)(field);
-    const normalizedField = (0, _clone.default)(field);
+    const orig = fieldToString(field);
+    const normalizedField = clone(field);
     normalizeQualifyingInformationField(normalizedField);
-    const mod = (0, _utils.fieldToString)(normalizedField);
+    const mod = fieldToString(normalizedField);
     if (orig !== mod) {
-      // Fail as the input is "broken"/"crap"/sumthing
       res.message.push(`'TODO: ${orig}' => '${mod}'`);
       return;
     }
@@ -52,45 +35,37 @@ function _default() {
   }
 }
 function normalizeQualifyingInformationField(field) {
-  if (!['015', '020', '024', '028'].includes(field.tag) || !field.subfields) {
+  if (!["015", "020", "024", "028"].includes(field.tag) || !field.subfields) {
     return;
   }
-  field.subfields.forEach(sf => fixSubfield(sf)); // eslint-disable-line array-callback-return
+  field.subfields.forEach((sf) => fixSubfield(sf));
   return;
   function fixSubfield(sf) {
-    if (sf.code !== 'q') {
+    if (sf.code !== "q") {
       return;
     }
     sf.value = normalizeValue(sf.value);
   }
   function normalizeValue(val) {
-    // Should we do English as well: "coil bound" and "comb-bound" => "spiral-bound" (as per MTS)?
-
     if (val.match(/^(?:hft|häftad)[.,]*$/iu)) {
-      // MELINDA-8740
-      return 'mjuka pärmar';
+      return "mjuka p\xE4rmar";
     }
     if (val.match(/^inb(?:\.|unden)[.,]*$/iu)) {
-      // MELINDA-8740
-      return 'hårda pärmar';
+      return "h\xE5rda p\xE4rmar";
     }
-    if (val === 'rengaskirja') {
-      // https://www.kiwi.fi/display/melinda/Talonmies+tiedottaa+16.12.2021
-      return 'kierreselkä';
+    if (val === "rengaskirja") {
+      return "kierreselk\xE4";
     }
-    if (val === 'ringpärm') {
-      // https://www.kiwi.fi/display/melinda/Talonmies+tiedottaa+16.12.2021
-      return 'spiralrygg';
+    if (val === "ringp\xE4rm") {
+      return "spiralrygg";
     }
     if (val.match(/^nid(?:\.|ottu)[.,]*$/iu)) {
-      // MELINDA-8740
-      return 'pehmeäkantinen';
+      return "pehme\xE4kantinen";
     }
     if (val.match(/^sid(?:\.|ottu)[.,]*$/iu)) {
-      // MELINDA-8740
-      return 'kovakantinen';
+      return "kovakantinen";
     }
     return val;
   }
 }
-//# sourceMappingURL=normalize-qualifying-information.js.map
+//# sourceMappingURL=normalize-qualifying-information.js.map

package/dist/normalize-qualifying-information.js.map

@@ -1 +1,7 @@
-{"version":3,"file":"normalize-qualifying-information.js","names":["_clone","_interopRequireDefault","require","_utils","e","__esModule","default","_default","description","validate","fix","record","fields","forEach","field","normalizeQualifyingInformationField","res","message","valid","validateField","length","orig","fieldToString","normalizedField","clone","mod","push","includes","tag","subfields","sf","fixSubfield","code","value","normalizeValue","val","match"],"sources":["../src/normalize-qualifying-information.js"],"sourcesContent":["//import createDebugLogger from 'debug';\nimport clone from 'clone';\nimport {fieldToString} from './utils';\n\n// Author(s): Nicholas Volk\nexport default function () {\n\n  return {\n    // Fixes MELINDA-8740\n    description: 'Normalize qualifying information (020$q, 015$q, 024$q, 028$q)',\n    validate, fix\n  };\n\n  function fix(record) {\n    record.fields.forEach(field => {\n      normalizeQualifyingInformationField(field);\n    });\n\n    const res = {message: [], fix: [], valid: true};\n    return res;\n  }\n\n  function validate(record) {\n    const res = {message: []};\n\n    record.fields?.forEach(field => {\n      validateField(field, res);\n    });\n\n    res.valid = !(res.message.length >= 1);\n    return res;\n  }\n\n  function validateField(field, res) {\n    const orig = fieldToString(field);\n\n    const normalizedField = clone(field);\n    normalizeQualifyingInformationField(normalizedField);\n    const mod = fieldToString(normalizedField);\n    if (orig !== mod) { // Fail as the input is \"broken\"/\"crap\"/sumthing\n      res.message.push(`'TODO: ${orig}' => '${mod}'`);\n      return;\n    }\n    return;\n  }\n}\n\n\nfunction normalizeQualifyingInformationField(field) {\n  if (!['015', '020', '024', '028'].includes(field.tag) || !field.subfields) {\n    return;\n  }\n\n  field.subfields.forEach(sf => fixSubfield(sf)); // eslint-disable-line array-callback-return\n  return;\n\n  function fixSubfield(sf) {\n    if (sf.code !== 'q') {\n      return;\n    }\n    sf.value = normalizeValue(sf.value);\n  }\n\n  function normalizeValue(val) {\n    // Should we do English as well: \"coil bound\" and \"comb-bound\" => \"spiral-bound\" (as per MTS)?\n\n    if (val.match(/^(?:hft|häftad)[.,]*$/iu)) { // MELINDA-8740\n      return 'mjuka pärmar';\n    }\n\n    if (val.match(/^inb(?:\\.|unden)[.,]*$/iu)) { // MELINDA-8740\n      return 'hårda pärmar';\n    }\n\n    if (val === 'rengaskirja') { // https://www.kiwi.fi/display/melinda/Talonmies+tiedottaa+16.12.2021\n      return 'kierreselkä';\n    }\n\n    if (val === 'ringpärm') { // https://www.kiwi.fi/display/melinda/Talonmies+tiedottaa+16.12.2021\n      return 'spiralrygg';\n    }\n\n    if (val.match(/^nid(?:\\.|ottu)[.,]*$/iu)) { // MELINDA-8740\n      return 'pehmeäkantinen';\n    }\n\n    if (val.match(/^sid(?:\\.|ottu)[.,]*$/iu)) { // MELINDA-8740\n      return 'kovakantinen';\n    }\n    return val;\n  }\n}\n"],"mappings":"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","ignoreList":[]}
+{
+  "version": 3,
+  "sources": ["../src/normalize-qualifying-information.js"],
+  "sourcesContent": ["//import createDebugLogger from 'debug';\nimport clone from 'clone';\nimport {fieldToString} from './utils.js';\n\n// Author(s): Nicholas Volk\nexport default function () {\n\n  return {\n    // Fixes MELINDA-8740\n    description: 'Normalize qualifying information (020$q, 015$q, 024$q, 028$q)',\n    validate, fix\n  };\n\n  function fix(record) {\n    record.fields.forEach(field => {\n      normalizeQualifyingInformationField(field);\n    });\n\n    const res = {message: [], fix: [], valid: true};\n    return res;\n  }\n\n  function validate(record) {\n    const res = {message: []};\n\n    record.fields?.forEach(field => {\n      validateField(field, res);\n    });\n\n    res.valid = !(res.message.length >= 1);\n    return res;\n  }\n\n  function validateField(field, res) {\n    const orig = fieldToString(field);\n\n    const normalizedField = clone(field);\n    normalizeQualifyingInformationField(normalizedField);\n    const mod = fieldToString(normalizedField);\n    if (orig !== mod) { // Fail as the input is \"broken\"/\"crap\"/sumthing\n      res.message.push(`'TODO: ${orig}' => '${mod}'`);\n      return;\n    }\n    return;\n  }\n}\n\n\nfunction normalizeQualifyingInformationField(field) {\n  if (!['015', '020', '024', '028'].includes(field.tag) || !field.subfields) {\n    return;\n  }\n\n  field.subfields.forEach(sf => fixSubfield(sf));\n  return;\n\n  function fixSubfield(sf) {\n    if (sf.code !== 'q') {\n      return;\n    }\n    sf.value = normalizeValue(sf.value);\n  }\n\n  function normalizeValue(val) {\n    // Should we do English as well: \"coil bound\" and \"comb-bound\" => \"spiral-bound\" (as per MTS)?\n\n    if (val.match(/^(?:hft|h\u00E4ftad)[.,]*$/iu)) { // MELINDA-8740\n      return 'mjuka p\u00E4rmar';\n    }\n\n    if (val.match(/^inb(?:\\.|unden)[.,]*$/iu)) { // MELINDA-8740\n      return 'h\u00E5rda p\u00E4rmar';\n    }\n\n    if (val === 'rengaskirja') { // https://www.kiwi.fi/display/melinda/Talonmies+tiedottaa+16.12.2021\n      return 'kierreselk\u00E4';\n    }\n\n    if (val === 'ringp\u00E4rm') { // https://www.kiwi.fi/display/melinda/Talonmies+tiedottaa+16.12.2021\n      return 'spiralrygg';\n    }\n\n    if (val.match(/^nid(?:\\.|ottu)[.,]*$/iu)) { // MELINDA-8740\n      return 'pehme\u00E4kantinen';\n    }\n\n    if (val.match(/^sid(?:\\.|ottu)[.,]*$/iu)) { // MELINDA-8740\n      return 'kovakantinen';\n    }\n    return val;\n  }\n}\n"],
+  "mappings": "AACA,OAAO,WAAW;AAClB,SAAQ,qBAAoB;AAG5B,0BAA2B;AAEzB,SAAO;AAAA;AAAA,IAEL,aAAa;AAAA,IACb;AAAA,IAAU;AAAA,EACZ;AAEA,WAAS,IAAI,QAAQ;AACnB,WAAO,OAAO,QAAQ,WAAS;AAC7B,0CAAoC,KAAK;AAAA,IAC3C,CAAC;AAED,UAAM,MAAM,EAAC,SAAS,CAAC,GAAG,KAAK,CAAC,GAAG,OAAO,KAAI;AAC9C,WAAO;AAAA,EACT;AAEA,WAAS,SAAS,QAAQ;AACxB,UAAM,MAAM,EAAC,SAAS,CAAC,EAAC;AAExB,WAAO,QAAQ,QAAQ,WAAS;AAC9B,oBAAc,OAAO,GAAG;AAAA,IAC1B,CAAC;AAED,QAAI,QAAQ,EAAE,IAAI,QAAQ,UAAU;AACpC,WAAO;AAAA,EACT;AAEA,WAAS,cAAc,OAAO,KAAK;AACjC,UAAM,OAAO,cAAc,KAAK;AAEhC,UAAM,kBAAkB,MAAM,KAAK;AACnC,wCAAoC,eAAe;AACnD,UAAM,MAAM,cAAc,eAAe;AACzC,QAAI,SAAS,KAAK;AAChB,UAAI,QAAQ,KAAK,UAAU,IAAI,SAAS,GAAG,GAAG;AAC9C;AAAA,IACF;AACA;AAAA,EACF;AACF;AAGA,SAAS,oCAAoC,OAAO;AAClD,MAAI,CAAC,CAAC,OAAO,OAAO,OAAO,KAAK,EAAE,SAAS,MAAM,GAAG,KAAK,CAAC,MAAM,WAAW;AACzE;AAAA,EACF;AAEA,QAAM,UAAU,QAAQ,QAAM,YAAY,EAAE,CAAC;AAC7C;AAEA,WAAS,YAAY,IAAI;AACvB,QAAI,GAAG,SAAS,KAAK;AACnB;AAAA,IACF;AACA,OAAG,QAAQ,eAAe,GAAG,KAAK;AAAA,EACpC;AAEA,WAAS,eAAe,KAAK;AAG3B,QAAI,IAAI,MAAM,yBAAyB,GAAG;AACxC,aAAO;AAAA,IACT;AAEA,QAAI,IAAI,MAAM,0BAA0B,GAAG;AACzC,aAAO;AAAA,IACT;AAEA,QAAI,QAAQ,eAAe;AACzB,aAAO;AAAA,IACT;AAEA,QAAI,QAAQ,eAAY;AACtB,aAAO;AAAA,IACT;AAEA,QAAI,IAAI,MAAM,yBAAyB,GAAG;AACxC,aAAO;AAAA,IACT;AAEA,QAAI,IAAI,MAAM,yBAAyB,GAAG;AACxC,aAAO;AAAA,IACT;AACA,WAAO;AAAA,EACT;AACF;",
+  "names": []
+}

package/dist/normalize-qualifying-information.test.js

@@ -0,0 +1,44 @@
+import assert from "node:assert";
+import { MarcRecord } from "@natlibfi/marc-record";
+import validatorFactory from "./normalize-qualifying-information.js";
+import { READERS } from "@natlibfi/fixura";
+import generateTests from "@natlibfi/fixugen";
+import createDebugLogger from "debug";
+generateTests({
+  callback,
+  path: [import.meta.dirname, "..", "test-fixtures", "normalize-qualifying-information"],
+  useMetadataFile: true,
+  recurse: false,
+  fixura: {
+    reader: READERS.JSON
+  },
+  hooks: {
+    before: async () => {
+      testValidatorFactory();
+    }
+  }
+});
+const debug = createDebugLogger("@natlibfi/marc-record-validators-melinda/normalize-qualifying-information:test");
+async function testValidatorFactory() {
+  const validator = await validatorFactory();
+  assert.equal(typeof validator, "object");
+  assert.equal(typeof validator.description, "string");
+  assert.equal(typeof validator.validate, "function");
+}
+async function callback({ getFixture, enabled = true, fix = false }) {
+  if (enabled === false) {
+    debug("TEST SKIPPED!");
+    return;
+  }
+  const validator = await validatorFactory();
+  const record = new MarcRecord(getFixture("record.json"));
+  const expectedResult = getFixture("expectedResult.json");
+  if (!fix) {
+    const result = await validator.validate(record);
+    assert.deepEqual(result, expectedResult);
+    return;
+  }
+  await validator.fix(record);
+  assert.deepEqual(record, expectedResult);
+}
+//# sourceMappingURL=normalize-qualifying-information.test.js.map

package/dist/normalize-qualifying-information.test.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../src/normalize-qualifying-information.test.js"],
+  "sourcesContent": ["import assert from 'node:assert';\nimport {MarcRecord} from '@natlibfi/marc-record';\nimport validatorFactory from './normalize-qualifying-information.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', 'normalize-qualifying-information'],\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/normalize-qualifying-information: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,kCAAkC;AAAA,EACrF,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,gFAAgF;AAEhH,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;",
+  "names": []
+}

package/dist/normalize-utf8-diacritics.js

@@ -1,71 +1,22 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = _default;
-exports.fieldFixComposition = fieldFixComposition;
-exports.fixComposition = fixComposition;
-exports.precomposeFinnishLetters = precomposeFinnishLetters;
-var _clone = _interopRequireDefault(require("clone"));
-var _unicodeDecomposition = require("./unicode-decomposition");
-var _utils = require("./utils");
-function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-//import createDebugLogger from 'debug';
-
-// Note that https://github.com/NatLibFi/marc-record-validators-melinda/blob/master/src/unicode-decomposition.js contains
-// similar functionalities. It's less generic and lacks diacritic removal but has it advantages as well.
-
-//const debug = createDebugLogger('@natlibfi/marc-record-validators-melinda/normalize-utf-diacritics');
-
-// See also https://github.com/NatLibFi/marc-record-validators-melinda/blob/master/src/unicode-decomposition.js .
-// It uses a list of convertable characters whilst this uses a generic stuff as well.
-// It handles various '.' and '©' type normalizations as well.
-// NB! This version has minor bug/feature issue regarding fixComposition()
-
-// Author(s): Nicholas Volk
-function _default() {
+import clone from "clone";
+import { convert as nongenericNormalization } from "./unicode-decomposition.js";
+import { fieldToString } from "./utils.js";
+export default function() {
   return {
-    description: 'Generic normalization of latin UTF-8 diacritics. Precompose Finnish å, ä and ö. Decompose others.',
+    description: "Generic normalization of latin UTF-8 diacritics. Precompose Finnish \xE5, \xE4 and \xF6. Decompose others.",
     validate,
     fix
   };
   function fix(record) {
-    const res = {
-      message: [],
-      fix: [],
-      valid: true
-    };
-    //message.fix = [];
-
-    // Actual parsing of all fields
-    /*
-    if (!record.fields) {
-      return false;
-    }
-    */
-
-    record.fields.forEach(field => {
+    const res = { message: [], fix: [], valid: true };
+    record.fields.forEach((field) => {
       fieldFixComposition(field);
-      //validateField(field, true, message);
     });
-
-    // message.valid = !(message.message.length >= 1);
     return res;
   }
   function validate(record) {
-    const res = {
-      message: []
-    };
-
-    // Actual parsing of all fields
-    /*
-    if (!record.fields) {
-      return false;
-    }
-    */
-
-    record.fields.forEach(field => {
+    const res = { message: [] };
+    record.fields.forEach((field) => {
       validateField(field, res);
     });
     res.valid = !(res.message.length >= 1);
@@ -75,69 +26,32 @@ function _default() {
     if (!field.subfields) {
       return;
     }
-    const orig = (0, _utils.fieldToString)(field);
-    const normalizedField = fieldFixComposition((0, _clone.default)(field));
-    const mod = (0, _utils.fieldToString)(normalizedField);
+    const orig = fieldToString(field);
+    const normalizedField = fieldFixComposition(clone(field));
+    const mod = fieldToString(normalizedField);
     if (orig !== mod) {
-      // Fail as the input is "broken"/"crap"/sumthing
       res.message.push(`'${orig}' requires normalization`);
       return;
     }
     return;
   }
 }
-
-// Traditionally these six are precomposed and all the rest decomposed
-function precomposeFinnishLetters(value = '') {
-  return value.replace(/å/gu, 'å').replace(/ä/gu, 'ä').replace(/ö/gu, 'ö').replace(/Å/gu, 'Å').replace(/Ä/gu, 'Ä').replace(/Ö/gu, 'Ö');
+export function precomposeFinnishLetters(value = "") {
+  return value.replace(/å/gu, "\xE5").replace(/ä/gu, "\xE4").replace(/ö/gu, "\xF6").replace(/Å/gu, "\xC5").replace(/Ä/gu, "\xC4").replace(/Ö/gu, "\xD6");
 }
-function fixComposition(value = '') {
-  // Target: Diacritics use Melinda internal notation.
-  // General solution: Decompose everything and then compose 'å', 'ä', 'ö', 'Å', 'Ä' and 'Ö'.
-  // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/normalize
-  // Bug/Feature: the generic normalize() function also normalizes non-latin encodings as well, is this ok?
-  // Exception: Input contains non-Latin script letters: don't decompose (see field 880 tests):
+export function fixComposition(value = "") {
   if (value.match(/[^\p{Script=Latin}\p{Script=Common}\p{Script=Inherited}]/u)) {
-    // Problem with this approach: mixed language content (eg. cyrillic + latin) won't get normalized.
-    // Hack/Damage control: we might add decomposition rules for most common diacritis here (eg. ü, é...).
-    // OR we could split input to words and handle them separately?
-    // NB! Hack not implemented yet. The main source of problematic case would probably be greek characters
-    // within texts, that are written with latin alphabet.
-    //return precomposeFinnishLetters(value);
-    return (0, _unicodeDecomposition.convert)(value);
+    return nongenericNormalization(value);
   }
-  return precomposeFinnishLetters(String(value).normalize('NFD'));
+  return precomposeFinnishLetters(String(value).normalize("NFD"));
 }
-function fieldFixComposition(field) {
+export function fieldFixComposition(field) {
   if (!field.subfields) {
     return field;
   }
-  //const originalValue = fieldToString(field);
-  //nvdebug(`fFC: '${originalValue}'`, debug);
   field.subfields.forEach((subfield, index) => {
     field.subfields[index].value = fixComposition(subfield.value);
   });
-  //const newValue = fieldToString(field);
-  //if (originalValue !== newValue) {
-  //  debug(`FIXCOMP: '${originalValue}' => '${newValue}'`);
-  //}
   return field;
 }
-
-/*
-export function fieldRemoveDecomposedDiacritics(field) {
-  // Raison d'être/motivation: "Sirén" and diacriticless "Siren" might refer to a same surname, so this normalization
-  // allows us to compare authors and avoid duplicate fields.
-  field.subfields.forEach((sf) => {
-    sf.value = removeDecomposedDiacritics(sf.value);
-  });
-
-  function removeDecomposedDiacritics(value = '') {
-    // NB #1: Does nothing to precomposed letters. String.normalize('NFD') can handle them.
-    // NB #2: Finnish letters 'å', 'ä', 'ö', 'Å', Ä', and 'Ö' should be handled (=precomposed) before calling this.
-    // NB #3: Calling our very own fixComposition() before this function handles both #1 and #2.
-    return String(value).replace(/\p{Diacritic}/gu, '');
-  }
-}
-*/
-//# sourceMappingURL=normalize-utf8-diacritics.js.map
+//# sourceMappingURL=normalize-utf8-diacritics.js.map

package/dist/normalize-utf8-diacritics.js.map

@@ -1 +1,7 @@
-{"version":3,"file":"normalize-utf8-diacritics.js","names":["_clone","_interopRequireDefault","require","_unicodeDecomposition","_utils","e","__esModule","default","_default","description","validate","fix","record","res","message","valid","fields","forEach","field","fieldFixComposition","validateField","length","subfields","orig","fieldToString","normalizedField","clone","mod","push","precomposeFinnishLetters","value","replace","fixComposition","match","nongenericNormalization","String","normalize","subfield","index"],"sources":["../src/normalize-utf8-diacritics.js"],"sourcesContent":["//import createDebugLogger from 'debug';\nimport clone from 'clone';\nimport {convert as nongenericNormalization} from './unicode-decomposition';\nimport {fieldToString} from './utils';\n\n// Note that https://github.com/NatLibFi/marc-record-validators-melinda/blob/master/src/unicode-decomposition.js contains\n// similar functionalities. It's less generic and lacks diacritic removal but has it advantages as well.\n\n//const debug = createDebugLogger('@natlibfi/marc-record-validators-melinda/normalize-utf-diacritics');\n\n// See also https://github.com/NatLibFi/marc-record-validators-melinda/blob/master/src/unicode-decomposition.js .\n// It uses a list of convertable characters whilst this uses a generic stuff as well.\n// It handles various '.' and '©' type normalizations as well.\n// NB! This version has minor bug/feature issue regarding fixComposition()\n\n// Author(s): Nicholas Volk\nexport default function () {\n\n  return {\n    description: 'Generic normalization of latin UTF-8 diacritics. Precompose Finnish å, ä and ö. Decompose others.',\n    validate, fix\n  };\n\n  function fix(record) {\n    const res = {message: [], fix: [], valid: true};\n    //message.fix = [];\n\n    // Actual parsing of all fields\n    /*\n    if (!record.fields) {\n      return false;\n    }\n    */\n\n    record.fields.forEach(field => {\n      fieldFixComposition(field);\n      //validateField(field, true, message);\n    });\n\n    // message.valid = !(message.message.length >= 1);\n    return res;\n  }\n\n  function validate(record) {\n    const res = {message: []};\n\n    // Actual parsing of all fields\n    /*\n    if (!record.fields) {\n      return false;\n    }\n    */\n\n    record.fields.forEach(field => {\n      validateField(field, res);\n    });\n\n    res.valid = !(res.message.length >= 1);\n    return res;\n  }\n\n  function validateField(field, res) {\n    if (!field.subfields) {\n      return;\n    }\n    const orig = fieldToString(field);\n\n    const normalizedField = fieldFixComposition(clone(field));\n    const mod = fieldToString(normalizedField);\n    if (orig !== mod) { // Fail as the input is \"broken\"/\"crap\"/sumthing\n      res.message.push(`'${orig}' requires normalization`);\n      return;\n    }\n    return;\n  }\n}\n\n\n// Traditionally these six are precomposed and all the rest decomposed\nexport function precomposeFinnishLetters(value = '') {\n  return value.\n    replace(/å/gu, 'å').\n    replace(/ä/gu, 'ä').\n    replace(/ö/gu, 'ö').\n    replace(/Å/gu, 'Å').\n    replace(/Ä/gu, 'Ä').\n    replace(/Ö/gu, 'Ö');\n}\n\nexport function fixComposition(value = '') {\n  // Target: Diacritics use Melinda internal notation.\n  // General solution: Decompose everything and then compose 'å', 'ä', 'ö', 'Å', 'Ä' and 'Ö'.\n  // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/normalize\n  // Bug/Feature: the generic normalize() function also normalizes non-latin encodings as well, is this ok?\n  // Exception: Input contains non-Latin script letters: don't decompose (see field 880 tests):\n  if (value.match(/[^\\p{Script=Latin}\\p{Script=Common}\\p{Script=Inherited}]/u)) {\n    // Problem with this approach: mixed language content (eg. cyrillic + latin) won't get normalized.\n    // Hack/Damage control: we might add decomposition rules for most common diacritis here (eg. ü, é...).\n    // OR we could split input to words and handle them separately?\n    // NB! Hack not implemented yet. The main source of problematic case would probably be greek characters\n    // within texts, that are written with latin alphabet.\n    //return precomposeFinnishLetters(value);\n    return nongenericNormalization(value);\n  }\n  return precomposeFinnishLetters(String(value).normalize('NFD'));\n}\n\n\nexport function fieldFixComposition(field) {\n  if (!field.subfields) {\n    return field;\n  }\n  //const originalValue = fieldToString(field);\n  //nvdebug(`fFC: '${originalValue}'`, debug);\n  field.subfields.forEach((subfield, index) => {\n    field.subfields[index].value = fixComposition(subfield.value);\n  });\n  //const newValue = fieldToString(field);\n  //if (originalValue !== newValue) {\n  //  debug(`FIXCOMP: '${originalValue}' => '${newValue}'`);\n  //}\n  return field;\n}\n\n/*\nexport function fieldRemoveDecomposedDiacritics(field) {\n  // Raison d'être/motivation: \"Sirén\" and diacriticless \"Siren\" might refer to a same surname, so this normalization\n  // allows us to compare authors and avoid duplicate fields.\n  field.subfields.forEach((sf) => {\n    sf.value = removeDecomposedDiacritics(sf.value);\n  });\n\n  function removeDecomposedDiacritics(value = '') {\n    // NB #1: Does nothing to precomposed letters. String.normalize('NFD') can handle them.\n    // NB #2: Finnish letters 'å', 'ä', 'ö', 'Å', Ä', and 'Ö' should be handled (=precomposed) before calling this.\n    // NB #3: Calling our very own fixComposition() before this function handles both #1 and #2.\n    return String(value).replace(/\\p{Diacritic}/gu, '');\n  }\n}\n*/\n\n"],"mappings":"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","ignoreList":[]}
+{
+  "version": 3,
+  "sources": ["../src/normalize-utf8-diacritics.js"],
+  "sourcesContent": ["//import createDebugLogger from 'debug';\nimport clone from 'clone';\nimport {convert as nongenericNormalization} from './unicode-decomposition.js';\nimport {fieldToString} from './utils.js';\n\n// Note that https://github.com/NatLibFi/marc-record-validators-melinda/blob/master/src/unicode-decomposition.js contains\n// similar functionalities. It's less generic and lacks diacritic removal but has it advantages as well.\n\n//const debug = createDebugLogger('@natlibfi/marc-record-validators-melinda/normalize-utf-diacritics');\n\n// See also https://github.com/NatLibFi/marc-record-validators-melinda/blob/master/src/unicode-decomposition.js .\n// It uses a list of convertable characters whilst this uses a generic stuff as well.\n// It handles various '.' and '\u00A9' type normalizations as well.\n// NB! This version has minor bug/feature issue regarding fixComposition()\n\n// Author(s): Nicholas Volk\nexport default function () {\n\n  return {\n    description: 'Generic normalization of latin UTF-8 diacritics. Precompose Finnish \u00E5, \u00E4 and \u00F6. Decompose others.',\n    validate, fix\n  };\n\n  function fix(record) {\n    const res = {message: [], fix: [], valid: true};\n    //message.fix = [];\n\n    // Actual parsing of all fields\n    /*\n    if (!record.fields) {\n      return false;\n    }\n    */\n\n    record.fields.forEach(field => {\n      fieldFixComposition(field);\n      //validateField(field, true, message);\n    });\n\n    // message.valid = !(message.message.length >= 1);\n    return res;\n  }\n\n  function validate(record) {\n    const res = {message: []};\n\n    // Actual parsing of all fields\n    /*\n    if (!record.fields) {\n      return false;\n    }\n    */\n\n    record.fields.forEach(field => {\n      validateField(field, res);\n    });\n\n    res.valid = !(res.message.length >= 1);\n    return res;\n  }\n\n  function validateField(field, res) {\n    if (!field.subfields) {\n      return;\n    }\n    const orig = fieldToString(field);\n\n    const normalizedField = fieldFixComposition(clone(field));\n    const mod = fieldToString(normalizedField);\n    if (orig !== mod) { // Fail as the input is \"broken\"/\"crap\"/sumthing\n      res.message.push(`'${orig}' requires normalization`);\n      return;\n    }\n    return;\n  }\n}\n\n\n// Traditionally these six are precomposed and all the rest decomposed\nexport function precomposeFinnishLetters(value = '') {\n  return value.\n    replace(/a\u030A/gu, '\u00E5').\n    replace(/a\u0308/gu, '\u00E4').\n    replace(/o\u0308/gu, '\u00F6').\n    replace(/A\u030A/gu, '\u00C5').\n    replace(/A\u0308/gu, '\u00C4').\n    replace(/O\u0308/gu, '\u00D6');\n}\n\nexport function fixComposition(value = '') {\n  // Target: Diacritics use Melinda internal notation.\n  // General solution: Decompose everything and then compose '\u00E5', '\u00E4', '\u00F6', '\u00C5', '\u00C4' and '\u00D6'.\n  // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/normalize\n  // Bug/Feature: the generic normalize() function also normalizes non-latin encodings as well, is this ok?\n  // Exception: Input contains non-Latin script letters: don't decompose (see field 880 tests):\n  if (value.match(/[^\\p{Script=Latin}\\p{Script=Common}\\p{Script=Inherited}]/u)) {\n    // Problem with this approach: mixed language content (eg. cyrillic + latin) won't get normalized.\n    // Hack/Damage control: we might add decomposition rules for most common diacritis here (eg. \u00FC, \u00E9...).\n    // OR we could split input to words and handle them separately?\n    // NB! Hack not implemented yet. The main source of problematic case would probably be greek characters\n    // within texts, that are written with latin alphabet.\n    //return precomposeFinnishLetters(value);\n    return nongenericNormalization(value);\n  }\n  return precomposeFinnishLetters(String(value).normalize('NFD'));\n}\n\n\nexport function fieldFixComposition(field) {\n  if (!field.subfields) {\n    return field;\n  }\n  //const originalValue = fieldToString(field);\n  //nvdebug(`fFC: '${originalValue}'`, debug);\n  field.subfields.forEach((subfield, index) => {\n    field.subfields[index].value = fixComposition(subfield.value);\n  });\n  //const newValue = fieldToString(field);\n  //if (originalValue !== newValue) {\n  //  debug(`FIXCOMP: '${originalValue}' => '${newValue}'`);\n  //}\n  return field;\n}\n\n/*\nexport function fieldRemoveDecomposedDiacritics(field) {\n  // Raison d'\u00EAtre/motivation: \"Sir\u00E9n\" and diacriticless \"Siren\" might refer to a same surname, so this normalization\n  // allows us to compare authors and avoid duplicate fields.\n  field.subfields.forEach((sf) => {\n    sf.value = removeDecomposedDiacritics(sf.value);\n  });\n\n  function removeDecomposedDiacritics(value = '') {\n    // NB #1: Does nothing to precomposed letters. String.normalize('NFD') can handle them.\n    // NB #2: Finnish letters '\u00E5', '\u00E4', '\u00F6', '\u00C5', \u00C4', and '\u00D6' should be handled (=precomposed) before calling this.\n    // NB #3: Calling our very own fixComposition() before this function handles both #1 and #2.\n    return String(value).replace(/\\p{Diacritic}/gu, '');\n  }\n}\n*/\n\n"],
+  "mappings": "AACA,OAAO,WAAW;AAClB,SAAQ,WAAW,+BAA8B;AACjD,SAAQ,qBAAoB;AAa5B,0BAA2B;AAEzB,SAAO;AAAA,IACL,aAAa;AAAA,IACb;AAAA,IAAU;AAAA,EACZ;AAEA,WAAS,IAAI,QAAQ;AACnB,UAAM,MAAM,EAAC,SAAS,CAAC,GAAG,KAAK,CAAC,GAAG,OAAO,KAAI;AAU9C,WAAO,OAAO,QAAQ,WAAS;AAC7B,0BAAoB,KAAK;AAAA,IAE3B,CAAC;AAGD,WAAO;AAAA,EACT;AAEA,WAAS,SAAS,QAAQ;AACxB,UAAM,MAAM,EAAC,SAAS,CAAC,EAAC;AASxB,WAAO,OAAO,QAAQ,WAAS;AAC7B,oBAAc,OAAO,GAAG;AAAA,IAC1B,CAAC;AAED,QAAI,QAAQ,EAAE,IAAI,QAAQ,UAAU;AACpC,WAAO;AAAA,EACT;AAEA,WAAS,cAAc,OAAO,KAAK;AACjC,QAAI,CAAC,MAAM,WAAW;AACpB;AAAA,IACF;AACA,UAAM,OAAO,cAAc,KAAK;AAEhC,UAAM,kBAAkB,oBAAoB,MAAM,KAAK,CAAC;AACxD,UAAM,MAAM,cAAc,eAAe;AACzC,QAAI,SAAS,KAAK;AAChB,UAAI,QAAQ,KAAK,IAAI,IAAI,0BAA0B;AACnD;AAAA,IACF;AACA;AAAA,EACF;AACF;AAIO,gBAAS,yBAAyB,QAAQ,IAAI;AACnD,SAAO,MACL,QAAQ,QAAQ,MAAG,EACnB,QAAQ,QAAQ,MAAG,EACnB,QAAQ,QAAQ,MAAG,EACnB,QAAQ,QAAQ,MAAG,EACnB,QAAQ,QAAQ,MAAG,EACnB,QAAQ,QAAQ,MAAG;AACvB;AAEO,gBAAS,eAAe,QAAQ,IAAI;AAMzC,MAAI,MAAM,MAAM,2DAA2D,GAAG;AAO5E,WAAO,wBAAwB,KAAK;AAAA,EACtC;AACA,SAAO,yBAAyB,OAAO,KAAK,EAAE,UAAU,KAAK,CAAC;AAChE;AAGO,gBAAS,oBAAoB,OAAO;AACzC,MAAI,CAAC,MAAM,WAAW;AACpB,WAAO;AAAA,EACT;AAGA,QAAM,UAAU,QAAQ,CAAC,UAAU,UAAU;AAC3C,UAAM,UAAU,KAAK,EAAE,QAAQ,eAAe,SAAS,KAAK;AAAA,EAC9D,CAAC;AAKD,SAAO;AACT;",
+  "names": []
+}

package/dist/normalize-utf8-diacritics.test.js

@@ -0,0 +1,44 @@
+import assert from "node:assert";
+import { MarcRecord } from "@natlibfi/marc-record";
+import validatorFactory from "./normalize-utf8-diacritics.js";
+import { READERS } from "@natlibfi/fixura";
+import generateTests from "@natlibfi/fixugen";
+import createDebugLogger from "debug";
+generateTests({
+  callback,
+  path: [import.meta.dirname, "..", "test-fixtures", "normalize-utf8-diacritics"],
+  useMetadataFile: true,
+  recurse: false,
+  fixura: {
+    reader: READERS.JSON
+  },
+  hooks: {
+    before: async () => {
+      testValidatorFactory();
+    }
+  }
+});
+const debug = createDebugLogger("@natlibfi/marc-record-validators-melinda/normalize-utf8-diacritics:test");
+async function testValidatorFactory() {
+  const validator = await validatorFactory();
+  assert.equal(typeof validator, "object");
+  assert.equal(typeof validator.description, "string");
+  assert.equal(typeof validator.validate, "function");
+}
+async function callback({ getFixture, enabled = true, fix = false }) {
+  if (enabled === false) {
+    debug("TEST SKIPPED!");
+    return;
+  }
+  const validator = await validatorFactory();
+  const record = new MarcRecord(getFixture("record.json"));
+  const expectedResult = getFixture("expectedResult.json");
+  if (!fix) {
+    const result = await validator.validate(record);
+    assert.deepEqual(result, expectedResult);
+    return;
+  }
+  await validator.fix(record);
+  assert.deepEqual(record, expectedResult);
+}
+//# sourceMappingURL=normalize-utf8-diacritics.test.js.map

package/dist/normalize-utf8-diacritics.test.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../src/normalize-utf8-diacritics.test.js"],
+  "sourcesContent": ["import assert from 'node:assert';\nimport {MarcRecord} from '@natlibfi/marc-record';\nimport validatorFactory from './normalize-utf8-diacritics.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', 'normalize-utf8-diacritics'],\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/normalize-utf8-diacritics: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,2BAA2B;AAAA,EAC9E,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,yEAAyE;AAEzG,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;",
+  "names": []
+}