aria-ease 6.10.0 → 6.11.0

package/dist/src/combobox/index.d.ts

@@ -1,4 +1,4 @@
-import { C as ComboboxConfig, A as AccessibilityInstance } from '../Types.d-yGC2bBaB.js';
+import { C as ComboboxConfig, a as AccessibilityInstance } from '../Types.d-DYfYR3Vc.js';
 
 /**
  * Makes a Combobox accessible by adding appropriate ARIA attributes, keyboard interactions and focus management.

package/dist/src/menu/index.d.cts

@@ -1,4 +1,4 @@
-import { M as MenuConfig, A as AccessibilityInstance } from '../Types.d-yGC2bBaB.cjs';
+import { M as MenuConfig, a as AccessibilityInstance } from '../Types.d-DYfYR3Vc.cjs';
 
 /**
   * Adds keyboard interaction to toggle menu. The menu traps focus and can be interacted with using the keyboard. The first interactive item of the menu has focus when menu open.

package/dist/src/menu/index.d.ts

@@ -1,4 +1,4 @@
-import { M as MenuConfig, A as AccessibilityInstance } from '../Types.d-yGC2bBaB.js';
+import { M as MenuConfig, a as AccessibilityInstance } from '../Types.d-DYfYR3Vc.js';
 
 /**
   * Adds keyboard interaction to toggle menu. The menu traps focus and can be interacted with using the keyboard. The first interactive item of the menu has focus when menu open.

package/dist/src/radio/index.d.cts

@@ -1,4 +1,4 @@
-import { A as AccessibilityInstance } from '../Types.d-yGC2bBaB.cjs';
+import { a as AccessibilityInstance } from '../Types.d-DYfYR3Vc.cjs';
 
 /**
  * Makes a radio group accessible by managing ARIA attributes, keyboard interaction, and state.

package/dist/src/radio/index.d.ts

@@ -1,4 +1,4 @@
-import { A as AccessibilityInstance } from '../Types.d-yGC2bBaB.js';
+import { a as AccessibilityInstance } from '../Types.d-DYfYR3Vc.js';
 
 /**
  * Makes a radio group accessible by managing ARIA attributes, keyboard interaction, and state.

package/dist/src/tabs/index.d.cts

@@ -1,4 +1,4 @@
-import { T as TabsConfig, A as AccessibilityInstance } from '../Types.d-yGC2bBaB.cjs';
+import { T as TabsConfig, a as AccessibilityInstance } from '../Types.d-DYfYR3Vc.cjs';
 
 /**
  * Makes tabs accessible by managing ARIA attributes, keyboard interaction, and state.

package/dist/src/tabs/index.d.ts

@@ -1,4 +1,4 @@
-import { T as TabsConfig, A as AccessibilityInstance } from '../Types.d-yGC2bBaB.js';
+import { T as TabsConfig, a as AccessibilityInstance } from '../Types.d-DYfYR3Vc.js';
 
 /**
  * Makes tabs accessible by managing ARIA attributes, keyboard interaction, and state.

package/dist/src/toggle/index.d.cts

@@ -1,4 +1,4 @@
-import { A as AccessibilityInstance } from '../Types.d-yGC2bBaB.cjs';
+import { a as AccessibilityInstance } from '../Types.d-DYfYR3Vc.cjs';
 
 /**
  * Makes a toggle button accessible by managing ARIA attributes and keyboard interactions.

package/dist/src/toggle/index.d.ts

@@ -1,4 +1,4 @@
-import { A as AccessibilityInstance } from '../Types.d-yGC2bBaB.js';
+import { a as AccessibilityInstance } from '../Types.d-DYfYR3Vc.js';
 
 /**
  * Makes a toggle button accessible by managing ARIA attributes and keyboard interactions.

package/dist/src/utils/test/dsl/index.cjs

@@ -1,90 +1,141 @@
 'use strict';
 
 // src/utils/test/dsl/src/state-packs/comboboxStatePack.ts
+function hasCapabilities(ctx, requiredCaps) {
+  return requiredCaps.some((cap) => ctx.capabilities.includes(cap));
+}
+function resolveSetup(setup, ctx) {
+  if (Array.isArray(setup) && setup.length && !setup[0].when) {
+    setup = [{ when: ["keyboard"], steps: () => setup }];
+  }
+  for (const strat of setup) {
+    if (hasCapabilities(ctx, strat.when)) {
+      return strat.steps(ctx);
+    }
+  }
+  throw new Error(
+    `No setup strategy matches capabilities: ${ctx.capabilities.join(", ")}`
+  );
+}
 var COMBOBOX_STATES = {
   "listbox.open": {
-    setup: openCombobox(),
-    assertion: isComboboxOpen()
+    setup: [
+      {
+        when: ["keyboard", "textInput"],
+        steps: () => [
+          { type: "keypress", target: "input", key: "ArrowDown" }
+        ]
+      },
+      {
+        when: ["pointer"],
+        steps: () => [
+          { type: "click", target: "button" }
+        ]
+      }
+    ],
+    assertion: isComboboxOpen
   },
   "listbox.closed": {
-    setup: closeCombobox(),
-    assertion: isComboboxClosed()
+    setup: [
+      {
+        when: ["keyboard"],
+        steps: () => [
+          /* { type: "keypress", target: "input", key: "Escape" } */
+        ]
+      },
+      {
+        when: ["pointer"],
+        steps: () => [
+          /* { type: "click", target: "button" } */
+        ]
+      }
+    ],
+    assertion: isComboboxClosed
   },
   "input.focused": {
-    setup: focusInput(),
-    assertion: [
-      ...isInputFocused()
-    ]
+    setup: [
+      {
+        when: ["keyboard"],
+        steps: () => [
+          { type: "focus", target: "input" }
+        ]
+      }
+    ],
+    assertion: isInputFocused
   },
   "input.filled": {
-    setup: fillInput(),
-    assertion: [
-      ...isInputFilled()
-    ]
+    setup: [
+      {
+        when: ["keyboard", "textInput"],
+        steps: () => [
+          { type: "type", target: "input", value: "test" }
+        ]
+      }
+    ],
+    assertion: isInputFilled
   },
   "activeOption.first": {
     requires: ["listbox.open"],
     setup: [
-      { type: "keypress", target: "input", key: "ArrowDown" }
+      {
+        when: ["keyboard"],
+        steps: () => [
+          { type: "keypress", target: "input", key: "ArrowDown" }
+        ]
+      }
     ],
-    assertion: [
-      ...isActiveDescendantNotEmpty()
-    ]
+    assertion: isActiveDescendantNotEmpty
   },
   "activeOption.last": {
     requires: ["activeOption.first"],
     setup: [
-      { type: "keypress", target: "input", key: "ArrowUp" }
+      {
+        when: ["keyboard"],
+        steps: () => [
+          { type: "keypress", target: "input", key: "ArrowUp" }
+        ]
+      }
     ],
-    assertion: [
-      ...isActiveDescendantNotEmpty()
-    ]
+    assertion: isActiveDescendantNotEmpty
   },
   "selectedOption.first": {
     requires: ["listbox.open"],
     setup: [
-      { type: "click", target: "relative", relativeTarget: "first" }
+      {
+        when: ["pointer"],
+        steps: () => [
+          { type: "click", target: "relative", relativeTarget: "first" }
+        ]
+      }
     ],
-    assertion: [
-      ...isAriaSelected("first")
-    ]
+    assertion: () => isAriaSelected("first")
   },
   "selectedOption.last": {
     requires: ["listbox.open"],
     setup: [
-      { type: "click", target: "relative", relativeTarget: "last" }
+      {
+        when: ["pointer"],
+        steps: () => [
+          { type: "click", target: "relative", relativeTarget: "last" }
+        ]
+      }
     ],
-    assertion: [
-      ...isAriaSelected("first")
-    ]
+    assertion: () => isAriaSelected("last")
   }
 };
