@ts-for-gir/generator-typescript 3.3.0 → 4.0.0-beta.2

package/lib/package-data-parser.js

@@ -1,4 +1,4 @@
-import { packageXmlParser } from './package-xml-parser.js';
+import { parseStringPromise } from 'xml2js';
 import { readFile } from 'fs/promises';
 import { resolve } from 'path';
 import { Logger, splitModuleName, cleanString } from '@ts-for-gir/lib';
@@ -9,7 +9,7 @@ export class PackageDataParser {
     packages = [];
     constructor(config) {
         this.config = config;
-        this.log = new Logger('', config.verbose, 'ModuleLoader');
+        this.log = new Logger(config.verbose, 'ModuleLoader');
     }
     get(name) {
         return this.packages.find((pkg) => pkg.gir === name);
@@ -61,7 +61,7 @@ export class PackageDataParser {
         const filePath = resolve(__dirname, '../packages.xml');
         this.log.log(`Parsing ${filePath}...`);
         const fileContents = await readFile(filePath, 'utf8');
-        const result = packageXmlParser(fileContents);
+        const result = (await parseStringPromise(fileContents));
         this.parseSections(result.packages.section);
     }
 }

package/lib/package-data-parser.js.map

@@ -1 +1 @@
-{"version":3,"file":"package-data-parser.js","sourceRoot":"","sources":["../src/package-data-parser.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"package-data-parser.js","sourceRoot":"","sources":["../src/package-data-parser.ts"],"names":[],"mappings":"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"}

package/lib/template-processor.d.ts

@@ -4,7 +4,7 @@
  */
 import ejs from 'ejs';
 import { Logger, Transformation } from '@ts-for-gir/lib';
-import type { GenerateConfig, Dependency, TemplateData, Environment } from '@ts-for-gir/lib';
+import type { GenerateConfig, Dependency, TemplateData } from '@ts-for-gir/lib';
 export declare class TemplateProcessor {
     protected readonly data: TemplateData | undefined;
     protected readonly packageName: string;
@@ -20,13 +20,13 @@ export declare class TemplateProcessor {
      * @param baseDir The base directory
      * @returns The path to the directory
      */
-    protected getEnvironmentDir: (environment: Environment, baseDir: string) => string;
+    protected getEnvironmentDir: (baseDir: string) => string;
     protected getAppendTemplateName(templateFilename: string): string;
     /**
      * Loads and renders a template and gets the rendered templates back
      * @param templateFilename
      */
-    load(templateFilename: string, options?: Partial<ejs.Options>, overrideTemplateData?: TemplateData): Promise<{
+    load(templateFilename: string, ejsOptions?: Partial<ejs.Options>, overrideTemplateData?: TemplateData): Promise<{
         prepend: string;
         append: string;
     }>;
@@ -34,11 +34,11 @@ export declare class TemplateProcessor {
      * Loads and renders all templates in a directory and gets the rendered templates back
      * @param templateDirname
      * @param fileExtension
-     * @param options EJS options
+     * @param ejsOptions EJS options
      * @param overrideTemplateData Override template data if you want
      * @returns The rendered templates
      */
-    loadAll(templateDirname: string, fileExtension: string, options?: Partial<ejs.Options>, overrideTemplateData?: TemplateData): Promise<{
+    loadAll(templateDirname: string, fileExtension: string, ejsOptions?: Partial<ejs.Options>, overrideTemplateData?: TemplateData): Promise<{
         [path: string]: string;
     }>;
     /**
@@ -46,38 +46,35 @@ export declare class TemplateProcessor {
      * @param templateFilename The filename of the template
      * @param baseOutputPath The base output directory path where the templates should be written to
      * @param outputFilename The filename of the output file
-     * @param prependEnv A (optional) boolean that indicates if the environment should be prepended to the output path
      * @param content A (optional) string that should be appended to the rendered template
-     * @param options EJS options
+     * @param ejsOptions EJS options
      * @param overrideTemplateData Override template data if you want
      * @return The rendered template string
      */
-    create(templateFilename: string, baseOutputPath: string, outputFilename: string, prependEnv?: boolean, content?: string, options?: Partial<ejs.Options>, overrideTemplateData?: TemplateData): Promise<string>;
+    create(templateFilename: string, baseOutputPath: string, outputFilename: string, content?: string, ejsOptions?: Partial<ejs.Options>, overrideTemplateData?: TemplateData): Promise<string>;
     /**
      * Loads all templates with file extension in dir, render the templates and write the template to the filesystem
      * @param fileExtension The file extension of the templates
      * @param templateDirname The directory where the templates are located
      * @param baseOutputPath The base output directory path where the templates should be written to
      * @param outputDirname The child output directory of the base output directory where the templates should be written to
-     * @param prependEnv A (optional) boolean that indicates if the environment should be prepended to the output path
      * @param append A (optional) string that should be appended to the rendered template
-     * @param options EJS options
+     * @param ejsOptions EJS options
      * @param overrideTemplateData Override template data if you want
      * @return The rendered (and if possible prettified) templates
      */
-    createAll(fileExtension: string, templateDirname: string, baseOutputPath: string, outputDirname: string, prependEnv?: boolean, append?: string, options?: Partial<ejs.Options>, overrideTemplateData?: TemplateData): Promise<{
+    createAll(fileExtension: string, templateDirname: string, baseOutputPath: string, outputDirname: string, append?: string, ejsOptions?: Partial<ejs.Options>, overrideTemplateData?: TemplateData): Promise<{
         [path: string]: string;
     }>;
-    getOutputPath(baseOutputPath: string, outputFilename: string, prependEnv?: boolean): string;
+    getOutputPath(baseOutputPath: string, outputFilename: string): string;
     /**
      * Writes the `content` to the filesystem
      * @param content The content (normally the content of a rendered template file) that should be written to the filesystem
      * @param baseOutputPath The base output directory path where the templates should be written to
      * @param outputFilename The filename of the output file
-     * @param prependEnv A (optional) boolean that indicates if the environment should be prepended to the output path
      * @returns
      */
-    protected write(content: string, baseOutputPath: string, outputFilename: string, prependEnv?: boolean): Promise<string>;
+    protected write(content: string, baseOutputPath: string, outputFilename: string): Promise<string>;
     /**
      *
      * @param templateString The template content string that should be rendered

package/lib/template-processor.js

@@ -7,7 +7,7 @@ import { readFile, writeFile, mkdir, readdir } from 'fs/promises';
 import { join, dirname, relative, extname } from 'path';
 import ejs from 'ejs';
 import { __dirname } from './utils.js';
-import { Logger, APP_NAME, APP_USAGE, APP_SOURCE, APP_VERSION, PACKAGE_DESC, PACKAGE_KEYWORDS, getDestPath, DependencyManager, Transformation, } from '@ts-for-gir/lib';
+import { Logger, APP_NAME, APP_USAGE, APP_SOURCE, APP_VERSION, PACKAGE_DESC, PACKAGE_KEYWORDS, DependencyManager, Transformation, } from '@ts-for-gir/lib';
 const TEMPLATE_DIR = join(__dirname, '../templates');
 export class TemplateProcessor {
     data;
@@ -27,15 +27,15 @@ export class TemplateProcessor {
         let outdir = config.outdir || './';
         // Make outdir relative to the root directory
         outdir = relative(config.root, outdir);
-        const typeDir = getDestPath(outdir);
+        const typeDir = outdir;
         this.data = {
             ...this.data,
             APP_NAME,
             APP_USAGE,
             APP_SOURCE,
             APP_VERSION,
-            PACKAGE_DESC: PACKAGE_DESC(packageName, this.config.environment, this.data?.girModule?.libraryVersion),
-            PACKAGE_KEYWORDS: PACKAGE_KEYWORDS(packageName, this.config.environment),
+            PACKAGE_DESC: PACKAGE_DESC(packageName, this.data?.girModule?.libraryVersion),
+            PACKAGE_KEYWORDS: PACKAGE_KEYWORDS(packageName),
             importName: this.transformation.transformImportName(packageName),
             dep,
             deps,
@@ -43,8 +43,8 @@ export class TemplateProcessor {
             join,
             dirname,
         };
-        this.environmentTemplateDir = this.getEnvironmentDir(config.environment, TEMPLATE_DIR);
-        this.log = new Logger(config.environment, config.verbose, this.packageName);
+        this.environmentTemplateDir = this.getEnvironmentDir(TEMPLATE_DIR);
+        this.log = new Logger(config.verbose, this.packageName);
     }
     /**
      * Get the output or input directory of the environment
@@ -52,13 +52,9 @@ export class TemplateProcessor {
      * @param baseDir The base directory
      * @returns The path to the directory
      */
-    getEnvironmentDir = (environment, baseDir) => {
-        if (!baseDir.endsWith(environment))
-            if (environment === 'gjs' && !baseDir.endsWith('/gjs')) {
-                return join(baseDir, 'gjs');
-            }
-        if (environment === 'node' && !baseDir.endsWith('/node-gtk')) {
-            return join(baseDir, 'node-gtk');
+    getEnvironmentDir = (baseDir) => {
+        if (!baseDir.endsWith('/gjs')) {
+            return join(baseDir, 'gjs');
         }
         return baseDir;
     };
@@ -80,14 +76,14 @@ export class TemplateProcessor {
      * Loads and renders a template and gets the rendered templates back
      * @param templateFilename
      */
-    async load(templateFilename, options = {}, overrideTemplateData = {}) {
+    async load(templateFilename, ejsOptions = {}, overrideTemplateData = {}) {
         const fileContent = await this.read(templateFilename);
-        const prepend = await this.render(fileContent, options, overrideTemplateData);
+        const prepend = await this.render(fileContent, ejsOptions, overrideTemplateData);
         let append = '';
         const appendTemplateFilename = this.getAppendTemplateName(templateFilename);
         if (this.exists(appendTemplateFilename)) {
             const appendFileContent = await this.read(appendTemplateFilename);
-            append = await this.render(appendFileContent, options, overrideTemplateData);
+            append = await this.render(appendFileContent, ejsOptions, overrideTemplateData);
         }
         return { prepend, append };
     }
@@ -95,14 +91,14 @@ export class TemplateProcessor {
      * Loads and renders all templates in a directory and gets the rendered templates back
      * @param templateDirname
      * @param fileExtension
-     * @param options EJS options
+     * @param ejsOptions EJS options
      * @param overrideTemplateData Override template data if you want
      * @returns The rendered templates
      */
-    async loadAll(templateDirname, fileExtension, options = {}, overrideTemplateData = {}) {
+    async loadAll(templateDirname, fileExtension, ejsOptions = {}, overrideTemplateData = {}) {
         const fileContents = await this.readAll(templateDirname, fileExtension);
         for (const file of Object.keys(fileContents)) {
-            fileContents[file] = await this.render(fileContents[file], options, overrideTemplateData);
+            fileContents[file] = await this.render(fileContents[file], ejsOptions, overrideTemplateData);
         }
         return fileContents;
     }
@@ -111,16 +107,15 @@ export class TemplateProcessor {
      * @param templateFilename The filename of the template
      * @param baseOutputPath The base output directory path where the templates should be written to
      * @param outputFilename The filename of the output file
-     * @param prependEnv A (optional) boolean that indicates if the environment should be prepended to the output path
      * @param content A (optional) string that should be appended to the rendered template
-     * @param options EJS options
+     * @param ejsOptions EJS options
      * @param overrideTemplateData Override template data if you want
      * @return The rendered template string
      */
-    async create(templateFilename, baseOutputPath, outputFilename, prependEnv = true, content = '', options = {}, overrideTemplateData = {}) {
-        const { prepend, append } = await this.load(templateFilename, options, overrideTemplateData);
+    async create(templateFilename, baseOutputPath, outputFilename, content = '', ejsOptions = {}, overrideTemplateData = {}) {
+        const { prepend, append } = await this.load(templateFilename, ejsOptions, overrideTemplateData);
         const code = prepend + '\n' + content + '\n' + append;
-        await this.write(code, baseOutputPath, outputFilename, prependEnv);
+        await this.write(code, baseOutputPath, outputFilename);
         return code;
     }
     /**
@@ -129,27 +124,24 @@ export class TemplateProcessor {
      * @param templateDirname The directory where the templates are located
      * @param baseOutputPath The base output directory path where the templates should be written to
      * @param outputDirname The child output directory of the base output directory where the templates should be written to
-     * @param prependEnv A (optional) boolean that indicates if the environment should be prepended to the output path
      * @param append A (optional) string that should be appended to the rendered template
-     * @param options EJS options
+     * @param ejsOptions EJS options
      * @param overrideTemplateData Override template data if you want
      * @return The rendered (and if possible prettified) templates
      */
-    async createAll(fileExtension, templateDirname, baseOutputPath, outputDirname, prependEnv = true, append = '', options = {}, overrideTemplateData = {}) {
-        const rendered = await this.loadAll(templateDirname, fileExtension, options, overrideTemplateData);
+    async createAll(fileExtension, templateDirname, baseOutputPath, outputDirname, append = '', ejsOptions = {}, overrideTemplateData = {}) {
+        const rendered = await this.loadAll(templateDirname, fileExtension, ejsOptions, overrideTemplateData);
         const result = {};
         for (const filename of Object.keys(rendered)) {
-            const destPath = getDestPath(baseOutputPath, outputDirname, filename);
+            const destPath = join(baseOutputPath, outputDirname, filename);
             result[destPath] = rendered[filename] + '\n' + append;
-            await this.write(result[destPath], baseOutputPath, join(outputDirname, filename), prependEnv);
+            await this.write(result[destPath], baseOutputPath, join(outputDirname, filename));
         }
         return result;
     }
-    getOutputPath(baseOutputPath, outputFilename, prependEnv = true) {
-        const filePath = this.config.package
-            ? join(this.data?.importName || this.packageName, outputFilename)
-            : outputFilename;
-        const outputPath = prependEnv ? getDestPath(baseOutputPath, filePath) : join(baseOutputPath, filePath);
+    getOutputPath(baseOutputPath, outputFilename) {
+        const filePath = join(this.data?.importName || this.packageName, outputFilename);
+        const outputPath = join(baseOutputPath, filePath);
         return outputPath;
     }
     /**
@@ -157,11 +149,10 @@ export class TemplateProcessor {
      * @param content The content (normally the content of a rendered template file) that should be written to the filesystem
      * @param baseOutputPath The base output directory path where the templates should be written to
      * @param outputFilename The filename of the output file
-     * @param prependEnv A (optional) boolean that indicates if the environment should be prepended to the output path
      * @returns
      */
-    async write(content, baseOutputPath, outputFilename, prependEnv = true) {
-        const outputPath = this.getOutputPath(baseOutputPath, outputFilename, prependEnv);
+    async write(content, baseOutputPath, outputFilename) {
+        const outputPath = this.getOutputPath(baseOutputPath, outputFilename);
         // write template result file
         await mkdir(dirname(outputPath), { recursive: true });
         await writeFile(outputPath, content, { encoding: 'utf8', flag: 'w' });

package/lib/template-processor.js.map

@@ -1 +1 @@
-{"version":3,"file":"template-processor.js","sourceRoot":"","sources":["../src/template-processor.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"template-processor.js","sourceRoot":"","sources":["../src/template-processor.ts"],"names":[],"mappings":"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"}

package/lib/type-definition-generator.d.ts

@@ -1,54 +1,52 @@
 import { Generator } from '@ts-for-gir/generator-base';
-import { Logger, Dependency, DependencyManager } from '@ts-for-gir/lib';
+import { Logger, DependencyManager, TypeExpression, NSRegistry, IntrospectedClass, IntrospectedRecord, IntrospectedInterface, IntrospectedBaseClass, IntrospectedField, GirDirection, TsDocTag } from '@ts-for-gir/lib';
 import { TemplateProcessor } from './template-processor.js';
 import { PackageDataParser } from './package-data-parser.js';
-import type { GenerateConfig, GirClassElement, GirCallableParamElement, GirSignalElement, GirEnumElement, GirAliasElement, GirInterfaceElement, GirUnionElement, GirModulesGrouped, GirRecordElement, GirBitfieldElement, GirInstanceParameter, GirModule, TsGenericParameter, TsType, TsDoc, TsFunction, TsCallback, TsSignal, TsMember, TsVar, TsProperty, TsParameter } from '@ts-for-gir/lib';
-export declare class TypeDefinitionGenerator implements Generator {
-    protected readonly _config: GenerateConfig;
-    protected log: Logger;
-    protected dependencyManager: DependencyManager;
-    protected packageData?: PackageDataParser;
-    /** Override config, used to override the config temporarily to generate both ESM and CJS for NPM packages */
-    protected overrideConfig: Partial<GenerateConfig>;
-    /** Get the current config, including the override config */
-    protected get config(): GenerateConfig;
+import { GenerateConfig, GirModule, IntrospectedFunction, IntrospectedCallback, IntrospectedSignal, IntrospectedProperty, IntrospectedConstant, IntrospectedClassCallback, IntrospectedClassFunction, IntrospectedConstructor, IntrospectedDirectAllocationConstructor, IntrospectedFunctionParameter, IntrospectedStaticClassFunction, IntrospectedVirtualClassFunction, IntrospectedAlias, IntrospectedEnum, IntrospectedSignalType, IntrospectedEnumMember, IntrospectedError, FormatGenerator, Generic } from '@ts-for-gir/lib';
+declare class ModuleGenerator extends FormatGenerator<string[]> {
+    log: Logger;
+    dependencyManager: DependencyManager;
+    packageData?: PackageDataParser;
+    config: GenerateConfig;
+    moduleTemplateProcessor: TemplateProcessor;
     /**
      * @param _config The config to use without the override config
      */
-    constructor(_config: GenerateConfig);
+    constructor(namespace: GirModule, config: GenerateConfig);
+    generateClassCallback(node: IntrospectedClassCallback): string[];
+    generateConstructor(node: IntrospectedConstructor): string[];
+    generateDirectAllocationConstructor(node: IntrospectedDirectAllocationConstructor): string[];
+    protected generateParameters(parameters: IntrospectedFunctionParameter[]): string;
+    generateConstructorFunction(node: IntrospectedConstructor): string[];
+    generateRecord(node: IntrospectedRecord): string[];
+    generateInterface(node: IntrospectedInterface): string[];
+    generateInterfaceNamespace(node: IntrospectedInterface): string[];
+    generateInterfaceDeclaration(node: IntrospectedInterface): string[];
+    generateError(node: IntrospectedError): string[];
+    generateSignal(node: IntrospectedSignal, type?: IntrospectedSignalType): string[];
+    generateStaticClassFunction(node: IntrospectedStaticClassFunction): string[];
+    generateVirtualClassFunction(node: IntrospectedVirtualClassFunction): string[];
+    generateExport(type: string, name: string, definition: string, indentCount?: number): string;
+    generateProperty(tsProp: IntrospectedProperty, construct?: boolean, indentCount?: number): string[];
+    generateField(tsProp: IntrospectedField, indentCount?: number): string[];
+    generateProperties(tsProps: IntrospectedProperty[], comment: string, indentCount?: number): string[];
+    generateFields(tsProps: IntrospectedField[], comment: string, indentCount?: number): string[];
+    generateMemberName(tsVar: IntrospectedProperty | IntrospectedConstant | IntrospectedField): string;
     /**
-     *
-     * @param namespace E.g. 'Gtk'
-     * @param packageName E.g. 'Gtk-3.0'
-     * @param asExternType Currently only used for node type imports
-     */
-    protected generateModuleDependenciesImport(packageName: string): string[];
-    protected generateExport(type: string, name: string, definition: string, indentCount?: number): string;
-    protected generateProperty(tsProp: TsProperty, onlyStatic: boolean, namespace: string, indentCount?: number): string[];
-    protected generateProperties(tsProps: TsProperty[], onlyStatic: boolean, namespace: string, comment: string, indentCount?: number): string[];
-    protected generateVariableCallbackType(tsType: TsType, namespace: string): string;
-    protected generateVariable(tsVar: TsProperty | TsVar, namespace: string, indentCount?: number, allowCommentOut?: boolean): string;
-    protected generateType(tsType: TsType, namespace: string, generateNullable?: boolean): string;
-    protected generateTypes(tsTypes: TsType[], namespace: string): string;
-    protected generateGenericValues(tsType: TsType, namespace: string): string;
-    /**
-     * Generates signals from all properties of a base class
-     * TODO: Build new `GirSignalElement`s in `gir-module.ts` instead of generate the strings directly
-     * @param girClass
-     * @param namespace
-     * @param indentCount
-     * @returns
+     * @param tsType The type expression
+     * @param namespace Provides the namespace to import relative to, defaults to the current namespace
+     * @returns A string for the type expression
      */
-    protected generateClassPropertySignals(girClass: GirClassElement | GirUnionElement | GirInterfaceElement | GirRecordElement, namespace: string, indentCount?: number): string[];
-    protected generateInParameters(inParams: GirCallableParamElement[], instanceParameters: GirInstanceParameter[], namespace: string): string[];
-    protected generateSignals(girSignals: GirSignalElement[], girClass: GirClassElement | GirUnionElement | GirInterfaceElement | GirRecordElement, namespace: string, indentCount?: number): string[];
+    generateType(tsType: TypeExpression): string;
+    generateDirectedType(tsType: TypeExpression, direction: GirDirection): string;
+    generateInParameters(inParams: IntrospectedFunctionParameter[]): string[];
     /**
      * Adds documentation comments
      * @see https://github.com/microsoft/tsdoc
      * @param lines
      * @param indentCount
      */
-    protected addTSDocCommentLines(lines: string[], indentCount?: number): string[];
+    addTSDocCommentLines(lines: string[], indentCount?: number): string[];
     /**
      * Adds the documentation as comments
      * @see https://github.com/microsoft/tsdoc
@@ -57,87 +55,103 @@ export declare class TypeDefinitionGenerator implements Generator {
      * @param overwriteDoc
      * @returns
      */
-    protected addGirDocComment(tsDoc: TsDoc | undefined, indentCount?: number, overwriteDoc?: Partial<TsDoc>): string[];
+    addGirDocComment(tsDoc: string | null | undefined, tags?: TsDocTag[], indentCount?: number): string[];
     /**
      * Adds an info comment, is used for debugging the generated types
      * @param comment
      * @param indentCount
      * @returns
      */
-    protected addInfoComment(comment?: string, indentCount?: number): string[];
+    addInfoComment(comment?: string, indentCount?: number): string[];
     /**
      * Adds an inline info comment, is used for debugging the generated types
      * @param comment
      * @param indentCount
      * @returns
      */
-    protected addInlineInfoComment(comment?: string, indentCount?: number): string[];
-    protected mergeDescs(descs: string[], comment?: string, indentCount?: number): string[];
-    protected generateParameter(tsParam: TsParameter, namespace: string): string[];
+    addInlineInfoComment(comment?: string, indentCount?: number): string[];
+    mergeDescs(descs: string[], comment?: string, indentCount?: number): string[];
+    generateParameter(tsParam: IntrospectedFunctionParameter): string[];
     /**
      *
      * @param tsGenerics
      * @param isOut If this generic parameters are out do only generate the type parameter names
      * @returns
      */
-    protected generateGenericParameters(tsGenerics?: TsGenericParameter[], isOut?: boolean): string;
-    protected generateOutParameterReturn(girParam: GirCallableParamElement, namespace: string): string[];
-    protected generateFunctionReturn(tsFunction: TsFunction | TsCallback | TsSignal, namespace: string): string;
-    protected generateFunction(tsFunction: TsFunction | TsCallback | TsSignal | undefined, 
-    /** If true only generate static functions otherwise generate only non static functions */
-    onlyStatic: boolean, namespace: string, indentCount?: number, overloads?: boolean): string[];
-    protected generateFunctions(tsFunctions: TsFunction[], onlyStatic: boolean, namespace: string, indentCount?: number, comment?: string): string[];
-    protected generateCallbackInterface(tsCallback: TsCallback | TsSignal, namespace: string, indentCount?: number, classModuleName?: string): string[];
-    protected generateCallbackInterfaces(tsCallbacks: Array<TsCallback | TsSignal>, namespace: string, indentCount: number | undefined, classModuleName: string, comment?: string): string[];
-    protected generateEnumeration(girEnum: GirEnumElement | GirBitfieldElement, indentCount?: number): string[];
-    protected generateEnumerationMember(tsMember: TsMember, indentCount?: number): string[];
-    protected generateConstant(tsConst: TsVar, namespace: string, indentCount?: number): string[];
-    protected generateAlias(girAlias: GirAliasElement, namespace: string, indentCount?: number): string[] | "";
-    protected generateConstructPropsInterface(girClass: GirClassElement | GirUnionElement | GirInterfaceElement | GirRecordElement, namespace: string, indentCount?: number): string[];
-    protected generateClassFields(girClass: GirClassElement | GirUnionElement | GirInterfaceElement | GirRecordElement, onlyStatic: boolean, namespace: string, indentCount?: number): string[];
-    protected generateClassProperties(girClass: GirClassElement | GirUnionElement | GirInterfaceElement | GirRecordElement, onlyStatic: boolean, namespace: string, indentCount?: number): string[];
-    protected generateClassMethods(girClass: GirClassElement | GirUnionElement | GirInterfaceElement | GirRecordElement, onlyStatic: boolean, namespace: string, indentCount?: number): string[];
-    protected generateClassConstructors(girClass: GirClassElement | GirUnionElement | GirInterfaceElement | GirRecordElement, namespace: string, indentCount?: number): string[];
+    generateGenericParameters(nodes: Generic[], withDefaults?: boolean): string;
+    generateFunctionReturn(tsFunction: IntrospectedFunction | IntrospectedClassFunction | IntrospectedClassCallback | IntrospectedCallback): string;
+    generateClassFunction(node: IntrospectedClassFunction): string[];
+    generateFunction(tsFunction: IntrospectedClassFunction | IntrospectedFunction | IntrospectedCallback, indentCount?: number): string[];
+    generateFunctions(tsFunctions: IntrospectedFunction[] | IntrospectedClassFunction[], indentCount?: number, comment?: string): string[];
+    generateCallback(tsCallback: IntrospectedCallback | IntrospectedClassCallback, indentCount?: number, classModuleName?: string): string[];
+    generateCallbackInterfaces(tsCallbacks: Array<IntrospectedCallback | IntrospectedClassCallback>, indentCount: number | undefined, classModuleName: string, comment?: string): string[];
+    generateEnum(girEnum: IntrospectedEnum, indentCount?: number): string[];
+    generateEnumMember(tsMember: IntrospectedEnumMember, indentCount?: number): string[];
+    generateConst(tsConst: IntrospectedConstant, indentCount?: number): string[];
+    generateAlias(girAlias: IntrospectedAlias, indentCount?: number): string[];
+    generateConstructPropsInterface(girClass: IntrospectedClass | IntrospectedRecord | IntrospectedInterface, indentCount?: number): string[];
+    generateClassStaticFields(girClass: IntrospectedClass | IntrospectedRecord | IntrospectedInterface, indentCount?: number): string[];
+    generateClassMemberFields(girClass: IntrospectedClass | IntrospectedRecord | IntrospectedInterface, indentCount?: number): string[];
+    generateClassFields(girClass: IntrospectedClass | IntrospectedRecord, indentCount?: number): string[];
+    generateClassProperties(girClass: IntrospectedClass | IntrospectedRecord | IntrospectedInterface, indentCount?: number): string[];
+    generateClassStaticMethods(girClass: IntrospectedClass | IntrospectedRecord | IntrospectedInterface, indentCount?: number): string[];
+    generateClassMethods(girClass: IntrospectedClass | IntrospectedRecord | IntrospectedInterface, indentCount?: number): string[];
+    generateClassConstructors(girClass: IntrospectedClass | IntrospectedRecord | IntrospectedInterface, indentCount?: number): string[];
     /**
      * Instance methods, vfunc_ prefix
      * @param girClass
      */
-    protected generateClassVirtualMethods(girClass: GirClassElement | GirUnionElement | GirInterfaceElement | GirRecordElement, namespace: string, indentCount?: number): string[];
-    protected generateClassSignalInterfaces(girClass: GirClassElement | GirUnionElement | GirInterfaceElement | GirRecordElement, namespace: string, indentCount?: number): string[];
-    protected generateClassSignals(girClass: GirClassElement | GirUnionElement | GirInterfaceElement | GirRecordElement, namespace: string): string[];
-    protected generateClassModules(girClass: GirClassElement | GirUnionElement | GirInterfaceElement | GirRecordElement, namespace: string, indentCount?: number): string[];
+    generateClassVirtualMethods(girClass: IntrospectedClass | IntrospectedRecord | IntrospectedInterface, indentCount?: number): string[];
+    generateClassSignalInterfaces(girClass: IntrospectedClass, indentCount?: number): string[];
+    generateSignals(girClass: IntrospectedClass): string[];
+    generateClassSignals(girClass: IntrospectedClass): string[];
+    generateClassModules(girClass: IntrospectedClass | IntrospectedRecord | IntrospectedInterface, indentCount?: number): string[];
+    generateClassCallbacks(girClass: IntrospectedClass | IntrospectedInterface | IntrospectedRecord): string[];
     /**
      * In Typescript, interfaces and classes can have the same name,
      * so we use this to generate interfaces with the same name to implement multiple inheritance
      * @param girClass
      * @param namespace
      */
-    protected generateImplementationInterface(girClass: GirClassElement | GirUnionElement | GirInterfaceElement | GirRecordElement, namespace: string): string[];
+    generateImplementationInterface(girClass: IntrospectedClass | IntrospectedRecord | IntrospectedInterface): string[];
+    protected extends(node: IntrospectedBaseClass): string;
+    protected implements(node: IntrospectedClass): string;
     /**
      * Represents a record, GObject class or interface as a Typescript class
      * @param girClass
      * @param namespace
      */
-    protected generateClass(girClass: GirClassElement | GirUnionElement | GirInterfaceElement | GirRecordElement, namespace: string): string[];
-    protected exportModuleJS(moduleTemplateProcessor: TemplateProcessor, girModule: GirModule): Promise<void>;
-    protected exportModuleAmbientTS(moduleTemplateProcessor: TemplateProcessor, girModule: GirModule): Promise<void>;
-    protected exportModuleAmbientJS(moduleTemplateProcessor: TemplateProcessor, girModule: GirModule): Promise<void>;
-    protected exportModuleImportTS(moduleTemplateProcessor: TemplateProcessor, girModule: GirModule): Promise<void>;
-    protected exportModuleImportJS(moduleTemplateProcessor: TemplateProcessor, girModule: GirModule): Promise<void>;
-    protected exportModuleTS(moduleTemplateProcessor: TemplateProcessor, girModule: GirModule): Promise<void>;
-    protected exportNPMPackage(moduleTemplateProcessor: TemplateProcessor, girModuleImportName: string): Promise<void>;
-    protected exportNPMPackageJson(moduleTemplateProcessor: TemplateProcessor): Promise<void>;
-    protected exportNPMReadme(moduleTemplateProcessor: TemplateProcessor, girModuleImportName: string): Promise<void>;
-    protected exportTSConfig(moduleTemplateProcessor: TemplateProcessor): Promise<void>;
-    protected exportTypeDoc(moduleTemplateProcessor: TemplateProcessor): Promise<void>;
-    protected exportModule(girModule: GirModule, girModules: GirModule[], girModulesGrouped: GirModulesGrouped[]): Promise<void>;
+    generateClass(girClass: IntrospectedClass | IntrospectedRecord): string[];
+    stringifyNamespace(node: GirModule): Promise<string | null>;
+    exportModuleJS(girModule: GirModule): Promise<void>;
+    exportModuleAmbientTS(girModule: GirModule): Promise<void>;
+    protected exportModuleAmbientJS(girModule: GirModule): Promise<void>;
+    protected exportModuleImportTS(girModule: GirModule): Promise<void>;
+    protected exportModuleImportJS(girModule: GirModule): Promise<void>;
+    exportModuleTS(): Promise<void>;
     /**
-     * We build both module types if we build an NPM package,
-     * so we need to switch the module type and use the default noNamespace value for the module type
+     *
+     * @param namespace E.g. 'Gtk'
+     * @param packageName E.g. 'Gtk-3.0'
+     * @param asExternType Currently only used for node type imports
+     */
+    protected generateModuleDependenciesImport(packageName: string): string[];
+    generateNamespace(girModule: GirModule): Promise<string[] | null>;
+    exportModule(_registry: NSRegistry, girModule: GirModule): Promise<void>;
+}
+export declare class TypeDefinitionGenerator implements Generator {
+    readonly config: GenerateConfig;
+    log: Logger;
+    dependencyManager: DependencyManager;
+    packageData?: PackageDataParser;
+    module: ModuleGenerator;
+    /**
+     * @param _config The config to use without the override config
      */
-    protected setOverrideConfigForOtherModuleType(): void;
-    protected resetOverrideConfig(): void;
-    protected exportGjs(dependencies: Dependency[], girModules: GirModule[], girModulesGrouped: GirModulesGrouped[]): Promise<void>;
-    protected exportNodeGtk(dependencies: Dependency[], girModules: GirModule[], girModulesGrouped: GirModulesGrouped[]): Promise<void>;
-    start(girModules: GirModule[], girModulesGrouped?: GirModulesGrouped[]): Promise<void>;
+    constructor(config: GenerateConfig);
+    exportGjs(): Promise<void>;
+    generate(registry: NSRegistry, module: GirModule): Promise<void>;
+    start(): Promise<void>;
+    finish(): Promise<void>;
 }
+export {};