@gtkx/ffi 0.1.12 → 0.1.15

package/dist/generated/gio/tls-connection.js

@@ -4,6 +4,12 @@ import { TlsDatabase } from "./tls-database.js";
 import { TlsInteraction } from "./tls-interaction.js";
 import { TlsCertificate } from "./tls-certificate.js";
 import { IOStream } from "./iostream.js";
+const SIGNAL_META = {
+    "accept-certificate": [
+        { type: { type: "gobject", borrowed: false }, cls: TlsCertificate },
+        { type: { type: "int", size: 32, unsigned: false } },
+    ],
+};
 export class TlsConnection extends IOStream {
     constructor(...args) {
         super(...args);
@@ -121,7 +127,7 @@ export class TlsConnection extends IOStream {
                 type: { type: "gobject" },
                 value: this.ptr,
             },
-        ], { type: "string" });
+        ], { type: "string", borrowed: true });
     }
     getPeerCertificate() {
         const ptr = call("libgio-2.0.so.0", "g_tls_connection_get_peer_certificate", [
@@ -221,8 +227,8 @@ export class TlsConnection extends IOStream {
                 value: callback?.ptr ?? callback,
             },
             {
-                type: { type: "gobject" },
-                value: userData?.ptr ?? userData,
+                type: { type: "int", size: 64, unsigned: true },
+                value: userData,
             },
         ], { type: "undefined" });
     }
