@natlibfi/marc-record-validators-melinda 13.0.4 → 13.0.5-alpha.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (31) hide show
  1. package/dist/cyrillux-usemarcon-replacement.test.js +2 -2
  2. package/dist/cyrillux-usemarcon-replacement.test.js.map +2 -2
  3. package/dist/merge-fields/mergeConstraints.js +1 -1
  4. package/dist/merge-fields/mergeConstraints.js.map +2 -2
  5. package/dist/merge-fields/mergeField.js +2 -2
  6. package/dist/merge-fields/mergeField.js.map +2 -2
  7. package/dist/merge-fields/mergeOrAddSubfield.js +19 -5
  8. package/dist/merge-fields/mergeOrAddSubfield.js.map +2 -2
  9. package/dist/punctuation2.js +16 -8
  10. package/dist/punctuation2.js.map +2 -2
  11. package/dist/punctuation2.test.js +2 -2
  12. package/dist/punctuation2.test.js.map +2 -2
  13. package/dist/sortSubfields.js +2 -2
  14. package/dist/sortSubfields.js.map +2 -2
  15. package/package.json +8 -8
  16. package/src/cyrillux-usemarcon-replacement.test.js +2 -2
  17. package/src/merge-fields/mergeConstraints.js +1 -1
  18. package/src/merge-fields/mergeField.js +2 -2
  19. package/src/merge-fields/mergeOrAddSubfield.js +28 -5
  20. package/src/punctuation2.js +20 -12
  21. package/src/punctuation2.test.js +2 -2
  22. package/src/sortSubfields.js +1 -1
  23. package/test-fixtures/cyrillux-usemarcon-replacement/f10/metadata.json +1 -1
  24. package/test-fixtures/merge-fields/f04/expectedResult.json +1 -2
  25. package/test-fixtures/merge-fields/f04/record.json +1 -2
  26. package/test-fixtures/merge-fields/f700_01/expectedResult.json +18 -0
  27. package/test-fixtures/merge-fields/f700_01/metadata.json +5 -0
  28. package/test-fixtures/merge-fields/f700_01/record.json +24 -0
  29. package/test-fixtures/merge-fields/f830_01/expectedResult.json +20 -0
  30. package/test-fixtures/merge-fields/f830_01/metadata.json +6 -0
  31. package/test-fixtures/merge-fields/f830_01/record.json +20 -0
