test: update tests tckt-363

packages/forms/src/error.ts

@@ -1,10 +1,8 @@
 type FormErrorType = 'required' | 'custom';
 
-export type FormError =
-  | {
-      type?: FormErrorType;
-      message?: string;
-    }
-  | undefined;
+export type FormError = {
+  type: FormErrorType;
+  message?: string;
+};
 
 export type FormErrors = Record<string, FormError>;

packages/forms/src/pattern.ts

@@ -146,7 +146,7 @@ const aggregateValuesByPrefix = (
   return aggregatedValues;
 };
 
-export const validatePatternAndChildren = (
+export const aggregatePatternSessionValues = (
   config: FormConfig,
   form: Blueprint,
   patternConfig: PatternConfig,
@@ -155,7 +155,7 @@ export const validatePatternAndChildren = (
   result: {
     values: Record<PatternId, PatternValue>;
     errors: Record<PatternId, FormError>;
-  } = { values: {}, errors: {} }
+  }
 ) => {
   const aggregatedValues = aggregateValuesByPrefix(values);
 
@@ -165,15 +165,15 @@ export const validatePatternAndChildren = (
 
     if (parseResult.success) {
       result.values[pattern.id] = parseResult.data;
-      result.errors[pattern.id] = undefined;
+      delete result.errors[pattern.id];
     } else {
       result.values[pattern.id] = values[pattern.id];
       result.errors[pattern.id] = parseResult.error;
     }
   }
   for (const child of patternConfig.getChildren(pattern, form.patterns)) {
     const childPatternConfig = getPatternConfig(config, child.type);
-    validatePatternAndChildren(
+    aggregatePatternSessionValues(
       config,
       form,
       childPatternConfig,

packages/forms/src/patterns/page-set/submit.test.ts

@@ -23,17 +23,15 @@ describe('Page-set submission', () => {
         session: {
           ...session,
           data: {
-            errors: {
-              'input-1': undefined,
-            },
+            errors: {},
             values: {
               'input-1': 'test',
             },
           },
           route: {
             url: '#',
             params: {
-              page: '0',
+              page: '1',
             },
           },
           form: session.form,

packages/forms/src/patterns/page-set/submit.ts

@@ -3,8 +3,8 @@ import { failure, success } from '@atj/common';
 import {
   getPatternConfig,
   getPatternSafely,
-  validatePatternAndChildren,
-} from '../../pattern';
+  aggregatePatternSessionValues,
+} from '../../pattern.js';
 import { type FormSession } from '../../session';
 import { type SubmitHandler } from '../../submission';
 import { type PagePattern } from '../page/config';
@@ -35,12 +35,16 @@ export const submitPage: SubmitHandler<PageSetPattern> = async (
     return failure(pagePattern.error);
   }
 
-  const result = validatePatternAndChildren(
+  const result = aggregatePatternSessionValues(
     config,
     opts.session.form,
     pagePatternConfig,
     pagePattern.data,
-    opts.data
+    opts.data,
+    {
+      values: { ...opts.session.data.values },
+      errors: { ...opts.session.data.errors },
+    }
   );
 
   // Increment the page number if there are no errors and this isn't the last page.
@@ -53,17 +57,7 @@ export const submitPage: SubmitHandler<PageSetPattern> = async (
   return success({
     session: {
       ...opts.session,
-      data: {
-        ...opts.session.data,
-        values: {
-          ...opts.session.data.values,
-          ...result.values,
-        },
-        errors: {
-          ...opts.session.data.errors,
-          ...result.errors,
-        },
-      },
+      data: result,
       route: opts.session.route
         ? {
             ...opts.session.route,

packages/forms/src/patterns/phone-number/phone-number.test.ts

@@ -18,7 +18,11 @@ describe('PhoneNumberPattern tests', () => {
       const invalidInput = '123456abc';
 
       expect(schema.safeParse(validInput).success).toBe(true);
-      expect(schema.safeParse(invalidInput).success).toBe(false);
+      const invalidResult = schema.safeParse(invalidInput);
+      expect(invalidResult.success).toBe(false);
+      expect(invalidResult.error?.issues[0].message).toBe(
+        'Phone number may only contain digits, spaces, parentheses, hyphens, and periods.'
+      );
     });
 
     it('should create schema for optional phone input', () => {
@@ -30,9 +34,16 @@ describe('PhoneNumberPattern tests', () => {
       const schema = createPhoneSchema(data);
       const validInput = '+12223334444';
       const emptyInput = '';
+      const invalidInput = '123456abc';
 
       expect(schema.safeParse(validInput).success).toBe(true);
       expect(schema.safeParse(emptyInput).success).toBe(true);
+
+      const invalidResult = schema.safeParse(invalidInput);
+      expect(invalidResult.success).toBe(false);
+      expect(invalidResult.error?.issues[0].message).toBe(
+        'Phone number may only contain digits, spaces, parentheses, hyphens, and periods.'
+      );
     });
 
     it('should fail with less than 10 digits', () => {
@@ -44,7 +55,11 @@ describe('PhoneNumberPattern tests', () => {
       const schema = createPhoneSchema(data);
       const shortInput = '123456789';
 
-      expect(schema.safeParse(shortInput).success).toBe(false);
+      const shortInputResult = schema.safeParse(shortInput);
+      expect(shortInputResult.success).toBe(false);
+      expect(shortInputResult.error?.issues[0].message).toBe(
+        'Phone number must contain at least 10 digits'
+      );
     });
   });
 
@@ -88,6 +103,9 @@ describe('PhoneNumberPattern tests', () => {
       const result = phoneNumberConfig.parseUserInput(pattern, invalidInput);
       if (!result.success) {
         expect(result.error).toBeDefined();
+        expect(result.error?.message).toContain(
+          'Phone number may only contain digits, spaces, parentheses, hyphens, and periods.'
+        );
       } else {
         expect.fail('Unexpected validation success');
       }

packages/forms/src/patterns/select-dropdown/select-dropdown.test.ts

@@ -79,7 +79,7 @@ describe('SelectDropdownPattern tests', () => {
       if (result.success) {
         expect(result.data).toBe('value1');
       } else {
-        throw new Error('Unexpected validation failure');
+        expect.fail('Unexpected validation failure');
       }
     });
 
@@ -105,11 +105,11 @@ describe('SelectDropdownPattern tests', () => {
       console.log('Test parse result (error case):', result);
       if (!result.success) {
         expect(result.error).toBeDefined();
-        expect(result.error.message).toBe(
+        expect(result.error?.message).toBe(
           "Invalid enum value. Expected 'value1' | 'value2', received 'invalid'"
         );
       } else {
-        throw new Error('Unexpected validation success');
+        expect.fail('Unexpected validation success');
       }
     });
 
@@ -132,7 +132,7 @@ describe('SelectDropdownPattern tests', () => {
         expect(result.data.required).toBe(true);
         expect(result.data.options.length).toBe(2);
       } else {
-        throw new Error('Unexpected validation failure');
+        expect.fail('Unexpected validation failure');
       }
     });
 
@@ -150,7 +150,7 @@ describe('SelectDropdownPattern tests', () => {
       if (!result.success) {
         expect(result.error).toBeDefined();
       } else {
-        throw new Error('Unexpected validation success');
+        expect.fail('Unexpected validation success');
       }
     });
   });

packages/forms/src/services/submit-form.test.ts

@@ -262,16 +262,14 @@ describe('multi-page form', () => {
           ...session,
           data: {
             attachments: undefined,
-            errors: {
-              'element-1': undefined,
-            },
+            errors: {},
             values: {
               'element-1': 'test',
             },
           },
           route: {
             params: {
-              page: '0',
+              page: '1',
             },
             url: '#',
           },