@@ -339,26 +345,21 @@ export class TlsConnection extends IOStream {
         ], { type: "undefined" });
     }
     connect(signal, handler, after = false) {
-        const signalMeta = {
-            "accept-certificate": [
-                { type: { type: "gobject", borrowed: false }, cls: TlsCertificate },
-                { type: { type: "int", size: 32, unsigned: false } },
-            ],
-        };
-        const meta = signalMeta[signal];
-        const selfType = { type: "gobject", borrowed: false };
+        const meta = SIGNAL_META[signal];
+        const selfType = { type: "gobject", borrowed: true };
         const argTypes = meta ? [selfType, ...meta.map((m) => m.type)] : [selfType];
         const wrappedHandler = (...args) => {
+            const self = wrapPtr(args[0], TlsConnection);
             const signalArgs = args.slice(1);
             if (!meta)
-                return handler(...signalArgs);
+                return handler(self, ...signalArgs);
             const wrapped = meta.map((m, i) => {
                 if (m.cls && signalArgs[i] != null) {
                     return wrapPtr(signalArgs[i], m.cls);
                 }
                 return signalArgs[i];
             });
-            return handler(...wrapped);
+            return handler(self, ...wrapped);
         };
         return call("libgio-2.0.so.0", "g_signal_connect_closure", [
             { type: { type: "gobject" }, value: this.ptr },

package/dist/generated/gio/tls-database.d.ts

@@ -9,17 +9,17 @@ import * as GObject from "../gobject/index.js";
 export declare class TlsDatabase extends GObject.GObject {
     constructor(...args: unknown[]);
     protected createPtr(_args: unknown[]): unknown;
-    createCertificateHandle(certificate: TlsCertificate): string;
-    lookupCertificateForHandle(handle: string, flags: TlsDatabaseLookupFlags, interaction?: TlsInteraction, cancellable?: Cancellable): TlsCertificate;
-    lookupCertificateForHandleAsync(handle: string, flags: TlsDatabaseLookupFlags, interaction?: TlsInteraction, cancellable?: Cancellable, callback?: unknown, userData?: unknown): void;
+    createCertificateHandle(certificate: TlsCertificate): string | null;
+    lookupCertificateForHandle(handle: string, flags: TlsDatabaseLookupFlags, interaction?: TlsInteraction | null, cancellable?: Cancellable | null): TlsCertificate | null;
+    lookupCertificateForHandleAsync(handle: string, flags: TlsDatabaseLookupFlags, interaction?: TlsInteraction | null, cancellable?: Cancellable | null, callback?: unknown | null, userData?: number | null): void;
     lookupCertificateForHandleFinish(result: AsyncResult): TlsCertificate;
-    lookupCertificateIssuer(certificate: TlsCertificate, flags: TlsDatabaseLookupFlags, interaction?: TlsInteraction, cancellable?: Cancellable): TlsCertificate;
-    lookupCertificateIssuerAsync(certificate: TlsCertificate, flags: TlsDatabaseLookupFlags, interaction?: TlsInteraction, cancellable?: Cancellable, callback?: unknown, userData?: unknown): void;
+    lookupCertificateIssuer(certificate: TlsCertificate, flags: TlsDatabaseLookupFlags, interaction?: TlsInteraction | null, cancellable?: Cancellable | null): TlsCertificate;
+    lookupCertificateIssuerAsync(certificate: TlsCertificate, flags: TlsDatabaseLookupFlags, interaction?: TlsInteraction | null, cancellable?: Cancellable | null, callback?: unknown | null, userData?: number | null): void;
     lookupCertificateIssuerFinish(result: AsyncResult): TlsCertificate;
-    lookupCertificatesIssuedBy(issuerRawDn: GLib.ByteArray, flags: TlsDatabaseLookupFlags, interaction?: TlsInteraction, cancellable?: Cancellable): unknown;
-    lookupCertificatesIssuedByAsync(issuerRawDn: GLib.ByteArray, flags: TlsDatabaseLookupFlags, interaction?: TlsInteraction, cancellable?: Cancellable, callback?: unknown, userData?: unknown): void;
-    lookupCertificatesIssuedByFinish(result: AsyncResult): unknown;
-    verifyChain(chain: TlsCertificate, purpose: string, flags: TlsDatabaseVerifyFlags, identity?: SocketConnectable, interaction?: TlsInteraction, cancellable?: Cancellable): TlsCertificateFlags;
-    verifyChainAsync(chain: TlsCertificate, purpose: string, flags: TlsDatabaseVerifyFlags, identity?: SocketConnectable, interaction?: TlsInteraction, cancellable?: Cancellable, callback?: unknown, userData?: unknown): void;
+    lookupCertificatesIssuedBy(issuerRawDn: GLib.ByteArray, flags: TlsDatabaseLookupFlags, interaction?: TlsInteraction | null, cancellable?: Cancellable | null): TlsCertificate[];
+    lookupCertificatesIssuedByAsync(issuerRawDn: GLib.ByteArray, flags: TlsDatabaseLookupFlags, interaction?: TlsInteraction | null, cancellable?: Cancellable | null, callback?: unknown | null, userData?: number | null): void;
+    lookupCertificatesIssuedByFinish(result: AsyncResult): TlsCertificate[];
+    verifyChain(chain: TlsCertificate, purpose: string, flags: TlsDatabaseVerifyFlags, identity?: SocketConnectable | null, interaction?: TlsInteraction | null, cancellable?: Cancellable | null): TlsCertificateFlags;
+    verifyChainAsync(chain: TlsCertificate, purpose: string, flags: TlsDatabaseVerifyFlags, identity?: SocketConnectable | null, interaction?: TlsInteraction | null, cancellable?: Cancellable | null, callback?: unknown | null, userData?: number | null): void;
     verifyChainFinish(result: AsyncResult): TlsCertificateFlags;
 }

package/dist/generated/gio/tls-database.js

@@ -98,8 +98,8 @@ export class TlsDatabase extends GObject.GObject {
                 value: callback?.ptr ?? callback,
             },
             {
-                type: { type: "gobject" },
-                value: userData?.ptr ?? userData,
+                type: { type: "int", size: 64, unsigned: true },
+                value: userData,
             },
         ], { type: "undefined" });
     }
@@ -129,8 +129,6 @@ export class TlsDatabase extends GObject.GObject {
         if (error.value !== null) {
             throw new NativeError(error.value);
         }
-        if (ptr === null)
-            return null;
         return wrapPtr(ptr, TlsCertificate);
     }
     lookupCertificateIssuer(certificate, flags, interaction, cancellable) {
@@ -171,8 +169,6 @@ export class TlsDatabase extends GObject.GObject {
         if (error.value !== null) {
             throw new NativeError(error.value);
         }
-        if (ptr === null)
-            return null;
         return wrapPtr(ptr, TlsCertificate);
     }
     lookupCertificateIssuerAsync(certificate, flags, interaction, cancellable, callback, userData) {
@@ -202,8 +198,8 @@ export class TlsDatabase extends GObject.GObject {
                 value: callback?.ptr ?? callback,
             },
             {
-                type: { type: "gobject" },
-                value: userData?.ptr ?? userData,
+                type: { type: "int", size: 64, unsigned: true },
+                value: userData,
             },
         ], { type: "undefined" });
     }
