Change regex schema for isValidSwissIbanNumber

Author: dom-baur

src/lib/swissStandards.spec.ts

@@ -11,8 +11,16 @@ describe("Swiss standards test", () => {
     ["CH93 0000 0000 0000 0000 1", false],
     ["ch93 0076 2011 6238 5295 7", false],
     ["DE93 0076 2011 6238 5295 7", false],
-  ])("check if this swiss IBAN is valid or not", (unformattedIbanNumber, expected) => {
-    expect(isValidSwissIbanNumber(unformattedIbanNumber)).toBe(expected);
+  ])("check if this swiss IBAN is valid or not", (iBanNumberToCheck, expected) => {
+    expect(isValidSwissIbanNumber(iBanNumberToCheck)).toBe(expected);
+  });
+
+  test.each([
+    [null as unknown as string, false],
+    [undefined as unknown as string, false],
+    ["CH35 0023 0230 1234 5601 X", true],
+  ])("check if this siwss IBAN with letters is valid or not", (iBanNumberToCheck, expected) => {
+    expect(isValidSwissIbanNumber(iBanNumberToCheck)).toBe(expected);
   });
 
   test.each([
@@ -26,7 +34,7 @@ describe("Swiss standards test", () => {
     ["756.1234.5678.91", false],
     ["test756.9217.0769.85", false],
     ["7.56..9217...0769.85", false],
-  ])("check if the social insurance number is valid or not", (ahvNumber, expected) => {
-    expect(isValidSwissSocialInsuranceNumber(ahvNumber)).toBe(expected);
+  ])("check if the social insurance number is valid or not", (socialInsuranceNumberToCheck, expected) => {
+    expect(isValidSwissSocialInsuranceNumber(socialInsuranceNumberToCheck)).toBe(expected);
   });
 });

src/lib/swissStandards.ts

@@ -16,9 +16,9 @@ export function isValidSwissIbanNumber(ibanNumber: string): boolean {
 
   // 2. Define allowed strict formats
   //    - with spaces: "CHXX XXXX XXXX XXXX XXXX X"
-  const compactIbanNumberWithWhiteSpaces = new RegExp(/^CH\d{2}(?: \d{4}){4} \d{1}$/);
+  const compactIbanNumberWithWhiteSpaces = new RegExp(/^CH\d{2}(?:\s[A-Z0-9]{4}){4}\s[A-Z0-9]{1}$/);
   //    - without spaces: "CHXXXXXXXXXXXXXXXXXXX"
-  const compactIbanNumberWithoutWhiteSpaces = new RegExp(/^CH\d{19}$/);
+  const compactIbanNumberWithoutWhiteSpaces = new RegExp(/^CH\d{2}[A-Z0-9]{17}$/);
 
   // 3. Check if input matches one of the allowed formats
   if (!compactIbanNumberWithWhiteSpaces.test(ibanNumber) && !compactIbanNumberWithoutWhiteSpaces.test(ibanNumber)) {