@gtkx/testing 0.8.0 → 0.9.1

package/dist/queries.js

@@ -1,4 +1,4 @@
-import { getInterface } from "@gtkx/ffi";
+import { getObject } from "@gtkx/ffi";
 import * as Gtk from "@gtkx/ffi/gtk";
 import { findAll } from "./traversal.js";
 import { waitFor } from "./wait-for.js";
@@ -50,13 +50,13 @@ const ROLES_WITH_INTERNAL_LABELS = new Set([
     Gtk.AccessibleRole.LINK,
 ]);
 const isInternalLabel = (widget) => {
-    const accessible = getInterface(widget.id, Gtk.Accessible);
+    const accessible = getObject(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.id, Gtk.Accessible);
+    const parentAccessible = getObject(parent.id, Gtk.Accessible);
     if (!parentAccessible)
         return false;
     return ROLES_WITH_INTERNAL_LABELS.has(parentAccessible.getAccessibleRole());
@@ -70,7 +70,7 @@ const collectChildLabels = (widget) => {
     const labels = [];
     let child = widget.getFirstChild();
     while (child) {
-        const childAccessible = getInterface(child.id, Gtk.Accessible);
+        const childAccessible = getObject(child.id, Gtk.Accessible);
         if (childAccessible?.getAccessibleRole() === Gtk.AccessibleRole.LABEL) {
             const labelText = getLabelText(child);
             if (labelText)
@@ -84,7 +84,7 @@ const collectChildLabels = (widget) => {
 const getWidgetText = (widget) => {
     if (isInternalLabel(widget))
         return null;
-    const role = getInterface(widget.id, Gtk.Accessible)?.getAccessibleRole();
+    const role = getObject(widget.id, Gtk.Accessible)?.getAccessibleRole();
     if (role === undefined)
         return null;
     switch (role) {
@@ -109,7 +109,7 @@ const getWidgetText = (widget) => {
         case Gtk.AccessibleRole.TEXT_BOX:
         case Gtk.AccessibleRole.SEARCH_BOX:
         case Gtk.AccessibleRole.SPIN_BUTTON:
-            return getInterface(widget.id, Gtk.Editable)?.getText() ?? null;
+            return getObject(widget.id, Gtk.Editable)?.getText() ?? null;
         case Gtk.AccessibleRole.GROUP:
             return widget.getLabel?.() ?? null;
         case Gtk.AccessibleRole.WINDOW:
@@ -135,7 +135,7 @@ const getWidgetTestId = (widget) => {
     return widget.getName();
 };
 const getWidgetCheckedState = (widget) => {
-    const accessible = getInterface(widget.id, Gtk.Accessible);
+    const accessible = getObject(widget.id, Gtk.Accessible);
     if (!accessible)
         return undefined;
     const role = accessible.getAccessibleRole();
@@ -152,7 +152,7 @@ const getWidgetCheckedState = (widget) => {
     }
 };
 const getWidgetExpandedState = (widget) => {
-    const accessible = getInterface(widget.id, Gtk.Accessible);
+    const accessible = getObject(widget.id, Gtk.Accessible);
     if (!accessible)
         return undefined;
     const role = accessible.getAccessibleRole();
@@ -203,7 +203,7 @@ const formatByRoleError = (role, options) => {
 };
 const getAllByRole = (container, role, options) => {
     const matches = findAll(container, (node) => {
-        const accessible = getInterface(node.id, Gtk.Accessible);
+        const accessible = getObject(node.id, Gtk.Accessible);
         if (!accessible || accessible.getAccessibleRole() !== role)
             return false;
         return matchByRoleOptions(node, options);

package/dist/render.js

@@ -1,5 +1,5 @@
 import { jsx as _jsx } from "react/jsx-runtime";
-import { getCurrentApp, getInterface, start, stop } from "@gtkx/ffi";
+import { getCurrentApp, getObject, start, stop } from "@gtkx/ffi";
 import * as Gtk from "@gtkx/ffi/gtk";
 import { ApplicationWindow, ROOT_NODE_CONTAINER, reconciler } from "@gtkx/react";
 import * as queries from "./queries.js";
@@ -11,7 +11,7 @@ let container = null;
 const getWidgetLabel = (widget) => {
     if (!hasLabel(widget))
         return null;
-    const accessible = getInterface(widget.id, Gtk.Accessible);
+    const accessible = getObject(widget.id, Gtk.Accessible);
     if (!accessible)
         return null;
     const role = accessible.getAccessibleRole();
@@ -22,7 +22,7 @@ const getWidgetLabel = (widget) => {
 };
 const printWidgetTree = (root, indent = 0) => {
     const prefix = "  ".repeat(indent);
-    const accessibleRole = getInterface(root.id, Gtk.Accessible)?.getAccessibleRole();
+    const accessibleRole = getObject(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,4 +1,4 @@
-import { getInterface, getObject } from "@gtkx/ffi";
+import { getObject } from "@gtkx/ffi";
 import * as Gtk from "@gtkx/ffi/gtk";
 import { fireEvent } from "./fire-event.js";
 import { tick } from "./timing.js";
@@ -10,14 +10,14 @@ const TOGGLEABLE_ROLES = new Set([
     Gtk.AccessibleRole.SWITCH,
 ]);
 const isToggleable = (widget) => {
-    const accessible = getInterface(widget.id, Gtk.Accessible);
+    const accessible = getObject(widget.id, Gtk.Accessible);
     if (!accessible)
         return false;
     return TOGGLEABLE_ROLES.has(accessible.getAccessibleRole());
 };
 const click = async (element) => {
     if (isToggleable(element)) {
-        const role = getInterface(element.id, Gtk.Accessible)?.getAccessibleRole();
+        const role = getObject(element.id, Gtk.Accessible)?.getAccessibleRole();
         if (role === Gtk.AccessibleRole.CHECKBOX || role === Gtk.AccessibleRole.RADIO) {
             const checkButton = element;
             checkButton.setActive(!checkButton.getActive());
@@ -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.id, Gtk.Editable);
+    const editable = getObject(element.id, Gtk.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.id, Gtk.Editable)?.setText("");
+    getObject(element.id, Gtk.Editable)?.setText("");
     await tick();
 };
 const SELECTABLE_ROLES = new Set([Gtk.AccessibleRole.COMBO_BOX, Gtk.AccessibleRole.LIST]);
 const isSelectable = (widget) => {
-    const accessible = getInterface(widget.id, Gtk.Accessible);
+    const accessible = getObject(widget.id, Gtk.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.id, Gtk.Accessible)?.getAccessibleRole();
+    const role = getObject(element.id, Gtk.Accessible)?.getAccessibleRole();
     const valueArray = Array.isArray(values) ? values : [values];
     if (role === Gtk.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.id, Gtk.Accessible)?.getAccessibleRole();
+    const role = getObject(element.id, Gtk.Accessible)?.getAccessibleRole();
     if (role !== Gtk.AccessibleRole.LIST) {
         throw new Error("Cannot deselect options: only ListBox supports deselection");
     }

package/dist/widget.js

@@ -1,4 +1,4 @@
-import { getInterface } from "@gtkx/ffi";
+import { getObject } from "@gtkx/ffi";
 import * as Gtk from "@gtkx/ffi/gtk";
 const EDITABLE_ROLES = new Set([
     Gtk.AccessibleRole.TEXT_BOX,
@@ -9,7 +9,7 @@ const EDITABLE_ROLES = new Set([
  * Checks if a widget has an editable accessible role (text box, search box, or spin button).
  */
 export const isEditable = (widget) => {
-    const accessible = getInterface(widget.id, Gtk.Accessible);
+    const accessible = getObject(widget.id, Gtk.Accessible);
     if (!accessible)
         return false;
     return EDITABLE_ROLES.has(accessible.getAccessibleRole());
@@ -28,7 +28,7 @@ const LABEL_ROLES = new Set([
  * Checks if a widget has an accessible role that supports labels.
  */
 export const hasLabel = (widget) => {
-    const accessible = getInterface(widget.id, Gtk.Accessible);
+    const accessible = getObject(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.8.0",
+  "version": "0.9.1",
   "description": "Testing utilities for GTKX applications",
   "keywords": [
     "gtk",
@@ -32,12 +32,12 @@
     "dist"
   ],
   "dependencies": {
-    "@gtkx/ffi": "0.8.0",
-    "@gtkx/native": "0.8.0",
-    "@gtkx/react": "0.8.0"
+    "@gtkx/ffi": "0.9.1",
+    "@gtkx/native": "0.9.1",
+    "@gtkx/react": "0.9.1"
   },
   "scripts": {
     "build": "tsc -b && cp ../../README.md .",
-    "test": "if [ -n \"$CI\" ]; then vitest run; else GDK_BACKEND=x11 xvfb-run -a vitest run; fi"
+    "test": "../../scripts/run-tests.sh"
   }
 }