@@ -233,8 +229,6 @@ export class TlsDatabase extends GObject.GObject {
         if (error.value !== null) {
             throw new NativeError(error.value);
         }
-        if (ptr === null)
-            return null;
         return wrapPtr(ptr, TlsCertificate);
     }
     lookupCertificatesIssuedBy(issuerRawDn, flags, interaction, cancellable) {
@@ -275,7 +269,7 @@ export class TlsDatabase extends GObject.GObject {
                 },
                 value: error,
             },
-        ], { type: "gobject", borrowed: true });
+        ], { type: "array", itemType: { type: "gobject" } });
         if (error.value !== null) {
             throw new NativeError(error.value);
         }
@@ -312,8 +306,8 @@ export class TlsDatabase extends GObject.GObject {
                 value: callback?.ptr ?? callback,
             },
             {
-                type: { type: "gobject" },
-                value: userData?.ptr ?? userData,
+                type: { type: "int", size: 64, unsigned: true },
+                value: userData,
             },
         ], { type: "undefined" });
     }
@@ -339,7 +333,7 @@ export class TlsDatabase extends GObject.GObject {
                 },
                 value: error,
             },
-        ], { type: "gobject", borrowed: true });
+        ], { type: "array", itemType: { type: "gobject" } });
         if (error.value !== null) {
             throw new NativeError(error.value);
         }
@@ -428,8 +422,8 @@ export class TlsDatabase extends GObject.GObject {
                 value: callback?.ptr ?? callback,
             },
             {
-                type: { type: "gobject" },
-                value: userData?.ptr ?? userData,
+                type: { type: "int", size: 64, unsigned: true },
+                value: userData,
             },
         ], { type: "undefined" });
     }

package/dist/generated/gio/tls-interaction.d.ts

@@ -7,12 +7,12 @@ import * as GObject from "../gobject/index.js";
 export declare class TlsInteraction extends GObject.GObject {
     constructor(...args: unknown[]);
     protected createPtr(_args: unknown[]): unknown;
-    askPassword(password: TlsPassword, cancellable?: Cancellable): TlsInteractionResult;
-    askPasswordAsync(password: TlsPassword, cancellable?: Cancellable, callback?: unknown, userData?: unknown): void;
+    askPassword(password: TlsPassword, cancellable?: Cancellable | null): TlsInteractionResult;
+    askPasswordAsync(password: TlsPassword, cancellable?: Cancellable | null, callback?: unknown | null, userData?: number | null): void;
     askPasswordFinish(result: AsyncResult): TlsInteractionResult;
-    invokeAskPassword(password: TlsPassword, cancellable?: Cancellable): TlsInteractionResult;
-    invokeRequestCertificate(connection: TlsConnection, flags: TlsCertificateRequestFlags, cancellable?: Cancellable): TlsInteractionResult;
-    requestCertificate(connection: TlsConnection, flags: TlsCertificateRequestFlags, cancellable?: Cancellable): TlsInteractionResult;
-    requestCertificateAsync(connection: TlsConnection, flags: TlsCertificateRequestFlags, cancellable?: Cancellable, callback?: unknown, userData?: unknown): void;
+    invokeAskPassword(password: TlsPassword, cancellable?: Cancellable | null): TlsInteractionResult;
+    invokeRequestCertificate(connection: TlsConnection, flags: TlsCertificateRequestFlags, cancellable?: Cancellable | null): TlsInteractionResult;
+    requestCertificate(connection: TlsConnection, flags: TlsCertificateRequestFlags, cancellable?: Cancellable | null): TlsInteractionResult;
+    requestCertificateAsync(connection: TlsConnection, flags: TlsCertificateRequestFlags, cancellable?: Cancellable | null, callback?: unknown | null, userData?: number | null): void;
     requestCertificateFinish(result: AsyncResult): TlsInteractionResult;
 }

package/dist/generated/gio/tls-interaction.js