package/dist/punctuation2.js.map CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../src/punctuation2.js"],
4
- "sourcesContent": ["/* eslint-disable max-lines */\n/*\n* punctuation.js -- try and fix a marc field punctuation\n*\n* Author(s): Nicholas Volk <nicholas.volk@helsinki.fi>\n*\n* NOTE #1: https://www.kiwi.fi/display/kumea/Loppupisteohje is implemented via another validator/fixer (ending-punctuation).\n* This file has some support but it's now yet thorough. (And mmight never be.)\n* NOTE #2: Validator/fixer punctuation does similar stuff, but focuses on X00 fields.\n* NOTE #3: As of 2023-06-05 control subfields ($0...$9) are obsolete. Don't use them in rules.\n* (They are jumped over when looking for next (non-controlfield subfield)\n*/\nimport {validateSingleField} from './ending-punctuation.js';\nimport {tagToDataProvenanceSubfieldCode} from './dataProvenanceUtils.js';\nimport {fieldGetUnambiguousTag} from './subfield6Utils.js';\nimport createDebugLogger from 'debug';\nimport {fieldToString, isContentSubfieldCode, nvdebug} from './utils.js';\n\n\nconst debug = createDebugLogger('@natlibfi/marc-record-validators-melinda:punctuation2');\n//const debugData = debug.extend('data');\nconst debugDev = debug.extend('dev');\n\nconst descriptionString = 'Remove invalid and add valid punctuation to data fields';\nexport default function () {\n return {\n description: descriptionString,\n validate, fix\n };\n\n function fix(record) {\n nvdebug(`${descriptionString}: fixer`, debugDev);\n const res = {message: [], fix: [], valid: true};\n record.fields.forEach(f => fieldFixPunctuation(f));\n return res;\n }\n\n function validate(record) {\n nvdebug(`${descriptionString}: validate`, debugDev);\n\n const fieldsNeedingModification = record.fields.filter(f => fieldNeedsModification(f, true));\n\n\n const values = fieldsNeedingModification.map(f => fieldToString(f));\n const newValues = fieldsNeedingModification.map(f => fieldGetFixedString(f, true));\n\n const messages = values.map((val, i) => `'${val}' => '${newValues[i]}'`);\n\n const res = {message: messages};\n\n res.valid = res.message.length < 1;\n return res;\n }\n}\n\n\n\nfunction isIrrelevantSubfield(subfield, tag) {\n const dataProvenanceSubfieldCode = tagToDataProvenanceSubfieldCode(tag);\n if (subfield.code === dataProvenanceSubfieldCode) {\n return true;\n }\n return !isContentSubfieldCode(subfield.code); // Currently this contains other stuff as well ($3, $4, $7, $9...)\n}\n\n\nfunction getNextRelevantSubfield(field, currSubfieldIndex) {\n return field.subfields.find((subfield, index) => index > currSubfieldIndex && !isIrrelevantSubfield(subfield, field.tag));\n}\n\nexport function fieldGetFixedString(field, add = true) {\n const cloneField = structuredClone(field);\n const operation = add ? subfieldFixPunctuation : subfieldStripPunctuation;\n cloneField.subfields.forEach((sf, i) => {\n // NB! instead of next subfield, we should actually get next *non-control-subfield*!!!\n // (In plain English: We should skip $0 - $9 at least, maybe $w as well...)\n operation(cloneField, sf, getNextRelevantSubfield(cloneField, i));\n });\n return fieldToString(cloneField);\n}\n\nexport function fieldNeedsModification(field, add = true) {\n if (!field.subfields) {\n return false;\n }\n\n const originalFieldAsString = fieldToString(field);\n const modifiedFieldAsString = fieldGetFixedString(field, add);\n\n return modifiedFieldAsString !== originalFieldAsString;\n}\n\n/////////////////////////////////////////////////////////////////////////////////////\n// <= Above code is written for the validator logic <= //\n// => Everything below was originally transferred from reducers' punctuation.js => //\n/////////////////////////////////////////////////////////////////////////////////////\n\n\n//const stripCrap = / *[-;:,+]+$/u;\nconst needsPuncAfterAlphanumeric = /(?:[a-z0-9A-Z]|\u00E5|\u00E4|\u00F6|\u00C5|\u00C4|\u00D6)$/u;\nconst defaultNeedsPuncAfter2 = /(?:[\\]a-zA-Z0-9)]|\u00E4|\u00E5|\u00F6|\u00C5|\u00C4|\u00D6)$/u;\nconst doesNotEndInPunc = /[^!?.:;,]$/u; // non-punc for pre-240/700/XXX $, note that '.' comes if preceded by ')'\nconst blocksPuncRHS = /^(?:\\()/u;\nconst allowsPuncRHS = /^(?:[A-Za-z0-9]|\u00E5|\u00E4|\u00F6|\u00C5|\u00C4|\u00D6)/u;\nconst aToZ = 'abcdefghijklmnopqrstuvwxyz';\n\n\nconst dotIsProbablyPunc = /(?:[a-z0-9)]|\u00E5|\u00E4|\u00F6|(?:[A-Za-z0-9]|\u00C5|\u00C4|\u00D6)(?:[A-Z]|\u00C5|\u00C4|\u00D6))\\.$/u;\nconst puncIsProbablyPunc = /(?:[a-z0-9)]|\u00E5|\u00E4|\u00F6) ?[.,:;]$/u;\n// NB! 65X: Finnish terms don't use punctuation, but international ones do. Neither one is currently (2021-11-08) coded here.\n\n// Will unfortunately trigger \"Sukunimi, Th.\" type:\nconst removeColons = {'code': 'abcdefghijklmnopqrstuvwxyz', 'remove': / *[;:]$/u};\nconst removeX00Comma = {'code': 'abcdejnqt', 'followedBy': 'abcdenqtv#', 'context': /.,$/u, 'remove': /,$/u};\nconst cleanRHS = {'code': 'abcd', 'followedBy': 'bcde', 'context': /(?:(?:[a-z0-9]|\u00E5|\u00E4|\u00F6)\\.|,)$/u, 'contextRHS': blocksPuncRHS, 'remove': /[.,]$/u};\nconst cleanX00dCommaOrDot = {'code': 'd', 'followedBy': 'et#', 'context': /[0-9]-[,.]$/u, 'remove': /[,.]$/u};\nconst cleanX00aDot = {'code': 'abcde', 'followedBy': 'cdegj', 'context': dotIsProbablyPunc, 'remove': /\\.$/u};\nconst cleanCorruption = {'code': 'abcdefghijklmnopqrstuvwxyz', 'remove': / \\.$/u};\n// These $e dot removals are tricky: before removing the comma, we should know that it ain't an abbreviation such as \"esitt.\"...\nconst cleanX00eDot = {'code': 'e', 'followedBy': 'egj#', 'context': /(?:[ai]ja|j\u00E4)[.,]$/u, 'remove': /\\.$/u};\nconst cleanX11jDot = {'code': 'e', 'followedBy': 'egj#', 'context': /(?:[ai]ja|j\u00E4)[.,]$/u, 'remove': /\\.$/u};\nconst removeCommaBeforeLanguageSubfieldL = {'followedBy': 'l', 'remove': /,$/u};\nconst removeCommaBeforeTitleSubfieldT = {'followedBy': 't', 'remove': /,$/u};\n\nconst X00RemoveDotAfterBracket = {'code': 'cq', 'context': /\\)\\.$/u, 'remove': /\\.$/u};\n// 390, 800, 810, 830...\nconst cleanPuncBeforeLanguage = {'code': 'atvxyz', 'followedBy': 'l', 'context': puncIsProbablyPunc, 'remove': / *[.,:;]$/u};\n\nconst addX00aComma = {'add': ',', 'code': 'abcqejt', 'followedBy': 'cdegnr', 'context': doesNotEndInPunc, 'contextRHS': allowsPuncRHS};\nconst addX00dComma = {'name': 'X00$d ending in \"-\" does not get comma', 'add': ',', 'code': 'd', 'followedBy': 'cdeg', 'context': /[^-,.!]$/u, 'contextRHS': allowsPuncRHS};\nconst addX00aComma2 = {'add': ',', 'code': 'abcdej', 'followedBy': 'cdeg', 'context': /(?:[A-Z]|\u00C5|\u00C4|\u00D6)\\.$/u, 'contextRHS': allowsPuncRHS};\nconst addX00Dot = {'add': '.', 'code': 'abcdetv', 'followedBy': 'fklptu', 'context': needsPuncAfterAlphanumeric};\nconst addEntryFieldFinalDot = {'name': 'X00 final dot', 'add': '.', 'code': 'abcdefghijklmnopqrstuvwxyz', 'followedBy': '#', 'context': /[^.)!?-]$/u};\n\n\nconst addXX0iColon = {name: 'Punctuate relationship information', add: ':', code: 'i', context: defaultNeedsPuncAfter2}; // Not explicitly checking it, but this should always be followed by 'a' or 't'\nconst addX10bDot = {'name': 'Add X10 pre-$b dot', 'add': '.', 'code': 'ab', 'followedBy': 'b', 'context': defaultNeedsPuncAfter2};\nconst addX10Comma = {'add': ',', 'code': 'abet', 'followedBy': 'en', 'context': defaultNeedsPuncAfter2};\nconst addX10Dot = {'name': 'Add X10 final dot', 'add': '.', 'code': 'abet', 'followedBy': 'tu#', 'context': needsPuncAfterAlphanumeric};\nconst addColonToRelationshipInformation = {'name': 'Add \\':\\' to 7X0 $i relationship info', 'add': ':', 'code': 'i', 'context': defaultNeedsPuncAfter2};\n\nconst addX11Spacecolon = {name: '611 space colon(y :-)', add: ' :', code: 'nd', followedBy: 'dc', 'context': defaultNeedsPuncAfter2};\n\nconst addDotBeforeLanguageSubfieldL = {'name': 'Add dot before $l', 'add': '.', 'code': 'abepst', 'followedBy': 'l', 'context': doesNotEndInPunc};\n\n// 490:\nconst addSemicolonBeforeVolumeDesignation = {'name': 'Add \" ;\" before $v', 'add': ' ;', 'code': 'atxyz', 'followedBy': 'v', 'context': /[^;]$/u};\n\nconst NONE = 0;\nconst ADD = 2;\nconst REMOVE = 1;\nconst REMOVE_AND_ADD = 3;\n\n// Crappy punctuation consists of various crap that is somewhat common.\n// We strip crap for merge decisions. We are not trying to actively remove crap here.\n\nconst removeCrapFromAllEntryFields = [removeCommaBeforeLanguageSubfieldL, removeCommaBeforeTitleSubfieldT];\n\nconst removeX00Whatever = [removeX00Comma, cleanX00aDot, cleanX00eDot, cleanCorruption, cleanX00dCommaOrDot, cleanRHS, X00RemoveDotAfterBracket, removeColons, cleanPuncBeforeLanguage, ...removeCrapFromAllEntryFields];\nconst removeX10Whatever = [removeX00Comma, cleanX00aDot, cleanX00eDot, cleanCorruption, removeColons, cleanPuncBeforeLanguage, ...removeCrapFromAllEntryFields];\nconst removeX11Whatever = [removeX00Comma, cleanX11jDot, ...removeCrapFromAllEntryFields];\nconst removeX30Whatever = removeCrapFromAllEntryFields;\n\nconst remove490And830Whatever = [{'code': 'axyzv', 'followedBy': 'axyzv', 'remove': /(?: *;| *=|,)$/u}];\n\nconst linkingEntryRemoveWhatever = [\n {'code': 'i', 'followedBy': 'at', 'remove': / ?:$/u}, // ':'\n {'code': 'at', 'remove': /\\.$/u},\n // Only \". -\" separator is still used in music. We can strip it, but can only create the non-music punctuation!\n {'code': 'abdghiklmnopqrstuwxyz', 'followedBy': 'abdghiklmnopqrstuwxyz#', 'remove': /\\. -$/u}\n];\n\n\n// '!' means negation, thus '!b' means any other subfield but 'b'.\n// 'followedBy': '#' means that current subfield is the last subfield.\n// NB! Note that control subfields are ignored in punctuation rules.\n// NB #2! Control field ignorance causes issues with field 257: https://wiki.helsinki.fi/display/rdasovellusohje/Loppupisteohje\n// Might need to work on that at some point. NOT a top priority though.\n// NB #3! Final punctuation creation is/should be handled by endind-punctuation.js validator!\n\nconst crappy24X = [\n {'code': 'abnp', 'followedBy': '!c', 'remove': / \\/$/u},\n {'code': 'abn', 'followedBy': 'c', 'remove': /\\.$/u, 'context': dotIsProbablyPunc},\n {'code': 'abn', 'followedBy': 'c', 'remove': /\\.$/u, 'context': dotIsProbablyPunc},\n {'code': 'abc', 'followedBy': '#', 'remove': /\\.$/u, 'context': dotIsProbablyPunc},\n {'code': 'abfghinp', 'followedBy': '#', 'remove': /\\.$/u, 'context': dotIsProbablyPunc},\n {'code': 'n', 'followedBy': 'p', 'remove': /\\.$/u, 'context': dotIsProbablyPunc}, // MELINDA-8817\n {'code': 'p', 'followedBy': 'pc', 'remove': /\\.$/u, 'context': dotIsProbablyPunc}, // MELINDA-8817\n removeCommaBeforeLanguageSubfieldL\n];\n\n\nconst cleanCrappyPunctuationRules = {\n '100': removeX00Whatever,\n '110': removeX10Whatever,\n '111': removeX11Whatever,\n '130': removeX30Whatever,\n '240': crappy24X,\n '245': crappy24X,\n '246': crappy24X,\n '300': [\n {'code': 'a', 'followedBy': '!b', 'remove': / *:$/u},\n {'code': 'a', 'followedBy': 'b', 'remove': /:$/u, 'context': /[^ ]:$/u},\n {'code': 'ab', 'followedBy': '!c', 'remove': / *;$/u},\n {'code': 'ab', 'followedBy': 'c', 'remove': /;$/u, 'context': /[^ ];$/u},\n {'code': 'abc', 'followedBy': '!e', 'remove': / *\\+$/u} // Removes both valid (with one space) and invalid (spaceless et al) puncs\n\n ],\n\n '490': remove490And830Whatever,\n '600': removeX00Whatever,\n '610': removeX10Whatever,\n '611': removeX11Whatever,\n '630': removeX30Whatever,\n '700': removeX00Whatever,\n '710': removeX10Whatever,\n '711': removeX11Whatever,\n '730': removeX30Whatever,\n '773': linkingEntryRemoveWhatever,\n '774': linkingEntryRemoveWhatever,\n '776': linkingEntryRemoveWhatever,\n '787': linkingEntryRemoveWhatever,\n '800': removeX00Whatever,\n '810': removeX10Whatever,\n '830': remove490And830Whatever,\n '946': crappy24X\n};\n\nconst cleanLegalX00Comma = {'code': 'abcdetn', 'followedBy': 'cdegjnr', 'context': /.,$/u, 'remove': /,$/u};\n// Accept upper case letters in X00$b, since they are probably Roman numerals.\nconst cleanLegalX00bDot = {'code': 'b', 'followedBy': 't#', context: /^[IVXLCDM]+\\.$/u, 'remove': /\\.$/u};\nconst cleanLegalX00iColon = {'code': 'i', 'followedBy': 'a', 'remove': / *:$/u}; // NB! context is not needed\nconst cleanLegalX00Dot = {'code': 'abcdetkvl', 'followedBy': 'tklu#', 'context': /(?:[a-z0-9)]|\u00E5|\u00E4|\u00F6)\\.$/u, 'remove': /\\.$/u};\nconst cleanDotBeforeLanguageSubfieldL = {'name': 'pre-language-$l dot', 'followedBy': 'l', 'context': /.\\.$/u, 'remove': /\\.$/u};\n\nconst legalEntryField = [cleanDotBeforeLanguageSubfieldL];\n\nconst legalX11SpaceColon = {name: 'legal X11 spacecolony', code: 'nd', followedBy: 'dc', context: / :$/u, remove: / :$/u};\nconst legalX00punc = [cleanLegalX00Comma, cleanLegalX00iColon, cleanLegalX00bDot, cleanLegalX00Dot, ...legalEntryField];\n\nconst cleanLegalX10Comma = {'name': 'X10comma', 'code': 'abe', 'followedBy': 'e', 'context': /.,$/u, 'remove': /,$/u};\nconst cleanLegalX10Dot = {'name': 'X10dot', 'code': 'abt', 'followedBy': 'bst#', 'context': /.\\.$/u, 'remove': /\\.$/u};\n\nconst legalX10punc = [cleanLegalX10Comma, cleanLegalX10Dot, cleanX00eDot, ...legalEntryField];\n\nconst cleanLegalSeriesTitle = [ // 490 and 830\n {'code': 'a', 'followedBy': 'a', 'remove': / =$/u},\n {'code': 'axyz', 'followedBy': 'xyz', 'remove': /,$/u, 'context': /.,$/u},\n {'code': 'axyz', 'followedBy': 'v', 'remove': / *;$/u}\n];\n\nconst clean24X = [\n {'name': 'I:A', 'code': 'i', 'followedBy': 'a', 'remove': / *:$/u},\n {'name': 'A:B', 'code': 'a', 'followedBy': 'b', 'remove': / [:;=]$/u},\n {'name': 'AB:K', 'code': 'ab', 'followedBy': 'k', 'remove': / :$/u},\n {'name': 'ABK:F', 'code': 'abk', 'followedBy': 'f', 'remove': /,$/u},\n {'name': 'ABFNP:C', 'code': 'abfnp', 'followedBy': 'c', 'remove': / \\/$/u},\n {'name': 'ABN:N', 'code': 'abn', 'followedBy': 'n', 'remove': /\\.$/u},\n {'name': 'ABNP:#', 'code': 'abnp', 'followedBy': '#', 'remove': /\\.$/u},\n {'name': 'N:P', 'code': 'n', 'followedBy': 'p', 'remove': /,$/u},\n cleanDotBeforeLanguageSubfieldL\n];\n\nconst legalX11Punc = [...legalEntryField, legalX11SpaceColon];\n\nconst cleanValidPunctuationRules = {\n '100': legalX00punc,\n '110': legalX10punc,\n '111': legalX11Punc,\n '130': legalEntryField,\n '240': clean24X,\n '243': clean24X,\n '245': clean24X,\n '246': clean24X,\n '260': [\n {'code': 'abc', 'followedBy': 'a', 'remove': / ;$/u},\n {'code': 'a', 'followedBy': 'b', 'remove': / :$/u},\n {'code': 'b', 'followedBy': 'c', 'remove': /,$/u},\n {'code': 'c', 'followedBy': '#', 'remove': /\\.$/u},\n {'code': 'd', 'followedBy': 'e', 'remove': / :$/u},\n {'code': 'e', 'followedBy': 'f', 'remove': /,$/u},\n {'code': 'f', 'followedBy': '#', 'remove': /\\.$/u} // Probably ')' but should it be removed?\n ],\n '264': [\n {'code': 'a', 'followedBy': 'b', 'remove': / :$/u},\n {'code': 'b', 'followedBy': 'c', 'remove': /,$/u},\n {'code': 'c', 'followedBy': '#', 'remove': /\\.$/u}\n ],\n '300': [\n // NB! Remove crap as well, thus the '*' in / *:$/\n {'code': 'a', 'followedBy': 'b', 'remove': / :$/u},\n {'code': 'ab', 'followedBy': 'c', 'remove': / ;$/u},\n {'code': 'abc', 'followedBy': 'e', 'remove': / \\+$/u}\n ],\n '490': cleanLegalSeriesTitle,\n '534': [{'code': 'p', 'followedBy': 'c', 'remove': /:$/u}],\n '600': legalX00punc,\n '610': legalX10punc,\n '611': legalX11Punc,\n '630': legalEntryField,\n // Experimental, MET366-ish (end punc in internationally valid, but we don't use it here in Finland):\n '648': [{'code': 'a', 'content': /^[0-9]+\\.$/u, 'ind2': ['4'], 'remove': /\\.$/u}],\n '700': legalX00punc,\n '710': legalX10punc,\n '711': legalX11Punc,\n '730': legalEntryField,\n '800': legalX00punc,\n '810': legalX10punc,\n '811': legalX11Punc,\n '830': [...legalEntryField, ...cleanLegalSeriesTitle],\n '946': clean24X\n};\n\n\n// Overgeneralizes a bit: eg. addColonToRelationshipInformation only applies to 700/710 but as others don't have $i, it's fine.\nconst addToAllEntryFields = [addDotBeforeLanguageSubfieldL, addSemicolonBeforeVolumeDesignation, addColonToRelationshipInformation, addEntryFieldFinalDot];\n\n\nconst addX00 = [addXX0iColon, addX00aComma, addX00aComma2, addX00Dot, addX00dComma, ...addToAllEntryFields];\nconst addX10 = [addXX0iColon, addX10bDot, addX10Comma, addX10Dot, ...addToAllEntryFields];\nconst addX11 = [...addToAllEntryFields, addX11Spacecolon];\nconst addX30 = [...addToAllEntryFields];\n\nconst add24X = [\n {'code': 'i', 'followedBy': 'a', 'add': ':', 'context': needsPuncAfterAlphanumeric},\n {'code': 'a', 'followedBy': 'b', 'add': ' :', 'context': '[^:]$'},\n {'code': 'abk', 'followedBy': 'f', 'add': ',', 'context': needsPuncAfterAlphanumeric},\n {'code': 'abfnp', 'followedBy': 'c', 'add': ' /', 'context': '[^/]$'},\n addDotBeforeLanguageSubfieldL\n];\n\nconst add245 = [\n ...add24X,\n // Blah! Also \"$a = $b\" and \"$a ; $b\" can be valid... But ' :' is better than nothing, I guess...\n {'code': 'ab', 'followedBy': 'n', 'add': '.', 'context': needsPuncAfterAlphanumeric},\n {'code': 'n', 'followedBy': 'p', 'add': ',', 'context': defaultNeedsPuncAfter2},\n {'code': 'abnpc', 'followedBy': '#', 'add': '.', 'context': needsPuncAfterAlphanumeric} // Stepping on \"punctuation validator's\" toes\n];\n\nconst addSeriesTitle = [ // 490 and 830\n {'code': 'a', 'followedBy': 'a', 'add': ' =', 'context': defaultNeedsPuncAfter2},\n {'code': 'axyz', 'followedBy': 'xy', 'add': ',', 'context': defaultNeedsPuncAfter2},\n addSemicolonBeforeVolumeDesignation // eg. 490$axyz-$v\n];\n\nconst addLinkingEntry = [ // NB! Music 773 uses different punctuation rules, that are not implement here (can they even be?)\n {'code': 'i', 'followedBy': aToZ, 'add': ':', 'context': defaultNeedsPuncAfter2},\n {'code': 'a', 'followedBy': 't', 'add': '.', 'context': defaultNeedsPuncAfter2},\n {'code': 't', 'followedBy': 'dghoz', 'add': '.', 'context': defaultNeedsPuncAfter2}\n];\n\nconst addPairedPunctuationRules = {\n '100': addX00,\n '110': addX10,\n '111': addX11,\n '130': addX30,\n '240': add24X,\n '243': add24X,\n '245': add245,\n '246': add24X,\n '260': [\n {'code': 'a', 'followedBy': 'b', 'add': ' :', 'context': defaultNeedsPuncAfter2},\n {'code': 'ab', 'followedBy': 'c', 'add': ',', 'context': defaultNeedsPuncAfter2},\n {'code': 'abc', 'followedBy': 'a', 'add': ' ;', 'context': defaultNeedsPuncAfter2},\n {'code': 'e', 'followedBy': 'f', 'add': ' :', 'context': defaultNeedsPuncAfter2},\n {'code': 'f', 'followedBy': 'g', 'add': ',', 'context': defaultNeedsPuncAfter2}\n ],\n '264': [\n {'code': 'a', 'followedBy': 'b', 'add': ' :', 'context': defaultNeedsPuncAfter2},\n {'code': 'b', 'followedBy': 'c', 'add': ',', 'context': defaultNeedsPuncAfter2},\n // NB! The $c rule messes dotless exception \"264 #4 $c p1983\" up\n // We'll need to add a hacky postprocessor for this? Add 'hasInd1': '0123' etc?\n {'code': 'c', 'followedBy': '#', 'add': '.', 'context': needsPuncAfterAlphanumeric, 'ind2': ['0', '1', '2', '3']}\n ],\n '300': [\n {'code': 'a', 'followedBy': 'b', 'add': ' :', 'context': defaultNeedsPuncAfter2},\n {'code': 'ab', 'followedBy': 'c', 'add': ' ;', 'context': defaultNeedsPuncAfter2},\n {'code': 'abc', 'followedBy': 'e', 'add': ' +', 'context': defaultNeedsPuncAfter2}\n ],\n '490': addSeriesTitle,\n '506': [{'code': 'a', 'followedBy': '#', 'add': '.', 'context': defaultNeedsPuncAfter2}],\n '534': [{'code': 'p', 'followedBy': 'c', 'add': ':', 'context': defaultNeedsPuncAfter2}],\n '600': addX00,\n '610': addX10,\n '611': addX11,\n '630': addX30,\n '700': addX00,\n '710': addX10,\n '711': addX11,\n '730': addX30,\n '773': addLinkingEntry,\n '787': addLinkingEntry,\n '800': addX00,\n '810': addX10,\n '811': addX11,\n '830': [...addX30, ...addSeriesTitle],\n '946': [{'code': 'i', 'followedBy': 'a', 'add': ':', 'context': defaultNeedsPuncAfter2}]\n};\n\n/*\nfunction debugRule(rule) {\n //nvdebug('', debugDev);\n nvdebug(`NAME ${rule.name ? rule.name : '<unnamed>'}`, debugDev);\n nvdebug(`SUBFIELD CODE '${rule.code}' FOLLOWED BY SUBFIELD CODE '${rule.followedBy}'`, debugDev);\n if ('add' in rule) {\n nvdebug(`ADD '${rule.add}'`, debugDev);\n }\n if ('remove' in rule) {\n nvdebug(`REMOVE '${rule.remove}'`, debugDev);\n }\n if ('context' in rule) {\n nvdebug(`CONTEXT '${rule.context.toString()}'`, debugDev);\n }\n //nvdebug('', debugDev);\n}\n*/\n\nfunction ruleAppliesToSubfieldCode(targetSubfieldCodes, currSubfieldCode) {\n if (!targetSubfieldCodes) { // We are not interested in what subfield precedes 240$l, ',' is removed anyway\n return true;\n }\n const negation = targetSubfieldCodes.includes('!');\n if (negation) {\n return !targetSubfieldCodes.includes(currSubfieldCode);\n }\n return targetSubfieldCodes.includes(currSubfieldCode);\n}\n\n\nfunction ruleAppliesToField(rule, field) {\n if ('ind1' in rule && !rule.ind1.includes(field.ind1)) {\n return false;\n }\n\n if ('ind2' in rule && !rule.ind2.includes(field.ind2)) {\n return false;\n }\n\n // If we want to check, say, $2, it should be implemented here!\n\n return true;\n}\n\n\nfunction ruleAppliesToCurrentSubfield(rule, subfield) {\n //nvdebug(` Apply rule on LHS?`, debugDev);\n if (!ruleAppliesToSubfieldCode(rule.code, subfield.code)) {\n //nvdebug(` Reject rule!`, debugDev);\n return false;\n }\n if ('context' in rule) {\n //nvdebug(` Check '${subfield.value}' versus '${rule.context.toString()}'`, debugDev);\n if (!subfield.value.match(rule.context)) { // njsscan-ignore: regex_injection_dos\n //nvdebug(` Reject rule!`, debugDev);\n return false;\n }\n }\n //nvdebug(` Apply rule!`, debugDev);\n return true;\n}\n\nfunction ruleAppliesToNextSubfield(rule, nextSubfield) {\n if (!('followedBy' in rule)) { // Return true, if we are not interested in the next subfield\n return true;\n }\n // The '#' existence check applies only to the RHS field. LHS always exists.\n if (!nextSubfield) {\n const negation = rule.followedBy.includes('!');\n if (negation) {\n return !rule.followedBy.includes('#');\n }\n return rule.followedBy.includes('#');\n }\n\n if (!ruleAppliesToSubfieldCode(rule.followedBy, nextSubfield.code)) {\n return false;\n }\n if ('contextRHS' in rule && !nextSubfield.value.match(rule.contextRHS)) { // njsscan-ignore: regex_injection_dos\n return false;\n }\n return true;\n}\n\nfunction checkRule(rule, field, subfield1, subfield2) {\n if (!ruleAppliesToField(rule, field)) {\n //nvdebug(`FAIL ON WHOLE FIELD: '${fieldToString(field)}`, debugDev);\n return false;\n }\n //const name = rule.name || 'UNNAMED';\n if (!ruleAppliesToCurrentSubfield(rule, subfield1)) {\n //nvdebug(`${name}: FAIL ON LHS SUBFIELD: '$${subfield1.code} ${subfield1.value}', SF=${rule.code}`, debugDev);\n return false;\n }\n\n // NB! This is not a perfect solution. We might have $e$0$e where $e$0 punctuation should actually be based on $e$e rules\n if (!ruleAppliesToNextSubfield(rule, subfield2)) {\n //const msg = subfield2 ? `${name}: FAIL ON RHS SUBFIELD '${subfield2.code}' not in [${rule.followedBy}]` : `${name}: FAIL ON RHS FIELD`;\n //nvdebug(msg, debugDev);\n return false;\n }\n\n \n //nvdebug(`${rule.name ? rule.name : '<unnamed>'}: ACCEPT ${rule.code} (${subfield1.code}), SF2=${rule.followedBy} (${subfield2 ? subfield2.code : '#'})`, debugDev);\n return true;\n}\n\n\nfunction applyPunctuationRules(field, subfield1, subfield2, ruleArray = null, operation = NONE) {\n if (operation === NONE || ruleArray === null) { // !fieldIsApplicable(field, ruleArray)) {\n return;\n }\n const tag2 = field.tag === '880' ? fieldGetUnambiguousTag(field) : field.tag;\n if (!tag2) {\n return;\n }\n if (!(`${tag2}` in ruleArray)) {\n return;\n }\n\n //nvdebug(`PUNCTUATE ${field.tag}/${tag2} '${subfieldToString(subfield1)}' XXX '${subfield2 ? subfieldToString(subfield2) : '#'} }`, debugDev);\n\n //nvdebug(`OP=${operation} ${tag2}: '${subfield1.code}: ${subfield1.value}' ??? '${subfield2 ? subfield2.code : '#'}'`, debugDev);\n const candRules = ruleArray[tag2];\n candRules.every(rule => { // uses \"every\", not \"forEach\", so that only one rule is applies to the given subfields\n //debugRule(rule);\n if (!checkRule(rule, field, subfield1, subfield2)) {\n return true;\n }\n\n //const originalValue = subfield1.value;\n if (rule.remove && [REMOVE, REMOVE_AND_ADD].includes(operation) && subfield1.value.match(rule.remove)) {\n //nvdebug(` PUNC REMOVAL TO BE PERFORMED FOR $${subfield1.code} '${subfield1.value}'`, debugDev);\n subfield1.value = subfield1.value.replace(rule.remove, '');\n //nvdebug(` PUNC REMOVAL PERFORMED FOR '${subfield1.value}'`, debugDev);\n return false;\n }\n if (rule.add && [ADD, REMOVE_AND_ADD].includes(operation)) {\n subfield1.value += rule.add;\n //nvdebug(` ADDED '${rule.add}' TO FORM '${subfield1.value}' USING RULE ${rule.name}`, debugDev);\n return false;\n }\n\n /*\n if (subfield1.value !== originalValue) {\n nvdebug(` PROCESS PUNC: '\u2021${subfield1.code} ${originalValue}' => '\u2021${subfield1.code} ${subfield1.value}'`, debugDev);\n }\n */\n\n return true;\n });\n}\n\nfunction subfieldFixPunctuation(field, subfield1, subfield2) {\n applyPunctuationRules(field, subfield1, subfield2, cleanCrappyPunctuationRules, REMOVE);\n applyPunctuationRules(field, subfield1, subfield2, addPairedPunctuationRules, ADD);\n}\n\nfunction subfieldStripPunctuation(field, subfield1, subfield2) {\n //nvdebug(`FSP1: '${subfield1.value}'`, debugDev);\n applyPunctuationRules(field, subfield1, subfield2, cleanValidPunctuationRules, REMOVE);\n //nvdebug(`FSP2: '${subfield1.value}'`, debugDev);\n applyPunctuationRules(field, subfield1, subfield2, cleanCrappyPunctuationRules, REMOVE);\n //nvdebug(`FSP3: '${subfield1.value}'`, debugDev);\n\n}\n\nexport function fieldStripPunctuation(field) {\n if (!field.subfields) {\n return field;\n }\n\n field.subfields.forEach((sf, i) => {\n // NB! instead of next subfield, we should actually get next *non-control-subfield*!!!\n // (In plain English: We should skip $0 - $9 at least, maybe $w as well...)\n subfieldStripPunctuation(field, sf, getNextRelevantSubfield(field, i));\n\n });\n return field;\n}\n\nexport function fieldFixPunctuation(field) {\n if (!field.subfields) {\n return field;\n }\n //nvdebug(`################### fieldFixPunctuation() TEST ${fieldToString(field)}`, debugDev);\n\n field.subfields.forEach((sf, i) => {\n // NB! instead of next subfield, we should actually get next *non-control-subfield*!!!\n // (In plain English: We should skip $0 - $9 at least, maybe $w as well...)\n // We'll need some magic for field 257 here, do we? (Also Finnish lexicons vs global lexicons in 65X fields)\n subfieldFixPunctuation(field, sf, getNextRelevantSubfield(field, i));\n });\n\n // Use shared code for final punctuation (sadly this does not fix intermediate punc):\n if (field.useExternalEndPunctuation) {\n // addFinalPunctuation(field); // local version. use shared code instead.\n validateSingleField(field, false, true); // NB! Don't use field.tag as second argument! It's a string, not an int. 3rd arg must be true (=fix)\n }\n return field;\n}\n"],
5
- "mappings": "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",
4
+ "sourcesContent": ["/* eslint-disable max-lines */\n/*\n* punctuation.js -- try and fix a marc field punctuation\n*\n* Author(s): Nicholas Volk <nicholas.volk@helsinki.fi>\n*\n* NOTE #1: https://www.kiwi.fi/display/kumea/Loppupisteohje is implemented via another validator/fixer (ending-punctuation).\n* This file has some support but it's now yet thorough. (And mmight never be.)\n* NOTE #2: Validator/fixer punctuation does similar stuff, but focuses on X00 fields.\n* NOTE #3: As of 2023-06-05 control subfields ($0...$9) are obsolete. Don't use them in rules.\n* (They are jumped over when looking for next (non-controlfield subfield)\n*/\nimport {validateSingleField} from './ending-punctuation.js';\nimport {tagToDataProvenanceSubfieldCode} from './dataProvenanceUtils.js';\nimport {fieldGetUnambiguousTag} from './subfield6Utils.js';\nimport createDebugLogger from 'debug';\nimport {fieldToString, isContentSubfieldCode, nvdebug} from './utils.js';\n\n\nconst debug = createDebugLogger('@natlibfi/marc-record-validators-melinda:punctuation2');\n//const debugData = debug.extend('data');\nconst debugDev = debug.extend('dev');\n\nconst descriptionString = 'Remove invalid and add valid punctuation to data fields';\nexport default function () {\n return {\n description: descriptionString,\n validate, fix\n };\n\n function fix(record) {\n nvdebug(`${descriptionString}: fixer`, debugDev);\n const res = {message: [], fix: [], valid: true};\n record.fields.forEach(f => fieldFixPunctuation(f));\n return res;\n }\n\n function validate(record) {\n nvdebug(`${descriptionString}: validate`, debugDev);\n\n const fieldsNeedingModification = record.fields.filter(f => fieldNeedsModification(f, true));\n\n\n const values = fieldsNeedingModification.map(f => fieldToString(f));\n const newValues = fieldsNeedingModification.map(f => fieldGetFixedString(f, true));\n\n const messages = values.map((val, i) => `'${val}' => '${newValues[i]}'`);\n\n const res = {message: messages};\n\n res.valid = res.message.length < 1;\n return res;\n }\n}\n\n\n\nfunction isIrrelevantSubfield(subfield, tag) {\n const dataProvenanceSubfieldCode = tagToDataProvenanceSubfieldCode(tag);\n if (subfield.code === dataProvenanceSubfieldCode) {\n return true;\n }\n // control subfields, data provenance subfields etc do not affect the punctuation of the previous field\n return !isContentSubfieldCode(subfield.code);\n}\n\n\nfunction getNextRelevantSubfield(field, currSubfieldIndex) {\n return field.subfields.find((subfield, index) => index > currSubfieldIndex && !isIrrelevantSubfield(subfield, field.tag));\n}\n\nexport function fieldGetFixedString(field, add = true) {\n const cloneField = structuredClone(field);\n const operation = add ? subfieldFixPunctuation : subfieldStripPunctuation;\n cloneField.subfields.forEach((sf, i) => {\n // NB! instead of next subfield, we should actually get next *non-control-subfield*!!!\n // (In plain English: We should skip $0 - $9 at least, maybe $w as well...)\n operation(cloneField, sf, getNextRelevantSubfield(cloneField, i));\n });\n return fieldToString(cloneField);\n}\n\nexport function fieldNeedsModification(field, add = true) {\n if (!field.subfields) {\n return false;\n }\n\n const originalFieldAsString = fieldToString(field);\n const modifiedFieldAsString = fieldGetFixedString(field, add);\n\n return modifiedFieldAsString !== originalFieldAsString;\n}\n\n/////////////////////////////////////////////////////////////////////////////////////\n// <= Above code is written for the validator logic <= //\n// => Everything below was originally transferred from reducers' punctuation.js => //\n/////////////////////////////////////////////////////////////////////////////////////\n\n\n//const stripCrap = / *[-;:,+]+$/u;\nconst needsPuncAfterAlphanumeric = /(?:[a-z0-9A-Z]|\u00E5|\u00E4|\u00F6|\u00C5|\u00C4|\u00D6)$/u;\nconst defaultNeedsPuncAfter2 = /(?:[\\]a-zA-Z0-9)]|\u00E4|\u00E5|\u00F6|\u00C5|\u00C4|\u00D6)$/u;\nconst doesNotEndInPunc = /[^!?.:;,]$/u; // non-punc for pre-240/700/XXX $, note that '.' comes if preceded by ')'\nconst blocksPuncRHS = /^(?:\\()/u;\nconst allowsPuncRHS = /^(?:[A-Za-z0-9]|\u00E5|\u00E4|\u00F6|\u00C5|\u00C4|\u00D6)/u;\nconst aToZ = 'abcdefghijklmnopqrstuvwxyz';\n\n\nconst dotIsProbablyPunc = /(?:[a-z0-9)]|\u00E5|\u00E4|\u00F6|(?:[A-Za-z0-9]|\u00C5|\u00C4|\u00D6)(?:[A-Z]|\u00C5|\u00C4|\u00D6))\\.$/u;\nconst puncIsProbablyPunc = /(?:[a-z0-9)]|\u00E5|\u00E4|\u00F6) ?[.,:;]$/u;\n// NB! 65X: Finnish terms don't use punctuation, but international ones do. Neither one is currently (2021-11-08) coded here.\n\n// Will unfortunately trigger \"Sukunimi, Th.\" type:\nconst removeColons = {'code': 'abcdefghijklmnopqrstuvwxyz', 'remove': / *[;:]$/u};\nconst removeX00Comma = {'code': 'abcdejnqt', 'followedBy': 'abcdenqtv#', 'context': /.,$/u, 'remove': /,$/u};\nconst cleanRHS = {'code': 'abcd', 'followedBy': 'bcde', 'context': /(?:(?:[a-z0-9]|\u00E5|\u00E4|\u00F6)\\.|,)$/u, 'contextRHS': blocksPuncRHS, 'remove': /[.,]$/u};\nconst cleanX00dCommaOrDot = {'code': 'd', 'followedBy': 'et#', 'context': /[0-9]-[,.]$/u, 'remove': /[,.]$/u};\nconst cleanX00aDot = {'code': 'abcde', 'followedBy': 'cdegj', 'context': dotIsProbablyPunc, 'remove': /\\.$/u};\nconst cleanCorruption = {'code': 'abcdefghijklmnopqrstuvwxyz', 'remove': / \\.$/u};\n// These $e dot removals are tricky: before removing the comma, we should know that it ain't an abbreviation such as \"esitt.\"...\nconst cleanX00eDot = {'code': 'e', 'followedBy': 'egj#', 'context': /(?:[ai]ja|j\u00E4)[.,]$/u, 'remove': /\\.$/u};\nconst cleanX11jDot = {'code': 'e', 'followedBy': 'egj#', 'context': /(?:[ai]ja|j\u00E4)[.,]$/u, 'remove': /\\.$/u};\nconst removeCommaBeforeLanguageSubfieldL = {'followedBy': 'l', 'remove': /,$/u};\nconst removeCommaBeforeTitleSubfieldT = {'followedBy': 't', 'remove': /,$/u};\n\nconst X00RemoveDotAfterBracket = {'code': 'cq', 'context': /\\)\\.$/u, 'remove': /\\.$/u};\n// 390, 800, 810, 830...\nconst cleanPuncBeforeLanguage = {'code': 'atvxyz', 'followedBy': 'l', 'context': puncIsProbablyPunc, 'remove': / *[.,:;]$/u};\n\nconst addX00aComma = {'add': ',', 'code': 'abcqejt', 'followedBy': 'cdegnr', 'context': doesNotEndInPunc, 'contextRHS': allowsPuncRHS};\nconst addX00dComma = {'name': 'X00$d ending in \"-\" does not get comma', 'add': ',', 'code': 'd', 'followedBy': 'cdeg', 'context': /[^-,.!]$/u, 'contextRHS': allowsPuncRHS};\nconst addX00aComma2 = {'add': ',', 'code': 'abcdej', 'followedBy': 'cdeg', 'context': /(?:[A-Z]|\u00C5|\u00C4|\u00D6)\\.$/u, 'contextRHS': allowsPuncRHS};\nconst addX00Dot = {'name': 'addX00Dot', 'add': '.', 'code': 'abcdetv', 'followedBy': 'fklptu', 'context': needsPuncAfterAlphanumeric};\nconst addEntryFieldFinalDot = {'name': 'X00 final dot', 'add': '.', 'code': 'abcdefghijklmnopqrstuvwxyz', 'followedBy': '#', 'context': /[^.)!?-]$/u};\n\n\nconst addXX0iColon = {name: 'Punctuate relationship information', add: ':', code: 'i', context: defaultNeedsPuncAfter2}; // Not explicitly checking it, but this should always be followed by 'a' or 't'\nconst addX10bDot = {'name': 'Add X10 pre-$b dot', 'add': '.', 'code': 'ab', 'followedBy': 'b', 'context': defaultNeedsPuncAfter2};\nconst addX10Comma = {'add': ',', 'code': 'abet', 'followedBy': 'en', 'context': defaultNeedsPuncAfter2};\nconst addX10Dot = {'name': 'Add X10 final dot', 'add': '.', 'code': 'abet', 'followedBy': 'tu#', 'context': needsPuncAfterAlphanumeric};\nconst addColonToRelationshipInformation = {'name': 'Add \\':\\' to 7X0 $i relationship info', 'add': ':', 'code': 'i', 'context': defaultNeedsPuncAfter2};\n\nconst addX11Spacecolon = {name: '611 space colon(y :-)', add: ' :', code: 'nd', followedBy: 'dc', 'context': defaultNeedsPuncAfter2};\n\nconst addDotBeforeLanguageSubfieldL = {'name': 'Add dot before $l', 'add': '.', 'code': 'abepst', 'followedBy': 'l', 'context': doesNotEndInPunc};\n\n// 490:\nconst addSemicolonBeforeVolumeDesignation = {'name': 'Add \" ;\" before $v', 'add': ' ;', 'followedBy': 'v', 'context': /[^;]$/u};\n\nconst NONE = 0;\nconst ADD = 2;\nconst REMOVE = 1;\nconst REMOVE_AND_ADD = 3;\n\n// Crappy punctuation consists of various crap that is somewhat common.\n// We strip crap for merge decisions. We are not trying to actively remove crap here.\n\nconst removeCrapFromAllEntryFields = [removeCommaBeforeLanguageSubfieldL, removeCommaBeforeTitleSubfieldT];\n\nconst removeX00Whatever = [removeX00Comma, cleanX00aDot, cleanX00eDot, cleanCorruption, cleanX00dCommaOrDot, cleanRHS, X00RemoveDotAfterBracket, removeColons, cleanPuncBeforeLanguage, ...removeCrapFromAllEntryFields];\nconst removeX10Whatever = [removeX00Comma, cleanX00aDot, cleanX00eDot, cleanCorruption, removeColons, cleanPuncBeforeLanguage, ...removeCrapFromAllEntryFields];\nconst removeX11Whatever = [removeX00Comma, cleanX11jDot, ...removeCrapFromAllEntryFields];\nconst removeX30Whatever = removeCrapFromAllEntryFields;\n\nconst remove490And830Whatever = [{'code': 'axyzv', 'followedBy': 'axyzv', 'remove': /(?: *;| *=|,)$/u}];\n\nconst linkingEntryRemoveWhatever = [\n {'code': 'i', 'followedBy': 'at', 'remove': / ?:$/u}, // ':'\n {'code': 'at', 'remove': /\\.$/u},\n // Only \". -\" separator is still used in music. We can strip it, but can only create the non-music punctuation!\n {'code': 'abdghiklmnopqrstuwxyz', 'followedBy': 'abdghiklmnopqrstuwxyz#', 'remove': /\\. -$/u}\n];\n\n\n// '!' means negation, thus '!b' means any other subfield but 'b'.\n// 'followedBy': '#' means that current subfield is the last subfield.\n// NB! Note that control subfields are ignored in punctuation rules.\n// NB #2! Control field ignorance causes issues with field 257: https://wiki.helsinki.fi/display/rdasovellusohje/Loppupisteohje\n// Might need to work on that at some point. NOT a top priority though.\n// NB #3! Final punctuation creation is/should be handled by endind-punctuation.js validator!\n\nconst crappy24X = [\n {'code': 'abnp', 'followedBy': '!c', 'remove': / \\/$/u},\n {'code': 'abn', 'followedBy': 'c', 'remove': /\\.$/u, 'context': dotIsProbablyPunc},\n {'code': 'abn', 'followedBy': 'c', 'remove': /\\.$/u, 'context': dotIsProbablyPunc},\n {'code': 'abc', 'followedBy': '#', 'remove': /\\.$/u, 'context': dotIsProbablyPunc},\n {'code': 'abfghinp', 'followedBy': '#', 'remove': /\\.$/u, 'context': dotIsProbablyPunc},\n {'code': 'n', 'followedBy': 'p', 'remove': /\\.$/u, 'context': dotIsProbablyPunc}, // MELINDA-8817\n {'code': 'p', 'followedBy': 'pc', 'remove': /\\.$/u, 'context': dotIsProbablyPunc}, // MELINDA-8817\n removeCommaBeforeLanguageSubfieldL\n];\n\n\nconst cleanCrappyPunctuationRules = {\n '100': removeX00Whatever,\n '110': removeX10Whatever,\n '111': removeX11Whatever,\n '130': removeX30Whatever,\n '240': crappy24X,\n '245': crappy24X,\n '246': crappy24X,\n '300': [\n {'code': 'a', 'followedBy': '!b', 'remove': / *:$/u},\n {'code': 'a', 'followedBy': 'b', 'remove': /:$/u, 'context': /[^ ]:$/u},\n {'code': 'ab', 'followedBy': '!c', 'remove': / *;$/u},\n {'code': 'ab', 'followedBy': 'c', 'remove': /;$/u, 'context': /[^ ];$/u},\n {'code': 'abc', 'followedBy': '!e', 'remove': / *\\+$/u} // Removes both valid (with one space) and invalid (spaceless et al) puncs\n\n ],\n\n '490': remove490And830Whatever,\n '600': removeX00Whatever,\n '610': removeX10Whatever,\n '611': removeX11Whatever,\n '630': removeX30Whatever,\n '700': removeX00Whatever,\n '710': removeX10Whatever,\n '711': removeX11Whatever,\n '730': removeX30Whatever,\n '773': linkingEntryRemoveWhatever,\n '774': linkingEntryRemoveWhatever,\n '776': linkingEntryRemoveWhatever,\n '787': linkingEntryRemoveWhatever,\n '800': removeX00Whatever,\n '810': removeX10Whatever,\n '830': remove490And830Whatever,\n '946': crappy24X\n};\n\nconst cleanLegalX00Comma = {'code': 'abcdetn', 'followedBy': 'cdegjnr', 'context': /.,$/u, 'remove': /,$/u};\n// Accept upper case letters in X00$b, since they are probably Roman numerals.\nconst cleanLegalX00bDot = {'code': 'b', 'followedBy': 't#', context: /^[IVXLCDM]+\\.$/u, 'remove': /\\.$/u};\nconst cleanLegalX00iColon = {'code': 'i', 'followedBy': 'a', 'remove': / *:$/u}; // NB! context is not needed\nconst cleanLegalX00Dot = {'code': 'abcdetkvl', 'followedBy': 'tklu#', 'context': /(?:[a-z0-9)]|\u00E5|\u00E4|\u00F6)\\.$/u, 'remove': /\\.$/u};\nconst cleanDotBeforeLanguageSubfieldL = {'name': 'pre-language-$l dot', 'followedBy': 'l', 'context': /.\\.$/u, 'remove': /\\.$/u};\n\nconst legalEntryField = [cleanDotBeforeLanguageSubfieldL];\n\nconst legalX11SpaceColon = {name: 'legal X11 spacecolony', code: 'nd', followedBy: 'dc', context: / :$/u, remove: / :$/u};\nconst legalX00punc = [cleanLegalX00Comma, cleanLegalX00iColon, cleanLegalX00bDot, cleanLegalX00Dot, ...legalEntryField];\n\nconst cleanLegalX10Comma = {'name': 'X10comma', 'code': 'abe', 'followedBy': 'e', 'context': /.,$/u, 'remove': /,$/u};\nconst cleanLegalX10Dot = {'name': 'X10dot', 'code': 'abt', 'followedBy': 'bst#', 'context': /.\\.$/u, 'remove': /\\.$/u};\n\nconst legalX10punc = [cleanLegalX10Comma, cleanLegalX10Dot, cleanX00eDot, ...legalEntryField];\n\nconst cleanLegalSeriesTitle = [ // 490 and 830\n {'code': 'a', 'followedBy': 'a', 'remove': / =$/u},\n {'code': 'a', 'followedBy': 'n', 'remove': /\\.$/u}, // f830-only\n {'code': 'n', 'followedBy': 'p', 'remove': /,$/u}, // f830-only\n {'code': 'anpxyz', 'followedBy': 'xyz', 'remove': /,$/u, 'context': /.,$/u},\n {'code': 'axyz', 'followedBy': 'v', 'remove': / *;$/u}\n];\n\nconst clean24X = [\n {'name': 'I:A', 'code': 'i', 'followedBy': 'a', 'remove': / *:$/u},\n {'name': 'A:B', 'code': 'a', 'followedBy': 'b', 'remove': / [:;=]$/u},\n {'name': 'AB:K', 'code': 'ab', 'followedBy': 'k', 'remove': / :$/u},\n {'name': 'ABK:F', 'code': 'abk', 'followedBy': 'f', 'remove': /,$/u},\n {'name': 'ABFNP:C', 'code': 'abfnp', 'followedBy': 'c', 'remove': / \\/$/u},\n {'name': 'ABN:N', 'code': 'abn', 'followedBy': 'n', 'remove': /\\.$/u},\n {'name': 'ABNP:#', 'code': 'abnp', 'followedBy': '#', 'remove': /\\.$/u},\n {'name': 'N:P', 'code': 'n', 'followedBy': 'p', 'remove': /,$/u},\n cleanDotBeforeLanguageSubfieldL\n];\n\nconst legalX11Punc = [...legalEntryField, legalX11SpaceColon];\n\nconst cleanValidPunctuationRules = {\n '100': legalX00punc,\n '110': legalX10punc,\n '111': legalX11Punc,\n '130': legalEntryField,\n '240': clean24X,\n '243': clean24X,\n '245': clean24X,\n '246': clean24X,\n '260': [\n {'code': 'abc', 'followedBy': 'a', 'remove': / ;$/u},\n {'code': 'a', 'followedBy': 'b', 'remove': / :$/u},\n {'code': 'b', 'followedBy': 'c', 'remove': /,$/u},\n {'code': 'c', 'followedBy': '#', 'remove': /\\.$/u},\n {'code': 'd', 'followedBy': 'e', 'remove': / :$/u},\n {'code': 'e', 'followedBy': 'f', 'remove': /,$/u},\n {'code': 'f', 'followedBy': '#', 'remove': /\\.$/u} // Probably ')' but should it be removed?\n ],\n '264': [\n {'code': 'a', 'followedBy': 'b', 'remove': / :$/u},\n {'code': 'b', 'followedBy': 'c', 'remove': /,$/u},\n {'code': 'c', 'followedBy': '#', 'remove': /\\.$/u}\n ],\n '300': [\n // NB! Remove crap as well, thus the '*' in / *:$/\n {'code': 'a', 'followedBy': 'b', 'remove': / :$/u},\n {'code': 'ab', 'followedBy': 'c', 'remove': / ;$/u},\n {'code': 'abc', 'followedBy': 'e', 'remove': / \\+$/u}\n ],\n '490': cleanLegalSeriesTitle,\n '534': [{'code': 'p', 'followedBy': 'c', 'remove': /:$/u}],\n '600': legalX00punc,\n '610': legalX10punc,\n '611': legalX11Punc,\n '630': legalEntryField,\n // Experimental, MET366-ish (end punc in internationally valid, but we don't use it here in Finland):\n '648': [{'code': 'a', 'context': /^[0-9]+\\.$/u, 'ind2': ['4'], 'remove': /\\.$/u}],\n '700': legalX00punc,\n '710': legalX10punc,\n '711': legalX11Punc,\n '730': legalEntryField,\n '800': legalX00punc,\n '810': legalX10punc,\n '811': legalX11Punc,\n '830': [...legalEntryField, ...cleanLegalSeriesTitle],\n '946': clean24X\n};\n\n\n// Overgeneralizes a bit: eg. addColonToRelationshipInformation only applies to 700/710 but as others don't have $i, it's fine.\n// Also addSemicolonBeforeVolumeDesignation applies only to 8XX:\nconst addToAllEntryFields = [addDotBeforeLanguageSubfieldL, addSemicolonBeforeVolumeDesignation, addColonToRelationshipInformation, addEntryFieldFinalDot];\n\n\nconst addX00 = [addXX0iColon, addX00aComma, addX00aComma2, addX00Dot, addX00dComma, ...addToAllEntryFields];\nconst addX10 = [addXX0iColon, addX10bDot, addX10Comma, addX10Dot, ...addToAllEntryFields];\nconst addX11 = [...addToAllEntryFields, addX11Spacecolon];\nconst addX30 = [\n ...addToAllEntryFields,\n {'name': 'X30$a dot', 'code': 'a', 'followedBy': 'knp', 'add': '.', 'context': needsPuncAfterAlphanumeric},\n {'name': 'X30 final dot', 'code': 'adfghklmnoprstv', 'followedBy': '#', 'add': '.', 'context': needsPuncAfterAlphanumeric}\n];\n\nconst add24X = [\n {'code': 'i', 'followedBy': 'a', 'add': ':', 'context': needsPuncAfterAlphanumeric},\n {'code': 'a', 'followedBy': 'b', 'add': ' :', 'context': '[^:]$'},\n {'code': 'abk', 'followedBy': 'f', 'add': ',', 'context': needsPuncAfterAlphanumeric},\n {'code': 'abfnp', 'followedBy': 'c', 'add': ' /', 'context': '[^/]$'},\n addDotBeforeLanguageSubfieldL\n];\n\nconst add245 = [\n ...add24X,\n // Blah! Also \"$a = $b\" and \"$a ; $b\" can be valid... But ' :' is better than nothing, I guess...\n {'code': 'ab', 'followedBy': 'n', 'add': '.', 'context': needsPuncAfterAlphanumeric},\n {'code': 'n', 'followedBy': 'p', 'add': ',', 'context': defaultNeedsPuncAfter2},\n {'code': 'abnpc', 'followedBy': '#', 'add': '.', 'context': needsPuncAfterAlphanumeric} // Stepping on \"punctuation validator's\" toes\n];\n\nconst addSeriesTitle = [ // 490 and 830\n {'code': 'a', 'followedBy': 'a', 'add': ' =', 'context': defaultNeedsPuncAfter2},\n {'code': 'anpxyz', 'followedBy': 'pxy', 'add': ',', 'context': defaultNeedsPuncAfter2},\n addSemicolonBeforeVolumeDesignation // eg. 490$axyz-$v\n];\n\nconst addLinkingEntry = [ // NB! Music 773 uses different punctuation rules, that are not implement here (can they even be?)\n {'code': 'i', 'followedBy': aToZ, 'add': ':', 'context': defaultNeedsPuncAfter2},\n {'code': 'a', 'followedBy': 't', 'add': '.', 'context': defaultNeedsPuncAfter2},\n {'code': 't', 'followedBy': 'dghoz', 'add': '.', 'context': defaultNeedsPuncAfter2}\n];\n\nconst addPairedPunctuationRules = {\n '100': addX00,\n '110': addX10,\n '111': addX11,\n '130': addX30,\n '240': add24X,\n '243': add24X,\n '245': add245,\n '246': add24X,\n '260': [\n {'code': 'a', 'followedBy': 'b', 'add': ' :', 'context': defaultNeedsPuncAfter2},\n {'code': 'ab', 'followedBy': 'c', 'add': ',', 'context': defaultNeedsPuncAfter2},\n {'code': 'abc', 'followedBy': 'a', 'add': ' ;', 'context': defaultNeedsPuncAfter2},\n {'code': 'e', 'followedBy': 'f', 'add': ' :', 'context': defaultNeedsPuncAfter2},\n {'code': 'f', 'followedBy': 'g', 'add': ',', 'context': defaultNeedsPuncAfter2}\n ],\n '264': [\n {'code': 'a', 'followedBy': 'b', 'add': ' :', 'context': defaultNeedsPuncAfter2},\n {'code': 'b', 'followedBy': 'c', 'add': ',', 'context': defaultNeedsPuncAfter2},\n // NB! The $c rule messes dotless exception \"264 #4 $c p1983\" up\n // We'll need to add a hacky postprocessor for this? Add 'hasInd1': '0123' etc?\n {'code': 'c', 'followedBy': '#', 'add': '.', 'context': needsPuncAfterAlphanumeric, 'ind2': ['0', '1', '2', '3']}\n ],\n '300': [\n {'code': 'a', 'followedBy': 'b', 'add': ' :', 'context': defaultNeedsPuncAfter2},\n {'code': 'ab', 'followedBy': 'c', 'add': ' ;', 'context': defaultNeedsPuncAfter2},\n {'code': 'abc', 'followedBy': 'e', 'add': ' +', 'context': defaultNeedsPuncAfter2}\n ],\n '490': addSeriesTitle,\n '506': [{'code': 'a', 'followedBy': '#', 'add': '.', 'context': defaultNeedsPuncAfter2}],\n '534': [{'code': 'p', 'followedBy': 'c', 'add': ':', 'context': defaultNeedsPuncAfter2}],\n '600': addX00,\n '610': addX10,\n '611': addX11,\n '630': addX30,\n '700': addX00,\n '710': addX10,\n '711': addX11,\n '730': addX30,\n '773': addLinkingEntry,\n '787': addLinkingEntry,\n '800': addX00,\n '810': addX10,\n '811': addX11,\n '830': [...addX30, ...addSeriesTitle],\n '946': [{'code': 'i', 'followedBy': 'a', 'add': ':', 'context': defaultNeedsPuncAfter2}]\n};\n\n/*\nfunction debugRule(rule) {\n //nvdebug('', debugDev);\n nvdebug(`NAME ${rule.name ? rule.name : '<unnamed>'}`, debugDev);\n nvdebug(`SUBFIELD CODE '${rule.code}' FOLLOWED BY SUBFIELD CODE '${rule.followedBy}'`, debugDev);\n if ('add' in rule) {\n nvdebug(`ADD '${rule.add}'`, debugDev);\n }\n if ('remove' in rule) {\n nvdebug(`REMOVE '${rule.remove}'`, debugDev);\n }\n if ('context' in rule) {\n nvdebug(`CONTEXT '${rule.context.toString()}'`, debugDev);\n }\n //nvdebug('', debugDev);\n}\n*/\n\nfunction ruleAppliesToSubfieldCode(targetSubfieldCodes, currSubfieldCode) {\n if (!targetSubfieldCodes) { // We are not interested in what subfield precedes 240$l, ',' is removed anyway\n return true;\n }\n const negation = targetSubfieldCodes.includes('!');\n if (negation) {\n return !targetSubfieldCodes.includes(currSubfieldCode);\n }\n return targetSubfieldCodes.includes(currSubfieldCode);\n}\n\n\nfunction ruleAppliesToField(rule, field) {\n if ('ind1' in rule && !rule.ind1.includes(field.ind1)) {\n return false;\n }\n\n if ('ind2' in rule && !rule.ind2.includes(field.ind2)) {\n return false;\n }\n\n // If we want to check, say, $2, it should be implemented here!\n\n return true;\n}\n\n\nfunction ruleAppliesToCurrentSubfield(rule, subfield) {\n //nvdebug(` Apply rule on LHS?`, debugDev);\n if (!ruleAppliesToSubfieldCode(rule.code, subfield.code)) {\n //nvdebug(` Reject rule!`, debugDev);\n return false;\n }\n if ('context' in rule) {\n //nvdebug(` Check '${subfield.value}' versus '${rule.context.toString()}'`, debugDev);\n if (!subfield.value.match(rule.context)) { // njsscan-ignore: regex_injection_dos\n //nvdebug(` Reject rule!`, debugDev);\n return false;\n }\n }\n //nvdebug(` Apply rule!`, debugDev);\n return true;\n}\n\nfunction ruleAppliesToNextSubfield(rule, nextSubfield) {\n if (!('followedBy' in rule)) { // Return true, if we are not interested in the next subfield\n return true;\n }\n // The '#' existence check applies only to the RHS field. LHS always exists.\n if (!nextSubfield) {\n const negation = rule.followedBy.includes('!');\n if (negation) {\n return !rule.followedBy.includes('#');\n }\n return rule.followedBy.includes('#');\n }\n\n if (!ruleAppliesToSubfieldCode(rule.followedBy, nextSubfield.code)) {\n return false;\n }\n if ('contextRHS' in rule && !nextSubfield.value.match(rule.contextRHS)) { // njsscan-ignore: regex_injection_dos\n return false;\n }\n return true;\n}\n\nfunction checkRule(rule, field, subfield1, subfield2) {\n if (!ruleAppliesToField(rule, field)) {\n //nvdebug(`FAIL ON WHOLE FIELD: '${fieldToString(field)}`, debugDev);\n return false;\n }\n //const name = rule.name || 'UNNAMED';\n if (!ruleAppliesToCurrentSubfield(rule, subfield1)) {\n //nvdebug(`${name}: FAIL ON LHS SUBFIELD: '$${subfield1.code} ${subfield1.value}', SF=${rule.code}`, debugDev);\n return false;\n }\n\n // NB! This is not a perfect solution. We might have $e$0$e where $e$0 punctuation should actually be based on $e$e rules\n if (!ruleAppliesToNextSubfield(rule, subfield2)) {\n //const msg = subfield2 ? `${name}: FAIL ON RHS SUBFIELD '${subfield2.code}' not in [${rule.followedBy}]` : `${name}: FAIL ON RHS FIELD`;\n //nvdebug(msg, debugDev);\n return false;\n }\n\n \n //nvdebug(`${rule.name ? rule.name : '<unnamed>'}: ACCEPT ${rule.code} (${subfield1.code}), SF2=${rule.followedBy} (${subfield2 ? subfield2.code : '#'})`, debugDev);\n return true;\n}\n\n\nfunction applyPunctuationRules(field, subfield1, subfield2, ruleArray = null, operation = NONE) {\n if (operation === NONE || ruleArray === null) { // !fieldIsApplicable(field, ruleArray)) {\n return;\n }\n const tag2 = field.tag === '880' ? fieldGetUnambiguousTag(field) : field.tag;\n if (!tag2) {\n return;\n }\n if (!(`${tag2}` in ruleArray)) {\n return;\n }\n\n //nvdebug(`PUNCTUATE ${field.tag}/${tag2} '${subfieldToString(subfield1)}' XXX '${subfield2 ? subfieldToString(subfield2) : '#'} }`, debugDev);\n\n //nvdebug(`OP=${operation} ${tag2}: '${subfield1.code}: ${subfield1.value}' ??? '${subfield2 ? subfield2.code : '#'}'`, debugDev);\n const candRules = ruleArray[tag2];\n candRules.every(rule => { // uses \"every\", not \"forEach\", so that only one rule is applied to the given subfields\n //debugRule(rule);\n if (!checkRule(rule, field, subfield1, subfield2)) {\n return true;\n }\n\n //const originalValue = subfield1.value;\n if (rule.remove && [REMOVE, REMOVE_AND_ADD].includes(operation) && subfield1.value.match(rule.remove)) {\n //nvdebug(` PUNC REMOVAL TO BE PERFORMED FOR $${subfield1.code} '${subfield1.value}'`, debugDev);\n subfield1.value = subfield1.value.replace(rule.remove, '');\n //nvdebug(` PUNC REMOVAL PERFORMED FOR '${subfield1.value}'`, debugDev);\n return false;\n }\n if (rule.add && [ADD, REMOVE_AND_ADD].includes(operation)) {\n subfield1.value += rule.add;\n //nvdebug(` ADDED '${rule.add}' TO FORM '${subfield1.value}' USING RULE ${rule.name}`, debugDev);\n return false;\n }\n\n /*\n if (subfield1.value !== originalValue) {\n nvdebug(` PROCESS PUNC: '\u2021${subfield1.code} ${originalValue}' => '\u2021${subfield1.code} ${subfield1.value}'`, debugDev);\n }\n */\n\n return true;\n });\n}\n\nfunction subfieldFixPunctuation(field, subfield1, subfield2) {\n applyPunctuationRules(field, subfield1, subfield2, cleanCrappyPunctuationRules, REMOVE);\n applyPunctuationRules(field, subfield1, subfield2, addPairedPunctuationRules, ADD);\n}\n\nfunction subfieldStripPunctuation(field, subfield1, subfield2) {\n //nvdebug(`FSP1: '${subfield1.value}'`, debugDev);\n applyPunctuationRules(field, subfield1, subfield2, cleanValidPunctuationRules, REMOVE);\n //nvdebug(`FSP2: '${subfield1.value}'`, debugDev);\n applyPunctuationRules(field, subfield1, subfield2, cleanCrappyPunctuationRules, REMOVE);\n //nvdebug(`FSP3: '${subfield1.value}'`, debugDev);\n\n}\n\nexport function fieldStripPunctuation(field) {\n if (!field.subfields) {\n return field;\n }\n\n field.subfields.forEach((sf, i) => {\n // NB! instead of next subfield, we should actually get next *non-control-subfield*!!!\n // (In plain English: We should skip $0 - $9 at least, maybe $w as well...)\n subfieldStripPunctuation(field, sf, getNextRelevantSubfield(field, i));\n\n });\n return field;\n}\n\nexport function fieldFixPunctuation(field, externalEndPunctuation = false) {\n if (!field.subfields) {\n return field;\n }\n //nvdebug(`################### fieldFixPunctuation() TEST ${fieldToString(field)}`, debugDev);\n\n field.subfields.forEach((sf, i) => {\n // NB! instead of next subfield, we get next *non-control-subfield*!!!\n // (In plain English: We skip $0 ... $9 at least, maybe $w as well...)\n // We'll need some magic for field 257 here, do we? (Also Finnish lexicons vs global lexicons in 65X fields)\n subfieldFixPunctuation(field, sf, getNextRelevantSubfield(field, i));\n });\n\n // Use shared code for final punctuation (sadly this does not fix intermediate punc):\n if (externalEndPunctuation || field.useExternalEndPunctuation) {\n // addFinalPunctuation(field); // local version. use shared code instead.\n validateSingleField(field, false, true); // NB! Don't use field.tag as second argument! It's a string, not an int. 3rd arg must be true (=fix)\n }\n return field;\n}\n"],
5
+ "mappings": "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",
6
6
  "names": []
