aria-ease 6.12.1 → 6.14.0

package/dist/{MenuComponentStrategy-JAMTCSNF.js → MenuComponentStrategy-VYCC2XOM.js}

@@ -22,7 +22,7 @@ var MenuComponentStrategy = class {
     if (!closeSelector && this.selectors.focusable) {
       closeSelector = this.selectors.focusable;
     } else if (!closeSelector) {
-      closeSelector = this.selectors.trigger;
+      closeSelector = this.selectors.main;
     }
     if (closeSelector) {
       const closeElement = page.locator(closeSelector).first();
@@ -30,8 +30,8 @@ var MenuComponentStrategy = class {
       await page.keyboard.press("Escape");
       menuClosed = await (0, test_exports.expect)(popupElement).toBeHidden({ timeout: this.assertionTimeoutMs }).then(() => true).catch(() => false);
     }
-    if (!menuClosed && this.selectors.trigger) {
-      const triggerElement = page.locator(this.selectors.trigger).first();
+    if (!menuClosed && this.selectors.main) {
+      const triggerElement = page.locator(this.selectors.main).first();
       await triggerElement.click({ timeout: this.actionTimeoutMs });
       menuClosed = await (0, test_exports.expect)(popupElement).toBeHidden({ timeout: this.assertionTimeoutMs }).then(() => true).catch(() => false);
     }
@@ -51,8 +51,8 @@ This indicates a problem with the menu component's close functionality.`
     if (this.selectors.input) {
       await page.locator(this.selectors.input).first().clear();
     }
-    if (this.selectors.trigger) {
-      const triggerElement = page.locator(this.selectors.trigger).first();
+    if (this.selectors.main) {
+      const triggerElement = page.locator(this.selectors.main).first();
       await triggerElement.focus();
     }
   }

package/dist/{buildContracts-FT6KWUJN.js → buildContracts-VIV6GM56.js}

@@ -214,25 +214,6 @@ function validateContractSchema(contract) {
       });
     }
   }
-  if (c.states !== void 0) {
-    if (!Array.isArray(c.states)) {
-      errors.push({ path: "$.states", message: "states must be an array" });
-    } else {
-      c.states.forEach((state, idx) => {
-        if (typeof state !== "object" || state === null) {
-          errors.push({ path: `$.states[${idx}]`, message: "state must be an object" });
-          return;
-        }
-        const s = state;
-        if (typeof s.name !== "string") {
-          errors.push({ path: `$.states[${idx}].name`, message: "name is required and must be a string" });
-        }
-        if (!Array.isArray(s.requires)) {
-          errors.push({ path: `$.states[${idx}].requires`, message: "requires is required and must be an array" });
-        }
-      });
-    }
-  }
   return {
     valid: errors.length === 0,
     errors
@@ -308,17 +289,8 @@ function validateTargetReferences(contract, selectorKeys) {
     });
   }
   const dynamicItems = c.dynamic;