@@ -67,8 +67,8 @@ export class TlsInteraction extends GObject.GObject {
                 value: callback?.ptr ?? callback,
             },
             {
-                type: { type: "gobject" },
-                value: userData?.ptr ?? userData,
+                type: { type: "int", size: 64, unsigned: true },
+                value: userData,
             },
         ], { type: "undefined" });
     }
@@ -227,8 +227,8 @@ export class TlsInteraction extends GObject.GObject {
                 value: callback?.ptr ?? callback,
             },
             {
-                type: { type: "gobject" },
-                value: userData?.ptr ?? userData,
+                type: { type: "int", size: 64, unsigned: true },
+                value: userData,
             },
         ], { type: "undefined" });
     }

package/dist/generated/gio/tls-password.d.ts

@@ -7,11 +7,11 @@ export declare class TlsPassword extends GObject.GObject {
     protected createPtr(args: unknown[]): unknown;
     getDescription(): string;
     getFlags(): TlsPasswordFlags;
-    getValue(length?: Ref<unknown>): number[];
+    getValue(length?: Ref<number> | null): number[];
     getWarning(): string;
     setDescription(description: string): void;
     setFlags(flags: TlsPasswordFlags): void;
-    setValue(value: number[], length: unknown): void;
-    setValueFull(value: number[], length: unknown, destroy?: unknown): void;
+    setValue(value: number[], length: number): void;
+    setValueFull(value: number[], length: number, destroy?: () => void | null): void;
     setWarning(warning: string): void;
 }

package/dist/generated/gio/tls-password.js

@@ -15,7 +15,7 @@ export class TlsPassword extends GObject.GObject {
                 type: { type: "string" },
                 value: description,
             },
-        ], { type: "gobject", borrowed: true });
+        ], { type: "gobject", borrowed: false });
     }
     getDescription() {
         return call("libgio-2.0.so.0", "g_tls_password_get_description", [
@@ -23,7 +23,7 @@ export class TlsPassword extends GObject.GObject {
                 type: { type: "gobject" },
                 value: this.ptr,
             },
-        ], { type: "string" });
+        ], { type: "string", borrowed: true });
     }
     getFlags() {
         return call("libgio-2.0.so.0", "g_tls_password_get_flags", [
@@ -40,7 +40,10 @@ export class TlsPassword extends GObject.GObject {
                 value: this.ptr,
             },
             {
-                type: { type: "ref", innerType: { type: "gobject" } },
+                type: {
+                    type: "ref",
+                    innerType: { type: "int", size: 64, unsigned: true },
+                },
                 value: length,
             },
         ], { type: "array", itemType: { type: "int", size: 8, unsigned: true } });
@@ -51,7 +54,7 @@ export class TlsPassword extends GObject.GObject {
                 type: { type: "gobject" },
                 value: this.ptr,
             },
-        ], { type: "string" });
+        ], { type: "string", borrowed: true });
     }
     setDescription(description) {
         call("libgio-2.0.so.0", "g_tls_password_set_description", [
@@ -91,8 +94,8 @@ export class TlsPassword extends GObject.GObject {
                 value: value,
             },
             {
-                type: { type: "gobject" },
-                value: length?.ptr ?? length,
+                type: { type: "int", size: 64, unsigned: false },
+                value: length,
             },
         ], { type: "undefined" });
     }
@@ -110,12 +113,12 @@ export class TlsPassword extends GObject.GObject {
                 value: value,
             },
             {
-                type: { type: "gobject" },
-                value: length?.ptr ?? length,
+                type: { type: "int", size: 64, unsigned: false },
+                value: length,
             },
             {
-                type: { type: "gobject" },
-                value: destroy?.ptr ?? destroy,
+                type: { type: "callback", trampoline: "destroy" },
+                value: destroy,
             },
         ], { type: "undefined" });
     }

package/dist/generated/gio/unix-connection.d.ts