7
7
  }
package/dist/punctuation2.test.js CHANGED
@@ -1,4 +1,4 @@
1
- import assert from "node:assert";
1
+ import assert from "node:assert/strict";
2
2
  import { MarcRecord } from "@natlibfi/marc-record";
3
3
  import validatorFactory from "./punctuation2.js";
4
4
  import { READERS } from "@natlibfi/fixura";
@@ -33,6 +33,6 @@ async function callback({ getFixture, fix = false }) {
33
33
  return;
34
34
  }
35
35
  await validator.fix(record);
36
- assert.deepEqual(record, expectedResult);
36
+ assert.deepEqual(record, new MarcRecord(expectedResult));
37
37
  }
38
38
  //# sourceMappingURL=punctuation2.test.js.map
package/dist/punctuation2.test.js.map CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../src/punctuation2.test.js"],
4
- "sourcesContent": ["import assert from 'node:assert';\nimport {MarcRecord} from '@natlibfi/marc-record';\nimport validatorFactory from './punctuation2.js';\nimport {READERS} from '@natlibfi/fixura';\nimport generateTests from '@natlibfi/fixugen';\n//import createDebugLogger from 'debug';\n\ngenerateTests({\n callback,\n path: [import.meta.dirname, '..', 'test-fixtures', 'punctuation2'],\n useMetadataFile: true,\n recurse: false,\n fixura: {\n reader: READERS.JSON\n },\n hooks: {\n before: async () => {\n testValidatorFactory();\n }\n }\n});\n//const debug = createDebugLogger('@natlibfi/marc-record-validators-melinda/punctuation2:test');\n\nasync function testValidatorFactory() {\n const validator = await validatorFactory();\n\n assert.equal(typeof validator, 'object');\n assert.equal(typeof validator.description, 'string');\n assert.equal(typeof validator.validate, 'function');\n}\n\nasync function callback({getFixture, fix = false}) {\n const validator = await validatorFactory();\n const record = new MarcRecord(getFixture('record.json'));\n const expectedResult = getFixture('expectedResult.json');\n // console.log(expectedResult); // eslint-disable-line\n\n if (!fix) {\n const result = await validator.validate(record);\n assert.deepEqual(result, expectedResult);\n return;\n }\n\n await validator.fix(record);\n assert.deepEqual(record, expectedResult);\n}\n"],
5
- "mappings": "AAAA,OAAO,YAAY;AACnB,SAAQ,kBAAiB;AACzB,OAAO,sBAAsB;AAC7B,SAAQ,eAAc;AACtB,OAAO,mBAAmB;AAG1B,cAAc;AAAA,EACZ;AAAA,EACA,MAAM,CAAC,YAAY,SAAS,MAAM,iBAAiB,cAAc;AAAA,EACjE,iBAAiB;AAAA,EACjB,SAAS;AAAA,EACT,QAAQ;AAAA,IACN,QAAQ,QAAQ;AAAA,EAClB;AAAA,EACA,OAAO;AAAA,IACL,QAAQ,YAAY;AAClB,2BAAqB;AAAA,IACvB;AAAA,EACF;AACF,CAAC;AAGD,eAAe,uBAAuB;AACpC,QAAM,YAAY,MAAM,iBAAiB;AAEzC,SAAO,MAAM,OAAO,WAAW,QAAQ;AACvC,SAAO,MAAM,OAAO,UAAU,aAAa,QAAQ;AACnD,SAAO,MAAM,OAAO,UAAU,UAAU,UAAU;AACpD;AAEA,eAAe,SAAS,EAAC,YAAY,MAAM,MAAK,GAAG;AACjD,QAAM,YAAY,MAAM,iBAAiB;AACzC,QAAM,SAAS,IAAI,WAAW,WAAW,aAAa,CAAC;AACvD,QAAM,iBAAiB,WAAW,qBAAqB;AAGvD,MAAI,CAAC,KAAK;AACR,UAAM,SAAS,MAAM,UAAU,SAAS,MAAM;AAC9C,WAAO,UAAU,QAAQ,cAAc;AACvC;AAAA,EACF;AAEA,QAAM,UAAU,IAAI,MAAM;AAC1B,SAAO,UAAU,QAAQ,cAAc;AACzC;",
4
+ "sourcesContent": ["import assert from 'node:assert/strict';\nimport {MarcRecord} from '@natlibfi/marc-record';\nimport validatorFactory from './punctuation2.js';\nimport {READERS} from '@natlibfi/fixura';\nimport generateTests from '@natlibfi/fixugen';\n//import createDebugLogger from 'debug';\n\ngenerateTests({\n callback,\n path: [import.meta.dirname, '..', 'test-fixtures', 'punctuation2'],\n useMetadataFile: true,\n recurse: false,\n fixura: {\n reader: READERS.JSON\n },\n hooks: {\n before: async () => {\n testValidatorFactory();\n }\n }\n});\n//const debug = createDebugLogger('@natlibfi/marc-record-validators-melinda/punctuation2:test');\n\nasync function testValidatorFactory() {\n const validator = await validatorFactory();\n\n assert.equal(typeof validator, 'object');\n assert.equal(typeof validator.description, 'string');\n assert.equal(typeof validator.validate, 'function');\n}\n\nasync function callback({getFixture, fix = false}) {\n const validator = await validatorFactory();\n const record = new MarcRecord(getFixture('record.json'));\n const expectedResult = getFixture('expectedResult.json');\n // console.log(expectedResult); // eslint-disable-line\n\n if (!fix) {\n const result = await validator.validate(record);\n assert.deepEqual(result, expectedResult);\n return;\n }\n\n await validator.fix(record);\n assert.deepEqual(record, new MarcRecord(expectedResult));\n}\n"],
5
+ "mappings": "AAAA,OAAO,YAAY;AACnB,SAAQ,kBAAiB;AACzB,OAAO,sBAAsB;AAC7B,SAAQ,eAAc;AACtB,OAAO,mBAAmB;AAG1B,cAAc;AAAA,EACZ;AAAA,EACA,MAAM,CAAC,YAAY,SAAS,MAAM,iBAAiB,cAAc;AAAA,EACjE,iBAAiB;AAAA,EACjB,SAAS;AAAA,EACT,QAAQ;AAAA,IACN,QAAQ,QAAQ;AAAA,EAClB;AAAA,EACA,OAAO;AAAA,IACL,QAAQ,YAAY;AAClB,2BAAqB;AAAA,IACvB;AAAA,EACF;AACF,CAAC;AAGD,eAAe,uBAAuB;AACpC,QAAM,YAAY,MAAM,iBAAiB;AAEzC,SAAO,MAAM,OAAO,WAAW,QAAQ;AACvC,SAAO,MAAM,OAAO,UAAU,aAAa,QAAQ;AACnD,SAAO,MAAM,OAAO,UAAU,UAAU,UAAU;AACpD;AAEA,eAAe,SAAS,EAAC,YAAY,MAAM,MAAK,GAAG;AACjD,QAAM,YAAY,MAAM,iBAAiB;AACzC,QAAM,SAAS,IAAI,WAAW,WAAW,aAAa,CAAC;AACvD,QAAM,iBAAiB,WAAW,qBAAqB;AAGvD,MAAI,CAAC,KAAK;AACR,UAAM,SAAS,MAAM,UAAU,SAAS,MAAM;AAC9C,WAAO,UAAU,QAAQ,cAAc;AACvC;AAAA,EACF;AAEA,QAAM,UAAU,IAAI,MAAM;AAC1B,SAAO,UAAU,QAAQ,IAAI,WAAW,cAAc,CAAC;AACzD;",
6
6
  "names": []
