@gtkx/ffi 0.2.6 → 0.3.0

package/dist/generated/gio/dbus-interface-info.d.ts

@@ -8,7 +8,8 @@ export interface DBusInterfaceInfoInit {
 }
 /** Information about a D-Bus interface. */
 export declare class DBusInterfaceInfo {
-    ptr: unknown;
+    static readonly glibTypeName: string;
+    id: unknown;
     constructor(init?: DBusInterfaceInfoInit);
     protected createPtr(init: DBusInterfaceInfoInit): unknown;
     /**

package/dist/generated/gio/dbus-interface-info.js

@@ -1,13 +1,11 @@
 import { alloc, call, read, write } from "@gtkx/native";
-import { getObject } from "@gtkx/ffi";
-import { DBusMethodInfo } from "./dbus-method-info.js";
-import { DBusPropertyInfo } from "./dbus-property-info.js";
-import { DBusSignalInfo } from "./dbus-signal-info.js";
+import { getObject, registerClass } from "@gtkx/ffi";
 /** Information about a D-Bus interface. */
 export class DBusInterfaceInfo {
-    ptr;
+    static glibTypeName = "GDBusInterfaceInfo";
+    id;
     constructor(init = {}) {
-        this.ptr = this.createPtr(init);
+        this.id = this.createPtr(init);
     }
     createPtr(init) {
         const ptr = alloc(48, "GDBusInterfaceInfo", "libgio-2.0.so.0");
@@ -36,7 +34,7 @@ export class DBusInterfaceInfo {
                     innerType: "GDBusInterfaceInfo",
                     lib: "libgio-2.0.so.0",
                 },
-                value: this.ptr,
+                value: this.id,
             },
         ], { type: "undefined" });
     }
@@ -54,7 +52,7 @@ export class DBusInterfaceInfo {
                     innerType: "GDBusInterfaceInfo",
                     lib: "libgio-2.0.so.0",
                 },
-                value: this.ptr,
+                value: this.id,
             },
         ], { type: "undefined" });
     }
@@ -77,7 +75,7 @@ export class DBusInterfaceInfo {
                     innerType: "GDBusInterfaceInfo",
                     lib: "libgio-2.0.so.0",
                 },
-                value: this.ptr,
+                value: this.id,
             },
             {
                 type: { type: "int", size: 32, unsigned: true },
@@ -90,7 +88,7 @@ export class DBusInterfaceInfo {
                     innerType: "GString",
                     lib: "libgio-2.0.so.0",
                 },
-                value: stringBuilder?.ptr ?? stringBuilder,
+                value: stringBuilder?.id ?? stringBuilder,
             },
         ], { type: "undefined" });
     }
@@ -110,7 +108,7 @@ export class DBusInterfaceInfo {
                     innerType: "GDBusInterfaceInfo",
                     lib: "libgio-2.0.so.0",
                 },
-                value: this.ptr,
+                value: this.id,
             },
             {
                 type: { type: "string" },
@@ -124,7 +122,7 @@ export class DBusInterfaceInfo {
         });
         if (ptr === null)
             return null;
