@gtkx/ffi 0.1.1 → 0.1.2

package/dist/generated/gtk/custom-filter.d.ts

@@ -1,5 +1,7 @@
 import { Filter } from "./filter.js";
 export declare class CustomFilter extends Filter {
-    constructor(matchFunc?: (...args: unknown[]) => unknown, userData?: unknown, userDestroy?: unknown);
+    constructor(userDestroy: unknown, matchFunc?: (...args: unknown[]) => unknown, userData?: unknown);
+    constructor(_args: unknown[]);
+    protected createPtr(_args: unknown[]): unknown;
     setFilterFunc(userDestroy: unknown, matchFunc?: (...args: unknown[]) => unknown, userData?: unknown): void;
 }

package/dist/generated/gtk/custom-filter.js

@@ -1,9 +1,13 @@
 import { call } from "@gtkx/native";
 import { Filter } from "./filter.js";
 export class CustomFilter extends Filter {
-    constructor(matchFunc, userData, userDestroy) {
-        super(true);
-        this.ptr = call("libgtk-4.so.1", "gtk_custom_filter_new", [
+    constructor(...args) {
+        const _args = args.length === 1 && Array.isArray(args[0]) ? args[0] : args;
+        super(_args);
+    }
+    createPtr(_args) {
+        const [matchFunc, userData, userDestroy] = _args;
+        return call("libgtk-4.so.1", "gtk_custom_filter_new", [
             {
                 type: { type: "callback" },
                 value: matchFunc,

package/dist/generated/gtk/custom-layout.d.ts

@@ -1,4 +1,6 @@
 import { LayoutManager } from "./layout-manager.js";
 export declare class CustomLayout extends LayoutManager {
-    constructor(requestMode?: (...args: unknown[]) => unknown, measure?: (...args: unknown[]) => unknown, allocate?: (...args: unknown[]) => unknown);
+    constructor(measure: (...args: unknown[]) => unknown, allocate: (...args: unknown[]) => unknown, requestMode?: (...args: unknown[]) => unknown);
+    constructor(_args: unknown[]);
+    protected createPtr(_args: unknown[]): unknown;
 }

package/dist/generated/gtk/custom-layout.js

@@ -1,9 +1,13 @@
 import { call } from "@gtkx/native";
 import { LayoutManager } from "./layout-manager.js";
 export class CustomLayout extends LayoutManager {
-    constructor(requestMode, measure, allocate) {
-        super(true);
-        this.ptr = call("libgtk-4.so.1", "gtk_custom_layout_new", [
+    constructor(...args) {
+        const _args = args.length === 1 && Array.isArray(args[0]) ? args[0] : args;
+        super(_args);
+    }
+    createPtr(_args) {
+        const [requestMode, measure, allocate] = _args;
+        return call("libgtk-4.so.1", "gtk_custom_layout_new", [
             {
                 type: { type: "callback" },
                 value: requestMode,

package/dist/generated/gtk/custom-sorter.d.ts

@@ -1,5 +1,7 @@
 import { Sorter } from "./sorter.js";
 export declare class CustomSorter extends Sorter {
     constructor(sortFunc?: (...args: unknown[]) => unknown, userData?: unknown, userDestroy?: unknown);
+    constructor(_args: unknown[]);
+    protected createPtr(_args: unknown[]): unknown;
     setSortFunc(userDestroy: unknown, sortFunc?: (...args: unknown[]) => unknown, userData?: unknown): void;
 }

package/dist/generated/gtk/custom-sorter.js

@@ -1,9 +1,13 @@
 import { call } from "@gtkx/native";
 import { Sorter } from "./sorter.js";
 export class CustomSorter extends Sorter {
-    constructor(sortFunc, userData, userDestroy) {
-        super(true);
-        this.ptr = call("libgtk-4.so.1", "gtk_custom_sorter_new", [
+    constructor(...args) {
+        const _args = args.length === 1 && Array.isArray(args[0]) ? args[0] : args;
+        super(_args);
+    }
+    createPtr(_args) {
+        const [sortFunc, userData, userDestroy] = _args;
+        return call("libgtk-4.so.1", "gtk_custom_sorter_new", [
             {
                 type: { type: "callback" },
                 value: sortFunc,

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

@@ -1,8 +1,9 @@
 import { DialogFlags } from "./enums.js";
 import { Window } from "./window.js";
 export declare class Dialog extends Window {
-    constructor(_skipCreate?: boolean);
+    constructor(_args?: unknown[]);
     static newWithButtons(flags: DialogFlags, title?: string, parent?: unknown, firstButtonText?: string): Dialog;
+    protected createPtr(_args: unknown[]): unknown;
     addActionWidget(child: unknown, responseId: number): void;
     addButton(buttonText: string, responseId: number): unknown;
     addButtons(firstButtonText: string): void;

package/dist/generated/gtk/dialog.js

@@ -1,13 +1,8 @@
 import { call } from "@gtkx/native";
 import { Window } from "./window.js";
 export class Dialog extends Window {
-    constructor(_skipCreate) {
-        super(true);
-        if (!_skipCreate)
-            this.ptr = call("libgtk-4.so.1", "gtk_dialog_new", [], {
-                type: "gobject",
-                borrowed: true,
-            });
+    constructor(_args = []) {
+        super(_args);
     }
     static newWithButtons(flags, title, parent, firstButtonText) {
         const ptr = call("libgtk-4.so.1", "gtk_dialog_new_with_buttons", [
@@ -32,6 +27,12 @@ export class Dialog extends Window {
         instance.ptr = ptr;
         return instance;
     }
+    createPtr(_args) {
+        return call("libgtk-4.so.1", "gtk_dialog_new", [], {
+            type: "gobject",
+            borrowed: true,
+        });
+    }
     addActionWidget(child, responseId) {
         call("libgtk-4.so.1", "gtk_dialog_add_action_widget", [
             {
@@ -165,17 +166,19 @@ export class Dialog extends Window {
             response: [{ type: { type: "int", size: 32, unsigned: false } }],
         };
         const meta = signalMeta[signal];
-        const argTypes = meta?.map((m) => m.type);
+        const selfType = { type: "gobject", borrowed: false };
+        const argTypes = meta ? [selfType, ...meta.map((m) => m.type)] : [selfType];
         const wrappedHandler = (...args) => {
+            const signalArgs = args.slice(1);
             if (!meta)
-                return handler(...args);
+                return handler(...signalArgs);
             const wrapped = meta.map((m, i) => {
-                if (m.cls && args[i] != null) {
+                if (m.cls && signalArgs[i] != null) {
                     const inst = Object.create(m.cls.prototype);
-                    inst.ptr = args[i];
+                    inst.ptr = signalArgs[i];
                     return inst;
                 }
-                return args[i];
+                return signalArgs[i];
             });
             return handler(...wrapped);
         };

package/dist/generated/gtk/directory-list.d.ts

@@ -1,6 +1,8 @@
 export declare class DirectoryList {
     ptr: unknown;
     constructor(attributes?: string, file?: unknown);
+    constructor(_args: unknown[]);
+    protected createPtr(_args: unknown[]): unknown;
     getAttributes(): string;
     getError(): unknown;
     getFile(): unknown;

package/dist/generated/gtk/directory-list.js

@@ -1,8 +1,13 @@
 import { call } from "@gtkx/native";
 export class DirectoryList {
     ptr;
-    constructor(attributes, file) {
-        this.ptr = call("libgtk-4.so.1", "gtk_directory_list_new", [
+    constructor(...args) {
+        const _args = args.length === 1 && Array.isArray(args[0]) ? args[0] : args;
+        this.ptr = this.createPtr(_args);
+    }
+    createPtr(_args) {
+        const [attributes, file] = _args;
+        return call("libgtk-4.so.1", "gtk_directory_list_new", [
             {
                 type: { type: "string" },
                 value: attributes,

package/dist/generated/gtk/drag-icon.d.ts

@@ -1,6 +1,8 @@
 import { Widget } from "./widget.js";
 export declare class DragIcon extends Widget {
-    constructor(drag?: unknown);
+    constructor(drag: unknown);
+    constructor(_args: unknown[]);
+    protected createPtr(_args: unknown[]): unknown;
     getChild(): unknown;
     setChild(child?: unknown): void;
     get child(): unknown;

package/dist/generated/gtk/drag-icon.js

@@ -1,9 +1,13 @@
 import { call } from "@gtkx/native";
 import { Widget } from "./widget.js";
 export class DragIcon extends Widget {
-    constructor(drag) {
-        super(true);
-        this.ptr = call("libgtk-4.so.1", "gtk_drag_icon_get_for_drag", [
+    constructor(...args) {
+        const _args = args.length === 1 && Array.isArray(args[0]) ? args[0] : args;
+        super(_args);
+    }
+    createPtr(_args) {
+        const [drag] = _args;
+        return call("libgtk-4.so.1", "gtk_drag_icon_get_for_drag", [
             {
                 type: { type: "gobject" },
                 value: drag,

package/dist/generated/gtk/drag-source.d.ts

@@ -1,6 +1,7 @@
 import { GestureSingle } from "./gesture-single.js";
 export declare class DragSource extends GestureSingle {
-    constructor();
+    constructor(_args?: unknown[]);
+    protected createPtr(_args: unknown[]): unknown;
     dragCancel(): void;
     getActions(): unknown;
     getContent(): unknown;

package/dist/generated/gtk/drag-source.js

@@ -1,9 +1,11 @@
 import { call } from "@gtkx/native";
 import { GestureSingle } from "./gesture-single.js";
 export class DragSource extends GestureSingle {
-    constructor() {
-        super(true);
-        this.ptr = call("libgtk-4.so.1", "gtk_drag_source_new", [], {
+    constructor(_args = []) {
+        super(_args);
+    }
+    createPtr(_args) {
+        return call("libgtk-4.so.1", "gtk_drag_source_new", [], {
             type: "gobject",
             borrowed: true,
         });
@@ -113,17 +115,19 @@ export class DragSource extends GestureSingle {
             ],
         };
         const meta = signalMeta[signal];
-        const argTypes = meta?.map((m) => m.type);
+        const selfType = { type: "gobject", borrowed: false };
+        const argTypes = meta ? [selfType, ...meta.map((m) => m.type)] : [selfType];
         const wrappedHandler = (...args) => {
+            const signalArgs = args.slice(1);
             if (!meta)
-                return handler(...args);
+                return handler(...signalArgs);
             const wrapped = meta.map((m, i) => {
-                if (m.cls && args[i] != null) {
+                if (m.cls && signalArgs[i] != null) {
                     const inst = Object.create(m.cls.prototype);
-                    inst.ptr = args[i];
+                    inst.ptr = signalArgs[i];
                     return inst;
                 }
-                return args[i];
+                return signalArgs[i];
             });
             return handler(...wrapped);
         };

package/dist/generated/gtk/drawing-area.d.ts

@@ -1,6 +1,7 @@
 import { Widget } from "./widget.js";
 export declare class DrawingArea extends Widget {
-    constructor();
+    constructor(_args?: unknown[]);
+    protected createPtr(_args: unknown[]): unknown;
     getContentHeight(): number;
     getContentWidth(): number;
     setContentHeight(height: number): void;

package/dist/generated/gtk/drawing-area.js

@@ -1,9 +1,11 @@
 import { call } from "@gtkx/native";
 import { Widget } from "./widget.js";
 export class DrawingArea extends Widget {
-    constructor() {
-        super(true);
-        this.ptr = call("libgtk-4.so.1", "gtk_drawing_area_new", [], {
+    constructor(_args = []) {
+        super(_args);
+    }
+    createPtr(_args) {
+        return call("libgtk-4.so.1", "gtk_drawing_area_new", [], {
             type: "gobject",
             borrowed: true,
         });
@@ -88,17 +90,19 @@ export class DrawingArea extends Widget {
             ],
         };
         const meta = signalMeta[signal];
-        const argTypes = meta?.map((m) => m.type);
+        const selfType = { type: "gobject", borrowed: false };
+        const argTypes = meta ? [selfType, ...meta.map((m) => m.type)] : [selfType];
         const wrappedHandler = (...args) => {
+            const signalArgs = args.slice(1);
             if (!meta)
-                return handler(...args);
+                return handler(...signalArgs);
             const wrapped = meta.map((m, i) => {
-                if (m.cls && args[i] != null) {
+                if (m.cls && signalArgs[i] != null) {
                     const inst = Object.create(m.cls.prototype);
-                    inst.ptr = args[i];
+                    inst.ptr = signalArgs[i];
                     return inst;
                 }
-                return args[i];
+                return signalArgs[i];
             });
             return handler(...wrapped);
         };

package/dist/generated/gtk/drop-controller-motion.d.ts

@@ -1,6 +1,7 @@
 import { EventController } from "./event-controller.js";
 export declare class DropControllerMotion extends EventController {
-    constructor();
+    constructor(_args?: unknown[]);
+    protected createPtr(_args: unknown[]): unknown;
     containsPointer(): boolean;
     getDrop(): unknown;
     isPointer(): boolean;

package/dist/generated/gtk/drop-controller-motion.js

@@ -1,9 +1,11 @@
 import { call } from "@gtkx/native";
 import { EventController } from "./event-controller.js";
 export class DropControllerMotion extends EventController {
-    constructor() {
-        super(true);
-        this.ptr = call("libgtk-4.so.1", "gtk_drop_controller_motion_new", [], {
+    constructor(_args = []) {
+        super(_args);
+    }
+    createPtr(_args) {
+        return call("libgtk-4.so.1", "gtk_drop_controller_motion_new", [], {
             type: "gobject",
             borrowed: true,
         });
@@ -48,17 +50,19 @@ export class DropControllerMotion extends EventController {
             ],
         };
         const meta = signalMeta[signal];
-        const argTypes = meta?.map((m) => m.type);
+        const selfType = { type: "gobject", borrowed: false };
+        const argTypes = meta ? [selfType, ...meta.map((m) => m.type)] : [selfType];
         const wrappedHandler = (...args) => {
+            const signalArgs = args.slice(1);
             if (!meta)
-                return handler(...args);
+                return handler(...signalArgs);
             const wrapped = meta.map((m, i) => {
-                if (m.cls && args[i] != null) {
+                if (m.cls && signalArgs[i] != null) {
                     const inst = Object.create(m.cls.prototype);
-                    inst.ptr = args[i];
+                    inst.ptr = signalArgs[i];
                     return inst;
                 }
-                return args[i];
+                return signalArgs[i];
             });
             return handler(...wrapped);
         };

package/dist/generated/gtk/drop-down.d.ts

@@ -2,7 +2,9 @@ import { StringFilterMatchMode } from "./enums.js";
 import { Widget } from "./widget.js";
 export declare class DropDown extends Widget {
     constructor(model?: unknown, expression?: unknown);
+    constructor(_args: unknown[]);
     static downNewFromStrings(strings: string[]): DropDown;
+    protected createPtr(_args: unknown[]): unknown;
     getEnableSearch(): boolean;
     getExpression(): unknown;
     getFactory(): unknown;

package/dist/generated/gtk/drop-down.js

@@ -1,18 +1,9 @@
 import { call } from "@gtkx/native";
 import { Widget } from "./widget.js";
 export class DropDown extends Widget {
-    constructor(model, expression) {
-        super(true);
-        this.ptr = call("libgtk-4.so.1", "gtk_drop_down_new", [
-            {
-                type: { type: "gobject" },
-                value: model,
-            },
-            {
-                type: { type: "gobject" },
-                value: expression,
-            },
-        ], { type: "gobject", borrowed: true });
+    constructor(...args) {
+        const _args = args.length === 1 && Array.isArray(args[0]) ? args[0] : args;
+        super(_args);
     }
     static downNewFromStrings(strings) {
         const ptr = call("libgtk-4.so.1", "gtk_drop_down_new_from_strings", [
@@ -25,6 +16,19 @@ export class DropDown extends Widget {
         instance.ptr = ptr;
         return instance;
     }
+    createPtr(_args) {
+        const [model, expression] = _args;
+        return call("libgtk-4.so.1", "gtk_drop_down_new", [
+            {
+                type: { type: "gobject" },
+                value: model,
+            },
+            {
+                type: { type: "gobject" },
+                value: expression,
+            },
+        ], { type: "gobject", borrowed: true });
+    }
     getEnableSearch() {
         return call("libgtk-4.so.1", "gtk_drop_down_get_enable_search", [
             {
@@ -275,17 +279,19 @@ export class DropDown extends Widget {
             activate: [],
         };
         const meta = signalMeta[signal];
-        const argTypes = meta?.map((m) => m.type);
+        const selfType = { type: "gobject", borrowed: false };
+        const argTypes = meta ? [selfType, ...meta.map((m) => m.type)] : [selfType];
         const wrappedHandler = (...args) => {
+            const signalArgs = args.slice(1);
             if (!meta)
-                return handler(...args);
+                return handler(...signalArgs);
             const wrapped = meta.map((m, i) => {
-                if (m.cls && args[i] != null) {
+                if (m.cls && signalArgs[i] != null) {
                     const inst = Object.create(m.cls.prototype);
-                    inst.ptr = args[i];
+                    inst.ptr = signalArgs[i];
                     return inst;
                 }
-                return args[i];
+                return signalArgs[i];
             });
             return handler(...wrapped);
         };

package/dist/generated/gtk/drop-target-async.d.ts

@@ -1,6 +1,8 @@
 import { EventController } from "./event-controller.js";
 export declare class DropTargetAsync extends EventController {
-    constructor(formats?: unknown, actions?: unknown);
+    constructor(actions: unknown, formats?: unknown);
+    constructor(_args: unknown[]);
+    protected createPtr(_args: unknown[]): unknown;
     getActions(): unknown;
     getFormats(): unknown;
     rejectDrop(drop: unknown): void;

package/dist/generated/gtk/drop-target-async.js

@@ -1,9 +1,13 @@
 import { call } from "@gtkx/native";
 import { EventController } from "./event-controller.js";
 export class DropTargetAsync extends EventController {
-    constructor(formats, actions) {
-        super(true);
-        this.ptr = call("libgtk-4.so.1", "gtk_drop_target_async_new", [
+    constructor(...args) {
+        const _args = args.length === 1 && Array.isArray(args[0]) ? args[0] : args;
+        super(_args);
+    }
+    createPtr(_args) {
+        const [formats, actions] = _args;
+        return call("libgtk-4.so.1", "gtk_drop_target_async_new", [
             {
                 type: { type: "gobject" },
                 value: formats,
@@ -99,17 +103,19 @@ export class DropTargetAsync extends EventController {
             ],
         };
         const meta = signalMeta[signal];
-        const argTypes = meta?.map((m) => m.type);
+        const selfType = { type: "gobject", borrowed: false };
+        const argTypes = meta ? [selfType, ...meta.map((m) => m.type)] : [selfType];
         const wrappedHandler = (...args) => {
+            const signalArgs = args.slice(1);
             if (!meta)
-                return handler(...args);
+                return handler(...signalArgs);
             const wrapped = meta.map((m, i) => {
-                if (m.cls && args[i] != null) {
+                if (m.cls && signalArgs[i] != null) {
                     const inst = Object.create(m.cls.prototype);
-                    inst.ptr = args[i];
+                    inst.ptr = signalArgs[i];
                     return inst;
                 }
-                return args[i];
+                return signalArgs[i];
             });
             return handler(...wrapped);
         };

package/dist/generated/gtk/drop-target.d.ts

@@ -1,7 +1,9 @@
 import { Ref } from "@gtkx/native";
 import { EventController } from "./event-controller.js";
 export declare class DropTarget extends EventController {
-    constructor(type?: number, actions?: unknown);
+    constructor(type: number, actions: unknown);
+    constructor(_args: unknown[]);
+    protected createPtr(_args: unknown[]): unknown;
     getActions(): unknown;
     getCurrentDrop(): unknown;
     getDrop(): unknown;

package/dist/generated/gtk/drop-target.js

@@ -1,9 +1,13 @@
 import { call } from "@gtkx/native";
 import { EventController } from "./event-controller.js";
 export class DropTarget extends EventController {
-    constructor(type, actions) {
-        super(true);
-        this.ptr = call("libgtk-4.so.1", "gtk_drop_target_new", [
+    constructor(...args) {
+        const _args = args.length === 1 && Array.isArray(args[0]) ? args[0] : args;
+        super(_args);
+    }
+    createPtr(_args) {
+        const [type, actions] = _args;
+        return call("libgtk-4.so.1", "gtk_drop_target_new", [
             {
                 type: { type: "int", size: 64, unsigned: true },
                 value: type,
@@ -168,17 +172,19 @@ export class DropTarget extends EventController {
             ],
         };
         const meta = signalMeta[signal];
-        const argTypes = meta?.map((m) => m.type);
+        const selfType = { type: "gobject", borrowed: false };
+        const argTypes = meta ? [selfType, ...meta.map((m) => m.type)] : [selfType];
         const wrappedHandler = (...args) => {
+            const signalArgs = args.slice(1);
             if (!meta)
-                return handler(...args);
+                return handler(...signalArgs);
             const wrapped = meta.map((m, i) => {
-                if (m.cls && args[i] != null) {
+                if (m.cls && signalArgs[i] != null) {
                     const inst = Object.create(m.cls.prototype);
-                    inst.ptr = args[i];
+                    inst.ptr = signalArgs[i];
                     return inst;
                 }
-                return args[i];
+                return signalArgs[i];
             });
             return handler(...wrapped);
         };

package/dist/generated/gtk/editable-label.d.ts

@@ -1,6 +1,8 @@
 import { Widget } from "./widget.js";
 export declare class EditableLabel extends Widget {
-    constructor(str?: string);
+    constructor(str: string);
+    constructor(_args: unknown[]);
+    protected createPtr(_args: unknown[]): unknown;
     getEditing(): boolean;
     startEditing(): void;
     stopEditing(commit: boolean): void;

package/dist/generated/gtk/editable-label.js

@@ -1,9 +1,13 @@
 import { call } from "@gtkx/native";
 import { Widget } from "./widget.js";
 export class EditableLabel extends Widget {
-    constructor(str) {
-        super(true);
-        this.ptr = call("libgtk-4.so.1", "gtk_editable_label_new", [
+    constructor(...args) {
+        const _args = args.length === 1 && Array.isArray(args[0]) ? args[0] : args;
+        super(_args);
+    }
+    createPtr(_args) {
+        const [str] = _args;
+        return call("libgtk-4.so.1", "gtk_editable_label_new", [
             {
                 type: { type: "string" },
                 value: str,

package/dist/generated/gtk/editable.js

@@ -333,17 +333,19 @@ export class Editable {
             ],
         };
         const meta = signalMeta[signal];
-        const argTypes = meta?.map((m) => m.type);
+        const selfType = { type: "gobject", borrowed: false };
+        const argTypes = meta ? [selfType, ...meta.map((m) => m.type)] : [selfType];
         const wrappedHandler = (...args) => {
+            const signalArgs = args.slice(1);
             if (!meta)
-                return handler(...args);
+                return handler(...signalArgs);
             const wrapped = meta.map((m, i) => {
-                if (m.cls && args[i] != null) {
+                if (m.cls && signalArgs[i] != null) {
                     const inst = Object.create(m.cls.prototype);
-                    inst.ptr = args[i];
+                    inst.ptr = signalArgs[i];
                     return inst;
                 }
-                return args[i];
+                return signalArgs[i];
             });
             return handler(...wrapped);
         };

package/dist/generated/gtk/emoji-chooser.d.ts

@@ -1,5 +1,6 @@
 import { Popover } from "./popover.js";
 export declare class EmojiChooser extends Popover {
-    constructor();
+    constructor(_args?: unknown[]);
+    protected createPtr(_args: unknown[]): unknown;
     connect(signal: string, handler: (...args: unknown[]) => unknown, after?: boolean): number;
 }

package/dist/generated/gtk/emoji-chooser.js

@@ -1,9 +1,11 @@
 import { call } from "@gtkx/native";
 import { Popover } from "./popover.js";
 export class EmojiChooser extends Popover {
-    constructor() {
-        super(true);
-        this.ptr = call("libgtk-4.so.1", "gtk_emoji_chooser_new", [], {
+    constructor(_args = []) {
+        super(_args);
+    }
+    createPtr(_args) {
+        return call("libgtk-4.so.1", "gtk_emoji_chooser_new", [], {
             type: "gobject",
             borrowed: true,
         });
@@ -13,17 +15,19 @@ export class EmojiChooser extends Popover {
             "emoji-picked": [{ type: { type: "string" } }],
         };
         const meta = signalMeta[signal];
-        const argTypes = meta?.map((m) => m.type);
+        const selfType = { type: "gobject", borrowed: false };
+        const argTypes = meta ? [selfType, ...meta.map((m) => m.type)] : [selfType];
         const wrappedHandler = (...args) => {
+            const signalArgs = args.slice(1);
             if (!meta)
-                return handler(...args);
+                return handler(...signalArgs);
             const wrapped = meta.map((m, i) => {
-                if (m.cls && args[i] != null) {
+                if (m.cls && signalArgs[i] != null) {
                     const inst = Object.create(m.cls.prototype);
-                    inst.ptr = args[i];
+                    inst.ptr = signalArgs[i];
                     return inst;
                 }
-                return args[i];
+                return signalArgs[i];
             });
             return handler(...wrapped);
         };