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

package/dist/reindexSubfield6OccurenceNumbers.js.map

@@ -1 +1,7 @@
-{"version":3,"file":"reindexSubfield6OccurenceNumbers.js","names":["_debug","_interopRequireDefault","require","_utils","_subfield6Utils","e","__esModule","default","debug","createDebugLogger","_default","description","validate","fix","record","nvdebug","res","message","valid","recordDisambiguateSharedSubfield6OccurrenceNumbers","recordResetSubfield6OccurrenceNumbers","recordGetSharedOccurrenceNumbers","length","push","max","recordGetMaxSubfield6OccurrenceNumberAsInteger","size","recordGetNumberOfUniqueSubfield6OccurrenceNumbers","getPotentialSharedOccurrenceNumberFields","occurrenceNumber","fields","filter","f","tag","subfields","some","sf","subfield6GetOccurrenceNumber","subfieldHasSharedOccurrenceNumber","subfield","candFields","relevantFields","fieldHasSharedOccurrenceNumber","field","fieldsContainingSubfield6","fieldHasSubfield","sharedOccurrenceNumberFields","forEach","disambiguateOccurrenceNumber","disambiguateable","fieldGetUnambiguousOccurrenceNumber","fieldToString","undefined","allRelevantFields","relevantFieldsWithCurrFieldTag","candField","newOccurrenceNumberAsInt","newOccurrenceNumber","intToOccurrenceNumberString","pairedFields","fieldGetOccurrenceNumberPairs","fieldResetOccurrenceNumber","pairedField","indexArray","gatherFieldData","gatherSubfieldData","isValidSubfield6","i","subfield6GetOccurrenceNumberAsInteger","n","elem","currentInt","oldtoNewCache","fieldResetSubfield6","subfieldReset6","currIndex","newIndex","mapCurrIndexToNewIndex","subfield6ResetOccurrenceNumber"],"sources":["../src/reindexSubfield6OccurenceNumbers.js"],"sourcesContent":["import createDebugLogger from 'debug';\nimport {fieldHasSubfield, fieldToString, nvdebug} from './utils';\nimport {fieldGetOccurrenceNumberPairs, fieldGetUnambiguousOccurrenceNumber, fieldResetOccurrenceNumber, intToOccurrenceNumberString, isValidSubfield6,\n  recordGetMaxSubfield6OccurrenceNumberAsInteger,\n  subfield6GetOccurrenceNumber, subfield6GetOccurrenceNumberAsInteger, subfield6ResetOccurrenceNumber} from './subfield6Utils';\n\n// Relocated from melinda-marc-record-merge-reducers (and renamed)\n\nconst debug = createDebugLogger('@natlibfi/marc-record-validators-melinda:reindexSubfield6OccurrenceNumbers');\n\n\n// NB! This validator/fixer has two functionalities:\n// 1) normal reindexing of occurrence numbers\n// 2) disambiguation (when possible) of unambiguous occurrence numbers\n\nexport default function () {\n  return {\n    description: 'Reindex occurrence numbers in $6 subfield so that they start from 01 and end in NN',\n    validate, fix\n  };\n\n  function fix(record) {\n    nvdebug('Fix SF6 occurrence numbers', debug);\n    const res = {message: [], fix: [], valid: true};\n    //message.fix = [];\n\n    // This can not really fail...\n\n    recordDisambiguateSharedSubfield6OccurrenceNumbers(record);\n    recordResetSubfield6OccurrenceNumbers(record);\n\n    // message.valid = !(message.message.length >= 1);\n    return res;\n  }\n\n  function validate(record) {\n    const res = {message: []};\n\n    nvdebug('Validate SF6 occurrence number multiuses', debug);\n    if (recordGetSharedOccurrenceNumbers(record).length) {\n      res.message.push(`Multi-use of occurrence number(s) detected`);\n    }\n\n    // Check max, and check number of different indexes\n    nvdebug('Validate SF6 occurrence number (max vs n instances)', debug);\n    const max = recordGetMaxSubfield6OccurrenceNumberAsInteger(record);\n    const size = recordGetNumberOfUniqueSubfield6OccurrenceNumbers(record);\n\n\n    if (max !== size) {\n      res.message.push(`Gaps detected in occurrence numbers: found ${size}, seen max ${max}`);\n    }\n    res.valid = res.message.length < 1;\n    return res;\n  }\n}\n\nfunction getPotentialSharedOccurrenceNumberFields(occurrenceNumber, fields) {\n  return fields.filter(f => f.tag !== '880' && f.subfields.some(sf => subfield6GetOccurrenceNumber(sf) === occurrenceNumber));\n}\n\nfunction subfieldHasSharedOccurrenceNumber(subfield, candFields) {\n  const occurrenceNumber = subfield6GetOccurrenceNumber(subfield);\n  if (!occurrenceNumber || occurrenceNumber === '00') {\n    return false;\n  }\n  const relevantFields = getPotentialSharedOccurrenceNumberFields(occurrenceNumber, candFields);\n  // record.fields.filter(f => f.tag !== '880' && fieldHasOccurrenceNumber(f, occurrenceNumber));\n  return relevantFields.length > 1;\n}\n\nfunction fieldHasSharedOccurrenceNumber(field, candFields) {\n  if (!field.subfields || field.tag === '880') { // Should not happen\n    return false;\n  }\n\n  // What if there are multiple $6s in a given field? Should not be, but...\n  return field.subfields.some(subfield => subfieldHasSharedOccurrenceNumber(subfield, candFields));\n\n}\n\nfunction recordGetSharedOccurrenceNumbers(record) {\n  const fieldsContainingSubfield6 = record.fields.filter(field => field.tag !== '880' && fieldHasSubfield(field, '6'));\n  // fieldsContainingSubfield6.some(field => fieldHasSharedOccurrenceNumber(field, fieldsContainingSubfield6)))\n  return fieldsContainingSubfield6.filter(field => fieldHasSharedOccurrenceNumber(field, fieldsContainingSubfield6));\n}\n\nfunction recordDisambiguateSharedSubfield6OccurrenceNumbers(record) {\n  const sharedOccurrenceNumberFields = recordGetSharedOccurrenceNumbers(record);\n  if (sharedOccurrenceNumberFields.length < 2) {\n    return;\n  }\n  nvdebug(`Disambiguate occurrence numbers (N=${sharedOccurrenceNumberFields.length}) in...`, debug);\n  sharedOccurrenceNumberFields.forEach(field => disambiguateOccurrenceNumber(field)); // eslint-disable-line array-callback-return\n\n  function disambiguateable(field) {\n    if (field.tag === '880') { // Not needed, already filtered...\n      return false;\n    }\n    const occurrenceNumber = fieldGetUnambiguousOccurrenceNumber(field);\n    nvdebug(` Trying to disambiguate ${occurrenceNumber} in '${fieldToString(field)}`);\n    if (occurrenceNumber === undefined) {\n      return false;\n    }\n    const allRelevantFields = getPotentialSharedOccurrenceNumberFields(occurrenceNumber, sharedOccurrenceNumberFields);\n    if (allRelevantFields.length < 2) {\n      nvdebug(` Currently only ${allRelevantFields.length} field(s) use occurrence number ${occurrenceNumber}. No action required.`);\n      return false;\n    }\n    nvdebug(` Currently ${allRelevantFields.length} field(s) use occurrence number ${occurrenceNumber}. ACTION REQUIRED!`);\n    const relevantFieldsWithCurrFieldTag = allRelevantFields.filter(candField => field.tag === candField.tag);\n\n    if (relevantFieldsWithCurrFieldTag.length !== 1) {\n      nvdebug(` Number of them using tag ${field.tag} is ${relevantFieldsWithCurrFieldTag.length}. Can not disambiguate!`);\n      return false;\n    }\n\n    return true;\n  }\n\n  function disambiguateOccurrenceNumber(field) {\n    if (!disambiguateable(field)) {\n      return;\n    }\n    // Reset field:\n    const occurrenceNumber = fieldGetUnambiguousOccurrenceNumber(field);\n    const newOccurrenceNumberAsInt = recordGetMaxSubfield6OccurrenceNumberAsInteger(record) + 1;\n    const newOccurrenceNumber = intToOccurrenceNumberString(newOccurrenceNumberAsInt);\n    const pairedFields = fieldGetOccurrenceNumberPairs(field, record.fields);\n\n    nvdebug(` Reindex '${fieldToString(field)}' occurrence number and it's ${pairedFields.length} pair(s) using '${newOccurrenceNumber}'`, debug);\n\n    fieldResetOccurrenceNumber(field, newOccurrenceNumber, occurrenceNumber);\n    pairedFields.forEach(pairedField => fieldResetOccurrenceNumber(pairedField, newOccurrenceNumber, occurrenceNumber)); // eslint-disable-line array-callback-return\n\n  }\n\n\n}\nfunction recordGetNumberOfUniqueSubfield6OccurrenceNumbers(record) {\n  // Calculates the number of used different occurrence numbers\n  /* eslint-disable */\n  let indexArray = [];\n  record.fields.forEach(field => gatherFieldData(field));\n\n  function gatherFieldData(field) {\n    if (!field.subfields) {\n      return;\n    }\n    field.subfields.forEach(subfield => gatherSubfieldData(subfield));\n  }\n\n  function gatherSubfieldData(subfield) {\n    if (!isValidSubfield6(subfield)) {\n      return;\n    }\n    const i = subfield6GetOccurrenceNumberAsInteger(subfield);\n    if (i === 0) {\n      return\n    }\n    indexArray[i] = 1;\n  }\n  let n = 0;\n  indexArray.forEach(elem => n+= elem); \n  /* eslint-enable */\n  return n;\n}\n\nexport function recordResetSubfield6OccurrenceNumbers(record) { // Remove gaps\n  /* eslint-disable */\n  let currentInt = 1;\n  let oldtoNewCache = {};\n\n  record.fields.forEach(field => fieldResetSubfield6(field));\n\n  function fieldResetSubfield6(field) {\n    nvdebug(`fieldResetSubfield6(${fieldToString(field)}), CURR:${currentInt}`, debug);\n    if (!field.subfields) {\n      return;\n    }\n    field.subfields.forEach(subfield => subfieldReset6(subfield));\n  }\n\n  function subfieldReset6(subfield) {\n    if (!isValidSubfield6(subfield)) {\n      return;\n    }\n    const currIndex = subfield6GetOccurrenceNumber(subfield);\n    if (currIndex === undefined || currIndex === '00') {\n      return;\n    }\n\n    const newIndex = mapCurrIndexToNewIndex(currIndex);\n    //nvdebug(`subfieldReset6(${subfieldToString(subfield)}): ${newIndex}`, debug);\n    subfield6ResetOccurrenceNumber(subfield, newIndex);\n  }\n\n  function mapCurrIndexToNewIndex(currIndex) {\n    if(currIndex in oldtoNewCache) {\n      return oldtoNewCache[currIndex];\n    }\n    const newIndex = intToOccurrenceNumberString(currentInt);\n    oldtoNewCache[currIndex] = newIndex;\n    currentInt++;\n    return newIndex;\n  }\n\n  /* eslint-enable */\n\n}\n"],"mappings":"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","ignoreList":[]}
+{
+  "version": 3,
+  "sources": ["../src/reindexSubfield6OccurenceNumbers.js"],
+  "sourcesContent": ["import createDebugLogger from 'debug';\nimport {fieldHasSubfield, fieldToString, nvdebug} from './utils.js';\nimport {fieldGetOccurrenceNumberPairs, fieldGetUnambiguousOccurrenceNumber, fieldResetOccurrenceNumber, intToOccurrenceNumberString, isValidSubfield6,\n  recordGetMaxSubfield6OccurrenceNumberAsInteger,\n  subfield6GetOccurrenceNumber, subfield6GetOccurrenceNumberAsInteger, subfield6ResetOccurrenceNumber} from './subfield6Utils.js';\n\n// Relocated from melinda-marc-record-merge-reducers (and renamed)\n\nconst debug = createDebugLogger('@natlibfi/marc-record-validators-melinda:reindexSubfield6OccurrenceNumbers');\n\n\n// NB! This validator/fixer has two functionalities:\n// 1) normal reindexing of occurrence numbers\n// 2) disambiguation (when possible) of unambiguous occurrence numbers\n\nexport default function () {\n  return {\n    description: 'Reindex occurrence numbers in $6 subfield so that they start from 01 and end in NN',\n    validate, fix\n  };\n\n  function fix(record) {\n    nvdebug('Fix SF6 occurrence numbers', debug);\n    const res = {message: [], fix: [], valid: true};\n    //message.fix = [];\n\n    // This can not really fail...\n\n    recordDisambiguateSharedSubfield6OccurrenceNumbers(record);\n    recordResetSubfield6OccurrenceNumbers(record);\n\n    // message.valid = !(message.message.length >= 1);\n    return res;\n  }\n\n  function validate(record) {\n    const res = {message: []};\n\n    nvdebug('Validate SF6 occurrence number multiuses', debug);\n    if (recordGetSharedOccurrenceNumbers(record).length) {\n      res.message.push(`Multi-use of occurrence number(s) detected`);\n    }\n\n    // Check max, and check number of different indexes\n    nvdebug('Validate SF6 occurrence number (max vs n instances)', debug);\n    const max = recordGetMaxSubfield6OccurrenceNumberAsInteger(record);\n    const size = recordGetNumberOfUniqueSubfield6OccurrenceNumbers(record);\n\n\n    if (max !== size) {\n      res.message.push(`Gaps detected in occurrence numbers: found ${size}, seen max ${max}`);\n    }\n    res.valid = res.message.length < 1;\n    return res;\n  }\n}\n\nfunction getPotentialSharedOccurrenceNumberFields(occurrenceNumber, fields) {\n  return fields.filter(f => f.tag !== '880' && f.subfields.some(sf => subfield6GetOccurrenceNumber(sf) === occurrenceNumber));\n}\n\nfunction subfieldHasSharedOccurrenceNumber(subfield, candFields) {\n  const occurrenceNumber = subfield6GetOccurrenceNumber(subfield);\n  if (!occurrenceNumber || occurrenceNumber === '00') {\n    return false;\n  }\n  const relevantFields = getPotentialSharedOccurrenceNumberFields(occurrenceNumber, candFields);\n  // record.fields.filter(f => f.tag !== '880' && fieldHasOccurrenceNumber(f, occurrenceNumber));\n  return relevantFields.length > 1;\n}\n\nfunction fieldHasSharedOccurrenceNumber(field, candFields) {\n  if (!field.subfields || field.tag === '880') { // Should not happen\n    return false;\n  }\n\n  // What if there are multiple $6s in a given field? Should not be, but...\n  return field.subfields.some(subfield => subfieldHasSharedOccurrenceNumber(subfield, candFields));\n\n}\n\nfunction recordGetSharedOccurrenceNumbers(record) {\n  const fieldsContainingSubfield6 = record.fields.filter(field => field.tag !== '880' && fieldHasSubfield(field, '6'));\n  // fieldsContainingSubfield6.some(field => fieldHasSharedOccurrenceNumber(field, fieldsContainingSubfield6)))\n  return fieldsContainingSubfield6.filter(field => fieldHasSharedOccurrenceNumber(field, fieldsContainingSubfield6));\n}\n\nfunction recordDisambiguateSharedSubfield6OccurrenceNumbers(record) {\n  const sharedOccurrenceNumberFields = recordGetSharedOccurrenceNumbers(record);\n  if (sharedOccurrenceNumberFields.length < 2) {\n    return;\n  }\n  nvdebug(`Disambiguate occurrence numbers (N=${sharedOccurrenceNumberFields.length}) in...`, debug);\n  sharedOccurrenceNumberFields.forEach(field => disambiguateOccurrenceNumber(field));\n\n  function disambiguateable(field) {\n    if (field.tag === '880') { // Not needed, already filtered...\n      return false;\n    }\n    const occurrenceNumber = fieldGetUnambiguousOccurrenceNumber(field);\n    nvdebug(` Trying to disambiguate ${occurrenceNumber} in '${fieldToString(field)}`);\n    if (occurrenceNumber === undefined) {\n      return false;\n    }\n    const allRelevantFields = getPotentialSharedOccurrenceNumberFields(occurrenceNumber, sharedOccurrenceNumberFields);\n    if (allRelevantFields.length < 2) {\n      nvdebug(` Currently only ${allRelevantFields.length} field(s) use occurrence number ${occurrenceNumber}. No action required.`);\n      return false;\n    }\n    nvdebug(` Currently ${allRelevantFields.length} field(s) use occurrence number ${occurrenceNumber}. ACTION REQUIRED!`);\n    const relevantFieldsWithCurrFieldTag = allRelevantFields.filter(candField => field.tag === candField.tag);\n\n    if (relevantFieldsWithCurrFieldTag.length !== 1) {\n      nvdebug(` Number of them using tag ${field.tag} is ${relevantFieldsWithCurrFieldTag.length}. Can not disambiguate!`);\n      return false;\n    }\n\n    return true;\n  }\n\n  function disambiguateOccurrenceNumber(field) {\n    if (!disambiguateable(field)) {\n      return;\n    }\n    // Reset field:\n    const occurrenceNumber = fieldGetUnambiguousOccurrenceNumber(field);\n    const newOccurrenceNumberAsInt = recordGetMaxSubfield6OccurrenceNumberAsInteger(record) + 1;\n    const newOccurrenceNumber = intToOccurrenceNumberString(newOccurrenceNumberAsInt);\n    const pairedFields = fieldGetOccurrenceNumberPairs(field, record.fields);\n\n    nvdebug(` Reindex '${fieldToString(field)}' occurrence number and it's ${pairedFields.length} pair(s) using '${newOccurrenceNumber}'`, debug);\n\n    fieldResetOccurrenceNumber(field, newOccurrenceNumber, occurrenceNumber);\n    pairedFields.forEach(pairedField => fieldResetOccurrenceNumber(pairedField, newOccurrenceNumber, occurrenceNumber));\n\n  }\n\n\n}\nfunction recordGetNumberOfUniqueSubfield6OccurrenceNumbers(record) {\n  // Calculates the number of used different occurrence numbers\n  let indexArray = [];\n  record.fields.forEach(field => gatherFieldData(field));\n\n  function gatherFieldData(field) {\n    if (!field.subfields) {\n      return;\n    }\n    field.subfields.forEach(subfield => gatherSubfieldData(subfield));\n  }\n\n  function gatherSubfieldData(subfield) {\n    if (!isValidSubfield6(subfield)) {\n      return;\n    }\n    const i = subfield6GetOccurrenceNumberAsInteger(subfield);\n    if (i === 0) {\n      return\n    }\n    indexArray[i] = 1;\n  }\n  let n = 0;\n  indexArray.forEach(elem => n+= elem);\n  return n;\n}\n\nexport function recordResetSubfield6OccurrenceNumbers(record) { // Remove gaps\n  /* eslint-disable */\n  let currentInt = 1;\n  let oldtoNewCache = {};\n\n  record.fields.forEach(field => fieldResetSubfield6(field));\n\n  function fieldResetSubfield6(field) {\n    nvdebug(`fieldResetSubfield6(${fieldToString(field)}), CURR:${currentInt}`, debug);\n    if (!field.subfields) {\n      return;\n    }\n    field.subfields.forEach(subfield => subfieldReset6(subfield));\n  }\n\n  function subfieldReset6(subfield) {\n    if (!isValidSubfield6(subfield)) {\n      return;\n    }\n    const currIndex = subfield6GetOccurrenceNumber(subfield);\n    if (currIndex === undefined || currIndex === '00') {\n      return;\n    }\n\n    const newIndex = mapCurrIndexToNewIndex(currIndex);\n    //nvdebug(`subfieldReset6(${subfieldToString(subfield)}): ${newIndex}`, debug);\n    subfield6ResetOccurrenceNumber(subfield, newIndex);\n  }\n\n  function mapCurrIndexToNewIndex(currIndex) {\n    if(currIndex in oldtoNewCache) {\n      return oldtoNewCache[currIndex];\n    }\n    const newIndex = intToOccurrenceNumberString(currentInt);\n    oldtoNewCache[currIndex] = newIndex;\n    currentInt++;\n    return newIndex;\n  }\n\n  /* eslint-enable */\n\n}\n"],
+  "mappings": "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",
+  "names": []
+}

