@gtkx/ffi 0.1.5 → 0.1.7

package/dist/generated/gtk/font-dialog.js

@@ -1,4 +1,7 @@
 import { call } from "@gtkx/native";
+import { NativeError } from "@gtkx/ffi";
+import { Filter } from "./filter.js";
+import * as Pango from "../pango/index.js";
 export class FontDialog {
     ptr;
     constructor(_args = []) {
@@ -10,245 +13,330 @@ export class FontDialog {
             borrowed: true,
         });
     }
-    chooseFace(parent, initialValue, cancellable, callback, userData) {
-        call("libgtk-4.so.1", "gtk_font_dialog_choose_face", [
-            {
-                type: { type: "gobject" },
-                value: this.ptr,
-            },
-            {
-                type: { type: "gobject" },
-                value: parent,
-            },
-            {
-                type: { type: "gobject" },
-                value: initialValue,
-            },
-            {
-                type: { type: "gobject" },
-                value: cancellable,
-            },
-            {
-                type: { type: "gobject" },
-                value: callback,
-            },
-            {
-                type: { type: "gobject" },
-                value: userData,
-            },
-        ], { type: "undefined" });
-    }
-    chooseFaceFinish(result) {
-        const error = { value: null };
-        const _result = call("libgtk-4.so.1", "gtk_font_dialog_choose_face_finish", [
-            {
-                type: { type: "gobject" },
-                value: this.ptr,
-            },
-            {
-                type: { type: "gobject" },
-                value: result,
-            },
-            {
-                type: { type: "ref", innerType: { type: "gobject" } },
-                value: error,
-            },
-        ], { type: "gobject", borrowed: true });
-        if (error.value !== null) {
-            const jsError = new Error("GLib Error occurred");
-            jsError.gError = error.value;
-            throw jsError;
-        }
-        return _result;
-    }
-    chooseFamily(parent, initialValue, cancellable, callback, userData) {
-        call("libgtk-4.so.1", "gtk_font_dialog_choose_family", [
-            {
-                type: { type: "gobject" },
-                value: this.ptr,
-            },
-            {
-                type: { type: "gobject" },
-                value: parent,
-            },
-            {
-                type: { type: "gobject" },
-                value: initialValue,
-            },
-            {
-                type: { type: "gobject" },
-                value: cancellable,
-            },
-            {
-                type: { type: "gobject" },
-                value: callback,
-            },
-            {
-                type: { type: "gobject" },
-                value: userData,
-            },
-        ], { type: "undefined" });
-    }
-    chooseFamilyFinish(result) {
-        const error = { value: null };
-        const _result = call("libgtk-4.so.1", "gtk_font_dialog_choose_family_finish", [
-            {
-                type: { type: "gobject" },
-                value: this.ptr,
-            },
-            {
-                type: { type: "gobject" },
-                value: result,
-            },
-            {
-                type: { type: "ref", innerType: { type: "gobject" } },
-                value: error,
-            },
-        ], { type: "gobject", borrowed: true });
-        if (error.value !== null) {
-            const jsError = new Error("GLib Error occurred");
-            jsError.gError = error.value;
-            throw jsError;
-        }
-        return _result;
-    }
-    chooseFont(parent, initialValue, cancellable, callback, userData) {
-        call("libgtk-4.so.1", "gtk_font_dialog_choose_font", [
-            {
-                type: { type: "gobject" },
-                value: this.ptr,
-            },
-            {
-                type: { type: "gobject" },
-                value: parent,
-            },
-            {
-                type: { type: "gobject" },
-                value: initialValue,
-            },
-            {
-                type: { type: "gobject" },
-                value: cancellable,
-            },
-            {
-                type: { type: "gobject" },
-                value: callback,
-            },
-            {
-                type: { type: "gobject" },
-                value: userData,
-            },
-        ], { type: "undefined" });
+    chooseFace(parent, initialValue, cancellable) {
+        return new Promise((resolve, reject) => {
+            const callback = (_source, asyncResult) => {
+                try {
+                    const error = { value: null };
+                    const ptr = call("libgtk-4.so.1", "gtk_font_dialog_choose_face_finish", [
+                        { type: { type: "gobject" }, value: this.ptr },
+                        { type: { type: "gobject" }, value: asyncResult },
+                        {
+                            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) {
+                        resolve(null);
+                        return;
+                    }
+                    const instance = Object.create(Pango.FontFace.prototype);
+                    instance.ptr = ptr;
+                    resolve(instance);
+                }
+                catch (err) {
+                    reject(err);
+                }
+            };
+            call("libgtk-4.so.1", "gtk_font_dialog_choose_face", [
+                { type: { type: "gobject" }, value: this.ptr },
+                {
+                    type: { type: "gobject" },
+                    value: parent?.ptr ?? parent,
+                },
+                {
+                    type: { type: "gobject" },
+                    value: initialValue?.ptr ?? initialValue,
+                },
+                {
+                    type: { type: "gobject" },
+                    value: cancellable?.ptr ?? cancellable,
+                },
+                {
+                    type: {
+                        type: "asyncCallback",
+                        sourceType: { type: "gobject", borrowed: true },
+                        resultType: { type: "gobject", borrowed: true },
+                    },
+                    value: callback,
+                },
+            ], { type: "undefined" });
+        });
     }
-    chooseFontAndFeatures(parent, initialValue, cancellable, callback, userData) {
-        call("libgtk-4.so.1", "gtk_font_dialog_choose_font_and_features", [
-            {
-                type: { type: "gobject" },
-                value: this.ptr,
-            },
-            {
-                type: { type: "gobject" },
-                value: parent,
-            },
-            {
-                type: { type: "gobject" },
-                value: initialValue,
-            },
-            {
-                type: { type: "gobject" },
-                value: cancellable,
-            },
-            {
-                type: { type: "gobject" },
-                value: callback,
-            },
-            {
-                type: { type: "gobject" },
-                value: userData,
-            },
-        ], { type: "undefined" });
+    chooseFamily(parent, initialValue, cancellable) {
+        return new Promise((resolve, reject) => {
+            const callback = (_source, asyncResult) => {
+                try {
+                    const error = { value: null };
+                    const ptr = call("libgtk-4.so.1", "gtk_font_dialog_choose_family_finish", [
+                        { type: { type: "gobject" }, value: this.ptr },
+                        { type: { type: "gobject" }, value: asyncResult },
+                        {
+                            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) {
+                        resolve(null);
+                        return;
+                    }
+                    const instance = Object.create(Pango.FontFamily.prototype);
+                    instance.ptr = ptr;
+                    resolve(instance);
+                }
+                catch (err) {
+                    reject(err);
+                }
+            };
+            call("libgtk-4.so.1", "gtk_font_dialog_choose_family", [
+                { type: { type: "gobject" }, value: this.ptr },
+                {
+                    type: { type: "gobject" },
+                    value: parent?.ptr ?? parent,
+                },
+                {
+                    type: { type: "gobject" },
+                    value: initialValue?.ptr ?? initialValue,
+                },
+                {
+                    type: { type: "gobject" },
+                    value: cancellable?.ptr ?? cancellable,
+                },
+                {
+                    type: {
+                        type: "asyncCallback",
+                        sourceType: { type: "gobject", borrowed: true },
+                        resultType: { type: "gobject", borrowed: true },
+                    },
+                    value: callback,
+                },
+            ], { type: "undefined" });
+        });
     }
-    chooseFontAndFeaturesFinish(result, fontDesc, fontFeatures, language) {
-        const error = { value: null };
-        const _result = call("libgtk-4.so.1", "gtk_font_dialog_choose_font_and_features_finish", [
-            {
-                type: { type: "gobject" },
-                value: this.ptr,
-            },
-            {
-                type: { type: "gobject" },
-                value: result,
-            },
-            {
-                type: { type: "ref", innerType: { type: "gobject" } },
-                value: fontDesc,
-            },
-            {
-                type: { type: "ref", innerType: { type: "string" } },
-                value: fontFeatures,
-            },
-            {
-                type: { type: "ref", innerType: { type: "gobject" } },
-                value: language,
-            },
-            {
-                type: { type: "ref", innerType: { type: "gobject" } },
-                value: error,
-            },
-        ], { type: "boolean" });
-        if (error.value !== null) {
-            const jsError = new Error("GLib Error occurred");
-            jsError.gError = error.value;
-            throw jsError;
-        }
-        return _result;
+    chooseFont(parent, initialValue, cancellable) {
+        return new Promise((resolve, reject) => {
+            const callback = (_source, asyncResult) => {
+                try {
+                    const error = { value: null };
+                    const ptr = call("libgtk-4.so.1", "gtk_font_dialog_choose_font_finish", [
+                        { type: { type: "gobject" }, value: this.ptr },
+                        { type: { type: "gobject" }, value: asyncResult },
+                        {
+                            type: {
+                                type: "ref",
+                                innerType: {
+                                    type: "boxed",
+                                    innerType: "GError",
+                                    lib: "libglib-2.0.so.0",
+                                },
+                            },
+                            value: error,
+                        },
+                    ], {
+                        type: "boxed",
+                        borrowed: true,
+                        innerType: "PangoFontDescription",
+                        lib: "libgtk-4.so.1",
+                    });
+                    if (error.value !== null) {
+                        throw new NativeError(error.value);
+                    }
+                    if (ptr === null) {
+                        resolve(null);
+                        return;
+                    }
+                    const instance = Object.create(Pango.FontDescription.prototype);
+                    instance.ptr = ptr;
+                    resolve(instance);
+                }
+                catch (err) {
+                    reject(err);
+                }
+            };
+            call("libgtk-4.so.1", "gtk_font_dialog_choose_font", [
+                { type: { type: "gobject" }, value: this.ptr },
+                {
+                    type: { type: "gobject" },
+                    value: parent?.ptr ?? parent,
+                },
+                {
+                    type: {
+                        type: "boxed",
+                        innerType: "PangoFontDescription",
+                        lib: "libgtk-4.so.1",
+                    },
+                    value: initialValue?.ptr ?? initialValue,
+                },
+                {
+                    type: { type: "gobject" },
+                    value: cancellable?.ptr ?? cancellable,
+                },
+                {
+                    type: {
+                        type: "asyncCallback",
+                        sourceType: { type: "gobject", borrowed: true },
+                        resultType: { type: "gobject", borrowed: true },
+                    },
+                    value: callback,
+                },
+            ], { type: "undefined" });
+        });
     }
-    chooseFontFinish(result) {
-        const error = { value: null };
-        const _result = call("libgtk-4.so.1", "gtk_font_dialog_choose_font_finish", [
-            {
-                type: { type: "gobject" },
-                value: this.ptr,
-            },
-            {
-                type: { type: "gobject" },
-                value: result,
-            },
-            {
-                type: { type: "ref", innerType: { type: "gobject" } },
-                value: error,
-            },
-        ], { type: "gobject", borrowed: true });
-        if (error.value !== null) {
-            const jsError = new Error("GLib Error occurred");
-            jsError.gError = error.value;
-            throw jsError;
-        }
-        return _result;
+    chooseFontAndFeatures(parent, initialValue, cancellable) {
+        return new Promise((resolve, reject) => {
+            const fontDescRef = { value: null };
+            const fontFeaturesRef = { value: null };
+            const languageRef = { value: null };
+            const callback = (_source, asyncResult) => {
+                try {
+                    const error = { value: null };
+                    const result = call("libgtk-4.so.1", "gtk_font_dialog_choose_font_and_features_finish", [
+                        { type: { type: "gobject" }, value: this.ptr },
+                        { type: { type: "gobject" }, value: asyncResult },
+                        {
+                            type: {
+                                type: "ref",
+                                innerType: {
+                                    type: "boxed",
+                                    innerType: "PangoFontDescription",
+                                    lib: "libgtk-4.so.1",
+                                },
+                            },
+                            value: fontDescRef,
+                        },
+                        {
+                            type: { type: "ref", innerType: { type: "string" } },
+                            value: fontFeaturesRef,
+                        },
+                        {
+                            type: {
+                                type: "ref",
+                                innerType: {
+                                    type: "boxed",
+                                    innerType: "PangoLanguage",
+                                    lib: "libgtk-4.so.1",
+                                },
+                            },
+                            value: languageRef,
+                        },
+                        {
+                            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);
+                    }
+                    resolve({
+                        result,
+                        fontDesc: fontDescRef.value,
+                        fontFeatures: fontFeaturesRef.value,
+                        language: languageRef.value,
+                    });
+                }
+                catch (err) {
+                    reject(err);
+                }
+            };
+            call("libgtk-4.so.1", "gtk_font_dialog_choose_font_and_features", [
+                { type: { type: "gobject" }, value: this.ptr },
+                {
+                    type: { type: "gobject" },
+                    value: parent?.ptr ?? parent,
+                },
+                {
+                    type: {
+                        type: "boxed",
+                        innerType: "PangoFontDescription",
+                        lib: "libgtk-4.so.1",
+                    },
+                    value: initialValue?.ptr ?? initialValue,
+                },
+                {
+                    type: { type: "gobject" },
+                    value: cancellable?.ptr ?? cancellable,
+                },
+                {
+                    type: {
+                        type: "asyncCallback",
+                        sourceType: { type: "gobject", borrowed: true },
+                        resultType: { type: "gobject", borrowed: true },
+                    },
+                    value: callback,
+                },
+            ], { type: "undefined" });
+        });
     }
     getFilter() {
-        return call("libgtk-4.so.1", "gtk_font_dialog_get_filter", [
+        const ptr = call("libgtk-4.so.1", "gtk_font_dialog_get_filter", [
             {
                 type: { type: "gobject" },
                 value: this.ptr,
             },
         ], { type: "gobject", borrowed: true });
+        if (ptr === null)
+            return null;
+        const instance = Object.create(Filter.prototype);
+        instance.ptr = ptr;
+        return instance;
     }
     getFontMap() {
-        return call("libgtk-4.so.1", "gtk_font_dialog_get_font_map", [
+        const ptr = call("libgtk-4.so.1", "gtk_font_dialog_get_font_map", [
             {
                 type: { type: "gobject" },
                 value: this.ptr,
             },
         ], { type: "gobject", borrowed: true });
+        if (ptr === null)
+            return null;
+        const instance = Object.create(Pango.FontMap.prototype);
+        instance.ptr = ptr;
+        return instance;
     }
     getLanguage() {
-        return call("libgtk-4.so.1", "gtk_font_dialog_get_language", [
+        const ptr = call("libgtk-4.so.1", "gtk_font_dialog_get_language", [
             {
                 type: { type: "gobject" },
                 value: this.ptr,
             },
-        ], { type: "gobject", borrowed: true });
+        ], {
+            type: "boxed",
+            borrowed: true,
+            innerType: "PangoLanguage",
+            lib: "libgtk-4.so.1",
+        });
+        if (ptr === null)
+            return null;
+        const instance = Object.create(Pango.Language.prototype);
+        instance.ptr = ptr;
+        return instance;
     }
     getModal() {
         return call("libgtk-4.so.1", "gtk_font_dialog_get_modal", [
@@ -274,7 +362,7 @@ export class FontDialog {
             },
             {
                 type: { type: "gobject" },
-                value: filter,
+                value: filter?.ptr ?? filter,
             },
         ], { type: "undefined" });
     }
@@ -286,7 +374,7 @@ export class FontDialog {
             },
             {
                 type: { type: "gobject" },
-                value: fontmap,
+                value: fontmap?.ptr ?? fontmap,
             },
         ], { type: "undefined" });
     }
@@ -297,8 +385,12 @@ export class FontDialog {
                 value: this.ptr,
             },
             {
-                type: { type: "gobject" },
-                value: language,
+                type: {
+                    type: "boxed",
+                    innerType: "PangoLanguage",
+                    lib: "libgtk-4.so.1",
+                },
+                value: language?.ptr ?? language,
             },
         ], { type: "undefined" });
     }

package/dist/generated/gtk/frame.d.ts

@@ -3,20 +3,20 @@ export declare class Frame extends Widget {
     constructor(label?: string);
     constructor(_args: unknown[]);
     protected createPtr(_args: unknown[]): unknown;
-    getChild(): unknown;
+    getChild(): Widget;
     getLabel(): string;
     getLabelAlign(): number;
-    getLabelWidget(): unknown;
-    setChild(child?: unknown): void;
+    getLabelWidget(): Widget;
+    setChild(child?: Widget): void;
     setLabel(label?: string): void;
     setLabelAlign(xalign: number): void;
-    setLabelWidget(labelWidget?: unknown): void;
-    get child(): unknown;
-    set child(_value: unknown);
+    setLabelWidget(labelWidget?: Widget): void;
+    get child(): Widget;
+    set child(_value: Widget);
     get label(): string;
     set label(_value: string);
-    get labelWidget(): unknown;
-    set labelWidget(_value: unknown);
+    get labelWidget(): Widget;
+    set labelWidget(_value: Widget);
     get labelXalign(): number;
     set labelXalign(_value: number);
 }

package/dist/generated/gtk/frame.js

@@ -15,12 +15,17 @@ export class Frame extends Widget {
         ], { type: "gobject", borrowed: true });
     }
     getChild() {
-        return call("libgtk-4.so.1", "gtk_frame_get_child", [
+        const ptr = call("libgtk-4.so.1", "gtk_frame_get_child", [
             {
                 type: { type: "gobject" },
                 value: this.ptr,
             },
         ], { type: "gobject", borrowed: true });
+        if (ptr === null)
+            return null;
+        const instance = Object.create(Widget.prototype);
+        instance.ptr = ptr;
+        return instance;
     }
     getLabel() {
         return call("libgtk-4.so.1", "gtk_frame_get_label", [
@@ -39,12 +44,17 @@ export class Frame extends Widget {
         ], { type: "float", size: 32 });
     }
     getLabelWidget() {
-        return call("libgtk-4.so.1", "gtk_frame_get_label_widget", [
+        const ptr = call("libgtk-4.so.1", "gtk_frame_get_label_widget", [
             {
                 type: { type: "gobject" },
                 value: this.ptr,
             },
         ], { type: "gobject", borrowed: true });
+        if (ptr === null)
+            return null;
+        const instance = Object.create(Widget.prototype);
+        instance.ptr = ptr;
+        return instance;
     }
     setChild(child) {
         call("libgtk-4.so.1", "gtk_frame_set_child", [
@@ -54,7 +64,7 @@ export class Frame extends Widget {
             },
             {
                 type: { type: "gobject" },
-                value: child,
+                value: child?.ptr ?? child,
             },
         ], { type: "undefined" });
     }
@@ -90,7 +100,7 @@ export class Frame extends Widget {
             },
             {
                 type: { type: "gobject" },
-                value: labelWidget,
+                value: labelWidget?.ptr ?? labelWidget,
             },
         ], { type: "undefined" });
     }