@gtkx/testing 0.1.35 → 0.1.37

package/dist/index.d.ts

@@ -2,7 +2,8 @@ export { fireEvent } from "./fire-event.js";
 export { findAllByLabelText, findAllByRole, findAllByTestId, findAllByText, findByLabelText, findByRole, findByTestId, findByText, } from "./queries.js";
 export { cleanup, render, teardown } from "./render.js";
 export { screen } from "./screen.js";
-export type { ByRoleOptions, RenderOptions, RenderResult, TextMatchOptions, WaitForOptions, } from "./types.js";
+export type { BoundQueries, ByRoleOptions, RenderOptions, RenderResult, TextMatchOptions, WaitForOptions, } from "./types.js";
 export type { UserEventInstance, UserEventOptions } from "./user-event.js";
 export { userEvent } from "./user-event.js";
 export { waitFor, waitForElementToBeRemoved } from "./wait-for.js";
+export { within } from "./within.js";

package/dist/index.js

@@ -4,3 +4,4 @@ export { cleanup, render, teardown } from "./render.js";
 export { screen } from "./screen.js";
 export { userEvent } from "./user-event.js";
 export { waitFor, waitForElementToBeRemoved } from "./wait-for.js";
+export { within } from "./within.js";

package/dist/queries.js

@@ -1,4 +1,4 @@
-import { wrapPtr } from "@gtkx/ffi";
+import { getObject } from "@gtkx/ffi";
 import { AccessibleRole, Button, CheckButton, Expander, Label, ToggleButton } from "@gtkx/ffi/gtk";
 import { findAll } from "./traversal.js";
 import { waitFor } from "./wait-for.js";
@@ -18,11 +18,11 @@ const matchText = (actual, expected, options) => {
     }
     return expected.test(normalizedActual);
 };
-const asButton = (widget) => wrapPtr(widget.ptr, Button);
-const asLabel = (widget) => wrapPtr(widget.ptr, Label);
-const asCheckButton = (widget) => wrapPtr(widget.ptr, CheckButton);
-const asToggleButton = (widget) => wrapPtr(widget.ptr, ToggleButton);
-const asExpander = (widget) => wrapPtr(widget.ptr, Expander);
+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;
     if (accessible.getAccessibleRole() !== AccessibleRole.LABEL)

package/dist/render.js

@@ -4,6 +4,7 @@ import * as Gtk from "@gtkx/ffi/gtk";
 import { ApplicationWindow, reconciler } from "@gtkx/react";
 import * as queries from "./queries.js";
 import { setScreenRoot } from "./screen.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";
@@ -29,7 +30,7 @@ const ensureInitialized = () => {
     const app = start(APP_ID);
     if (!container) {
         const instance = reconciler.getInstance();
-        container = instance.createContainer(app, 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/types.d.ts

@@ -23,8 +23,7 @@ export interface RenderOptions {
         children: ReactNode;
     }>;
 }
-export interface RenderResult {
-    container: Gtk.Application;
+export interface BoundQueries {
     findByRole: (role: AccessibleRole, options?: ByRoleOptions) => Promise<Gtk.Widget>;
     findByLabelText: (text: string | RegExp, options?: TextMatchOptions) => Promise<Gtk.Widget>;
     findByText: (text: string | RegExp, options?: TextMatchOptions) => Promise<Gtk.Widget>;
@@ -33,6 +32,9 @@ export interface RenderResult {
     findAllByLabelText: (text: string | RegExp, options?: TextMatchOptions) => Promise<Gtk.Widget[]>;
     findAllByText: (text: string | RegExp, options?: TextMatchOptions) => Promise<Gtk.Widget[]>;
     findAllByTestId: (testId: string | RegExp, options?: TextMatchOptions) => Promise<Gtk.Widget[]>;
+}
+export interface RenderResult extends BoundQueries {
+    container: Gtk.Application;
     unmount: () => Promise<void>;
     rerender: (element: ReactNode) => Promise<void>;
     debug: () => void;

package/dist/within.d.ts

@@ -0,0 +1,3 @@
+import type * as Gtk from "@gtkx/ffi/gtk";
+import type { BoundQueries } from "./types.js";
+export declare const within: (container: Gtk.Widget) => BoundQueries;

package/dist/within.js

@@ -0,0 +1,11 @@
+import * as queries from "./queries.js";
+export const within = (container) => ({
+    findByRole: (role, options) => queries.findByRole(container, role, options),
+    findByLabelText: (text, options) => queries.findByLabelText(container, text, options),
+    findByText: (text, options) => queries.findByText(container, text, options),
+    findByTestId: (testId, options) => queries.findByTestId(container, testId, options),
+    findAllByRole: (role, options) => queries.findAllByRole(container, role, options),
+    findAllByLabelText: (text, options) => queries.findAllByLabelText(container, text, options),
+    findAllByText: (text, options) => queries.findAllByText(container, text, options),
+    findAllByTestId: (testId, options) => queries.findAllByTestId(container, testId, options),
+});

package/package.json

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