@ts-for-gir/lib 4.0.0-beta.36 → 4.0.0-beta.38

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ts-for-gir/lib",
-  "version": "4.0.0-beta.36",
+  "version": "4.0.0-beta.38",
   "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.36",
-    "@ts-for-gir/reporter": "^4.0.0-beta.36",
-    "@ts-for-gir/templates": "^4.0.0-beta.36",
+    "@gi.ts/parser": "^4.0.0-beta.38",
+    "@ts-for-gir/reporter": "^4.0.0-beta.38",
+    "@ts-for-gir/templates": "^4.0.0-beta.38",
     "colorette": "^2.0.20",
     "ejs": "^3.1.10",
     "glob": "^11.0.3",

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");

package/src/types/answer-version.ts

@@ -1,4 +1,4 @@
 export interface AnswerVersion {
-    selected: string[]
-    unselected: string[]
+	selected: string[];
+	unselected: string[];
 }

package/src/types/any-introspected-type.ts

@@ -1,3 +1,5 @@
 import type { IntrospectedBase } from "../gir/introspected-base.ts";
+import type { IntrospectedNamespace } from "../gir/namespace.ts";
 
-export type AnyIntrospectedType = IntrospectedBase<any>;
+// Recursive type representing any IntrospectedBase with a valid parent constraint
+export type AnyIntrospectedType = IntrospectedBase<IntrospectedNamespace | AnyIntrospectedType | null>;

package/src/types/class-function-types.ts

@@ -1,49 +1,57 @@
-import type { TypeExpression, Generic } from "../gir.ts";
+import type { IntrospectedEnum } from "../gir/enum.ts";
+import type { IntrospectedBaseClass, IntrospectedClassFunction } from "../gir/introspected-classes.ts";
 import type { IntrospectedFunctionParameter } from "../gir/parameter.ts";
+import type { Generic, TypeExpression } from "../gir.ts";
 import type { GirVisitor } from "../visitor.ts";
 
 export interface ClassFunctionCopyOptions<Parent> {
-  parent?: Parent;
-  name?: string;
-  interfaceParent?: any; // Using any to avoid circular deps
-  parameters?: IntrospectedFunctionParameter[];
-  outputParameters?: IntrospectedFunctionParameter[];
-  returnType?: TypeExpression;
+	parent?: Parent;
+	name?: string;
+	interfaceParent?: IntrospectedBaseClass | IntrospectedEnum; // avoid circular deps by importing types only
+	parameters?: IntrospectedFunctionParameter[];
+	outputParameters?: IntrospectedFunctionParameter[];
+	returnType?: TypeExpression;
 }
 
 export interface ClassFunctionOptions<Parent> {
-  name: string;
-  parameters?: IntrospectedFunctionParameter[];
-  output_parameters?: IntrospectedFunctionParameter[];
-  return_type?: TypeExpression;
-  parent: Parent;
-  originalParent?: Parent | null;
-  doc?: string | null;
+	name: string;
+	parameters?: IntrospectedFunctionParameter[];
+	output_parameters?: IntrospectedFunctionParameter[];
+	return_type?: TypeExpression;
+	parent: Parent;
+	originalParent?: Parent | null;
+	doc?: string | null;
 }
 
 // Type discriminators for function types
 export const FunctionTypeKind = {
-  CLASS_FUNCTION: 'CLASS_FUNCTION',
-  VIRTUAL_CLASS_FUNCTION: 'VIRTUAL_CLASS_FUNCTION',
-  STATIC_CLASS_FUNCTION: 'STATIC_CLASS_FUNCTION',
-  CONSTRUCTOR: 'CONSTRUCTOR'
+	CLASS_FUNCTION: "CLASS_FUNCTION",
+	VIRTUAL_CLASS_FUNCTION: "VIRTUAL_CLASS_FUNCTION",
+	STATIC_CLASS_FUNCTION: "STATIC_CLASS_FUNCTION",
+	CONSTRUCTOR: "CONSTRUCTOR",
 } as const;
 
