@natlibfi/marc-record-validators-melinda 11.6.0 → 11.6.1

package/dist/subfieldValueNormalizations.js

@@ -148,6 +148,9 @@ function normalizeSubfieldValues(field, catLang) {
     return field;
   }
   field.subfields.forEach((subfield, index) => {
+    if (!field.subfields[index].value) {
+      return;
+    }
     field.subfields[index].value = getNormalizedValue(subfield, field, catLang); // eslint-disable-line functional/immutable-data
   });
   return field;

package/dist/subfieldValueNormalizations.js.map

@@ -1 +1 @@
-{"version":3,"file":"subfieldValueNormalizations.js","names":["_clone","_interopRequireDefault","require","_utils","_punctuation","_subfield6Utils","e","__esModule","default","_default","description","validate","fix","record","catLang","getCatalogingLanguage","res","message","valid","fields","forEach","field","normalizeSubfieldValues","validateField","length","subfields","orig","fieldToString","normalizedField","clone","mod","push","handleInitials","value","subfieldCode","ind1","includes","tag","fieldHasSubfield","i","initialsInRow","replace","str","match","getNormalizedValue","subfield","handleFikt","uppercaseLanguage","handleMovies","code","wrapFiktiivinenHahmo","expandFikt","relevantTags","targetTag","tagForUppercasing","newValue","toUpperCase","slice","fieldFixPunctuation","fieldGetUnambiguousTag","index"],"sources":["../src/subfieldValueNormalizations.js"],"sourcesContent":["//import createDebugLogger from 'debug';\nimport clone from 'clone';\nimport {fieldHasSubfield, fieldToString, getCatalogingLanguage} from './utils';\nimport {fieldFixPunctuation} from './punctuation2';\nimport {fieldGetUnambiguousTag} from './subfield6Utils';\n\n// NB! You should probably run punctuation fixes after this validator!\n\n// Author(s): Nicholas Volk\nexport default function () {\n\n  return {\n    description: 'Fix various subfield internal values',\n    validate, fix\n  };\n\n  function fix(record) {\n    const catLang = getCatalogingLanguage(record, 'fin');\n    const res = {message: [], fix: [], valid: true};\n\n    record.fields.forEach(field => {\n      normalizeSubfieldValues(field, catLang);\n    });\n\n    // message.valid = !(message.message.length >= 1); // eslint-disable-line functional/immutable-data\n    return res;\n  }\n\n  function validate(record) {\n    const catLang = getCatalogingLanguage(record, 'fin');\n    const res = {message: []};\n\n    record.fields.forEach(field => {\n      validateField(field, res, catLang);\n    });\n\n    res.valid = !(res.message.length >= 1); // eslint-disable-line functional/immutable-data\n    return res;\n  }\n\n  function validateField(field, res, catLang) {\n    if (!field.subfields) {\n      return;\n    }\n    const orig = fieldToString(field);\n\n    const normalizedField = normalizeSubfieldValues(clone(field), catLang);\n    const mod = fieldToString(normalizedField);\n    if (orig !== mod) { // Fail as the input is \"broken\"/\"crap\"/sumthing\n      res.message.push(`'${orig}' requires subfield internal mods/normalization`); // eslint-disable-line functional/immutable-data\n      return;\n    }\n    return;\n  }\n}\n\n\nfunction handleInitials(value, subfieldCode, field) {\n  // MRA-267/273\n  /* eslint-disable */\n  if (field.ind1 === '1' && subfieldCode === 'a' && ['100', '600', '700', '800'].includes(field.tag) && !fieldHasSubfield(field, '0')) {\n    // Fix MRA-267/273 (partial): Handle the most common case(s). (And extend them rules later on if the need arises):\n    // No longest initial sequence I've seen is six (in a Sri Lankan name).\n    for (var i=0; i < 6 && initialsInRow(value); i++) {\n      // NB: Regexp has ','. Everything before it belongs to the surname. Everything after it is free game.\n      value = value.replace(/(,.*) ([A-Z]|Å|Ö|Ö)\\.([A-Z]|Å|Ö|Ö)/u, '$1 $2. $3');\n    }\n  }\n\n  return value;\n\n  /* eslint-enable */\n  function initialsInRow(str) {\n    // initial space confirms us that it's an initial\n    return str.match(/ (?:[A-Z]|Å|Ä|Ö)\\.(?:[A-Z]|Å|Ä|Ö)/u);\n  }\n}\n\nfunction getNormalizedValue(subfield, field, catLang) {\n  return handleFikt(uppercaseLanguage(handleMovies(handleInitials(subfield.value, subfield.code, field))));\n\n  function handleFikt(value) {\n    if (subfield.code !== 'c' || field.tag !== '600') {\n      return value;\n    }\n\n    return wrapFiktiivinenHahmo(expandFikt(value));\n\n    function wrapFiktiivinenHahmo(value) {\n      if (value.includes('(')) { // Some kind of parentheses already found -> nothing to do here\n        return value;\n      }\n      if (value.match(/^(?:fiktiivinen hahmo|fiktiv gestalt|fiktiivinen yhteisö)[,.]?$/u)) {\n        // Hope that some other module handles punctuation, if needed:\n        return `(${value.replace(/[.,]$/u, '')})`;\n      }\n      return value;\n    }\n\n    // wrap text around parentheses\n    function expandFikt(value) {\n      if (field.ind1 === '3') { // Not handling \"fiktiivinen yhteisö\" at the moment\n        return value;\n      }\n\n      if (value.match(/\\bfikt\\.?(?:$|[,)])/u) && !value.match(/fikt.*fikt/ui)) {\n        // NB! Dot '.' in 'fikt.' might also be punctuation as well. Run punctuation2 fixer after this fixer!\n        if (catLang === 'fin') {\n          return value.replace(/\\bfikt\\./u, 'fiktiivinen hahmo');\n        }\n        if (catLang === 'swe') {\n          return value.replace(/\\bfikt\\./u, 'fiktiv gestalt');\n        }\n      }\n      return value;\n    }\n\n  }\n\n  function handleMovies(value) {\n    if (subfield.code === 'a' && ['130', '630', '730'].includes(field.tag)) {\n      // MRA-614: \"(elokuva, 2000)\" => \"(elokuva : 2000)\"\"\n      return value.replace(/\\((elokuva), (19[0-9][0-9]|20[0-2][0-9])\\)/u, '($1 : $2)'); // eslint-disable-line prefer-named-capture-group\n    }\n    return value;\n  }\n\n\n  function uppercaseLanguage(value) { // Part of MET-549\n    const relevantTags = ['130', '240', '243', '600', '610', '611', '630', '700', '710', '711', '730', '800', '810', '811', '830'];\n\n    if (subfield.code !== 'l') {\n      return value;\n    }\n    const targetTag = tagForUppercasing();\n    if (relevantTags.includes(targetTag)) {\n      const newValue = `${value[0].toUpperCase()}${value.slice(1)}`;\n      if (newValue !== value) {\n        fieldFixPunctuation(field); // Rather hackily try to fix prev punc on the fly\n        return newValue;\n      }\n    }\n\n    function tagForUppercasing() {\n      return field.tag === '880' ? fieldGetUnambiguousTag(field) : field.tag;\n    }\n\n    return value;\n  }\n}\n\nfunction normalizeSubfieldValues(field, catLang) {\n  if (!field.subfields) {\n    return field;\n  }\n  field.subfields.forEach((subfield, index) => {\n    field.subfields[index].value = getNormalizedValue(subfield, field, catLang); // eslint-disable-line functional/immutable-data\n  });\n  return field;\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"subfieldValueNormalizations.js","names":["_clone","_interopRequireDefault","require","_utils","_punctuation","_subfield6Utils","e","__esModule","default","_default","description","validate","fix","record","catLang","getCatalogingLanguage","res","message","valid","fields","forEach","field","normalizeSubfieldValues","validateField","length","subfields","orig","fieldToString","normalizedField","clone","mod","push","handleInitials","value","subfieldCode","ind1","includes","tag","fieldHasSubfield","i","initialsInRow","replace","str","match","getNormalizedValue","subfield","handleFikt","uppercaseLanguage","handleMovies","code","wrapFiktiivinenHahmo","expandFikt","relevantTags","targetTag","tagForUppercasing","newValue","toUpperCase","slice","fieldFixPunctuation","fieldGetUnambiguousTag","index"],"sources":["../src/subfieldValueNormalizations.js"],"sourcesContent":["//import createDebugLogger from 'debug';\nimport clone from 'clone';\nimport {fieldHasSubfield, fieldToString, getCatalogingLanguage} from './utils';\nimport {fieldFixPunctuation} from './punctuation2';\nimport {fieldGetUnambiguousTag} from './subfield6Utils';\n\n// NB! You should probably run punctuation fixes after this validator!\n\n// Author(s): Nicholas Volk\nexport default function () {\n\n  return {\n    description: 'Fix various subfield internal values',\n    validate, fix\n  };\n\n  function fix(record) {\n    const catLang = getCatalogingLanguage(record, 'fin');\n    const res = {message: [], fix: [], valid: true};\n\n    record.fields.forEach(field => {\n      normalizeSubfieldValues(field, catLang);\n    });\n\n    // message.valid = !(message.message.length >= 1); // eslint-disable-line functional/immutable-data\n    return res;\n  }\n\n  function validate(record) {\n    const catLang = getCatalogingLanguage(record, 'fin');\n    const res = {message: []};\n\n    record.fields.forEach(field => {\n      validateField(field, res, catLang);\n    });\n\n    res.valid = !(res.message.length >= 1); // eslint-disable-line functional/immutable-data\n    return res;\n  }\n\n  function validateField(field, res, catLang) {\n    if (!field.subfields) {\n      return;\n    }\n    const orig = fieldToString(field);\n\n    const normalizedField = normalizeSubfieldValues(clone(field), catLang);\n    const mod = fieldToString(normalizedField);\n    if (orig !== mod) { // Fail as the input is \"broken\"/\"crap\"/sumthing\n      res.message.push(`'${orig}' requires subfield internal mods/normalization`); // eslint-disable-line functional/immutable-data\n      return;\n    }\n    return;\n  }\n}\n\n\nfunction handleInitials(value, subfieldCode, field) {\n  // MRA-267/273\n  /* eslint-disable */\n  if (field.ind1 === '1' && subfieldCode === 'a' && ['100', '600', '700', '800'].includes(field.tag) && !fieldHasSubfield(field, '0')) {\n    // Fix MRA-267/273 (partial): Handle the most common case(s). (And extend them rules later on if the need arises):\n    // No longest initial sequence I've seen is six (in a Sri Lankan name).\n    for (var i=0; i < 6 && initialsInRow(value); i++) {\n      // NB: Regexp has ','. Everything before it belongs to the surname. Everything after it is free game.\n      value = value.replace(/(,.*) ([A-Z]|Å|Ö|Ö)\\.([A-Z]|Å|Ö|Ö)/u, '$1 $2. $3');\n    }\n  }\n\n  return value;\n\n  /* eslint-enable */\n  function initialsInRow(str) {\n    // initial space confirms us that it's an initial\n    return str.match(/ (?:[A-Z]|Å|Ä|Ö)\\.(?:[A-Z]|Å|Ä|Ö)/u);\n  }\n}\n\nfunction getNormalizedValue(subfield, field, catLang) {\n  return handleFikt(uppercaseLanguage(handleMovies(handleInitials(subfield.value, subfield.code, field))));\n\n  function handleFikt(value) {\n    if (subfield.code !== 'c' || field.tag !== '600') {\n      return value;\n    }\n\n    return wrapFiktiivinenHahmo(expandFikt(value));\n\n    function wrapFiktiivinenHahmo(value) {\n      if (value.includes('(')) { // Some kind of parentheses already found -> nothing to do here\n        return value;\n      }\n      if (value.match(/^(?:fiktiivinen hahmo|fiktiv gestalt|fiktiivinen yhteisö)[,.]?$/u)) {\n        // Hope that some other module handles punctuation, if needed:\n        return `(${value.replace(/[.,]$/u, '')})`;\n      }\n      return value;\n    }\n\n    // wrap text around parentheses\n    function expandFikt(value) {\n      if (field.ind1 === '3') { // Not handling \"fiktiivinen yhteisö\" at the moment\n        return value;\n      }\n\n      if (value.match(/\\bfikt\\.?(?:$|[,)])/u) && !value.match(/fikt.*fikt/ui)) {\n        // NB! Dot '.' in 'fikt.' might also be punctuation as well. Run punctuation2 fixer after this fixer!\n        if (catLang === 'fin') {\n          return value.replace(/\\bfikt\\./u, 'fiktiivinen hahmo');\n        }\n        if (catLang === 'swe') {\n          return value.replace(/\\bfikt\\./u, 'fiktiv gestalt');\n        }\n      }\n      return value;\n    }\n\n  }\n\n  function handleMovies(value) {\n    if (subfield.code === 'a' && ['130', '630', '730'].includes(field.tag)) {\n      // MRA-614: \"(elokuva, 2000)\" => \"(elokuva : 2000)\"\"\n      return value.replace(/\\((elokuva), (19[0-9][0-9]|20[0-2][0-9])\\)/u, '($1 : $2)'); // eslint-disable-line prefer-named-capture-group\n    }\n    return value;\n  }\n\n\n  function uppercaseLanguage(value) { // Part of MET-549\n    const relevantTags = ['130', '240', '243', '600', '610', '611', '630', '700', '710', '711', '730', '800', '810', '811', '830'];\n\n    if (subfield.code !== 'l') {\n      return value;\n    }\n    const targetTag = tagForUppercasing();\n    if (relevantTags.includes(targetTag)) {\n      const newValue = `${value[0].toUpperCase()}${value.slice(1)}`;\n      if (newValue !== value) {\n        fieldFixPunctuation(field); // Rather hackily try to fix prev punc on the fly\n        return newValue;\n      }\n    }\n\n    function tagForUppercasing() {\n      return field.tag === '880' ? fieldGetUnambiguousTag(field) : field.tag;\n    }\n\n    return value;\n  }\n}\n\nfunction normalizeSubfieldValues(field, catLang) {\n  if (!field.subfields) {\n    return field;\n  }\n  field.subfields.forEach((subfield, index) => {\n    if (!field.subfields[index].value) {\n      return;\n    }\n    field.subfields[index].value = getNormalizedValue(subfield, field, catLang); // eslint-disable-line functional/immutable-data\n  });\n  return field;\n}\n"],"mappings":"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","ignoreList":[]}

package/package.json

@@ -14,7 +14,7 @@
     "url": "git@github.com:natlibfi/marc-record-validators-melinda.git"
   },
   "license": "MIT",
-  "version": "11.6.0",
+  "version": "11.6.1",
   "main": "./dist/index.js",
   "publishConfig": {
     "access": "public"

package/src/subfieldValueNormalizations.js

@@ -154,6 +154,9 @@ function normalizeSubfieldValues(field, catLang) {
     return field;
   }
   field.subfields.forEach((subfield, index) => {
+    if (!field.subfields[index].value) {
+      return;
+    }
     field.subfields[index].value = getNormalizedValue(subfield, field, catLang); // eslint-disable-line functional/immutable-data
   });
   return field;

package/test-fixtures/normalize-subfield-value/01/record.json

@@ -24,8 +24,14 @@
     },
     { "tag": "700", "ind1": "1", "ind2": " ", "subfields": [
       { "code": "a", "value": "Kaikki, O. N. Oikein." }
-      ]
-    },
+    ]},
+    { "tag": "700", "ind1": "1", "ind2": " ", "subfields": [
+      { "code": "a" },
+      { "code": "e", "value": "bugi"}
+    ]},
+    { "tag": "700", "ind1": "1", "ind2": " ", "subfields": [
+      { "code": "a" }
+    ]},
     { "tag": "730", "ind1": " ", "ind2": " ", "subfields": [
       { "code": "a", "value": "Movie (elokuva, 2020)" }
       ]

package/test-fixtures/normalize-subfield-value/02/expectedResult.json

@@ -23,6 +23,13 @@
       { "code": "a", "value": "Sukunimelä, A. B. C." }
       ]
     },
+    { "tag": "700", "ind1": "1", "ind2": " ", "subfields": [
+      { "code": "a" },
+      { "code": "e", "value": "bugi"}
+    ]},
+    { "tag": "700", "ind1": "1", "ind2": " ", "subfields": [
+      { "code": "a" }
+    ]},
     { "tag": "730", "ind1": " ", "ind2": " ", "subfields": [
       { "code": "a", "value": "Movie (elokuva : 2020)" }
       ]

package/test-fixtures/normalize-subfield-value/02/record.json

@@ -22,6 +22,13 @@
       { "code": "a", "value": "Sukunimelä, A.B.C." }
       ]
     },
+    { "tag": "700", "ind1": "1", "ind2": " ", "subfields": [
+      { "code": "a" },
+      { "code": "e", "value": "bugi"}
+    ]},
+    { "tag": "700", "ind1": "1", "ind2": " ", "subfields": [
+      { "code": "a" }
+    ]},
     { "tag": "730", "ind1": " ", "ind2": " ", "subfields": [
       { "code": "a", "value": "Movie (elokuva, 2020)" }
       ]