@ts-for-gir/lib 4.0.0-beta.2 → 4.0.0-beta.21

package/lib/constants.d.ts

@@ -1,13 +1,8 @@
 import { LibraryVersion } from './library-version.js';
-/**
- * In gjs all classes have a static name property but the classes listed below already have a static name property
- */
-export declare const STATIC_NAME_ALREADY_EXISTS: string[];
 export declare const COMMENT_REG_EXP: RegExp;
 export declare const PARAM_REG_EXP: RegExp;
 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 PACKAGE: {
     name: string;
     version: string;
@@ -22,5 +17,9 @@ export declare const APP_SOURCE = "https://github.com/gjsify/ts-for-gir";
 export declare const APP_VERSION: string;
 export declare const PACKAGE_DESC: (packageName: string, libraryVersion?: LibraryVersion) => string;
 export declare const PACKAGE_KEYWORDS: (packageName: string) => string;
-export declare const GENERIC_NAMES: string[];
-export declare const SIGNAL_METHOD_NAMES: string[];
+/** The reserved variable names listed here cannot be resolved simply by quotation marks */
+export declare const RESERVED_QUOTE_VARIABLE_NAMES: string[];
+export declare const RESERVED_VARIABLE_NAMES: string[];
+export declare const RESERVED_CLASS_NAMES: string[];
+export declare const RESERVED_FUNCTION_NAMES: string[];
+export declare const RESERVED_NAMESPACE_NAMES: {};

package/lib/constants.js

@@ -1,15 +1,10 @@
-import { __dirname, readJsonFile } from './utils.js';
+import { __dirname, readJsonFile } from './utils/index.js';
 import { join } from 'path';
-/**
- * In gjs all classes have a static name property but the classes listed below already have a static name property
- */
-export const STATIC_NAME_ALREADY_EXISTS = ['GMime.Charset', 'Camel.StoreInfo'];
 export const COMMENT_REG_EXP = /\/\*.*\*\//g;
 export const PARAM_REG_EXP = /[0-9a-zA-Z_]*:/g;
 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 PACKAGE = await readJsonFile(join(__dirname, '../package.json'));
+export const PACKAGE = await readJsonFile(join(__dirname, './package.json'));
 export const APP_NAME = 'ts-for-gir';
 export const APP_USAGE = 'TypeScript type definition generator for GObject introspection GIR files';
 export const APP_SOURCE = 'https://github.com/gjsify/ts-for-gir';
@@ -23,6 +18,76 @@ export const PACKAGE_DESC = (packageName, libraryVersion) => {
 export const PACKAGE_KEYWORDS = (packageName) => {
     return `"Gir", "TypeScript", "types", "GObject-Introspection", "GJS", "${packageName}"`;
 };
-export const GENERIC_NAMES = ['A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'K'];
-export const SIGNAL_METHOD_NAMES = ['connect', 'emit', 'disconnect', 'connect_after', 'emit'];
+/** The reserved variable names listed here cannot be resolved simply by quotation marks */
+export const RESERVED_QUOTE_VARIABLE_NAMES = ['constructor'];
+export const RESERVED_VARIABLE_NAMES = [
+    'in',
+    'function',
+    'true',
+    'false',
+    'break',
+    'arguments',
+    'eval',
+    'default',
+    'new',
+    'extends',
+    'with',
+    'var',
+    'class',
+    'delete',
+    'return',
+    'constructor',
+    'this', // TODO check if this is used as we would use this in javascript, if so, this is only allowed as the first parameter
+];
+export const RESERVED_CLASS_NAMES = [
+    'break',
+    'boolean',
+    'case',
+    'catch',
+    'class',
+    'const',
+    'continue',
+    'debugger',
+    'default',
+    'delete',
+    'do',
+    'else',
+    'enum',
+    'export',
+    'extends',
+    'false',
+    'finally',
+    'for',
+    'function',
+    'if',
+    'implements',
+    'import',
+    'in',
+    'instanceof',
+    'interface',
+    'let',
+    'new',
+    'number',
+    'package',
+    'private',
+    'protected',
+    'public',
+    'return',
+    'static',
+    'super',
+    'switch',
+    'string',
+    'this',
+    'throw',
+    'true',
+    'try',
+    'typeof',
+    'var',
+    'void',
+    'while',
+    'with',
+    'yield',
+];
+export const RESERVED_FUNCTION_NAMES = ['false', 'true', 'break'];
+export const RESERVED_NAMESPACE_NAMES = {};
 //# sourceMappingURL=constants.js.map

package/lib/constants.js.map

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AACpD,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAA;AAE3B;;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,OAAO,GAAG,MAAM,YAAY,CAOtC,IAAI,CAAC,SAAS,EAAE,iBAAiB,CAAC,CAAC,CAAA;AAEtC,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,CAAC,OAAO,CAAA;AAE1C,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,WAAmB,EAAE,cAA+B,EAAE,EAAE;IACjF,IAAI,cAAc,EAAE,CAAC;QACjB,OAAO,uCAAuC,WAAW,oCAAoC,cAAc,CAAC,QAAQ,EAAE,EAAE,CAAA;IAC5H,CAAC;IACD,OAAO,uCAAuC,WAAW,EAAE,CAAA;AAC/D,CAAC,CAAA;AACD,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,WAAmB,EAAE,EAAE;IACpD,OAAO,kEAAkE,WAAW,GAAG,CAAA;AAC3F,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,mBAAmB,GAAa,CAAC,SAAS,EAAE,MAAM,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,CAAC,CAAA"}
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAA;AAC1D,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAA;AAE3B,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,OAAO,GAAG,MAAM,YAAY,CAOtC,IAAI,CAAC,SAAS,EAAE,gBAAgB,CAAC,CAAC,CAAA;AAErC,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,CAAC,OAAO,CAAA;AAE1C,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,WAAmB,EAAE,cAA+B,EAAE,EAAE;IACjF,IAAI,cAAc,EAAE,CAAC;QACjB,OAAO,uCAAuC,WAAW,oCAAoC,cAAc,CAAC,QAAQ,EAAE,EAAE,CAAA;IAC5H,CAAC;IACD,OAAO,uCAAuC,WAAW,EAAE,CAAA;AAC/D,CAAC,CAAA;AACD,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,WAAmB,EAAE,EAAE;IACpD,OAAO,kEAAkE,WAAW,GAAG,CAAA;AAC3F,CAAC,CAAA;AAED,2FAA2F;AAC3F,MAAM,CAAC,MAAM,6BAA6B,GAAG,CAAC,aAAa,CAAC,CAAA;AAE5D,MAAM,CAAC,MAAM,uBAAuB,GAAG;IACnC,IAAI;IACJ,UAAU;IACV,MAAM;IACN,OAAO;IACP,OAAO;IACP,WAAW;IACX,MAAM;IACN,SAAS;IACT,KAAK;IACL,SAAS;IACT,MAAM;IACN,KAAK;IACL,OAAO;IACP,QAAQ;IACR,QAAQ;IACR,aAAa;IACb,MAAM,EAAE,oHAAoH;CAC/H,CAAA;AAED,MAAM,CAAC,MAAM,oBAAoB,GAAG;IAChC,OAAO;IACP,SAAS;IACT,MAAM;IACN,OAAO;IACP,OAAO;IACP,OAAO;IACP,UAAU;IACV,UAAU;IACV,SAAS;IACT,QAAQ;IACR,IAAI;IACJ,MAAM;IACN,MAAM;IACN,QAAQ;IACR,SAAS;IACT,OAAO;IACP,SAAS;IACT,KAAK;IACL,UAAU;IACV,IAAI;IACJ,YAAY;IACZ,QAAQ;IACR,IAAI;IACJ,YAAY;IACZ,WAAW;IACX,KAAK;IACL,KAAK;IACL,QAAQ;IACR,SAAS;IACT,SAAS;IACT,WAAW;IACX,QAAQ;IACR,QAAQ;IACR,QAAQ;IACR,OAAO;IACP,QAAQ;IACR,QAAQ;IACR,MAAM;IACN,OAAO;IACP,MAAM;IACN,KAAK;IACL,QAAQ;IACR,KAAK;IACL,MAAM;IACN,OAAO;IACP,MAAM;IACN,OAAO;CACV,CAAA;AAED,MAAM,CAAC,MAAM,uBAAuB,GAAG,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,CAAA;AAEjE,MAAM,CAAC,MAAM,wBAAwB,GAAG,EAAE,CAAA"}

package/lib/dependency-manager.d.ts

@@ -1,26 +1,50 @@
+import { GirXML, GirRepository, GirNamespace } from '@gi.ts/parser';
 import { Logger } from './logger.js';
 import { Transformation } from './transformation.js';
-import type { Dependency, GenerateConfig, GirInclude } from './types/index.js';
+import { LibraryVersion } from './library-version.js';
+import type { Dependency, OptionsGeneration, GirInclude, FileInfo } from './types/index.js';
 import type { GirModule } from './gir-module.js';
 import { GirNSRegistry } from './registry.js';
 export declare class DependencyManager extends GirNSRegistry {
-    protected readonly config: GenerateConfig;
+    protected readonly config: OptionsGeneration;
     protected log: Logger;
     protected transformation: Transformation;
-    cache: {
+    protected _cache: {
         [packageName: string]: Dependency;
     };
-    static instance?: DependencyManager;
-    protected constructor(config: GenerateConfig);
+    static instances: {
+        [key: string]: DependencyManager;
+    };
+    protected constructor(config: OptionsGeneration);
     /**
      * Get the DependencyManager singleton instance
      */
-    static getInstance(config: GenerateConfig): DependencyManager;
-    protected parseArgs(namespaceOrPackageName: string, version?: string): {
+    static getInstance(config?: OptionsGeneration): DependencyManager;
+    protected parsePackageName(namespaceOrPackageName: string, version?: string): {
         packageName: string;
         namespace: string;
         version: string;
     };
+    protected parseArgs(namespaceOrPackageNameOrRepo: string | GirRepository, version?: string): {
+        repo: null;
+        namespace: string;
+        importNamespace: string;
+        version: string;
+        libraryVersion: LibraryVersion;
+        packageName: string;
+        importName: string;
+        importPath: string;
+        importDef: string;
+        girXML: GirXML | null;
+        path: string | null;
+        filename: string;
+        exists: boolean;
+    } | {
+        packageName: string;
+        namespace: string;
+        version: string;
+        repo: GirRepository | null;
+    };
     /**
      * Get all dependencies in the cache
      * @returns All dependencies in the cache
@@ -31,26 +55,48 @@ export declare class DependencyManager extends GirNSRegistry {
      * Get the core dependencies
      * @returns
      */
-    core(): Dependency[];
-    createImportProperties(namespace: string, packageName: string): {
+    core(): Promise<Dependency[]>;
+    createImportProperties(namespace: string, packageName: string, version: string): {
         importPath: string;
         importDef: string;
     };
-    createImportPath(packageName: string): string;
+    createImportPath(packageName: string, namespace: string, version: string): string;
     createImportDef(namespace: string, importPath: string): string;
+    protected parseGir(path: string): Promise<{
+        girXML: GirXML;
+        repo: GirRepository;
+        ns: GirNamespace | undefined;
+        version: string | undefined;
+    }>;
+    protected parseGirAndReturnLatestVersion(filesInfo: FileInfo[]): Promise<{
+        libraryVersion: LibraryVersion;
+        girXML: GirXML;
+        fileInfo: FileInfo;
+    } | {
+        libraryVersion: LibraryVersion;
+        girXML: null;
+        fileInfo: FileInfo;
+    }>;
     /**
      * 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(packageName: string): Promise<Dependency>;
     /**
      * 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(namespace: string, version: string): Dependency;
+    get(namespace: string, version: string): Promise<Dependency>;
+    /**
+     * Get the dependency object by {@link GirRepository}
+     * @param namespace The namespace of the dependency
+     * @param version The version of the dependency
+     * @returns The dependency object
+     */
+    get(repo: GirRepository): Promise<Dependency>;
     /**
      * Get all dependencies with the given namespace
      * @param namespace The namespace of the dependency
@@ -67,13 +113,13 @@ export declare class DependencyManager extends GirNSRegistry {
      * Add all dependencies from an array of gir modules
      * @param girModules
      */
-    addAll(girModules: GirModule[]): Dependency[];
+    addAll(girModules: GirModule[]): Promise<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[];
+    fromGirIncludes(girIncludes: GirInclude[]): Promise<Dependency[]>;
     /**
      * Check if multiple dependencies with the given namespace exist in the cache
      * @param namespace The namespace of the dependency

package/lib/dependency-manager.js

@@ -1,30 +1,39 @@
-import { findFileInDirs, splitModuleName, pascalCase } from './utils.js';
+import { parser } from '@gi.ts/parser';
+import { readFile } from 'fs/promises';
+import { findFilesInDirs, splitModuleName, pascalCase } from './utils/index.js';
+import { sanitizeNamespace } from './gir/util.js';
 import { Logger } from './logger.js';
 import { Transformation } from './transformation.js';
+import { LibraryVersion } from './library-version.js';
 import { GirNSRegistry } from './registry.js';
 export class DependencyManager extends GirNSRegistry {
     config;
     log;
     transformation;
-    cache = {};
-    static instance;
+    _cache = {};
+    static instances = {};
     constructor(config) {
         super();
         this.config = config;
-        this.transformation = new Transformation(config);
+        this.transformation = Transformation.getSingleton(config);
         this.log = new Logger(config.verbose, 'DependencyManager');
     }
     /**
      * Get the DependencyManager singleton instance
      */
     static getInstance(config) {
-        if (this.instance) {
-            return this.instance;
+        const configKey = config ? JSON.stringify(config) : Object.keys(this.instances)[0];
+        if (this.instances[configKey]) {
+            return this.instances[configKey];
         }
-        this.instance = new DependencyManager(config);
-        return this.instance;
+        if (!config) {
+            throw new Error('config parameter is required to initialize DependencyManager');
+        }
+        const instance = new DependencyManager(config);
+        this.instances[configKey] = instance;
+        return instance;
     }
-    parseArgs(namespaceOrPackageName, version) {
+    parsePackageName(namespaceOrPackageName, version) {
         let packageName;
         let namespace;
         if (version) {
@@ -39,32 +48,66 @@ export class DependencyManager extends GirNSRegistry {
         }
         return { packageName, namespace, version };
     }
+    parseArgs(namespaceOrPackageNameOrRepo, version) {
+        let packageName;
+        let namespace;
+        let repo = null;
+        if (typeof namespaceOrPackageNameOrRepo === 'string') {
+            // Special case for Gjs
+            if (namespaceOrPackageNameOrRepo === 'Gjs') {
+                return { ...this.getGjs(), repo: null };
+            }
+            const args = this.parsePackageName(namespaceOrPackageNameOrRepo, version);
+            version = args.version;
+            packageName = args.packageName;
+            namespace = args.namespace;
+        }
+        else {
+            repo = namespaceOrPackageNameOrRepo;
+            const ns = repo.namespace?.[0];
+            if (!ns) {
+                throw new Error('Invalid GirRepository');
+            }
+            version = ns.$.version;
+            namespace = ns.$.name;
+            packageName = `${namespace}-${version}`;
+        }
+        return { packageName, namespace, version, repo };
+    }
     /**
      * Get all dependencies in the cache
      * @returns All dependencies in the cache
      */
     all() {
-        return Object.values(this.cache);
+        return Object.values(this._cache);
     }
     getAllPackageNames() {
-        return Object.keys(this.cache);
+        return Object.keys(this._cache);
     }
     /**
      * Get the core dependencies
      * @returns
      */
-    core() {
-        return [this.get('GObject-2.0'), this.get('GLib-2.0')];
+    async core() {
+        return [
+            await this.get('GObject', '2.0'),
+            await this.get('GLib', '2.0'),
+            await this.get('Gio', '2.0'),
+            await this.get('Cairo', '1.0'),
+        ];
     }
-    createImportProperties(namespace, packageName) {
-        const importPath = this.createImportPath(packageName);
+    createImportProperties(namespace, packageName, version) {
+        const importPath = this.createImportPath(packageName, namespace, version);
         const importDef = this.createImportDef(namespace, importPath);
         return {
             importPath,
             importDef,
         };
     }
-    createImportPath(packageName) {
+    createImportPath(packageName, namespace, version) {
+        if (!this.config.package) {
+            return `gi://${namespace}?version=${version}`;
+        }
         const importName = this.transformation.transformImportName(packageName);
         const importPath = `${this.config.npmScope}/${importName}`;
         return importPath;
@@ -74,32 +117,86 @@ export class DependencyManager extends GirNSRegistry {
             ? `import type * as ${namespace} from '${importPath}'`
             : `import type ${namespace} from '${importPath}';`;
     }
-    get(namespaceOrPackageName, version) {
-        // Special case for Gjs
-        if (namespaceOrPackageName === 'Gjs') {
-            return this.getGjs();
+    async parseGir(path) {
+        const girXML = parser.parseGir(await readFile(path, 'utf8'));
+        const repo = girXML.repository[0];
+        const ns = repo?.namespace?.[0];
+        const version = ns?.$.version;
+        return { girXML, repo, ns, version };
+    }
+    async parseGirAndReturnLatestVersion(filesInfo) {
+        const libraryVersions = [];
+        if (filesInfo.length > 1) {
+            this.log.warn(`Multiple paths found for ${filesInfo[0].filename}`);
+        }
+        for (const fileInfo of filesInfo) {
+            if (!fileInfo.exists || !fileInfo.path) {
+                continue;
+            }
+            const { girXML, ns, version } = await this.parseGir(fileInfo.path);
+            if (!version || !ns) {
+                continue;
+            }
+            const libraryVersion = new LibraryVersion(ns?.constant, version);
+            if (filesInfo.length > 1) {
+                this.log.muted(` - ${fileInfo.path} (${libraryVersion.toString()})`);
+            }
+            libraryVersions.push({
+                libraryVersion,
+                girXML,
+                fileInfo,
+            });
+        }
+        // Compare all library versions and return the latest version
+        const latestLibraryVersion = libraryVersions.sort((a, b) => a.libraryVersion.compare(b.libraryVersion))[0];
+        if (!latestLibraryVersion) {
+            this.log.warn('No latest library version found', {
+                libraryVersions,
+                filesInfo,
+            });
+            return {
+                libraryVersion: new LibraryVersion(),
+                girXML: null,
+                fileInfo: filesInfo[0],
+            };
+        }
+        if (filesInfo.length > 1) {
+            this.log.muted(`Use latest version ${latestLibraryVersion.libraryVersion.toString()}`);
         }
-        const args = this.parseArgs(namespaceOrPackageName, version);
-        version = args.version;
-        const packageName = args.packageName;
-        const namespace = args.namespace;
-        if (this.cache[packageName]) {
-            const dep = this.cache[packageName];
+        return latestLibraryVersion;
+    }
+    async get(namespaceOrPackageNameOrRepo, _version) {
+        const parsedArgs = this.parseArgs(namespaceOrPackageNameOrRepo, _version);
+        const { packageName, repo } = parsedArgs;
+        let { namespace, version } = parsedArgs;
+        namespace = sanitizeNamespace(namespace);
+        if (this._cache[packageName]) {
+            const dep = this._cache[packageName];
             return dep;
         }
         const filename = `${packageName}.gir`;
-        const { exists, path } = findFileInDirs(this.config.girDirectories, filename);
+        const filesInfo = await findFilesInDirs(this.config.girDirectories, filename);
+        const { libraryVersion, girXML, fileInfo } = await this.parseGirAndReturnLatestVersion(filesInfo);
+        const ns = girXML?.repository[0]?.namespace?.[0] || repo?.namespace?.[0] || null;
+        // Use the version from the gir file if it exists
+        if (ns?.$.version) {
+            version = ns?.$.version;
+        }
+        if (ns?.$.name) {
+            namespace = ns?.$.name;
+        }
         const dependency = {
+            ...fileInfo,
             namespace,
-            exists,
-            filename,
-            path,
             packageName,
             importName: this.transformation.transformImportName(packageName),
+            importNamespace: this.transformation.transformModuleNamespaceName(packageName),
             version,
-            ...this.createImportProperties(namespace, packageName),
+            libraryVersion,
+            girXML,
+            ...this.createImportProperties(namespace, packageName, version),
         };
-        this.cache[packageName] = dependency;
+        this._cache[packageName] = dependency;
         return dependency;
     }
     /**
@@ -110,7 +207,7 @@ export class DependencyManager extends GirNSRegistry {
     list(namespace) {
         const packageNames = this.all();
         const candidates = packageNames.filter((dep) => {
-            return dep.namespace === namespace;
+            return dep.namespace === namespace && dep.exists;
         });
         return candidates;
     }
@@ -126,9 +223,9 @@ export class DependencyManager extends GirNSRegistry {
      * Add all dependencies from an array of gir modules
      * @param girModules
      */
-    addAll(girModules) {
+    async addAll(girModules) {
         for (const girModule of girModules) {
-            this.get(girModule.namespace, girModule.version || '0.0');
+            await this.get(girModule.namespace, girModule.version || '0.0');
         }
         return this.all();
     }
@@ -137,10 +234,10 @@ export class DependencyManager extends GirNSRegistry {
      * @param girIncludes - Array of gir includes
      * @returns Array of dependencies
      */
-    fromGirIncludes(girIncludes) {
+    async fromGirIncludes(girIncludes) {
         const dependencies = [];
         for (const i of girIncludes) {
-            dependencies.unshift(this.get(i.$.name, i.$.version || '0.0'));
+            dependencies.unshift(await this.get(i.$.name, i.$.version || '0.0'));
         }
         return dependencies;
     }
@@ -152,7 +249,7 @@ export class DependencyManager extends GirNSRegistry {
     hasConflict(namespace) {
         const packageNames = this.getAllPackageNames();
         const candidates = packageNames.filter((packageName) => {
-            return packageName.startsWith(`${namespace}-`) && this.cache[packageName].namespace === namespace;
+            return packageName.startsWith(`${namespace}-`) && this._cache[packageName].namespace === namespace;
         });
         return candidates.length > 1;
     }
@@ -192,31 +289,36 @@ export class DependencyManager extends GirNSRegistry {
         }
         const packageNames = this.getAllPackageNames();
         const candidates = packageNames.filter((packageName) => {
-            return packageName.startsWith(`${namespace}-`) && this.cache[packageName].namespace === namespace;
+            return packageName.startsWith(`${namespace}-`) && this._cache[packageName].namespace === namespace;
         });
         if (candidates.length > 1) {
             this.log.warn(`Found multiple versions of ${namespace}: ${candidates.join(', ')}`);
         }
         const latestVersion = candidates.sort().pop();
-        if (latestVersion && this.cache[latestVersion]) {
-            const dep = 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];
+        if (this._cache[packageName]) {
+            return this._cache[packageName];
         }
+        const namespace = pascalCase(packageName);
+        const version = '2.0';
         const dep = {
-            namespace: pascalCase(packageName),
+            namespace,
             exists: true,
             filename: '',
             path: '',
             packageName: packageName,
             importName: this.transformation.transformImportName(packageName),
-            version: '0.0',
-            ...this.createImportProperties(packageName, packageName),
+            importNamespace: this.transformation.transformModuleNamespaceName(packageName),
+            version,
+            libraryVersion: new LibraryVersion(),
+            girXML: null,
+            ...this.createImportProperties(packageName, packageName, version),
         };
         return dep;
     }

package/lib/dependency-manager.js.map

@@ -1 +1 @@
-{"version":3,"file":"dependency-manager.js","sourceRoot":"","sources":["../src/dependency-manager.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"dependency-manager.js","sourceRoot":"","sources":["../src/dependency-manager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAuC,MAAM,eAAe,CAAA;AAC3E,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAA;AAEtC,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAC/E,OAAO,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAA;AACjD,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AACpC,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAA;AACpD,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAIrD,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAA;AAC7C,MAAM,OAAO,iBAAkB,SAAQ,aAAa;IAQP;IAP/B,GAAG,CAAQ;IACX,cAAc,CAAgB;IAE9B,MAAM,GAA0C,EAAE,CAAA;IAE5D,MAAM,CAAC,SAAS,GAAyC,EAAE,CAAA;IAE3D,YAAyC,MAAyB;QAC9D,KAAK,EAAE,CAAA;QAD8B,WAAM,GAAN,MAAM,CAAmB;QAG9D,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC,YAAY,CAAC,MAAM,CAAC,CAAA;QACzD,IAAI,CAAC,GAAG,GAAG,IAAI,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,mBAAmB,CAAC,CAAA;IAC9D,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,WAAW,CAAC,MAA0B;QACzC,MAAM,SAAS,GAAG,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAA;QAElF,IAAI,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,EAAE,CAAC;YAC5B,OAAO,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,CAAA;QACpC,CAAC;QAED,IAAI,CAAC,MAAM,EAAE,CAAC;YACV,MAAM,IAAI,KAAK,CAAC,8DAA8D,CAAC,CAAA;QACnF,CAAC;QAED,MAAM,QAAQ,GAAG,IAAI,iBAAiB,CAAC,MAAM,CAAC,CAAA;QAC9C,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,GAAG,QAAQ,CAAA;QACpC,OAAO,QAAQ,CAAA;IACnB,CAAC;IAES,gBAAgB,CAAC,sBAA8B,EAAE,OAAgB;QACvE,IAAI,WAAmB,CAAA;QACvB,IAAI,SAAiB,CAAA;QACrB,IAAI,OAAO,EAAE,CAAC;YACV,SAAS,GAAG,sBAAsB,CAAA;YAClC,WAAW,GAAG,GAAG,SAAS,IAAI,OAAO,EAAE,CAAA;QAC3C,CAAC;aAAM,CAAC;YACJ,WAAW,GAAG,sBAAsB,CAAA;YACpC,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,eAAe,CAAC,WAAW,CAAC,CAAA;YACjF,SAAS,GAAG,UAAU,CAAA;YACtB,OAAO,GAAG,QAAQ,CAAA;QACtB,CAAC;QACD,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,OAAO,EAAE,CAAA;IAC9C,CAAC;IAES,SAAS,CAAC,4BAAoD,EAAE,OAAgB;QACtF,IAAI,WAAmB,CAAA;QACvB,IAAI,SAAiB,CAAA;QACrB,IAAI,IAAI,GAAyB,IAAI,CAAA;QAErC,IAAI,OAAO,4BAA4B,KAAK,QAAQ,EAAE,CAAC;YACnD,uBAAuB;YACvB,IAAI,4BAA4B,KAAK,KAAK,EAAE,CAAC;gBACzC,OAAO,EAAE,GAAG,IAAI,CAAC,MAAM,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAA;YAC3C,CAAC;YAED,MAAM,IAAI,GAAG,IAAI,CAAC,gBAAgB,CAAC,4BAA4B,EAAE,OAAO,CAAC,CAAA;YACzE,OAAO,GAAG,IAAI,CAAC,OAAO,CAAA;YACtB,WAAW,GAAG,IAAI,CAAC,WAAW,CAAA;YAC9B,SAAS,GAAG,IAAI,CAAC,SAAS,CAAA;QAC9B,CAAC;aAAM,CAAC;YACJ,IAAI,GAAG,4BAA4B,CAAA;YACnC,MAAM,EAAE,GAAG,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,CAAA;YAC9B,IAAI,CAAC,EAAE,EAAE,CAAC;gBACN,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAA;YAC5C,CAAC;YACD,OAAO,GAAG,EAAE,CAAC,CAAC,CAAC,OAAO,CAAA;YACtB,SAAS,GAAG,EAAE,CAAC,CAAC,CAAC,IAAI,CAAA;YACrB,WAAW,GAAG,GAAG,SAAS,IAAI,OAAO,EAAE,CAAA;QAC3C,CAAC;QAED,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,OAAO,EAAE,IAAI,EAAE,CAAA;IACpD,CAAC;IAED;;;OAGG;IACH,GAAG;QACC,OAAO,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;IACrC,CAAC;IAED,kBAAkB;QACd,OAAO,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;IACnC,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,IAAI;QACN,OAAO;YACH,MAAM,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE,KAAK,CAAC;YAChC,MAAM,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC;YAC7B,MAAM,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,KAAK,CAAC;YAC5B,MAAM,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,KAAK,CAAC;SACjC,CAAA;IACL,CAAC;IAED,sBAAsB,CAAC,SAAiB,EAAE,WAAmB,EAAE,OAAe;QAC1E,MAAM,UAAU,GAAG,IAAI,CAAC,gBAAgB,CAAC,WAAW,EAAE,SAAS,EAAE,OAAO,CAAC,CAAA;QACzE,MAAM,SAAS,GAAG,IAAI,CAAC,eAAe,CAAC,SAAS,EAAE,UAAU,CAAC,CAAA;QAC7D,OAAO;YACH,UAAU;YACV,SAAS;SACZ,CAAA;IACL,CAAC;IAED,gBAAgB,CAAC,WAAmB,EAAE,SAAiB,EAAE,OAAe;QACpE,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;YACvB,OAAO,QAAQ,SAAS,YAAY,OAAO,EAAE,CAAA;QACjD,CAAC;QACD,MAAM,UAAU,GAAG,IAAI,CAAC,cAAc,CAAC,mBAAmB,CAAC,WAAW,CAAC,CAAA;QACvE,MAAM,UAAU,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,IAAI,UAAU,EAAE,CAAA;QAC1D,OAAO,UAAU,CAAA;IACrB,CAAC;IAED,eAAe,CAAC,SAAiB,EAAE,UAAkB;QACjD,OAAO,IAAI,CAAC,MAAM,CAAC,WAAW;YAC1B,CAAC,CAAC,oBAAoB,SAAS,UAAU,UAAU,GAAG;YACtD,CAAC,CAAC,eAAe,SAAS,UAAU,UAAU,IAAI,CAAA;IAC1D,CAAC;IAES,KAAK,CAAC,QAAQ,CAAC,IAAY;QACjC,MAAM,MAAM,GAAG,MAAM,CAAC,QAAQ,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAA;QAC5D,MAAM,IAAI,GAAG,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,CAAA;QACjC,MAAM,EAAE,GAAG,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,CAAA;QAC/B,MAAM,OAAO,GAAG,EAAE,EAAE,CAAC,CAAC,OAAO,CAAA;QAC7B,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,OAAO,EAAE,CAAA;IACxC,CAAC;IAES,KAAK,CAAC,8BAA8B,CAAC,SAAqB;QAChE,MAAM,eAAe,GAA6E,EAAE,CAAA;QAEpG,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACvB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,4BAA4B,SAAS,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAA;QACtE,CAAC;QAED,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;YAC/B,IAAI,CAAC,QAAQ,CAAC,MAAM,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;gBACrC,SAAQ;YACZ,CAAC;YACD,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,OAAO,EAAE,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;YAClE,IAAI,CAAC,OAAO,IAAI,CAAC,EAAE,EAAE,CAAC;gBAClB,SAAQ;YACZ,CAAC;YAED,MAAM,cAAc,GAAG,IAAI,cAAc,CAAC,EAAE,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAA;YAEhE,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACvB,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,QAAQ,CAAC,IAAI,KAAK,cAAc,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAA;YACxE,CAAC;YAED,eAAe,CAAC,IAAI,CAAC;gBACjB,cAAc;gBACd,MAAM;gBACN,QAAQ;aACX,CAAC,CAAA;QACN,CAAC;QACD,6DAA6D;QAC7D,MAAM,oBAAoB,GAAG,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;QAE1G,IAAI,CAAC,oBAAoB,EAAE,CAAC;YACxB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,iCAAiC,EAAE;gBAC7C,eAAe;gBACf,SAAS;aACZ,CAAC,CAAA;YACF,OAAO;gBACH,cAAc,EAAE,IAAI,cAAc,EAAE;gBACpC,MAAM,EAAE,IAAI;gBACZ,QAAQ,EAAE,SAAS,CAAC,CAAC,CAAC;aACzB,CAAA;QACL,CAAC;QAED,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACvB,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,sBAAsB,oBAAoB,CAAC,cAAc,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAA;QAC1F,CAAC;QAED,OAAO,oBAAoB,CAAA;IAC/B,CAAC;IAsBD,KAAK,CAAC,GAAG,CAAC,4BAAoD,EAAE,QAAiB;QAC7E,MAAM,UAAU,GAAG,IAAI,CAAC,SAAS,CAAC,4BAA4B,EAAE,QAAQ,CAAC,CAAA;QACzE,MAAM,EAAE,WAAW,EAAE,IAAI,EAAE,GAAG,UAAU,CAAA;QACxC,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,GAAG,UAAU,CAAA;QACvC,SAAS,GAAG,iBAAiB,CAAC,SAAS,CAAC,CAAA;QAExC,IAAI,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE,CAAC;YAC3B,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,CAAA;YACpC,OAAO,GAAG,CAAA;QACd,CAAC;QACD,MAAM,QAAQ,GAAG,GAAG,WAAW,MAAM,CAAA;QACrC,MAAM,SAAS,GAAG,MAAM,eAAe,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,EAAE,QAAQ,CAAC,CAAA;QAE7E,MAAM,EAAE,cAAc,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,IAAI,CAAC,8BAA8B,CAAC,SAAS,CAAC,CAAA;QAEjG,MAAM,EAAE,GAAwB,MAAM,EAAE,UAAU,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,IAAI,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,IAAI,IAAI,CAAA;QAErG,iDAAiD;QACjD,IAAI,EAAE,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC;YAChB,OAAO,GAAG,EAAE,EAAE,CAAC,CAAC,OAAO,CAAA;QAC3B,CAAC;QACD,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;YACb,SAAS,GAAG,EAAE,EAAE,CAAC,CAAC,IAAI,CAAA;QAC1B,CAAC;QAED,MAAM,UAAU,GAAe;YAC3B,GAAG,QAAQ;YACX,SAAS;YACT,WAAW;YACX,UAAU,EAAE,IAAI,CAAC,cAAc,CAAC,mBAAmB,CAAC,WAAW,CAAC;YAChE,eAAe,EAAE,IAAI,CAAC,cAAc,CAAC,4BAA4B,CAAC,WAAW,CAAC;YAC9E,OAAO;YACP,cAAc;YACd,MAAM;YACN,GAAG,IAAI,CAAC,sBAAsB,CAAC,SAAS,EAAE,WAAW,EAAE,OAAO,CAAC;SAClE,CAAA;QAED,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,GAAG,UAAU,CAAA;QAErC,OAAO,UAAU,CAAA;IACrB,CAAC;IAED;;;;OAIG;IACH,IAAI,CAAC,SAAiB;QAClB,MAAM,YAAY,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;QAC/B,MAAM,UAAU,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE;YAC3C,OAAO,GAAG,CAAC,SAAS,KAAK,SAAS,IAAI,GAAG,CAAC,MAAM,CAAA;QACpD,CAAC,CAAC,CAAA;QACF,OAAO,UAAU,CAAA;IACrB,CAAC;IAED;;;;OAIG;IACH,SAAS,CAAC,UAAuB,EAAE,GAAe;QAC9C,OAAO,UAAU,CAAC,IAAI,CAClB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,KAAK,GAAG,CAAC,WAAW,IAAI,CAAC,CAAC,SAAS,KAAK,GAAG,CAAC,SAAS,IAAI,CAAC,CAAC,OAAO,KAAK,GAAG,CAAC,OAAO,CACzG,CAAA;IACL,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,MAAM,CAAC,UAAuB;QAChC,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;YACjC,MAAM,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,SAAS,EAAE,SAAS,CAAC,OAAO,IAAI,KAAK,CAAC,CAAA;QACnE,CAAC;QACD,OAAO,IAAI,CAAC,GAAG,EAAE,CAAA;IACrB,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,eAAe,CAAC,WAAyB;QAC3C,MAAM,YAAY,GAAiB,EAAE,CAAA;QACrC,KAAK,MAAM,CAAC,IAAI,WAAW,EAAE,CAAC;YAC1B,YAAY,CAAC,OAAO,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,IAAI,KAAK,CAAC,CAAC,CAAA;QACxE,CAAC;QACD,OAAO,YAAY,CAAA;IACvB,CAAC;IAED;;;;OAIG;IACH,WAAW,CAAC,SAAiB;QACzB,MAAM,YAAY,GAAG,IAAI,CAAC,kBAAkB,EAAE,CAAA;QAC9C,MAAM,UAAU,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC,WAAW,EAAE,EAAE;YACnD,OAAO,WAAW,CAAC,UAAU,CAAC,GAAG,SAAS,GAAG,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,SAAS,KAAK,SAAS,CAAA;QACtG,CAAC,CAAC,CAAA;QAEF,OAAO,UAAU,CAAC,MAAM,GAAG,CAAC,CAAA;IAChC,CAAC;IAED;;;;OAIG;IACH,gBAAgB,CAAC,SAAiB;QAC9B,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;QACvC,MAAM,aAAa,GAAG,UAAU;aAC3B,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;YACX,OAAO,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,OAAO,CAAC,CAAA;QAC7C,CAAC,CAAC;aACD,GAAG,EAAE,CAAA;QACV,OAAO,aAAa,CAAA;IACxB,CAAC;IAED;;;;;OAKG;IACH,eAAe,CAAC,SAAiB,EAAE,OAAe;QAC9C,MAAM,aAAa,GAAG,IAAI,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAA;QACtD,OAAO,aAAa,EAAE,OAAO,KAAK,OAAO,CAAA;IAC7C,CAAC;IAED;;;;OAIG;IACH,IAAI,CAAC,SAAiB;QAClB,uBAAuB;QACvB,IAAI,SAAS,KAAK,KAAK,EAAE,CAAC;YACtB,OAAO,IAAI,CAAC,MAAM,EAAE,CAAA;QACxB,CAAC;QAED,MAAM,YAAY,GAAG,IAAI,CAAC,kBAAkB,EAAE,CAAA;QAC9C,MAAM,UAAU,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC,WAAW,EAAE,EAAE;YACnD,OAAO,WAAW,CAAC,UAAU,CAAC,GAAG,SAAS,GAAG,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,SAAS,KAAK,SAAS,CAAA;QACtG,CAAC,CAAC,CAAA;QAEF,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACxB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,8BAA8B,SAAS,KAAK,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;QACtF,CAAC;QAED,MAAM,aAAa,GAAG,UAAU,CAAC,IAAI,EAAE,CAAC,GAAG,EAAE,CAAA;QAE7C,IAAI,aAAa,IAAI,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE,CAAC;YAC9C,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,CAAA;YACtC,OAAO,GAAG,CAAA;QACd,CAAC;QAED,OAAO,IAAI,CAAA;IACf,CAAC;IAES,gBAAgB,CAAC,WAAmB;QAC1C,IAAI,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE,CAAC;YAC3B,OAAO,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,CAAA;QACnC,CAAC;QAED,MAAM,SAAS,GAAG,UAAU,CAAC,WAAW,CAAC,CAAA;QACzC,MAAM,OAAO,GAAG,KAAK,CAAA;QAErB,MAAM,GAAG,GAAe;YACpB,SAAS;YACT,MAAM,EAAE,IAAI;YACZ,QAAQ,EAAE,EAAE;YACZ,IAAI,EAAE,EAAE;YACR,WAAW,EAAE,WAAW;YACxB,UAAU,EAAE,IAAI,CAAC,cAAc,CAAC,mBAAmB,CAAC,WAAW,CAAC;YAChE,eAAe,EAAE,IAAI,CAAC,cAAc,CAAC,4BAA4B,CAAC,WAAW,CAAC;YAC9E,OAAO;YACP,cAAc,EAAE,IAAI,cAAc,EAAE;YACpC,MAAM,EAAE,IAAI;YACZ,GAAG,IAAI,CAAC,sBAAsB,CAAC,WAAW,EAAE,WAAW,EAAE,OAAO,CAAC;SACpE,CAAA;QAED,OAAO,GAAG,CAAA;IACd,CAAC;IAED,MAAM;QACF,OAAO,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAA;IACvC,CAAC"}

package/lib/generators/dts-inline.d.ts

@@ -1,8 +1,10 @@
+import { Logger } from "../logger.js";
 import { IntrospectedNamespace } from "../gir/namespace.js";
-import { GenerationOptions } from "../types.js";
 import { DtsGenerator } from "./dts.js";
+import type { OptionsGeneration } from "../types/index.js";
 export declare class DtsInlineGenerator extends DtsGenerator {
-    constructor(namespace: IntrospectedNamespace, options: GenerationOptions);
+    readonly log: Logger;
+    constructor(namespace: IntrospectedNamespace, options: OptionsGeneration);
     generateNamespace(node: IntrospectedNamespace): Promise<string | null>;
     stringifyNamespace(node: IntrospectedNamespace): Promise<string | null>;
 }