@gtkx/testing 0.3.0 → 0.3.2

package/README.md

@@ -64,7 +64,6 @@ npm install -D @types/react typescript
 Create your first app:
 
 ```tsx
-// src/app.tsx
 import { useState } from "react";
 import * as Gtk from "@gtkx/ffi/gtk";
 import { ApplicationWindow, Box, Button, Label, quit } from "@gtkx/react";
@@ -98,7 +97,6 @@ export const appId = "org.example.MyApp";
 ```
 
 ```tsx
-// src/index.tsx
 import { render } from "@gtkx/react";
 import App, { appId } from "./app.js";
 
@@ -147,7 +145,6 @@ import { cleanup, render, screen, userEvent, fireEvent } from "@gtkx/testing";
 import { AccessibleRole } from "@gtkx/ffi/gtk";
 import { App } from "./app.js";
 
-// Clean up after each test
 afterEach(async () => {
   await cleanup();
 });

package/dist/queries.js

@@ -1,5 +1,5 @@
-import { cast } from "@gtkx/ffi";
-import { AccessibleRole, } 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";
 const DEFAULT_NORMALIZER = (text) => text.trim().replace(/\s+/g, " ");
@@ -30,38 +30,38 @@ const ROLES_WITH_INTERNAL_LABELS = new Set([
     AccessibleRole.LINK,
 ]);
 const isInternalLabel = (widget) => {
-    const accessible = cast(widget);
+    const accessible = getInterface(widget, Accessible);
     if (accessible.getAccessibleRole() !== AccessibleRole.LABEL)
         return false;
     const parent = widget.getParent();
     if (!parent)
         return false;
-    const parentRole = cast(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 = cast(widget).getAccessibleRole();
+    const role = getInterface(widget, Accessible).getAccessibleRole();
     switch (role) {
         case AccessibleRole.BUTTON:
         case AccessibleRole.LINK:
         case AccessibleRole.TAB:
-            return cast(widget).getLabel();
+            return getInterface(widget, Button).getLabel();
         case AccessibleRole.TOGGLE_BUTTON:
-            return cast(widget).getLabel();
+            return getInterface(widget, ToggleButton).getLabel();
         case AccessibleRole.CHECKBOX:
         case AccessibleRole.RADIO:
-            return cast(widget).getLabel();
+            return getInterface(widget, CheckButton).getLabel();
         case AccessibleRole.LABEL:
-            return cast(widget).getLabel();
+            return getInterface(widget, Label).getLabel();
         case AccessibleRole.TEXT_BOX:
         case AccessibleRole.SEARCH_BOX:
         case AccessibleRole.SPIN_BUTTON:
-            return cast(widget).getText();
+            return getInterface(widget, Editable).getText();
         case AccessibleRole.GROUP:
             try {
-                return cast(widget).getLabel();
+                return getInterface(widget, Frame).getLabel();
             }
             catch {
                 return null;
@@ -69,10 +69,10 @@ const getWidgetText = (widget) => {
         case AccessibleRole.WINDOW:
         case AccessibleRole.DIALOG:
         case AccessibleRole.ALERT_DIALOG:
-            return cast(widget).getTitle();
+            return getInterface(widget, Window).getTitle();
         case AccessibleRole.TAB_PANEL:
             try {
-                return cast(widget).getTitle();
+                return getInterface(widget, StackPage).getTitle();
             }
             catch {
                 return null;
@@ -87,26 +87,26 @@ const getWidgetTestId = (widget) => {
     return widget.getName();
 };
 const getWidgetCheckedState = (widget) => {
-    const role = cast(widget).getAccessibleRole();
+    const role = getInterface(widget, Accessible).getAccessibleRole();
     switch (role) {
         case AccessibleRole.CHECKBOX:
         case AccessibleRole.RADIO:
-            return cast(widget).getActive();
+            return getInterface(widget, CheckButton).getActive();
         case AccessibleRole.TOGGLE_BUTTON:
-            return cast(widget).getActive();
+            return getInterface(widget, ToggleButton).getActive();
         case AccessibleRole.SWITCH:
-            return cast(widget).getActive();
+            return getInterface(widget, Switch).getActive();
         default:
             return undefined;
     }
 };
 const getWidgetExpandedState = (widget) => {
-    const role = cast(widget).getAccessibleRole();
+    const role = getInterface(widget, Accessible).getAccessibleRole();
     if (role === AccessibleRole.BUTTON) {
         const parent = widget.getParent();
         if (!parent)
             return undefined;
-        return cast(parent).getExpanded();
+        return getInterface(parent, Expander).getExpanded();
     }
     return undefined;
 };
@@ -149,7 +149,7 @@ const formatByRoleError = (role, options) => {
 };
 const getAllByRole = (container, role, options) => {
     const matches = findAll(container, (node) => {
-        if (cast(node).getAccessibleRole() !== role)
+        if (getInterface(node, 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 { cast, getCurrentApp, 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";
@@ -12,15 +12,15 @@ let container = null;
 const getWidgetLabel = (widget) => {
     if (!hasLabel(widget))
         return null;
-    const role = cast(widget).getAccessibleRole();
+    const role = getInterface(widget, Gtk.Accessible).getAccessibleRole();
     if (role === Gtk.AccessibleRole.LABEL) {
-        return cast(widget).getLabel();
+        return getInterface(widget, Gtk.Label).getLabel();
     }
-    return cast(widget).getLabel();
+    return getInterface(widget, Gtk.Button).getLabel();
 };
 const printWidgetTree = (root, indent = 0) => {
     const prefix = "  ".repeat(indent);
-    const role = Gtk.AccessibleRole[cast(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,16 +1,16 @@
-import { cast } from "@gtkx/ffi";
-import { AccessibleRole, DirectionType, } 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 { isEditable } from "./widget.js";
 const TOGGLEABLE_ROLES = new Set([AccessibleRole.CHECKBOX, AccessibleRole.RADIO, AccessibleRole.TOGGLE_BUTTON]);
 const isToggleable = (widget) => {
-    const role = cast(widget).getAccessibleRole();
+    const role = getInterface(widget, Accessible).getAccessibleRole();
     return TOGGLEABLE_ROLES.has(role);
 };
 const click = async (element) => {
     if (isToggleable(element)) {
-        const role = cast(element).getAccessibleRole();
+        const role = getInterface(element, Accessible).getAccessibleRole();
         if (role === AccessibleRole.CHECKBOX || role === AccessibleRole.RADIO) {
             const checkButton = element;
             checkButton.setActive(!checkButton.getActive());
@@ -48,7 +48,7 @@ const tab = async (element, options) => {
     const direction = options?.shift ? DirectionType.TAB_BACKWARD : DirectionType.TAB_FORWARD;
     const root = element.getRoot();
     if (root) {
-        cast(root).childFocus(direction);
+        getInterface(root, Widget).childFocus(direction);
     }
     await tick();
 };
@@ -56,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 = cast(element);
+    const editable = getInterface(element, Editable);
     const currentText = editable.getText();
     editable.setText(currentText + text);
     await tick();
@@ -65,19 +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)");
     }
-    cast(element).setText("");
+    getInterface(element, Editable).setText("");
     await tick();
 };
 const SELECTABLE_ROLES = new Set([AccessibleRole.COMBO_BOX, AccessibleRole.LIST]);
 const isSelectable = (widget) => {
-    const role = cast(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 = cast(element).getAccessibleRole();
+    const role = getInterface(element, Accessible).getAccessibleRole();
     const valueArray = Array.isArray(values) ? values : [values];
     if (role === AccessibleRole.COMBO_BOX) {
         if (valueArray.length > 1) {
@@ -110,7 +110,7 @@ const selectOptions = async (element, values) => {
     await tick();
 };
 const deselectOptions = async (element, values) => {
-    const role = cast(element).getAccessibleRole();
+    const role = getInterface(element, Accessible).getAccessibleRole();
     if (role !== AccessibleRole.LIST) {
         throw new Error("Cannot deselect options: only ListBox supports deselection");
     }

package/dist/widget.js

@@ -1,8 +1,8 @@
-import { cast } from "@gtkx/ffi";
-import { AccessibleRole } from "@gtkx/ffi/gtk";
+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 = cast(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 = cast(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.3.0",
+  "version": "0.3.2",
   "description": "Testing utilities for GTKX applications",
   "keywords": [
     "gtk",
@@ -32,9 +32,9 @@
     "dist"
   ],
   "dependencies": {
-    "@gtkx/ffi": "0.3.0",
-    "@gtkx/native": "0.3.0",
-    "@gtkx/react": "0.3.0"
+    "@gtkx/ffi": "0.3.2",
+    "@gtkx/native": "0.3.2",
+    "@gtkx/react": "0.3.2"
   },
   "scripts": {
     "build": "tsc -b && cp ../../README.md .",