extract vat matcher for Switzerland (CH)

- adjust number separation rule - edit comments in test
validatorjs · Mar 21, 2023 · 823323e · 823323e
1 parent c3a4336
commit 823323e
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 17 deletions.
diff --git a/src/lib/isVAT.js b/src/lib/isVAT.js
@@ -1,6 +1,21 @@
 import assertString from './util/assertString';
 import * as algorithms from './util/algorithms';
 
+const CH = (str) => {
+  // @see {@link https://www.ech.ch/de/ech/ech-0097/5.2.0}
+  const hasValidCheckNumber = (digits) => {
+    const lastDigit = digits.pop(); // used as check number
+    const weights = [5, 4, 3, 2, 7, 6, 5, 4];
+    const calculatedCheckNumber = (11 - (digits.reduce((acc, el, idx) =>
+      acc + (el * weights[idx]), 0) % 11)) % 11;
+
+    return lastDigit === calculatedCheckNumber;
+  };
+
+  // @see {@link https://www.estv.admin.ch/estv/de/home/mehrwertsteuer/uid/mwst-uid-nummer.html}
+  return /^(CHE[- ]?)?(\d{9}|(\d{3}\.\d{3}\.\d{3})|(\d{3} \d{3} \d{3})) ?(TVA|MWST|IVA)?$/.test(str) && hasValidCheckNumber((str.match(/\d/g).map(el => +el)));
+};
+
 const PT = (str) => {
   const match = str.match(/^(PT)?(\d{9})$/);
   if (!match) {
@@ -69,20 +84,7 @@ export const vatMatchers = {
   SM: str => /^(SM)?\d{5}$/.test(str),
   SA: str => /^(SA)?\d{15}$/.test(str),
   RS: str => /^(RS)?\d{9}$/.test(str),
-  CH: (str) => {
-    // @see {@link https://www.ech.ch/de/ech/ech-0097/5.2.0}
-    const hasValidCheckNumber = (digits) => {
-      const lastDigit = digits.pop(); // used as check number
-      const weights = [5, 4, 3, 2, 7, 6, 5, 4];
-      const calculatedCheckNumber = (11 - (digits.reduce((acc, el, idx) =>
-        acc + (el * weights[idx]), 0) % 11)) % 11;
-
-      return lastDigit === calculatedCheckNumber;
-    };
-
-    // @see {@link https://www.estv.admin.ch/estv/de/home/mehrwertsteuer/uid/mwst-uid-nummer.html}
-    return /^(CHE[- ]?)?(\d{9}|(\d{3}[\. ]\d{3}[\. ]\d{3})) ?(TVA|MWST|IVA)?$/.test(str) && hasValidCheckNumber((str.match(/\d/g).map(el => +el)));
-  },
+  CH,
   TR: str => /^(TR)?\d{10}$/.test(str),
   UA: str => /^(UA)?\d{12}$/.test(str),
   GB: str => /^GB((\d{3} \d{4} ([0-8][0-9]|9[0-6]))|(\d{9} \d{3})|(((GD[0-4])|(HA[5-9]))[0-9]{2}))$/.test(str),

diff --git a/test/validators.test.js b/test/validators.test.js
@@ -13885,10 +13885,10 @@ describe('Validators', () => {
       invalid: [
         'CH-116.281.710 MWST', // invalid prefix (should be CHE)
         'CHE-116.281 MWST', // invalid number of digits (should be 9)
-        'CHE-123.456.789 MWST', // invalid last digits (should match the calculated check-number 8)
-        'CHE-123.356.780 MWST', // invalid check-number (there are no swiss UIDs for the calculated check number 10)
+        'CHE-123.456.789 MWST', // invalid last digit (should match the calculated check-number 8)
+        'CHE-123.356.780 MWST', // invalid check-number (there are no swiss UIDs with the calculated check number 10)
         'CH-116.281.710 VAT', // invalid suffix (should be MWST, IVA or TVA)
-        'CHE-116/281/710 IVA', // invalid number separator (should be dot or space or empty-string)
+        'CHE-116/281/710 IVA', // invalid number separators (should be all dots or all spaces)
       ],
     });
     test({