chore: rename-policy-to-validation

Author: ryanbas21

e2e/davinci-app/components/password.ts

@@ -36,12 +36,12 @@ export default function passwordComponent(
   formEl?.appendChild(input);
 
   if (collector.type === 'ValidatedPasswordCollector') {
-    const passwordPolicy = collector.output.passwordPolicy;
+    const validation = collector.input.validation;
     const requirementsList = document.createElement('ul');
     requirementsList.className = 'password-requirements';
 
-    if (passwordPolicy.length) {
-      const { min, max } = passwordPolicy.length;
+    if (validation.length) {
+      const { min, max } = validation.length;
       let lengthMessage: string | null = null;
       if (min != null && max != null) {
         lengthMessage = `${min}–${max} characters`;
@@ -57,8 +57,8 @@ export default function passwordComponent(
       }
     }
 
-    if (passwordPolicy.minCharacters) {
-      for (const [charset, count] of Object.entries(passwordPolicy.minCharacters)) {
+    if (validation.minCharacters) {
+      for (const [charset, count] of Object.entries(validation.minCharacters)) {
         const li = document.createElement('li');
         if (UPPERCASE_RE.test(charset)) {
           li.textContent = `At least ${count} uppercase letter(s)`;

packages/davinci-client/src/lib/collector.types.test-d.ts

@@ -74,13 +74,13 @@ describe('Collector Types', () => {
       expectTypeOf<ValidatedPasswordCollector['output']>()
         .toHaveProperty('verify')
         .toEqualTypeOf<boolean>();
-      expectTypeOf<ValidatedPasswordCollector['output']>()
-        .toHaveProperty('passwordPolicy')
+      expectTypeOf<ValidatedPasswordCollector['input']>()
+        .toHaveProperty('validation')
         .toEqualTypeOf<PasswordPolicy>();
     });
 
-    it('should validate PasswordCollector output does NOT have passwordPolicy', () => {
-      expectTypeOf<PasswordCollector['output']>().not.toHaveProperty('passwordPolicy');
+    it('should validate PasswordCollector input does NOT have validation', () => {
+      expectTypeOf<PasswordCollector['input']>().not.toHaveProperty('validation');
     });
 
     it('should validate SingleCollector structure', () => {
@@ -310,13 +310,13 @@ describe('Collector Types', () => {
           key: '',
           value: '',
           type: '',
+          validation: {},
         },
         output: {
           key: '',
           label: '',
           type: '',
           verify: false,
-          passwordPolicy: {},
         },
       };
 

packages/davinci-client/src/lib/collector.types.ts

@@ -217,13 +217,13 @@ export interface ValidatedPasswordCollector {
     key: string;
     value: string | number | boolean;
     type: string;
+    validation: PasswordPolicy;
   };
   output: {
     key: string;
     label: string;
     type: string;
     verify: boolean;
-    passwordPolicy: PasswordPolicy;
   };
 }
 export type TextCollector = SingleValueCollectorWithValue<'TextCollector'>;

packages/davinci-client/src/lib/collector.utils.test.ts

@@ -1346,13 +1346,13 @@ describe('returnValidatedPasswordCollector', () => {
         key: 'user.password',
         value: '',
         type: 'PASSWORD_VERIFY',
+        validation: mockPasswordPolicy,
       },
       output: {
         key: 'user.password',
         label: 'Password',
         type: 'PASSWORD_VERIFY',
         verify: false,
-        passwordPolicy: mockPasswordPolicy,
       },
     });
   });
@@ -1384,7 +1384,7 @@ describe('returnValidatedPasswordCollector', () => {
 
     const result = returnValidatedPasswordCollector(field, 1);
 
-    expect(result.output.passwordPolicy).toEqual({});
+    expect(result.input.validation).toEqual({});
     expect(result.output.verify).toBe(false);
   });
 

packages/davinci-client/src/lib/collector.utils.ts

@@ -192,7 +192,7 @@ export function returnSingleValueCollector<
     // Reducer routes by `field.type === 'PASSWORD_VERIFY'`, so a policy may or may not be
     // present. Fallback to an empty object keeps the factory total; the policy validator
     // treats an empty policy as no rules.
-    const passwordPolicy =
+    const validation =
       'passwordPolicy' in field && field.passwordPolicy ? field.passwordPolicy : {};
     const verify = 'verify' in field ? field.verify === true : false;
     return {
@@ -205,13 +205,13 @@ export function returnSingleValueCollector<
         key: field.key,
         value: '',
         type: field.type,
+        validation,
       },
       output: {
         key: field.key,
         label: field.label,
         type: field.type,
         verify,
-        passwordPolicy,
       },
     } as InferSingleValueCollectorType<CollectorType>;
   } else if (collectorType === 'SingleSelectCollector') {

packages/davinci-client/src/lib/node.reducer.test.ts

@@ -1476,13 +1476,13 @@ describe('PASSWORD_VERIFY with password policy', () => {
           key: 'user.password',
           value: '',
           type: 'PASSWORD_VERIFY',
+          validation: mockPasswordPolicy,
         },
         output: {
           key: 'user.password',
           label: 'Password',
           type: 'PASSWORD_VERIFY',
           verify: false,
-          passwordPolicy: mockPasswordPolicy,
         },
       } satisfies ValidatedPasswordCollector,
     ]);
@@ -1504,7 +1504,7 @@ describe('PASSWORD_VERIFY with password policy', () => {
     };
     const result = nodeCollectorReducer(undefined, action);
     expect(result[0].type).toBe('ValidatedPasswordCollector');
-    expect((result[0] as ValidatedPasswordCollector).output.passwordPolicy).toEqual({});
+    expect((result[0] as ValidatedPasswordCollector).input.validation).toEqual({});
   });
 
   it('should produce ValidatedPasswordCollector when a PASSWORD field has a policy', () => {
@@ -1524,9 +1524,7 @@ describe('PASSWORD_VERIFY with password policy', () => {
     };
     const result = nodeCollectorReducer(undefined, action);
     expect(result[0].type).toBe('ValidatedPasswordCollector');
-    expect((result[0] as ValidatedPasswordCollector).output.passwordPolicy).toEqual(
-      mockPasswordPolicy,
-    );
+    expect((result[0] as ValidatedPasswordCollector).input.validation).toEqual(mockPasswordPolicy);
   });
 
   it('should propagate verify: true from the field onto PasswordCollector', () => {
@@ -1604,7 +1602,8 @@ describe('PASSWORD_VERIFY with password policy', () => {
     };
     const result = nodeCollectorReducer(undefined, action);
     expect(result[0].type).toBe('PasswordCollector');
-    expect(result[0].output).not.toHaveProperty('passwordPolicy');
+    expect((result[0] as PasswordCollector).output).not.toHaveProperty('passwordPolicy');
+    expect((result[0] as PasswordCollector).input).not.toHaveProperty('validation');
   });
 });
 

packages/davinci-client/src/lib/password-policy.rules.ts

@@ -89,7 +89,7 @@ const passwordPolicyRules: readonly PasswordPolicyRule[] = [
 export function returnPasswordPolicyValidator(
   collector: ValidatedPasswordCollector,
 ): (value: string) => string[] {
-  const policy = collector.output.passwordPolicy;
+  const policy = collector.input.validation;
   return (value: string) =>
     policy
       ? pipe(