@@ -5,12 +5,12 @@ import { SocketConnection } from "./socket-connection.js";
 export declare class UnixConnection extends SocketConnection {
     constructor(...args: unknown[]);
     protected createPtr(_args: unknown[]): unknown;
-    receiveCredentials(cancellable?: Cancellable): Credentials;
-    receiveCredentialsAsync(cancellable?: Cancellable, callback?: unknown, userData?: unknown): void;
+    receiveCredentials(cancellable?: Cancellable | null): Credentials;
+    receiveCredentialsAsync(cancellable?: Cancellable | null, callback?: unknown | null, userData?: number | null): void;
     receiveCredentialsFinish(result: AsyncResult): Credentials;
-    receiveFd(cancellable?: Cancellable): number;
-    sendCredentials(cancellable?: Cancellable): boolean;
-    sendCredentialsAsync(cancellable?: Cancellable, callback?: unknown, userData?: unknown): void;
+    receiveFd(cancellable?: Cancellable | null): number;
+    sendCredentials(cancellable?: Cancellable | null): boolean;
+    sendCredentialsAsync(cancellable?: Cancellable | null, callback?: unknown | null, userData?: number | null): void;
     sendCredentialsFinish(result: AsyncResult): boolean;
-    sendFd(fd: number, cancellable?: Cancellable): boolean;
+    sendFd(fd: number, cancellable?: Cancellable | null): boolean;
 }

package/dist/generated/gio/unix-connection.js

@@ -43,8 +43,6 @@ export class UnixConnection extends SocketConnection {
         if (error.value !== null) {
             throw new NativeError(error.value);
         }
-        if (ptr === null)
-            return null;
         return wrapPtr(ptr, Credentials);
     }
     receiveCredentialsAsync(cancellable, callback, userData) {
@@ -62,8 +60,8 @@ export class UnixConnection extends SocketConnection {
                 value: callback?.ptr ?? callback,
             },
             {
-                type: { type: "gobject" },
-                value: userData?.ptr ?? userData,
+                type: { type: "int", size: 64, unsigned: true },
+                value: userData,
             },
         ], { type: "undefined" });
     }
@@ -93,8 +91,6 @@ export class UnixConnection extends SocketConnection {
         if (error.value !== null) {
             throw new NativeError(error.value);
         }
-        if (ptr === null)
-            return null;
         return wrapPtr(ptr, Credentials);
     }
     receiveFd(cancellable) {
@@ -168,8 +164,8 @@ export class UnixConnection extends SocketConnection {
                 value: callback?.ptr ?? callback,
             },
             {
-                type: { type: "gobject" },
-                value: userData?.ptr ?? userData,
+                type: { type: "int", size: 64, unsigned: true },
+                value: userData,
             },
         ], { type: "undefined" });
     }

package/dist/generated/gio/unix-credentials-message.js

@@ -12,13 +12,13 @@ export class UnixCredentialsMessage extends SocketControlMessage {
                 type: { type: "gobject" },
                 value: credentials?.ptr ?? credentials,
             },
-        ], { type: "gobject", borrowed: true });
+        ], { type: "gobject", borrowed: false });
         return wrapPtr(ptr, UnixCredentialsMessage);
     }
     createPtr(_args) {
         return call("libgio-2.0.so.0", "g_unix_credentials_message_new", [], {
             type: "gobject",
-            borrowed: true,
+            borrowed: false,
         });
     }
     static isSupported() {
@@ -31,8 +31,6 @@ export class UnixCredentialsMessage extends SocketControlMessage {
                 value: this.ptr,
             },
         ], { type: "gobject", borrowed: true });
-        if (ptr === null)
-            return null;
         return wrapPtr(ptr, Credentials);
     }
 }

package/dist/generated/gio/unix-fdlist.d.ts

@@ -7,6 +7,6 @@ export declare class UnixFDList extends GObject.GObject {
     append(fd: number): number;
     get(index_: number): number;
     getLength(): number;
-    peekFds(length?: Ref<number>): number[];
-    stealFds(length?: Ref<number>): number[];
+    peekFds(length?: Ref<number> | null): number[];
+    stealFds(length?: Ref<number> | null): number[];
 }

package/dist/generated/gio/unix-fdlist.js

@@ -18,13 +18,13 @@ export class UnixFDList extends GObject.GObject {
                 type: { type: "int", size: 32, unsigned: false },
                 value: nFds,
             },
