@gtkx/testing 1.0.0-rc.1 → 1.0.0-rc.2

package/src/widget-accessible-properties.ts

@@ -3,106 +3,175 @@ import { getAccessibleMetadata } from "@gtkx/react/internal";
 import { EDITABLE_ROLES, isEditable, readEditableText } from "./editable.js";
 import { descendants } from "./traversal.js";
 
+type WidgetValue = {
+    now: number | null;
+    min: number | null;
+    max: number | null;
+    text: string | null;
+};
+
+type ValueTriplet = { now: number | null; min: number | null; max: number | null };
+
+const DEFAULT_TEXT_GETTERS = ["getLabel", "getText", "getTitle"] as const;
+
 const callStringGetter = (widget: Gtk.Widget, method: string): string | null => {
     const fn: unknown = Reflect.get(widget, method);
-    if (typeof fn !== "function") return null;
+
+    if (typeof fn !== "function") {
+        return null;
+    }
+
     const value = (fn as () => string | null).call(widget);
+
     return value ?? null;
 };
 
 const readAccessibleString = (widget: Gtk.Widget, key: string): string | null => {
-    const value = getAccessibleMetadata<string>(widget, key);
+    const value = getAccessibleMetadata(widget, key);
+
     return typeof value === "string" ? value : null;
 };
 
 const readAccessibleNumber = (widget: Gtk.Widget, key: string): number | null => {
-    const value = getAccessibleMetadata<number>(widget, key);
+    const value = getAccessibleMetadata(widget, key);
+
     return typeof value === "number" ? value : null;
 };
 
+const readAccessibleWidgets = (widget: Gtk.Widget, key: string): Gtk.Widget[] | null => {
+    const value = getAccessibleMetadata(widget, key);
+
+    if (!Array.isArray(value)) {
+        return null;
+    }
+
+    const widgets = value.filter((item): item is Gtk.Widget => item instanceof Gtk.Widget);
+
+    return widgets.length > 0 ? widgets : null;
+};
+
 const readAccessibleBoolean = (widget: Gtk.Widget, key: string): boolean | null => {
-    const value = getAccessibleMetadata<boolean>(widget, key);
+    const value = getAccessibleMetadata(widget, key);
+
     return typeof value === "boolean" ? value : null;
 };
 
 const getLabelText = (widget: Gtk.Widget): string | null => {
-    if (widget instanceof Gtk.Label) return widget.getLabel();
-    if (widget instanceof Gtk.Inscription) return widget.getText() ?? null;
+    if (widget instanceof Gtk.Label) {
+        return widget.getLabel();
+    }
+
+    if (widget instanceof Gtk.Inscription) {
+        return widget.getText() ?? null;
+    }
+
     return null;
 };
 
-const DEFAULT_TEXT_GETTERS = ["getLabel", "getText", "getTitle"] as const;
-
 /**
  * Returns a widget's own text by trying its label, text, and title getters in
  * order, or null when none produce a value.
  *
  * @param widget The widget to read text from.
  */
