@gtkx/testing 1.0.0-rc.2 → 1.0.0-rc.4

package/src/matchers.ts

@@ -1,75 +1,185 @@
 /// <reference types="@vitest/expect" />
+import * as GObject from "@gtkx/gi/gobject";
 import * as Gtk from "@gtkx/gi/gtk";
+import { getDefaultNormalizer } from "./normalize.js";
+import { formatRole } from "./role-helpers.js";
 import {
+    type CheckedState,
     getWidgetAccessibleName,
     getWidgetCheckedState,
+    getWidgetDescribedByText,
     getWidgetDisplayValue,
+    getWidgetErrorMessage,
     getWidgetExpandedState,
-    getWidgetNodeText,
+    getWidgetInvalidState,
+    getWidgetLabelText,
     getWidgetPlaceholderText,
     getWidgetPressedState,
+    getWidgetRequiredState,
     getWidgetSelectedState,
+    getWidgetSelection,
+    getWidgetTextContent,
     getWidgetValue,
+    hasDisplayValue,
+    isWidgetDisabled,
+    isWidgetVisible,
 } from "./widget-accessible-properties.js";
 
 /** The expected value for a text matcher: an exact string or a regular expression. */
 type TextExpectation = string | RegExp;
+
+/** Options controlling how `toHaveTextContent` normalizes the text it reads. */
+type TextContentOptions = {
+    /**
+     * When true (the default), trim the text and collapse runs of whitespace into single spaces
+     * before comparing. When false, only replace non-breaking spaces with regular ones.
+     */
+    normalizeWhitespace?: boolean | undefined;
+};
+
+/** The expected value for a style class: an exact class name or a regular expression. */
+type ClassExpectation = string | RegExp;
+/** The outcome of a matcher: whether it passed, and the failure text built on demand. */
 type MatcherResult = { pass: boolean; message: () => string };
+/** The matcher state bound as `this`, supplying the test runner's deep equality check. */
+type MatcherContext = { equals: (actual: unknown, expected: unknown) => boolean };
+/** Compares text read from the received widget; with no expected value, asserts the text is non-empty. */
 type TextMatcher = (received: unknown, expected?: TextExpectation) => MatcherResult;
+/** Asserts a single state of the received widget, taking no expected value. */
 type StateMatcher = (received: unknown) => MatcherResult;
-type ValueMatcher = (received: unknown, expected: number) => MatcherResult;
 type TextMatcherContext = { matcherName: string; widget: Gtk.Widget; actual: string | null };
+type ClassArguments = { expected: ClassExpectation[]; isExact: boolean };
+
+/** A text matcher that also takes normalization options for the text it reads. */
+type TextContentMatcher = (
+    received: unknown,
+    expected?: TextExpectation,
+    options?: TextContentOptions,
+) => MatcherResult;
 
