@girs/gtksource-4 4.4.0 → 4.6.0

package/README.md

@@ -4,82 +4,96 @@
 ![version](https://img.shields.io/npm/v/@girs/gtksource-4)
 ![downloads/week](https://img.shields.io/npm/dw/@girs/gtksource-4)
 
+GJS TypeScript type definitions for GtkSource-4 using [ts-for-gir](https://github.com/gjsify/ts-for-gir) v4.6.0.
 
-GJS TypeScript type definitions for GtkSource-4 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/gtksource-4
 ```
 
-## Usage
+Any package manager works. The package has no dependencies beyond other `@girs/*`
+type packages.
+
+## What it exports
+
+| Import | What you get |
+|---|---|
+| `@girs/gtksource-4` | the namespace as a default export, plus the ambient and global declarations |
+| `@girs/gtksource-4/ambient` | only the `gi://` module declarations |
+| `@girs/gtksource-4/import` | only the `imports.gi` declarations |
+| `@girs/gtksource-4/gtksource-4` | the namespace, without the side-effecting declarations |
+| `@girs/gtksource-4/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 GtkSource from '@girs/gtksource-4';
 ```
 
-### 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/gtksource-4` or `@girs/gtksource-4/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/gtksource-4'
+import '@girs/gtksource-4';
 ```
 
-`tsconfig.json`:
 ```json
-{
-  "compilerOptions": {
-    ...
-  },
-  "include": ["@girs/gtksource-4"],
-  ...
-}
+{ "include": ["@girs/gtksource-4"] }
 ```
 
-The ambient module now resolves with types:
+Then the runtime spelling type-checks:
 
 ```ts
 import GtkSource from 'gi://GtkSource?version=4';
 ```
 
-### Global import
+Referencing `@girs/gtksource-4/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/gtksource-4` or `@girs/gtksource-4/import` in your `tsconfig` or entry point Typescript file:
+GJS's global object works the same way, via `@girs/gtksource-4/import`:
 
-`index.ts`:
 ```ts
-import '@girs/gtksource-4'
+const GtkSource = imports.gi.GtkSource;
 ```
 
-`tsconfig.json`:
-```json
-{
-  "compilerOptions": {
-    ...
-  },
-  "include": ["@girs/gtksource-4"],
-  ...
-}
-```
+## Widget vocabulary
 
-That form carries types as well:
+`gtksource-4` declares widgets, so it also carries what the GIR says about them, as
+types and as values a test can read:
 
 ```ts
-const GtkSource = imports.gi.GtkSource;
+import type { Widgets, PropsOf } from '@girs/gtksource-4/vocabulary';
+import { OWN_PROPS, ENUM_NICKS, PROVENANCE } from '@girs/gtksource-4/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/gtksource-4-vocabulary.d.ts

@@ -0,0 +1,303 @@
+/**
+ * The GIR-derived widget VOCABULARY for GtkSource-4.
+ *
+ * GENERATED — do not edit. Provenance: GtkSource-4 — dropped empty base(s): GObject.InitiallyUnowned GObject.Object Atk.ImplementorIface
+ *
+ * 5 concrete widgets, 6 declarations, 8 enum nick unions, 1 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 GtkSource from './gtksource-4.js';
+import type Pango from '@girs/pango-1.0';
+import type { GtkActionableConstructOnly, GtkActionableProps, GtkActivatableConstructOnly, GtkActivatableProps, GtkBinConstructOnly, GtkBinProps, GtkBuildableConstructOnly, GtkBuildableProps, GtkButtonConstructOnly, GtkButtonProps, GtkContainerConstructOnly, GtkContainerProps, GtkScrollableConstructOnly, GtkScrollableProps, GtkTextViewConstructOnly, GtkTextViewProps, GtkWidgetConstructOnly, GtkWidgetProps, GtkWindowConstructOnly, GtkWindowProps } from '@girs/gtk-3.0/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.
+// ---------------------------------------------------------------------------
+
+export type GtkSourceBackgroundPatternTypeNick = 'none' | 'grid';
+export type GtkSourceBracketMatchTypeNick = 'none' | 'out-of-range' | 'not-found' | 'found';
+export type GtkSourceChangeCaseTypeNick = 'lower' | 'upper' | 'toggle' | 'title';
+export type GtkSourceCompressionTypeNick = 'none' | 'gzip';
+export type GtkSourceGutterRendererAlignmentModeNick = 'cell' | 'first' | 'last';
+export type GtkSourceNewlineTypeNick = 'lf' | 'cr' | 'cr-lf';
+export type GtkSourceSmartHomeEndTypeNick = 'disabled' | 'before' | 'after' | 'always';
+export type GtkSourceViewGutterPositionNick = 'lines' | 'marks';
+
+// ---------------------------------------------------------------------------
+// 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 GtkSourceCompletionInfoProps extends GtkWindowProps, GtkBuildableProps {
+}
+/** Settable only at construction — a renderer must REBUILD, not patch. */
+export type GtkSourceCompletionInfoConstructOnly = GtkWindowConstructOnly | GtkBuildableConstructOnly;
+
+export interface GtkSourceMapProps extends GtkSourceViewProps, GtkBuildableProps, GtkScrollableProps {
+    'font-desc'?: Pango.FontDescription;
+    view?: GtkSource.View | null;
+}
+/** Settable only at construction — a renderer must REBUILD, not patch. */
+export type GtkSourceMapConstructOnly = GtkSourceViewConstructOnly | GtkBuildableConstructOnly | GtkScrollableConstructOnly;
+
+export interface GtkSourceStyleSchemeChooserProps {
+    /**
+     * The :style-scheme property contains the currently selected style scheme.
+     * @since 3.16
+     */
+    'style-scheme'?: GtkSource.StyleScheme;
+}
+/** Settable only at construction — a renderer must REBUILD, not patch. */
+export type GtkSourceStyleSchemeChooserConstructOnly = never;
+
+export interface GtkSourceStyleSchemeChooserButtonProps extends GtkButtonProps, GtkActionableProps, GtkActivatableProps, GtkBuildableProps, GtkSourceStyleSchemeChooserProps {
+}
+/** Settable only at construction — a renderer must REBUILD, not patch. */
+export type GtkSourceStyleSchemeChooserButtonConstructOnly = GtkButtonConstructOnly | GtkActionableConstructOnly | GtkActivatableConstructOnly | GtkBuildableConstructOnly | GtkSourceStyleSchemeChooserConstructOnly;
+
+export interface GtkSourceStyleSchemeChooserWidgetProps extends GtkBinProps, GtkBuildableProps, GtkSourceStyleSchemeChooserProps {
+}
+/** Settable only at construction — a renderer must REBUILD, not patch. */
+export type GtkSourceStyleSchemeChooserWidgetConstructOnly = GtkBinConstructOnly | GtkBuildableConstructOnly | GtkSourceStyleSchemeChooserConstructOnly;
+
+export interface GtkSourceViewProps extends GtkTextViewProps, GtkBuildableProps, GtkScrollableProps {
+    /** @default FALSE */
+    'auto-indent'?: boolean;
+    /**
+     * Draw a specific background pattern on the view.
+     * @since 3.16
+     * @default GTK_SOURCE_BACKGROUND_PATTERN_TYPE_NONE
+     */
+    'background-pattern'?: GtkSourceBackgroundPatternTypeNick | GtkSource.BackgroundPatternType;
+    /** @default FALSE */
+    'highlight-current-line'?: boolean;
+    /** @default TRUE */
+    'indent-on-tab'?: boolean;
+    /**
+     * Width of an indentation step expressed in number of spaces.
+     * @default -1
+     */
+    'indent-width'?: number;
+    /** @default FALSE */
+    'insert-spaces-instead-of-tabs'?: boolean;
+    /**
+     * Position of the right margin.
+     * @default 80
+     */
+    'right-margin-position'?: number;
+    /**
+     * Whether to display line mark pixbufs
+     * @default FALSE
+     */
+    'show-line-marks'?: boolean;
+    /**
+     * Whether to display line numbers
+     * @default FALSE
+     */
+    'show-line-numbers'?: boolean;
+    /**
+     * Whether to display the right margin.
+     * @default FALSE
+     */
+    'show-right-margin'?: boolean;
+    /**
+     * Whether smart Backspace should be used.
+     * @since 3.18
+     * @default FALSE
+     */
+    'smart-backspace'?: boolean;
+    /**
+     * Set the behavior of the HOME and END keys.
+     * @since 2.0
+     * @default GTK_SOURCE_SMART_HOME_END_DISABLED
+     */
+    'smart-home-end'?: GtkSourceSmartHomeEndTypeNick | GtkSource.SmartHomeEndType;
+    /**
+     * Width of a tab character expressed in number of spaces.
+     * @default 8
+     */
+    'tab-width'?: number;
+}
+/** Settable only at construction — a renderer must REBUILD, not patch. */
+export type GtkSourceViewConstructOnly = GtkTextViewConstructOnly | GtkBuildableConstructOnly | 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 {
+    GtkSourceCompletionInfo: {
+        class: GtkSource.CompletionInfo;
+        props: GtkSourceCompletionInfoProps;
+        signals: GtkSource.CompletionInfo.SignalSignatures;
+        constructOnly: GtkSourceCompletionInfoConstructOnly;
+        slotCandidates: {};
+    };
+    GtkSourceMap: {
+        class: GtkSource.Map;
+        props: GtkSourceMapProps;
+        signals: GtkSource.Map.SignalSignatures;
+        constructOnly: GtkSourceMapConstructOnly;
+        slotCandidates: {
+        'view': 'set_view';
+        };
+    };
+    GtkSourceStyleSchemeChooserButton: {
+        class: GtkSource.StyleSchemeChooserButton;
+        props: GtkSourceStyleSchemeChooserButtonProps;
+        signals: GtkSource.StyleSchemeChooserButton.SignalSignatures;
+        constructOnly: GtkSourceStyleSchemeChooserButtonConstructOnly;
+        slotCandidates: {};
+    };
+    GtkSourceStyleSchemeChooserWidget: {
+        class: GtkSource.StyleSchemeChooserWidget;
+        props: GtkSourceStyleSchemeChooserWidgetProps;
+        signals: GtkSource.StyleSchemeChooserWidget.SignalSignatures;
+        constructOnly: GtkSourceStyleSchemeChooserWidgetConstructOnly;
+        slotCandidates: {};
+    };
+    GtkSourceView: {
+        class: GtkSource.View;
+        props: GtkSourceViewProps;
+        signals: GtkSource.View.SignalSignatures;
+        constructOnly: GtkSourceViewConstructOnly;
+        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/gtksource-4-vocabulary.js

@@ -0,0 +1,71 @@
+// The widget vocabulary of GtkSource-4 as runtime data.
+//
+// GENERATED — do not edit. Provenance: GtkSource-4 — dropped empty base(s): GObject.InitiallyUnowned GObject.Object Atk.ImplementorIface
+//
+// 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: 'GtkSource',
+    version: '4',
+    libraryVersion: null,
+    childHolders: 0,
+    droppedBases: ['GObject.InitiallyUnowned', 'GObject.Object', 'Atk.ImplementorIface'],
+    inlinedBases: [],
+    unsettableProps: [],
+};
+
+export const OWN_PROPS = {
+    GtkSourceMap: ['font-desc', 'view'],
+    GtkSourceStyleSchemeChooser: ['style-scheme'],
+    GtkSourceView: ['auto-indent', 'background-pattern', 'highlight-current-line', 'indent-on-tab', 'indent-width', 'insert-spaces-instead-of-tabs', 'right-margin-position', 'show-line-marks', 'show-line-numbers', 'show-right-margin', 'smart-backspace', 'smart-home-end', 'tab-width'],
+};
+
+export const OWN_SIGNALS = {
+    GtkSourceView: ['change-case', 'change-number', 'join-lines', 'line-mark-activated', 'move-lines', 'move-to-matching-bracket', 'move-words', 'redo', 'show-completion', 'smart-home-end', 'undo'],
+};
+
+export const DECLS = {
+    GtkSourceCompletionInfo: ['GtkSourceCompletionInfo', 'GtkWindow', 'GtkBin', 'GtkContainer', 'GtkWidget', 'GtkBuildable'],
+    GtkSourceMap: ['GtkSourceMap', 'GtkSourceView', 'GtkTextView', 'GtkContainer', 'GtkWidget', 'GtkBuildable', 'GtkScrollable'],
+    GtkSourceStyleSchemeChooserButton: ['GtkSourceStyleSchemeChooserButton', 'GtkButton', 'GtkBin', 'GtkContainer', 'GtkWidget', 'GtkActionable', 'GtkActivatable', 'GtkBuildable', 'GtkSourceStyleSchemeChooser'],
+    GtkSourceStyleSchemeChooserWidget: ['GtkSourceStyleSchemeChooserWidget', 'GtkBin', 'GtkContainer', 'GtkWidget', 'GtkBuildable', 'GtkSourceStyleSchemeChooser'],
+    GtkSourceView: ['GtkSourceView', 'GtkTextView', 'GtkContainer', 'GtkWidget', 'GtkBuildable', '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 = {
+    GtkSourceBackgroundPatternType: ['none', 'grid'],
+    GtkSourceBracketMatchType: ['none', 'out-of-range', 'not-found', 'found'],
+    GtkSourceChangeCaseType: ['lower', 'upper', 'toggle', 'title'],
+    GtkSourceCompressionType: ['none', 'gzip'],
+    GtkSourceGutterRendererAlignmentMode: ['cell', 'first', 'last'],
+    GtkSourceNewlineType: ['lf', 'cr', 'cr-lf'],
+    GtkSourceSmartHomeEndType: ['disabled', 'before', 'after', 'always'],
+    GtkSourceViewGutterPosition: ['lines', 'marks'],
+};
+
+export const SLOT_CANDIDATES = {
+    GtkSourceMap: {
+        'view': 'set_view',
+    },
+};
+
+export const SINCE = {
+    'GtkSourceStyleSchemeChooser.style-scheme': '3.16',
+    'GtkSourceView.background-pattern': '3.16',
+    'GtkSourceView.smart-backspace': '3.18',
+    'GtkSourceView.smart-home-end': '2.0',
+    'GtkSourceView::change-case': '3.16',
+    'GtkSourceView::change-number': '3.16',
+    'GtkSourceView::join-lines': '3.16',
+    'GtkSourceView::move-to-matching-bracket': '3.16',
+    'GtkSourceView::move-words': '3.0',
+    'GtkSourceView::smart-home-end': '3.0',
+};

package/gtksource-4.d.ts

@@ -47,11 +47,11 @@ export namespace GtkSource {
         /**
          * no pattern
          */
-        NONE,
+        NONE = 0,
         /**
          * grid pattern
          */
-        GRID,
+        GRID = 1,
     }
 
 
@@ -69,20 +69,20 @@ export namespace GtkSource {
         /**
          * there is no bracket to match.
          */
-        NONE,
+        NONE = 0,
         /**
          * matching a bracket
          *  failed because the maximum range was reached.
          */
-        OUT_OF_RANGE,
+        OUT_OF_RANGE = 1,
         /**
          * a matching bracket was not found.
          */
-        NOT_FOUND,
+        NOT_FOUND = 2,
         /**
          * a matching bracket was found.
          */
-        FOUND,
+        FOUND = 3,
     }
 
 
@@ -101,19 +101,19 @@ export namespace GtkSource {
         /**
          * change case to lowercase.
          */
-        LOWER,
+        LOWER = 0,
         /**
          * change case to uppercase.
          */
-        UPPER,
+        UPPER = 1,
         /**
          * toggle case of each character.
          */
-        TOGGLE,
+        TOGGLE = 2,
         /**
          * capitalize each word.
          */
-        TITLE,
+        TITLE = 3,
     }
 
 
@@ -161,11 +161,11 @@ export namespace GtkSource {
         /**
          * plain text.
          */
-        NONE,
+        NONE = 0,
         /**
          * gzip compression.
          */
-        GZIP,
+        GZIP = 1,
     }
 
 
@@ -246,15 +246,15 @@ export namespace GtkSource {
         /**
          * The full cell.
          */
-        CELL,
+        CELL = 0,
         /**
          * The first line.
          */
-        FIRST,
+        FIRST = 1,
         /**
          * The last line.
          */
-        LAST,
+        LAST = 2,
     }
 
 
@@ -273,16 +273,16 @@ export namespace GtkSource {
         /**
          * line feed, used on UNIX.
          */
-        LF,
+        LF = 0,
         /**
          * carriage return, used on Mac.
          */
-        CR,
+        CR = 1,
         /**
          * carriage return followed by a line feed, used
          *   on Windows.
          */
-        CR_LF,
+        CR_LF = 2,
     }
 
 
@@ -300,24 +300,24 @@ export namespace GtkSource {
         /**
          * smart-home-end disabled.
          */
-        DISABLED,
+        DISABLED = 0,
         /**
          * move to the first/last
          * non-whitespace character on the first press of the HOME/END keys and
          * to the beginning/end of the line on the second press.
          */
-        BEFORE,
+        BEFORE = 1,
         /**
          * move to the beginning/end of the
          * line on the first press of the HOME/END keys and to the first/last
          * non-whitespace character on the second press.
          */
-        AFTER,
+        AFTER = 2,
         /**
          * always move to the first/last
          * non-whitespace character when the HOME/END keys are pressed.
          */
-        ALWAYS,
+        ALWAYS = 3,
     }
 
 
@@ -336,12 +336,12 @@ export namespace GtkSource {
          * the gutter position of the lines
          * renderer
          */
-        LINES,
+        LINES = -30,
         /**
          * the gutter position of the marks
          * renderer
          */
-        MARKS,
+        MARKS = -20,
     }
 
 
@@ -464,19 +464,19 @@ export namespace GtkSource {
         /**
          * None.
          */
-        NONE,
+        NONE = 0,
         /**
          * Interactive activation. By
          * default, it occurs on each insertion in the {@link Gtk.TextBuffer}. This can be
          * blocked temporarily with `gtk_source_completion_block_interactive()`.
          */
-        INTERACTIVE,
+        INTERACTIVE = 1,
         /**
          * User requested activation.
          * By default, it occurs when the user presses
          * <keycombo><keycap>Control</keycap><keycap>space</keycap></keycombo>.
          */
-        USER_REQUESTED,
+        USER_REQUESTED = 2,
     }
 
 
@@ -496,19 +496,19 @@ export namespace GtkSource {
         /**
          * No flags.
          */
-        NONE,
+        NONE = 0,
         /**
          * Ignore invalid characters.
          */
-        IGNORE_INVALID_CHARS,
+        IGNORE_INVALID_CHARS = 1,
         /**
          * Save file despite external modifications.
          */
-        IGNORE_MODIFICATION_TIME,
+        IGNORE_MODIFICATION_TIME = 2,
         /**
          * Create a backup before saving the file.
          */
-        CREATE_BACKUP,
+        CREATE_BACKUP = 4,
     }
 
 
@@ -526,22 +526,22 @@ export namespace GtkSource {
         /**
          * normal state
          */
-        NORMAL,
+        NORMAL = 0,
         /**
          * area in the renderer represents the
          * line on which the insert cursor is currently positioned
          */
-        CURSOR,
+        CURSOR = 1,
         /**
          * the mouse pointer is currently
          * over the activatable area of the renderer
          */
-        PRELIT,
+        PRELIT = 2,
         /**
          * area in the renderer represents
          * a line in the buffer which contains part of the selection
          */
-        SELECTED,
+        SELECTED = 4,
     }
 
 
@@ -560,19 +560,19 @@ export namespace GtkSource {
         /**
          * no flags specified
          */
-        NONE,
+        NONE = 0,
         /**
          * case sensitive sort
          */
-        CASE_SENSITIVE,
+        CASE_SENSITIVE = 1,
         /**
          * sort in reverse order
          */
-        REVERSE_ORDER,
+        REVERSE_ORDER = 2,
         /**
          * remove duplicates
          */
-        REMOVE_DUPLICATES,
+        REMOVE_DUPLICATES = 4,
     }
 
 
@@ -595,24 +595,24 @@ export namespace GtkSource {
         /**
          * No flags.
          */
-        NONE,
+        NONE = 0,
         /**
          * Leading white spaces on a line, i.e. the
          *   indentation.
          */
-        LEADING,
+        LEADING = 1,
         /**
          * White spaces inside a line of text.
          */
-        INSIDE_TEXT,
+        INSIDE_TEXT = 2,
         /**
          * Trailing white spaces on a line.
          */
-        TRAILING,
+        TRAILING = 4,
         /**
          * White spaces anywhere.
          */
-        ALL,
+        ALL = 7,
     }
 
 
@@ -632,29 +632,29 @@ export namespace GtkSource {
         /**
          * No flags.
          */
-        NONE,
+        NONE = 0,
         /**
          * Space character.
          */
-        SPACE,
+        SPACE = 1,
         /**
          * Tab character.
          */
-        TAB,
+        TAB = 2,
         /**
          * Line break character. If the
          *   {@link GtkSource.Buffer.implicit_trailing_newline} property is `true`,
          *   {@link GtkSource.SpaceDrawer} also draws a line break at the end of the buffer.
          */
-        NEWLINE,
+        NEWLINE = 4,
         /**
          * Non-breaking space character.
          */
-        NBSP,
+        NBSP = 8,
         /**
          * All white spaces.
          */
-        ALL,
+        ALL = 15,
     }
 
 
@@ -674,7 +674,7 @@ export namespace GtkSource {
              * @since 2.12
              * @run-last
              */
-            "bracket-matched": (arg0: Gtk.TextIter | null, arg1: BracketMatchType) => void;
+            "bracket-matched": (iter: Gtk.TextIter | null, state: BracketMatchType) => void;
             /**
              * The ::highlight-updated signal is emitted when the syntax
              * highlighting and [context classes][context-classes] are updated in a
@@ -682,7 +682,7 @@ export namespace GtkSource {
              * @signal
              * @run-last
              */
-            "highlight-updated": (arg0: Gtk.TextIter, arg1: Gtk.TextIter) => void;
+            "highlight-updated": (start: Gtk.TextIter, end: Gtk.TextIter) => void;
             /**
              * The ::redo signal is emitted to redo the last undo operation.
              * @signal
@@ -695,7 +695,7 @@ export namespace GtkSource {
              * @signal
              * @run-last
              */
-            "source-mark-updated": (arg0: Gtk.TextMark) => void;
+            "source-mark-updated": (mark: Gtk.TextMark) => void;
             /**
              * The ::undo signal is emitted to undo the last user action which
              * modified the buffer.
@@ -1312,7 +1312,7 @@ export namespace GtkSource {
              * @action
              * @run-last
              */
-            "move-cursor": (arg0: Gtk.ScrollStep, arg1: number) => void;
+            "move-cursor": (step: Gtk.ScrollStep, num: number) => void;
             /**
              * The {@link GtkSource.Completion.SignalSignatures.move_page | GtkSource.Completion::move-page} signal is a keybinding
              * signal which gets emitted when the user initiates a page
@@ -1337,7 +1337,7 @@ export namespace GtkSource {
              * @action
              * @run-last
              */
-            "move-page": (arg0: Gtk.ScrollStep, arg1: number) => void;
+            "move-page": (step: Gtk.ScrollStep, num: number) => void;
             /**
              * Emitted just before starting to populate the completion with providers.
              * You can use this signal to add additional attributes in the context.
@@ -1345,7 +1345,7 @@ export namespace GtkSource {
              * @action
              * @run-last
              */
-            "populate-context": (arg0: CompletionContext) => void;
+            "populate-context": (context: CompletionContext) => void;
             /**
              * Emitted when the completion window is shown. The default handler
              * will actually show the window.
@@ -1612,6 +1612,7 @@ export namespace GtkSource {
          * no longer need it.
          * @param provider a {@link GtkSource.CompletionProvider}.
          * @returns `true` if `provider` was successfully added, otherwise if `error`          is provided, it will be set with the error and `false` is returned.
+         * @throws GLib.Error
          */
         add_provider(provider: CompletionProvider): boolean;
 
@@ -1666,6 +1667,7 @@ export namespace GtkSource {
          * Remove `provider` from the completion.
          * @param provider a {@link GtkSource.CompletionProvider}.
          * @returns `true` if `provider` was successfully removed, otherwise if `error`          is provided, it will be set with the error and `false` is returned.
+         * @throws GLib.Error
          */
         remove_provider(provider: CompletionProvider): boolean;
 
@@ -2149,7 +2151,7 @@ export namespace GtkSource {
 
     namespace CompletionItem {
         // Signal signatures
-        interface SignalSignatures extends GObject.Object.SignalSignatures {
+        interface SignalSignatures extends GObject.Object.SignalSignatures, CompletionProposal.SignalSignatures {
             "notify::gicon": (pspec: GObject.ParamSpec) => void;
             "notify::icon": (pspec: GObject.ParamSpec) => void;
             "notify::icon-name": (pspec: GObject.ParamSpec) => void;
@@ -3299,6 +3301,7 @@ export namespace GtkSource {
          * @param result a {@link Gio.AsyncResult}.
          * @returns whether the contents has been loaded successfully.
          * @since 3.14
+         * @throws GLib.Error
          */
         load_finish(result: Gio.AsyncResult): boolean;
 
@@ -3546,6 +3549,7 @@ export namespace GtkSource {
          * @param result a {@link Gio.AsyncResult}.
          * @returns whether the file was saved successfully.
          * @since 3.14
+         * @throws GLib.Error
          */
         save_finish(result: Gio.AsyncResult): boolean;
 
@@ -3715,14 +3719,14 @@ export namespace GtkSource {
              * @signal
              * @run-last
              */
-            activate: (arg0: Gtk.TextIter, arg1: Gdk.Rectangle, arg2: Gdk.Event) => void;
+            activate: (iter: Gtk.TextIter, area: Gdk.Rectangle, event: Gdk.Event) => void;
             /**
              * The ::query-activatable signal is emitted when the renderer
              * can possibly be activated.
              * @signal
              * @run-last
              */
-            "query-activatable": (arg0: Gtk.TextIter, arg1: Gdk.Rectangle, arg2: Gdk.Event) => boolean | void;
+            "query-activatable": (iter: Gtk.TextIter, area: Gdk.Rectangle, event: Gdk.Event) => boolean | void;
             /**
              * The ::query-data signal is emitted when the renderer needs
              * to be filled with data just before a cell is drawn. This can
@@ -3731,14 +3735,14 @@ export namespace GtkSource {
              * @signal
              * @run-last
              */
-            "query-data": (arg0: Gtk.TextIter, arg1: Gtk.TextIter, arg2: GutterRendererState) => void;
+            "query-data": (start: Gtk.TextIter, end: Gtk.TextIter, state: GutterRendererState) => void;
             /**
              * The ::query-tooltip signal is emitted when the renderer can
              * show a tooltip.
              * @signal
              * @run-last
              */
-            "query-tooltip": (arg0: Gtk.TextIter, arg1: Gdk.Rectangle, arg2: number, arg3: number, arg4: Gtk.Tooltip) => boolean | void;
+            "query-tooltip": (iter: Gtk.TextIter, area: Gdk.Rectangle, x: number, y: number, tooltip: Gtk.Tooltip) => boolean | void;
             /**
              * The ::queue-draw signal is emitted when the renderer needs
              * to be redrawn. Use `gtk_source_gutter_renderer_queue_draw()`
@@ -5009,14 +5013,14 @@ export namespace GtkSource {
              * @signal
              * @run-last
              */
-            "query-tooltip-markup": (arg0: Mark) => string;
+            "query-tooltip-markup": (mark: Mark) => string;
             /**
              * The code should connect to this signal to provide a tooltip for given
              * `mark`. The tooltip should be just a plain text.
              * @signal
              * @run-last
              */
-            "query-tooltip-text": (arg0: Mark) => string;
+            "query-tooltip-text": (mark: Mark) => string;
             "notify::background": (pspec: GObject.ParamSpec) => void;
             "notify::gicon": (pspec: GObject.ParamSpec) => void;
             "notify::icon-name": (pspec: GObject.ParamSpec) => void;
@@ -6392,6 +6396,7 @@ export namespace GtkSource {
          * @param result a {@link Gio.AsyncResult}.
          * @returns whether a match was found.
          * @since 4.0
+         * @throws GLib.Error
          */
         backward_finish(result: Gio.AsyncResult): [boolean, Gtk.TextIter | null, Gtk.TextIter | null, boolean];
 
@@ -6474,6 +6479,7 @@ export namespace GtkSource {
          * @param result a {@link Gio.AsyncResult}.
          * @returns whether a match was found.
          * @since 4.0
+         * @throws GLib.Error
          */
         forward_finish(result: Gio.AsyncResult): [boolean, Gtk.TextIter | null, Gtk.TextIter | null, boolean];
 
@@ -6549,6 +6555,7 @@ export namespace GtkSource {
          * @param replace_length the length of `replace` in bytes, or -1.
          * @returns whether the match has been replaced.
          * @since 4.0
+         * @throws GLib.Error
          */
         replace(match_start: Gtk.TextIter, match_end: Gtk.TextIter, replace: string, replace_length: number): boolean;
 
@@ -6563,6 +6570,7 @@ export namespace GtkSource {
          * @param replace_length the length of `replace` in bytes, or -1.
          * @returns the number of replaced matches.
          * @since 3.10
+         * @throws GLib.Error
          */
         replace_all(replace: string, replace_length: number): number;
 
@@ -8372,7 +8380,7 @@ export namespace GtkSource {
              * @action
              * @run-last
              */
-            "change-case": (arg0: ChangeCaseType) => void;
+            "change-case": (case_type: ChangeCaseType) => void;
             /**
              * Keybinding signal to edit a number at the current cursor position.
              * @signal
@@ -8380,7 +8388,7 @@ export namespace GtkSource {
              * @action
              * @run-last
              */
-            "change-number": (arg0: number) => void;
+            "change-number": (count: number) => void;
             /**
              * Keybinding signal to join the lines currently selected.
              * @signal
@@ -8396,7 +8404,7 @@ export namespace GtkSource {
              * @signal
              * @run-last
              */
-            "line-mark-activated": (arg0: Gtk.TextIter, arg1: Gdk.Event) => void;
+            "line-mark-activated": (iter: Gtk.TextIter, event: Gdk.Event) => void;
             /**
              * The ::move-lines signal is a keybinding which gets emitted
              * when the user initiates moving a line. The default binding key
@@ -8406,7 +8414,7 @@ export namespace GtkSource {
              * @action
              * @run-last
              */
-            "move-lines": (arg0: boolean) => void;
+            "move-lines": (down: boolean) => void;
             /**
              * Keybinding signal to move the cursor to the matching bracket.
              * @signal
@@ -8414,7 +8422,7 @@ export namespace GtkSource {
              * @action
              * @run-last
              */
-            "move-to-matching-bracket": (arg0: boolean) => void;
+            "move-to-matching-bracket": (extend_selection: boolean) => void;
             /**
              * The ::move-words signal is a keybinding which gets emitted
              * when the user initiates moving a word. The default binding key
@@ -8425,7 +8433,7 @@ export namespace GtkSource {
              * @action
              * @run-last
              */
-            "move-words": (arg0: number) => void;
+            "move-words": (count: number) => void;
             /**
              * @signal
              * @action
@@ -8458,7 +8466,7 @@ export namespace GtkSource {
              * @since 3.0
              * @run-last
              */
-            "smart-home-end": (arg0: Gtk.TextIter, arg1: number) => void;
+            "smart-home-end": (iter: Gtk.TextIter, count: number) => void;
             /**
              * @signal
              * @action
@@ -9753,6 +9761,17 @@ export namespace GtkSource {
 
 
     namespace CompletionProposal {
+        // Signal signatures
+        interface SignalSignatures {
+            /**
+             * Emitted when the proposal has changed. The completion popup
+             * will react to this by updating the shown information.
+             * @signal
+             * @action
+             * @run-last
+             */
+            changed: () => void;
+        }
         /**
          * Interface for implementing CompletionProposal.
          * Contains only the virtual methods that need to be implemented.
@@ -10331,6 +10350,25 @@ export namespace GtkSource {
     };
 
     namespace UndoManager {
+        // Signal signatures
+        interface SignalSignatures {
+            /**
+             * Emitted when the ability to redo has changed.
+             * @signal
+             * @since 2.10
+             * @action
+             * @run-last
+             */
+            "can-redo-changed": () => void;
+            /**
+             * Emitted when the ability to undo has changed.
+             * @signal
+             * @since 2.10
+             * @action
+             * @run-last
+             */
+            "can-undo-changed": () => void;
+        }
         /**
          * Interface for implementing UndoManager.
          * Contains only the virtual methods that need to be implemented.

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@girs/gtksource-4",
-    "version": "4.4.0",
+    "version": "4.6.0",
     "description": "GJS TypeScript type definitions for GtkSource-4",
     "type": "module",
     "module": "gtksource-4.js",
@@ -16,10 +16,10 @@
         "import": "./gtksource-4-import.js",
         "default": "./gtksource-4-import.js"
       },
-      "./surface": {
-        "types": "./gtksource-4-surface.d.ts",
-        "import": "./gtksource-4-surface.js",
-        "default": "./gtksource-4-surface.js"
+      "./vocabulary": {
+        "types": "./gtksource-4-vocabulary.d.ts",
+        "import": "./gtksource-4-vocabulary.js",
+        "default": "./gtksource-4-vocabulary.js"
       },
       "./gtksource-4": {
         "types": "./gtksource-4.d.ts",
@@ -36,20 +36,20 @@
       "test": "tsc --project tsconfig.json"
     },
     "dependencies": {
-      "@girs/gjs": "^4.4.0",
-      "@girs/gtk-3.0": "^4.4.0",
-      "@girs/xlib-2.0": "^4.4.0",
-      "@girs/gdk-3.0": "^4.4.0",
-      "@girs/cairo-1.0": "^4.4.0",
-      "@girs/gobject-2.0": "^4.4.0",
-      "@girs/glib-2.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/gio-2.0": "^4.4.0",
-      "@girs/gmodule-2.0": "^4.4.0",
-      "@girs/gdkpixbuf-2.0": "^4.4.0",
-      "@girs/atk-1.0": "^4.4.0"    },
+      "@girs/gjs": "^4.6.0",
+      "@girs/gtk-3.0": "^4.6.0",
+      "@girs/xlib-2.0": "^4.6.0",
+      "@girs/gdk-3.0": "^4.6.0",
+      "@girs/cairo-1.0": "^4.6.0",
+      "@girs/gobject-2.0": "^4.6.0",
+      "@girs/glib-2.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/gio-2.0": "^4.6.0",
+      "@girs/gmodule-2.0": "^4.6.0",
+      "@girs/gdkpixbuf-2.0": "^4.6.0",
+      "@girs/atk-1.0": "^4.6.0"    },
     "devDependencies": {
       "typescript": "*"
     },

package/tsconfig.json

@@ -62,7 +62,7 @@
       ]
 }
   },
-  "include": ["./gtksource-4.d.ts","./gtksource-4-surface.d.ts"]
+  "include": ["./gtksource-4.d.ts","./gtksource-4-vocabulary.d.ts"]
 }