@gtkx/ffi 0.1.7 → 0.1.9

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

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

package/dist/codegen/ffi-generator.js

@@ -168,6 +168,7 @@ export class CodeGenerator {
     usesWrite = false;
     usesAlloc = false;
     usesNativeError = false;
+    usesWrapPtr = false;
     usedEnums = new Set();
     usedRecords = new Set();
     usedExternalTypes = new Map();
@@ -308,6 +309,7 @@ export class CodeGenerator {
         this.usesWrite = false;
         this.usesAlloc = false;
         this.usesNativeError = false;
+        this.usesWrapPtr = false;
         this.usedEnums.clear();
         this.usedRecords.clear();
         this.usedExternalTypes.clear();
@@ -601,6 +603,7 @@ ${args}
         const params = this.generateParameterList(ctor.parameters);
         const args = this.generateCallArguments(ctor.parameters);
         const ctorDoc = formatMethodDoc(ctor.doc, ctor.parameters);
+        this.usesWrapPtr = true;
         return `${ctorDoc}  static ${methodName}(${params}): ${className} {
     const ptr = call(
       "${sharedLibrary}",
@@ -610,9 +613,7 @@ ${args}
       ],
       { type: "gobject", borrowed: true }
     );
-    const instance = Object.create(${className}.prototype) as ${className} & { ptr: unknown };
-    instance.ptr = ptr;
-    return instance;
+    return wrapPtr(ptr, ${className});
   }
 `;
     }
@@ -647,6 +648,7 @@ ${args}
         const errorArg = func.throws ? this.generateErrorArgument() : "";
         const allArgs = errorArg ? args + (args ? ",\n" : "") + errorArg : args;
         if (returnsOwnClass) {
+            this.usesWrapPtr = true;
             lines.push(`    const ptr = call(
       "${sharedLibrary}",
       "${func.cIdentifier}",
@@ -658,9 +660,7 @@ ${allArgs ? `${allArgs},` : ""}
             if (func.throws) {
                 lines.push(this.generateErrorCheck());
             }
-            lines.push(`    const instance = Object.create(${className}.prototype) as ${className} & { ptr: unknown };
-    instance.ptr = ptr;
-    return instance;`);
+            lines.push(`    return wrapPtr(ptr, ${className});`);
         }
         else {
             const callPrefix = func.throws
@@ -867,10 +867,9 @@ ${allArgs ? `${allArgs},` : ""}
         if (outputParams.length === 0) {
             if (hasMainReturn) {
                 if (needsObjectWrap) {
+                    this.usesWrapPtr = true;
                     lines.push(`          if (ptr === null) { resolve(null as unknown as ${finishReturnType.ts}); return; }`);
-                    lines.push(`          const instance = Object.create(${finishReturnType.ts}.prototype) as ${finishReturnType.ts} & { ptr: unknown };`);
-                    lines.push(`          instance.ptr = ptr;`);
-                    lines.push(`          resolve(instance);`);
+                    lines.push(`          resolve(wrapPtr(ptr, ${finishReturnType.ts}));`);
                 }
                 else {
                     lines.push(`          resolve(result);`);
@@ -884,11 +883,8 @@ ${allArgs ? `${allArgs},` : ""}
             const resolveFields = [];
             if (hasMainReturn) {
                 if (needsObjectWrap) {
-                    lines.push(`          const result = (ptr === null ? null : (() => {`);
-                    lines.push(`            const instance = Object.create(${finishReturnType.ts}.prototype) as ${finishReturnType.ts} & { ptr: unknown };`);
-                    lines.push(`            instance.ptr = ptr;`);
-                    lines.push(`            return instance;`);
-                    lines.push(`          })()) as ${finishReturnType.ts};`);
+                    this.usesWrapPtr = true;
+                    lines.push(`          const result = (ptr === null ? null : wrapPtr(ptr, ${finishReturnType.ts})) as ${finishReturnType.ts};`);
                 }
                 resolveFields.push("result");
             }
@@ -996,9 +992,8 @@ ${allArgs ? `${allArgs},` : ""}
                 lines.push(`    return { ptr } as unknown as ${tsReturnType};`);
             }
             else {
-                lines.push(`    const instance = Object.create(${tsReturnType}.prototype) as ${tsReturnType} & { ptr: unknown };`);
-                lines.push(`    instance.ptr = ptr;`);
-                lines.push(`    return instance;`);
+                this.usesWrapPtr = true;
+                lines.push(`    return wrapPtr(ptr, ${tsReturnType});`);
             }
         }
         else {
@@ -1116,6 +1111,9 @@ ${allArgs ? `${allArgs},` : ""}
             this.usedSameNamespaceClasses.set(className, originalName);
         });
         this.usesType = true;
+        if (signalMetadata.length > 0) {
+            this.usesWrapPtr = true;
+        }
         const signalMapCode = signalMetadata.length > 0
             ? `const signalMeta: Record<string, { type: Type; cls?: { prototype: object } }[]> = {\n${signalMetadata.join(",\n")}\n  };
     const meta = signalMeta[signal];
@@ -1127,9 +1125,7 @@ ${allArgs ? `${allArgs},` : ""}
       if (!meta) return handler(...signalArgs);
       const wrapped = meta.map((m, i) => {
         if (m.cls && signalArgs[i] != null) {
-          const inst = Object.create(m.cls.prototype) as { ptr: unknown };
-          inst.ptr = signalArgs[i];
-          return inst;
+          return wrapPtr(signalArgs[i], m.cls);
         }
         return signalArgs[i];
       });
@@ -1371,6 +1367,7 @@ ${args}
         const params = this.generateParameterList(ctor.parameters);
         const args = this.generateCallArguments(ctor.parameters);
         const ctorDoc = formatMethodDoc(ctor.doc, ctor.parameters);
+        this.usesWrapPtr = true;
         return `${ctorDoc}  static ${methodName}(${params}): ${recordName} {
     const ptr = call(
       "${sharedLibrary}",
@@ -1380,9 +1377,7 @@ ${args}
       ],
       { type: "boxed", borrowed: true, innerType: "${recordName}" }
     );
-    const instance = Object.create(${recordName}.prototype) as ${recordName} & { ptr: unknown };
-    instance.ptr = ptr;
-    return instance;
+    return wrapPtr(ptr, ${recordName});
   }
 `;
     }
@@ -1535,6 +1530,7 @@ ${args}
         const errorArg = func.throws ? this.generateErrorArgument("  ") : "";
         const allArgs = errorArg ? args + (args ? ",\n" : "") + errorArg : args;
         if (needsObjectWrap && hasReturnValue) {
+            this.usesWrapPtr = true;
             lines.push(`  const ptr = call("${sharedLibrary}", "${func.cIdentifier}", [
 ${allArgs ? `${allArgs},` : ""}
   ], ${this.generateTypeDescriptor(returnTypeMapping.ffi)});`);
@@ -1542,9 +1538,7 @@ ${allArgs ? `${allArgs},` : ""}
                 lines.push(this.generateErrorCheck(""));
             }
             lines.push(`  if (ptr === null) return null as unknown as ${returnTypeMapping.ts};`);
-            lines.push(`  const instance = Object.create(${returnTypeMapping.ts}.prototype) as ${returnTypeMapping.ts} & { ptr: unknown };`);
-            lines.push(`  instance.ptr = ptr;`);
-            lines.push(`  return instance;`);
+            lines.push(`  return wrapPtr(ptr, ${returnTypeMapping.ts});`);
         }
         else {
             const callPrefix = func.throws
@@ -1669,8 +1663,13 @@ ${indent}  }`;
         if (nativeImports.length > 0) {
             lines.push(`import { ${nativeImports.join(", ")} } from "@gtkx/native";`);
         }
-        if (this.usesNativeError) {
-            lines.push(`import { NativeError } from "@gtkx/ffi";`);
+        const ffiImports = [];
+        if (this.usesNativeError)
+            ffiImports.push("NativeError");
+        if (this.usesWrapPtr)
+            ffiImports.push("wrapPtr");
+        if (ffiImports.length > 0) {
+            lines.push(`import { ${ffiImports.join(", ")} } from "@gtkx/ffi";`);
         }
         if (this.usedEnums.size > 0) {
             const enumList = Array.from(this.usedEnums).sort().join(", ");

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

@@ -1,4 +1,5 @@
 import { call } from "@gtkx/native";
+import { wrapPtr } from "@gtkx/ffi";
 import { Display } from "./display.js";
 export class AppLaunchContext {
     ptr;
@@ -17,9 +18,7 @@ export class AppLaunchContext {
         ], { type: "gobject", borrowed: true });
         if (ptr === null)
             return null;
-        const instance = Object.create(Display.prototype);
-        instance.ptr = ptr;
-        return instance;
+        return wrapPtr(ptr, Display);
     }
     setDesktop(desktop) {
         call("libgtk-4.so.1", "gdk_app_launch_context_set_desktop", [

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

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

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

@@ -1,5 +1,5 @@
 import { call } from "@gtkx/native";
-import { NativeError } from "@gtkx/ffi";
+import { NativeError, wrapPtr } from "@gtkx/ffi";
 import { ColorState } from "./color-state.js";
 export class CicpParams {
     ptr;
@@ -41,9 +41,7 @@ export class CicpParams {
         }
         if (ptr === null)
             return null;
-        const instance = Object.create(ColorState.prototype);
-        instance.ptr = ptr;
-        return instance;
+        return wrapPtr(ptr, ColorState);
     }
     getColorPrimaries() {
         return call("libgtk-4.so.1", "gdk_cicp_params_get_color_primaries", [

package/dist/generated/gdk/clipboard.js

@@ -1,5 +1,5 @@
 import { call } from "@gtkx/native";
-import { NativeError } from "@gtkx/ffi";
+import { NativeError, wrapPtr } from "@gtkx/ffi";
 import { ContentFormats } from "./content-formats.js";
 import { ContentProvider } from "./content-provider.js";
 import { Display } from "./display.js";
@@ -23,9 +23,7 @@ export class Clipboard {
         ], { type: "gobject", borrowed: true });
         if (ptr === null)
             return null;
-        const instance = Object.create(ContentProvider.prototype);
-        instance.ptr = ptr;
-        return instance;
+        return wrapPtr(ptr, ContentProvider);
     }
     getDisplay() {
         const ptr = call("libgtk-4.so.1", "gdk_clipboard_get_display", [
@@ -36,9 +34,7 @@ export class Clipboard {
         ], { type: "gobject", borrowed: true });
         if (ptr === null)
             return null;
-        const instance = Object.create(Display.prototype);
-        instance.ptr = ptr;
-        return instance;
+        return wrapPtr(ptr, Display);
     }
     getFormats() {
         const ptr = call("libgtk-4.so.1", "gdk_clipboard_get_formats", [
@@ -54,9 +50,7 @@ export class Clipboard {
         });
         if (ptr === null)
             return null;
-        const instance = Object.create(ContentFormats.prototype);
-        instance.ptr = ptr;
-        return instance;
+        return wrapPtr(ptr, ContentFormats);
     }
     isLocal() {
         return call("libgtk-4.so.1", "gdk_clipboard_is_local", [
@@ -98,9 +92,7 @@ export class Clipboard {
         }
         if (ptr === null)
             return null;
-        const instance = Object.create(Gio.InputStream.prototype);
-        instance.ptr = ptr;
-        return instance;
+        return wrapPtr(ptr, Gio.InputStream);
     }
     readTextFinish(result) {
         const error = { value: null };
@@ -158,9 +150,7 @@ export class Clipboard {
         }
         if (ptr === null)
             return null;
-        const instance = Object.create(Texture.prototype);
-        instance.ptr = ptr;
-        return instance;
+        return wrapPtr(ptr, Texture);
     }
     readValueFinish(result) {
         const error = { value: null };
@@ -195,9 +185,7 @@ export class Clipboard {
         }
         if (ptr === null)
             return null;
-        const instance = Object.create(GObject.Value.prototype);
-        instance.ptr = ptr;
-        return instance;
+        return wrapPtr(ptr, GObject.Value);
     }
     set(type) {
         call("libgtk-4.so.1", "gdk_clipboard_set", [
@@ -328,9 +316,7 @@ export class Clipboard {
                 return handler(...signalArgs);
             const wrapped = meta.map((m, i) => {
                 if (m.cls && signalArgs[i] != null) {
-                    const inst = Object.create(m.cls.prototype);
-                    inst.ptr = signalArgs[i];
-                    return inst;
+                    return wrapPtr(signalArgs[i], m.cls);
                 }
                 return signalArgs[i];
             });

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

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

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

@@ -1,4 +1,5 @@
 import { call } from "@gtkx/native";
+import { wrapPtr } from "@gtkx/ffi";
 import * as GObject from "../gobject/index.js";
 import * as Gio from "../gio/index.js";
 export class ContentDeserializer {
@@ -18,9 +19,7 @@ export class ContentDeserializer {
         ], { type: "gobject", borrowed: true });
         if (ptr === null)
             return null;
-        const instance = Object.create(Gio.Cancellable.prototype);
-        instance.ptr = ptr;
-        return instance;
+        return wrapPtr(ptr, Gio.Cancellable);
     }
     getGtype() {
         return call("libgtk-4.so.1", "gdk_content_deserializer_get_gtype", [
@@ -39,9 +38,7 @@ export class ContentDeserializer {
         ], { type: "gobject", borrowed: true });
         if (ptr === null)
             return null;
-        const instance = Object.create(Gio.InputStream.prototype);
-        instance.ptr = ptr;
-        return instance;
+        return wrapPtr(ptr, Gio.InputStream);
     }
     getMimeType() {
         return call("libgtk-4.so.1", "gdk_content_deserializer_get_mime_type", [
@@ -89,9 +86,7 @@ export class ContentDeserializer {
         });
         if (ptr === null)
             return null;
-        const instance = Object.create(GObject.Value.prototype);
-        instance.ptr = ptr;
-        return instance;
+        return wrapPtr(ptr, GObject.Value);
     }
     returnError(error) {
         call("libgtk-4.so.1", "gdk_content_deserializer_return_error", [

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

@@ -1,4 +1,5 @@
 import { call } from "@gtkx/native";
+import { wrapPtr } from "@gtkx/ffi";
 import { ContentFormats } from "./content-formats.js";
 export class ContentFormatsBuilder {
     ptr;
@@ -66,9 +67,7 @@ export class ContentFormatsBuilder {
         });
         if (ptr === null)
             return null;
-        const instance = Object.create(ContentFormats.prototype);
-        instance.ptr = ptr;
-        return instance;
+        return wrapPtr(ptr, ContentFormats);
     }
     ref() {
         const ptr = call("libgtk-4.so.1", "gdk_content_formats_builder_ref", [
@@ -84,9 +83,7 @@ export class ContentFormatsBuilder {
         });
         if (ptr === null)
             return null;
-        const instance = Object.create(ContentFormatsBuilder.prototype);
-        instance.ptr = ptr;
-        return instance;
+        return wrapPtr(ptr, ContentFormatsBuilder);
     }
     toFormats() {
         const ptr = call("libgtk-4.so.1", "gdk_content_formats_builder_to_formats", [
@@ -102,9 +99,7 @@ export class ContentFormatsBuilder {
         });
         if (ptr === null)
             return null;
-        const instance = Object.create(ContentFormats.prototype);
-        instance.ptr = ptr;
-        return instance;
+        return wrapPtr(ptr, ContentFormats);
     }
     unref() {
         call("libgtk-4.so.1", "gdk_content_formats_builder_unref", [

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

@@ -1,4 +1,5 @@
 import { call } from "@gtkx/native";
+import { wrapPtr } from "@gtkx/ffi";
 export class ContentFormats {
     ptr;
     constructor(nMimeTypes, mimeTypes) {
@@ -12,9 +13,7 @@ export class ContentFormats {
                 value: type,
             },
         ], { type: "boxed", borrowed: true, innerType: "ContentFormats" });
-        const instance = Object.create(ContentFormats.prototype);
-        instance.ptr = ptr;
-        return instance;
+        return wrapPtr(ptr, ContentFormats);
     }
     createPtr(_args) {
         const [mimeTypes, nMimeTypes] = _args;
@@ -41,9 +40,7 @@ export class ContentFormats {
             innerType: "GdkContentFormats",
             lib: "libgtk-4.so.1",
         });
-        const instance = Object.create(ContentFormats.prototype);
-        instance.ptr = ptr;
-        return instance;
+        return wrapPtr(ptr, ContentFormats);
     }
     containGtype(type) {
         return call("libgtk-4.so.1", "gdk_content_formats_contain_gtype", [
@@ -175,9 +172,7 @@ export class ContentFormats {
         });
         if (ptr === null)
             return null;
-        const instance = Object.create(ContentFormats.prototype);
-        instance.ptr = ptr;
-        return instance;
+        return wrapPtr(ptr, ContentFormats);
     }
     toString() {
         return call("libgtk-4.so.1", "gdk_content_formats_to_string", [
@@ -209,9 +204,7 @@ export class ContentFormats {
         });
         if (ptr === null)
             return null;
-        const instance = Object.create(ContentFormats.prototype);
-        instance.ptr = ptr;
-        return instance;
+        return wrapPtr(ptr, ContentFormats);
     }
     unionDeserializeGtypes() {
         const ptr = call("libgtk-4.so.1", "gdk_content_formats_union_deserialize_gtypes", [
@@ -227,9 +220,7 @@ export class ContentFormats {
         });
         if (ptr === null)
             return null;
-        const instance = Object.create(ContentFormats.prototype);
-        instance.ptr = ptr;
-        return instance;
+        return wrapPtr(ptr, ContentFormats);
     }
     unionDeserializeMimeTypes() {
         const ptr = call("libgtk-4.so.1", "gdk_content_formats_union_deserialize_mime_types", [
@@ -245,9 +236,7 @@ export class ContentFormats {
         });
         if (ptr === null)
             return null;
-        const instance = Object.create(ContentFormats.prototype);
-        instance.ptr = ptr;
-        return instance;
+        return wrapPtr(ptr, ContentFormats);
     }
     unionSerializeGtypes() {
         const ptr = call("libgtk-4.so.1", "gdk_content_formats_union_serialize_gtypes", [
@@ -263,9 +252,7 @@ export class ContentFormats {
         });
         if (ptr === null)
             return null;
-        const instance = Object.create(ContentFormats.prototype);
-        instance.ptr = ptr;
-        return instance;
+        return wrapPtr(ptr, ContentFormats);
     }
     unionSerializeMimeTypes() {
         const ptr = call("libgtk-4.so.1", "gdk_content_formats_union_serialize_mime_types", [
@@ -281,9 +268,7 @@ export class ContentFormats {
         });
         if (ptr === null)
             return null;
-        const instance = Object.create(ContentFormats.prototype);
-        instance.ptr = ptr;
-        return instance;
+        return wrapPtr(ptr, ContentFormats);
     }
     unref() {
         call("libgtk-4.so.1", "gdk_content_formats_unref", [

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

@@ -1,5 +1,5 @@
 import { call } from "@gtkx/native";
-import { NativeError } from "@gtkx/ffi";
+import { NativeError, wrapPtr } from "@gtkx/ffi";
 import { ContentFormats } from "./content-formats.js";
 export class ContentProvider {
     ptr;
@@ -14,9 +14,7 @@ export class ContentProvider {
                 value: value?.ptr ?? value,
             },
         ], { type: "gobject", borrowed: true });
-        const instance = Object.create(ContentProvider.prototype);
-        instance.ptr = ptr;
-        return instance;
+        return wrapPtr(ptr, ContentProvider);
     }
     static providerNewTyped(type) {
         const ptr = call("libgtk-4.so.1", "gdk_content_provider_new_typed", [
@@ -25,9 +23,7 @@ export class ContentProvider {
                 value: type,
             },
         ], { type: "gobject", borrowed: true });
-        const instance = Object.create(ContentProvider.prototype);
-        instance.ptr = ptr;
-        return instance;
+        return wrapPtr(ptr, ContentProvider);
     }
     static providerNewUnion(nProviders, providers) {
         const ptr = call("libgtk-4.so.1", "gdk_content_provider_new_union", [
@@ -40,9 +36,7 @@ export class ContentProvider {
                 value: nProviders?.ptr ?? nProviders,
             },
         ], { type: "gobject", borrowed: true });
-        const instance = Object.create(ContentProvider.prototype);
-        instance.ptr = ptr;
-        return instance;
+        return wrapPtr(ptr, ContentProvider);
     }
     createPtr(_args) {
         const [mimeType, bytes] = _args;
@@ -114,9 +108,7 @@ export class ContentProvider {
         });
         if (ptr === null)
             return null;
-        const instance = Object.create(ContentFormats.prototype);
-        instance.ptr = ptr;
-        return instance;
+        return wrapPtr(ptr, ContentFormats);
     }
     refStorableFormats() {
         const ptr = call("libgtk-4.so.1", "gdk_content_provider_ref_storable_formats", [
@@ -132,9 +124,7 @@ export class ContentProvider {
         });
         if (ptr === null)
             return null;
-        const instance = Object.create(ContentFormats.prototype);
-        instance.ptr = ptr;
-        return instance;
+        return wrapPtr(ptr, ContentFormats);
     }
     writeMimeTypeFinish(result) {
         const error = { value: null };
@@ -183,9 +173,7 @@ export class ContentProvider {
                 return handler(...signalArgs);
             const wrapped = meta.map((m, i) => {
                 if (m.cls && signalArgs[i] != null) {
-                    const inst = Object.create(m.cls.prototype);
-                    inst.ptr = signalArgs[i];
-                    return inst;
+                    return wrapPtr(signalArgs[i], m.cls);
                 }
                 return signalArgs[i];
             });