@gtkx/ffi 0.9.1 → 0.9.2

package/README.md

@@ -22,7 +22,7 @@ GTKX lets you build native Linux desktop applications using React and TypeScript
 ## Features
 
 - **React** — Hooks, state, props, and components you already know
-- **Hot Reload** — Edit code and see changes instantly via Vite
+- **HMR** — Edit code and see changes instantly via Vite
 - **Native** — Direct FFI bindings to GTK4 via Rust and libffi
 - **CLI** — `npx @gtkx/cli@latest create` scaffolds a ready-to-go project
 - **CSS-in-JS** — Emotion-style `css` template literals for GTK styling
@@ -41,14 +41,7 @@ Edit your code and see changes instantly—no restart needed.
 ### Example
 
 ```tsx
-import {
-  render,
-  ApplicationWindow,
-  Box,
-  Button,
-  Label,
-  quit,
-} from "@gtkx/react";
+import { render, ApplicationWindow, Box, Button, quit } from "@gtkx/react";
 import * as Gtk from "@gtkx/ffi/gtk";
 import { useState } from "react";
 
@@ -58,7 +51,7 @@ const App = () => {
   return (
     <ApplicationWindow title="Counter" onCloseRequest={quit}>
       <Box orientation={Gtk.Orientation.VERTICAL} spacing={12}>
-        <Label label={`Count: ${count}`} />
+        {`Count: ${count}`}
         <Button label="Increment" onClicked={() => setCount((c) => c + 1)} />
       </Box>
     </ApplicationWindow>
@@ -84,8 +77,6 @@ const primary = css`
 <Button label="Click me" cssClasses={[primary]} />;
 ```
 
-GTK also provides built-in classes like `suggested-action`, `destructive-action`, `card`, and `heading`.
-
 ## Testing
 
 ```tsx