+/** Signatures of the widget assertion matchers, keyed by the name each is registered under. */
 type MatcherImplementations = {
+    /** Asserts the text an editable widget or combo box shows; with no argument, that it is not empty. */
     toHaveDisplayValue: TextMatcher;
-    toHaveTextContent: TextMatcher;
+    /** Asserts the widget's own text, or its descendants' when it has none, contains or matches the expectation. */
+    toHaveTextContent: TextContentMatcher;
+    /** Asserts the widget's accessible name; with no argument, that it has one. */
     toHaveAccessibleName: TextMatcher;
+    /**
+     * Asserts the joined accessible names of the widget's `described-by` targets, falling back to its
+     * `description` and then to its tooltip.
+     */
+    toHaveAccessibleDescription: TextMatcher;
+    /** Asserts the joined accessible names of the widget's `error-message` targets, read only while it is invalid. */
+    toHaveAccessibleErrorMessage: TextMatcher;
+    /** Asserts the widget's placeholder text; with no argument, that it has some. */
     toHavePlaceholderText: TextMatcher;
+    /** Asserts the text currently selected in an editable widget. */
+    toHaveSelection: TextMatcher;
+    /** Asserts the widget's checked state is checked rather than unchecked or mixed. */
     toBeChecked: StateMatcher;
+    /** Asserts the widget's checked state is mixed. */
+    toBePartiallyChecked: StateMatcher;
+    /** Asserts a `Gtk.ToggleButton` is active, and throws for any other widget. */
     toBePressed: StateMatcher;
+    /** Asserts a `Gtk.Expander` or the row behind a `Gtk.TreeExpander` is expanded, and throws for anything else. */
     toBeExpanded: StateMatcher;
+    /**
+     * Asserts a `Gtk.ListBoxRow` or `Gtk.FlowBoxChild` is selected, or that a widget in a selectable role
+     * carries the selected state flag, and throws for anything else.
+     */
     toBeSelected: StateMatcher;
-    toHaveValue: ValueMatcher;
+    /** Asserts the widget is insensitive, or sits inside an insensitive ancestor. */
+    toBeDisabled: StateMatcher;
+    /** Asserts the widget and all of its ancestors are sensitive. */
+    toBeEnabled: StateMatcher;
+    /** Asserts the widget and its ancestors are all visible, and that none of them is fully transparent. */
+    toBeVisible: StateMatcher;
+    /** Asserts the widget's root is a window that is still in the toplevel list. */
+    toBeRooted: StateMatcher;
+    /** Asserts the widget has neither a child nor label text. */
+    toBeEmpty: StateMatcher;
+    /** Asserts the widget's accessible invalid state is set to anything other than false. */
+    toBeInvalid: StateMatcher;
+    /** Asserts the widget's accessible invalid state is unset or false. */
+    toBeValid: StateMatcher;
+    /** Asserts the widget's accessible required state. */
+    toBeRequired: StateMatcher;
+    /** Asserts the widget holds the platform focus state. */
+    toHaveFocus: StateMatcher;
+    /** Asserts a widget's numeric value, or its display value when a string is given. */
+    toHaveValue: (received: unknown, expected?: number | string) => MatcherResult;
+    /** Asserts the widget's accessible role. */
+    toHaveRole: (received: unknown, expected: Gtk.AccessibleRole) => MatcherResult;
+    /** Asserts the widget is, or is an ancestor of, the given widget. */
+    toContainElement: (received: unknown, descendant: Gtk.Widget | null) => MatcherResult;
+    /**
+     * Asserts the widget carries every given style class, each a name, a space-separated list, or a pattern.
+     * Pass `{ exact: true }` last to require exactly that set, which rules out patterns.
+     */
+    toHaveClass: (received: unknown, ...args: unknown[]) => MatcherResult;
+    /**
+     * Asserts a GObject property, named as in GObject and looked up by its camel-cased accessor, equals the
+     * expected value. With no expected value, asserts the property is set. GObject values compare by identity.
+     */
+    toHaveObjectProperty: (this: MatcherContext, received: unknown, ...args: unknown[]) => MatcherResult;
 };
 
 type ExpectExtend = { extend: (m: MatcherImplementations) => void };
 
-const toHaveDisplayValue: TextMatcher = textMatcher("toHaveDisplayValue", getWidgetDisplayValue, "exact");
+const registration = { isRegistered: false };
+const displayValueMatcher: TextMatcher = textMatcher("toHaveDisplayValue", getWidgetDisplayValue, "exact");
+const toHaveAccessibleName: TextMatcher = textMatcher("toHaveAccessibleName", getWidgetAccessibleName, "exact");
 
