@gtkx/testing 0.6.1 → 0.7.0

package/dist/queries.d.ts

@@ -1,5 +1,4 @@
-import type * as Gtk from "@gtkx/ffi/gtk";
-import { AccessibleRole } from "@gtkx/ffi/gtk";
+import * as Gtk from "@gtkx/ffi/gtk";
 import type { ByRoleOptions, TextMatch, TextMatchOptions } from "./types.js";
 type Container = Gtk.Application | Gtk.Widget;
 /**
@@ -9,7 +8,7 @@ type Container = Gtk.Application | Gtk.Widget;
  * @param options - Additional filtering options (name, checked, expanded)
  * @returns Promise resolving to the matching widget
  */
-export declare const findByRole: (container: Container, role: AccessibleRole, options?: ByRoleOptions) => Promise<Gtk.Widget>;
+export declare const findByRole: (container: Container, role: Gtk.AccessibleRole, options?: ByRoleOptions) => Promise<Gtk.Widget>;
 /**
  * Waits for and finds all widgets matching the specified accessible role.
  * @param container - The container to search within
@@ -17,7 +16,7 @@ export declare const findByRole: (container: Container, role: AccessibleRole, op
  * @param options - Additional filtering options (name, checked, expanded)
  * @returns Promise resolving to array of matching widgets
  */
