@ts-for-gir/generator-json 4.0.0-beta.41 → 4.0.0-beta.42

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ts-for-gir/generator-json",
-  "version": "4.0.0-beta.41",
+  "version": "4.0.0-beta.42",
   "description": "JSON generator for ts-for-gir",
   "main": "src/index.ts",
   "module": "src/index.ts",
@@ -36,17 +36,17 @@
     "json"
   ],
   "devDependencies": {
-    "@ts-for-gir/tsconfig": "^4.0.0-beta.41",
+    "@ts-for-gir/tsconfig": "^4.0.0-beta.42",
     "@types/node": "^24.12.0",
     "typescript": "^5.9.3"
   },
   "dependencies": {
-    "@gi.ts/parser": "^4.0.0-beta.41",
-    "@ts-for-gir/generator-base": "^4.0.0-beta.41",
-    "@ts-for-gir/generator-typescript": "^4.0.0-beta.41",
-    "@ts-for-gir/gir-module-metadata": "^4.0.0-beta.41",
-    "@ts-for-gir/lib": "^4.0.0-beta.41",
-    "@ts-for-gir/reporter": "^4.0.0-beta.41",
+    "@gi.ts/parser": "^4.0.0-beta.42",
+    "@ts-for-gir/generator-base": "^4.0.0-beta.42",
+    "@ts-for-gir/generator-typescript": "^4.0.0-beta.42",
+    "@ts-for-gir/gir-module-metadata": "^4.0.0-beta.42",
+    "@ts-for-gir/lib": "^4.0.0-beta.42",
+    "@ts-for-gir/reporter": "^4.0.0-beta.42",
     "typedoc": "^0.28.17"
   }
 }

package/src/gir-metadata-types.ts

@@ -107,7 +107,7 @@ export interface GirNamespaceMetadata {
 	cPrefixes: string[];
 	libraryVersion: string;
 	dependencies: Array<{ namespace: string; version: string }>;
-	/** NPM package version (e.g. "4.20.3-4.0.0-beta.41") */
+	/** NPM package version (e.g. "4.20.3-4.0.0-beta.42") */
 	packageVersion?: string;
 	/** Human-readable display name, e.g. "GTK" */
 	displayName?: string;

package/src/typedoc-pipeline.ts

@@ -14,6 +14,7 @@ import {
 	normalizePath,
 	type OptionsReader,
 	type ProjectReflection,
+	ReferenceReflection,
 	ReflectionCategory,
 	Serializer,
 	TSConfigReader,
@@ -199,7 +200,7 @@ export class TypeDocPipeline {
 	 * converts each package separately, then merges them into one ProjectReflection.
 	 */
 	async createCombinedTypeDocApp(): Promise<TypeDocAppResult> {
-		return this.bootstrapAndConvert(
+		const result = await this.bootstrapAndConvert(
 			{
 				entryPoints: [join(this.tempDir, "*")],
 				entryPointStrategy: "packages",
@@ -213,6 +214,8 @@ export class TypeDocPipeline {
 			},
 			[new TSConfigReader()],
 		);
+		this.fixExportImportReferences(result.project);
+		return result;
 	}
 
 	/**
@@ -235,7 +238,9 @@ export class TypeDocPipeline {
 		// Register deserializer for merge mode — restores GIR metadata from JSON
 		app.deserializer.addDeserializer(new GirMetadataDeserializer());
 
-		return this.convertApp(app, "merged documentation");
+		const result = await this.convertApp(app, "merged documentation");
+		this.fixExportImportReferences(result.project);
+		return result;
 	}
 
 	async cleanup(): Promise<void> {
@@ -488,6 +493,77 @@ export class TypeDocPipeline {
 		return dotIdx > 0 ? name.slice(0, dotIdx) : name;
 	}
 
+	/**
+	 * Fix ReferenceReflection targets broken by TypeDoc's handling of
+	 * `export import X = Y.Z` statements.
+	 *
+	 * TypeDoc may resolve all such re-exports within a namespace to the same
+	 * target reflection (e.g. every Cairo enum points to Status). This method
+	 * detects the mismatch and corrects each reference's internal target ID.
+	 */
+	private fixExportImportReferences(project: ProjectReflection): void {
+		// Step 1: Identify targets that are shared by multiple references with
+		// different names — the specific bug pattern where TypeDoc resolves all
+		// `export import X = Y.Z` statements to the same target.
+		const refsByTargetId = new Map<number, ReferenceReflection[]>();
+		for (const r of Object.values(project.reflections)) {
+			if (!(r instanceof ReferenceReflection)) continue;
+			const target = r.tryGetTargetReflectionDeep();
+			if (!target) continue;
+			let list = refsByTargetId.get(target.id);
+			if (!list) {
+				list = [];
+				refsByTargetId.set(target.id, list);
+			}
+			list.push(r);
+		}
+
+		// Only consider targets where multiple differently-named references
+		// point to the same reflection — a single reference with a different
+		// name (e.g. `default → Gio`) is intentional, not a bug.
+		const brokenTargetIds = new Set<number>();
+		for (const [targetId, refs] of refsByTargetId) {
+			const distinctNames = new Set(refs.map((r) => r.name));
+			if (distinctNames.size > 1) {
+				brokenTargetIds.add(targetId);
+			}
+		}
+
+		if (brokenTargetIds.size === 0) return;
+
+		// Step 2: Build a lookup of non-reference reflections by name.
+		const nonRefByName = new Map<string, Array<{ id: number; kind: number }>>();
+		for (const refl of Object.values(project.reflections)) {
+			if (refl.isReference()) continue;
+			let list = nonRefByName.get(refl.name);
+			if (!list) {
+				list = [];
+				nonRefByName.set(refl.name, list);
+			}
+			list.push({ id: refl.id, kind: refl.kind });
+		}
+
+		// Step 3: Fix only the references pointing to broken (shared) targets.
+		for (const r of Object.values(project.reflections)) {
+			if (!(r instanceof ReferenceReflection)) continue;
+
+			const target = r.tryGetTargetReflectionDeep();
+			if (!target || target.name === r.name) continue;
+			if (!brokenTargetIds.has(target.id)) continue;
+
+			const candidates = nonRefByName.get(r.name);
+			if (!candidates?.length) continue;
+
+			// Prefer a candidate with the same kind as the (wrong) target.
+			// Fall back to the first candidate if kinds don't match.
+			const correctTarget = candidates.find((c) => c.kind === target.kind) ?? candidates[0];
+
+			// ReferenceReflection._target is private; direct assignment
+			// is the only way to fix the resolved ID after conversion.
+			(r as unknown as { _target: number })._target = correctTarget.id;
+		}
+	}
+
 	/** Register GIR metadata serializer and namespace-level metadata on a TypeDoc app. */
 	private registerGirMetadata(app: Application, module: GirModule): void {
 		const index = buildGirLookupIndex(module);