@gtkx/ffi 0.1.35 → 0.1.37

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

@@ -16,7 +16,7 @@ export declare class CodeGenerator {
     private usesWrite;
     private usesAlloc;
     private usesNativeError;
-    private usesWrapPtr;
+    private usesGetObject;
     private usesSignalMeta;
     private usedEnums;
     private usedRecords;

package/dist/codegen/ffi-generator.js

@@ -218,7 +218,7 @@ export class CodeGenerator {
     usesWrite = false;
     usesAlloc = false;
     usesNativeError = false;
-    usesWrapPtr = false;
+    usesGetObject = false;
     usesSignalMeta = false;
     usedEnums = new Set();
     usedRecords = new Set();
@@ -330,7 +330,7 @@ export class CodeGenerator {
         this.usesWrite = false;
         this.usesAlloc = false;
         this.usesNativeError = false;
-        this.usesWrapPtr = false;
+        this.usesGetObject = false;
         this.usesSignalMeta = false;
         this.usedEnums.clear();
         this.usedRecords.clear();
@@ -682,7 +682,7 @@ ${callArgs}
         const args = this.generateCallArguments(ctor.parameters);
         const ctorDoc = formatMethodDoc(ctor.doc, ctor.parameters);
         const borrowed = ctor.returnType.transferOwnership !== "full";
-        this.usesWrapPtr = true;
+        this.usesGetObject = true;
         return `${ctorDoc}  static ${methodName}(${params}): ${className} {
     const ptr = call(
       "${sharedLibrary}",
@@ -692,7 +692,7 @@ ${args}
       ],
       { type: "gobject", borrowed: ${borrowed} }
     );
-    return wrapPtr(ptr, ${className});
+    return getObject(ptr, ${className});
   }
 `;
     }
@@ -727,7 +727,7 @@ ${args}
         const errorArg = func.throws ? this.generateErrorArgument() : "";
         const allArgs = errorArg ? args + (args ? ",\n" : "") + errorArg : args;
         if (returnsOwnClass) {
-            this.usesWrapPtr = true;
+            this.usesGetObject = true;
             lines.push(`    const ptr = call(
       "${sharedLibrary}",
       "${func.cIdentifier}",
@@ -739,7 +739,7 @@ ${allArgs ? `${allArgs},` : ""}
             if (func.throws) {
                 lines.push(this.generateErrorCheck());
             }
-            lines.push(`    return wrapPtr(ptr, ${className});`);
+            lines.push(`    return getObject(ptr, ${className});`);
         }
         else {
             const callPrefix = func.throws
@@ -949,11 +949,11 @@ ${allArgs ? `${allArgs},` : ""}
         if (outputParams.length === 0) {
             if (hasMainReturn) {
                 if (needsObjectWrap) {
-                    this.usesWrapPtr = true;
+                    this.usesGetObject = true;
                     if (isNullable) {
                         lines.push(`          if (ptr === null) { resolve(null); return; }`);
                     }
-                    lines.push(`          resolve(wrapPtr(ptr, ${finishReturnType.ts}));`);
+                    lines.push(`          resolve(getObject(ptr, ${finishReturnType.ts}));`);
                 }
                 else {
                     lines.push(`          resolve(result);`);
@@ -967,12 +967,12 @@ ${allArgs ? `${allArgs},` : ""}
             const resolveFields = [];
             if (hasMainReturn) {
                 if (needsObjectWrap) {
-                    this.usesWrapPtr = true;
+                    this.usesGetObject = true;
                     if (isNullable) {
-                        lines.push(`          const result = (ptr === null ? null : wrapPtr(ptr, ${finishReturnType.ts})) as ${finishReturnType.ts} | null;`);
+                        lines.push(`          const result = (ptr === null ? null : getObject(ptr, ${finishReturnType.ts})) as ${finishReturnType.ts} | null;`);
                     }
                     else {
-                        lines.push(`          const result = wrapPtr(ptr, ${finishReturnType.ts});`);
+                        lines.push(`          const result = getObject(ptr, ${finishReturnType.ts});`);
                     }
                 }
                 resolveFields.push("result");
@@ -1087,13 +1087,13 @@ ${allArgs ? `${allArgs},` : ""}
                 lines.push(`    return { ptr } as unknown as ${baseReturnType};`);
             }
             else {
-                this.usesWrapPtr = true;
-                lines.push(`    return wrapPtr(ptr, ${baseReturnType});`);
+                this.usesGetObject = true;
+                lines.push(`    return getObject(ptr, ${baseReturnType});`);
             }
         }
         else if (needsArrayWrap && hasReturnValue) {
             const elementType = baseReturnType.slice(0, -2);
-            this.usesWrapPtr = true;
+            this.usesGetObject = true;
             lines.push(`    const ptrs = call(
       "${sharedLibrary}",
       "${method.cIdentifier}",
@@ -1109,7 +1109,7 @@ ${allArgs ? `${allArgs},` : ""}
             if (method.throws) {
                 lines.push(this.generateErrorCheck());
             }
-            lines.push(`    return ptrs.map(ptr => wrapPtr(ptr, ${elementType}));`);
+            lines.push(`    return ptrs.map(ptr => getObject(ptr, ${elementType}));`);
         }
         else {
             const callPrefix = method.throws
@@ -1216,7 +1216,7 @@ ${allArgs ? `${allArgs},` : ""}
         }
         signalOverloads.push(`  ${methodName}(signal: string, handler: (...args: any[]) => any, after?: boolean): number;`);
         this.usesType = true;
-        this.usesWrapPtr = true;
+        this.usesGetObject = true;
         if (signalMetadata.length > 0) {
             this.usesSignalMeta = true;
         }
@@ -1229,19 +1229,19 @@ ${allArgs ? `${allArgs},` : ""}
             : `const selfType: Type = { type: "gobject", borrowed: true };\n    const argTypes = [selfType];\n    const returnType = undefined;`;
         const wrapperCode = signalMetadata.length > 0
             ? `const wrappedHandler = (...args: unknown[]) => {
-      const self = wrapPtr(args[0], ${className});
+      const self = getObject(args[0], ${className});
       const signalArgs = args.slice(1);
       if (!meta) return handler(self, ...signalArgs);
       const wrapped = meta.params.map((m, i) => {
         if (m.getCls && signalArgs[i] != null) {
-          return wrapPtr(signalArgs[i], m.getCls());
+          return getObject(signalArgs[i], m.getCls());
         }
         return signalArgs[i];
       });
       return handler(self, ...wrapped);
     };`
             : `const wrappedHandler = (...args: unknown[]) => {
-      const self = wrapPtr(args[0], ${className});
+      const self = getObject(args[0], ${className});
       return handler(self, ...args.slice(1));
     };`;
         const overloadsSection = signalOverloads.length > 0 ? `${signalOverloads.join("\n")}\n` : "";
@@ -1482,7 +1482,7 @@ ${args}
         const params = this.generateParameterList(ctor.parameters);
         const args = this.generateCallArguments(ctor.parameters);
         const ctorDoc = formatMethodDoc(ctor.doc, ctor.parameters);
-        this.usesWrapPtr = true;
+        this.usesGetObject = true;
         return `${ctorDoc}  static ${methodName}(${params}): ${recordName} {
     const ptr = call(
       "${sharedLibrary}",
@@ -1492,7 +1492,7 @@ ${args}
       ],
       { type: "boxed", borrowed: true, innerType: "${recordName}" }
     );
-    return wrapPtr(ptr, ${recordName});
+    return getObject(ptr, ${recordName});
   }
 `;
     }
@@ -1648,7 +1648,7 @@ ${args}
         const errorArg = func.throws ? this.generateErrorArgument("  ") : "";
         const allArgs = errorArg ? args + (args ? ",\n" : "") + errorArg : args;
         if (needsObjectWrap && hasReturnValue) {
-            this.usesWrapPtr = true;
+            this.usesGetObject = true;
             lines.push(`  const ptr = call("${sharedLibrary}", "${func.cIdentifier}", [
 ${allArgs ? `${allArgs},` : ""}
   ], ${this.generateTypeDescriptor(returnTypeMapping.ffi)});`);
@@ -1658,7 +1658,7 @@ ${allArgs ? `${allArgs},` : ""}
             if (isNullable) {
                 lines.push(`  if (ptr === null) return null;`);
             }
-            lines.push(`  return wrapPtr(ptr, ${baseReturnType});`);
+            lines.push(`  return getObject(ptr, ${baseReturnType});`);
         }
         else {
             const callPrefix = func.throws
@@ -1811,8 +1811,8 @@ ${indent}  }`;
         const ffiImports = [];
         if (this.usesNativeError)
             ffiImports.push("NativeError");
-        if (this.usesWrapPtr)
-            ffiImports.push("wrapPtr");
+        if (this.usesGetObject)
+            ffiImports.push("getObject");
         if (ffiImports.length > 0) {
             lines.push(`import { ${ffiImports.join(", ")} } from "@gtkx/ffi";`);
         }

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

@@ -1,5 +1,5 @@
 import { call } from "@gtkx/native";
-import { wrapPtr } from "@gtkx/ffi";
+import { getObject } from "@gtkx/ffi";
 import { Display } from "./display.js";
 import * as Gio from "../gio/index.js";
 export class AppLaunchContext extends Gio.AppLaunchContext {
@@ -24,7 +24,7 @@ export class AppLaunchContext extends Gio.AppLaunchContext {
                 value: this.ptr,
             },
         ], { type: "gobject", borrowed: true });
-        return wrapPtr(ptr, Display);
+        return getObject(ptr, Display);
     }
     setDesktop(desktop) {
         call("libgtk-4.so.1", "gdk_app_launch_context_set_desktop", [
@@ -45,7 +45,7 @@ export class AppLaunchContext extends Gio.AppLaunchContext {
                 value: this.ptr,
             },
             {
-                type: { type: "gobject" },
+                type: { type: "gobject", borrowed: true },
                 value: icon?.ptr ?? icon,
             },
         ], { type: "undefined" });
@@ -79,7 +79,7 @@ export class AppLaunchContext extends Gio.AppLaunchContext {
         const argTypes = [selfType];
         const returnType = undefined;
         const wrappedHandler = (...args) => {
-            const self = wrapPtr(args[0], AppLaunchContext);
+            const self = getObject(args[0], AppLaunchContext);
             return handler(self, ...args.slice(1));
         };
         return call("libgtk-4.so.1", "g_signal_connect_closure", [

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

@@ -1,5 +1,5 @@
 import { call } from "@gtkx/native";
-import { wrapPtr } from "@gtkx/ffi";
+import { getObject } from "@gtkx/ffi";
 import * as cairo from "../cairo/index.js";
 import { DrawContext } from "./draw-context.js";
 export class CairoContext extends DrawContext {
@@ -31,6 +31,6 @@ export class CairoContext extends DrawContext {
         });
         if (ptr === null)
             return null;
-        return wrapPtr(ptr, cairo.Context);
+        return getObject(ptr, cairo.Context);
     }
 }

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

@@ -1,5 +1,5 @@
 import { call } from "@gtkx/native";
-import { NativeError, wrapPtr } from "@gtkx/ffi";
+import { NativeError, getObject } from "@gtkx/ffi";
 import { ColorState } from "./color-state.js";
 import * as GObject from "../gobject/index.js";
 export class CicpParams extends GObject.GObject {
@@ -39,7 +39,7 @@ export class CicpParams extends GObject.GObject {
         if (error.value !== null) {
             throw new NativeError(error.value);
         }
-        return wrapPtr(ptr, ColorState);
+        return getObject(ptr, ColorState);
     }
     getColorPrimaries() {
         return call("libgtk-4.so.1", "gdk_cicp_params_get_color_primaries", [
@@ -126,7 +126,7 @@ export class CicpParams extends GObject.GObject {
         const argTypes = [selfType];
         const returnType = undefined;
         const wrappedHandler = (...args) => {
-            const self = wrapPtr(args[0], CicpParams);
+            const self = getObject(args[0], CicpParams);
             return handler(self, ...args.slice(1));
         };
         return call("libgtk-4.so.1", "g_signal_connect_closure", [

package/dist/generated/gdk/clipboard.js

@@ -1,5 +1,5 @@
 import { call } from "@gtkx/native";
-import { NativeError, wrapPtr } from "@gtkx/ffi";
+import { NativeError, getObject } from "@gtkx/ffi";
 import { ContentFormats } from "./content-formats.js";
 import { ContentProvider } from "./content-provider.js";
 import { Display } from "./display.js";
@@ -33,7 +33,7 @@ export class Clipboard extends GObject.GObject {
         ], { type: "gobject", borrowed: true });
         if (ptr === null)
             return null;
-        return wrapPtr(ptr, ContentProvider);
+        return getObject(ptr, ContentProvider);
     }
     getDisplay() {
         const ptr = call("libgtk-4.so.1", "gdk_clipboard_get_display", [
@@ -42,7 +42,7 @@ export class Clipboard extends GObject.GObject {
                 value: this.ptr,
             },
         ], { type: "gobject", borrowed: true });
-        return wrapPtr(ptr, Display);
+        return getObject(ptr, Display);
     }
     getFormats() {
         const ptr = call("libgtk-4.so.1", "gdk_clipboard_get_formats", [
@@ -56,7 +56,7 @@ export class Clipboard extends GObject.GObject {
             innerType: "GdkContentFormats",
             lib: "libgtk-4.so.1",
         });
-        return wrapPtr(ptr, ContentFormats);
+        return getObject(ptr, ContentFormats);
     }
     isLocal() {
         return call("libgtk-4.so.1", "gdk_clipboard_is_local", [
@@ -74,7 +74,7 @@ export class Clipboard extends GObject.GObject {
                 value: this.ptr,
             },
             {
-                type: { type: "gobject" },
+                type: { type: "gobject", borrowed: true },
                 value: result?.ptr ?? result,
             },
             {
@@ -98,7 +98,7 @@ export class Clipboard extends GObject.GObject {
         }
         if (ptr === null)
             return null;
-        return wrapPtr(ptr, Gio.InputStream);
+        return getObject(ptr, Gio.InputStream);
     }
     readTextFinish(result) {
         const error = { value: null };
@@ -108,7 +108,7 @@ export class Clipboard extends GObject.GObject {
                 value: this.ptr,
             },
             {
-                type: { type: "gobject" },
+                type: { type: "gobject", borrowed: true },
                 value: result?.ptr ?? result,
             },
             {
@@ -136,7 +136,7 @@ export class Clipboard extends GObject.GObject {
                 value: this.ptr,
             },
             {
-                type: { type: "gobject" },
+                type: { type: "gobject", borrowed: true },
                 value: result?.ptr ?? result,
             },
             {
@@ -156,7 +156,7 @@ export class Clipboard extends GObject.GObject {
         }
         if (ptr === null)
             return null;
-        return wrapPtr(ptr, Texture);
+        return getObject(ptr, Texture);
     }
     readValueFinish(result) {
         const error = { value: null };
@@ -166,7 +166,7 @@ export class Clipboard extends GObject.GObject {
                 value: this.ptr,
             },
             {
-                type: { type: "gobject" },
+                type: { type: "gobject", borrowed: true },
                 value: result?.ptr ?? result,
             },
             {
@@ -189,7 +189,7 @@ export class Clipboard extends GObject.GObject {
         if (error.value !== null) {
             throw new NativeError(error.value);
         }
-        return wrapPtr(ptr, GObject.Value);
+        return getObject(ptr, GObject.Value);
     }
     setContent(provider) {
         return call("libgtk-4.so.1", "gdk_clipboard_set_content", [
@@ -198,7 +198,7 @@ export class Clipboard extends GObject.GObject {
                 value: this.ptr,
             },
             {
-                type: { type: "gobject" },
+                type: { type: "gobject", borrowed: true },
                 value: provider?.ptr ?? provider,
             },
         ], { type: "boolean" });
@@ -210,7 +210,12 @@ export class Clipboard extends GObject.GObject {
                 value: this.ptr,
             },
             {
-                type: { type: "boxed", innerType: "GValue", lib: "libgtk-4.so.1" },
+                type: {
+                    type: "boxed",
+                    borrowed: true,
+                    innerType: "GValue",
+                    lib: "libgtk-4.so.1",
+                },
                 value: value?.ptr ?? value,
             },
         ], { type: "undefined" });
@@ -223,7 +228,7 @@ export class Clipboard extends GObject.GObject {
                 value: this.ptr,
             },
             {
-                type: { type: "gobject" },
+                type: { type: "gobject", borrowed: true },
                 value: result?.ptr ?? result,
             },
             {
@@ -251,13 +256,13 @@ export class Clipboard extends GObject.GObject {
             : [selfType];
         const returnType = meta?.returnType;
         const wrappedHandler = (...args) => {
-            const self = wrapPtr(args[0], Clipboard);
+            const self = getObject(args[0], Clipboard);
             const signalArgs = args.slice(1);
             if (!meta)
                 return handler(self, ...signalArgs);
             const wrapped = meta.params.map((m, i) => {
                 if (m.getCls && signalArgs[i] != null) {
-                    return wrapPtr(signalArgs[i], m.getCls());
+                    return getObject(signalArgs[i], m.getCls());
                 }
                 return signalArgs[i];
             });

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

@@ -1,5 +1,5 @@
 import { call } from "@gtkx/native";
-import { wrapPtr } from "@gtkx/ffi";
+import { getObject } from "@gtkx/ffi";
 import { CicpParams } from "./cicp-params.js";
 export class ColorState {
     ptr;
@@ -16,7 +16,7 @@ export class ColorState {
             innerType: "GdkColorState",
             lib: "libgtk-4.so.1",
         });
-        return wrapPtr(ptr, ColorState);
+        return getObject(ptr, ColorState);
     }
     static getOklch() {
         const ptr = call("libgtk-4.so.1", "gdk_color_state_get_oklch", [], {
@@ -25,7 +25,7 @@ export class ColorState {
             innerType: "GdkColorState",
             lib: "libgtk-4.so.1",
         });
-        return wrapPtr(ptr, ColorState);
+        return getObject(ptr, ColorState);
     }
     static getRec2100Linear() {
         const ptr = call("libgtk-4.so.1", "gdk_color_state_get_rec2100_linear", [], {
@@ -34,7 +34,7 @@ export class ColorState {
             innerType: "GdkColorState",
             lib: "libgtk-4.so.1",
         });
-        return wrapPtr(ptr, ColorState);
+        return getObject(ptr, ColorState);
     }
     static getRec2100Pq() {
         const ptr = call("libgtk-4.so.1", "gdk_color_state_get_rec2100_pq", [], {
@@ -43,7 +43,7 @@ export class ColorState {
             innerType: "GdkColorState",
             lib: "libgtk-4.so.1",
         });
-        return wrapPtr(ptr, ColorState);
+        return getObject(ptr, ColorState);
     }
     static getSrgb() {
         const ptr = call("libgtk-4.so.1", "gdk_color_state_get_srgb", [], {
@@ -52,7 +52,7 @@ export class ColorState {
             innerType: "GdkColorState",
             lib: "libgtk-4.so.1",
         });
-        return wrapPtr(ptr, ColorState);
+        return getObject(ptr, ColorState);
     }
     static getSrgbLinear() {
         const ptr = call("libgtk-4.so.1", "gdk_color_state_get_srgb_linear", [], {
@@ -61,7 +61,7 @@ export class ColorState {
             innerType: "GdkColorState",
             lib: "libgtk-4.so.1",
         });
-        return wrapPtr(ptr, ColorState);
+        return getObject(ptr, ColorState);
     }
     createCicpParams() {
         const ptr = call("libgtk-4.so.1", "gdk_color_state_create_cicp_params", [
@@ -72,7 +72,7 @@ export class ColorState {
         ], { type: "gobject", borrowed: true });
         if (ptr === null)
             return null;
-        return wrapPtr(ptr, CicpParams);
+        return getObject(ptr, CicpParams);
     }
     equal(other) {
         return call("libgtk-4.so.1", "gdk_color_state_equal", [
@@ -83,6 +83,7 @@ export class ColorState {
             {
                 type: {
                     type: "boxed",
+                    borrowed: true,
                     innerType: "GdkColorState",
                     lib: "libgtk-4.so.1",
                 },
@@ -99,6 +100,7 @@ export class ColorState {
             {
                 type: {
                     type: "boxed",
+                    borrowed: true,
                     innerType: "GdkColorState",
                     lib: "libgtk-4.so.1",
                 },
@@ -118,7 +120,7 @@ export class ColorState {
             innerType: "GdkColorState",
             lib: "libgtk-4.so.1",
         });
-        return wrapPtr(ptr, ColorState);
+        return getObject(ptr, ColorState);
     }
     unref() {
         call("libgtk-4.so.1", "gdk_color_state_unref", [

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

@@ -1,5 +1,5 @@
 import { call } from "@gtkx/native";
-import { wrapPtr } from "@gtkx/ffi";
+import { getObject } from "@gtkx/ffi";
 import * as GObject from "../gobject/index.js";
 import * as Gio from "../gio/index.js";
 export class ContentDeserializer extends GObject.GObject {
@@ -22,7 +22,7 @@ export class ContentDeserializer extends GObject.GObject {
         ], { type: "gobject", borrowed: true });
         if (ptr === null)
             return null;
-        return wrapPtr(ptr, Gio.Cancellable);
+        return getObject(ptr, Gio.Cancellable);
     }
     getGtype() {
         return call("libgtk-4.so.1", "gdk_content_deserializer_get_gtype", [
@@ -39,7 +39,7 @@ export class ContentDeserializer extends GObject.GObject {
                 value: this.ptr,
             },
         ], { type: "gobject", borrowed: true });
-        return wrapPtr(ptr, Gio.InputStream);
+        return getObject(ptr, Gio.InputStream);
     }
     getMimeType() {
         return call("libgtk-4.so.1", "gdk_content_deserializer_get_mime_type", [
@@ -85,7 +85,7 @@ export class ContentDeserializer extends GObject.GObject {
             innerType: "GValue",
             lib: "libgtk-4.so.1",
         });
-        return wrapPtr(ptr, GObject.Value);
+        return getObject(ptr, GObject.Value);
     }
     returnError(error) {
         call("libgtk-4.so.1", "gdk_content_deserializer_return_error", [
@@ -128,7 +128,7 @@ export class ContentDeserializer extends GObject.GObject {
         const argTypes = [selfType];
         const returnType = undefined;
         const wrappedHandler = (...args) => {
-            const self = wrapPtr(args[0], ContentDeserializer);
+            const self = getObject(args[0], ContentDeserializer);
             return handler(self, ...args.slice(1));
         };
         return call("libgtk-4.so.1", "g_signal_connect_closure", [

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

@@ -1,5 +1,5 @@
 import { call } from "@gtkx/native";
-import { wrapPtr } from "@gtkx/ffi";
+import { getObject } from "@gtkx/ffi";
 import { ContentFormats } from "./content-formats.js";
 export class ContentFormatsBuilder {
     ptr;
@@ -22,6 +22,7 @@ export class ContentFormatsBuilder {
             {
                 type: {
                     type: "boxed",
+                    borrowed: true,
                     innerType: "GdkContentFormats",
                     lib: "libgtk-4.so.1",
                 },
@@ -65,7 +66,7 @@ export class ContentFormatsBuilder {
             innerType: "GdkContentFormatsBuilder",
             lib: "libgtk-4.so.1",
         });
-        return wrapPtr(ptr, ContentFormatsBuilder);
+        return getObject(ptr, ContentFormatsBuilder);
     }
     toFormats() {
         const ptr = call("libgtk-4.so.1", "gdk_content_formats_builder_to_formats", [
@@ -79,7 +80,7 @@ export class ContentFormatsBuilder {
             innerType: "GdkContentFormats",
             lib: "libgtk-4.so.1",
         });
-        return wrapPtr(ptr, ContentFormats);
+        return getObject(ptr, ContentFormats);
     }
     unref() {
         call("libgtk-4.so.1", "gdk_content_formats_builder_unref", [