@gtkx/ffi 0.1.6 → 0.1.8

package/dist/generated/gio/dbus-object-manager-client.js

@@ -1,6 +1,11 @@
 import { call } from "@gtkx/native";
+import { NativeError } from "@gtkx/ffi";
+import { DBusConnection } from "./dbus-connection.js";
+import { DBusInterface } from "./dbus-interface.js";
+import { DBusObject } from "./dbus-object.js";
 import { DBusObjectProxy } from "./dbus-object-proxy.js";
 import { DBusProxy } from "./dbus-proxy.js";
+import * as GObject from "../gobject/index.js";
 export class DBusObjectManagerClient {
     ptr;
     constructor(...args) {
@@ -11,7 +16,7 @@ export class DBusObjectManagerClient {
         const ptr = call("libgio-2.0.so.0", "g_dbus_object_manager_client_new_for_bus_finish", [
             {
                 type: { type: "gobject" },
-                value: res,
+                value: res?.ptr ?? res,
             },
         ], { type: "gobject", borrowed: true });
         const instance = Object.create(DBusObjectManagerClient.prototype);
@@ -42,15 +47,16 @@ export class DBusObjectManagerClient {
             },
             {
                 type: { type: "gobject" },
-                value: getProxyTypeUserData,
+                value: getProxyTypeUserData?.ptr ?? getProxyTypeUserData,
             },
             {
                 type: { type: "gobject" },
-                value: getProxyTypeDestroyNotify,
+                value: getProxyTypeDestroyNotify?.ptr ??
+                    getProxyTypeDestroyNotify,
             },
             {
                 type: { type: "gobject" },
-                value: cancellable,
+                value: cancellable?.ptr ?? cancellable,
             },
         ], { type: "gobject", borrowed: true });
         const instance = Object.create(DBusObjectManagerClient.prototype);
@@ -61,7 +67,7 @@ export class DBusObjectManagerClient {
         const ptr = call("libgio-2.0.so.0", "g_dbus_object_manager_client_new_sync", [
             {
                 type: { type: "gobject" },
-                value: connection,
+                value: connection?.ptr ?? connection,
             },
             {
                 type: { type: "int", size: 32, unsigned: false },
@@ -81,15 +87,16 @@ export class DBusObjectManagerClient {
             },
             {
                 type: { type: "gobject" },
-                value: getProxyTypeUserData,
+                value: getProxyTypeUserData?.ptr ?? getProxyTypeUserData,
             },
             {
                 type: { type: "gobject" },
-                value: getProxyTypeDestroyNotify,
+                value: getProxyTypeDestroyNotify?.ptr ??
+                    getProxyTypeDestroyNotify,
             },
             {
                 type: { type: "gobject" },
-                value: cancellable,
+                value: cancellable?.ptr ?? cancellable,
             },
         ], { type: "gobject", borrowed: true });
         const instance = Object.create(DBusObjectManagerClient.prototype);
@@ -101,7 +108,7 @@ export class DBusObjectManagerClient {
         return call("libgio-2.0.so.0", "g_dbus_object_manager_client_new_finish", [
             {
                 type: { type: "gobject" },
-                value: res,
+                value: res?.ptr ?? res,
             },
         ], { type: "gobject", borrowed: true });
     }
@@ -109,7 +116,7 @@ export class DBusObjectManagerClient {
         call("libgio-2.0.so.0", "g_dbus_object_manager_client_new", [
             {
                 type: { type: "gobject" },
-                value: connection,
+                value: connection?.ptr ?? connection,
             },
             {
                 type: { type: "int", size: 32, unsigned: false },
@@ -129,23 +136,24 @@ export class DBusObjectManagerClient {
             },
             {
                 type: { type: "gobject" },
-                value: getProxyTypeUserData,
+                value: getProxyTypeUserData?.ptr ?? getProxyTypeUserData,
             },
             {
                 type: { type: "gobject" },
-                value: getProxyTypeDestroyNotify,
+                value: getProxyTypeDestroyNotify?.ptr ??
+                    getProxyTypeDestroyNotify,
             },
             {
                 type: { type: "gobject" },
-                value: cancellable,
+                value: cancellable?.ptr ?? cancellable,
             },
             {
                 type: { type: "gobject" },
-                value: callback,
+                value: callback?.ptr ?? callback,
             },
             {
                 type: { type: "gobject" },
-                value: userData,
+                value: userData?.ptr ?? userData,
             },
         ], { type: "undefined" });
     }
@@ -173,33 +181,39 @@ export class DBusObjectManagerClient {
             },
             {
                 type: { type: "gobject" },
-                value: getProxyTypeUserData,
+                value: getProxyTypeUserData?.ptr ?? getProxyTypeUserData,
             },
             {
                 type: { type: "gobject" },
-                value: getProxyTypeDestroyNotify,
+                value: getProxyTypeDestroyNotify?.ptr ??
+                    getProxyTypeDestroyNotify,
             },
             {
                 type: { type: "gobject" },
-                value: cancellable,
+                value: cancellable?.ptr ?? cancellable,
             },
             {
                 type: { type: "gobject" },
-                value: callback,
+                value: callback?.ptr ?? callback,
             },
             {
                 type: { type: "gobject" },
-                value: userData,
+                value: userData?.ptr ?? userData,
             },
         ], { type: "undefined" });
     }
     getConnection() {
-        return call("libgio-2.0.so.0", "g_dbus_object_manager_client_get_connection", [
+        const ptr = call("libgio-2.0.so.0", "g_dbus_object_manager_client_get_connection", [
             {
                 type: { type: "gobject" },
                 value: this.ptr,
             },
         ], { type: "gobject", borrowed: true });
+        if (ptr === null)
+            return null;
+        const instance = Object.create(DBusConnection.prototype);
+        instance.ptr = ptr;
+        return instance;
     }
     getFlags() {
         return call("libgio-2.0.so.0", "g_dbus_object_manager_client_get_flags", [
@@ -249,12 +263,178 @@ export class DBusObjectManagerClient {
     get objectPath() {
         throw new Error("Property getters not yet implemented");
     }
+    initAsync(ioPriority, cancellable, callback, userData) {
+        call("libgio-2.0.so.0", "g_async_initable_init_async", [
+            {
+                type: { type: "gobject" },
+                value: this.ptr,
+            },
+            {
+                type: { type: "int", size: 32, unsigned: false },
+                value: ioPriority,
+            },
+            {
+                type: { type: "gobject" },
+                value: cancellable?.ptr ?? cancellable,
+            },
+            {
+                type: { type: "gobject" },
+                value: callback?.ptr ?? callback,
+            },
+            {
+                type: { type: "gobject" },
+                value: userData?.ptr ?? userData,
+            },
+        ], { type: "undefined" });
+    }
+    initFinish(res) {
+        const error = { value: null };
+        const result = call("libgio-2.0.so.0", "g_async_initable_init_finish", [
+            {
+                type: { type: "gobject" },
+                value: this.ptr,
+            },
+            {
+                type: { type: "gobject" },
+                value: res?.ptr ?? res,
+            },
+            {
+                type: {
+                    type: "ref",
+                    innerType: {
+                        type: "boxed",
+                        innerType: "GError",
+                        lib: "libglib-2.0.so.0",
+                    },
+                },
+                value: error,
+            },
+        ], { type: "boolean" });
+        if (error.value !== null) {
+            throw new NativeError(error.value);
+        }
+        return result;
+    }
+    newFinish(res) {
+        const error = { value: null };
+        const ptr = call("libgio-2.0.so.0", "g_async_initable_new_finish", [
+            {
+                type: { type: "gobject" },
+                value: this.ptr,
+            },
+            {
+                type: { type: "gobject" },
+                value: res?.ptr ?? res,
+            },
+            {
+                type: {
+                    type: "ref",
+                    innerType: {
+                        type: "boxed",
+                        innerType: "GError",
+                        lib: "libglib-2.0.so.0",
+                    },
+                },
+                value: error,
+            },
+        ], { type: "gobject", borrowed: true });
+        if (error.value !== null) {
+            throw new NativeError(error.value);
+        }
+        if (ptr === null)
+            return null;
+        const instance = Object.create(GObject.GObject.prototype);
+        instance.ptr = ptr;
+        return instance;
+    }
+    getInterface(objectPath, interfaceName) {
+        const ptr = call("libgio-2.0.so.0", "g_dbus_object_manager_get_interface", [
+            {
+                type: { type: "gobject" },
+                value: this.ptr,
+            },
+            {
+                type: { type: "string" },
+                value: objectPath,
+            },
+            {
+                type: { type: "string" },
+                value: interfaceName,
+            },
+        ], { type: "gobject", borrowed: true });
+        if (ptr === null)
+            return null;
+        const instance = Object.create(DBusInterface.prototype);
+        instance.ptr = ptr;
+        return instance;
+    }
+    getObject(objectPath) {
+        const ptr = call("libgio-2.0.so.0", "g_dbus_object_manager_get_object", [
+            {
+                type: { type: "gobject" },
+                value: this.ptr,
+            },
+            {
+                type: { type: "string" },
+                value: objectPath,
+            },
+        ], { type: "gobject", borrowed: true });
+        if (ptr === null)
+            return null;
+        const instance = Object.create(DBusObject.prototype);
+        instance.ptr = ptr;
+        return instance;
+    }
+    getObjectPath() {
+        return call("libgio-2.0.so.0", "g_dbus_object_manager_get_object_path", [
+            {
+                type: { type: "gobject" },
+                value: this.ptr,
+            },
+        ], { type: "string" });
+    }
+    getObjects() {
+        return call("libgio-2.0.so.0", "g_dbus_object_manager_get_objects", [
+            {
+                type: { type: "gobject" },
+                value: this.ptr,
+            },
+        ], { type: "gobject", borrowed: true });
+    }
+    init(cancellable) {
+        const error = { value: null };
+        const result = call("libgio-2.0.so.0", "g_initable_init", [
+            {
+                type: { type: "gobject" },
+                value: this.ptr,
+            },
+            {
+                type: { type: "gobject" },
+                value: cancellable?.ptr ?? cancellable,
+            },
+            {
+                type: {
+                    type: "ref",
+                    innerType: {
+                        type: "boxed",
+                        innerType: "GError",
+                        lib: "libglib-2.0.so.0",
+                    },
+                },
+                value: error,
+            },
+        ], { type: "boolean" });
+        if (error.value !== null) {
+            throw new NativeError(error.value);
+        }
+        return result;
+    }
     connect(signal, handler, after = false) {
         const signalMeta = {
             "interface-proxy-properties-changed": [
                 { type: { type: "gobject", borrowed: false }, cls: DBusObjectProxy },
                 { type: { type: "gobject", borrowed: false }, cls: DBusProxy },
-                { type: { type: "gobject", borrowed: false } },
+                { type: { type: "boxed", borrowed: false, innerType: "GVariant" } },
                 { type: { type: "array", itemType: { type: "string" } } },
             ],
             "interface-proxy-signal": [
@@ -262,7 +442,7 @@ export class DBusObjectManagerClient {
                 { type: { type: "gobject", borrowed: false }, cls: DBusProxy },
                 { type: { type: "string" } },
                 { type: { type: "string" } },
-                { type: { type: "gobject", borrowed: false } },
+                { type: { type: "boxed", borrowed: false, innerType: "GVariant" } },
             ],
         };
         const meta = signalMeta[signal];

package/dist/generated/gio/dbus-object-manager-server.d.ts

@@ -1,15 +1,23 @@
+import { DBusConnection } from "./dbus-connection.js";
+import { DBusInterface } from "./dbus-interface.js";
+import { DBusObject } from "./dbus-object.js";
+import { DBusObjectSkeleton } from "./dbus-object-skeleton.js";
 export declare class DBusObjectManagerServer {
     ptr: unknown;
     constructor(objectPath: string);
     constructor(_args: unknown[]);
     protected createPtr(_args: unknown[]): unknown;
-    export(object: unknown): void;
-    exportUniquely(object: unknown): void;
-    getConnection(): unknown;
-    isExported(object: unknown): boolean;
-    setConnection(connection?: unknown): void;
+    export(object: DBusObjectSkeleton): void;
+    exportUniquely(object: DBusObjectSkeleton): void;
+    getConnection(): DBusConnection;
+    isExported(object: DBusObjectSkeleton): boolean;
+    setConnection(connection?: DBusConnection): void;
     unexport(objectPath: string): boolean;
-    get connection(): unknown;
-    set connection(_value: unknown);
+    get connection(): DBusConnection;
+    set connection(_value: DBusConnection);
     get objectPath(): string;
+    getInterface(objectPath: string, interfaceName: string): DBusInterface;
+    getObject(objectPath: string): DBusObject;
+    getObjectPath(): string;
+    getObjects(): unknown;
 }

package/dist/generated/gio/dbus-object-manager-server.js

@@ -1,4 +1,7 @@
 import { call } from "@gtkx/native";
+import { DBusConnection } from "./dbus-connection.js";
+import { DBusInterface } from "./dbus-interface.js";
+import { DBusObject } from "./dbus-object.js";
 export class DBusObjectManagerServer {
     ptr;
     constructor(...args) {
@@ -22,7 +25,7 @@ export class DBusObjectManagerServer {
             },
             {
                 type: { type: "gobject" },
-                value: object,
+                value: object?.ptr ?? object,
             },
         ], { type: "undefined" });
     }
@@ -34,17 +37,22 @@ export class DBusObjectManagerServer {
             },
             {
                 type: { type: "gobject" },
-                value: object,
+                value: object?.ptr ?? object,
             },
         ], { type: "undefined" });
     }
     getConnection() {
-        return call("libgio-2.0.so.0", "g_dbus_object_manager_server_get_connection", [
+        const ptr = call("libgio-2.0.so.0", "g_dbus_object_manager_server_get_connection", [
             {
                 type: { type: "gobject" },
                 value: this.ptr,
             },
         ], { type: "gobject", borrowed: true });
+        if (ptr === null)
+            return null;
+        const instance = Object.create(DBusConnection.prototype);
+        instance.ptr = ptr;
+        return instance;
     }
     isExported(object) {
         return call("libgio-2.0.so.0", "g_dbus_object_manager_server_is_exported", [
@@ -54,7 +62,7 @@ export class DBusObjectManagerServer {
             },
             {
                 type: { type: "gobject" },
-                value: object,
+                value: object?.ptr ?? object,
             },
         ], { type: "boolean" });
     }
@@ -66,7 +74,7 @@ export class DBusObjectManagerServer {
             },
             {
                 type: { type: "gobject" },
-                value: connection,
+                value: connection?.ptr ?? connection,
             },
         ], { type: "undefined" });
     }
@@ -91,4 +99,58 @@ export class DBusObjectManagerServer {
     get objectPath() {
         throw new Error("Property getters not yet implemented");
     }
+    getInterface(objectPath, interfaceName) {
+        const ptr = call("libgio-2.0.so.0", "g_dbus_object_manager_get_interface", [
+            {
+                type: { type: "gobject" },
+                value: this.ptr,
+            },
+            {
+                type: { type: "string" },
+                value: objectPath,
+            },
+            {
+                type: { type: "string" },
+                value: interfaceName,
+            },
+        ], { type: "gobject", borrowed: true });
+        if (ptr === null)
+            return null;
+        const instance = Object.create(DBusInterface.prototype);
+        instance.ptr = ptr;
+        return instance;
+    }
+    getObject(objectPath) {
+        const ptr = call("libgio-2.0.so.0", "g_dbus_object_manager_get_object", [
+            {
+                type: { type: "gobject" },
+                value: this.ptr,
+            },
+            {
+                type: { type: "string" },
+                value: objectPath,
+            },
+        ], { type: "gobject", borrowed: true });
+        if (ptr === null)
+            return null;
+        const instance = Object.create(DBusObject.prototype);
+        instance.ptr = ptr;
+        return instance;
+    }
+    getObjectPath() {
+        return call("libgio-2.0.so.0", "g_dbus_object_manager_get_object_path", [
+            {
+                type: { type: "gobject" },
+                value: this.ptr,
+            },
+        ], { type: "string" });
+    }
+    getObjects() {
+        return call("libgio-2.0.so.0", "g_dbus_object_manager_get_objects", [
+            {
+                type: { type: "gobject" },
+                value: this.ptr,
+            },
+        ], { type: "gobject", borrowed: true });
+    }
 }

package/dist/generated/gio/dbus-object-manager.d.ts

@@ -1,8 +1,11 @@
-export declare abstract class DBusObjectManager {
-    protected abstract ptr: unknown;
-    getInterface(objectPath: string, interfaceName: string): unknown;
-    getObject(objectPath: string): unknown;
+import { DBusInterface } from "./dbus-interface.js";
+import { DBusObject } from "./dbus-object.js";
+export declare class DBusObjectManager {
+    ptr: unknown;
+    protected constructor(ptr: unknown);
+    static fromPtr(ptr: unknown): DBusObjectManager;
+    getInterface(objectPath: string, interfaceName: string): DBusInterface;
+    getObject(objectPath: string): DBusObject;
     getObjectPath(): string;
     getObjects(): unknown;
-    connect(signal: string, handler: (...args: unknown[]) => unknown, after?: boolean): number;
 }

package/dist/generated/gio/dbus-object-manager.js

@@ -1,7 +1,16 @@
 import { call } from "@gtkx/native";
+import { DBusInterface } from "./dbus-interface.js";
+import { DBusObject } from "./dbus-object.js";
 export class DBusObjectManager {
+    ptr;
+    constructor(ptr) {
+        this.ptr = ptr;
+    }
+    static fromPtr(ptr) {
+        return new DBusObjectManager(ptr);
+    }
     getInterface(objectPath, interfaceName) {
-        return call("libgio-2.0.so.0", "g_dbus_object_manager_get_interface", [
+        const ptr = call("libgio-2.0.so.0", "g_dbus_object_manager_get_interface", [
             {
                 type: { type: "gobject" },
                 value: this.ptr,
@@ -15,9 +24,14 @@ export class DBusObjectManager {
                 value: interfaceName,
             },
         ], { type: "gobject", borrowed: true });
+        if (ptr === null)
+            return null;
+        const instance = Object.create(DBusInterface.prototype);
+        instance.ptr = ptr;
+        return instance;
     }
     getObject(objectPath) {
-        return call("libgio-2.0.so.0", "g_dbus_object_manager_get_object", [
+        const ptr = call("libgio-2.0.so.0", "g_dbus_object_manager_get_object", [
             {
                 type: { type: "gobject" },
                 value: this.ptr,
@@ -27,6 +41,11 @@ export class DBusObjectManager {
                 value: objectPath,
             },
         ], { type: "gobject", borrowed: true });
+        if (ptr === null)
+            return null;
+        const instance = Object.create(DBusObject.prototype);
+        instance.ptr = ptr;
+        return instance;
     }
     getObjectPath() {
         return call("libgio-2.0.so.0", "g_dbus_object_manager_get_object_path", [
@@ -44,41 +63,4 @@ export class DBusObjectManager {
             },
         ], { type: "gobject", borrowed: true });
     }
-    connect(signal, handler, after = false) {
-        const signalMeta = {
-            "interface-added": [
-                { type: { type: "gobject", borrowed: false } },
-                { type: { type: "gobject", borrowed: false } },
-            ],
-            "interface-removed": [
-                { type: { type: "gobject", borrowed: false } },
-                { type: { type: "gobject", borrowed: false } },
-            ],
-            "object-added": [{ type: { type: "gobject", borrowed: false } }],
-            "object-removed": [{ type: { type: "gobject", borrowed: false } }],
-        };
-        const meta = signalMeta[signal];
-        const selfType = { type: "gobject", borrowed: false };
-        const argTypes = meta ? [selfType, ...meta.map((m) => m.type)] : [selfType];
-        const wrappedHandler = (...args) => {
-            const signalArgs = args.slice(1);
-            if (!meta)
-                return handler(...signalArgs);
-            const wrapped = meta.map((m, i) => {
-                if (m.cls && signalArgs[i] != null) {
-                    const inst = Object.create(m.cls.prototype);
-                    inst.ptr = signalArgs[i];
-                    return inst;
-                }
-                return signalArgs[i];
-            });
-            return handler(...wrapped);
-        };
-        return call("libgio-2.0.so.0", "g_signal_connect_closure", [
-            { type: { type: "gobject" }, value: this.ptr },
-            { type: { type: "string" }, value: signal },
-            { type: { type: "callback", argTypes }, value: wrappedHandler },
-            { type: { type: "boolean" }, value: after },
-        ], { type: "int", size: 64, unsigned: true });
-    }
 }

package/dist/generated/gio/dbus-object-proxy.d.ts

@@ -1,9 +1,14 @@
+import { DBusConnection } from "./dbus-connection.js";
+import { DBusInterface } from "./dbus-interface.js";
 export declare class DBusObjectProxy {
     ptr: unknown;
-    constructor(connection: unknown, objectPath: string);
+    constructor(connection: DBusConnection, objectPath: string);
     constructor(_args: unknown[]);
     protected createPtr(_args: unknown[]): unknown;
-    getConnection(): unknown;
-    get gConnection(): unknown;
+    getConnection(): DBusConnection;
+    get gConnection(): DBusConnection;
     get gObjectPath(): string;
+    getInterface(interfaceName: string): DBusInterface;
+    getInterfaces(): unknown;
+    getObjectPath(): string;
 }