@ts-for-gir/generator-typescript 4.0.0-beta.42 → 4.0.0-beta.44

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ts-for-gir/generator-typescript",
-  "version": "4.0.0-beta.42",
+  "version": "4.0.0-beta.44",
   "description": "TypeScript type definition generator for ts-for-gir",
   "main": "src/index.ts",
   "module": "src/index.ts",
@@ -31,17 +31,17 @@
     "generator"
   ],
   "devDependencies": {
-    "@ts-for-gir/tsconfig": "^4.0.0-beta.42",
+    "@ts-for-gir/tsconfig": "^4.0.0-beta.44",
     "@types/ejs": "^3.1.5",
     "@types/node": "^24.12.0",
     "@types/xml2js": "^0.4.14",
-    "typescript": "^5.9.3"
+    "typescript": "^6.0.2"
   },
   "dependencies": {
-    "@gi.ts/parser": "^4.0.0-beta.42",
-    "@ts-for-gir/generator-base": "^4.0.0-beta.42",
-    "@ts-for-gir/lib": "^4.0.0-beta.42",
-    "@ts-for-gir/templates": "^4.0.0-beta.42",
+    "@gi.ts/parser": "^4.0.0-beta.44",
+    "@ts-for-gir/generator-base": "^4.0.0-beta.44",
+    "@ts-for-gir/lib": "^4.0.0-beta.44",
+    "@ts-for-gir/templates": "^4.0.0-beta.44",
     "ejs": "^5.0.1",
     "xml2js": "^0.6.2"
   }

package/src/generators/signal-generator.ts

@@ -107,8 +107,6 @@ export class SignalGenerator {
 		const allSignals = girClass.getAllSignals();
 
 		allSignals.forEach((signalInfo) => {
-			const signalKey = /^[a-zA-Z_$][a-zA-Z0-9_$]*$/.test(signalInfo.name) ? signalInfo.name : `"${signalInfo.name}"`;
-
 			let cbType: string;
 
 			if (signalInfo.isNotifySignal) {
@@ -132,6 +130,14 @@ export class SignalGenerator {
 				cbType = `(${paramTypes.join(", ")}) => ${returnTypeStr}`;
 			}
 
+			// Template literal catch-all signals use index signature syntax
+			if (signalInfo.isTemplateLiteral) {
+				def.push(`${indent}    [key: \`${signalInfo.name}\`]: ${cbType};`);
+				return;
+			}
+
+			const signalKey = /^[a-zA-Z_$][a-zA-Z0-9_$]*$/.test(signalInfo.name) ? signalInfo.name : `"${signalInfo.name}"`;
+
 			// Add signal doc comment with @signal tag and signal-specific modifier tags
 			if (!signalInfo.isNotifySignal && signalInfo.signal) {
 				const signalTags = [

package/src/module-generator.ts

@@ -55,6 +55,7 @@ import {
 	type TsDocTag,
 	TypeConflict,
 	type TypeExpression,
+	TypeIdentifier,
 	transformGirDocTagTextWithContext,
 	transformGirDocText,
 } from "@ts-for-gir/lib";
@@ -402,14 +403,16 @@ export class ModuleGenerator extends FormatGenerator<string[]> {
 
 		clazz.superType = GLibError.getType();
 
-		// Manually construct a GLib.Error constructor.
+		// GJS GError constructor expects one object: { message: string, code: number }
+		// The domain is automatically derived from the error enum type.
+		// See: gjs/gi/gerror.cpp ErrorInstance::constructor_impl
 		clazz.mainConstructor = new IntrospectedConstructor({
 			name: "new",
 			parent: clazz,
 			parameters: [
 				new IntrospectedFunctionParameter({
 					name: "options",
-					type: NativeType.of("{ message: string, code: number}"),
+					type: NativeType.of("{ message: string, code: number }"),
 					direction: GirDirection.In,
 				}),
 			],
@@ -515,6 +518,13 @@ export class ModuleGenerator extends FormatGenerator<string[]> {
 		const Type = type.resolve(this.namespace, this.options).rootPrint(this.namespace, this.options) || "any";
 
 		if (construct) {
+			// If the property type is GType, use GTypeInput to also accept class constructors
+			// with $gtype (e.g., passing a class to Gio.ListStore's item_type property)
+			const unwrapped = type.deepUnwrap();
+			if (unwrapped instanceof TypeIdentifier && unwrapped.is("GObject", "GType")) {
+				const gtypeNamespace = this.namespace.namespace === "GObject" ? "" : "GObject.";
+				return [`${name}: ${gtypeNamespace}GTypeInput;`];
+			}
 			return [`${name}: ${Type};`];
 		}
 
@@ -1272,6 +1282,7 @@ export class ModuleGenerator extends FormatGenerator<string[]> {
 		else if (girClass.mainConstructor instanceof IntrospectedConstructor)
 			def.push(...this.generateConstructor(girClass.mainConstructor));
 		else if (
+			(girClass.namespace.namespace === "GObject" && girClass.name === "Object") ||
 			girClass.someParent((p: IntrospectedBaseClass) => p.namespace.namespace === "GObject" && p.name === "Object")
 		)
 			def.push(`\nconstructor(properties?: Partial<${girClass.name}.ConstructorProps>, ...args: any[]);\n`);