@gtkx/testing 0.14.0 → 0.15.0

package/README.md

@@ -80,11 +80,11 @@ render(<App />, "com.example.counter");
 
 Explore complete applications in the [`examples/`](./examples) directory:
 
-- **[browser](./examples/browser)** — Simple browser using WebKitWebView
 - **[gtk-demo](./examples/gtk-demo)** — Full replica of the official GTK demo app
 - **[hello-world](./examples/hello-world)** — Minimal application showing a counter
 - **[todo](./examples/todo)** — Full-featured todo application with Adwaita styling and testing
 - **[x-showcase](./examples/x-showcase)** — Showcase of all x.\* virtual components
+- **[browser](./examples/browser)** — Simple browser using WebKitWebView
 - **[deploying](./examples/deploying)** — Example of packaging and distributing a GTKX app
 
 ## Documentation

package/dist/fire-event.d.ts

@@ -1,5 +1,5 @@
+import { Value } from "@gtkx/ffi/gobject";
 import type * as Gtk from "@gtkx/ffi/gtk";
-import type { Arg } from "@gtkx/native";
 /**
  * Emits a GTK signal on a widget or event controller.
  *
@@ -8,20 +8,21 @@ import type { Arg } from "@gtkx/native";
  *
  * @param element - The widget or event controller to emit the signal on
  * @param signalName - GTK signal name (e.g., "clicked", "activate", "drag-begin")
- * @param args - Additional signal arguments
+ * @param args - Additional signal arguments as GValues
  *
  * @example
  * ```tsx
  * import { fireEvent } from "@gtkx/testing";
+ * import { Value } from "@gtkx/ffi/gobject";
  *
  * // Emit signal on widget
  * await fireEvent(widget, "clicked");
  *
  * // Emit signal on gesture controller
  * const gesture = widget.observeControllers().getObject(0) as Gtk.GestureDrag;
- * await fireEvent(gesture, "drag-begin", { type: { type: "float", size: 64 }, value: 100 }, { type: { type: "float", size: 64 }, value: 100 });
+ * await fireEvent(gesture, "drag-begin", Value.newFromDouble(100), Value.newFromDouble(100));
  * ```
  *
  * @see {@link userEvent} for high-level user interactions
  */
-export declare const fireEvent: (element: Gtk.Widget | Gtk.EventController, signalName: string, ...args: Arg[]) => Promise<void>;
+export declare const fireEvent: (element: Gtk.Widget | Gtk.EventController, signalName: string, ...args: Value[]) => Promise<void>;

package/dist/fire-event.js

@@ -1,4 +1,4 @@
-import { call } from "@gtkx/native";
+import { signalEmitv, signalLookup, typeFromName, Value } from "@gtkx/ffi/gobject";
 import { tick } from "./timing.js";
 /**
  * Emits a GTK signal on a widget or event controller.
@@ -8,27 +8,27 @@ import { tick } from "./timing.js";
  *
  * @param element - The widget or event controller to emit the signal on
  * @param signalName - GTK signal name (e.g., "clicked", "activate", "drag-begin")
- * @param args - Additional signal arguments
+ * @param args - Additional signal arguments as GValues
  *
  * @example
  * ```tsx
  * import { fireEvent } from "@gtkx/testing";
+ * import { Value } from "@gtkx/ffi/gobject";
  *
  * // Emit signal on widget
  * await fireEvent(widget, "clicked");
  *
  * // Emit signal on gesture controller
  * const gesture = widget.observeControllers().getObject(0) as Gtk.GestureDrag;
- * await fireEvent(gesture, "drag-begin", { type: { type: "float", size: 64 }, value: 100 }, { type: { type: "float", size: 64 }, value: 100 });
+ * await fireEvent(gesture, "drag-begin", Value.newFromDouble(100), Value.newFromDouble(100));
  * ```
  *
  * @see {@link userEvent} for high-level user interactions
  */
 export const fireEvent = async (element, signalName, ...args) => {
-    call("libgobject-2.0.so.0", "g_signal_emit_by_name", [
-        { type: { type: "gobject", ownership: "borrowed" }, value: element.handle },
-        { type: { type: "string", ownership: "borrowed" }, value: signalName },
-        ...args,
-    ], { type: "undefined" });
+    const gtype = typeFromName(element.constructor.glibTypeName);
+    const signalId = signalLookup(signalName, gtype);
+    const instanceValue = Value.newFromObject(element);
+    signalEmitv([instanceValue, ...args], signalId, 0, null);
     await tick();
 };

package/dist/user-event.d.ts

@@ -6,6 +6,13 @@ export type TabOptions = {
     /** Navigate backwards (Shift+Tab) instead of forwards */
     shift?: boolean;
 };
