From cea273cfe5b9a6be1f6634d0cc637324513c41af Mon Sep 17 00:00:00 2001
From: TSenter <tyler.senter.427@gmail.com>
Date: Mon, 19 Aug 2024 21:16:16 -0400
Subject: [PATCH 01/13] refactor(validations): Update types to support computed
 properties

---
 packages/ember/src/components/form/index.gts  | 10 ++--
 packages/ember/src/validation/index.ts        |  5 +-
 .../src/validation/{types.d.ts => types.ts}   | 47 ++++++++--------
 packages/ember/src/validation/utils.ts        |  2 +-
 .../ember/src/validation/validators/base.ts   | 53 ++++++++++++++-----
 .../src/validation/validators/confirmation.ts | 22 +++++---
 .../ember/src/validation/validators/custom.ts | 30 +++++++----
 .../src/validation/validators/exclusion.ts    | 10 ++--
 .../src/validation/validators/inclusion.ts    |  8 +--
 .../ember/src/validation/validators/length.ts |  8 +--
 .../ember/src/validation/validators/number.ts |  6 +--
 .../src/validation/validators/presence.ts     |  8 +--
 .../ember/src/validation/validators/range.ts  |  8 +--
 .../ember/src/validation/validators/regex.ts  | 18 +++----
 14 files changed, 136 insertions(+), 99 deletions(-)
 rename packages/ember/src/validation/{types.d.ts => types.ts} (52%)

diff --git a/packages/ember/src/components/form/index.gts b/packages/ember/src/components/form/index.gts
index 10f319c87..18b537a06 100644
--- a/packages/ember/src/components/form/index.gts
+++ b/packages/ember/src/components/form/index.gts
@@ -22,12 +22,12 @@ import type { ComponentLike } from '@glint/template';
 
 type Wrapper = {
   id: string;
-  v: Validator<unknown, unknown, unknown, unknown>;
+  v: Validator<unknown, object, object, object>;
 };
-type ValidatorArray = ValidatorBuilder<unknown, unknown, unknown, unknown>[];
+type ValidatorArray = ValidatorBuilder<unknown, object, object, object>[];
 type ValidatorsObject = Record<
   string,
