@ts-for-gir/lib 4.0.0-beta.40 → 4.0.0-beta.41

package/src/gir.ts

@@ -21,7 +21,7 @@ export enum ConflictType {
 	VFUNC_SIGNATURE_CONFLICT,
 }
 
-import { ConsoleReporter, ReporterService } from "@ts-for-gir/reporter";
+import { type ConsoleReporter, LazyReporter } from "@ts-for-gir/reporter";
 import type { IntrospectedField, IntrospectedProperty } from "./gir/property.ts";
 import type { OptionsBase } from "./types/index.ts";
 import { isInvalid, sanitizeIdentifierName, sanitizeNamespace } from "./utils/naming.ts";
@@ -49,44 +49,14 @@ export class TypeIdentifier extends TypeExpression {
 	readonly name: string;
 	readonly namespace: string;
 
-	// Global reporter configuration and instance
-	private static reporterConfig: { enabled: boolean; output: string } = {
-		enabled: false,
-		output: "ts-for-gir-report.json",
-	};
-	private static globalReporter: ConsoleReporter | null = null;
+	private static readonly reporter = new LazyReporter("TypeIdentifier");
 
-	static configureReporter(enabled: boolean, output: string = "ts-for-gir-report.json") {
-		TypeIdentifier.reporterConfig = { enabled, output };
-
-		// Reset global reporter to force recreation with new config
-		if (TypeIdentifier.globalReporter) {
-			TypeIdentifier.globalReporter = null;
-		}
-
-		// Create and register the global reporter if enabled
-		if (enabled) {
-			TypeIdentifier.globalReporter = new ConsoleReporter(true, "TypeIdentifier", enabled, output);
-			const reporterService = ReporterService.getInstance();
-			reporterService.registerReporter("TypeIdentifier", TypeIdentifier.globalReporter);
-		}
-	}
-
-	private static getReporter(): ConsoleReporter {
-		if (!TypeIdentifier.globalReporter) {
-			const config = TypeIdentifier.reporterConfig;
-			TypeIdentifier.globalReporter = new ConsoleReporter(true, "TypeIdentifier", config.enabled, config.output);
-
-			if (config.enabled) {
-				const reporterService = ReporterService.getInstance();
-				reporterService.registerReporter("TypeIdentifier", TypeIdentifier.globalReporter);
-			}
-		}
-		return TypeIdentifier.globalReporter;
+	static configureReporter(enabled: boolean, output?: string) {
+		TypeIdentifier.reporter.configure(enabled, output);
 	}
 
 	get log(): ConsoleReporter {
-		return TypeIdentifier.getReporter();
+		return TypeIdentifier.reporter.get();
 	}
 
 	constructor(name: string, namespace: string) {
@@ -194,7 +164,7 @@ export class TypeIdentifier extends TypeExpression {
 
 			return new TypeIdentifier(c_resolved_name, ns.namespace);
 		} else if (namespace.namespace === ns.namespace) {
-			this.log.reportTypeResolutionError(
+			this.log.reportTypeResolutionWarning(
 				this.name,
 				ns.namespace,
 				`Unable to resolve type ${this.name} in same namespace ${ns.namespace}!`,
@@ -203,11 +173,12 @@ export class TypeIdentifier extends TypeExpression {
 			return null;
 		}
 
-		this.log.reportTypeResolutionError(
+		this.log.reportTypeResolutionWarning(
 			this.name,
 			this.namespace,
 			`Type ${this.name} could not be resolved in ${namespace.namespace} ${namespace.version}`,
-			`Failed to resolve type during namespace processing`,
+			`Referenced from ${namespace.namespace} ${namespace.version}`,
+			`${namespace.namespace} ${namespace.version}`,
 		);
 		return null;
 	}
@@ -876,7 +847,12 @@ export class ArrayType extends TypeExpression {
 	}
 }
 
-// Common native types as constants
+/**
+ * Common native types as constants.
+ * These represent TypeScript types in generated .d.ts output for GJS runtime,
+ * not internal tool types. Uses of `any` here are intentional — they produce
+ * correct type definitions for GLib/GIO/GObject APIs that accept dynamic values.
+ */
 export const ThisType = new NativeType("this");
 export const ObjectType = new NativeType("object");
 export const AnyType = new NativeType("any");

package/src/injections/gio.ts

@@ -1,3 +1,8 @@
+/**
+ * GIO type injection overrides.
+ * Uses of `any`/`AnyType` in this file are intentional — they produce
+ * generated .d.ts output matching GIO's dynamic runtime behavior.
+ */
 import { GirDirection } from "@gi.ts/parser";
 import { IntrospectedAlias } from "../gir/alias.ts";
 import { IntrospectedConstructor } from "../gir/constructor.ts";
@@ -28,6 +33,7 @@ import {
 	Uint8ArrayType,
 	VoidType,
 } from "../gir.ts";
+import { girParsingReporter } from "../utils/gir-parsing.ts";
 
 export default {
 	namespace: "Gio",
@@ -700,7 +706,14 @@ export default {
 		if (existingMethodIndex !== -1) {
 			ActionMap.members[existingMethodIndex] = newMethod;
 		} else {
-			console.warn("Could not find existing add_action_entries method to override");
+			girParsingReporter
+				.get()
+				.reportParsingFailure(
+					"add_action_entries",
+					"method",
+					"Gio",
+					"Could not find existing add_action_entries method to override in Gio.ActionMap",
+				);
 			ActionMap.members.push(newMethod);
 		}
 	},

package/src/injections/glib.ts

@@ -1,3 +1,8 @@
+/**
+ * GLib type injection overrides.
+ * Uses of `any`/`AnyType` in this file are intentional — they produce
+ * generated .d.ts output matching GLib's dynamic runtime behavior.
+ */
 import { GirDirection } from "@gi.ts/parser";
 import { IntrospectedConstructor } from "../gir/constructor.ts";
 import { IntrospectedDirectAllocationConstructor } from "../gir/direct-allocation-constructor.ts";

package/src/injections/gobject.ts

@@ -1,3 +1,8 @@
+/**
+ * GObject type injection overrides.
+ * Uses of `any`/`AnyType` in this file are intentional — they produce
+ * generated .d.ts output matching GObject's dynamic runtime behavior.
+ */
 import { GirDirection } from "@gi.ts/parser";
 import { IntrospectedAlias } from "../gir/alias.ts";
 import { IntrospectedFunction } from "../gir/function.ts";

package/src/types/options-generation.ts

@@ -50,4 +50,16 @@ export interface OptionsGeneration extends OptionsBase {
 	 * Output file path for the reporter
 	 */
 	reporterOutput: string;
+	/** Generate a single unified documentation for all modules instead of separate per-module docs */
+	combined?: boolean;
+	/** URL template for source links in generated documentation. Supports {path}, {line}, {gitRevision} placeholders */
+	sourceLinkTemplate?: string;
+	/** Theme for HTML documentation generation (default: "gi-docgen") */
+	theme?: string;
+	/** Path to a README file to use as the documentation index page (default: "none") */
+	readme?: string;
+	/** Use TypeDoc merge mode to generate HTML from pre-generated JSON files */
+	merge?: boolean;
+	/** Directory containing pre-generated TypeDoc JSON files for merge mode (from 'ts-for-gir json') */
+	jsonDir?: string;
 }

package/src/types/user-config.ts

@@ -55,4 +55,16 @@ export interface UserConfig {
 	 * Output file path for the reporter
 	 */
 	reporterOutput: string;
+	/** Generate a single unified documentation for all modules instead of separate per-module docs */
+	combined?: boolean;
+	/** URL template for source links in generated documentation. Supports {path}, {line}, {gitRevision} placeholders */
+	sourceLinkTemplate?: string;
+	/** Theme for HTML documentation generation (default: "gi-docgen") */
+	theme?: string;
+	/** Path to a README file to use as the documentation index page (default: "none") */
+	readme?: string;
+	/** Use TypeDoc merge mode to generate HTML from pre-generated JSON files */
+	merge?: boolean;
+	/** Directory containing pre-generated TypeDoc JSON files for merge mode (from 'ts-for-gir json') */
+	jsonDir?: string;
 }

package/src/utils/conflicts.ts

@@ -1,5 +1,5 @@
 import { GirDirection } from "@gi.ts/parser";
-import { ConsoleReporter, ReporterService } from "@ts-for-gir/reporter";
+import { LazyReporter } from "@ts-for-gir/reporter";
 import { IntrospectedConstructor } from "../gir/constructor.ts";
 import { FilterBehavior } from "../gir/data.ts";
 import type { IntrospectedFunction } from "../gir/function.ts";
@@ -20,48 +20,14 @@ import { AnyType, ArrayType, ConflictType, NeverType, TypeConflict } from "../gi
 import { findMap } from "../util.ts";
 import { isSubtypeOf } from "./type-resolution.ts";
 
-// Global reporter configuration for conflicts
-let conflictsReporterInstance: ConsoleReporter | null = null;
-let conflictsReporterConfig: { enabled: boolean; output: string } = {
-	enabled: false,
-	output: "ts-for-gir-report.json",
-};
+export const conflictsReporter = new LazyReporter("conflicts");
 
-function configureConflictsReporterInternal(enabled: boolean, output: string = "ts-for-gir-report.json") {
-	conflictsReporterConfig = { enabled, output };
-
-	// Reset instance to force recreation with new config
-	if (conflictsReporterInstance) {
-		conflictsReporterInstance = null;
-	}
-
-	// Create and register the global reporter if enabled
-	if (enabled) {
-		conflictsReporterInstance = new ConsoleReporter(true, "conflicts", enabled, output);
-		const reporterService = ReporterService.getInstance();
-		reporterService.registerReporter("conflicts", conflictsReporterInstance);
-	}
-}
-
-function getConflictsReporterInstance(): ConsoleReporter {
-	if (!conflictsReporterInstance) {
-		const config = conflictsReporterConfig;
-		conflictsReporterInstance = new ConsoleReporter(true, "conflicts", config.enabled, config.output);
-
-		// Register with reporter service if reporting is enabled
-		if (config.enabled) {
-			const reporterService = ReporterService.getInstance();
-			reporterService.registerReporter("conflicts", conflictsReporterInstance);
-		}
-	}
-	return conflictsReporterInstance;
-}
-
-const log = getConflictsReporterInstance();
-
-// Export function to configure conflicts reporter
-export function configureConflictsReporter(enabled: boolean, output: string = "ts-for-gir-report.json") {
-	configureConflictsReporterInternal(enabled, output);
+// Use a function to always get the current reporter instance.
+// A module-level `const log = conflictsReporter.get()` would capture a stale
+// reference from before configure() is called, causing problems to be logged
+// to console but not stored in the report.
+function getLog() {
+	return conflictsReporter.get();
 }
 
 // Constants for GObject methods that always conflict
@@ -119,7 +85,7 @@ export function filterFunctionConflict<
 
 			if (conflictResult.shouldOmit) {
 				// Always omit methods that conflict with properties/fields
-				log.reportTypeConflict(
+				getLog().reportTypeConflict(
 					"field_property",
 					next.name,
 					next.parent?.namespace.namespace || "unknown",
@@ -127,7 +93,7 @@ export function filterFunctionConflict<
 				);
 			} else if (conflictResult.hasConflict) {
 				if (isInheritedMethods) {
-					log.reportTypeConflict(
+					getLog().reportTypeConflict(
 						"method",
 						next.name,
 						next.parent?.namespace.namespace || "unknown",
@@ -445,7 +411,7 @@ function checkPropertyConflicts<T extends IntrospectedClassMember | Introspected
 					element instanceof IntrospectedProperty &&
 					!isSubtypeOf(ns, thisType, resolved_parent.getType(), element.type, p.type)
 				) {
-					log.reportTypeConflict(
+					getLog().reportTypeConflict(
 						"general",
 						element.name,
 						element.parent?.namespace.namespace || "unknown",