@ts-for-gir/lib 4.0.0-rc.4 → 4.0.0-rc.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ts-for-gir/lib",
-  "version": "4.0.0-rc.4",
+  "version": "4.0.0-rc.6",
   "description": "Typescript .d.ts generator from GIR for gjs",
   "main": "src/index.ts",
   "module": "src/index.ts",
@@ -41,19 +41,19 @@
     "type definitions"
   ],
   "devDependencies": {
-    "@ts-for-gir/tsconfig": "^4.0.0-rc.4",
+    "@ts-for-gir/tsconfig": "^4.0.0-rc.6",
     "@types/ejs": "^3.1.5",
     "@types/lodash": "^4.17.24",
-    "@types/node": "^24.12.2",
+    "@types/node": "^25.6.0",
     "rimraf": "^6.1.3",
-    "typescript": "^6.0.2"
+    "typescript": "^6.0.3"
   },
   "dependencies": {
-    "@gi.ts/parser": "^4.0.0-rc.4",
-    "@ts-for-gir/reporter": "^4.0.0-rc.4",
-    "@ts-for-gir/templates": "^4.0.0-rc.4",
+    "@gi.ts/parser": "^4.0.0-rc.6",
+    "@ts-for-gir/reporter": "^4.0.0-rc.6",
+    "@ts-for-gir/templates": "^4.0.0-rc.6",
     "colorette": "^2.0.20",
-    "ejs": "^5.0.1",
+    "ejs": "^5.0.2",
     "glob": "^13.0.6",
     "lodash": "4.18.1"
   }

package/src/dependency-manager.ts

@@ -132,6 +132,15 @@ export class DependencyManager {
 	}
 
 	createImportPath(packageName: string, namespace: string, version: string): string {
+		// In external-deps mode every dep import is resolved against an installed npm package
+		// (e.g. `@girs/glib-2.0`), regardless of `package` mode. User-supplied overrides win
+		// for namespaces with non-default scopes/versions (e.g. `Soup → @girs/soup-3.0`).
+		if (this.config.externalDeps) {
+			const override = this.config.externalPackages?.[namespace];
+			if (override) return override;
+			const importName = transformImportName(packageName);
+			return `${this.config.npmScope}/${importName}`;
+		}
 		if (!this.config.package) {
 			return `gi://${namespace}?version=${version}`;
 		}

package/src/gir/registry.ts

@@ -103,13 +103,17 @@ export class NSRegistry {
 	}
 
 	transform(options: OptionsTransform) {
-		const GLib = this.assertNamespace("GLib", "2.0");
-		const Gio = this.assertNamespace("Gio", "2.0");
-		const GObject = this.assertNamespace("GObject", "2.0");
+		// In tolerant external-deps mode (with --allow-missing-deps) the core namespaces
+		// may not be loaded. Sync their package_version only when actually present;
+		// generify/inject still run on whatever IS loaded (other modules' transformations
+		// don't depend on GLib being in the registry).
+		const GLib = this.namespace("GLib", "2.0");
+		const Gio = this.namespace("Gio", "2.0");
+		const GObject = this.namespace("GObject", "2.0");
 
 		// These follow the GLib version.
-		Gio.package_version = [...GLib.package_version];
-		GObject.package_version = [...GLib.package_version];
+		if (GLib && Gio) Gio.package_version = [...GLib.package_version];
+		if (GLib && GObject) GObject.package_version = [...GLib.package_version];
 
 		const interfaceVisitor = new InterfaceVisitor();
 
@@ -119,11 +123,13 @@ export class NSRegistry {
 
 		this.registerTransformation(classVisitor);
 
-		console.log("Adding generics...");
-		generify(this, options.inferGenerics);
+		if (GLib && Gio) {
+			console.log("Adding generics...");
+			generify(this, options.inferGenerics);
 
-		console.log("Injecting types...");
-		inject(this);
+			console.log("Injecting types...");
+			inject(this);
+		}
 	}
 
 	defaultVersionOf(name: string): string | null {

package/src/types/options-generation.ts

@@ -64,4 +64,25 @@ export interface OptionsGeneration extends OptionsBase {
 	merge?: boolean;
 	/** Directory containing pre-generated TypeDoc JSON files for merge mode (from 'ts-for-gir json') */
 	jsonDir?: string;
+	/**
+	 * External-deps mode: emit `import` statements that reference dependency types from
+	 * already-installed npm packages (e.g. `@girs/glib-2.0`) instead of regenerating them.
+	 * Designed for project-local GIRs (Vala bridges etc.) where the surrounding `@girs/*`
+	 * ecosystem is already in node_modules. No GJS supporting files, no index aggregator.
+	 */
+	externalDeps: boolean;
+	/**
+	 * In `externalDeps` mode, allow generation to proceed even when some transitive dep GIRs
+	 * cannot be found. Default is strict: missing deps abort the run, since divergent dep
+	 * availability between environments (dev with -devel packages vs CI without) would
+	 * silently produce inconsistent generated `.d.ts` output.
+	 */
+	allowMissingDeps: boolean;
+	/**
+	 * Override the default `<npmScope>/<importName>` mapping for individual namespaces when
+	 * resolving external dependency imports in `externalDeps` mode.
+	 *
+	 * Example: `{ Soup: '@girs/soup-3.0', GLib: '@girs/glib-2.0' }`
+	 */
+	externalPackages?: Record<string, string>;
 }

package/src/types/user-config.ts

@@ -77,4 +77,24 @@ export interface UserConfig {
 	merge?: boolean;
 	/** Directory containing pre-generated TypeDoc JSON files for merge mode (from 'ts-for-gir json') */
 	jsonDir?: string;
+	/**
+	 * External-deps mode: emit `import` statements that reference dependency types from
+	 * already-installed npm packages (e.g. `@girs/glib-2.0`) instead of regenerating them.
+	 * Designed for project-local GIRs (Vala bridges etc.) where the surrounding `@girs/*`
+	 * ecosystem is already in node_modules.
+	 */
+	externalDeps: boolean;
+	/**
+	 * Allow `externalDeps` generation to proceed when some transitive dep GIRs are missing.
+	 * Default is strict: missing deps cause an error to prevent silent type-quality drift
+	 * between environments with and without system GIR -devel packages installed.
+	 */
+	allowMissingDeps: boolean;
+	/**
+	 * Override the default `<npmScope>/<importName>` mapping for individual namespaces when
+	 * resolving external dependency imports in `externalDeps` mode.
+	 *
+	 * Example: `{ Soup: '@girs/soup-3.0', GLib: '@girs/glib-2.0' }`
+	 */
+	externalPackages?: Record<string, string>;
 }