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

package/src/json-definition-generator.ts

@@ -1,18 +1,28 @@
-import { type GirModule, type NSRegistry, type OptionsGeneration, Reporter, ReporterService } from "@ts-for-gir/lib";
-import { JsonGenerator } from "./json-generator.ts";
+import { mkdir, writeFile } from "node:fs/promises";
+import { join } from "node:path";
+
+import type { GirModule, NSRegistry, OptionsGeneration } from "@ts-for-gir/lib";
+import { Reporter, ReporterService } from "@ts-for-gir/lib";
+
+import { TypeDocPipeline } from "./typedoc-pipeline.ts";
 
 /**
- * Generator interface implementation for JSON output
- * This provides the high-level Generator interface that can be used by the CLI
+ * Generator that produces TypeDoc JSON output from GIR modules.
+ *
+ * Uses {@link TypeDocPipeline} for the shared .d.ts → TypeDoc conversion,
+ * then serializes each ProjectReflection to JSON.
  */
 export class JsonDefinitionGenerator {
 	readonly log: Reporter;
 	readonly config: OptionsGeneration;
 	readonly registry: NSRegistry;
 
+	private readonly pipeline: TypeDocPipeline;
+
 	constructor(config: OptionsGeneration, registry: NSRegistry) {
 		this.config = config;
 		this.registry = registry;
+		this.pipeline = new TypeDocPipeline(config, registry);
 		this.log = new Reporter(
 			this.config.verbose,
 			JsonDefinitionGenerator.name,
@@ -20,42 +30,81 @@ export class JsonDefinitionGenerator {
 			this.config.reporterOutput,
 		);
 
-		// Register with reporter service if reporting is enabled
 		if (this.config.reporter) {
-			const reporterService = ReporterService.getInstance();
-			reporterService.registerReporter(JsonDefinitionGenerator.name, this.log);
+			ReporterService.getInstance().registerReporter(JsonDefinitionGenerator.name, this.log);
 		}
 	}
 
+	public async start(): Promise<void> {
+		this.log.info("Starting JSON generation via TypeDoc...");
+		await this.pipeline.start();
+	}
+
 	public async generate(module: GirModule): Promise<void> {
-		const jsonGenerator = new JsonGenerator(module, this.config);
-		const output = await jsonGenerator.stringifyNamespace(module);
+		await this.pipeline.generate(module);
+	}
 
-		if (output) {
+	public async finish(girModules: GirModule[]): Promise<void> {
+		await this.pipeline.finishTypescriptGeneration(girModules);
+
+		try {
 			if (this.config.outdir) {
-				// Write to file
-				const fs = await import("node:fs/promises");
-				const path = await import("node:path");
-
-				const filename = `${module.packageName}.json`;
-				const filepath = path.join(this.config.outdir, filename);
-
-				await fs.writeFile(filepath, output, "utf8");
-				this.log.info(`Generated ${filename}`);
-			} else {
-				// Output to console
-				this.log.log(output);
+				await mkdir(this.config.outdir, { recursive: true });
 			}
-		} else {
-			this.log.error(`Failed to generate JSON for ${module.packageName}`);
+
+			for (const module of this.pipeline.modules) {
+				await this.generateTypeDocJson(module);
+			}
+
+			// Always generate JSON for the GJS core types package
+			await this.generateGjsJson();
+
+			if (this.config.outdir) {
+				this.log.success(
+					`JSON generation completed for ${this.pipeline.modules.length} modules in ${this.config.outdir}`,
+				);
+			}
+		} finally {
+			await this.pipeline.cleanup();
 		}
 	}
 
-	public async start(): Promise<void> {
-		this.log.info("Starting JSON generation...");
+	private async generateGjsJson(): Promise<void> {
+		const result = await this.pipeline.createGjsTypeDocApp();
+		if (!result) {
+			this.log.info("GJS package not available, skipping JSON generation for GJS");
+			return;
+		}
+
+		const { app, project } = result;
+		const gjsDir = this.pipeline.getGjsDir();
+		const jsonOutput = app.serializer.projectToObject(project, gjsDir);
+		const pretty = this.config.verbose;
+		const jsonStr = `${JSON.stringify(jsonOutput, null, pretty ? "\t" : "")}\n`;
+
+		if (this.config.outdir) {
+			const filepath = join(this.config.outdir, "Gjs.json");
+			await writeFile(filepath, jsonStr, "utf8");
+			this.log.info(`Generated ${filepath}`);
+		} else {
+			this.log.log(jsonStr);
+		}
 	}
 
-	public async finish(girModules: GirModule[]): Promise<void> {
-		this.log.success(`JSON generation completed for ${girModules.length} modules`);
+	private async generateTypeDocJson(module: GirModule): Promise<void> {
+		const { app, project } = await this.pipeline.createTypeDocApp(module);
+		const moduleDir = this.pipeline.getModuleDir(module);
+
+		const jsonOutput = app.serializer.projectToObject(project, moduleDir);
+		const pretty = this.config.verbose;
+		const jsonStr = `${JSON.stringify(jsonOutput, null, pretty ? "\t" : "")}\n`;
+
+		if (this.config.outdir) {
+			const filepath = join(this.config.outdir, `${module.packageName}.json`);
+			await writeFile(filepath, jsonStr, "utf8");
+			this.log.info(`Generated ${filepath}`);
+		} else {
+			this.log.log(jsonStr);
+		}
 	}
 }