@ts-for-gir/cli 3.0.4 → 3.2.0

package/README.md

@@ -121,9 +121,6 @@ Options:
                                                        [string] [default: false]
       --noDebugComments         Do not generate debugging inline comments
                                                        [string] [default: false]
-      --noDOMLib                Disables the generation of types that are in con
-                                flict with the DOM types
-                                                       [string] [default: false]
       --fixConflicts            Fix Inheritance and implementation type conflict
                                 s                       [string] [default: true]
   -a, --generateAlias           Generate an alias tsconfig file to support GJS E
@@ -395,15 +392,6 @@ The `noDebugComments` CLI option is used to control the generation of inline com
 
 By default, the `noDebugComments` option is disabled and these inline comments will be included in the generated TypeScript files. If you do not require these comments for debugging purposes, you can use the -`-noDebugComments` option to disable their generation and keep your TypeScript code more compact.
 
-### noDOMLib
-The `noDOMLib` option helps to avoid conflicts between the generated GJS global types and the DOM types, which can cause lint warnings and compilation errors with TypeScript.
-
-To utilize this option, it is recommended to either modify your `tsconfig.json` or `jsconfig.json` file to exclude the DOM lib, or to enable the `noLib` property. Doing so will prevent the generation of types that conflict with the DOM types.
-
-For more information on the `lib` and `noLib` properties, please refer to the official TypeScript documentation at https://www.typescriptlang.org/tsconfig/#lib and https://www.typescriptlang.org/tsconfig#noLib.
-
-In summary, the `noDOMLib` option provides a convenient way to prevent the generation of conflicting types, making it easier to build robust and error-free TypeScript applications with GJS.
-
 ### fixConflicts
 The `fixConflicts` CLI option is used to resolve type conflicts between the GObject Introspection descriptions in GIR XML format and TypeScript. For example, properties in the GIR XML format can be overwritten by methods, which is not allowed in TypeScript. When this option is active, `ts-for-gir` attempts to resolve these conflicts. However, it's important to note that this may result in generating types that do not exist.
 

package/lib/config.d.ts

