@gtkx/testing 0.2.7 → 0.3.1

package/dist/fire-event.js

@@ -14,5 +14,5 @@ import { call } from "@gtkx/native";
  * fireEvent(widget, "custom-signal", { type: { type: "int", size: 32 }, value: 42 })
  */
 export const fireEvent = (element, signalName, ...args) => {
-    call("libgobject-2.0.so.0", "g_signal_emit_by_name", [{ type: { type: "gobject" }, value: element.ptr }, { type: { type: "string" }, value: signalName }, ...args], { type: "undefined" });
+    call("libgobject-2.0.so.0", "g_signal_emit_by_name", [{ type: { type: "gobject" }, value: element.id }, { type: { type: "string" }, value: signalName }, ...args], { type: "undefined" });
 };

package/dist/queries.js

@@ -1,8 +1,7 @@
-import { getObject } from "@gtkx/ffi";
-import { AccessibleRole, Button, CheckButton, Editable, Expander, Frame, Label, StackPage, Switch, ToggleButton, Window, } from "@gtkx/ffi/gtk";
+import { getInterface } from "@gtkx/ffi";
+import { Accessible, AccessibleRole, Button, CheckButton, Editable, Expander, Frame, Label, StackPage, Switch, ToggleButton, Window, } from "@gtkx/ffi/gtk";
 import { findAll } from "./traversal.js";
 import { waitFor } from "./wait-for.js";
-import { asAccessible } from "./widget.js";
 const DEFAULT_NORMALIZER = (text) => text.trim().replace(/\s+/g, " ");
 const normalizeText = (text, options) => {
     const normalizer = options?.normalizer ?? DEFAULT_NORMALIZER;
@@ -19,14 +18,6 @@ const matchText = (actual, expected, options) => {
     }
     return expected.test(normalizedActual);
 };