-        ], { type: "gobject", borrowed: true });
+        ], { type: "gobject", borrowed: false });
         return wrapPtr(ptr, UnixFDList);
     }
     createPtr(_args) {
         return call("libgio-2.0.so.0", "g_unix_fd_list_new", [], {
             type: "gobject",
-            borrowed: true,
+            borrowed: false,
         });
     }
     append(fd) {

package/dist/generated/gio/unix-socket-address.d.ts

@@ -10,5 +10,5 @@ export declare class UnixSocketAddress extends SocketAddress {
     getAddressType(): UnixSocketAddressType;
     getIsAbstract(): boolean;
     getPath(): string;
-    getPathLen(): unknown;
+    getPathLen(): number;
 }

package/dist/generated/gio/unix-socket-address.js

@@ -18,7 +18,7 @@ export class UnixSocketAddress extends SocketAddress {
                 type: { type: "int", size: 32, unsigned: false },
                 value: pathLen,
             },
-        ], { type: "gobject", borrowed: true });
+        ], { type: "gobject", borrowed: false });
         return wrapPtr(ptr, UnixSocketAddress);
     }
     static socketAddressNewWithType(path, pathLen, type) {
@@ -38,7 +38,7 @@ export class UnixSocketAddress extends SocketAddress {
                 type: { type: "int", size: 32, unsigned: false },
                 value: type,
             },
-        ], { type: "gobject", borrowed: true });
+        ], { type: "gobject", borrowed: false });
         return wrapPtr(ptr, UnixSocketAddress);
     }
     createPtr(args) {
@@ -48,7 +48,7 @@ export class UnixSocketAddress extends SocketAddress {
                 type: { type: "string" },
                 value: path,
             },
-        ], { type: "gobject", borrowed: true });
+        ], { type: "gobject", borrowed: false });
     }
     static abstractNamesSupported() {
         return call("libgio-2.0.so.0", "g_unix_socket_address_abstract_names_supported", [], { type: "boolean" });
@@ -75,7 +75,7 @@ export class UnixSocketAddress extends SocketAddress {
                 type: { type: "gobject" },
                 value: this.ptr,
             },
-        ], { type: "string" });
+        ], { type: "string", borrowed: true });
     }
     getPathLen() {
         return call("libgio-2.0.so.0", "g_unix_socket_address_get_path_len", [
@@ -83,6 +83,6 @@ export class UnixSocketAddress extends SocketAddress {
                 type: { type: "gobject" },
                 value: this.ptr,
             },
-        ], { type: "gobject", borrowed: true });
+        ], { type: "int", size: 64, unsigned: true });
     }
 }

package/dist/generated/gio/vfs.d.ts

@@ -10,6 +10,6 @@ export declare class Vfs extends GObject.GObject {
     getSupportedUriSchemes(): string[];
     isActive(): boolean;
     parseName(parseName: string): File;
-    registerUriScheme(scheme: string, uriFunc?: (...args: unknown[]) => unknown, uriData?: unknown, uriDestroy?: unknown, parseNameFunc?: (...args: unknown[]) => unknown, parseNameData?: unknown, parseNameDestroy?: unknown): boolean;
+    registerUriScheme(scheme: string, uriFunc?: (...args: unknown[]) => unknown | null, uriData?: number | null, uriDestroy?: () => void | null, parseNameFunc?: (...args: unknown[]) => unknown | null, parseNameData?: number | null, parseNameDestroy?: () => void | null): boolean;
     unregisterUriScheme(scheme: string): boolean;
 }

package/dist/generated/gio/vfs.js

@@ -42,8 +42,6 @@ export class Vfs extends GObject.GObject {
                 value: path,
             },
         ], { type: "gobject", borrowed: true });
-        if (ptr === null)
-            return null;
         return wrapPtr(ptr, File);
     }
     getFileForUri(uri) {
@@ -57,8 +55,6 @@ export class Vfs extends GObject.GObject {
                 value: uri,
             },
         ], { type: "gobject", borrowed: true });
-        if (ptr === null)
-            return null;
         return wrapPtr(ptr, File);
     }
     getSupportedUriSchemes() {
@@ -88,8 +84,6 @@ export class Vfs extends GObject.GObject {
                 value: parseName,
             },
         ], { type: "gobject", borrowed: true });