-export type FunctionTypeKind = typeof FunctionTypeKind[keyof typeof FunctionTypeKind];
+export type FunctionTypeKind = (typeof FunctionTypeKind)[keyof typeof FunctionTypeKind];
 
 // Base interface for all class functions to enable type checking
 export interface ClassFunctionLike {
-  readonly __functionTypeKind: FunctionTypeKind;
-  readonly parameters: IntrospectedFunctionParameter[];
-  readonly output_parameters: IntrospectedFunctionParameter[];
-  readonly generics: Generic[];
-  returnTypeDoc?: string | null;
-  interfaceParent?: any;
-  
-  anyify(): any;
-  shouldAnyify(): boolean;
-  return(): TypeExpression;
-  getCallbackParameters(): any;
-  copy(options?: any): any;
-  accept(visitor: GirVisitor): any;
-} 
+	readonly __functionTypeKind: FunctionTypeKind;
+	readonly parameters: IntrospectedFunctionParameter[];
+	readonly output_parameters: IntrospectedFunctionParameter[];
+	readonly generics: Generic[];
+	returnTypeDoc?: string | null;
+	interfaceParent?: IntrospectedBaseClass | IntrospectedEnum | null;
+
+	anyify(): IntrospectedClassFunction;
+	shouldAnyify(): boolean;
+	return(): TypeExpression;
+	getCallbackParameters(): {
+		name: string;
+		parent: IntrospectedBaseClass | IntrospectedEnum;
+		output_parameters: IntrospectedFunctionParameter[];
+		parameters: IntrospectedFunctionParameter[];
+		return_type: TypeExpression;
+	};
+	copy(options?: ClassFunctionCopyOptions<IntrospectedBaseClass | IntrospectedEnum>): IntrospectedClassFunction;
+	accept(visitor: GirVisitor): IntrospectedClassFunction;
+}

package/src/types/class-parent.ts

@@ -1,14 +1,14 @@
-import type { GirClassElement, GirUnionElement, GirInterfaceElement, GirRecordElement, TypeGirClass } from './index.ts'
+import type { GirClassElement, GirInterfaceElement, GirRecordElement, GirUnionElement, TypeGirClass } from "./index.ts";
 
 export interface ClassParent {
-    parentName: string
-    qualifiedParentName: string
-    /** qualified if its module != qualifiedName's module */
-    localParentName: string
-    type: 'parent' | 'prerequisite' | 'implements'
-    /** Parent class / interface */
-    cls?: GirClassElement | GirUnionElement | GirInterfaceElement | GirRecordElement
-    girTypeName: TypeGirClass
-    /** True if the parent dependency exists */
-    dependencyExists: boolean
+	parentName: string;
+	qualifiedParentName: string;
+	/** qualified if its module != qualifiedName's module */
+	localParentName: string;
+	type: "parent" | "prerequisite" | "implements";
+	/** Parent class / interface */
+	cls?: GirClassElement | GirUnionElement | GirInterfaceElement | GirRecordElement;
+	girTypeName: TypeGirClass;
+	/** True if the parent dependency exists */
+	dependencyExists: boolean;
 }

package/src/types/class.ts

@@ -1,45 +1,43 @@
+import type { IntrospectedConstructor } from "../gir/constructor.ts";
 import type {
-    TypeIdentifier,
-} from "../gir.ts";
-import type {
-    IntrospectedClassFunction,
+	IntrospectedBaseClass,
+	IntrospectedClass,
+	IntrospectedClassCallback,
+	IntrospectedClassFunction,
+	IntrospectedInterface,
 } from "../gir/introspected-classes.ts";
-import type { IntrospectedConstructor } from "../gir/constructor.ts";
-import type { IntrospectedClassCallback } from "../gir/introspected-classes.ts";
-import type { IntrospectedProperty, IntrospectedField } from "../gir/property.ts";
-import type { IntrospectedBaseClass } from "../gir/introspected-classes.ts";
-import type { IntrospectedInterface } from "../gir/introspected-classes.ts";
-import type { IntrospectedClass } from "../gir/introspected-classes.ts";
+import type { IntrospectedField, IntrospectedProperty } from "../gir/property.ts";
 import type { IntrospectedRecord } from "../gir/record.ts";
