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

package/README.md

@@ -125,7 +125,7 @@ Examples:
   ts-for-gir generate                       Run 'ts-for-gir generate' in your gjs
                                             project to generate typings for your
                                             project, pass the gir modules you need
-  ts-for-gir generate Gtk*                  You can also use wild cards
+  ts-for-gir generate 'Gtk*'                  You can also use wild cards
   ts-for-gir generate '*'                   If you want to parse all of your locally
                                             installed gir modules run
   ts-for-gir generate --configName='.ts-for-gir.gtk4.rc.js'  Use a special config file

package/bin/ts-for-gir

@@ -8502,10 +8502,17 @@ var DependencyManager = class _DependencyManager {
       await this.get("cairo", "1.0")
     ];
   }
-  createImportProperties(namespace, packageName, version) {
+  createImportProperties(namespace, packageName, version, libraryVersion) {
     const importPath = this.createImportPath(packageName, namespace, version);
     const importDef = this.createImportDef(namespace, importPath);
-    const packageJsonImport = this.createPackageJsonImport(importPath);
+    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,
@@ -8523,8 +8530,15 @@ var DependencyManager = class _DependencyManager {
   createImportDef(namespace, importPath) {
     return this.config.noNamespace ? `import type * as ${namespace} from '${importPath}'` : `import type ${namespace} from '${importPath}';`;
   }
-  createPackageJsonImport(importPath) {
-    const depVersion = this.config.workspace ? "workspace:^" : "*";
+  createPackageJsonImport(importPath, libraryVersion) {
+    let depVersion;
+    if (this.config.workspace) {
+      depVersion = "workspace:^";
+    } else if (libraryVersion) {
+      depVersion = `${libraryVersion.toString()}-${APP_VERSION}`;
+    } else {
+      depVersion = APP_VERSION;
+    }
     return `"${importPath}": "${depVersion}"`;
   }
   async parseGir(path) {
@@ -8604,7 +8618,7 @@ var DependencyManager = class _DependencyManager {
       version,
       libraryVersion,
       girXML,
-      ...this.createImportProperties(namespace, packageName, version)
+      ...this.createImportProperties(namespace, packageName, version, libraryVersion)
     };
     if (!noOverride && namespace === "cairo" && version === "1.0") {
       dependency.importDef = this.createImportDef("cairo", "cairo");
@@ -20082,7 +20096,7 @@ var examples4 = [
     `${APP_NAME} generate`,
     `Run '${APP_NAME} generate' in your gjs project to generate typings for your project, pass the gir modules you need for your project`
   ],
-  [`${APP_NAME} generate Gtk*`, "You can also use wild cards"],
+  [`${APP_NAME} generate 'Gtk*'`, "You can also use wild cards"],
   [`${APP_NAME} generate '*'`, "If you want to parse all of your locally installed gir modules run"],
   [`${APP_NAME} generate --configName='.ts-for-gir.gtk4.rc.js`, "Use a special config file"],
   [`${APP_NAME} generate --ignore=Gtk-4.0 xrandr-1.3`, "Generate .d.ts. files but not for Gtk-4.0 and xrandr-1.3"]
@@ -20143,7 +20157,7 @@ var description5 = "Generates JSON representation from GIR files for analysis an
 var logger7 = new Logger(true, "JsonCommand");
 var examples5 = [
   [`${APP_NAME} json`, `Run '${APP_NAME} json' in your gjs project to generate JSON files for your project`],
-  [`${APP_NAME} json Gtk*`, "You can also use wild cards"],
+  [`${APP_NAME} json 'Gtk*'`, "You can also use wild cards"],
   [`${APP_NAME} json '*'`, "If you want to parse all of your locally installed gir modules run"],
   [`${APP_NAME} json --configName='.ts-for-gir.gtk4.rc.js`, "Use a special config file"],
   [`${APP_NAME} json --ignore=Gtk-4.0 xrandr-1.3`, "Generate JSON files but not for Gtk-4.0 and xrandr-1.3"]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ts-for-gir/cli",
-  "version": "4.0.0-beta.35",
+  "version": "4.0.0-beta.36",
   "description": "TypeScript type definition generator for GObject introspection GIR files",
   "main": "src/index.ts",
   "module": "src/index.ts",
@@ -53,13 +53,13 @@
     ".": "./src/index.ts"
   },
   "devDependencies": {
-    "@gi.ts/parser": "^4.0.0-beta.35",
-    "@ts-for-gir/generator-base": "^4.0.0-beta.35",
-    "@ts-for-gir/generator-html-doc": "^4.0.0-beta.35",
-    "@ts-for-gir/generator-json": "^4.0.0-beta.35",
-    "@ts-for-gir/generator-typescript": "^4.0.0-beta.35",
-    "@ts-for-gir/lib": "^4.0.0-beta.35",
-    "@ts-for-gir/reporter": "^4.0.0-beta.35",
+    "@gi.ts/parser": "^4.0.0-beta.36",
+    "@ts-for-gir/generator-base": "^4.0.0-beta.36",
+    "@ts-for-gir/generator-html-doc": "^4.0.0-beta.36",
+    "@ts-for-gir/generator-json": "^4.0.0-beta.36",
+    "@ts-for-gir/generator-typescript": "^4.0.0-beta.36",
+    "@ts-for-gir/lib": "^4.0.0-beta.36",
+    "@ts-for-gir/reporter": "^4.0.0-beta.36",
     "@types/ejs": "^3.1.5",
     "@types/inquirer": "^9.0.9",
     "@types/node": "^24.2.1",
@@ -70,7 +70,7 @@
   },
   "dependencies": {
     "@inquirer/prompts": "^7.8.2",
-    "@ts-for-gir/templates": "^4.0.0-beta.35",
+    "@ts-for-gir/templates": "^4.0.0-beta.36",
     "colorette": "^2.0.20",
     "cosmiconfig": "^9.0.0",
     "ejs": "^3.1.10",

package/src/commands/generate.ts

@@ -32,7 +32,7 @@ const examples: ReadonlyArray<[string, string?]> = [
 		`${APP_NAME} generate`,
 		`Run '${APP_NAME} generate' in your gjs project to generate typings for your project, pass the gir modules you need for your project`,
 	],
-	[`${APP_NAME} generate Gtk*`, "You can also use wild cards"],
+	[`${APP_NAME} generate 'Gtk*'`, "You can also use wild cards"],
 	[`${APP_NAME} generate '*'`, "If you want to parse all of your locally installed gir modules run"],
 	[`${APP_NAME} generate --configName='.ts-for-gir.gtk4.rc.js`, "Use a special config file"],
 	[`${APP_NAME} generate --ignore=Gtk-4.0 xrandr-1.3`, "Generate .d.ts. files but not for Gtk-4.0 and xrandr-1.3"],

package/src/commands/json.ts

@@ -28,7 +28,7 @@ const logger = new Logger(true, "JsonCommand");
 
 const examples: ReadonlyArray<[string, string?]> = [
 	[`${APP_NAME} json`, `Run '${APP_NAME} json' in your gjs project to generate JSON files for your project`],
-	[`${APP_NAME} json Gtk*`, "You can also use wild cards"],
+	[`${APP_NAME} json 'Gtk*'`, "You can also use wild cards"],
 	[`${APP_NAME} json '*'`, "If you want to parse all of your locally installed gir modules run"],
 	[`${APP_NAME} json --configName='.ts-for-gir.gtk4.rc.js`, "Use a special config file"],
 	[`${APP_NAME} json --ignore=Gtk-4.0 xrandr-1.3`, "Generate JSON files but not for Gtk-4.0 and xrandr-1.3"],

package/src/module-loader.ts

@@ -235,6 +235,8 @@ export class ModuleLoader {
 		const GObject = await this.dependencyManager.get("GObject", "2.0");
 		const Cairo = await this.dependencyManager.get("cairo", "1.0");
 
+		// Update library versions for GObject and Gio to use GLib's version
+
 		const dependencies = await this.fileFinder.girFilePathToDependencies(girFiles);
 
 		const { loaded, failed } = await this.loadGirModules(