@@ -109,9 +100,8 @@ test("increments count", async () => {
 
 ## Requirements
 
-- Node.js 20+
+- Node.js 20+ (Deno support experimental)
 - GTK4 Runtime (`gtk4` on Fedora, `libgtk-4-1` on Ubuntu)
-- Linux
 
 ## Contributing
 

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

@@ -1,24 +1,11 @@
 import type { GirNamespace, TypeRegistry } from "@gtkx/gir";
-/**
- * Configuration options for the FFI code generator.
- */
 type GeneratorOptions = {
-    /** Output directory for generated files. */
     outputDir: string;
-    /** The namespace being generated (e.g., "Gtk"). */
     namespace: string;
-    /** Optional Prettier configuration for formatting output. */
     prettierConfig?: unknown;
-    /** Optional type registry for cross-namespace type resolution. */
     typeRegistry?: TypeRegistry;
-    /** All parsed namespaces for cross-namespace parent method lookup. */
     allNamespaces?: Map<string, GirNamespace>;
 };
-/**
- * Generates TypeScript FFI bindings from GIR namespace definitions.
- * Creates classes, methods, properties, and signal handlers that call
- * native GTK functions through the FFI bridge.
- */
 export declare class CodeGenerator {
     private options;
     private typeMapper;
@@ -32,7 +19,7 @@ export declare class CodeGenerator {
     private usesAlloc;
     private usesNativeError;
     private usesNativeObject;
-    private usesGetObject;
+    private usesGetNativeObject;
     private usesRegisterNativeClass;
     private usesGetClassByTypeName;
     private usesSignalMeta;
@@ -47,16 +34,10 @@ export declare class CodeGenerator {
     private currentSharedLibrary;
     private cyclicReturnTypes;
     private methodRenames;
-    /**
-     * Creates a new code generator with the given options.
-     * @param options - Generator configuration
-     */
     constructor(options: GeneratorOptions);
-    /**
-     * Generates TypeScript files for all types in a GIR namespace.
-     * @param namespace - The parsed GIR namespace
-     * @returns Map of filename to generated TypeScript code
-     */
+    private sanitizeDoc;
+    private formatDoc;
+    private formatMethodDoc;
     generateNamespace(namespace: GirNamespace): Promise<Map<string, string>>;
     private registerEnumsAndBitfields;
     private registerRecords;
@@ -123,13 +104,6 @@ export declare class CodeGenerator {
     private generateImports;
     private formatCode;
     private generateCyclicTypeReturn;
-    /**
-     * Adds a catch-all signal handler overload for unknown signal types.
-     *
-     * Uses `any` because TypeScript overload resolution requires the catch-all
-     * signature to be compatible with all typed overloads. Using `unknown` would
-     * prevent passing typed handlers to this overload.
-     */
     private addSignalCatchAllOverload;
 }
 export {};

package/dist/codegen/ffi-generator.js

@@ -1,4 +1,4 @@
-import { TypeMapper, toCamelCase, toPascalCase } from "@gtkx/gir";
+import { formatDoc as formatDocBase, formatMethodDoc as formatMethodDocBase, sanitizeDoc as sanitizeDocBase, TypeMapper, toCamelCase, toPascalCase, } from "@gtkx/gir";
 import { format } from "prettier";
 const RESERVED_WORDS = new Set([
     "break",
@@ -72,55 +72,6 @@ const toKebabCase = (str) => str
     .replace(/_/g, "-")
     .toLowerCase();
 const toConstantCase = (str) => str.replace(/-/g, "_").toUpperCase();
-const sanitizeDoc = (doc) => {
-    let result = doc;
-    result = result.replace(/<picture>[\s\S]*?<\/picture>/gi, "");
-    result = result.replace(/<img[^>]*>/gi, "");
-    result = result.replace(/<source[^>]*>/gi, "");
-    result = result.replace(/!\[[^\]]*\]\([^)]+\.png\)/gi, "");
-    result = result.replace(/<kbd>([^<]*)<\/kbd>/gi, "`$1`");
-    result = result.replace(/<kbd>/gi, "`");
-    result = result.replace(/<\/kbd>/gi, "`");
-    result = result.replace(/\[([^\]]+)\]\([^)]+\.html[^)]*\)/gi, "$1");
-    result = result.replace(/@(\w+)\s/g, "`$1` ");
-    return result.trim();
-};
-const formatDoc = (doc, indent = "") => {
-    if (!doc)
-        return "";
-    const sanitized = sanitizeDoc(doc);
-    if (!sanitized)
-        return "";
-    const lines = sanitized.split("\n").map((line) => line.trim());
-    const firstLine = lines[0] ?? "";
-    if (lines.length === 1 && firstLine.length < 80) {
-        return `${indent}/** ${firstLine} */\n`;
-    }
-    const formattedLines = lines.map((line) => `${indent} * ${line}`);
-    return `${indent}/**\n${formattedLines.join("\n")}\n${indent} */\n`;
-};
-const formatMethodDoc = (doc, params, indent = "  ") => {
-    const sanitizedDoc = doc ? sanitizeDoc(doc) : undefined;
-    if (!sanitizedDoc && params.every((p) => !p.doc))
-        return "";
-    const lines = [];
-    if (sanitizedDoc) {
-        for (const line of sanitizedDoc.split("\n")) {
-            lines.push(` * ${line.trim()}`);
-        }
-    }
-    for (const param of params) {
-        if (param.doc && param.name && param.name !== "..." && param.name !== "") {
-            const paramName = toValidIdentifier(toCamelCase(param.name));
-            const sanitizedParamDoc = sanitizeDoc(param.doc);
-            const paramDoc = sanitizedParamDoc.split("\n")[0]?.trim() ?? "";
-            lines.push(` * @param ${paramName} - ${paramDoc}`);
-        }
-    }
-    if (lines.length === 0)
-        return "";
-    return `${indent}/**\n${indent}${lines.join(`\n${indent}`)}\n${indent} */\n`;
-};
 const toValidIdentifier = (str) => {
     let result = str.replace(/[^a-zA-Z0-9_$]/g, "_");
     if (RESERVED_WORDS.has(result))
@@ -190,11 +141,6 @@ const isVararg = (param) => param.name === "..." || param.name === "";
 const hasUnsupportedCallbacks = (params, typeMapper) => {
     return params.some((p) => typeMapper.hasUnsupportedCallback(p));
 };
-/**
- * Generates TypeScript FFI bindings from GIR namespace definitions.
- * Creates classes, methods, properties, and signal handlers that call
- * native GTK functions through the FFI bridge.
- */
 export class CodeGenerator {
     options;
     typeMapper;
@@ -208,7 +154,7 @@ export class CodeGenerator {
     usesAlloc = false;
     usesNativeError = false;
     usesNativeObject = false;
-    usesGetObject = false;
+    usesGetNativeObject = false;
     usesRegisterNativeClass = false;
     usesGetClassByTypeName = false;
     usesSignalMeta = false;
@@ -223,10 +169,6 @@ export class CodeGenerator {
     currentSharedLibrary = "";
     cyclicReturnTypes = new Set();
     methodRenames = new Map();
-    /**
-     * Creates a new code generator with the given options.
-     * @param options - Generator configuration
-     */
     constructor(options) {
         this.options = options;
         this.typeMapper = new TypeMapper();
@@ -234,11 +176,21 @@ export class CodeGenerator {
             this.typeMapper.setTypeRegistry(options.typeRegistry, options.namespace);
         }
     }
-    /**
-     * Generates TypeScript files for all types in a GIR namespace.
-     * @param namespace - The parsed GIR namespace
-     * @returns Map of filename to generated TypeScript code
-     */
+    sanitizeDoc(doc) {
+        return sanitizeDocBase(doc, { namespace: this.options.namespace });
+    }
+    formatDoc(doc, indent = "") {
+        return formatDocBase(doc, indent, { namespace: this.options.namespace });
+    }
+    formatMethodDoc(doc, params, indent = "  ") {
+        const formattedParams = params
+            .filter((p) => p.doc && p.name && p.name !== "..." && p.name !== "")
+            .map((p) => ({
+            name: toValidIdentifier(toCamelCase(p.name)),
+            doc: p.doc,
+        }));
+        return formatMethodDocBase(doc, formattedParams, indent, { namespace: this.options.namespace });
+    }
     async generateNamespace(namespace) {
         const files = new Map();
         this.currentSharedLibrary = namespace.sharedLibrary;
@@ -344,7 +296,7 @@ export class CodeGenerator {
         this.usesAlloc = false;
         this.usesNativeError = false;
         this.usesNativeObject = false;
-        this.usesGetObject = false;
+        this.usesGetNativeObject = false;
         this.usesRegisterNativeClass = false;
         this.usesGetClassByTypeName = false;
         this.usesSignalMeta = false;
@@ -454,7 +406,7 @@ export class CodeGenerator {
         }
         sections.push("");
         if (cls.doc) {
-            sections.push(formatDoc(cls.doc));
+            sections.push(this.formatDoc(cls.doc));
         }
         sections.push(`export class ${className}${parentInfo.extendsClause}${implementsClause} {`);
         if (cls.glibTypeName) {
@@ -691,7 +643,7 @@ export class CodeGenerator {
     }
     generateConstructorWithFlag(ctor, sharedLibrary) {
         this.usesInstantiating = true;
-        const ctorDoc = formatMethodDoc(ctor.doc, ctor.parameters);
+        const ctorDoc = this.formatMethodDoc(ctor.doc, ctor.parameters);
         const params = this.generateParameterList(ctor.parameters);
         const args = this.generateCallArguments(ctor.parameters);
         const docComment = ctorDoc ? `${ctorDoc.trimEnd()}\n` : "";
@@ -757,11 +709,11 @@ ${args ? `${args},` : ""}
         }
         const params = this.generateParameterList(ctor.parameters);
         const args = this.generateCallArguments(ctor.parameters);
-        const ctorDoc = formatMethodDoc(ctor.doc, ctor.parameters);
+        const ctorDoc = this.formatMethodDoc(ctor.doc, ctor.parameters);
         const borrowed = ctor.returnType.transferOwnership !== "full";
         const errorArg = ctor.throws ? this.generateErrorArgument() : "";
         const allArgs = errorArg ? args + (args ? ",\n" : "") + errorArg : args;
-        this.usesGetObject = true;
+        this.usesGetNativeObject = true;
         const lines = [];
         lines.push(`${ctorDoc}  static ${methodName}(${params}): ${className} {`);
         if (ctor.throws) {
@@ -778,7 +730,7 @@ ${allArgs}
         if (ctor.throws) {
             lines.push(this.generateErrorCheck());
         }
-        lines.push(`    return getObject(ptr) as ${className};`);
+        lines.push(`    return getNativeObject(ptr) as ${className};`);
         lines.push(`  }`);
         return `${lines.join("\n")}\n`;
     }
@@ -803,7 +755,7 @@ ${allArgs}
         const hasReturnValue = rawReturnType !== "void";
         const gtkAllocatesRefs = this.identifyGtkAllocatesRefs(func.parameters);
         const lines = [];
-        const funcDoc = formatMethodDoc(func.doc, func.parameters);
+        const funcDoc = this.formatMethodDoc(func.doc, func.parameters);
         if (funcDoc) {
             lines.push(funcDoc.trimEnd());
         }
@@ -815,7 +767,7 @@ ${allArgs}
         const errorArg = func.throws ? this.generateErrorArgument() : "";
         const allArgs = errorArg ? args + (args ? ",\n" : "") + errorArg : args;
         if (returnsOwnClass) {
-            this.usesGetObject = true;
+            this.usesGetNativeObject = true;
             lines.push(`    const ptr = call(
       "${sharedLibrary}",
       "${func.cIdentifier}",
@@ -828,7 +780,7 @@ ${allArgs ? `${allArgs},` : ""}
                 lines.push(this.generateErrorCheck());
             }
             lines.push(...this.generateRefRewrapCode(gtkAllocatesRefs));
-            lines.push(`    return getObject(ptr) as ${className};`);
+            lines.push(`    return getNativeObject(ptr) as ${className};`);
         }
         else {
             const hasRefRewrap = gtkAllocatesRefs.length > 0;
@@ -943,7 +895,7 @@ ${allArgs ? `${allArgs},` : ""}
         lines.push(`  /**`);
         lines.push(`   * Promise-based version of ${methodName}.`);
         if (method.doc) {
-            const docLines = sanitizeDoc(method.doc).split("\n").slice(0, 3);
+            const docLines = this.sanitizeDoc(method.doc).split("\n").slice(0, 3);
             for (const line of docLines) {
                 lines.push(`   * ${line.trim()}`);
             }
@@ -1047,18 +999,18 @@ ${allArgs ? `${allArgs},` : ""}
         if (outputParams.length === 0) {
             if (hasMainReturn) {
                 if (needsBoxedWrap || needsInterfaceWrap) {
-                    this.usesGetObject = true;
+                    this.usesGetNativeObject = true;
                     if (isNullable) {
                         lines.push(`          if (ptr === null) { resolve(null); return; }`);
                     }
-                    lines.push(`          resolve(getObject(ptr, ${finishReturnType.ts})!);`);
+                    lines.push(`          resolve(getNativeObject(ptr, ${finishReturnType.ts})!);`);
                 }
                 else if (needsGObjectWrap) {
-                    this.usesGetObject = true;
+                    this.usesGetNativeObject = true;
                     if (isNullable) {
                         lines.push(`          if (ptr === null) { resolve(null); return; }`);
                     }
-                    lines.push(`          resolve(getObject(ptr) as ${finishReturnType.ts});`);
+                    lines.push(`          resolve(getNativeObject(ptr) as ${finishReturnType.ts});`);
                 }
                 else {
                     lines.push(`          resolve(result);`);
@@ -1072,21 +1024,21 @@ ${allArgs ? `${allArgs},` : ""}
             const resolveFields = [];
             if (hasMainReturn) {
                 if (needsBoxedWrap || needsInterfaceWrap) {
-                    this.usesGetObject = true;
+                    this.usesGetNativeObject = true;
                     if (isNullable) {
-                        lines.push(`          const result = ptr === null ? null : getObject(ptr, ${finishReturnType.ts})!;`);
+                        lines.push(`          const result = ptr === null ? null : getNativeObject(ptr, ${finishReturnType.ts})!;`);
                     }
                     else {
-                        lines.push(`          const result = getObject(ptr, ${finishReturnType.ts})!;`);
+                        lines.push(`          const result = getNativeObject(ptr, ${finishReturnType.ts})!;`);
                     }
                 }
                 else if (needsGObjectWrap) {
-                    this.usesGetObject = true;
+                    this.usesGetNativeObject = true;
                     if (isNullable) {
-                        lines.push(`          const result = (ptr === null ? null : getObject(ptr)) as ${finishReturnType.ts} | null;`);
+                        lines.push(`          const result = (ptr === null ? null : getNativeObject(ptr)) as ${finishReturnType.ts} | null;`);
                     }
                     else {
-                        lines.push(`          const result = getObject(ptr) as ${finishReturnType.ts};`);
+                        lines.push(`          const result = getNativeObject(ptr) as ${finishReturnType.ts};`);
                     }
                 }
                 resolveFields.push("result");
@@ -1176,7 +1128,7 @@ ${allArgs ? `${allArgs},` : ""}
             ? `{ type: "boxed", borrowed: true, innerType: "${className}", lib: "${sharedLibrary}" }`
             : `{ type: "gobject" }`;
         const lines = [];
-        const methodDoc = formatMethodDoc(method.doc, method.parameters);
+        const methodDoc = this.formatMethodDoc(method.doc, method.parameters);
         if (methodDoc) {
             lines.push(methodDoc.trimEnd());
         }
@@ -1212,17 +1164,17 @@ ${allArgs ? `${allArgs},` : ""}
                 lines.push(this.generateCyclicTypeReturn(baseReturnType));
             }
             else if (needsBoxedWrap || needsInterfaceWrap) {
-                this.usesGetObject = true;
-                lines.push(`    return getObject(ptr, ${baseReturnType})!;`);
+                this.usesGetNativeObject = true;
+                lines.push(`    return getNativeObject(ptr, ${baseReturnType})!;`);
             }
             else {
-                this.usesGetObject = true;
-                lines.push(`    return getObject(ptr) as ${baseReturnType};`);
+                this.usesGetNativeObject = true;
+                lines.push(`    return getNativeObject(ptr) as ${baseReturnType};`);
             }
         }
         else if (needsArrayWrap && hasReturnValue) {
             const elementType = baseReturnType.slice(0, -2);
-            this.usesGetObject = true;
+            this.usesGetNativeObject = true;
             lines.push(`    const ptrs = call(
       "${sharedLibrary}",
       "${method.cIdentifier}",
@@ -1239,7 +1191,7 @@ ${allArgs ? `${allArgs},` : ""}
                 lines.push(this.generateErrorCheck());
             }
             lines.push(...this.generateRefRewrapCode(gtkAllocatesRefs));
-            lines.push(`    return ptrs.map(ptr => getObject(ptr) as ${elementType});`);
+            lines.push(`    return ptrs.map(ptr => getNativeObject(ptr) as ${elementType});`);
         }
         else {
             const hasRefRewrap = gtkAllocatesRefs.length > 0;
@@ -1374,7 +1326,7 @@ ${allArgs ? `${allArgs},` : ""}
         }
         this.addSignalCatchAllOverload(signalOverloads, methodName);
         this.usesType = true;
-        this.usesGetObject = true;
+        this.usesGetNativeObject = true;
         if (signalMetadata.length > 0) {
             this.usesSignalMeta = true;
         }
@@ -1392,24 +1344,24 @@ ${allArgs ? `${allArgs},` : ""}
             ? `
         if (m.type === "boxed" && signalArgs[i] != null) {
           const cls = getNativeClass(m.innerType);
-          return cls ? getObject(signalArgs[i], cls) : signalArgs[i];
+          return cls ? getNativeObject(signalArgs[i], cls) : signalArgs[i];
         }`
             : "";
         const wrapperCode = signalMetadata.length > 0
             ? `const wrappedHandler = (...args: unknown[]) => {
-      const self = getObject(args[0]);
+      const self = getNativeObject(args[0]);
       const signalArgs = args.slice(1);
       if (!meta) return handler(self, ...signalArgs);
       const wrapped = meta.params.map((m, i) => {
         if (m.type === "gobject" && signalArgs[i] != null) {
-          return getObject(signalArgs[i]);
+          return getNativeObject(signalArgs[i]);
         }${boxedHandling}
         return signalArgs[i];
       });
       return handler(self, ...wrapped);
     };`
             : `const wrappedHandler = (...args: unknown[]) => {
-      const self = getObject(args[0]);
+      const self = getNativeObject(args[0]);
       return handler(self, ...args.slice(1));
     };`;
         const overloadsSection = signalOverloads.length > 0 ? `${signalOverloads.join("\n")}\n` : "";
@@ -1442,7 +1394,7 @@ ${allArgs ? `${allArgs},` : ""}
         this.usesCall = iface.methods.length > 0;
         this.usesRef = iface.methods.some((m) => hasRefParameter(m.parameters, this.typeMapper));
         if (iface.doc) {
-            sections.push(formatDoc(iface.doc));
+            sections.push(this.formatDoc(iface.doc));
         }
         this.usesNativeObject = true;
         sections.push(`export class ${interfaceName} extends NativeObject {`);
@@ -1475,7 +1427,7 @@ ${allArgs ? `${allArgs},` : ""}
             sections.push(initInterface);
         }
         if (record.doc) {
-            sections.push(formatDoc(record.doc));
+            sections.push(this.formatDoc(record.doc));
         }
         this.usesNativeObject = true;
         sections.push(`export class ${recordName} extends NativeObject {`);
@@ -1513,7 +1465,7 @@ ${allArgs ? `${allArgs},` : ""}
         const supportedConstructors = record.constructors.filter((c) => !hasUnsupportedCallbacks(c.parameters, this.typeMapper));
         const mainConstructor = supportedConstructors.find((c) => !c.parameters.some(isVararg));
         if (mainConstructor) {
-            const ctorDoc = formatMethodDoc(mainConstructor.doc, mainConstructor.parameters);
+            const ctorDoc = this.formatMethodDoc(mainConstructor.doc, mainConstructor.parameters);
             const filteredParams = mainConstructor.parameters.filter((p) => !isVararg(p));
             if (filteredParams.length === 0) {
                 sections.push(`${ctorDoc}  constructor() {\n    super();\n    this.id = this.createPtr([]);\n  }\n`);
@@ -1669,8 +1621,8 @@ ${args}
         }
         const params = this.generateParameterList(ctor.parameters);
         const args = this.generateCallArguments(ctor.parameters);
-        const ctorDoc = formatMethodDoc(ctor.doc, ctor.parameters);
-        this.usesGetObject = true;
+        const ctorDoc = this.formatMethodDoc(ctor.doc, ctor.parameters);
+        this.usesGetNativeObject = true;
         return `${ctorDoc}  static ${methodName}(${params}): ${recordName} {
     const ptr = call(
       "${sharedLibrary}",
@@ -1680,7 +1632,7 @@ ${args}
       ],
       { type: "boxed", borrowed: true, innerType: "${recordName}" }
     );
-    return getObject(ptr) as ${recordName};
+    return getNativeObject(ptr) as ${recordName};
   }
 `;
     }
@@ -1716,7 +1668,7 @@ ${args}
                 fieldName = "id_";
             const typeMapping = this.typeMapper.mapType(field.type);
             if (field.doc) {
-                sections.push(formatDoc(field.doc, "  ").trimEnd());
+                sections.push(this.formatDoc(field.doc, "  ").trimEnd());
             }
             if (isReadable) {
                 sections.push(`  get ${fieldName}(): ${typeMapping.ts} {
@@ -1835,7 +1787,7 @@ ${args}
         const hasReturnValue = returnTypeMapping.ts !== "void";
         const gtkAllocatesRefs = this.identifyGtkAllocatesRefs(func.parameters);
         const lines = [];
-        const funcDoc = formatMethodDoc(func.doc, func.parameters, "");
+        const funcDoc = this.formatMethodDoc(func.doc, func.parameters, "");
         if (funcDoc) {
             lines.push(funcDoc.trimEnd());
         }
@@ -1859,12 +1811,12 @@ ${allArgs ? `${allArgs},` : ""}
                 lines.push(`  if (ptr === null) return null;`);
             }
             if (needsBoxedWrap || needsInterfaceWrap) {
-                this.usesGetObject = true;
-                lines.push(`  return getObject(ptr, ${baseReturnType})!;`);
+                this.usesGetNativeObject = true;
+                lines.push(`  return getNativeObject(ptr, ${baseReturnType})!;`);
             }
             else {
-                this.usesGetObject = true;
-                lines.push(`  return getObject(ptr) as ${baseReturnType};`);
+                this.usesGetNativeObject = true;
+                lines.push(`  return getNativeObject(ptr) as ${baseReturnType};`);
             }
         }
         else {
@@ -1899,10 +1851,10 @@ ${allArgs ? `${allArgs},` : ""}
                 let memberName = toConstantCase(member.name);
                 if (/^\d/.test(memberName))
                     memberName = `_${memberName}`;
-                const memberDoc = member.doc ? `${formatDoc(member.doc, "  ").trimEnd()}\n` : "";
+                const memberDoc = member.doc ? `${this.formatDoc(member.doc, "  ").trimEnd()}\n` : "";
                 return `${memberDoc}  ${memberName} = ${member.value},`;
             });
-            const enumDoc = enumeration.doc ? formatDoc(enumeration.doc) : "";
+            const enumDoc = enumeration.doc ? this.formatDoc(enumeration.doc) : "";
             return `${enumDoc}export enum ${enumName} {\n${members.join("\n")}\n}`;
         });
         return this.formatCode(`${sections.join("\n\n")}\n`);
@@ -1918,7 +1870,7 @@ ${allArgs ? `${allArgs},` : ""}
             seen.add(constName);
             const isStringType = constant.type.name === "utf8" || constant.type.name === "filename";
             const constValue = isStringType ? `"${constant.value}"` : constant.value;
-            const constDoc = constant.doc ? formatDoc(constant.doc) : "";
+            const constDoc = constant.doc ? this.formatDoc(constant.doc) : "";
             sections.push(`${constDoc}export const ${constName} = ${constValue};`);
         }
         return this.formatCode(`${sections.join("\n\n")}\n`);
@@ -1988,15 +1940,15 @@ ${allArgs ? `${allArgs},` : ""}
         }
         return gtkAllocatesRefs.map((ref) => {
             if (ref.isBoxed) {
-                this.usesGetObject = true;
+                this.usesGetNativeObject = true;
                 return ref.nullable
-                    ? `    if (${ref.paramName}) ${ref.paramName}.value = getObject(${ref.paramName}.value, ${ref.innerType})!;`
-                    : `    ${ref.paramName}.value = getObject(${ref.paramName}.value, ${ref.innerType})!;`;
+                    ? `    if (${ref.paramName}) ${ref.paramName}.value = getNativeObject(${ref.paramName}.value, ${ref.innerType})!;`
+                    : `    ${ref.paramName}.value = getNativeObject(${ref.paramName}.value, ${ref.innerType})!;`;
             }
-            this.usesGetObject = true;
+            this.usesGetNativeObject = true;
             return ref.nullable
-                ? `    if (${ref.paramName}) ${ref.paramName}.value = getObject(${ref.paramName}.value)! as ${ref.innerType};`
-                : `    ${ref.paramName}.value = getObject(${ref.paramName}.value)! as ${ref.innerType};`;
+                ? `    if (${ref.paramName}) ${ref.paramName}.value = getNativeObject(${ref.paramName}.value)! as ${ref.innerType};`
+                : `    ${ref.paramName}.value = getNativeObject(${ref.paramName}.value)! as ${ref.innerType};`;
         });
     }
     generateErrorArgument(indent = "      ") {
@@ -2087,8 +2039,8 @@ ${indent}  }`;
         if (this.usesNativeError) {
             lines.push(`import { NativeError } from "../../native/error.js";`);
         }
-        if (this.usesGetObject) {
-            lines.push(`import { getObject } from "../../native/object.js";`);
+        if (this.usesGetNativeObject) {
+            lines.push(`import { getNativeObject } from "../../native/object.js";`);
         }
         const baseImports = [];
         if (this.usesInstantiating)
@@ -2190,13 +2142,6 @@ ${indent}  }`;
     generateCyclicTypeReturn(baseReturnType) {
         return `    return { id: ptr } as unknown as ${baseReturnType};`;
     }
-    /**
-     * Adds a catch-all signal handler overload for unknown signal types.
-     *
-     * Uses `any` because TypeScript overload resolution requires the catch-all
-     * signature to be compatible with all typed overloads. Using `unknown` would
-     * prevent passing typed handlers to this overload.
-     */
     addSignalCatchAllOverload(signalOverloads, methodName) {
         signalOverloads.push(`  ${methodName}(signal: string, handler: (...args: any[]) => any, after?: boolean): number;`);
     }