@gtkx/ffi 0.2.7 → 0.3.1

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

@@ -29,6 +29,7 @@ export declare class CodeGenerator {
     private usesAlloc;
     private usesNativeError;
     private usesGetObject;
+    private usesRegisterClass;
     private usesSignalMeta;
     private usedEnums;
     private usedRecords;

package/dist/codegen/ffi-generator.js

@@ -224,6 +224,7 @@ export class CodeGenerator {
     usesAlloc = false;
     usesNativeError = false;
     usesGetObject = false;
+    usesRegisterClass = false;
     usesSignalMeta = false;
     usedEnums = new Set();
     usedRecords = new Set();
@@ -345,6 +346,7 @@ export class CodeGenerator {
         this.usesAlloc = false;
         this.usesNativeError = false;
         this.usesGetObject = false;
+        this.usesRegisterClass = false;
         this.usesSignalMeta = false;
         this.usedEnums.clear();
         this.usedRecords.clear();
@@ -413,7 +415,7 @@ export class CodeGenerator {
             sections.push(`  static ${override}readonly glibTypeName: string = "${cls.glibTypeName}";\n`);
         }
         if (!parentInfo.hasParent) {
-            sections.push(`  ptr: unknown;\n`);
+            sections.push(`  id: unknown;\n`);
         }
         sections.push(this.generateConstructors(cls, sharedLibrary, parentInfo.hasParent));
         sections.push(this.generateCreatePtr(cls, sharedLibrary, parentInfo.hasParent));
@@ -431,6 +433,10 @@ export class CodeGenerator {
             sections.push(signalConnect.method);
         }
         sections.push("}");
+        if (cls.glibTypeName) {
+            this.usesRegisterClass = true;
+            sections.push(`\nregisterClass(${className});`);
+        }
         if (signalMetaConstant) {
             const classDefIndex = sections.findIndex((s) => s.startsWith("export class "));
             if (classDefIndex !== -1) {
@@ -602,7 +608,7 @@ export class CodeGenerator {
                 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.id = this.createPtr(args);\n  }\n`);
             }
         }
         return sections.join("\n");
@@ -614,7 +620,7 @@ export class CodeGenerator {
             if (hasParent) {
                 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.id = this.createPtr(args);\n  }\n`;
         }
         const typedParams = this.generateParameterList(ctor.parameters, false);
         if (hasParent) {
@@ -628,7 +634,7 @@ export class CodeGenerator {
         return `${ctorDoc}  constructor(${typedParams});
   constructor(...args: unknown[]);
   constructor(...args: unknown[]) {
-    this.ptr = this.createPtr(args);
+    this.id = this.createPtr(args);
   }
 `;
     }
@@ -709,7 +715,7 @@ ${args}
       ],
       { type: "gobject", borrowed: ${borrowed} }
     );
-    return getObject(ptr, ${className});
+    return getObject(ptr) as ${className};
   }
 `;
     }
@@ -756,7 +762,7 @@ ${allArgs ? `${allArgs},` : ""}
             if (func.throws) {
                 lines.push(this.generateErrorCheck());
             }
-            lines.push(`    return getObject(ptr, ${className});`);
+            lines.push(`    return getObject(ptr) as ${className};`);
         }
         else {
             const callPrefix = func.throws
@@ -919,7 +925,7 @@ ${allArgs ? `${allArgs},` : ""}
             const mapped = this.typeMapper.mapParameter(param);
             const jsParamName = toValidIdentifier(toCamelCase(param.name));
             const needsPtr = mapped.ffi.type === "gobject" || mapped.ffi.type === "boxed";
-            const valueName = needsPtr ? `(${jsParamName} as any)?.ptr ?? ${jsParamName}` : jsParamName;
+            const valueName = needsPtr ? `(${jsParamName} as any)?.id ?? ${jsParamName}` : jsParamName;
             return `          {\n            type: ${this.generateTypeDescriptor(mapped.ffi)},\n            value: ${valueName},\n          }`;
         })
             .join(",\n");
@@ -940,7 +946,7 @@ ${allArgs ? `${allArgs},` : ""}
             lines.push(`            "${sharedLibrary}",`);
             lines.push(`            "${finishMethod.cIdentifier}",`);
             lines.push(`            [`);
-            lines.push(`              { type: { type: "gobject" }, value: this.ptr },`);
+            lines.push(`              { type: { type: "gobject" }, value: this.id },`);
             lines.push(`${finishCallArgs}${errorArg}`);
             lines.push(`            ],`);
             lines.push(`            ${this.generateTypeDescriptor(finishReturnType.ffi)}`);
@@ -951,7 +957,7 @@ ${allArgs ? `${allArgs},` : ""}
             lines.push(`            "${sharedLibrary}",`);
             lines.push(`            "${finishMethod.cIdentifier}",`);
             lines.push(`            [`);
-            lines.push(`              { type: { type: "gobject" }, value: this.ptr },`);
+            lines.push(`              { type: { type: "gobject" }, value: this.id },`);
             lines.push(`${finishCallArgs}${errorArg}`);
             lines.push(`            ],`);
             lines.push(`            { type: "undefined" }`);
@@ -970,7 +976,7 @@ ${allArgs ? `${allArgs},` : ""}
                     if (isNullable) {
                         lines.push(`          if (ptr === null) { resolve(null); return; }`);
                     }
-                    lines.push(`          resolve(getObject(ptr, ${finishReturnType.ts}));`);
+                    lines.push(`          resolve(getObject(ptr) as ${finishReturnType.ts});`);
                 }
                 else {
                     lines.push(`          resolve(result);`);
@@ -986,10 +992,10 @@ ${allArgs ? `${allArgs},` : ""}
                 if (needsObjectWrap) {
                     this.usesGetObject = true;
                     if (isNullable) {
-                        lines.push(`          const result = (ptr === null ? null : getObject(ptr, ${finishReturnType.ts})) as ${finishReturnType.ts} | null;`);
+                        lines.push(`          const result = (ptr === null ? null : getObject(ptr)) as ${finishReturnType.ts} | null;`);
                     }
                     else {
-                        lines.push(`          const result = getObject(ptr, ${finishReturnType.ts});`);
+                        lines.push(`          const result = getObject(ptr) as ${finishReturnType.ts};`);
                     }
                 }
                 resolveFields.push("result");
@@ -1013,7 +1019,7 @@ ${allArgs ? `${allArgs},` : ""}
         lines.push(`        "${sharedLibrary}",`);
         lines.push(`        "${method.cIdentifier}",`);
         lines.push(`        [`);
-        lines.push(`          { type: { type: "gobject" }, value: this.ptr },`);
+        lines.push(`          { type: { type: "gobject" }, value: this.id },`);
         if (asyncCallArgs) {
             lines.push(`${asyncCallArgs},`);
         }
@@ -1040,7 +1046,7 @@ ${allArgs ? `${allArgs},` : ""}
             }
             const mapped = this.typeMapper.mapParameter(param);
             const needsPtr = mapped.ffi.type === "gobject" || mapped.ffi.type === "boxed";
-            const valueName = needsPtr ? `(${paramName} as any)?.ptr ?? ${paramName}` : paramName;
+            const valueName = needsPtr ? `(${paramName} as any)?.id ?? ${paramName}` : paramName;
             return `              { type: ${this.generateTypeDescriptor(mapped.ffi)}, value: ${valueName} }`;
         })
             .join(",\n");
@@ -1092,7 +1098,7 @@ ${allArgs ? `${allArgs},` : ""}
       [
         {
           type: ${selfTypeDescriptor},
-          value: this.ptr,
+          value: this.id,
         },
 ${allArgs ? `${allArgs},` : ""}
       ],
@@ -1105,11 +1111,11 @@ ${allArgs ? `${allArgs},` : ""}
                 lines.push(`    if (ptr === null) return null;`);
             }
             if (isCyclic) {
-                lines.push(`    return { ptr } as unknown as ${baseReturnType};`);
+                lines.push(`    return { id: ptr } as unknown as ${baseReturnType};`);
             }
             else {
                 this.usesGetObject = true;
-                lines.push(`    return getObject(ptr, ${baseReturnType});`);
+                lines.push(`    return getObject(ptr) as ${baseReturnType};`);
             }
         }
         else if (needsArrayWrap && hasReturnValue) {
@@ -1121,7 +1127,7 @@ ${allArgs ? `${allArgs},` : ""}
       [
         {
           type: ${selfTypeDescriptor},
-          value: this.ptr,
+          value: this.id,
         },
 ${allArgs ? `${allArgs},` : ""}
       ],
@@ -1130,7 +1136,7 @@ ${allArgs ? `${allArgs},` : ""}
             if (method.throws) {
                 lines.push(this.generateErrorCheck());
             }
-            lines.push(`    return ptrs.map(ptr => getObject(ptr, ${elementType}));`);
+            lines.push(`    return ptrs.map(ptr => getObject(ptr) as ${elementType});`);
         }
         else {
             const callPrefix = method.throws
@@ -1147,7 +1153,7 @@ ${allArgs ? `${allArgs},` : ""}
       [
         {
           type: ${selfTypeDescriptor},
-          value: this.ptr,
+          value: this.id,
         },
 ${allArgs ? `${allArgs},` : ""}
       ],
@@ -1272,19 +1278,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 = getObject(args[0], ${className});
+      const self = getObject(args[0]);
       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 getObject(signalArgs[i], m.getCls());
+          return getObject(signalArgs[i]);
         }
         return signalArgs[i];
       });
       return handler(self, ...wrapped);
     };`
             : `const wrappedHandler = (...args: unknown[]) => {
-      const self = getObject(args[0], ${className});
+      const self = getObject(args[0]);
       return handler(self, ...args.slice(1));
     };`;
         const overloadsSection = signalOverloads.length > 0 ? `${signalOverloads.join("\n")}\n` : "";
@@ -1299,7 +1305,7 @@ ${allArgs ? `${allArgs},` : ""}
       "${sharedLibrary}",
       "g_signal_connect_closure",
       [
-        { type: { type: "gobject" }, value: this.ptr },
+        { type: { type: "gobject" }, value: this.id },
         { type: { type: "string" }, value: signal },
         { type: { type: "callback", argTypes, returnType }, value: wrappedHandler },
         { type: { type: "boolean" }, value: after },
@@ -1320,14 +1326,17 @@ ${allArgs ? `${allArgs},` : ""}
             sections.push(formatDoc(iface.doc));
         }
         sections.push(`export class ${interfaceName} {`);
-        sections.push(`  ptr: unknown;`);
+        if (iface.glibTypeName) {
+            sections.push(`  static readonly glibTypeName: string = "${iface.glibTypeName}";\n`);
+        }
+        sections.push(`  id: unknown;`);
         sections.push(``);
-        sections.push(`  protected constructor(ptr: unknown) {`);
-        sections.push(`    this.ptr = ptr;`);
+        sections.push(`  protected constructor(id: unknown) {`);
+        sections.push(`    this.id = id;`);
         sections.push(`  }`);
         sections.push(``);
-        sections.push(`  static fromPtr(ptr: unknown): ${interfaceName} {`);
-        sections.push(`    return new ${interfaceName}(ptr);`);
+        sections.push(`  static fromPtr(id: unknown): ${interfaceName} {`);
+        sections.push(`    return new ${interfaceName}(id);`);
         sections.push(`  }`);
         if (iface.methods.length > 0) {
             sections.push(this.generateMethods(iface.methods, sharedLibrary, interfaceName));
@@ -1357,12 +1366,19 @@ ${allArgs ? `${allArgs},` : ""}
             sections.push(formatDoc(record.doc));
         }
         sections.push(`export class ${recordName} {`);
-        sections.push(`  ptr: unknown;\n`);
+        if (record.glibTypeName) {
+            sections.push(`  static readonly glibTypeName: string = "${record.glibTypeName}";\n`);
+        }
+        sections.push(`  id: unknown;\n`);
         sections.push(this.generateRecordConstructors(record, sharedLibrary));
         sections.push(this.generateRecordStaticFunctions(record.functions, sharedLibrary, recordName));
         sections.push(this.generateRecordMethods(record.methods, sharedLibrary, record.name, record.glibTypeName));
         sections.push(this.generateRecordFields(record.fields, record.methods));
         sections.push("}");
+        if (record.glibTypeName) {
+            this.usesRegisterClass = true;
+            sections.push(`\nregisterClass(${recordName});`);
+        }
         const imports = this.generateImports(recordName);
         return this.formatCode(imports + sections.join("\n"));
     }
@@ -1384,7 +1400,7 @@ ${allArgs ? `${allArgs},` : ""}
             const ctorDoc = formatMethodDoc(mainConstructor.doc, mainConstructor.parameters);
             const filteredParams = mainConstructor.parameters.filter((p) => !isVararg(p));
             if (filteredParams.length === 0) {
-                sections.push(`${ctorDoc}  constructor() {\n    this.ptr = this.createPtr([]);\n  }\n`);
+                sections.push(`${ctorDoc}  constructor() {\n    this.id = this.createPtr([]);\n  }\n`);
             }
             else {
                 const typedParams = this.generateParameterList(mainConstructor.parameters, false);
@@ -1394,7 +1410,7 @@ ${allArgs ? `${allArgs},` : ""}
                 if (isFirstParamArray) {
                     sections.push(`${ctorDoc}  constructor(${typedParams}) {
     const _args = [${paramNames.join(", ")}];
-    this.ptr = this.createPtr(_args);
+    this.id = this.createPtr(_args);
   }
 `);
                 }
@@ -1403,7 +1419,7 @@ ${allArgs ? `${allArgs},` : ""}
   constructor(_args: unknown[]);
   constructor(...args: unknown[]) {
     const _args = args.length === 1 && Array.isArray(args[0]) ? args[0] : args;
-    this.ptr = this.createPtr(_args);
+    this.id = this.createPtr(_args);
   }
 `);
                 }
@@ -1417,10 +1433,10 @@ ${allArgs ? `${allArgs},` : ""}
         else {
             const initFields = this.getWritableFields(record.fields);
             if (initFields.length > 0) {
-                sections.push(`  constructor(init: ${recordName}Init = {}) {\n    this.ptr = this.createPtr(init);\n  }\n`);
+                sections.push(`  constructor(init: ${recordName}Init = {}) {\n    this.id = this.createPtr(init);\n  }\n`);
             }
             else {
-                sections.push(`  constructor() {\n    this.ptr = this.createPtr({});\n  }\n`);
+                sections.push(`  constructor() {\n    this.id = this.createPtr({});\n  }\n`);
             }
         }
         sections.push(this.generateRecordCreatePtr(record, sharedLibrary));
@@ -1533,7 +1549,7 @@ ${args}
       ],
       { type: "boxed", borrowed: true, innerType: "${recordName}" }
     );
-    return getObject(ptr, ${recordName});
+    return getObject(ptr) as ${recordName};
   }
 `;
     }
@@ -1571,14 +1587,14 @@ ${args}
             }
             if (isReadable) {
                 sections.push(`  get ${fieldName}(): ${typeMapping.ts} {
-    return read(this.ptr, ${this.generateTypeDescriptor(typeMapping.ffi)}, ${offset}) as ${typeMapping.ts};
+    return read(this.id, ${this.generateTypeDescriptor(typeMapping.ffi)}, ${offset}) as ${typeMapping.ts};
   }
 `);
             }
             if (isWritable && this.isWritableType(field.type)) {
                 this.usesWrite = true;
                 sections.push(`  set ${fieldName}(value: ${typeMapping.ts}) {
-    write(this.ptr, ${this.generateTypeDescriptor(typeMapping.ffi)}, ${offset}, value);
+    write(this.id, ${this.generateTypeDescriptor(typeMapping.ffi)}, ${offset}, value);
   }
 `);
             }
@@ -1699,7 +1715,7 @@ ${allArgs ? `${allArgs},` : ""}
             if (isNullable) {
                 lines.push(`  if (ptr === null) return null;`);
             }
-            lines.push(`  return getObject(ptr, ${baseReturnType});`);
+            lines.push(`  return getObject(ptr) as ${baseReturnType};`);
         }
         else {
             const callPrefix = func.throws
@@ -1765,7 +1781,7 @@ ${allArgs ? `${allArgs},` : ""}
             const mapped = this.typeMapper.mapParameter(param);
             const jsParamName = toValidIdentifier(toCamelCase(param.name));
             const needsPtr = mapped.ffi.type === "gobject" || mapped.ffi.type === "boxed";
-            const valueName = needsPtr ? `(${jsParamName} as any)?.ptr ?? ${jsParamName}` : jsParamName;
+            const valueName = needsPtr ? `(${jsParamName} as any)?.id ?? ${jsParamName}` : jsParamName;
             const isOptional = this.typeMapper.isNullable(param);
             const optionalPart = isOptional ? `,\n${indent}    optional: true` : "";
             return `${indent}  {\n${indent}    type: ${this.generateTypeDescriptor(mapped.ffi)},\n${indent}    value: ${valueName}${optionalPart},\n${indent}  }`;
@@ -1856,6 +1872,8 @@ ${indent}  }`;
             ffiImports.push("NativeError");
         if (this.usesGetObject)
             ffiImports.push("getObject");
+        if (this.usesRegisterClass)
+            ffiImports.push("registerClass");
         if (ffiImports.length > 0) {
             lines.push(`import { ${ffiImports.join(", ")} } from "@gtkx/ffi";`);
         }

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

@@ -1,5 +1,6 @@
 export declare class Context {
-    ptr: unknown;
+    static readonly glibTypeName: string;
+    id: unknown;
     constructor();
     protected createPtr(_init: Record<string, unknown>): unknown;
 }

package/dist/generated/cairo/context.js

@@ -1,9 +1,12 @@
+import { registerClass } from "@gtkx/ffi";
 export class Context {
-    ptr;
+    static glibTypeName = "CairoContext";
+    id;
     constructor() {
-        this.ptr = this.createPtr({});
+        this.id = this.createPtr({});
     }
     createPtr(_init) {
         return null;
     }
 }
+registerClass(Context);

package/dist/generated/cairo/device.d.ts

@@ -1,5 +1,6 @@
 export declare class Device {
-    ptr: unknown;
+    static readonly glibTypeName: string;
+    id: unknown;
     constructor();
     protected createPtr(_init: Record<string, unknown>): unknown;
 }

package/dist/generated/cairo/device.js

@@ -1,9 +1,12 @@
+import { registerClass } from "@gtkx/ffi";
 export class Device {
-    ptr;
+    static glibTypeName = "CairoDevice";
+    id;
     constructor() {
-        this.ptr = this.createPtr({});
+        this.id = this.createPtr({});
     }
     createPtr(_init) {
         return null;
     }
 }
+registerClass(Device);

package/dist/generated/cairo/font-face.d.ts

@@ -1,5 +1,6 @@
 export declare class FontFace {
-    ptr: unknown;
+    static readonly glibTypeName: string;
+    id: unknown;
     constructor();
     protected createPtr(_init: Record<string, unknown>): unknown;
 }

package/dist/generated/cairo/font-face.js

@@ -1,9 +1,12 @@
+import { registerClass } from "@gtkx/ffi";
 export class FontFace {
-    ptr;
+    static glibTypeName = "CairoFontFace";
+    id;
     constructor() {
-        this.ptr = this.createPtr({});
+        this.id = this.createPtr({});
     }
     createPtr(_init) {
         return null;
     }
 }
+registerClass(FontFace);

package/dist/generated/cairo/font-options.d.ts

@@ -1,5 +1,6 @@
 export declare class FontOptions {
-    ptr: unknown;
+    static readonly glibTypeName: string;
+    id: unknown;
     constructor();
     protected createPtr(_init: Record<string, unknown>): unknown;
 }

package/dist/generated/cairo/font-options.js

@@ -1,9 +1,12 @@
+import { registerClass } from "@gtkx/ffi";
 export class FontOptions {
-    ptr;
+    static glibTypeName = "CairoFontOptions";
+    id;
     constructor() {
-        this.ptr = this.createPtr({});
+        this.id = this.createPtr({});
     }
     createPtr(_init) {
         return null;
     }
 }
+registerClass(FontOptions);

package/dist/generated/cairo/glyph.d.ts

@@ -4,7 +4,8 @@ export interface GlyphInit {
     y?: number;
 }
 export declare class Glyph {
-    ptr: unknown;
+    static readonly glibTypeName: string;
+    id: unknown;
     constructor(init?: GlyphInit);
     protected createPtr(init: GlyphInit): unknown;
     get index(): number;

package/dist/generated/cairo/glyph.js

@@ -1,8 +1,10 @@
 import { alloc, read, write } from "@gtkx/native";
+import { registerClass } from "@gtkx/ffi";
 export class Glyph {
-    ptr;
+    static glibTypeName = "CairoGlyph";
+    id;
     constructor(init = {}) {
-        this.ptr = this.createPtr(init);
+        this.id = this.createPtr(init);
     }
     createPtr(init) {
         const ptr = alloc(24, "CairoGlyph", "libcairo-gobject.so.2");
@@ -15,21 +17,22 @@ export class Glyph {
         return ptr;
     }
     get index() {
-        return read(this.ptr, { type: "int", size: 64, unsigned: true }, 0);
+        return read(this.id, { type: "int", size: 64, unsigned: true }, 0);
     }
     set index(value) {
-        write(this.ptr, { type: "int", size: 64, unsigned: true }, 0, value);
+        write(this.id, { type: "int", size: 64, unsigned: true }, 0, value);
     }
     get x() {
-        return read(this.ptr, { type: "float", size: 64 }, 8);
+        return read(this.id, { type: "float", size: 64 }, 8);
     }
     set x(value) {
-        write(this.ptr, { type: "float", size: 64 }, 8, value);
+        write(this.id, { type: "float", size: 64 }, 8, value);
     }
     get y() {
-        return read(this.ptr, { type: "float", size: 64 }, 16);
+        return read(this.id, { type: "float", size: 64 }, 16);
     }
     set y(value) {
-        write(this.ptr, { type: "float", size: 64 }, 16, value);
+        write(this.id, { type: "float", size: 64 }, 16, value);
     }
 }
+registerClass(Glyph);

package/dist/generated/cairo/pattern.d.ts

@@ -1,5 +1,6 @@
 export declare class Pattern {
-    ptr: unknown;
+    static readonly glibTypeName: string;
+    id: unknown;
     constructor();
     protected createPtr(_init: Record<string, unknown>): unknown;
 }

package/dist/generated/cairo/pattern.js

@@ -1,9 +1,12 @@
+import { registerClass } from "@gtkx/ffi";
 export class Pattern {
-    ptr;
+    static glibTypeName = "CairoPattern";
+    id;
     constructor() {
-        this.ptr = this.createPtr({});
+        this.id = this.createPtr({});
     }
     createPtr(_init) {
         return null;
     }
 }
+registerClass(Pattern);

package/dist/generated/cairo/rectangle-int.d.ts

@@ -5,7 +5,8 @@ export interface RectangleIntInit {
     height?: number;
 }
 export declare class RectangleInt {
-    ptr: unknown;
+    static readonly glibTypeName: string;
+    id: unknown;
     constructor(init?: RectangleIntInit);
     protected createPtr(init: RectangleIntInit): unknown;
     get x(): number;

package/dist/generated/cairo/rectangle-int.js

@@ -1,8 +1,10 @@
 import { alloc, read, write } from "@gtkx/native";
+import { registerClass } from "@gtkx/ffi";
 export class RectangleInt {
-    ptr;
+    static glibTypeName = "CairoRectangleInt";
+    id;
     constructor(init = {}) {
-        this.ptr = this.createPtr(init);
+        this.id = this.createPtr(init);
     }
     createPtr(init) {
         const ptr = alloc(16, "CairoRectangleInt", "libcairo-gobject.so.2");
@@ -17,27 +19,28 @@ export class RectangleInt {
         return ptr;
     }
     get x() {
-        return read(this.ptr, { type: "int", size: 32, unsigned: false }, 0);
+        return read(this.id, { type: "int", size: 32, unsigned: false }, 0);
     }
     set x(value) {
-        write(this.ptr, { type: "int", size: 32, unsigned: false }, 0, value);
+        write(this.id, { type: "int", size: 32, unsigned: false }, 0, value);
     }
     get y() {
-        return read(this.ptr, { type: "int", size: 32, unsigned: false }, 4);
+        return read(this.id, { type: "int", size: 32, unsigned: false }, 4);
     }
     set y(value) {
-        write(this.ptr, { type: "int", size: 32, unsigned: false }, 4, value);
+        write(this.id, { type: "int", size: 32, unsigned: false }, 4, value);
     }
     get width() {
-        return read(this.ptr, { type: "int", size: 32, unsigned: false }, 8);
+        return read(this.id, { type: "int", size: 32, unsigned: false }, 8);
     }
     set width(value) {
-        write(this.ptr, { type: "int", size: 32, unsigned: false }, 8, value);
+        write(this.id, { type: "int", size: 32, unsigned: false }, 8, value);
     }
     get height() {
-        return read(this.ptr, { type: "int", size: 32, unsigned: false }, 12);
+        return read(this.id, { type: "int", size: 32, unsigned: false }, 12);
     }
     set height(value) {
-        write(this.ptr, { type: "int", size: 32, unsigned: false }, 12, value);
+        write(this.id, { type: "int", size: 32, unsigned: false }, 12, value);
     }
 }
+registerClass(RectangleInt);

package/dist/generated/cairo/rectangle.d.ts

@@ -5,7 +5,8 @@ export interface RectangleInit {
     height?: number;
 }
 export declare class Rectangle {
-    ptr: unknown;
+    static readonly glibTypeName: string;
+    id: unknown;
     constructor(init?: RectangleInit);
     protected createPtr(init: RectangleInit): unknown;
     get x(): number;

package/dist/generated/cairo/rectangle.js

@@ -1,8 +1,10 @@
 import { alloc, read, write } from "@gtkx/native";
+import { registerClass } from "@gtkx/ffi";
 export class Rectangle {
-    ptr;
+    static glibTypeName = "CairoRectangle";
+    id;
     constructor(init = {}) {
-        this.ptr = this.createPtr(init);
+        this.id = this.createPtr(init);
     }
     createPtr(init) {
         const ptr = alloc(32, "CairoRectangle", "libcairo-gobject.so.2");
@@ -17,27 +19,28 @@ export class Rectangle {
         return ptr;
     }
     get x() {
-        return read(this.ptr, { type: "float", size: 64 }, 0);
+        return read(this.id, { type: "float", size: 64 }, 0);
     }
     set x(value) {
-        write(this.ptr, { type: "float", size: 64 }, 0, value);
+        write(this.id, { type: "float", size: 64 }, 0, value);
     }
     get y() {
-        return read(this.ptr, { type: "float", size: 64 }, 8);
+        return read(this.id, { type: "float", size: 64 }, 8);
     }
     set y(value) {
-        write(this.ptr, { type: "float", size: 64 }, 8, value);
+        write(this.id, { type: "float", size: 64 }, 8, value);
     }
     get width() {
-        return read(this.ptr, { type: "float", size: 64 }, 16);
+        return read(this.id, { type: "float", size: 64 }, 16);
     }
     set width(value) {
-        write(this.ptr, { type: "float", size: 64 }, 16, value);
+        write(this.id, { type: "float", size: 64 }, 16, value);
     }
     get height() {
-        return read(this.ptr, { type: "float", size: 64 }, 24);
+        return read(this.id, { type: "float", size: 64 }, 24);
     }
     set height(value) {
-        write(this.ptr, { type: "float", size: 64 }, 24, value);
+        write(this.id, { type: "float", size: 64 }, 24, value);
     }
 }
+registerClass(Rectangle);