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

package/README.md

@@ -18,13 +18,12 @@
 
 # CLI
 
-CLI tool to generate Typescript Type Definition files for GJS and node-gtk.
+CLI tool to generate Typescript Type Definition files for GJS.
 
 ## Getting started
 
 ``` bash
-npm install -g @ts-for-gir/cli
-ts-for-gir --help
+npx @ts-for-gir/cli --help
 ```
 
 > Alternatively you can also add @ts-for-gir/cli to your dependencies:
@@ -32,28 +31,28 @@ ts-for-gir --help
 > npm install --save-dev @ts-for-gir/cli
 > ```
 >
-> Or without installing using `npx`:
+> Or globally install it:
 > ```bash
-> npx @ts-for-gir/cli --help
+> npm install -g @ts-for-gir/cli
+> ts-for-gir --help
 > ```
 
-After you have installed `@ts-for-gir/cli` you can run the `ts-for-gir` command:
-
 ```bash
-$ ts-for-gir --help
+$ npx @ts-for-gir/cli --help
 
-Typescript .d.ts generator from GIR for GJS or node-gtk
+TypeScript type definition generator for GObject introspection GIR files
 
 Commands:
-  ts-for-gir generate [modules..]  Generates .d.ts files from GIR for GJS or nod
-                                   e-gtk
+  ts-for-gir generate [modules..]  Generates .d.ts files from GIR for GJS
   ts-for-gir list [modules..]      Lists all available GIR modules
+  ts-for-gir copy [modules..]      Scan for *.gir files and copy them to a new d
+                                   irectory
   ts-for-gir doc [modules..]       The HTML documentation generator is not yet i
                                    mplemented, but feel free to implement it 🤗
 
 Options:
   --version  Show version number                                       [boolean]
-  --help     Show help                                                 [boolean]                                             [boolean]
+  --help     Show help                                                 [boolean]
 ```
 
 ## Example
@@ -64,24 +63,16 @@ To generate the Typescript type definitions of Gtk-4.0 for GJS run:
 ts-for-gir generate Gtk-4.0
 ```
 
