@gtkx/ffi 0.4.1 → 0.4.3

package/dist/codegen/ffi-generator.d.ts

@@ -107,10 +107,18 @@ export declare class CodeGenerator {
     private generateIndex;
     private generateParameterList;
     private generateCallArguments;
+    private identifyGtkAllocatesRefs;
+    private generateRefRewrapCode;
     private generateErrorArgument;
     private generateErrorCheck;
     private generateTypeDescriptor;
     private generateImports;
     private formatCode;
+    private generateCyclicTypeReturn;
+    /**
+     * Adds a catch-all signal handler overload.
+     * Uses `any` for TypeScript compatibility with typed overloads.
+     */
+    private addSignalCatchAllOverload;
 }
 export {};

package/dist/codegen/ffi-generator.js

@@ -201,7 +201,22 @@ const parseParentReference = (parent, classMap) => {
     }
     return { hasParent: false, isCrossNamespace: false, className: "", extendsClause: "" };
 };
-const hasOutParameter = (params) => params.some((p) => p.direction === "out" || p.direction === "inout");
+const hasRefParameter = (params, typeMapper) => {
+    const savedSameNamespace = typeMapper.getSameNamespaceClassUsageCallback();
+    const savedExternal = typeMapper.getExternalTypeUsageCallback();
+    const savedRecord = typeMapper.getRecordUsageCallback();
+    const savedEnum = typeMapper.getEnumUsageCallback();
+    typeMapper.setSameNamespaceClassUsageCallback(null);
+    typeMapper.setExternalTypeUsageCallback(null);
+    typeMapper.setRecordUsageCallback(null);
+    typeMapper.setEnumUsageCallback(null);
+    const result = params.some((p) => typeMapper.mapParameter(p).ts.startsWith("Ref<"));
+    typeMapper.setSameNamespaceClassUsageCallback(savedSameNamespace);
+    typeMapper.setExternalTypeUsageCallback(savedExternal);
+    typeMapper.setRecordUsageCallback(savedRecord);
+    typeMapper.setEnumUsageCallback(savedEnum);
+    return result;
+};
 const isVararg = (param) => param.name === "..." || param.name === "";
 const cTypeToGetTypeFunc = (cType) => {
     const snakeCase = cType.replace(/([a-z])([A-Z])/g, "$1_$2").toLowerCase();
@@ -385,10 +400,10 @@ export class CodeGenerator {
         const syncMethods = filteredClassMethods.filter((m) => !asyncMethods.has(m.name) && !finishMethods.has(m.name));
         const syncInterfaceMethods = interfaceMethods.filter((m) => !asyncMethods.has(m.name) && !finishMethods.has(m.name));
         this.usesRef =
-            syncMethods.some((m) => hasOutParameter(m.parameters)) ||
-                cls.constructors.some((c) => hasOutParameter(c.parameters)) ||
-                cls.functions.some((f) => hasOutParameter(f.parameters)) ||
-                syncInterfaceMethods.some((m) => hasOutParameter(m.parameters));
+            syncMethods.some((m) => hasRefParameter(m.parameters, this.typeMapper)) ||
+                cls.constructors.some((c) => hasRefParameter(c.parameters, this.typeMapper)) ||
+                cls.functions.some((f) => hasRefParameter(f.parameters, this.typeMapper)) ||
+                syncInterfaceMethods.some((m) => hasRefParameter(m.parameters, this.typeMapper));
         const hasNonVarargConstructor = cls.constructors.some((c) => !c.parameters.some(isVararg));
         const needsGObjectNewFallback = !hasNonVarargConstructor && !!cls.parent && !!cls.cType;
         this.usesCall =
@@ -735,6 +750,7 @@ ${args}
         const resultVarName = hasResultParam ? "_result" : "result";
         const needsCast = rawReturnType !== "void" && rawReturnType !== "unknown";
         const hasReturnValue = rawReturnType !== "void";
+        const gtkAllocatesRefs = this.identifyGtkAllocatesRefs(func.parameters);
         const lines = [];
         const funcDoc = formatMethodDoc(func.doc, func.parameters);
         if (funcDoc) {
@@ -760,10 +776,13 @@ ${allArgs ? `${allArgs},` : ""}
             if (func.throws) {
                 lines.push(this.generateErrorCheck());
             }
+            lines.push(...this.generateRefRewrapCode(gtkAllocatesRefs));
             lines.push(`    return getObject(ptr) as ${className};`);
         }
         else {
-            const callPrefix = func.throws
+            const hasRefRewrap = gtkAllocatesRefs.length > 0;
+            const needsResultVar = func.throws || hasRefRewrap;
+            const callPrefix = needsResultVar
                 ? hasReturnValue
                     ? `const ${resultVarName} = `
                     : ""
@@ -780,9 +799,10 @@ ${allArgs ? `${allArgs},` : ""}
     )${needsCast ? ` as ${rawReturnType}` : ""};`);
             if (func.throws) {
                 lines.push(this.generateErrorCheck());
-                if (hasReturnValue) {
-                    lines.push(`    return ${resultVarName};`);
-                }
+            }
+            lines.push(...this.generateRefRewrapCode(gtkAllocatesRefs));
+            if (needsResultVar && hasReturnValue) {
+                lines.push(`    return ${resultVarName};`);
             }
         }
         lines.push(`  }`);
@@ -828,12 +848,6 @@ ${allArgs ? `${allArgs},` : ""}
         const finishMethod = this.findFinishMethod(method, allMethods);
         if (!finishMethod)
             return null;
-        let methodName = toCamelCase(method.name);
-        if (className) {
-            const renamed = getRenamedMethod(this.options.namespace, className, methodName);
-            if (renamed)
-                methodName = renamed;
-        }
         const paramsWithoutCallback = method.parameters.filter((p, i) => !isVararg(p) &&
             p.type.name !== "Gio.AsyncReadyCallback" &&
             !this.typeMapper.isClosureTarget(i, method.parameters));
@@ -849,6 +863,12 @@ ${allArgs ? `${allArgs},` : ""}
         if (hasRequiredAfterOptional) {
             return null;
         }
+        let methodName = toCamelCase(method.name);
+        if (className) {
+            const renamed = getRenamedMethod(this.options.namespace, className, methodName);
+            if (renamed)
+                methodName = renamed;
+        }
         const params = paramsWithoutCallback
             .map((p) => {
             const mapped = this.typeMapper.mapParameter(p);
@@ -1072,7 +1092,7 @@ ${allArgs ? `${allArgs},` : ""}
             returnTypeMapping.ffi.itemType?.type === "gobject" &&
             baseReturnType.endsWith("[]");
         const hasReturnValue = returnTypeMapping.ts !== "void";
-        // For records (boxed types), use "boxed" type with innerType; for classes, use "gobject"
+        const gtkAllocatesRefs = this.identifyGtkAllocatesRefs(method.parameters);
         const selfTypeDescriptor = isRecord && className
             ? `{ type: "boxed", borrowed: true, innerType: "${className}", lib: "${sharedLibrary}" }`
             : `{ type: "gobject" }`;
@@ -1105,13 +1125,12 @@ ${allArgs ? `${allArgs},` : ""}
             if (method.throws) {
                 lines.push(this.generateErrorCheck());
             }
+            lines.push(...this.generateRefRewrapCode(gtkAllocatesRefs));
             if (isNullable) {
                 lines.push(`    if (ptr === null) return null;`);
             }
             if (isCyclic) {
-                // For cyclic types, return a minimal NativeObject wrapper. Cast is necessary
-                // because the full type interface isn't available without circular imports.
-                lines.push(`    return { id: ptr } as unknown as ${baseReturnType};`);
+                lines.push(this.generateCyclicTypeReturn(baseReturnType));
             }
             else {
                 this.usesGetObject = true;
@@ -1136,10 +1155,13 @@ ${allArgs ? `${allArgs},` : ""}
             if (method.throws) {
                 lines.push(this.generateErrorCheck());
             }
+            lines.push(...this.generateRefRewrapCode(gtkAllocatesRefs));
             lines.push(`    return ptrs.map(ptr => getObject(ptr) as ${elementType});`);
         }
         else {
-            const callPrefix = method.throws
+            const hasRefRewrap = gtkAllocatesRefs.length > 0;
+            const needsResultVar = method.throws || hasRefRewrap;
+            const callPrefix = needsResultVar
                 ? hasReturnValue
                     ? `const ${resultVarName} = `
                     : ""
@@ -1161,9 +1183,10 @@ ${allArgs ? `${allArgs},` : ""}
     )${needsCast ? ` as ${tsReturnType}` : ""};`);
             if (method.throws) {
                 lines.push(this.generateErrorCheck());
-                if (hasReturnValue) {
-                    lines.push(`    return ${resultVarName};`);
-                }
+            }
+            lines.push(...this.generateRefRewrapCode(gtkAllocatesRefs));
+            if (needsResultVar && hasReturnValue) {
+                lines.push(`    return ${resultVarName};`);
             }
         }
         lines.push(`  }`);