-function openCombobox() {
-  return [
-    { type: "keypress", target: "input", key: "ArrowDown" }
-  ];
-}
-function closeCombobox() {
-  return [
-    { type: "keypress", target: "input", key: "Escape" }
-  ];
-}
-function focusInput() {
-  return [
-    { type: "focus", target: "input" }
-  ];
-}
-function fillInput() {
-  return [
-    { type: "type", target: "input", value: "test" }
-  ];
-}
 function isComboboxOpen() {
   return [
     {
       target: "listbox",
       assertion: "toBeVisible",
       failureMessage: "Expected listbox to be visible"
+    },
+    {
+      target: "input",
+      assertion: "toHaveAttribute",
+      attribute: "aria-expanded",
+      expectedValue: "true",
+      failureMessage: "Expect combobox input to have aria-expanded='true'"
     }
   ];
 }
@@ -94,6 +145,13 @@ function isComboboxClosed() {
       target: "listbox",
       assertion: "notToBeVisible",
       failureMessage: "Expected listbox to be closed"
+    },
+    {
+      target: "input",
+      assertion: "toHaveAttribute",
+      attribute: "aria-expanded",
+      expectedValue: "false",
+      failureMessage: "Expect combobox input to have aria-expanded='false'"
     }
   ];
 }
@@ -116,7 +174,7 @@ function isAriaSelected(index) {
       assertion: "toHaveAttribute",
       attribute: "aria-selected",
       expectedValue: "true",
-      failureMessage: `Expected aria-selected on ${index} option to be true`
+      failureMessage: `Expected ${index} option to have aria-selected='true'`
     }
   ];
 }