7
7
  }
package/dist/sortSubfields.js CHANGED
@@ -103,8 +103,8 @@ const subfieldSortOrder = [
103
103
  { "tag": "800", "sortOrder": sortOrderForX00 },
104
104
  { "tag": "810", "sortOrder": sortOrderForX10 },
105
105
  { "tag": "811", "sortOrder": sortOrderForX11 },
106
- { "tag": "830", "sortOrder": ["a", "n", "x", "v"] },
107
- // INCOMPLETE, SAME AS 490? APPARENTLY NOT...
106
+ { "tag": "830", "sortOrder": ["a", "n", "p", "x", "v"] },
107
+ // Sort of an extension of f490...
108
108
  { "tag": "856", "sortOrder": ["3", "u", "q", "x", "y", "z", "5"] },
109
109
  // incomplete, LoC examples are inconclusive
110
110
  { "tag": "880", "sortOrder": ["a"] },
package/dist/sortSubfields.js.map CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../src/sortSubfields.js"],
4
- "sourcesContent": ["// Author(s): Nicholas Volk\n\n\nimport createDebugLogger from 'debug';\nimport {fieldToString, nvdebug} from './utils.js';\n\nconst debug = createDebugLogger('@natlibfi/marc-record-validators-melinda:sortSubfields');\n//const debugData = debug.extend('data');\nconst debugDev = debug.extend('dev');\n\nconst defaultSortOrderStringFinns = '863abcdefghijklmnopqrstuvwxyz4201759'; // NB! We Finns like $2 before $0 in 6XX...\nconst defaultSortOrderStringOthers = '863abcdefghijklmnopqrstuvwxyz4021759'; // NB 760-788 have '7' in different position...\n\nconst defaultSortOrderFinns = defaultSortOrderStringFinns.split('');\nconst defaultSortOrderOthers = defaultSortOrderStringOthers.split('');\n\n\nexport default function (defaultTagPattern) {\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 = defaultTagPattern) {\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, tagPattern = defaultTagPattern) {\n const res = {message: []};\n\n const relevantFields = getRelevantFields(record, tagPattern);\n\n relevantFields.forEach(field => {\n const clonedField = structuredClone(field);\n sortAdjacentSubfields(clonedField);\n const clonedFieldAsString = fieldToString(clonedField);\n const fieldAsString = fieldToString(field);\n if (fieldAsString !== clonedFieldAsString) {\n res.message.push(clonedFieldAsString);\n }\n });\n\n res.valid = !(res.message.length >= 1);\n return res;\n }\n}\n\n\n// X00, X10, X11 and X130 could also for their own sets...\n// (ouch! sometimes $c comes after $d...): LoC: 100 0# \u2021a Black Foot, \u2021c Chief, \u2021d d. 1877 \u2021c (Spirit)\nconst sortOrderForX00 = ['i', 'a', 'b', 'q', 'c', 'd', 'e', 't', 'u', 'l', 'f', 'x', 'y', 'z', '0', '1', '5', '9']; // skip $g. Can't remember why, though...\nconst sortOrderForX10 = ['i', 'a', 'b', 't', 'n', 'c', 'e', 'v', 'w', 'x', 'y', 'z', '0', '1', '5', '9']; // somewhat iffy\nconst sortOrderForX11 = ['a', 'n', 'd', 'c', 'e', 'g', 'j', '0', '1', '5', '9'];\nconst sortOrderFor7XXLinkingEntries = ['8', '7', 'i', 'a', 's', 't', 'b', 'c', 'd', 'm', 'h', 'k', 'o', 'x', 'z', 'g', 'q', 'w', '0', '1', 'l', '9', '5'];\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', 'a', 'b', 'e', 'c', 'd', 'x']},\n // rda mus: 041: k < h < e < n < g < m < j (I think h<e is bad)\n // rda: g < h, j < p < h, i < j, k < h\n // loc: b < j, $m follows $b or $g\n // NV: $a \n {'tag': '041', 'sortOrder': ['8', 'a', 'd', 'e', 'b', 'f', 'i', 'j', 'p', 'k', 'h', 'n', 'g', 'm']}, // guesswork\n {'tag': '048', 'sortOrder': ['8', 'b', 'a']},\n {'tag': '100', 'sortOrder': sortOrderForX00},\n {'tag': '110', 'sortOrder': sortOrderForX10},\n {'tag': '111', 'sortOrder': sortOrderForX11},\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': ['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', '1']},\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': '534', 'sortOrder': ['3', 'p', 'a', 't', 'l', 'c', 'f', 'b', 'e', 'o', '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': sortOrderForX11},\n {'tag': '650', 'sortOrder': ['a', 'x', 'y', 'z']},\n {'tag': '700', 'sortOrder': sortOrderForX00},\n {'tag': '710', 'sortOrder': sortOrderForX10},\n {'tag': '711', 'sortOrder': sortOrderForX11},\n {'tag': '760', 'sortOrder': sortOrderFor7XXLinkingEntries},\n {'tag': '762', 'sortOrder': sortOrderFor7XXLinkingEntries},\n {'tag': '765', 'sortOrder': sortOrderFor7XXLinkingEntries},\n {'tag': '767', 'sortOrder': sortOrderFor7XXLinkingEntries},\n {'tag': '770', 'sortOrder': sortOrderFor7XXLinkingEntries},\n {'tag': '772', 'sortOrder': sortOrderFor7XXLinkingEntries},\n {'tag': '773', 'sortOrder': sortOrderFor7XXLinkingEntries},\n {'tag': '774', 'sortOrder': sortOrderFor7XXLinkingEntries},\n {'tag': '775', 'sortOrder': sortOrderFor7XXLinkingEntries},\n {'tag': '776', 'sortOrder': sortOrderFor7XXLinkingEntries},\n {'tag': '777', 'sortOrder': sortOrderFor7XXLinkingEntries},\n {'tag': '780', 'sortOrder': sortOrderFor7XXLinkingEntries},\n {'tag': '785', 'sortOrder': sortOrderFor7XXLinkingEntries},\n {'tag': '786', 'sortOrder': sortOrderFor7XXLinkingEntries},\n {'tag': '787', 'sortOrder': sortOrderFor7XXLinkingEntries},\n {'tag': '788', 'sortOrder': sortOrderFor7XXLinkingEntries},\n {'tag': '800', 'sortOrder': sortOrderForX00},\n {'tag': '810', 'sortOrder': sortOrderForX10},\n {'tag': '811', 'sortOrder': sortOrderForX11},\n {'tag': '830', 'sortOrder': ['a', 'n', 'x', 'v']}, // INCOMPLETE, SAME AS 490? APPARENTLY NOT...\n {'tag': '856', 'sortOrder': ['3', 'u', 'q', 'x', 'y', 'z', '5']}, // incomplete, LoC examples are inconclusive\n {'tag': '880', 'sortOrder': ['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 if (!['300'].includes(field.tag)) { // Lis tags which use normal $a...$z order here!\n nvdebug(`WARNING!\\tNo subfield order found for ${field.tag}.`, debugDev);\n }\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;\n field.subfields[index] = tmp;\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\nfunction moveSubfield6ToTheFront(field) {\n // https://www.loc.gov/marc/bibliographic/ecbdcntf.html says \"Subfield $6 is always the first subfield in the field.\"\n const sf6s = field.subfields.filter(sf => sf.code === '6');\n const others = field.subfields.filter(sf => sf.code !== '6');\n field.subfields = [...sf6s, ...others];\n}\n\nexport function sortAdjacentSubfields(field, externalSortOrder = []) {\n if (!field.subfields) {\n return field;\n }\n\n moveSubfield6ToTheFront(field); // specs: \"Subfield $6 is always the first subfield in the 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\n const finnishWay = twoBeforeZero(field);\n\n // Note: 760-789: '7' comes way earlier (after '6' and '8')\n const controlSubfieldOrder = finnishWay ? ['8', '3', 'a', '4', '2', '0', '1', '7', '5', '9'] : ['8', '7', '3', 'a', '4', '0', '1', '2', '7', '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(', ')}`, debugDev);\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(', ')}`, debugDev);\n //if (sortOrder === null) { return field; } //// Currently always sort..\n //nvdebug(`IN: ${fieldToString(field)}`, debugDev);\n swapSubfields(field, subfieldOrder);\n //nvdebug(`OUT: ${fieldToString(field)}`, debugDev);\n\n return field;\n}\n\n"],
5
- "mappings": "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",
4
+ "sourcesContent": ["// Author(s): Nicholas Volk\n\n\nimport createDebugLogger from 'debug';\nimport {fieldToString, nvdebug} from './utils.js';\n\nconst debug = createDebugLogger('@natlibfi/marc-record-validators-melinda:sortSubfields');\n//const debugData = debug.extend('data');\nconst debugDev = debug.extend('dev');\n\nconst defaultSortOrderStringFinns = '863abcdefghijklmnopqrstuvwxyz4201759'; // NB! We Finns like $2 before $0 in 6XX...\nconst defaultSortOrderStringOthers = '863abcdefghijklmnopqrstuvwxyz4021759'; // NB 760-788 have '7' in different position...\n\nconst defaultSortOrderFinns = defaultSortOrderStringFinns.split('');\nconst defaultSortOrderOthers = defaultSortOrderStringOthers.split('');\n\n\nexport default function (defaultTagPattern) {\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 = defaultTagPattern) {\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, tagPattern = defaultTagPattern) {\n const res = {message: []};\n\n const relevantFields = getRelevantFields(record, tagPattern);\n\n relevantFields.forEach(field => {\n const clonedField = structuredClone(field);\n sortAdjacentSubfields(clonedField);\n const clonedFieldAsString = fieldToString(clonedField);\n const fieldAsString = fieldToString(field);\n if (fieldAsString !== clonedFieldAsString) {\n res.message.push(clonedFieldAsString);\n }\n });\n\n res.valid = !(res.message.length >= 1);\n return res;\n }\n}\n\n\n// X00, X10, X11 and X130 could also for their own sets...\n// (ouch! sometimes $c comes after $d...): LoC: 100 0# \u2021a Black Foot, \u2021c Chief, \u2021d d. 1877 \u2021c (Spirit)\nconst sortOrderForX00 = ['i', 'a', 'b', 'q', 'c', 'd', 'e', 't', 'u', 'l', 'f', 'x', 'y', 'z', '0', '1', '5', '9']; // skip $g. Can't remember why, though...\nconst sortOrderForX10 = ['i', 'a', 'b', 't', 'n', 'c', 'e', 'v', 'w', 'x', 'y', 'z', '0', '1', '5', '9']; // somewhat iffy\nconst sortOrderForX11 = ['a', 'n', 'd', 'c', 'e', 'g', 'j', '0', '1', '5', '9'];\nconst sortOrderFor7XXLinkingEntries = ['8', '7', 'i', 'a', 's', 't', 'b', 'c', 'd', 'm', 'h', 'k', 'o', 'x', 'z', 'g', 'q', 'w', '0', '1', 'l', '9', '5'];\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', 'a', 'b', 'e', 'c', 'd', 'x']},\n // rda mus: 041: k < h < e < n < g < m < j (I think h<e is bad)\n // rda: g < h, j < p < h, i < j, k < h\n // loc: b < j, $m follows $b or $g\n // NV: $a \n {'tag': '041', 'sortOrder': ['8', 'a', 'd', 'e', 'b', 'f', 'i', 'j', 'p', 'k', 'h', 'n', 'g', 'm']}, // guesswork\n {'tag': '048', 'sortOrder': ['8', 'b', 'a']},\n {'tag': '100', 'sortOrder': sortOrderForX00},\n {'tag': '110', 'sortOrder': sortOrderForX10},\n {'tag': '111', 'sortOrder': sortOrderForX11},\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': ['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', '1']},\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': '534', 'sortOrder': ['3', 'p', 'a', 't', 'l', 'c', 'f', 'b', 'e', 'o', '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': sortOrderForX11},\n {'tag': '650', 'sortOrder': ['a', 'x', 'y', 'z']},\n {'tag': '700', 'sortOrder': sortOrderForX00},\n {'tag': '710', 'sortOrder': sortOrderForX10},\n {'tag': '711', 'sortOrder': sortOrderForX11},\n {'tag': '760', 'sortOrder': sortOrderFor7XXLinkingEntries},\n {'tag': '762', 'sortOrder': sortOrderFor7XXLinkingEntries},\n {'tag': '765', 'sortOrder': sortOrderFor7XXLinkingEntries},\n {'tag': '767', 'sortOrder': sortOrderFor7XXLinkingEntries},\n {'tag': '770', 'sortOrder': sortOrderFor7XXLinkingEntries},\n {'tag': '772', 'sortOrder': sortOrderFor7XXLinkingEntries},\n {'tag': '773', 'sortOrder': sortOrderFor7XXLinkingEntries},\n {'tag': '774', 'sortOrder': sortOrderFor7XXLinkingEntries},\n {'tag': '775', 'sortOrder': sortOrderFor7XXLinkingEntries},\n {'tag': '776', 'sortOrder': sortOrderFor7XXLinkingEntries},\n {'tag': '777', 'sortOrder': sortOrderFor7XXLinkingEntries},\n {'tag': '780', 'sortOrder': sortOrderFor7XXLinkingEntries},\n {'tag': '785', 'sortOrder': sortOrderFor7XXLinkingEntries},\n {'tag': '786', 'sortOrder': sortOrderFor7XXLinkingEntries},\n {'tag': '787', 'sortOrder': sortOrderFor7XXLinkingEntries},\n {'tag': '788', 'sortOrder': sortOrderFor7XXLinkingEntries},\n {'tag': '800', 'sortOrder': sortOrderForX00},\n {'tag': '810', 'sortOrder': sortOrderForX10},\n {'tag': '811', 'sortOrder': sortOrderForX11},\n {'tag': '830', 'sortOrder': ['a', 'n', 'p', 'x', 'v']}, // Sort of an extension of f490...\n {'tag': '856', 'sortOrder': ['3', 'u', 'q', 'x', 'y', 'z', '5']}, // incomplete, LoC examples are inconclusive\n {'tag': '880', 'sortOrder': ['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 if (!['300'].includes(field.tag)) { // Lis tags which use normal $a...$z order here!\n nvdebug(`WARNING!\\tNo subfield order found for ${field.tag}.`, debugDev);\n }\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;\n field.subfields[index] = tmp;\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\nfunction moveSubfield6ToTheFront(field) {\n // https://www.loc.gov/marc/bibliographic/ecbdcntf.html says \"Subfield $6 is always the first subfield in the field.\"\n const sf6s = field.subfields.filter(sf => sf.code === '6');\n const others = field.subfields.filter(sf => sf.code !== '6');\n field.subfields = [...sf6s, ...others];\n}\n\nexport function sortAdjacentSubfields(field, externalSortOrder = []) {\n if (!field.subfields) {\n return field;\n }\n\n moveSubfield6ToTheFront(field); // specs: \"Subfield $6 is always the first subfield in the 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\n const finnishWay = twoBeforeZero(field);\n\n // Note: 760-789: '7' comes way earlier (after '6' and '8')\n const controlSubfieldOrder = finnishWay ? ['8', '3', 'a', '4', '2', '0', '1', '7', '5', '9'] : ['8', '7', '3', 'a', '4', '0', '1', '2', '7', '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(', ')}`, debugDev);\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(', ')}`, debugDev);\n //if (sortOrder === null) { return field; } //// Currently always sort..\n //nvdebug(`IN: ${fieldToString(field)}`, debugDev);\n swapSubfields(field, subfieldOrder);\n //nvdebug(`OUT: ${fieldToString(field)}`, debugDev);\n\n return field;\n}\n\n"],
5
+ "mappings": "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",
6
6
  "names": ["sortOrder"]
7
7
  }