@@ -1263,9 +1286,7 @@ ${allArgs ? `${allArgs},` : ""}
                 kind: "class",
             });
         }
-        // Signal handler catch-all overload must use `any` for compatibility with typed overloads.
-        // The typed overloads have specific return types, and unknown is not assignable to them.
-        signalOverloads.push(`  ${methodName}(signal: string, handler: (...args: any[]) => any, after?: boolean): number;`);
+        this.addSignalCatchAllOverload(signalOverloads, methodName);
         this.usesType = true;
         this.usesGetObject = true;
         if (signalMetadata.length > 0) {
@@ -1323,7 +1344,7 @@ ${allArgs ? `${allArgs},` : ""}
         const interfaceName = toPascalCase(iface.name);
         const sections = [];
         this.usesCall = iface.methods.length > 0;
-        this.usesRef = iface.methods.some((m) => hasOutParameter(m.parameters));
+        this.usesRef = iface.methods.some((m) => hasRefParameter(m.parameters, this.typeMapper));
         if (iface.doc) {
             sections.push(formatDoc(iface.doc));
         }
@@ -1350,9 +1371,9 @@ ${allArgs ? `${allArgs},` : ""}
     async generateRecord(record, sharedLibrary) {
         this.resetState();
         this.usesRef =
-            record.methods.some((m) => hasOutParameter(m.parameters)) ||
-                record.constructors.some((c) => hasOutParameter(c.parameters)) ||
-                record.functions.some((f) => hasOutParameter(f.parameters));
+            record.methods.some((m) => hasRefParameter(m.parameters, this.typeMapper)) ||
+                record.constructors.some((c) => hasRefParameter(c.parameters, this.typeMapper)) ||
+                record.functions.some((f) => hasRefParameter(f.parameters, this.typeMapper));
         this.usesCall = record.methods.length > 0 || record.constructors.length > 0 || record.functions.length > 0;
         const hasReadableFields = record.fields.some((f) => f.readable !== false && !f.private);
         if (hasReadableFields) {
@@ -1671,7 +1692,7 @@ ${args}
     }
     async generateFunctions(functions, sharedLibrary) {
         this.resetState();
-        this.usesRef = functions.some((f) => hasOutParameter(f.parameters));
+        this.usesRef = functions.some((f) => hasRefParameter(f.parameters, this.typeMapper));
         this.usesCall = functions.length > 0;
         const sections = [];
         for (const func of functions) {
@@ -1694,6 +1715,7 @@ ${args}
             returnTypeMapping.ts !== "unknown" &&
             returnTypeMapping.kind !== "interface";
         const hasReturnValue = returnTypeMapping.ts !== "void";
+        const gtkAllocatesRefs = this.identifyGtkAllocatesRefs(func.parameters);
         const lines = [];
         const funcDoc = formatMethodDoc(func.doc, func.parameters, "");
         if (funcDoc) {
@@ -1706,6 +1728,7 @@ ${args}
         const args = this.generateCallArguments(func.parameters, "  ");
         const errorArg = func.throws ? this.generateErrorArgument("  ") : "";
         const allArgs = errorArg ? args + (args ? ",\n" : "") + errorArg : args;
+        const refRewrapCode = this.generateRefRewrapCode(gtkAllocatesRefs).map((line) => line.replace(/^ {4}/, "  "));
         if (needsObjectWrap && hasReturnValue) {
             this.usesGetObject = true;
             lines.push(`  const ptr = call("${sharedLibrary}", "${func.cIdentifier}", [
@@ -1714,13 +1737,16 @@ ${allArgs ? `${allArgs},` : ""}
             if (func.throws) {
                 lines.push(this.generateErrorCheck(""));
             }
+            lines.push(...refRewrapCode);
             if (isNullable) {
                 lines.push(`  if (ptr === null) return null;`);
             }
             lines.push(`  return getObject(ptr) as ${baseReturnType};`);
         }
         else {
-            const callPrefix = func.throws
+            const hasRefRewrap = gtkAllocatesRefs.length > 0;
+            const needsResultVar = func.throws || hasRefRewrap;
+            const callPrefix = needsResultVar
                 ? hasReturnValue
                     ? `const ${resultVarName} = `
                     : ""
@@ -1733,9 +1759,10 @@ ${allArgs ? `${allArgs},` : ""}
   ], ${this.generateTypeDescriptor(returnTypeMapping.ffi)})${needsCast ? ` as ${returnTypeMapping.ts}` : ""};`);
             if (func.throws) {
                 lines.push(this.generateErrorCheck(""));
-                if (hasReturnValue) {
-                    lines.push(`  return ${resultVarName};`);
-                }
+            }
+            lines.push(...refRewrapCode);
+            if (needsResultVar && hasReturnValue) {
+                lines.push(`  return ${resultVarName};`);
             }
         }
         lines.push(`};`);
@@ -1790,6 +1817,34 @@ ${allArgs ? `${allArgs},` : ""}
         })
             .join(",\n");
     }
+    identifyGtkAllocatesRefs(parameters) {
+        return parameters
+            .filter((p, i) => !isVararg(p) && !this.typeMapper.isClosureTarget(i, parameters))
+            .map((param) => {
+            const mapped = this.typeMapper.mapParameter(param);
+            if (mapped.ffi.type === "ref" &&
+                typeof mapped.ffi.innerType === "object" &&
+                (mapped.ffi.innerType.type === "boxed" || mapped.ffi.innerType.type === "gobject")) {
+                const innerTsType = mapped.ts.slice(4, -1);
+                return {
+                    paramName: toValidIdentifier(toCamelCase(param.name)),
+                    innerType: innerTsType,
+                    nullable: this.typeMapper.isNullable(param),
+                };
+            }
+            return null;
+        })
+            .filter((x) => x !== null);
+    }
+    generateRefRewrapCode(gtkAllocatesRefs) {
+        if (gtkAllocatesRefs.length === 0) {
+            return [];
+        }
+        this.usesGetObject = true;
+        return gtkAllocatesRefs.map((ref) => ref.nullable
+            ? `    if (${ref.paramName}) ${ref.paramName}.value = getObject(${ref.paramName}.value) as ${ref.innerType};`
+            : `    ${ref.paramName}.value = getObject(${ref.paramName}.value) as ${ref.innerType};`);
+    }
     generateErrorArgument(indent = "      ") {
         return `${indent}  {\n${indent}    type: { type: "ref", innerType: { type: "boxed", innerType: "GError", lib: "libglib-2.0.so.0" } },\n${indent}    value: error,\n${indent}  }`;
     }
@@ -1952,4 +2007,14 @@ ${indent}  }`;
             return code;
         }
     }
+    generateCyclicTypeReturn(baseReturnType) {
+        return `    return { id: ptr } as unknown as ${baseReturnType};`;
+    }
+    /**
+     * Adds a catch-all signal handler overload.
+     * Uses `any` for TypeScript compatibility with typed overloads.
+     */
+    addSignalCatchAllOverload(signalOverloads, methodName) {
+        signalOverloads.push(`  ${methodName}(signal: string, handler: (...args: any[]) => any, after?: boolean): number;`);
+    }
 }

package/dist/generated/gdk/content-provider.d.ts

@@ -1,4 +1,3 @@
-import { Ref } from "@gtkx/native";
 import { ContentFormats } from "./content-formats.js";
 import * as GLib from "../glib/index.js";
 import * as GObject from "../gobject/index.js";
@@ -53,7 +52,7 @@ export declare class ContentProvider extends GObject.GObject {
      * `G_IO_ERROR_NOT_SUPPORTED` will be reported.
      * @param value - the `GValue` to fill
      */
-    getValue(value: Ref<unknown>): boolean;
+    getValue(value: GObject.Value): boolean;
     /**
      * Gets the formats that the provider can provide its current contents in.
      */

package/dist/generated/gdk/content-provider.js

@@ -118,14 +118,12 @@ export class ContentProvider extends GObject.GObject {
             },
             {
                 type: {
-                    type: "ref",
-                    innerType: {
-                        type: "boxed",
-                        innerType: "GValue",
-                        lib: "libgtk-4.so.1",
-                    },
+                    type: "boxed",
+                    borrowed: true,
+                    innerType: "GValue",
+                    lib: "libgtk-4.so.1",
                 },
-                value: value,
+                value: value?.id ?? value,
             },
             {
                 type: {

package/dist/generated/gdk/functions.d.ts

@@ -159,7 +159,7 @@ export declare const contentDeserializeAsync: (stream: Gio.InputStream, mimeType
  * @param result - the `GAsyncResult`
  * @param value - return location for the result of the operation
  */
-export declare const contentDeserializeFinish: (result: Gio.AsyncResult, value: Ref<unknown>) => boolean;
+export declare const contentDeserializeFinish: (result: Gio.AsyncResult, value: GObject.Value) => boolean;
 /**
  * Parses the given `string` into `GdkContentFormats` and
  * returns the formats.

package/dist/generated/gdk/functions.js

@@ -386,14 +386,12 @@ export const contentDeserializeFinish = (result, value) => {
         },
         {
             type: {
-                type: "ref",
-                innerType: {
-                    type: "boxed",
-                    innerType: "GValue",
-                    lib: "libgtk-4.so.1",
-                },
+                type: "boxed",
+                borrowed: true,
+                innerType: "GValue",
+                lib: "libgtk-4.so.1",
             },
-            value: value,
+            value: value?.id ?? value,
         },
         {
             type: {

package/dist/generated/gdk/monitor.d.ts

@@ -1,5 +1,5 @@
-import { Ref } from "@gtkx/native";
 import { SubpixelLayout } from "./enums.js";
+import { Rectangle } from "./rectangle.js";
 import { Display } from "./display.js";
 import * as GObject from "../gobject/index.js";
 export declare class Monitor extends GObject.GObject {
@@ -32,7 +32,7 @@ export declare class Monitor extends GObject.GObject {
      * ”device pixels” (see [method@Gdk.Monitor.get_scale]).
      * @param geometry - a `GdkRectangle` to be filled with the monitor geometry
      */
-    getGeometry(geometry: Ref<unknown>): void;
+    getGeometry(geometry: Rectangle): void;
     /**
      * Gets the height in millimeters of the monitor.
      */

package/dist/generated/gdk/monitor.js

@@ -83,14 +83,12 @@ export class Monitor extends GObject.GObject {
             },
             {
                 type: {
-                    type: "ref",
-                    innerType: {
-                        type: "boxed",
-                        innerType: "GdkRectangle",
-                        lib: "libgtk-4.so.1",
-                    },
+                    type: "boxed",
+                    borrowed: true,
+                    innerType: "GdkRectangle",
+                    lib: "libgtk-4.so.1",
                 },
-                value: geometry,
+                value: geometry?.id ?? geometry,
             },
         ], { type: "undefined" });
     }

package/dist/generated/gdk/rectangle.d.ts

@@ -1,4 +1,3 @@
-import { Ref } from "@gtkx/native";
 export interface RectangleInit {
     x?: number;
     y?: number;
@@ -49,7 +48,7 @@ export declare class Rectangle {
      * @param src2 - a `GdkRectangle`
      * @param dest - return location for the
      */
-    intersect(src2: Rectangle, dest?: Ref<unknown> | null): boolean;
+    intersect(src2: Rectangle, dest?: Rectangle | null): boolean;
     /**
      * Calculates the union of two rectangles.
      *
@@ -62,7 +61,7 @@ export declare class Rectangle {
      * @param src2 - a `GdkRectangle`
      * @param dest - return location for the union of `src1` and @src2
      */
-    union(src2: Rectangle, dest: Ref<unknown>): void;
+    union(src2: Rectangle, dest: Rectangle): void;
     /** the x coordinate of the top left corner */
     get x(): number;
     set x(value: number);

package/dist/generated/gdk/rectangle.js

@@ -120,14 +120,12 @@ export class Rectangle {
             },
             {
                 type: {
-                    type: "ref",
-                    innerType: {
-                        type: "boxed",
-                        innerType: "GdkRectangle",
-                        lib: "libgtk-4.so.1",
-                    },
+                    type: "boxed",
+                    borrowed: true,
+                    innerType: "GdkRectangle",
+                    lib: "libgtk-4.so.1",
                 },
-                value: dest,
+                value: dest?.id ?? dest,
                 optional: true,
             },
         ], { type: "boolean" });
@@ -166,14 +164,12 @@ export class Rectangle {
             },
             {
                 type: {
-                    type: "ref",
-                    innerType: {
-                        type: "boxed",
-                        innerType: "GdkRectangle",
-                        lib: "libgtk-4.so.1",
-                    },
+                    type: "boxed",
+                    borrowed: true,
+                    innerType: "GdkRectangle",
+                    lib: "libgtk-4.so.1",
                 },
-                value: dest,
+                value: dest?.id ?? dest,
             },
         ], { type: "undefined" });
     }

package/dist/generated/gio/action-group.d.ts

@@ -261,5 +261,5 @@ export declare class ActionGroup {
      * @param stateHint - the state hint, or `NULL` if none
      * @param state - the current state, or `NULL` if stateless
      */
-    queryAction(actionName: string, enabled: Ref<boolean>, parameterType?: Ref<unknown> | null, stateType?: Ref<unknown> | null, stateHint?: Ref<unknown> | null, state?: Ref<unknown> | null): boolean;
+    queryAction(actionName: string, enabled: Ref<boolean>, parameterType?: Ref<GLib.VariantType> | null, stateType?: Ref<GLib.VariantType> | null, stateHint?: Ref<GLib.Variant> | null, state?: Ref<GLib.Variant> | null): boolean;
 }

package/dist/generated/gio/action-group.js

@@ -468,7 +468,7 @@ export class ActionGroup {
      * @param state - the current state, or `NULL` if stateless
      */
     queryAction(actionName, enabled, parameterType, stateType, stateHint, state) {
-        return call("libgio-2.0.so.0", "g_action_group_query_action", [
+        const result = call("libgio-2.0.so.0", "g_action_group_query_action", [
             {
                 type: { type: "gobject" },
                 value: this.id,
@@ -530,5 +530,14 @@ export class ActionGroup {
                 optional: true,
             },
         ], { type: "boolean" });
+        if (parameterType)
+            parameterType.value = getObject(parameterType.value);
+        if (stateType)
+            stateType.value = getObject(stateType.value);
+        if (stateHint)
+            stateHint.value = getObject(stateHint.value);
+        if (state)
+            state.value = getObject(state.value);
+        return result;
     }
 }

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

@@ -879,7 +879,7 @@ export declare class Application extends GObject.GObject {
      * @param stateHint - the state hint, or `NULL` if none
      * @param state - the current state, or `NULL` if stateless
      */
-    queryAction(actionName: string, enabled: Ref<boolean>, parameterType?: Ref<unknown> | null, stateType?: Ref<unknown> | null, stateHint?: Ref<unknown> | null, state?: Ref<unknown> | null): boolean;
+    queryAction(actionName: string, enabled: Ref<boolean>, parameterType?: Ref<GLib.VariantType> | null, stateType?: Ref<GLib.VariantType> | null, stateHint?: Ref<GLib.Variant> | null, state?: Ref<GLib.Variant> | null): boolean;
     /**
      * Adds an action to the @action_map.
      *

package/dist/generated/gio/application.js

@@ -1655,7 +1655,7 @@ export class Application extends GObject.GObject {
      * @param state - the current state, or `NULL` if stateless
      */
     queryAction(actionName, enabled, parameterType, stateType, stateHint, state) {
-        return call("libgio-2.0.so.0", "g_action_group_query_action", [
+        const result = call("libgio-2.0.so.0", "g_action_group_query_action", [
             {
                 type: { type: "gobject" },
                 value: this.id,
@@ -1717,6 +1717,15 @@ export class Application extends GObject.GObject {
                 optional: true,
             },
         ], { type: "boolean" });
+        if (parameterType)
+            parameterType.value = getObject(parameterType.value);
+        if (stateType)
+            stateType.value = getObject(stateType.value);
+        if (stateHint)
+            stateHint.value = getObject(stateHint.value);
+        if (state)
+            state.value = getObject(state.value);
+        return result;
     }
     /**
      * Adds an action to the @action_map.

package/dist/generated/gio/dbus-action-group.d.ts

@@ -242,7 +242,7 @@ export declare class DBusActionGroup extends GObject.GObject {
      * @param stateHint - the state hint, or `NULL` if none
      * @param state - the current state, or `NULL` if stateless
      */
-    queryAction(actionName: string, enabled: Ref<boolean>, parameterType?: Ref<unknown> | null, stateType?: Ref<unknown> | null, stateHint?: Ref<unknown> | null, state?: Ref<unknown> | null): boolean;
+    queryAction(actionName: string, enabled: Ref<boolean>, parameterType?: Ref<GLib.VariantType> | null, stateType?: Ref<GLib.VariantType> | null, stateHint?: Ref<GLib.Variant> | null, state?: Ref<GLib.Variant> | null): boolean;
     /**
      * Activates the remote action.
      *

package/dist/generated/gio/dbus-action-group.js

@@ -473,7 +473,7 @@ export class DBusActionGroup extends GObject.GObject {
      * @param state - the current state, or `NULL` if stateless
      */
     queryAction(actionName, enabled, parameterType, stateType, stateHint, state) {
-        return call("libgio-2.0.so.0", "g_action_group_query_action", [
+        const result = call("libgio-2.0.so.0", "g_action_group_query_action", [
             {
                 type: { type: "gobject" },
                 value: this.id,
@@ -535,6 +535,15 @@ export class DBusActionGroup extends GObject.GObject {
                 optional: true,
             },
         ], { type: "boolean" });
+        if (parameterType)
+            parameterType.value = getObject(parameterType.value);
+        if (stateType)
+            stateType.value = getObject(stateType.value);
+        if (stateHint)
+            stateHint.value = getObject(stateHint.value);
+        if (state)
+            state.value = getObject(state.value);
+        return result;
     }
     /**
      * Activates the remote action.

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

@@ -321,7 +321,7 @@ export declare class DBusConnection extends GObject.GObject {
      * @param outFdList - return location for a #GUnixFDList or %NULL
      * @param res - a #GAsyncResult obtained from the #GAsyncReadyCallback passed to
      */
-    callWithUnixFdListFinish(res: AsyncResult, outFdList?: Ref<unknown> | null): GLib.Variant;
+    callWithUnixFdListFinish(res: AsyncResult, outFdList?: Ref<UnixFDList> | null): GLib.Variant;
     /**
      * Like g_dbus_connection_call_sync() but also takes and returns #GUnixFDList objects.
      * See g_dbus_connection_call_with_unix_fd_list() and
@@ -340,7 +340,7 @@ export declare class DBusConnection extends GObject.GObject {
      * @param outFdList - return location for a #GUnixFDList or %NULL
      * @param cancellable - a #GCancellable or %NULL
      */
-    callWithUnixFdListSync(objectPath: string, interfaceName: string, methodName: string, flags: DBusCallFlags, timeoutMsec: number, busName?: string | null, parameters?: GLib.Variant | null, replyType?: GLib.VariantType | null, fdList?: UnixFDList | null, outFdList?: Ref<unknown> | null, cancellable?: Cancellable | null): GLib.Variant;
+    callWithUnixFdListSync(objectPath: string, interfaceName: string, methodName: string, flags: DBusCallFlags, timeoutMsec: number, busName?: string | null, parameters?: GLib.Variant | null, replyType?: GLib.VariantType | null, fdList?: UnixFDList | null, outFdList?: Ref<UnixFDList> | null, cancellable?: Cancellable | null): GLib.Variant;
     /**
      * Closes @connection. Note that this never causes the process to
      * exit (this might only happen if the other end of a shared message

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

@@ -806,6 +806,8 @@ export class DBusConnection extends GObject.GObject {
         if (error.value !== null) {
             throw new NativeError(error.value);
         }
+        if (outFdList)
+            outFdList.value = getObject(outFdList.value);
         return getObject(ptr);
     }
     /**
@@ -913,6 +915,8 @@ export class DBusConnection extends GObject.GObject {
         if (error.value !== null) {
             throw new NativeError(error.value);
         }
+        if (outFdList)
+            outFdList.value = getObject(outFdList.value);
         return getObject(ptr);
     }
     /**

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

@@ -239,7 +239,7 @@ export declare class DBusProxy extends GObject.GObject {
      * @param outFdList - Return location for a #GUnixFDList or %NULL.
      * @param res - A #GAsyncResult obtained from the #GAsyncReadyCallback passed to g_dbus_proxy_call_with_unix_fd_list().
      */
-    callWithUnixFdListFinish(res: AsyncResult, outFdList?: Ref<unknown> | null): GLib.Variant;
+    callWithUnixFdListFinish(res: AsyncResult, outFdList?: Ref<UnixFDList> | null): GLib.Variant;
     /**
      * Like g_dbus_proxy_call_sync() but also takes and returns #GUnixFDList objects.
      *
@@ -252,7 +252,7 @@ export declare class DBusProxy extends GObject.GObject {
      * @param outFdList - Return location for a #GUnixFDList or %NULL.
      * @param cancellable - A #GCancellable or %NULL.
      */
-    callWithUnixFdListSync(methodName: string, flags: DBusCallFlags, timeoutMsec: number, parameters?: GLib.Variant | null, fdList?: UnixFDList | null, outFdList?: Ref<unknown> | null, cancellable?: Cancellable | null): GLib.Variant;
+    callWithUnixFdListSync(methodName: string, flags: DBusCallFlags, timeoutMsec: number, parameters?: GLib.Variant | null, fdList?: UnixFDList | null, outFdList?: Ref<UnixFDList> | null, cancellable?: Cancellable | null): GLib.Variant;
     /**
      * Looks up the value for a property from the cache. This call does no
      * blocking IO.