@ts-for-gir/lib 4.0.0-beta.42 → 4.0.0-beta.44

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ts-for-gir/lib",
-  "version": "4.0.0-beta.42",
+  "version": "4.0.0-beta.44",
   "description": "Typescript .d.ts generator from GIR for gjs",
   "main": "src/index.ts",
   "module": "src/index.ts",
@@ -41,20 +41,20 @@
     "type definitions"
   ],
   "devDependencies": {
-    "@ts-for-gir/tsconfig": "^4.0.0-beta.42",
+    "@ts-for-gir/tsconfig": "^4.0.0-beta.44",
     "@types/ejs": "^3.1.5",
     "@types/lodash": "^4.17.24",
     "@types/node": "^24.12.0",
     "rimraf": "^6.1.3",
-    "typescript": "^5.9.3"
+    "typescript": "^6.0.2"
   },
   "dependencies": {
-    "@gi.ts/parser": "^4.0.0-beta.42",
-    "@ts-for-gir/reporter": "^4.0.0-beta.42",
-    "@ts-for-gir/templates": "^4.0.0-beta.42",
+    "@gi.ts/parser": "^4.0.0-beta.44",
+    "@ts-for-gir/reporter": "^4.0.0-beta.44",
+    "@ts-for-gir/templates": "^4.0.0-beta.44",
     "colorette": "^2.0.20",
     "ejs": "^5.0.1",
     "glob": "^13.0.6",
-    "lodash": "^4.17.23"
+    "lodash": "4.17.21"
   }
 }

package/src/generics/clutter.ts

@@ -66,7 +66,7 @@ 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 */
+/** Clutter-14 was introduced with GNOME 46 */
 export const clutter14 = createClutterTemplate("14");
 /** Clutter-15 was introduced with GNOME 47 */
 export const clutter15 = createClutterTemplate("15");
@@ -74,7 +74,8 @@ export const clutter15 = createClutterTemplate("15");
 export const clutter16 = createClutterTemplate("16");
 /** Clutter-17 was introduced with GNOME 49 */
 export const clutter17 = createClutterTemplate("17");
-// Possibly future versions, adjust if necessary
+/** Clutter-18 was introduced with GNOME 50 */
 export const clutter18 = createClutterTemplate("18");
+// Possibly future versions, adjust if necessary
 export const clutter19 = createClutterTemplate("19");
 export const clutter20 = createClutterTemplate("20");

package/src/generics/meta.ts

@@ -36,7 +36,7 @@ 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 */
+/** Meta-14 was introduced with GNOME 46 */
 export const meta14 = createMetaTemplate("14");
 /** Meta-15 was introduced with GNOME 47 */
 export const meta15 = createMetaTemplate("15");
@@ -44,7 +44,8 @@ export const meta15 = createMetaTemplate("15");
 export const meta16 = createMetaTemplate("16");
 /** Meta-17 was introduced with GNOME 49 */
 export const meta17 = createMetaTemplate("17");
-// Possibly future versions, adjust if necessary
+/** Meta-18 was introduced with GNOME 50 */
 export const meta18 = createMetaTemplate("18");
+// Possibly future versions, adjust if necessary
 export const meta19 = createMetaTemplate("19");
 export const meta20 = createMetaTemplate("20");

package/src/generics/st.ts

@@ -192,7 +192,7 @@ 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 */
+/** St-14 was introduced with GNOME 46 */
 export const st14 = createStTemplate("14");
 /** St-15 was introduced with GNOME 47 */
 export const st15 = createStTemplate("15");
@@ -200,7 +200,8 @@ export const st15 = createStTemplate("15");
 export const st16 = createStTemplate("16");
 /** St-17 was introduced with GNOME 49 */
 export const st17 = createStTemplate("17");
-// Possibly future versions, adjust if necessary
+/** St-18 was introduced with GNOME 50 */
 export const st18 = createStTemplate("18");
+// Possibly future versions, adjust if necessary
 export const st19 = createStTemplate("19");
 export const st20 = createStTemplate("20");

package/src/gir/introspected-classes.ts

@@ -55,6 +55,7 @@ export interface SignalDescriptor {
 	signal?: IntrospectedSignal;
 	isNotifySignal?: boolean;
 	isDetailSignal?: boolean;
+	isTemplateLiteral?: boolean;
 	parameterTypes?: string[];
 	returnType?: string;
 }
@@ -663,6 +664,19 @@ export class IntrospectedClass extends IntrospectedBaseClass {
 				returnType: "void",
 			});
 		});
