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

package/bin/ts-for-gir

@@ -17250,23 +17250,17 @@ var FileFinder = class {
       if (!globPackageNames[i]) {
         continue;
       }
-      if (globPackageNames[i] === "*") {
-        for (const girDirectory of this.girDirectories) {
-          const pattern = join7(girDirectory, "*.gir");
-          const ignoreGirs = ignore.map((ignored) => join7(girDirectory, `${ignored}.gir`));
-          const files = await glob2(pattern, { ignore: ignoreGirs });
-          for (const file of files) {
-            foundFiles.add(file);
-          }
-        }
-      } else {
-        const filename = `${globPackageNames[i]}.gir`;
-        const pattern = this.girDirectories.map((girDirectory) => join7(girDirectory, filename));
-        const ignoreGirs = ignore.map((girDirectory) => `${girDirectory}.gir`);
-        const files = await glob2(pattern, { ignore: ignoreGirs });
-        for (const file of files) {
-          foundFiles.add(file);
-        }
+      const filename = `${globPackageNames[i]}.gir`;
+      const pattern = this.girDirectories.map((girDirectory) => join7(girDirectory, filename));
+      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);
       }
     }
     return foundFiles;
@@ -17536,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;
@@ -19209,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 "";
   }
@@ -19891,7 +19892,7 @@ var handler4 = async (args) => {
           "Generation failed"
         );
       }
-      await service.printComprehensiveSummary();
+      service.printComprehensiveSummary();
       await service.saveComprehensiveReport();
     }
     throw error;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ts-for-gir/cli",
-  "version": "4.0.0-beta.33",
+  "version": "4.0.0-beta.34",
   "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.33",
-    "@ts-for-gir/generator-base": "^4.0.0-beta.33",
-    "@ts-for-gir/generator-html-doc": "^4.0.0-beta.33",
-    "@ts-for-gir/generator-json": "^4.0.0-beta.33",
-    "@ts-for-gir/generator-typescript": "^4.0.0-beta.33",
-    "@ts-for-gir/lib": "^4.0.0-beta.33",
-    "@ts-for-gir/reporter": "^4.0.0-beta.33",
+    "@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.33",
+    "@ts-for-gir/templates": "^4.0.0-beta.34",
     "colorette": "^2.0.20",
     "cosmiconfig": "^9.0.0",
     "ejs": "^3.1.10",

package/src/commands/generate.ts

@@ -93,7 +93,7 @@ const handler = async (args: ConfigFlags) => {
 			}
 
 			// Generate and save the report
-			await service.printComprehensiveSummary();
+			service.printComprehensiveSummary();
 			await service.saveComprehensiveReport();
 		}
 

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

@@ -26,27 +26,20 @@ export class FileFinder {
 				continue;
 			}
 
-			// Handle wildcard patterns
-			if (globPackageNames[i] === "*") {
-				// Special case: find all .gir files
-				for (const girDirectory of this.girDirectories) {
-					const pattern = join(girDirectory, "*.gir");
-					const ignoreGirs = ignore.map((ignored) => join(girDirectory, `${ignored}.gir`));
-					const files = await glob(pattern, { ignore: ignoreGirs });
-					for (const file of files) {
-						foundFiles.add(file);
-					}
-				}
-			} else {
-				// Handle specific module names or patterns like "Gtk*"
-				const filename = `${globPackageNames[i]}.gir`;
-				const pattern = this.girDirectories.map((girDirectory) => join(girDirectory, filename));
-				const ignoreGirs = ignore.map((girDirectory) => `${girDirectory}.gir`);
-				const files = await glob(pattern, { ignore: ignoreGirs });
+			// 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 = 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) {
-					foundFiles.add(file);
-				}
+			for (const file of files) {
+				foundFiles.add(file);
 			}
 		}
 

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();