@@ -1,3 +1,6 @@
+/**
+ * Default values, parse the config file and handle CLI flags
+ */
 import { Options } from 'yargs';
 import type { Environment, UserConfig, ConfigFlags, GenerateConfig } from '@ts-for-gir/lib';
 export declare class Config {
@@ -23,7 +26,6 @@ export declare class Config {
         noComments: boolean;
         noDebugComments: boolean;
         fixConflicts: boolean;
-        noDOMLib: boolean;
         generateAlias: boolean;
         promisify: boolean;
         npmScope: string;
@@ -56,7 +58,6 @@ export declare class Config {
         noNamespace: Options;
         noComments: Options;
         noDebugComments: Options;
-        noDOMLib: Options;
         fixConflicts: Options;
         generateAlias: Options;
         promisify: Options;
@@ -93,8 +94,7 @@ export declare class Config {
      */
     private static loadConfigFile;
     static getGenerateConfig(config: UserConfig, environment?: Environment): GenerateConfig;
-    protected static validateTsConfig(config: UserConfig): Promise<UserConfig>;
-    static validate(config: UserConfig): Promise<UserConfig>;
+    static validate(config: UserConfig): UserConfig;
     /**
      * Loads the values of the config file and concatenate them with passed cli flags / arguments.
      * The values from config file are preferred if the cli flag value is the default (and so not set / overwritten)

package/lib/config.js

@@ -1,13 +1,7 @@
-/* eslint-disable @typescript-eslint/no-unsafe-member-access */
-/**
- * Default values, parse the config file and handle CLI flags
- */
-import inquirer from 'inquirer';
 import { cosmiconfig } from 'cosmiconfig';
 import { join, extname, dirname, resolve } from 'path';
 import { writeFile } from 'fs/promises';
 import { merge, isEqual, Logger, APP_NAME, APP_USAGE, ERROR_CONFIG_EXTENSION_UNSUPPORTED, WARN_USE_ESM_FOR_ALIAS, WARN_USE_GJS_FOR_ALIAS, } from '@ts-for-gir/lib';
-import { readTsJsConfig } from './utils.js';
 export class Config {
     static appName = APP_NAME;
     static usage = APP_USAGE;
@@ -31,7 +25,6 @@ export class Config {
         noComments: false,
         noDebugComments: false,
         fixConflicts: true,
-        noDOMLib: false,
         generateAlias: false,
         promisify: true,
         npmScope: '@girs',
@@ -156,12 +149,6 @@ export class Config {
             default: Config.defaults.fixConflicts,
             normalize: true,
         },
-        noDOMLib: {
-            type: 'boolean',
-            description: 'Disables the generation of types that are in conflict with the DOM types',
-            default: Config.defaults.noDOMLib,
-            normalize: true,
-        },
         generateAlias: {
             type: 'boolean',
             alias: 'a',
@@ -213,7 +200,6 @@ export class Config {
         noNamespace: this.options.noNamespace,
         noComments: this.options.noComments,
         noDebugComments: this.options.noDebugComments,
-        noDOMLib: this.options.noDOMLib,
         fixConflicts: this.options.fixConflicts,
         generateAlias: this.options.generateAlias,
         promisify: this.options.promisify,
@@ -311,7 +297,6 @@ export class Config {
             noComments: config.noComments,
             noDebugComments: config.noDebugComments,
             fixConflicts: config.fixConflicts,
-            noDOMLib: config.noDOMLib,
             generateAlias: config.generateAlias,
             promisify: config.promisify,
             npmScope: config.npmScope,
@@ -320,28 +305,7 @@ export class Config {
         };
         return generateConfig;
     }
-    static async validateTsConfig(config) {
-        const tsCompilerOptions = (config.outdir && readTsJsConfig(config.outdir)?.compilerOptions) || {};
-        const tsConfigHasDOMLib = tsCompilerOptions.noLib
-            ? false // NoLib makes typescript to ignore the lib property
-            : Array.isArray(tsCompilerOptions.lib)
-                ? tsCompilerOptions.lib.some((lib) => lib.toLowerCase().startsWith('dom'))
-                : true; // Typescript includes DOM lib by default
-        if (config.environments.includes('gjs') && tsConfigHasDOMLib && !config.noDOMLib) {
-            const answer = (await inquirer.prompt([
-                {
-                    type: 'list',
-                    name: 'include',
-                    choices: ['Yes', 'No'],
-                    message: 'Your typescript compilerOptions includes the DOM lib, this conflicts with some Gjs global types, do you want to skip generating those types?',
-                },
-            ])).include;
-            if (answer == 'No')
-                config.noDOMLib = true;
-        }
-        return config;
-    }
-    static async validate(config) {
+    static validate(config) {
         if (config.generateAlias) {
             if (!config.environments.includes('gjs')) {
                 Logger.warn(WARN_USE_GJS_FOR_ALIAS);
@@ -352,7 +316,6 @@ export class Config {
                 config.moduleType = 'esm';
             }
         }
-        config = await this.validateTsConfig(config);
         return config;
     }
     /**
@@ -379,7 +342,6 @@ export class Config {
             noComments: options.noComments,
             noDebugComments: options.noDebugComments,
             fixConflicts: options.fixConflicts,
-            noDOMLib: options.noDOMLib,
             generateAlias: options.generateAlias,
             promisify: options.promisify,
             npmScope: options.npmScope,
@@ -457,10 +419,6 @@ export class Config {
                 typeof configFileData.fixConflicts === 'boolean') {
                 config.fixConflicts = configFileData.fixConflicts;
             }
-            // noDOMLib
-            if (config.noDOMLib === Config.options.noDOMLib.default && typeof configFileData.noDOMLib === 'boolean') {
-                config.noDOMLib = configFileData.noDOMLib;
-            }
             // generateAlias
             if (config.generateAlias === Config.options.generateAlias.default &&
                 typeof configFileData.generateAlias === 'boolean') {
@@ -501,7 +459,7 @@ export class Config {
                 return dir;
             });
         }
-        return await this.validate(config);
+        return this.validate(config);
     }
 }
 function getDefaultGirDirectories() {

package/lib/config.js.map

@@ -1 +1 @@
-{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,+DAA+D;AAC/D;;GAEG;AACH,OAAO,QAAQ,MAAM,UAAU,CAAA;AAE/B,OAAO,EAAE,WAAW,EAAkC,MAAM,aAAa,CAAA;AACzE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAA;AACtD,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AACvC,OAAO,EACH,KAAK,EACL,OAAO,EACP,MAAM,EACN,QAAQ,EACR,SAAS,EACT,kCAAkC,EAClC,sBAAsB,EACtB,sBAAsB,GACzB,MAAM,iBAAiB,CAAA;AACxB,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAA;AAI3C,MAAM,OAAO,MAAM;IACf,MAAM,CAAC,OAAO,GAAG,QAAQ,CAAA;IAEzB,MAAM,CAAC,KAAK,GAAG,SAAS,CAAA;IAExB;;OAEG;IACH,MAAM,CAAC,QAAQ,GAAG;QACd,YAAY,EAAE,CAAC,KAAK,CAAC;QACrB,KAAK,EAAE,KAAK;QACZ,UAAU,EAAE,kBAAkB;QAC9B,IAAI,EAAE,OAAO,CAAC,GAAG,EAAE;QACnB,MAAM,EAAE,UAAU;QAClB,cAAc,EAAE,wBAAwB,EAAE;QAC1C,OAAO,EAAE,CAAC,GAAG,CAAC;QACd,MAAM,EAAE,EAAE;QACV,OAAO,EAAE,KAAK;QACd,sBAAsB,EAAE,KAAK;QAC7B,WAAW,EAAE,KAAK;QAClB,SAAS,EAAE,KAAK;QAChB,UAAU,EAAE,KAAK;QACjB,UAAU,EAAE,KAAK;QACjB,eAAe,EAAE,KAAK;QACtB,YAAY,EAAE,IAAI;QAClB,QAAQ,EAAE,KAAK;QACf,aAAa,EAAE,KAAK;QACpB,SAAS,EAAE,IAAI;QACf,QAAQ,EAAE,OAAO;QACjB,OAAO,EAAE,KAAK;QACd,WAAW,EAAE,KAAK;KACrB,CAAA;IAED,MAAM,CAAC,cAAc,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAA;IAEvE;;OAEG;IACH,MAAM,CAAC,OAAO,GAAgC;QAC1C,OAAO,EAAE;YACL,WAAW,EAAE,+DAA+D;YAC5E,KAAK,EAAE,IAAI;YACX,OAAO,EAAE,MAAM,CAAC,QAAQ,CAAC,OAAO;YAChC,SAAS,EAAE,IAAI;SAClB;QACD,cAAc,EAAE;YACZ,IAAI,EAAE,QAAQ;YACd,KAAK,EAAE,GAAG;YACV,WAAW,EAAE,iBAAiB;YAC9B,KAAK,EAAE,IAAI;YACX,OAAO,EAAE,MAAM,CAAC,QAAQ,CAAC,cAAc;YACvC,SAAS,EAAE,IAAI;SAClB;QACD,IAAI,EAAE;YACF,IAAI,EAAE,QAAQ;YACd,WAAW,EAAE,gCAAgC;YAC7C,OAAO,EAAE,MAAM,CAAC,QAAQ,CAAC,IAAI;YAC7B,SAAS,EAAE,IAAI;SAClB;QACD,MAAM,EAAE;YACJ,IAAI,EAAE,QAAQ;YACd,KAAK,EAAE,GAAG;YACV,WAAW,EAAE,wBAAwB;YACrC,OAAO,EAAE,MAAM,CAAC,QAAQ,CAAC,MAAM;YAC/B,SAAS,EAAE,IAAI;SAClB;QACD,YAAY,EAAE;YACV,IAAI,EAAE,QAAQ;YACd,KAAK,EAAE,GAAG;YACV,WAAW,EAAE,wBAAwB;YACrC,KAAK,EAAE,IAAI;YACX,OAAO,EAAE,CAAC,KAAK,EAAE,MAAM,CAAC;YACxB,OAAO,EAAE,MAAM,CAAC,QAAQ,CAAC,YAAY;YACrC,SAAS,EAAE,IAAI;SAClB;QACD,MAAM,EAAE;YACJ,IAAI,EAAE,QAAQ;YACd,KAAK,EAAE,GAAG;YACV,WAAW,EAAE,gCAAgC;YAC7C,KAAK,EAAE,IAAI;YACX,OAAO,EAAE,MAAM,CAAC,QAAQ,CAAC,MAAM;YAC/B,SAAS,EAAE,IAAI;SAClB;QACD,SAAS,EAAE;YACP,IAAI,EAAE,QAAQ;YACd,KAAK,EAAE,GAAG;YACV,WAAW,EAAE,6BAA6B;YAC1C,KAAK,EAAE,KAAK;YACZ,OAAO,EAAE,CAAC,KAAK,EAAE,OAAO,CAAC;YACzB,OAAO,EAAE,MAAM,CAAC,QAAQ,CAAC,SAAS;YAClC,SAAS,EAAE,IAAI;SAClB;QACD,UAAU,EAAE;YACR,IAAI,EAAE,QAAQ;YACd,KAAK,EAAE,GAAG;YACV,WAAW,EAAE,wCAAwC;YACrD,OAAO,EAAE,CAAC,KAAK,EAAE,UAAU,EAAE,KAAK,CAAC;YACnC,OAAO,EAAE,MAAM,CAAC,QAAQ,CAAC,UAAU;YACnC,SAAS,EAAE,IAAI;SAClB;QACD,OAAO,EAAE;YACL,IAAI,EAAE,SAAS;YACf,KAAK,EAAE,GAAG;YACV,WAAW,EAAE,gCAAgC;YAC7C,OAAO,EAAE,MAAM,CAAC,QAAQ,CAAC,OAAO;YAChC,SAAS,EAAE,IAAI;SAClB;QACD,sBAAsB,EAAE;YACpB,IAAI,EAAE,SAAS;YACf,WAAW,EAAE,gEAAgE;YAC7E,OAAO,EAAE,MAAM,CAAC,QAAQ,CAAC,sBAAsB;YAC/C,SAAS,EAAE,IAAI;SAClB;QACD,KAAK,EAAE;YACH,IAAI,EAAE,SAAS;YACf,KAAK,EAAE,GAAG;YACV,WAAW,EAAE,iDAAiD;YAC9D,OAAO,EAAE,MAAM,CAAC,QAAQ,CAAC,KAAK;YAC9B,SAAS,EAAE,IAAI;SAClB;QACD,UAAU,EAAE;YACR,IAAI,EAAE,QAAQ;YACd,WAAW,EAAE,wDAAwD;YACrE,OAAO,EAAE,MAAM,CAAC,QAAQ,CAAC,UAAU;YACnC,SAAS,EAAE,IAAI;SAClB;QACD,WAAW,EAAE;YACT,IAAI,EAAE,SAAS;YACf,KAAK,EAAE,GAAG;YACV,WAAW,EAAE,0DAA0D;YACvE,OAAO,EAAE,MAAM,CAAC,QAAQ,CAAC,WAAW;YACpC,SAAS,EAAE,IAAI;SAClB;QACD,UAAU,EAAE;YACR,IAAI,EAAE,SAAS;YACf,KAAK,EAAE,GAAG;YACV,WAAW,EAAE,wCAAwC;YACrD,OAAO,EAAE,MAAM,CAAC,QAAQ,CAAC,UAAU;YACnC,SAAS,EAAE,IAAI;SAClB;QACD,eAAe,EAAE;YACb,IAAI,EAAE,SAAS;YACf,WAAW,EAAE,2CAA2C;YACxD,OAAO,EAAE,MAAM,CAAC,QAAQ,CAAC,eAAe;YACxC,SAAS,EAAE,IAAI;SAClB;QACD,YAAY,EAAE;YACV,IAAI,EAAE,SAAS;YACf,WAAW,EAAE,mDAAmD;YAChE,OAAO,EAAE,MAAM,CAAC,QAAQ,CAAC,YAAY;YACrC,SAAS,EAAE,IAAI;SAClB;QACD,QAAQ,EAAE;YACN,IAAI,EAAE,SAAS;YACf,WAAW,EAAE,0EAA0E;YACvF,OAAO,EAAE,MAAM,CAAC,QAAQ,CAAC,QAAQ;YACjC,SAAS,EAAE,IAAI;SAClB;QACD,aAAa,EAAE;YACX,IAAI,EAAE,SAAS;YACf,KAAK,EAAE,GAAG;YACV,WAAW,EAAE,mEAAmE;YAChF,OAAO,EAAE,MAAM,CAAC,QAAQ,CAAC,aAAa;YACtC,SAAS,EAAE,IAAI;SAClB;QACD,SAAS,EAAE;YACP,IAAI,EAAE,SAAS;YACf,WAAW,EAAE,uDAAuD;YACpE,OAAO,EAAE,MAAM,CAAC,QAAQ,CAAC,SAAS;YAClC,SAAS,EAAE,IAAI;SAClB;QACD,QAAQ,EAAE;YACN,IAAI,EAAE,QAAQ;YACd,WAAW,EAAE,qCAAqC;YAClD,OAAO,EAAE,MAAM,CAAC,QAAQ,CAAC,QAAQ;YACjC,SAAS,EAAE,IAAI;SAClB;QACD,OAAO,EAAE;YACL,IAAI,EAAE,SAAS;YACf,WAAW,EAAE,0DAA0D;YACvE,OAAO,EAAE,MAAM,CAAC,QAAQ,CAAC,OAAO;YAChC,SAAS,EAAE,IAAI;SAClB;QACD,WAAW,EAAE;YACT,IAAI,EAAE,SAAS;YACf,WAAW,EAAE,iDAAiD;YAC9D,OAAO,EAAE,MAAM,CAAC,QAAQ,CAAC,WAAW;YACpC,SAAS,EAAE,IAAI;SAClB;KACJ,CAAA;IAED;;OAEG;IACH,MAAM,CAAC,eAAe,GAAG;QACrB,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,OAAO;QAC7B,cAAc,EAAE,IAAI,CAAC,OAAO,CAAC,cAAc;QAC3C,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI;QACvB,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM;QAC3B,YAAY,EAAE,IAAI,CAAC,OAAO,CAAC,YAAY;QACvC,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM;QAC3B,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC,SAAS;QACjC,UAAU,EAAE,IAAI,CAAC,OAAO,CAAC,UAAU;QACnC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,OAAO;QAC7B,sBAAsB,EAAE,IAAI,CAAC,OAAO,CAAC,sBAAsB;QAC3D,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,KAAK;QACzB,UAAU,EAAE,IAAI,CAAC,OAAO,CAAC,UAAU;QACnC,WAAW,EAAE,IAAI,CAAC,OAAO,CAAC,WAAW;QACrC,UAAU,EAAE,IAAI,CAAC,OAAO,CAAC,UAAU;QACnC,eAAe,EAAE,IAAI,CAAC,OAAO,CAAC,eAAe;QAC7C,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,QAAQ;QAC/B,YAAY,EAAE,IAAI,CAAC,OAAO,CAAC,YAAY;QACvC,aAAa,EAAE,IAAI,CAAC,OAAO,CAAC,aAAa;QACzC,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC,SAAS;QACjC,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,QAAQ;QAC/B,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,OAAO;QAC7B,WAAW,EAAE,IAAI,CAAC,OAAO,CAAC,WAAW;KACxC,CAAA;IAED,MAAM,CAAC,WAAW,GAAG;QACjB,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,OAAO;QAC7B,cAAc,EAAE,MAAM,CAAC,OAAO,CAAC,cAAc;QAC7C,MAAM,EAAE,MAAM,CAAC,OAAO,CAAC,MAAM;QAC7B,UAAU,EAAE,MAAM,CAAC,OAAO,CAAC,UAAU;QACrC,OAAO,EAAE,MAAM,CAAC,OAAO,CAAC,OAAO;KAClC,CAAA;IAED,MAAM,CAAC,UAAU,GAAG;QAChB,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,OAAO;QAC7B,cAAc,EAAE,MAAM,CAAC,OAAO,CAAC,cAAc;QAC7C,MAAM,EAAE,MAAM,CAAC,OAAO,CAAC,MAAM;QAC7B,YAAY,EAAE,MAAM,CAAC,OAAO,CAAC,YAAY;QACzC,MAAM,EAAE,MAAM,CAAC,OAAO,CAAC,MAAM;QAC7B,OAAO,EAAE,MAAM,CAAC,OAAO,CAAC,OAAO;QAC/B,sBAAsB,EAAE,MAAM,CAAC,OAAO,CAAC,sBAAsB;QAC7D,UAAU,EAAE,MAAM,CAAC,OAAO,CAAC,UAAU;KACxC,CAAA;IAED;;;OAGG;IACI,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,YAAiC,EAAE,UAAmB;QAClF,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC,CAAA;QACxD,MAAM,IAAI,GAAG,UAAU,EAAE,QAAQ,IAAI,IAAI,CAAC,cAAc,CAAA;QACxD,MAAM,aAAa,GAAG,EAAE,CAAA;QACxB,KAAK,CAAC,aAAa,EAAE,UAAU,EAAE,MAAM,IAAI,EAAE,EAAE,YAAY,CAAC,CAAA;QAC5D,MAAM,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;QACnC,IAAI,iBAAiB,GAAG,EAAE,CAAA;QAC1B,QAAQ,aAAa,EAAE;YACnB,KAAK,KAAK;gBACN,iBAAiB,GAAG,kBAAkB,IAAI,CAAC,SAAS,CAAC,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CAAA;gBAC9E,MAAK;YACT,KAAK,OAAO;gBACR,iBAAiB,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CAAA;gBAC/D,MAAK;YACT;gBACI,MAAM,CAAC,KAAK,CAAC,kCAAkC,CAAC,CAAA;gBAChD,MAAK;SACZ;QACD,IAAI,iBAAiB,IAAI,IAAI,EAAE;YAC3B,OAAO,SAAS,CAAC,IAAI,EAAE,iBAAiB,CAAC,CAAA;SAC5C;IACL,CAAC;IAED;;;;OAIG;IACK,MAAM,CAAC,KAAK,CAAC,cAAc,CAAC,UAAmB;QACnD,MAAM,mBAAmB,GAAwB;YAC7C,OAAO,EAAE;gBACL,aAAa;gBACb,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE;oBACtB,mEAAmE;oBACnE,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,QAAQ,CAAC,CAAA;oBAEnC,yCAAyC;oBACzC,IAAI,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE;wBACxB,OAAO,IAAI,CAAC,OAAO,CAAC,OAA8B,CAAA;qBACrD;oBACD,sCAAsC;oBACtC,IAAI,IAAI,EAAE,OAAO,EAAE;wBACf,OAAO,IAAI,CAAC,OAA8B,CAAA;qBAC7C;oBACD,8BAA8B;oBAC9B,OAAO,IAA2B,CAAA;gBACtC,CAAC;aACJ;SACJ,CAAA;QACD,IAAI,UAAU,EAAE;YACZ,mBAAmB,CAAC,YAAY,GAAG,CAAC,UAAU,CAAC,CAAA;SAClD;QACD,MAAM,UAAU,GAAgC,MAAM,WAAW,CAAC,MAAM,CAAC,OAAO,EAAE,mBAAmB,CAAC,CAAC,MAAM,EAAE,CAAA;QAC/G,IAAI,UAAU,EAAE,QAAQ,EAAE;YACtB,MAAM,CAAC,cAAc,GAAG,UAAU,CAAC,QAAQ,CAAA;SAC9C;QAED,OAAO,UAAU,CAAA;IACrB,CAAC;IAEM,MAAM,CAAC,iBAAiB,CAAC,MAAkB,EAAE,cAA2B,KAAK;QAChF,MAAM,cAAc,GAAmB;YACnC,WAAW,EAAE,WAAW;YACxB,cAAc,EAAE,MAAM,CAAC,cAAc;YACrC,IAAI,EAAE,MAAM,CAAC,IAAI;YACjB,MAAM,EAAE,MAAM,CAAC,MAAM;YACrB,OAAO,EAAE,MAAM,CAAC,OAAO;YACvB,SAAS,EAAE,MAAM,CAAC,SAAS;YAC3B,UAAU,EAAE,MAAM,CAAC,UAAU;YAC7B,WAAW,EAAE,MAAM,CAAC,WAAW;YAC/B,UAAU,EAAE,MAAM,CAAC,UAAU;YAC7B,eAAe,EAAE,MAAM,CAAC,eAAe;YACvC,YAAY,EAAE,MAAM,CAAC,YAAY;YACjC,QAAQ,EAAE,MAAM,CAAC,QAAQ;YACzB,aAAa,EAAE,MAAM,CAAC,aAAa;YACnC,SAAS,EAAE,MAAM,CAAC,SAAS;YAC3B,QAAQ,EAAE,MAAM,CAAC,QAAQ;YACzB,OAAO,EAAE,MAAM,CAAC,OAAO;YACvB,WAAW,EAAE,MAAM,CAAC,WAAW;SAClC,CAAA;QACD,OAAO,cAAc,CAAA;IACzB,CAAC;IAES,MAAM,CAAC,KAAK,CAAC,gBAAgB,CAAC,MAAkB;QACtD,MAAM,iBAAiB,GAAG,CAAC,MAAM,CAAC,MAAM,IAAI,cAAc,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,eAAe,CAAC,IAAI,EAAE,CAAA;QACjG,MAAM,iBAAiB,GAAG,iBAAiB,CAAC,KAAK;YAC7C,CAAC,CAAC,KAAK,CAAC,oDAAoD;YAC5D,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,iBAAiB,CAAC,GAAG,CAAC;gBACtC,CAAC,CAAC,iBAAiB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;gBAC1E,CAAC,CAAC,IAAI,CAAA,CAAC,yCAAyC;QAEpD,IAAI,MAAM,CAAC,YAAY,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,iBAAiB,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE;YAC9E,MAAM,MAAM,GAAG,CACX,MAAM,QAAQ,CAAC,MAAM,CAAC;gBAClB;oBACI,IAAI,EAAE,MAAM;oBACZ,IAAI,EAAE,SAAS;oBACf,OAAO,EAAE,CAAC,KAAK,EAAE,IAAI,CAAC;oBACtB,OAAO,EACH,8IAA8I;iBACrJ;aACJ,CAAC,CACL,CAAC,OAAuB,CAAA;YAEzB,IAAI,MAAM,IAAI,IAAI;gBAAE,MAAM,CAAC,QAAQ,GAAG,IAAI,CAAA;SAC7C;QAED,OAAO,MAAM,CAAA;IACjB,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAkB;QAC3C,IAAI,MAAM,CAAC,aAAa,EAAE;YACtB,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;gBACtC,MAAM,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAA;gBACnC,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;aAClC;YACD,IAAI,MAAM,CAAC,UAAU,KAAK,KAAK,EAAE;gBAC7B,MAAM,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAA;gBACnC,MAAM,CAAC,UAAU,GAAG,KAAK,CAAA;aAC5B;SACJ;QAED,MAAM,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAA;QAE5C,OAAO,MAAM,CAAA;IACjB,CAAC;IAED;;;;OAIG;IACI,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,OAAoB;QACzC,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,UAAU,CAAC,CAAA;QAChE,MAAM,cAAc,GAAG,UAAU,EAAE,MAAM,IAAI,EAAE,CAAA;QAE/C,MAAM,MAAM,GAAe;YACvB,YAAY,EAAE,OAAO,CAAC,YAAY;YAClC,SAAS,EAAE,OAAO,CAAC,SAAS;YAC5B,UAAU,EAAE,OAAO,CAAC,UAAU;YAC9B,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,sBAAsB,EAAE,OAAO,CAAC,sBAAsB;YACtD,KAAK,EAAE,OAAO,CAAC,KAAK;YACpB,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,cAAc,EAAE,OAAO,CAAC,cAAc;YACtC,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,WAAW,EAAE,OAAO,CAAC,WAAW;YAChC,UAAU,EAAE,OAAO,CAAC,UAAU;YAC9B,eAAe,EAAE,OAAO,CAAC,eAAe;YACxC,YAAY,EAAE,OAAO,CAAC,YAAY;YAClC,QAAQ,EAAE,OAAO,CAAC,QAAQ;YAC1B,aAAa,EAAE,OAAO,CAAC,aAAa;YACpC,SAAS,EAAE,OAAO,CAAC,SAAS;YAC5B,QAAQ,EAAE,OAAO,CAAC,QAAQ;YAC1B,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,WAAW,EAAE,OAAO,CAAC,WAAW;SACnC,CAAA;QAED,IAAI,cAAc,EAAE;YAChB,eAAe;YACf,IAAI,OAAO,CAAC,MAAM,CAAC,YAAY,EAAE,MAAM,CAAC,QAAQ,CAAC,YAAY,CAAC,IAAI,cAAc,CAAC,YAAY,EAAE;gBAC3F,MAAM,CAAC,YAAY,GAAG,cAAc,CAAC,YAAY,CAAA;aACpD;YACD,YAAY;YACZ,IAAI,MAAM,CAAC,SAAS,KAAK,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,OAAO,IAAI,cAAc,CAAC,SAAS,EAAE;gBACnF,MAAM,CAAC,SAAS,GAAG,cAAc,CAAC,SAAS,CAAA;aAC9C;YACD,aAAa;YACb,IAAI,MAAM,CAAC,UAAU,KAAK,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,OAAO,IAAI,cAAc,CAAC,UAAU,EAAE;gBACtF,MAAM,CAAC,UAAU,GAAG,cAAc,CAAC,UAAU,CAAA;aAChD;YACD,UAAU;YACV,IAAI,MAAM,CAAC,OAAO,KAAK,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,IAAI,OAAO,cAAc,CAAC,OAAO,KAAK,SAAS,EAAE;gBAClG,MAAM,CAAC,OAAO,GAAG,cAAc,CAAC,OAAO,CAAA;aAC1C;YACD,yBAAyB;YACzB,IACI,MAAM,CAAC,sBAAsB,KAAK,MAAM,CAAC,OAAO,CAAC,sBAAsB,CAAC,OAAO;gBAC/E,OAAO,cAAc,CAAC,sBAAsB,KAAK,SAAS,EAC5D;gBACE,MAAM,CAAC,sBAAsB,GAAG,cAAc,CAAC,sBAAsB,CAAA;aACxE;YACD,QAAQ;YACR,IAAI,MAAM,CAAC,KAAK,KAAK,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,IAAI,OAAO,cAAc,CAAC,KAAK,KAAK,SAAS,EAAE;gBAC5F,MAAM,CAAC,KAAK,GAAG,cAAc,CAAC,KAAK,CAAA;aACtC;YACD,OAAO;YACP,IAAI,MAAM,CAAC,IAAI,KAAK,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,IAAI,CAAC,cAAc,CAAC,IAAI,IAAI,UAAU,EAAE,QAAQ,CAAC,EAAE;gBAC9F,mEAAmE;gBACnE,MAAM,CAAC,IAAI;oBACP,cAAc,CAAC,IAAI;wBACnB,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAE,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,OAAkB,CAAC,CAAA;aACtG;YACD,SAAS;YACT,IAAI,MAAM,CAAC,MAAM,KAAK,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,IAAI,cAAc,CAAC,MAAM,EAAE;gBAC1E,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,cAAc,CAAC,MAAM,CAAA;aAC9D;YACD,iBAAiB;YACjB,IAAI,MAAM,CAAC,cAAc,KAAK,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC,OAAO,IAAI,cAAc,CAAC,cAAc,EAAE;gBAClG,MAAM,CAAC,cAAc,GAAG,cAAc,CAAC,cAAc,CAAA;aACxD;YACD,SAAS;YACT,IACI,CAAC,CAAC,MAAM,CAAC,MAAM,IAAI,MAAM,CAAC,MAAM,CAAC,MAAM,IAAI,CAAC,IAAI,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;gBAC/F,cAAc,CAAC,MAAM,EACvB;gBACE,MAAM,CAAC,MAAM,GAAG,cAAc,CAAC,MAAM,CAAA;aACxC;YACD,UAAU;YACV,IACI,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,IAAI,CAAC,IAAI,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;gBAChF,cAAc,CAAC,OAAO,EACxB;gBACE,MAAM,CAAC,OAAO,GAAG,cAAc,CAAC,OAAO,CAAA;aAC1C;YACD,cAAc;YACd,IACI,MAAM,CAAC,WAAW,KAAK,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,OAAO;gBACzD,OAAO,cAAc,CAAC,WAAW,KAAK,SAAS,EACjD;gBACE,MAAM,CAAC,WAAW,GAAG,cAAc,CAAC,WAAW,CAAA;aAClD;YACD,aAAa;YACb,IACI,MAAM,CAAC,UAAU,KAAK,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,OAAO;gBACvD,OAAO,cAAc,CAAC,UAAU,KAAK,SAAS,EAChD;gBACE,MAAM,CAAC,UAAU,GAAG,cAAc,CAAC,UAAU,CAAA;aAChD;YACD,kBAAkB;YAClB,IACI,MAAM,CAAC,eAAe,KAAK,MAAM,CAAC,OAAO,CAAC,eAAe,CAAC,OAAO;gBACjE,OAAO,cAAc,CAAC,eAAe,KAAK,SAAS,EACrD;gBACE,MAAM,CAAC,eAAe,GAAG,cAAc,CAAC,eAAe,CAAA;aAC1D;YACD,eAAe;YACf,IACI,MAAM,CAAC,YAAY,KAAK,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,OAAO;gBAC3D,OAAO,cAAc,CAAC,YAAY,KAAK,SAAS,EAClD;gBACE,MAAM,CAAC,YAAY,GAAG,cAAc,CAAC,YAAY,CAAA;aACpD;YACD,WAAW;YACX,IAAI,MAAM,CAAC,QAAQ,KAAK,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,IAAI,OAAO,cAAc,CAAC,QAAQ,KAAK,SAAS,EAAE;gBACrG,MAAM,CAAC,QAAQ,GAAG,cAAc,CAAC,QAAQ,CAAA;aAC5C;YACD,gBAAgB;YAChB,IACI,MAAM,CAAC,aAAa,KAAK,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,OAAO;gBAC7D,OAAO,cAAc,CAAC,aAAa,KAAK,SAAS,EACnD;gBACE,MAAM,CAAC,aAAa,GAAG,cAAc,CAAC,aAAa,CAAA;aACtD;YACD,YAAY;YACZ,IACI,MAAM,CAAC,SAAS,KAAK,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,OAAO;gBACrD,OAAO,cAAc,CAAC,SAAS,KAAK,SAAS,EAC/C;gBACE,MAAM,CAAC,SAAS,GAAG,cAAc,CAAC,SAAS,CAAA;aAC9C;YACD,WAAW;YACX,IAAI,MAAM,CAAC,QAAQ,KAAK,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,IAAI,cAAc,CAAC,QAAQ,EAAE;gBAChF,MAAM,CAAC,QAAQ,GAAG,cAAc,CAAC,QAAQ,CAAA;aAC5C;YACD,UAAU;YACV,IAAI,MAAM,CAAC,OAAO,KAAK,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,IAAI,OAAO,cAAc,CAAC,OAAO,KAAK,SAAS,EAAE;gBAClG,MAAM,CAAC,OAAO,GAAG,cAAc,CAAC,OAAO,CAAA;aAC1C;YACD,cAAc;YACd,IACI,MAAM,CAAC,WAAW,KAAK,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,OAAO;gBACzD,OAAO,cAAc,CAAC,WAAW,KAAK,SAAS,EACjD;gBACE,MAAM,CAAC,WAAW,GAAG,cAAc,CAAC,WAAW,CAAA;aAClD;SACJ;QAED,IAAK,MAAM,CAAC,UAAqB,KAAK,UAAU,EAAE;YAC9C,MAAM,CAAC,UAAU,GAAG,KAAK,CAAA;SAC5B;QAED,+DAA+D;QAC/D,IAAI,MAAM,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,GAAG,CAAC,EAAE;YAClD,MAAM,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,CAAA;SACtD;QAED,0BAA0B;QAC1B,IAAI,MAAM,CAAC,cAAc,EAAE;YACvB,MAAM,CAAC,cAAc,GAAG,MAAM,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;gBACtD,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;oBACtB,OAAO,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,GAAG,CAAC,CAAA;iBACnC;gBACD,OAAO,GAAG,CAAA;YACd,CAAC,CAAC,CAAA;SACL;QAED,OAAO,MAAM,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAA;IACtC,CAAC;;AAGL,SAAS,wBAAwB;IAC7B,MAAM,cAAc,GAAG;QACnB,0BAA0B;QAC1B,oBAAoB;QACpB,wBAAwB;QACxB,gCAAgC;QAChC,sBAAsB;QACtB,sBAAsB;QACtB,sBAAsB;QACtB,qCAAqC;QACrC,qCAAqC;QACrC,qCAAqC;KACxC,CAAA;IACD,4EAA4E;IAC5E,wEAAwE;IACxE,2JAA2J;IAC3J,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE,CAAA;IAC/D,KAAK,IAAI,OAAO,IAAI,QAAQ,EAAE;QAC1B,OAAO,GAAG,IAAI,CAAC,OAAO,EAAE,SAAS,CAAC,CAAA;QAClC,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE;YACnC,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;SAC/B;KACJ;IACD,OAAO,cAAc,CAAA;AACzB,CAAC"}
+{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"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"}

package/lib/index.d.ts

@@ -2,4 +2,3 @@ export * from './commands/index.js';
 export * from './config.js';
 export * from './generation-handler.js';
 export * from './module-loader.js';
-export * from './utils.js';

package/lib/index.js

@@ -2,5 +2,4 @@ export * from './commands/index.js';
 export * from './config.js';
 export * from './generation-handler.js';
 export * from './module-loader.js';
-export * from './utils.js';
 //# sourceMappingURL=index.js.map

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,qBAAqB,CAAA;AACnC,cAAc,aAAa,CAAA;AAC3B,cAAc,yBAAyB,CAAA;AACvC,cAAc,oBAAoB,CAAA;AAClC,cAAc,YAAY,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,qBAAqB,CAAA;AACnC,cAAc,aAAa,CAAA;AAC3B,cAAc,yBAAyB,CAAA;AACvC,cAAc,oBAAoB,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ts-for-gir/cli",
-  "version": "3.0.4",
+  "version": "3.2.0",
   "description": "TypeScript type definition generator for GObject introspection GIR files",
   "module": "lib/index.js",
   "main": "lib/index.js",
@@ -55,11 +55,11 @@
   ],
   "devDependencies": {
     "@types/inquirer": "^9.0.3",
-    "@types/node": "^18.16.16",
+    "@types/node": "^18.16.18",
     "@types/yargs": "^17.0.24",
-    "@typescript-eslint/eslint-plugin": "^5.59.8",
-    "@typescript-eslint/parser": "^5.59.8",
-    "eslint": "^8.41.0",
+    "@typescript-eslint/eslint-plugin": "^5.60.0",
+    "@typescript-eslint/parser": "^5.60.0",
+    "eslint": "^8.43.0",
     "eslint-config-prettier": "^8.8.0",
     "eslint-plugin-prettier": "^4.2.1",
     "prettier": "^2.8.8",
@@ -68,14 +68,13 @@
     "typescript": "^5.1.3"
   },
   "dependencies": {
-    "@ts-for-gir/generator-base": "^3.0.4",
-    "@ts-for-gir/generator-html-doc": "^3.0.4",
-    "@ts-for-gir/generator-typescript": "^3.0.4",
-    "@ts-for-gir/lib": "^3.0.4",
+    "@ts-for-gir/generator-base": "^3.2.0",
+    "@ts-for-gir/generator-html-doc": "^3.2.0",
+    "@ts-for-gir/generator-typescript": "^3.2.0",
+    "@ts-for-gir/lib": "^3.2.0",
     "colorette": "^2.0.20",
-    "cosmiconfig": "^8.1.3",
-    "get-tsconfig": "^4.6.0",
-    "inquirer": "^9.2.6",
+    "cosmiconfig": "^8.2.0",
+    "inquirer": "^9.2.7",
     "tiny-glob": "^0.2.9",
     "yargs": "^17.7.2"
   }

package/src/config.ts

@@ -2,7 +2,6 @@
 /**
  * Default values, parse the config file and handle CLI flags
  */
-import inquirer from 'inquirer'
 import { Options } from 'yargs'
 import { cosmiconfig, Options as ConfigSearchOptions } from 'cosmiconfig'
 import { join, extname, dirname, resolve } from 'path'
@@ -17,7 +16,6 @@ import {
     WARN_USE_ESM_FOR_ALIAS,
     WARN_USE_GJS_FOR_ALIAS,
 } from '@ts-for-gir/lib'
-import { readTsJsConfig } from './utils.js'
 
 import type { Environment, UserConfig, ConfigFlags, UserConfigLoadResult, GenerateConfig } from '@ts-for-gir/lib'
 
@@ -46,7 +44,6 @@ export class Config {
         noComments: false,
         noDebugComments: false,
         fixConflicts: true,
-        noDOMLib: false,
         generateAlias: false,
         promisify: true,
         npmScope: '@girs',
@@ -173,12 +170,6 @@ export class Config {
             default: Config.defaults.fixConflicts,
             normalize: true,
         },
-        noDOMLib: {
-            type: 'boolean',
-            description: 'Disables the generation of types that are in conflict with the DOM types',
-            default: Config.defaults.noDOMLib,
-            normalize: true,
-        },
         generateAlias: {
             type: 'boolean',
             alias: 'a',
@@ -231,7 +222,6 @@ export class Config {
         noNamespace: this.options.noNamespace,
         noComments: this.options.noComments,
         noDebugComments: this.options.noDebugComments,
-        noDOMLib: this.options.noDOMLib,
         fixConflicts: this.options.fixConflicts,
         generateAlias: this.options.generateAlias,
         promisify: this.options.promisify,
@@ -336,7 +326,6 @@ export class Config {
             noComments: config.noComments,
             noDebugComments: config.noDebugComments,
             fixConflicts: config.fixConflicts,
-            noDOMLib: config.noDOMLib,
             generateAlias: config.generateAlias,
             promisify: config.promisify,
             npmScope: config.npmScope,
@@ -346,34 +335,7 @@ export class Config {
         return generateConfig
     }
 
-    protected static async validateTsConfig(config: UserConfig): Promise<UserConfig> {
-        const tsCompilerOptions = (config.outdir && readTsJsConfig(config.outdir)?.compilerOptions) || {}
-        const tsConfigHasDOMLib = tsCompilerOptions.noLib
-            ? false // NoLib makes typescript to ignore the lib property
-            : Array.isArray(tsCompilerOptions.lib)
-            ? tsCompilerOptions.lib.some((lib) => lib.toLowerCase().startsWith('dom'))
-            : true // Typescript includes DOM lib by default
-
-        if (config.environments.includes('gjs') && tsConfigHasDOMLib && !config.noDOMLib) {
-            const answer = (
-                await inquirer.prompt([
-                    {
-                        type: 'list',
-                        name: 'include',
-                        choices: ['Yes', 'No'],
-                        message:
-                            'Your typescript compilerOptions includes the DOM lib, this conflicts with some Gjs global types, do you want to skip generating those types?',
-                    },
-                ])
-            ).include as 'Yes' | 'No'
-
-            if (answer == 'No') config.noDOMLib = true
-        }
-
-        return config
-    }
-
-    public static async validate(config: UserConfig): Promise<UserConfig> {
+    public static validate(config: UserConfig): UserConfig {
         if (config.generateAlias) {
             if (!config.environments.includes('gjs')) {
                 Logger.warn(WARN_USE_GJS_FOR_ALIAS)
@@ -385,8 +347,6 @@ export class Config {
             }
         }
 
-        config = await this.validateTsConfig(config)
-
         return config
     }
 
@@ -415,7 +375,6 @@ export class Config {
             noComments: options.noComments,
             noDebugComments: options.noDebugComments,
             fixConflicts: options.fixConflicts,
-            noDOMLib: options.noDOMLib,
             generateAlias: options.generateAlias,
             promisify: options.promisify,
             npmScope: options.npmScope,
@@ -508,10 +467,6 @@ export class Config {
             ) {
                 config.fixConflicts = configFileData.fixConflicts
             }
-            // noDOMLib
-            if (config.noDOMLib === Config.options.noDOMLib.default && typeof configFileData.noDOMLib === 'boolean') {
-                config.noDOMLib = configFileData.noDOMLib
-            }
             // generateAlias
             if (
                 config.generateAlias === Config.options.generateAlias.default &&
@@ -562,7 +517,7 @@ export class Config {
             })
         }
 
-        return await this.validate(config)
+        return this.validate(config)
     }
 }
 

package/src/index.ts

@@ -2,4 +2,3 @@ export * from './commands/index.js'
 export * from './config.js'
 export * from './generation-handler.js'
 export * from './module-loader.js'
-export * from './utils.js'

package/src/utils.ts

@@ -1,40 +0,0 @@
-import { join, dirname, resolve } from 'path'
-import { existsSync } from 'fs'
-import { getTsconfig, TsConfigJsonResolved } from 'get-tsconfig'
-
-/**
- * Get a typescript or javascript config by path
- * @param path The path to search for a tsconfig.json or jsconfig.json file
- * @returns The config or null if not found
- */
-export const getTsJsConfigByPath = (path: string) => {
-    try {
-        const config = getTsconfig(path)?.config
-        if (config) return config
-    } catch {
-        // ignored
-    }
-    return null
-}
-
-/**
- * Given an directory path search for a tsconfig.json or jsconfig.json file in it or any of its parent directories, then read the file and parse it as json.
- *
- * @param path - The directory path to search for a tsconfig.json or jsconfig.json file
- */
-export function readTsJsConfig(path: string) {
-    let config: null | false | TsConfigJsonResolved = null
-    let lastPath = ''
-    let currentPath = resolve(path)
-    while (!config && currentPath !== lastPath) {
-        const tsConfigPath = join(currentPath, 'tsconfig.json')
-        const jsConfigPath = join(currentPath, 'jsconfig.json')
-        config =
-            (existsSync(tsConfigPath) && getTsJsConfigByPath(tsConfigPath)) ||
-            (existsSync(jsConfigPath) && getTsJsConfigByPath(jsConfigPath))
-        lastPath = currentPath
-        currentPath = dirname(currentPath)
-    }
-
-    return config || null
-}