-  const states = c.states;
-  const stateNames = new Set((states || []).map((s) => String(s.name)));
   if (Array.isArray(dynamicItems)) {
     dynamicItems.forEach((item, itemIdx) => {
-      const given = item.given;
-      if (given && !stateNames.has(given)) {
-        errors.push({
-          path: `$.dynamic[${itemIdx}].given`,
-          message: `State '${given}' not found in states`
-        });
-      }
       const actions = item.action;
       if (Array.isArray(actions)) {
         actions.forEach((action, actIdx) => {

package/dist/cli.cjs

@@ -1155,7 +1155,7 @@ var init_MenuComponentStrategy = __esm({
         if (!closeSelector && this.selectors.focusable) {
           closeSelector = this.selectors.focusable;
         } else if (!closeSelector) {
-          closeSelector = this.selectors.trigger;
+          closeSelector = this.selectors.main;
         }
         if (closeSelector) {
           const closeElement = page.locator(closeSelector).first();
@@ -1163,8 +1163,8 @@ var init_MenuComponentStrategy = __esm({
           await page.keyboard.press("Escape");
           menuClosed = await (0, test_exports.expect)(popupElement).toBeHidden({ timeout: this.assertionTimeoutMs }).then(() => true).catch(() => false);
         }
-        if (!menuClosed && this.selectors.trigger) {
-          const triggerElement = page.locator(this.selectors.trigger).first();
+        if (!menuClosed && this.selectors.main) {
+          const triggerElement = page.locator(this.selectors.main).first();
           await triggerElement.click({ timeout: this.actionTimeoutMs });
           menuClosed = await (0, test_exports.expect)(popupElement).toBeHidden({ timeout: this.assertionTimeoutMs }).then(() => true).catch(() => false);
         }
@@ -1184,8 +1184,8 @@ This indicates a problem with the menu component's close functionality.`
         if (this.selectors.input) {
           await page.locator(this.selectors.input).first().clear();
         }
-        if (this.selectors.trigger) {
-          const triggerElement = page.locator(this.selectors.trigger).first();
+        if (this.selectors.main) {
+          const triggerElement = page.locator(this.selectors.main).first();
           await triggerElement.focus();
         }
       }
@@ -1977,13 +1977,21 @@ var init_AssertionRunner = __esm({
       /**
        * Validate focus assertion
        */
-      async validateFocus(target, targetName, failureMessage, testDescription) {
+      async validateFocus(target, targetName, expectedFocus, failureMessage, testDescription) {
         try {
-          await (0, test_exports.expect)(target).toBeFocused({ timeout: this.timeoutMs });
-          return {
-            success: true,
-            passMessage: `${targetName} has focus as expected. Test: "${testDescription}".`
-          };
+          if (expectedFocus) {
+            await (0, test_exports.expect)(target).toBeFocused({ timeout: this.timeoutMs });
+            return {
+              success: true,
+              passMessage: `${targetName} has focus as expected. Test: "${testDescription}".`
+            };
+          } else {
+            await (0, test_exports.expect)(target).not.toBeFocused({ timeout: this.timeoutMs });
+            return {
+              success: true,
+              passMessage: `${targetName} does not have focus as expected. Test: "${testDescription}".`
+            };
+          }
         } catch {
           const actualFocus = await this.page.evaluate(() => {
             const focused = document.activeElement;
@@ -2069,7 +2077,9 @@ var init_AssertionRunner = __esm({
             }
             return { success: false, failMessage: "Missing expectedValue for toHaveValue assertion" };
           case "toHaveFocus":
-            return this.validateFocus(target, assertion.target, assertion.failureMessage || "", testDescription);
+            return this.validateFocus(target, assertion.target, true, assertion.failureMessage || "", testDescription);
+          case "notToHaveFocus":
+            return this.validateFocus(target, assertion.target, false, assertion.failureMessage || "", testDescription);
           case "toHaveRole":
             if (assertion.expectedValue !== void 0) {
               return this.validateRole(target, assertion.target, assertion.expectedValue, assertion.failureMessage || "", testDescription);
@@ -2092,12 +2102,7 @@ async function runContractTestsPlaywright(componentName, url, strictness, config
   const componentConfig = config?.test?.components?.find((c) => c.name === componentName);
   const isCustomContract = !!componentConfig?.contractPath;
   const reporter = new ContractReporter(true, isCustomContract);
-  const defaultTimeouts = {
-    actionTimeoutMs: 400,
-    assertionTimeoutMs: 400,
-    navigationTimeoutMs: 3e4,
-    componentReadyTimeoutMs: 5e3
-  };
+  const defaultTimeouts = { actionTimeoutMs: 400, assertionTimeoutMs: 400, navigationTimeoutMs: 3e4, componentReadyTimeoutMs: 5e3 };
   const globalDisableTimeouts = config?.test?.disableTimeouts === true;
   const componentDisableTimeouts = componentConfig?.disableTimeouts === true;
   const disableTimeouts = componentDisableTimeouts || globalDisableTimeouts;
@@ -2109,11 +2114,7 @@ async function runContractTestsPlaywright(componentName, url, strictness, config
     }
     return value;
   };
-  const actionTimeoutMs = resolveTimeout(
-    componentConfig?.actionTimeoutMs,
-    config?.test?.actionTimeoutMs,
-    defaultTimeouts.actionTimeoutMs
-  );
+  const actionTimeoutMs = resolveTimeout(componentConfig?.actionTimeoutMs, config?.test?.actionTimeoutMs, defaultTimeouts.actionTimeoutMs);
   const assertionTimeoutMs = resolveTimeout(
     componentConfig?.assertionTimeoutMs,
     config?.test?.assertionTimeoutMs,
@@ -2213,8 +2214,8 @@ This usually means:
       );
     }
     reporter.start(componentName, totalTests, apgUrl);
-    if (componentName === "menu" && componentContract.selectors.trigger) {
-      await page.locator(componentContract.selectors.trigger).first().waitFor({ state: "attached", timeout: componentReadyTimeoutMs }).catch(() => {
+    if (componentName === "menu" && componentContract.selectors.main) {
+      await page.locator(componentContract.selectors.main).first().waitFor({ state: "visible", timeout: componentReadyTimeoutMs }).catch(() => {
       });
     }
     const hasSubmenuCapability = componentName === "menu" && !!componentContract.selectors.submenuTrigger ? await page.locator(componentContract.selectors.submenuTrigger).count() > 0 : false;
@@ -2223,7 +2224,42 @@ This usually means:
     let staticFailed = 0;
     let staticWarnings = 0;
     for (const rel of componentContract.relationships || []) {
+      if (strategy && typeof strategy.resetState === "function") {
+        try {
+          await strategy.resetState(page);
+        } catch (err) {
+          warnings.push(`Warning: resetState failed before relationship test: ${err instanceof Error ? err.message : String(err)}`);
+        }
+      }
       const relationshipLevel = normalizeLevel(rel.level);
+      if (Array.isArray(rel.setup) && rel.setup.length > 0) {
+        let isAllowedType2 = function(t) {
+          return allowedTypes.includes(t);
+        };
+        var isAllowedType = isAllowedType2;
+        const actionExecutor = new ActionExecutor(page, componentContract.selectors, actionTimeoutMs);
+        const relDescription = rel.type === "aria-reference" ? `${rel.from}.${rel.attribute} references ${rel.to}` : `${rel.parent} contains ${rel.child}`;
+        const allowedTypes = ["focus", "type", "click", "keypress", "hover"];
+        const toSetupAction = (a) => ({
+          ...a,
+          type: isAllowedType2(a.type) ? a.type : "click"
+        });
+        const setupActions = rel.setup.map(toSetupAction);
+        const setupResult = await runSetupActions(setupActions, actionExecutor, strategy, page, relDescription, ["submenu", "submenuTrigger", "submenuItems"]);
+        if (setupResult.skip) {
+          skipped.push(setupResult.message || "Setup action skipped");
+          reporter.reportStaticTest(relDescription, "skip", setupResult.message, relationshipLevel);
+          continue;
+        }
+        if (!setupResult.success) {
+          const failure = `Relationship setup failed: ${setupResult.error}`;
+          const outcome = classifyFailure(failure, rel.level);
+          if (outcome.status === "fail") staticFailed += 1;
+          if (outcome.status === "warn") staticWarnings += 1;
+          reporter.reportStaticTest(relDescription, outcome.status, outcome.detail, outcome.level);
+          continue;
+        }
+      }
       if (componentName === "menu" && !hasSubmenuCapability) {
         const involvesSubmenu = isSubmenuRelation(rel);
         if (involvesSubmenu) {
@@ -2396,7 +2432,53 @@ This usually means:
       }
     }
     const staticAssertionRunner = new AssertionRunner(page, componentContract.selectors, assertionTimeoutMs);
+    async function runSetupActions(setup, actionExecutor, strategy2, page2, description, skipKeywords = []) {
+      if (!Array.isArray(setup) || setup.length === 0) return { success: true };
+      if (strategy2 && typeof strategy2.resetState === "function") {
+        await strategy2.resetState(page2);
+      }
+      for (const setupAct of setup) {
+        let setupResult = { success: true };
+        try {
+          if (setupAct.type === "focus") {
+            if (setupAct.target === "relative" && setupAct.relativeTarget) {
+              setupResult = await actionExecutor.focus("relative", setupAct.relativeTarget);
+            } else {
+              setupResult = await actionExecutor.focus(setupAct.target);
+            }
+          } else if (setupAct.type === "type" && setupAct.value) {
+            setupResult = await actionExecutor.type(setupAct.target, setupAct.value);
+          } else if (setupAct.type === "click") {
+            setupResult = await actionExecutor.click(setupAct.target, setupAct.relativeTarget);
+          } else if (setupAct.type === "keypress" && setupAct.key) {
+            setupResult = await actionExecutor.keypress(setupAct.target, setupAct.key);
+          } else if (setupAct.type === "hover") {
+            setupResult = await actionExecutor.hover(setupAct.target, setupAct.relativeTarget);
+          } else {
+            continue;
+          }
+        } catch (err) {
+          setupResult = { success: false, error: err instanceof Error ? err.message : String(err) };
+        }
+        if (!setupResult.success) {
+          const setupMsg = setupResult.error || "Setup action failed";
+          const isSkip = skipKeywords.some((kw) => description.includes(kw) || setupMsg.includes(kw));
+          if (isSkip) {
+            return { success: false, skip: true, message: `Skipping test - capability not present: ${setupMsg}` };
+          }
+          return { success: false, error: setupMsg };
+        }
+      }
+      return { success: true };
+    }
     for (const test of componentContract.static[0]?.assertions || []) {
+      if (strategy && typeof strategy.resetState === "function") {
+        try {
+          await strategy.resetState(page);
+        } catch (err) {
+          warnings.push(`Warning: resetState failed before static test: ${err instanceof Error ? err.message : String(err)}`);
+        }
+      }
       if (test.target === "relative") continue;
       const staticDescription = `${test.target}${test.attribute ? ` (${test.attribute})` : ""}`;
       const staticLevel = normalizeLevel(test.level);
@@ -2406,6 +2488,33 @@ This usually means:
         reporter.reportStaticTest(staticDescription, "skip", skipMessage, staticLevel);
         continue;
       }
+      if (Array.isArray(test.setup) && test.setup.length > 0) {
+        let isAllowedType2 = function(t) {
+          return allowedTypes.includes(t);
+        };
+        var isAllowedType = isAllowedType2;
+        const actionExecutor = new ActionExecutor(page, componentContract.selectors, actionTimeoutMs);
+        const allowedTypes = ["focus", "type", "click", "keypress", "hover"];
+        const toSetupAction = (a) => ({
+          ...a,
+          type: isAllowedType2(a.type) ? a.type : "click"
+        });
+        const setupActions = test.setup.map(toSetupAction);
+        const setupResult = await runSetupActions(setupActions, actionExecutor, strategy, page, staticDescription, ["submenu", "submenuTrigger", "submenuItems"]);
+        if (setupResult.skip) {
+          skipped.push(setupResult.message || "Setup action skipped");
+          reporter.reportStaticTest(staticDescription, "skip", setupResult.message, staticLevel);
+          continue;
+        }
+        if (!setupResult.success) {
+          const failure = `Static setup failed: ${setupResult.error}`;
+          const outcome = classifyFailure(failure, test.level);
+          if (outcome.status === "fail") staticFailed += 1;
+          if (outcome.status === "warn") staticWarnings += 1;
+          reporter.reportStaticTest(staticDescription, outcome.status, outcome.detail, outcome.level);
+          continue;
+        }
+      }
       const targetSelector = componentContract.selectors[test.target];
       if (!targetSelector) {
         const failure = `Selector for target ${test.target} not found.`;
@@ -2532,31 +2641,26 @@ This usually means:
       const dynamicLevel = normalizeLevel(dynamicTest.level);
       const actionExecutor = new ActionExecutor(page, componentContract.selectors, actionTimeoutMs);
       if (Array.isArray(setup) && setup.length > 0) {
-        for (const setupAct of setup) {
-          let setupResult;
-          if (setupAct.type === "focus") {
-            if (setupAct.target === "relative" && setupAct.relativeTarget) {
-              setupResult = await actionExecutor.focus("relative", setupAct.relativeTarget);
-            } else {
-              setupResult = await actionExecutor.focus(setupAct.target);
-            }
-          } else if (setupAct.type === "type" && setupAct.value) {
-            setupResult = await actionExecutor.type(setupAct.target, setupAct.value);
-          } else if (setupAct.type === "click") {
-            setupResult = await actionExecutor.click(setupAct.target, setupAct.relativeTarget);
-          } else if (setupAct.type === "keypress" && setupAct.key) {
-            setupResult = await actionExecutor.keypress(setupAct.target, setupAct.key);
-          } else if (setupAct.type === "hover") {
-            setupResult = await actionExecutor.hover(setupAct.target, setupAct.relativeTarget);
-          } else {
-            continue;
-          }
-          if (!setupResult.success) {
-            const setupMsg = setupResult.error || "Setup action failed";
-            const outcome = classifyFailure(`Setup failed: ${setupMsg}`, dynamicTest.level);
-            reporter.reportTest({ description: dynamicTest.description, level: dynamicLevel }, outcome.status, outcome.detail);
-            continue;
-          }
+        let isAllowedType2 = function(t) {
+          return allowedTypes.includes(t);
+        };
+        var isAllowedType = isAllowedType2;
+        const allowedTypes = ["focus", "type", "click", "keypress", "hover"];
+        const toSetupAction = (a) => ({
+          ...a,
+          type: isAllowedType2(a.type) ? a.type : "click"
+        });
+        const setupActions = setup.map(toSetupAction);
+        const setupResult = await runSetupActions(setupActions, actionExecutor, strategy, page, dynamicTest.description, ["submenu", "submenuTrigger", "submenuItems"]);
+        if (setupResult.skip) {
+          skipped.push(setupResult.message || "Setup action skipped");
+          reporter.reportTest({ description: dynamicTest.description, level: dynamicLevel }, "skip", setupResult.message);
+          continue;
+        }
+        if (!setupResult.success) {
+          const outcome = classifyFailure(`Setup failed: ${setupResult.error}`, dynamicTest.level);
+          reporter.reportTest({ description: dynamicTest.description, level: dynamicLevel }, outcome.status, outcome.detail);
+          continue;
         }
       }
       const failuresBeforeTest = failures.length;
@@ -3136,25 +3240,6 @@ function validateContractSchema(contract) {
       });
     }
   }
-  if (c.states !== void 0) {
-    if (!Array.isArray(c.states)) {
-      errors.push({ path: "$.states", message: "states must be an array" });
-    } else {
-      c.states.forEach((state, idx) => {
-        if (typeof state !== "object" || state === null) {
-          errors.push({ path: `$.states[${idx}]`, message: "state must be an object" });
-          return;
-        }
-        const s = state;
-        if (typeof s.name !== "string") {
-          errors.push({ path: `$.states[${idx}].name`, message: "name is required and must be a string" });
-        }
-        if (!Array.isArray(s.requires)) {
-          errors.push({ path: `$.states[${idx}].requires`, message: "requires is required and must be an array" });
-        }
-      });
-    }
-  }
   return {
     valid: errors.length === 0,
     errors
@@ -3230,17 +3315,8 @@ function validateTargetReferences(contract, selectorKeys) {
     });
   }
   const dynamicItems = c.dynamic;
-  const states = c.states;
-  const stateNames = new Set((states || []).map((s) => String(s.name)));
   if (Array.isArray(dynamicItems)) {
     dynamicItems.forEach((item, itemIdx) => {
-      const given = item.given;
-      if (given && !stateNames.has(given)) {
-        errors.push({
-          path: `$.dynamic[${itemIdx}].given`,
-          message: `State '${given}' not found in states`
-        });
-      }
       const actions = item.action;
       if (Array.isArray(actions)) {
         actions.forEach((action, actIdx) => {

package/dist/cli.js

@@ -122,12 +122,12 @@ program.command("audit").description("Run axe-core powered accessibility audit o
   process.exit(1);
 });
 program.command("test").description("Run core a11y accessibility standard tests on UI components").action(async () => {
-  const { runTest } = await import("./test-FYSJXQWO.js");
+  const { runTest } = await import("./test-WDBS5JWO.js");
   runTest();
 });
 program.command("build").description("Build accessibility artifacts").addCommand(
   new Command("contracts").description("Build DSL contracts to JSON").action(async () => {
-    const { buildContracts } = await import("./buildContracts-FT6KWUJN.js");
+    const { buildContracts } = await import("./buildContracts-VIV6GM56.js");
     const { loadConfig: loadConfig2 } = await import("./configLoader-REHK3S3Q.js");
     const cwd = process.cwd();
     const { config, configPath, errors } = await loadConfig2(cwd);