@gtkx/ffi 0.1.41 → 0.1.43

package/dist/codegen/ffi-generator.js

@@ -1148,10 +1148,19 @@ ${allArgs ? `${allArgs},` : ""}
             return undefined;
         if (typeName.includes(".")) {
             const [ns, className] = typeName.split(".", 2);
-            if (ns === this.options.namespace && className) {
-                return normalizeClassName(className);
+            if (!className)
+                return undefined;
+            if (this.options.typeRegistry) {
+                const registered = this.options.typeRegistry.resolve(typeName);
+                if (!registered || (registered.kind !== "class" && registered.kind !== "interface")) {
+                    return undefined;
+                }
             }
-            return undefined;
+            const normalizedName = normalizeClassName(className);
+            if (ns === this.options.namespace) {
+                return normalizedName;
+            }
+            return `${ns}.${normalizedName}`;
         }
         const normalizedName = normalizeClassName(typeName);
         if (classMap.has(typeName) || classMap.has(normalizedName)) {
@@ -1172,7 +1181,20 @@ ${allArgs ? `${allArgs},` : ""}
                 const ffiType = JSON.stringify(this.typeMapper.mapParameter(param).ffi);
                 const signalParamClass = this.extractSignalParamClass(param, classMap);
                 if (signalParamClass) {
-                    this.signalClasses.add(signalParamClass);
+                    const dotIndex = signalParamClass.indexOf(".");
+                    if (dotIndex !== -1) {
+                        const ns = signalParamClass.slice(0, dotIndex);
+                        const clsName = signalParamClass.slice(dotIndex + 1);
+                        this.usedExternalTypes.set(signalParamClass, {
+                            namespace: ns,
+                            name: clsName,
+                            transformedName: clsName,
+                            kind: "class",
+                        });
+                    }
+                    else {
+                        this.signalClasses.add(signalParamClass);
+                    }
                     return `{ type: ${ffiType}, getCls: () => ${signalParamClass} }`;
                 }
                 return `{ type: ${ffiType} }`;

package/dist/generated/gio/socket-service.js

@@ -1,6 +1,7 @@
 import { call } from "@gtkx/native";
 import { getObject } from "@gtkx/ffi";
 import { SocketConnection } from "./socket-connection.js";
+import * as GObject from "../gobject/index.js";
 import { SocketListener } from "./socket-listener.js";
 const SIGNAL_META = {
     incoming: {
@@ -9,7 +10,10 @@ const SIGNAL_META = {
                 type: { type: "gobject", borrowed: true },
                 getCls: () => SocketConnection,
             },
-            { type: { type: "gobject", borrowed: true } },
+            {
+                type: { type: "gobject", borrowed: true },
+                getCls: () => GObject.GObject,
+            },
         ],
         returnType: { type: "boolean" },
     },

package/dist/generated/gio/threaded-socket-service.js

@@ -1,6 +1,7 @@
 import { call } from "@gtkx/native";
 import { getObject } from "@gtkx/ffi";
 import { SocketConnection } from "./socket-connection.js";
+import * as GObject from "../gobject/index.js";
 import { SocketService } from "./socket-service.js";
 const SIGNAL_META = {
     run: {
@@ -9,7 +10,10 @@ const SIGNAL_META = {
                 type: { type: "gobject", borrowed: true },
                 getCls: () => SocketConnection,
             },
-            { type: { type: "gobject", borrowed: true } },
+            {
+                type: { type: "gobject", borrowed: true },
+                getCls: () => GObject.GObject,
+            },
         ],
         returnType: { type: "boolean" },
     },
@@ -19,7 +23,10 @@ const SIGNAL_META = {
                 type: { type: "gobject", borrowed: true },
                 getCls: () => SocketConnection,
             },
-            { type: { type: "gobject", borrowed: true } },
+            {
+                type: { type: "gobject", borrowed: true },
+                getCls: () => GObject.GObject,
+            },
         ],
         returnType: { type: "boolean" },
     },

package/dist/generated/gtk/app-chooser-widget.js

@@ -4,11 +4,15 @@ import * as Gio from "../gio/index.js";
 import { Widget } from "./widget.js";
 const SIGNAL_META = {
     "application-activated": {
-        params: [{ type: { type: "gobject", borrowed: true } }],
+        params: [
+            { type: { type: "gobject", borrowed: true }, getCls: () => Gio.AppInfo },
+        ],
         returnType: { type: "undefined" },
     },
     "application-selected": {
-        params: [{ type: { type: "gobject", borrowed: true } }],
+        params: [
+            { type: { type: "gobject", borrowed: true }, getCls: () => Gio.AppInfo },
+        ],
         returnType: { type: "undefined" },
     },
 };

