@gtkx/ffi 0.9.0 → 0.9.1

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

@@ -31,10 +31,10 @@ export declare class CodeGenerator {
     private usesWrite;
     private usesAlloc;
     private usesNativeError;
+    private usesNativeObject;
     private usesGetObject;
-    private usesGetBoxed;
-    private usesGetInterface;
-    private usesRegisterType;
+    private usesRegisterNativeClass;
+    private usesGetClassByTypeName;
     private usesSignalMeta;
     private usedEnums;
     private usedRecords;

package/dist/codegen/ffi-generator.js

@@ -141,7 +141,7 @@ const normalizeClassName = (name, namespace) => {
 };
 const parseParentReference = (parent, classMap, currentNamespace) => {
     if (!parent) {
-        return { hasParent: false, isCrossNamespace: false, className: "", extendsClause: "" };
+        return { hasParent: false, isCrossNamespace: false, className: "", extendsClause: " extends NativeObject" };
     }
     if (parent.includes(".")) {
         const [ns, className] = parent.split(".", 2);
@@ -207,10 +207,10 @@ export class CodeGenerator {
     usesWrite = false;
     usesAlloc = false;
     usesNativeError = false;
+    usesNativeObject = false;
     usesGetObject = false;
-    usesGetBoxed = false;
-    usesGetInterface = false;
-    usesRegisterType = false;
+    usesRegisterNativeClass = false;
+    usesGetClassByTypeName = false;
     usesSignalMeta = false;
     usedEnums = new Set();
     usedRecords = new Set();
@@ -343,10 +343,10 @@ export class CodeGenerator {
         this.usesWrite = false;
         this.usesAlloc = false;
         this.usesNativeError = false;
+        this.usesNativeObject = false;
         this.usesGetObject = false;
-        this.usesGetBoxed = false;
-        this.usesGetInterface = false;
-        this.usesRegisterType = false;
+        this.usesRegisterNativeClass = false;
+        this.usesGetClassByTypeName = false;
         this.usesSignalMeta = false;
         this.usedEnums.clear();
         this.usedRecords.clear();
@@ -459,10 +459,11 @@ export class CodeGenerator {
         sections.push(`export class ${className}${parentInfo.extendsClause}${implementsClause} {`);
         if (cls.glibTypeName) {
             const override = parentInfo.hasParent ? "override " : "";
-            sections.push(`  static ${override}readonly glibTypeName: string = "${cls.glibTypeName}";\n`);
+            sections.push(`  static ${override}readonly glibTypeName: string = "${cls.glibTypeName}";`);
+            sections.push(`  static ${override}readonly objectType = "gobject" as const;\n`);
         }
         if (!parentInfo.hasParent) {
-            sections.push(`  id: unknown;\n`);
+            this.usesNativeObject = true;
         }
         sections.push(this.generateConstructors(cls, sharedLibrary, parentInfo.hasParent));
         sections.push(this.generateStaticFunctions(cls.functions, sharedLibrary, className));
@@ -479,8 +480,8 @@ export class CodeGenerator {
         }
         sections.push("}");
         if (cls.glibTypeName) {
-            this.usesRegisterType = true;
-            sections.push(`\nregisterType(${className});`);
+            this.usesRegisterNativeClass = true;
+            sections.push(`\nregisterNativeClass(${className});`);
         }
         if (signalMetaConstant) {
             const classDefIndex = sections.findIndex((s) => s.startsWith("export class "));
@@ -682,7 +683,7 @@ export class CodeGenerator {
                 sections.push(`  constructor() {\n    super();\n  }\n`);
             }
             else {
-                sections.push(`  constructor() {\n    this.create();\n  }\n`);
+                sections.push(`  constructor() {\n    super();\n    this.create();\n  }\n`);
                 sections.push(`  protected create() {}\n`);
             }
         }
@@ -1045,19 +1046,12 @@ ${allArgs ? `${allArgs},` : ""}
         }
         if (outputParams.length === 0) {
             if (hasMainReturn) {
-                if (needsBoxedWrap) {
-                    this.usesGetBoxed = true;
-                    if (isNullable) {
-                        lines.push(`          if (ptr === null) { resolve(null); return; }`);
-                    }
-                    lines.push(`          resolve(getBoxed(ptr, ${finishReturnType.ts}));`);
-                }
-                else if (needsInterfaceWrap) {
-                    this.usesGetInterface = true;
+                if (needsBoxedWrap || needsInterfaceWrap) {
+                    this.usesGetObject = true;
                     if (isNullable) {
                         lines.push(`          if (ptr === null) { resolve(null); return; }`);
                     }
-                    lines.push(`          resolve(getInterface(ptr, ${finishReturnType.ts})!);`);
+                    lines.push(`          resolve(getObject(ptr, ${finishReturnType.ts})!);`);
                 }
                 else if (needsGObjectWrap) {
                     this.usesGetObject = true;
@@ -1077,22 +1071,13 @@ ${allArgs ? `${allArgs},` : ""}
         else {
             const resolveFields = [];
             if (hasMainReturn) {
-                if (needsBoxedWrap) {
-                    this.usesGetBoxed = true;
-                    if (isNullable) {
-                        lines.push(`          const result = ptr === null ? null : getBoxed(ptr, ${finishReturnType.ts});`);
-                    }
-                    else {
-                        lines.push(`          const result = getBoxed(ptr, ${finishReturnType.ts});`);
-                    }
-                }
-                else if (needsInterfaceWrap) {
-                    this.usesGetInterface = true;
+                if (needsBoxedWrap || needsInterfaceWrap) {
+                    this.usesGetObject = true;
                     if (isNullable) {
-                        lines.push(`          const result = ptr === null ? null : getInterface(ptr, ${finishReturnType.ts});`);
+                        lines.push(`          const result = ptr === null ? null : getObject(ptr, ${finishReturnType.ts})!;`);
                     }
                     else {
-                        lines.push(`          const result = getInterface(ptr, ${finishReturnType.ts})!;`);
+                        lines.push(`          const result = getObject(ptr, ${finishReturnType.ts})!;`);
                     }
                 }
                 else if (needsGObjectWrap) {
@@ -1226,13 +1211,9 @@ ${allArgs ? `${allArgs},` : ""}
             if (isCyclic) {
                 lines.push(this.generateCyclicTypeReturn(baseReturnType));
             }
-            else if (needsBoxedWrap) {
-                this.usesGetBoxed = true;
-                lines.push(`    return getBoxed(ptr, ${baseReturnType});`);
-            }
-            else if (needsInterfaceWrap) {
-                this.usesGetInterface = true;
-                lines.push(`    return getInterface(ptr, ${baseReturnType})!;`);
+            else if (needsBoxedWrap || needsInterfaceWrap) {
+                this.usesGetObject = true;
+                lines.push(`    return getObject(ptr, ${baseReturnType})!;`);
             }
             else {
                 this.usesGetObject = true;
@@ -1328,29 +1309,14 @@ ${allArgs ? `${allArgs},` : ""}
         this.typeMapper.setRecordUsageCallback(null);
         this.typeMapper.setExternalTypeUsageCallback(null);
         this.typeMapper.setSameNamespaceClassUsageCallback(null);
+        let hasBoxedSignalParams = false;
         const signalMetadata = signals.map((signal) => {
             const paramEntries = (signal.parameters ?? []).map((param) => {
-                const ffiType = JSON.stringify(this.typeMapper.mapParameter(param).ffi);
-                const signalParamClass = this.extractSignalParamClass(param, classMap);
-                if (signalParamClass) {
-                    const { transformedName, originalName } = signalParamClass;
-                    const dotIndex = transformedName.indexOf(".");
-                    if (dotIndex !== -1) {
-                        const ns = transformedName.slice(0, dotIndex);
-                        const clsName = transformedName.slice(dotIndex + 1);
-                        this.usedExternalTypes.set(transformedName, {
-                            namespace: ns,
-                            name: originalName,
-                            transformedName: clsName,
-                            kind: "class",
-                        });
-                    }
-                    else {
-                        this.signalClasses.set(transformedName, originalName);
-                    }
-                    return `{ type: ${ffiType}, getCls: () => ${transformedName} }`;
+                const ffiType = this.typeMapper.mapParameter(param).ffi;
+                if (ffiType.type === "boxed") {
+                    hasBoxedSignalParams = true;
                 }
-                return `{ type: ${ffiType} }`;
+                return JSON.stringify(ffiType);
             });
             const returnTypeFfi = signal.returnType
                 ? JSON.stringify(this.typeMapper.mapType(signal.returnType).ffi)
@@ -1373,6 +1339,23 @@ ${allArgs ? `${allArgs},` : ""}
             for (const param of signalParams) {
                 const paramName = toValidIdentifier(toCamelCase(param.name));
                 const signalParamClass = this.extractSignalParamClass(param, classMap);
+                if (signalParamClass) {
+                    const { transformedName, originalName } = signalParamClass;
+                    const dotIndex = transformedName.indexOf(".");
+                    if (dotIndex !== -1) {
+                        const ns = transformedName.slice(0, dotIndex);
+                        const clsName = transformedName.slice(dotIndex + 1);
+                        this.usedExternalTypes.set(transformedName, {
+                            namespace: ns,
+                            name: originalName,
+                            transformedName: clsName,
+                            kind: "class",
+                        });
+                    }
+                    else {
+                        this.signalClasses.set(transformedName, originalName);
+                    }
+                }
                 const paramType = signalParamClass?.transformedName ?? this.typeMapper.mapType(param.type).ts;
                 handlerParams.push(`${paramName}: ${paramType}`);
             }
@@ -1395,22 +1378,32 @@ ${allArgs ? `${allArgs},` : ""}
         if (signalMetadata.length > 0) {
             this.usesSignalMeta = true;
         }
+        if (hasBoxedSignalParams) {
+            this.usesGetClassByTypeName = true;
+        }
         const moduleLevel = signalMetadata.length > 0 ? `const SIGNAL_META: SignalMeta = {\n${signalMetadata.join(",\n")}\n};\n` : "";
         const signalMapCode = signalMetadata.length > 0
             ? `const meta = SIGNAL_META[signal];
     const selfType: Type = { type: "gobject", borrowed: true };
-    const argTypes = meta ? [selfType, ...meta.params.map((m) => m.type)] : [selfType];
+    const argTypes = meta ? [selfType, ...meta.params] : [selfType];
     const returnType = meta?.returnType;`
             : `const selfType: Type = { type: "gobject", borrowed: true };\n    const argTypes = [selfType];\n    const returnType = undefined;`;
+        const boxedHandling = hasBoxedSignalParams
+            ? `
+        if (m.type === "boxed" && signalArgs[i] != null) {
+          const cls = getNativeClass(m.innerType);
+          return cls ? getObject(signalArgs[i], cls) : signalArgs[i];
+        }`
+            : "";
         const wrapperCode = signalMetadata.length > 0
             ? `const wrappedHandler = (...args: unknown[]) => {
       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) {
+        if (m.type === "gobject" && signalArgs[i] != null) {
           return getObject(signalArgs[i]);
-        }
+        }${boxedHandling}
         return signalArgs[i];
       });
       return handler(self, ...wrapped);
@@ -1451,19 +1444,12 @@ ${allArgs ? `${allArgs},` : ""}
         if (iface.doc) {
             sections.push(formatDoc(iface.doc));
         }
-        sections.push(`export class ${interfaceName} {`);
+        this.usesNativeObject = true;
+        sections.push(`export class ${interfaceName} extends NativeObject {`);
         if (iface.glibTypeName) {
-            sections.push(`  static readonly glibTypeName: string = "${iface.glibTypeName}";\n`);
-        }
-        sections.push(`  id: unknown;`);
-        sections.push(``);
-        sections.push(`  protected constructor(id: unknown) {`);
-        sections.push(`    this.id = id;`);
-        sections.push(`  }`);
-        sections.push(``);
-        sections.push(`  static fromPtr(id: unknown): ${interfaceName} {`);
-        sections.push(`    return new ${interfaceName}(id);`);
-        sections.push(`  }`);
+            sections.push(`  static readonly glibTypeName: string = "${iface.glibTypeName}";`);
+            sections.push(`  static readonly objectType = "interface" as const;\n`);
+        }
         if (iface.methods.length > 0) {
             sections.push(this.generateMethods(iface.methods, sharedLibrary, interfaceName));
         }
@@ -1491,11 +1477,12 @@ ${allArgs ? `${allArgs},` : ""}
         if (record.doc) {
             sections.push(formatDoc(record.doc));
         }
-        sections.push(`export class ${recordName} {`);
+        this.usesNativeObject = true;
+        sections.push(`export class ${recordName} extends NativeObject {`);
         if (record.glibTypeName) {
-            sections.push(`  static readonly glibTypeName: string = "${record.glibTypeName}";\n`);
+            sections.push(`  static readonly glibTypeName: string = "${record.glibTypeName}";`);
+            sections.push(`  static readonly objectType = "boxed" as const;\n`);
         }
-        sections.push(`  id: unknown;\n`);
         sections.push(this.generateRecordConstructors(record, sharedLibrary));
         sections.push(this.generateRecordFromPtr(recordName));
         sections.push(this.generateRecordStaticFunctions(record.functions, sharedLibrary, recordName));
@@ -1503,8 +1490,8 @@ ${allArgs ? `${allArgs},` : ""}
         sections.push(this.generateRecordFields(record.fields, record.methods));
         sections.push("}");
         if (record.glibTypeName) {
-            this.usesRegisterType = true;
-            sections.push(`\nregisterType(${recordName});`);
+            this.usesRegisterNativeClass = true;
+            sections.push(`\nregisterNativeClass(${recordName});`);
         }
         const imports = this.generateImports(recordName);
         return this.formatCode(imports + sections.join("\n"));
@@ -1529,7 +1516,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.id = this.createPtr([]);\n  }\n`);
+                sections.push(`${ctorDoc}  constructor() {\n    super();\n    this.id = this.createPtr([]);\n  }\n`);
             }
             else {
                 const typedParams = this.generateParameterList(mainConstructor.parameters, false);
@@ -1538,6 +1525,7 @@ ${allArgs ? `${allArgs},` : ""}
                 const isFirstParamArray = firstParamType.endsWith("[]") || firstParamType.startsWith("Array<");
                 if (isFirstParamArray) {
                     sections.push(`${ctorDoc}  constructor(${typedParams}) {
+    super();
     const _args = [${paramNames.join(", ")}];
     this.id = this.createPtr(_args);
   }
@@ -1547,6 +1535,7 @@ ${allArgs ? `${allArgs},` : ""}
                     sections.push(`${ctorDoc}  constructor(${typedParams});
   constructor(_args: unknown[]);
   constructor(...args: unknown[]) {
+    super();
     const _args = args.length === 1 && Array.isArray(args[0]) ? args[0] : args;
     this.id = this.createPtr(_args);
   }
@@ -1562,10 +1551,10 @@ ${allArgs ? `${allArgs},` : ""}
         else {
             const initFields = this.getWritableFields(record.fields);
             if (initFields.length > 0) {
-                sections.push(`  constructor(init: ${recordName}Init = {}) {\n    this.id = this.createPtr(init);\n  }\n`);
+                sections.push(`  constructor(init: ${recordName}Init = {}) {\n    super();\n    this.id = this.createPtr(init);\n  }\n`);
             }
             else {
-                sections.push(`  constructor() {\n    this.id = this.createPtr({});\n  }\n`);
+                sections.push(`  constructor() {\n    super();\n    this.id = this.createPtr({});\n  }\n`);
             }
         }
         sections.push(this.generateRecordCreatePtr(record, sharedLibrary));
@@ -1869,13 +1858,9 @@ ${allArgs ? `${allArgs},` : ""}
             if (isNullable) {
                 lines.push(`  if (ptr === null) return null;`);
             }
-            if (needsBoxedWrap) {
-                this.usesGetBoxed = true;
-                lines.push(`  return getBoxed(ptr, ${baseReturnType});`);
-            }
-            else if (needsInterfaceWrap) {
-                this.usesGetInterface = true;
-                lines.push(`  return getInterface(ptr, ${baseReturnType})!;`);
+            if (needsBoxedWrap || needsInterfaceWrap) {
+                this.usesGetObject = true;
+                lines.push(`  return getObject(ptr, ${baseReturnType})!;`);
             }
             else {
                 this.usesGetObject = true;
@@ -1952,7 +1937,7 @@ ${allArgs ? `${allArgs},` : ""}
             const mapped = this.typeMapper.mapParameter(param);
             const paramName = toValidIdentifier(toCamelCase(param.name));
             const isOptional = makeAllOptional || this.typeMapper.isNullable(param);
-            const typeStr = isOptional ? `${mapped.ts} | null` : mapped.ts;
+            const typeStr = mapped.ts;
             const paramStr = `${paramName}${isOptional ? "?" : ""}: ${typeStr}`;
             (isOptional ? optional : required).push(paramStr);
         }
@@ -2003,15 +1988,15 @@ ${allArgs ? `${allArgs},` : ""}
         }
         return gtkAllocatesRefs.map((ref) => {
             if (ref.isBoxed) {
-                this.usesGetBoxed = true;
+                this.usesGetObject = true;
                 return ref.nullable
-                    ? `    if (${ref.paramName}) ${ref.paramName}.value = getBoxed(${ref.paramName}.value, ${ref.innerType});`
-                    : `    ${ref.paramName}.value = getBoxed(${ref.paramName}.value, ${ref.innerType});`;
+                    ? `    if (${ref.paramName}) ${ref.paramName}.value = getObject(${ref.paramName}.value, ${ref.innerType})!;`
+                    : `    ${ref.paramName}.value = getObject(${ref.paramName}.value, ${ref.innerType})!;`;
             }
             this.usesGetObject = 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 = getObject(${ref.paramName}.value)! as ${ref.innerType};`
+                : `    ${ref.paramName}.value = getObject(${ref.paramName}.value)! as ${ref.innerType};`;
         });
     }
     generateErrorArgument(indent = "      ") {
@@ -2038,10 +2023,15 @@ ${indent}  }`;
         }
         if (type.type === "boxed") {
             const innerType = typeof type.innerType === "string" ? type.innerType : "";
-            const lib = this.currentSharedLibrary;
-            return type.borrowed
-                ? `{ type: "boxed", borrowed: true, innerType: "${innerType}", lib: "${lib}" }`
-                : `{ type: "boxed", innerType: "${innerType}", lib: "${lib}" }`;
+            const lib = type.lib ?? this.currentSharedLibrary;
+            const parts = [`type: "boxed"`, `innerType: "${innerType}"`, `lib: "${lib}"`];
+            if (type.borrowed) {
+                parts.splice(1, 0, `borrowed: true`);
+            }
+            if (type.getTypeFn) {
+                parts.push(`getTypeFn: "${type.getTypeFn}"`);
+            }
+            return `{ ${parts.join(", ")} }`;
         }
         if (type.type === "ref" && type.innerType && typeof type.innerType !== "string") {
             return `{ type: "ref", innerType: ${this.generateTypeDescriptor(type.innerType)} }`;
@@ -2095,22 +2085,26 @@ ${indent}  }`;
             lines.push(`import { call } from "../../batch.js";`);
         }
         if (this.usesNativeError) {
-            lines.push(`import { NativeError } from "../../native-error.js";`);
-        }
-        const nativeJsImports = [];
-        if (this.usesGetObject)
-            nativeJsImports.push("getObject");
-        if (this.usesGetBoxed)
-            nativeJsImports.push("getBoxed");
-        if (this.usesGetInterface)
-            nativeJsImports.push("getInterface");
-        if (this.usesInstantiating)
-            nativeJsImports.push("isInstantiating", "setInstantiating");
-        if (nativeJsImports.length > 0) {
-            lines.push(`import { ${nativeJsImports.join(", ")} } from "../../native.js";`);
+            lines.push(`import { NativeError } from "../../native/error.js";`);
+        }
+        if (this.usesGetObject) {
+            lines.push(`import { getObject } from "../../native/object.js";`);
         }
-        if (this.usesRegisterType) {
-            lines.push(`import { registerType } from "../../registry.js";`);
+        const baseImports = [];
+        if (this.usesInstantiating)
+            baseImports.push("isInstantiating", "setInstantiating");
+        if (this.usesNativeObject)
+            baseImports.push("NativeObject");
+        if (baseImports.length > 0) {
+            lines.push(`import { ${baseImports.join(", ")} } from "../../native/base.js";`);
+        }
+        const registryImports = [];
+        if (this.usesRegisterNativeClass)
+            registryImports.push("registerNativeClass");
+        if (this.usesGetClassByTypeName)
+            registryImports.push("getNativeClass");
+        if (registryImports.length > 0) {
+            lines.push(`import { ${registryImports.join(", ")} } from "../../registry.js";`);
         }
         if (this.usesSignalMeta) {
             lines.push(`import type { SignalMeta } from "../../types.js";`);

package/dist/generated/adw/about-dialog.d.ts

@@ -3,6 +3,7 @@ import * as Gtk from "../gtk/index.js";
 import { Dialog } from "./dialog.js";
 export declare class AboutDialog extends Dialog {
     static readonly glibTypeName: string;
+    static readonly objectType: "gobject";
     /**
      * Creates a new `AdwAboutDialog`.
      */
@@ -32,7 +33,7 @@ export declare class AboutDialog extends Dialog {
      * @param resourcePath - The resource to use
      * @param releaseNotesVersion - The version to retrieve release notes for
      */
-    static dialogNewFromAppdata(resourcePath: string, releaseNotesVersion?: string | null): AboutDialog;
+    static dialogNewFromAppdata(resourcePath: string, releaseNotesVersion?: string): AboutDialog;
     /**
      * Adds a section to the Acknowledgements page.
      *
@@ -54,7 +55,7 @@ export declare class AboutDialog extends Dialog {
      * @param name - the section name
      * @param people - the list of names
      */
-    addAcknowledgementSection(people: string[], name?: string | null): void;
+    addAcknowledgementSection(people: string[], name?: string): void;
     /**
      * Adds an extra section to the Credits page.
      *
@@ -74,7 +75,7 @@ export declare class AboutDialog extends Dialog {
      * @param name - the section name
      * @param people - the list of names
      */
-    addCreditSection(people: string[], name?: string | null): void;
+    addCreditSection(people: string[], name?: string): void;
     /**
      * Adds an extra section to the Legal page.
      *
@@ -121,7 +122,7 @@ export declare class AboutDialog extends Dialog {
      * @param licenseType - the type of license
      * @param license - custom license information
      */
-    addLegalSection(title: string, licenseType: Gtk.License, copyright?: string | null, license?: string | null): void;
+    addLegalSection(title: string, licenseType: Gtk.License, copyright?: string, license?: string): void;
     /**
      * Adds an extra link to the Details page.
      *
@@ -269,7 +270,7 @@ export declare class AboutDialog extends Dialog {
      * * [method@AboutDialog.add_acknowledgement_section]
      * @param artists - the list of artists
      */
-    setArtists(artists?: string[] | null): void;
+    setArtists(artists?: string[]): void;
     /**
      * Sets the comments about the application.
      *
@@ -337,7 +338,7 @@ export declare class AboutDialog extends Dialog {
      * * [method@AboutDialog.add_acknowledgement_section]
      * @param designers - the list of designers
      */
-    setDesigners(designers?: string[] | null): void;
+    setDesigners(designers?: string[]): void;
     /**
      * Sets the developer name for @self.
      *
@@ -368,7 +369,7 @@ export declare class AboutDialog extends Dialog {
      * * [method@AboutDialog.add_acknowledgement_section]
      * @param developers - the list of developers
      */
-    setDevelopers(developers?: string[] | null): void;
+    setDevelopers(developers?: string[]): void;
     /**
      * Sets the list of documenters of the application.
      *
@@ -387,7 +388,7 @@ export declare class AboutDialog extends Dialog {
      * * [method@AboutDialog.add_acknowledgement_section]
      * @param documenters - the list of documenters
      */
-    setDocumenters(documenters?: string[] | null): void;
+    setDocumenters(documenters?: string[]): void;
     /**
      * Sets the issue tracker URL for @self.
      *

package/dist/generated/adw/about-dialog.js

@@ -1,6 +1,7 @@
 import { call } from "../../batch.js";
-import { getObject, isInstantiating, setInstantiating } from "../../native.js";
-import { registerType } from "../../registry.js";
+import { getObject } from "../../native/object.js";
+import { isInstantiating, setInstantiating } from "../../native/base.js";
+import { registerNativeClass } from "../../registry.js";
 import { Dialog } from "./dialog.js";
 /**
  * A dialog showing information about the application.
@@ -170,7 +171,7 @@ import { Dialog } from "./dialog.js";
  */
 const SIGNAL_META = {
     "activate-link": {
-        params: [{ type: { type: "string", borrowed: false } }],
+        params: [{ type: "string", borrowed: false }],
         returnType: { type: "boolean" },
     },
     "close-attempt": { params: [], returnType: { type: "undefined" } },
@@ -178,6 +179,7 @@ const SIGNAL_META = {
 };
 export class AboutDialog extends Dialog {
     static glibTypeName = "AdwAboutDialog";
+    static objectType = "gobject";
     /**
      * Creates a new `AdwAboutDialog`.
      */
@@ -1189,9 +1191,7 @@ export class AboutDialog extends Dialog {
     connect(signal, handler, after = false) {
         const meta = SIGNAL_META[signal];
         const selfType = { type: "gobject", borrowed: true };
-        const argTypes = meta
-            ? [selfType, ...meta.params.map((m) => m.type)]
-            : [selfType];
+        const argTypes = meta ? [selfType, ...meta.params] : [selfType];
         const returnType = meta?.returnType;
         const wrappedHandler = (...args) => {
             const self = getObject(args[0]);
@@ -1199,7 +1199,7 @@ export class AboutDialog extends Dialog {
             if (!meta)
                 return handler(self, ...signalArgs);
             const wrapped = meta.params.map((m, i) => {
-                if (m.getCls && signalArgs[i] != null) {
+                if (m.type === "gobject" && signalArgs[i] != null) {
                     return getObject(signalArgs[i]);
                 }
                 return signalArgs[i];
@@ -1217,4 +1217,4 @@ export class AboutDialog extends Dialog {
         ], { type: "int", size: 64, unsigned: true });
     }
 }
-registerType(AboutDialog);
+registerNativeClass(AboutDialog);

package/dist/generated/adw/about-window.d.ts

@@ -3,6 +3,7 @@ import * as Gtk from "../gtk/index.js";
 import { Window } from "./window.js";
 export declare class AboutWindow extends Window {
     static readonly glibTypeName: string;
+    static readonly objectType: "gobject";
     /**
      * Creates a new `AdwAboutWindow`.
      */
@@ -32,7 +33,7 @@ export declare class AboutWindow extends Window {
      * @param resourcePath - The resource to use
      * @param releaseNotesVersion - The version to retrieve release notes for
      */
-    static windowNewFromAppdata(resourcePath: string, releaseNotesVersion?: string | null): AboutWindow;
+    static windowNewFromAppdata(resourcePath: string, releaseNotesVersion?: string): AboutWindow;
     /**
      * Adds a section to the Acknowledgements page.
      *
@@ -54,7 +55,7 @@ export declare class AboutWindow extends Window {
      * @param name - the section name
      * @param people - the list of names
      */
-    addAcknowledgementSection(people: string[], name?: string | null): void;
+    addAcknowledgementSection(people: string[], name?: string): void;
     /**
      * Adds an extra section to the Credits page.
      *
@@ -74,7 +75,7 @@ export declare class AboutWindow extends Window {
      * @param name - the section name
      * @param people - the list of names
      */
-    addCreditSection(people: string[], name?: string | null): void;
+    addCreditSection(people: string[], name?: string): void;
     /**
      * Adds an extra section to the Legal page.
      *
@@ -121,7 +122,7 @@ export declare class AboutWindow extends Window {
      * @param licenseType - the type of license
      * @param license - custom license information
      */
-    addLegalSection(title: string, licenseType: Gtk.License, copyright?: string | null, license?: string | null): void;
+    addLegalSection(title: string, licenseType: Gtk.License, copyright?: string, license?: string): void;
     /**
      * Adds an extra link to the Details page.
      *
@@ -246,7 +247,7 @@ export declare class AboutWindow extends Window {
      * * [method@AboutWindow.add_acknowledgement_section]
      * @param artists - the list of artists
      */
-    setArtists(artists?: string[] | null): void;
+    setArtists(artists?: string[]): void;
     /**
      * Sets the comments about the application.
      *
@@ -314,7 +315,7 @@ export declare class AboutWindow extends Window {
      * * [method@AboutWindow.add_acknowledgement_section]
      * @param designers - the list of designers
      */
-    setDesigners(designers?: string[] | null): void;
+    setDesigners(designers?: string[]): void;
     /**
      * Sets the developer name for @self.
      *
@@ -345,7 +346,7 @@ export declare class AboutWindow extends Window {
      * * [method@AboutWindow.add_acknowledgement_section]
      * @param developers - the list of developers
      */
-    setDevelopers(developers?: string[] | null): void;
+    setDevelopers(developers?: string[]): void;
     /**
      * Sets the list of documenters of the application.
      *
@@ -364,7 +365,7 @@ export declare class AboutWindow extends Window {
      * * [method@AboutWindow.add_acknowledgement_section]
      * @param documenters - the list of documenters
      */
-    setDocumenters(documenters?: string[] | null): void;
+    setDocumenters(documenters?: string[]): void;
     /**
      * Sets the issue tracker URL for @self.
      *