@gtkx/ffi 0.1.8 → 0.1.10

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;
@@ -59,8 +60,6 @@ export declare class CodeGenerator {
     private buildAsyncCallArgs;
     private generateFinishCallArguments;
     private generateMethod;
-    private generateProperties;
-    private generateProperty;
     private extractSignalParamClass;
     private generateSignalConnect;
     private generateInterface;

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();
@@ -376,7 +378,6 @@ export class CodeGenerator {
         sections.push(this.generateCreatePtr(cls, sharedLibrary, hasParent));
         sections.push(this.generateStaticFunctions(cls.functions, sharedLibrary, className));
         sections.push(this.generateMethods(filteredClassMethods, sharedLibrary, cls.name));
-        sections.push(this.generateProperties(cls.properties, cls.methods));
         if (interfaceMethods.length > 0) {
             sections.push(this.generateMethods(interfaceMethods, sharedLibrary, className));
         }
@@ -524,10 +525,10 @@ export class CodeGenerator {
         }
         if (!mainConstructor) {
             if (hasParent) {
-                sections.push(`  constructor(_args: unknown[] = []) {\n    super(_args);\n  }\n`);
+                sections.push(`  constructor(...args: unknown[]) {\n    super(...args);\n  }\n`);
             }
             else {
-                sections.push(`  constructor(_args: unknown[] = []) {\n    this.ptr = this.createPtr(_args);\n  }\n`);
+                sections.push(`  constructor(...args: unknown[]) {\n    this.ptr = this.createPtr(args);\n  }\n`);
             }
         }
         return sections.join("\n");
@@ -537,27 +538,23 @@ export class CodeGenerator {
         const filteredParams = ctor.parameters.filter((p) => !isVararg(p));
         if (filteredParams.length === 0) {
             if (hasParent) {
-                return `${ctorDoc}  constructor(_args: unknown[] = []) {\n    super(_args);\n  }\n`;
+                return `${ctorDoc}  constructor(...args: unknown[]) {\n    super(...args);\n  }\n`;
             }
-            return `${ctorDoc}  constructor(_args: unknown[] = []) {\n    this.ptr = this.createPtr(_args);\n  }\n`;
+            return `${ctorDoc}  constructor(...args: unknown[]) {\n    this.ptr = this.createPtr(args);\n  }\n`;
         }
         const typedParams = this.generateParameterList(ctor.parameters, false);
-        const paramNames = filteredParams.map((p) => toValidIdentifier(toCamelCase(p.name)));
-        const firstParamType = this.typeMapper.mapParameter(filteredParams[0]).ts;
-        const isFirstParamArray = firstParamType.endsWith("[]") || firstParamType.startsWith("Array<");
-        const superOrCreate = hasParent ? "super(_args)" : "this.ptr = this.createPtr(_args)";
-        if (isFirstParamArray) {
-            return `${ctorDoc}  constructor(${typedParams}) {
-    const _args = [${paramNames.join(", ")}];
-    ${superOrCreate};
+        if (hasParent) {
+            return `${ctorDoc}  constructor(${typedParams});
+  constructor(...args: unknown[]);
+  constructor(...args: unknown[]) {
+    super(...args);
   }
 `;
         }
         return `${ctorDoc}  constructor(${typedParams});
-  constructor(_args: unknown[]);
+  constructor(...args: unknown[]);
   constructor(...args: unknown[]) {
-    const _args = args.length === 1 && Array.isArray(args[0]) ? args[0] : args;
-    ${superOrCreate};
+    this.ptr = this.createPtr(args);
   }
 `;
     }
@@ -572,17 +569,20 @@ export class CodeGenerator {
         const filteredParams = mainConstructor.parameters.filter((p, i) => !isVararg(p) && !this.typeMapper.isClosureTarget(i, mainConstructor.parameters));
         const paramTypes = filteredParams.map((p) => this.typeMapper.mapParameter(p).ts);
         const paramNames = filteredParams.map((p) => toValidIdentifier(toCamelCase(p.name)));
-        const destructuring = paramNames.length > 0
-            ? `    const [${paramNames.join(", ")}] = _args as [${paramTypes.join(", ")}];\n`
+        const hasParams = paramNames.length > 0;
+        const hasArgsParam = paramNames.includes("args");
+        const arrayParamName = hasArgsParam ? "ctorArgs" : hasParams ? "args" : "_args";
+        const destructuring = hasParams
+            ? `    const [${paramNames.join(", ")}] = ${arrayParamName} as [${paramTypes.join(", ")}];\n`
             : "";
-        const args = this.generateCallArguments(mainConstructor.parameters);
+        const callArgs = this.generateCallArguments(mainConstructor.parameters);
         const override = hasParent ? "override " : "";
-        return `  protected ${override}createPtr(_args: unknown[]): unknown {
+        return `  protected ${override}createPtr(${arrayParamName}: unknown[]): unknown {
 ${destructuring}    return call(
       "${sharedLibrary}",
       "${mainConstructor.cIdentifier}",
       [
-${args}
+${callArgs}
       ],
       { type: "gobject", borrowed: true }
     );
@@ -601,6 +601,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 +611,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 +646,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 +658,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 +865,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 +881,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 +990,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 {
@@ -1032,43 +1025,6 @@ ${allArgs ? `${allArgs},` : ""}
         lines.push(`  }`);
         return `${lines.join("\n")}\n`;
     }
-    generateProperties(properties, methods) {
-        const methodNames = new Set(methods.map((m) => toCamelCase(m.name)));
-        const sections = [];
-        for (const property of properties) {
-            if (!property.readable && !property.writable)
-                continue;
-            const propertyName = toValidIdentifier(toCamelCase(property.name));
-            if (methodNames.has(propertyName))
-                continue;
-            sections.push(this.generateProperty(property));
-        }
-        return sections.join("\n");
-    }
-    generateProperty(property) {
-        const propertyName = toValidIdentifier(toCamelCase(property.name));
-        const typeMapping = this.typeMapper.mapType(property.type);
-        const lines = [];
-        if (property.readable) {
-            if (property.doc) {
-                lines.push(formatDoc(property.doc, "  ").trimEnd());
-            }
-            lines.push(`  get ${propertyName}(): ${typeMapping.ts} {
-    throw new Error("Property getters not yet implemented");
-  }
-`);
-        }
-        if (property.writable && !property.constructOnly) {
-            if (!property.readable && property.doc) {
-                lines.push(formatDoc(property.doc, "  ").trimEnd());
-            }
-            lines.push(`  set ${propertyName}(_value: ${typeMapping.ts}) {
-    throw new Error("Property setters not yet implemented");
-  }
-`);
-        }
-        return lines.join("\n");
-    }
     extractSignalParamClass(param, classMap) {
         const typeName = param.type.name;
         if (!typeName)
@@ -1116,6 +1072,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 +1086,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 +1328,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 +1338,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 +1491,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 +1499,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 +1624,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.d.ts

@@ -2,12 +2,11 @@ import { Display } from "./display.js";
 import * as Gio from "../gio/index.js";
 export declare class AppLaunchContext {
     ptr: unknown;
-    constructor(_args?: unknown[]);
+    constructor(...args: unknown[]);
     protected createPtr(_args: unknown[]): unknown;
     getDisplay(): Display;
     setDesktop(desktop: number): void;
     setIcon(icon?: Gio.Icon): void;
     setIconName(iconName?: string): void;
     setTimestamp(timestamp: number): void;
-    get display(): Display;
 }

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

@@ -1,9 +1,10 @@
 import { call } from "@gtkx/native";
+import { wrapPtr } from "@gtkx/ffi";
 import { Display } from "./display.js";
 export class AppLaunchContext {
     ptr;
-    constructor(_args = []) {
-        this.ptr = this.createPtr(_args);
+    constructor(...args) {
+        this.ptr = this.createPtr(args);
     }
     createPtr(_args) {
         return null;
@@ -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", [
@@ -69,7 +68,4 @@ export class AppLaunchContext {
             },
         ], { type: "undefined" });
     }
-    get display() {
-        throw new Error("Property getters not yet implemented");
-    }
 }

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

@@ -1,6 +1,6 @@
 import { Event } from "./event.js";
 export declare class ButtonEvent extends Event {
-    constructor(_args?: unknown[]);
+    constructor(...args: unknown[]);
     protected createPtr(_args: unknown[]): unknown;
     getButton(): number;
 }

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

@@ -1,8 +1,8 @@
 import { call } from "@gtkx/native";
 import { Event } from "./event.js";
 export class ButtonEvent extends Event {
-    constructor(_args = []) {
-        super(_args);
+    constructor(...args) {
+        super(...args);
     }
     createPtr(_args) {
         return null;

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

@@ -1,7 +1,7 @@
 import * as cairo from "../cairo/index.js";
 import { DrawContext } from "./draw-context.js";
 export declare class CairoContext extends DrawContext {
-    constructor(_args?: unknown[]);
+    constructor(...args: unknown[]);
     protected createPtr(_args: unknown[]): unknown;
     cairoCreate(): cairo.Context;
 }

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

@@ -1,9 +1,10 @@
 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 {
-    constructor(_args = []) {
-        super(_args);
+    constructor(...args) {
+        super(...args);
     }
     createPtr(_args) {
         return null;
@@ -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.d.ts

@@ -2,7 +2,7 @@ import { CicpRange } from "./enums.js";
 import { ColorState } from "./color-state.js";
 export declare class CicpParams {
     ptr: unknown;
-    constructor(_args?: unknown[]);
+    constructor(...args: unknown[]);
     protected createPtr(_args: unknown[]): unknown;
     buildColorState(): ColorState;
     getColorPrimaries(): number;
@@ -13,12 +13,4 @@ export declare class CicpParams {
     setMatrixCoefficients(matrixCoefficients: number): void;
     setRange(range: CicpRange): void;
     setTransferFunction(transferFunction: number): void;
-    get colorPrimaries(): number;
-    set colorPrimaries(_value: number);
-    get matrixCoefficients(): number;
-    set matrixCoefficients(_value: number);
-    get range(): CicpRange;
-    set range(_value: CicpRange);
-    get transferFunction(): number;
-    set transferFunction(_value: number);
 }

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

@@ -1,10 +1,10 @@
 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;
-    constructor(_args = []) {
-        this.ptr = this.createPtr(_args);
+    constructor(...args) {
+        this.ptr = this.createPtr(args);
     }
     createPtr(_args) {
         return call("libgtk-4.so.1", "gdk_cicp_params_new", [], {
@@ -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", [
@@ -125,28 +123,4 @@ export class CicpParams {
             },
         ], { type: "undefined" });
     }
-    get colorPrimaries() {
-        throw new Error("Property getters not yet implemented");
-    }
-    set colorPrimaries(_value) {
-        throw new Error("Property setters not yet implemented");
-    }
-    get matrixCoefficients() {
-        throw new Error("Property getters not yet implemented");
-    }
-    set matrixCoefficients(_value) {
-        throw new Error("Property setters not yet implemented");
-    }
-    get range() {
-        throw new Error("Property getters not yet implemented");
-    }
-    set range(_value) {
-        throw new Error("Property setters not yet implemented");
-    }
-    get transferFunction() {
-        throw new Error("Property getters not yet implemented");
-    }
-    set transferFunction(_value) {
-        throw new Error("Property setters not yet implemented");
-    }
 }

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

@@ -7,7 +7,7 @@ import * as GObject from "../gobject/index.js";
 import * as Gio from "../gio/index.js";
 export declare class Clipboard {
     ptr: unknown;
-    constructor(_args?: unknown[]);
+    constructor(...args: unknown[]);
     protected createPtr(_args: unknown[]): unknown;
     getContent(): ContentProvider;
     getDisplay(): Display;
@@ -24,9 +24,5 @@ export declare class Clipboard {
     setValist(type: number, args: unknown): void;
     setValue(value: GObject.Value): void;
     storeFinish(result: Gio.AsyncResult): boolean;
-    get content(): ContentProvider;
-    get display(): Display;
-    get formats(): ContentFormats;
-    get local(): boolean;
     connect(signal: string, handler: (...args: unknown[]) => unknown, after?: boolean): number;
 }

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";
@@ -8,8 +8,8 @@ import * as GObject from "../gobject/index.js";
 import * as Gio from "../gio/index.js";
 export class Clipboard {
     ptr;
-    constructor(_args = []) {
-        this.ptr = this.createPtr(_args);
+    constructor(...args) {
+        this.ptr = this.createPtr(args);
     }
     createPtr(_args) {
         return null;
@@ -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", [
@@ -303,18 +291,6 @@ export class Clipboard {
         }
         return _result;
     }
-    get content() {
-        throw new Error("Property getters not yet implemented");
-    }
-    get display() {
-        throw new Error("Property getters not yet implemented");
-    }
-    get formats() {
-        throw new Error("Property getters not yet implemented");
-    }
-    get local() {
-        throw new Error("Property getters not yet implemented");
-    }
     connect(signal, handler, after = false) {
         const signalMeta = {
             changed: [],
@@ -328,9 +304,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];
             });