package/dist/generated/gtk/drag-source.js

@@ -4,19 +4,21 @@ import * as Gdk from "../gdk/index.js";
 import { GestureSingle } from "./gesture-single.js";
 const SIGNAL_META = {
     "drag-begin": {
-        params: [{ type: { type: "gobject", borrowed: true } }],
+        params: [
+            { type: { type: "gobject", borrowed: true }, getCls: () => Gdk.Drag },
+        ],
         returnType: { type: "undefined" },
     },
     "drag-cancel": {
         params: [
-            { type: { type: "gobject", borrowed: true } },
+            { type: { type: "gobject", borrowed: true }, getCls: () => Gdk.Drag },
             { type: { type: "int", size: 32, unsigned: false } },
         ],
         returnType: { type: "boolean" },
     },
     "drag-end": {
         params: [
-            { type: { type: "gobject", borrowed: true } },
+            { type: { type: "gobject", borrowed: true }, getCls: () => Gdk.Drag },
             { type: { type: "boolean" } },
         ],
         returnType: { type: "undefined" },

package/dist/generated/gtk/drop-target-async.js

@@ -4,24 +4,28 @@ import * as Gdk from "../gdk/index.js";
 import { EventController } from "./event-controller.js";
 const SIGNAL_META = {
     accept: {
-        params: [{ type: { type: "gobject", borrowed: true } }],
+        params: [
+            { type: { type: "gobject", borrowed: true }, getCls: () => Gdk.Drop },
+        ],
         returnType: { type: "boolean" },
     },
     "drag-enter": {
         params: [
-            { type: { type: "gobject", borrowed: true } },
+            { type: { type: "gobject", borrowed: true }, getCls: () => Gdk.Drop },
             { type: { type: "float", size: 64 } },
             { type: { type: "float", size: 64 } },
         ],
         returnType: { type: "int", size: 32, unsigned: false },
     },
     "drag-leave": {
-        params: [{ type: { type: "gobject", borrowed: true } }],
+        params: [
+            { type: { type: "gobject", borrowed: true }, getCls: () => Gdk.Drop },
+        ],
         returnType: { type: "undefined" },
     },
     "drag-motion": {
         params: [
-            { type: { type: "gobject", borrowed: true } },
+            { type: { type: "gobject", borrowed: true }, getCls: () => Gdk.Drop },
             { type: { type: "float", size: 64 } },
             { type: { type: "float", size: 64 } },
         ],
@@ -29,7 +33,7 @@ const SIGNAL_META = {
     },
     drop: {
         params: [
-            { type: { type: "gobject", borrowed: true } },
+            { type: { type: "gobject", borrowed: true }, getCls: () => Gdk.Drop },
             { type: { type: "float", size: 64 } },
             { type: { type: "float", size: 64 } },
         ],

package/dist/generated/gtk/drop-target.js

@@ -5,7 +5,9 @@ import * as Gdk from "../gdk/index.js";
 import { EventController } from "./event-controller.js";
 const SIGNAL_META = {
     accept: {
-        params: [{ type: { type: "gobject", borrowed: true } }],
+        params: [
+            { type: { type: "gobject", borrowed: true }, getCls: () => Gdk.Drop },
+        ],
         returnType: { type: "boolean" },
     },
     drop: {

package/dist/generated/gtk/event-controller-legacy.js

@@ -1,9 +1,12 @@
 import { call } from "@gtkx/native";
 import { getObject } from "@gtkx/ffi";
+import * as Gdk from "../gdk/index.js";
 import { EventController } from "./event-controller.js";
 const SIGNAL_META = {
     event: {
-        params: [{ type: { type: "gobject", borrowed: true } }],
+        params: [
+            { type: { type: "gobject", borrowed: true }, getCls: () => Gdk.Event },
+        ],
         returnType: { type: "boolean" },
     },
 };

package/dist/generated/gtk/glarea.js

@@ -9,7 +9,12 @@ const SIGNAL_META = {
         returnType: { type: "gobject", borrowed: false },
     },
     render: {
-        params: [{ type: { type: "gobject", borrowed: true } }],
+        params: [
+            {
+                type: { type: "gobject", borrowed: true },
+                getCls: () => Gdk.GLContext,
+            },
+        ],
         returnType: { type: "boolean" },
     },
     resize: {

package/dist/generated/gtk/signal-list-item-factory.js

@@ -1,21 +1,42 @@
 import { call } from "@gtkx/native";
 import { getObject } from "@gtkx/ffi";
+import * as GObject from "../gobject/index.js";
 import { ListItemFactory } from "./list-item-factory.js";
 const SIGNAL_META = {
     bind: {
-        params: [{ type: { type: "gobject", borrowed: true } }],
+        params: [
+            {
+                type: { type: "gobject", borrowed: true },
+                getCls: () => GObject.GObject,
+            },
+        ],
         returnType: { type: "undefined" },
     },
     setup: {
-        params: [{ type: { type: "gobject", borrowed: true } }],
+        params: [
+            {
+                type: { type: "gobject", borrowed: true },
+                getCls: () => GObject.GObject,
+            },
+        ],
         returnType: { type: "undefined" },
     },
     teardown: {
-        params: [{ type: { type: "gobject", borrowed: true } }],
+        params: [
+            {
+                type: { type: "gobject", borrowed: true },
+                getCls: () => GObject.GObject,
+            },
+        ],
         returnType: { type: "undefined" },
     },
     unbind: {
-        params: [{ type: { type: "gobject", borrowed: true } }],
+        params: [
+            {
+                type: { type: "gobject", borrowed: true },
+                getCls: () => GObject.GObject,
+            },
+        ],
         returnType: { type: "undefined" },
     },
 };

package/dist/generated/gtk/text-buffer.js

@@ -38,7 +38,10 @@ const SIGNAL_META = {
     "insert-paintable": {
         params: [
             { type: { type: "boxed", borrowed: true, innerType: "GtkTextIter" } },
-            { type: { type: "gobject", borrowed: true } },
+            {
+                type: { type: "gobject", borrowed: true },
+                getCls: () => Gdk.Paintable,
+            },
         ],
         returnType: { type: "undefined" },
     },
@@ -65,7 +68,12 @@ const SIGNAL_META = {
     },
     "modified-changed": { params: [], returnType: { type: "undefined" } },
     "paste-done": {
-        params: [{ type: { type: "gobject", borrowed: true } }],
+        params: [
+            {
+                type: { type: "gobject", borrowed: true },
+                getCls: () => Gdk.Clipboard,
+            },
+        ],
         returnType: { type: "undefined" },
     },
     redo: { params: [], returnType: { type: "undefined" } },

package/dist/generated/gtksource/buffer.js

@@ -21,7 +21,9 @@ const SIGNAL_META = {
         returnType: { type: "undefined" },
     },
     "source-mark-updated": {
-        params: [{ type: { type: "gobject", borrowed: true } }],
+        params: [
+            { type: { type: "gobject", borrowed: true }, getCls: () => Gtk.TextMark },
+        ],
         returnType: { type: "undefined" },
     },
 };

package/dist/generated/gtksource/completion-context.js

@@ -10,7 +10,10 @@ const SIGNAL_META = {
     "provider-model-changed": {
         params: [
             { type: { type: "gobject", borrowed: true } },
-            { type: { type: "gobject", borrowed: true } },
+            {
+                type: { type: "gobject", borrowed: true },
+                getCls: () => Gio.ListModel,
+            },
         ],
         returnType: { type: "undefined" },
     },

package/dist/generated/gtksource/gutter-renderer.js

@@ -2,6 +2,7 @@ import { call } from "@gtkx/native";
 import { getObject } from "@gtkx/ffi";
 import { Buffer } from "./buffer.js";
 import { View } from "./view.js";
+import * as GObject from "../gobject/index.js";
 import * as Gtk from "../gtk/index.js";
 const SIGNAL_META = {
     activate: {
@@ -23,7 +24,10 @@ const SIGNAL_META = {
     },
     "query-data": {
         params: [
-            { type: { type: "gobject", borrowed: true } },
+            {
+                type: { type: "gobject", borrowed: true },
+                getCls: () => GObject.GObject,
+            },
             { type: { type: "int", size: 32, unsigned: true } },
         ],
         returnType: { type: "undefined" },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gtkx/ffi",
-  "version": "0.1.41",
+  "version": "0.1.43",
   "description": "Generated TypeScript FFI bindings for GTK4 libraries",
   "keywords": [
     "gtk",
@@ -46,10 +46,10 @@
     "dist"
   ],
   "dependencies": {
-    "@gtkx/native": "0.1.41"
+    "@gtkx/native": "0.1.43"
   },
   "devDependencies": {
-    "@gtkx/gir": "0.1.41"
+    "@gtkx/gir": "0.1.43"
   },
   "scripts": {
     "build": "tsc -b && cp ../../README.md .",