@gtkx/ffi 0.1.48 → 0.1.49

package/dist/codegen/ffi-generator.js

@@ -780,7 +780,7 @@ ${allArgs ? `${allArgs},` : ""}
         lines.push(`  }`);
         return `${lines.join("\n")}\n`;
     }
-    generateMethods(methods, sharedLibrary, className) {
+    generateMethods(methods, sharedLibrary, className, isRecord = false) {
         const generatedMethods = new Set();
         const sections = [];
         const asyncMethods = new Set();
@@ -803,7 +803,7 @@ ${allArgs ? `${allArgs},` : ""}
                 }
                 continue;
             }
-            sections.push(this.generateMethod(method, sharedLibrary, className));
+            sections.push(this.generateMethod(method, sharedLibrary, className, isRecord));
         }
         return sections.join("\n");
     }
@@ -1041,7 +1041,7 @@ ${allArgs ? `${allArgs},` : ""}
         })
             .join(",\n");
     }
-    generateMethod(method, sharedLibrary, className) {
+    generateMethod(method, sharedLibrary, className, isRecord = false) {
         let methodName = toCamelCase(method.name);
         if (className) {
             const renamed = getRenamedMethod(this.options.namespace, className, methodName);
@@ -1064,6 +1064,10 @@ ${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 selfTypeDescriptor = isRecord && className
+            ? `{ type: "boxed", borrowed: true, innerType: "${className}", lib: "${sharedLibrary}" }`
+            : `{ type: "gobject" }`;
         const lines = [];
         const methodDoc = formatMethodDoc(method.doc, method.parameters);
         if (methodDoc) {
@@ -1083,7 +1087,7 @@ ${allArgs ? `${allArgs},` : ""}
       "${method.cIdentifier}",
       [
         {
-          type: { type: "gobject" },
+          type: ${selfTypeDescriptor},
           value: this.ptr,
         },
 ${allArgs ? `${allArgs},` : ""}
@@ -1112,7 +1116,7 @@ ${allArgs ? `${allArgs},` : ""}
       "${method.cIdentifier}",
       [
         {
-          type: { type: "gobject" },
+          type: ${selfTypeDescriptor},
           value: this.ptr,
         },
 ${allArgs ? `${allArgs},` : ""}
@@ -1138,7 +1142,7 @@ ${allArgs ? `${allArgs},` : ""}
       "${method.cIdentifier}",
       [
         {
-          type: { type: "gobject" },
+          type: ${selfTypeDescriptor},
           value: this.ptr,
         },
 ${allArgs ? `${allArgs},` : ""}
@@ -1352,7 +1356,7 @@ ${allArgs ? `${allArgs},` : ""}
         sections.push(`  ptr: unknown;\n`);
         sections.push(this.generateRecordConstructors(record, sharedLibrary));
         sections.push(this.generateRecordStaticFunctions(record.functions, sharedLibrary, recordName));
-        sections.push(this.generateRecordMethods(record.methods, sharedLibrary, record.name));
+        sections.push(this.generateRecordMethods(record.methods, sharedLibrary, record.name, record.glibTypeName));
         sections.push(this.generateRecordFields(record.fields, record.methods));
         sections.push("}");
         const imports = this.generateImports(recordName);
@@ -1495,8 +1499,6 @@ ${args}
     calculateStructSize(fields) {
         let currentOffset = 0;
         for (const field of fields) {
-            if (field.private)
-                continue;
             const fieldSize = this.getFieldSize(field.type);
             const alignment = this.getFieldAlignment(field.type);
             currentOffset = Math.ceil(currentOffset / alignment) * alignment;
@@ -1534,8 +1536,8 @@ ${args}
     generateRecordStaticFunctions(functions, sharedLibrary, recordName) {
         return this.generateStaticFunctions(functions, sharedLibrary, recordName);
     }
-    generateRecordMethods(methods, sharedLibrary, recordName) {
-        return this.generateMethods(methods, sharedLibrary, recordName);
+    generateRecordMethods(methods, sharedLibrary, recordName, glibTypeName) {
+        return this.generateMethods(methods, sharedLibrary, glibTypeName ?? recordName, true);
     }
     generateRecordFields(fields, methods) {
         const sections = [];

package/dist/generated/gdk/color-state.js

@@ -138,7 +138,12 @@ export class ColorState {
     createCicpParams() {
         const ptr = call("libgtk-4.so.1", "gdk_color_state_create_cicp_params", [
             {
-                type: { type: "gobject" },
+                type: {
+                    type: "boxed",
+                    borrowed: true,
+                    innerType: "GdkColorState",
+                    lib: "libgtk-4.so.1",
+                },
                 value: this.ptr,
             },
         ], { type: "gobject", borrowed: true });
@@ -157,7 +162,12 @@ export class ColorState {
     equal(other) {
         return call("libgtk-4.so.1", "gdk_color_state_equal", [
             {
-                type: { type: "gobject" },
+                type: {
+                    type: "boxed",
+                    borrowed: true,
+                    innerType: "GdkColorState",
+                    lib: "libgtk-4.so.1",
+                },
                 value: this.ptr,
             },
             {
@@ -181,7 +191,12 @@ export class ColorState {
     equivalent(other) {
         return call("libgtk-4.so.1", "gdk_color_state_equivalent", [
             {
-                type: { type: "gobject" },
+                type: {
+                    type: "boxed",
+                    borrowed: true,
+                    innerType: "GdkColorState",
+                    lib: "libgtk-4.so.1",
+                },
                 value: this.ptr,
             },
             {
@@ -201,7 +216,12 @@ export class ColorState {
     ref() {
         const ptr = call("libgtk-4.so.1", "gdk_color_state_ref", [
             {
-                type: { type: "gobject" },
+                type: {
+                    type: "boxed",
+                    borrowed: true,
+                    innerType: "GdkColorState",
+                    lib: "libgtk-4.so.1",
+                },
                 value: this.ptr,
             },
         ], {
@@ -221,7 +241,12 @@ export class ColorState {
     unref() {
         call("libgtk-4.so.1", "gdk_color_state_unref", [
             {
-                type: { type: "gobject" },
+                type: {
+                    type: "boxed",
+                    borrowed: true,
+                    innerType: "GdkColorState",
+                    lib: "libgtk-4.so.1",
+                },
                 value: this.ptr,
             },
         ], { type: "undefined" });

package/dist/generated/gdk/content-formats-builder.js

@@ -28,7 +28,12 @@ export class ContentFormatsBuilder {
     addFormats(formats) {
         call("libgtk-4.so.1", "gdk_content_formats_builder_add_formats", [
             {
-                type: { type: "gobject" },
+                type: {
+                    type: "boxed",
+                    borrowed: true,
+                    innerType: "GdkContentFormatsBuilder",
+                    lib: "libgtk-4.so.1",
+                },
                 value: this.ptr,
             },
             {
@@ -49,7 +54,12 @@ export class ContentFormatsBuilder {
     addGtype(type) {
         call("libgtk-4.so.1", "gdk_content_formats_builder_add_gtype", [
             {
-                type: { type: "gobject" },
+                type: {
+                    type: "boxed",
+                    borrowed: true,
+                    innerType: "GdkContentFormatsBuilder",
+                    lib: "libgtk-4.so.1",
+                },
                 value: this.ptr,
             },
             {
@@ -65,7 +75,12 @@ export class ContentFormatsBuilder {
     addMimeType(mimeType) {
         call("libgtk-4.so.1", "gdk_content_formats_builder_add_mime_type", [
             {
-                type: { type: "gobject" },
+                type: {
+                    type: "boxed",
+                    borrowed: true,
+                    innerType: "GdkContentFormatsBuilder",
+                    lib: "libgtk-4.so.1",
+                },
                 value: this.ptr,
             },
             {
@@ -83,7 +98,12 @@ export class ContentFormatsBuilder {
     ref() {
         const ptr = call("libgtk-4.so.1", "gdk_content_formats_builder_ref", [
             {
-                type: { type: "gobject" },
+                type: {
+                    type: "boxed",
+                    borrowed: true,
+                    innerType: "GdkContentFormatsBuilder",
+                    lib: "libgtk-4.so.1",
+                },
                 value: this.ptr,
             },
         ], {
@@ -106,7 +126,12 @@ export class ContentFormatsBuilder {
     toFormats() {
         const ptr = call("libgtk-4.so.1", "gdk_content_formats_builder_to_formats", [
             {
-                type: { type: "gobject" },
+                type: {
+                    type: "boxed",
+                    borrowed: true,
+                    innerType: "GdkContentFormatsBuilder",
+                    lib: "libgtk-4.so.1",
+                },
                 value: this.ptr,
             },
         ], {
@@ -123,7 +148,12 @@ export class ContentFormatsBuilder {
     unref() {
         call("libgtk-4.so.1", "gdk_content_formats_builder_unref", [
             {
-                type: { type: "gobject" },
+                type: {
+                    type: "boxed",
+                    borrowed: true,
+                    innerType: "GdkContentFormatsBuilder",
+                    lib: "libgtk-4.so.1",
+                },
                 value: this.ptr,
             },
         ], { type: "undefined" });

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

@@ -107,7 +107,12 @@ export class ContentFormats {
     containGtype(type) {
         return call("libgtk-4.so.1", "gdk_content_formats_contain_gtype", [
             {
-                type: { type: "gobject" },
+                type: {
+                    type: "boxed",
+                    borrowed: true,
+                    innerType: "GdkContentFormats",
+                    lib: "libgtk-4.so.1",
+                },
                 value: this.ptr,
             },
             {
@@ -123,7 +128,12 @@ export class ContentFormats {
     containMimeType(mimeType) {
         return call("libgtk-4.so.1", "gdk_content_formats_contain_mime_type", [
             {
-                type: { type: "gobject" },
+                type: {
+                    type: "boxed",
+                    borrowed: true,
+                    innerType: "GdkContentFormats",
+                    lib: "libgtk-4.so.1",
+                },
                 value: this.ptr,
             },
             {
@@ -142,7 +152,12 @@ export class ContentFormats {
     getGtypes(nGtypes) {
         return call("libgtk-4.so.1", "gdk_content_formats_get_gtypes", [
             {
-                type: { type: "gobject" },
+                type: {
+                    type: "boxed",
+                    borrowed: true,
+                    innerType: "GdkContentFormats",
+                    lib: "libgtk-4.so.1",
+                },
                 value: this.ptr,
             },
             {
@@ -165,7 +180,12 @@ export class ContentFormats {
     getMimeTypes(nMimeTypes) {
         return call("libgtk-4.so.1", "gdk_content_formats_get_mime_types", [
             {
-                type: { type: "gobject" },
+                type: {
+                    type: "boxed",
+                    borrowed: true,
+                    innerType: "GdkContentFormats",
+                    lib: "libgtk-4.so.1",
+                },
                 value: this.ptr,
             },
             {
@@ -184,7 +204,12 @@ export class ContentFormats {
     isEmpty() {
         return call("libgtk-4.so.1", "gdk_content_formats_is_empty", [
             {
-                type: { type: "gobject" },
+                type: {
+                    type: "boxed",
+                    borrowed: true,
+                    innerType: "GdkContentFormats",
+                    lib: "libgtk-4.so.1",
+                },
                 value: this.ptr,
             },
         ], { type: "boolean" });
@@ -196,7 +221,12 @@ export class ContentFormats {
     match(second) {
         return call("libgtk-4.so.1", "gdk_content_formats_match", [
             {
-                type: { type: "gobject" },
+                type: {
+                    type: "boxed",
+                    borrowed: true,
+                    innerType: "GdkContentFormats",
+                    lib: "libgtk-4.so.1",
+                },
                 value: this.ptr,
             },
             {
@@ -220,7 +250,12 @@ export class ContentFormats {
     matchGtype(second) {
         return call("libgtk-4.so.1", "gdk_content_formats_match_gtype", [
             {
-                type: { type: "gobject" },
+                type: {
+                    type: "boxed",
+                    borrowed: true,
+                    innerType: "GdkContentFormats",
+                    lib: "libgtk-4.so.1",
+                },
                 value: this.ptr,
             },
             {
@@ -244,7 +279,12 @@ export class ContentFormats {
     matchMimeType(second) {
         return call("libgtk-4.so.1", "gdk_content_formats_match_mime_type", [
             {
-                type: { type: "gobject" },
+                type: {
+                    type: "boxed",
+                    borrowed: true,
+                    innerType: "GdkContentFormats",
+                    lib: "libgtk-4.so.1",
+                },
                 value: this.ptr,
             },
             {
@@ -268,7 +308,12 @@ export class ContentFormats {
     print(string) {
         call("libgtk-4.so.1", "gdk_content_formats_print", [
             {
-                type: { type: "gobject" },
+                type: {
+                    type: "boxed",
+                    borrowed: true,
+                    innerType: "GdkContentFormats",
+                    lib: "libgtk-4.so.1",
+                },
                 value: this.ptr,
             },
             {
@@ -288,7 +333,12 @@ export class ContentFormats {
     ref() {
         const ptr = call("libgtk-4.so.1", "gdk_content_formats_ref", [
             {
-                type: { type: "gobject" },
+                type: {
+                    type: "boxed",
+                    borrowed: true,
+                    innerType: "GdkContentFormats",
+                    lib: "libgtk-4.so.1",
+                },
                 value: this.ptr,
             },
         ], {
@@ -310,7 +360,12 @@ export class ContentFormats {
     toString() {
         return call("libgtk-4.so.1", "gdk_content_formats_to_string", [
             {
-                type: { type: "gobject" },
+                type: {
+                    type: "boxed",
+                    borrowed: true,
+                    innerType: "GdkContentFormats",
+                    lib: "libgtk-4.so.1",
+                },
                 value: this.ptr,
             },
         ], { type: "string" });
@@ -323,7 +378,12 @@ export class ContentFormats {
     union(second) {
         const ptr = call("libgtk-4.so.1", "gdk_content_formats_union", [
             {
-                type: { type: "gobject" },
+                type: {
+                    type: "boxed",
+                    borrowed: true,
+                    innerType: "GdkContentFormats",
+                    lib: "libgtk-4.so.1",
+                },
                 value: this.ptr,
             },
             {
@@ -350,7 +410,12 @@ export class ContentFormats {
     unionDeserializeGtypes() {
         const ptr = call("libgtk-4.so.1", "gdk_content_formats_union_deserialize_gtypes", [
             {
-                type: { type: "gobject" },
+                type: {
+                    type: "boxed",
+                    borrowed: true,
+                    innerType: "GdkContentFormats",
+                    lib: "libgtk-4.so.1",
+                },
                 value: this.ptr,
             },
         ], {
@@ -368,7 +433,12 @@ export class ContentFormats {
     unionDeserializeMimeTypes() {
         const ptr = call("libgtk-4.so.1", "gdk_content_formats_union_deserialize_mime_types", [
             {
-                type: { type: "gobject" },
+                type: {
+                    type: "boxed",
+                    borrowed: true,
+                    innerType: "GdkContentFormats",
+                    lib: "libgtk-4.so.1",
+                },
                 value: this.ptr,
             },
         ], {
@@ -386,7 +456,12 @@ export class ContentFormats {
     unionSerializeGtypes() {
         const ptr = call("libgtk-4.so.1", "gdk_content_formats_union_serialize_gtypes", [
             {
-                type: { type: "gobject" },
+                type: {
+                    type: "boxed",
+                    borrowed: true,
+                    innerType: "GdkContentFormats",
+                    lib: "libgtk-4.so.1",
+                },
                 value: this.ptr,
             },
         ], {
@@ -404,7 +479,12 @@ export class ContentFormats {
     unionSerializeMimeTypes() {
         const ptr = call("libgtk-4.so.1", "gdk_content_formats_union_serialize_mime_types", [
             {
-                type: { type: "gobject" },
+                type: {
+                    type: "boxed",
+                    borrowed: true,
+                    innerType: "GdkContentFormats",
+                    lib: "libgtk-4.so.1",
+                },
                 value: this.ptr,
             },
         ], {
@@ -423,7 +503,12 @@ export class ContentFormats {
     unref() {
         call("libgtk-4.so.1", "gdk_content_formats_unref", [
             {
-                type: { type: "gobject" },
+                type: {
+                    type: "boxed",
+                    borrowed: true,
+                    innerType: "GdkContentFormats",
+                    lib: "libgtk-4.so.1",
+                },
                 value: this.ptr,
             },
         ], { type: "undefined" });

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

@@ -52,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<GObject.Value>): boolean;
+    getValue(value: Ref<unknown>): boolean;
     /**
      * Gets the formats that the provider can provide its current contents in.
      */

package/dist/generated/gdk/dmabuf-formats.js

@@ -37,7 +37,12 @@ export class DmabufFormats {
     contains(fourcc, modifier) {
         return call("libgtk-4.so.1", "gdk_dmabuf_formats_contains", [
             {
-                type: { type: "gobject" },
+                type: {
+                    type: "boxed",
+                    borrowed: true,
+                    innerType: "GdkDmabufFormats",
+                    lib: "libgtk-4.so.1",
+                },
                 value: this.ptr,
             },
             {
@@ -58,7 +63,12 @@ export class DmabufFormats {
     equal(formats2) {
         return call("libgtk-4.so.1", "gdk_dmabuf_formats_equal", [
             {
-                type: { type: "gobject" },
+                type: {
+                    type: "boxed",
+                    borrowed: true,
+                    innerType: "GdkDmabufFormats",
+                    lib: "libgtk-4.so.1",
+                },
                 value: this.ptr,
             },
             {
@@ -83,7 +93,12 @@ export class DmabufFormats {
     getFormat(idx, fourcc, modifier) {
         call("libgtk-4.so.1", "gdk_dmabuf_formats_get_format", [
             {
-                type: { type: "gobject" },
+                type: {
+                    type: "boxed",
+                    borrowed: true,
+                    innerType: "GdkDmabufFormats",
+                    lib: "libgtk-4.so.1",
+                },
                 value: this.ptr,
             },
             {
@@ -117,7 +132,12 @@ export class DmabufFormats {
     getNFormats() {
         return call("libgtk-4.so.1", "gdk_dmabuf_formats_get_n_formats", [
             {
-                type: { type: "gobject" },
+                type: {
+                    type: "boxed",
+                    borrowed: true,
+                    innerType: "GdkDmabufFormats",
+                    lib: "libgtk-4.so.1",
+                },
                 value: this.ptr,
             },
         ], { type: "int", size: 64, unsigned: true });
@@ -128,7 +148,12 @@ export class DmabufFormats {
     ref() {
         const ptr = call("libgtk-4.so.1", "gdk_dmabuf_formats_ref", [
             {
-                type: { type: "gobject" },
+                type: {
+                    type: "boxed",
+                    borrowed: true,
+                    innerType: "GdkDmabufFormats",
+                    lib: "libgtk-4.so.1",
+                },
                 value: this.ptr,
             },
         ], {
@@ -148,7 +173,12 @@ export class DmabufFormats {
     unref() {
         call("libgtk-4.so.1", "gdk_dmabuf_formats_unref", [
             {
-                type: { type: "gobject" },
+                type: {
+                    type: "boxed",
+                    borrowed: true,
+                    innerType: "GdkDmabufFormats",
+                    lib: "libgtk-4.so.1",
+                },
                 value: this.ptr,
             },
         ], { type: "undefined" });

package/dist/generated/gdk/file-list.js

@@ -56,7 +56,12 @@ export class FileList {
     getFiles() {
         const ptrs = call("libgtk-4.so.1", "gdk_file_list_get_files", [
             {
-                type: { type: "gobject" },
+                type: {
+                    type: "boxed",
+                    borrowed: true,
+                    innerType: "GdkFileList",
+                    lib: "libgtk-4.so.1",
+                },
                 value: this.ptr,
             },
         ], {