chore: revert prevValidation result, make prevShown Validator[]

.eslintignore

@@ -2,6 +2,7 @@ node_modules
 coverage/
 bundlesize/
 .history/
+storybook-static/
 *.d.ts
 _site-dev
 _site

packages/form-core/src/validate/ResultValidator.js

@@ -10,12 +10,20 @@ export class ResultValidator extends Validator {
   /**
    * @param {Object} context
    * @param {Validator[]} context.regularValidationResult
-   * @param {string} context.prevShownValidationFeedback
+   * @param {Validator[]} context.prevValidationResult
+   * @param {Validator[]} context.prevShownValidationResult
    * @param {Validator[]} [context.validators]
    * @returns {boolean}
    */
-  // eslint-disable-next-line no-unused-vars, class-methods-use-this
+  /* eslint-disable no-unused-vars */
-  executeOnResults({ regularValidationResult, prevShownValidationFeedback, validators }) {
+  // eslint-disable-next-line class-methods-use-this
+  executeOnResults({
+    regularValidationResult,
+    prevValidationResult,
+    prevShownValidationResult,
+    validators,
+  }) {
+    /* eslint-enable no-unused-vars */
     return true;
   }
 }

packages/form-core/src/validate/ValidateMixin.js

@@ -161,8 +161,10 @@ export const ValidateMixinImplementation = superclass =>
        * @type {Validator[]}
        */
       this.__validationResult = [];
-      /** @type {string} */
+      /** @type {Validator[]} */
-      this.__prevShownValidationFeedback = '';
+      this.__prevValidationResult = [];
+      /** @type {Validator[]} */
+      this.__prevShownValidationResult = [];
 
       this.__onValidatorUpdated = this.__onValidatorUpdated.bind(this);
       this._updateFeedbackComponent = this._updateFeedbackComponent.bind(this);
@@ -279,6 +281,7 @@ export const ValidateMixinImplementation = superclass =>
         return;
       }
 
+      this.__prevValidationResult = this.__validationResult;
       if (clearCurrentResult) {
         // Clear ('invalidate') all pending and existing validation results.
         // This is needed because we have async (pending) validators whose results
@@ -396,7 +399,8 @@ export const ValidateMixinImplementation = superclass =>
       return resultValidators.filter(v =>
         v.executeOnResults({
           regularValidationResult,
-          prevShownValidationFeedback: this.__prevShownValidationFeedback,
+          prevValidationResult: this.__prevValidationResult,
+          prevShownValidationResult: this.__prevShownValidationResult,
         }),
       );
     }
@@ -579,7 +583,7 @@ export const ValidateMixinImplementation = superclass =>
           });
 
           if (this.__prioritizedResult.length > 0) {
-            this.__prevShownValidationFeedback = this.__prioritizedResult[0].type;
+            this.__prevShownValidationResult = this.__prioritizedResult;
           }
 
           const messageMap = await this.__getFeedbackMessages(this.__prioritizedResult);

packages/form-core/src/validate/resultValidators/DefaultSuccess.js