-  ValidatorBuilder<unknown, unknown, unknown, unknown> | ValidatorArray
+  ValidatorBuilder<unknown, object, object, object> | ValidatorArray
 >;
 
 export interface FormType {
@@ -38,7 +38,7 @@ export interface FormType {
   warningFor(name: string): string | undefined;
   registerBinding(binding: Binding, name?: string): void;
   registerValidator(
-    validator: Validator<unknown, unknown, unknown, unknown>,
+    validator: Validator<unknown, object, object, object>,
     name?: string,
   ): string;
   unregisterValidator(name: string, id: string): void;
@@ -162,7 +162,7 @@ export default class Form extends Component<FormSignature> implements FormType {
 
   @action
   registerValidator(
-    validator: Validator<unknown, unknown, unknown, unknown>,
+    validator: Validator<unknown, object, object, object>,
     name?: string,
   ): string {
     const id = uid();
diff --git a/packages/ember/src/validation/index.ts b/packages/ember/src/validation/index.ts
index 1bd864a8a..579414f31 100644
--- a/packages/ember/src/validation/index.ts
+++ b/packages/ember/src/validation/index.ts
@@ -12,11 +12,8 @@ export { default as RegexValidator } from './validators/regex.ts';
 export { validator } from './utils.ts';
 
 export type {
+  BaseOptions,
   ComputedProperty,
-  DerivedOptions,
-  DerivedOptionValue,
-  Options,
-  OptionValue,
   TranslatableMessage,
   TranslatableOption,
   ValidateFnResponse,
diff --git a/packages/ember/src/validation/types.d.ts b/packages/ember/src/validation/types.ts
similarity index 52%
rename from packages/ember/src/validation/types.d.ts
rename to packages/ember/src/validation/types.ts
index a154b150b..6963af31b 100644
--- a/packages/ember/src/validation/types.d.ts
+++ b/packages/ember/src/validation/types.ts
@@ -1,27 +1,18 @@
-import { Binding } from '../index.ts';
+import type BaseValidator from './validators/base.ts';
+import type { Binding } from '../index.ts';
 
-export type ComputedProperty<Context> = (this: Context) => DerivedOptionValue;
-
-export interface DerivedOptions {
-  [key: string]: DerivedOptionValue;
+export type BaseOptions = {
+  disabled?: boolean;
+  key?: string;
   message?: string;
   isWarning?: boolean;
-}
-export type DerivedOptionValue =
-  | boolean
-  | number
-  | string
-  | Date
-  | undefined
-  | RegExp
-  | unknown[];
+};
 
-export interface Options<Context> {
-  [key: string]: OptionValue<Context>;
-}
-export type OptionValue<Context> =
-  | ComputedProperty<Context, unknown>
-  | DerivedOptionValue;
+export type Computable<Context, Options> = {
+  [key in keyof Options]: ComputedProperty<Context, Options[key]>;
+};
+
+export type ComputedProperty<Context, T> = T | ((this: Context) => T);
 
 export interface TranslatableMessage {
   key: string;
@@ -48,13 +39,23 @@ export interface ValidationResult {
   message?: string;
 }
 
-export type ValidatorBuilder<T, Model, OptionsShape, Context> = (
+export type ValidatorBuilder<
+  T,
+  Model extends object,
+  Context extends object,
+  OptionsShape extends object,
+> = (
   binding: Binding<Model>,
   context: Context,
 ) => Validator<T, Model, OptionsShape, Context>;
-export interface Validator<T, Model, OptionsShape, Context> {
+export interface Validator<
+  T,
+  Model extends object,
+  Context extends object,
+  OptionsShape extends BaseOptions,
+> {
   validate(
-    this: BaseValidator<T, Model, OptionsShape, Context>,
+    this: BaseValidator<T, Model, Context, OptionsShape>,
     value: T,
     options: OptionsShape,
     context: Context | Model,
diff --git a/packages/ember/src/validation/utils.ts b/packages/ember/src/validation/utils.ts
index 16da16c30..cd402c1de 100644
--- a/packages/ember/src/validation/utils.ts
+++ b/packages/ember/src/validation/utils.ts
@@ -37,7 +37,7 @@ type ValidatorFnArgs<T extends ValidatorType = ValidatorType> = T extends T
 
 export function validator<V extends ValidatorType = ValidatorType>(
   ...[type, options]: ValidatorFnArgs<V>
-): ValidatorBuilder<unknown, ContextOf<V>, OptionsOf<V>, ContextOf<V>> {
+): ValidatorBuilder<unknown, ContextOf<V>, ContextOf<V>, OptionsOf<V>> {
   if (type === 'confirmation') {
     return (binding: Binding<ContextOf<V>>, context: ContextOf<V>) =>
       new ConfirmationValidator(
diff --git a/packages/ember/src/validation/validators/base.ts b/packages/ember/src/validation/validators/base.ts
index 1d86cc73d..64a48a5b9 100644
--- a/packages/ember/src/validation/validators/base.ts
+++ b/packages/ember/src/validation/validators/base.ts
@@ -9,8 +9,8 @@ import { cached } from '@glimmer/tracking';
 
 import type { Binding } from '../../';
 import type {
-  DerivedOptions,
-  Options,
+  BaseOptions,
+  Computable,
   TranslatableMessage,
   ValidateFnResponse,
   ValidationResult,
@@ -34,26 +34,27 @@ export function unwrapProxy<T>(value: T): T {
 export default abstract class BaseValidator<
   T,
   Model extends object = Record<string, unknown>,
-  OptionsShape extends DerivedOptions = DerivedOptions,
   Context extends object = Record<string, unknown>,
-> implements Validator<T, Model, OptionsShape, Context>
+  OptionsShape extends BaseOptions = BaseOptions,
+> implements Validator<T, Model, Context, OptionsShape>
 {
   abstract validate(
-    this: BaseValidator<T, Model, OptionsShape, Context>,
+    this: BaseValidator<T, Model, Context, OptionsShape>,
     value: T,
     options: OptionsShape,
     context: Context | Model,
   ): ValidateFnResponse;
-  defaultOptions: OptionsShape = {} as OptionsShape;
+  defaultOptions: Computable<Context, OptionsShape & BaseOptions> =
+    {} as OptionsShape;
 
   readonly owner;
   readonly binding: Binding<Model>;
-  readonly options: OptionsShape;
+  readonly options: Computable<Context, OptionsShape & BaseOptions>;
   readonly context: Context | Model;
 
   constructor(
     binding: Binding<Model>,
-    options: OptionsShape,
+    options: Computable<Context, OptionsShape & BaseOptions>,
     context: Context,
   ) {
     this.binding = binding;
@@ -120,6 +121,14 @@ export default abstract class BaseValidator<
         message,
       };
     }
+    if (options.key) {
+      const message = this.translateMessage({ key: options.key, ...options });
+      return {
+        isValid: false,
+        isWarning: options.isWarning ?? false,
+        message,
+      };
+    }
 
     return response;
   }
@@ -130,18 +139,34 @@ export default abstract class BaseValidator<
     return this.intl.t(key, options);
   }
 
-  computeOptions(options: Options<Context>): OptionsShape {
+  computeOptions(options: Computable<Context, OptionsShape>) {
     const { context, defaultOptions } = this;
-    const computed: Record<string, unknown> = {};
+    const computed = {} as OptionsShape;
+
+    for (const key of Object.keys(options)) {
+      const value = options[key as keyof OptionsShape];
+      if (typeof value === 'function') {
+        computed[key as keyof OptionsShape] = value.apply(context);
+      } else {
+        computed[key as keyof OptionsShape] =
+          value as OptionsShape[keyof OptionsShape];
+      }
+    }
+
+    for (const key of Object.keys(defaultOptions)) {
+      if (key in computed) {
+        continue;
+      }
 
-    for (const [key, value] of Object.entries(options)) {
+      const value = defaultOptions[key as keyof OptionsShape];
       if (typeof value === 'function') {
-        computed[key] = value.apply(context);
+        computed[key as keyof OptionsShape] = value.apply(context);
       } else {
-        computed[key] = value;
+        computed[key as keyof OptionsShape] =
+          value as OptionsShape[keyof OptionsShape];
       }
     }
 
-    return { ...defaultOptions, ...computed } as OptionsShape;
+    return { ...computed };
   }
 }
diff --git a/packages/ember/src/validation/validators/confirmation.ts b/packages/ember/src/validation/validators/confirmation.ts
index 7daeecc09..4a56dae3c 100644
--- a/packages/ember/src/validation/validators/confirmation.ts
+++ b/packages/ember/src/validation/validators/confirmation.ts
@@ -4,7 +4,12 @@ import { isEqual, isPresent } from '@ember/utils';
 import BaseValidator from './base.ts';
 
 import type { Binding } from '../../';
-import type { TranslatableOption, ValidateFnResponse } from '../types';
+import type {
+  BaseOptions,
+  Computable,
+  TranslatableOption,
+  ValidateFnResponse,
+} from '../types';
 
 export type ConfirmationOptions = {
   /**
@@ -16,20 +21,21 @@ export type ConfirmationOptions = {
    * The property name to compare the value against.
    */
   on: string;
-};
+} & BaseOptions;
 
 export default class ConfirmationValidator<
   Model extends object,
+  Context extends object = Record<string, TranslatableOption>,
 > extends BaseValidator<
   TranslatableOption,
   Model,
-  ConfirmationOptions,
-  Record<string, TranslatableOption>
+  Context,
+  ConfirmationOptions
 > {
   constructor(
     binding: Binding<Model>,
-    options: ConfirmationOptions,
-    context: Record<string, TranslatableOption>,
+    options: Computable<Context, ConfirmationOptions>,
+    context: Context,
   ) {
     super(binding, options, context);
 
@@ -44,11 +50,11 @@ export default class ConfirmationValidator<
   validate(
     value: TranslatableOption,
     options: ConfirmationOptions,
-    context: Record<string, TranslatableOption>,
+    context: Context,
   ): ValidateFnResponse {
     const { label, on } = options;
 
-    const expectedValue = context[on];
+    const expectedValue = (context as Record<string, TranslatableOption>)[on];
 
     if (isEqual(value, expectedValue)) {
       return true;
diff --git a/packages/ember/src/validation/validators/custom.ts b/packages/ember/src/validation/validators/custom.ts
index 687e01d2a..66fa2854d 100644
--- a/packages/ember/src/validation/validators/custom.ts
+++ b/packages/ember/src/validation/validators/custom.ts
@@ -7,32 +7,36 @@ import BaseValidator from './base.ts';
 
 import type { Binding } from '../../';
 import type {
-  DerivedOptions,
+  BaseOptions,
+  Computable,
   ValidateFnResponse,
   ValidationResult,
 } from '../types';
 
-declare type ValidateFn<T> = (
+declare type ValidateFn<T, Context> = (
   value: T,
-  options: CustomOptions<T>,
+  options: CustomOptions<T, Context>,
   context: Record<string, unknown>,
 ) => ValidateFnResponse;
 
-export type CustomOptions<T> = {
+export type CustomOptions<T, Context> = {
   /**
    * The function to be called to validate. It should return a boolean or a
    * response object.
    */
-  validate: ValidateFn<T>;
-} & DerivedOptions;
+  validate: ValidateFn<T, Context>;
+} & BaseOptions;
 
 export default class CustomValidator<
   T,
   Model extends object,
-  Options extends CustomOptions<T> = CustomOptions<T>,
   Context extends object = Record<string, unknown>,
-> extends BaseValidator<T, Model, Options, Context> {
-  constructor(binding: Binding<Model>, options: Options, context: Context) {
+> extends BaseValidator<T, Model, Context, CustomOptions<T, Context>> {
+  constructor(
+    binding: Binding<Model>,
+    options: Computable<Context, CustomOptions<T, Context>>,
+    context: Context,
+  ) {
     super(binding, options, context);
 
     const { validate } = options;
@@ -47,9 +51,11 @@ export default class CustomValidator<
   get result(): ValidationResult {
     const { context, value } = this;
     const { validate, ...options } = this.options;
-    const computedOptions = this.computeOptions(options);
+    const computedOptions = this.computeOptions(
+      options as CustomOptions<T, Context>,
+    );
 
-    let response = validate.apply(context, [
+    let response = (validate as ValidateFn<T, Context>).apply(context, [
       value,
       computedOptions,
       context as Record<string, unknown>,
@@ -60,6 +66,8 @@ export default class CustomValidator<
       response.message ??= this.intl.t('nrg.validation.custom.invalid', {
         value: String(value),
       });
+
+      delete computedOptions.key;
     }
 
     return this.coalesceResponse(response, computedOptions);
diff --git a/packages/ember/src/validation/validators/exclusion.ts b/packages/ember/src/validation/validators/exclusion.ts
index 430216884..38bd95955 100644
--- a/packages/ember/src/validation/validators/exclusion.ts
+++ b/packages/ember/src/validation/validators/exclusion.ts
@@ -3,23 +3,23 @@ import { assert } from '@ember/debug';
 import BaseValidator from './base.ts';
 
 import type { Binding, Primitive } from '../../';
-import type { ValidateFnResponse } from '../types';
+import type { BaseOptions, Computable, ValidateFnResponse } from '../types';
 
 export type ExclusionOptions<T> = {
   /**
    * An array of invalid values.
    */
   in: T[];
-};
+} & BaseOptions;
 
 export default class ExclusionValidator<
   T extends Primitive,
-  Model extends object,
   Context extends object = Record<string, unknown>,
-> extends BaseValidator<T, Model, ExclusionOptions<T>, Context> {
+  Model extends object = Record<string, unknown>,
+> extends BaseValidator<T, Model, Context, ExclusionOptions<T>> {
   constructor(
     bind: Binding<Model>,
-    options: ExclusionOptions<T>,
+    options: Computable<Context, ExclusionOptions<T>>,
     context: Context,
   ) {
     super(bind, options, context);
diff --git a/packages/ember/src/validation/validators/inclusion.ts b/packages/ember/src/validation/validators/inclusion.ts
index 6bb2eb267..506054f31 100644
--- a/packages/ember/src/validation/validators/inclusion.ts
+++ b/packages/ember/src/validation/validators/inclusion.ts
@@ -3,23 +3,23 @@ import { assert } from '@ember/debug';
 import BaseValidator from './base.ts';
 
 import type { Binding, Primitive } from '../../';
-import type { ValidateFnResponse } from '../types';
+import type { BaseOptions, Computable, ValidateFnResponse } from '../types';
 
 export type InclusionOptions<T> = {
   /**
    * An array of valid values.
    */
   in: T[];
-};
+} & BaseOptions;
 
 export default class InclusionValidator<
   T extends Primitive,
   Model extends object,
   Context extends object = Record<string, unknown>,
-> extends BaseValidator<T, Model, InclusionOptions<T>, Context> {
+> extends BaseValidator<T, Model, Context, InclusionOptions<T>> {
   constructor(
     binding: Binding<Model>,
-    options: InclusionOptions<T>,
+    options: Computable<Context, InclusionOptions<T>>,
     context: Context,
   ) {
     super(binding, options, context);
diff --git a/packages/ember/src/validation/validators/length.ts b/packages/ember/src/validation/validators/length.ts
index 148ef2c02..90746e40b 100644
--- a/packages/ember/src/validation/validators/length.ts
+++ b/packages/ember/src/validation/validators/length.ts
@@ -4,7 +4,7 @@ import { isEmpty, isNone } from '@ember/utils';
 import BaseValidator from './base.ts';
 
 import type { Binding } from '../../';
-import type { ValidateFnResponse } from '../types';
+import type { BaseOptions, Computable, ValidateFnResponse } from '../types';
 
 export type LengthOptions = {
   /**
@@ -22,13 +22,13 @@ export type LengthOptions = {
   is?: number;
   max?: number;
   min?: number;
-};
+} & BaseOptions;
 
 export default class LengthValidator<
   T extends ArrayLike<T>,
   Model extends object,
   Context extends object = Record<string, unknown>,
-> extends BaseValidator<T, Model, LengthOptions, Context> {
+> extends BaseValidator<T, Model, Context, LengthOptions> {
   defaultOptions = {
     allowNone: true,
     presence: true,
@@ -36,7 +36,7 @@ export default class LengthValidator<
 
   constructor(
     binding: Binding<Model>,
-    options: LengthOptions,
+    options: Computable<Context, LengthOptions>,
     context: Context,
   ) {
     super(binding, options, context);
diff --git a/packages/ember/src/validation/validators/number.ts b/packages/ember/src/validation/validators/number.ts
index d0ea5632a..0859f4a02 100644
--- a/packages/ember/src/validation/validators/number.ts
+++ b/packages/ember/src/validation/validators/number.ts
@@ -2,7 +2,7 @@ import { isEmpty, isNone } from '@ember/utils';
 
 import BaseValidator from './base.ts';
 
-import type { ValidateFnResponse } from '../types';
+import type { BaseOptions, ValidateFnResponse } from '../types';
 
 export type NumberOptions = {
   /**
@@ -53,14 +53,14 @@ export type NumberOptions = {
    * When set, the number must be exactly this value
    */
   is?: number;
-};
+} & BaseOptions;
 
 declare type NumberLike = number | string | null | undefined;
 
 export default class NumberValidator<
   Model extends object,
   Context extends object = Record<string, unknown>,
-> extends BaseValidator<NumberLike, Model, NumberOptions, Context> {
+> extends BaseValidator<NumberLike, Model, Context, NumberOptions> {
   defaultOptions = {
     allowNone: true,
   };
diff --git a/packages/ember/src/validation/validators/presence.ts b/packages/ember/src/validation/validators/presence.ts
index 7a4e09d38..4bf8a0d0e 100644
--- a/packages/ember/src/validation/validators/presence.ts
+++ b/packages/ember/src/validation/validators/presence.ts
@@ -4,7 +4,7 @@ import { isEmpty, isPresent } from '@ember/utils';
 import BaseValidator from './base.ts';
 
 import type { Binding } from '../../';
-import type { ValidateFnResponse } from '../types';
+import type { BaseOptions, Computable, ValidateFnResponse } from '../types';
 
 export type PresenceOptions = {
   /**
@@ -17,13 +17,13 @@ export type PresenceOptions = {
    * @default false
    */
   ignoreBlank?: boolean;
-};
+} & BaseOptions;
 
 export default class PresenceValidator<
   T,
   Model extends object,
   Context extends object = Record<string, unknown>,
-> extends BaseValidator<T, Model, PresenceOptions, Context> {
+> extends BaseValidator<T, Model, Context, PresenceOptions> {
   defaultOptions = {
     presence: true,
     ignoreBlank: false,
@@ -31,7 +31,7 @@ export default class PresenceValidator<
 
   constructor(
     binding: Binding<Model>,
-    options: PresenceOptions,
+    options: Computable<Context, PresenceOptions>,
     context: Context,
   ) {
     super(binding, options, context);
diff --git a/packages/ember/src/validation/validators/range.ts b/packages/ember/src/validation/validators/range.ts
index e8bc1dbbc..a0e0aa42c 100644
--- a/packages/ember/src/validation/validators/range.ts
+++ b/packages/ember/src/validation/validators/range.ts
@@ -4,7 +4,7 @@ import { isPresent } from '@ember/utils';
 import BaseValidator from './base.ts';
 
 import type { Binding } from '../../';
-import type { ValidateFnResponse } from '../types';
+import type { BaseOptions, Computable, ValidateFnResponse } from '../types';
 
 export type RangeOptions = {
   /**
@@ -25,12 +25,12 @@ export type RangeOptions = {
    * @default true
    */
   maxInclusive?: boolean;
-};
+} & BaseOptions;
 
 export default class RangeValidator<
   Model extends object,
   Context extends object = Record<string, unknown>,
-> extends BaseValidator<number, Model, RangeOptions, Context> {
+> extends BaseValidator<number, Model, Context, RangeOptions> {
   defaultOptions = {
     minInclusive: true,
     maxInclusive: true,
@@ -38,7 +38,7 @@ export default class RangeValidator<
 
   constructor(
     binding: Binding<Model>,
-    options: RangeOptions,
+    options: Computable<Context, RangeOptions>,
     context: Context,
   ) {
     super(binding, options, context);
diff --git a/packages/ember/src/validation/validators/regex.ts b/packages/ember/src/validation/validators/regex.ts
index 452c5dcc9..cf0b7456f 100644
--- a/packages/ember/src/validation/validators/regex.ts
+++ b/packages/ember/src/validation/validators/regex.ts
@@ -4,7 +4,7 @@ import { isNone } from '@ember/utils';
 import BaseValidator from './base.ts';
 
 import type { Binding } from '../..';
-import type { ValidateFnResponse } from '../types';
+import type { BaseOptions, Computable, ValidateFnResponse } from '../types';
 
 export type RegexOptions = {
   /**
@@ -16,15 +16,15 @@ export type RegexOptions = {
    * A regular expression pattern that the value must match.
    */
   pattern: RegExp | string;
-};
+} & BaseOptions;
 
 export default class RegexValidator<
   Model extends object = Record<string, unknown>,
   Context extends object = Record<string, unknown>,
-> extends BaseValidator<string, Model, RegexOptions, Context> {
+> extends BaseValidator<string, Model, Context, RegexOptions> {
   constructor(
     binding: Binding<Model>,
-    options: RegexOptions,
+    options: Computable<Context, RegexOptions>,
     context: Context,
   ) {
     super(binding, options, context);
@@ -35,11 +35,6 @@ export default class RegexValidator<
       'RegexValidator requires `pattern` to be provided',
       !isNone(pattern),
     );
-
-    assert(
-      'RegexValidator requires the pattern to be of type string or RegExp',
-      typeof pattern === 'string' || pattern instanceof RegExp,
-    );
   }
 
   validate(value: string, options: RegexOptions): ValidateFnResponse {
@@ -50,6 +45,11 @@ export default class RegexValidator<
       !isNone(pattern),
     );
 
+    assert(
+      'RegexValidator requires the pattern to be of type string or RegExp',
+      typeof pattern === 'string' || pattern instanceof RegExp,
+    );
+
     const regex = typeof pattern === 'string' ? new RegExp(pattern) : pattern;
     const isValid = regex.test(value) === !inverse;
 

From 191d6b594c3bf9bcd03db7a9f4ee68e2b799496f Mon Sep 17 00:00:00 2001
From: TSenter <tyler.senter.427@gmail.com>
Date: Mon, 19 Aug 2024 21:32:03 -0400
Subject: [PATCH 02/13] feat(validations): Skip validations when `disabled`

---
 .../tests/unit/validators/custom-test.ts      | 36 +++++++++++++++++++
 .../ember/src/validation/validators/base.ts   |  5 +++
 .../ember/src/validation/validators/custom.ts |  4 +++
 3 files changed, 45 insertions(+)

diff --git a/apps/ember-test-app/tests/unit/validators/custom-test.ts b/apps/ember-test-app/tests/unit/validators/custom-test.ts
index 43c2a2ad5..a00abb8ce 100644
--- a/apps/ember-test-app/tests/unit/validators/custom-test.ts
+++ b/apps/ember-test-app/tests/unit/validators/custom-test.ts
@@ -15,6 +15,9 @@ import type { Binding } from '@nrg-ui/ember';
 class Model {
   @tracked
   field?: string | string[];
+
+  @tracked
+  disabled: boolean = false;
 }
 
 declare type TestContext = {
@@ -138,6 +141,39 @@ module('Unit | Validator | custom', function (hooks) {
     });
   });
 
+  test('disabled option works', async function (this: TestContext, assert) {
+    const validator = new CustomValidator(
+      this.binding,
+      {
+        validate() {
+          return false;
+        },
+        disabled() {
+          return this.disabled;
+        },
+      },
+      this.model,
+    );
+
+    this.model.field = ['foo', 'bar'];
+
+    let result = validator.result;
+
+    assert.deepEqual(result, {
+      isValid: false,
+      isWarning: false,
+      message: 'This field is invalid',
+    });
+
+    this.model.disabled = true;
+
+    result = validator.result;
+
+    assert.deepEqual(result, {
+      isValid: true,
+    });
+  });
+
   test('works with `validator` function', function (this: TestContext, assert) {
     const builder = buildValidator('custom', {
       validate: () => {
diff --git a/packages/ember/src/validation/validators/base.ts b/packages/ember/src/validation/validators/base.ts
index 64a48a5b9..2a946e070 100644
--- a/packages/ember/src/validation/validators/base.ts
+++ b/packages/ember/src/validation/validators/base.ts
@@ -90,6 +90,11 @@ export default abstract class BaseValidator<
   get result(): ValidationResult {
     const { context, options, validate, value } = this;
     const computedOptions = this.computeOptions(options);
+
+    if (computedOptions.disabled) {
+      return { isValid: true };
+    }
+
     const response = validate.apply(this, [value, computedOptions, context]);
 
     return this.coalesceResponse(response, computedOptions);
diff --git a/packages/ember/src/validation/validators/custom.ts b/packages/ember/src/validation/validators/custom.ts
index 66fa2854d..7d8aec304 100644
--- a/packages/ember/src/validation/validators/custom.ts
+++ b/packages/ember/src/validation/validators/custom.ts
@@ -55,6 +55,10 @@ export default class CustomValidator<
       options as CustomOptions<T, Context>,
     );
 
+    if (computedOptions.disabled) {
+      return { isValid: true };
+    }
+
     let response = (validate as ValidateFn<T, Context>).apply(context, [
       value,
       computedOptions,

From cdf1e94475e8210ee24611134e5a4584ba61b98f Mon Sep 17 00:00:00 2001
From: TSenter <tyler.senter.427@gmail.com>
Date: Mon, 19 Aug 2024 21:33:01 -0400
Subject: [PATCH 03/13] chore: Update test name and add TS directive

---
 apps/ember-test-app/tests/unit/validators/custom-test.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/ember-test-app/tests/unit/validators/custom-test.ts b/apps/ember-test-app/tests/unit/validators/custom-test.ts
index a00abb8ce..56fad8752 100644
--- a/apps/ember-test-app/tests/unit/validators/custom-test.ts
+++ b/apps/ember-test-app/tests/unit/validators/custom-test.ts
@@ -36,10 +36,11 @@ module('Unit | Validator | custom', function (hooks) {
     setOwner(this.model, this.owner);
   });
 
-  test('`on` option is required', function (this: TestContext, assert) {
+  test('`validate` option is required', function (this: TestContext, assert) {
     assert.expect(1);
 
     assert.throws(() => {
+      // @ts-expect-error Testing that the `validate` option is required
       const validator = new CustomValidator(this.binding, {}, this.model);
       const result = validator.result;
 

From 00515b3e21ee6c6e34ff8d7b9000472de42bdb9f Mon Sep 17 00:00:00 2001
From: TSenter <tyler.senter.427@gmail.com>
Date: Tue, 20 Aug 2024 08:40:56 -0400
Subject: [PATCH 04/13] feat(validations): Run and display warnings without
 submitting form

---
 packages/design-system/src/_forms.scss        | 75 +++++++++++++++++++
 packages/ember/src/components/form/field.gts  | 26 ++++++-
 packages/ember/src/components/form/index.gts  |  4 +-
 .../ember/src/components/form/radio-group.gts |  7 ++
 packages/ember/src/components/form/select.gts |  3 +
 .../ember/src/components/form/text-area.gts   |  3 +
 .../ember/src/components/form/text-field.gts  |  3 +
 7 files changed, 118 insertions(+), 3 deletions(-)

diff --git a/packages/design-system/src/_forms.scss b/packages/design-system/src/_forms.scss
index 541e85e2b..1bc5780aa 100644
--- a/packages/design-system/src/_forms.scss
+++ b/packages/design-system/src/_forms.scss
@@ -10,3 +10,78 @@
     overflow-y: auto;
   }
 }
+
+/* I'm open to changing the color (it's the "orange" color from
+ * Fomantic) but I think it's a good idea to have a color that's
+ * different from the default "warning" color from Bootstrap.
+ * The default Bootstrap warning color is hard to read, and the
+ * "emphasis" variant is gross (see `text-warning-emphasis`):
+ * <https://getbootstrap.com/docs/5.3/utilities/colors/#colors>
+ */
+$warning-custom: #f2711c;
+:root {
+  --bs-form-warning-rgb: 242, 113, 28;
+  --bs-form-warning-color: #f2711c;
+  --bs-form-warning-border-color: #f2711c;
+}
+
+input,
+textarea,
+select,
+.form-control {
+  &[disabled] {
+    & ~ .warning-feedback {
+      display: none;
+    }
+  }
+  &:not([disabled]) {
+    &:not(input[type="checkbox"]):not(input[type="radio"]) {
+      background: none !important;
+      padding-right: revert !important;
+    }
+
+    & ~ .warning-feedback {
+      @extend .invalid-feedback;
+      color: var(--bs-form-warning-color);
+      display: block;
+    }
+  }
+}
+
+input.form-control,
+textarea.form-control,
+select.form-select,
+.form-control,
+.form-check,
+.form-check-input {
+  &.is-warning:not([disabled]) {
+    @extend .is-invalid;
+
+    border-color: var(--bs-form-warning-border-color);
+  }
+
+  &.is-warning:focus:not([disabled]) {
+    @extend .is-invalid, :focus;
+
+    border-color: var(--bs-form-warning-border-color);
+    box-shadow: 0 0 0 0.25rem rgba(var(--bs-form-warning-rgb), 0.25);
+  }
+}
+
+.form-check-input.is-warning:not([disabled]) {
+  @extend .is-invalid;
+
+  &:checked {
+    &:focus,
+    & {
+      background-color: var(--bs-form-warning-color);
+    }
+  }
+
+  &:focus,
+  & {
+    & ~ .form-check-label {
+      color: var(--bs-form-warning-color);
+    }
+  }
+}
diff --git a/packages/ember/src/components/form/field.gts b/packages/ember/src/components/form/field.gts
index b367e6bff..c22f5c57d 100644
--- a/packages/ember/src/components/form/field.gts
+++ b/packages/ember/src/components/form/field.gts
@@ -109,6 +109,10 @@ export default class Field extends Component<FieldSignature> {
     return typeof this.errorMessage === 'string';
   }
 
+  get hasWarning() {
+    return typeof this.warningMessage === 'string';
+  }
+
   get errorMessage() {
     const { form } = this.args;
 
@@ -119,6 +123,16 @@ export default class Field extends Component<FieldSignature> {
     return form.errorFor(this.validatorKey);
   }
 
+  get warningMessage() {
+    const { form } = this.args;
+
+    if (!form) {
+      return undefined;
+    }
+
+    return form.warningFor(this.validatorKey);
+  }
+
   get validatorKey() {
     return this.args.validatorKey ?? this.binding.valuePath;
   }
@@ -126,7 +140,7 @@ export default class Field extends Component<FieldSignature> {
   get describedBy() {
     const describedBy = [];
 
-    if (this.hasError) {
+    if (this.hasError || this.hasWarning) {
       describedBy.push(this.messageId);
     }
 
@@ -202,6 +216,7 @@ export default class Field extends Component<FieldSignature> {
           id=this.fieldId
           initBinding=this.initBinding
           isInvalid=this.hasError
+          isWarning=this.hasWarning
         )
         Select=(component
           this.TypedSelect
@@ -210,6 +225,7 @@ export default class Field extends Component<FieldSignature> {
           id=this.fieldId
           initBinding=this.initBinding
           isInvalid=this.hasError
+          isWarning=this.hasWarning
         )
         Text=(component Text field=this id=this.textId)
         TextArea=(component
@@ -219,6 +235,7 @@ export default class Field extends Component<FieldSignature> {
           id=this.fieldId
           initBinding=this.initBinding
           isInvalid=this.hasError
+          isWarning=this.hasWarning
         )
         TextField=(component
           TextField
@@ -227,13 +244,18 @@ export default class Field extends Component<FieldSignature> {
           id=this.fieldId
           initBinding=this.initBinding
           isInvalid=this.hasError
+          isWarning=this.hasWarning
         )
       )
     }}
     {{#if this.hasError}}
-      <div class="invalid-feedback" id={{this.messageId}}>
+      <div class="invalid-feedback" id={{this.describedBy}}>
         {{this.errorMessage}}
       </div>
+    {{else if this.hasWarning}}
+      <div class="warning-feedback" id={{this.describedBy}}>
+        {{this.warningMessage}}
+      </div>
     {{/if}}
   </template>
 }
diff --git a/packages/ember/src/components/form/index.gts b/packages/ember/src/components/form/index.gts
index 18b537a06..f760bad2d 100644
--- a/packages/ember/src/components/form/index.gts
+++ b/packages/ember/src/components/form/index.gts
@@ -131,7 +131,9 @@ export default class Form extends Component<FormSignature> implements FormType {
     });
 
     const validations = Array.from(this.validations.values()).flat();
-    return validations.every((validator) => validator.v.result.isValid);
+    return validations
+      .filter((validator) => !validator.v.result.isWarning)
+      .every((validator) => validator.v.result.isValid);
   }
 
   submit = dropTask(async (event: SubmitEvent) => {
diff --git a/packages/ember/src/components/form/radio-group.gts b/packages/ember/src/components/form/radio-group.gts
index 71246f2a5..15f0b560c 100644
--- a/packages/ember/src/components/form/radio-group.gts
+++ b/packages/ember/src/components/form/radio-group.gts
@@ -16,6 +16,7 @@ export interface RadioGroupFieldSignature {
     disabled?: boolean;
     id?: string;
     isInvalid?: boolean;
+    isWarning?: boolean;
     name: string;
   };
   Blocks: {
@@ -44,6 +45,8 @@ export default class RadioGroupField extends BoundValue<
 
     if (this.args.isInvalid) {
       classes.push('is-invalid');
+    } else if (this.args.isWarning) {
+      classes.push('is-warning');
     }
 
     return classes.join(' ');
@@ -63,6 +66,7 @@ export default class RadioGroupField extends BoundValue<
             currentValue=this.value
             disabled=@disabled
             isInvalid=@isInvalid
+            isWarning=@isWarning
             name=@name
             onChange=this.change
           )
@@ -78,6 +82,7 @@ export interface RadioFieldSignature {
     currentValue?: string | null;
     disabled?: boolean;
     isInvalid?: boolean;
+    isWarning?: boolean;
     label?: string;
     name: string;
     option?: string;
@@ -97,6 +102,8 @@ class RadioField extends Component<RadioFieldSignature> {
 
     if (this.args.isInvalid) {
       classes.push('is-invalid');
+    } else if (this.args.isWarning) {
+      classes.push('is-warning');
     }
 
     return classes.join(' ');
diff --git a/packages/ember/src/components/form/select.gts b/packages/ember/src/components/form/select.gts
index 5fce809b7..fd331b6ff 100644
--- a/packages/ember/src/components/form/select.gts
+++ b/packages/ember/src/components/form/select.gts
@@ -83,6 +83,7 @@ export interface SelectSignature<T> {
     displayPath?: string;
     id?: string;
     isInvalid?: boolean;
+    isWarning?: boolean;
     loading?: boolean;
     options: T[];
     scrollable?: boolean;
@@ -127,6 +128,8 @@ export default class Select<T> extends BoundValue<
 
     if (this.args.isInvalid) {
       classes.push('is-invalid');
+    } else if (this.args.isWarning) {
+      classes.push('is-warning');
     }
 
     return classes.join(' ');
diff --git a/packages/ember/src/components/form/text-area.gts b/packages/ember/src/components/form/text-area.gts
index a52d291cd..ae85c83ef 100644
--- a/packages/ember/src/components/form/text-area.gts
+++ b/packages/ember/src/components/form/text-area.gts
@@ -11,6 +11,7 @@ export interface TextAreaSignature {
     disabled?: boolean;
     id?: string;
     isInvalid?: boolean;
+    isWarning?: boolean;
     readonly?: boolean;
   };
 }
@@ -25,6 +26,8 @@ export default class TextArea extends BoundValue<TextAreaSignature, string> {
 
     if (this.args.isInvalid) {
       classes.push('is-invalid');
+    } else if (this.args.isWarning) {
+      classes.push('is-warning');
     }
 
     return classes.join(' ');
diff --git a/packages/ember/src/components/form/text-field.gts b/packages/ember/src/components/form/text-field.gts
index fc3859dba..5931f67df 100644
--- a/packages/ember/src/components/form/text-field.gts
+++ b/packages/ember/src/components/form/text-field.gts
@@ -11,6 +11,7 @@ export interface TextFieldSignature {
     disabled?: boolean;
     id?: string;
     isInvalid?: boolean;
+    isWarning?: boolean;
     readonly?: boolean;
   };
 }
@@ -25,6 +26,8 @@ export default class TextField extends BoundValue<TextFieldSignature, string> {
 
     if (this.args.isInvalid) {
       classes.push('is-invalid');
+    } else if (this.args.isWarning) {
+      classes.push('is-warning');
     }
 
     return classes.join(' ');

From 69b10cef29b8bbc188ee484ffb97a28522a1234f Mon Sep 17 00:00:00 2001
From: TSenter <tyler.senter.427@gmail.com>
Date: Tue, 20 Aug 2024 08:41:55 -0400
Subject: [PATCH 05/13] docs: Add `isWarning` examples

---
 apps/ember-test-app/app/components/f/form.gts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/apps/ember-test-app/app/components/f/form.gts b/apps/ember-test-app/app/components/f/form.gts
index 57808b634..baa8d3518 100644
--- a/apps/ember-test-app/app/components/f/form.gts
+++ b/apps/ember-test-app/app/components/f/form.gts
@@ -26,8 +26,10 @@ const Validators = {
         console.log('Validating: ' + value);
         return value !== 'foo';
       },
+      isWarning: true,
     }),
   ],
+  radio: [validator('exclusion', { in: ['A', 'B'], isWarning: true })],
 };
 
 class Model {

From 99d41f91404ca48e8f03712308ecf8d60cb33307 Mon Sep 17 00:00:00 2001
From: TSenter <tyler.senter.427@gmail.com>
Date: Tue, 20 Aug 2024 08:42:06 -0400
Subject: [PATCH 06/13] chore: Add test for warning validations

---
 .../components/form/index-test.gts            | 49 +++++++++++++++++--
 1 file changed, 45 insertions(+), 4 deletions(-)

diff --git a/apps/ember-test-app/tests/integration/components/form/index-test.gts b/apps/ember-test-app/tests/integration/components/form/index-test.gts
index 877011a4a..010b84ff6 100644
--- a/apps/ember-test-app/tests/integration/components/form/index-test.gts
+++ b/apps/ember-test-app/tests/integration/components/form/index-test.gts
@@ -1,8 +1,10 @@
 import { setOwner } from '@ember/application';
+import { array } from '@ember/helper';
 import { click, fillIn, render } from '@ember/test-helpers';
 import { tracked } from '@glimmer/tracking';
 import Form from '@nrg-ui/ember/components/form';
 import bind from '@nrg-ui/ember/helpers/bind';
+import { validator } from '@nrg-ui/ember/validation';
 import { setupIntl } from 'ember-intl/test-support';
 import { setupRenderingTest } from 'ember-qunit';
 import { module, test } from 'qunit';
@@ -15,6 +17,13 @@ class Model {
   textArea: string = '';
 }
 
+const Validators = {
+  selectByAnotherProperty: validator('presence', {
+    presence: false,
+    isWarning: true,
+  }),
+};
+
 module('Integration | Component | form', function (hooks) {
   setupRenderingTest(hooks);
   setupIntl(hooks, 'en-us');
@@ -101,7 +110,7 @@ module('Integration | Component | form', function (hooks) {
   });
 
   test('validations work', async function (assert) {
-    assert.expect(12);
+    assert.expect(20);
 
     const model = this.model;
 
@@ -111,7 +120,7 @@ module('Integration | Component | form', function (hooks) {
     };
 
     await render(<template>
-      <Form @onSubmit={{actionHandler}} as |Form|>
+      <Form @validators={{Validators}} @onSubmit={{actionHandler}} as |Form|>
         <Form.Field @label="Text Field" @required={{true}} as |Field|>
           <Field.TextField @binding={{bind model "textField"}} />
         </Form.Field>
@@ -125,11 +134,43 @@ module('Integration | Component | form', function (hooks) {
             Here's some extra context for this field
           </Field.Text>
         </Form.Field>
+        <Form.Field
+          @label="Select"
+          @validatorKey="selectByAnotherProperty"
+          as |Field|
+        >
+          <Field.Select
+            @binding={{bind model "select"}}
+            @options={{array "A" "B" "C"}}
+          />
+        </Form.Field>
         <Form.SubmitButton />
       </Form>
     </template>);
 
-    await click('button');
+    // Select
+    const select = this.element.querySelector('label + button.dropdown');
+
+    assert
+      .dom(select)
+      .exists()
+      .hasAttribute('role', 'combobox')
+      .hasClass('form-control');
+
+    await click(select);
+    await click('button > .dropdown-menu > li:first-child');
+
+    const ariaId = select.getAttribute('aria-describedby');
+
+    assert.dom('button.dropdown').doesNotHaveClass('is-invalid');
+    assert
+      .dom('button.dropdown + div')
+      .exists()
+      .hasAttribute('id', ariaId)
+      .hasClass('warning-feedback')
+      .containsText('This field must be blank');
+
+    await click('button[type="submit"]');
 
     assert.false(didSubmit, 'Form should not submit when validations fail');
 
@@ -159,7 +200,7 @@ module('Integration | Component | form', function (hooks) {
       assert.ok(true, 'Form should submit');
     };
 
-    await click('button');
+    await click('button[type="submit"]');
 
     assert.true(didSubmit, 'Form should submit when validations pass');
   });

From a3b3d9228dfd4cef81c1c25b84717a46b1e88fb4 Mon Sep 17 00:00:00 2001
From: TSenter <tyler.senter.427@gmail.com>
Date: Tue, 20 Aug 2024 09:40:17 -0400
Subject: [PATCH 07/13] fix(radio): Add default name for group

---
 .../ember/src/components/form/radio-group.gts | 22 +++++++++++--------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/packages/ember/src/components/form/radio-group.gts b/packages/ember/src/components/form/radio-group.gts
index 15f0b560c..a4655c6cb 100644
--- a/packages/ember/src/components/form/radio-group.gts
+++ b/packages/ember/src/components/form/radio-group.gts
@@ -28,14 +28,6 @@ export default class RadioGroupField extends BoundValue<
   RadioGroupFieldSignature,
   string
 > {
-  @action
-  change(updatedValue: Optional<string>) {
-    if (updatedValue) {
-      this.value = updatedValue;
-      this.onChange(updatedValue);
-    }
-  }
-
   get classList() {
     const classes = ['form-control'];
 
@@ -52,6 +44,18 @@ export default class RadioGroupField extends BoundValue<
     return classes.join(' ');
   }
 
+  get name() {
+    return this.args.name ?? crypto.randomUUID();
+  }
+
+  @action
+  change(updatedValue: Optional<string>) {
+    if (updatedValue) {
+      this.value = updatedValue;
+      this.onChange(updatedValue);
+    }
+  }
+
   <template>
     <div
       aria-describedby={{@describedBy}}
@@ -67,7 +71,7 @@ export default class RadioGroupField extends BoundValue<
             disabled=@disabled
             isInvalid=@isInvalid
             isWarning=@isWarning
-            name=@name
+            name=this.name
             onChange=this.change
           )
         )

From b0f24176891dddaca63fcfd4cb1176ac4345abf2 Mon Sep 17 00:00:00 2001
From: TSenter <tyler.senter.427@gmail.com>
Date: Wed, 21 Aug 2024 15:43:28 -0400
Subject: [PATCH 08/13] feat(form): Add phone field as input for fields

---
 apps/ember-test-app/app/components/f/form.gts      | 13 +++++++++++++
 packages/ember/src/components/form/field.gts       | 11 +++++++++++
 packages/ember/src/components/form/phone-field.gts |  4 +++-
 3 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/apps/ember-test-app/app/components/f/form.gts b/apps/ember-test-app/app/components/f/form.gts
index baa8d3518..992a240aa 100644
--- a/apps/ember-test-app/app/components/f/form.gts
+++ b/apps/ember-test-app/app/components/f/form.gts
@@ -30,6 +30,11 @@ const Validators = {
     }),
   ],
   radio: [validator('exclusion', { in: ['A', 'B'], isWarning: true })],
+  phone: validator('length', {
+    max: 10,
+    isWarning: true,
+    message: 'Phone number cannot contain a country code',
+  }),
 };
 
 class Model {
@@ -42,6 +47,9 @@ class Model {
   @tracked
   select = '';
 
+  @tracked
+  phone = '';
+
   @tracked
   radio = '';
 
@@ -140,6 +148,11 @@ export default class extends Component {
             </Field.RadioGroup>
           </Form.Field>
         </div>
+        <div class="mb-3">
+          <Form.Field @label="Phone Number" @required={{true}} as |Field|>
+            <Field.Phone @binding={{bind this.model "phone"}} />
+          </Form.Field>
+        </div>
         <Form.SubmitButton class="btn-primary mt-3" />
         <Button
           class="btn{{unless this.required '-outline'}}-secondary mt-3"
diff --git a/packages/ember/src/components/form/field.gts b/packages/ember/src/components/form/field.gts
index c22f5c57d..fe05549cc 100644
--- a/packages/ember/src/components/form/field.gts
+++ b/packages/ember/src/components/form/field.gts
@@ -5,6 +5,7 @@ import Component from '@glimmer/component';
 import { tracked } from '@glimmer/tracking';
 import { runTask } from 'ember-lifeline';
 
+import PhoneField from './phone-field.gts';
 import RadioGroup from './radio-group.gts';
 import Select from './select.gts';
 import TextArea from './text-area.gts';
@@ -43,6 +44,7 @@ export interface FieldSignature {
   Blocks: {
     default: [
       {
+        Phone: ComponentLike<TextFieldSignature>;
         RadioGroup: ComponentLike<RadioGroupFieldSignature>;
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         Select: ComponentLike<SelectSignature<any>>;
@@ -209,6 +211,15 @@ export default class Field extends Component<FieldSignature> {
     </label>
     {{yield
       (hash
+        Phone=(component
+          PhoneField
+          describedBy=this.describedBy
+          disabled=@disabled
+          id=this.fieldId
+          initBinding=this.initBinding
+          isInvalid=this.hasError
+          isWarning=this.hasWarning
+        )
         RadioGroup=(component
           RadioGroup
           describedBy=this.describedBy
diff --git a/packages/ember/src/components/form/phone-field.gts b/packages/ember/src/components/form/phone-field.gts
index 0f8c3cadd..5350a8ecd 100644
--- a/packages/ember/src/components/form/phone-field.gts
+++ b/packages/ember/src/components/form/phone-field.gts
@@ -107,11 +107,13 @@ export default class PhoneField extends TextField {
 
   <template>
     <input
+      aria-describedby={{@describedBy}}
       class={{this.classList}}
       disabled={{@disabled}}
+      id={{@id}}
       readonly={{@readonly}}
-      type="tel"
       maxlength="19"
+      type="tel"
       value={{this.displayValue}}
       {{onInsert this.onInsert}}
       {{on "input" this.change}}

From 775b17bc200573835c19c7947fdd0b6beb27881f Mon Sep 17 00:00:00 2001
From: TSenter <tyler.senter.427@gmail.com>
Date: Wed, 21 Aug 2024 15:46:34 -0400
Subject: [PATCH 09/13] fix(form): Only display warnings for "invalid" fields

---
 packages/ember/src/components/form/index.gts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/ember/src/components/form/index.gts b/packages/ember/src/components/form/index.gts
index f760bad2d..3e7a7bfb2 100644
--- a/packages/ember/src/components/form/index.gts
+++ b/packages/ember/src/components/form/index.gts
@@ -250,7 +250,8 @@ export default class Form extends Component<FormSignature> implements FormType {
     }
 
     const warning = validators.find(
-      (validator) => validator.v.result.isWarning,
+      (validator) =>
+        !validator.v.result.isValid && validator.v.result.isWarning,
     );
 
     if (!warning) {

From d3283a3272c65ef04209d4b1f1d0b4f019b3ae99 Mon Sep 17 00:00:00 2001
From: TSenter <tyler.senter.427@gmail.com>
Date: Wed, 21 Aug 2024 15:51:32 -0400
Subject: [PATCH 10/13] fix(validations): Allow options to supersede response

---
 packages/ember/src/validation/types.ts        |   2 +-
 .../ember/src/validation/validators/base.ts   | 107 +++++++++++-------
 .../ember/src/validation/validators/custom.ts |  11 +-
 3 files changed, 74 insertions(+), 46 deletions(-)

diff --git a/packages/ember/src/validation/types.ts b/packages/ember/src/validation/types.ts
index 6963af31b..9a8c2b174 100644
--- a/packages/ember/src/validation/types.ts
+++ b/packages/ember/src/validation/types.ts
@@ -14,7 +14,7 @@ export type Computable<Context, Options> = {
 
 export type ComputedProperty<Context, T> = T | ((this: Context) => T);
 
-export interface TranslatableMessage {
+export interface TranslatableMessage extends Partial<ValidationResult> {
   key: string;
   [option: string]: TranslatableOption;
 }
diff --git a/packages/ember/src/validation/validators/base.ts b/packages/ember/src/validation/validators/base.ts
index 2a946e070..2932bd38e 100644
--- a/packages/ember/src/validation/validators/base.ts
+++ b/packages/ember/src/validation/validators/base.ts
@@ -62,8 +62,13 @@ export default abstract class BaseValidator<
     this.context = context ?? binding.model;
 
     assert(
-      'The `validate` method must be implemented by subclasses of BaseValidator',
-      this.validate,
+      `You must provide a binding argument to ${this.constructor.name}`,
+      binding,
+    );
+
+    assert(
+      'BaseValidator requires the `validate` function to be implemented by subclasses',
+      typeof this.validate === 'function',
     );
 
     const owner = getOwner(this.context);
@@ -104,38 +109,46 @@ export default abstract class BaseValidator<
     response: ValidateFnResponse,
     options: OptionsShape,
   ): ValidationResult {
+    let isValid = false;
+    let isWarning = options.isWarning;
+    let message = options.message;
+
     if (typeof response === 'boolean') {
-      return {
-        isValid: response,
-        isWarning: options.isWarning ?? false,
-        message: options.message,
-      };
-    }
-    if (typeof response === 'string') {
-      return {
-        isValid: false,
-        isWarning: options.isWarning ?? false,
-        message: options.message ?? response,
-      };
-    }
-    if ('key' in response) {
-      const message = this.translateMessage(response);
-      return {
-        isValid: false,
-        isWarning: options.isWarning ?? false,
-        message,
-      };
+      isValid = response;
+    } else if (typeof response === 'string') {
+      message = response;
+    } else {
+      isValid = response.isValid ?? isValid;
+      isWarning ??= response.isWarning ?? isWarning;
     }
+
+    isWarning ??= false;
+
     if (options.key) {
-      const message = this.translateMessage({ key: options.key, ...options });
-      return {
-        isValid: false,
-        isWarning: options.isWarning ?? false,
-        message,
-      };
+      const translationOptions = { ...options };
+      if (typeof response === 'object') {
+        Object.assign(translationOptions, response);
+      }
+
+      message = this.translateMessage({
+        ...translationOptions,
+        key: options.key,
+      });
+    } else if (options.message) {
+      message = options.message;
+    } else if (typeof response === 'object') {
+      message = response.message;
+
+      if ('key' in response && response.key) {
+        message = this.translateMessage({ ...options, ...response });
+      }
+    }
+
+    if (isValid && !isWarning) {
+      message = undefined;
     }
 
-    return response;
+    return { isValid, isWarning, message };
   }
 
   translateMessage(message: TranslatableMessage): string {
@@ -145,17 +158,13 @@ export default abstract class BaseValidator<
   }
 
   computeOptions(options: Computable<Context, OptionsShape>) {
-    const { context, defaultOptions } = this;
+    const { defaultOptions } = this;
     const computed = {} as OptionsShape;
 
     for (const key of Object.keys(options)) {
-      const value = options[key as keyof OptionsShape];
-      if (typeof value === 'function') {
-        computed[key as keyof OptionsShape] = value.apply(context);
-      } else {
-        computed[key as keyof OptionsShape] =
-          value as OptionsShape[keyof OptionsShape];
-      }
+      computed[key as keyof OptionsShape] = this.compute(
+        options[key as keyof OptionsShape],
+      );
     }
 
     for (const key of Object.keys(defaultOptions)) {
@@ -163,15 +172,27 @@ export default abstract class BaseValidator<
         continue;
       }
 
-      const value = defaultOptions[key as keyof OptionsShape];
-      if (typeof value === 'function') {
-        computed[key as keyof OptionsShape] = value.apply(context);
-      } else {
-        computed[key as keyof OptionsShape] =
-          value as OptionsShape[keyof OptionsShape];
+      const willOverrideMessage = key === 'key' && 'message' in computed;
+      const willOverrideKey = key === 'message' && 'key' in computed;
+      if (willOverrideMessage || willOverrideKey) {
+        continue;
       }
+
+      computed[key as keyof OptionsShape] = this.compute(
+        defaultOptions[key as keyof OptionsShape],
+      );
     }
 
     return { ...computed };
   }
+
+  compute<K extends keyof OptionsShape>(
+    value: Computable<Context, OptionsShape>[K],
+  ): OptionsShape[K] {
+    if (typeof value === 'function') {
+      return value.apply(this.context);
+    }
+
+    return value as OptionsShape[K];
+  }
 }
diff --git a/packages/ember/src/validation/validators/custom.ts b/packages/ember/src/validation/validators/custom.ts
index 7d8aec304..dc072d9fc 100644
--- a/packages/ember/src/validation/validators/custom.ts
+++ b/packages/ember/src/validation/validators/custom.ts
@@ -65,10 +65,17 @@ export default class CustomValidator<
       context as Record<string, unknown>,
     ]);
 
-    response = this.coalesceResponse(response, computedOptions);
+    const stringValue = String(value);
+    response = this.coalesceResponse(response, {
+      ...computedOptions,
+      // @ts-expect-error `value` is not an option defined on `CustomOptions`,
+      // but it is a valid option for the `coalesceResponse` method (which is
+      // is used for translations)
+      value: stringValue,
+    });
     if (!response.isValid) {
       response.message ??= this.intl.t('nrg.validation.custom.invalid', {
-        value: String(value),
+        value: stringValue,
       });
 
       delete computedOptions.key;

From 8af6d155d34e8efed939b6e183d4d93430405560 Mon Sep 17 00:00:00 2001
From: TSenter <tyler.senter.427@gmail.com>
Date: Wed, 21 Aug 2024 17:14:16 -0400
Subject: [PATCH 11/13] chore: Add tests for base validator functionality

---
 .../tests/unit/validators/base-test.ts        | 569 ++++++++++++++++++
 1 file changed, 569 insertions(+)
 create mode 100644 apps/ember-test-app/tests/unit/validators/base-test.ts

diff --git a/apps/ember-test-app/tests/unit/validators/base-test.ts b/apps/ember-test-app/tests/unit/validators/base-test.ts
new file mode 100644
index 000000000..05174f5d1
--- /dev/null
+++ b/apps/ember-test-app/tests/unit/validators/base-test.ts
@@ -0,0 +1,569 @@
+import { setOwner } from '@ember/application';
+import { tracked } from '@glimmer/tracking';
+import { bind } from '@nrg-ui/ember/helpers/bind';
+import { BaseValidator } from '@nrg-ui/ember/validation';
+import { addTranslations, setupIntl } from 'ember-intl/test-support';
+import { setupTest } from 'ember-test-app/tests/helpers';
+import { module, test } from 'qunit';
+
+import type Owner from '@ember/owner';
+import type { TestContext as TC } from '@ember/test-helpers';
+import type { Binding } from '@nrg-ui/ember';
+import type { BaseOptions, ValidateFnResponse } from '@nrg-ui/ember/validation';
+
+class Model {
+  @tracked
+  disabled: boolean = false;
+}
+
+type DummyOptions<T extends ValidateFnResponse> = BaseOptions & {
+  value?: T;
+};
+
+class DummyValidator<T extends ValidateFnResponse> extends BaseValidator<
+  T,
+  Model,
+  Model,
+  DummyOptions<T>
+> {
+  validate(
+    this: BaseValidator<T, Model, Model, DummyOptions<T>>,
+    value: T,
+    options: DummyOptions<T>,
+  ) {
+    return options.value ?? true;
+  }
+}
+
+declare type TestContext = {
+  binding: Binding<Model>;
+  model: Model;
+} & TC;
+
+module('Unit | Validator | base', function (hooks) {
+  setupTest(hooks);
+  setupIntl(hooks, 'en-us');
+
+  hooks.beforeEach(function (this: TestContext) {
+    this.model = new Model();
+    this.binding = bind(this.model, 'field');
+
+    setOwner(this.model, this.owner);
+  });
+
+  test('`validate` function is required', function (this: TestContext, assert) {
+    assert.expect(1);
+
+    assert.throws(() => {
+      // @ts-expect-error TS disallows instantiating an abstract class
+      const validator = new BaseValidator(this.binding, {}, this.model);
+      const result = validator.result;
+
+      assert.notOk(
+        true,
+        'Expected an error, but got a result instead: ' + result,
+      );
+    }, new Error('Assertion Failed: BaseValidator requires the `validate` function to be implemented by subclasses'));
+  });
+
+  test('`binding` option is required', function (this: TestContext, assert) {
+    assert.expect(1);
+
+    assert.throws(() => {
+      // @ts-expect-error Testing that the `binding` option is required
+      const validator = new DummyValidator(null, {}, this.model);
+      const result = validator.result;
+
+      assert.notOk(
+        true,
+        'Expected an error, but got a result instead: ' + result,
+      );
+    }, new Error('Assertion Failed: You must provide a binding argument to DummyValidator'));
+  });
+
+  test('owner is required', function (this: TestContext, assert) {
+    assert.expect(3);
+
+    assert.throws(() => {
+      setOwner(this.model, undefined as unknown as Owner);
+      const validator = new DummyValidator(this.binding, {}, this.model);
+      const result = validator.result;
+
+      assert.notOk(
+        true,
+        'Expected an error, but got a result instead: ' + result,
+      );
+    }, new Error('Assertion Failed: The `context` or `model` must be have an owner. Usually this means the `context` or `model` is an EmberObject or GlimmerComponent, but this can be manually set up with `setOwner`'));
+
+    try {
+      setOwner(this.model, this.owner);
+      const validator = new DummyValidator(this.binding, {}, this.model);
+      const result = validator.result;
+
+      assert.true(result.isValid);
+    } catch (e) {
+      assert.notOk(true, 'Expected no error, but got an error instead: ' + e);
+    }
+
+    try {
+      const context = new Model();
+      setOwner(context, this.owner);
+      setOwner(this.model, null as unknown as Owner);
+      const validator = new DummyValidator(this.binding, {}, context);
+      const result = validator.result;
+
+      assert.true(result.isValid);
+    } catch (e) {
+      assert.notOk(true, 'Expected no error, but got an error instead: ' + e);
+    }
+  });
+
+  test('response can be a boolean', function (this: TestContext, assert) {
+    let validator: DummyValidator<boolean> = new DummyValidator(
+      this.binding,
+      {
+        value: true,
+      },
+      this.model,
+    );
+
+    let result = validator.result;
+
+    assert.deepEqual(result, {
+      isValid: true,
+      isWarning: false,
+      message: undefined,
+    });
+
+    validator = new DummyValidator(
+      this.binding,
+      {
+        value: false,
+      },
+      this.model,
+    );
+
+    result = validator.result;
+
+    assert.deepEqual(result, {
+      isValid: false,
+      isWarning: false,
+      message: undefined,
+    });
+
+    validator = new DummyValidator(
+      this.binding,
+      {
+        value: false,
+        isWarning: true,
+      },
+      this.model,
+    );
+
+    result = validator.result;
+
+    assert.deepEqual(result, {
+      isValid: false,
+      isWarning: true,
+      message: undefined,
+    });
+  });
+
+  test('response can be a string', function (this: TestContext, assert) {
+    const errorMessage = 'This field is really invalid';
+    const validator = new DummyValidator(
+      this.binding,
+      {
+        value: errorMessage,
+      },
+      this.model,
+    );
+
+    const result = validator.result;
+
+    assert.deepEqual(result, {
+      isValid: false,
+      isWarning: false,
+      message: errorMessage,
+    });
+  });
+
+  test('response can include a message', function (this: TestContext, assert) {
+    const errorMessage = 'This field is really invalid';
+    let validator = new DummyValidator(
+      this.binding,
+      {
+        value: false,
+        message: errorMessage,
+      },
+      this.model,
+    );
+
+    let result = validator.result;
+
+    assert.deepEqual(result, {
+      isValid: false,
+      isWarning: false,
+      message: errorMessage,
+    });
+
+    validator = new DummyValidator(
+      this.binding,
+      {
+        value: false,
+        message: errorMessage,
+        isWarning: true,
+      },
+      this.model,
+    );
+
+    result = validator.result;
+
+    assert.deepEqual(result, {
+      isValid: false,
+      isWarning: true,
+      message: errorMessage,
+    });
+  });
+
+  test('message from options supersedes response message', function (this: TestContext, assert) {
+    let validator = new DummyValidator(
+      this.binding,
+      {
+        value: {
+          isValid: false,
+          message: 'This is the response message',
+        },
+        message: 'This is the options message',
+      },
+      this.model,
+    );
+
+    let result = validator.result;
+
+    assert.deepEqual(result, {
+      isValid: false,
+      isWarning: false,
+      message: 'This is the options message',
+    });
+
+    validator = new DummyValidator(
+      this.binding,
+      {
+        value: {
+          isValid: false,
+          message: 'This is the response message',
+        },
+        message: 'This is the options message',
+        isWarning: true,
+      },
+      this.model,
+    );
+
+    result = validator.result;
+
+    assert.deepEqual(result, {
+      isValid: false,
+      isWarning: true,
+      message: 'This is the options message',
+    });
+  });
+
+  test('response can include a key', function (this: TestContext, assert) {
+    let validator = new DummyValidator(
+      this.binding,
+      {
+        value: false,
+        key: 'greeting',
+      },
+      this.model,
+    );
+
+    let result = validator.result;
+
+    assert.deepEqual(result, {
+      isValid: false,
+      isWarning: false,
+      message: 'Hello, world!',
+    });
+
+    validator = new DummyValidator(
+      this.binding,
+      {
+        value: false,
+        message: 'Hello, world!',
+        isWarning: true,
+      },
+      this.model,
+    );
+
+    result = validator.result;
+
+    assert.deepEqual(result, {
+      isValid: false,
+      isWarning: true,
+      message: 'Hello, world!',
+    });
+  });
+
+  test('key from options supersedes response key', async function (this: TestContext, assert) {
+    await addTranslations('en-us', {
+      'my.key': 'This is the correct message',
+    });
+
+    let validator = new DummyValidator(
+      this.binding,
+      {
+        value: {
+          isValid: false,
+          key: 'greeting',
+        },
+        key: 'my.key',
+      },
+      this.model,
+    );
+
+    let result = validator.result;
+
+    assert.deepEqual(result, {
+      isValid: false,
+      isWarning: false,
+      message: 'This is the correct message',
+    });
+
+    validator = new DummyValidator(
+      this.binding,
+      {
+        value: {
+          isValid: false,
+          key: 'greeting',
+        },
+        key: 'my.key',
+        isWarning: true,
+      },
+      this.model,
+    );
+
+    result = validator.result;
+
+    assert.deepEqual(result, {
+      isValid: false,
+      isWarning: true,
+      message: 'This is the correct message',
+    });
+  });
+
+  test('key from options supersedes response message', async function (this: TestContext, assert) {
+    await addTranslations('en-us', {
+      'my.key': 'This is the correct message',
+    });
+
+    let validator = new DummyValidator(
+      this.binding,
+      {
+        value: {
+          isValid: false,
+          message: 'This is the wrong message',
+        },
+        key: 'my.key',
+      },
+      this.model,
+    );
+
+    let result = validator.result;
+
+    assert.deepEqual(result, {
+      isValid: false,
+      isWarning: false,
+      message: 'This is the correct message',
+    });
+
+    validator = new DummyValidator(
+      this.binding,
+      {
+        value: {
+          isValid: false,
+          message: 'This is the wrong message',
+        },
+        key: 'my.key',
+        isWarning: true,
+      },
+      this.model,
+    );
+
+    result = validator.result;
+
+    assert.deepEqual(result, {
+      isValid: false,
+      isWarning: true,
+      message: 'This is the correct message',
+    });
+  });
+
+  test('message from options supersedes response key', async function (this: TestContext, assert) {
+    let validator = new DummyValidator(
+      this.binding,
+      {
+        value: {
+          isValid: false,
+          key: 'greeting',
+        },
+        message: 'This is the correct message',
+      },
+      this.model,
+    );
+
+    let result = validator.result;
+
+    assert.deepEqual(result, {
+      isValid: false,
+      isWarning: false,
+      message: 'This is the correct message',
+    });
+
+    validator = new DummyValidator(
+      this.binding,
+      {
+        value: {
+          isValid: false,
+          key: 'greeting',
+        },
+        message: 'This is the correct message',
+        isWarning: true,
+      },
+      this.model,
+    );
+
+    result = validator.result;
+
+    assert.deepEqual(result, {
+      isValid: false,
+      isWarning: true,
+      message: 'This is the correct message',
+    });
+  });
+
+  test('key from options supersedes options message', async function (this: TestContext, assert) {
+    await addTranslations('en-us', {
+      'my.key': 'This is the correct message',
+    });
+
+    let validator = new DummyValidator(
+      this.binding,
+      {
+        value: {
+          isValid: false,
+        },
+        message: 'This is the wrong message',
+        key: 'my.key',
+      },
+      this.model,
+    );
+
+    let result = validator.result;
+
+    assert.deepEqual(result, {
+      isValid: false,
+      isWarning: false,
+      message: 'This is the correct message',
+    });
+
+    validator = new DummyValidator(
+      this.binding,
+      {
+        value: {
+          isValid: false,
+        },
+        message: 'This is the wrong message',
+        key: 'my.key',
+        isWarning: true,
+      },
+      this.model,
+    );
+
+    result = validator.result;
+
+    assert.deepEqual(result, {
+      isValid: false,
+      isWarning: true,
+      message: 'This is the correct message',
+    });
+  });
+
+  test('key from response supersedes response message', async function (this: TestContext, assert) {
+    await addTranslations('en-us', {
+      'my.key': 'This is the correct message',
+    });
+
+    let validator = new DummyValidator(
+      this.binding,
+      {
+        value: {
+          isValid: false,
+          key: 'my.key',
+          message: 'This is the wrong message',
+        },
+      },
+      this.model,
+    );
+
+    let result = validator.result;
+
+    assert.deepEqual(result, {
+      isValid: false,
+      isWarning: false,
+      message: 'This is the correct message',
+    });
+
+    validator = new DummyValidator(
+      this.binding,
+      {
+        value: {
+          isValid: false,
+          key: 'my.key',
+          message: 'This is the wrong message',
+        },
+        isWarning: true,
+      },
+      this.model,
+    );
+
+    result = validator.result;
+
+    assert.deepEqual(result, {
+      isValid: false,
+      isWarning: true,
+      message: 'This is the correct message',
+    });
+  });
+
+  test('disabled option works', async function (this: TestContext, assert) {
+    const validator = new DummyValidator(
+      this.binding,
+      {
+        value: false,
+        message: 'This field is bad',
+        disabled() {
+          return this.disabled;
+        },
+      },
+      this.model,
+    );
+
+    let result = validator.result;
+
+    assert.deepEqual(result, {
+      isValid: false,
+      isWarning: false,
+      message: 'This field is bad',
+    });
+
+    this.model.disabled = true;
+
+    result = validator.result;
+
+    assert.deepEqual(result, {
+      isValid: true,
+    });
+  });
+});

From 33a701dd66a765c08b26ea574080216983633037 Mon Sep 17 00:00:00 2001
From: TSenter <tyler.senter.427@gmail.com>
Date: Thu, 22 Aug 2024 09:31:00 -0400
Subject: [PATCH 12/13] chore: Disable prototype extension

---
 apps/ember-test-app/config/environment.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/ember-test-app/config/environment.js b/apps/ember-test-app/config/environment.js
index 85d4b7e0f..9c44ae667 100644
--- a/apps/ember-test-app/config/environment.js
+++ b/apps/ember-test-app/config/environment.js
@@ -7,7 +7,7 @@ module.exports = function (environment) {
     rootURL: '/',
     locationType: 'history',
     EmberENV: {
-      EXTEND_PROTOTYPES: true,
+      EXTEND_PROTOTYPES: false,
       FEATURES: {
         // Here you can enable experimental features on an ember canary build
         // e.g. EMBER_NATIVE_DECORATOR_SUPPORT: true

From 9373de9a5ae272bd38dc5be25c56468104cf601e Mon Sep 17 00:00:00 2001
From: TSenter <tyler.senter.427@gmail.com>
Date: Thu, 22 Aug 2024 15:56:34 -0400
Subject: [PATCH 13/13] chore: PR review

---
 apps/ember-test-app/app/components/f/form.gts | 44 +++++++++++++++---
 .../tests/unit/validators/base-test.ts        | 46 +++++++++----------
 2 files changed, 61 insertions(+), 29 deletions(-)

diff --git a/apps/ember-test-app/app/components/f/form.gts b/apps/ember-test-app/app/components/f/form.gts
index 992a240aa..900f1cd64 100644
--- a/apps/ember-test-app/app/components/f/form.gts
+++ b/apps/ember-test-app/app/components/f/form.gts
@@ -30,14 +30,29 @@ const Validators = {
     }),
   ],
   radio: [validator('exclusion', { in: ['A', 'B'], isWarning: true })],
-  phone: validator('length', {
-    max: 10,
-    isWarning: true,
-    message: 'Phone number cannot contain a country code',
-  }),
+  phone: [
+    validator('length', {
+      min: 10,
+      message: 'Phone number must contain a 3-digit area code',
+      disabled() {
+        return !this.requirePhoneLength;
+      },
+    }),
+    validator('length', {
+      max: 10,
+      isWarning: true,
+      message: 'Phone number cannot contain a country code',
+      disabled() {
+        return !this.requirePhoneLength;
+      },
+    }),
+  ],
 };
 
 class Model {
+  @tracked
+  requirePhoneLength = true;
+
   @tracked
   textField = '';
 
@@ -96,6 +111,11 @@ export default class extends Component {
     this.required = !this.required;
   }
 
+  @action
+  toggleRequirePhoneLength() {
+    this.model.requirePhoneLength = !this.model.requirePhoneLength;
+  }
+
   @action
   onSubmit() {
     alert('Form submitted');
@@ -149,7 +169,11 @@ export default class extends Component {
           </Form.Field>
         </div>
         <div class="mb-3">
-          <Form.Field @label="Phone Number" @required={{true}} as |Field|>
+          <Form.Field
+            @label="Phone Number"
+            @required={{this.required}}
+            as |Field|
+          >
             <Field.Phone @binding={{bind this.model "phone"}} />
           </Form.Field>
         </div>
@@ -159,6 +183,14 @@ export default class extends Component {
           @text="Toggle Required"
           @onClick={{this.toggleRequired}}
         />
+        <Button
+          class="btn{{unless
+              this.model.requirePhoneLength
+              '-outline'
+            }}-secondary mt-3"
+          @text="Toggle Phone Length"
+          @onClick={{this.toggleRequirePhoneLength}}
+        />
       </Form>
       <hr />
       <div class="grid">
diff --git a/apps/ember-test-app/tests/unit/validators/base-test.ts b/apps/ember-test-app/tests/unit/validators/base-test.ts
index 05174f5d1..28d9e404a 100644
--- a/apps/ember-test-app/tests/unit/validators/base-test.ts
+++ b/apps/ember-test-app/tests/unit/validators/base-test.ts
@@ -17,7 +17,7 @@ class Model {
 }
 
 type DummyOptions<T extends ValidateFnResponse> = BaseOptions & {
-  value?: T;
+  response?: T;
 };
 
 class DummyValidator<T extends ValidateFnResponse> extends BaseValidator<
@@ -31,7 +31,7 @@ class DummyValidator<T extends ValidateFnResponse> extends BaseValidator<
     value: T,
     options: DummyOptions<T>,
   ) {
-    return options.value ?? true;
+    return options.response ?? true;
   }
 }
 
@@ -122,7 +122,7 @@ module('Unit | Validator | base', function (hooks) {
     let validator: DummyValidator<boolean> = new DummyValidator(
       this.binding,
       {
-        value: true,
+        response: true,
       },
       this.model,
     );
@@ -138,7 +138,7 @@ module('Unit | Validator | base', function (hooks) {
     validator = new DummyValidator(
       this.binding,
       {
-        value: false,
+        response: false,
       },
       this.model,
     );
@@ -154,7 +154,7 @@ module('Unit | Validator | base', function (hooks) {
     validator = new DummyValidator(
       this.binding,
       {
-        value: false,
+        response: false,
         isWarning: true,
       },
       this.model,
@@ -174,7 +174,7 @@ module('Unit | Validator | base', function (hooks) {
     const validator = new DummyValidator(
       this.binding,
       {
-        value: errorMessage,
+        response: errorMessage,
       },
       this.model,
     );
@@ -193,7 +193,7 @@ module('Unit | Validator | base', function (hooks) {
     let validator = new DummyValidator(
       this.binding,
       {
-        value: false,
+        response: false,
         message: errorMessage,
       },
       this.model,
@@ -210,7 +210,7 @@ module('Unit | Validator | base', function (hooks) {
     validator = new DummyValidator(
       this.binding,
       {
-        value: false,
+        response: false,
         message: errorMessage,
         isWarning: true,
       },
@@ -230,7 +230,7 @@ module('Unit | Validator | base', function (hooks) {
     let validator = new DummyValidator(
       this.binding,
       {
-        value: {
+        response: {
           isValid: false,
           message: 'This is the response message',
         },
@@ -250,7 +250,7 @@ module('Unit | Validator | base', function (hooks) {
     validator = new DummyValidator(
       this.binding,
       {
-        value: {
+        response: {
           isValid: false,
           message: 'This is the response message',
         },
@@ -273,7 +273,7 @@ module('Unit | Validator | base', function (hooks) {
     let validator = new DummyValidator(
       this.binding,
       {
-        value: false,
+        response: false,
         key: 'greeting',
       },
       this.model,
@@ -290,7 +290,7 @@ module('Unit | Validator | base', function (hooks) {
     validator = new DummyValidator(
       this.binding,
       {
-        value: false,
+        response: false,
         message: 'Hello, world!',
         isWarning: true,
       },
@@ -314,7 +314,7 @@ module('Unit | Validator | base', function (hooks) {
     let validator = new DummyValidator(
       this.binding,
       {
-        value: {
+        response: {
           isValid: false,
           key: 'greeting',
         },
@@ -334,7 +334,7 @@ module('Unit | Validator | base', function (hooks) {
     validator = new DummyValidator(
       this.binding,
       {
-        value: {
+        response: {
           isValid: false,
           key: 'greeting',
         },
@@ -361,7 +361,7 @@ module('Unit | Validator | base', function (hooks) {
     let validator = new DummyValidator(
       this.binding,
       {
-        value: {
+        response: {
           isValid: false,
           message: 'This is the wrong message',
         },
@@ -381,7 +381,7 @@ module('Unit | Validator | base', function (hooks) {
     validator = new DummyValidator(
       this.binding,
       {
-        value: {
+        response: {
           isValid: false,
           message: 'This is the wrong message',
         },
@@ -404,7 +404,7 @@ module('Unit | Validator | base', function (hooks) {
     let validator = new DummyValidator(
       this.binding,
       {
-        value: {
+        response: {
           isValid: false,
           key: 'greeting',
         },
@@ -424,7 +424,7 @@ module('Unit | Validator | base', function (hooks) {
     validator = new DummyValidator(
       this.binding,
       {
-        value: {
+        response: {
           isValid: false,
           key: 'greeting',
         },
@@ -451,7 +451,7 @@ module('Unit | Validator | base', function (hooks) {
     let validator = new DummyValidator(
       this.binding,
       {
-        value: {
+        response: {
           isValid: false,
         },
         message: 'This is the wrong message',
@@ -471,7 +471,7 @@ module('Unit | Validator | base', function (hooks) {
     validator = new DummyValidator(
       this.binding,
       {
-        value: {
+        response: {
           isValid: false,
         },
         message: 'This is the wrong message',
@@ -498,7 +498,7 @@ module('Unit | Validator | base', function (hooks) {
     let validator = new DummyValidator(
       this.binding,
       {
-        value: {
+        response: {
           isValid: false,
           key: 'my.key',
           message: 'This is the wrong message',
@@ -518,7 +518,7 @@ module('Unit | Validator | base', function (hooks) {
     validator = new DummyValidator(
       this.binding,
       {
-        value: {
+        response: {
           isValid: false,
           key: 'my.key',
           message: 'This is the wrong message',
@@ -541,7 +541,7 @@ module('Unit | Validator | base', function (hooks) {
     const validator = new DummyValidator(
       this.binding,
       {
-        value: false,
+        response: false,
         message: 'This field is bad',
         disabled() {
           return this.disabled;