@natlibfi/marc-record-validators-melinda 10.13.1 → 10.14.0-alpha.2

package/dist/sortSubfields.js.map

@@ -1 +1 @@
-{"version":3,"file":"sortSubfields.js","names":["_clone","_interopRequireDefault","require","_debug","_utils","obj","__esModule","default","debug","createDebugLogger","debugDev","extend","defaultSortOrderStringFinns","defaultSortOrderStringOthers","defaultSortOrderFinns","split","defaultSortOrderOthers","_default","description","validate","fix","record","res","message","valid","fields","forEach","field","sortAdjacentSubfields","clonedField","clone","clonedFieldAsString","fieldToString","fieldAsString","push","length","sortOrderForX00","sortOrderForX10","sortOrderFor7XX","sortOrderFor246","subfieldSortOrder","getSubfieldSortOrder","entry","filter","currEntry","tag","sortOrder","nvdebug","swapSubfields","subfields","loopAgain","some","sf","index","currPos","getPosition","prevPos","tmp","subfield","indexOf","code","includes","value","twoBeforeZero","sf2","externalSortOrder","finnishWay","controlSubfieldOrder","sortOrderForField","defaultSortOrder","subfieldOrder"],"sources":["../src/sortSubfields.js"],"sourcesContent":["// Author(s): Nicholas Volk\n\nimport clone from 'clone';\nimport createDebugLogger from 'debug';\nimport {fieldToString, nvdebug} from './utils';\n\nconst debug = createDebugLogger('@natlibfi/marc-record-validators-melinda:sortSubfields');\n//const debugData = debug.extend('data');\nconst debugDev = debug.extend('dev');\n\nconst defaultSortOrderStringFinns = '8673abcdefghijklmnopqrstuvwxyz420159'; // NB! We Finns like $2 before $0 in 6XX...\nconst defaultSortOrderStringOthers = '8673abcdefghijklmnopqrstuvwxyz402159';\n\nconst defaultSortOrderFinns = defaultSortOrderStringFinns.split('');\nconst defaultSortOrderOthers = defaultSortOrderStringOthers.split('');\n\n\nexport default function () {\n\n  return {\n    description: 'Swap adjacent subfields',\n    validate, fix\n  };\n\n  function fix(record) {\n    const res = {message: [], fix: [], valid: true};\n\n    record.fields.forEach(field => {\n      sortAdjacentSubfields(field);\n    });\n\n    return res;\n  }\n\n  function validate(record) {\n    const res = {message: []};\n\n    record.fields.forEach(field => {\n      const clonedField = clone(field);\n      sortAdjacentSubfields(clonedField);\n      const clonedFieldAsString = fieldToString(clonedField);\n      const fieldAsString = fieldToString(field);\n      if (fieldAsString !== clonedFieldAsString) { // eslint-disable-line functional/no-conditional-statements\n        res.message.push(clonedFieldAsString); // eslint-disable-line functional/immutable-data\n      }\n    });\n\n    res.valid = !(res.message.length >= 1); // eslint-disable-line functional/immutable-data\n    return res;\n  }\n}\n\n\n// X00, X10, X11 and X130 could also for their own sets...\nconst sortOrderForX00 = ['6', 'i', 'a', 'b', 'c', 'q', 'd', 'e', 't', 'u', 'l', 'f', 'x', 'y', 'z', '0', '5', '9']; // skip $g. Can't remember why, though...\nconst sortOrderForX10 = ['6', 'i', 'a', 'b', 't', 'n', 'e', 'v', 'w', 'x', 'y', 'z', '0', '5', '9']; // somewhat iffy\nconst sortOrderFor7XX = ['8', '6', '7', 'i', 'a', 's', 't', 'b', 'c', 'd', 'm', 'h', 'k', 'o', 'x', 'z', 'g', 'q', 'w'];\nconst sortOrderFor246 = ['i', 'a', 'b', 'n', 'p', 'f', '5', '9']; // Used by field 946 as well\n\n// List *only* exceptional order here. Otherwise default order is used.\nconst subfieldSortOrder = [\n  {'tag': '017', 'sortOrder': ['i', 'a', 'b', 'd']},\n  {'tag': '028', 'sortOrder': ['b', 'a', 'q']}, // National convention\n  //{'tag': '031', 'sortOrder': ['a', 'b', 'c', 'm', 'e', 'd']}, // utter guesswork\n  {'tag': '040', 'sortOrder': ['8', '6', 'a', 'b', 'e', 'c', 'd', 'x']},\n  {'tag': '041', 'sortOrder': ['8', '6', 'a', 'd', 'j', 'p', 'h', 'e', 'g', 'm']}, // guesswork\n  {'tag': '048', 'sortOrder': ['8', '6', 'b', 'a']},\n  {'tag': '100', 'sortOrder': sortOrderForX00},\n  {'tag': '110', 'sortOrder': sortOrderForX10},\n  {'tag': '111', 'sortOrder': ['a', 'n', 'd', 'c', 'e', 'g', 'j']},\n  {'tag': '130', 'sortOrder': ['a', 'n', 'p', 'k', 'l']},\n  {'tag': '240', 'sortOrder': ['a', 'm', 'n', 'p', 's', 'l', '2', '0', '1', '5', '9']},\n  {'tag': '245', 'sortOrder': ['6', 'a', 'b', 'n', 'p', 'k', 'f', 'c']},\n  {'tag': '246', 'sortOrder': sortOrderFor246},\n  {'tag': '382', 'sortOrder': ['a']},\n  {'tag': '385', 'sortOrder': ['8', 'm', 'n', 'a', '2', '0']},\n  {'tag': '386', 'sortOrder': ['8', 'm', 'n', 'a']},\n  {'tag': '490', 'sortOrder': ['a', 'x', 'y', 'v', 'l']},\n  {'tag': '505', 'sortOrder': ['a']},\n  {'tag': '526', 'sortOrder': ['i', 'a', 'b', 'x', 'z']},\n  {'tag': '540', 'sortOrder': ['a', 'b', 'c', 'd', 'f', '2', 'u']},\n  {'tag': '600', 'sortOrder': sortOrderForX00},\n  {'tag': '610', 'sortOrder': sortOrderForX10},\n  {'tag': '611', 'sortOrder': ['a', 'n', 'd', 'c', 'e', 'g', 'j']},\n  {'tag': '650', 'sortOrder': ['a', 'x', 'y', 'z']},\n  {'tag': '700', 'sortOrder': sortOrderForX00},\n  {'tag': '710', 'sortOrder': sortOrderForX10},\n  {'tag': '711', 'sortOrder': ['a', 'n', 'd', 'c', 'e', 'g', 'j']},\n  {'tag': '760', 'sortOrder': sortOrderFor7XX},\n  {'tag': '762', 'sortOrder': sortOrderFor7XX},\n  {'tag': '765', 'sortOrder': sortOrderFor7XX},\n  {'tag': '767', 'sortOrder': sortOrderFor7XX},\n  {'tag': '770', 'sortOrder': sortOrderFor7XX},\n  {'tag': '772', 'sortOrder': sortOrderFor7XX},\n  {'tag': '773', 'sortOrder': sortOrderFor7XX},\n  {'tag': '774', 'sortOrder': sortOrderFor7XX},\n  {'tag': '775', 'sortOrder': sortOrderFor7XX},\n  {'tag': '776', 'sortOrder': sortOrderFor7XX},\n  {'tag': '777', 'sortOrder': sortOrderFor7XX},\n  {'tag': '780', 'sortOrder': sortOrderFor7XX},\n  {'tag': '785', 'sortOrder': sortOrderFor7XX},\n  {'tag': '786', 'sortOrder': sortOrderFor7XX},\n  {'tag': '787', 'sortOrder': sortOrderFor7XX},\n  {'tag': '788', 'sortOrder': sortOrderFor7XX},\n  {'tag': '800', 'sortOrder': sortOrderForX00},\n  {'tag': '810', 'sortOrder': sortOrderForX10},\n  {'tag': '811', 'sortOrder': ['a', 'n', 'd', 'c', 'e', 'g', 'j']},\n  {'tag': '830', 'sortOrder': ['a', 'n', 'x', 'v']}, // INCOMPLETE, SAME AS 490? APPARENTLY NOT...\n  {'tag': '880', 'sortOrder': ['6', 'a']},\n  {'tag': '946', 'sortOrder': sortOrderFor246},\n  {'tag': 'LOW', 'sortOrder': ['a', 'b', 'c', 'l', 'h']},\n  {'tag': 'SID', 'sortOrder': ['c', 'b']} // Hack, so that default order is not used\n];\n\nfunction getSubfieldSortOrder(field) {\n  const entry = subfieldSortOrder.filter(currEntry => field.tag === currEntry.tag);\n  if (entry.length > 0 && 'sortOrder' in entry[0]) {\n    debugDev(`sort order for ${field.tag}: ${entry[0].sortOrder}`);\n    return entry[0].sortOrder;\n  }\n  nvdebug(`WARNING!\\tNo subfield order found for ${field.tag}.`);\n  return [];\n}\n\n\nfunction swapSubfields(field, sortOrder) {\n  if (!field.subfields) {\n    return;\n  }\n\n  const loopAgain = field.subfields.some((sf, index) => {\n    if (index === 0) {\n      return false;\n    }\n    const currPos = getPosition(sf, sortOrder);\n    const prevPos = getPosition(field.subfields[index - 1], sortOrder);\n    if (currPos === -1 || prevPos === -1 || currPos >= prevPos) {\n      return false;\n    }\n    // Swap:\n    const tmp = field.subfields[index - 1];\n    field.subfields[index - 1] = sf; // eslint-disable-line functional/immutable-data\n    field.subfields[index] = tmp; // eslint-disable-line functional/immutable-data\n    return true;\n  });\n\n  if (loopAgain) {\n    return swapSubfields(field, sortOrder);\n  }\n\n  return;\n\n  function getPosition(subfield, sortOrder) {\n    // Magic exception that *always* comes first, used by Aleph in linking overlong fields\n    if (sortOrder.indexOf('9') > -1 && subfield.code === '9' && ['^', '^^'].includes(subfield.value)) {\n      return -0.5; // normal \"best value\" is 0, and \"worst value\" is N\n    }\n    return sortOrder.indexOf(subfield.code);\n  }\n}\n\n\nfunction twoBeforeZero(field) {\n  const sf2 = field.subfields.filter(sf => sf.code === '2');\n  if (sf2.length !== 1) {\n    return true; // both true and false are ok here\n  }\n  // MRA-465: gcipplatform (field 753)\n  // rdasco (344), creatorbio (353), gbd (668), lsch (eg. 385)\n  if (['creatorbio', 'gbd', 'gcipplatform', 'lscsh', 'rdasco'].includes(sf2[0].value)) {\n    return false;\n  }\n  return true;\n}\n\nexport function sortAdjacentSubfields(field, externalSortOrder = []) {\n  if (!field.subfields) {\n    return field;\n  }\n  // Features:\n  // - Swap only sort adjacent pairs.\n  // - No sorting over unlisted subfield codes. Thus a given subfield can not shift to wrong side of 700$t...\n\n  // Implement: 880 field should use values from $6...\n\n  // Should we support multiple sort orders per field?\n\n  // Try to handle control subfield order. This is not 100% fool proof. Control subfields are pretty stable, though.\n  // However, there are exceptions (eg. $9 ^^ comes first and $2 $0 is a Finnish convention...)\n\n  const finnishWay = twoBeforeZero(field);\n  const controlSubfieldOrder = finnishWay ? ['8', '6', '7', '3', 'a', '4', '2', '0', '1', '5', '9'] : ['8', '6', '7', '3', 'a', '4', '0', '2', '1', '5', '9'];\n  swapSubfields(field, controlSubfieldOrder);\n\n  const sortOrderForField = externalSortOrder.length > 0 ? externalSortOrder : getSubfieldSortOrder(field);\n  //nvdebug(`INTERMEDIATE SUBFIELD ORDER FOR ${field.tag}: ${sortOrderForField.join(', ')}`);\n\n  const defaultSortOrder = finnishWay ? defaultSortOrderFinns : defaultSortOrderOthers; // $2 vs $0\n  const subfieldOrder = sortOrderForField.length > 0 ? sortOrderForField : defaultSortOrder;\n  //nvdebug(`FINAL SUBFIELD ORDER (FINNISH=${finnishWay}) FOR ${field.tag}: ${subfieldOrder.join(', ')}`);\n  //if (sortOrder === null) { return field; } //// Currently always sort..\n  //nvdebug(`IN:  ${fieldToString(field)}`);\n  swapSubfields(field, subfieldOrder);\n  //nvdebug(`OUT: ${fieldToString(field)}`);\n\n  return field;\n}\n\n"],"mappings":";;;;;;;AAEA,IAAAA,MAAA,GAAAC,sBAAA,CAAAC,OAAA;AACA,IAAAC,MAAA,GAAAF,sBAAA,CAAAC,OAAA;AACA,IAAAE,MAAA,GAAAF,OAAA;AAA+C,SAAAD,uBAAAI,GAAA,WAAAA,GAAA,IAAAA,GAAA,CAAAC,UAAA,GAAAD,GAAA,KAAAE,OAAA,EAAAF,GAAA;AAJ/C;;AAMA,MAAMG,KAAK,GAAG,IAAAC,cAAiB,EAAC,wDAAwD,CAAC;AACzF;AACA,MAAMC,QAAQ,GAAGF,KAAK,CAACG,MAAM,CAAC,KAAK,CAAC;AAEpC,MAAMC,2BAA2B,GAAG,sCAAsC,CAAC,CAAC;AAC5E,MAAMC,4BAA4B,GAAG,sCAAsC;AAE3E,MAAMC,qBAAqB,GAAGF,2BAA2B,CAACG,KAAK,CAAC,EAAE,CAAC;AACnE,MAAMC,sBAAsB,GAAGH,4BAA4B,CAACE,KAAK,CAAC,EAAE,CAAC;AAGtD,SAAAE,SAAA,EAAY;EAEzB,OAAO;IACLC,WAAW,EAAE,yBAAyB;IACtCC,QAAQ;IAAEC;EACZ,CAAC;EAED,SAASA,GAAGA,CAACC,MAAM,EAAE;IACnB,MAAMC,GAAG,GAAG;MAACC,OAAO,EAAE,EAAE;MAAEH,GAAG,EAAE,EAAE;MAAEI,KAAK,EAAE;IAAI,CAAC;IAE/CH,MAAM,CAACI,MAAM,CAACC,OAAO,CAACC,KAAK,IAAI;MAC7BC,qBAAqB,CAACD,KAAK,CAAC;IAC9B,CAAC,CAAC;IAEF,OAAOL,GAAG;EACZ;EAEA,SAASH,QAAQA,CAACE,MAAM,EAAE;IACxB,MAAMC,GAAG,GAAG;MAACC,OAAO,EAAE;IAAE,CAAC;IAEzBF,MAAM,CAACI,MAAM,CAACC,OAAO,CAACC,KAAK,IAAI;MAC7B,MAAME,WAAW,GAAG,IAAAC,cAAK,EAACH,KAAK,CAAC;MAChCC,qBAAqB,CAACC,WAAW,CAAC;MAClC,MAAME,mBAAmB,GAAG,IAAAC,oBAAa,EAACH,WAAW,CAAC;MACtD,MAAMI,aAAa,GAAG,IAAAD,oBAAa,EAACL,KAAK,CAAC;MAC1C,IAAIM,aAAa,KAAKF,mBAAmB,EAAE;QAAE;QAC3CT,GAAG,CAACC,OAAO,CAACW,IAAI,CAACH,mBAAmB,CAAC,CAAC,CAAC;MACzC;IACF,CAAC,CAAC;;IAEFT,GAAG,CAACE,KAAK,GAAG,EAAEF,GAAG,CAACC,OAAO,CAACY,MAAM,IAAI,CAAC,CAAC,CAAC,CAAC;IACxC,OAAOb,GAAG;EACZ;AACF;;AAGA;AACA,MAAMc,eAAe,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC;AACpH,MAAMC,eAAe,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC;AACrG,MAAMC,eAAe,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC;AACvH,MAAMC,eAAe,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC;;AAElE;AACA,MAAMC,iBAAiB,GAAG,CACxB;EAAC,KAAK,EAAE,KAAK;EAAE,WAAW,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG;AAAC,CAAC,EACjD;EAAC,KAAK,EAAE,KAAK;EAAE,WAAW,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG;AAAC,CAAC;AAAE;AAC9C;AACA;EAAC,KAAK,EAAE,KAAK;EAAE,WAAW,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG;AAAC,CAAC,EACrE;EAAC,KAAK,EAAE,KAAK;EAAE,WAAW,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG;AAAC,CAAC;AAAE;AACjF;EAAC,KAAK,EAAE,KAAK;EAAE,WAAW,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG;AAAC,CAAC,EACjD;EAAC,KAAK,EAAE,KAAK;EAAE,WAAW,EAAEJ;AAAe,CAAC,EAC5C;EAAC,KAAK,EAAE,KAAK;EAAE,WAAW,EAAEC;AAAe,CAAC,EAC5C;EAAC,KAAK,EAAE,KAAK;EAAE,WAAW,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG;AAAC,CAAC,EAChE;EAAC,KAAK,EAAE,KAAK;EAAE,WAAW,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG;AAAC,CAAC,EACtD;EAAC,KAAK,EAAE,KAAK;EAAE,WAAW,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG;AAAC,CAAC,EACpF;EAAC,KAAK,EAAE,KAAK;EAAE,WAAW,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG;AAAC,CAAC,EACrE;EAAC,KAAK,EAAE,KAAK;EAAE,WAAW,EAAEE;AAAe,CAAC,EAC5C;EAAC,KAAK,EAAE,KAAK;EAAE,WAAW,EAAE,CAAC,GAAG;AAAC,CAAC,EAClC;EAAC,KAAK,EAAE,KAAK;EAAE,WAAW,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG;AAAC,CAAC,EAC3D;EAAC,KAAK,EAAE,KAAK;EAAE,WAAW,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG;AAAC,CAAC,EACjD;EAAC,KAAK,EAAE,KAAK;EAAE,WAAW,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG;AAAC,CAAC,EACtD;EAAC,KAAK,EAAE,KAAK;EAAE,WAAW,EAAE,CAAC,GAAG;AAAC,CAAC,EAClC;EAAC,KAAK,EAAE,KAAK;EAAE,WAAW,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG;AAAC,CAAC,EACtD;EAAC,KAAK,EAAE,KAAK;EAAE,WAAW,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG;AAAC,CAAC,EAChE;EAAC,KAAK,EAAE,KAAK;EAAE,WAAW,EAAEH;AAAe,CAAC,EAC5C;EAAC,KAAK,EAAE,KAAK;EAAE,WAAW,EAAEC;AAAe,CAAC,EAC5C;EAAC,KAAK,EAAE,KAAK;EAAE,WAAW,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG;AAAC,CAAC,EAChE;EAAC,KAAK,EAAE,KAAK;EAAE,WAAW,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG;AAAC,CAAC,EACjD;EAAC,KAAK,EAAE,KAAK;EAAE,WAAW,EAAED;AAAe,CAAC,EAC5C;EAAC,KAAK,EAAE,KAAK;EAAE,WAAW,EAAEC;AAAe,CAAC,EAC5C;EAAC,KAAK,EAAE,KAAK;EAAE,WAAW,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG;AAAC,CAAC,EAChE;EAAC,KAAK,EAAE,KAAK;EAAE,WAAW,EAAEC;AAAe,CAAC,EAC5C;EAAC,KAAK,EAAE,KAAK;EAAE,WAAW,EAAEA;AAAe,CAAC,EAC5C;EAAC,KAAK,EAAE,KAAK;EAAE,WAAW,EAAEA;AAAe,CAAC,EAC5C;EAAC,KAAK,EAAE,KAAK;EAAE,WAAW,EAAEA;AAAe,CAAC,EAC5C;EAAC,KAAK,EAAE,KAAK;EAAE,WAAW,EAAEA;AAAe,CAAC,EAC5C;EAAC,KAAK,EAAE,KAAK;EAAE,WAAW,EAAEA;AAAe,CAAC,EAC5C;EAAC,KAAK,EAAE,KAAK;EAAE,WAAW,EAAEA;AAAe,CAAC,EAC5C;EAAC,KAAK,EAAE,KAAK;EAAE,WAAW,EAAEA;AAAe,CAAC,EAC5C;EAAC,KAAK,EAAE,KAAK;EAAE,WAAW,EAAEA;AAAe,CAAC,EAC5C;EAAC,KAAK,EAAE,KAAK;EAAE,WAAW,EAAEA;AAAe,CAAC,EAC5C;EAAC,KAAK,EAAE,KAAK;EAAE,WAAW,EAAEA;AAAe,CAAC,EAC5C;EAAC,KAAK,EAAE,KAAK;EAAE,WAAW,EAAEA;AAAe,CAAC,EAC5C;EAAC,KAAK,EAAE,KAAK;EAAE,WAAW,EAAEA;AAAe,CAAC,EAC5C;EAAC,KAAK,EAAE,KAAK;EAAE,WAAW,EAAEA;AAAe,CAAC,EAC5C;EAAC,KAAK,EAAE,KAAK;EAAE,WAAW,EAAEA;AAAe,CAAC,EAC5C;EAAC,KAAK,EAAE,KAAK;EAAE,WAAW,EAAEA;AAAe,CAAC,EAC5C;EAAC,KAAK,EAAE,KAAK;EAAE,WAAW,EAAEF;AAAe,CAAC,EAC5C;EAAC,KAAK,EAAE,KAAK;EAAE,WAAW,EAAEC;AAAe,CAAC,EAC5C;EAAC,KAAK,EAAE,KAAK;EAAE,WAAW,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG;AAAC,CAAC,EAChE;EAAC,KAAK,EAAE,KAAK;EAAE,WAAW,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG;AAAC,CAAC;AAAE;AACnD;EAAC,KAAK,EAAE,KAAK;EAAE,WAAW,EAAE,CAAC,GAAG,EAAE,GAAG;AAAC,CAAC,EACvC;EAAC,KAAK,EAAE,KAAK;EAAE,WAAW,EAAEE;AAAe,CAAC,EAC5C;EAAC,KAAK,EAAE,KAAK;EAAE,WAAW,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG;AAAC,CAAC,EACtD;EAAC,KAAK,EAAE,KAAK;EAAE,WAAW,EAAE,CAAC,GAAG,EAAE,GAAG;AAAC,CAAC,CAAC;AAAA,CACzC;;AAED,SAASE,oBAAoBA,CAACd,KAAK,EAAE;EACnC,MAAMe,KAAK,GAAGF,iBAAiB,CAACG,MAAM,CAACC,SAAS,IAAIjB,KAAK,CAACkB,GAAG,KAAKD,SAAS,CAACC,GAAG,CAAC;EAChF,IAAIH,KAAK,CAACP,MAAM,GAAG,CAAC,IAAI,WAAW,IAAIO,KAAK,CAAC,CAAC,CAAC,EAAE;IAC/ChC,QAAQ,CAAE,kBAAiBiB,KAAK,CAACkB,GAAI,KAAIH,KAAK,CAAC,CAAC,CAAC,CAACI,SAAU,EAAC,CAAC;IAC9D,OAAOJ,KAAK,CAAC,CAAC,CAAC,CAACI,SAAS;EAC3B;EACA,IAAAC,cAAO,EAAE,yCAAwCpB,KAAK,CAACkB,GAAI,GAAE,CAAC;EAC9D,OAAO,EAAE;AACX;AAGA,SAASG,aAAaA,CAACrB,KAAK,EAAEmB,SAAS,EAAE;EACvC,IAAI,CAACnB,KAAK,CAACsB,SAAS,EAAE;IACpB;EACF;EAEA,MAAMC,SAAS,GAAGvB,KAAK,CAACsB,SAAS,CAACE,IAAI,CAAC,CAACC,EAAE,EAAEC,KAAK,KAAK;IACpD,IAAIA,KAAK,KAAK,CAAC,EAAE;MACf,OAAO,KAAK;IACd;IACA,MAAMC,OAAO,GAAGC,WAAW,CAACH,EAAE,EAAEN,SAAS,CAAC;IAC1C,MAAMU,OAAO,GAAGD,WAAW,CAAC5B,KAAK,CAACsB,SAAS,CAACI,KAAK,GAAG,CAAC,CAAC,EAAEP,SAAS,CAAC;IAClE,IAAIQ,OAAO,KAAK,CAAC,CAAC,IAAIE,OAAO,KAAK,CAAC,CAAC,IAAIF,OAAO,IAAIE,OAAO,EAAE;MAC1D,OAAO,KAAK;IACd;IACA;IACA,MAAMC,GAAG,GAAG9B,KAAK,CAACsB,SAAS,CAACI,KAAK,GAAG,CAAC,CAAC;IACtC1B,KAAK,CAACsB,SAAS,CAACI,KAAK,GAAG,CAAC,CAAC,GAAGD,EAAE,CAAC,CAAC;IACjCzB,KAAK,CAACsB,SAAS,CAACI,KAAK,CAAC,GAAGI,GAAG,CAAC,CAAC;IAC9B,OAAO,IAAI;EACb,CAAC,CAAC;EAEF,IAAIP,SAAS,EAAE;IACb,OAAOF,aAAa,CAACrB,KAAK,EAAEmB,SAAS,CAAC;EACxC;EAEA;EAEA,SAASS,WAAWA,CAACG,QAAQ,EAAEZ,SAAS,EAAE;IACxC;IACA,IAAIA,SAAS,CAACa,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,IAAID,QAAQ,CAACE,IAAI,KAAK,GAAG,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,CAACC,QAAQ,CAACH,QAAQ,CAACI,KAAK,CAAC,EAAE;MAChG,OAAO,CAAC,GAAG,CAAC,CAAC;IACf;;IACA,OAAOhB,SAAS,CAACa,OAAO,CAACD,QAAQ,CAACE,IAAI,CAAC;EACzC;AACF;AAGA,SAASG,aAAaA,CAACpC,KAAK,EAAE;EAC5B,MAAMqC,GAAG,GAAGrC,KAAK,CAACsB,SAAS,CAACN,MAAM,CAACS,EAAE,IAAIA,EAAE,CAACQ,IAAI,KAAK,GAAG,CAAC;EACzD,IAAII,GAAG,CAAC7B,MAAM,KAAK,CAAC,EAAE;IACpB,OAAO,IAAI,CAAC,CAAC;EACf;EACA;EACA;EACA,IAAI,CAAC,YAAY,EAAE,KAAK,EAAE,cAAc,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC0B,QAAQ,CAACG,GAAG,CAAC,CAAC,CAAC,CAACF,KAAK,CAAC,EAAE;IACnF,OAAO,KAAK;EACd;EACA,OAAO,IAAI;AACb;AAEO,SAASlC,qBAAqBA,CAACD,KAAK,EAAEsC,iBAAiB,GAAG,EAAE,EAAE;EACnE,IAAI,CAACtC,KAAK,CAACsB,SAAS,EAAE;IACpB,OAAOtB,KAAK;EACd;EACA;EACA;EACA;;EAEA;;EAEA;;EAEA;EACA;;EAEA,MAAMuC,UAAU,GAAGH,aAAa,CAACpC,KAAK,CAAC;EACvC,MAAMwC,oBAAoB,GAAGD,UAAU,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC;EAC3JlB,aAAa,CAACrB,KAAK,EAAEwC,oBAAoB,CAAC;EAE1C,MAAMC,iBAAiB,GAAGH,iBAAiB,CAAC9B,MAAM,GAAG,CAAC,GAAG8B,iBAAiB,GAAGxB,oBAAoB,CAACd,KAAK,CAAC;EACxG;;EAEA,MAAM0C,gBAAgB,GAAGH,UAAU,GAAGpD,qBAAqB,GAAGE,sBAAsB,CAAC,CAAC;EACtF,MAAMsD,aAAa,GAAGF,iBAAiB,CAACjC,MAAM,GAAG,CAAC,GAAGiC,iBAAiB,GAAGC,gBAAgB;EACzF;EACA;EACA;EACArB,aAAa,CAACrB,KAAK,EAAE2C,aAAa,CAAC;EACnC;;EAEA,OAAO3C,KAAK;AACd"}
+{"version":3,"file":"sortSubfields.js","names":["_clone","_interopRequireDefault","require","_debug","_utils","obj","__esModule","default","debug","createDebugLogger","debugDev","extend","defaultSortOrderStringFinns","defaultSortOrderStringOthers","defaultSortOrderFinns","split","defaultSortOrderOthers","_default","tagPattern","description","validate","fix","getRelevantFields","record","datafields","fields","filter","f","subfields","regexp","RegExp","test","tag","res","message","valid","relevantFields","forEach","field","sortAdjacentSubfields","clonedField","clone","clonedFieldAsString","fieldToString","fieldAsString","push","length","sortOrderForX00","sortOrderForX10","sortOrderFor7XX","sortOrderFor246","subfieldSortOrder","getSubfieldSortOrder","entry","currEntry","sortOrder","nvdebug","swapSubfields","loopAgain","some","sf","index","currPos","getPosition","prevPos","tmp","subfield","indexOf","code","includes","value","twoBeforeZero","sf2","externalSortOrder","finnishWay","controlSubfieldOrder","sortOrderForField","defaultSortOrder","subfieldOrder"],"sources":["../src/sortSubfields.js"],"sourcesContent":["// Author(s): Nicholas Volk\n\nimport clone from 'clone';\nimport createDebugLogger from 'debug';\nimport {fieldToString, nvdebug} from './utils';\n\nconst debug = createDebugLogger('@natlibfi/marc-record-validators-melinda:sortSubfields');\n//const debugData = debug.extend('data');\nconst debugDev = debug.extend('dev');\n\nconst defaultSortOrderStringFinns = '8673abcdefghijklmnopqrstuvwxyz420159'; // NB! We Finns like $2 before $0 in 6XX...\nconst defaultSortOrderStringOthers = '8673abcdefghijklmnopqrstuvwxyz402159';\n\nconst defaultSortOrderFinns = defaultSortOrderStringFinns.split('');\nconst defaultSortOrderOthers = defaultSortOrderStringOthers.split('');\n\n\nexport default function (tagPattern) {\n\n  return {\n    description: 'Swap adjacent subfields',\n    validate, fix\n  };\n\n  function getRelevantFields(record, tagPattern) {\n    const datafields = record.fields.filter(f => f.subfields);\n    if (!tagPattern) {\n      return datafields;\n    }\n\n    const regexp = new RegExp(tagPattern, 'u');\n    return datafields.filter(f => regexp.test(f.tag));\n  }\n\n  function fix(record, tagPattern) {\n    const res = {message: [], fix: [], valid: true};\n\n    const relevantFields = getRelevantFields(record, tagPattern);\n\n    relevantFields.forEach(field => {\n      sortAdjacentSubfields(field);\n    });\n\n    return res;\n  }\n\n  function validate(record) {\n    const res = {message: []};\n\n    const relevantFields = getRelevantFields(record, tagPattern);\n\n    relevantFields.forEach(field => {\n      const clonedField = clone(field);\n      sortAdjacentSubfields(clonedField);\n      const clonedFieldAsString = fieldToString(clonedField);\n      const fieldAsString = fieldToString(field);\n      if (fieldAsString !== clonedFieldAsString) { // eslint-disable-line functional/no-conditional-statements\n        res.message.push(clonedFieldAsString); // eslint-disable-line functional/immutable-data\n      }\n    });\n\n    res.valid = !(res.message.length >= 1); // eslint-disable-line functional/immutable-data\n    return res;\n  }\n}\n\n\n// X00, X10, X11 and X130 could also for their own sets...\nconst sortOrderForX00 = ['6', 'i', 'a', 'b', 'c', 'q', 'd', 'e', 't', 'u', 'l', 'f', 'x', 'y', 'z', '0', '5', '9']; // skip $g. Can't remember why, though...\nconst sortOrderForX10 = ['6', 'i', 'a', 'b', 't', 'n', 'e', 'v', 'w', 'x', 'y', 'z', '0', '5', '9']; // somewhat iffy\nconst sortOrderFor7XX = ['8', '6', '7', 'i', 'a', 's', 't', 'b', 'c', 'd', 'm', 'h', 'k', 'o', 'x', 'z', 'g', 'q', 'w'];\nconst sortOrderFor246 = ['i', 'a', 'b', 'n', 'p', 'f', '5', '9']; // Used by field 946 as well\n\n// List *only* exceptional order here. Otherwise default order is used.\nconst subfieldSortOrder = [\n  {'tag': '017', 'sortOrder': ['i', 'a', 'b', 'd']},\n  {'tag': '028', 'sortOrder': ['b', 'a', 'q']}, // National convention\n  //{'tag': '031', 'sortOrder': ['a', 'b', 'c', 'm', 'e', 'd']}, // utter guesswork\n  {'tag': '040', 'sortOrder': ['8', '6', 'a', 'b', 'e', 'c', 'd', 'x']},\n  {'tag': '041', 'sortOrder': ['8', '6', 'a', 'd', 'j', 'p', 'h', 'e', 'g', 'm']}, // guesswork\n  {'tag': '048', 'sortOrder': ['8', '6', 'b', 'a']},\n  {'tag': '100', 'sortOrder': sortOrderForX00},\n  {'tag': '110', 'sortOrder': sortOrderForX10},\n  {'tag': '111', 'sortOrder': ['a', 'n', 'd', 'c', 'e', 'g', 'j']},\n  {'tag': '130', 'sortOrder': ['a', 'n', 'p', 'k', 'l']},\n  {'tag': '240', 'sortOrder': ['a', 'm', 'n', 'p', 's', 'l', '2', '0', '1', '5', '9']},\n  {'tag': '245', 'sortOrder': ['6', 'a', 'b', 'n', 'p', 'k', 'f', 'c']},\n  {'tag': '246', 'sortOrder': sortOrderFor246},\n  {'tag': '382', 'sortOrder': ['a']},\n  {'tag': '385', 'sortOrder': ['8', 'm', 'n', 'a', '2', '0']},\n  {'tag': '386', 'sortOrder': ['8', 'm', 'n', 'a']},\n  {'tag': '490', 'sortOrder': ['a', 'x', 'y', 'v', 'l']},\n  {'tag': '505', 'sortOrder': ['a']},\n  {'tag': '526', 'sortOrder': ['i', 'a', 'b', 'x', 'z']},\n  {'tag': '540', 'sortOrder': ['a', 'b', 'c', 'd', 'f', '2', 'u']},\n  {'tag': '600', 'sortOrder': sortOrderForX00},\n  {'tag': '610', 'sortOrder': sortOrderForX10},\n  {'tag': '611', 'sortOrder': ['a', 'n', 'd', 'c', 'e', 'g', 'j']},\n  {'tag': '650', 'sortOrder': ['a', 'x', 'y', 'z']},\n  {'tag': '700', 'sortOrder': sortOrderForX00},\n  {'tag': '710', 'sortOrder': sortOrderForX10},\n  {'tag': '711', 'sortOrder': ['a', 'n', 'd', 'c', 'e', 'g', 'j']},\n  {'tag': '760', 'sortOrder': sortOrderFor7XX},\n  {'tag': '762', 'sortOrder': sortOrderFor7XX},\n  {'tag': '765', 'sortOrder': sortOrderFor7XX},\n  {'tag': '767', 'sortOrder': sortOrderFor7XX},\n  {'tag': '770', 'sortOrder': sortOrderFor7XX},\n  {'tag': '772', 'sortOrder': sortOrderFor7XX},\n  {'tag': '773', 'sortOrder': sortOrderFor7XX},\n  {'tag': '774', 'sortOrder': sortOrderFor7XX},\n  {'tag': '775', 'sortOrder': sortOrderFor7XX},\n  {'tag': '776', 'sortOrder': sortOrderFor7XX},\n  {'tag': '777', 'sortOrder': sortOrderFor7XX},\n  {'tag': '780', 'sortOrder': sortOrderFor7XX},\n  {'tag': '785', 'sortOrder': sortOrderFor7XX},\n  {'tag': '786', 'sortOrder': sortOrderFor7XX},\n  {'tag': '787', 'sortOrder': sortOrderFor7XX},\n  {'tag': '788', 'sortOrder': sortOrderFor7XX},\n  {'tag': '800', 'sortOrder': sortOrderForX00},\n  {'tag': '810', 'sortOrder': sortOrderForX10},\n  {'tag': '811', 'sortOrder': ['a', 'n', 'd', 'c', 'e', 'g', 'j']},\n  {'tag': '830', 'sortOrder': ['a', 'n', 'x', 'v']}, // INCOMPLETE, SAME AS 490? APPARENTLY NOT...\n  {'tag': '880', 'sortOrder': ['6', 'a']},\n  {'tag': '946', 'sortOrder': sortOrderFor246},\n  {'tag': 'LOW', 'sortOrder': ['a', 'b', 'c', 'l', 'h']},\n  {'tag': 'SID', 'sortOrder': ['c', 'b']} // Hack, so that default order is not used\n];\n\nfunction getSubfieldSortOrder(field) {\n  const entry = subfieldSortOrder.filter(currEntry => field.tag === currEntry.tag);\n  if (entry.length > 0 && 'sortOrder' in entry[0]) {\n    debugDev(`sort order for ${field.tag}: ${entry[0].sortOrder}`);\n    return entry[0].sortOrder;\n  }\n  nvdebug(`WARNING!\\tNo subfield order found for ${field.tag}.`);\n  return [];\n}\n\n\nfunction swapSubfields(field, sortOrder) {\n  if (!field.subfields) {\n    return;\n  }\n\n  const loopAgain = field.subfields.some((sf, index) => {\n    if (index === 0) {\n      return false;\n    }\n    const currPos = getPosition(sf, sortOrder);\n    const prevPos = getPosition(field.subfields[index - 1], sortOrder);\n    if (currPos === -1 || prevPos === -1 || currPos >= prevPos) {\n      return false;\n    }\n    // Swap:\n    const tmp = field.subfields[index - 1];\n    field.subfields[index - 1] = sf; // eslint-disable-line functional/immutable-data\n    field.subfields[index] = tmp; // eslint-disable-line functional/immutable-data\n    return true;\n  });\n\n  if (loopAgain) {\n    return swapSubfields(field, sortOrder);\n  }\n\n  return;\n\n  function getPosition(subfield, sortOrder) {\n    // Magic exception that *always* comes first, used by Aleph in linking overlong fields\n    if (sortOrder.indexOf('9') > -1 && subfield.code === '9' && ['^', '^^'].includes(subfield.value)) {\n      return -0.5; // normal \"best value\" is 0, and \"worst value\" is N\n    }\n    return sortOrder.indexOf(subfield.code);\n  }\n}\n\n\nfunction twoBeforeZero(field) {\n  const sf2 = field.subfields.filter(sf => sf.code === '2');\n  if (sf2.length !== 1) {\n    return true; // both true and false are ok here\n  }\n  // MRA-465: gcipplatform (field 753)\n  // rdasco (344), creatorbio (353), gbd (668), lsch (eg. 385)\n  if (['creatorbio', 'gbd', 'gcipplatform', 'lscsh', 'rdasco'].includes(sf2[0].value)) {\n    return false;\n  }\n  return true;\n}\n\nexport function sortAdjacentSubfields(field, externalSortOrder = []) {\n  if (!field.subfields) {\n    return field;\n  }\n  // Features:\n  // - Swap only sort adjacent pairs.\n  // - No sorting over unlisted subfield codes. Thus a given subfield can not shift to wrong side of 700$t...\n\n  // Implement: 880 field should use values from $6...\n\n  // Should we support multiple sort orders per field?\n\n  // Try to handle control subfield order. This is not 100% fool proof. Control subfields are pretty stable, though.\n  // However, there are exceptions (eg. $9 ^^ comes first and $2 $0 is a Finnish convention...)\n\n  const finnishWay = twoBeforeZero(field);\n  const controlSubfieldOrder = finnishWay ? ['8', '6', '7', '3', 'a', '4', '2', '0', '1', '5', '9'] : ['8', '6', '7', '3', 'a', '4', '0', '2', '1', '5', '9'];\n  swapSubfields(field, controlSubfieldOrder);\n\n  const sortOrderForField = externalSortOrder.length > 0 ? externalSortOrder : getSubfieldSortOrder(field);\n  //nvdebug(`INTERMEDIATE SUBFIELD ORDER FOR ${field.tag}: ${sortOrderForField.join(', ')}`);\n\n  const defaultSortOrder = finnishWay ? defaultSortOrderFinns : defaultSortOrderOthers; // $2 vs $0\n  const subfieldOrder = sortOrderForField.length > 0 ? sortOrderForField : defaultSortOrder;\n  //nvdebug(`FINAL SUBFIELD ORDER (FINNISH=${finnishWay}) FOR ${field.tag}: ${subfieldOrder.join(', ')}`);\n  //if (sortOrder === null) { return field; } //// Currently always sort..\n  //nvdebug(`IN:  ${fieldToString(field)}`);\n  swapSubfields(field, subfieldOrder);\n  //nvdebug(`OUT: ${fieldToString(field)}`);\n\n  return field;\n}\n\n"],"mappings":"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"}

