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

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

@@ -5990,9 +5990,7 @@ var ConsoleReporter = class _ConsoleReporter extends ReporterBase {
   generateSummary(statistics) {
     const { bySeverity, byCategory, totalProblems } = statistics;
     let status = "success";
-    if (bySeverity["critical" /* CRITICAL */] > 0 || bySeverity["error" /* ERROR */] > 10) {
-      status = "failed";
-    } else if (bySeverity["error" /* ERROR */] > 0 || bySeverity["warning" /* WARNING */] > 20) {
+    if (bySeverity["error" /* ERROR */] > 0 || bySeverity["warning" /* WARNING */] > 20) {
       status = "partial";
     }
     const keyIssues = [];
@@ -6386,12 +6384,10 @@ var ReporterService = class _ReporterService {
       problemsByCategory[problem.category].push(problem);
     }
     const errorCount = statistics.bySeverity["error" /* ERROR */] || 0;
-    const criticalCount = statistics.bySeverity["critical" /* CRITICAL */] || 0;
+    const _criticalCount = statistics.bySeverity["critical" /* CRITICAL */] || 0;
     const warningCount = statistics.bySeverity["warning" /* WARNING */] || 0;
     let status = "success";
-    if (criticalCount > 0 || errorCount > 10) {
-      status = "failed";
-    } else if (errorCount > 0 || warningCount > 20) {
+    if (errorCount > 0 || warningCount > 20) {
       status = "partial";
     }
     const keyIssues = [];
@@ -6464,7 +6460,7 @@ var ReporterService = class _ReporterService {
 ${"=".repeat(60)}`);
     console.log("\u{1F4CA} COMPREHENSIVE GENERATION REPORT");
     console.log("=".repeat(60));
-    const statusColor = summary.status === "success" ? green2 : summary.status === "partial" ? yellow2 : red2;
+    const statusColor = summary.status === "success" ? green2 : yellow2;
     console.log(`
 \u{1F3AF} Overall Status: ${statusColor(summary.status.toUpperCase())}`);
     console.log(`
@@ -8502,10 +8498,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 +8526,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 +8614,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");
@@ -13087,6 +13097,10 @@ var clutter13 = createClutterTemplate("13");
 var clutter14 = createClutterTemplate("14");
 var clutter15 = createClutterTemplate("15");
 var clutter16 = createClutterTemplate("16");
+var clutter17 = createClutterTemplate("17");
+var clutter18 = createClutterTemplate("18");
+var clutter19 = createClutterTemplate("19");
+var clutter20 = createClutterTemplate("20");
 
 // ../lib/src/generics/gio.ts
 function createGioConfig() {
@@ -13288,6 +13302,10 @@ var meta13 = createMetaTemplate("13");
 var meta14 = createMetaTemplate("14");
 var meta15 = createMetaTemplate("15");
 var meta16 = createMetaTemplate("16");
+var meta17 = createMetaTemplate("17");
+var meta18 = createMetaTemplate("18");
+var meta19 = createMetaTemplate("19");
+var meta20 = createMetaTemplate("20");
 
 // ../lib/src/generics/st.ts
 function createStTemplate(version) {
@@ -13431,6 +13449,10 @@ var st13 = createStTemplate("13");
 var st14 = createStTemplate("14");
 var st15 = createStTemplate("15");
 var st16 = createStTemplate("16");
+var st17 = createStTemplate("17");
+var st18 = createStTemplate("18");
+var st19 = createStTemplate("19");
+var st20 = createStTemplate("20");
 
 // ../lib/src/visitor.ts
 var GirVisitor = class {
@@ -13791,17 +13813,32 @@ var OPTIONAL_DEFINITIONS = [
   clutter13,
   clutter14,
   clutter15,
+  clutter16,
+  clutter17,
+  clutter18,
+  clutter19,
+  clutter20,
   st1,
   st12,
   st13,
   st14,
   st15,
+  st16,
+  st17,
+  st18,
+  st19,
+  st20,
   meta10,
   meta11,
   meta12,
   meta13,
   meta14,
-  meta15
+  meta15,
+  meta16,
+  meta17,
+  meta18,
+  meta19,
+  meta20
 ];
 function createDefinitionProcessor(registry, inferGenerics, required = true) {
   return (definition) => {
@@ -15532,6 +15569,10 @@ var shellTemplate = (version) => ({
 var shell14 = shellTemplate("14");
 var shell15 = shellTemplate("15");
 var shell16 = shellTemplate("16");
+var shell17 = shellTemplate("17");
+var shell18 = shellTemplate("18");
+var shell19 = shellTemplate("19");
+var shell20 = shellTemplate("20");
 
 // ../lib/src/injections/tracker1.ts
 var tracker1_default = {
@@ -15582,6 +15623,11 @@ function inject(registry) {
   $_(gtk4_default);
   $_(shell14);
   $_(shell15);
+  $_(shell16);
+  $_(shell17);
+  $_(shell18);
+  $_(shell19);
+  $_(shell20);
 }
 
 // ../lib/src/validators/class.ts
@@ -20082,7 +20128,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 +20189,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.37",
   "description": "TypeScript type definition generator for GObject introspection GIR files",
   "main": "src/index.ts",
   "module": "src/index.ts",
@@ -53,29 +53,29 @@
     ".": "./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.37",
+    "@ts-for-gir/generator-base": "^4.0.0-beta.37",
+    "@ts-for-gir/generator-html-doc": "^4.0.0-beta.37",
+    "@ts-for-gir/generator-json": "^4.0.0-beta.37",
+    "@ts-for-gir/generator-typescript": "^4.0.0-beta.37",
+    "@ts-for-gir/lib": "^4.0.0-beta.37",
+    "@ts-for-gir/reporter": "^4.0.0-beta.37",
     "@types/ejs": "^3.1.5",
     "@types/inquirer": "^9.0.9",
-    "@types/node": "^24.2.1",
+    "@types/node": "^24.5.2",
     "@types/yargs": "^17.0.33",
     "dpdm": "^3.14.0",
-    "esbuild": "^0.25.9",
+    "esbuild": "^0.25.10",
     "typescript": "^5.9.2"
   },
   "dependencies": {
-    "@inquirer/prompts": "^7.8.2",
-    "@ts-for-gir/templates": "^4.0.0-beta.35",
+    "@inquirer/prompts": "^7.8.6",
+    "@ts-for-gir/templates": "^4.0.0-beta.37",
     "colorette": "^2.0.20",
     "cosmiconfig": "^9.0.0",
     "ejs": "^3.1.10",
     "glob": "^11.0.3",
-    "inquirer": "^12.9.2",
+    "inquirer": "^12.9.6",
     "prettier": "^3.6.2",
     "yargs": "^18.0.0"
   }

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(