@ts-for-gir/lib 3.0.0-beta.12 → 3.0.1

package/lib/constants.d.ts

@@ -1,4 +1,5 @@
-import { Environment } from './types/index.js';
+import { LibraryVersion } from './library-version.js';
+import type { Environment } from './types/index.js';
 /**
  * In gjs all classes have a static name property but the classes listed below already have a static name property
  */
@@ -9,8 +10,11 @@ export declare const OPT_PARAM_REG_EXP: RegExp;
 export declare const NEW_LINE_REG_EXP: RegExp;
 export declare const MAX_CLASS_PARENT_DEPTH = 100;
 export declare const APP_NAME = "ts-for-gir";
-export declare const APP_USAGE = "Typescript .d.ts generator from GIR for gjs or node-gtk";
-export declare const APP_SOURCE = "https://github.com/gjsify/ts-for-gjs";
+export declare const APP_USAGE = "TypeScript type definition generator for GObject introspection GIR files";
+export declare const APP_SOURCE = "https://github.com/gjsify/ts-for-gir";
+export declare const APP_VERSION = "3.0.1";
+export declare const PACKAGE_DESC: (packageName: string, environment: Environment, libraryVersion?: LibraryVersion) => string;
+export declare const PACKAGE_KEYWORDS: (packageName: string, environment: Environment) => string;
 export declare const GENERIC_NAMES: string[];
 export declare const SIGNAL_METHOD_NAMES_GENERAL: string[];
 export declare const SIGNAL_METHOD_NAMES_GJS: string[];

package/lib/constants.js

@@ -8,8 +8,20 @@ export const OPT_PARAM_REG_EXP = /[0-9a-zA-Z_]*\?:/g;
 export const NEW_LINE_REG_EXP = /[\n\r]+/g;
 export const MAX_CLASS_PARENT_DEPTH = 100;
 export const APP_NAME = 'ts-for-gir';