-const toHaveTextContent: TextMatcher = textMatcher(
-    "toHaveTextContent",
-    (widget) => getWidgetNodeText(widget) ?? getWidgetAccessibleName(widget),
-    "substring",
+const toHaveAccessibleDescription: TextMatcher = textMatcher(
+    "toHaveAccessibleDescription",
+    getWidgetDescribedByText,
+    "exact",
 );
 
-const toHaveAccessibleName: TextMatcher = textMatcher("toHaveAccessibleName", getWidgetAccessibleName, "exact");
-
-const toHavePlaceholderText: TextMatcher = textMatcher(
-    "toHavePlaceholderText",
-    getWidgetPlaceholderText,
+const toHaveAccessibleErrorMessage: TextMatcher = textMatcher(
+    "toHaveAccessibleErrorMessage",
+    readErrorMessageText,
     "exact",
 );
 
-const toBeChecked: StateMatcher = booleanStateMatcher("toBeChecked", "checked", getWidgetCheckedState);
+const toHavePlaceholderText: TextMatcher = textMatcher("toHavePlaceholderText", getWidgetPlaceholderText, "exact");
+const toHaveSelection: TextMatcher = textMatcher("toHaveSelection", getWidgetSelection, "exact");
 const toBePressed: StateMatcher = booleanStateMatcher("toBePressed", "pressed", getWidgetPressedState);
 const toBeExpanded: StateMatcher = booleanStateMatcher("toBeExpanded", "expanded", getWidgetExpandedState);
 const toBeSelected: StateMatcher = booleanStateMatcher("toBeSelected", "selected", getWidgetSelectedState);
+const toBeRequired: StateMatcher = booleanStateMatcher("toBeRequired", "required", getWidgetRequiredState);
 
 /** The widget assertion matchers keyed by name, suitable for passing to `expect.extend`. */
 const matchers: MatcherImplementations = {
     toHaveDisplayValue,
     toHaveTextContent,
     toHaveAccessibleName,
+    toHaveAccessibleDescription,
+    toHaveAccessibleErrorMessage,
     toHavePlaceholderText,
+    toHaveSelection,
     toBeChecked,
+    toBePartiallyChecked,
     toBePressed,
     toBeExpanded,
     toBeSelected,
+    toBeDisabled,
+    toBeEnabled,
+    toBeVisible,
+    toBeRooted,
+    toBeEmpty,
+    toBeInvalid,
+    toBeValid,
+    toBeRequired,
+    toHaveFocus,
     toHaveValue,
+    toHaveRole,
+    toContainElement,
+    toHaveClass,
+    toHaveObjectProperty,
 };
 
-const registration = { isRegistered: false };
-
 const asWidget = (received: unknown, matcherName: string): Gtk.Widget => {
     if (!(received instanceof Gtk.Widget)) {
         throw new TypeError(`${matcherName}: received value must be a Gtk.Widget, got ${typeof received}`);
@@ -78,6 +188,14 @@ const asWidget = (received: unknown, matcherName: string): Gtk.Widget => {
     return received;
 };
 
+const asObject = (received: unknown, matcherName: string): GObject.Object => {
+    if (!(received instanceof GObject.Object)) {
+        throw new TypeError(`${matcherName}: received value must be a GObject, got ${typeof received}`);
+    }
+
+    return received;
+};
+
 const describeWidget = (widget: Gtk.Widget): string => {
     const role = Gtk.AccessibleRole[widget.getAccessibleRole()];
     const name = getWidgetAccessibleName(widget);
@@ -85,6 +203,9 @@ const describeWidget = (widget: Gtk.Widget): string => {
     return name === null ? `<${role}>` : `<${role} name=${JSON.stringify(name)}>`;
 };
 
+const describeObject = (object: GObject.Object): string =>
+    object instanceof Gtk.Widget ? describeWidget(object) : `<${object.constructor.name}>`;
+
 const isTextMatch = (actual: string, expected: TextExpectation, mode: "exact" | "substring"): boolean => {
     if (expected instanceof RegExp) {
         expected.lastIndex = 0;
@@ -118,6 +239,127 @@ const matchedResult = (context: TextMatcherContext, expected: TextExpectation, i
         `but received ${JSON.stringify(context.actual)}\n${describeWidget(context.widget)}`,
 });
 
+const stateResult = (widget: Gtk.Widget, stateName: string, isPass: boolean): MatcherResult => ({
+    pass: isPass,
+    message: () => `expected widget ${negationPrefix(isPass)}to be ${stateName}\n${describeWidget(widget)}`,
+});
+
+const camelCase = (name: string): string =>
+    name.replaceAll(/-([a-z])/g, (_match, letter: string) => letter.toUpperCase());
+
+const isAsymmetricMatcher = (value: unknown): boolean =>
+    typeof value === "object" && value !== null && typeof Reflect.get(value, "asymmetricMatch") === "function";
+
+const isEqualValue = (context: MatcherContext, actual: unknown, expected: unknown): boolean => {
+    if (isAsymmetricMatcher(expected)) {
+        return context.equals(actual, expected);
+    }
+
+    if (actual instanceof GObject.Object || expected instanceof GObject.Object) {
+        return Object.is(actual, expected);
+    }
+
+    return context.equals(actual, expected);
+};
+
+const isClassMatch = (actual: string[], expected: ClassExpectation): boolean =>
+    expected instanceof RegExp ? actual.some((name) => expected.test(name)) : actual.includes(expected);
+
+const isWidgetRooted = (widget: Gtk.Widget): boolean => {
+    const root = widget.getRoot();
+
+    if (root === null) {
+        return false;
+    }
+
+    if (root instanceof Gtk.Window) {
+        return Gtk.Window.listToplevels().includes(root);
+    }
+
+    return true;
+};
+
+const globalExpect = (): ExpectExtend | null => {
+    const candidate: unknown = Reflect.get(globalThis, "expect");
+
+    if (candidate && typeof (candidate as ExpectExtend).extend === "function") {
+        return candidate as ExpectExtend;
+    }
+
+    return null;
+};
+
+function readErrorMessageText(widget: Gtk.Widget): string | null {
+    const state = getWidgetInvalidState(widget);
+
+    if (state === null || state === Gtk.AccessibleInvalidState.FALSE) {
+        return null;
+    }
+
+    const targets = getWidgetErrorMessage(widget);
+
+    if (targets === null) {
+        return null;
+    }
+
+    const texts = targets.map((target) => getWidgetAccessibleName(target)).filter((text) => text !== null);
+
+    return texts.length > 0 ? texts.join(" ") : null;
+}
+
+function assertReadableProperty(object: GObject.Object, name: string, property: string, value: unknown): void {
+    if (typeof value === "function") {
+        throw new TypeError(
+            `toHaveObjectProperty: "${name}" is shadowed by a method of the same name; ` +
+            `call ${property}() and assert on its result instead`,
+        );
+    }
+
+    if (value === undefined && !Reflect.has(object, property)) {
+        throw new TypeError(
+            `toHaveObjectProperty: no readable property "${name}" on ${describeObject(object)}; ` +
+            "construct-only and write-only properties cannot be read back",
+        );
+    }
+}
+
+function readObjectProperty(object: GObject.Object, name: string): unknown {
+    const property = camelCase(name);
+    const value: unknown = Reflect.get(object, property);
+    assertReadableProperty(object, name, property, value);
+
+    return value;
+}
+
+function classEntries(entry: unknown): ClassExpectation[] {
+    return entry instanceof RegExp ? [entry] : String(entry).split(/\s+/).filter(Boolean);
+}
+
+function parseClassArguments(args: unknown[]): ClassArguments {
+    const last = args.at(-1);
+    const isOptions = typeof last === "object" && last !== null && !(last instanceof RegExp);
+    const isExact = isOptions && Reflect.get(last, "exact") === true;
+    const entries = isOptions ? args.slice(0, -1) : args;
+
+    return { expected: entries.flatMap((entry) => classEntries(entry)), isExact };
+}
+
+function exactClassResult(widget: Gtk.Widget, actual: string[], expected: ClassExpectation[]): MatcherResult {
+    if (expected.some((entry) => entry instanceof RegExp)) {
+        throw new TypeError("toHaveClass: the exact option cannot be combined with a regular expression");
+    }
+
+    const names = expected.map(String);
+    const isPass = names.length === actual.length && names.every((name) => actual.includes(name));
+
+    return {
+        pass: isPass,
+        message: () =>
+            `expected widget ${negationPrefix(isPass)}to have exactly the classes ${JSON.stringify(names)}, ` +
+            `but received ${JSON.stringify(actual)}\n${describeWidget(widget)}`,
+    };
+}
+
 function textMatcher(
     matcherName: string,
     read: (widget: Gtk.Widget) => string | null,
@@ -136,6 +378,37 @@ function textMatcher(
     };
 }
 
+function normalizeTextContent(text: string, options?: TextContentOptions): string {
+    if (options?.normalizeWhitespace === false) {
+        return text.replaceAll("\u{A0}", " ");
+    }
+
+    return getDefaultNormalizer()(text);
+}
+
+function readTextContent(widget: Gtk.Widget, options?: TextContentOptions): string | null {
+    const text = getWidgetTextContent(widget);
+
+    return text === null ? null : normalizeTextContent(text, options);
+}
+
+function toHaveTextContent(
+    received: unknown,
+    expected?: TextExpectation,
+    options?: TextContentOptions,
+): MatcherResult {
+    const read = (widget: Gtk.Widget): string | null => readTextContent(widget, options);
+
+    return textMatcher("toHaveTextContent", read, "substring")(received, expected);
+}
+
+function notApplicable(matcherName: string, stateName: string, widget: Gtk.Widget): Error {
+    return new Error(
+        `${matcherName}: widget does not expose a ${stateName} ` +
+        `(role ${Gtk.AccessibleRole[widget.getAccessibleRole()]})\n${describeWidget(widget)}`,
+    );
+}
+
 function booleanStateMatcher(
     matcherName: string,
     stateName: string,
@@ -146,32 +419,59 @@ function booleanStateMatcher(
         const state = read(widget);
 
         if (state === null) {
-            throw new Error(
-                `${matcherName}: widget does not expose a ${stateName} state ` +
-                `(role ${Gtk.AccessibleRole[widget.getAccessibleRole()]})\n${describeWidget(widget)}`,
-            );
+            throw notApplicable(matcherName, `${stateName} state`, widget);
         }
 
-        return {
-            pass: state,
-            message: () =>
-                `expected widget ${negationPrefix(state)}to be ${stateName}\n${describeWidget(widget)}`,
-        };
+        return stateResult(widget, stateName, state);
     };
 }
 
-function toHaveValue(received: unknown, expected: number): MatcherResult {
+function readCheckedState(widget: Gtk.Widget, matcherName: string): CheckedState {
+    const state = getWidgetCheckedState(widget);
+
+    if (state === null) {
+        throw notApplicable(matcherName, "checked state", widget);
+    }
+
+    return state;
+}
+
+function toBeChecked(received: unknown): MatcherResult {
+    const widget = asWidget(received, "toBeChecked");
+
+    return stateResult(widget, "checked", readCheckedState(widget, "toBeChecked") === "checked");
+}
+
+function toBePartiallyChecked(received: unknown): MatcherResult {
+    const widget = asWidget(received, "toBePartiallyChecked");
+
+    return stateResult(widget, "partially checked", readCheckedState(widget, "toBePartiallyChecked") === "mixed");
+}
+
+function toHaveDisplayValue(received: unknown, expected?: TextExpectation): MatcherResult {
+    const widget = asWidget(received, "toHaveDisplayValue");
+
+    if (!hasDisplayValue(widget)) {
+        throw notApplicable("toHaveDisplayValue", "display value", widget);
+    }
+
+    return displayValueMatcher(received, expected);
+}
+
+function toHaveValue(received: unknown, expected?: number | string): MatcherResult {
     const widget = asWidget(received, "toHaveValue");
+
+    if (typeof expected === "string") {
+        return displayValueMatcher(received, expected);
+    }
+
     const actual = getWidgetValue(widget).now;
 
     if (actual === null) {
-        throw new Error(
-            "toHaveValue: widget does not expose a numeric value " +
-            `(role ${Gtk.AccessibleRole[widget.getAccessibleRole()]})\n${describeWidget(widget)}`,
-        );
+        throw notApplicable("toHaveValue", "numeric value", widget);
     }
 
-    const isPass = actual === expected;
+    const isPass = expected === undefined || actual === expected;
 
     return {
         pass: isPass,
@@ -181,15 +481,135 @@ function toHaveValue(received: unknown, expected: number): MatcherResult {
     };
 }
 
-const globalExpect = (): ExpectExtend | null => {
-    const candidate: unknown = Reflect.get(globalThis, "expect");
+function toBeDisabled(received: unknown): MatcherResult {
+    const widget = asWidget(received, "toBeDisabled");
 
-    if (candidate && typeof (candidate as ExpectExtend).extend === "function") {
-        return candidate as ExpectExtend;
+    return stateResult(widget, "disabled", isWidgetDisabled(widget));
+}
+
+function toBeEnabled(received: unknown): MatcherResult {
+    const widget = asWidget(received, "toBeEnabled");
+
+    return stateResult(widget, "enabled", !isWidgetDisabled(widget));
+}
+
+function toBeVisible(received: unknown): MatcherResult {
+    const widget = asWidget(received, "toBeVisible");
+
+    return stateResult(widget, "visible", isWidgetVisible(widget));
+}
+
+function toBeRooted(received: unknown): MatcherResult {
+    if (received === null) {
+        return { pass: false, message: () => "expected a widget to be rooted in a window, but received null" };
     }
 
-    return null;
-};
+    const widget = asWidget(received, "toBeRooted");
+
+    return stateResult(widget, "rooted in a window", isWidgetRooted(widget));
+}
+
+function toBeEmpty(received: unknown): MatcherResult {
+    const widget = asWidget(received, "toBeEmpty");
+
+    return stateResult(widget, "empty", widget.getFirstChild() === null && getWidgetLabelText(widget) === null);
+}
+
+function toBeInvalid(received: unknown): MatcherResult {
+    const widget = asWidget(received, "toBeInvalid");
+    const state = getWidgetInvalidState(widget);
+
+    return stateResult(widget, "invalid", state !== null && state !== Gtk.AccessibleInvalidState.FALSE);
+}
+
+function toBeValid(received: unknown): MatcherResult {
+    const widget = asWidget(received, "toBeValid");
+    const state = getWidgetInvalidState(widget);
+
+    return stateResult(widget, "valid", state === null || state === Gtk.AccessibleInvalidState.FALSE);
+}
+
+function toHaveFocus(received: unknown): MatcherResult {
+    const widget = asWidget(received, "toHaveFocus");
+
+    return stateResult(widget, "focused", widget.getPlatformState(Gtk.AccessiblePlatformState.FOCUSED));
+}
+
+function toHaveRole(received: unknown, expected: Gtk.AccessibleRole): MatcherResult {
+    const widget = asWidget(received, "toHaveRole");
+    const actual = widget.getAccessibleRole();
+    const isPass = actual === expected;
+
+    return {
+        pass: isPass,
+        message: () =>
+            `expected widget ${negationPrefix(isPass)}to have role '${formatRole(expected)}', ` +
+            `but received '${formatRole(actual)}'\n${describeWidget(widget)}`,
+    };
+}
+
+function toContainElement(received: unknown, descendant: Gtk.Widget | null): MatcherResult {
+    const widget = asWidget(received, "toContainElement");
+    const isPass = descendant !== null && (descendant === widget || descendant.isAncestor(widget));
+
+    return {
+        pass: isPass,
+        message: () =>
+            `expected widget ${negationPrefix(isPass)}to contain ` +
+            `${descendant === null ? "null" : describeWidget(descendant)}\n${describeWidget(widget)}`,
+    };
+}
+
+function toHaveClass(received: unknown, ...args: unknown[]): MatcherResult {
+    const widget = asWidget(received, "toHaveClass");
+    const actual = widget.getCssClasses();
+    const { expected, isExact } = parseClassArguments(args);
+
+    if (isExact) {
+        return exactClassResult(widget, actual, expected);
+    }
+
+    if (expected.length === 0) {
+        return stateResult(widget, "given any style class", actual.length > 0);
+    }
+
+    const isPass = expected.every((entry) => isClassMatch(actual, entry));
+
+    return {
+        pass: isPass,
+        message: () =>
+            `expected widget ${negationPrefix(isPass)}to have class ${expected.map(String).join(", ")}, ` +
+            `but received ${JSON.stringify(actual)}\n${describeWidget(widget)}`,
+    };
+}
+
+function toHaveObjectProperty(this: MatcherContext, received: unknown, ...args: unknown[]): MatcherResult {
+    const object = asObject(received, "toHaveObjectProperty");
+    const [name, expected] = args;
+    const actual = readObjectProperty(object, String(name));
+
+    if (args.length < 2) {
+        const isSet = actual !== null && actual !== undefined;
+
+        return {
+            pass: isSet,
+            message: () =>
+                `expected ${describeObject(object)} ${negationPrefix(isSet)}to have a value for property ` +
+                `"${String(name)}", but received ${JSON.stringify(actual)}`,
+        };
+    }
+
+    /* eslint-disable-next-line unicorn/no-this-outside-of-class --
+       expect.extend invokes matchers with the matcher state as `this` */
+    const isPass = isEqualValue(this, actual, expected);
+
+    return {
+        pass: isPass,
+        message: () =>
+            `expected ${describeObject(object)} ${negationPrefix(isPass)}to have property "${String(name)}" ` +
+            `equal to ${JSON.stringify(expected)}, but received ${JSON.stringify(actual)}`,
+    };
+}
 
 /** Registers the widget matchers on the global `expect`, when one is available. Safe to call more than once. */
 const registerMatchers = (): void => {
@@ -209,29 +629,37 @@ const registerMatchers = (): void => {
 
 declare module "@vitest/expect" {
     /* eslint-disable @typescript-eslint/consistent-type-definitions -- declaration merging requires interfaces */
-    interface Assertion {
+    interface WidgetMatchers {
         toHaveDisplayValue(expected?: TextExpectation): void;
-        toHaveTextContent(expected?: TextExpectation): void;
+        toHaveTextContent(expected?: TextExpectation, options?: TextContentOptions): void;
         toHaveAccessibleName(expected?: TextExpectation): void;
+        toHaveAccessibleDescription(expected?: TextExpectation): void;
+        toHaveAccessibleErrorMessage(expected?: TextExpectation): void;
         toHavePlaceholderText(expected?: TextExpectation): void;
+        toHaveSelection(expected?: TextExpectation): void;
         toBeChecked(): void;
+        toBePartiallyChecked(): void;
         toBePressed(): void;
         toBeExpanded(): void;
         toBeSelected(): void;
-        toHaveValue(expected: number): void;
+        toBeDisabled(): void;
+        toBeEnabled(): void;
+        toBeVisible(): void;
+        toBeRooted(): void;
+        toBeEmpty(): void;
+        toBeInvalid(): void;
+        toBeValid(): void;
+        toBeRequired(): void;
+        toHaveFocus(): void;
+        toHaveValue(expected?: number | string): void;
+        toHaveRole(expected: Gtk.AccessibleRole): void;
+        toContainElement(descendant: Gtk.Widget | null): void;
+        toHaveClass(...args: (ClassExpectation | { exact: boolean })[]): void;
+        toHaveObjectProperty(name: string, expected?: unknown): void;
     }
 
-    interface AsymmetricMatchersContaining {
-        toHaveDisplayValue(expected?: TextExpectation): void;
-        toHaveTextContent(expected?: TextExpectation): void;
-        toHaveAccessibleName(expected?: TextExpectation): void;
-        toHavePlaceholderText(expected?: TextExpectation): void;
-        toBeChecked(): void;
-        toBePressed(): void;
-        toBeExpanded(): void;
-        toBeSelected(): void;
-        toHaveValue(expected: number): void;
-    }
+    interface Assertion extends WidgetMatchers {}
+    interface AsymmetricMatchersContaining extends WidgetMatchers {}
     /* eslint-enable @typescript-eslint/consistent-type-definitions */
 }
 
@@ -239,13 +667,32 @@ export {
     toHaveDisplayValue,
     toHaveTextContent,
     toHaveAccessibleName,
+    toHaveAccessibleDescription,
+    toHaveAccessibleErrorMessage,
     toHavePlaceholderText,
+    toHaveSelection,
     toBeChecked,
+    toBePartiallyChecked,
     toBePressed,
     toBeExpanded,
     toBeSelected,
-    matchers,
+    toBeDisabled,
+    toBeEnabled,
+    toBeVisible,
+    toBeRooted,
+    toBeEmpty,
+    toBeInvalid,
+    toBeValid,
+    toBeRequired,
+    toHaveFocus,
     toHaveValue,
+    toHaveRole,
+    toContainElement,
+    toHaveClass,
+    toHaveObjectProperty,
+    matchers,
     registerMatchers,
+    type ClassExpectation,
+    type TextContentOptions,
     type TextExpectation,
 };