+import type { TypeIdentifier } from "../gir.ts";
 
 export interface ClassDefinition {
-  superType: TypeIdentifier;
-  interfaces: TypeIdentifier[];
-  mainConstructor: IntrospectedConstructor;
-  constructors: IntrospectedConstructor[];
-  members: IntrospectedClassFunction[];
-  props: IntrospectedProperty[];
-  fields: IntrospectedField[];
-  callbacks: IntrospectedClassCallback[];
+	superType: TypeIdentifier;
+	interfaces: TypeIdentifier[];
+	mainConstructor: IntrospectedConstructor;
+	constructors: IntrospectedConstructor[];
+	members: IntrospectedClassFunction[];
+	props: IntrospectedProperty[];
+	fields: IntrospectedField[];
+	callbacks: IntrospectedClassCallback[];
 }
 
 export interface ResolutionNode {
-  identifier: TypeIdentifier;
-  node: IntrospectedBaseClass;
+	identifier: TypeIdentifier;
+	node: IntrospectedBaseClass;
 }
 
 export interface InterfaceResolution extends ResolutionNode, Iterable<InterfaceResolution | ClassResolution> {
-  extends(): InterfaceResolution | ClassResolution | undefined;
-  node: IntrospectedInterface;
+	extends(): InterfaceResolution | ClassResolution | undefined;
+	node: IntrospectedInterface;
 }
 
 export interface ClassResolution extends ResolutionNode, Iterable<ClassResolution> {
-  extends(): ClassResolution | undefined;
-  implements(): InterfaceResolution[];
-  node: IntrospectedClass;
+	extends(): ClassResolution | undefined;
+	implements(): InterfaceResolution[];
+	node: IntrospectedClass;
 }
 
 export interface RecordResolution extends ResolutionNode, Iterable<RecordResolution> {
-  extends(): RecordResolution | undefined;
-  node: IntrospectedRecord;
-}
+	extends(): RecordResolution | undefined;
+	node: IntrospectedRecord;
+}

package/src/types/config-flags.ts

@@ -1,5 +1,5 @@
-import type { UserConfig } from './user-config.ts'
+import type { UserConfig } from "./user-config.ts";
 
 export interface ConfigFlags extends UserConfig {
-    configName: string
+	configName: string;
 }

package/src/types/construct-name.ts

@@ -1,13 +1,13 @@
 export type ConstructName =
-    | 'functionName'
-    | 'enumMember'
-    | 'signalName'
-    | 'fieldName'
-    | 'constantName'
-    | 'constructorPropertyName'
-    | 'propertyName'
-    | 'parameterName'
-    | 'enumName'
-    | 'importNamespaceName'
-    | 'signalInterfaceName'
-    | 'importName'
+	| "functionName"
+	| "enumMember"
+	| "signalName"
+	| "fieldName"
+	| "constantName"
+	| "constructorPropertyName"
+	| "propertyName"
+	| "parameterName"
+	| "enumName"
+	| "importNamespaceName"
+	| "signalInterfaceName"
+	| "importName";

package/src/types/dependency-map.ts

@@ -1,4 +1,4 @@
-import type { Dependency } from './dependency.ts'
+import type { Dependency } from "./dependency.ts";
 export interface DependencyMap {
-    [packageName: string]: Dependency[]
+	[packageName: string]: Dependency[];
 }

package/src/types/dependency.ts

@@ -1,49 +1,49 @@
-import type { FileInfo } from './index.ts'
-import type { LibraryVersion } from '../library-version.ts'
-import type { GirXML } from '@gi.ts/parser'
+import type { GirXML } from "@gi.ts/parser";
+import type { LibraryVersion } from "../library-version.ts";
+import type { FileInfo } from "./index.ts";
 
 export interface Dependency extends FileInfo {
-    /**
-     * E.g. 'Gtk'
-     */
-    namespace: string
-    /**
-     * E.g. 'Gtk40'
-     * Is used in the generated index.d.ts, for example: `import * as Gtk40 from "./Gtk-4.0.ts";`
-     */
-    importNamespace: string
-    /**
-     * E.g. '4.0'
-     */
-    version: string
-    /**
-     * E.g. '4.14.0'
-     */
-    libraryVersion: LibraryVersion
-    /**
-     * E.g. 'Gtk-4.0'
-     */
-    packageName: string
-    /**
-     * The NPM package name
-     * E.g. 'gtk-4.0'
-     */
-    importName: string
-    /**
-     * Import path for the package
-     * E.g. './Gtk-4.0.ts' or '@girs/Gtk-4.0'
-     */
-    importPath: string
-    /**
-     * Import definition for the package
-     * E.g. `import type Gtk from '@girs/Gtk-3.0'`
-     */
-    importDef: string
-    /**
-     * Complete dependency string for package.json
-     * E.g. `"@girs/gtk-4.0": "workspace:^"`
-     */
-    packageJsonImport: string
+	/**
+	 * E.g. 'Gtk'
+	 */
+	namespace: string;
+	/**
+	 * E.g. 'Gtk40'
+	 * Is used in the generated index.d.ts, for example: `import * as Gtk40 from "./Gtk-4.0.ts";`
+	 */
+	importNamespace: string;
+	/**
+	 * E.g. '4.0'
+	 */
+	version: string;
+	/**
+	 * E.g. '4.14.0'
+	 */
+	libraryVersion: LibraryVersion;
+	/**
+	 * E.g. 'Gtk-4.0'
+	 */
+	packageName: string;
+	/**
+	 * The NPM package name
+	 * E.g. 'gtk-4.0'
+	 */
+	importName: string;
+	/**
+	 * Import path for the package
+	 * E.g. './Gtk-4.0.ts' or '@girs/Gtk-4.0'
+	 */
+	importPath: string;
+	/**
+	 * Import definition for the package
+	 * E.g. `import type Gtk from '@girs/Gtk-3.0'`
+	 */
+	importDef: string;
+	/**
+	 * Complete dependency string for package.json
+	 * E.g. `"@girs/gtk-4.0": "workspace:^"`
+	 */
+	packageJsonImport: string;
 
-    girXML: GirXML | null
+	girXML: GirXML | null;
 }

