aria-ease 6.10.0 → 6.11.0

package/README.md

@@ -60,7 +60,7 @@ npx aria-ease audit --url https://yoursite.com
 
 #### 3. **Contract Testing** (Available Now)
 
-This is the game-changer. Encoded a deterministic, testable interpretation of WAI-ARIA APG guidance into JSON "contracts" using Aria-Ease DSL API, and validate your contract against your component using Aria-Ease's Playwright runner with isolated test-harness architecture. Run it locally or in CI/CD.
+This is the game-changer. Encode a deterministic, testable interpretation of WAI-ARIA APG guidance into JSON "contracts" using Aria-Ease DSL API, and validate your contract against your component using Aria-Ease's Playwright runner with isolated test-harness architecture. Run it locally or in CI/CD.
 
 Teams and experts can enforce their own standards and maintain reusability and consistency.
 

package/{bin/buildContracts-S22V7AGV.js → dist/buildContracts-FT6KWUJN.js}

@@ -1,12 +1,12 @@
 import "./chunk-I2KLQ2HA.js";
 
-// src/utils/cli/buildContracts.ts
+// src/utils/test/dsl/src/buildContracts.ts
 import path from "path";
 import fs from "fs-extra";
 import { glob } from "fs/promises";
 import chalk from "chalk";
 
-// src/utils/cli/contractValidator.ts
+// src/utils/test/dsl/src/contractValidator.ts
 function validateContractSchema(contract) {
   const errors = [];
   if (!contract || typeof contract !== "object") {
@@ -348,7 +348,7 @@ function validateTargetReferences(contract, selectorKeys) {
   return errors;
 }
 
-// src/utils/cli/buildContracts.ts
+// src/utils/test/dsl/src/buildContracts.ts
 async function buildContracts(cwd, config) {
   const errors = [];
   const built = [];

package/{bin → dist}/cli.cjs

@@ -2865,7 +2865,7 @@ var init_test3 = __esm({
   }
 });
 
-// src/utils/cli/contractValidator.ts
+// src/utils/test/dsl/src/contractValidator.ts
 function validateContractSchema(contract) {
   const errors = [];
   if (!contract || typeof contract !== "object") {
@@ -3207,12 +3207,12 @@ function validateTargetReferences(contract, selectorKeys) {
   return errors;
 }
 var init_contractValidator = __esm({
-  "src/utils/cli/contractValidator.ts"() {
+  "src/utils/test/dsl/src/contractValidator.ts"() {
     "use strict";
   }
 });
 
-// src/utils/cli/buildContracts.ts
+// src/utils/test/dsl/src/buildContracts.ts
 var buildContracts_exports = {};
 __export(buildContracts_exports, {
   buildContracts: () => buildContracts
@@ -3330,7 +3330,7 @@ ${errorLines}`;
 }
 var import_path7, import_fs_extra3, import_promises2, import_chalk2;
 var init_buildContracts = __esm({
-  "src/utils/cli/buildContracts.ts"() {
+  "src/utils/test/dsl/src/buildContracts.ts"() {
     "use strict";
     import_path7 = __toESM(require("path"), 1);
     import_fs_extra3 = __toESM(require("fs-extra"), 1);

package/{bin → dist}/cli.js

@@ -127,7 +127,7 @@ program.command("test").description("Run core a11y accessibility standard tests
 });
 program.command("build").description("Build accessibility artifacts").addCommand(
   new Command("contracts").description("Build DSL contracts to JSON").action(async () => {
-    const { buildContracts } = await import("./buildContracts-S22V7AGV.js");
+    const { buildContracts } = await import("./buildContracts-FT6KWUJN.js");
     const { loadConfig: loadConfig2 } = await import("./configLoader-UJZHQBYS.js");
     const cwd = process.cwd();
     const { config, configPath, errors } = await loadConfig2(cwd);

package/dist/index.cjs

@@ -3761,90 +3761,141 @@ function makeTabsAccessible({ tabListId, tabsClass, tabPanelsClass, orientation
 }
 
 // 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'"
     }
   ];
 }
@@ -3854,6 +3905,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'"
     }
   ];
 }
@@ -3876,7 +3934,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'`
     }
   ];
 }
@@ -4022,7 +4080,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];
@@ -4030,22 +4098,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/index.js

@@ -1509,90 +1509,141 @@ function makeTabsAccessible({ tabListId, tabsClass, tabPanelsClass, orientation
 }
 
 // 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'"
     }
   ];
 }
@@ -1602,6 +1653,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'"
     }
   ];
 }
@@ -1624,7 +1682,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'`
     }
   ];
 }
@@ -1770,7 +1828,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];
@@ -1778,22 +1846,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/{Types.d-yGC2bBaB.d.ts → Types.d-DYfYR3Vc.d.cts}

@@ -88,4 +88,4 @@ interface MenuCallback {
     onOpenChange?: (isOpen: boolean) => void;
 }
 
-export type { AccessibilityInstance as A, ComboboxConfig as C, MenuConfig as M, TabsConfig as T, AccordionConfig as a };
+export type { AccordionConfig as A, ComboboxConfig as C, MenuConfig as M, TabsConfig as T, AccessibilityInstance as a };

package/dist/src/{Types.d-yGC2bBaB.d.cts → Types.d-DYfYR3Vc.d.ts}

@@ -88,4 +88,4 @@ interface MenuCallback {
     onOpenChange?: (isOpen: boolean) => void;
 }
 
-export type { AccessibilityInstance as A, ComboboxConfig as C, MenuConfig as M, TabsConfig as T, AccordionConfig as a };
+export type { AccordionConfig as A, ComboboxConfig as C, MenuConfig as M, TabsConfig as T, AccessibilityInstance as a };

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

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

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

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

package/dist/src/block/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';
 
 /**
  * Adds keyboard interaction to block. The block traps focus and can be interacted with using the keyboard.

package/dist/src/block/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';
 
 /**
  * Adds keyboard interaction to block. The block traps focus and can be interacted with using the keyboard.

package/dist/src/checkbox/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 checkbox group accessible by managing ARIA attributes and keyboard interaction.

package/dist/src/checkbox/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 checkbox group accessible by managing ARIA attributes and keyboard interaction.

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

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