-const asButton = (widget) => getObject(widget.ptr, Button);
-const asLabel = (widget) => getObject(widget.ptr, Label);
-const asCheckButton = (widget) => getObject(widget.ptr, CheckButton);
-const asToggleButton = (widget) => getObject(widget.ptr, ToggleButton);
-const asExpander = (widget) => getObject(widget.ptr, Expander);
-const asFrame = (widget) => getObject(widget.ptr, Frame);
-const asWindow = (widget) => getObject(widget.ptr, Window);
-const asStackPage = (widget) => getObject(widget.ptr, StackPage);
 const ROLES_WITH_INTERNAL_LABELS = new Set([
     AccessibleRole.BUTTON,
     AccessibleRole.TOGGLE_BUTTON,
@@ -39,38 +30,38 @@ const ROLES_WITH_INTERNAL_LABELS = new Set([
     AccessibleRole.LINK,
 ]);
 const isInternalLabel = (widget) => {
-    const accessible = asAccessible(widget);
+    const accessible = getInterface(widget, Accessible);
     if (accessible.getAccessibleRole() !== AccessibleRole.LABEL)
         return false;
     const parent = widget.getParent();
     if (!parent)
         return false;
-    const parentRole = asAccessible(parent).getAccessibleRole();
+    const parentRole = getInterface(parent, Accessible).getAccessibleRole();
     return ROLES_WITH_INTERNAL_LABELS.has(parentRole);
 };
 const getWidgetText = (widget) => {
     if (isInternalLabel(widget))
         return null;
-    const role = asAccessible(widget).getAccessibleRole();
+    const role = getInterface(widget, Accessible).getAccessibleRole();
     switch (role) {
         case AccessibleRole.BUTTON:
         case AccessibleRole.LINK:
         case AccessibleRole.TAB:
-            return asButton(widget).getLabel();
+            return getInterface(widget, Button).getLabel();
         case AccessibleRole.TOGGLE_BUTTON:
-            return asToggleButton(widget).getLabel();
+            return getInterface(widget, ToggleButton).getLabel();
         case AccessibleRole.CHECKBOX:
         case AccessibleRole.RADIO:
-            return asCheckButton(widget).getLabel();
+            return getInterface(widget, CheckButton).getLabel();
         case AccessibleRole.LABEL:
-            return asLabel(widget).getLabel();
+            return getInterface(widget, Label).getLabel();
         case AccessibleRole.TEXT_BOX:
         case AccessibleRole.SEARCH_BOX:
         case AccessibleRole.SPIN_BUTTON:
-            return getObject(widget.ptr, Editable).getText();
+            return getInterface(widget, Editable).getText();
         case AccessibleRole.GROUP:
             try {
-                return asFrame(widget).getLabel();
+                return getInterface(widget, Frame).getLabel();
             }
             catch {
                 return null;
@@ -78,10 +69,10 @@ const getWidgetText = (widget) => {
         case AccessibleRole.WINDOW:
         case AccessibleRole.DIALOG:
         case AccessibleRole.ALERT_DIALOG:
-            return asWindow(widget).getTitle();
+            return getInterface(widget, Window).getTitle();
         case AccessibleRole.TAB_PANEL:
             try {
-                return asStackPage(widget).getTitle();
+                return getInterface(widget, StackPage).getTitle();
             }
             catch {
                 return null;
@@ -95,28 +86,27 @@ const getWidgetText = (widget) => {
 const getWidgetTestId = (widget) => {
     return widget.getName();
 };
-const asSwitch = (widget) => getObject(widget.ptr, Switch);
 const getWidgetCheckedState = (widget) => {
-    const role = asAccessible(widget).getAccessibleRole();
+    const role = getInterface(widget, Accessible).getAccessibleRole();
     switch (role) {
         case AccessibleRole.CHECKBOX:
         case AccessibleRole.RADIO:
-            return asCheckButton(widget).getActive();
+            return getInterface(widget, CheckButton).getActive();
         case AccessibleRole.TOGGLE_BUTTON:
-            return asToggleButton(widget).getActive();
+            return getInterface(widget, ToggleButton).getActive();
         case AccessibleRole.SWITCH:
-            return asSwitch(widget).getActive();
+            return getInterface(widget, Switch).getActive();
         default:
             return undefined;
     }
 };
 const getWidgetExpandedState = (widget) => {
-    const role = asAccessible(widget).getAccessibleRole();
+    const role = getInterface(widget, Accessible).getAccessibleRole();
     if (role === AccessibleRole.BUTTON) {
         const parent = widget.getParent();
         if (!parent)
             return undefined;
-        return asExpander(parent).getExpanded();
+        return getInterface(parent, Expander).getExpanded();
     }
     return undefined;
 };
@@ -159,7 +149,7 @@ const formatByRoleError = (role, options) => {
 };
 const getAllByRole = (container, role, options) => {
     const matches = findAll(container, (node) => {
-        if (asAccessible(node).getAccessibleRole() !== role)
+        if (getInterface(node, Accessible).getAccessibleRole() !== role)
             return false;
         return matchByRoleOptions(node, options);
     });

package/dist/render.js

@@ -1,26 +1,26 @@
 import { jsx as _jsx } from "react/jsx-runtime";
-import { getCurrentApp, getObject, start, stop } from "@gtkx/ffi";
+import { getCurrentApp, getInterface, start, stop } from "@gtkx/ffi";
 import * as Gtk from "@gtkx/ffi/gtk";
 import { ApplicationWindow, reconciler } from "@gtkx/react";
 import * as queries from "./queries.js";
 import { setScreenRoot } from "./screen.js";
 import { tick } from "./timing.js";
-import { asAccessible, hasLabel } from "./widget.js";
+import { hasLabel } from "./widget.js";
 const ROOT_NODE_CONTAINER = Symbol.for("ROOT_NODE_CONTAINER");
 const APP_ID = "com.gtkx.testing";
 let container = null;
 const getWidgetLabel = (widget) => {
     if (!hasLabel(widget))
         return null;
-    const role = asAccessible(widget).getAccessibleRole();
+    const role = getInterface(widget, Gtk.Accessible).getAccessibleRole();
     if (role === Gtk.AccessibleRole.LABEL) {
-        return getObject(widget.ptr, Gtk.Label).getLabel();
+        return getInterface(widget, Gtk.Label).getLabel();
     }
-    return getObject(widget.ptr, Gtk.Button).getLabel();
+    return getInterface(widget, Gtk.Button).getLabel();
 };
 const printWidgetTree = (root, indent = 0) => {
     const prefix = "  ".repeat(indent);
-    const role = Gtk.AccessibleRole[asAccessible(root).getAccessibleRole()] ?? "UNKNOWN";
+    const role = Gtk.AccessibleRole[getInterface(root, Gtk.Accessible).getAccessibleRole()] ?? "UNKNOWN";
     const labelText = getWidgetLabel(root);
     const label = labelText ? ` label="${labelText}"` : "";
     let result = `${prefix}<${root.constructor.name} role=${role}${label}>\n`;

package/dist/user-event.js

@@ -1,22 +1,22 @@
-import { getObject } from "@gtkx/ffi";
-import { AccessibleRole, CheckButton, ComboBox, DirectionType, DropDown, Editable, ListBox, ListBoxRow, ToggleButton, Widget, } from "@gtkx/ffi/gtk";
+import { getInterface } from "@gtkx/ffi";
+import { Accessible, AccessibleRole, DirectionType, Editable, Widget, } from "@gtkx/ffi/gtk";
 import { fireEvent } from "./fire-event.js";
 import { tick } from "./timing.js";
-import { asAccessible, isEditable } from "./widget.js";
+import { isEditable } from "./widget.js";
 const TOGGLEABLE_ROLES = new Set([AccessibleRole.CHECKBOX, AccessibleRole.RADIO, AccessibleRole.TOGGLE_BUTTON]);
 const isToggleable = (widget) => {
-    const role = asAccessible(widget).getAccessibleRole();
+    const role = getInterface(widget, Accessible).getAccessibleRole();
     return TOGGLEABLE_ROLES.has(role);
 };
 const click = async (element) => {
     if (isToggleable(element)) {
-        const role = asAccessible(element).getAccessibleRole();
+        const role = getInterface(element, Accessible).getAccessibleRole();
         if (role === AccessibleRole.CHECKBOX || role === AccessibleRole.RADIO) {
-            const checkButton = getObject(element.ptr, CheckButton);
+            const checkButton = element;
             checkButton.setActive(!checkButton.getActive());
         }
         else {
-            const toggleButton = getObject(element.ptr, ToggleButton);
+            const toggleButton = element;
             toggleButton.setActive(!toggleButton.getActive());
         }
         // Note: setActive() automatically emits the "toggled" signal, so we don't need to emit it manually
@@ -48,8 +48,7 @@ const tab = async (element, options) => {
     const direction = options?.shift ? DirectionType.TAB_BACKWARD : DirectionType.TAB_FORWARD;
     const root = element.getRoot();
     if (root) {
-        const rootWidget = getObject(root.ptr, Widget);
-        rootWidget.childFocus(direction);
+        getInterface(root, Widget).childFocus(direction);
     }
     await tick();
 };
@@ -57,7 +56,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 = getObject(element.ptr, Editable);
+    const editable = getInterface(element, Editable);
     const currentText = editable.getText();
     editable.setText(currentText + text);
     await tick();
@@ -66,20 +65,19 @@ const clear = async (element) => {
     if (!isEditable(element)) {
         throw new Error("Cannot clear element: element is not editable (TEXT_BOX, SEARCH_BOX, or SPIN_BUTTON)");
     }
-    const editable = getObject(element.ptr, Editable);
-    editable.setText("");
+    getInterface(element, Editable).setText("");
     await tick();
 };
 const SELECTABLE_ROLES = new Set([AccessibleRole.COMBO_BOX, AccessibleRole.LIST]);
 const isSelectable = (widget) => {
-    const role = asAccessible(widget).getAccessibleRole();
+    const role = getInterface(widget, Accessible).getAccessibleRole();
     return SELECTABLE_ROLES.has(role);
 };
 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 = asAccessible(element).getAccessibleRole();
+    const role = getInterface(element, Accessible).getAccessibleRole();
     const valueArray = Array.isArray(values) ? values : [values];
     if (role === AccessibleRole.COMBO_BOX) {
         if (valueArray.length > 1) {
@@ -91,14 +89,14 @@ const selectOptions = async (element, values) => {
         }
         const isDropDown = element.constructor.name === "DropDown";
         if (isDropDown) {
-            getObject(element.ptr, DropDown).setSelected(value);
+            element.setSelected(value);
         }
         else {
-            getObject(element.ptr, ComboBox).setActive(value);
+            element.setActive(value);
         }
     }
     else if (role === AccessibleRole.LIST) {
-        const listBox = getObject(element.ptr, ListBox);
+        const listBox = element;
         for (const value of valueArray) {
             if (typeof value !== "number") {
                 throw new Error("ListBox selection requires numeric indices");
@@ -112,16 +110,16 @@ const selectOptions = async (element, values) => {
     await tick();
 };
 const deselectOptions = async (element, values) => {
-    const role = asAccessible(element).getAccessibleRole();
+    const role = getInterface(element, Accessible).getAccessibleRole();
     if (role !== AccessibleRole.LIST) {
         throw new Error("Cannot deselect options: only ListBox supports deselection");
     }
-    const listBox = getObject(element.ptr, ListBox);
+    const listBox = element;
     const valueArray = Array.isArray(values) ? values : [values];
     for (const value of valueArray) {
         const row = listBox.getRowAtIndex(value);
         if (row) {
-            listBox.unselectRow(getObject(row.ptr, ListBoxRow));
+            listBox.unselectRow(row);
         }
     }
     await tick();

package/dist/widget.d.ts

@@ -1,5 +1,3 @@
 import type * as Gtk from "@gtkx/ffi/gtk";
-import { type Accessible } from "@gtkx/ffi/gtk";
-export declare const asAccessible: (widget: Gtk.Widget) => Accessible;
 export declare const isEditable: (widget: Gtk.Widget) => boolean;
 export declare const hasLabel: (widget: Gtk.Widget) => boolean;

package/dist/widget.js

@@ -1,8 +1,8 @@
-import { AccessibleRole } from "@gtkx/ffi/gtk";
-export const asAccessible = (widget) => widget;
+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]);
 export const isEditable = (widget) => {
-    const role = asAccessible(widget).getAccessibleRole();
+    const role = getInterface(widget, Accessible).getAccessibleRole();
     return EDITABLE_ROLES.has(role);
 };
 const LABEL_ROLES = new Set([
@@ -16,6 +16,6 @@ const LABEL_ROLES = new Set([
     AccessibleRole.MENU_ITEM_RADIO,
 ]);
 export const hasLabel = (widget) => {
-    const role = asAccessible(widget).getAccessibleRole();
+    const role = getInterface(widget, Accessible).getAccessibleRole();
     return LABEL_ROLES.has(role);
 };

package/package.json

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