more tests

Author: alexanbj

packages/validation/README.md

@@ -40,7 +40,6 @@ The methods are "strict" by default, meaning no formatting characters in the inp
 This is preferrable, for instance when doing server-side validation, where the input is often expected to be a "clean" value.
 
 If you want to allow formatting characters in the input, you can pass `allowFormatting: true` in the options object to the method.
-Note that this currently allows any formatting characters, not just the just the "expected" ones for the input type.
 
 
 ```js

packages/validation/src/no.ts

@@ -113,11 +113,7 @@ type NationalIdentityNumberOptions = ValidatorOptions;
  *
  * @example
  * ```
- * // Fødselsnummer
- * validatePersonalIdentityNumber('21075417753') // => true
- *
- * // D-nummer
- * validatePersonalIdentityNumber('53097248016') // => true
+ * validatePersonalIdentityNumber('DDMMYYXXXXX') // => true
  * ```
  */
 export function validateNationalIdentityNumber(

packages/validation/src/se.ts

@@ -85,8 +85,8 @@ export function validateOrganizationNumber(
 }
 
 type NationalIdentityNumberFormat = 'short' | 'long';
-type NationalIdenityNumberOptions = ValidatorOptions & {
-  /** By default, both formats are allowed */
+type NationalIdentityNumberOptions = ValidatorOptions & {
+  /** Specify this if you want to format to be only long (12 digits) or short (10 digits). By default, both formats are allowed */
   format?: NationalIdentityNumberFormat;
 };
 
@@ -100,16 +100,18 @@ const PERSONNUMMER_FORMAT = /^(\d{2}){0,1}(\d{2})(\d{2})(\d{2})([+-]?)(\d{4})$/;
  *
  * @example
  * ```
- * // Personnummer
- * validatePersonalIdentityNumber('21075417753') // => true
+ * // Short format
+ * validatePersonalIdentityNumber('YYMMDDXXXX') // => true
+ * validatePersonalIdentityNumber('YYMMDD-XXXX', { allowFormatting: true }) // => true
  *