@@ -17,18 +17,17 @@ export class DefaultSuccess extends ResultValidator {
    *
    * @param {Object} context
    * @param {Validator[]} context.regularValidationResult
-   * @param {string} context.prevShownValidationFeedback
+   * @param {Validator[]} context.prevValidationResult
+   * @param {Validator[]} context.prevShownValidationResult
    * @returns {boolean}
    */
   // eslint-disable-next-line class-methods-use-this
-  executeOnResults({ regularValidationResult, prevShownValidationFeedback }) {
+  executeOnResults({ regularValidationResult, prevShownValidationResult }) {
     const errorOrWarning = /** @param {Validator} v */ v =>
       v.type === 'error' || v.type === 'warning';
     const hasErrorOrWarning = !!regularValidationResult.filter(errorOrWarning).length;
+    const hasShownErrorOrWarning = !!prevShownValidationResult.filter(errorOrWarning).length;
 
-    return (
+    return !hasErrorOrWarning && hasShownErrorOrWarning;
-      !hasErrorOrWarning &&
-      (prevShownValidationFeedback === 'error' || prevShownValidationFeedback === 'warning')
-    );
   }
 }

packages/form-core/test-suites/ValidateMixin.suite.js

@@ -550,19 +550,16 @@ export function runValidateMixinSuite(customConfig) {
          *
          * @param {Object} context
          * @param {Validator[]} context.regularValidationResult
-         * @param {string} context.prevShownValidationFeedback
+         * @param {Validator[]} context.prevShownValidationResult
          * @returns {boolean}
          */
         // eslint-disable-next-line class-methods-use-this
-        executeOnResults({ regularValidationResult, prevShownValidationFeedback }) {
+        executeOnResults({ regularValidationResult, prevShownValidationResult }) {
           const errorOrWarning = /** @param {Validator} v */ v =>
             v.type === 'error' || v.type === 'warning';
           const hasErrorOrWarning = !!regularValidationResult.filter(errorOrWarning).length;
-
+          const hasShownErrorOrWarning = !!prevShownValidationResult.filter(errorOrWarning).length;
-          return (
+          return !hasErrorOrWarning && hasShownErrorOrWarning;
-            !hasErrorOrWarning &&
-            (prevShownValidationFeedback === 'error' || prevShownValidationFeedback === 'warning')
-          );
         }
       };
 
@@ -613,7 +610,8 @@ export function runValidateMixinSuite(customConfig) {
               .modelValue=${'myValue'}
             >${lightDom}</${withSuccessTag}>
           `));
-        const prevShownValidationFeedback = el.__prevShownValidationFeedback;
+        const prevValidationResult = el.__prevValidationResult;
+        const prevShownValidationResult = el.__prevShownValidationResult;
         const regularValidationResult = [
           ...el.__syncValidationResult,
           ...el.__asyncValidationResult,
@@ -621,7 +619,8 @@ export function runValidateMixinSuite(customConfig) {
 
         expect(resultValidateSpy.args[0][0]).to.eql({
           regularValidationResult,
-          prevShownValidationFeedback,
+          prevValidationResult,
+          prevShownValidationResult,
         });
       });
 

packages/form-core/test/validate/ResultValidator.test.js

@@ -1,5 +1,6 @@
 import { expect } from '@open-wc/testing';
 import { ResultValidator } from '../../src/validate/ResultValidator.js';
+import { DefaultSuccess } from '../../src/validate/resultValidators/DefaultSuccess.js';
 import { Required } from '../../src/validate/validators/Required.js';
 import { MinLength } from '../../src/validate/validators/StringValidators.js';
 
@@ -15,19 +16,31 @@ describe('ResultValidator', () => {
        *
        * @param {Object} context
        * @param {Validator[]} context.regularValidationResult
-       * @param {string} context.prevShownValidationFeedback
+       * @param {Validator[]} context.prevValidationResult
+       * @param {Validator[]} context.prevShownValidationResult
        * @returns {boolean}
        */
-      executeOnResults({ regularValidationResult, prevShownValidationFeedback }) {
+      executeOnResults({ regularValidationResult, prevShownValidationResult }) {
-        const hasSuccess =
+        const errorOrWarning = /** @param {Validator} v */ v =>
-          regularValidationResult.length && prevShownValidationFeedback === 'error';
+          v.type === 'error' || v.type === 'warning';
-        return !!hasSuccess;
+        const hasErrorOrWarning = !!regularValidationResult.filter(errorOrWarning).length;
+        const hasShownErrorOrWarning = !!prevShownValidationResult.filter(errorOrWarning).length;
+
+        return !hasErrorOrWarning && hasShownErrorOrWarning;
       }
     }
     expect(
       new MyResultValidator().executeOnResults({
         regularValidationResult: [new Required(), new MinLength(3)],
-        prevShownValidationFeedback: 'error',
+        prevValidationResult: [],
+        prevShownValidationResult: [],
+      }),
+    ).to.be.false;
+    expect(
+      new MyResultValidator().executeOnResults({
+        regularValidationResult: [new DefaultSuccess()],
+        prevValidationResult: [new Required()],
+        prevShownValidationResult: [new Required()],
       }),
     ).to.be.true;
   });

packages/form-core/types/validate/ValidateMixinTypes.d.ts

@@ -37,7 +37,8 @@ export declare class ValidateHost {
   __syncValidationResult: Validator[];
   __asyncValidationResult: Validator[];
   __validationResult: Validator[];
-  __prevShownValidationFeedback: string;
+  __prevValidationResult: Validator[];
+  __prevShownValidationResult: Validator[];
 
   connectedCallback(): void;
   disconnectedCallback(): void;