@girs/foundrygtk-1 4.4.0 → 4.6.0

package/README.md

@@ -4,82 +4,96 @@
 ![version](https://img.shields.io/npm/v/@girs/foundrygtk-1)
 ![downloads/week](https://img.shields.io/npm/dw/@girs/foundrygtk-1)
 
+GJS TypeScript type definitions for FoundryGtk-1 using [ts-for-gir](https://github.com/gjsify/ts-for-gir) v4.6.0.
 
-GJS TypeScript type definitions for FoundryGtk-1 using [ts-for-gir](https://github.com/gjsify/ts-for-gir) v4.4.0.
+This package contains type declarations only. It ships no runtime code, so it adds
+nothing to your program and works with any bundler or none at all.
 
 ## Install
 
-Install the type definitions with npm:
 ```bash
 npm install @girs/foundrygtk-1
 ```
 
-## Usage
+Any package manager works. The package has no dependencies beyond other `@girs/*`
+type packages.
+
+## What it exports
+
+| Import | What you get |
+|---|---|
+| `@girs/foundrygtk-1` | the namespace as a default export, plus the ambient and global declarations |
+| `@girs/foundrygtk-1/ambient` | only the `gi://` module declarations |
+| `@girs/foundrygtk-1/import` | only the `imports.gi` declarations |
+| `@girs/foundrygtk-1/foundrygtk-1` | the namespace, without the side-effecting declarations |
+| `@girs/foundrygtk-1/vocabulary` | GIR-derived widget data: settable properties, enum nicks, slot candidates |
+
+## Three ways to import
+
+Which one you use depends on how you write imports elsewhere, not on your toolchain.
+
+### As a module
 
-Import it like any other module:
 ```ts
 import FoundryGtk from '@girs/foundrygtk-1';
 ```
 
-### Ambient Modules
+### As `gi://`
 
-[Ambient modules](https://github.com/gjsify/ts-for-gir/tree/main/packages/cli#ambient-modules) let you write the same import you would in plain JavaScript.
-For this you need to include `@girs/foundrygtk-1` or `@girs/foundrygtk-1/ambient` in your `tsconfig` or entry point Typescript file:
+GJS resolves `gi://` at runtime. To give it types, reference the package once, either
+from your entry point or from `tsconfig.json`:
 
-`index.ts`:
 ```ts
-import '@girs/foundrygtk-1'
+import '@girs/foundrygtk-1';
 ```
 
-`tsconfig.json`:
 ```json
-{
-  "compilerOptions": {
-    ...
-  },
-  "include": ["@girs/foundrygtk-1"],
-  ...
-}
+{ "include": ["@girs/foundrygtk-1"] }
 ```
 
-The ambient module now resolves with types:
+Then the runtime spelling type-checks:
 
 ```ts
 import FoundryGtk from 'gi://FoundryGtk?version=1';
 ```
 
-### Global import
+Referencing `@girs/foundrygtk-1/ambient` instead pulls in these declarations
+alone. See [ambient modules](https://github.com/gjsify/ts-for-gir/tree/main/packages/cli#ambient-modules).
+
+### As `imports.gi`
 
-GJS's global `imports.gi` works too, with types.
-For this you need to include `@girs/foundrygtk-1` or `@girs/foundrygtk-1/import` in your `tsconfig` or entry point Typescript file:
+GJS's global object works the same way, via `@girs/foundrygtk-1/import`:
 
-`index.ts`:
 ```ts
-import '@girs/foundrygtk-1'
+const FoundryGtk = imports.gi.FoundryGtk;
 ```
 
-`tsconfig.json`:
-```json
-{
-  "compilerOptions": {
-    ...
-  },
-  "include": ["@girs/foundrygtk-1"],
-  ...
-}
-```
+## Widget vocabulary
 
-That form carries types as well:
+`foundrygtk-1` declares widgets, so it also carries what the GIR says about them, as
+types and as values a test can read:
 
 ```ts
-const FoundryGtk = imports.gi.FoundryGtk;
+import type { Widgets, PropsOf } from '@girs/foundrygtk-1/vocabulary';
+import { OWN_PROPS, ENUM_NICKS, PROVENANCE } from '@girs/foundrygtk-1/vocabulary';
 ```
 
-### Bundle
+Properties are keyed the way GObject registered them, writable-only and optional, so they
+match `g_object_set`, GtkBuilder XML and Blueprint. `PROVENANCE.libraryVersion` names the
+library release this was generated from, which lets a check tell "newer than what is
+installed" from "wrong".
 
-Most projects want a bundler. [esbuild](https://esbuild.github.io/) is the smallest thing that works; the [examples directory](https://github.com/gjsify/ts-for-gir/tree/main/examples) has setups for several others.
+This subpath answers what the GIR says, not what the installed library has. For the
+second question, ask the library.
+
+## Building
+
+The declarations need no build step. If you bundle, every bundler works, since there is
+no runtime code to resolve. The [examples](https://github.com/gjsify/ts-for-gir/tree/main/examples)
+show working setups for several.
 
 ## Other packages
 
-All existing pre-generated packages can be found on [gjsify/types](https://github.com/gjsify/types).
+Every pre-generated package is at [gjsify/types](https://github.com/gjsify/types).
+
 

package/foundrygtk-1-vocabulary.d.ts

@@ -0,0 +1,276 @@
+/**
+ * The GIR-derived widget VOCABULARY for FoundryGtk-1.
+ *
+ * GENERATED — do not edit. Provenance: FoundryGtk-1 — dropped empty base(s): GObject.InitiallyUnowned GObject.Object
+ *
+ * 6 concrete widgets, 6 declarations, 0 enum nick unions, 0 slot candidates.
+ *
+ * Module-scoped exports only. There is no `JSX` namespace here, no tag spelling and
+ * no `on<Signal>` prop name: those are DIALECT, and every framework answers them
+ * differently. The shape to avoid is the GLOBAL AUGMENT — a `declare global` on
+ * `React.JSX` collides with every other library on a shared tag — while a
+ * module-scoped `JSX` behind a `jsxImportSource` does not. This package is used by
+ * projects that want nothing to do with JSX, so it emits neither; a consumer declaring
+ * a module-scoped namespace over these names is doing it right.
+ *
+ * Three things this is and `ConstructorProps` is not: WRITABLE-only (measured on
+ * Gtk-4.0, `ConstructorProps` offers 150 read-only properties across 68 classes as
+ * settable, and GTK's failure mode for writing one is exit 0), OPTIONAL, and keyed
+ * by the name GObject actually REGISTERED — the dashed spelling `g_object_set`,
+ * GtkBuilder XML and Blueprint all use.
+ *
+ * Signal handler types are not re-derived: `X.SignalSignatures`, which this package
+ * already emits for every class with the parent chain, every implemented interface
+ * and the `notify::` keys folded in, is what `Widgets[G]['signals']` points at.
+ */
+
+import type Foundry from '@girs/foundry-1';
+import type FoundryGtk from './foundrygtk-1.js';
+import type Pango from '@girs/pango-1.0';
+import type { GtkAccessibleConstructOnly, GtkAccessibleProps, GtkAccessibleTextConstructOnly, GtkAccessibleTextProps, GtkBuildableConstructOnly, GtkBuildableProps, GtkConstraintTargetConstructOnly, GtkConstraintTargetProps, GtkScrollableConstructOnly, GtkScrollableProps, GtkTextViewConstructOnly, GtkTextViewProps, GtkWidgetConstructOnly, GtkWidgetProps } from '@girs/gtk-4.0/vocabulary';
+import type { GtkSourceGutterRendererConstructOnly, GtkSourceGutterRendererProps, GtkSourceViewConstructOnly, GtkSourceViewProps } from '@girs/gtksource-5/vocabulary';
+
+// ---------------------------------------------------------------------------
+// Enum nicks — the string vocabulary GObject registered, from GIR's `glib:nick`.
+//
+// Not derived from the member name. Substituting underscores for dashes is not a law:
+// some nicks keep an underscore the substitution would have replaced, and only the
+// attribute knows which. Gtk-4.0 and Adw-1 contradict no derivation at all, which is
+// how a derived nick passes review and breaks elsewhere.
+// Re-measure with `scripts/check-nick-derivation.mjs` in ts-for-gir.
+// ---------------------------------------------------------------------------
+
+
+
+// ---------------------------------------------------------------------------
+// Property surfaces — one interface per GIR DECLARATION, mirroring GIR's own
+// inheritance rather than flattening per widget.
+//
+// The interfaces are load-bearing, not tidiness: `GtkBox` declares four properties
+// of its own and `orientation` is not among them — it lives on `Gtk.Orientable`,
+// because GObject installs interface properties on the implementor at runtime while
+// GIR keeps them once, on the interface.
+// ---------------------------------------------------------------------------
+
+export interface FoundryChangesGutterRendererProps extends GtkSourceGutterRendererProps, GtkAccessibleProps, GtkBuildableProps, GtkConstraintTargetProps {
+    /** @default FALSE */
+    'show-overview'?: boolean;
+}
+/** Settable only at construction — a renderer must REBUILD, not patch. */
+export type FoundryChangesGutterRendererConstructOnly = GtkSourceGutterRendererConstructOnly | GtkAccessibleConstructOnly | GtkBuildableConstructOnly | GtkConstraintTargetConstructOnly;
+
+export interface FoundryDiagnosticsGutterRendererProps extends GtkSourceGutterRendererProps, GtkAccessibleProps, GtkBuildableProps, GtkConstraintTargetProps {
+    diagnostics?: Foundry.OnTypeDiagnostics;
+}
+/** Settable only at construction — a renderer must REBUILD, not patch. */
+export type FoundryDiagnosticsGutterRendererConstructOnly = GtkSourceGutterRendererConstructOnly | GtkAccessibleConstructOnly | GtkBuildableConstructOnly | GtkConstraintTargetConstructOnly;
+
+/** A widget that displays Git graph lanes for a [class@Foundry.VcsGraphEntry]. */
+export interface FoundryGitLanesProps extends GtkWidgetProps, GtkAccessibleProps, GtkBuildableProps, GtkConstraintTargetProps {
+    /**
+     * The graph entry to render.
+     * @since 1.2
+     */
+    entry?: Foundry.VcsGraphEntry;
+}
+/** Settable only at construction — a renderer must REBUILD, not patch. */
+export type FoundryGitLanesConstructOnly = GtkWidgetConstructOnly | GtkAccessibleConstructOnly | GtkBuildableConstructOnly | GtkConstraintTargetConstructOnly;
+
+export interface FoundryMarkupViewProps extends GtkWidgetProps, GtkAccessibleProps, GtkBuildableProps, GtkConstraintTargetProps {
+}
+/** Settable only at construction — a renderer must REBUILD, not patch. */
+export type FoundryMarkupViewConstructOnly = GtkWidgetConstructOnly | GtkAccessibleConstructOnly | GtkBuildableConstructOnly | GtkConstraintTargetConstructOnly;
+
+export interface FoundrySourceViewProps extends GtkSourceViewProps, GtkAccessibleProps, GtkAccessibleTextProps, GtkBuildableProps, GtkConstraintTargetProps, GtkScrollableProps {
+    document?: Foundry.TextDocument;
+    /** @default TRUE */
+    'enable-completion'?: boolean;
+    /** @default FALSE */
+    'enable-vim'?: boolean;
+    font?: Pango.FontDescription;
+    /**
+     * Specify a non-default line height for text within the editor.
+     * @default 1.000000
+     */
+    'line-height'?: number;
+    /**
+     * Shows the line changes on the left-hand side of the editor (when in LTR direction) for each line in the editor.
+     * @default FALSE
+     */
+    'show-diagnostics'?: boolean;
+    /**
+     * Shows the line changes on the left-hand side of the editor (when in LTR direction) for each line in the editor.
+     * @default FALSE
+     */
+    'show-line-changes'?: boolean;
+    /**
+     * Shows the line changes on the right-hand side of the editor (when in LTR direction) but as an overview of the entire document.
+     * @default FALSE
+     */
+    'show-line-changes-overview'?: boolean;
+}
+/** Settable only at construction — a renderer must REBUILD, not patch. */
+export type FoundrySourceViewConstructOnly = GtkSourceViewConstructOnly | GtkAccessibleConstructOnly | GtkAccessibleTextConstructOnly | GtkBuildableConstructOnly | GtkConstraintTargetConstructOnly | GtkScrollableConstructOnly | 'document';
+
+export interface FoundryTerminalProps extends GtkWidgetProps, GtkAccessibleProps, GtkAccessibleTextProps, GtkBuildableProps, GtkConstraintTargetProps, GtkScrollableProps {
+    palette?: FoundryGtk.TerminalPalette | null;
+}
+/** Settable only at construction — a renderer must REBUILD, not patch. */
+export type FoundryTerminalConstructOnly = GtkWidgetConstructOnly | GtkAccessibleConstructOnly | GtkAccessibleTextConstructOnly | GtkBuildableConstructOnly | GtkConstraintTargetConstructOnly | GtkScrollableConstructOnly;
+
+// ---------------------------------------------------------------------------
+// The GType-keyed widget map.
+//
+// Keyed by GType because that is also the GtkBuilder XML key and the typelib key. A
+// consumer maps GTypes to tags in ITS convention — kebab for JSX intrinsics, Pascal
+// for a Vue `GlobalComponents`, the class itself for a renderer whose element type
+// is the class. None of those is baked in here.
+//
+// `slotCandidates` is a candidate list and never an answer: derived from methods
+// taking exactly one widget argument. The GIR cannot tell adoption from reference —
+// `set_title_widget` parents its argument and `set_activatable_widget` does not, and
+// both are `void f(GtkWidget*)` at `transfer-ownership="none"`. Curation decides;
+// this is what notices when a release adds a candidate.
+// ---------------------------------------------------------------------------
+
+export interface Widgets {
+    FoundryChangesGutterRenderer: {
+        class: FoundryGtk.ChangesGutterRenderer;
+        props: FoundryChangesGutterRendererProps;
+        signals: FoundryGtk.ChangesGutterRenderer.SignalSignatures;
+        constructOnly: FoundryChangesGutterRendererConstructOnly;
+        slotCandidates: {};
+    };
+    FoundryDiagnosticsGutterRenderer: {
+        class: FoundryGtk.DiagnosticsGutterRenderer;
+        props: FoundryDiagnosticsGutterRendererProps;
+        signals: FoundryGtk.DiagnosticsGutterRenderer.SignalSignatures;
+        constructOnly: FoundryDiagnosticsGutterRendererConstructOnly;
+        slotCandidates: {};
+    };
+    FoundryGitLanes: {
+        class: FoundryGtk.GitLanes;
+        props: FoundryGitLanesProps;
+        signals: FoundryGtk.GitLanes.SignalSignatures;
+        constructOnly: FoundryGitLanesConstructOnly;
+        slotCandidates: {};
+    };
+    FoundryMarkupView: {
+        class: FoundryGtk.MarkupView;
+        props: FoundryMarkupViewProps;
+        signals: FoundryGtk.MarkupView.SignalSignatures;
+        constructOnly: FoundryMarkupViewConstructOnly;
+        slotCandidates: {};
+    };
+    FoundrySourceView: {
+        class: FoundryGtk.SourceView;
+        props: FoundrySourceViewProps;
+        signals: FoundryGtk.SourceView.SignalSignatures;
+        constructOnly: FoundrySourceViewConstructOnly;
+        slotCandidates: {};
+    };
+    FoundryTerminal: {
+        class: FoundryGtk.Terminal;
+        props: FoundryTerminalProps;
+        signals: FoundryGtk.Terminal.SignalSignatures;
+        constructOnly: FoundryTerminalConstructOnly;
+        slotCandidates: {};
+    };
+}
+
+/** Every GType this namespace can create. A consumer derives its own tag map. */
+export type WidgetGType = keyof Widgets;
+
+// ---------------------------------------------------------------------------
+// Child holders — the same shape, for objects that CARRY a widget without being one.
+//
+// `GtkListItem`, `GtkListHeader`, `GtkColumnViewCell` and `AdwToggle` descend from
+// `GObject.Object` and hold a widget through `set_child`/`get_child`. A renderer places
+// them exactly like a container, so they belong in the vocabulary; a check asking "is
+// this a widget" must still be able to say no. Hence a sibling table rather than four
+// more rows in `Widgets`: concatenate them when you mean both.
+// ---------------------------------------------------------------------------
+
+export interface ChildHolders {
+
+}
+
+/** Every GType this namespace holds a child in without it being a widget. */
+export type ChildHolderGType = keyof ChildHolders;
+
+/** The writable, optional, GObject-keyed property surface of one GType. */
+export type PropsOf<G extends WidgetGType> = Widgets[G]['props'];
+
+/** The signal table this package already emits, reached by GType. */
+export type SignalsOf<G extends WidgetGType> = Widgets[G]['signals'];
+
+/** The instance type — what a `ref`-shaped prop should infer. */
+export type InstanceOf<G extends WidgetGType> = Widgets[G]['class'];
+
+/** Property names that can only be set at construction. */
+export type ConstructOnlyOf<G extends WidgetGType> = Widgets[G]['constructOnly'];
+
+/** Candidate child slots — see the note above; curation decides. */
+export type SlotCandidatesOf<G extends WidgetGType> = keyof Widgets[G]['slotCandidates'];
+
+/**
+ * The same facts as runtime data, for a consumer that CHECKS them.
+ *
+ * Types are erased, so a spec that asks the installed GTK whether every property
+ * here is a writable ParamSpec, every signal resolvable by `GObject.signal_lookup`
+ * and every nick resolvable through an enum lookup cannot read the interfaces
+ * above. Emitted headlessly with no GTK present, which is exactly why the checking
+ * belongs to the consumer and the DATA belongs here.
+ */
+export const PROVENANCE: {
+    readonly namespace: string;
+    readonly version: string;
+    /** The version the LIBRARY states, or null where it states none. Never the namespace's. */
+    readonly libraryVersion: string | null;
+    readonly childHolders: number;
+    readonly droppedBases: readonly string[];
+    readonly inlinedBases: readonly string[];
+    readonly unsettableProps: readonly string[];
+};
+
+/** Declaration GType -> its own settable properties, as GObject registered them. */
+export const OWN_PROPS: Readonly<Record<string, readonly string[]>>;
+
+/**
+ * Declaration GType -> the signals it registers itself, never its parents'.
+ *
+ * Keyed like `OWN_PROPS`, so both are read at every link of a `DECLS` chain. An
+ * abstract base has no `Widgets` row and still owns signals — `GtkWidget` owns 13.
+ */
+export const OWN_SIGNALS: Readonly<Record<string, readonly string[]>>;
+
+/** Widget GType -> every declaration its members come from, self first. */
+export const DECLS: Readonly<Record<string, readonly string[]>>;
+
+/** The GTypes in `DECLS` that hold a widget without being one — see `ChildHolders`. */
+export const CHILD_HOLDERS: readonly string[];
+
+/** Enum GType -> the nicks this surface offers. */
+export const ENUM_NICKS: Readonly<Record<string, readonly string[]>>;
+
+/** Widget GType -> slot name -> the method that may adopt a child there. */
+export const SLOT_CANDIDATES: Readonly<Record<string, Readonly<Record<string, string>>>>;
+
+/**
+ * `Type`, `Type.property` and `Type::signal` -> the release that introduced it.
+ *
+ * What keeps a runtime cross-check honest across a version gap without an
+ * allowlist: a name the installed library lacks is a defect UNLESS the version
+ * here is newer than the one running.
+ *
+ * ALL THREE key shapes, because that test only works for the names it covers. A
+ * property-only map leaves a consumer no way to explain a missing SIGNAL, which is
+ * a correct vocabulary reported as 18 defects; a member-only map leaves it no way to
+ * explain a missing CLASS, and that one fails as a bare
+ * `TypeError: can't access property "$gtype", ctor() is undefined` that does not
+ * even name the GType.
+ *
+ * A key is present only where the GIR states a version — sparse by nature (`version`
+ * sits on 29 of the 301 classes and interfaces in Gtk-4.0), never inferred.
+ */
+export const SINCE: Readonly<Record<string, string>>;

package/foundrygtk-1-vocabulary.js

@@ -0,0 +1,51 @@
+// The widget vocabulary of FoundryGtk-1 as runtime data.
+//
+// GENERATED — do not edit. Provenance: FoundryGtk-1 — dropped empty base(s): GObject.InitiallyUnowned GObject.Object
+//
+// The type half of this subpath is the sibling `.d.ts`. This file exists because
+// types are erased: a consumer that wants to ask the installed library whether every
+// name here is real needs values, not declarations.
+
+export const PROVENANCE = {
+    namespace: 'FoundryGtk',
+    version: '1',
+    libraryVersion: null,
+    childHolders: 0,
+    droppedBases: ['GObject.InitiallyUnowned', 'GObject.Object'],
+    inlinedBases: [],
+    unsettableProps: [],
+};
+
+export const OWN_PROPS = {
+    FoundryChangesGutterRenderer: ['show-overview'],
+    FoundryDiagnosticsGutterRenderer: ['diagnostics'],
+    FoundryGitLanes: ['entry'],
+    FoundrySourceView: ['document', 'enable-completion', 'enable-vim', 'font', 'line-height', 'show-diagnostics', 'show-line-changes', 'show-line-changes-overview'],
+    FoundryTerminal: ['palette'],
+};
+
+export const OWN_SIGNALS = {};
+
+export const DECLS = {
+    FoundryChangesGutterRenderer: ['FoundryChangesGutterRenderer', 'GtkSourceGutterRenderer', 'GtkWidget', 'GtkAccessible', 'GtkBuildable', 'GtkConstraintTarget'],
+    FoundryDiagnosticsGutterRenderer: ['FoundryDiagnosticsGutterRenderer', 'GtkSourceGutterRenderer', 'GtkWidget', 'GtkAccessible', 'GtkBuildable', 'GtkConstraintTarget'],
+    FoundryGitLanes: ['FoundryGitLanes', 'GtkWidget', 'GtkAccessible', 'GtkBuildable', 'GtkConstraintTarget'],
+    FoundryMarkupView: ['FoundryMarkupView', 'GtkWidget', 'GtkAccessible', 'GtkBuildable', 'GtkConstraintTarget'],
+    FoundrySourceView: ['FoundrySourceView', 'GtkSourceView', 'GtkTextView', 'GtkWidget', 'GtkAccessible', 'GtkAccessibleText', 'GtkBuildable', 'GtkConstraintTarget', 'GtkScrollable'],
+    FoundryTerminal: ['FoundryTerminal', 'GtkWidget', 'GtkAccessible', 'GtkAccessibleText', 'GtkBuildable', 'GtkConstraintTarget', 'GtkScrollable'],
+};
+
+// The GTypes above that are NOT widgets: they hold one through `set_child`/`get_child`
+// and descend from `GObject.Object`. A renderer places them like a container; a check
+// asking "is this a widget" must not count them. Derived from the accessor pair, never
+// from a list — the count is in the provenance line above.
+export const CHILD_HOLDERS = [];
+
+export const ENUM_NICKS = {};
+
+export const SLOT_CANDIDATES = {};
+
+export const SINCE = {
+    'FoundryGitLanes': '1.2',
+    'FoundryGitLanes.entry': '1.2',
+};

package/foundrygtk-1.d.ts

@@ -1273,6 +1273,7 @@ export namespace FoundryGtk {
         // Methods
         /**
          * @param filename 
+         * @throws GLib.Error
          */
         add_filename(filename: string): number;
 
@@ -1280,6 +1281,7 @@ export namespace FoundryGtk {
          * @param resource 
          * @returns the merge id
          * @since 1.4
+         * @throws GLib.Error
          */
         add_resource(resource: string): number;
 
@@ -1414,7 +1416,7 @@ export namespace FoundryGtk {
 
     namespace ShortcutBundle {
         // Signal signatures
-        interface SignalSignatures extends GObject.Object.SignalSignatures {}
+        interface SignalSignatures extends GObject.Object.SignalSignatures, Gio.ListModel.SignalSignatures {}
 
         // Constructor properties interface
         interface ConstructorProps<A extends GObject.Object = GObject.Object> extends GObject.Object.ConstructorProps, Gio.ListModel.ConstructorProps {}
@@ -1463,6 +1465,7 @@ export namespace FoundryGtk {
         /**
          * @param shortcut_id 
          * @param accelerator 
+         * @throws GLib.Error
          */
         override(shortcut_id: string, accelerator: string): boolean;
 
@@ -1473,6 +1476,7 @@ export namespace FoundryGtk {
 
         /**
          * @param file 
+         * @throws GLib.Error
          */
         parse(file: Gio.File): boolean;
 
@@ -1591,7 +1595,7 @@ export namespace FoundryGtk {
 
     namespace ShortcutManager {
         // Signal signatures
-        interface SignalSignatures extends Foundry.Service.SignalSignatures {
+        interface SignalSignatures extends Foundry.Service.SignalSignatures, Gio.ListModel.SignalSignatures {
             "notify::context": (pspec: GObject.ParamSpec) => void;
         }
 
@@ -1782,7 +1786,7 @@ export namespace FoundryGtk {
              * @detailed
              * @run-last
              */
-            "accel-changed": (arg0: string, arg1: string | null) => void;
+            "accel-changed": (action: string, accel: string | null) => void;
             "notify::model": (pspec: GObject.ParamSpec) => void;
             /**
              * This signal is emitted when an action is determined to have been changed
@@ -1791,8 +1795,8 @@ export namespace FoundryGtk {
              * @detailed
              * @run-last
              */
-            "accel-changed::model": (arg0: string, arg1: string | null) => void;
-            [key: `accel-changed::${string}`]: (arg0: string, arg1: string | null) => void;
+            "accel-changed::model": (action: string, accel: string | null) => void;
+            [key: `accel-changed::${string}`]: (action: string, accel: string | null) => void;
         }
 
         // Constructor properties interface

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@girs/foundrygtk-1",
-    "version": "4.4.0",
+    "version": "4.6.0",
     "description": "GJS TypeScript type definitions for FoundryGtk-1",
     "type": "module",
     "module": "foundrygtk-1.js",
@@ -16,10 +16,10 @@
         "import": "./foundrygtk-1-import.js",
         "default": "./foundrygtk-1-import.js"
       },
-      "./surface": {
-        "types": "./foundrygtk-1-surface.d.ts",
-        "import": "./foundrygtk-1-surface.js",
-        "default": "./foundrygtk-1-surface.js"
+      "./vocabulary": {
+        "types": "./foundrygtk-1-vocabulary.d.ts",
+        "import": "./foundrygtk-1-vocabulary.js",
+        "default": "./foundrygtk-1-vocabulary.js"
       },
       "./foundrygtk-1": {
         "types": "./foundrygtk-1.d.ts",
@@ -36,27 +36,27 @@
       "test": "tsc --project tsconfig.json"
     },
     "dependencies": {
-      "@girs/gjs": "^4.4.0",
-      "@girs/peas-2": "^4.4.0",
-      "@girs/gio-2.0": "^4.4.0",
-      "@girs/gobject-2.0": "^4.4.0",
-      "@girs/glib-2.0": "^4.4.0",
-      "@girs/gmodule-2.0": "^4.4.0",
-      "@girs/json-1.0": "^4.4.0",
-      "@girs/gtksource-5": "^4.4.0",
-      "@girs/gtk-4.0": "^4.4.0",
-      "@girs/gsk-4.0": "^4.4.0",
-      "@girs/graphene-1.0": "^4.4.0",
-      "@girs/gdk-4.0": "^4.4.0",
-      "@girs/cairo-1.0": "^4.4.0",
-      "@girs/pangocairo-1.0": "^4.4.0",
-      "@girs/pango-1.0": "^4.4.0",
-      "@girs/harfbuzz-0.0": "^4.4.0",
-      "@girs/freetype2-2.0": "^4.4.0",
-      "@girs/gdkpixbuf-2.0": "^4.4.0",
-      "@girs/foundry-1": "^4.4.0",
-      "@girs/dex-1": "^4.4.0",
-      "@girs/giounix-2.0": "^4.4.0"    },
+      "@girs/gjs": "^4.6.0",
+      "@girs/peas-2": "^4.6.0",
+      "@girs/gio-2.0": "^4.6.0",
+      "@girs/gobject-2.0": "^4.6.0",
+      "@girs/glib-2.0": "^4.6.0",
+      "@girs/gmodule-2.0": "^4.6.0",
+      "@girs/json-1.0": "^4.6.0",
+      "@girs/gtksource-5": "^4.6.0",
+      "@girs/gtk-4.0": "^4.6.0",
+      "@girs/gsk-4.0": "^4.6.0",
+      "@girs/graphene-1.0": "^4.6.0",
+      "@girs/gdk-4.0": "^4.6.0",
+      "@girs/cairo-1.0": "^4.6.0",
+      "@girs/pangocairo-1.0": "^4.6.0",
+      "@girs/pango-1.0": "^4.6.0",
+      "@girs/harfbuzz-0.0": "^4.6.0",
+      "@girs/freetype2-2.0": "^4.6.0",
+      "@girs/gdkpixbuf-2.0": "^4.6.0",
+      "@girs/foundry-1": "^4.6.0",
+      "@girs/dex-1": "^4.6.0",
+      "@girs/giounix-2.0": "^4.6.0"    },
     "devDependencies": {
       "typescript": "*"
     },

package/tsconfig.json

@@ -83,7 +83,7 @@
       ]
 }
   },
-  "include": ["./foundrygtk-1.d.ts","./foundrygtk-1-surface.d.ts"]
+  "include": ["./foundrygtk-1.d.ts","./foundrygtk-1-vocabulary.d.ts"]
 }