aria-ease 6.11.0 → 6.12.1

package/dist/src/utils/test/{contractTestRunnerPlaywright-Z2AHXSNM.js → contractTestRunnerPlaywright-5FT6K2WN.js}

@@ -1,4 +1,5 @@
-import { contract_default, ContractReporter, normalizeStrictness, createTestPage, normalizeLevel, resolveEnforcement } from './chunk-XERMSYEH.js';
+import { ContractReporter, normalizeStrictness, createTestPage, normalizeLevel, resolveEnforcement } from './chunk-4DU5Z5BR.js';
+import { RelativeTargetResolver } from './chunk-GLT43UVH.js';
 import { readFileSync } from 'fs';
 import path2 from 'path';
 import { pathToFileURL } from 'url';
@@ -27,7 +28,7 @@ var StrategyRegistry = class {
     );
     this.builtInStrategies.set(
       "combobox",
-      () => import('./ComboboxComponentStrategy-5AECQSRN.js').then(
+      () => import('./ComboboxComponentStrategy-XKQ72RFD.js').then(
         (m) => m.ComboboxComponentStrategy
       )
     );
@@ -37,12 +38,6 @@ var StrategyRegistry = class {
         (m) => m.TabsComponentStrategy
       )
     );
-    this.builtInStrategies.set(
-      "combobox.listbox",
-      () => import('./ComboboxComponentStrategy-5AECQSRN.js').then(
-        (m) => m.ComboboxComponentStrategy
-      )
-    );
   }
   /**
    * Load a strategy - either from custom path or built-in registry
@@ -106,11 +101,7 @@ var ComponentDetector = class {
    */
   static async detect(componentName, componentConfig, actionTimeoutMs = 400, assertionTimeoutMs = 400, configBaseDir) {
     const typedComponentConfig = this.isComponentConfig(componentConfig) ? componentConfig : void 0;
-    let contractPath = typedComponentConfig?.path;
-    if (!contractPath) {
-      const contractTyped = contract_default;
-      contractPath = contractTyped[componentName]?.path;
-    }
+    const contractPath = typedComponentConfig?.contractPath;
     if (!contractPath) {
       throw new Error(`Contract path not found for component: ${componentName}`);
     }
@@ -143,7 +134,7 @@ var ComponentDetector = class {
     if (!strategyClass) {
       return null;
     }
-    const mainSelector = selectors.trigger || selectors.input || selectors.tablist || selectors.container;
+    const mainSelector = selectors.main;
     if (componentName === "tabs") {
       return new strategyClass(mainSelector, selectors);
     }
@@ -156,46 +147,6 @@ var ComponentDetector = class {
   }
 };
 
-// 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;
-    }
-  }
-};
-
 // src/utils/test/src/ActionExecutor.ts
 var ActionExecutor = class {
   constructor(page, selectors, timeoutMs = 400) {
@@ -221,16 +172,16 @@ var ActionExecutor = class {
   async focus(target, relativeTarget, virtualId) {
     try {
       if (target === "virtual" && virtualId) {
-        const inputSelector = this.selectors.input;
-        if (!inputSelector) {
-          return { success: false, error: `Input selector not defined for virtual focus.` };
+        const mainSelector = this.selectors.main;
+        if (!mainSelector) {
+          return { success: false, error: `Main selector not defined for virtual focus.` };
         }
-        const input = this.page.locator(inputSelector).first();
-        const exists = await input.count();
+        const main = this.page.locator(mainSelector).first();
+        const exists = await main.count();
         if (!exists) {
-          return { success: false, error: `Input element not found for virtual focus.` };
+          return { success: false, error: `Main element not found for virtual focus.` };
         }
-        await input.evaluate((el, id) => {
+        await main.evaluate((el, id) => {
           el.setAttribute("aria-activedescendant", id);
         }, virtualId);
         return { success: true };
@@ -522,6 +473,10 @@ var AssertionRunner = class {
         };
       }
     }
+    if (typeof expectedValue !== "string") {
+      console.error("[AssertionRunner] expectedValue is not a string:", expectedValue);
+      throw new Error(`AssertionRunner: expectedValue for attribute assertion must be a string, but got: ${JSON.stringify(expectedValue)}`);
+    }
     const expectedValues = expectedValue.split(" | ").map((v) => v.trim());
     const attributeValue = await target.getAttribute(attribute);
     if (attributeValue !== null && expectedValues.includes(attributeValue)) {
@@ -689,7 +644,7 @@ var AssertionRunner = class {
 // src/utils/test/src/contractTestRunnerPlaywright.ts
 async function runContractTestsPlaywright(componentName, url, strictness, config, configBaseDir) {
   const componentConfig = config?.test?.components?.find((c) => c.name === componentName);
-  const isCustomContract = !!componentConfig?.path;
+  const isCustomContract = !!componentConfig?.contractPath;
   const reporter = new ContractReporter(true, isCustomContract);
   const defaultTimeouts = {
     actionTimeoutMs: 400,
@@ -729,11 +684,7 @@ async function runContractTestsPlaywright(componentName, url, strictness, config
     defaultTimeouts.componentReadyTimeoutMs
   );
   const strictnessMode = normalizeStrictness(strictness);
-  let contractPath = componentConfig?.path;
-  if (!contractPath) {
-    const contractTyped = contract_default;
-    contractPath = contractTyped[componentName]?.path;
-  }
+  const contractPath = componentConfig?.contractPath;
   if (!contractPath) {
     throw new Error(`Contract path not found for component: ${componentName}`);
   }
@@ -952,6 +903,52 @@ This usually means:
         reporter.reportStaticTest(relDescription, "pass", void 0, relationshipLevel);
       }
     }
+    async function resolveExpectedValue(expectedValue, selectors, page2, context = {}) {
+      if (!expectedValue || typeof expectedValue !== "object" || !("ref" in expectedValue)) return expectedValue;
+      let refSelector;
+      if (expectedValue.ref === "relative") {
+        if (!expectedValue.relativeTarget || !context.relativeBaseSelector) return void 0;
+        const baseLocator = page2.locator(context.relativeBaseSelector);
+        const count = await baseLocator.count();
+        let idx = 0;
+        if (expectedValue.relativeTarget === "first") idx = 0;
+        else if (expectedValue.relativeTarget === "second") idx = 1;
+        else if (expectedValue.relativeTarget === "last") idx = count - 1;
+        else if (!isNaN(Number(expectedValue.relativeTarget))) idx = Number(expectedValue.relativeTarget);
+        else idx = 0;
+        if (idx < 0 || idx >= count) return void 0;
+        const relElem = baseLocator.nth(idx);
+        return await getPropertyFromLocator(relElem, expectedValue.property || expectedValue.attribute);
+      } else {
+        refSelector = selectors[expectedValue.ref];
+        if (!refSelector) throw new Error(`Selector for ref '${expectedValue.ref}' not found in contract selectors.`);
+        const refLocator = page2.locator(refSelector).first();
+        return await getPropertyFromLocator(refLocator, expectedValue.property || expectedValue.attribute);
+      }
+    }
+    async function getPropertyFromLocator(locator, property) {
+      if (!locator) return void 0;
+      if (!property || property === "id") {
+        return await locator.getAttribute("id") ?? void 0;
+      } else if (property === "class") {
+        return await locator.getAttribute("class") ?? void 0;
+      } else if (property === "textContent") {
+        return await locator.evaluate((el) => el.textContent ?? void 0);
+      } else if (property.startsWith("aria-")) {
+        return await locator.getAttribute(property) ?? void 0;
+      } else if (property.endsWith("*")) {
+        const attrs = await locator.evaluate((el) => {
+          const out = [];
+          for (const attr of Array.from(el.attributes)) {
+            if (attr.name.startsWith("aria-")) out.push(`${attr.name}=${attr.value}`);
+          }
+          return out.join(";");
+        });
+        return attrs;
+      } else {
+        return await locator.getAttribute(property) ?? void 0;
+      }
+    }
     const staticAssertionRunner = new AssertionRunner(page, componentContract.selectors, assertionTimeoutMs);
     for (const test of componentContract.static[0]?.assertions || []) {
       if (test.target === "relative") continue;
@@ -994,6 +991,22 @@ This usually means:
         }
         return false;
       };
+      let expectedValue = test.expectedValue;
+      if (test.expectedValue && typeof test.expectedValue === "object" && "ref" in test.expectedValue) {
+        const context = {};
+        const relTarget = test.relativeTarget;
+        if (test.expectedValue.ref === "relative" && test.target === "relative" && relTarget) {
+          const baseSel = componentContract.selectors[relTarget];
+          if (!baseSel) throw new Error(`Selector for relativeTarget '${relTarget}' not found in contract selectors.`);
+          context.relativeBaseSelector = baseSel;
+        } else if (test.expectedValue.ref === "relative" && relTarget) {
+          const baseSel = componentContract.selectors[relTarget];
+          if (!baseSel) throw new Error(`Selector for relativeTarget '${relTarget}' not found in contract selectors.`);
+          context.relativeBaseSelector = baseSel;
+        }
+        expectedValue = await resolveExpectedValue(test.expectedValue, componentContract.selectors, page, context);
+        console.log("Expected value in static check", expectedValue);
+      }
       if (!test.expectedValue) {
         const attributes = test.attribute.split(" | ");
         let hasAny = false;
@@ -1027,16 +1040,17 @@ This usually means:
           reporter.reportStaticTest(staticDescription, "pass", void 0, staticLevel);
         }
       } else {
-        if (isRedundantCheck(targetSelector, test.attribute, test.expectedValue)) {
-          passes.push(`${test.attribute}="${test.expectedValue}" on ${test.target} verified by selector (already present in: ${targetSelector}).`);
+        if (isRedundantCheck(targetSelector, test.attribute, typeof expectedValue === "string" ? expectedValue : void 0)) {
+          passes.push(`${test.attribute}="${expectedValue}" on ${test.target} verified by selector (already present in: ${targetSelector}).`);
           staticPassed += 1;
           reporter.reportStaticTest(staticDescription, "pass", void 0, staticLevel);
         } else {
+          const valueToCheck = expectedValue ?? "";
           const result = await staticAssertionRunner.validateAttribute(
             target,
             test.target,
             test.attribute,
-            test.expectedValue,
+            valueToCheck,
             test.failureMessage,
             "Static ARIA Test"
           );
@@ -1154,7 +1168,33 @@ This usually means:
         continue;
       }
       for (const assertion of assertions) {
-        const result = await assertionRunner.validate(assertion, dynamicTest.description);
+        let expectedValue;
+        if (assertion.expectedValue && typeof assertion.expectedValue === "object" && "ref" in assertion.expectedValue) {
+          if (assertion.expectedValue.ref === "relative") {
+            const { RelativeTargetResolver: RelativeTargetResolver2 } = await import('./RelativeTargetResolver-G2XDN2VV.js');
+            const relativeSelector = componentContract.selectors.relative;
+            if (!relativeSelector) throw new Error("Relative selector not defined in contract selectors.");
+            const relTarget = assertion.relativeTarget || "first";
+            const relElem = await RelativeTargetResolver2.resolve(page, relativeSelector, relTarget);
+            if (!relElem) throw new Error(`Could not resolve relative target '${relTarget}' for expectedValue.`);
+            const prop = assertion.expectedValue.property || assertion.expectedValue.attribute || "id";
+            if (prop === "textContent") {
+              expectedValue = await relElem.evaluate((el) => el.textContent ?? void 0);
+            } else {
+              const attr = await relElem.getAttribute(prop);
+              expectedValue = attr === null ? void 0 : attr;
+            }
+          } else {
+            expectedValue = await resolveExpectedValue(assertion.expectedValue, componentContract.selectors, page, {});
+          }
+        } else if (typeof assertion.expectedValue === "string" || typeof assertion.expectedValue === "undefined") {
+          expectedValue = assertion.expectedValue;
+        } else {
+          expectedValue = "";
+        }
+        const assertionToRun = { ...assertion, expectedValue };
+        const valueToCheck = expectedValue ?? "";
+        const result = await assertionRunner.validate({ ...assertionToRun, expectedValue: valueToCheck }, dynamicTest.description);
         if (result.success && result.passMessage) {
           passes.push(result.passMessage);
         } else if (!result.success && result.failMessage) {

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

@@ -18,7 +18,7 @@ function resolveSetup(setup, ctx) {
   );
 }
 var COMBOBOX_STATES = {
-  "listbox.open": {
+  "popup.open": {
     setup: [
       {
         when: ["keyboard", "textInput"],
@@ -35,7 +35,7 @@ var COMBOBOX_STATES = {
     ],
     assertion: isComboboxOpen
   },
-  "listbox.closed": {
+  "popup.closed": {
     setup: [
       {
         when: ["keyboard"],
@@ -50,18 +50,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: [
@@ -74,8 +74,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"],
@@ -84,7 +95,7 @@ var COMBOBOX_STATES = {
         ]
       }
     ],
-    assertion: isActiveDescendantNotEmpty
+    assertion: isActiveDescendantFirst
   },
   "activeOption.last": {
     requires: ["activeOption.first"],
@@ -96,10 +107,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"],
@@ -111,7 +142,7 @@ var COMBOBOX_STATES = {
     assertion: () => isAriaSelected("first")
   },
   "selectedOption.last": {
-    requires: ["listbox.open"],
+    requires: ["popup.open"],
     setup: [
       {
         when: ["pointer"],
@@ -126,43 +157,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."
     }
   ];
 }
@@ -174,16 +238,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."
     }
   ];
 }
@@ -193,14 +257,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 {
@@ -234,11 +308,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);
@@ -249,7 +325,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" })
         })
       })
     };

package/dist/src/utils/test/dsl/index.d.cts

@@ -92,10 +92,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: {
@@ -103,6 +105,7 @@ declare class ContractBuilder {
             has: (attribute: string, expectedValue: string) => {
                 required: () => void;
                 optional: () => void;
+                recommended: () => void;
             };
         };
     }) => void): this;

package/dist/src/utils/test/dsl/index.d.ts

@@ -92,10 +92,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: {
@@ -103,6 +105,7 @@ declare class ContractBuilder {
             has: (attribute: string, expectedValue: string) => {
                 required: () => void;
                 optional: () => void;
+                recommended: () => void;
             };
         };
     }) => void): this;