@ts-for-gir/lib 4.0.0-beta.41 → 4.0.0-beta.43

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ts-for-gir/lib",
-  "version": "4.0.0-beta.41",
+  "version": "4.0.0-beta.43",
   "description": "Typescript .d.ts generator from GIR for gjs",
   "main": "src/index.ts",
   "module": "src/index.ts",
@@ -41,17 +41,17 @@
     "type definitions"
   ],
   "devDependencies": {
-    "@ts-for-gir/tsconfig": "^4.0.0-beta.41",
+    "@ts-for-gir/tsconfig": "^4.0.0-beta.43",
     "@types/ejs": "^3.1.5",
     "@types/lodash": "^4.17.24",
     "@types/node": "^24.12.0",
     "rimraf": "^6.1.3",
-    "typescript": "^5.9.3"
+    "typescript": "^6.0.2"
   },
   "dependencies": {
-    "@gi.ts/parser": "^4.0.0-beta.41",
-    "@ts-for-gir/reporter": "^4.0.0-beta.41",
-    "@ts-for-gir/templates": "^4.0.0-beta.41",
+    "@gi.ts/parser": "^4.0.0-beta.43",
+    "@ts-for-gir/reporter": "^4.0.0-beta.43",
+    "@ts-for-gir/templates": "^4.0.0-beta.43",
     "colorette": "^2.0.20",
     "ejs": "^5.0.1",
     "glob": "^13.0.6",

package/src/constants.ts

@@ -8,61 +8,27 @@ export const PARAM_REG_EXP = /[0-9a-zA-Z_]*:/g;
 export const OPT_PARAM_REG_EXP = /[0-9a-zA-Z_]*\?:/g;
 export const NEW_LINE_REG_EXP = /[\n\r]+/g;
 
-/**
- * Package information interface for package.json
- */
-interface Package {
-	name: string;
-	version: string;
-	description: string;
-	license: string;
-	homepage: string;
-	author: string;
-}
+declare const __TS_FOR_GIR_VERSION__: string;
 
 /**
- * Resolves the current package's package.json path
- * Uses import.meta.url for ES Module compatibility
- * Works both in workspace and after publishing
+ * Reads the package version, using the build-time injected value when bundled
+ * or falling back to reading package.json in development mode.
  */
-function resolvePackageJson(): string {
-	try {
-		// Get the directory of the current module
-		const currentModulePath = fileURLToPath(import.meta.url);
-		const currentDir = dirname(currentModulePath);
-
-		// Go up to the package root (src/ -> package root)
-		const packageRoot = join(currentDir, "..");
-		const packageJsonPath = join(packageRoot, "package.json");
-
-		return packageJsonPath;
-	} catch (error) {
-		throw new Error(`Unable to resolve package.json path: ${error instanceof Error ? error.message : "Unknown error"}`);
+function getPackageVersion(): string {
+	if (typeof __TS_FOR_GIR_VERSION__ !== "undefined") {
+		return __TS_FOR_GIR_VERSION__;
 	}
+	const currentModulePath = fileURLToPath(import.meta.url);
+	const currentDir = dirname(currentModulePath);
+	const packageJsonPath = join(currentDir, "..", "package.json");
+	const content = readFileSync(packageJsonPath, "utf-8");
+	return (JSON.parse(content) as { version: string }).version;
 }
 
-/**
- * Reads and parses the current package's package.json file synchronously
- * Contains version and metadata for this specific package
- */
-function readPackageSync(): Package {
-	try {
-		const packagePath = resolvePackageJson();
-		const content = readFileSync(packagePath, "utf-8");
-		return JSON.parse(content) as Package;
-	} catch (error) {
-		const message = error instanceof Error ? error.message : "Unknown error";
-		throw new Error(`Failed to read package.json: ${message}`);
-	}
-}
-
-// Read package information once at module load
-export const PACKAGE = readPackageSync();
-
 export const APP_NAME = "ts-for-gir";
 export const APP_USAGE = "TypeScript type definition generator for GObject introspection GIR files";
 export const APP_SOURCE = "https://github.com/gjsify/ts-for-gir";
-export const APP_VERSION = PACKAGE.version;
+export const APP_VERSION = getPackageVersion();
 
 export const PACKAGE_DESC = (packageName: string, libraryVersion?: LibraryVersion) => {
 	if (libraryVersion) {

package/src/gir/introspected-classes.ts

@@ -55,6 +55,7 @@ export interface SignalDescriptor {
 	signal?: IntrospectedSignal;
 	isNotifySignal?: boolean;
 	isDetailSignal?: boolean;
+	isTemplateLiteral?: boolean;
 	parameterTypes?: string[];
 	returnType?: string;
 }
@@ -663,6 +664,19 @@ export class IntrospectedClass extends IntrospectedBaseClass {
 				returnType: "void",
 			});
 		});
+
+		// Add template literal catch-all for arbitrary property names.
+		// Only on GObject.Object itself — children inherit it via SignalSignatures extends.
+		if (this.isGObjectObject()) {
+			allSignals.push({
+				name: `notify::\${string}`,
+				isNotifySignal: true,
+				isDetailSignal: false,
+				isTemplateLiteral: true,
+				parameterTypes: ["GObject.ParamSpec"],
+				returnType: "void",
+			});
+		}
 	}
 
 	private addDetailedSignals(allSignals: SignalDescriptor[]): void {
@@ -670,6 +684,9 @@ export class IntrospectedClass extends IntrospectedBaseClass {
 
 		this.signals.forEach((signal) => {
 			if (signal.detailed) {
+				// Skip "notify" signal — already handled by addNotifySignals
+				if (signal.name === "notify") return;
+
 				propertyNames.forEach((propertyName) => {
 					allSignals.push({
 						name: `${signal.name}::${propertyName}`,
@@ -680,6 +697,17 @@ export class IntrospectedClass extends IntrospectedBaseClass {
 						returnType: this.getPropertyTypeString(signal.return_type),
 					});
 				});
+
+				// Add template literal catch-all for arbitrary detail strings
+				allSignals.push({
+					name: `${signal.name}::\${string}`,
+					signal: signal,
+					isNotifySignal: false,
+					isDetailSignal: true,
+					isTemplateLiteral: true,
+					parameterTypes: signal.parameters.map((p) => this.getPropertyTypeString(p.type)),
+					returnType: this.getPropertyTypeString(signal.return_type),
+				});
 			}
 		});
 	}

package/src/injections/gobject.ts

@@ -292,7 +292,7 @@ See https://gjs.guide/guides/gobject/basics.html#properties for more details.`;
 			const override = new IntrospectedClassFunction({
 				parent: ParamSpec,
 				name: "override",
-				return_type: VoidType,
+				return_type: ParamSpec.getType(),
 				parameters: [
 					new IntrospectedFunctionParameter({
 						direction: GirDirection.In,