@ts-for-gir/lib 4.0.0-beta.35 → 4.0.0-beta.37

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ts-for-gir/lib",
-  "version": "4.0.0-beta.35",
+  "version": "4.0.0-beta.37",
   "description": "Typescript .d.ts generator from GIR for gjs",
   "main": "src/index.ts",
   "module": "src/index.ts",
@@ -43,14 +43,14 @@
   "devDependencies": {
     "@types/ejs": "^3.1.5",
     "@types/lodash": "^4.17.20",
-    "@types/node": "^24.2.1",
+    "@types/node": "^24.5.2",
     "rimraf": "^6.0.1",
     "typescript": "^5.9.2"
   },
   "dependencies": {
-    "@gi.ts/parser": "^4.0.0-beta.35",
-    "@ts-for-gir/reporter": "^4.0.0-beta.35",
-    "@ts-for-gir/templates": "^4.0.0-beta.35",
+    "@gi.ts/parser": "^4.0.0-beta.37",
+    "@ts-for-gir/reporter": "^4.0.0-beta.37",
+    "@ts-for-gir/templates": "^4.0.0-beta.37",
     "colorette": "^2.0.20",
     "ejs": "^3.1.10",
     "glob": "^11.0.3",

package/src/dependency-manager.ts

@@ -1,5 +1,6 @@
 import { readFile } from "node:fs/promises";
 import { type GirInclude, type GirNamespace, type GirRepository, type GirXML, parser } from "@gi.ts/parser";
+import { APP_VERSION } from "./constants.ts";
 import type { GirModule } from "./gir-module.ts";
 import { LibraryVersion } from "./library-version.ts";
 import { Logger } from "./logger.ts";
@@ -109,10 +110,20 @@ export class DependencyManager {
 		];
 	}
 