-export const getWidgetNodeText = (widget: Gtk.Widget): string | null => {
+const getWidgetNodeText = (widget: Gtk.Widget): string | null => {
     for (const getter of DEFAULT_TEXT_GETTERS) {
         const value = callStringGetter(widget, getter);
-        if (value) return value;
+
+        if (value) {
+            return value;
+        }
     }
+
     return null;
 };
 
-const stripMnemonic = (text: string): string => text.replace(/_(.)/g, "$1");
+const stripMnemonic = (text: string): string => text.replaceAll(/_(.)/g, "$1");
 
 const namingLabelText = (widget: Gtk.Widget): string | null => {
     const text = getLabelText(widget);
-    if (text === null) return null;
+
+    if (text === null) {
+        return null;
+    }
+
     return widget instanceof Gtk.Label && widget.getUseUnderline() ? stripMnemonic(text) : text;
 };
 
-const isNamingLabelRole = (role: Gtk.AccessibleRole, includePresentation: boolean): boolean =>
-    role === Gtk.AccessibleRole.LABEL || (includePresentation && role === Gtk.AccessibleRole.PRESENTATION);
+const isNamingLabelRole = (role: Gtk.AccessibleRole, shouldIncludePresentation: boolean): boolean =>
+    role === Gtk.AccessibleRole.LABEL ||
+    (shouldIncludePresentation && role === Gtk.AccessibleRole.PRESENTATION);
 
 const collectLabels = (widget: Gtk.Widget): string[] => {
-    const includePresentation = widget.getAccessibleRole() === Gtk.AccessibleRole.MENU_ITEM;
+    const isIncludePresentation = widget.getAccessibleRole() === Gtk.AccessibleRole.MENU_ITEM;
     const labels: string[] = [];
+
     for (const descendant of descendants(widget)) {
-        if (!isNamingLabelRole(descendant.getAccessibleRole(), includePresentation)) continue;
+        if (!isNamingLabelRole(descendant.getAccessibleRole(), isIncludePresentation)) {
+            continue;
+        }
+
         const labelText = namingLabelText(descendant);
-        if (labelText) labels.push(labelText);
+
+        if (labelText) {
+            labels.push(labelText);
+        }
     }
+
     return labels;
 };
 
-export const getWidgetLabelText = (widget: Gtk.Widget): string | null => {
-    if (widget.getAccessibleRole() !== Gtk.AccessibleRole.LABEL) return null;
+const getWidgetLabelText = (widget: Gtk.Widget): string | null => {
+    if (widget.getAccessibleRole() !== Gtk.AccessibleRole.LABEL) {
+        return null;
+    }
+
     return getLabelText(widget);
 };
 
-export const getWidgetAccessibleName = (widget: Gtk.Widget): string | null => {
+const tabPanelTitle = (widget: Gtk.Widget): string | null => {
+    const parent = widget.getParent();
+
+    if (parent instanceof Gtk.Stack) {
+        return parent.getPage(widget).getTitle() ?? null;
+    }
+
+    return null;
+};
+
+const getWidgetAccessibleName = (widget: Gtk.Widget): string | null => {
     const role = widget.getAccessibleRole();
 
     if (role === Gtk.AccessibleRole.TAB_PANEL) {
-        const parent = widget.getParent();
-        if (parent instanceof Gtk.Stack) {
-            const page = parent.getPage(widget);
-            return page.getTitle() ?? null;
-        }
-        return null;
+        return tabPanelTitle(widget);
     }
 
-    const accessibleLabel = getAccessibleMetadata<string>(widget, "accessibleLabel");
-    if (accessibleLabel) return accessibleLabel;
+    const accessibleLabel = readAccessibleString(widget, "accessibleLabel");
+
+    if (accessibleLabel) {
+        return accessibleLabel;
+    }
 
     const ownText = getWidgetNodeText(widget);
-    if (ownText) return ownText;
+
+    if (ownText) {
+        return ownText;
+    }
 
     const childLabels = collectLabels(widget);
-    if (childLabels.length > 0) return childLabels.join(" ");
+
+    if (childLabels.length > 0) {
+        return childLabels.join(" ");
+    }
 
     return callStringGetter(widget, "getTooltipText");
 };
 
-export const getWidgetName = (widget: Gtk.Widget): string | null => {
+const getWidgetName = (widget: Gtk.Widget): string | null => {
     return widget.getName();
 };
 
-export const getWidgetPlaceholderText = (widget: Gtk.Widget): string | null => {
+const getWidgetPlaceholderText = (widget: Gtk.Widget): string | null => {
     if (!EDITABLE_ROLES.has(widget.getAccessibleRole()) || !(widget instanceof Gtk.Editable)) {
         return null;
     }
@@ -110,7 +179,7 @@ export const getWidgetPlaceholderText = (widget: Gtk.Widget): string | null => {
     return callStringGetter(widget, "getPlaceholderText");
 };
 
-export const getWidgetDisplayValue = (widget: Gtk.Widget): string | null => {
+const getWidgetDisplayValue = (widget: Gtk.Widget): string | null => {
     if (EDITABLE_ROLES.has(widget.getAccessibleRole()) && isEditable(widget)) {
         return readEditableText(widget);
     }
@@ -118,21 +187,31 @@ export const getWidgetDisplayValue = (widget: Gtk.Widget): string | null => {
     return null;
 };
 
-export const getWidgetCheckedState = (widget: Gtk.Widget): boolean | null => {
-    if (widget instanceof Gtk.CheckButton) return widget.getActive();
-    if (widget instanceof Gtk.Switch) return widget.getActive();
+const getWidgetCheckedState = (widget: Gtk.Widget): boolean | null => {
+    if (widget instanceof Gtk.CheckButton) {
+        return widget.getActive();
+    }
+
+    if (widget instanceof Gtk.Switch) {
+        return widget.getActive();
+    }
+
     if (widget instanceof Gtk.ToggleButton && widget.getAccessibleRole() === Gtk.AccessibleRole.RADIO) {
         return widget.getActive();
     }
+
     return null;
 };
 
-export const getWidgetPressedState = (widget: Gtk.Widget): boolean | null => {
-    if (widget instanceof Gtk.ToggleButton) return widget.getActive();
+const getWidgetPressedState = (widget: Gtk.Widget): boolean | null => {
+    if (widget instanceof Gtk.ToggleButton) {
+        return widget.getActive();
+    }
+
     return null;
 };
 
-export const getWidgetExpandedState = (widget: Gtk.Widget): boolean | null => {
+const getWidgetExpandedState = (widget: Gtk.Widget): boolean | null => {
     if (widget instanceof Gtk.Expander) {
         return widget.getExpanded();
     }
@@ -144,7 +223,7 @@ export const getWidgetExpandedState = (widget: Gtk.Widget): boolean | null => {
     return null;
 };
 
-export const getWidgetSelectedState = (widget: Gtk.Widget): boolean | null => {
+const getWidgetSelectedState = (widget: Gtk.Widget): boolean | null => {
     if (widget instanceof Gtk.ListBoxRow) {
         return widget.isSelected();
     }
@@ -156,58 +235,79 @@ export const getWidgetSelectedState = (widget: Gtk.Widget): boolean | null => {
     return null;
 };
 
-export const getWidgetLevel = (widget: Gtk.Widget): number | null => {
+const getWidgetLevel = (widget: Gtk.Widget): number | null => {
     return readAccessibleNumber(widget, "accessibleLevel");
 };
 
-export const getWidgetInvalidState = (widget: Gtk.Widget): Gtk.AccessibleInvalidState | null => {
-    return getAccessibleMetadata<Gtk.AccessibleInvalidState>(widget, "accessibleInvalid");
-};
+const getWidgetInvalidState = (widget: Gtk.Widget): Gtk.AccessibleInvalidState | null => {
+    const value = readAccessibleNumber(widget, "accessibleInvalid");
 
-export const getWidgetErrorMessage = (widget: Gtk.Widget): Gtk.Widget[] | null => {
-    const targets = getAccessibleMetadata<Gtk.Widget[]>(widget, "accessibleErrorMessage");
-    return Array.isArray(targets) && targets.length > 0 ? targets : null;
+    return value ?? null;
 };
 
-export const getWidgetBusyState = (widget: Gtk.Widget): boolean | null => {
+const getWidgetErrorMessage = (widget: Gtk.Widget): Gtk.Widget[] | null =>
+    readAccessibleWidgets(widget, "accessibleErrorMessage");
+
+const getWidgetBusyState = (widget: Gtk.Widget): boolean | null => {
     return readAccessibleBoolean(widget, "accessibleBusy");
 };
 
-export const getWidgetDescription = (widget: Gtk.Widget): string | null => {
+const getWidgetDescription = (widget: Gtk.Widget): string | null => {
     return readAccessibleString(widget, "accessibleDescription");
 };
 
-export type WidgetValue = {
-    now: number | null;
-    min: number | null;
-    max: number | null;
-    text: string | null;
-};
-
-type ValueTriplet = { now: number | null; min: number | null; max: number | null };
-
 const adjustmentValue = (adjustment: Gtk.Adjustment): ValueTriplet => ({
     now: adjustment.getValue(),
     min: adjustment.getLower(),
     max: adjustment.getUpper(),
 });
 
+const adjustmentWidgetValue = (widget: Gtk.Widget): ValueTriplet | null => {
+    if (widget instanceof Gtk.Range) {
+        return adjustmentValue(widget.getAdjustment());
+    }
+
+    if (widget instanceof Gtk.Scrollbar) {
+        return adjustmentValue(widget.getAdjustment());
+    }
+
+    if (widget instanceof Gtk.SpinButton) {
+        return adjustmentValue(widget.getAdjustment());
+    }
+
+    if (widget instanceof Gtk.ScaleButton) {
+        return adjustmentValue(widget.getAdjustment());
+    }
+
+    return null;
+};
+
 const getWidgetLiveValue = (widget: Gtk.Widget): ValueTriplet | null => {
-    if (widget instanceof Gtk.Range) return adjustmentValue(widget.getAdjustment());
-    if (widget instanceof Gtk.Scrollbar) return adjustmentValue(widget.getAdjustment());
-    if (widget instanceof Gtk.SpinButton) return adjustmentValue(widget.getAdjustment());
-    if (widget instanceof Gtk.ScaleButton) return adjustmentValue(widget.getAdjustment());
+    const adjustmentBased = adjustmentWidgetValue(widget);
+
+    if (adjustmentBased) {
+        return adjustmentBased;
+    }
+
     if (widget instanceof Gtk.LevelBar) {
         return { now: widget.getValue(), min: widget.getMinValue(), max: widget.getMaxValue() };
     }
-    if (widget instanceof Gtk.ProgressBar) return { now: widget.getFraction(), min: 0, max: 1 };
+
+    if (widget instanceof Gtk.ProgressBar) {
+        return { now: widget.getFraction(), min: 0, max: 1 };
+    }
+
     return null;
 };
 
-export const getWidgetValue = (widget: Gtk.Widget): WidgetValue => {
+const getWidgetValue = (widget: Gtk.Widget): WidgetValue => {
     const text = readAccessibleString(widget, "accessibleValueText");
     const live = getWidgetLiveValue(widget);
-    if (live) return { ...live, text };
+
+    if (live) {
+        return { ...live, text };
+    }
+
     return {
         now: readAccessibleNumber(widget, "accessibleValueNow"),
         min: readAccessibleNumber(widget, "accessibleValueMin"),
@@ -216,29 +316,73 @@ export const getWidgetValue = (widget: Gtk.Widget): WidgetValue => {
     };
 };
 
-export const getWidgetOwnLabel = (widget: Gtk.Widget): string | null => {
+const getWidgetOwnLabel = (widget: Gtk.Widget): string | null => {
     return readAccessibleString(widget, "accessibleLabel");
 };
 
-export const getWidgetLabelledByText = (widget: Gtk.Widget): string | null => {
-    const targets = getAccessibleMetadata<Gtk.Widget[]>(widget, "accessibleLabelledBy");
-    if (!Array.isArray(targets) || targets.length === 0) return null;
-
+const collectAccessibleNames = (targets: Gtk.Widget[]): string[] => {
     const texts: string[] = [];
+
     for (const target of targets) {
         const text = getWidgetAccessibleName(target);
-        if (text !== null) texts.push(text);
+
+        if (text !== null) {
+            texts.push(text);
+        }
     }
 
+    return texts;
+};
+
+const getWidgetLabelledByText = (widget: Gtk.Widget): string | null => {
+    const targets = readAccessibleWidgets(widget, "accessibleLabelledBy");
+
+    if (targets === null) {
+        return null;
+    }
+
+    const texts = collectAccessibleNames(targets);
+
     return texts.length > 0 ? texts.join(" ") : null;
 };
 
-export const isInaccessible = (widget: Gtk.Widget): boolean => {
+const isInaccessible = (widget: Gtk.Widget): boolean => {
     let current: Gtk.Widget | null = widget;
+
     while (current) {
-        if (!current.getVisible()) return true;
-        if (readAccessibleBoolean(current, "accessibleHidden") === true) return true;
+        if (!current.getVisible()) {
+            return true;
+        }
+
+        if (readAccessibleBoolean(current, "accessibleHidden") === true) {
+            return true;
+        }
+
         current = current.getParent();
     }
+
     return false;
 };
+
+export {
+    getWidgetNodeText,
+    getWidgetLabelText,
+    getWidgetAccessibleName,
+    getWidgetName,
+    getWidgetPlaceholderText,
+    getWidgetDisplayValue,
+    getWidgetCheckedState,
+    getWidgetPressedState,
+    getWidgetExpandedState,
+    getWidgetSelectedState,
+    getWidgetLevel,
+    getWidgetInvalidState,
+    getWidgetErrorMessage,
+    getWidgetBusyState,
+    getWidgetDescription,
+    getWidgetValue,
+    getWidgetOwnLabel,
+    getWidgetLabelledByText,
+    isInaccessible,
+    type WidgetValue,
+};

package/src/within.ts

@@ -1,15 +1,16 @@
 import type { BoundQueries } from "./bound-queries.js";
-import { builtinQueries } from "./queries.js";
 import type { Container } from "./traversal.js";
 import type { BoundCustomQueries, QueryMap } from "./types.js";
+import { builtinQueries } from "./queries.js";
 
 const bindQuery =
     <Args extends unknown[], Result>(query: (container: Container, ...args: Args) => Result, container: Container) =>
-    (...args: Args): Result =>
-        query(container, ...args);
+        (...args: Args): Result =>
+            query(container, ...args);
 
 const bindCustomQueries = <Q extends QueryMap>(customQueries: Q, container: Container): BoundCustomQueries<Q> => {
     const entries = Object.entries(customQueries).map(([key, query]) => [key, bindQuery(query, container)] as const);
+
     return Object.fromEntries(entries) as BoundCustomQueries<Q>;
 };
 
@@ -21,10 +22,12 @@ const bindCustomQueries = <Q extends QueryMap>(customQueries: Q, container: Cont
  * @param queries Optional custom queries to bind alongside the built-in ones.
  * @returns The queries bound to the container.
  */
-export const within = <Q extends QueryMap = Record<never, never>>(
+const within = <Q extends QueryMap = Record<never, never>>(
     container: Container,
     queries?: Q,
 ): BoundQueries & BoundCustomQueries<Q> => ({
     ...bindCustomQueries(builtinQueries, container),
     ...(queries ? bindCustomQueries(queries, container) : ({} as BoundCustomQueries<Q>)),
 });
+
+export { within };