@gtkx/ffi 0.4.3 → 0.5.0

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

@@ -70,8 +70,8 @@ export declare class CodeGenerator {
     private collectParentMethodNames;
     private collectAllSignals;
     private generateConstructors;
+    private generateGObjectNewConstructor;
     private generateConstructor;
-    private generateCreatePtr;
     private generateStaticFactoryMethod;
     private generateStaticFunctions;
     private generateStaticFunction;

package/dist/codegen/ffi-generator.js

@@ -218,10 +218,6 @@ const hasRefParameter = (params, typeMapper) => {
     return result;
 };
 const isVararg = (param) => param.name === "..." || param.name === "";
-const cTypeToGetTypeFunc = (cType) => {
-    const snakeCase = cType.replace(/([a-z])([A-Z])/g, "$1_$2").toLowerCase();
-    return `${snakeCase}_get_type`;
-};
 /**
  * Generates TypeScript FFI bindings from GIR namespace definitions.
  * Creates classes, methods, properties, and signal handlers that call
@@ -404,15 +400,20 @@ export class CodeGenerator {
                 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;
+        const mainConstructor = cls.constructors.find((c) => !c.parameters.some(isVararg));
+        const hasMainConstructorWithParent = mainConstructor && !!cls.parent;
+        const hasGObjectNewConstructor = !mainConstructor && !!cls.parent && !!cls.glibGetType && !cls.abstract;
+        const hasStaticFactoryMethods = cls.constructors.some((c) => c !== mainConstructor) || (cls.constructors.length > 0 && !cls.parent);
+        const { signals: allSignals, hasCrossNamespaceParent } = this.collectAllSignals(cls, classMap);
+        const hasSignalConnect = allSignals.length > 0 || hasCrossNamespaceParent;
         this.usesCall =
             filteredClassMethods.length > 0 ||
-                cls.constructors.length > 0 ||
                 cls.functions.length > 0 ||
-                cls.signals.length > 0 ||
                 interfaceMethods.length > 0 ||
-                needsGObjectNewFallback;
+                hasMainConstructorWithParent ||
+                hasGObjectNewConstructor ||
+                hasStaticFactoryMethods ||
+                hasSignalConnect;
         const className = normalizeClassName(cls.name);
         const parentInfo = parseParentReference(cls.parent, classMap);
         const implementsClause = "";
@@ -433,15 +434,13 @@ export class CodeGenerator {
             sections.push(`  id: unknown;\n`);
         }
         sections.push(this.generateConstructors(cls, sharedLibrary, parentInfo.hasParent));
-        sections.push(this.generateCreatePtr(cls, sharedLibrary, parentInfo.hasParent));
         sections.push(this.generateStaticFunctions(cls.functions, sharedLibrary, className));
         sections.push(this.generateMethods(filteredClassMethods, sharedLibrary, cls.name));
         if (interfaceMethods.length > 0) {
             sections.push(this.generateMethods(interfaceMethods, sharedLibrary, className));
         }
         let signalMetaConstant = "";
-        const { signals: allSignals, hasCrossNamespaceParent } = this.collectAllSignals(cls, classMap);
-        if (allSignals.length > 0 || hasCrossNamespaceParent) {
+        if (hasSignalConnect) {
             const hasConnectMethod = cls.methods.some((m) => toCamelCase(m.name) === "connect");
             const signalConnect = this.generateSignalConnect(sharedLibrary, allSignals, hasConnectMethod, classMap, className);
             signalMetaConstant = signalConnect.moduleLevel;
@@ -600,109 +599,103 @@ export class CodeGenerator {
         }
         return { signals: allSignals, hasCrossNamespaceParent: false };
     }
-    generateConstructors(cls, _sharedLibrary, hasParent) {
+    generateConstructors(cls, sharedLibrary, hasParent) {
         const mainConstructor = cls.constructors.find((c) => !c.parameters.some(isVararg));
         const sections = [];
-        if (mainConstructor) {
-            sections.push(this.generateConstructor(mainConstructor, hasParent));
+        if (mainConstructor && hasParent) {
+            sections.push(this.generateConstructor(mainConstructor, sharedLibrary));
             for (const ctor of cls.constructors) {
                 if (ctor !== mainConstructor) {
-                    sections.push(this.generateStaticFactoryMethod(ctor, cls.name, _sharedLibrary));
+                    sections.push(this.generateStaticFactoryMethod(ctor, cls.name, sharedLibrary));
                 }
             }
         }
-        else if (cls.constructors.length > 0) {
+        else {
             for (const ctor of cls.constructors) {
-                sections.push(this.generateStaticFactoryMethod(ctor, cls.name, _sharedLibrary));
+                sections.push(this.generateStaticFactoryMethod(ctor, cls.name, sharedLibrary));
             }
-        }
-        if (!mainConstructor) {
-            if (hasParent) {
-                sections.push(`  constructor(...args: unknown[]) {\n    super(...args);\n  }\n`);
+            if (hasParent && cls.glibGetType && !cls.abstract) {
+                sections.push(this.generateGObjectNewConstructor(cls.glibGetType, sharedLibrary));
+            }
+            else if (hasParent) {
+                sections.push(`  constructor() {\n    super();\n  }\n`);
             }
             else {
-                sections.push(`  constructor(...args: unknown[]) {\n    this.id = this.createPtr(args);\n  }\n`);
+                sections.push(`  constructor() {}\n`);
             }
         }
         return sections.join("\n");
     }
-    generateConstructor(ctor, hasParent) {
-        const ctorDoc = formatMethodDoc(ctor.doc, ctor.parameters);
-        const filteredParams = ctor.parameters.filter((p) => !isVararg(p));
-        if (filteredParams.length === 0) {
-            if (hasParent) {
-                return `${ctorDoc}  constructor(...args: unknown[]) {\n    super(...args);\n  }\n`;
-            }
-            return `${ctorDoc}  constructor(...args: unknown[]) {\n    this.id = this.createPtr(args);\n  }\n`;
-        }
-        const typedParams = this.generateParameterList(ctor.parameters, false);
-        if (hasParent) {
-            return `${ctorDoc}  constructor(${typedParams});
-  constructor(...args: unknown[]);
-  constructor(...args: unknown[]) {
-    super(...args);
-  }
-`;
-        }
-        return `${ctorDoc}  constructor(${typedParams});
-  constructor(...args: unknown[]);
-  constructor(...args: unknown[]) {
-    this.id = this.createPtr(args);
-  }
-`;
-    }
-    generateCreatePtr(cls, sharedLibrary, hasParent) {
-        const mainConstructor = cls.constructors.find((c) => !c.parameters.some(isVararg));
-        if (!mainConstructor) {
-            if (hasParent && cls.cType) {
-                const getTypeFunc = cTypeToGetTypeFunc(cls.cType);
-                const override = hasParent ? "override " : "";
-                return `  protected ${override}createPtr(_args: unknown[]): unknown {
+    generateGObjectNewConstructor(getTypeFunc, sharedLibrary) {
+        return `  constructor() {
+    super();
     const gtype = call(
       "${sharedLibrary}",
       "${getTypeFunc}",
       [],
       { type: "int", size: 64, unsigned: true }
-    ) as number;
-    return call(
+    );
+    this.id = call(
       "libgobject-2.0.so.0",
       "g_object_new",
       [
         { type: { type: "int", size: 64, unsigned: true }, value: gtype },
-        { type: { type: "gobject" }, value: null },
+        { type: { type: "null" }, value: null },
       ],
       { type: "gobject", borrowed: true }
     );
   }
 `;
-            }
-            if (hasParent) {
-                return `  protected override createPtr(_args: unknown[]): unknown {\n    return null;\n  }\n`;
-            }
-            return `  protected createPtr(_args: unknown[]): unknown {\n    return null;\n  }\n`;
+    }
+    generateConstructor(ctor, sharedLibrary) {
+        const ctorDoc = formatMethodDoc(ctor.doc, ctor.parameters);
+        const filteredParams = ctor.parameters.filter((p, i) => !isVararg(p) && !this.typeMapper.isClosureTarget(i, ctor.parameters));
+        const typedParams = this.generateParameterList(ctor.parameters, true);
+        const callArgs = this.generateCallArguments(ctor.parameters);
+        const borrowed = ctor.returnType.transferOwnership !== "full";
+        if (filteredParams.length === 0) {
+            return `${ctorDoc}  constructor() {
+    super();
+    this.id = call(
+      "${sharedLibrary}",
+      "${ctor.cIdentifier}",
+      [],
+      { type: "gobject", borrowed: ${borrowed} }
+    );
+  }
+`;
         }
-        const filteredParams = mainConstructor.parameters.filter((p, i) => !isVararg(p) && !this.typeMapper.isClosureTarget(i, mainConstructor.parameters));
-        const paramTypes = filteredParams.map((p) => this.typeMapper.mapParameter(p).ts);
-        const paramNames = filteredParams.map((p) => toValidIdentifier(toCamelCase(p.name)));
-        const hasParams = paramNames.length > 0;
-        const hasArgsParam = paramNames.includes("args");
-        const arrayParamName = hasArgsParam ? "ctorArgs" : hasParams ? "args" : "_args";
-        const destructuring = hasParams
-            ? `    const [${paramNames.join(", ")}] = ${arrayParamName} as [${paramTypes.join(", ")}];\n`
-            : "";
-        const callArgs = this.generateCallArguments(mainConstructor.parameters);
-        const override = hasParent ? "override " : "";
-        const borrowed = mainConstructor.returnType.transferOwnership !== "full";
-        return `  protected ${override}createPtr(${arrayParamName}: unknown[]): unknown {
-${destructuring}    return call(
+        const firstParam = filteredParams[0];
+        const firstParamName = toValidIdentifier(toCamelCase(firstParam?.name ?? ""));
+        const firstParamNullable = firstParam ? this.typeMapper.isNullable(firstParam) : false;
+        if (firstParamNullable) {
+            return `${ctorDoc}  constructor(${typedParams}) {
+    super();
+    this.id = call(
       "${sharedLibrary}",
-      "${mainConstructor.cIdentifier}",
+      "${ctor.cIdentifier}",
       [
 ${callArgs}
       ],
       { type: "gobject", borrowed: ${borrowed} }
     );
   }
+`;
+        }
+        return `${ctorDoc}  constructor(${typedParams}) {
+    super();
+
+    if (${firstParamName} !== undefined) {
+      this.id = call(
+        "${sharedLibrary}",
+        "${ctor.cIdentifier}",
+        [
+${callArgs}
+        ],
+        { type: "gobject", borrowed: ${borrowed} }
+      );
+    }
+  }
 `;
     }
     generateStaticFactoryMethod(ctor, className, sharedLibrary) {

package/dist/generated/gdk/app-launch-context.d.ts

@@ -24,8 +24,7 @@ import * as Gio from "../gio/index.js";
  */
 export declare class AppLaunchContext extends Gio.AppLaunchContext {
     static readonly glibTypeName: string;
-    constructor(...args: unknown[]);
-    protected createPtr(_args: unknown[]): unknown;
+    constructor();
     /**
      * Gets the `GdkDisplay` that `context` is for.
      */

package/dist/generated/gdk/app-launch-context.js

@@ -23,18 +23,16 @@ import * as Gio from "../gio/index.js";
  */
 export class AppLaunchContext extends Gio.AppLaunchContext {
     static glibTypeName = "GdkAppLaunchContext";
-    constructor(...args) {
-        super(...args);
-    }
-    createPtr(_args) {
+    constructor() {
+        super();
         const gtype = call("libgtk-4.so.1", "gdk_app_launch_context_get_type", [], {
             type: "int",
             size: 64,
             unsigned: true,
         });
-        return call("libgobject-2.0.so.0", "g_object_new", [
+        this.id = call("libgobject-2.0.so.0", "g_object_new", [
             { type: { type: "int", size: 64, unsigned: true }, value: gtype },
-            { type: { type: "gobject" }, value: null },
+            { type: { type: "null" }, value: null },
         ], { type: "gobject", borrowed: true });
     }
     /**

package/dist/generated/gdk/button-event.d.ts

@@ -2,8 +2,7 @@ import { Event } from "./event.js";
 /** An event related to a button on a pointer device. */
 export declare class ButtonEvent extends Event {
     static readonly glibTypeName: string;
-    constructor(...args: unknown[]);
-    protected createPtr(_args: unknown[]): unknown;
+    constructor();
     /**
      * Extract the button number from a button event.
      */

package/dist/generated/gdk/button-event.js

@@ -3,18 +3,16 @@ import { Event } from "./event.js";
 /** An event related to a button on a pointer device. */
 export class ButtonEvent extends Event {
     static glibTypeName = "GdkButtonEvent";
-    constructor(...args) {
-        super(...args);
-    }
-    createPtr(_args) {
+    constructor() {
+        super();
         const gtype = call("libgtk-4.so.1", "gdk_button_event_get_type", [], {
             type: "int",
             size: 64,
             unsigned: true,
         });
-        return call("libgobject-2.0.so.0", "g_object_new", [
+        this.id = call("libgobject-2.0.so.0", "g_object_new", [
             { type: { type: "int", size: 64, unsigned: true }, value: gtype },
-            { type: { type: "gobject" }, value: null },
+            { type: { type: "null" }, value: null },
         ], { type: "gobject", borrowed: true });
     }
     /**

package/dist/generated/gdk/cairo-context.d.ts

@@ -10,8 +10,7 @@ import { DrawContext } from "./draw-context.js";
  */
 export declare class CairoContext extends DrawContext {
     static readonly glibTypeName: string;
-    constructor(...args: unknown[]);
-    protected createPtr(_args: unknown[]): unknown;
+    constructor();
     /**
      * Retrieves a Cairo context to be used to draw on the `GdkSurface`
      * of @context.

package/dist/generated/gdk/cairo-context.js

@@ -9,19 +9,8 @@ import { DrawContext } from "./draw-context.js";
  */
 export class CairoContext extends DrawContext {
     static glibTypeName = "GdkCairoContext";
-    constructor(...args) {
-        super(...args);
-    }
-    createPtr(_args) {
-        const gtype = call("libgtk-4.so.1", "gdk_cairo_context_get_type", [], {
-            type: "int",
-            size: 64,
-            unsigned: true,
-        });
-        return call("libgobject-2.0.so.0", "g_object_new", [
-            { type: { type: "int", size: 64, unsigned: true }, value: gtype },
-            { type: { type: "gobject" }, value: null },
-        ], { type: "gobject", borrowed: true });
+    constructor() {
+        super();
     }
     /**
      * Retrieves a Cairo context to be used to draw on the `GdkSurface`

package/dist/generated/gdk/cicp-params.d.ts

@@ -30,8 +30,7 @@ export declare class CicpParams extends GObject.GObject {
      * The initial values of the properties are the values for "undefined"
      * and need to be set before a color state object can be built.
      */
-    constructor(...args: unknown[]);
-    protected createPtr(_args: unknown[]): unknown;
+    constructor();
     /**
      * Creates a new `GdkColorState` object for the cicp parameters in @self.
      *

package/dist/generated/gdk/cicp-params.js

@@ -29,11 +29,9 @@ export class CicpParams extends GObject.GObject {
      * The initial values of the properties are the values for "undefined"
      * and need to be set before a color state object can be built.
      */
-    constructor(...args) {
-        super(...args);
-    }
-    createPtr(_args) {
-        return call("libgtk-4.so.1", "gdk_cicp_params_new", [], {
+    constructor() {
+        super();
+        this.id = call("libgtk-4.so.1", "gdk_cicp_params_new", [], {
             type: "gobject",
             borrowed: false,
         });

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

@@ -7,8 +7,7 @@ import * as GObject from "../gobject/index.js";
 import * as Gio from "../gio/index.js";
 export declare class Clipboard extends GObject.GObject {
     static readonly glibTypeName: string;
-    constructor(...args: unknown[]);
-    protected createPtr(_args: unknown[]): unknown;
+    constructor();
     /**
      * Returns the `GdkContentProvider` currently set on @clipboard.
      *

package/dist/generated/gdk/clipboard.js

@@ -23,18 +23,16 @@ const SIGNAL_META = {
 };
 export class Clipboard extends GObject.GObject {
     static glibTypeName = "GdkClipboard";
-    constructor(...args) {
-        super(...args);
-    }
-    createPtr(_args) {
+    constructor() {
+        super();
         const gtype = call("libgtk-4.so.1", "gdk_clipboard_get_type", [], {
             type: "int",
             size: 64,
             unsigned: true,
         });
-        return call("libgobject-2.0.so.0", "g_object_new", [
+        this.id = call("libgobject-2.0.so.0", "g_object_new", [
             { type: { type: "int", size: 64, unsigned: true }, value: gtype },
-            { type: { type: "gobject" }, value: null },
+            { type: { type: "null" }, value: null },
         ], { type: "gobject", borrowed: true });
     }
     /**

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

@@ -15,8 +15,7 @@ import * as Gio from "../gio/index.js";
  */
 export declare class ContentDeserializer extends GObject.GObject {
     static readonly glibTypeName: string;
-    constructor(...args: unknown[]);
-    protected createPtr(_args: unknown[]): unknown;
+    constructor();
     /**
      * Gets the cancellable for the current operation.
      *

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

@@ -14,14 +14,12 @@ import * as GObject from "../gobject/index.js";
  */
 export class ContentDeserializer extends GObject.GObject {
     static glibTypeName = "GdkContentDeserializer";
-    constructor(...args) {
-        super(...args);
-    }
-    createPtr(_args) {
+    constructor() {
+        super();
         const gtype = call("libgtk-4.so.1", "gdk_content_deserializer_get_type", [], { type: "int", size: 64, unsigned: true });
-        return call("libgobject-2.0.so.0", "g_object_new", [
+        this.id = call("libgobject-2.0.so.0", "g_object_new", [
             { type: { type: "int", size: 64, unsigned: true }, value: gtype },
-            { type: { type: "gobject" }, value: null },
+            { type: { type: "null" }, value: null },
         ], { type: "gobject", borrowed: true });
     }
     /**

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

@@ -10,8 +10,7 @@ export declare class ContentProvider extends GObject.GObject {
      * @param mimeType - the mime type
      * @param bytes - a `GBytes` with the data for @mime_type
      */
-    constructor(mimeType: string, bytes: GLib.Bytes);
-    constructor(...args: unknown[]);
+    constructor(mimeType?: string | null, bytes?: GLib.Bytes | null);
     /**
      * Create a content provider that provides the given @value.
      * @param value - a `GValue`
@@ -37,7 +36,6 @@ export declare class ContentProvider extends GObject.GObject {
      * @param nProviders - the number of providers
      */
     static providerNewUnion(nProviders: number, providers?: ContentProvider[] | null): ContentProvider;
-    protected createPtr(args: unknown[]): unknown;
     /**
      * Emits the ::content-changed signal.
      */

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

@@ -16,8 +16,31 @@ const SIGNAL_META = {
 };
 export class ContentProvider extends GObject.GObject {
     static glibTypeName = "GdkContentProvider";
-    constructor(...args) {
-        super(...args);
+    /**
+     * Create a content provider that provides the given `bytes` as data for
+     * the given @mime_type.
+     * @param mimeType - the mime type
+     * @param bytes - a `GBytes` with the data for @mime_type
+     */
+    constructor(mimeType, bytes) {
+        super();
+        if (mimeType !== undefined) {
+            this.id = call("libgtk-4.so.1", "gdk_content_provider_new_for_bytes", [
+                {
+                    type: { type: "string" },
+                    value: mimeType,
+                },
+                {
+                    type: {
+                        type: "boxed",
+                        borrowed: true,
+                        innerType: "GBytes",
+                        lib: "libgtk-4.so.1",
+                    },
+                    value: bytes?.id ?? bytes,
+                },
+            ], { type: "gobject", borrowed: false });
+        }
     }
     /**
      * Create a content provider that provides the given @value.
@@ -70,24 +93,6 @@ export class ContentProvider extends GObject.GObject {
         ], { type: "gobject", borrowed: false });
         return getObject(ptr);
     }
-    createPtr(args) {
-        const [mimeType, bytes] = args;
-        return call("libgtk-4.so.1", "gdk_content_provider_new_for_bytes", [
-            {
-                type: { type: "string" },
-                value: mimeType,
-            },
-            {
-                type: {
-                    type: "boxed",
-                    borrowed: true,
-                    innerType: "GBytes",
-                    lib: "libgtk-4.so.1",
-                },
-                value: bytes?.id ?? bytes,
-            },
-        ], { type: "gobject", borrowed: false });
-    }
     /**
      * Emits the ::content-changed signal.
      */

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

@@ -16,8 +16,7 @@ import * as Gio from "../gio/index.js";
  */
 export declare class ContentSerializer extends GObject.GObject {
     static readonly glibTypeName: string;
-    constructor(...args: unknown[]);
-    protected createPtr(_args: unknown[]): unknown;
+    constructor();
     /**
      * Gets the cancellable for the current operation.
      *

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

@@ -15,18 +15,16 @@ import * as GObject from "../gobject/index.js";
  */
 export class ContentSerializer extends GObject.GObject {
     static glibTypeName = "GdkContentSerializer";
-    constructor(...args) {
-        super(...args);
-    }
-    createPtr(_args) {
+    constructor() {
+        super();
         const gtype = call("libgtk-4.so.1", "gdk_content_serializer_get_type", [], {
             type: "int",
             size: 64,
             unsigned: true,
         });
-        return call("libgobject-2.0.so.0", "g_object_new", [
+        this.id = call("libgobject-2.0.so.0", "g_object_new", [
             { type: { type: "int", size: 64, unsigned: true }, value: gtype },
-            { type: { type: "gobject" }, value: null },
+            { type: { type: "null" }, value: null },
         ], { type: "gobject", borrowed: true });
     }
     /**

package/dist/generated/gdk/crossing-event.d.ts

@@ -3,8 +3,7 @@ import { Event } from "./event.js";
 /** An event caused by a pointing device moving between surfaces. */
 export declare class CrossingEvent extends Event {
     static readonly glibTypeName: string;
-    constructor(...args: unknown[]);
-    protected createPtr(_args: unknown[]): unknown;
+    constructor();
     /**
      * Extracts the notify detail from a crossing event.
      */

package/dist/generated/gdk/crossing-event.js

@@ -3,18 +3,16 @@ import { Event } from "./event.js";
 /** An event caused by a pointing device moving between surfaces. */
 export class CrossingEvent extends Event {
     static glibTypeName = "GdkCrossingEvent";
-    constructor(...args) {
-        super(...args);
-    }
-    createPtr(_args) {
+    constructor() {
+        super();
         const gtype = call("libgtk-4.so.1", "gdk_crossing_event_get_type", [], {
             type: "int",
             size: 64,
             unsigned: true,
         });
-        return call("libgobject-2.0.so.0", "g_object_new", [
+        this.id = call("libgobject-2.0.so.0", "g_object_new", [
             { type: { type: "int", size: 64, unsigned: true }, value: gtype },
-            { type: { type: "gobject" }, value: null },
+            { type: { type: "null" }, value: null },
         ], { type: "gobject", borrowed: true });
     }
     /**

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

@@ -48,8 +48,7 @@ export declare class Cursor extends GObject.GObject {
      * @param destroy - destroy notify for @data
      * @param fallback - the `GdkCursor` to fall back to when
      */
-    constructor(callback: (...args: unknown[]) => unknown, destroy: () => void, data?: number | null, fallback?: Cursor | null);
-    constructor(...args: unknown[]);
+    constructor(callback?: (...args: unknown[]) => unknown | null, data?: number | null, destroy?: () => void | null, fallback?: Cursor | null);
     /**
      * Creates a new cursor by looking up `name` in the current cursor
      * theme.
@@ -108,7 +107,6 @@ export declare class Cursor extends GObject.GObject {
      * @param fallback - the `GdkCursor` to fall back to when
      */
     static newFromTexture(texture: Texture, hotspotX: number, hotspotY: number, fallback?: Cursor | null): Cursor;
-    protected createPtr(args: unknown[]): unknown;
     /**
      * Returns the fallback for this @cursor.
      *