-        return getObject(ptr, DBusMethodInfo);
+        return getObject(ptr);
     }
     /**
      * Looks up information about a property.
@@ -142,7 +140,7 @@ export class DBusInterfaceInfo {
                     innerType: "GDBusInterfaceInfo",
                     lib: "libgio-2.0.so.0",
                 },
-                value: this.ptr,
+                value: this.id,
             },
             {
                 type: { type: "string" },
@@ -156,7 +154,7 @@ export class DBusInterfaceInfo {
         });
         if (ptr === null)
             return null;
-        return getObject(ptr, DBusPropertyInfo);
+        return getObject(ptr);
     }
     /**
      * Looks up information about a signal.
@@ -174,7 +172,7 @@ export class DBusInterfaceInfo {
                     innerType: "GDBusInterfaceInfo",
                     lib: "libgio-2.0.so.0",
                 },
-                value: this.ptr,
+                value: this.id,
             },
             {
                 type: { type: "string" },
@@ -188,7 +186,7 @@ export class DBusInterfaceInfo {
         });
         if (ptr === null)
             return null;
-        return getObject(ptr, DBusSignalInfo);
+        return getObject(ptr);
     }
     /**
      * If `info` is statically allocated does nothing. Otherwise increases
@@ -203,7 +201,7 @@ export class DBusInterfaceInfo {
                     innerType: "GDBusInterfaceInfo",
                     lib: "libgio-2.0.so.0",
                 },
-                value: this.ptr,
+                value: this.id,
             },
         ], {
             type: "boxed",
@@ -211,7 +209,7 @@ export class DBusInterfaceInfo {
             innerType: "GDBusInterfaceInfo",
             lib: "libgio-2.0.so.0",
         });
-        return getObject(ptr, DBusInterfaceInfo);
+        return getObject(ptr);
     }
     /**
      * If `info` is statically allocated, does nothing. Otherwise decreases
@@ -227,26 +225,26 @@ export class DBusInterfaceInfo {
                     innerType: "GDBusInterfaceInfo",
                     lib: "libgio-2.0.so.0",
                 },
-                value: this.ptr,
+                value: this.id,
             },
         ], { type: "undefined" });
     }
     /** The reference count or -1 if statically allocated. */
     get refCount() {
-        return read(this.ptr, { type: "int", size: 32, unsigned: false }, 0);
+        return read(this.id, { type: "int", size: 32, unsigned: false }, 0);
     }
     set refCount(value) {
-        write(this.ptr, { type: "int", size: 32, unsigned: false }, 0, value);
+        write(this.id, { type: "int", size: 32, unsigned: false }, 0, value);
     }
     /** The name of the D-Bus interface, e.g. "org.freedesktop.DBus.Properties". */
     get name() {
-        return read(this.ptr, { type: "string" }, 8);
+        return read(this.id, { type: "string" }, 8);
     }
     /**
      * A pointer to a %NULL-terminated array of pointers to #GDBusMethodInfo structures or %NULL if there are no methods.
      */
     get methods() {
-        return read(this.ptr, {
+        return read(this.id, {
             type: "array",
             itemType: {
                 type: "boxed",
@@ -259,7 +257,7 @@ export class DBusInterfaceInfo {
      * A pointer to a %NULL-terminated array of pointers to #GDBusSignalInfo structures or %NULL if there are no signals.
      */
     get signals() {
-        return read(this.ptr, {
+        return read(this.id, {
             type: "array",
             itemType: {
                 type: "boxed",
@@ -272,7 +270,7 @@ export class DBusInterfaceInfo {
      * A pointer to a %NULL-terminated array of pointers to #GDBusPropertyInfo structures or %NULL if there are no properties.
      */
     get properties() {
-        return read(this.ptr, {
+        return read(this.id, {
             type: "array",
             itemType: {
                 type: "boxed",
@@ -285,7 +283,7 @@ export class DBusInterfaceInfo {
      * A pointer to a %NULL-terminated array of pointers to #GDBusAnnotationInfo structures or %NULL if there are no annotations.
      */
     get annotations() {
-        return read(this.ptr, {
+        return read(this.id, {
             type: "array",
             itemType: {
                 type: "boxed",
@@ -295,3 +293,4 @@ export class DBusInterfaceInfo {
         }, 40);
     }
 }
+registerClass(DBusInterfaceInfo);

package/dist/generated/gio/dbus-interface-skeleton.js

@@ -1,10 +1,6 @@
 import { call } from "@gtkx/native";
-import { NativeError, getObject } from "@gtkx/ffi";
-import { DBusInterfaceInfo } from "./dbus-interface-info.js";
-import { DBusConnection } from "./dbus-connection.js";
-import { DBusObject } from "./dbus-object.js";
+import { NativeError, getObject, registerClass } from "@gtkx/ffi";
 import { DBusMethodInvocation } from "./dbus-method-invocation.js";
-import * as GLib from "../glib/index.js";
 import * as GObject from "../gobject/index.js";
 /** Abstract base class for D-Bus interfaces on the service side. */
 const SIGNAL_META = {
@@ -45,11 +41,11 @@ export class DBusInterfaceSkeleton extends GObject.GObject {
         const result = call("libgio-2.0.so.0", "g_dbus_interface_skeleton_export", [
             {
                 type: { type: "gobject" },
-                value: this.ptr,
+                value: this.id,
             },
             {
                 type: { type: "gobject", borrowed: true },
-                value: connection?.ptr ?? connection,
+                value: connection?.id ?? connection,
             },
             {
                 type: { type: "string" },
@@ -86,7 +82,7 @@ export class DBusInterfaceSkeleton extends GObject.GObject {
         call("libgio-2.0.so.0", "g_dbus_interface_skeleton_flush", [
             {
                 type: { type: "gobject" },
-                value: this.ptr,
+                value: this.id,
             },
         ], { type: "undefined" });
     }
@@ -97,12 +93,12 @@ export class DBusInterfaceSkeleton extends GObject.GObject {
         const ptr = call("libgio-2.0.so.0", "g_dbus_interface_skeleton_get_connection", [
             {
                 type: { type: "gobject" },
-                value: this.ptr,
+                value: this.id,
             },
         ], { type: "gobject", borrowed: true });
         if (ptr === null)
             return null;
-        return getObject(ptr, DBusConnection);
+        return getObject(ptr);
     }
     /**
      * Gets a list of the connections that `interface_` is exported on.
@@ -111,7 +107,7 @@ export class DBusInterfaceSkeleton extends GObject.GObject {
         const ptrs = call("libgio-2.0.so.0", "g_dbus_interface_skeleton_get_connections", [
             {
                 type: { type: "gobject" },
-                value: this.ptr,
+                value: this.id,
             },
         ], {
             type: "array",
@@ -119,7 +115,7 @@ export class DBusInterfaceSkeleton extends GObject.GObject {
             listType: "glist",
             borrowed: true,
         });
-        return ptrs.map((ptr) => getObject(ptr, DBusConnection));
+        return ptrs.map((ptr) => getObject(ptr));
     }
     /**
      * Gets the #GDBusInterfaceSkeletonFlags that describes what the behavior
@@ -129,7 +125,7 @@ export class DBusInterfaceSkeleton extends GObject.GObject {
         return call("libgio-2.0.so.0", "g_dbus_interface_skeleton_get_flags", [
             {
                 type: { type: "gobject" },
-                value: this.ptr,
+                value: this.id,
             },
         ], { type: "int", size: 32, unsigned: false });
     }
@@ -141,7 +137,7 @@ export class DBusInterfaceSkeleton extends GObject.GObject {
         const ptr = call("libgio-2.0.so.0", "g_dbus_interface_skeleton_get_info", [
             {
                 type: { type: "gobject" },
-                value: this.ptr,
+                value: this.id,
             },
         ], {
             type: "boxed",
@@ -149,7 +145,7 @@ export class DBusInterfaceSkeleton extends GObject.GObject {
             innerType: "GDBusInterfaceInfo",
             lib: "libgio-2.0.so.0",
         });
-        return getObject(ptr, DBusInterfaceInfo);
+        return getObject(ptr);
     }
     /**
      * Gets the object path that `interface_` is exported on, if any.
@@ -158,7 +154,7 @@ export class DBusInterfaceSkeleton extends GObject.GObject {
         return call("libgio-2.0.so.0", "g_dbus_interface_skeleton_get_object_path", [
             {
                 type: { type: "gobject" },
-                value: this.ptr,
+                value: this.id,
             },
         ], { type: "string", borrowed: true });
     }
@@ -169,7 +165,7 @@ export class DBusInterfaceSkeleton extends GObject.GObject {
         const ptr = call("libgio-2.0.so.0", "g_dbus_interface_skeleton_get_properties", [
             {
                 type: { type: "gobject" },
-                value: this.ptr,
+                value: this.id,
             },
         ], {
             type: "boxed",
@@ -177,7 +173,7 @@ export class DBusInterfaceSkeleton extends GObject.GObject {
             innerType: "GVariant",
             lib: "libgio-2.0.so.0",
         });
-        return getObject(ptr, GLib.Variant);
+        return getObject(ptr);
     }
     /**
      * Gets the interface vtable for the D-Bus interface implemented by
@@ -187,7 +183,7 @@ export class DBusInterfaceSkeleton extends GObject.GObject {
         return call("libgio-2.0.so.0", "g_dbus_interface_skeleton_get_vtable", [
             {
                 type: { type: "gobject" },
-                value: this.ptr,
+                value: this.id,
             },
         ], { type: "int", size: 64, unsigned: true });
     }
@@ -199,11 +195,11 @@ export class DBusInterfaceSkeleton extends GObject.GObject {
         return call("libgio-2.0.so.0", "g_dbus_interface_skeleton_has_connection", [
             {
                 type: { type: "gobject" },
-                value: this.ptr,
+                value: this.id,
             },
             {
                 type: { type: "gobject", borrowed: true },
-                value: connection?.ptr ?? connection,
+                value: connection?.id ?? connection,
             },
         ], { type: "boolean" });
     }
@@ -215,7 +211,7 @@ export class DBusInterfaceSkeleton extends GObject.GObject {
         call("libgio-2.0.so.0", "g_dbus_interface_skeleton_set_flags", [
             {
                 type: { type: "gobject" },
-                value: this.ptr,
+                value: this.id,
             },
             {
                 type: { type: "int", size: 32, unsigned: false },
@@ -233,7 +229,7 @@ export class DBusInterfaceSkeleton extends GObject.GObject {
         call("libgio-2.0.so.0", "g_dbus_interface_skeleton_unexport", [
             {
                 type: { type: "gobject" },
-                value: this.ptr,
+                value: this.id,
             },
         ], { type: "undefined" });
     }
@@ -248,11 +244,11 @@ export class DBusInterfaceSkeleton extends GObject.GObject {
         call("libgio-2.0.so.0", "g_dbus_interface_skeleton_unexport_from_connection", [
             {
                 type: { type: "gobject" },
-                value: this.ptr,
+                value: this.id,
             },
             {
                 type: { type: "gobject", borrowed: true },
-                value: connection?.ptr ?? connection,
+                value: connection?.id ?? connection,
             },
         ], { type: "undefined" });
     }
@@ -263,12 +259,12 @@ export class DBusInterfaceSkeleton extends GObject.GObject {
         const ptr = call("libgio-2.0.so.0", "g_dbus_interface_dup_object", [
             {
                 type: { type: "gobject" },
-                value: this.ptr,
+                value: this.id,
             },
         ], { type: "gobject", borrowed: true });
         if (ptr === null)
             return null;
-        return getObject(ptr, DBusObject);
+        return getObject(ptr);
     }
     /**
      * Sets the #GDBusObject for `interface_` to @object.
@@ -280,11 +276,11 @@ export class DBusInterfaceSkeleton extends GObject.GObject {
         call("libgio-2.0.so.0", "g_dbus_interface_set_object", [
             {
                 type: { type: "gobject" },
-                value: this.ptr,
+                value: this.id,
             },
             {
                 type: { type: "gobject", borrowed: true },
-                value: object?.ptr ?? object,
+                value: object?.id ?? object,
                 optional: true,
             },
         ], { type: "undefined" });
@@ -297,20 +293,20 @@ export class DBusInterfaceSkeleton extends GObject.GObject {
             : [selfType];
         const returnType = meta?.returnType;
         const wrappedHandler = (...args) => {
-            const self = getObject(args[0], DBusInterfaceSkeleton);
+            const self = getObject(args[0]);
             const signalArgs = args.slice(1);
             if (!meta)
                 return handler(self, ...signalArgs);
             const wrapped = meta.params.map((m, i) => {
                 if (m.getCls && signalArgs[i] != null) {
-                    return getObject(signalArgs[i], m.getCls());
+                    return getObject(signalArgs[i]);
                 }
                 return signalArgs[i];
             });
             return handler(self, ...wrapped);
         };
         return call("libgio-2.0.so.0", "g_signal_connect_closure", [
-            { type: { type: "gobject" }, value: this.ptr },
+            { type: { type: "gobject" }, value: this.id },
             { type: { type: "string" }, value: signal },
             {
                 type: { type: "callback", argTypes, returnType },
@@ -320,3 +316,4 @@ export class DBusInterfaceSkeleton extends GObject.GObject {
         ], { type: "int", size: 64, unsigned: true });
     }
 }
+registerClass(DBusInterfaceSkeleton);

package/dist/generated/gio/dbus-interface.d.ts

@@ -8,9 +8,9 @@ import { DBusObject } from "./dbus-object.js";
  * (see [class@Gio.DBusProxy]).
  */
 export declare class DBusInterface {
-    ptr: unknown;
-    protected constructor(ptr: unknown);
-    static fromPtr(ptr: unknown): DBusInterface;
+    id: unknown;
+    protected constructor(id: unknown);
+    static fromPtr(id: unknown): DBusInterface;
     /**
      * Gets the #GDBusObject that `interface_` belongs to, if any.
      */

package/dist/generated/gio/dbus-interface.js

@@ -1,7 +1,5 @@
 import { call } from "@gtkx/native";
 import { getObject } from "@gtkx/ffi";
-import { DBusInterfaceInfo } from "./dbus-interface-info.js";
-import { DBusObject } from "./dbus-object.js";
 /**
  * Base type for D-Bus interfaces.
  *
@@ -10,12 +8,12 @@ import { DBusObject } from "./dbus-object.js";
  * (see [class@Gio.DBusProxy]).
  */
 export class DBusInterface {
-    ptr;
-    constructor(ptr) {
-        this.ptr = ptr;
+    id;
+    constructor(id) {
+        this.id = id;
     }
-    static fromPtr(ptr) {
-        return new DBusInterface(ptr);
+    static fromPtr(id) {
+        return new DBusInterface(id);
     }
     /**
      * Gets the #GDBusObject that `interface_` belongs to, if any.
@@ -24,12 +22,12 @@ export class DBusInterface {
         const ptr = call("libgio-2.0.so.0", "g_dbus_interface_dup_object", [
             {
                 type: { type: "gobject" },
-                value: this.ptr,
+                value: this.id,
             },
         ], { type: "gobject", borrowed: true });
         if (ptr === null)
             return null;
-        return getObject(ptr, DBusObject);
+        return getObject(ptr);
     }
     /**
      * Gets D-Bus introspection information for the D-Bus interface
@@ -39,7 +37,7 @@ export class DBusInterface {
         const ptr = call("libgio-2.0.so.0", "g_dbus_interface_get_info", [
             {
                 type: { type: "gobject" },
-                value: this.ptr,
+                value: this.id,
             },
         ], {
             type: "boxed",
@@ -47,7 +45,7 @@ export class DBusInterface {
             innerType: "GDBusInterfaceInfo",
             lib: "libgio-2.0.so.0",
         });
-        return getObject(ptr, DBusInterfaceInfo);
+        return getObject(ptr);
     }
     /**
      * Sets the #GDBusObject for `interface_` to @object.
@@ -59,11 +57,11 @@ export class DBusInterface {
         call("libgio-2.0.so.0", "g_dbus_interface_set_object", [
             {
                 type: { type: "gobject" },
-                value: this.ptr,
+                value: this.id,
             },
             {
                 type: { type: "gobject", borrowed: true },
-                value: object?.ptr ?? object,
+                value: object?.id ?? object,
                 optional: true,
             },
         ], { type: "undefined" });

package/dist/generated/gio/dbus-menu-model.js

@@ -1,5 +1,5 @@
 import { call } from "@gtkx/native";
-import { getObject } from "@gtkx/ffi";
+import { getObject, registerClass } from "@gtkx/ffi";
 import { MenuModel } from "./menu-model.js";
 /**
  * `GDBusMenuModel` is an implementation of [class@Gio.MenuModel] that can be
@@ -49,7 +49,7 @@ export class DBusMenuModel extends MenuModel {
         const ptr = call("libgio-2.0.so.0", "g_dbus_menu_model_get", [
             {
                 type: { type: "gobject", borrowed: true },
-                value: connection?.ptr ?? connection,
+                value: connection?.id ?? connection,
             },
             {
                 type: { type: "string" },
@@ -61,7 +61,7 @@ export class DBusMenuModel extends MenuModel {
                 value: objectPath,
             },
         ], { type: "gobject", borrowed: true });
-        return getObject(ptr, DBusMenuModel);
+        return getObject(ptr);
     }
     connect(signal, handler, after = false) {
         const meta = SIGNAL_META[signal];
@@ -71,20 +71,20 @@ export class DBusMenuModel extends MenuModel {
             : [selfType];
         const returnType = meta?.returnType;
         const wrappedHandler = (...args) => {
-            const self = getObject(args[0], DBusMenuModel);
+            const self = getObject(args[0]);
             const signalArgs = args.slice(1);
             if (!meta)
                 return handler(self, ...signalArgs);
             const wrapped = meta.params.map((m, i) => {
                 if (m.getCls && signalArgs[i] != null) {
-                    return getObject(signalArgs[i], m.getCls());
+                    return getObject(signalArgs[i]);
                 }
                 return signalArgs[i];
             });
             return handler(self, ...wrapped);
         };
         return call("libgio-2.0.so.0", "g_signal_connect_closure", [
-            { type: { type: "gobject" }, value: this.ptr },
+            { type: { type: "gobject" }, value: this.id },
             { type: { type: "string" }, value: signal },
             {
                 type: { type: "callback", argTypes, returnType },
@@ -94,3 +94,4 @@ export class DBusMenuModel extends MenuModel {
         ], { type: "int", size: 64, unsigned: true });
     }
 }
+registerClass(DBusMenuModel);