@natlibfi/marc-record-validators-melinda 12.0.0-alpha.5 → 12.0.0-alpha.7

package/package.json

@@ -6,16 +6,15 @@
     "name": "The National Library of Finland"
   },
   "keywords": [],
-  "homepage": "https://github.com/natlibfi/marc-record-validators-melinda",
+  "homepage": "https://www.npmjs.com/package/@natlibfi/marc-record-validators-melinda",
   "bugs": {
     "url": "https://github.com/natlibfi/marc-record-validators-melinda/issues"
   },
   "repository": {
-    "type": "git",
-    "url": "git@github.com:natlibfi/marc-record-validators-melinda.git"
+    "url": "https://github.com/NatLibFi/marc-record-validators-melinda"
   },
   "license": "MIT",
-  "version": "12.0.0-alpha.5",
+  "version": "12.0.0-alpha.7",
   "main": "./dist/index.js",
   "publishConfig": {
     "access": "public"
@@ -35,13 +34,13 @@
   },
   "dependencies": {
     "@natlibfi/issn-verify": "^1.0.6",
-    "@natlibfi/marc-record": "^10.0.0-alpha.1",
-    "@natlibfi/marc-record-serializers": "^11.0.0-alpha.2",
-    "@natlibfi/marc-record-validate": "^9.0.0-alpha.1",
-    "@natlibfi/melinda-commons": "^14.0.0-alpha.3",
-    "@natlibfi/sfs-4900": "^2.0.0-alpha.3",
-    "@natlibfi/iso9-1995": "^1.0.0-alpha.2",
-    "@natlibfi/sru-client": "^7.0.0-alpha.3",
+    "@natlibfi/marc-record": "next",
+    "@natlibfi/marc-record-serializers": "next",
+    "@natlibfi/marc-record-validate": "next",
+    "@natlibfi/melinda-commons": "next",
+    "@natlibfi/sfs-4900": "next",
+    "@natlibfi/iso9-1995": "next",
+    "@natlibfi/sru-client": "next",
     "cld3-asm": "^4.0.0",
     "clone": "^2.1.2",
     "debug": "^4.4.3",
@@ -51,11 +50,11 @@
     "xregexp": "^5.1.2"
   },
   "peerDependencies": {
-    "@natlibfi/marc-record-validate": "^9.0.0-alpha.1"
+    "@natlibfi/marc-record-validate": "next"
   },
   "devDependencies": {
-    "@natlibfi/fixugen": "^3.0.0-alpha.6",
-    "@natlibfi/fixura": "^4.0.0-alpha.13",
+    "@natlibfi/fixugen": "next",
+    "@natlibfi/fixura": "next",
     "cross-env": "^10.0.0",
     "esbuild": "^0.25.10",
     "eslint": "^9.36.0",

package/src/ending-punctuation-conf.js

@@ -4,7 +4,8 @@ const finnishTerms = [
   /^(?:kauno|slm|yso)\//u
 ];
 
-const validPuncMarks = '?"-!,)]';
+const validPuncMarks = '?-!.'; // NB! ')' and ']' are only valid for some fields!
+const validQuoteChars = "\"'";
 // Configuration specification
 const confSpec = [
   { // 010-035 EI
@@ -666,4 +667,4 @@ const confSpec = [
   }
 ];
 
-export {finnishTerms, validPuncMarks, confSpec};
+export {finnishTerms, validPuncMarks, validQuoteChars, confSpec};

package/src/ending-punctuation.js

@@ -27,7 +27,7 @@
 */
 
 // Import {validPuncMarks, finnishTerms, confSpec} from './ending-punctuation-conf.js';
-import {validPuncMarks, finnishTerms, confSpec} from './ending-punctuation-conf.js';
+import {validPuncMarks, validQuoteChars, finnishTerms, confSpec} from './ending-punctuation-conf.js';
 import createDebugLogger from 'debug';
 
 const debug = createDebugLogger('@natlibfi/marc-record-validator-melinda/ending-punctuation');
@@ -71,34 +71,65 @@ function validateField(field, linkedTag, fix, message) {
     return subfields.slice(-1).shift();
   }
 
+  function getDefaultPuncMarks(tag) {
+    if (tag.match(/^[1678](?:00|10|11|30)/u) || tag === '740') { // As defined in Loppupisteohje
+      return `${validPuncMarks})`;
+    }
+    // We don't want ').' here either. However, Loppupisteohje is a bit iffy here.
+    // BUG: Note that our generic rules will remove dot from Finnish terms such as https://finto.fi/yso-aika/fi/page/p1069910600
+    if (['647', '648', '650', '651', '654', '655', '656', '657', '658', '662'].includes(tag)) {
+       return `${validPuncMarks})`;
+    }
+    if(['260'].includes(tag)) {
+      return `${validPuncMarks})]`;
+    }
+    return validPuncMarks;
+  }
+
   // Punctuation rule (Boolean), Check no ending dot strict (Boolean)
   function normalPuncRules(subfield, punc, tag, checkEnd, overrideValidPuncMarks) {
-    const puncMarks = overrideValidPuncMarks || validPuncMarks;
-    const lastPuncMark = puncMarks.includes(subfield.value.slice(-1)); // If string ends to punctuation char
-    const lastPuncDot = '.'.includes(subfield.value.slice(-1)); // If string ends to dot
+    const puncMarks = overrideValidPuncMarks || getDefaultPuncMarks(tag);
+    const lastChar = subfield.value.slice(-1);
+    const lastPuncMark = puncMarks.includes(lastChar); // If string ends to punctuation char
+    const lastPuncDot = '.'.includes(lastChar); // If string ends to dot
+    const penultimateCharacter = subfield.value.length >= 2 ? subfield.value.charAt(subfield.value.length - 2) : undefined;
+    const antePenultimateCharacter = subfield.value.length >= 3 ? subfield.value.charAt(subfield.value.length - 3) : undefined;
 
-    // Last char should be punc, but its not one of marks nor dot
+
+    // Last char should be punc, but it's not one of listed punctuation marks nor dot
     if (punc && !(lastPuncMark || lastPuncDot)) {
-      // Console.log("1. Invalid punctuation - missing")
-      message.message.push(`Field ${tag} has invalid ending punctuation`);
-      if (fix) {
-        subfield.value = subfield.value.concat('.');
-        message.fix.push(`Field ${tag} - Added punctuation to $${subfield.code}`);
+      console.log(puncMarks)
+      if (penultimateCharacter && validQuoteChars.includes(lastChar) && puncMarks.includes(penultimateCharacter)) {
+        // Exception: do nothing! Ending in punc+quote combo is all right, and does not imply a missing punc
+      }
+      else {
+        // Console.log("1. Invalid punctuation - missing")
+        message.message.push(`Field ${tag} requires ending punctuation, ends in '${lastChar}'`);
+        if (fix) {
+          subfield.value = subfield.value.concat('.');
+          message.fix.push(`Field ${tag} - Added punctuation to $${subfield.code}`);
+        }
       }
 
       // Last char is dot, but previous char is one of punc marks, like 'Question?.'
-    } else if (lastPuncDot && subfield.value.length > 1 && puncMarks.includes(subfield.value.charAt(subfield.value.length - 2))) {
+    } else if (lastPuncDot && penultimateCharacter && puncMarks.includes(penultimateCharacter)) {
       // Console.log("2. Invalid punctuation - duplicate, like '?.'")
-      message.message.push(`Field ${tag} has invalid ending punctuation`);
+      message.message.push(`Field ${tag} has an extra dot after '${penultimateCharacter}'`);
       if (fix) {
         subfield.value = subfield.value.slice(0, -1);
-        message.fix.push(`Field ${tag} - Removed double punctuation from $${subfield.code}`);
+        message.fix.push(`Field ${tag} - Removed dot after punctuation from $${subfield.code}`);
+      }
+      // Last char is dot, but previous two cars are punc+quote, like 'Lorum "Ipsum.".'
+    } else if (lastPuncDot && antePenultimateCharacter && validQuoteChars.includes(penultimateCharacter) && puncMarks.includes(antePenultimateCharacter)) {
+      message.message.push(`Field ${tag} has an extra dot in '${antePenultimateCharacter}${penultimateCharacter}${lastChar}'`);
+      if (fix) {
+        subfield.value = subfield.value.slice(0, -1);
+        message.fix.push(`Field ${tag} - Removed '${lastChar}' after '${antePenultimateCharacter}${penultimateCharacter}'`);
       }
-
       // Last char shouldn't be dot !! This is behind checkEnd boolean, because of dots at end of abbreviations, so this is checked only in special cases !!//
     } else if (checkEnd && (!punc && lastPuncDot)) {
       // Console.log("3. Invalid punctuation - Shouldn't be dot, is")
-      message.message.push(`Field ${tag} has invalid ending punctuation`);
+      message.message.push(`Field ${tag} has unwanted ending punctuation '${lastChar}'`);
       if (fix) {
         subfield.value = subfield.value.slice(0, -1);
         message.fix.push(`Field ${tag} - Removed punctuation from $${subfield.code}`);
@@ -136,7 +167,7 @@ function validateField(field, linkedTag, fix, message) {
         if (res.special.ifInd2 && res.special.ifInd2.includes(field.ind2)) {
           normalPuncRules(lastSubField, res.special.ifBoth, tag, true, res.special.ifLastCharNot);
 
-          // Matches execption to special rule, noPuncIfInd2 (likely with value 4, that indicates copyright mark)
+          // Matches exception to special rule, noPuncIfInd2 (likely with value 4, that indicates copyright mark)
         } else if (res.special.noPuncIfInd2 && field.ind2 && res.special.noPuncIfInd2.includes(field.ind2)) {
           normalPuncRules(lastSubField, !res.special.ifBoth, tag, true, res.special.ifLastCharNot);
 
@@ -199,6 +230,15 @@ function validateField(field, linkedTag, fix, message) {
 
       validateField(field, linkedTag, fix, message);
     }
+    // fallback
+    else {
+      debug(`special is definedm but no rule applies`);
+      const lastSubField = findLastSubfield(field);
+
+      if (lastSubField) {
+        normalPuncRules(lastSubField, res.punc, field.tag, false, false, fix, message);
+      }
+    }
   }
 
   let res = null;