-To generate this types for [node-gtk](https://github.com/romgrk/node-gtk) run:
-
-```
-ts-for-gir generate Gtk-4.0 -e node
-```
-
 You can also look at the [examples](https://github.com/gjsify/ts-for-gir/tree/main/examples) to see how the types are generated there.
 
 ## Generate .d.ts files
 
 ```bash
-$ ts-for-gir generate --help
-
-ts-for-gir generate [modules..]
+$ npx @ts-for-gir/cli generate --help
 
 ts-for-gir generate [modules..]
 
-Generates .d.ts files from GIR for GJS or node-gtk
+Generates .d.ts files from GIR for GJS
 
 Options:
       --version                 Show version number                    [boolean]
@@ -90,48 +81,50 @@ Options:
                                 tiple modules           [array] [default: ["*"]]
   -g, --girDirectories          GIR directories
   [array] [default: ["/usr/local/share/gir-1.0","/usr/share/gir-1.0","/usr/share
-  /gnome-shell","/usr/share/gnome-shell/gir-1.0","/usr/lib64/mutter-10","/usr/li
-  b64/mutter-11","/usr/lib64/mutter-12","/usr/lib/x86_64-linux-gnu/mutter-10","/
-  usr/lib/x86_64-linux-gnu/mutter-11","/usr/lib/x86_64-linux-gnu/mutter-12","/ho
-  me/jumplink/.local/share/flatpak/exports/share/gir-1.0","/var/lib/flatpak/expo
-                                                            rts/share/gir-1.0"]]
+  /*/gir-1.0","/usr/share/gnome-shell","/usr/share/gnome-shell/gir-1.0","/usr/li
+        b64/mutter-*","/usr/lib/mutter-*","/usr/lib/x86_64-linux-gnu/mutter-*"]]
       --root                    Root directory of your project
-                        [string] [default: "/home/jumplink/Projekte/ts-for-gir"]
+                 [string] [default: "/home/jumplink/Projekte/gjsify/ts-for-gir"]
   -o, --outdir                  Directory to output to
                                                   [string] [default: "./@types"]
   -i, --ignore                  Modules that should be ignored
                                                            [array] [default: []]
   -v, --verbose                 Switch on/off the verbose mode
                                                        [string] [default: false]
-      --ignoreVersionConflicts  Do not ask for package versions if multiple vers
-                                ions are found         [string] [default: false]
+      --ignoreVersionConflicts  Skip prompts for library version selection when
+                                multiple versions are detected
+                                                       [string] [default: false]
   -p, --print                   Print the output to console and create no files
                                                        [string] [default: false]
-      --configName              Name of the config if you want to use a differen
-                                t name    [string] [default: ".ts-for-girrc.js"]
+      --configName              Specify a custom name for the configuration file
+                                          [string] [default: ".ts-for-girrc.js"]
   -d, --noNamespace             Do not export all symbols for each module as a n
                                 amespace               [string] [default: false]
   -n, --noComments              Do not generate documentation comments
                                                        [string] [default: false]
-      --noDebugComments         Do not generate debugging inline comments
-                                                       [string] [default: false]
-      --fixConflicts            Fix Inheritance and implementation type conflict
-                                s                       [string] [default: true]
       --promisify               Generate promisified functions for async/finish
                                 calls                   [string] [default: true]
       --npmScope                Scope of the generated NPM packages
                                                      [string] [default: "@girs"]
+      --workspace               Uses the workspace protocol for the generated pa
+                                ckages which can be used with package managers l
+                                ike Yarn and PNPM      [string] [default: false]
+      --onlyVersionPrefix       Only use the version prefix for the ambient modu
+                                le exports. This is useful if, for whatever reas
+                                on, you want to use different library versions o
+                                f the same library in your project.
+                                                       [string] [default: false]
+      --package                 Generate the typescript types with package.json
+                                support                [string] [default: false]
 
 Examples:
   ts-for-gir generate                       Run 'ts-for-gir generate' in your gj
-                                            s or node-gtk project to generate ty
-                                            pings for your project, pass the gir
-                                             modules you need for your project
+                                            s project to generate typings for yo
+                                            ur project, pass the gir modules you
+                                             need for your project
   ts-for-gir generate Gtk*                  You can also use wild cards
   ts-for-gir generate '*'                   If you want to parse all of your loc
                                             ally installed gir modules run
-  ts-for-gir generate '*' -e gjs            Generate .d.ts. files only for gjs
-  ts-for-gir generate '*' -e node           Generate .d.ts. files only for node
   ts-for-gir generate --configName='.ts-fo  Use a special config file
   r-gir.gtk4.rc.js
   ts-for-gir generate --ignore=Gtk-4.0 xra  Generate .d.ts. files but not for Gt
@@ -141,7 +134,7 @@ Examples:
 ## List available GIR modules
 
 ```bash
-$ ts-for-gir list --help
+$ npx @ts-for-gir/cli list --help
  
 ts-for-gir list [modules..]
 
@@ -154,13 +147,12 @@ Options:
                         dules                           [array] [default: ["*"]]
   -g, --girDirectories  GIR directories
   [array] [default: ["/usr/local/share/gir-1.0","/usr/share/gir-1.0","/usr/share
-  /gnome-shell","/usr/share/gnome-shell/gir-1.0","/usr/lib64/mutter-10","/usr/li
-  b64/mutter-11","/usr/lib64/mutter-12","/usr/lib/x86_64-linux-gnu/mutter-10","/
-  usr/lib/x86_64-linux-gnu/mutter-11","/usr/lib/x86_64-linux-gnu/mutter-12","/ho
-  me/jumplink/.local/share/flatpak/exports/share/gir-1.0","/var/lib/flatpak/expo
-                                                            rts/share/gir-1.0"]]
+  /*/gir-1.0","/usr/share/gnome-shell","/usr/share/gnome-shell/gir-1.0","/usr/li
+        b64/mutter-*","/usr/lib/mutter-*","/usr/lib/x86_64-linux-gnu/mutter-*"]]
+      --root            Root directory of your project
+                 [string] [default: "/home/jumplink/Projekte/gjsify/ts-for-gir"]
   -i, --ignore          Modules that should be ignored     [array] [default: []]
-      --configName      Name of the config if you want to use a different name
+      --configName      Specify a custom name for the configuration file
                                           [string] [default: ".ts-for-girrc.js"]
   -v, --verbose         Switch on/off the verbose mode [string] [default: false]
 
@@ -175,7 +167,7 @@ Examples:
 ## Generate HTML documentation
 
 ```bash
-$ ts-for-gir doc --help
+$ npx @ts-for-gir/cli doc --help
 
 ts-for-gir doc [modules..]
 
@@ -190,16 +182,11 @@ To do that, create a new config file called `.ts-for-girrc.js` in your project r
 ```js
 // or on CommonJs: exports.default = {
 export default {
-  print: false,
   verbose: true,
-  environments: ['gjs', 'node'],
   outdir: '@types',
   girDirectories: ['/usr/share/gir-1.0'],
   modules: ['*'],
   ignore: [],
-  noNamespace: false,
-  buildType: 'lib',
-  moduleType: 'esm'
 }
 ```
 
@@ -241,97 +228,23 @@ In this example, the generated TypeScript types will be saved in the `./types` d
 
 It is important to note that the outdir option should be a valid directory path, and `ts-for-gir` will create the directory if it does not exist. If the specified directory already contains files, `ts-for-gir` will overwrite the existing files with the newly generated types.
 
-### environments
-The `environments` option allows you to specify the JavaScript environment for which you want to generate the TypeScript type definitions. The available values are `"gjs"` and `"node"`. You can also specify both environments.
-
-The default value for this option is `"gjs"`.
-
-To specify the environments option when running ts-for-gir, you would add the `--environments` or `-e` flag, followed by a comma-separated list of values. For example:
-
-```bash
-ts-for-gir generate * --environments gjs node
-```
-
-This option is useful if you want to generate type definitions for use in different JavaScript environments, such as in a `GJS` application or in a `Node.js` application using [node-gtk](https://github.com/romgrk/node-gtk). By specifying the appropriate environment, ts-for-gir can generate type definitions that are optimized for that environment, ensuring that your code will be type-checked correctly and you will receive meaningful error messages in your development environment.
-
 ### ignore
 The `ignore` CLI option allows you to specify modules that should be ignored when generating TypeScript types. This can be useful if you have multiple versions of a library installed but only want to generate types for one of them.
 
 To use the ignore option, pass one or more module names as arguments. For example, to ignore the `Gtk-3.0` module, you would use the following command:
 
 ```bash
-ts-for-gir generate Gtk-* --ignore Gtk-3.0
+ts-for-gir generate Gtk-* --ignore */Gtk-3.0
 ```
 
 You can also ignore multiple modules:
 
 ```bash
-ts-for-gir generate * --ignore Gtk-2.0 Gtk-3.0 Gtk-4.0
+ts-for-gir generate * --ignore */Gtk-2.0 */Gtk-3.0 */Gtk-4.0
 ```
 
 Note that ignoring a module will prevent ts-for-gir from generating types for that module and any submodules that it might contain.
 
-### buildType
-`ts-for-gir` supports two build types for generating the types: `"lib"` and `"types"`.
-
-* If `"lib"` is specified, `.js` files are generated as well as `.d.ts`, this is useful for some bundlers that expect a `.js` file. Some bundlers are also able to generate the import of this file only once, even if it occurs multiple times in your code.
-* If `"types"` is specified, only `.d.ts` files are generated. In this mode it is recommended to add the generated `"@types/gjs.d.ts"` and `"@types/ambient.d.ts"` under `"include"` in the `tsconfig` to make the generated types known in your project.
-
-### moduleType
-The `moduleType` CLI option determines the format in which the generated JavaScript files should be exported. The option takes either `"esm"` or `"cjs"` as its value, with `"esm"` being the default.
-
-> This option is only relevant if the `buildType` is set to `"lib"`. The choice of `moduleType` may affect how the generated code is used in other parts of your project, so it's important to choose the right format that works best for your use case.
-
-The choice of `moduleType` is also important in the context of the bundler that you plan to use in your project. For example, if you are using a bundler that only supports ESM (such as Rollup), you would need to set `moduleType` to "esm". On the other hand, if you are using a bundler that supports both ESM and CommonJS (such as Webpack), you can choose whichever format you prefer. Ultimately, the choice of `moduleType` will depend on your project requirements and the tools that you are using. For Example, if you want to build a GNOME Shell Extension, you should use `"cjs"` because `ESM` is currently not supported for GNOME Shell Extensions. For [node-gtk](https://github.com/romgrk/node-gtk) you also need to use `"cjs"`. If you want to build a regular GJS Application we recommend to use `ESM`.
-
-When `"esm"` is set, the generated JavaScript files will use the ECMAScript module (ESM) format for imports and exports. For example, the generated code might look like this:
-
-```ts
-// Gtk-4.0.d.ts
-import type GLib from './GLib-2.0.js';
-
-namespace Gtk {
-  class Window extends Widget {
-    ...
-  }
-  function builder_error_quark(): GLib.Quark
-}
-
-export default Gtk;
-```
-
-```js
-// Gtk-4.0.js
-import Gtk from 'gi://Gtk?version=4.0';
-export default Gtk;
-```
-
-> The `"esm"` module type is recommended for GJS applications as it makes use of the ESM import syntax, which is more modern and flexible compared to imports.gi / CommonJS imports. This allows for a more streamlined and convenient way of using the generated types in your GJS application. Support for ES modules can be activated in `gjs` with its `gjs -m` flag.
-
-When `"cjs"` and [`noNamespace`](#nonamespace) is set, the generated JavaScript files will use the CommonJS format exports and the `imports.gi` object for imports. For example:
-
-```ts
-// Gtk-4.0.d.ts
-import type * as GLib from './GLib-2.0.js';
-
-export class Window extends Widget {
-  ...
-}
-export function builder_error_quark(): GLib.Quark
-```
-
-```js
-// Gtk-4.0.js
-imports.gi.versions.Gtk = '4.0'
-const Gtk = imports.gi.Gtk;
-  
-module.exports = { Gtk };
-exports.default = Gtk;
-```
-
-> It is recommended to also set the [noNamespace](#nonamespace) option to true when using the `"cjs"` moduleType option. This will ensure that the generated code is fully compatible with the CommonJS format.
-
-
 ### verbose
 The `--verbose` or `-v` option is a flag that can be used to enable verbose output in the console when running the CLI. When this option is enabled, additional warnings and information about the processing of GIR files and the generation of TypeScript definitions will be printed to the console. This information can be useful for debugging purposes or for understanding what is happening behind the scenes when generating the TypeScript definitions.
 
@@ -377,16 +290,6 @@ To use the noComments option, pass it as a command line argument to `ts-for-gir`
 ts-for-gir generate * --noComments`
 ```
 
-### noDebugComments
-The `noDebugComments` CLI option is used to control the generation of inline comments in the generated TypeScript files. These comments are used for debugging purposes and can be useful in tracking down issues with the generated types.
-
-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.
-
-### 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.
-
-> If you have found an issue with the `fixConflicts` CLI option, we encourage you to report it. Reporting issues helps improve the quality of `ts-for-gir` and makes it a better tool for everyone.
-
 # package
 
 The `--package` option of ts-for-gir is used to package the generated TypeScript type definitions into an NPM package. The generated package can be easily installed and used in other TypeScript projects via `npm install`.

package/lib/commands/copy.d.ts

@@ -0,0 +1,12 @@
+/**
+ * Everything you need for the `ts-for-gir copy` command is located here
+ */
+import { Argv } from 'yargs';
+import type { ConfigFlags } from '@ts-for-gir/lib';
+export declare const copy: {
+    command: string;
+    description: string;
+    builder: ((args: Argv<any>) => Argv<ConfigFlags>) | ((args: Argv<any>) => void);
+    handler: (args: ConfigFlags) => Promise<void>;
+    examples: readonly [string, (string | undefined)?][];
+};

package/lib/commands/copy.js

@@ -0,0 +1,78 @@
+/**
+ * Everything you need for the `ts-for-gir copy` command is located here
+ */
+import { copyFile, mkdir } from 'fs/promises';
+import { basename, join } from 'path';
+import { ModuleLoader } from '../module-loader.js';
+import { Config } from '../config.js';
+import { Logger, ERROR_NO_MODULES_FOUND } from '@ts-for-gir/lib';
+const command = 'copy [modules..]';
+const description = 'Scan for *.gir files and copy them to a new directory';
+const builder = (yargs) => {
+    const optionNames = Object.keys(Config.copyOptions);
+    for (const optionName of optionNames) {
+        yargs = yargs.option(optionName, Config.copyOptions[optionName]);
+    }
+    return yargs.example(examples);
+};
+const copyGirFile = async (config, depModule) => {
+    if (!depModule.path) {
+        Logger.danger(`- ${depModule.packageName} not found`);
+        return;
+    }
+    if (!config.outdir) {
+        Logger.error(`outdir not found`);
+        return;
+    }
+    const filename = basename(depModule.path);
+    const dest = join(config.outdir, filename);
+    if (depModule.path === dest) {
+        Logger.yellow(`Skip ${depModule.path}`);
+        return;
+    }
+    Logger.success(`Copy ${depModule.path}`);
+    await copyFile(depModule.path, dest);
+};
+const handler = async (args) => {
+    const config = await Config.load(args);
+    const generateConfig = Config.getOptionsGeneration(config);
+    const moduleLoader = new ModuleLoader(generateConfig);
+    const { grouped, failed } = await moduleLoader.getModules(config.modules, config.ignore);
+    const moduleGroups = Object.values(grouped);
+    if (Object.keys(grouped).length === 0) {
+        return Logger.error(ERROR_NO_MODULES_FOUND(config.girDirectories));
+    }
+    if (!config.outdir) {
+        Logger.error(`outdir not found`);
+        return;
+    }
+    await mkdir(config.outdir, { recursive: true }).catch((err) => {
+        Logger.error(`Failed to copy gir files to ${config.outdir}: ${err}`);
+    });
+    for (const module of moduleGroups) {
+        for (const mod of module.modules) {
+            await copyGirFile(config, mod);
+        }
+    }
+    if (failed.length > 0) {
+        Logger.danger('\nDependencies not found:');
+        for (const fail of failed) {
+            Logger.white(`- ${fail}`);
+        }
+    }
+};
+const examples = [
+    [`${Config.appName} copy -o ./gir`, `Copy found *.gir files to ./gir`],
+    [
+        `${Config.appName} copy -g /usr/share/gir-1.0 --ignore=Gtk-3.0 xrandr-1.3 -o ./gir`,
+        'Copy all found *.gir files in /usr/share/gir-1.0 excluding Gtk-3.0 and xrandr-1.3 to ./gir',
+    ],
+];
+export const copy = {
+    command,
+    description,
+    builder,
+    handler,
+    examples,
+};
+//# sourceMappingURL=copy.js.map

package/lib/commands/copy.js.map

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

package/lib/commands/doc.js

@@ -8,7 +8,6 @@ import { Config } from '../config.js';
 import { ModuleLoader } from '../module-loader.js';
 const command = 'doc [modules..]';
 const description = 'The HTML documentation generator is not yet implemented, but feel free to implement it 🤗';
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
 const builder = (yargs) => {
     const optionNames = Object.keys(Config.docOptions);
     for (const optionName of optionNames) {
@@ -16,10 +15,9 @@ const builder = (yargs) => {
     }
     return yargs.example(examples);
 };
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
 const handler = async (args) => {
     const config = await Config.load(args);
-    const generateConfig = Config.getGenerateConfig(config);
+    const generateConfig = Config.getOptionsGeneration(config);
     const moduleLoader = new ModuleLoader(generateConfig);
     const { keep } = await moduleLoader.getModulesResolved(config.modules, config.ignore || [], config.ignoreVersionConflicts);
     if (keep.length === 0) {

package/lib/commands/doc.js.map

@@ -1 +1 @@
-{"version":3,"file":"doc.js","sourceRoot":"","sources":["../../src/commands/doc.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,EAAE,MAAM,EAAE,sBAAsB,EAAE,MAAM,iBAAiB,CAAA;AAChE,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAA;AAC1D,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAA;AAC5D,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAA;AACrC,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAA;AAIlD,MAAM,OAAO,GAAG,iBAAiB,CAAA;AAEjC,MAAM,WAAW,GAAG,2FAA2F,CAAA;AAE/G,8DAA8D;AAC9D,MAAM,OAAO,GAAsC,CAAC,KAAgB,EAAE,EAAE;IACpE,MAAM,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAA;IAClD,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE,CAAC;QACnC,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,CAAA;IACnE,CAAC;IACD,OAAO,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAsB,CAAA;AACvD,CAAC,CAAA;AAED,8DAA8D;AAC9D,MAAM,OAAO,GAAG,KAAK,EAAE,IAAiB,EAAE,EAAE;IACxC,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IAEtC,MAAM,cAAc,GAAG,MAAM,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAA;IACvD,MAAM,YAAY,GAAG,IAAI,YAAY,CAAC,cAAc,CAAC,CAAA;IACrD,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,YAAY,CAAC,kBAAkB,CAClD,MAAM,CAAC,OAAO,EACd,MAAM,CAAC,MAAM,IAAI,EAAE,EACnB,MAAM,CAAC,sBAAsB,CAChC,CAAA;IACD,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACpB,OAAO,MAAM,CAAC,KAAK,CAAC,sBAAsB,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,CAAA;IACtE,CAAC;IACD,MAAM,QAAQ,GAAG,IAAI,iBAAiB,CAAC,cAAc,EAAE,aAAa,CAAC,QAAQ,CAAC,CAAA;IAC9E,MAAM,QAAQ,GAAG,YAAY,CAAC,iBAAiB,CAAA;IAE/C,MAAM,QAAQ,CAAC,KAAK,CAChB,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,mBAAmB,EAAE,EAAE,CAAC,mBAAmB,CAAC,MAAM,CAAC,EACzE,QAAQ,CACX,CAAA;AACL,CAAC,CAAA;AAED,MAAM,QAAQ,GAAqC,EAAE,CAAA;AAErD,MAAM,CAAC,MAAM,GAAG,GAAG;IACf,OAAO;IACP,WAAW;IACX,OAAO;IACP,OAAO;IACP,QAAQ;CACX,CAAA"}
+{"version":3,"file":"doc.js","sourceRoot":"","sources":["../../src/commands/doc.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,EAAE,MAAM,EAAE,sBAAsB,EAAE,MAAM,iBAAiB,CAAA;AAChE,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAA;AAC1D,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAA;AAC5D,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAA;AACrC,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAA;AAIlD,MAAM,OAAO,GAAG,iBAAiB,CAAA;AAEjC,MAAM,WAAW,GAAG,2FAA2F,CAAA;AAG/G,MAAM,OAAO,GAAsC,CAAC,KAAgB,EAAE,EAAE;IACpE,MAAM,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAA;IAClD,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE,CAAC;QACnC,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,CAAA;IACnE,CAAC;IACD,OAAO,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAsB,CAAA;AACvD,CAAC,CAAA;AAGD,MAAM,OAAO,GAAG,KAAK,EAAE,IAAiB,EAAE,EAAE;IACxC,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IAEtC,MAAM,cAAc,GAAG,MAAM,CAAC,oBAAoB,CAAC,MAAM,CAAC,CAAA;IAC1D,MAAM,YAAY,GAAG,IAAI,YAAY,CAAC,cAAc,CAAC,CAAA;IACrD,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,YAAY,CAAC,kBAAkB,CAClD,MAAM,CAAC,OAAO,EACd,MAAM,CAAC,MAAM,IAAI,EAAE,EACnB,MAAM,CAAC,sBAAsB,CAChC,CAAA;IACD,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACpB,OAAO,MAAM,CAAC,KAAK,CAAC,sBAAsB,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,CAAA;IACtE,CAAC;IACD,MAAM,QAAQ,GAAG,IAAI,iBAAiB,CAAC,cAAc,EAAE,aAAa,CAAC,QAAQ,CAAC,CAAA;IAC9E,MAAM,QAAQ,GAAG,YAAY,CAAC,iBAAiB,CAAA;IAE/C,MAAM,QAAQ,CAAC,KAAK,CAChB,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,mBAAmB,EAAE,EAAE,CAAC,mBAAmB,CAAC,MAAM,CAAC,EACzE,QAAQ,CACX,CAAA;AACL,CAAC,CAAA;AAED,MAAM,QAAQ,GAAqC,EAAE,CAAA;AAErD,MAAM,CAAC,MAAM,GAAG,GAAG;IACf,OAAO;IACP,WAAW;IACX,OAAO;IACP,OAAO;IACP,QAAQ;CACX,CAAA"}

package/lib/commands/generate.js

@@ -9,8 +9,7 @@ import { ModuleLoader } from '../module-loader.js';
 import prettier from 'prettier';
 import { Formatter } from '@ts-for-gir/lib';
 const command = 'generate [modules..]';
-const description = 'Generates .d.ts files from GIR for GJS';
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
+const description = 'Generates Typescript type definition .d.ts files from GIR for GJS';
 const builder = (yargs) => {
     const optionNames = Object.keys(Config.generateOptions);
     for (const optionName of optionNames) {
@@ -18,15 +17,15 @@ const builder = (yargs) => {
     }
     return yargs.example(examples);
 };
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
 const handler = async (args) => {
     const config = await Config.load(args);
-    const generateConfig = Config.getGenerateConfig(config);
+    const generateConfig = Config.getOptionsGeneration(config);
     const moduleLoader = new ModuleLoader(generateConfig);
     const { keep } = await moduleLoader.getModulesResolved(config.modules, config.ignore || [], config.ignoreVersionConflicts);
     if (keep.length === 0) {
         return Logger.error(ERROR_NO_MODULES_FOUND(config.girDirectories));
     }
+    moduleLoader.parse(keep);
     const tsForGir = new GenerationHandler(generateConfig, GeneratorType.TYPES);
     const girModules = Array.from(keep).map((girModuleResolvedBy) => girModuleResolvedBy.module);
     moduleLoader.dependencyManager.registerFormatter('dts', new TypeScriptFormatter());
@@ -39,8 +38,6 @@ const examples = [
     ],
     [`${Config.appName} generate Gtk*`, 'You can also use wild cards'],
     [`${Config.appName} generate '*'`, 'If you want to parse all of your locally installed gir modules run'],
-    [`${Config.appName} generate '*' -e gjs`, 'Generate .d.ts. files only for gjs'],
-    [`${Config.appName} generate '*' -e node`, 'Generate .d.ts. files only for node'],
     [`${Config.appName} generate --configName='.ts-for-gir.gtk4.rc.js`, 'Use a special config file'],
     [
         `${Config.appName} generate --ignore=Gtk-4.0 xrandr-1.3`,
@@ -58,11 +55,8 @@ class TypeScriptFormatter extends Formatter {
             });
         }
         catch (error) {
+            Logger.warn('[TypeScriptFormatter] Failed to format with prettier, returning original input', error);
             return Promise.resolve(input);
-            // TODO: Don't return invalid TypeScript, useful for debugging for now.
-            // console.error('Failed to format output...')
-            // console.error(input)
-            // throw error
         }
     }
 }

package/lib/commands/generate.js.map

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

package/lib/commands/index.d.ts

@@ -1,3 +1,4 @@
+export * from './copy.js';
 export * from './doc.js';
 export * from './generate.js';
 export * from './list.js';

package/lib/commands/index.js

@@ -1,3 +1,4 @@
+export * from './copy.js';
 export * from './doc.js';
 export * from './generate.js';
 export * from './list.js';

package/lib/commands/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/commands/index.ts"],"names":[],"mappings":"AAAA,cAAc,UAAU,CAAA;AACxB,cAAc,eAAe,CAAA;AAC7B,cAAc,WAAW,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/commands/index.ts"],"names":[],"mappings":"AAAA,cAAc,WAAW,CAAA;AACzB,cAAc,UAAU,CAAA;AACxB,cAAc,eAAe,CAAA;AAC7B,cAAc,WAAW,CAAA"}

package/lib/commands/list.js

@@ -6,7 +6,6 @@ import { Config } from '../config.js';
 import { Logger, ERROR_NO_MODULES_FOUND, ResolveType } from '@ts-for-gir/lib';
 const command = 'list [modules..]';
 const description = 'Lists all available GIR modules';
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
 const builder = (yargs) => {
     const optionNames = Object.keys(Config.listOptions);
     for (const optionName of optionNames) {
@@ -14,10 +13,9 @@ const builder = (yargs) => {
     }
     return yargs.example(examples);
 };
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
 const handler = async (args) => {
     const config = await Config.load(args);
-    const generateConfig = Config.getGenerateConfig(config);
+    const generateConfig = Config.getOptionsGeneration(config);
     const moduleLoader = new ModuleLoader(generateConfig);
     const { grouped, failed } = await moduleLoader.getModules(config.modules, config.ignore);
     const moduleGroups = Object.values(grouped);
@@ -27,10 +25,15 @@ const handler = async (args) => {
     const conflictModules = moduleGroups.filter((moduleGroup) => moduleGroup.hasConflict);
     const byHandModules = moduleGroups.filter((moduleGroup) => moduleGroup.modules[0].resolvedBy === ResolveType.BY_HAND);
     const depModules = moduleGroups.filter((moduleGroup) => moduleGroup.modules[0].resolvedBy === ResolveType.DEPENDENCE);
+    Logger.info('\nSearch for gir files in:');
+    for (const dir of config.girDirectories) {
+        Logger.white(`- ${dir}`);
+    }
     Logger.info('\nSelected Modules:');
     for (const moduleGroup of byHandModules) {
         for (const depModule of moduleGroup.modules) {
             Logger.white(`- ${depModule.packageName}`);
+            Logger.gray(`  - ${depModule.path}`);
         }
     }
     if (depModules.length > 0) {
@@ -38,6 +41,7 @@ const handler = async (args) => {
         for (const moduleGroup of depModules) {
             for (const depModule of moduleGroup.modules) {
                 Logger.white(`- ${depModule.packageName}`);
+                Logger.gray(`- ${depModule.path}`);
             }
         }
     }
@@ -47,6 +51,7 @@ const handler = async (args) => {
             Logger.white(`- ${moduleGroup.namespace}`);
             for (const conflictModule of moduleGroup.modules) {
                 Logger.white(`  - ${conflictModule.packageName}`);
+                Logger.gray(`  - ${conflictModule.path}`);
             }
         }
     }

package/lib/commands/list.js.map

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