@ts-for-gir/lib 4.0.0-beta.35 → 4.0.0-beta.36

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ts-for-gir/lib",
-  "version": "4.0.0-beta.35",
+  "version": "4.0.0-beta.36",
   "description": "Typescript .d.ts generator from GIR for gjs",
   "main": "src/index.ts",
   "module": "src/index.ts",
@@ -48,9 +48,9 @@
     "typescript": "^5.9.2"
   },
   "dependencies": {
-    "@gi.ts/parser": "^4.0.0-beta.35",
-    "@ts-for-gir/reporter": "^4.0.0-beta.35",
-    "@ts-for-gir/templates": "^4.0.0-beta.35",
+    "@gi.ts/parser": "^4.0.0-beta.36",
+    "@ts-for-gir/reporter": "^4.0.0-beta.36",
+    "@ts-for-gir/templates": "^4.0.0-beta.36",
     "colorette": "^2.0.20",
     "ejs": "^3.1.10",
     "glob": "^11.0.3",

package/src/dependency-manager.ts

@@ -1,5 +1,6 @@
 import { readFile } from "node:fs/promises";
 import { type GirInclude, type GirNamespace, type GirRepository, type GirXML, parser } from "@gi.ts/parser";
+import { APP_VERSION } from "./constants.ts";
 import type { GirModule } from "./gir-module.ts";
 import { LibraryVersion } from "./library-version.ts";
 import { Logger } from "./logger.ts";
@@ -109,10 +110,20 @@ export class DependencyManager {
 		];
 	}
 
-	createImportProperties(namespace: string, packageName: string, version: string) {
+	createImportProperties(namespace: string, packageName: string, version: string, libraryVersion?: LibraryVersion) {
 		const importPath = this.createImportPath(packageName, namespace, version);
 		const importDef = this.createImportDef(namespace, importPath);
-		const packageJsonImport = this.createPackageJsonImport(importPath);
+
+		// For GObject and Gio, use GLib's library version if available
+		let effectiveLibraryVersion = libraryVersion;
+		if ((namespace === "GObject" || namespace === "Gio") && this._cache["GLib-2.0"]) {
+			const glibDep = this._cache["GLib-2.0"];
+			if (glibDep.libraryVersion.toString() !== "0.0.0") {
+				effectiveLibraryVersion = glibDep.libraryVersion;
+			}
+		}
+
+		const packageJsonImport = this.createPackageJsonImport(importPath, effectiveLibraryVersion);
 		return {
 			importPath,
 			importDef,
@@ -135,8 +146,15 @@ export class DependencyManager {
 			: `import type ${namespace} from '${importPath}';`;
 	}
 
-	createPackageJsonImport(importPath: string): string {
-		const depVersion = this.config.workspace ? "workspace:^" : "*";
+	createPackageJsonImport(importPath: string, libraryVersion?: LibraryVersion): string {
+		let depVersion: string;
+		if (this.config.workspace) {
+			depVersion = "workspace:^";
+		} else if (libraryVersion) {
+			depVersion = `${libraryVersion.toString()}-${APP_VERSION}`;
+		} else {
+			depVersion = APP_VERSION;
+		}
 		return `"${importPath}": "${depVersion}"`;
 	}
 
@@ -258,7 +276,7 @@ export class DependencyManager {
 			version,
 			libraryVersion,
 			girXML,
-			...this.createImportProperties(namespace, packageName, version),
+			...this.createImportProperties(namespace, packageName, version, libraryVersion),
 		};
 
 		// Special case for Cairo