-export const APP_USAGE = 'Typescript .d.ts generator from GIR for gjs or node-gtk';
-export const APP_SOURCE = 'https://github.com/gjsify/ts-for-gjs';
+export const APP_USAGE = 'TypeScript type definition generator for GObject introspection GIR files';
+export const APP_SOURCE = 'https://github.com/gjsify/ts-for-gir';
+export const APP_VERSION = '3.0.1';
+export const PACKAGE_DESC = (packageName, environment, libraryVersion) => {
+    const envStr = environment === 'node' ? 'Node.js' : 'GJS';
+    if (libraryVersion) {
+        return `${envStr} TypeScript type definitions for ${packageName}, generated from library version ${libraryVersion.toString()}`;
+    }
+    return `${envStr} TypeScript type definitions for ${packageName}`;
+};
+export const PACKAGE_KEYWORDS = (packageName, environment) => {
+    const envKeywords = environment === 'node' ? '"node", "node-gtk"' : '"GJS"';
+    return `"Gir", "TypeScript", "types", "GObject-Introspection", ${envKeywords}, "${packageName}"`;
+};
 export const GENERIC_NAMES = ['A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'K'];
 export const SIGNAL_METHOD_NAMES_GENERAL = ['connect', 'emit'];
 export const SIGNAL_METHOD_NAMES_GJS = ['connect_after', 'emit', 'disconnect'];

package/lib/constants.js.map

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":"AAEA;;GAEG;AACH,MAAM,CAAC,MAAM,0BAA0B,GAAG,CAAC,eAAe,EAAE,iBAAiB,CAAC,CAAA;AAE9E,MAAM,CAAC,MAAM,eAAe,GAAG,aAAa,CAAA;AAC5C,MAAM,CAAC,MAAM,aAAa,GAAG,iBAAiB,CAAA;AAC9C,MAAM,CAAC,MAAM,iBAAiB,GAAG,mBAAmB,CAAA;AACpD,MAAM,CAAC,MAAM,gBAAgB,GAAG,UAAU,CAAA;AAE1C,MAAM,CAAC,MAAM,sBAAsB,GAAG,GAAG,CAAA;AAEzC,MAAM,CAAC,MAAM,QAAQ,GAAG,YAAY,CAAA;AACpC,MAAM,CAAC,MAAM,SAAS,GAAG,yDAAyD,CAAA;AAClF,MAAM,CAAC,MAAM,UAAU,GAAG,sCAAsC,CAAA;AAEhE,MAAM,CAAC,MAAM,aAAa,GAAa,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAA;AAEzF,MAAM,CAAC,MAAM,2BAA2B,GAAa,CAAC,SAAS,EAAE,MAAM,CAAC,CAAA;AACxE,MAAM,CAAC,MAAM,uBAAuB,GAAa,CAAC,eAAe,EAAE,MAAM,EAAE,YAAY,CAAC,CAAA;AACxF,MAAM,CAAC,MAAM,wBAAwB,GAAa,CAAC,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,CAAC,CAAA;AAChF,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,GAAgB,EAAE,EAAE;IACpD,IAAI,GAAG,KAAK,MAAM,EAAE;QAChB,OAAO,CAAC,GAAG,2BAA2B,EAAE,wBAAwB,CAAC,CAAA;KACpE;IACD,OAAO,CAAC,GAAG,2BAA2B,EAAE,uBAAuB,CAAC,CAAA;AACpE,CAAC,CAAA"}
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":"AAIA;;GAEG;AACH,MAAM,CAAC,MAAM,0BAA0B,GAAG,CAAC,eAAe,EAAE,iBAAiB,CAAC,CAAA;AAE9E,MAAM,CAAC,MAAM,eAAe,GAAG,aAAa,CAAA;AAC5C,MAAM,CAAC,MAAM,aAAa,GAAG,iBAAiB,CAAA;AAC9C,MAAM,CAAC,MAAM,iBAAiB,GAAG,mBAAmB,CAAA;AACpD,MAAM,CAAC,MAAM,gBAAgB,GAAG,UAAU,CAAA;AAE1C,MAAM,CAAC,MAAM,sBAAsB,GAAG,GAAG,CAAA;AAEzC,MAAM,CAAC,MAAM,QAAQ,GAAG,YAAY,CAAA;AACpC,MAAM,CAAC,MAAM,SAAS,GAAG,0EAA0E,CAAA;AACnG,MAAM,CAAC,MAAM,UAAU,GAAG,sCAAsC,CAAA;AAChE,MAAM,CAAC,MAAM,WAAW,GAAG,OAAO,CAAA;AAElC,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,WAAmB,EAAE,WAAwB,EAAE,cAA+B,EAAE,EAAE;IAC3G,MAAM,MAAM,GAAG,WAAW,KAAK,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAA;IACzD,IAAI,cAAc,EAAE;QAChB,OAAO,GAAG,MAAM,oCAAoC,WAAW,oCAAoC,cAAc,CAAC,QAAQ,EAAE,EAAE,CAAA;KACjI;IACD,OAAO,GAAG,MAAM,oCAAoC,WAAW,EAAE,CAAA;AACrE,CAAC,CAAA;AACD,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,WAAmB,EAAE,WAAwB,EAAE,EAAE;IAC9E,MAAM,WAAW,GAAG,WAAW,KAAK,MAAM,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAC,OAAO,CAAA;IAC3E,OAAO,0DAA0D,WAAW,MAAM,WAAW,GAAG,CAAA;AACpG,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,aAAa,GAAa,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAA;AAEzF,MAAM,CAAC,MAAM,2BAA2B,GAAa,CAAC,SAAS,EAAE,MAAM,CAAC,CAAA;AACxE,MAAM,CAAC,MAAM,uBAAuB,GAAa,CAAC,eAAe,EAAE,MAAM,EAAE,YAAY,CAAC,CAAA;AACxF,MAAM,CAAC,MAAM,wBAAwB,GAAa,CAAC,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,CAAC,CAAA;AAChF,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,GAAgB,EAAE,EAAE;IACpD,IAAI,GAAG,KAAK,MAAM,EAAE;QAChB,OAAO,CAAC,GAAG,2BAA2B,EAAE,wBAAwB,CAAC,CAAA;KACpE;IACD,OAAO,CAAC,GAAG,2BAA2B,EAAE,uBAAuB,CAAC,CAAA;AACpE,CAAC,CAAA"}

package/lib/dependency-manager.d.ts

@@ -1,17 +1,44 @@
 import { Logger } from './logger.js';
+import { Transformation } from './transformation.js';
 import type { Dependency, GenerateConfig, GirInclude } from './types/index.js';
+import type { GirModule } from './gir-module.js';
 export declare class DependencyManager {
     protected readonly config: GenerateConfig;
     protected log: Logger;
+    protected transformation: Transformation;
     cache: {
-        [key: string]: Dependency;
+        [packageName: string]: Dependency;
+    };
+    static instances: {
+        [env: string]: DependencyManager;
     };
-    static instance: DependencyManager;
     protected constructor(config: GenerateConfig);
     /**
      * Get the DependencyManager singleton instance
      */
     static getInstance(config: GenerateConfig): DependencyManager;
+    /**
+     * Get all dependencies in the cache
+     * @returns All dependencies in the cache
+     */
+    all(): Dependency[];
+    /**
+     * Get the core dependencies
+     * @returns
+     */
+    core(): Dependency[];
+    createImportProperties(namespace: string, packageName: string): {
+        importPath: string;
+        importDef: string;
+    };
+    createImportPath(packageName: string): string;
+    createImportDef(namespace: string, importPath: string): string;
+    /**
+     * Get the dependency object by packageName
+     * @param packageName The package name (with version affix) of the dependency
+     * @returns The dependency object
+     */
+    get(packageName: string): Dependency;
     /**
      * Get the dependency object by namespace and version
      * @param namespace The namespace of the dependency
@@ -19,16 +46,38 @@ export declare class DependencyManager {
      * @returns The dependency object
      */
     get(namespace: string, version: string): Dependency;
+    /**
+     * Add all dependencies from an array of gir modules
+     * @param girModules
+     */
+    addAll(girModules: GirModule[]): Dependency[];
     /**
      * Transforms a gir include object array to a dependency object array
      * @param girIncludes - Array of gir includes
      * @returns Array of dependencies
      */
     fromGirIncludes(girIncludes: GirInclude[]): Dependency[];
+    getAllPackageNames(): string[];
+    /**
+     * Check if multiple dependencies with the given namespace exist in the cache
+     * @param namespace The namespace of the dependency
+     * @returns
+     */
+    hasConflict(namespace: string): boolean;
+    /**
+     * Check if the given version is the latest version of the dependency
+     * @param namespace The namespace of the dependency
+     * @param version The version of the dependency
+     * @returns
+     */
+    isLatestVersion(namespace: string, version: string): boolean;
     /**
-     * Find a dependency by it's namespace from the cache
+     * Find a dependency by it's namespace from the cache, if multiple versions are found, the latest version is returned
      * @param namespace The namespace of the dependency
      * @returns The dependency object or null if not found
      */
     find(namespace: string): Dependency | null;
+    protected getPseudoPackage(packageName: string): Dependency;
+    getGjs(): Dependency;
+    getNodeGtk(): Dependency;
 }

package/lib/dependency-manager.js

@@ -1,34 +1,82 @@
-import { findFileInDirs } from './utils.js';
+import { findFileInDirs, splitModuleName, pascalCase } from './utils.js';
 import { Logger } from './logger.js';
-export class DependencyManager {
+import { Transformation } from './transformation.js';
+class DependencyManager {
     config;
     log;
+    transformation;
     cache = {};
-    static instance;
+    static instances = {};
     constructor(config) {
         this.config = config;
+        this.transformation = new Transformation(config);
         this.log = new Logger(config.environment, config.verbose, 'DependencyManager');
     }
     /**
      * Get the DependencyManager singleton instance
      */
     static getInstance(config) {
-        if (this.instance) {
-            return this.instance;
+        if (this.instances[config.environment]) {
+            return this.instances[config.environment];
         }
-        this.instance = new DependencyManager(config);
-        return this.instance;
+        this.instances[config.environment] = new DependencyManager(config);
+        return this.instances[config.environment];
     }
     /**
-     * Get the dependency object by namespace and version
-     * @param namespace The namespace of the dependency
-     * @param version The version of the dependency
-     * @returns The dependency object
+     * Get all dependencies in the cache
+     * @returns All dependencies in the cache
+     */
+    all() {
+        return Object.values(this.cache);
+    }
+    /**
+     * Get the core dependencies
+     * @returns
      */
-    get(namespace, version) {
-        const packageName = `${namespace}-${version}`;
+    core() {
+        return [this.get('GObject-2.0'), this.get('GLib-2.0')];
+    }
+    createImportProperties(namespace, packageName) {
+        const importPath = this.createImportPath(packageName);
+        const importDef = this.createImportDef(namespace, importPath);
+        return {
+            importPath,
+            importDef,
+        };
+    }
+    createImportPath(packageName) {
+        const importName = this.transformation.transformImportName(packageName);
+        const importPath = this.config.package ? `${this.config.npmScope}/${importName}` : `./${importName}.js`;
+        return importPath;
+    }
+    createImportDef(namespace, importPath) {
+        return this.config.noNamespace
+            ? `import type * as ${namespace} from '${importPath}'`
+            : `import type ${namespace} from '${importPath}';`;
+    }
+    get(namespaceOrPackageName, version) {
+        // Special case for Gjs
+        if (namespaceOrPackageName === 'Gjs') {
+            return this.getGjs();
+        }
+        else if (namespaceOrPackageName === 'node-gtk') {
+            return this.getNodeGtk();
+        }
+        let packageName;
+        let namespace;
+        if (version) {
+            packageName = `${namespaceOrPackageName}-${version}`;
+            namespace = namespaceOrPackageName;
+        }
+        else {
+            packageName = namespaceOrPackageName;
+            const { namespace: _namespace, version: _version } = splitModuleName(packageName);
+            namespace = _namespace;
+            version = _version;
+        }
         if (this.cache[packageName]) {
-            return this.cache[packageName];
+            const dep = this.cache[packageName];
+            return dep;
         }
         const filename = `${packageName}.gir`;
         const { exists, path } = findFileInDirs(this.config.girDirectories, filename);
@@ -38,11 +86,23 @@ export class DependencyManager {
             filename,
             path,
             packageName,
+            importName: this.transformation.transformImportName(packageName),
             version,
+            ...this.createImportProperties(namespace, packageName),
         };
         this.cache[packageName] = dependency;
         return dependency;
     }
+    /**
+     * Add all dependencies from an array of gir modules
+     * @param girModules
+     */
+    addAll(girModules) {
+        for (const girModule of girModules) {
+            this.get(girModule.namespace, girModule.version || '0.0');
+        }
+        return this.all();
+    }
     /**
      * Transforms a gir include object array to a dependency object array
      * @param girIncludes - Array of gir includes
@@ -55,13 +115,49 @@ export class DependencyManager {
         }
         return dependencies;
     }
+    getAllPackageNames() {
+        return Object.keys(this.cache);
+    }
+    /**
+     * Check if multiple dependencies with the given namespace exist in the cache
+     * @param namespace The namespace of the dependency
+     * @returns
+     */
+    hasConflict(namespace) {
+        const packageNames = this.getAllPackageNames();
+        const candidates = packageNames.filter((packageName) => {
+            return packageName.startsWith(`${namespace}-`) && this.cache[packageName].namespace === namespace;
+        });
+        return candidates.length > 1;
+    }
     /**
-     * Find a dependency by it's namespace from the cache
+     * Check if the given version is the latest version of the dependency
+     * @param namespace The namespace of the dependency
+     * @param version The version of the dependency
+     * @returns
+     */
+    isLatestVersion(namespace, version) {
+        const hasConflict = this.hasConflict(namespace);
+        if (!hasConflict) {
+            return true;
+        }
+        const latestVersion = this.find(namespace);
+        return latestVersion?.version === version;
+    }
+    /**
+     * Find a dependency by it's namespace from the cache, if multiple versions are found, the latest version is returned
      * @param namespace The namespace of the dependency
      * @returns The dependency object or null if not found
      */
     find(namespace) {
-        const packageNames = Object.keys(this.cache);
+        // Special case for Gjs
+        if (namespace === 'Gjs') {
+            return this.getGjs();
+        }
+        else if (namespace === 'node-gtk') {
+            return this.getNodeGtk();
+        }
+        const packageNames = this.getAllPackageNames();
         const candidates = packageNames.filter((packageName) => {
             return packageName.startsWith(`${namespace}-`) && this.cache[packageName].namespace === namespace;
         });
@@ -69,10 +165,34 @@ export class DependencyManager {
             this.log.warn(`Found multiple versions of ${namespace}: ${candidates.join(', ')}`);
         }
         const latestVersion = candidates.sort().pop();
-        if (latestVersion) {
-            return this.cache[latestVersion];
+        if (latestVersion && this.cache[latestVersion]) {
+            const dep = this.cache[latestVersion];
+            return dep;
         }
         return null;
     }
+    getPseudoPackage(packageName) {
+        if (this.cache[packageName]) {
+            return this.cache[packageName];
+        }
+        const dep = {
+            namespace: pascalCase(packageName),
+            exists: true,
+            filename: '',
+            path: '',
+            packageName: packageName,
+            importName: this.transformation.transformImportName(packageName),
+            version: '0.0',
+            ...this.createImportProperties(packageName, packageName),
+        };
+        return dep;
+    }
+    getGjs() {
+        return this.getPseudoPackage('Gjs');
+    }
+    getNodeGtk() {
+        return this.getPseudoPackage('node-gtk');
+    }
 }
+export { DependencyManager };
 //# sourceMappingURL=dependency-manager.js.map

package/lib/dependency-manager.js.map

@@ -1 +1 @@
-{"version":3,"file":"dependency-manager.js","sourceRoot":"","sources":["../src/dependency-manager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAA;AAC3C,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AAIpC,MAAM,OAAO,iBAAiB;IAOe;IAN/B,GAAG,CAAQ;IAErB,KAAK,GAAkC,EAAE,CAAA;IAEzC,MAAM,CAAC,QAAQ,CAAmB;IAElC,YAAyC,MAAsB;QAAtB,WAAM,GAAN,MAAM,CAAgB;QAC3D,IAAI,CAAC,GAAG,GAAG,IAAI,MAAM,CAAC,MAAM,CAAC,WAAW,EAAE,MAAM,CAAC,OAAO,EAAE,mBAAmB,CAAC,CAAA;IAClF,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,WAAW,CAAC,MAAsB;QACrC,IAAI,IAAI,CAAC,QAAQ,EAAE;YACf,OAAO,IAAI,CAAC,QAAQ,CAAA;SACvB;QACD,IAAI,CAAC,QAAQ,GAAG,IAAI,iBAAiB,CAAC,MAAM,CAAC,CAAA;QAC7C,OAAO,IAAI,CAAC,QAAQ,CAAA;IACxB,CAAC;IAED;;;;;OAKG;IACH,GAAG,CAAC,SAAiB,EAAE,OAAe;QAClC,MAAM,WAAW,GAAG,GAAG,SAAS,IAAI,OAAO,EAAE,CAAA;QAC7C,IAAI,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,EAAE;YACzB,OAAO,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,CAAA;SACjC;QACD,MAAM,QAAQ,GAAG,GAAG,WAAW,MAAM,CAAA;QACrC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,EAAE,QAAQ,CAAC,CAAA;QAC7E,MAAM,UAAU,GAAe;YAC3B,SAAS;YACT,MAAM;YACN,QAAQ;YACR,IAAI;YACJ,WAAW;YACX,OAAO;SACV,CAAA;QAED,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,GAAG,UAAU,CAAA;QAEpC,OAAO,UAAU,CAAA;IACrB,CAAC;IAED;;;;OAIG;IACH,eAAe,CAAC,WAAyB;QACrC,MAAM,YAAY,GAAiB,EAAE,CAAA;QACrC,KAAK,MAAM,CAAC,IAAI,WAAW,EAAE;YACzB,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,IAAI,KAAK,CAAC,CAAC,CAAA;SACjE;QACD,OAAO,YAAY,CAAA;IACvB,CAAC;IAED;;;;OAIG;IACH,IAAI,CAAC,SAAiB;QAClB,MAAM,YAAY,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;QAC5C,MAAM,UAAU,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC,WAAW,EAAE,EAAE;YACnD,OAAO,WAAW,CAAC,UAAU,CAAC,GAAG,SAAS,GAAG,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,SAAS,KAAK,SAAS,CAAA;QACrG,CAAC,CAAC,CAAA;QAEF,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE;YACvB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,8BAA8B,SAAS,KAAK,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;SACrF;QAED,MAAM,aAAa,GAAG,UAAU,CAAC,IAAI,EAAE,CAAC,GAAG,EAAE,CAAA;QAE7C,IAAI,aAAa,EAAE;YACf,OAAO,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,CAAA;SACnC;QAED,OAAO,IAAI,CAAA;IACf,CAAC;CACJ"}
+{"version":3,"file":"dependency-manager.js","sourceRoot":"","sources":["../src/dependency-manager.ts"],"names":[],"mappings":"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"}

package/lib/gir-module.d.ts

@@ -5,6 +5,7 @@ import { GirFactory } from './gir-factory.js';
 import { ConflictResolver } from './conflict-resolver.js';
 import { DependencyManager } from './dependency-manager.js';
 import { SymTable } from './symtable.js';
+import { LibraryVersion } from './library-version.js';
 import type { Dependency, GirRepository, GirNamespace, GirAliasElement, GirFunctionElement, GirType, GirCallableParamElement, GirCallableReturn, GirConstantElement, GirFieldElement, GirPropertyElement, InheritanceTable, ParsedGir, GenerateConfig, ClassParent } from './types/index.js';
 export declare class GirModule {
     private readonly config;
@@ -17,18 +18,24 @@ export declare class GirModule {
      */
     namespace: string;
     /**
-     * E.g. '3.0'
+     * E.g. '4.0'
      */
     version: string;
     /**
-     * E.g. 'Gtk-3.0'
+     * E.g. 'Gtk-4.0'
      */
     packageName: string;
     /**
-     * E.g. 'Gtk30'
-     * Is used in the generated index.d.ts, for example: `import * as Gtk30 from "./Gtk-3.0.js";`
+     * E.g. 'Gtk40'
+     * Is used in the generated index.d.ts, for example: `import * as Gtk40 from "./Gtk-4.0.js";`
      */
+    importNamespace: string;
     importName: string;
+    /**
+     * The version of the library as an object.
+     * E.g. `{ major: 4, minor: 0, patch: 0 }` or as string `4.0.0`'
+     */
+    libraryVersion: LibraryVersion;
     dependencies: Dependency[];
     private _transitiveDependencies;
     set transitiveDependencies(deps: Dependency[]);
@@ -255,5 +262,5 @@ export declare class GirModule {
     /**
      * Start processing the typescript data
      */
-    start(): void;
+    start(girModules: GirModule[]): void;
 }

package/lib/gir-module.js

@@ -9,8 +9,9 @@ import { DependencyManager } from './dependency-manager.js';
 import { NO_TSDATA, WARN_NOT_FOUND_TYPE, WARN_CONSTANT_ALREADY_EXPORTED, WARN_DUPLICATE_SYMBOL, WARN_DUPLICATE_PARAMETER, WARN_DUPLICATE_ENUM_IDENTIFIER, } from './messages.js';
 import { isEqual, find, clone, girBool, removeNamespace, addNamespace, girElementIsIntrospectable } from './utils.js';
 import { SymTable } from './symtable.js';
+import { LibraryVersion } from './library-version.js';
 import { GirDirection } from './types/index.js';
-export class GirModule {
+class GirModule {
     config;
     /**
      * Array of all gir modules
@@ -21,18 +22,24 @@ export class GirModule {
      */
     namespace;
     /**
-     * E.g. '3.0'
+     * E.g. '4.0'
      */
     version = '0.0';
     /**
-     * E.g. 'Gtk-3.0'
+     * E.g. 'Gtk-4.0'
      */
     packageName;
     /**
-     * E.g. 'Gtk30'
-     * Is used in the generated index.d.ts, for example: `import * as Gtk30 from "./Gtk-3.0.js";`
+     * E.g. 'Gtk40'
+     * Is used in the generated index.d.ts, for example: `import * as Gtk40 from "./Gtk-4.0.js";`
      */
+    importNamespace;
     importName;
+    /**
+     * The version of the library as an object.
+     * E.g. `{ major: 4, minor: 0, patch: 0 }` or as string `4.0.0`'
+     */
+    libraryVersion;
     dependencies = [];
     _transitiveDependencies = [];
     set transitiveDependencies(deps) {
@@ -74,11 +81,13 @@ export class GirModule {
         this.namespace = this.ns.$.name;
         this.version = this.ns.$.version;
         this.packageName = `${this.namespace}-${this.version}`;
-        this.transformation = new Transformation(this.packageName, config);
+        this.libraryVersion = new LibraryVersion(this.ns.constant, this.version);
+        this.transformation = new Transformation(config);
         this.log = new Logger(config.environment, config.verbose, this.packageName || 'GirModule');
         this.conflictResolver = new ConflictResolver(config.environment, config.verbose);
         this.inject = new Injector(this.config.environment);
-        this.importName = this.transformation.transformModuleNamespaceName(this.packageName);
+        this.importNamespace = this.transformation.transformModuleNamespaceName(this.packageName);
+        this.importName = this.transformation.transformImportName(this.packageName);
         this.symTable = new SymTable(this.config, this.packageName, this.namespace);
     }
     checkTransitiveDependencies(transitiveDependencies) {
@@ -2184,8 +2193,16 @@ export class GirModule {
     /**
      * Start processing the typescript data
      */
-    start() {
+    start(girModules) {
+        // GObject and Gio are following the version of GLib
+        if (this.namespace === 'GObject' || this.namespace === 'Gio') {
+            const glibModule = girModules.find((girModule) => girModule.namespace === 'GLib');
+            if (glibModule) {
+                this.libraryVersion = glibModule.libraryVersion;
+            }
+        }
         this.setModuleTsData();
     }
 }
+export { GirModule };
 //# sourceMappingURL=gir-module.js.map