package/dist/sortSubfields.spec.js

@@ -29,7 +29,8 @@ async function testValidatorFactory() {
 async function callback({
   getFixture,
   enabled = true,
-  fix = false
+  fix = false,
+  tagPattern = false
 }) {
   if (enabled === false) {
     debug('TEST SKIPPED!');
@@ -41,11 +42,11 @@ async function callback({
   // console.log(expectedResult); // eslint-disable-line
 
   if (!fix) {
-    const result = await validator.validate(record);
+    const result = await validator.validate(record, tagPattern);
     (0, _chai.expect)(result).to.eql(expectedResult);
     return;
   }
-  await validator.fix(record);
+  await validator.fix(record, tagPattern);
   (0, _chai.expect)(record).to.eql(expectedResult);
 }
 //# sourceMappingURL=sortSubfields.spec.js.map

package/dist/sortSubfields.spec.js.map

@@ -1 +1 @@
-{"version":3,"file":"sortSubfields.spec.js","names":["_chai","require","_marcRecord","_sortSubfields","_interopRequireDefault","_fixura","_fixugen","_debug","obj","__esModule","default","generateTests","callback","path","__dirname","useMetadataFile","recurse","fixura","reader","READERS","JSON","mocha","before","testValidatorFactory","debug","createDebugLogger","validator","validatorFactory","expect","to","be","an","that","has","any","keys","description","a","validate","getFixture","enabled","fix","record","MarcRecord","expectedResult","result","eql"],"sources":["../src/sortSubfields.spec.js"],"sourcesContent":["import {expect} from 'chai';\nimport {MarcRecord} from '@natlibfi/marc-record';\nimport validatorFactory from './sortSubfields';\nimport {READERS} from '@natlibfi/fixura';\nimport generateTests from '@natlibfi/fixugen';\nimport createDebugLogger from 'debug';\n\ngenerateTests({\n  callback,\n  path: [__dirname, '..', 'test-fixtures', 'sort-subfields'],\n  useMetadataFile: true,\n  recurse: false,\n  fixura: {\n    reader: READERS.JSON\n  },\n  mocha: {\n    before: () => testValidatorFactory()\n  }\n});\nconst debug = createDebugLogger('@natlibfi/marc-record-validators-melinda/sortSubfields:test');\n\nasync function testValidatorFactory() {\n  const validator = await validatorFactory();\n\n  expect(validator)\n    .to.be.an('object')\n    .that.has.any.keys('description', 'validate');\n\n  expect(validator.description).to.be.a('string');\n  expect(validator.validate).to.be.a('function');\n}\n\nasync function callback({getFixture, enabled = true, fix = false}) {\n  if (enabled === false) {\n    debug('TEST SKIPPED!');\n    return;\n  }\n\n  const validator = await validatorFactory();\n  const record = new MarcRecord(getFixture('record.json'));\n  const expectedResult = getFixture('expectedResult.json');\n  // console.log(expectedResult); // eslint-disable-line\n\n  if (!fix) {\n    const result = await validator.validate(record);\n    expect(result).to.eql(expectedResult);\n    return;\n  }\n\n  await validator.fix(record);\n  expect(record).to.eql(expectedResult);\n}\n"],"mappings":";;AAAA,IAAAA,KAAA,GAAAC,OAAA;AACA,IAAAC,WAAA,GAAAD,OAAA;AACA,IAAAE,cAAA,GAAAC,sBAAA,CAAAH,OAAA;AACA,IAAAI,OAAA,GAAAJ,OAAA;AACA,IAAAK,QAAA,GAAAF,sBAAA,CAAAH,OAAA;AACA,IAAAM,MAAA,GAAAH,sBAAA,CAAAH,OAAA;AAAsC,SAAAG,uBAAAI,GAAA,WAAAA,GAAA,IAAAA,GAAA,CAAAC,UAAA,GAAAD,GAAA,KAAAE,OAAA,EAAAF,GAAA;AAEtC,IAAAG,gBAAa,EAAC;EACZC,QAAQ;EACRC,IAAI,EAAE,CAACC,SAAS,EAAE,IAAI,EAAE,eAAe,EAAE,gBAAgB,CAAC;EAC1DC,eAAe,EAAE,IAAI;EACrBC,OAAO,EAAE,KAAK;EACdC,MAAM,EAAE;IACNC,MAAM,EAAEC,eAAO,CAACC;EAClB,CAAC;EACDC,KAAK,EAAE;IACLC,MAAM,EAAEA,CAAA,KAAMC,oBAAoB,CAAC;EACrC;AACF,CAAC,CAAC;AACF,MAAMC,KAAK,GAAG,IAAAC,cAAiB,EAAC,6DAA6D,CAAC;AAE9F,eAAeF,oBAAoBA,CAAA,EAAG;EACpC,MAAMG,SAAS,GAAG,MAAM,IAAAC,sBAAgB,EAAC,CAAC;EAE1C,IAAAC,YAAM,EAACF,SAAS,CAAC,CACdG,EAAE,CAACC,EAAE,CAACC,EAAE,CAAC,QAAQ,CAAC,CAClBC,IAAI,CAACC,GAAG,CAACC,GAAG,CAACC,IAAI,CAAC,aAAa,EAAE,UAAU,CAAC;EAE/C,IAAAP,YAAM,EAACF,SAAS,CAACU,WAAW,CAAC,CAACP,EAAE,CAACC,EAAE,CAACO,CAAC,CAAC,QAAQ,CAAC;EAC/C,IAAAT,YAAM,EAACF,SAAS,CAACY,QAAQ,CAAC,CAACT,EAAE,CAACC,EAAE,CAACO,CAAC,CAAC,UAAU,CAAC;AAChD;AAEA,eAAezB,QAAQA,CAAC;EAAC2B,UAAU;EAAEC,OAAO,GAAG,IAAI;EAAEC,GAAG,GAAG;AAAK,CAAC,EAAE;EACjE,IAAID,OAAO,KAAK,KAAK,EAAE;IACrBhB,KAAK,CAAC,eAAe,CAAC;IACtB;EACF;EAEA,MAAME,SAAS,GAAG,MAAM,IAAAC,sBAAgB,EAAC,CAAC;EAC1C,MAAMe,MAAM,GAAG,IAAIC,sBAAU,CAACJ,UAAU,CAAC,aAAa,CAAC,CAAC;EACxD,MAAMK,cAAc,GAAGL,UAAU,CAAC,qBAAqB,CAAC;EACxD;;EAEA,IAAI,CAACE,GAAG,EAAE;IACR,MAAMI,MAAM,GAAG,MAAMnB,SAAS,CAACY,QAAQ,CAACI,MAAM,CAAC;IAC/C,IAAAd,YAAM,EAACiB,MAAM,CAAC,CAAChB,EAAE,CAACiB,GAAG,CAACF,cAAc,CAAC;IACrC;EACF;EAEA,MAAMlB,SAAS,CAACe,GAAG,CAACC,MAAM,CAAC;EAC3B,IAAAd,YAAM,EAACc,MAAM,CAAC,CAACb,EAAE,CAACiB,GAAG,CAACF,cAAc,CAAC;AACvC"}
+{"version":3,"file":"sortSubfields.spec.js","names":["_chai","require","_marcRecord","_sortSubfields","_interopRequireDefault","_fixura","_fixugen","_debug","obj","__esModule","default","generateTests","callback","path","__dirname","useMetadataFile","recurse","fixura","reader","READERS","JSON","mocha","before","testValidatorFactory","debug","createDebugLogger","validator","validatorFactory","expect","to","be","an","that","has","any","keys","description","a","validate","getFixture","enabled","fix","tagPattern","record","MarcRecord","expectedResult","result","eql"],"sources":["../src/sortSubfields.spec.js"],"sourcesContent":["import {expect} from 'chai';\nimport {MarcRecord} from '@natlibfi/marc-record';\nimport validatorFactory from './sortSubfields';\nimport {READERS} from '@natlibfi/fixura';\nimport generateTests from '@natlibfi/fixugen';\nimport createDebugLogger from 'debug';\n\ngenerateTests({\n  callback,\n  path: [__dirname, '..', 'test-fixtures', 'sort-subfields'],\n  useMetadataFile: true,\n  recurse: false,\n  fixura: {\n    reader: READERS.JSON\n  },\n  mocha: {\n    before: () => testValidatorFactory()\n  }\n});\nconst debug = createDebugLogger('@natlibfi/marc-record-validators-melinda/sortSubfields:test');\n\nasync function testValidatorFactory() {\n  const validator = await validatorFactory();\n\n  expect(validator)\n    .to.be.an('object')\n    .that.has.any.keys('description', 'validate');\n\n  expect(validator.description).to.be.a('string');\n  expect(validator.validate).to.be.a('function');\n}\n\nasync function callback({getFixture, enabled = true, fix = false, tagPattern = 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, tagPattern);\n    expect(result).to.eql(expectedResult);\n    return;\n  }\n\n  await validator.fix(record, tagPattern);\n  expect(record).to.eql(expectedResult);\n}\n"],"mappings":";;AAAA,IAAAA,KAAA,GAAAC,OAAA;AACA,IAAAC,WAAA,GAAAD,OAAA;AACA,IAAAE,cAAA,GAAAC,sBAAA,CAAAH,OAAA;AACA,IAAAI,OAAA,GAAAJ,OAAA;AACA,IAAAK,QAAA,GAAAF,sBAAA,CAAAH,OAAA;AACA,IAAAM,MAAA,GAAAH,sBAAA,CAAAH,OAAA;AAAsC,SAAAG,uBAAAI,GAAA,WAAAA,GAAA,IAAAA,GAAA,CAAAC,UAAA,GAAAD,GAAA,KAAAE,OAAA,EAAAF,GAAA;AAEtC,IAAAG,gBAAa,EAAC;EACZC,QAAQ;EACRC,IAAI,EAAE,CAACC,SAAS,EAAE,IAAI,EAAE,eAAe,EAAE,gBAAgB,CAAC;EAC1DC,eAAe,EAAE,IAAI;EACrBC,OAAO,EAAE,KAAK;EACdC,MAAM,EAAE;IACNC,MAAM,EAAEC,eAAO,CAACC;EAClB,CAAC;EACDC,KAAK,EAAE;IACLC,MAAM,EAAEA,CAAA,KAAMC,oBAAoB,CAAC;EACrC;AACF,CAAC,CAAC;AACF,MAAMC,KAAK,GAAG,IAAAC,cAAiB,EAAC,6DAA6D,CAAC;AAE9F,eAAeF,oBAAoBA,CAAA,EAAG;EACpC,MAAMG,SAAS,GAAG,MAAM,IAAAC,sBAAgB,EAAC,CAAC;EAE1C,IAAAC,YAAM,EAACF,SAAS,CAAC,CACdG,EAAE,CAACC,EAAE,CAACC,EAAE,CAAC,QAAQ,CAAC,CAClBC,IAAI,CAACC,GAAG,CAACC,GAAG,CAACC,IAAI,CAAC,aAAa,EAAE,UAAU,CAAC;EAE/C,IAAAP,YAAM,EAACF,SAAS,CAACU,WAAW,CAAC,CAACP,EAAE,CAACC,EAAE,CAACO,CAAC,CAAC,QAAQ,CAAC;EAC/C,IAAAT,YAAM,EAACF,SAAS,CAACY,QAAQ,CAAC,CAACT,EAAE,CAACC,EAAE,CAACO,CAAC,CAAC,UAAU,CAAC;AAChD;AAEA,eAAezB,QAAQA,CAAC;EAAC2B,UAAU;EAAEC,OAAO,GAAG,IAAI;EAAEC,GAAG,GAAG,KAAK;EAAEC,UAAU,GAAG;AAAK,CAAC,EAAE;EACrF,IAAIF,OAAO,KAAK,KAAK,EAAE;IACrBhB,KAAK,CAAC,eAAe,CAAC;IACtB;EACF;EAEA,MAAME,SAAS,GAAG,MAAM,IAAAC,sBAAgB,EAAC,CAAC;EAC1C,MAAMgB,MAAM,GAAG,IAAIC,sBAAU,CAACL,UAAU,CAAC,aAAa,CAAC,CAAC;EACxD,MAAMM,cAAc,GAAGN,UAAU,CAAC,qBAAqB,CAAC;EACxD;;EAEA,IAAI,CAACE,GAAG,EAAE;IACR,MAAMK,MAAM,GAAG,MAAMpB,SAAS,CAACY,QAAQ,CAACK,MAAM,EAAED,UAAU,CAAC;IAC3D,IAAAd,YAAM,EAACkB,MAAM,CAAC,CAACjB,EAAE,CAACkB,GAAG,CAACF,cAAc,CAAC;IACrC;EACF;EAEA,MAAMnB,SAAS,CAACe,GAAG,CAACE,MAAM,EAAED,UAAU,CAAC;EACvC,IAAAd,YAAM,EAACe,MAAM,CAAC,CAACd,EAAE,CAACkB,GAAG,CAACF,cAAc,CAAC;AACvC"}

package/dist/utils.js

@@ -12,6 +12,7 @@ exports.isElectronicMaterial = isElectronicMaterial;
 exports.nvdebug = nvdebug;
 exports.nvdebugFieldArray = nvdebugFieldArray;
 exports.subfieldToString = subfieldToString;
+exports.uniqArray = uniqArray;
 function isElectronicMaterial(record) {
   const f337s = record.get('337');
   return f337s.some(field => {
@@ -78,4 +79,7 @@ function getCatalogingLanguage(record) {
   }
   return b.value;
 }
+function uniqArray(arr) {
+  return arr.filter((val, i) => arr.indexOf(val) === i);
+}
 //# sourceMappingURL=utils.js.map

package/dist/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","names":["isElectronicMaterial","record","f337s","get","some","field","mediaTypeIsC","subfields","sub","code","value","sourceIsRdamedia","nvdebug","message","func","undefined","fieldHasSubfield","subfieldCode","subfieldValue","sf","subfieldToString","normalizeIndicatorValue","val","fieldToString","f","tag","ind1","ind2","formatSubfields","map","join","fieldsToString","fields","nvdebugFieldArray","prefix","forEach","isControlSubfieldCode","includes","getCatalogingLanguage","field040","b","filter"],"sources":["../src/utils.js"],"sourcesContent":["export function isElectronicMaterial(record) {\n  const f337s = record.get('337');\n\n  return f337s.some(field => {\n    const mediaTypeIsC = field.subfields.some(sub => sub.code === 'b' && sub.value === 'c');\n    const sourceIsRdamedia = field.subfields.some(sub => sub.code === '2' && sub.value === 'rdamedia');\n    return mediaTypeIsC && sourceIsRdamedia;\n  });\n}\n\nexport function nvdebug(message, func = undefined) {\n  if (func) { // eslint-disable-line functional/no-conditional-statements\n    func(message);\n  }\n  //console.info(message); // eslint-disable-line no-console\n}\n\nexport function fieldHasSubfield(field, subfieldCode, subfieldValue = null) {\n  if (!field.subfields) {\n    return false;\n  }\n  if (subfieldValue === null) {\n    return field.subfields.some(sf => sf.code === subfieldCode);\n  }\n  return field.subfields.some(sf => sf.code === subfieldCode && subfieldValue === sf.value);\n}\n\nexport function subfieldToString(sf) {\n  return `‡${sf.code} ${sf.value}`;\n}\n\nfunction normalizeIndicatorValue(val) {\n  if (val === ' ') {\n    return '#';\n  }\n  return val;\n}\n\nexport function fieldToString(f) {\n  if ('subfields' in f) {\n    return `${f.tag} ${normalizeIndicatorValue(f.ind1)}${normalizeIndicatorValue(f.ind2)}${formatSubfields(f)}`;\n  }\n  return `${f.tag}    ${f.value}`;\n\n  function formatSubfields(field) {\n    return field.subfields.map(sf => ` ${subfieldToString(sf)}`).join('');\n  }\n}\n\nexport function fieldsToString(fields) {\n  return fields.map(f => fieldToString(f)).join('\\t__SEPARATOR__\\t');\n}\n\nexport function nvdebugFieldArray(fields, prefix = '  ', func = undefined) {\n  fields.forEach(field => nvdebug(`${prefix}${fieldToString(field)}`, func));\n}\n\nexport function isControlSubfieldCode(subfieldCode) {\n  if (['0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'w'].includes(subfieldCode)) {\n    return true;\n  }\n  return false;\n}\n\nexport function getCatalogingLanguage(record) {\n  const [field040] = record.get(/^040$/u);\n  if (!field040) {\n    return null;\n  }\n  const [b] = field040.subfields.filter(sf => sf.code === 'b');\n  if (!b) {\n    return null;\n  }\n  return b.value;\n}\n"],"mappings":"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"}
+{"version":3,"file":"utils.js","names":["isElectronicMaterial","record","f337s","get","some","field","mediaTypeIsC","subfields","sub","code","value","sourceIsRdamedia","nvdebug","message","func","undefined","fieldHasSubfield","subfieldCode","subfieldValue","sf","subfieldToString","normalizeIndicatorValue","val","fieldToString","f","tag","ind1","ind2","formatSubfields","map","join","fieldsToString","fields","nvdebugFieldArray","prefix","forEach","isControlSubfieldCode","includes","getCatalogingLanguage","field040","b","filter","uniqArray","arr","i","indexOf"],"sources":["../src/utils.js"],"sourcesContent":["export function isElectronicMaterial(record) {\n  const f337s = record.get('337');\n\n  return f337s.some(field => {\n    const mediaTypeIsC = field.subfields.some(sub => sub.code === 'b' && sub.value === 'c');\n    const sourceIsRdamedia = field.subfields.some(sub => sub.code === '2' && sub.value === 'rdamedia');\n    return mediaTypeIsC && sourceIsRdamedia;\n  });\n}\n\nexport function nvdebug(message, func = undefined) {\n  if (func) { // eslint-disable-line functional/no-conditional-statements\n    func(message);\n  }\n  //console.info(message); // eslint-disable-line no-console\n}\n\nexport function fieldHasSubfield(field, subfieldCode, subfieldValue = null) {\n  if (!field.subfields) {\n    return false;\n  }\n  if (subfieldValue === null) {\n    return field.subfields.some(sf => sf.code === subfieldCode);\n  }\n  return field.subfields.some(sf => sf.code === subfieldCode && subfieldValue === sf.value);\n}\n\nexport function subfieldToString(sf) {\n  return `‡${sf.code} ${sf.value}`;\n}\n\nfunction normalizeIndicatorValue(val) {\n  if (val === ' ') {\n    return '#';\n  }\n  return val;\n}\n\nexport function fieldToString(f) {\n  if ('subfields' in f) {\n    return `${f.tag} ${normalizeIndicatorValue(f.ind1)}${normalizeIndicatorValue(f.ind2)}${formatSubfields(f)}`;\n  }\n  return `${f.tag}    ${f.value}`;\n\n  function formatSubfields(field) {\n    return field.subfields.map(sf => ` ${subfieldToString(sf)}`).join('');\n  }\n}\n\nexport function fieldsToString(fields) {\n  return fields.map(f => fieldToString(f)).join('\\t__SEPARATOR__\\t');\n}\n\nexport function nvdebugFieldArray(fields, prefix = '  ', func = undefined) {\n  fields.forEach(field => nvdebug(`${prefix}${fieldToString(field)}`, func));\n}\n\nexport function isControlSubfieldCode(subfieldCode) {\n  if (['0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'w'].includes(subfieldCode)) {\n    return true;\n  }\n  return false;\n}\n\nexport function getCatalogingLanguage(record) {\n  const [field040] = record.get(/^040$/u);\n  if (!field040) {\n    return null;\n  }\n  const [b] = field040.subfields.filter(sf => sf.code === 'b');\n  if (!b) {\n    return null;\n  }\n  return b.value;\n}\n\n\nexport function uniqArray(arr) {\n  return arr.filter((val, i) => arr.indexOf(val) === i);\n}\n"],"mappings":"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"}

package/package.json

@@ -14,7 +14,7 @@
     "url": "git@github.com:natlibfi/marc-record-validators-melinda.git"
   },
   "license": "MIT",
-  "version": "10.13.1",
+  "version": "10.14.0-alpha.2",
   "main": "./dist/index.js",
   "publishConfig": {
     "access": "public"
@@ -51,19 +51,19 @@
     "@natlibfi/marc-record-validate": "^8.0.1"
   },
   "devDependencies": {
-    "@babel/cli": "^7.22.15",
-    "@babel/core": "^7.22.17",
+    "@babel/cli": "^7.23.0",
+    "@babel/core": "^7.23.0",
     "@babel/eslint-parser": "^7.22.15",
-    "@babel/preset-env": "^7.22.15",
-    "@natlibfi/eslint-config-melinda-backend": "^3.0.1",
+    "@babel/preset-env": "^7.22.20",
+    "@natlibfi/eslint-config-melinda-backend": "^3.0.2",
     "@natlibfi/fixugen": "^2.0.1",
     "@natlibfi/fixura": "^3.0.1",
     "babel-plugin-istanbul": "^6.1.1",
     "babel-plugin-rewire": "^1.2.0",
-    "chai": "^4.3.8",
+    "chai": "^4.3.10",
     "chai-as-promised": "^7.1.1",
     "cross-env": "^7.0.3",
-    "eslint": "^8.49.0",
+    "eslint": "^8.50.0",
     "fetch-mock": "^9.11.0",
     "mocha": "^10.2.0",
     "nyc": "^15.1.0"

package/src/index.js

@@ -30,6 +30,7 @@ import RemoveDuplicateDataFields from './removeDuplicateDataFields';
 import RemoveInferiorDataFields from './removeInferiorDataFields';
 import ResolvableExtReferences from './resolvable-ext-references-melinda';
 import SanitizeVocabularySourceCodes from './sanitize-vocabulary-source-codes';
+import SortFields from './sortFields';
 import SortRelatorTerms from './sortRelatorTerms';
 import SortSubfields from './sortSubfields';
 import SortTags from './sort-tags';
@@ -84,5 +85,6 @@ export {
   TypeOfDateF008,
   UnicodeDecomposition,
   UpdateField540,
-  Urn
+  Urn,
+  SortFields // Keep this as last
 };

package/src/punctuation2.js

@@ -145,16 +145,20 @@ const linkingEntryWhatever = [{'code': 'abdghiklmnopqrstuwxyz', 'followedBy': 'a
 //        Might need to work on that at some point. NOT a top priority though.
 // NB #3! Final punctuation creation is/should be handled by endind-punctuation.js validator!
 
-const crappy246 = [{'code': 'abfghinp', 'followedBy': '#', 'remove': /\.$/u, 'context': dotIsProbablyPunc}];
+const crappy24X = [
+  {'code': 'abnp', 'followedBy': '!c', 'remove': / \/$/u},
+  {'code': 'abc', 'followedBy': '#', 'remove': /\.$/u, 'context': dotIsProbablyPunc},
+  {'code': 'abfghinp', 'followedBy': '#', 'remove': /\.$/u, 'context': dotIsProbablyPunc},
+  {'code': 'n', 'followedBy': 'p', 'remove': /\.$/u, 'context': dotIsProbablyPunc}, // MELINDA-8817
+  {'code': 'p', 'followedBy': 'pc', 'remove': /\.$/u, 'context': dotIsProbablyPunc} // MELINDA-8817
+];
 
 const cleanCrappyPunctuationRules = {
   '100': removeX00Whatever,
   '110': removeX10Whatever,
-  '245': [
-    {'code': 'ab', 'followedBy': '!c', 'remove': / \/$/u},
-    {'code': 'abc', 'followedBy': '#', 'remove': /\.$/u, 'context': dotIsProbablyPunc}
-  ],
-  '246': crappy246,
+  '240': crappy24X,
+  '245': crappy24X,
+  '246': crappy24X,
   '300': [
     {'code': 'a', 'followedBy': '!b', 'remove': / *:$/u},
     {'code': 'a', 'followedBy': 'b', 'remove': /:$/u, 'context': /[^ ]:$/u},
@@ -175,7 +179,7 @@ const cleanCrappyPunctuationRules = {
   '800': removeX00Whatever,
   '810': removeX10Whatever,
   '830': remove490And830Whatever,
-  '946': crappy246
+  '946': crappy24X
 };
 
 const cleanLegalX00Comma = {'code': 'abcde', 'followedBy': 'cdegj', 'context': /.,$/u, 'remove': /,$/u};
@@ -256,7 +260,9 @@ const addX10 = [addX10bDot, addX10eComma, addX10Dot, addLanguageComma, addSemico
 const add245 = [
   // Blah! Also "$a = $b" and "$a ; $b" can be valid... But ' :' is better than nothing, I guess...
   {'code': 'a', 'followedBy': 'b', 'add': ' :', 'context': defaultNeedsPuncAfter},
+  {'code': 'ab', 'followedBy': 'n', 'add': '.', 'content': defaultNeedsPuncAfter},
   {'code': 'abk', 'followedBy': 'f', 'add': ',', 'context': defaultNeedsPuncAfter},
+  {'code': 'n', 'followedBy': 'p', 'add': ',', 'context': defaultNeedsPuncAfter},
   {'code': 'abfnp', 'followedBy': 'c', 'add': ' /', 'context': defaultNeedsPuncAfter},
   {'code': 'abc', 'followedBy': '#', 'add': '.', 'context': defaultNeedsPuncAfter} // Stepping on punctuation/ toes
 ];
@@ -278,6 +284,7 @@ const addSeriesTitle = [ // 490 and 830
 const addPairedPunctuationRules = {
   '100': addX00,
   '110': addX10,
+  '240': add246,
   '245': add245,
   '246': add246,
   '260': [