package/dist/reindexSubfield6OccurenceNumbers.test.js

@@ -0,0 +1,44 @@
+import assert from "node:assert";
+import { MarcRecord } from "@natlibfi/marc-record";
+import validatorFactory from "./reindexSubfield6OccurenceNumbers.js";
+import { READERS } from "@natlibfi/fixura";
+import generateTests from "@natlibfi/fixugen";
+import createDebugLogger from "debug";
+generateTests({
+  callback,
+  path: [import.meta.dirname, "..", "test-fixtures", "reindex-sf6-occurence-numbers"],
+  useMetadataFile: true,
+  recurse: false,
+  fixura: {
+    reader: READERS.JSON
+  },
+  hooks: {
+    before: async () => {
+      testValidatorFactory();
+    }
+  }
+});
+const debug = createDebugLogger("@natlibfi/marc-record-validators-melinda/reindexSubfield6OccurrenceNumbers: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=reindexSubfield6OccurenceNumbers.test.js.map

package/dist/reindexSubfield6OccurenceNumbers.test.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../src/reindexSubfield6OccurenceNumbers.test.js"],
+  "sourcesContent": ["import assert from 'node:assert';\nimport {MarcRecord} from '@natlibfi/marc-record';\nimport validatorFactory from './reindexSubfield6OccurenceNumbers.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', 'reindex-sf6-occurence-numbers'],\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/reindexSubfield6OccurrenceNumbers: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,+BAA+B;AAAA,EAClF,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,iFAAiF;AAEjH,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/removeDuplicateDataFields.js

@@ -1,101 +1,53 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = _default;
-exports.fieldToChain = fieldToChain;
-exports.handleDuplicateSubfield8Chains = handleDuplicateSubfield8Chains;
-exports.isChainHead = isChainHead;
-exports.removeDuplicateDatafields = removeDuplicateDatafields;
-exports.removeDuplicateSubfield8Chains = removeDuplicateSubfield8Chains;
-exports.sameField = sameField;
-var _debug = _interopRequireDefault(require("debug"));
-var _utils = require("./utils");
-var _subfield6Utils = require("./subfield6Utils");
-var _subfield8Utils = require("./subfield8Utils");
-function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+import createDebugLogger from "debug";
+import { fieldsToString, fieldToString, nvdebug } from "./utils.js";
+import { fieldHasValidSubfield6, fieldsGetOccurrenceNumbers, fieldsToNormalizedString, fieldToNormalizedString, get6s } from "./subfield6Utils.js";
+import { add8s, fieldHasLinkingNumber, fieldHasValidSubfield8, fieldsGetAllSubfield8LinkingNumbers, getSubfield8LinkingNumber, recordGetAllSubfield8LinkingNumbers, recordGetFieldsWithSubfield8LinkingNumber } from "./subfield8Utils.js";
 const LINK_ROOT = 4;
 const LINKED_AND_PROCESSED = 2;
 const LINKED_NOT_PROCESSED = 1;
-
-// Relocated from melinda-marc-record-merge-reducers (and renamed)
-
-const debug = (0, _debug.default)('@natlibfi/marc-record-validators-melinda:removeDuplicateDataFields');
-function _default() {
+const debug = createDebugLogger("@natlibfi/marc-record-validators-melinda:removeDuplicateDataFields");
+export default function() {
   return {
-    description: 'Remove duplicate data fields. Certain exceptions apply, mainly too complited chained fields',
+    description: "Remove duplicate data fields. Certain exceptions apply, mainly too complited chained fields",
     validate,
     fix
   };
   function fix(record) {
-    (0, _utils.nvdebug)('Remove duplicate data fields');
-    const res = {
-      message: [],
-      fix: [],
-      valid: true
-    };
+    nvdebug("Remove duplicate data fields");
+    const res = { message: [], fix: [], valid: true };
     removeDuplicateDatafields(record, true);
-    // This can not really fail...
     return res;
   }
   function validate(record) {
-    // Check max, and check number of different indexes
-    (0, _utils.nvdebug)('Validate record: duplicate data fields cause (t)error', debug);
+    nvdebug("Validate record: duplicate data fields cause (t)error", debug);
     const duplicates = removeDuplicateDatafields(record, false);
-
-    //const orphanedFields = getOrphanedFields(fieldsContainingSubfield6);
-
-    const res = {
-      message: duplicates
-    };
-
-    /*
-    if (orphanedFields.length > 0) {
-      res.message = [`${orphanedFields.length} orphaned occurrence number field(s) detected`];
-    }
-    */
+    const res = { message: duplicates };
     res.valid = res.message.length < 1;
     return res;
   }
 }
-
-/*
-function numberOfLinkageSubfields(field) {
-  nvdebug(`N of Linkage Subs(${fieldToString(field)})`);
-  const subfields = field.subfields.filter(sf => sf.code === '6' || sf.code === '8');
-  return subfields.length;
-}
-*/
-
 function removeLinkNotes(record) {
-  record.fields.forEach(f => delete f.linkNote); // eslint-disable-line array-callback-return
+  record.fields.forEach((f) => delete f.linkNote);
 }
 function newGetAllLinkedFields(field, record, useSixes = true, useEights = true) {
-  removeLinkNotes(record); // should be clear, but let's play safe
-
-  /* eslint-disable */
+  removeLinkNotes(record);
   field.linkNote = LINK_ROOT;
   let currField = field;
-
-  // Loop until all linked fields have been processed:
-  while (currField !== undefined) {
+  while (currField !== void 0) {
     if (useSixes) {
-      const related6s = (0, _subfield6Utils.get6s)(currField, record.fields);
-      related6s.forEach(f => linkField(f));
+      const related6s = get6s(currField, record.fields);
+      related6s.forEach((f) => linkField(f));
     }
     if (useEights) {
-      const related8s = (0, _subfield8Utils.add8s)([currField], record);
-      related8s.forEach(f => linkField(f));
+      const related8s = add8s([currField], record);
+      related8s.forEach((f) => linkField(f));
     }
     if (currField.linkNote !== LINK_ROOT) {
       currField.linkNote = LINKED_AND_PROCESSED;
     }
-    currField = record.fields.find(f => f.linkNote === LINKED_NOT_PROCESSED);
+    currField = record.fields.find((f) => f.linkNote === LINKED_NOT_PROCESSED);
   }
-
-  // Collect relevant fields:
-  const linkedFields = record.fields.filter(f => f.linkNote);
+  const linkedFields = record.fields.filter((f) => f.linkNote);
   removeLinkNotes(record);
   return linkedFields;
   function linkField(f) {
@@ -103,135 +55,104 @@ function newGetAllLinkedFields(field, record, useSixes = true, useEights = true)
       f.linkNote = LINKED_NOT_PROCESSED;
     }
   }
-
-  /* eslint-enable */
 }
 function recordRemoveFieldOrSubfield8(record, field, currLinkingNumber) {
-  const eights = field.subfields.filter(sf => sf.code === '8');
+  const eights = field.subfields.filter((sf) => sf.code === "8");
   if (eights.length < 2) {
     record.removeField(field);
     return;
   }
-  const subfields = field.subfields.filter(sf => (0, _subfield8Utils.getSubfield8LinkingNumber)(sf) === currLinkingNumber);
-  subfields.forEach(sf => record.removeSubfield(sf, field)); // eslint-disable-line array-callback-return
+  const subfields = field.subfields.filter((sf) => getSubfield8LinkingNumber(sf) === currLinkingNumber);
+  subfields.forEach((sf) => record.removeSubfield(sf, field));
 }
 function newRecordRemoveFieldOrSubfield8(record, field, currLinkingNumber, fix) {
-  const eights = field.subfields.filter(sf => sf.code === '8');
+  const eights = field.subfields.filter((sf) => sf.code === "8");
   if (eights.length < 2) {
     field.deleted = 1;
     return;
   }
-  const subfields = field.subfields.filter(sf => (0, _subfield8Utils.getSubfield8LinkingNumber)(sf) === currLinkingNumber);
-  subfields.forEach(sf => {
+  const subfields = field.subfields.filter((sf) => getSubfield8LinkingNumber(sf) === currLinkingNumber);
+  subfields.forEach((sf) => {
     field.modified = 1;
     if (fix) {
       record.removeSubfield(sf, field);
     }
   });
 }
-function removeDuplicateSubfield8Chains(record, fix = true) {
-  // Seen $8 subsfields in various fields:
-  // 161 700
-  // 17 710
-  // 11 110
-  // 8 730
-  // 1 100
-  // Given these stats, there's no need to check for 1XX-vs-7XX removals
-
-  /* eslint-disable */
+export function removeDuplicateSubfield8Chains(record, fix = true) {
   let seen = {};
-  let removables = []; // for validation
-
-  (0, _utils.nvdebug)("CHAIN-8");
-  const seenLinkingNumbers = (0, _subfield8Utils.recordGetAllSubfield8LinkingNumbers)(record);
+  let removables = [];
+  nvdebug("CHAIN-8");
+  const seenLinkingNumbers = recordGetAllSubfield8LinkingNumbers(record);
   if (seenLinkingNumbers.length === 0) {
     return removables;
   }
-  (0, _utils.nvdebug)(`seen linking numbers ($8): ${seenLinkingNumbers.join(', ')}`, debug);
-  seenLinkingNumbers.forEach(currLinkingNumber => {
-    const linkedFields = (0, _subfield8Utils.recordGetFieldsWithSubfield8LinkingNumber)(record, currLinkingNumber); //getFieldsWithSubfield8Index(base, baseIndex);
-    // As/If there's just one occurrence number it should be fine to use normalizeOccurrenceNumber = true
+  nvdebug(`seen linking numbers ($8): ${seenLinkingNumbers.join(", ")}`, debug);
+  seenLinkingNumbers.forEach((currLinkingNumber) => {
+    const linkedFields = recordGetFieldsWithSubfield8LinkingNumber(record, currLinkingNumber);
     const normalizeOccurrenceNumber = true;
-    const linkedFieldsAsString = (0, _subfield6Utils.fieldsToNormalizedString)(linkedFields, currLinkingNumber, normalizeOccurrenceNumber, true);
-    (0, _utils.nvdebug)(`Results for LINKING NUMBER ${currLinkingNumber}:`, debug);
-    (0, _utils.nvdebug)(`${linkedFieldsAsString}`, debug);
+    const linkedFieldsAsString = fieldsToNormalizedString(linkedFields, currLinkingNumber, normalizeOccurrenceNumber, true);
+    nvdebug(`Results for LINKING NUMBER ${currLinkingNumber}:`, debug);
+    nvdebug(`${linkedFieldsAsString}`, debug);
     if (linkedFieldsAsString in seen) {
       if (!removables.includes(linkedFieldsAsString)) {
         removables.push(linkedFieldsAsString);
       }
       if (fix) {
-        (0, _utils.nvdebug)(`$8 CHAIN FIX: REMOVE $8 GROUP: ${(0, _utils.fieldsToString)(linkedFields)}`, debug);
-        linkedFields.forEach(field => recordRemoveFieldOrSubfield8(record, field, currLinkingNumber));
+        nvdebug(`$8 CHAIN FIX: REMOVE $8 GROUP: ${fieldsToString(linkedFields)}`, debug);
+        linkedFields.forEach((field) => recordRemoveFieldOrSubfield8(record, field, currLinkingNumber));
         return;
       }
-      (0, _utils.nvdebug)(`$8 VALIDATION: DUPLICATE DETECTED ${linkedFieldsAsString}`, debug);
+      nvdebug(`$8 VALIDATION: DUPLICATE DETECTED ${linkedFieldsAsString}`, debug);
       return;
     }
-    (0, _utils.nvdebug)(`$8 DOUBLE REMOVAL OR VALIDATION: ADD2SEEN ${linkedFieldsAsString}`, debug);
+    nvdebug(`$8 DOUBLE REMOVAL OR VALIDATION: ADD2SEEN ${linkedFieldsAsString}`, debug);
     seen[linkedFieldsAsString] = 1;
     return;
   });
-
-  /* eslint-enable */
   return removables;
 }
-function handleDuplicateSubfield8Chains(record, fix) {
-  // Seen $8 subsfields in various fields:
-  // 161 700
-  // 17 710
-  // 11 110
-  // 8 730
-  // 1 100
-  // Given these stats, there's no need to check for 1XX-vs-7XX removals
-
-  /* eslint-disable */
+export function handleDuplicateSubfield8Chains(record, fix) {
   let seen = {};
-  (0, _utils.nvdebug)("CHAIN-8");
-  const seenLinkingNumbers = (0, _subfield8Utils.recordGetAllSubfield8LinkingNumbers)(record);
+  nvdebug("CHAIN-8");
+  const seenLinkingNumbers = recordGetAllSubfield8LinkingNumbers(record);
   if (seenLinkingNumbers.length === 0) {
     return;
   }
-  (0, _utils.nvdebug)(`seen linking numbers ($8): ${seenLinkingNumbers.join(', ')}`, debug);
-  seenLinkingNumbers.forEach(currLinkingNumber => {
-    const linkedFields = (0, _subfield8Utils.recordGetFieldsWithSubfield8LinkingNumber)(record, currLinkingNumber); //getFieldsWithSubfield8Index(base, baseIndex);
-    // As/If there's just one occurrence number it should be fine to use normalizeOccurrenceNumber = true
-    const normalizeOccurrenceNumber = false; //true;
-    const linkedFieldsAsString = (0, _subfield6Utils.fieldsToNormalizedString)(linkedFields, currLinkingNumber, normalizeOccurrenceNumber, true);
-    (0, _utils.nvdebug)(`Results for LINKING NUMBER ${currLinkingNumber}:`, debug);
-    (0, _utils.nvdebug)(`${linkedFieldsAsString}`, debug);
+  nvdebug(`seen linking numbers ($8): ${seenLinkingNumbers.join(", ")}`, debug);
+  seenLinkingNumbers.forEach((currLinkingNumber) => {
+    const linkedFields = recordGetFieldsWithSubfield8LinkingNumber(record, currLinkingNumber);
+    const normalizeOccurrenceNumber = false;
+    const linkedFieldsAsString = fieldsToNormalizedString(linkedFields, currLinkingNumber, normalizeOccurrenceNumber, true);
+    nvdebug(`Results for LINKING NUMBER ${currLinkingNumber}:`, debug);
+    nvdebug(`${linkedFieldsAsString}`, debug);
     if (linkedFieldsAsString in seen) {
-      (0, _utils.nvdebug)(`$8 CHAIN FIX: REMOVE $8 GROUP: ${(0, _utils.fieldsToString)(linkedFields)}`, debug);
-      linkedFields.forEach(field => newRecordRemoveFieldOrSubfield8(record, field, currLinkingNumber, fix));
+      nvdebug(`$8 CHAIN FIX: REMOVE $8 GROUP: ${fieldsToString(linkedFields)}`, debug);
+      linkedFields.forEach((field) => newRecordRemoveFieldOrSubfield8(record, field, currLinkingNumber, fix));
       return;
     }
-    (0, _utils.nvdebug)(`$8 DOUBLE REMOVAL OR VALIDATION: ADD2SEEN ${linkedFieldsAsString}`, debug);
+    nvdebug(`$8 DOUBLE REMOVAL OR VALIDATION: ADD2SEEN ${linkedFieldsAsString}`, debug);
     seen[linkedFieldsAsString] = 1;
     return;
   });
-
-  /* eslint-enable */
 }
 function markIdenticalSubfield6Chains(chain, record) {
   const normalizeOccurrenceNumber = true;
-  const normalizeTag = chain.some(field => field.tag.substring(0, 1) === '1'); // 1XX can delete 7XX as well!
-  const chainAsString = (0, _subfield6Utils.fieldsToNormalizedString)(chain, 0, normalizeOccurrenceNumber, normalizeTag);
-  (0, _utils.nvdebug)(`markIdenticalSubfield6Chains: ${chainAsString}`);
-  record.fields.forEach(f => compareWithChain(f)); // eslint-disable-line array-callback-return
-
+  const normalizeTag = chain.some((field) => field.tag.substring(0, 1) === "1");
+  const chainAsString = fieldsToNormalizedString(chain, 0, normalizeOccurrenceNumber, normalizeTag);
+  nvdebug(`markIdenticalSubfield6Chains: ${chainAsString}`);
+  record.fields.forEach((f) => compareWithChain(f));
   function compareWithChain(f) {
-    (0, _utils.nvdebug)(`FIELD2CHAIN ${(0, _utils.fieldToString)(f)}`);
+    nvdebug(`FIELD2CHAIN ${fieldToString(f)}`);
     const otherChain = fieldToChain(f, record);
-    // Not a lone field or chain (head) or ... or is-same-chain
     if (otherChain.length === 0 || sameField(chain[0], otherChain[0])) {
       return;
     }
-    const otherChainAsString = (0, _subfield6Utils.fieldsToNormalizedString)(otherChain, 0, normalizeOccurrenceNumber, normalizeTag);
-
-    // Mark other chain as deleted:
+    const otherChainAsString = fieldsToNormalizedString(otherChain, 0, normalizeOccurrenceNumber, normalizeTag);
     if (chainAsString === otherChainAsString) {
-      otherChain.forEach(f => {
-        (0, _utils.nvdebug)(` mark ${(0, _utils.fieldToString)(f)} as deleted ($6-chain)...`);
-        f.deleted = 1;
+      otherChain.forEach((f2) => {
+        nvdebug(` mark ${fieldToString(f2)} as deleted ($6-chain)...`);
+        f2.deleted = 1;
       });
       return;
     }
@@ -241,81 +162,72 @@ function markIdenticalLoneFieldsAsDeletable(field, record) {
   if (field.deleted) {
     return;
   }
-  // targetLinkingNumber = 0, normalizedOccurenceNumber = false, normalizeTag = true)
-  const normalizeTag = field.tag.substring(0, 1) === '1'; // 1XX can delete 7XX as well!
-  const fieldAsString = (0, _subfield6Utils.fieldToNormalizedString)(field, 0, false, normalizeTag);
-  const identicalLoneFields = record.fields.filter(f => !sameField(f, field) && (0, _subfield6Utils.fieldToNormalizedString)(f, 0, false, normalizeTag) === fieldAsString);
-
-  // Mark fields as deleted:
-  identicalLoneFields.forEach(f => {
-    (0, _utils.nvdebug)(` mark ${(0, _utils.fieldToString)(f)} as deleted (lone field)...`);
+  const normalizeTag = field.tag.substring(0, 1) === "1";
+  const fieldAsString = fieldToNormalizedString(field, 0, false, normalizeTag);
+  const identicalLoneFields = record.fields.filter((f) => !sameField(f, field) && fieldToNormalizedString(f, 0, false, normalizeTag) === fieldAsString);
+  identicalLoneFields.forEach((f) => {
+    nvdebug(` mark ${fieldToString(f)} as deleted (lone field)...`);
     f.deleted = 1;
   });
 }
 function acceptFieldsWithSubfield6(fieldsWithSubfield6) {
-  // There can be only one non-880 field:
-  const non880 = fieldsWithSubfield6.filter(f => f.tag !== '880');
+  const non880 = fieldsWithSubfield6.filter((f) => f.tag !== "880");
   if (non880.length > 1) {
     return false;
   }
-  const occurrenceNumbers = (0, _subfield6Utils.fieldsGetOccurrenceNumbers)(fieldsWithSubfield6);
-  // Chain can contain only single occurrence number:
+  const occurrenceNumbers = fieldsGetOccurrenceNumbers(fieldsWithSubfield6);
   if (occurrenceNumbers.length > 1) {
     return false;
   }
   return true;
 }
 function isSingleTagLinkingNumber(linkingNumber, fields, tag) {
-  const relevantFields = fields.filter(f => (0, _subfield8Utils.fieldHasLinkingNumber)(f, linkingNumber));
-  if (relevantFields.some(f => f.tag !== tag)) {
+  const relevantFields = fields.filter((f) => fieldHasLinkingNumber(f, linkingNumber));
+  if (relevantFields.some((f) => f.tag !== tag)) {
     return false;
   }
   return true;
 }
 function acceptFieldsWithSubfield8(fieldsWithSubfield8, requireSingleTag = false) {
-  const linkingNumbers = (0, _subfield8Utils.fieldsGetAllSubfield8LinkingNumbers)(fieldsWithSubfield8);
-  if (linkingNumbers.some(linkingNumber => anomaly8(linkingNumber))) {
+  const linkingNumbers = fieldsGetAllSubfield8LinkingNumbers(fieldsWithSubfield8);
+  if (linkingNumbers.some((linkingNumber) => anomaly8(linkingNumber))) {
     return false;
   }
   return true;
-
-  // If linking number
   function anomaly8(linkingNumber) {
-    (0, _utils.nvdebug)(`  Looking for anomalies in linkin number ${linkingNumber}`);
-    const relevantFields = fieldsWithSubfield8.filter(f => (0, _subfield8Utils.fieldHasLinkingNumber)(f, linkingNumber));
+    nvdebug(`  Looking for anomalies in linkin number ${linkingNumber}`);
+    const relevantFields = fieldsWithSubfield8.filter((f) => fieldHasLinkingNumber(f, linkingNumber));
     if (requireSingleTag) {
       return !isSingleTagLinkingNumber(linkingNumber, relevantFields, relevantFields[0].tag);
     }
-    const f880 = relevantFields.filter(f => f.tag === '880');
+    const f880 = relevantFields.filter((f) => f.tag === "880");
     if (f880.length === 0 || f880.length === relevantFields.length) {
       return false;
     }
     return true;
   }
 }
-function sameField(field1, field2) {
+export function sameField(field1, field2) {
   field1.tmpMyId = 666;
   const result = field2.tmpMyId === 666 ? true : false;
   delete field1.tmpMyId;
   return result;
 }
-function isChainHead(field, chain) {
+export function isChainHead(field, chain) {
   return sameField(field, chain[0]);
 }
-function fieldToChain(field, record) {
+export function fieldToChain(field, record) {
   if (field.deleted || !field.subfields) {
     return [];
   }
   const chain = newGetAllLinkedFields(field, record, true, true);
-  (0, _utils.nvdebug)(` Chain contains ${chain.length} field(s)`);
+  nvdebug(` Chain contains ${chain.length} field(s)`);
   if (!isChainHead(field, chain)) {
-    // newGetAllLinkedFields() marks relevant record.fields!
     return [];
   }
-  const fieldsWithSubfield6 = chain.filter(f => (0, _subfield6Utils.fieldHasValidSubfield6)(f));
-  // Hack: multiple $6 fields, but either all are non-880 or all are 880: treat field as a single entry
+  const fieldsWithSubfield6 = chain.filter((f) => fieldHasValidSubfield6(f));
   if (fieldsWithSubfield6.length > 0) {
-    const non880 = fieldsWithSubfield6.filter(f => f.tag !== '880');
+    const non880 = fieldsWithSubfield6.filter((f) => f.tag !== "880");
     if (non880.length === 0 || non880.length === fieldsWithSubfield6.length) {
       return [field];
     }
@@ -324,74 +236,62 @@ function fieldToChain(field, record) {
     }
   }
   if (!acceptFieldsWithSubfield6(fieldsWithSubfield6)) {
-    // Check tag subfield $6s are legal(ish)
     return [];
   }
-  const fieldsWithSubfield8 = chain.filter(f => (0, _subfield8Utils.fieldHasValidSubfield8)(f));
+  const fieldsWithSubfield8 = chain.filter((f) => fieldHasValidSubfield8(f));
   if (!acceptFieldsWithSubfield8(fieldsWithSubfield8, false)) {
     return [];
   }
-
-  //nvdebug(`Proceed with ${fieldsToString(chain)}`);
-
   return chain;
 }
 function fieldHandleDuplicateDatafields(field, record) {
   const chain = fieldToChain(field, record);
-  (0, _utils.nvdebug)(` TRY TO HANDLE DUPLICATES OF '${(0, _utils.fieldsToString)(chain)}'`);
+  nvdebug(` TRY TO HANDLE DUPLICATES OF '${fieldsToString(chain)}'`);
   if (chain.length === 0) {
     return;
   }
-  const fieldsWithSubfield6 = chain.filter(f => (0, _subfield6Utils.fieldHasValidSubfield6)(f));
-  const fieldsWithSubfield8 = chain.filter(f => (0, _subfield8Utils.fieldHasValidSubfield8)(f));
-
-  // Lone fields:
+  const fieldsWithSubfield6 = chain.filter((f) => fieldHasValidSubfield6(f));
+  const fieldsWithSubfield8 = chain.filter((f) => fieldHasValidSubfield8(f));
   if (chain.length === 1) {
     markIdenticalLoneFieldsAsDeletable(chain[0], record);
     return;
   }
   if (fieldsWithSubfield6.length === 0) {
     if (fieldsWithSubfield8.length === 0) {
-      // chain.length === 1?
-      (0, _utils.nvdebug)(` Trying to find duplicates of single field '${(0, _utils.fieldToString)(chain[0])}'`);
+      nvdebug(` Trying to find duplicates of single field '${fieldToString(chain[0])}'`);
       markIdenticalLoneFieldsAsDeletable(chain[0], record);
       return;
     }
-    const linkingNumbers = (0, _subfield8Utils.fieldsGetAllSubfield8LinkingNumbers)(fieldsWithSubfield8);
+    const linkingNumbers = fieldsGetAllSubfield8LinkingNumbers(fieldsWithSubfield8);
     if (linkingNumbers.length < 2) {
       markIdenticalSubfield6Chains(chain, record);
       return;
     }
   }
   if (fieldsWithSubfield6.length > 0 && acceptFieldsWithSubfield8(fieldsWithSubfield8, true)) {
-    // Checks that non-880 tags are all same
-    // Chain is removable
     markIdenticalSubfield6Chains(chain, record);
     return;
   }
-  (0, _utils.nvdebug)(` NO HANDLER FOUND FOR '${(0, _utils.fieldsToString)(chain)}'`);
-  (0, _utils.nvdebug)(`  N8s: ${fieldsWithSubfield6.length}`);
+  nvdebug(` NO HANDLER FOUND FOR '${fieldsToString(chain)}'`);
+  nvdebug(`  N8s: ${fieldsWithSubfield6.length}`);
 }
-function removeDuplicateDatafields(record, fix = true) {
-  // Sometimes only $8 subfield (vs the whole field) is removed. Thus they are handled separately:
+export function removeDuplicateDatafields(record, fix = true) {
   handleDuplicateSubfield8Chains(record, fix);
-  const dataFields = record.fields.filter(f => f.subfields !== undefined);
-  dataFields.forEach(f => fieldHandleDuplicateDatafields(f, record)); // eslint-disable-line array-callback-return
-
-  const deletableFields = dataFields.filter(f => f.deleted);
-  const modifiedFields = dataFields.filter(f => f.modified && !f.deleted);
-  const result = deletableFields.map(f => `DEL: ${(0, _utils.fieldToString)(f)}`);
+  const dataFields = record.fields.filter((f) => f.subfields !== void 0);
+  dataFields.forEach((f) => fieldHandleDuplicateDatafields(f, record));
+  const deletableFields = dataFields.filter((f) => f.deleted);
+  const modifiedFields = dataFields.filter((f) => f.modified && !f.deleted);
+  const result = deletableFields.map((f) => `DEL: ${fieldToString(f)}`);
   if (modifiedFields.length) {
-    modifiedFields.forEach(f => delete f.modified); // eslint-disable-line array-callback-return
-    result.push(modifiedFields.map(f => `MOD: ${(0, _utils.fieldToString)(f)}`));
+    modifiedFields.forEach((f) => delete f.modified);
+    result.push(modifiedFields.map((f) => `MOD: ${fieldToString(f)}`));
   }
   if (fix) {
-    deletableFields.forEach(f => record.removeField(f)); // eslint-disable-line array-callback-return
+    deletableFields.forEach((f) => record.removeField(f));
     return result;
   }
-  deletableFields.forEach(f => delete f.deleted); // eslint-disable-line array-callback-return
-  deletableFields.forEach(f => delete f.modified); // eslint-disable-line array-callback-return
-
+  deletableFields.forEach((f) => delete f.deleted);
+  deletableFields.forEach((f) => delete f.modified);
   return result;
 }
-//# sourceMappingURL=removeDuplicateDataFields.js.map
+//# sourceMappingURL=removeDuplicateDataFields.js.map