@@ -262,7 +320,17 @@ var DynamicTestBuilder = class {
     return this.parent;
   }
   _finalize() {
-    const resolveSetup = (stateName, visited = /* @__PURE__ */ new Set()) => {
+    const capabilityMap = {
+      keypress: "keyboard",
+      click: "pointer",
+      type: "textInput",
+      focus: "keyboard",
+      hover: "pointer"
+      // add more mappings as needed
+    };
+    const capability = capabilityMap[this._as || "keyboard"] || (this._as || "keyboard");
+    const ctx = { capabilities: [capability] };
+    const resolveAllSetups = (stateName, visited = /* @__PURE__ */ new Set()) => {
       if (visited.has(stateName)) return [];
       visited.add(stateName);
       const s = this.statePack[stateName];
@@ -270,22 +338,30 @@ var DynamicTestBuilder = class {
       let actions = [];
       if (Array.isArray(s.requires)) {
         for (const req of s.requires) {
-          actions = actions.concat(resolveSetup(req, visited));
+          actions = actions.concat(resolveAllSetups(req, visited));
         }
       }
-      if (s.setup) actions = actions.concat(s.setup);
+      if (s.setup) actions = actions.concat(resolveSetup(s.setup, ctx));
       return actions;
     };
     const setup = [];
     for (const state of this._given) {
-      setup.push(...resolveSetup(state));
+      setup.push(...resolveAllSetups(state));
     }
     const assertions = [];
     for (const state of this._then) {
       const s = this.statePack[state];
-      if (s && s.assertion) {
-        if (Array.isArray(s.assertion)) assertions.push(...s.assertion);
-        else assertions.push(s.assertion);
+      if (s && s.assertion !== void 0) {
+        let value = s.assertion;
+        if (typeof value === "function") {
+          try {
+            value = value();
+          } catch (e) {
+            throw new Error(`Error calling assertion function for state '${state}': ${e.message}`);
+          }
+        }
+        if (Array.isArray(value)) assertions.push(...value);
+        else assertions.push(value);
       }
     }
     const action = [

package/dist/src/utils/test/dsl/index.js

@@ -1,88 +1,139 @@
 // src/utils/test/dsl/src/state-packs/comboboxStatePack.ts
+function hasCapabilities(ctx, requiredCaps) {
+  return requiredCaps.some((cap) => ctx.capabilities.includes(cap));
+}
+function resolveSetup(setup, ctx) {
+  if (Array.isArray(setup) && setup.length && !setup[0].when) {
+    setup = [{ when: ["keyboard"], steps: () => setup }];
+  }
+  for (const strat of setup) {
+    if (hasCapabilities(ctx, strat.when)) {
+      return strat.steps(ctx);
+    }
+  }
+  throw new Error(
+    `No setup strategy matches capabilities: ${ctx.capabilities.join(", ")}`
+  );
+}
 var COMBOBOX_STATES = {
   "listbox.open": {
-    setup: openCombobox(),
-    assertion: isComboboxOpen()
+    setup: [
+      {
+        when: ["keyboard", "textInput"],
+        steps: () => [
+          { type: "keypress", target: "input", key: "ArrowDown" }
+        ]
+      },
+      {
+        when: ["pointer"],
+        steps: () => [
+          { type: "click", target: "button" }
+        ]
+      }
+    ],
+    assertion: isComboboxOpen
   },
   "listbox.closed": {
-    setup: closeCombobox(),
-    assertion: isComboboxClosed()
+    setup: [
+      {
+        when: ["keyboard"],
+        steps: () => [
+          /* { type: "keypress", target: "input", key: "Escape" } */
+        ]
+      },
+      {
+        when: ["pointer"],
+        steps: () => [
+          /* { type: "click", target: "button" } */
+        ]
+      }
+    ],
+    assertion: isComboboxClosed
   },
   "input.focused": {
-    setup: focusInput(),
-    assertion: [
-      ...isInputFocused()
-    ]
+    setup: [
+      {
+        when: ["keyboard"],
+        steps: () => [
+          { type: "focus", target: "input" }
+        ]
+      }
+    ],
+    assertion: isInputFocused
   },
   "input.filled": {
-    setup: fillInput(),
-    assertion: [
-      ...isInputFilled()
-    ]
+    setup: [
+      {
+        when: ["keyboard", "textInput"],
+        steps: () => [
+          { type: "type", target: "input", value: "test" }
+        ]
+      }
+    ],
+    assertion: isInputFilled
   },
   "activeOption.first": {
     requires: ["listbox.open"],
     setup: [
-      { type: "keypress", target: "input", key: "ArrowDown" }
+      {
+        when: ["keyboard"],
+        steps: () => [
+          { type: "keypress", target: "input", key: "ArrowDown" }
+        ]
+      }
     ],
-    assertion: [
-      ...isActiveDescendantNotEmpty()
-    ]
+    assertion: isActiveDescendantNotEmpty
   },
   "activeOption.last": {
     requires: ["activeOption.first"],
     setup: [
-      { type: "keypress", target: "input", key: "ArrowUp" }
+      {
+        when: ["keyboard"],
+        steps: () => [
+          { type: "keypress", target: "input", key: "ArrowUp" }
+        ]
+      }
     ],
-    assertion: [
-      ...isActiveDescendantNotEmpty()
-    ]
+    assertion: isActiveDescendantNotEmpty
   },
   "selectedOption.first": {
     requires: ["listbox.open"],
     setup: [
-      { type: "click", target: "relative", relativeTarget: "first" }
+      {
+        when: ["pointer"],
+        steps: () => [
+          { type: "click", target: "relative", relativeTarget: "first" }
+        ]
+      }
     ],
-    assertion: [
-      ...isAriaSelected("first")
-    ]
+    assertion: () => isAriaSelected("first")
   },
   "selectedOption.last": {
     requires: ["listbox.open"],
     setup: [
-      { type: "click", target: "relative", relativeTarget: "last" }
+      {
+        when: ["pointer"],
+        steps: () => [
+          { type: "click", target: "relative", relativeTarget: "last" }
+        ]
+      }
     ],
-    assertion: [
-      ...isAriaSelected("first")
-    ]
+    assertion: () => isAriaSelected("last")
   }
 };
-function openCombobox() {
-  return [
-    { type: "keypress", target: "input", key: "ArrowDown" }
-  ];
-}
-function closeCombobox() {
-  return [
-    { type: "keypress", target: "input", key: "Escape" }
-  ];
-}
-function focusInput() {
-  return [
-    { type: "focus", target: "input" }
-  ];
-}
-function fillInput() {
-  return [
-    { type: "type", target: "input", value: "test" }
-  ];
-}
 function isComboboxOpen() {
   return [
     {
       target: "listbox",
       assertion: "toBeVisible",
       failureMessage: "Expected listbox to be visible"
+    },
+    {
+      target: "input",
+      assertion: "toHaveAttribute",
+      attribute: "aria-expanded",
+      expectedValue: "true",
+      failureMessage: "Expect combobox input to have aria-expanded='true'"
     }
   ];
 }
@@ -92,6 +143,13 @@ function isComboboxClosed() {
       target: "listbox",
       assertion: "notToBeVisible",
       failureMessage: "Expected listbox to be closed"
+    },
+    {
+      target: "input",
+      assertion: "toHaveAttribute",
+      attribute: "aria-expanded",
+      expectedValue: "false",
+      failureMessage: "Expect combobox input to have aria-expanded='false'"
     }
   ];
 }
@@ -114,7 +172,7 @@ function isAriaSelected(index) {
       assertion: "toHaveAttribute",
       attribute: "aria-selected",
       expectedValue: "true",
-      failureMessage: `Expected aria-selected on ${index} option to be true`
+      failureMessage: `Expected ${index} option to have aria-selected='true'`
     }
   ];
 }
@@ -260,7 +318,17 @@ var DynamicTestBuilder = class {
     return this.parent;
   }
   _finalize() {
-    const resolveSetup = (stateName, visited = /* @__PURE__ */ new Set()) => {
+    const capabilityMap = {
+      keypress: "keyboard",
+      click: "pointer",
+      type: "textInput",
+      focus: "keyboard",
+      hover: "pointer"
+      // add more mappings as needed
+    };
+    const capability = capabilityMap[this._as || "keyboard"] || (this._as || "keyboard");
+    const ctx = { capabilities: [capability] };
+    const resolveAllSetups = (stateName, visited = /* @__PURE__ */ new Set()) => {
       if (visited.has(stateName)) return [];
       visited.add(stateName);
       const s = this.statePack[stateName];
@@ -268,22 +336,30 @@ var DynamicTestBuilder = class {
       let actions = [];
       if (Array.isArray(s.requires)) {
         for (const req of s.requires) {
-          actions = actions.concat(resolveSetup(req, visited));
+          actions = actions.concat(resolveAllSetups(req, visited));
         }
       }
-      if (s.setup) actions = actions.concat(s.setup);
+      if (s.setup) actions = actions.concat(resolveSetup(s.setup, ctx));
       return actions;
     };
     const setup = [];
     for (const state of this._given) {
-      setup.push(...resolveSetup(state));
+      setup.push(...resolveAllSetups(state));
     }
     const assertions = [];
     for (const state of this._then) {
       const s = this.statePack[state];
-      if (s && s.assertion) {
-        if (Array.isArray(s.assertion)) assertions.push(...s.assertion);
-        else assertions.push(s.assertion);
+      if (s && s.assertion !== void 0) {
+        let value = s.assertion;
+        if (typeof value === "function") {
+          try {
+            value = value();
+          } catch (e) {
+            throw new Error(`Error calling assertion function for state '${state}': ${e.message}`);
+          }
+        }
+        if (Array.isArray(value)) assertions.push(...value);
+        else assertions.push(value);
       }
     }
     const action = [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aria-ease",
-  "version": "6.10.0",
+  "version": "6.11.0",
   "description": "Accessibility infrastructure for the entire frontend engineering lifecycle. Build accessible patterns, run automated audits, verify component interactions, and gate deployments — all in one system.",
   "main": "dist/index.cjs",
   "type": "module",
@@ -16,12 +16,12 @@
     "release:patch": "standard-version --release-as patch",
     "release:minor": "standard-version --release-as minor",
     "release:major": "standard-version --release-as major",
-    "clean": "rm -rf dist bin",
+    "clean": "rm -rf dist",
     "build:core": "tsup ./index.ts --format esm,cjs --dts --outDir dist --external jest-axe --external @testing-library/react --external @axe-core/playwright --external playwright",
     "build:modules": "tsup ./src/combobox/index.ts ./src/accordion/index.ts ./src/block/index.ts ./src/checkbox/index.ts ./src/menu/index.ts ./src/tabs/index.ts ./src/radio/index.ts ./src/toggle/index.ts ./src/contracts/index.ts --format esm,cjs --dts --treeshake --outDir dist/src",
     "build:test": "tsup ./src/utils/test/index.ts --format esm,cjs --dts --treeshake --external jest-axe --external @testing-library/react --external playwright --external @playwright/test --outDir dist/src/utils/test",
     "build:dsl": "tsup ./src/utils/test/dsl/index.ts --format esm,cjs --dts --treeshake --outDir dist/src/utils/test/dsl",
-    "build:cli": "tsup ./src/utils/cli/cli.ts --format esm,cjs --dts --outDir bin --external commander --external chalk --external jest-axe --external @testing-library/react --external @axe-core/playwright --external playwright",
+    "build:cli": "tsup ./src/utils/cli/cli.ts --format esm,cjs --dts --outDir dist --external commander --external chalk --external jest-axe --external @testing-library/react --external @axe-core/playwright --external playwright",
     "build:contracts": "mkdir -p ./dist/src/utils/test && cp -r ./src/utils/test/contract/aria-contracts ./dist/src/utils/test/",
     "build": "npm run clean && npm run build:core && npm run build:modules && npm run build:test && npm run build:dsl && npm run build:cli && npm run build:contracts"
   },
@@ -127,7 +127,6 @@
   },
   "files": [
     "dist",
-    "bin",
     "README.md",
     "LICENSE"
   ],
@@ -152,6 +151,6 @@
     }
   },
   "bin": {
-    "aria-ease": "./bin/cli.js"
+    "aria-ease": "./dist/cli.js"
   }
 }

package/bin/AccordionComponentStrategy-4ZEIQ2V6.js

@@ -1,42 +0,0 @@
-import {
-  test_exports
-} from "./chunk-PK5L2SAF.js";
-import "./chunk-I2KLQ2HA.js";
-
-// src/utils/test/src/component-strategies/AccordionComponentStrategy.ts
-var AccordionComponentStrategy = class {
-  constructor(mainSelector, selectors, actionTimeoutMs = 400, assertionTimeoutMs = 400) {
-    this.mainSelector = mainSelector;
-    this.selectors = selectors;
-    this.actionTimeoutMs = actionTimeoutMs;
-    this.assertionTimeoutMs = assertionTimeoutMs;
-  }
-  async resetState(page) {
-    if (!this.selectors.panel || !this.selectors.trigger || this.selectors.popup) {
-      return;
-    }
-    const triggerSelector = this.selectors.trigger;
-    const panelSelector = this.selectors.panel;
-    if (!triggerSelector || !panelSelector) return;
-    const allTriggers = await page.locator(triggerSelector).all();
-    for (const trigger of allTriggers) {
-      const isExpanded = await trigger.getAttribute("aria-expanded") === "true";
-      const triggerPanel = await trigger.getAttribute("aria-controls");
-      if (isExpanded && triggerPanel) {
-        await trigger.click({ timeout: this.actionTimeoutMs });
-        const panel = page.locator(`#${triggerPanel}`);
-        await (0, test_exports.expect)(panel).toBeHidden({ timeout: this.assertionTimeoutMs }).catch(() => {
-        });
-      }
-    }
-  }
-  async shouldSkipTest() {
-    return false;
-  }
-  getMainSelector() {
-    return this.mainSelector;
-  }
-};
-export {
-  AccordionComponentStrategy
-};