package/src/types/file-info.ts

@@ -1,14 +1,14 @@
 export interface FileInfo {
-    /**
-     * The path to the gir file or null if the file does not exist
-     */
-    path: string | null
-    /**
-     * The filename of the gir file
-     */
-    filename: string
-    /**
-     * Whether the file exists or not
-     */
-    exists: boolean
+	/**
+	 * The path to the gir file or null if the file does not exist
+	 */
+	path: string | null;
+	/**
+	 * The filename of the gir file
+	 */
+	filename: string;
+	/**
+	 * Whether the file exists or not
+	 */
+	exists: boolean;
 }

package/src/types/format.ts

@@ -1 +1 @@
-export type Format = 'dts' | 'json'
+export type Format = "dts" | "json";

package/src/types/generator-constructor.ts

@@ -1,7 +1,7 @@
+import type { FormatGenerator } from "../generators/generator.ts";
 import type { IntrospectedNamespace } from "../gir/namespace.ts";
 import type { OptionsGeneration } from "./options-generation.ts";
-import type { FormatGenerator } from "../generators/generator.ts";
 
-export type GeneratorConstructor<T> = {     
-  new (namespace: IntrospectedNamespace, options: OptionsGeneration, ...args: any[]): FormatGenerator<T>;
-};
+export type GeneratorConstructor<T> = {
+	new (namespace: IntrospectedNamespace, options: OptionsGeneration, ...args: unknown[]): FormatGenerator<T>;
+};

package/src/types/generics-config.ts

@@ -87,4 +87,4 @@ export interface GlibConfig {
 	version: string;
 	/** The modifier function to apply GLib-specific generics */
 	modifier: (namespace: IntrospectedNamespace) => void;
-} 
+}

package/src/types/gir-any-element.ts

@@ -1,35 +1,35 @@
 import type {
-    GirBitfieldElement,
-    GirCallbackElement,
-    GirClassElement,
-    GirConstantElement,
-    GirEnumElement,
-    GirFunctionElement,
-    GirInterfaceElement,
-    GirRecordElement,
-    GirUnionElement,
-    GirAliasElement,
-    GirMethodElement,
-    GirVirtualMethodElement,
-    GirSignalElement,
-    GirConstructorElement,
-    GirFieldElement,
-    GirPropertyElement,
-} from './index.ts'
+	GirAliasElement,
+	GirBitfieldElement,
+	GirCallbackElement,
+	GirClassElement,
+	GirConstantElement,
+	GirConstructorElement,
+	GirEnumElement,
+	GirFieldElement,
+	GirFunctionElement,
+	GirInterfaceElement,
+	GirMethodElement,
+	GirPropertyElement,
+	GirRecordElement,
+	GirSignalElement,
+	GirUnionElement,
+	GirVirtualMethodElement,
+} from "./index.ts";
 export type GirAnyElement =
-    | GirBitfieldElement
-    | GirCallbackElement
-    | GirClassElement
-    | GirConstantElement
-    | GirEnumElement
-    | GirFunctionElement
-    | GirInterfaceElement
-    | GirRecordElement
-    | GirUnionElement
-    | GirAliasElement
-    | GirMethodElement
-    | GirVirtualMethodElement
-    | GirSignalElement
-    | GirConstructorElement
-    | GirFieldElement
-    | GirPropertyElement
+	| GirBitfieldElement
+	| GirCallbackElement
+	| GirClassElement
+	| GirConstantElement
+	| GirEnumElement
+	| GirFunctionElement
+	| GirInterfaceElement
+	| GirRecordElement
+	| GirUnionElement
+	| GirAliasElement
+	| GirMethodElement
+	| GirVirtualMethodElement
+	| GirSignalElement
+	| GirConstructorElement
+	| GirFieldElement
+	| GirPropertyElement;