package/package.json CHANGED
@@ -14,7 +14,7 @@
14
14
  "url": "https://github.com/NatLibFi/marc-record-validators-melinda"
15
15
  },
16
16
  "license": "MIT",
17
- "version": "13.0.4",
17
+ "version": "13.0.5-alpha.1",
18
18
  "main": "./dist/index.js",
19
19
  "publishConfig": {
20
20
  "access": "public"
@@ -35,18 +35,18 @@
35
35
  "dev:debug": "cross-env LOG_LEVEL=debug DEBUG=@natlibfi/* NODE_ENV=test"
36
36
  },
37
37
  "dependencies": {
38
- "@natlibfi/iso9-1995": "^1.1.4",
38
+ "@natlibfi/iso9-1995": "^1.1.5",
39
39
  "@natlibfi/issn-verify": "^2.0.4",
40
40
  "@natlibfi/marc-record": "^11.0.3",
41
- "@natlibfi/marc-record-serializers": "^11.0.4",
42
- "@natlibfi/marc-record-validate": "^9.0.1",
41
+ "@natlibfi/marc-record-serializers": "^11.0.5",
42
+ "@natlibfi/marc-record-validate": "^9.0.2",
43
43
  "@natlibfi/melinda-commons": "^15.0.2",
44
- "@natlibfi/sfs-4900": "^2.0.0",
45
- "@natlibfi/sru-client": "^7.0.4",
44
+ "@natlibfi/sfs-4900": "^3.0.0",
45
+ "@natlibfi/sru-client": "^7.0.5",
46
46
  "clone": "^2.1.2",
47
47
  "debug": "^4.4.3",
48
48
  "franc": "^6.2.0",
49
- "isbn3": "^2.0.10",
49
+ "isbn3": "^2.0.11",
50
50
  "xml2js": "^0.6.2",
51
51
  "xregexp": "^5.1.2"
52
52
  },