+
+		// Add template literal catch-all for arbitrary property names.
+		// Only on GObject.Object itself — children inherit it via SignalSignatures extends.
+		if (this.isGObjectObject()) {
+			allSignals.push({
+				name: `notify::\${string}`,
+				isNotifySignal: true,
+				isDetailSignal: false,
+				isTemplateLiteral: true,
+				parameterTypes: ["GObject.ParamSpec"],
+				returnType: "void",
+			});
+		}
 	}
 
 	private addDetailedSignals(allSignals: SignalDescriptor[]): void {
@@ -670,6 +684,9 @@ export class IntrospectedClass extends IntrospectedBaseClass {
 
 		this.signals.forEach((signal) => {
 			if (signal.detailed) {
+				// Skip "notify" signal — already handled by addNotifySignals
+				if (signal.name === "notify") return;
+
 				propertyNames.forEach((propertyName) => {
 					allSignals.push({
 						name: `${signal.name}::${propertyName}`,
@@ -680,6 +697,17 @@ export class IntrospectedClass extends IntrospectedBaseClass {
 						returnType: this.getPropertyTypeString(signal.return_type),
 					});
 				});
+
+				// Add template literal catch-all for arbitrary detail strings
+				allSignals.push({
+					name: `${signal.name}::\${string}`,
+					signal: signal,
+					isNotifySignal: false,
+					isDetailSignal: true,
+					isTemplateLiteral: true,
+					parameterTypes: signal.parameters.map((p) => this.getPropertyTypeString(p.type)),
+					returnType: this.getPropertyTypeString(signal.return_type),
+				});
 			}
 		});
 	}

package/src/injections/gobject.ts

@@ -292,7 +292,7 @@ See https://gjs.guide/guides/gobject/basics.html#properties for more details.`;
 			const override = new IntrospectedClassFunction({
 				parent: ParamSpec,
 				name: "override",
-				return_type: VoidType,
+				return_type: ParamSpec.getType(),
 				parameters: [
 					new IntrospectedFunctionParameter({
 						direction: GirDirection.In,

package/src/injections/shell.ts

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

package/src/utils/girs.ts

@@ -106,8 +106,7 @@ export const printGirDocComment = (tsDoc: TsDoc, config: { noComments: boolean }
 	return desc.join("\n");
 };
 
-export const isIntrospectable = (e: { $?: GirInfoAttrs }) =>
-	!e || !e.$ || !e.$.introspectable || e.$.introspectable === "1";
+export const isIntrospectable = (e: { $?: GirInfoAttrs }) => !e?.$?.introspectable || e.$.introspectable === "1";
 export const isDeprecated = (e: { $: GirInfoAttrs }) => e?.$ && e.$.deprecated === "1";
 export const deprecatedVersion = (e: { $: GirInfoAttrs }) => e?.$?.["deprecated-version"];
 export const introducedVersion = (e: { $: GirInfoAttrs }) => e?.$?.version;

package/src/validators/class.ts

@@ -7,12 +7,23 @@ import { AnyType, NativeType, TypeIdentifier } from "../gir.ts";
 import { resolveTypeIdentifier } from "../utils/type-resolution.ts";
 import { GirVisitor } from "../visitor.ts";
 
+// These methods are often marked introspectable="0" in GIR because the C signatures
+// involve gpointer types, but GJS exposes them at runtime regardless. Their signatures are
+// always trivial (no params, return self or void) so they are safe to keep.
+// Only exempt on records — classes have deep inheritance hierarchies where return types
+// at different levels conflict (e.g. GObject.Object.ref() vs Gtk.Widget.ref()).
+const INTROSPECTABLE_EXEMPT_METHODS = new Set(["ref", "unref", "copy", "free", "destroy"]);
+
 const filterIntrospectableClassMembers = <T extends IntrospectedBaseClass>(node: T): T => {
 	node.fields = node.fields.filter((field) => field.isIntrospectable);
 	node.props = node.props.filter((prop) => prop.isIntrospectable);
 	node.callbacks = node.callbacks.filter((prop) => prop.isIntrospectable);
 	node.constructors = node.constructors.filter((prop) => prop.isIntrospectable);
-	node.members = node.members.filter((prop) => prop.isIntrospectable);
+
+	const isRecord = node instanceof IntrospectedRecord;
+	node.members = node.members.filter(
+		(member) => member.isIntrospectable || (isRecord && INTROSPECTABLE_EXEMPT_METHODS.has(member.name)),
+	);
 
 	return node;
 };