aria-ease 6.11.0 → 6.12.1

package/dist/index.d.cts

@@ -288,10 +288,12 @@ declare class ContractBuilder {
         ariaReference: (from: string, attribute: string, to: string) => {
             required: () => void;
             optional: () => void;
+            recommended: () => void;
         };
         contains: (parent: string, child: string) => {
             required: () => void;
             optional: () => void;
+            recommended: () => void;
         };
     }) => void): this;
     static(fn: (s: {
@@ -299,6 +301,7 @@ declare class ContractBuilder {
             has: (attribute: string, expectedValue: string) => {
                 required: () => void;
                 optional: () => void;
+                recommended: () => void;
             };
         };
     }) => void): this;

package/dist/index.d.ts

@@ -288,10 +288,12 @@ declare class ContractBuilder {
         ariaReference: (from: string, attribute: string, to: string) => {
             required: () => void;
             optional: () => void;
+            recommended: () => void;
         };
         contains: (parent: string, child: string) => {
             required: () => void;
             optional: () => void;
+            recommended: () => void;
         };
     }) => void): this;
     static(fn: (s: {
@@ -299,6 +301,7 @@ declare class ContractBuilder {
             has: (attribute: string, expectedValue: string) => {
                 required: () => void;
                 optional: () => void;
+                recommended: () => void;
             };
         };
     }) => void): this;

package/dist/index.js

@@ -1,11 +1,10 @@
 import {
   ContractReporter,
   closeSharedBrowser,
-  contract_default,
   normalizeLevel,
   normalizeStrictness,
   resolveEnforcement
-} from "./chunk-XERMSYEH.js";
+} from "./chunk-4DU5Z5BR.js";
 import "./chunk-I2KLQ2HA.js";
 
 // src/accordion/src/makeAccordionAccessible/makeAccordionAccessible.ts