- * // Samordningsnummer
- * validatePersonalIdentityNumber('53097248016') // => true
+ * // Long format
+ * validatePersonalIdentityNumber('YYYYMMDDXXXX') // => true
+ * validatePersonalIdentityNumber('YYYYMMDD-XXXX', { allowFormatting: true }) // => true
  * ```
  */
 export function validateNationalIdentityNumber(
   value: string,
-  options: NationalIdenityNumberOptions = {},
+  options: NationalIdentityNumberOptions = {},
 ): boolean {
   const match = PERSONNUMMER_FORMAT.exec(value);
 
@@ -123,6 +125,10 @@ export function validateNationalIdentityNumber(
     return false;
   }
 
+  if (!centuryStr && options.format === 'long') {
+    return false;
+  }
+
   if (separator && !options.allowFormatting) {
     return false;
   }
@@ -137,13 +143,13 @@ export function validateNationalIdentityNumber(
   let year = 0;
   switch (true) {
     // if we have the long format version, we already have the full year
-    case centuryStr:
+    case !!centuryStr:
       year = Number(centuryStr + yearStr);
       break;
     // otherwise, we can use the separator to determine the century of the personnummer
-    // if the separator is '+', the person is over a 100 years old
-    // we can then get
-    case separator: {
+    // if the separator is '+', we know person is over a 100 years old
+    // we can then calculate the full year
+    case !!separator: {
       const date = new Date();
       const baseYear =
         separator === '+' ? date.getUTCFullYear() - 100 : date.getUTCFullYear();
@@ -170,7 +176,7 @@ export function validateNationalIdentityNumber(
     day = day - 60;
   }
 
-  return isValidDate(year, month, day);
+  return isValidDate(year, month, day, centuryStr || separator);
 }
 
 // just reexport the no method for API feature parity

packages/validation/src/utils.ts

@@ -60,18 +60,24 @@ export function mod10(value: string): boolean {
   return sum % 10 === 0;
 }
 
-export function isValidDate(year: number, month: number, day: number): boolean {
+export function isValidDate(
+  year: number,
+  month: number,
+  day: number,
+  /** Whether to check the year as part of the date validation. */
+  validateYear = false,
+): boolean {
   // biome-ignore lint/style/noParameterAssign: months are zero index 🤷‍♂️
   month -= 1;
 
   // important to use UTC so the user's timezone doesn't affect the validation
   const date = new Date(Date.UTC(year, month, day));
 
+  const validYear = validateYear ? date.getUTCFullYear() === year : true;
+
   return (
     date &&
-    // cannot do this for Norway
-    // maybe do it for Sweden for long format?
-    // date.getUTCFullYear() === year &&
+    validYear &&
     date.getUTCMonth() === month &&
     date.getUTCDate() === day
   );

packages/validation/src/validation.test.ts

@@ -180,50 +180,86 @@ describe('se', () => {
     expect(se.validateObosMembershipNumber(input, options)).toBe(expected);
   });
 
-  test('test with leap years', () => {
-    expect(
-      se.validateOrganizationNumber('000229-3017', { allowFormatting: true }),
-    ).toBe(true);
-
-    expect(
-      se.validateOrganizationNumber('000229-5855', { allowFormatting: true }),
-    ).toBe(true);
-  });
-
-  test('validateNationalIdentityNumber() - validates short format personnummer', () => {
+  test('validateNationalIdentityNumber() - validates short format (YYMMDDXXXX) personnummer', () => {
     for (let i = 0; i < 1000; ++i) {
-      const pnr = swedishPersonNummer({ format: 'short' });
+      const pnrWithSeparator = swedishPersonNummer({ format: 'short' });
+      const pnrWithoutSeparator = pnrWithSeparator.replace(/[-+]/, '');
+
       expect(
-        se.validateNationalIdentityNumber(pnr, {
+        se.validateNationalIdentityNumber(pnrWithSeparator, {
           allowFormatting: true,
           format: 'short',
         }),
-        `${pnr} is valid`,
+        `${pnrWithSeparator} is valid with separator`,
       ).toBe(true);
-    }
-  });
 
-  test('validateNationalIdentityNumber() - validates long format personnummer', () => {
-    for (let i = 0; i < 1000; ++i) {
-      const pnr = swedishPersonNummer({ format: 'long' });
       expect(
-        se.validateNationalIdentityNumber(pnr, { format: 'long' }),
-        `${pnr} is valid`,
+        se.validateNationalIdentityNumber(pnrWithoutSeparator, {
+          format: 'short',
+        }),
+        `${pnrWithSeparator} is valid without separator`,
       ).toBe(true);
     }
   });
 
-  test('validateNationalIdentityNumber() - validates long format personnummer', () => {
+  test('validateNationalIdentityNumber() - validates long format (YYYYMMDDXXXX) personnummer', () => {
     for (let i = 0; i < 1000; ++i) {
       const pnr = swedishPersonNummer({ format: 'long' });
+
       expect(
         se.validateNationalIdentityNumber(pnr, { format: 'long' }),
         `${pnr} is valid`,
       ).toBe(true);
     }
   });
 
-  test.only('validateNationalIdentityNumber() - handles leap years', () => {
+  test('validateNationalIdentityNumber() - handles separator/leap years', () => {
+    // 29th of February is the best way to test whether the separator and long/short handling works correctly.
+    // The 29th of February year 2000 is valid a valid date, while the 29th of February year 1900 is not.
+    // That means we get different results based on the separator.
     expect(se.validateNationalIdentityNumber('0002297422')).toBe(true);
+    expect(
+      se.validateNationalIdentityNumber('000229-7422', {
+        allowFormatting: true,
+      }),
+    ).toBe(true);
+
+    expect(
+      se.validateNationalIdentityNumber('000229+7422', {
+        allowFormatting: true,
+      }),
+    ).toBe(false);
+
+    expect(se.validateNationalIdentityNumber('190002297422')).toBe(false);
+  });
+
+  test('validateNationalIdentityNumber() - validates samordningsnummer', () => {
+    expect(
+      se.validateNationalIdentityNumber('701063-2391', {
+        allowFormatting: true,
+      }),
+    ).toBe(true);
+  });
+
+  test('validateNationalIdentityNumber() - respects format modifier', () => {
+    expect(
+      se.validateNationalIdentityNumber(
+        swedishPersonNummer({ format: 'short' }),
+        {
+          allowFormatting: true,
+          format: 'long',
+        },
+      ),
+    ).toBe(false);
+
+    expect(
+      se.validateNationalIdentityNumber(
+        swedishPersonNummer({ format: 'long' }),
+        {
+          allowFormatting: true,
+          format: 'short',
+        },
+      ),
+    ).toBe(false);
   });
 });