-export declare const findAllByRole: (container: Container, role: AccessibleRole, options?: ByRoleOptions) => Promise<Gtk.Widget[]>;
+export declare const findAllByRole: (container: Container, role: Gtk.AccessibleRole, options?: ByRoleOptions) => Promise<Gtk.Widget[]>;
 /**
  * Waits for and finds a single widget matching the specified label text.
  * @param container - The container to search within

package/dist/queries.js

@@ -1,5 +1,5 @@
 import { getInterface } from "@gtkx/ffi";
-import { Accessible, AccessibleRole, Button, CheckButton, Editable, Expander, Frame, Label, MenuButton, StackPage, Switch, ToggleButton, Window, } from "@gtkx/ffi/gtk";
+import * as Gtk from "@gtkx/ffi/gtk";
 import { findAll } from "./traversal.js";
 import { waitFor } from "./wait-for.js";
 const buildNormalizer = (options) => {
@@ -39,35 +39,40 @@ const matchText = (actual, expected, widget, options) => {
     return exact ? normalizedActual === normalizedExpected : normalizedActual.includes(normalizedExpected);
 };
 const ROLES_WITH_INTERNAL_LABELS = new Set([
-    AccessibleRole.BUTTON,
-    AccessibleRole.TOGGLE_BUTTON,
-    AccessibleRole.CHECKBOX,
-    AccessibleRole.RADIO,
-    AccessibleRole.MENU_ITEM,
-    AccessibleRole.MENU_ITEM_CHECKBOX,
-    AccessibleRole.MENU_ITEM_RADIO,
-    AccessibleRole.TAB,
-    AccessibleRole.LINK,
+    Gtk.AccessibleRole.BUTTON,
+    Gtk.AccessibleRole.TOGGLE_BUTTON,
+    Gtk.AccessibleRole.CHECKBOX,
+    Gtk.AccessibleRole.RADIO,
+    Gtk.AccessibleRole.MENU_ITEM,
+    Gtk.AccessibleRole.MENU_ITEM_CHECKBOX,
+    Gtk.AccessibleRole.MENU_ITEM_RADIO,
+    Gtk.AccessibleRole.TAB,
+    Gtk.AccessibleRole.LINK,
 ]);
 const isInternalLabel = (widget) => {
-    const accessible = getInterface(widget, Accessible);
-    if (!accessible || accessible.getAccessibleRole() !== AccessibleRole.LABEL)
+    const accessible = getInterface(widget.id, Gtk.Accessible);
+    if (!accessible || accessible.getAccessibleRole() !== Gtk.AccessibleRole.LABEL)
         return false;
     const parent = widget.getParent();
     if (!parent)
         return false;
-    const parentAccessible = getInterface(parent, Accessible);
+    const parentAccessible = getInterface(parent.id, Gtk.Accessible);
     if (!parentAccessible)
         return false;
     return ROLES_WITH_INTERNAL_LABELS.has(parentAccessible.getAccessibleRole());
 };
+const getLabelText = (widget) => {
+    const asLabel = widget;
+    const asInscription = widget;
+    return asLabel.getLabel?.() ?? asInscription.getText?.() ?? null;
+};
 const collectChildLabels = (widget) => {
     const labels = [];
     let child = widget.getFirstChild();
     while (child) {
-        const childAccessible = getInterface(child, Accessible);
-        if (childAccessible?.getAccessibleRole() === AccessibleRole.LABEL) {
-            const labelText = getInterface(child, Label)?.getLabel();
+        const childAccessible = getInterface(child.id, Gtk.Accessible);
+        if (childAccessible?.getAccessibleRole() === Gtk.AccessibleRole.LABEL) {
+            const labelText = getLabelText(child);
             if (labelText)
                 labels.push(labelText);
         }
@@ -79,40 +84,49 @@ const collectChildLabels = (widget) => {
 const getWidgetText = (widget) => {
     if (isInternalLabel(widget))
         return null;
-    const role = getInterface(widget, Accessible)?.getAccessibleRole();
+    const role = getInterface(widget.id, Gtk.Accessible)?.getAccessibleRole();
     if (role === undefined)
         return null;
     switch (role) {
-        case AccessibleRole.BUTTON:
-        case AccessibleRole.LINK:
-        case AccessibleRole.TAB: {
-            const directLabel = getInterface(widget, Button)?.getLabel() ??
-                getInterface(widget, MenuButton)?.getLabel() ??
-                getInterface(widget, Expander)?.getLabel();
+        case Gtk.AccessibleRole.BUTTON:
+        case Gtk.AccessibleRole.LINK:
+        case Gtk.AccessibleRole.TAB: {
+            const directLabel = widget.getLabel?.() ??
+                widget.getLabel?.() ??
+                widget.getLabel?.();
             if (directLabel)
                 return directLabel;
             const childLabels = collectChildLabels(widget);
             return childLabels.length > 0 ? childLabels.join(" ") : null;
         }
-        case AccessibleRole.TOGGLE_BUTTON:
-            return getInterface(widget, ToggleButton)?.getLabel() ?? null;
-        case AccessibleRole.CHECKBOX:
-        case AccessibleRole.RADIO:
-            return getInterface(widget, CheckButton)?.getLabel() ?? null;
-        case AccessibleRole.LABEL:
-            return getInterface(widget, Label)?.getLabel() ?? null;
-        case AccessibleRole.TEXT_BOX:
-        case AccessibleRole.SEARCH_BOX:
-        case AccessibleRole.SPIN_BUTTON:
-            return getInterface(widget, Editable)?.getText() ?? null;
-        case AccessibleRole.GROUP:
-            return getInterface(widget, Frame)?.getLabel() ?? null;
-        case AccessibleRole.WINDOW:
-        case AccessibleRole.DIALOG:
-        case AccessibleRole.ALERT_DIALOG:
-            return getInterface(widget, Window)?.getTitle() ?? null;
-        case AccessibleRole.TAB_PANEL:
-            return getInterface(widget, StackPage)?.getTitle() ?? null;
+        case Gtk.AccessibleRole.TOGGLE_BUTTON:
+            return widget.getLabel?.() ?? null;
+        case Gtk.AccessibleRole.CHECKBOX:
+        case Gtk.AccessibleRole.RADIO:
+            return widget.getLabel?.() ?? null;
+        case Gtk.AccessibleRole.LABEL:
+            return getLabelText(widget);
+        case Gtk.AccessibleRole.TEXT_BOX:
+        case Gtk.AccessibleRole.SEARCH_BOX:
+        case Gtk.AccessibleRole.SPIN_BUTTON:
+            return getInterface(widget.id, Gtk.Editable)?.getText() ?? null;
+        case Gtk.AccessibleRole.GROUP:
+            return widget.getLabel?.() ?? null;
+        case Gtk.AccessibleRole.WINDOW:
+        case Gtk.AccessibleRole.DIALOG:
+        case Gtk.AccessibleRole.ALERT_DIALOG:
+            return widget.getTitle() ?? null;
+        case Gtk.AccessibleRole.TAB_PANEL: {
+            const parent = widget.getParent();
+            if (parent) {
+                const stack = parent;
+                const page = stack.getPage?.(widget);
+                if (page) {
+                    return page.getTitle() ?? null;
+                }
+            }
+            return null;
+        }
         default:
             return null;
     }
@@ -121,32 +135,32 @@ const getWidgetTestId = (widget) => {
     return widget.getName();
 };
 const getWidgetCheckedState = (widget) => {
-    const accessible = getInterface(widget, Accessible);
+    const accessible = getInterface(widget.id, Gtk.Accessible);
     if (!accessible)
         return undefined;
     const role = accessible.getAccessibleRole();
     switch (role) {
-        case AccessibleRole.CHECKBOX:
-        case AccessibleRole.RADIO:
-            return getInterface(widget, CheckButton)?.getActive();
-        case AccessibleRole.TOGGLE_BUTTON:
-            return getInterface(widget, ToggleButton)?.getActive();
-        case AccessibleRole.SWITCH:
-            return getInterface(widget, Switch)?.getActive();
+        case Gtk.AccessibleRole.CHECKBOX:
+        case Gtk.AccessibleRole.RADIO:
+            return widget.getActive();
+        case Gtk.AccessibleRole.TOGGLE_BUTTON:
+            return widget.getActive();
+        case Gtk.AccessibleRole.SWITCH:
+            return widget.getActive();
         default:
             return undefined;
     }
 };
 const getWidgetExpandedState = (widget) => {
-    const accessible = getInterface(widget, Accessible);
+    const accessible = getInterface(widget.id, Gtk.Accessible);
     if (!accessible)
         return undefined;
     const role = accessible.getAccessibleRole();
-    if (role === AccessibleRole.BUTTON) {
+    if (role === Gtk.AccessibleRole.BUTTON) {
         const parent = widget.getParent();
         if (!parent)
             return undefined;
-        return getInterface(parent, Expander)?.getExpanded();
+        return parent.getExpanded?.();
     }
     return undefined;
 };
@@ -170,7 +184,7 @@ const matchByRoleOptions = (widget, options) => {
     }
     return true;
 };
-const formatRole = (role) => AccessibleRole[role] ?? String(role);
+const formatRole = (role) => Gtk.AccessibleRole[role] ?? String(role);
 const formatByRoleError = (role, options) => {
     const parts = [`role "${formatRole(role)}"`];
     if (options?.name)
@@ -189,7 +203,7 @@ const formatByRoleError = (role, options) => {
 };
 const getAllByRole = (container, role, options) => {
     const matches = findAll(container, (node) => {
-        const accessible = getInterface(node, Accessible);
+        const accessible = getInterface(node.id, Gtk.Accessible);
         if (!accessible || accessible.getAccessibleRole() !== role)
             return false;
         return matchByRoleOptions(node, options);

package/dist/render.js

@@ -11,18 +11,18 @@ let container = null;
 const getWidgetLabel = (widget) => {
     if (!hasLabel(widget))
         return null;
-    const accessible = getInterface(widget, Gtk.Accessible);
+    const accessible = getInterface(widget.id, Gtk.Accessible);
     if (!accessible)
         return null;
     const role = accessible.getAccessibleRole();
     if (role === Gtk.AccessibleRole.LABEL) {
-        return getInterface(widget, Gtk.Label)?.getLabel() ?? null;
+        return widget.getLabel?.() ?? null;
     }
-    return getInterface(widget, Gtk.Button)?.getLabel() ?? null;
+    return widget.getLabel?.() ?? null;
 };
 const printWidgetTree = (root, indent = 0) => {
     const prefix = "  ".repeat(indent);
-    const accessibleRole = getInterface(root, Gtk.Accessible)?.getAccessibleRole();
+    const accessibleRole = getInterface(root.id, Gtk.Accessible)?.getAccessibleRole();
     const role = accessibleRole !== undefined ? (Gtk.AccessibleRole[accessibleRole] ?? "UNKNOWN") : "UNKNOWN";
     const labelText = getWidgetLabel(root);
     const label = labelText ? ` label="${labelText}"` : "";

package/dist/user-event.js

@@ -1,5 +1,5 @@
-import { getInterface } from "@gtkx/ffi";
-import { Accessible, AccessibleRole, DirectionType, Editable, Widget, } from "@gtkx/ffi/gtk";
+import { getInterface, getObject } from "@gtkx/ffi";
+import { Accessible, AccessibleRole, DirectionType, Editable, } from "@gtkx/ffi/gtk";
 import { fireEvent } from "./fire-event.js";
 import { tick } from "./timing.js";
 import { isEditable } from "./widget.js";
@@ -10,14 +10,14 @@ const TOGGLEABLE_ROLES = new Set([
     AccessibleRole.SWITCH,
 ]);
 const isToggleable = (widget) => {
-    const accessible = getInterface(widget, Accessible);
+    const accessible = getInterface(widget.id, Accessible);
     if (!accessible)
         return false;
     return TOGGLEABLE_ROLES.has(accessible.getAccessibleRole());
 };
 const click = async (element) => {
     if (isToggleable(element)) {
-        const role = getInterface(element, Accessible)?.getAccessibleRole();
+        const role = getInterface(element.id, Accessible)?.getAccessibleRole();
         if (role === AccessibleRole.CHECKBOX || role === AccessibleRole.RADIO) {
             const checkButton = element;
             checkButton.setActive(!checkButton.getActive());
@@ -53,7 +53,7 @@ const tab = async (element, options) => {
     const direction = options?.shift ? DirectionType.TAB_BACKWARD : DirectionType.TAB_FORWARD;
     const root = element.getRoot();
     if (root) {
-        getInterface(root, Widget)?.childFocus(direction);
+        getObject(root.id).childFocus(direction);
     }
     await tick();
 };
@@ -61,7 +61,7 @@ const type = async (element, text) => {
     if (!isEditable(element)) {
         throw new Error("Cannot type into element: element is not editable (TEXT_BOX, SEARCH_BOX, or SPIN_BUTTON)");
     }
-    const editable = getInterface(element, Editable);
+    const editable = getInterface(element.id, Editable);
     if (!editable)
         return;
     const currentText = editable.getText();
@@ -72,12 +72,12 @@ const clear = async (element) => {
     if (!isEditable(element)) {
         throw new Error("Cannot clear element: element is not editable (TEXT_BOX, SEARCH_BOX, or SPIN_BUTTON)");
     }
-    getInterface(element, Editable)?.setText("");
+    getInterface(element.id, Editable)?.setText("");
     await tick();
 };
 const SELECTABLE_ROLES = new Set([AccessibleRole.COMBO_BOX, AccessibleRole.LIST]);
 const isSelectable = (widget) => {
-    const accessible = getInterface(widget, Accessible);
+    const accessible = getInterface(widget.id, Accessible);
     if (!accessible)
         return false;
     return SELECTABLE_ROLES.has(accessible.getAccessibleRole());
@@ -86,7 +86,7 @@ const selectOptions = async (element, values) => {
     if (!isSelectable(element)) {
         throw new Error("Cannot select options: element is not a selectable widget (COMBO_BOX or LIST)");
     }
-    const role = getInterface(element, Accessible)?.getAccessibleRole();
+    const role = getInterface(element.id, Accessible)?.getAccessibleRole();
     const valueArray = Array.isArray(values) ? values : [values];
     if (role === AccessibleRole.COMBO_BOX) {
         if (valueArray.length > 1) {
@@ -120,7 +120,7 @@ const selectOptions = async (element, values) => {
     await tick();
 };
 const deselectOptions = async (element, values) => {
-    const role = getInterface(element, Accessible)?.getAccessibleRole();
+    const role = getInterface(element.id, Accessible)?.getAccessibleRole();
     if (role !== AccessibleRole.LIST) {
         throw new Error("Cannot deselect options: only ListBox supports deselection");
     }

package/dist/widget.d.ts

@@ -1,4 +1,4 @@
-import type * as Gtk from "@gtkx/ffi/gtk";
+import * as Gtk from "@gtkx/ffi/gtk";
 /**
  * Checks if a widget has an editable accessible role (text box, search box, or spin button).
  */

