@gtkx/ffi 0.1.8 → 0.1.10

package/dist/generated/pango/layout-iter.js

@@ -1,4 +1,5 @@
 import { call } from "@gtkx/native";
+import { wrapPtr } from "@gtkx/ffi";
 import { LayoutLine } from "./layout-line.js";
 import { Layout } from "./layout.js";
 export class LayoutIter {
@@ -31,9 +32,7 @@ export class LayoutIter {
         });
         if (ptr === null)
             return null;
-        const instance = Object.create(LayoutIter.prototype);
-        instance.ptr = ptr;
-        return instance;
+        return wrapPtr(ptr, LayoutIter);
     }
     free() {
         call("libpango-1.0.so.0", "pango_layout_iter_free", [
@@ -96,9 +95,7 @@ export class LayoutIter {
         ], { type: "gobject", borrowed: true });
         if (ptr === null)
             return null;
-        const instance = Object.create(Layout.prototype);
-        instance.ptr = ptr;
-        return instance;
+        return wrapPtr(ptr, Layout);
     }
     getLayoutExtents(inkRect, logicalRect) {
         call("libpango-1.0.so.0", "pango_layout_iter_get_layout_extents", [
@@ -130,9 +127,7 @@ export class LayoutIter {
         });
         if (ptr === null)
             return null;
-        const instance = Object.create(LayoutLine.prototype);
-        instance.ptr = ptr;
-        return instance;
+        return wrapPtr(ptr, LayoutLine);
     }
     getLineExtents(inkRect, logicalRect) {
         call("libpango-1.0.so.0", "pango_layout_iter_get_line_extents", [
@@ -164,9 +159,7 @@ export class LayoutIter {
         });
         if (ptr === null)
             return null;
-        const instance = Object.create(LayoutLine.prototype);
-        instance.ptr = ptr;
-        return instance;
+        return wrapPtr(ptr, LayoutLine);
     }
     getLineYrange(y0_, y1_) {
         call("libpango-1.0.so.0", "pango_layout_iter_get_line_yrange", [

package/dist/generated/pango/layout-line.js

@@ -1,4 +1,5 @@
 import { alloc, call, read, write } from "@gtkx/native";
+import { wrapPtr } from "@gtkx/ffi";
 export class LayoutLine {
     ptr;
     constructor(init = {}) {
@@ -165,9 +166,7 @@ export class LayoutLine {
         });
         if (ptr === null)
             return null;
-        const instance = Object.create(LayoutLine.prototype);
-        instance.ptr = ptr;
-        return instance;
+        return wrapPtr(ptr, LayoutLine);
     }
     unref() {
         call("libpango-1.0.so.0", "pango_layout_line_unref", [

package/dist/generated/pango/layout.d.ts

@@ -10,8 +10,8 @@ import * as GLib from "../glib/index.js";
 export declare class Layout {
     ptr: unknown;
     constructor(context: Context);
-    constructor(_args: unknown[]);
-    protected createPtr(_args: unknown[]): unknown;
+    constructor(...args: unknown[]);
+    protected createPtr(args: unknown[]): unknown;
     static deserialize(context: Context, bytes: GLib.Bytes, flags: LayoutDeserializeFlags): Layout;
     contextChanged(): void;
     copy(): Layout;

package/dist/generated/pango/layout.js

@@ -1,5 +1,5 @@
 import { call } from "@gtkx/native";
-import { NativeError } from "@gtkx/ffi";
+import { NativeError, wrapPtr } from "@gtkx/ffi";
 import { AttrList } from "./attr-list.js";
 import { FontDescription } from "./font-description.js";
 import { LayoutIter } from "./layout-iter.js";
@@ -10,11 +10,10 @@ import * as GLib from "../glib/index.js";
 export class Layout {
     ptr;
     constructor(...args) {
-        const _args = args.length === 1 && Array.isArray(args[0]) ? args[0] : args;
-        this.ptr = this.createPtr(_args);
+        this.ptr = this.createPtr(args);
     }
-    createPtr(_args) {
-        const [context] = _args;
+    createPtr(args) {
+        const [context] = args;
         return call("libpango-1.0.so.0", "pango_layout_new", [
             {
                 type: { type: "gobject" },
@@ -56,9 +55,7 @@ export class Layout {
         if (error.value !== null) {
             throw new NativeError(error.value);
         }
-        const instance = Object.create(Layout.prototype);
-        instance.ptr = ptr;
-        return instance;
+        return wrapPtr(ptr, Layout);
     }
     contextChanged() {
         call("libpango-1.0.so.0", "pango_layout_context_changed", [
@@ -77,9 +74,7 @@ export class Layout {
         ], { type: "gobject", borrowed: true });
         if (ptr === null)
             return null;
-        const instance = Object.create(Layout.prototype);
-        instance.ptr = ptr;
-        return instance;
+        return wrapPtr(ptr, Layout);
     }
     getAlignment() {
         return call("libpango-1.0.so.0", "pango_layout_get_alignment", [
@@ -103,9 +98,7 @@ export class Layout {
         });
         if (ptr === null)
             return null;
-        const instance = Object.create(AttrList.prototype);
-        instance.ptr = ptr;
-        return instance;
+        return wrapPtr(ptr, AttrList);
     }
     getAutoDir() {
         return call("libpango-1.0.so.0", "pango_layout_get_auto_dir", [
@@ -160,9 +153,7 @@ export class Layout {
         ], { type: "gobject", borrowed: true });
         if (ptr === null)
             return null;
-        const instance = Object.create(Context.prototype);
-        instance.ptr = ptr;
-        return instance;
+        return wrapPtr(ptr, Context);
     }
     getCursorPos(index_, strongPos, weakPos) {
         call("libpango-1.0.so.0", "pango_layout_get_cursor_pos", [
@@ -234,9 +225,7 @@ export class Layout {
         });
         if (ptr === null)
             return null;
-        const instance = Object.create(FontDescription.prototype);
-        instance.ptr = ptr;
-        return instance;
+        return wrapPtr(ptr, FontDescription);
     }
     getHeight() {
         return call("libpango-1.0.so.0", "pango_layout_get_height", [
@@ -268,9 +257,7 @@ export class Layout {
         });
         if (ptr === null)
             return null;
-        const instance = Object.create(LayoutIter.prototype);
-        instance.ptr = ptr;
-        return instance;
+        return wrapPtr(ptr, LayoutIter);
     }
     getJustify() {
         return call("libpango-1.0.so.0", "pango_layout_get_justify", [
@@ -306,9 +293,7 @@ export class Layout {
         });
         if (ptr === null)
             return null;
-        const instance = Object.create(LayoutLine.prototype);
-        instance.ptr = ptr;
-        return instance;
+        return wrapPtr(ptr, LayoutLine);
     }
     getLineCount() {
         return call("libpango-1.0.so.0", "pango_layout_get_line_count", [
@@ -336,9 +321,7 @@ export class Layout {
         });
         if (ptr === null)
             return null;
-        const instance = Object.create(LayoutLine.prototype);
-        instance.ptr = ptr;
-        return instance;
+        return wrapPtr(ptr, LayoutLine);
     }
     getLineSpacing() {
         return call("libpango-1.0.so.0", "pango_layout_get_line_spacing", [
@@ -499,9 +482,7 @@ export class Layout {
         });
         if (ptr === null)
             return null;
-        const instance = Object.create(TabArray.prototype);
-        instance.ptr = ptr;
-        return instance;
+        return wrapPtr(ptr, TabArray);
     }
     getText() {
         return call("libpango-1.0.so.0", "pango_layout_get_text", [
@@ -653,9 +634,7 @@ export class Layout {
         });
         if (ptr === null)
             return null;
-        const instance = Object.create(GLib.Bytes.prototype);
-        instance.ptr = ptr;
-        return instance;
+        return wrapPtr(ptr, GLib.Bytes);
     }
     setAlignment(alignment) {
         call("libpango-1.0.so.0", "pango_layout_set_alignment", [

package/dist/generated/pango/matrix.js

@@ -1,4 +1,5 @@
 import { alloc, call, read, write } from "@gtkx/native";
+import { wrapPtr } from "@gtkx/ffi";
 export class Matrix {
     ptr;
     constructor(init = {}) {
@@ -50,9 +51,7 @@ export class Matrix {
         });
         if (ptr === null)
             return null;
-        const instance = Object.create(Matrix.prototype);
-        instance.ptr = ptr;
-        return instance;
+        return wrapPtr(ptr, Matrix);
     }
     free() {
         call("libpango-1.0.so.0", "pango_matrix_free", [

package/dist/generated/pango/renderer.d.ts

@@ -8,7 +8,7 @@ import { Font } from "./font.js";
 import { Layout } from "./layout.js";
 export declare class Renderer {
     ptr: unknown;
-    constructor(_args?: unknown[]);
+    constructor(...args: unknown[]);
     protected createPtr(_args: unknown[]): unknown;
     activate(): void;
     deactivate(): void;

package/dist/generated/pango/renderer.js

@@ -1,12 +1,13 @@
 import { call } from "@gtkx/native";
+import { wrapPtr } from "@gtkx/ffi";
 import { Color } from "./color.js";
 import { LayoutLine } from "./layout-line.js";
 import { Matrix } from "./matrix.js";
 import { Layout } from "./layout.js";
 export class Renderer {
     ptr;
-    constructor(_args = []) {
-        this.ptr = this.createPtr(_args);
+    constructor(...args) {
+        this.ptr = this.createPtr(args);
     }
     createPtr(_args) {
         return null;
@@ -269,9 +270,7 @@ export class Renderer {
         });
         if (ptr === null)
             return null;
-        const instance = Object.create(Color.prototype);
-        instance.ptr = ptr;
-        return instance;
+        return wrapPtr(ptr, Color);
     }
     getLayout() {
         const ptr = call("libpango-1.0.so.0", "pango_renderer_get_layout", [
@@ -282,9 +281,7 @@ export class Renderer {
         ], { type: "gobject", borrowed: true });
         if (ptr === null)
             return null;
-        const instance = Object.create(Layout.prototype);
-        instance.ptr = ptr;
-        return instance;
+        return wrapPtr(ptr, Layout);
     }
     getLayoutLine() {
         const ptr = call("libpango-1.0.so.0", "pango_renderer_get_layout_line", [
@@ -300,9 +297,7 @@ export class Renderer {
         });
         if (ptr === null)
             return null;
-        const instance = Object.create(LayoutLine.prototype);
-        instance.ptr = ptr;
-        return instance;
+        return wrapPtr(ptr, LayoutLine);
     }
     getMatrix() {
         const ptr = call("libpango-1.0.so.0", "pango_renderer_get_matrix", [
@@ -318,9 +313,7 @@ export class Renderer {
         });
         if (ptr === null)
             return null;
-        const instance = Object.create(Matrix.prototype);
-        instance.ptr = ptr;
-        return instance;
+        return wrapPtr(ptr, Matrix);
     }
     partChanged(part) {
         call("libpango-1.0.so.0", "pango_renderer_part_changed", [

package/dist/generated/pango/tab-array.js

@@ -1,4 +1,5 @@
 import { call } from "@gtkx/native";
+import { wrapPtr } from "@gtkx/ffi";
 export class TabArray {
     ptr;
     constructor(...args) {
@@ -24,9 +25,7 @@ export class TabArray {
                 value: firstPosition,
             },
         ], { type: "boxed", borrowed: true, innerType: "TabArray" });
-        const instance = Object.create(TabArray.prototype);
-        instance.ptr = ptr;
-        return instance;
+        return wrapPtr(ptr, TabArray);
     }
     createPtr(_args) {
         const [initialSize, positionsInPixels] = _args;
@@ -53,9 +52,7 @@ export class TabArray {
             innerType: "PangoTabArray",
             lib: "libpango-1.0.so.0",
         });
-        const instance = Object.create(TabArray.prototype);
-        instance.ptr = ptr;
-        return instance;
+        return wrapPtr(ptr, TabArray);
     }
     copy() {
         const ptr = call("libpango-1.0.so.0", "pango_tab_array_copy", [
@@ -71,9 +68,7 @@ export class TabArray {
         });
         if (ptr === null)
             return null;
-        const instance = Object.create(TabArray.prototype);
-        instance.ptr = ptr;
-        return instance;
+        return wrapPtr(ptr, TabArray);
     }
     free() {
         call("libpango-1.0.so.0", "pango_tab_array_free", [

package/dist/generated/pangocairo/font-map.js

@@ -1,4 +1,5 @@
 import { call } from "@gtkx/native";
+import { wrapPtr } from "@gtkx/ffi";
 import * as Pango from "../pango/index.js";
 export class FontMap {
     ptr;
@@ -17,9 +18,7 @@ export class FontMap {
         ], { type: "gobject", borrowed: true });
         if (ptr === null)
             return null;
-        const instance = Object.create(Pango.Context.prototype);
-        instance.ptr = ptr;
-        return instance;
+        return wrapPtr(ptr, Pango.Context);
     }
     getFontType() {
         return call("libpangocairo-1.0.so.0", "pango_cairo_font_map_get_font_type", [

package/dist/generated/pangocairo/font.js

@@ -1,4 +1,5 @@
 import { call } from "@gtkx/native";
+import { wrapPtr } from "@gtkx/ffi";
 import * as cairo from "../cairo/index.js";
 export class Font {
     ptr;
@@ -22,8 +23,6 @@ export class Font {
         });
         if (ptr === null)
             return null;
-        const instance = Object.create(cairo.ScaledFont.prototype);
-        instance.ptr = ptr;
-        return instance;
+        return wrapPtr(ptr, cairo.ScaledFont);
     }
 }

package/dist/generated/pangocairo/functions.js

@@ -1,4 +1,5 @@
 import { call } from "@gtkx/native";
+import { wrapPtr } from "@gtkx/ffi";
 import * as Pango from "../pango/index.js";
 import * as cairo from "../cairo/index.js";
 export const contextGetFontOptions = (context) => {
@@ -15,9 +16,7 @@ export const contextGetFontOptions = (context) => {
     });
     if (ptr === null)
         return null;
-    const instance = Object.create(cairo.FontOptions.prototype);
-    instance.ptr = ptr;
-    return instance;
+    return wrapPtr(ptr, cairo.FontOptions);
 };
 export const contextGetResolution = (context) => {
     return call("libpangocairo-1.0.so.0", "pango_cairo_context_get_resolution", [
@@ -100,9 +99,7 @@ export const createContext = (cr) => {
     ], { type: "gobject", borrowed: true });
     if (ptr === null)
         return null;
-    const instance = Object.create(Pango.Context.prototype);
-    instance.ptr = ptr;
-    return instance;
+    return wrapPtr(ptr, Pango.Context);
 };
 export const createLayout = (cr) => {
     const ptr = call("libpangocairo-1.0.so.0", "pango_cairo_create_layout", [
@@ -117,9 +114,7 @@ export const createLayout = (cr) => {
     ], { type: "gobject", borrowed: true });
     if (ptr === null)
         return null;
-    const instance = Object.create(Pango.Layout.prototype);
-    instance.ptr = ptr;
-    return instance;
+    return wrapPtr(ptr, Pango.Layout);
 };
 export const errorUnderlinePath = (cr, x, y, width, height) => {
     call("libpangocairo-1.0.so.0", "pango_cairo_error_underline_path", [
@@ -153,9 +148,7 @@ export const fontMapGetDefault = () => {
     const ptr = call("libpangocairo-1.0.so.0", "pango_cairo_font_map_get_default", [], { type: "gobject", borrowed: true });
     if (ptr === null)
         return null;
-    const instance = Object.create(Pango.FontMap.prototype);
-    instance.ptr = ptr;
-    return instance;
+    return wrapPtr(ptr, Pango.FontMap);
 };
 export const fontMapNew = () => {
     const ptr = call("libpangocairo-1.0.so.0", "pango_cairo_font_map_new", [], {
@@ -164,9 +157,7 @@ export const fontMapNew = () => {
     });
     if (ptr === null)
         return null;
-    const instance = Object.create(Pango.FontMap.prototype);
-    instance.ptr = ptr;
-    return instance;
+    return wrapPtr(ptr, Pango.FontMap);
 };
 export const fontMapNewForFontType = (fonttype) => {
     const ptr = call("libpangocairo-1.0.so.0", "pango_cairo_font_map_new_for_font_type", [
@@ -177,9 +168,7 @@ export const fontMapNewForFontType = (fonttype) => {
     ], { type: "gobject", borrowed: true });
     if (ptr === null)
         return null;
-    const instance = Object.create(Pango.FontMap.prototype);
-    instance.ptr = ptr;
-    return instance;
+    return wrapPtr(ptr, Pango.FontMap);
 };
 export const glyphStringPath = (cr, font, glyphs) => {
     call("libpangocairo-1.0.so.0", "pango_cairo_glyph_string_path", [

package/dist/native.d.ts

@@ -1,6 +1,8 @@
 import type { ApplicationFlags } from "./generated/gio/enums.js";
-type ReadyCallback = () => void;
-export declare const onReady: (callback: ReadyCallback) => void;
-export declare const start: (appId: string, flags?: ApplicationFlags) => unknown;
+import { Application } from "./generated/gtk/application.js";
+export declare const wrapPtr: <T extends object>(ptr: unknown, cls: {
+    prototype: T;
+}) => T;
+export declare const onReady: (callback: () => void) => void;
+export declare const start: (appId: string, flags?: ApplicationFlags) => Application;
 export declare const stop: () => void;
-export {};

package/dist/native.js

@@ -1,11 +1,17 @@
 import { EventEmitter } from "node:events";
 import { start as nativeStart, stop as nativeStop } from "@gtkx/native";
+import { Application } from "./generated/gtk/application.js";
 let keepAliveTimeout = null;
+let isReady = false;
+const events = new EventEmitter();
+export const wrapPtr = (ptr, cls) => {
+    const instance = Object.create(cls.prototype);
+    instance.ptr = ptr;
+    return instance;
+};
 const keepAlive = () => {
     keepAliveTimeout = setTimeout(() => keepAlive(), 2147483647);
 };
-const events = new EventEmitter();
-let isReady = false;
 export const onReady = (callback) => {
     if (isReady) {
         callback();
@@ -16,10 +22,10 @@ export const onReady = (callback) => {
 };
 export const start = (appId, flags) => {
     const app = nativeStart(appId, flags);
-    keepAlive();
     isReady = true;
     events.emit("ready");
-    return app;
+    keepAlive();
+    return wrapPtr(app, Application);
 };
 export const stop = () => {
     if (keepAliveTimeout) {

package/package.json

@@ -1,18 +1,7 @@
 {
   "name": "@gtkx/ffi",
-  "version": "0.1.8",
+  "version": "0.1.10",
   "description": "Generated TypeScript FFI bindings for GTK4 libraries",
-  "license": "MPL-2.0",
-  "author": "Eugenio Depalo <eugeniodepalo@gmail.com>",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/eugeniodepalo/gtkx.git",
-    "directory": "packages/ffi"
-  },
-  "homepage": "https://eugeniodepalo.github.io/gtkx",
-  "bugs": {
-    "url": "https://github.com/eugeniodepalo/gtkx/issues"
-  },
   "keywords": [
     "gtk",
     "gtk4",
@@ -22,28 +11,39 @@
     "linux",
     "desktop"
   ],
+  "homepage": "https://eugeniodepalo.github.io/gtkx",
+  "bugs": {
+    "url": "https://github.com/eugeniodepalo/gtkx/issues"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/eugeniodepalo/gtkx.git",
+    "directory": "packages/ffi"
+  },
+  "license": "MPL-2.0",
+  "author": "Eugenio Depalo <eugeniodepalo@gmail.com>",
   "type": "module",
   "exports": {
     "./package.json": "./package.json",
     ".": {
+      "types": "./dist/index.d.ts",
       "development": "./src/index.ts",
-      "default": "./dist/index.js",
-      "types": "./dist/index.d.ts"
+      "default": "./dist/index.js"
     },
     "./*": {
+      "types": "./dist/generated/*/index.d.ts",
       "development": "./src/generated/*/index.ts",
-      "default": "./dist/generated/*/index.js",
-      "types": "./dist/generated/*/index.d.ts"
+      "default": "./dist/generated/*/index.js"
     }
   },
   "files": [
     "dist"
   ],
   "dependencies": {
-    "@gtkx/native": "0.1.8"
+    "@gtkx/native": "0.1.10"
   },
   "devDependencies": {
-    "@gtkx/gir": "0.1.8"
+    "@gtkx/gir": "0.1.10"
   },
   "scripts": {
     "build": "tsc -b",