@@ -1118,6 +1117,7 @@ function makeComboboxAccessible({ comboboxInputId, comboboxButtonId, listBoxId,
         } else if (comboboxInput.value) {
           event.preventDefault();
           comboboxInput.value = "";
+          comboboxInput.setAttribute("aria-activedescendant", "");
           const visibleItems2 = getVisibleItems();
           visibleItems2.forEach((item) => {
             if (item.getAttribute("aria-selected") === "true") item.setAttribute("aria-selected", "false");
@@ -1526,7 +1526,7 @@ function resolveSetup(setup, ctx) {
   );
 }
 var COMBOBOX_STATES = {
-  "listbox.open": {
+  "popup.open": {
     setup: [
       {
         when: ["keyboard", "textInput"],
@@ -1543,7 +1543,7 @@ var COMBOBOX_STATES = {
     ],
     assertion: isComboboxOpen
   },
-  "listbox.closed": {
+  "popup.closed": {
     setup: [
       {
         when: ["keyboard"],
@@ -1558,18 +1558,18 @@ var COMBOBOX_STATES = {
         ]
       }
     ],
-    assertion: isComboboxClosed
+    assertion: [...isComboboxClosed(), ...isActiveDescendantEmpty()]
   },
-  "input.focused": {
+  "main.focused": {
     setup: [
       {
         when: ["keyboard"],
         steps: () => [
-          { type: "focus", target: "input" }
+          { type: "focus", target: "main" }
         ]
       }
     ],
-    assertion: isInputFocused
+    assertion: isMainFocused
   },
   "input.filled": {
     setup: [
@@ -1582,8 +1582,19 @@ var COMBOBOX_STATES = {
     ],
     assertion: isInputFilled
   },
+  "input.notFilled": {
+    setup: [
+      {
+        when: ["keyboard", "textInput"],
+        steps: () => [
+          { type: "type", target: "input", value: "" }
+        ]
+      }
+    ],
+    assertion: isInputNotFilled
+  },
   "activeOption.first": {
-    requires: ["listbox.open"],
+    requires: ["popup.open"],
     setup: [
       {
         when: ["keyboard"],
@@ -1592,7 +1603,7 @@ var COMBOBOX_STATES = {
         ]
       }
     ],
-    assertion: isActiveDescendantNotEmpty
+    assertion: isActiveDescendantFirst
   },
   "activeOption.last": {
     requires: ["activeOption.first"],
@@ -1604,10 +1615,30 @@ var COMBOBOX_STATES = {
         ]
       }
     ],
+    assertion: isActiveDescendantLast
+  },
+  "activeDescendant.notEmpty": {
+    requires: [],
+    setup: [
+      {
+        when: ["keyboard"],
+        steps: () => []
+      }
+    ],
     assertion: isActiveDescendantNotEmpty
   },
+  "activeDescendant.Empty": {
+    requires: [],
+    setup: [
+      {
+        when: ["keyboard"],
+        steps: () => []
+      }
+    ],
+    assertion: isActiveDescendantEmpty
+  },
   "selectedOption.first": {
-    requires: ["listbox.open"],
+    requires: ["popup.open"],
     setup: [
       {
         when: ["pointer"],
@@ -1619,7 +1650,7 @@ var COMBOBOX_STATES = {
     assertion: () => isAriaSelected("first")
   },
   "selectedOption.last": {
-    requires: ["listbox.open"],
+    requires: ["popup.open"],
     setup: [
       {
         when: ["pointer"],
@@ -1634,43 +1665,76 @@ var COMBOBOX_STATES = {
 function isComboboxOpen() {
   return [
     {
-      target: "listbox",
+      target: "popup",
       assertion: "toBeVisible",
-      failureMessage: "Expected listbox to be visible"
+      failureMessage: "Expected popup to be visible"
     },
     {
-      target: "input",
+      target: "main",
       assertion: "toHaveAttribute",
       attribute: "aria-expanded",
       expectedValue: "true",
-      failureMessage: "Expect combobox input to have aria-expanded='true'"
+      failureMessage: "Expect combobox main to have aria-expanded='true'."
     }
   ];
 }
 function isComboboxClosed() {
   return [
     {
-      target: "listbox",
+      target: "popup",
       assertion: "notToBeVisible",
-      failureMessage: "Expected listbox to be closed"
+      failureMessage: "Expected popup to be closed"
     },
     {
-      target: "input",
+      target: "main",
       assertion: "toHaveAttribute",
       attribute: "aria-expanded",
       expectedValue: "false",
-      failureMessage: "Expect combobox input to have aria-expanded='false'"
+      failureMessage: "Expect combobox main to have aria-expanded='false'."
+    }
+  ];
+}
+function isActiveDescendantFirst() {
+  return [
+    {
+      target: "main",
+      assertion: "toHaveAttribute",
+      attribute: "aria-activedescendant",
+      expectedValue: { ref: "relative", relativeTarget: "first", property: "id" },
+      failureMessage: "Expected aria-activedescendant on main to match the id of the first option."
+    }
+  ];
+}
+function isActiveDescendantLast() {
+  return [
+    {
+      target: "main",
+      assertion: "toHaveAttribute",
+      attribute: "aria-activedescendant",
+      expectedValue: { ref: "relative", relativeTarget: "last", property: "id" },
+      failureMessage: "Expected aria-activedescendant on main to match the id of the last option."
     }
   ];
 }
 function isActiveDescendantNotEmpty() {
   return [
     {
-      target: "input",
+      target: "main",
       assertion: "toHaveAttribute",
       attribute: "aria-activedescendant",
       expectedValue: "!empty",
-      failureMessage: "Expected aria-activedescendant to not be empty"
+      failureMessage: "Expected aria-activedescendant on main to not be empty."
+    }
+  ];
+}
+function isActiveDescendantEmpty() {
+  return [
+    {
+      target: "main",
+      assertion: "toHaveAttribute",
+      attribute: "aria-activedescendant",
+      expectedValue: "",
+      failureMessage: "Expected aria-activedescendant on main to be empty."
     }
   ];
 }
@@ -1682,16 +1746,16 @@ function isAriaSelected(index) {
       assertion: "toHaveAttribute",
       attribute: "aria-selected",
       expectedValue: "true",
-      failureMessage: `Expected ${index} option to have aria-selected='true'`
+      failureMessage: `Expected ${index} option to have aria-selected='true'.`
     }
   ];
 }
-function isInputFocused() {
+function isMainFocused() {
   return [
     {
-      target: "input",
+      target: "main",
       assertion: "toHaveFocus",
-      failureMessage: "Expected input to be focused"
+      failureMessage: "Expected main to be focused."
     }
   ];
 }
@@ -1701,14 +1765,24 @@ function isInputFilled() {
       target: "input",
       assertion: "toHaveValue",
       expectedValue: "test",
-      failureMessage: "Expected input to have the value 'test'"
+      failureMessage: "Expected input to have the value 'test'."
+    }
+  ];
+}
+function isInputNotFilled() {
+  return [
+    {
+      target: "input",
+      assertion: "toHaveValue",
+      expectedValue: "",
+      failureMessage: "Expected input to have the value ''."
     }
   ];
 }
 
 // src/utils/test/dsl/src/contractBuilder.ts
 var STATE_PACKS = {
-  "combobox.listbox": COMBOBOX_STATES
+  "combobox": COMBOBOX_STATES
   // Add more mappings as needed
 };
 var FluentContract = class {
@@ -1742,11 +1816,13 @@ var ContractBuilder = class {
     const api = {
       ariaReference: (from, attribute, to) => ({
         required: () => this.relationshipInvariants.push({ type: "aria-reference", from, attribute, to, level: "required" }),
-        optional: () => this.relationshipInvariants.push({ type: "aria-reference", from, attribute, to, level: "optional" })
+        optional: () => this.relationshipInvariants.push({ type: "aria-reference", from, attribute, to, level: "optional" }),
+        recommended: () => this.relationshipInvariants.push({ type: "aria-reference", from, attribute, to, level: "recommended" })
       }),
       contains: (parent, child) => ({
         required: () => this.relationshipInvariants.push({ type: "contains", parent, child, level: "required" }),
-        optional: () => this.relationshipInvariants.push({ type: "contains", parent, child, level: "optional" })
+        optional: () => this.relationshipInvariants.push({ type: "contains", parent, child, level: "optional" }),
+        recommended: () => this.relationshipInvariants.push({ type: "contains", parent, child, level: "recommended" })
       })
     };
     fn(api);
@@ -1757,7 +1833,8 @@ var ContractBuilder = class {
       target: (target) => ({
         has: (attribute, expectedValue) => ({
           required: () => this.staticAssertions.push({ target, attribute, expectedValue, failureMessage: "", level: "required" }),
-          optional: () => this.staticAssertions.push({ target, attribute, expectedValue, failureMessage: "", level: "optional" })
+          optional: () => this.staticAssertions.push({ target, attribute, expectedValue, failureMessage: "", level: "optional" }),
+          recommended: () => this.staticAssertions.push({ target, attribute, expectedValue, failureMessage: "", level: "recommended" })
         })
       })
     };
@@ -1899,16 +1976,13 @@ import { axe } from "jest-axe";
 
 // src/utils/test/src/contractTestRunner.ts
 import fs from "fs/promises";
-async function runContractTests(componentName, component, strictness) {
+async function runContractTests(contractPath, componentName, component, strictness) {
   const reporter = new ContractReporter(false);
   const strictnessMode = normalizeStrictness(strictness);
-  const contractTyped = contract_default;
-  const contractPath = contractTyped[componentName]?.path;
   if (!contractPath) {
-    throw new Error(`No contract found for component: ${componentName}`);
+    throw new Error(`No contract path provided for component: ${componentName}`);
   }
-  const resolvedPath = new URL(contractPath, import.meta.url).pathname;
-  const contractData = await fs.readFile(resolvedPath, "utf-8");
+  const contractData = await fs.readFile(contractPath, "utf-8");
   const componentContract = JSON.parse(contractData);
   const totalTests = (componentContract.relationships?.length || 0) + (componentContract.static[0]?.assertions.length || 0) + componentContract.dynamic.length;
   reporter.start(componentName, totalTests);
@@ -2043,7 +2117,7 @@ async function runContractTests(componentName, component, strictness) {
           staticPassed += 1;
           reporter.reportStaticTest(`${test.target} has ${test.attribute}`, "pass", void 0, staticLevel);
         }
-      } else if (!attributeValue || !test.expectedValue.split(" | ").includes(attributeValue)) {
+      } else if (!attributeValue || typeof test.expectedValue === "string" && !test.expectedValue.split(" | ").includes(attributeValue)) {
         const outcome = classifyFailure(test.failureMessage + ` Attribute value does not match expected value. Expected: ${test.expectedValue}, Found: ${attributeValue}`, test.level);
         if (outcome.status === "fail") staticFailed += 1;
         if (outcome.status === "warn") staticWarnings += 1;
@@ -2108,7 +2182,7 @@ Error: ${error instanceof Error ? error.message : String(error)}`
   let configBaseDir = typeof process !== "undefined" ? process.cwd() : "";
   if (typeof process !== "undefined" && typeof process.cwd === "function") {
     try {
-      const { loadConfig } = await import("./configLoader-DWHOHXHL.js");
+      const { loadConfig } = await import("./configLoader-Q7N5XV4P.js");
       const result2 = await loadConfig(process.cwd());
       config = result2.config;
       if (result2.configPath) {
@@ -2130,7 +2204,7 @@ Error: ${error instanceof Error ? error.message : String(error)}`
       const devServerUrl = await checkDevServer(url);
       if (devServerUrl) {
         console.log(`\u{1F3AD} Running Playwright tests on ${devServerUrl}`);
-        const { runContractTestsPlaywright } = await import("./contractTestRunnerPlaywright-WNWQYSXZ.js");
+        const { runContractTestsPlaywright } = await import("./contractTestRunnerPlaywright-NL3JNJYH.js");
         contract = await runContractTestsPlaywright(componentName, devServerUrl, strictness, config, configBaseDir);
       } else {
         throw new Error(
@@ -2140,7 +2214,16 @@ Please start your dev server and try again.`
       }
     } else if (component) {
       console.log(`\u{1F3AD} Running component contract tests in JSDOM mode`);
-      contract = await runContractTests(componentName, component, strictness);
+      const contractPath = config.test?.components?.find((comp) => comp?.name === componentName)?.contractPath;
+      if (!contractPath) {
+        throw new Error(`\u274C No contract path found for component: ${componentName}`);
+      }
+      contract = await runContractTests(
+        path.resolve(configBaseDir, contractPath),
+        componentName,
+        component,
+        strictness
+      );
     } else {
       throw new Error("\u274C Either component or URL must be provided");
     }

package/dist/src/combobox/index.cjs

@@ -130,6 +130,7 @@ function makeComboboxAccessible({ comboboxInputId, comboboxButtonId, listBoxId,
         } else if (comboboxInput.value) {
           event.preventDefault();
           comboboxInput.value = "";
+          comboboxInput.setAttribute("aria-activedescendant", "");
           const visibleItems2 = getVisibleItems();
           visibleItems2.forEach((item) => {
             if (item.getAttribute("aria-selected") === "true") item.setAttribute("aria-selected", "false");

package/dist/src/combobox/index.js

@@ -128,6 +128,7 @@ function makeComboboxAccessible({ comboboxInputId, comboboxButtonId, listBoxId,
         } else if (comboboxInput.value) {
           event.preventDefault();
           comboboxInput.value = "";
+          comboboxInput.setAttribute("aria-activedescendant", "");
           const visibleItems2 = getVisibleItems();
           visibleItems2.forEach((item) => {
             if (item.getAttribute("aria-selected") === "true") item.setAttribute("aria-selected", "false");

package/dist/src/utils/test/{ComboboxComponentStrategy-5AECQSRN.js → ComboboxComponentStrategy-XKQ72RFD.js}

@@ -14,7 +14,7 @@ var ComboboxComponentStrategy = class {
     const popupElement = page.locator(popupSelector).first();
     const isPopupVisible = await popupElement.isVisible().catch(() => false);
     if (!isPopupVisible) return;
-    let listBoxClosed = false;
+    let popupClosed = false;
     let closeSelector = this.selectors.input;
     if (!closeSelector && this.selectors.focusable) {
       closeSelector = this.selectors.focusable;
@@ -25,18 +25,18 @@ var ComboboxComponentStrategy = class {
       const closeElement = page.locator(closeSelector).first();
       await closeElement.focus();
       await page.keyboard.press("Escape");
-      listBoxClosed = await expect(popupElement).toBeHidden({ timeout: this.assertionTimeoutMs }).then(() => true).catch(() => false);
+      popupClosed = await expect(popupElement).toBeHidden({ timeout: this.assertionTimeoutMs }).then(() => true).catch(() => false);
     }
-    if (!listBoxClosed && this.selectors.button) {
+    if (!popupClosed && this.selectors.button) {
       const buttonElement = page.locator(this.selectors.button).first();
       await buttonElement.click({ timeout: this.actionTimeoutMs });
-      listBoxClosed = await expect(popupElement).toBeHidden({ timeout: this.assertionTimeoutMs }).then(() => true).catch(() => false);
+      popupClosed = await expect(popupElement).toBeHidden({ timeout: this.assertionTimeoutMs }).then(() => true).catch(() => false);
     }
-    if (!listBoxClosed) {
+    if (!popupClosed) {
       await page.mouse.click(10, 10);
-      listBoxClosed = await expect(popupElement).toBeHidden({ timeout: this.assertionTimeoutMs }).then(() => true).catch(() => false);
+      popupClosed = await expect(popupElement).toBeHidden({ timeout: this.assertionTimeoutMs }).then(() => true).catch(() => false);
     }
-    if (!listBoxClosed) {
+    if (!popupClosed) {
       throw new Error(
         `\u274C FATAL: Cannot close combobox popup between tests. Popup remains visible after trying:
   1. Escape key

package/dist/src/utils/test/RelativeTargetResolver-G2XDN2VV.js

@@ -0,0 +1 @@
+export { RelativeTargetResolver } from './chunk-GLT43UVH.js';

package/dist/src/utils/test/{chunk-XERMSYEH.js → chunk-4DU5Z5BR.js}

@@ -1,25 +1,5 @@
 import { chromium } from 'playwright';
 
-// src/utils/test/contract/contract.json
-var contract_default = {
-  menu: {
-    path: "./aria-contracts/menu/menu.contract.json",
-    component: "menu"
-  },
-  "combobox.listbox": {
-    path: "./aria-contracts/combobox/combobox.listbox.contract.json",
-    component: "combobox.listbox"
-  },
-  accordion: {
-    path: "./aria-contracts/accordion/accordion.contract.json",
-    component: "accordion"
-  },
-  tabs: {
-    path: "./aria-contracts/tabs/tabs.contract.json",
-    component: "tabs"
-  }
-};
-
 // src/utils/test/src/ContractReporter.ts
 var ContractReporter = class {
   startTime = 0;
@@ -328,9 +308,7 @@ async function getOrCreateContext() {
   if (!sharedContext) {
     const browser = await getOrCreateBrowser();
     sharedContext = await browser.newContext({
-      // Isolated context - no permissions, no geolocation, etc.
       permissions: [],
-      // Ignore HTTPS errors for local dev servers
       ignoreHTTPSErrors: true
     });
   }
@@ -351,4 +329,4 @@ async function closeSharedBrowser() {
   }
 }
 
-export { ContractReporter, closeSharedBrowser, contract_default, createTestPage, normalizeLevel, normalizeStrictness, resolveEnforcement };
+export { ContractReporter, closeSharedBrowser, createTestPage, normalizeLevel, normalizeStrictness, resolveEnforcement };

package/dist/src/utils/test/chunk-GLT43UVH.js

@@ -0,0 +1,41 @@
+// src/utils/test/src/RelativeTargetResolver.ts
+var RelativeTargetResolver = class {
+  /**
+   * Resolve a relative target like "first", "second", "last", "next", "previous"
+   * @param page Playwright page instance
+   * @param selector Base selector to find elements
+   * @param relative Relative position (first, second, last, next, previous)
+   * @returns The resolved Locator or null if not found
+   */
+  static async resolve(page, selector, relative) {
+    const items = await page.locator(selector).all();
+    switch (relative) {
+      case "first":
+        return items[0];
+      case "second":
+        return items[1];
+      case "last":
+        return items[items.length - 1];
+      case "next": {
+        const currentIndex = await page.evaluate(([sel]) => {
+          const items2 = Array.from(document.querySelectorAll(sel));
+          return items2.indexOf(document.activeElement);
+        }, [selector]);
+        const nextIndex = (currentIndex + 1) % items.length;
+        return items[nextIndex];
+      }
+      case "previous": {
+        const currentIndex = await page.evaluate(([sel]) => {
+          const items2 = Array.from(document.querySelectorAll(sel));
+          return items2.indexOf(document.activeElement);
+        }, [selector]);
+        const prevIndex = (currentIndex - 1 + items.length) % items.length;
+        return items[prevIndex];
+      }
+      default:
+        return null;
+    }
+  }
+};
+
+export { RelativeTargetResolver };

package/dist/src/utils/test/{configLoader-SHJSRG2A.js → configLoader-NA7IBCS3.js}

@@ -69,8 +69,8 @@ function validateConfig(config) {
               if (typeof comp.name !== "string") {
                 errors.push(`test.components[${idx}].name must be a string`);
               }
-              if (comp.path !== void 0 && typeof comp.path !== "string") {
-                errors.push(`test.components[${idx}].path must be a string when provided`);
+              if (comp.contractPath !== void 0 && typeof comp.contractPath !== "string") {
+                errors.push(`test.components[${idx}].contractPath must be a string when provided`);
               }
               if (comp.strategyPath !== void 0 && typeof comp.strategyPath !== "string") {
                 errors.push(`test.components[${idx}].strategyPath must be a string when provided`);