-        if (ptr === null)
-            return null;
         return wrapPtr(ptr, File);
     }
     registerUriScheme(scheme, uriFunc, uriData, uriDestroy, parseNameFunc, parseNameData, parseNameDestroy) {
@@ -107,24 +101,24 @@ export class Vfs extends GObject.GObject {
                 value: uriFunc,
             },
             {
-                type: { type: "gobject" },
-                value: uriData?.ptr ?? uriData,
+                type: { type: "int", size: 64, unsigned: true },
+                value: uriData,
             },
             {
-                type: { type: "gobject" },
-                value: uriDestroy?.ptr ?? uriDestroy,
+                type: { type: "callback", trampoline: "destroy" },
+                value: uriDestroy,
             },
             {
                 type: { type: "callback" },
                 value: parseNameFunc,
             },
             {
-                type: { type: "gobject" },
-                value: parseNameData?.ptr ?? parseNameData,
+                type: { type: "int", size: 64, unsigned: true },
+                value: parseNameData,
             },
             {
-                type: { type: "gobject" },
-                value: parseNameDestroy?.ptr ?? parseNameDestroy,
+                type: { type: "callback", trampoline: "destroy" },
+                value: parseNameDestroy,
             },
         ], { type: "boolean" });
     }

package/dist/generated/gio/volume-monitor.d.ts

@@ -1,3 +1,4 @@
+import { Drive } from "./drive.js";
 import { Mount } from "./mount.js";
 import { Volume } from "./volume.js";
 import * as GObject from "../gobject/index.js";
@@ -6,10 +7,9 @@ export declare class VolumeMonitor extends GObject.GObject {
     protected createPtr(_args: unknown[]): unknown;
     static adoptOrphanMount(mount: Mount): Volume;
     static get(): VolumeMonitor;
-    getConnectedDrives(): unknown;
-    getMountForUuid(uuid: string): Mount;
-    getMounts(): unknown;
-    getVolumeForUuid(uuid: string): Volume;
-    getVolumes(): unknown;
-    connect(signal: string, handler: (...args: unknown[]) => unknown, after?: boolean): number;
+    getConnectedDrives(): Drive[];
+    getMountForUuid(uuid: string): Mount | null;
+    getMounts(): Mount[];
+    getVolumeForUuid(uuid: string): Volume | null;
+    getVolumes(): Volume[];
 }

package/dist/generated/gio/volume-monitor.js

@@ -39,7 +39,7 @@ export class VolumeMonitor extends GObject.GObject {
                 type: { type: "gobject" },
                 value: this.ptr,
             },
-        ], { type: "gobject", borrowed: true });
+        ], { type: "array", itemType: { type: "gobject" } });
     }
     getMountForUuid(uuid) {
         const ptr = call("libgio-2.0.so.0", "g_volume_monitor_get_mount_for_uuid", [
@@ -62,7 +62,7 @@ export class VolumeMonitor extends GObject.GObject {
                 type: { type: "gobject" },
                 value: this.ptr,
             },
-        ], { type: "gobject", borrowed: true });
+        ], { type: "array", itemType: { type: "gobject" } });
     }
     getVolumeForUuid(uuid) {
         const ptr = call("libgio-2.0.so.0", "g_volume_monitor_get_volume_for_uuid", [
@@ -85,43 +85,6 @@ export class VolumeMonitor extends GObject.GObject {
                 type: { type: "gobject" },
                 value: this.ptr,
             },
-        ], { type: "gobject", borrowed: true });
-    }
-    connect(signal, handler, after = false) {
-        const signalMeta = {
-            "drive-changed": [{ type: { type: "gobject", borrowed: false } }],
-            "drive-connected": [{ type: { type: "gobject", borrowed: false } }],
-            "drive-disconnected": [{ type: { type: "gobject", borrowed: false } }],
-            "drive-eject-button": [{ type: { type: "gobject", borrowed: false } }],
-            "drive-stop-button": [{ type: { type: "gobject", borrowed: false } }],
-            "mount-added": [{ type: { type: "gobject", borrowed: false } }],
-            "mount-changed": [{ type: { type: "gobject", borrowed: false } }],
-            "mount-pre-unmount": [{ type: { type: "gobject", borrowed: false } }],
-            "mount-removed": [{ type: { type: "gobject", borrowed: false } }],
-            "volume-added": [{ type: { type: "gobject", borrowed: false } }],
-            "volume-changed": [{ type: { type: "gobject", borrowed: false } }],
-            "volume-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) {
-                    return wrapPtr(signalArgs[i], m.cls);
-                }
-                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 });
+        ], { type: "array", itemType: { type: "gobject" } });
     }
 }