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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ts-for-gir/lib",
-  "version": "4.0.0-beta.39",
+  "version": "4.0.0-beta.40",
   "description": "Typescript .d.ts generator from GIR for gjs",
   "main": "src/index.ts",
   "module": "src/index.ts",
@@ -48,9 +48,9 @@
     "typescript": "^5.9.3"
   },
   "dependencies": {
-    "@gi.ts/parser": "^4.0.0-beta.39",
-    "@ts-for-gir/reporter": "^4.0.0-beta.39",
-    "@ts-for-gir/templates": "^4.0.0-beta.39",
+    "@gi.ts/parser": "^4.0.0-beta.40",
+    "@ts-for-gir/reporter": "^4.0.0-beta.40",
+    "@ts-for-gir/templates": "^4.0.0-beta.40",
     "colorette": "^2.0.20",
     "ejs": "^4.0.1",
     "glob": "^13.0.6",

package/src/gir/enum.ts

@@ -14,6 +14,7 @@ import type { IntrospectedRecord } from "./record.ts";
 
 export class IntrospectedEnum extends IntrospectedNamespaceMember {
 	members = new Map<string, GirEnumMember>();
+	isRegistered: boolean = false;
 	flags: boolean = false;
 	ns: IntrospectedNamespace;
 
@@ -24,7 +25,7 @@ export class IntrospectedEnum extends IntrospectedNamespaceMember {
 	}
 
 	copy({ members }: { parent?: undefined; members?: Map<string, GirEnumMember> } = {}): IntrospectedEnum {
-		const { namespace, name, flags } = this;
+		const { namespace, name, isRegistered, flags } = this;
 
 		const en = new IntrospectedEnum(name, namespace);
 
@@ -32,6 +33,7 @@ export class IntrospectedEnum extends IntrospectedNamespaceMember {
 			en.members.set(key, member.copy());
 		}
 
+		en.isRegistered = isRegistered;
 		en.flags = flags;
 
 		en._copyBaseProperties(this);
@@ -93,6 +95,7 @@ export class IntrospectedEnum extends IntrospectedNamespaceMember {
 		const em = new IntrospectedEnum(sanitizeMemberName(element.$.name), ns);
 
 		if (element.$["glib:type-name"]) {
+			em.isRegistered = true;
 			em.resolve_names.push(element.$["glib:type-name"]);
 
 			ns.registerResolveName(element.$["glib:type-name"], ns.namespace, em.name);

package/src/gir/error.ts

@@ -8,6 +8,7 @@ import { IntrospectedEnum } from "./enum.ts";
 import { GirEnumMember } from "./enum-member.ts";
 import { IntrospectedStaticClassFunction } from "./introspected-classes.ts";
 import type { IntrospectedNamespace } from "./namespace.ts";
+import type { IntrospectedRecord } from "./record.ts";
 
 // TODO: Move to utils
 function isEnumElement(e: unknown): e is GirEnumElement {
@@ -39,6 +40,12 @@ export class IntrospectedError extends IntrospectedEnum {
 		return en._copyBaseProperties(this);
 	}
 
+	asClass(): IntrospectedRecord {
+		const clazz = super.asClass();
+		clazz.overrideGType(this.namespace.namespace === "GLib" ? "Error" : "GLib.Error");
+		return clazz;
+	}
+
 	static fromXML(
 		element: GirEnumElement | GirBitfieldElement,
 		ns: IntrospectedNamespace,

package/src/gir/introspected-classes.ts

@@ -603,6 +603,10 @@ export class IntrospectedClass extends IntrospectedBaseClass {
 		super({ name, namespace });
 	}
 
+	get gtype() {
+		return this.name;
+	}
+
 	getAllSignals(): SignalDescriptor[] {
 		const allSignals = this.getBaseSignals();
 

package/src/gir/record.ts

@@ -25,6 +25,7 @@ export class IntrospectedRecord extends IntrospectedBaseClass {
 	private _structFor: ClassStructTypeIdentifier | null = null;
 	private _isSimple: boolean | null = null;
 	private _isSimpleWithoutPointers: string | null = null;
+	private _overriddenGType: string | null = null;
 
 	/**
 	 * Returns all signals for this record (records typically don't have signals)
@@ -49,6 +50,14 @@ export class IntrospectedRecord extends IntrospectedBaseClass {
 		return this._structFor;
 	}
 
+	get gtype() {
+		return this._overriddenGType ?? this.name;
+	}
+
+	overrideGType(gtype: string) {
+		this._overriddenGType = gtype;
+	}
+
 	getType(): TypeIdentifier {
 		if (this._structFor) {
 			return this._structFor;
@@ -149,6 +158,7 @@ export class IntrospectedRecord extends IntrospectedBaseClass {
 			constructors,
 			_isForeign,
 			_structFor,
+			_overriddenGType,
 			props,
 			fields,
 			callbacks,
@@ -166,6 +176,7 @@ export class IntrospectedRecord extends IntrospectedBaseClass {
 
 		clazz._structFor = _structFor;
 		clazz._isForeign = _isForeign;
+		clazz._overriddenGType = _overriddenGType;
 		clazz.props = (options.props ?? props).map((p) => p.copy({ parent: clazz }));
 		clazz.fields = (options.fields ?? fields).map((f) => f.copy({ parent: clazz }));
 		clazz.callbacks = (options.callbacks ?? callbacks).map((c) => c.copy({ parent: clazz }));

package/src/gir-module.ts

@@ -599,7 +599,8 @@ export class GirModule implements IGirModule {
 		if (ns.enumeration) {
 			// Get the requested enums
 			const enumerations = ns.enumeration
-				?.map((enumeration) => {
+				?.filter(isIntrospectable)
+				.map((enumeration) => {
 					if (enumeration.$["glib:error-domain"]) {
 						return IntrospectedError.fromXML(enumeration as GirEnumElement, this, options);
 					} else {