-	createImportProperties(namespace: string, packageName: string, version: string) {
+	createImportProperties(namespace: string, packageName: string, version: string, libraryVersion?: LibraryVersion) {
 		const importPath = this.createImportPath(packageName, namespace, version);
 		const importDef = this.createImportDef(namespace, importPath);
-		const packageJsonImport = this.createPackageJsonImport(importPath);
+
+		// For GObject and Gio, use GLib's library version if available
+		let effectiveLibraryVersion = libraryVersion;
+		if ((namespace === "GObject" || namespace === "Gio") && this._cache["GLib-2.0"]) {
+			const glibDep = this._cache["GLib-2.0"];
+			if (glibDep.libraryVersion.toString() !== "0.0.0") {
+				effectiveLibraryVersion = glibDep.libraryVersion;
+			}
+		}
+
+		const packageJsonImport = this.createPackageJsonImport(importPath, effectiveLibraryVersion);
 		return {
 			importPath,
 			importDef,
@@ -135,8 +146,15 @@ export class DependencyManager {
 			: `import type ${namespace} from '${importPath}';`;
 	}
 
-	createPackageJsonImport(importPath: string): string {
-		const depVersion = this.config.workspace ? "workspace:^" : "*";
+	createPackageJsonImport(importPath: string, libraryVersion?: LibraryVersion): string {
+		let depVersion: string;
+		if (this.config.workspace) {
+			depVersion = "workspace:^";
+		} else if (libraryVersion) {
+			depVersion = `${libraryVersion.toString()}-${APP_VERSION}`;
+		} else {
+			depVersion = APP_VERSION;
+		}
 		return `"${importPath}": "${depVersion}"`;
 	}
 
@@ -258,7 +276,7 @@ export class DependencyManager {
 			version,
 			libraryVersion,
 			girXML,
-			...this.createImportProperties(namespace, packageName, version),
+			...this.createImportProperties(namespace, packageName, version, libraryVersion),
 		};
 
 		// Special case for Cairo

package/src/generics/clutter.ts

@@ -66,6 +66,15 @@ export const clutter10 = createClutterTemplate("10");
 export const clutter11 = createClutterTemplate("11");
 export const clutter12 = createClutterTemplate("12");
 export const clutter13 = createClutterTemplate("13");
+/** Clutter-14 was introduced with GNOME 45 */
 export const clutter14 = createClutterTemplate("14");
+/** Clutter-15 was introduced with GNOME 47 */
 export const clutter15 = createClutterTemplate("15");
+/** Clutter-16 was introduced with GNOME 48 */
 export const clutter16 = createClutterTemplate("16");
+/** Clutter-17 was introduced with GNOME 49 */
+export const clutter17 = createClutterTemplate("17");
+// Possibly future versions, adjust if necessary
+export const clutter18 = createClutterTemplate("18");
+export const clutter19 = createClutterTemplate("19");
+export const clutter20 = createClutterTemplate("20");

package/src/generics/generify.ts

@@ -1,11 +1,23 @@
 import type { NSRegistry } from "../gir/registry.ts";
 import type { NamespaceDefinition } from "../types/generics-config.ts";
-import { clutter10, clutter11, clutter12, clutter13, clutter14, clutter15 } from "./clutter.ts";
+import {
+	clutter10,
+	clutter11,
+	clutter12,
+	clutter13,
+	clutter14,
+	clutter15,
+	clutter16,
+	clutter17,
+	clutter18,
+	clutter19,
+	clutter20,
+} from "./clutter.ts";
 import gio from "./gio.ts";
 import glib from "./glib.ts";
 import gtk from "./gtk.ts";
-import { meta10, meta11, meta12, meta13, meta14, meta15 } from "./meta.ts";
-import { st1, st12, st13, st14, st15 } from "./st.ts";
+import { meta10, meta11, meta12, meta13, meta14, meta15, meta16, meta17, meta18, meta19, meta20 } from "./meta.ts";
+import { st1, st12, st13, st14, st15, st16, st17, st18, st19, st20 } from "./st.ts";
 import { GenericVisitor } from "./visitor.ts";
 
 // Core namespace definitions that are required
@@ -20,17 +32,32 @@ const OPTIONAL_DEFINITIONS: NamespaceDefinition[] = [
 	clutter13,
 	clutter14,
 	clutter15,
+	clutter16,
+	clutter17,
+	clutter18,
+	clutter19,
+	clutter20,
 	st1,
 	st12,
 	st13,
 	st14,
 	st15,
+	st16,
+	st17,
+	st18,
+	st19,
+	st20,
 	meta10,
 	meta11,
 	meta12,
 	meta13,
 	meta14,
 	meta15,
+	meta16,
+	meta17,
+	meta18,
+	meta19,
+	meta20,
 ];
 
 function createDefinitionProcessor(registry: NSRegistry, inferGenerics: boolean, required: boolean = true) {

package/src/generics/meta.ts

@@ -36,6 +36,15 @@ export const meta10 = createMetaTemplate("10");
 export const meta11 = createMetaTemplate("11");
 export const meta12 = createMetaTemplate("12");
 export const meta13 = createMetaTemplate("13");
+/** Meta-14 was introduced with GNOME 45 */
 export const meta14 = createMetaTemplate("14");
+/** Meta-15 was introduced with GNOME 47 */
 export const meta15 = createMetaTemplate("15");
+/** Meta-16 was introduced with GNOME 48 */
 export const meta16 = createMetaTemplate("16");
+/** Meta-17 was introduced with GNOME 49 */
+export const meta17 = createMetaTemplate("17");
+// Possibly future versions, adjust if necessary
+export const meta18 = createMetaTemplate("18");
+export const meta19 = createMetaTemplate("19");
+export const meta20 = createMetaTemplate("20");

package/src/generics/st.ts

@@ -192,6 +192,15 @@ function updatePropertyType(
 export const st1 = createStTemplate("1.0");
 export const st12 = createStTemplate("12");
 export const st13 = createStTemplate("13");
+/** St-14 was introduced with GNOME 45 */
 export const st14 = createStTemplate("14");
+/** St-15 was introduced with GNOME 47 */
 export const st15 = createStTemplate("15");
+/** St-16 was introduced with GNOME 48 */
 export const st16 = createStTemplate("16");
+/** St-17 was introduced with GNOME 49 */
+export const st17 = createStTemplate("17");
+// Possibly future versions, adjust if necessary
+export const st18 = createStTemplate("18");
+export const st19 = createStTemplate("19");
+export const st20 = createStTemplate("20");

package/src/injections/inject.ts

@@ -6,7 +6,7 @@ import gio from "./gio.ts";
 import glib from "./glib.ts";
 import gobject from "./gobject.ts";
 import gtk4 from "./gtk4.ts";
-import { shell14, shell15 } from "./shell.ts";
+import { shell14, shell15, shell16, shell17, shell18, shell19, shell20 } from "./shell.ts";
 import tracker1 from "./tracker1.ts";
 
 export type NamespaceInjection = (namespace: IntrospectedNamespace, registry: NSRegistry) => void;
@@ -41,4 +41,9 @@ export function inject(registry: NSRegistry) {
 	$_(gtk4);
 	$_(shell14);
 	$_(shell15);
+	$_(shell16);
+	$_(shell17);
+	$_(shell18);
+	$_(shell19);
+	$_(shell20);
 }

package/src/injections/shell.ts

@@ -37,9 +37,13 @@ const shellTemplate = (version: string) => ({
 
 /** Shell 14 was introduced with GNOME 45 */
 export const shell14 = shellTemplate("14");
-
 /** Shell 15 was introduced with GNOME 47 */
 export const shell15 = shellTemplate("15");
-
 /** Shell 16 was introduced with GNOME 48 */
 export const shell16 = shellTemplate("16");
+/** Shell 17 was introduced with GNOME 49 */
+export const shell17 = shellTemplate("17");
+// Possibly future versions, adjust if necessary
+export const shell18 = shellTemplate("18");
+export const shell19 = shellTemplate("19");
+export const shell20 = shellTemplate("20");