@girs/gdl-3 4.8.0 → 5.0.0

package/README.md

@@ -4,7 +4,7 @@
 ![version](https://img.shields.io/npm/v/@girs/gdl-3)
 ![downloads/week](https://img.shields.io/npm/dw/@girs/gdl-3)
 
-GJS TypeScript type definitions for Gdl-3 using [ts-for-gir](https://github.com/gjsify/ts-for-gir) v4.8.0.
+GJS TypeScript type definitions for Gdl-3 using [ts-for-gir](https://github.com/gjsify/ts-for-gir) v5.0.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.

package/gdl-3-vocabulary.d.ts

@@ -450,6 +450,27 @@ export const FLAG_VALUES: Readonly<Record<string, number>>;
 /** `<bitfield GType>.<nick>` -> the raw GIR `value` no number could be read from. */
 export const FLAG_VALUES_UNREADABLE: Readonly<Record<string, string>>;
 
+/**
+ * `<declaration GType>.<property>` -> the GType of that property's enum or bitfield.
+ *
+ * The join the value tables need and nothing else here carries. A host with no GI has a
+ * property name and a nick and needs a number; `ENUM_VALUES` is keyed by ENUM GType, and
+ * only this says which enum a property is. Keyed by DECLARATION like `OWN_PROPS`, so it is
+ * read at every link of a `DECLS` chain — `orientation` belongs to `GtkOrientable`, not
+ * to the `GtkBox` a caller starts from.
+ *
+ * Present only where the property's OWN type is the enum: an array of them, or a union that
+ * merely mentions one, would be an entry a consumer resolves wrongly.
+ *
+ * The GType named here is not always one THIS module gives numbers for. A nick vocabulary is
+ * emitted once, by the namespace that owns the enum, so `AdwComboRow.search-match-mode` names
+ * `GtkStringFilterMatchMode` and its rows are in `@girs/gtk-4.0/vocabulary` — 57 of the 438
+ * entries in a full run resolve only with the owner's vocabulary loaded beside this one. An
+ * owner with no vocabulary of its own (Gdk, Pango) is inlined here instead, so every entry
+ * resolves against SOME module.
+ */
+export const PROP_ENUMS: Readonly<Record<string, string>>;
+
 /** Widget GType -> slot name -> the method that may adopt a child there. */
 export const SLOT_CANDIDATES: Readonly<Record<string, Readonly<Record<string, string>>>>;
 

package/gdl-3-vocabulary.js

@@ -162,6 +162,29 @@ export const FLAG_VALUES = {
 // so this is the table that shape actually reaches.
 export const FLAG_VALUES_UNREADABLE = {};
 
+// Declaration GType + property name -> the GType of that property's enum or bitfield.
+//
+// Without it the value tables above are half an answer. A host with no GI knows it must set
+// `orientation` to the number behind the nick `vertical`; `ENUM_VALUES` is keyed
+// `GtkOrientation.vertical`, and nothing else says that `orientation` is a
+// `GtkOrientation`. Deriving it is not available: `never` is a member of several Gtk enums,
+// and choosing between them produces a wrong number rather than a missing one.
+//
+// Only where the property's OWN type is the enum. An array of them and a union that mentions
+// one are both entries a consumer would resolve wrongly, so neither is written.
+//
+// A GType named here has numbers in SOME vocabulary, not necessarily this one: the namespace
+// that OWNS an enum publishes it, so 57 of the 438 entries a full run emits want the owner's
+// vocabulary loaded too. Owners that emit none (Gdk, Pango) are inlined into the tables above.
+export const PROP_ENUMS = {
+    'GdlDockBar.dockbar-style': 'GdlDockBarStyle',
+    'GdlDockItem.behavior': 'GdlDockItemBehavior',
+    'GdlDockItem.orientation': 'GtkOrientation',
+    'GdlDockPlaceholder.next-placement': 'GdlDockPlacement',
+    'GdlSwitcher.switcher-style': 'GdlSwitcherStyle',
+    'GdlSwitcher.tab-pos': 'GtkPositionType',
+};
+
 export const SLOT_CANDIDATES = {
     GdlDockItem: {
         'child': 'set_child',

package/gdl-3.d.ts

@@ -538,15 +538,12 @@ export namespace Gdl {
         // Signals
         /** @signal */
         connect<K extends keyof Dock.SignalSignatures>(signal: K, callback: GObject.SignalCallback<this, Dock.SignalSignatures[K]>): number;
-        connect(signal: string, callback: (...args: any[]) => any): number;
 
         /** @signal */
         connect_after<K extends keyof Dock.SignalSignatures>(signal: K, callback: GObject.SignalCallback<this, Dock.SignalSignatures[K]>): number;
-        connect_after(signal: string, callback: (...args: any[]) => any): number;
 
         /** @signal */
-        emit<K extends keyof Dock.SignalSignatures>(signal: K, ...args: GObject.GjsParameters<Dock.SignalSignatures[K]> extends [any, ...infer Q] ? Q : never): void;
-        emit(signal: string, ...args: any[]): void;
+        emit<K extends keyof Dock.SignalSignatures>(signal: K, ...args: GObject.GjsParameters<Dock.SignalSignatures[K]>): void;
 
         // Virtual methods
         /**
@@ -754,15 +751,12 @@ export namespace Gdl {
         // Signals
         /** @signal */
         connect<K extends keyof DockBar.SignalSignatures>(signal: K, callback: GObject.SignalCallback<this, DockBar.SignalSignatures[K]>): number;
-        connect(signal: string, callback: (...args: any[]) => any): number;
 
         /** @signal */
         connect_after<K extends keyof DockBar.SignalSignatures>(signal: K, callback: GObject.SignalCallback<this, DockBar.SignalSignatures[K]>): number;
-        connect_after(signal: string, callback: (...args: any[]) => any): number;
 
         /** @signal */
-        emit<K extends keyof DockBar.SignalSignatures>(signal: K, ...args: GObject.GjsParameters<DockBar.SignalSignatures[K]> extends [any, ...infer Q] ? Q : never): void;
-        emit(signal: string, ...args: any[]): void;
+        emit<K extends keyof DockBar.SignalSignatures>(signal: K, ...args: GObject.GjsParameters<DockBar.SignalSignatures[K]>): void;
 
         // Methods
         /**
@@ -1032,15 +1026,12 @@ export namespace Gdl {
         // Signals
         /** @signal */
         connect<K extends keyof DockItem.SignalSignatures>(signal: K, callback: GObject.SignalCallback<this, DockItem.SignalSignatures[K]>): number;
-        connect(signal: string, callback: (...args: any[]) => any): number;
 
         /** @signal */
         connect_after<K extends keyof DockItem.SignalSignatures>(signal: K, callback: GObject.SignalCallback<this, DockItem.SignalSignatures[K]>): number;
-        connect_after(signal: string, callback: (...args: any[]) => any): number;
 
         /** @signal */
-        emit<K extends keyof DockItem.SignalSignatures>(signal: K, ...args: GObject.GjsParameters<DockItem.SignalSignatures[K]> extends [any, ...infer Q] ? Q : never): void;
-        emit(signal: string, ...args: any[]): void;
+        emit<K extends keyof DockItem.SignalSignatures>(signal: K, ...args: GObject.GjsParameters<DockItem.SignalSignatures[K]>): void;
 
         // Static methods
         /**
@@ -1367,15 +1358,12 @@ export namespace Gdl {
         // Signals
         /** @signal */
         connect<K extends keyof DockItemButtonImage.SignalSignatures>(signal: K, callback: GObject.SignalCallback<this, DockItemButtonImage.SignalSignatures[K]>): number;
-        connect(signal: string, callback: (...args: any[]) => any): number;
 
         /** @signal */
         connect_after<K extends keyof DockItemButtonImage.SignalSignatures>(signal: K, callback: GObject.SignalCallback<this, DockItemButtonImage.SignalSignatures[K]>): number;
-        connect_after(signal: string, callback: (...args: any[]) => any): number;
 
         /** @signal */
-        emit<K extends keyof DockItemButtonImage.SignalSignatures>(signal: K, ...args: GObject.GjsParameters<DockItemButtonImage.SignalSignatures[K]> extends [any, ...infer Q] ? Q : never): void;
-        emit(signal: string, ...args: any[]): void;
+        emit<K extends keyof DockItemButtonImage.SignalSignatures>(signal: K, ...args: GObject.GjsParameters<DockItemButtonImage.SignalSignatures[K]>): void;
 
         /**
          * Adds a child to `buildable`. `type` is an optional string
@@ -1672,15 +1660,12 @@ export namespace Gdl {
         // Signals
         /** @signal */
         connect<K extends keyof DockItemGrip.SignalSignatures>(signal: K, callback: GObject.SignalCallback<this, DockItemGrip.SignalSignatures[K]>): number;
-        connect(signal: string, callback: (...args: any[]) => any): number;
 
         /** @signal */
         connect_after<K extends keyof DockItemGrip.SignalSignatures>(signal: K, callback: GObject.SignalCallback<this, DockItemGrip.SignalSignatures[K]>): number;
-        connect_after(signal: string, callback: (...args: any[]) => any): number;
 
         /** @signal */
-        emit<K extends keyof DockItemGrip.SignalSignatures>(signal: K, ...args: GObject.GjsParameters<DockItemGrip.SignalSignatures[K]> extends [any, ...infer Q] ? Q : never): void;
-        emit(signal: string, ...args: any[]): void;
+        emit<K extends keyof DockItemGrip.SignalSignatures>(signal: K, ...args: GObject.GjsParameters<DockItemGrip.SignalSignatures[K]>): void;
 
         // Methods
         /**
@@ -1769,15 +1754,12 @@ export namespace Gdl {
         // Signals
         /** @signal */
         connect<K extends keyof DockLayout.SignalSignatures>(signal: K, callback: GObject.SignalCallback<this, DockLayout.SignalSignatures[K]>): number;
-        connect(signal: string, callback: (...args: any[]) => any): number;
 
         /** @signal */
         connect_after<K extends keyof DockLayout.SignalSignatures>(signal: K, callback: GObject.SignalCallback<this, DockLayout.SignalSignatures[K]>): number;
-        connect_after(signal: string, callback: (...args: any[]) => any): number;
 
         /** @signal */
-        emit<K extends keyof DockLayout.SignalSignatures>(signal: K, ...args: GObject.GjsParameters<DockLayout.SignalSignatures[K]> extends [any, ...infer Q] ? Q : never): void;
-        emit(signal: string, ...args: any[]): void;
+        emit<K extends keyof DockLayout.SignalSignatures>(signal: K, ...args: GObject.GjsParameters<DockLayout.SignalSignatures[K]>): void;
 
         // Methods
         /**
@@ -1975,15 +1957,12 @@ export namespace Gdl {
         // Signals
         /** @signal */
         connect<K extends keyof DockMaster.SignalSignatures>(signal: K, callback: GObject.SignalCallback<this, DockMaster.SignalSignatures[K]>): number;
-        connect(signal: string, callback: (...args: any[]) => any): number;
 
         /** @signal */
         connect_after<K extends keyof DockMaster.SignalSignatures>(signal: K, callback: GObject.SignalCallback<this, DockMaster.SignalSignatures[K]>): number;
-        connect_after(signal: string, callback: (...args: any[]) => any): number;
 
         /** @signal */
-        emit<K extends keyof DockMaster.SignalSignatures>(signal: K, ...args: GObject.GjsParameters<DockMaster.SignalSignatures[K]> extends [any, ...infer Q] ? Q : never): void;
-        emit(signal: string, ...args: any[]): void;
+        emit<K extends keyof DockMaster.SignalSignatures>(signal: K, ...args: GObject.GjsParameters<DockMaster.SignalSignatures[K]>): void;
 
         // Virtual methods
         /**
@@ -2147,15 +2126,12 @@ export namespace Gdl {
         // Signals
         /** @signal */
         connect<K extends keyof DockNotebook.SignalSignatures>(signal: K, callback: GObject.SignalCallback<this, DockNotebook.SignalSignatures[K]>): number;
-        connect(signal: string, callback: (...args: any[]) => any): number;
 
         /** @signal */
         connect_after<K extends keyof DockNotebook.SignalSignatures>(signal: K, callback: GObject.SignalCallback<this, DockNotebook.SignalSignatures[K]>): number;
-        connect_after(signal: string, callback: (...args: any[]) => any): number;
 
         /** @signal */
-        emit<K extends keyof DockNotebook.SignalSignatures>(signal: K, ...args: GObject.GjsParameters<DockNotebook.SignalSignatures[K]> extends [any, ...infer Q] ? Q : never): void;
-        emit(signal: string, ...args: any[]): void;
+        emit<K extends keyof DockNotebook.SignalSignatures>(signal: K, ...args: GObject.GjsParameters<DockNotebook.SignalSignatures[K]>): void;
     }
 
 
@@ -2322,15 +2298,12 @@ export namespace Gdl {
         // Signals
         /** @signal */
         connect<K extends keyof DockObject.SignalSignatures>(signal: K, callback: GObject.SignalCallback<this, DockObject.SignalSignatures[K]>): number;
-        connect(signal: string, callback: (...args: any[]) => any): number;
 
         /** @signal */
         connect_after<K extends keyof DockObject.SignalSignatures>(signal: K, callback: GObject.SignalCallback<this, DockObject.SignalSignatures[K]>): number;
-        connect_after(signal: string, callback: (...args: any[]) => any): number;
 
         /** @signal */
-        emit<K extends keyof DockObject.SignalSignatures>(signal: K, ...args: GObject.GjsParameters<DockObject.SignalSignatures[K]> extends [any, ...infer Q] ? Q : never): void;
-        emit(signal: string, ...args: any[]): void;
+        emit<K extends keyof DockObject.SignalSignatures>(signal: K, ...args: GObject.GjsParameters<DockObject.SignalSignatures[K]>): void;
 
         // Static methods
         /**
@@ -2757,15 +2730,12 @@ export namespace Gdl {
         // Signals
         /** @signal */
         connect<K extends keyof DockPaned.SignalSignatures>(signal: K, callback: GObject.SignalCallback<this, DockPaned.SignalSignatures[K]>): number;
-        connect(signal: string, callback: (...args: any[]) => any): number;
 
         /** @signal */
         connect_after<K extends keyof DockPaned.SignalSignatures>(signal: K, callback: GObject.SignalCallback<this, DockPaned.SignalSignatures[K]>): number;
-        connect_after(signal: string, callback: (...args: any[]) => any): number;
 
         /** @signal */
-        emit<K extends keyof DockPaned.SignalSignatures>(signal: K, ...args: GObject.GjsParameters<DockPaned.SignalSignatures[K]> extends [any, ...infer Q] ? Q : never): void;
-        emit(signal: string, ...args: any[]): void;
+        emit<K extends keyof DockPaned.SignalSignatures>(signal: K, ...args: GObject.GjsParameters<DockPaned.SignalSignatures[K]>): void;
     }
 
 
@@ -2786,15 +2756,12 @@ export namespace Gdl {
         // Signals
         /** @signal */
         connect<K extends keyof DockParam.SignalSignatures>(signal: K, callback: GObject.SignalCallback<this, DockParam.SignalSignatures[K]>): number;
-        connect(signal: string, callback: (...args: any[]) => any): number;
 
         /** @signal */
         connect_after<K extends keyof DockParam.SignalSignatures>(signal: K, callback: GObject.SignalCallback<this, DockParam.SignalSignatures[K]>): number;
-        connect_after(signal: string, callback: (...args: any[]) => any): number;
 
         /** @signal */
-        emit<K extends keyof DockParam.SignalSignatures>(signal: K, ...args: GObject.GjsParameters<DockParam.SignalSignatures[K]> extends [any, ...infer Q] ? Q : never): void;
-        emit(signal: string, ...args: any[]): void;
+        emit<K extends keyof DockParam.SignalSignatures>(signal: K, ...args: GObject.GjsParameters<DockParam.SignalSignatures[K]>): void;
     }
 
 
@@ -2951,15 +2918,12 @@ export namespace Gdl {
         // Signals
         /** @signal */
         connect<K extends keyof DockPlaceholder.SignalSignatures>(signal: K, callback: GObject.SignalCallback<this, DockPlaceholder.SignalSignatures[K]>): number;
-        connect(signal: string, callback: (...args: any[]) => any): number;
 
         /** @signal */
         connect_after<K extends keyof DockPlaceholder.SignalSignatures>(signal: K, callback: GObject.SignalCallback<this, DockPlaceholder.SignalSignatures[K]>): number;
-        connect_after(signal: string, callback: (...args: any[]) => any): number;
 
         /** @signal */
-        emit<K extends keyof DockPlaceholder.SignalSignatures>(signal: K, ...args: GObject.GjsParameters<DockPlaceholder.SignalSignatures[K]> extends [any, ...infer Q] ? Q : never): void;
-        emit(signal: string, ...args: any[]): void;
+        emit<K extends keyof DockPlaceholder.SignalSignatures>(signal: K, ...args: GObject.GjsParameters<DockPlaceholder.SignalSignatures[K]>): void;
 
         // Methods
         /**
@@ -3069,15 +3033,12 @@ export namespace Gdl {
         // Signals
         /** @signal */
         connect<K extends keyof DockTablabel.SignalSignatures>(signal: K, callback: GObject.SignalCallback<this, DockTablabel.SignalSignatures[K]>): number;
-        connect(signal: string, callback: (...args: any[]) => any): number;
 
         /** @signal */
         connect_after<K extends keyof DockTablabel.SignalSignatures>(signal: K, callback: GObject.SignalCallback<this, DockTablabel.SignalSignatures[K]>): number;
-        connect_after(signal: string, callback: (...args: any[]) => any): number;
 
         /** @signal */
-        emit<K extends keyof DockTablabel.SignalSignatures>(signal: K, ...args: GObject.GjsParameters<DockTablabel.SignalSignatures[K]> extends [any, ...infer Q] ? Q : never): void;
-        emit(signal: string, ...args: any[]): void;
+        emit<K extends keyof DockTablabel.SignalSignatures>(signal: K, ...args: GObject.GjsParameters<DockTablabel.SignalSignatures[K]>): void;
 
         // Virtual methods
         /**
@@ -3218,15 +3179,12 @@ export namespace Gdl {
         // Signals
         /** @signal */
         connect<K extends keyof PreviewWindow.SignalSignatures>(signal: K, callback: GObject.SignalCallback<this, PreviewWindow.SignalSignatures[K]>): number;
-        connect(signal: string, callback: (...args: any[]) => any): number;
 
         /** @signal */
         connect_after<K extends keyof PreviewWindow.SignalSignatures>(signal: K, callback: GObject.SignalCallback<this, PreviewWindow.SignalSignatures[K]>): number;
-        connect_after(signal: string, callback: (...args: any[]) => any): number;
 
         /** @signal */
-        emit<K extends keyof PreviewWindow.SignalSignatures>(signal: K, ...args: GObject.GjsParameters<PreviewWindow.SignalSignatures[K]> extends [any, ...infer Q] ? Q : never): void;
-        emit(signal: string, ...args: any[]): void;
+        emit<K extends keyof PreviewWindow.SignalSignatures>(signal: K, ...args: GObject.GjsParameters<PreviewWindow.SignalSignatures[K]>): void;
 
         // Methods
         /**
@@ -3368,15 +3326,12 @@ export namespace Gdl {
         // Signals
         /** @signal */
         connect<K extends keyof Switcher.SignalSignatures>(signal: K, callback: GObject.SignalCallback<this, Switcher.SignalSignatures[K]>): number;
-        connect(signal: string, callback: (...args: any[]) => any): number;
 
         /** @signal */
         connect_after<K extends keyof Switcher.SignalSignatures>(signal: K, callback: GObject.SignalCallback<this, Switcher.SignalSignatures[K]>): number;
-        connect_after(signal: string, callback: (...args: any[]) => any): number;
 
         /** @signal */
-        emit<K extends keyof Switcher.SignalSignatures>(signal: K, ...args: GObject.GjsParameters<Switcher.SignalSignatures[K]> extends [any, ...infer Q] ? Q : never): void;
-        emit(signal: string, ...args: any[]): void;
+        emit<K extends keyof Switcher.SignalSignatures>(signal: K, ...args: GObject.GjsParameters<Switcher.SignalSignatures[K]>): void;
 
         // Methods
         /**

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@girs/gdl-3",
-    "version": "4.8.0",
+    "version": "5.0.0",
     "description": "GJS TypeScript type definitions for Gdl-3",
     "type": "module",
     "module": "gdl-3.js",
@@ -36,20 +36,20 @@
       "test": "tsc --project tsconfig.json"
     },
     "dependencies": {
-      "@girs/gjs": "^4.8.0",
-      "@girs/gtk-3.0": "^4.8.0",
-      "@girs/xlib-2.0": "^4.8.0",
-      "@girs/gdk-3.0": "^4.8.0",
-      "@girs/cairo-1.0": "^4.8.0",
-      "@girs/gobject-2.0": "^4.8.0",
-      "@girs/glib-2.0": "^4.8.0",
-      "@girs/pango-1.0": "^4.8.0",
-      "@girs/harfbuzz-0.0": "^4.8.0",
-      "@girs/freetype2-2.0": "^4.8.0",
-      "@girs/gio-2.0": "^4.8.0",
-      "@girs/gmodule-2.0": "^4.8.0",
-      "@girs/gdkpixbuf-2.0": "^4.8.0",
-      "@girs/atk-1.0": "^4.8.0"    },
+      "@girs/gjs": "^5.0.0",
+      "@girs/gtk-3.0": "^5.0.0",
+      "@girs/xlib-2.0": "^5.0.0",
+      "@girs/gdk-3.0": "^5.0.0",
+      "@girs/cairo-1.0": "^5.0.0",
+      "@girs/gobject-2.0": "^5.0.0",
+      "@girs/glib-2.0": "^5.0.0",
+      "@girs/pango-1.0": "^5.0.0",
+      "@girs/harfbuzz-0.0": "^5.0.0",
+      "@girs/freetype2-2.0": "^5.0.0",
+      "@girs/gio-2.0": "^5.0.0",
+      "@girs/gmodule-2.0": "^5.0.0",
+      "@girs/gdkpixbuf-2.0": "^5.0.0",
+      "@girs/atk-1.0": "^5.0.0"    },
     "devDependencies": {
       "typescript": "*"
     },