package/dist/widget.js

@@ -1,30 +1,34 @@
 import { getInterface } from "@gtkx/ffi";
-import { Accessible, AccessibleRole } from "@gtkx/ffi/gtk";
-const EDITABLE_ROLES = new Set([AccessibleRole.TEXT_BOX, AccessibleRole.SEARCH_BOX, AccessibleRole.SPIN_BUTTON]);
+import * as Gtk from "@gtkx/ffi/gtk";
+const EDITABLE_ROLES = new Set([
+    Gtk.AccessibleRole.TEXT_BOX,
+    Gtk.AccessibleRole.SEARCH_BOX,
+    Gtk.AccessibleRole.SPIN_BUTTON,
+]);
 /**
  * Checks if a widget has an editable accessible role (text box, search box, or spin button).
  */
 export const isEditable = (widget) => {
-    const accessible = getInterface(widget, Accessible);
+    const accessible = getInterface(widget.id, Gtk.Accessible);
     if (!accessible)
         return false;
     return EDITABLE_ROLES.has(accessible.getAccessibleRole());
 };
 const LABEL_ROLES = new Set([
-    AccessibleRole.BUTTON,
-    AccessibleRole.TOGGLE_BUTTON,
-    AccessibleRole.CHECKBOX,
-    AccessibleRole.RADIO,
-    AccessibleRole.LABEL,
-    AccessibleRole.MENU_ITEM,
-    AccessibleRole.MENU_ITEM_CHECKBOX,
-    AccessibleRole.MENU_ITEM_RADIO,
+    Gtk.AccessibleRole.BUTTON,
+    Gtk.AccessibleRole.TOGGLE_BUTTON,
+    Gtk.AccessibleRole.CHECKBOX,
+    Gtk.AccessibleRole.RADIO,
+    Gtk.AccessibleRole.LABEL,
+    Gtk.AccessibleRole.MENU_ITEM,
+    Gtk.AccessibleRole.MENU_ITEM_CHECKBOX,
+    Gtk.AccessibleRole.MENU_ITEM_RADIO,
 ]);
 /**
  * Checks if a widget has an accessible role that supports labels.
  */
 export const hasLabel = (widget) => {
-    const accessible = getInterface(widget, Accessible);
+    const accessible = getInterface(widget.id, Gtk.Accessible);
     if (!accessible)
         return false;
     return LABEL_ROLES.has(accessible.getAccessibleRole());

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gtkx/testing",
-  "version": "0.6.1",
+  "version": "0.7.0",
   "description": "Testing utilities for GTKX applications",
   "keywords": [
     "gtk",
@@ -32,9 +32,9 @@
     "dist"
   ],
   "dependencies": {
-    "@gtkx/ffi": "0.6.1",
-    "@gtkx/react": "0.6.1",
-    "@gtkx/native": "0.6.1"
+    "@gtkx/native": "0.7.0",
+    "@gtkx/ffi": "0.7.0",
+    "@gtkx/react": "0.7.0"
   },
   "scripts": {
     "build": "tsc -b && cp ../../README.md .",