+/**
+ * Pointer input actions for simulating mouse interactions.
+ *
+ * - `"click"` or `"[MouseLeft]"`: Full click (press + release)
+ * - `"down"` or `"[MouseLeft>]"`: Press and hold
+ * - `"up"` or `"[/MouseLeft]"`: Release
+ */
 export type PointerInput = "click" | "down" | "up" | "[MouseLeft]" | "[MouseLeft>]" | "[/MouseLeft]";
 /**
  * User interaction utilities for testing.

package/dist/user-event.js

@@ -1,7 +1,7 @@
 import { getNativeObject } from "@gtkx/ffi";
 import * as Gdk from "@gtkx/ffi/gdk";
+import { signalEmitv, signalLookup, typeFromName, Value } from "@gtkx/ffi/gobject";
 import * as Gtk from "@gtkx/ffi/gtk";
-import { call, createRef } from "@gtkx/native";
 import { fireEvent } from "./fire-event.js";
 import { tick } from "./timing.js";
 import { isEditable } from "./widget.js";
@@ -166,36 +166,18 @@ const getOrCreateController = (element, controllerType) => {
     element.addController(controller);
     return controller;
 };
-const SIGNALS_WITH_RETURN_VALUE = new Set(["key-pressed", "key-released"]);
-const emitSignal = (target, signalName, ...args) => {
-    const signalArgs = args.map((arg) => {
-        if (arg.type === "float") {
-            return { type: { type: "float", size: 64 }, value: arg.value };
-        }
-        return { type: { type: "int", size: 32, unsigned: true }, value: arg.value };
-    });
-    const ffiArgs = [
-        { type: { type: "gobject", ownership: "borrowed" }, value: target.handle },
-        { type: { type: "string", ownership: "borrowed" }, value: signalName },
-        ...signalArgs,
-    ];
-    if (SIGNALS_WITH_RETURN_VALUE.has(signalName)) {
-        const returnRef = createRef(0);
-        ffiArgs.push({
-            type: { type: "ref", innerType: { type: "int", size: 32, unsigned: false } },
-            value: returnRef,
-        });
-    }
-    call("libgobject-2.0.so.0", "g_signal_emit_by_name", ffiArgs, { type: "undefined" });
+const getSignalId = (target, signalName) => {
+    const gtype = typeFromName(target.constructor.glibTypeName);
+    return signalLookup(signalName, gtype);
 };
 const hover = async (element) => {
     const controller = getOrCreateController(element, Gtk.EventControllerMotion);
-    emitSignal(controller, "enter", { type: "float", value: 0 }, { type: "float", value: 0 });
+    signalEmitv([Value.newFromObject(controller), Value.newFromDouble(0), Value.newFromDouble(0)], getSignalId(controller, "enter"), 0, null);
     await tick();
 };
 const unhover = async (element) => {
     const controller = getOrCreateController(element, Gtk.EventControllerMotion);
-    emitSignal(controller, "leave");
+    signalEmitv([Value.newFromObject(controller)], getSignalId(controller, "leave"), 0, null);
     await tick();
 };
 const KEY_MAP = {
@@ -261,7 +243,13 @@ const keyboard = async (element, input) => {
     const actions = parseKeyboardInput(input);
     for (const action of actions) {
         const signalName = action.press ? "key-pressed" : "key-released";
-        emitSignal(controller, signalName, { type: "int", value: action.keyval }, { type: "int", value: 0 }, { type: "int", value: 0 });
+        const returnValue = Value.newFromBoolean(false);
+        signalEmitv([
+            Value.newFromObject(controller),
+            Value.newFromUint(action.keyval),
+            Value.newFromUint(0),
+            Value.newFromUint(0),
+        ], getSignalId(controller, signalName), 0, returnValue);
         if (action.press && action.keyval === Gdk.KEY_Return && isEditable(element)) {
             await fireEvent(element, "activate");
         }
@@ -270,15 +258,27 @@ const keyboard = async (element, input) => {
 };
 const pointer = async (element, input) => {
     const controller = getOrCreateController(element, Gtk.GestureClick);
+    const pressedArgs = [
+        Value.newFromObject(controller),
+        Value.newFromInt(1),
+        Value.newFromDouble(0),
+        Value.newFromDouble(0),
+    ];
+    const releasedArgs = [
+        Value.newFromObject(controller),
+        Value.newFromInt(1),
+        Value.newFromDouble(0),
+        Value.newFromDouble(0),
+    ];
     if (input === "[MouseLeft]" || input === "click") {
-        emitSignal(controller, "pressed", { type: "int", value: 1 }, { type: "float", value: 0 }, { type: "float", value: 0 });
-        emitSignal(controller, "released", { type: "int", value: 1 }, { type: "float", value: 0 }, { type: "float", value: 0 });
+        signalEmitv(pressedArgs, getSignalId(controller, "pressed"), 0, null);
+        signalEmitv(releasedArgs, getSignalId(controller, "released"), 0, null);
     }
     else if (input === "[MouseLeft>]" || input === "down") {
-        emitSignal(controller, "pressed", { type: "int", value: 1 }, { type: "float", value: 0 }, { type: "float", value: 0 });
+        signalEmitv(pressedArgs, getSignalId(controller, "pressed"), 0, null);
     }
     else if (input === "[/MouseLeft]" || input === "up") {
-        emitSignal(controller, "released", { type: "int", value: 1 }, { type: "float", value: 0 }, { type: "float", value: 0 });
+        signalEmitv(releasedArgs, getSignalId(controller, "released"), 0, null);
     }
     await tick();
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gtkx/testing",
-  "version": "0.14.0",
+  "version": "0.15.0",
   "description": "Testing utilities for GTKX applications",
   "keywords": [
     "gtkx",
@@ -36,14 +36,13 @@
     "dist"
   ],
   "dependencies": {
-    "@gtkx/ffi": "0.14.0",
-    "@gtkx/native": "0.14.0",
-    "@gtkx/react": "0.14.0"
+    "@gtkx/ffi": "0.15.0",
+    "@gtkx/react": "0.15.0"
   },
   "devDependencies": {
     "@types/react-reconciler": "^0.32.3",
     "react-reconciler": "^0.33.0",
-    "@gtkx/vitest": "0.14.0"
+    "@gtkx/vitest": "0.15.0"
   },
   "scripts": {
     "build": "tsc -b && cp ../../README.md .",