@gtkx/testing 0.1.48 → 0.1.49

package/dist/queries.js

@@ -18,20 +18,20 @@ const matchText = (actual, expected, options) => {
     }
     return expected.test(normalizedActual);
 };
+const asAccessible = (widget) => widget;
 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 isInternalLabel = (widget) => {
-    const accessible = widget;
+    const accessible = asAccessible(widget);
     if (accessible.getAccessibleRole() !== AccessibleRole.LABEL)
         return false;
     const parent = widget.getParent();
     if (!parent)
         return false;
-    const parentAccessible = parent;
-    const parentRole = parentAccessible.getAccessibleRole();
+    const parentRole = asAccessible(parent).getAccessibleRole();
     return (parentRole === AccessibleRole.BUTTON ||
         parentRole === AccessibleRole.TOGGLE_BUTTON ||
         parentRole === AccessibleRole.CHECKBOX ||
@@ -43,8 +43,7 @@ const isInternalLabel = (widget) => {
 const getWidgetText = (widget) => {
     if (isInternalLabel(widget))
         return null;
-    const accessible = widget;
-    const role = accessible.getAccessibleRole();
+    const role = asAccessible(widget).getAccessibleRole();
     switch (role) {
         case AccessibleRole.BUTTON:
         case AccessibleRole.TOGGLE_BUTTON:
@@ -68,8 +67,7 @@ const getWidgetTestId = (widget) => {
     return widget.getName();
 };
 const getWidgetCheckedState = (widget) => {
-    const accessible = widget;
-    const role = accessible.getAccessibleRole();
+    const role = asAccessible(widget).getAccessibleRole();
     if (role === AccessibleRole.CHECKBOX || role === AccessibleRole.RADIO) {
         return asCheckButton(widget).getActive();
     }
@@ -79,8 +77,7 @@ const getWidgetCheckedState = (widget) => {
     return undefined;
 };
 const getWidgetExpandedState = (widget) => {
-    const accessible = widget;
-    const role = accessible.getAccessibleRole();
+    const role = asAccessible(widget).getAccessibleRole();
     if (role === AccessibleRole.BUTTON) {
         const parent = widget.getParent();
         if (!parent)
@@ -128,8 +125,7 @@ const formatByRoleError = (role, options) => {
 };
 const getAllByRole = (container, role, options) => {
     const matches = findAll(container, (node) => {
-        const accessible = node;
-        if (accessible.getAccessibleRole() !== role)
+        if (asAccessible(node).getAccessibleRole() !== role)
             return false;
         return matchByRoleOptions(node, options);
     });
@@ -143,7 +139,10 @@ const getByRole = (container, role, options) => {
     if (matches.length > 1) {
         throw new Error(`Found ${matches.length} elements with ${formatByRoleError(role, options)}`);
     }
-    return matches[0];
+    const [first] = matches;
+    if (!first)
+        throw new Error(`Unable to find element with ${formatByRoleError(role, options)}`);
+    return first;
 };
 const getAllByLabelText = (container, text, options) => {
     const matches = findAll(container, (node) => {
@@ -160,7 +159,10 @@ const getByLabelText = (container, text, options) => {
     if (matches.length > 1) {
         throw new Error(`Found ${matches.length} elements with label text "${text}"`);
     }
-    return matches[0];
+    const [first] = matches;
+    if (!first)
+        throw new Error(`Unable to find element with label text "${text}"`);
+    return first;
 };
 const getAllByText = (container, text, options) => {
     const matches = findAll(container, (node) => {
@@ -177,7 +179,10 @@ const getByText = (container, text, options) => {
     if (matches.length > 1) {
         throw new Error(`Found ${matches.length} elements with text "${text}"`);
     }
-    return matches[0];
+    const [first] = matches;
+    if (!first)
+        throw new Error(`Unable to find element with text "${text}"`);
+    return first;
 };
 const getAllByTestId = (container, testId, options) => {
     const matches = findAll(container, (node) => {
@@ -194,7 +199,10 @@ const getByTestId = (container, testId, options) => {
     if (matches.length > 1) {
         throw new Error(`Found ${matches.length} elements with test id "${testId}"`);
     }
-    return matches[0];
+    const [first] = matches;
+    if (!first)
+        throw new Error(`Unable to find element with test id "${testId}"`);
+    return first;
 };
 /**
  * Waits for and finds a single widget matching the specified accessible role.

package/dist/render.js

@@ -4,14 +4,15 @@ 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";
 const ROOT_NODE_CONTAINER = Symbol.for("ROOT_NODE_CONTAINER");
 const APP_ID = "com.gtkx.testing";
 let container = null;
 const hasGetLabel = (widget) => typeof widget.getLabel === "function";
+const asAccessible = (widget) => widget;
 const printWidgetTree = (root, indent = 0) => {
-    const accessible = root;
     const prefix = "  ".repeat(indent);
-    const role = Gtk.AccessibleRole[accessible.getAccessibleRole()] ?? "UNKNOWN";
+    const role = Gtk.AccessibleRole[asAccessible(root).getAccessibleRole()] ?? "UNKNOWN";
     const label = hasGetLabel(root) ? ` label="${root.getLabel()}"` : "";
     let result = `${prefix}<${root.constructor.name} role=${role}${label}>\n`;
     let child = root.getFirstChild();
@@ -21,7 +22,6 @@ const printWidgetTree = (root, indent = 0) => {
     }
     return result;
 };
-const tick = () => new Promise((resolve) => setTimeout(resolve, 0));
 const update = async (instance, element, fiberRoot) => {
     instance.updateContainer(element, fiberRoot, null, () => { });
     await tick();
@@ -30,9 +30,7 @@ const ensureInitialized = () => {
     const app = start(APP_ID);
     if (!container) {
         const instance = reconciler.getInstance();
-        container = instance.createContainer(
-        // biome-ignore lint/suspicious/noExplicitAny: testing only
-        ROOT_NODE_CONTAINER, 0, null, false, null, "", (error) => console.error("Test reconciler error:", error), () => { }, () => { }, () => { }, null);
+        container = instance.createContainer(ROOT_NODE_CONTAINER, 0, null, false, null, "", (error) => console.error("Test reconciler error:", error), () => { }, () => { }, () => { }, null);
     }
     return { app, container };
 };

package/dist/timing.d.ts

@@ -0,0 +1 @@
+export declare const tick: () => Promise<void>;

package/dist/timing.js

@@ -0,0 +1 @@
+export const tick = () => new Promise((resolve) => setTimeout(resolve, 0));

package/dist/user-event.js

@@ -1,6 +1,6 @@
 import { fireEvent } from "./fire-event.js";
+import { tick } from "./timing.js";
 import { hasGetText, hasSetText } from "./widget.js";
-const tick = () => new Promise((resolve) => setTimeout(resolve, 0));
 const createUserEventInstance = (_options) => {
     return {
         click: async (element) => {

package/package.json

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