@@ -55,7 +55,7 @@
55
55
  "@natlibfi/fixura": "^5.0.0",
56
56
  "cross-env": "^10.1.0",
57
57
  "esbuild": "^0.28.2",
58
- "eslint": "^10.9.1",
58
+ "eslint": "^10.10.0",
59
59
  "fetch-mock": "^12.6.0"
60
60
  }
61
61
  }
package/src/cyrillux-usemarcon-replacement.test.js CHANGED
@@ -1,4 +1,4 @@
1
- import assert from 'node:assert';
1
+ import assert from 'node:assert/strict';
2
2
  import {MarcRecord} from '@natlibfi/marc-record';
3
3
  import validatorFactory from './cyrillux-usemarcon-replacement.js';
4
4
  import {READERS} from '@natlibfi/fixura';
@@ -46,5 +46,5 @@ async function callback({getFixture, fix = false}) {
46
46
  }
47
47
 
48
48
  await validator.fix(record);
49
- assert.deepEqual(record, expectedResult);
49
+ assert.deepEqual(record, new MarcRecord(expectedResult));
50
50
  }
package/src/merge-fields/mergeConstraints.js CHANGED
@@ -246,7 +246,7 @@ const mergeConstraints = [
246
246
  {'tag': '800', 'required': 'a', 'paired': 'bt', 'key': keyX00},
247
247
  {'tag': '810', 'required': 'a', 'paired': 'bt', 'key': keyX10},
248
248
  {'tag': '811', 'required': 'a', 'paired': 't', 'key': keyX11},
249
- {'tag': '830', 'required': 'a', 'key': keyX30},
249
+ {'tag': '830', 'required': 'a', 'paired': 'np', 'key': keyX30},
250
250
  {'tag': '840', 'required': 'a'},
251
251
  {'tag': '841', 'required': 'a'},
252
252
  {'tag': '842', 'required': 'a'},
package/src/merge-fields/mergeField.js CHANGED
@@ -85,7 +85,7 @@ function mergeField2(baseRecord, baseField, sourceField, config, candFieldPairs8
85
85
 
86
86
  const subfieldData = {'tag': sourceField.tag, 'code': originalSubfield.code, 'originalValue': originalSubfield.value, 'normalizedValue': normalizedSubfield.value, 'punctuationlessValue': punctlessSubfield.value};
87
87
 
88
- mergeOrAddSubfield(baseField, subfieldData, candFieldPairs880); // candSubfield);
88
+ mergeOrAddSubfield(baseField, subfieldData, candFieldPairs880, sourceField); // candSubfield);
89
89
  const newValue = fieldToString(baseField);
90
90
  if (originalBaseValue !== newValue) {
91
91
  nvdebug(` SUBFIELD MERGE RESULT: '${newValue}'`, debugDev);
@@ -159,7 +159,7 @@ export function mergeField(baseRecord, sourceRecord, sourceField, config) {
159
159
  return false;
160
160
  }
161
161
 
162
- nvdebug(`mergeField(): Try to merge '${fieldToString(sourceField)}'.`, debugDev);
162
+ nvdebug(`mergeField(): Try to merge '${fieldToString(sourceField)}'.`, debug);
163
163
  const counterpartField = getCounterpart(baseRecord, sourceRecord, sourceField, config);
164
164
 
165
165
  if (counterpartField) {
package/src/merge-fields/mergeOrAddSubfield.js CHANGED
@@ -37,7 +37,7 @@ function dataContainsPrepublicationSubfield(candSubfieldData) {
37
37
  }
38
38
 
39
39
 
40
- function mergeOrAddSubfieldNotRequiredSpecialCases(targetField, candSubfieldData) {
40
+ function mergeOrAddSubfieldNotRequiredSpecialCases(targetField, candSubfieldData, sourceField) {
41
41
 
42
42
  // Don't bring WHATEVER<KEEP> from source 7XX to base 1XX.
43
43
  // Exceptionally we can merge <KEEP>ed 7XX with un-<KEEP>ed 1XX as 1XX should not use <KEEP>s.
@@ -50,6 +50,29 @@ function mergeOrAddSubfieldNotRequiredSpecialCases(targetField, candSubfieldData
50
50
  return true;
51
51
  }
52
52
 
53
+ // Authorized fields: don't add data that in covered by authorization:
54
+ // (Even if, say 100$d exists and is correct, the authorized row does not want it!)
55
+ if (targetField.subfields.some(sf => sf.code === '0') && sourceField && !sourceField.subfields.some(sf => sf.code === '0')) {
56
+ // FIN13 should also remove $t etc work related subfield...
57
+ if (['100', '600', '700', '800'].includes(targetField.tag) && ['a', 'b', 'c', 'd', 'q'].includes(candSubfieldData.code)) {
58
+ return true;
59
+ }
60
+ // X10: Asteri has only $a and $b extensively: 53601 a, 10862 b, 34 d, 16 c, 10 n, 1 t
61
+ if (['110', '610', '710', '810'].includes(targetField.tag) && ['a', 'b'].includes(candSubfieldData.code)) {
62
+ return true;
63
+ }
64
+ // X11: 1388 a, 72 d, 63 c, 43 n, 11 e
65
+ if (['111', '611', '711', '811'].includes(targetField.tag) && ['a'].includes(candSubfieldData.code)) {
66
+ return true;
67
+ }
68
+
69
+ if (['130', '630', '730', '830'].includes(targetField.tag) && ['a', 'n', 'p'].includes(candSubfieldData.code)) {
70
+ return true;
71
+ }
72
+
73
+ }
74
+
75
+
53
76
 
54
77
  // Don't add $0 subfields that mean the same even if they look different:
55
78
  const alephIdentifierType = normalizeAs(targetField.tag, candSubfieldData.code);
@@ -75,12 +98,12 @@ function skipNormalizedComparison(tag, subfieldCode, subfieldValue) {
75
98
  return false;
76
99
  }
77
100
 
78
- function mergeOrAddSubfieldNotRequired(targetField, candSubfieldData) {
101
+ function mergeOrAddSubfieldNotRequired(targetField, candSubfieldData, sourceField) {
79
102
  if (catalogingSourceModifyingAgencyCandIsOriginalCatalogingSourceAgencyInTargetField(targetField, candSubfieldData) || dataContainsPrepublicationSubfield(candSubfieldData)) {
80
103
  return true;
81
104
  }
82
105
 
83
- if (mergeOrAddSubfieldNotRequiredSpecialCases(targetField, candSubfieldData)) {
106
+ if (mergeOrAddSubfieldNotRequiredSpecialCases(targetField, candSubfieldData, sourceField)) {
84
107
  return true;
85
108
  }
86
109
 
@@ -151,12 +174,12 @@ function resetPaired880(candFieldPair880, targetField, punctlessCandSubfield) {
151
174
  resetSubfield6Tag(candFieldPair880.subfields[0], targetField.tag);
152
175
  }
153
176
 
154
- export function mergeOrAddSubfield(targetField, candSubfieldData, candFieldPairs880 = []) {
177
+ export function mergeOrAddSubfield(targetField, candSubfieldData, candFieldPairs880 = [], sourceField) {
155
178
 
156
179
  const candSubfieldAsString = `${candSubfieldData.code} ${candSubfieldData.originalValue}`;
157
180
 
158
181
  nvdebug(` Q: mergeOrAddSubfield '${candSubfieldAsString}'\n with field '${fieldToString(targetField)}'?`, debugDev);
159
- if (mergeOrAddSubfieldNotRequired(targetField, candSubfieldData)) {
182
+ if (mergeOrAddSubfieldNotRequired(targetField, candSubfieldData, sourceField)) {
160
183
  nvdebug(` A: No. No need to merge nor to add the subfield '${candSubfieldAsString}'`, debugDev);
161
184
  return;
162
185
  }