@ts-for-gir/cli 4.0.0-beta.32 → 4.0.0-beta.34

package/bin/ts-for-gir

@@ -17252,7 +17252,12 @@ var FileFinder = class {
       }
       const filename = `${globPackageNames[i]}.gir`;
       const pattern = this.girDirectories.map((girDirectory) => join7(girDirectory, filename));
-      const ignoreGirs = ignore.map((girDirectory) => `${girDirectory}.gir`);
+      const ignoreGirs = this.girDirectories.flatMap(
+        (girDirectory) => ignore.map((ignored) => {
+          const cleanIgnored = ignored.startsWith("*/") ? ignored.slice(2) : ignored;
+          return join7(girDirectory, `${cleanIgnored}.gir`);
+        })
+      );
       const files = await glob2(pattern, { ignore: ignoreGirs });
       for (const file of files) {
         foundFiles.add(file);
@@ -17525,7 +17530,13 @@ var ModuleLoader = class {
    */
   async loadGirModules(dependencies, ignoreDependencies = [], girModules = [], resolvedBy = 1 /* BY_HAND */, failedGirModules = /* @__PURE__ */ new Set()) {
     let newModuleFound = false;
-    dependencies = [...dependencies];
+    dependencies = [...dependencies].filter((dep) => {
+      const packageName = dep.packageName;
+      return !ignoreDependencies.some((ignored) => {
+        const cleanIgnored = ignored.startsWith("*/") ? ignored.slice(2) : ignored;
+        return packageName === cleanIgnored;
+      });
+    });
     while (dependencies.length > 0) {
       const dependency = dependencies.shift();
       if (!dependency?.packageName) continue;
@@ -17635,7 +17646,7 @@ var ModuleLoader = class {
 // src/commands/copy.ts
 var command2 = "copy [modules..]";
 var description2 = "Scan for *.gir files and copy them to a new directory";
-var logger3 = new Logger(false, "CopyCommand");
+var logger3 = new Logger(true, "CopyCommand");
 var examples2 = [
   [`${APP_NAME} copy -o ./gir`, "Copy found *.gir files to ./gir"],
   [
@@ -19198,9 +19209,10 @@ ${girClass.__ts__indexSignature}
       if (Type) {
         return ` extends ${Type}`;
       }
-      throw new Error(
+      this.log.warn(
         `Unable to resolve type: ${node.superType.name} from ${node.superType.namespace} in ${node.namespace.namespace} ${node.namespace.version}, falling back to GObject.Object`
       );
+      return ` extends GObject.Object`;
     }
     return "";
   }
@@ -19773,7 +19785,7 @@ var GenerationHandler = class {
 // src/commands/doc.ts
 var command3 = "doc [modules..]";
 var description3 = "The HTML documentation generator is not yet implemented, but feel free to implement it \u{1F917}";
-var logger4 = new Logger(false, "DocCommand");
+var logger4 = new Logger(true, "DocCommand");
 var builder3 = (yargs2) => {
   const optionNames = Object.keys(docOptions);
   for (const optionName of optionNames) {
@@ -19833,7 +19845,7 @@ var TypeScriptFormatter = class extends Formatter {
 // src/commands/generate.ts
 var command4 = "generate [modules..]";
 var description4 = "Generates Typescript type definition .d.ts files from GIR for GJS";
-var logger6 = new Logger(false, "GenerateCommand");
+var logger6 = new Logger(true, "GenerateCommand");
 var examples4 = [
   [
     `${APP_NAME} generate`,
@@ -19880,7 +19892,7 @@ var handler4 = async (args) => {
           "Generation failed"
         );
       }
-      await service.printComprehensiveSummary();
+      service.printComprehensiveSummary();
       await service.saveComprehensiveReport();
     }
     throw error;
@@ -19897,7 +19909,7 @@ var generate = {
 // src/commands/json.ts
 var command5 = "json [modules..]";
 var description5 = "Generates JSON representation from GIR files for analysis and tooling";
-var logger7 = new Logger(false, "JsonCommand");
+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"],
@@ -19957,7 +19969,7 @@ var json = {
 // src/commands/list.ts
 var command6 = "list [modules..]";
 var description6 = "Lists all available GIR modules";
-var logger8 = new Logger(false, "ListCommand");
+var logger8 = new Logger(true, "ListCommand");
 var examples6 = [
   [`${APP_NAME} list -g ./vala-girs/gir-1.0`, "Lists all available GIR modules in ./vala-girs/gir-1.0"],
   [
@@ -19977,26 +19989,16 @@ var handler6 = async (args) => {
     return logger8.error(ERROR_NO_MODULES_FOUND(config.girDirectories));
   }
   const conflictModules = moduleGroups.filter((moduleGroup) => moduleGroup.hasConflict);
-  const byHandModules = moduleGroups.filter((moduleGroup) => moduleGroup.modules[0].resolvedBy === 1 /* BY_HAND */);
-  const depModules = moduleGroups.filter((moduleGroup) => moduleGroup.modules[0].resolvedBy === 0 /* DEPENDENCE */);
+  const allModules = moduleGroups.filter((moduleGroup) => !moduleGroup.hasConflict);
   logger8.info("\nSearch for gir files in:");
   for (const dir of config.girDirectories) {
     logger8.white(`- ${dir}`);
   }
-  logger8.info("\nSelected Modules:");
-  for (const moduleGroup of byHandModules) {
-    for (const depModule of moduleGroup.modules) {
-      logger8.white(`- ${depModule.packageName}`);
-      logger8.gray(`  - ${depModule.path}`);
-    }
-  }
-  if (depModules.length > 0) {
-    logger8.yellow("\nDependencies:");
-    for (const moduleGroup of depModules) {
-      for (const depModule of moduleGroup.modules) {
-        logger8.white(`- ${depModule.packageName}`);
-        logger8.gray(`- ${depModule.path}`);
-      }
+  logger8.info("\nAvailable Modules:");
+  for (const moduleGroup of allModules) {
+    for (const module of moduleGroup.modules) {
+      logger8.white(`- ${module.packageName}`);
+      logger8.gray(`  - ${module.path}`);
     }
   }
   if (conflictModules.length > 0) {

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@ts-for-gir/cli",
-  "version": "4.0.0-beta.32",
+  "version": "4.0.0-beta.34",
   "description": "TypeScript type definition generator for GObject introspection GIR files",
   "main": "src/index.ts",
   "module": "src/index.ts",
   "type": "module",
   "bin": {
-    "ts-for-gir": "bin/ts-for-gir",
     "cli": "bin/ts-for-gir",
+    "ts-for-gir": "bin/ts-for-gir",
     "ts-for-gir-dev": "bin/ts-for-gir-dev"
   },
   "engines": {
@@ -53,13 +53,13 @@
     ".": "./src/index.ts"
   },
   "devDependencies": {
-    "@gi.ts/parser": "^4.0.0-beta.32",
-    "@ts-for-gir/generator-base": "^4.0.0-beta.32",
-    "@ts-for-gir/generator-html-doc": "^4.0.0-beta.32",
-    "@ts-for-gir/generator-json": "^4.0.0-beta.32",
-    "@ts-for-gir/generator-typescript": "^4.0.0-beta.32",
-    "@ts-for-gir/lib": "^4.0.0-beta.32",
-    "@ts-for-gir/reporter": "^4.0.0-beta.32",
+    "@gi.ts/parser": "^4.0.0-beta.34",
+    "@ts-for-gir/generator-base": "^4.0.0-beta.34",
+    "@ts-for-gir/generator-html-doc": "^4.0.0-beta.34",
+    "@ts-for-gir/generator-json": "^4.0.0-beta.34",
+    "@ts-for-gir/generator-typescript": "^4.0.0-beta.34",
+    "@ts-for-gir/lib": "^4.0.0-beta.34",
+    "@ts-for-gir/reporter": "^4.0.0-beta.34",
     "@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.32",
+    "@ts-for-gir/templates": "^4.0.0-beta.34",
     "colorette": "^2.0.20",
     "cosmiconfig": "^9.0.0",
     "ejs": "^3.1.10",

package/src/commands/copy.ts

@@ -15,7 +15,7 @@ const command = "copy [modules..]";
 
 const description = "Scan for *.gir files and copy them to a new directory";
 
-const logger = new Logger(false, "CopyCommand");
+const logger = new Logger(true, "CopyCommand");
 
 const examples: ReadonlyArray<[string, string?]> = [
 	[`${APP_NAME} copy -o ./gir`, "Copy found *.gir files to ./gir"],

package/src/commands/doc.ts

@@ -22,7 +22,7 @@ const command = "doc [modules..]";
 
 const description = "The HTML documentation generator is not yet implemented, but feel free to implement it 🤗";
 
-const logger = new Logger(false, "DocCommand");
+const logger = new Logger(true, "DocCommand");
 
 const builder: BuilderCallback<DocCommandArgs, ConfigFlags> = (yargs: Argv<DocCommandArgs>) => {
 	const optionNames = Object.keys(docOptions);

package/src/commands/generate.ts

@@ -25,7 +25,7 @@ const command = "generate [modules..]";
 
 const description = "Generates Typescript type definition .d.ts files from GIR for GJS";
 
-const logger = new Logger(false, "GenerateCommand");
+const logger = new Logger(true, "GenerateCommand");
 
 const examples: ReadonlyArray<[string, string?]> = [
 	[
@@ -93,7 +93,7 @@ const handler = async (args: ConfigFlags) => {
 			}
 
 			// Generate and save the report
-			await service.printComprehensiveSummary();
+			service.printComprehensiveSummary();
 			await service.saveComprehensiveReport();
 		}
 

package/src/commands/json.ts

@@ -24,7 +24,7 @@ const command = "json [modules..]";
 
 const description = "Generates JSON representation from GIR files for analysis and tooling";
 
-const logger = new Logger(false, "JsonCommand");
+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`],

package/src/commands/list.ts

@@ -3,7 +3,7 @@
  */
 
 import type { ConfigFlags } from "@ts-for-gir/lib";
-import { APP_NAME, ERROR_NO_MODULES_FOUND, Logger, NSRegistry, ResolveType } from "@ts-for-gir/lib";
+import { APP_NAME, ERROR_NO_MODULES_FOUND, Logger, NSRegistry } from "@ts-for-gir/lib";
 import { getOptionsGeneration, listOptions, load } from "../config.ts";
 import { ModuleLoader } from "../module-loader.ts";
 import type { ListCommandArgs } from "../types/index.ts";
@@ -13,7 +13,7 @@ const command = "list [modules..]";
 
 const description = "Lists all available GIR modules";
 
-const logger = new Logger(false, "ListCommand");
+const logger = new Logger(true, "ListCommand");
 
 const examples: ReadonlyArray<[string, string?]> = [
 	[`${APP_NAME} list -g ./vala-girs/gir-1.0`, "Lists all available GIR modules in ./vala-girs/gir-1.0"],
@@ -32,39 +32,29 @@ const handler = async (args: ConfigFlags) => {
 	const moduleLoader = new ModuleLoader(generateConfig, registry);
 	const { grouped, failed } = await moduleLoader.getModules(config.modules, config.ignore);
 	const moduleGroups = Object.values(grouped);
+
 	if (Object.keys(grouped).length === 0) {
 		return logger.error(ERROR_NO_MODULES_FOUND(config.girDirectories));
 	}
 
 	const conflictModules = moduleGroups.filter((moduleGroup) => moduleGroup.hasConflict);
-
-	const byHandModules = moduleGroups.filter((moduleGroup) => moduleGroup.modules[0].resolvedBy === ResolveType.BY_HAND);
-
-	const depModules = moduleGroups.filter((moduleGroup) => moduleGroup.modules[0].resolvedBy === ResolveType.DEPENDENCE);
+	const allModules = moduleGroups.filter((moduleGroup) => !moduleGroup.hasConflict);
 
 	logger.info("\nSearch for gir files in:");
 	for (const dir of config.girDirectories) {
 		logger.white(`- ${dir}`);
 	}
 
-	logger.info("\nSelected Modules:");
-	for (const moduleGroup of byHandModules) {
-		for (const depModule of moduleGroup.modules) {
-			logger.white(`- ${depModule.packageName}`);
-			logger.gray(`  - ${depModule.path}`);
-		}
-	}
-
-	if (depModules.length > 0) {
-		logger.yellow("\nDependencies:");
-		for (const moduleGroup of depModules) {
-			for (const depModule of moduleGroup.modules) {
-				logger.white(`- ${depModule.packageName}`);
-				logger.gray(`- ${depModule.path}`);
-			}
+	// Show all available modules
+	logger.info("\nAvailable Modules:");
+	for (const moduleGroup of allModules) {
+		for (const module of moduleGroup.modules) {
+			logger.white(`- ${module.packageName}`);
+			logger.gray(`  - ${module.path}`);
 		}
 	}
 
+	// Only show sections if there is actual content
 	if (conflictModules.length > 0) {
 		logger.danger("\nConflicts:");
 		for (const moduleGroup of conflictModules) {

package/src/module-loader/file-finder.ts

@@ -26,9 +26,16 @@ export class FileFinder {
 				continue;
 			}
 
+			// Handle all patterns uniformly (including wildcards like "*" and "Gtk*")
 			const filename = `${globPackageNames[i]}.gir`;
 			const pattern = this.girDirectories.map((girDirectory) => join(girDirectory, filename));
-			const ignoreGirs = ignore.map((girDirectory) => `${girDirectory}.gir`);
+			const ignoreGirs = this.girDirectories.flatMap((girDirectory) =>
+				ignore.map((ignored) => {
+					// Remove */ prefix if present (e.g., "*/Gtk-4.0" -> "Gtk-4.0")
+					const cleanIgnored = ignored.startsWith("*/") ? ignored.slice(2) : ignored;
+					return join(girDirectory, `${cleanIgnored}.gir`);
+				}),
+			);
 			const files = await glob(pattern, { ignore: ignoreGirs });
 
 			for (const file of files) {

package/src/module-loader.ts

@@ -150,8 +150,15 @@ export class ModuleLoader {
 	): Promise<{ loaded: GirModuleResolvedBy[]; failed: Set<string> }> {
 		let newModuleFound = false;
 
-		// Clone array
-		dependencies = [...dependencies];
+		// Clone array and filter out ignored dependencies
+		dependencies = [...dependencies].filter((dep) => {
+			const packageName = dep.packageName;
+			return !ignoreDependencies.some((ignored) => {
+				// Remove */ prefix if present (e.g., "*/Gtk-4.0" -> "Gtk-4.0")
+				const cleanIgnored = ignored.startsWith("*/") ? ignored.slice(2) : ignored;
+				return packageName === cleanIgnored;
+			});
+		});
 
 		while (dependencies.length > 0) {
 			const dependency = dependencies.shift();