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

package/dist/field-008-18-34-character-groups.js

@@ -1,188 +1,103 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = _default;
-exports.justifyAndSortField008CharacterGroups = justifyAndSortField008CharacterGroups;
-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
-// NB! CR 008/24 vs 008/25-27 is not supported yet!
-
-function _default() {
+import clone from "clone";
+import { fieldToString } from "./utils.js";
+export default function() {
   return {
-    description: 'Justify left and sort character groups within 008/18-24',
+    description: "Justify left and sort character groups within 008/18-24",
     validate,
     fix
   };
   function fix(record) {
     const typeOfMaterial = record.getTypeOfMaterial();
-    record.fields.forEach(field => {
+    record.fields.forEach((field) => {
       justifyAndSortField008CharacterGroups(field, typeOfMaterial);
     });
-    // Fix always succeeds (even when it really does not):
-    const res = {
-      message: [],
-      fix: [],
-      valid: true
-    };
+    const res = { message: [], fix: [], valid: true };
     return res;
   }
   function validate(record) {
-    const res = {
-      message: []
-    };
+    const res = { message: [] };
     const typeOfMaterial = record.getTypeOfMaterial();
-    record.fields?.forEach(field => {
+    record.fields?.forEach((field) => {
       validateField(field, res, typeOfMaterial);
     });
     res.valid = !(res.message.length >= 1);
     return res;
   }
   function validateField(field, res, typeOfMaterial) {
-    if (field.tag !== '008') {
-      // Optimize code a bit...
+    if (field.tag !== "008") {
       return;
     }
-    const orig = (0, _utils.fieldToString)(field);
-    const normalizedField = justifyAndSortField008CharacterGroups((0, _clone.default)(field), typeOfMaterial);
-    const mod = (0, _utils.fieldToString)(normalizedField);
+    const orig = fieldToString(field);
+    const normalizedField = justifyAndSortField008CharacterGroups(clone(field), typeOfMaterial);
+    const mod = fieldToString(normalizedField);
     if (orig !== mod) {
-      // Fail as the input is "broken"/"crap"/sumthing
       res.message.push(`TODO: '${orig}' => '${mod}'`);
       return;
     }
     return;
   }
 }
-
-// Should we add legal values?
-const characterGroups = [{
-  type: 'BK',
-  start: 18,
-  end: 21,
-  sort: true,
-  name: 'illustrations'
-}, {
-  type: 'BK',
-  start: 24,
-  end: 27,
-  sort: true,
-  name: 'nature of contents'
-},
-// English doc does not explicitly mention alphabetical sorting... Finnish does.
-{
-  type: 'CR',
-  start: 25,
-  end: 27,
-  sort: true,
-  name: 'nature of contents'
-},
-// NB! 24 vs 25-27 logic needs to be implemented separately
-{
-  type: 'MP',
-  start: 18,
-  end: 21,
-  sort: false,
-  name: 'relief'
-},
-// Order of importance!
-{
-  type: 'MP',
-  start: 33,
-  end: 34,
-  sort: false,
-  name: 'special format of characteristics'
-},
-// Order of importance!
-{
-  type: 'MU',
-  start: 24,
-  end: 29,
-  sort: true,
-  name: 'accompanying material'
-}, {
-  type: 'MU',
-  start: 30,
-  end: 31,
-  sort: true,
-  name: 'literary text for sound recordings'
-}];
+const characterGroups = [
+  { type: "BK", start: 18, end: 21, sort: true, name: "illustrations" },
+  { type: "BK", start: 24, end: 27, sort: true, name: "nature of contents" },
+  // English doc does not explicitly mention alphabetical sorting... Finnish does.
+  { type: "CR", start: 25, end: 27, sort: true, name: "nature of contents" },
+  // NB! 24 vs 25-27 logic needs to be implemented separately
+  { type: "MP", start: 18, end: 21, sort: false, name: "relief" },
+  // Order of importance!
+  { type: "MP", start: 33, end: 34, sort: false, name: "special format of characteristics" },
+  // Order of importance!
+  { type: "MU", start: 24, end: 29, sort: true, name: "accompanying material" },
+  { type: "MU", start: 30, end: 31, sort: true, name: "literary text for sound recordings" }
+];
 const BIG_BAD_VALUE = 999999999;
 function processCharacterGroup(field, group) {
   const originalContent = field.value.substring(group.start, group.end + 1);
   const content = removeDuplicateValues(fixBlanks(originalContent));
-  //console.info(`008/${group.start}-${group.end}: '${originalContent}'`); // eslint-disable-line no-console
-  const charArray = content.split('');
-  charArray.sort(function (a, b) {
+  const charArray = content.split("");
+  charArray.sort(function(a, b) {
     return scoreChar(a) - scoreChar(b);
   });
-  const newContent = charArray.join('');
+  const newContent = charArray.join("");
   if (originalContent === newContent) {
     return;
   }
-
-  //console.info(`'${fieldToString(field)}' =>`); // eslint-disable-line no-console
-
   field.value = `${field.value.substring(0, group.start)}${newContent}${field.value.substring(group.end + 1)}`;
-  //console.info(`'${fieldToString(field)}'`); // eslint-disable-line no-console
-
   function fixBlanks(str) {
-    if (str.includes('|') && str.match(/[^ |]/u)) {
-      return str.replaceAll('|', ' ');
+    if (str.includes("|") && str.match(/[^ |]/u)) {
+      return str.replaceAll("|", " ");
     }
     return str;
   }
   function scoreChar(c) {
-    if (c === '|' || c === ' ') {
-      return BIG_BAD_VALUE; // Max value, these should code last
+    if (c === "|" || c === " ") {
+      return BIG_BAD_VALUE;
     }
     if (!group.sort) {
-      // more meaningful comes first: keep the original order
       return 1;
     }
     const asciiCode = c.charCodeAt(0);
-    // a-z get values 1-26:
     if (asciiCode >= 97 && asciiCode <= 122) {
       return asciiCode - 96;
     }
-    // 0-9 get values 100-109
     if (asciiCode >= 48 && asciiCode <= 57) {
       return asciiCode + 52;
     }
-    // Others (=crap) return something between '9' and BIG BAD VALUE
     return asciiCode + 200;
   }
 }
-function justifyAndSortField008CharacterGroups(field, typeOfMaterial) {
-  if (field.tag !== '008' || field.subfields) {
+export function justifyAndSortField008CharacterGroups(field, typeOfMaterial) {
+  if (field.tag !== "008" || field.subfields) {
     return field;
   }
-
-  //console.info(typeOfMaterial); // eslint-disable-line no-console
-
-  const relevantCharacterGroups = characterGroups.filter(gr => gr.type === typeOfMaterial);
-  relevantCharacterGroups.forEach(group => processCharacterGroup(field, group)); // eslint-disable-line array-callback-return
-
-  //justifyField008CharacterGroups(field, typeOfMaterial); // Oops: also sorts...
-
-  // NB! add value # and | normalizations
-  //fixBlanks(field, typeOfMaterial);
-
+  const relevantCharacterGroups = characterGroups.filter((gr) => gr.type === typeOfMaterial);
+  relevantCharacterGroups.forEach((group) => processCharacterGroup(field, group));
   return field;
 }
 function removeDuplicateValues(str) {
-  const arr = str.split('');
-  // Take only the first instance of a proper value-carrying character
-  const reducedStr = arr.filter((c, i) => c === ' ' || c === '|' || arr.indexOf(c) === i).join('');
-  //console.info(`I: '${str}'`); // eslint-disable-line no-console
-  //console.info(`M: '${reducedStr}'`); // eslint-disable-line no-console
-  const output = `${reducedStr}${' '.repeat(str.length - reducedStr.length)}`; // Had some weird trouble with str.padEnd(n)
-  //console.info(`M: '${output}'`); // eslint-disable-line no-console
+  const arr = str.split("");
+  const reducedStr = arr.filter((c, i) => c === " " || c === "|" || arr.indexOf(c) === i).join("");
+  const output = `${reducedStr}${" ".repeat(str.length - reducedStr.length)}`;
   return output;
 }
-//# sourceMappingURL=field-008-18-34-character-groups.js.map
+//# sourceMappingURL=field-008-18-34-character-groups.js.map

package/dist/field-008-18-34-character-groups.js.map

@@ -1 +1,7 @@
-{"version":3,"file":"field-008-18-34-character-groups.js","names":["_clone","_interopRequireDefault","require","_utils","e","__esModule","default","_default","description","validate","fix","record","typeOfMaterial","getTypeOfMaterial","fields","forEach","field","justifyAndSortField008CharacterGroups","res","message","valid","validateField","length","tag","orig","fieldToString","normalizedField","clone","mod","push","characterGroups","type","start","end","sort","name","BIG_BAD_VALUE","processCharacterGroup","group","originalContent","value","substring","content","removeDuplicateValues","fixBlanks","charArray","split","a","b","scoreChar","newContent","join","str","includes","match","replaceAll","c","asciiCode","charCodeAt","subfields","relevantCharacterGroups","filter","gr","arr","reducedStr","i","indexOf","output","repeat"],"sources":["../src/field-008-18-34-character-groups.js"],"sourcesContent":["//import createDebugLogger from 'debug';\nimport clone from 'clone';\nimport {fieldToString} from './utils';\n// Author(s): Nicholas Volk\n// NB! CR 008/24 vs 008/25-27 is not supported yet!\n\nexport default function () {\n\n  return {\n    description: 'Justify left and sort character groups within 008/18-24',\n    validate, fix\n  };\n\n  function fix(record) {\n    const typeOfMaterial = record.getTypeOfMaterial();\n    record.fields.forEach(field => {\n      justifyAndSortField008CharacterGroups(field, typeOfMaterial);\n    });\n    // Fix always succeeds (even when it really does not):\n    const res = {message: [], fix: [], valid: true};\n    return res;\n  }\n\n  function validate(record) {\n    const res = {message: []};\n\n    const typeOfMaterial = record.getTypeOfMaterial();\n\n    record.fields?.forEach(field => {\n      validateField(field, res, typeOfMaterial);\n    });\n\n    res.valid = !(res.message.length >= 1);\n    return res;\n  }\n\n  function validateField(field, res, typeOfMaterial) {\n    if (field.tag !== '008') { // Optimize code a bit...\n      return;\n    }\n    const orig = fieldToString(field);\n\n    const normalizedField = justifyAndSortField008CharacterGroups(clone(field), typeOfMaterial);\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// Should we add legal values?\nconst characterGroups = [\n  {type: 'BK', start: 18, end: 21, sort: true, name: 'illustrations'},\n  {type: 'BK', start: 24, end: 27, sort: true, name: 'nature of contents'}, // English doc does not explicitly mention alphabetical sorting... Finnish does.\n  {type: 'CR', start: 25, end: 27, sort: true, name: 'nature of contents'}, // NB! 24 vs 25-27 logic needs to be implemented separately\n  {type: 'MP', start: 18, end: 21, sort: false, name: 'relief'}, // Order of importance!\n  {type: 'MP', start: 33, end: 34, sort: false, name: 'special format of characteristics'}, // Order of importance!\n  {type: 'MU', start: 24, end: 29, sort: true, name: 'accompanying material'},\n  {type: 'MU', start: 30, end: 31, sort: true, name: 'literary text for sound recordings'}\n];\n\nconst BIG_BAD_VALUE = 999999999;\n\nfunction processCharacterGroup(field, group) {\n  const originalContent = field.value.substring(group.start, group.end + 1);\n  const content = removeDuplicateValues(fixBlanks(originalContent));\n  //console.info(`008/${group.start}-${group.end}: '${originalContent}'`); // eslint-disable-line no-console\n  const charArray = content.split('');\n\n  charArray.sort(function(a, b) {\n    return scoreChar(a) - scoreChar(b);\n  });\n\n  const newContent = charArray.join('');\n  if (originalContent === newContent) {\n    return;\n  }\n\n  //console.info(`'${fieldToString(field)}' =>`); // eslint-disable-line no-console\n\n  field.value = `${field.value.substring(0, group.start)}${newContent}${field.value.substring(group.end + 1)}`;\n  //console.info(`'${fieldToString(field)}'`); // eslint-disable-line no-console\n\n  function fixBlanks(str) {\n    if (str.includes('|') && str.match(/[^ |]/u)) {\n      return str.replaceAll('|', ' ');\n    }\n    return str;\n  }\n\n  function scoreChar(c) {\n    if (c === '|' || c === ' ') {\n      return BIG_BAD_VALUE; // Max value, these should code last\n    }\n    if (!group.sort) { // more meaningful comes first: keep the original order\n      return 1;\n    }\n    const asciiCode = c.charCodeAt(0);\n    // a-z get values 1-26:\n    if (asciiCode >= 97 && asciiCode <= 122) {\n      return asciiCode - 96;\n    }\n    // 0-9 get values 100-109\n    if (asciiCode >= 48 && asciiCode <= 57) {\n      return asciiCode + 52;\n    }\n    // Others (=crap) return something between '9' and BIG BAD VALUE\n    return asciiCode + 200;\n  }\n}\n\nexport function justifyAndSortField008CharacterGroups(field, typeOfMaterial) {\n  if (field.tag !== '008' || field.subfields) {\n    return field;\n  }\n\n  //console.info(typeOfMaterial); // eslint-disable-line no-console\n\n  const relevantCharacterGroups = characterGroups.filter(gr => gr.type === typeOfMaterial);\n\n  relevantCharacterGroups.forEach(group => processCharacterGroup(field, group)); // eslint-disable-line array-callback-return\n\n  //justifyField008CharacterGroups(field, typeOfMaterial); // Oops: also sorts...\n\n  // NB! add value # and | normalizations\n  //fixBlanks(field, typeOfMaterial);\n\n  return field;\n}\n\nfunction removeDuplicateValues(str) {\n  const arr = str.split('');\n  // Take only the first instance of a proper value-carrying character\n  const reducedStr = arr.filter((c, i) => c === ' ' || c === '|' || arr.indexOf(c) === i).join('');\n  //console.info(`I: '${str}'`); // eslint-disable-line no-console\n  //console.info(`M: '${reducedStr}'`); // eslint-disable-line no-console\n  const output = `${reducedStr}${' '.repeat(str.length - reducedStr.length)}`; // Had some weird trouble with str.padEnd(n)\n  //console.info(`M: '${output}'`); // eslint-disable-line no-console\n  return output;\n}\n"],"mappings":"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","ignoreList":[]}
+{
+  "version": 3,
+  "sources": ["../src/field-008-18-34-character-groups.js"],
+  "sourcesContent": ["//import createDebugLogger from 'debug';\nimport clone from 'clone';\nimport {fieldToString} from './utils.js';\n// Author(s): Nicholas Volk\n// NB! CR 008/24 vs 008/25-27 is not supported yet!\n\nexport default function () {\n\n  return {\n    description: 'Justify left and sort character groups within 008/18-24',\n    validate, fix\n  };\n\n  function fix(record) {\n    const typeOfMaterial = record.getTypeOfMaterial();\n    record.fields.forEach(field => {\n      justifyAndSortField008CharacterGroups(field, typeOfMaterial);\n    });\n    // Fix always succeeds (even when it really does not):\n    const res = {message: [], fix: [], valid: true};\n    return res;\n  }\n\n  function validate(record) {\n    const res = {message: []};\n\n    const typeOfMaterial = record.getTypeOfMaterial();\n\n    record.fields?.forEach(field => {\n      validateField(field, res, typeOfMaterial);\n    });\n\n    res.valid = !(res.message.length >= 1);\n    return res;\n  }\n\n  function validateField(field, res, typeOfMaterial) {\n    if (field.tag !== '008') { // Optimize code a bit...\n      return;\n    }\n    const orig = fieldToString(field);\n\n    const normalizedField = justifyAndSortField008CharacterGroups(clone(field), typeOfMaterial);\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// Should we add legal values?\nconst characterGroups = [\n  {type: 'BK', start: 18, end: 21, sort: true, name: 'illustrations'},\n  {type: 'BK', start: 24, end: 27, sort: true, name: 'nature of contents'}, // English doc does not explicitly mention alphabetical sorting... Finnish does.\n  {type: 'CR', start: 25, end: 27, sort: true, name: 'nature of contents'}, // NB! 24 vs 25-27 logic needs to be implemented separately\n  {type: 'MP', start: 18, end: 21, sort: false, name: 'relief'}, // Order of importance!\n  {type: 'MP', start: 33, end: 34, sort: false, name: 'special format of characteristics'}, // Order of importance!\n  {type: 'MU', start: 24, end: 29, sort: true, name: 'accompanying material'},\n  {type: 'MU', start: 30, end: 31, sort: true, name: 'literary text for sound recordings'}\n];\n\nconst BIG_BAD_VALUE = 999999999;\n\nfunction processCharacterGroup(field, group) {\n  const originalContent = field.value.substring(group.start, group.end + 1);\n  const content = removeDuplicateValues(fixBlanks(originalContent));\n  //console.info(`008/${group.start}-${group.end}: '${originalContent}'`); // eslint-disable-line no-console\n  const charArray = content.split('');\n\n  charArray.sort(function(a, b) {\n    return scoreChar(a) - scoreChar(b);\n  });\n\n  const newContent = charArray.join('');\n  if (originalContent === newContent) {\n    return;\n  }\n\n  //console.info(`'${fieldToString(field)}' =>`); // eslint-disable-line no-console\n\n  field.value = `${field.value.substring(0, group.start)}${newContent}${field.value.substring(group.end + 1)}`;\n  //console.info(`'${fieldToString(field)}'`); // eslint-disable-line no-console\n\n  function fixBlanks(str) {\n    if (str.includes('|') && str.match(/[^ |]/u)) {\n      return str.replaceAll('|', ' ');\n    }\n    return str;\n  }\n\n  function scoreChar(c) {\n    if (c === '|' || c === ' ') {\n      return BIG_BAD_VALUE; // Max value, these should code last\n    }\n    if (!group.sort) { // more meaningful comes first: keep the original order\n      return 1;\n    }\n    const asciiCode = c.charCodeAt(0);\n    // a-z get values 1-26:\n    if (asciiCode >= 97 && asciiCode <= 122) {\n      return asciiCode - 96;\n    }\n    // 0-9 get values 100-109\n    if (asciiCode >= 48 && asciiCode <= 57) {\n      return asciiCode + 52;\n    }\n    // Others (=crap) return something between '9' and BIG BAD VALUE\n    return asciiCode + 200;\n  }\n}\n\nexport function justifyAndSortField008CharacterGroups(field, typeOfMaterial) {\n  if (field.tag !== '008' || field.subfields) {\n    return field;\n  }\n\n  //console.info(typeOfMaterial); // eslint-disable-line no-console\n\n  const relevantCharacterGroups = characterGroups.filter(gr => gr.type === typeOfMaterial);\n\n  relevantCharacterGroups.forEach(group => processCharacterGroup(field, group));\n\n  //justifyField008CharacterGroups(field, typeOfMaterial); // Oops: also sorts...\n\n  // NB! add value # and | normalizations\n  //fixBlanks(field, typeOfMaterial);\n\n  return field;\n}\n\nfunction removeDuplicateValues(str) {\n  const arr = str.split('');\n  // Take only the first instance of a proper value-carrying character\n  const reducedStr = arr.filter((c, i) => c === ' ' || c === '|' || arr.indexOf(c) === i).join('');\n  //console.info(`I: '${str}'`); // eslint-disable-line no-console\n  //console.info(`M: '${reducedStr}'`); // eslint-disable-line no-console\n  const output = `${reducedStr}${' '.repeat(str.length - reducedStr.length)}`; // Had some weird trouble with str.padEnd(n)\n  //console.info(`M: '${output}'`); // eslint-disable-line no-console\n  return output;\n}\n"],
+  "mappings": "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",
+  "names": []
+}

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

@@ -0,0 +1,45 @@
+import assert from "node:assert";
+import { MarcRecord } from "@natlibfi/marc-record";
+import validatorFactory from "../src/field-008-18-34-character-groups.js";
+import { READERS } from "@natlibfi/fixura";
+import generateTests from "@natlibfi/fixugen";
+import createDebugLogger from "debug";
+generateTests({
+  callback,
+  path: [import.meta.dirname, "..", "test-fixtures", "field-008-18-34-character-groups"],
+  useMetadataFile: true,
+  recurse: false,
+  fixura: {
+    reader: READERS.JSON
+  },
+  hooks: {
+    before: async () => {
+      testValidatorFactory();
+    }
+  }
+});
+const debug = createDebugLogger("@natlibfi/marc-record-validators-melinda/field-008-18-34-character-groups:test");
+async function testValidatorFactory() {
+  const validator = await validatorFactory();
+  assert.equal(typeof validator, "object");
+  assert.equal(typeof validator.description, "string");
+  assert.equal(typeof validator.fix, "function");
+  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=field-008-18-34-character-groups.test.js.map

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

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../src/field-008-18-34-character-groups.test.js"],
+  "sourcesContent": ["import assert from 'node:assert';\nimport {MarcRecord} from '@natlibfi/marc-record';\nimport validatorFactory from '../src/field-008-18-34-character-groups.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', 'field-008-18-34-character-groups'],\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/field-008-18-34-character-groups: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.fix, 'function');\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,KAAK,UAAU;AAC7C,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/field-505-separators.js

@@ -1,48 +1,31 @@
-"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 {
     description: 'Normalize " ; " separators as " -- "',
     validate,
     fix
   };
   function fix(record) {
-    record.fields.forEach(field => {
+    record.fields.forEach((field) => {
       fix505(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 = fix505((0, _clone.default)(field));
-    const mod = (0, _utils.fieldToString)(normalizedField);
+    const orig = fieldToString(field);
+    const normalizedField = fix505(clone(field));
+    const mod = fieldToString(normalizedField);
     if (orig !== mod) {
-      // Fail as the input is "broken"/"crap"/sumthing
       res.message.push(`'TODO: ${orig}' => '${mod}'`);
       return;
     }
@@ -50,31 +33,28 @@ function _default() {
   }
 }
 function field505FixSubfieldA(field) {
-  const a = field.subfields.filter(sf => sf.code === 'a');
-  a.forEach(sf => fixSubfieldA(sf)); // eslint-disable-line array-callback-return
-
-  function fixSubfieldA(a) {
-    a.value = a.value.replace(/ ; /ug, ' -- ');
+  const a = field.subfields.filter((sf) => sf.code === "a");
+  a.forEach((sf) => fixSubfieldA(sf));
+  function fixSubfieldA(a2) {
+    a2.value = a2.value.replace(/ ; /ug, " -- ");
   }
 }
 function field505FixSubfieldTRG(field) {
-  // Modify subfield if next subfield is $t:
-  const subfieldsThatWillBeModified = field.subfields.filter((sf, i) => i + 1 < field.subfields.length && field.subfields[i + 1].code === 't');
-  subfieldsThatWillBeModified.forEach(sf => fixSubfieldThatPrecedesT(sf)); // eslint-disable-line array-callback-return
-
+  const subfieldsThatWillBeModified = field.subfields.filter((sf, i) => i + 1 < field.subfields.length && field.subfields[i + 1].code === "t");
+  subfieldsThatWillBeModified.forEach((sf) => fixSubfieldThatPrecedesT(sf));
   function fixSubfieldThatPrecedesT(sf) {
     if (!sf.value) {
       return;
     }
-    sf.value = sf.value.replace(/ ;$/u, ' --');
+    sf.value = sf.value.replace(/ ;$/u, " --");
   }
 }
 function fix505(field) {
-  if (field.tag !== '505' || !field.subfields) {
+  if (field.tag !== "505" || !field.subfields) {
     return field;
   }
   field505FixSubfieldTRG(field);
   field505FixSubfieldA(field);
   return field;
 }
-//# sourceMappingURL=field-505-separators.js.map
+//# sourceMappingURL=field-505-separators.js.map

package/dist/field-505-separators.js.map

@@ -1 +1,7 @@
-{"version":3,"file":"field-505-separators.js","names":["_clone","_interopRequireDefault","require","_utils","e","__esModule","default","_default","description","validate","fix","record","fields","forEach","field","fix505","res","message","valid","validateField","length","orig","fieldToString","normalizedField","clone","mod","push","field505FixSubfieldA","a","subfields","filter","sf","code","fixSubfieldA","value","replace","field505FixSubfieldTRG","subfieldsThatWillBeModified","i","fixSubfieldThatPrecedesT","tag"],"sources":["../src/field-505-separators.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    description: 'Normalize \" ; \" separators as \" -- \"',\n    validate, fix\n  };\n\n  function fix(record) {\n    record.fields.forEach(field => {\n      fix505(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 = fix505(clone(field));\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 field505FixSubfieldA(field) {\n  const a = field.subfields.filter(sf => sf.code === 'a');\n\n  a.forEach(sf => fixSubfieldA(sf)); // eslint-disable-line array-callback-return\n\n  function fixSubfieldA(a) {\n    a.value = a.value.replace(/ ; /ug, ' -- ');\n  }\n}\n\nfunction field505FixSubfieldTRG(field) {\n  // Modify subfield if next subfield is $t:\n  const subfieldsThatWillBeModified = field.subfields.filter((sf, i) => i + 1 < field.subfields.length && field.subfields[i + 1].code === 't');\n\n  subfieldsThatWillBeModified.forEach(sf => fixSubfieldThatPrecedesT(sf)); // eslint-disable-line array-callback-return\n\n  function fixSubfieldThatPrecedesT(sf) {\n    if (!sf.value) {\n      return;\n    }\n    sf.value = sf.value.replace(/ ;$/u, ' --');\n  }\n}\n\nfunction fix505(field) {\n  if (field.tag !== '505' || !field.subfields) {\n    return field;\n  }\n  field505FixSubfieldTRG(field);\n  field505FixSubfieldA(field);\n  return field;\n}\n"],"mappings":"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","ignoreList":[]}
+{
+  "version": 3,
+  "sources": ["../src/field-505-separators.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    description: 'Normalize \" ; \" separators as \" -- \"',\n    validate, fix\n  };\n\n  function fix(record) {\n    record.fields.forEach(field => {\n      fix505(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 = fix505(clone(field));\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 field505FixSubfieldA(field) {\n  const a = field.subfields.filter(sf => sf.code === 'a');\n\n  a.forEach(sf => fixSubfieldA(sf));\n\n  function fixSubfieldA(a) {\n    a.value = a.value.replace(/ ; /ug, ' -- ');\n  }\n}\n\nfunction field505FixSubfieldTRG(field) {\n  // Modify subfield if next subfield is $t:\n  const subfieldsThatWillBeModified = field.subfields.filter((sf, i) => i + 1 < field.subfields.length && field.subfields[i + 1].code === 't');\n\n  subfieldsThatWillBeModified.forEach(sf => fixSubfieldThatPrecedesT(sf));\n\n  function fixSubfieldThatPrecedesT(sf) {\n    if (!sf.value) {\n      return;\n    }\n    sf.value = sf.value.replace(/ ;$/u, ' --');\n  }\n}\n\nfunction fix505(field) {\n  if (field.tag !== '505' || !field.subfields) {\n    return field;\n  }\n  field505FixSubfieldTRG(field);\n  field505FixSubfieldA(field);\n  return field;\n}\n"],
+  "mappings": "AACA,OAAO,WAAW;AAClB,SAAQ,qBAAoB;AAG5B,0BAA2B;AAEzB,SAAO;AAAA,IACL,aAAa;AAAA,IACb;AAAA,IAAU;AAAA,EACZ;AAEA,WAAS,IAAI,QAAQ;AACnB,WAAO,OAAO,QAAQ,WAAS;AAC7B,aAAO,KAAK;AAAA,IACd,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,OAAO,MAAM,KAAK,CAAC;AAC3C,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,qBAAqB,OAAO;AACnC,QAAM,IAAI,MAAM,UAAU,OAAO,QAAM,GAAG,SAAS,GAAG;AAEtD,IAAE,QAAQ,QAAM,aAAa,EAAE,CAAC;AAEhC,WAAS,aAAaA,IAAG;AACvB,IAAAA,GAAE,QAAQA,GAAE,MAAM,QAAQ,SAAS,MAAM;AAAA,EAC3C;AACF;AAEA,SAAS,uBAAuB,OAAO;AAErC,QAAM,8BAA8B,MAAM,UAAU,OAAO,CAAC,IAAI,MAAM,IAAI,IAAI,MAAM,UAAU,UAAU,MAAM,UAAU,IAAI,CAAC,EAAE,SAAS,GAAG;AAE3I,8BAA4B,QAAQ,QAAM,yBAAyB,EAAE,CAAC;AAEtE,WAAS,yBAAyB,IAAI;AACpC,QAAI,CAAC,GAAG,OAAO;AACb;AAAA,IACF;AACA,OAAG,QAAQ,GAAG,MAAM,QAAQ,QAAQ,KAAK;AAAA,EAC3C;AACF;AAEA,SAAS,OAAO,OAAO;AACrB,MAAI,MAAM,QAAQ,SAAS,CAAC,MAAM,WAAW;AAC3C,WAAO;AAAA,EACT;AACA,yBAAuB,KAAK;AAC5B,uBAAqB,KAAK;AAC1B,SAAO;AACT;",
+  "names": ["a"]
+}

package/dist/field-505-separators.test.js

@@ -0,0 +1,45 @@
+import assert from "node:assert";
+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";
+generateTests({
+  callback,
+  path: [import.meta.dirname, "..", "test-fixtures", "field-505-separators"],
+  useMetadataFile: true,
+  recurse: false,
+  fixura: {
+    reader: READERS.JSON
+  },
+  hooks: {
+    before: async () => {
+      testValidatorFactory();
+    }
+  }
+});
+const debug = createDebugLogger("@natlibfi/marc-record-validators-melinda/field-505-separators: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 recordFixture = getFixture("record.json");
+  const record = recordFixture._validationOptions ? new MarcRecord(recordFixture, recordFixture._validationOptions) : new MarcRecord(recordFixture);
+  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=field-505-separators.test.js.map

package/dist/field-505-separators.test.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../src/field-505-separators.test.js"],
+  "sourcesContent": ["import assert from 'node:assert';\nimport {MarcRecord} from '@natlibfi/marc-record';\nimport validatorFactory from './field-505-separators.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', 'field-505-separators'],\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/field-505-separators: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\n  const recordFixture = getFixture('record.json');\n  const record = recordFixture._validationOptions ? new MarcRecord(recordFixture, recordFixture._validationOptions) : new MarcRecord(recordFixture);\n\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,sBAAsB;AAAA,EACzE,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,oEAAoE;AAEpG,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;AAEzC,QAAM,gBAAgB,WAAW,aAAa;AAC9C,QAAM,SAAS,cAAc,qBAAqB,IAAI,WAAW,eAAe,cAAc,kBAAkB,IAAI,IAAI,WAAW,aAAa;AAEhJ,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/field-521-fix.js

@@ -1,57 +1,31 @@
-"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 {
-    description: 'Various fixes for field 521',
+    description: "Various fixes for field 521",
     validate,
     fix
   };
   function fix(record) {
-    record.fields.forEach(field => {
+    record.fields.forEach((field) => {
       fix521(field);
     });
-    // Fix always succeeds (even when it really does not):
-    const res = {
-      message: [],
-      fix: [],
-      valid: true
-    };
+    const res = { message: [], fix: [], valid: true };
     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);
     return res;
   }
   function validateField(field, res) {
-    const orig = (0, _utils.fieldToString)(field);
-    const normalizedField = fix521((0, _clone.default)(field));
-    const mod = (0, _utils.fieldToString)(normalizedField);
+    const orig = fieldToString(field);
+    const normalizedField = fix521(clone(field));
+    const mod = fieldToString(normalizedField);
     if (orig !== mod) {
-      // Fail as the input is "broken"/"crap"/sumthing
       res.message.push(`'TODO: ${orig}' => '${mod}'`);
       return;
     }
@@ -59,22 +33,20 @@ function _default() {
   }
 }
 function fixSubfieldA(a) {
-  a.value = a.value.
-  // MET-332:
-  replace(/^(Ikäsuositus) ([0-9])/u, '$1: $2');
+  a.value = a.value.replace(/^(Ikäsuositus) ([0-9])/u, "$1: $2");
 }
 function fixSubfieldAInternalPunctuation(field) {
-  const a = field.subfields.filter(sf => sf.code === 'a');
-  a.forEach(sf => fixSubfieldA(sf)); // eslint-disable-line array-callback-return
+  const a = field.subfields.filter((sf) => sf.code === "a");
+  a.forEach((sf) => fixSubfieldA(sf));
 }
 function getIndicator1(field) {
-  const [a] = field.subfields.filter(sf => sf.code === 'a');
+  const [a] = field.subfields.filter((sf) => sf.code === "a");
   if (a) {
     if (a.value.match(/^Ikäsuositus/u)) {
-      return '1';
+      return "1";
     }
   }
-  return undefined;
+  return void 0;
 }
 function fixIndicator1(field) {
   const value = getIndicator1(field);
@@ -84,11 +56,11 @@ function fixIndicator1(field) {
   }
 }
 function fix521(field) {
-  if (field.tag !== '521' || !field.subfields) {
+  if (field.tag !== "521" || !field.subfields) {
     return field;
   }
   fixIndicator1(field);
   fixSubfieldAInternalPunctuation(field);
   return field;
 }
-//# sourceMappingURL=field-521-fix.js.map
+//# sourceMappingURL=field-521-fix.js.map