@ts-for-gir/cli 4.0.0-beta.6 → 4.0.0-beta.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (12) hide show
  1. package/README.md +43 -140
  2. package/lib/commands/generate.js +0 -2
  3. package/lib/commands/generate.js.map +1 -1
  4. package/lib/config.d.ts +10 -6
  5. package/lib/config.js +67 -65
  6. package/lib/config.js.map +1 -1
  7. package/lib/generation-handler.js +5 -4
  8. package/lib/generation-handler.js.map +1 -1
  9. package/package.json +10 -10
  10. package/src/commands/generate.ts +0 -2
  11. package/src/config.ts +75 -69
  12. package/src/generation-handler.ts +5 -5
package/README.md CHANGED
@@ -18,13 +18,12 @@
18
18
 
19
19
  # CLI
20
20
 
21
- CLI tool to generate Typescript Type Definition files for GJS and node-gtk.
21
+ CLI tool to generate Typescript Type Definition files for GJS.
22
22
 
23
23
  ## Getting started
24
24
 
25
25
  ``` bash
26
- npm install -g @ts-for-gir/cli
27
- ts-for-gir --help
26
+ npx @ts-for-gir/cli --help
28
27
  ```
29
28
 
30
29
  > Alternatively you can also add @ts-for-gir/cli to your dependencies:
@@ -32,28 +31,28 @@ ts-for-gir --help
32
31
  > npm install --save-dev @ts-for-gir/cli
33
32
  > ```
34
33
  >
35
- > Or without installing using `npx`:
34
+ > Or globally install it:
36
35
  > ```bash
37
- > npx @ts-for-gir/cli --help
36
+ > npm install -g @ts-for-gir/cli
37
+ > ts-for-gir --help
38
38
  > ```
39
39
 
40
- After you have installed `@ts-for-gir/cli` you can run the `ts-for-gir` command:
41
-
42
40
  ```bash
43
- $ ts-for-gir --help
41
+ $ npx @ts-for-gir/cli --help
44
42
 
45
- Typescript .d.ts generator from GIR for GJS or node-gtk
43
+ TypeScript type definition generator for GObject introspection GIR files
46
44
 
47
45
  Commands:
48
- ts-for-gir generate [modules..] Generates .d.ts files from GIR for GJS or nod
49
- e-gtk
46
+ ts-for-gir generate [modules..] Generates .d.ts files from GIR for GJS
50
47
  ts-for-gir list [modules..] Lists all available GIR modules
48
+ ts-for-gir copy [modules..] Scan for *.gir files and copy them to a new d
49
+ irectory
51
50
  ts-for-gir doc [modules..] The HTML documentation generator is not yet i
52
51
  mplemented, but feel free to implement it 🤗
53
52
 
54
53
  Options:
55
54
  --version Show version number [boolean]
56
- --help Show help [boolean] [boolean]
55
+ --help Show help [boolean]
57
56
  ```
58
57
 
59
58
  ## Example
@@ -64,24 +63,16 @@ To generate the Typescript type definitions of Gtk-4.0 for GJS run:
64
63
  ts-for-gir generate Gtk-4.0
65
64
  ```
66
65
 
67
- To generate this types for [node-gtk](https://github.com/romgrk/node-gtk) run:
68
-
69
- ```
70
- ts-for-gir generate Gtk-4.0 -e node
71
- ```
72
-
73
66
  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.
74
67
 
75
68
  ## Generate .d.ts files
76
69
 
77
70
  ```bash
78
- $ ts-for-gir generate --help
79
-
80
- ts-for-gir generate [modules..]
71
+ $ npx @ts-for-gir/cli generate --help
81
72
 
82
73
  ts-for-gir generate [modules..]
83
74
 
84
- Generates .d.ts files from GIR for GJS or node-gtk
75
+ Generates .d.ts files from GIR for GJS
85
76
 
86
77
  Options:
87
78
  --version Show version number [boolean]
@@ -90,48 +81,50 @@ Options:
90
81
  tiple modules [array] [default: ["*"]]
91
82
  -g, --girDirectories GIR directories
92
83
  [array] [default: ["/usr/local/share/gir-1.0","/usr/share/gir-1.0","/usr/share
93
- /gnome-shell","/usr/share/gnome-shell/gir-1.0","/usr/lib64/mutter-10","/usr/li
94
- b64/mutter-11","/usr/lib64/mutter-12","/usr/lib/x86_64-linux-gnu/mutter-10","/
95
- usr/lib/x86_64-linux-gnu/mutter-11","/usr/lib/x86_64-linux-gnu/mutter-12","/ho
96
- me/jumplink/.local/share/flatpak/exports/share/gir-1.0","/var/lib/flatpak/expo
97
- rts/share/gir-1.0"]]
84
+ /*/gir-1.0","/usr/share/gnome-shell","/usr/share/gnome-shell/gir-1.0","/usr/li
85
+ b64/mutter-*","/usr/lib/mutter-*","/usr/lib/x86_64-linux-gnu/mutter-*"]]
98
86
  --root Root directory of your project
99
- [string] [default: "/home/jumplink/Projekte/ts-for-gir"]
87
+ [string] [default: "/home/jumplink/Projekte/gjsify/ts-for-gir"]
100
88
  -o, --outdir Directory to output to
101
89
  [string] [default: "./@types"]
102
90
  -i, --ignore Modules that should be ignored
103
91
  [array] [default: []]
104
92
  -v, --verbose Switch on/off the verbose mode
105
93
  [string] [default: false]
106
- --ignoreVersionConflicts Do not ask for package versions if multiple vers
107
- ions are found [string] [default: false]
94
+ --ignoreVersionConflicts Skip prompts for library version selection when
95
+ multiple versions are detected
96
+ [string] [default: false]
108
97
  -p, --print Print the output to console and create no files
109
98
  [string] [default: false]
110
- --configName Name of the config if you want to use a differen
111
- t name [string] [default: ".ts-for-girrc.js"]
99
+ --configName Specify a custom name for the configuration file
100
+ [string] [default: ".ts-for-girrc.js"]
112
101
  -d, --noNamespace Do not export all symbols for each module as a n
113
102
  amespace [string] [default: false]
114
103
  -n, --noComments Do not generate documentation comments
115
104
  [string] [default: false]
116
- --noDebugComments Do not generate debugging inline comments
117
- [string] [default: false]
118
- --fixConflicts Fix Inheritance and implementation type conflict
119
- s [string] [default: true]
120
105
  --promisify Generate promisified functions for async/finish
121
106
  calls [string] [default: true]
122
107
  --npmScope Scope of the generated NPM packages
123
108
  [string] [default: "@girs"]
109
+ --workspace Uses the workspace protocol for the generated pa
110
+ ckages which can be used with package managers l
111
+ ike Yarn and PNPM [string] [default: false]
112
+ --onlyVersionPrefix Only use the version prefix for the ambient modu
113
+ le exports. This is useful if, for whatever reas
114
+ on, you want to use different library versions o
115
+ f the same library in your project.
116
+ [string] [default: false]
117
+ --package Generate the typescript types with package.json
118
+ support [string] [default: false]
124
119
 
125
120
  Examples:
126
121
  ts-for-gir generate Run 'ts-for-gir generate' in your gj
127
- s or node-gtk project to generate ty
128
- pings for your project, pass the gir
129
- modules you need for your project
122
+ s project to generate typings for yo
123
+ ur project, pass the gir modules you
124
+ need for your project
130
125
  ts-for-gir generate Gtk* You can also use wild cards
131
126
  ts-for-gir generate '*' If you want to parse all of your loc
132
127
  ally installed gir modules run
133
- ts-for-gir generate '*' -e gjs Generate .d.ts. files only for gjs
134
- ts-for-gir generate '*' -e node Generate .d.ts. files only for node
135
128
  ts-for-gir generate --configName='.ts-fo Use a special config file
136
129
  r-gir.gtk4.rc.js
137
130
  ts-for-gir generate --ignore=Gtk-4.0 xra Generate .d.ts. files but not for Gt
@@ -141,7 +134,7 @@ Examples:
141
134
  ## List available GIR modules
142
135
 
143
136
  ```bash
144
- $ ts-for-gir list --help
137
+ $ npx @ts-for-gir/cli list --help
145
138
 
146
139
  ts-for-gir list [modules..]
147
140
 
@@ -154,13 +147,12 @@ Options:
154
147
  dules [array] [default: ["*"]]
155
148
  -g, --girDirectories GIR directories
156
149
  [array] [default: ["/usr/local/share/gir-1.0","/usr/share/gir-1.0","/usr/share
157
- /gnome-shell","/usr/share/gnome-shell/gir-1.0","/usr/lib64/mutter-10","/usr/li
158
- b64/mutter-11","/usr/lib64/mutter-12","/usr/lib/x86_64-linux-gnu/mutter-10","/
159
- usr/lib/x86_64-linux-gnu/mutter-11","/usr/lib/x86_64-linux-gnu/mutter-12","/ho
160
- me/jumplink/.local/share/flatpak/exports/share/gir-1.0","/var/lib/flatpak/expo
161
- rts/share/gir-1.0"]]
150
+ /*/gir-1.0","/usr/share/gnome-shell","/usr/share/gnome-shell/gir-1.0","/usr/li
151
+ b64/mutter-*","/usr/lib/mutter-*","/usr/lib/x86_64-linux-gnu/mutter-*"]]
152
+ --root Root directory of your project
153
+ [string] [default: "/home/jumplink/Projekte/gjsify/ts-for-gir"]
162
154
  -i, --ignore Modules that should be ignored [array] [default: []]
163
- --configName Name of the config if you want to use a different name
155
+ --configName Specify a custom name for the configuration file
164
156
  [string] [default: ".ts-for-girrc.js"]
165
157
  -v, --verbose Switch on/off the verbose mode [string] [default: false]
166
158
 
@@ -175,7 +167,7 @@ Examples:
175
167
  ## Generate HTML documentation
176
168
 
177
169
  ```bash
178
- $ ts-for-gir doc --help
170
+ $ npx @ts-for-gir/cli doc --help
179
171
 
180
172
  ts-for-gir doc [modules..]
181
173
 
@@ -190,16 +182,11 @@ To do that, create a new config file called `.ts-for-girrc.js` in your project r
190
182
  ```js
191
183
  // or on CommonJs: exports.default = {
192
184
  export default {
193
- print: false,
194
185
  verbose: true,
195
- environments: ['gjs', 'node'],
196
186
  outdir: '@types',
197
187
  girDirectories: ['/usr/share/gir-1.0'],
198
188
  modules: ['*'],
199
189
  ignore: [],
200
- noNamespace: false,
201
- buildType: 'lib',
202
- moduleType: 'esm'
203
190
  }
204
191
  ```
205
192
 
@@ -241,97 +228,23 @@ In this example, the generated TypeScript types will be saved in the `./types` d
241
228
 
242
229
  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.
243
230
 
244
- ### environments
245
- 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.
246
-
247
- The default value for this option is `"gjs"`.
248
-
249
- 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:
250
-
251
- ```bash
252
- ts-for-gir generate * --environments gjs node
253
- ```
254
-
255
- 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.
256
-
257
231
  ### ignore
258
232
  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.
259
233
 
260
234
  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:
261
235
 
262
236
  ```bash
263
- ts-for-gir generate Gtk-* --ignore Gtk-3.0
237
+ ts-for-gir generate Gtk-* --ignore */Gtk-3.0
264
238
  ```
265
239
 
266
240
  You can also ignore multiple modules:
267
241
 
268
242
  ```bash
269
- ts-for-gir generate * --ignore Gtk-2.0 Gtk-3.0 Gtk-4.0
243
+ ts-for-gir generate * --ignore */Gtk-2.0 */Gtk-3.0 */Gtk-4.0
270
244
  ```
271
245
 
272
246
  Note that ignoring a module will prevent ts-for-gir from generating types for that module and any submodules that it might contain.
273
247
 
274
- ### buildType
275
- `ts-for-gir` supports two build types for generating the types: `"lib"` and `"types"`.
276
-
277
- * 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.
278
- * 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.
279
-
280
- ### moduleType
281
- 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.
282
-
283
- > 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.
284
-
285
- 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`.
286
-
287
- 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:
288
-
289
- ```ts
290
- // Gtk-4.0.d.ts
291
- import type GLib from './GLib-2.0.js';
292
-
293
- namespace Gtk {
294
- class Window extends Widget {
295
- ...
296
- }
297
- function builder_error_quark(): GLib.Quark
298
- }
299
-
300
- export default Gtk;
301
- ```
302
-
303
- ```js
304
- // Gtk-4.0.js
305
- import Gtk from 'gi://Gtk?version=4.0';
306
- export default Gtk;
307
- ```
308
-
309
- > 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.
310
-
311
- 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:
312
-
313
- ```ts
314
- // Gtk-4.0.d.ts
315
- import type * as GLib from './GLib-2.0.js';
316
-
317
- export class Window extends Widget {
318
- ...
319
- }
320
- export function builder_error_quark(): GLib.Quark
321
- ```
322
-
323
- ```js
324
- // Gtk-4.0.js
325
- imports.gi.versions.Gtk = '4.0'
326
- const Gtk = imports.gi.Gtk;
327
-
328
- module.exports = { Gtk };
329
- exports.default = Gtk;
330
- ```
331
-
332
- > 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.
333
-
334
-
335
248
  ### verbose
336
249
  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.
337
250
 
@@ -377,16 +290,6 @@ To use the noComments option, pass it as a command line argument to `ts-for-gir`
377
290
  ts-for-gir generate * --noComments`
378
291
  ```
379
292
 
380
- ### noDebugComments
381
- 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.
382
-
383
- 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.
384
-
385
- ### fixConflicts
386
- 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.
387
-
388
- > 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.
389
-
390
293
  # package
391
294
 
392
295
  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/generate.js CHANGED
@@ -40,8 +40,6 @@ const examples = [
40
40
  ],
41
41
  [`${Config.appName} generate Gtk*`, 'You can also use wild cards'],
42
42
  [`${Config.appName} generate '*'`, 'If you want to parse all of your locally installed gir modules run'],
43
- [`${Config.appName} generate '*' -e gjs`, 'Generate .d.ts. files only for gjs'],
44
- [`${Config.appName} generate '*' -e node`, 'Generate .d.ts. files only for node'],
45
43
  [`${Config.appName} generate --configName='.ts-for-gir.gtk4.rc.js`, 'Use a special config file'],
46
44
  [
47
45
  `${Config.appName} generate --ignore=Gtk-4.0 xrandr-1.3`,
package/lib/commands/generate.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"generate.js","sourceRoot":"","sources":["../../src/commands/generate.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"generate.js","sourceRoot":"","sources":["../../src/commands/generate.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,EAAE,sBAAsB,EAAE,MAAM,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;AAClD,OAAO,QAAQ,MAAM,UAAU,CAAA;AAG/B,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAE3C,MAAM,OAAO,GAAG,sBAAsB,CAAA;AAEtC,MAAM,WAAW,GAAG,wCAAwC,CAAA;AAE5D,8DAA8D;AAC9D,MAAM,OAAO,GAAsC,CAAC,KAAgB,EAAE,EAAE;IACpE,MAAM,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,CAAA;IACvD,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE,CAAC;QACnC,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC,CAAA;IACxE,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,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;IAED,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACpB,OAAO,MAAM,CAAC,KAAK,CAAC,sBAAsB,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,CAAA;IACtE,CAAC;IAED,YAAY,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;IAExB,MAAM,QAAQ,GAAG,IAAI,iBAAiB,CAAC,cAAc,EAAE,aAAa,CAAC,KAAK,CAAC,CAAA;IAE3E,MAAM,UAAU,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,mBAAmB,EAAE,EAAE,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAA;IAE5F,YAAY,CAAC,iBAAiB,CAAC,iBAAiB,CAAC,KAAK,EAAE,IAAI,mBAAmB,EAAE,CAAC,CAAA;IAClF,MAAM,QAAQ,CAAC,KAAK,CAAC,UAAU,EAAE,YAAY,CAAC,iBAAiB,CAAC,CAAA;AACpE,CAAC,CAAA;AAED,MAAM,QAAQ,GAAqC;IAC/C;QACI,GAAG,MAAM,CAAC,OAAO,WAAW;QAC5B,QAAQ,MAAM,CAAC,OAAO,qHAAqH;KAC9I;IACD,CAAC,GAAG,MAAM,CAAC,OAAO,gBAAgB,EAAE,6BAA6B,CAAC;IAClE,CAAC,GAAG,MAAM,CAAC,OAAO,eAAe,EAAE,oEAAoE,CAAC;IACxG,CAAC,GAAG,MAAM,CAAC,OAAO,gDAAgD,EAAE,2BAA2B,CAAC;IAChG;QACI,GAAG,MAAM,CAAC,OAAO,uCAAuC;QACxD,0DAA0D;KAC7D;CACJ,CAAA;AAED,MAAM,mBAAoB,SAAQ,SAAS;IACvC,MAAM,CAAC,KAAa;QAChB,IAAI,CAAC;YACD,OAAO,QAAQ,CAAC,MAAM,CAAC,KAAK,EAAE;gBAC1B,WAAW,EAAE,IAAI;gBACjB,MAAM,EAAE,YAAY;gBACpB,UAAU,EAAE,GAAG;gBACf,QAAQ,EAAE,CAAC;aACd,CAAC,CAAA;QACN,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,OAAO,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;QACjC,CAAC;IACL,CAAC;CACJ;AAED,MAAM,CAAC,MAAM,QAAQ,GAAG;IACpB,OAAO;IACP,WAAW;IACX,OAAO;IACP,OAAO;IACP,QAAQ;CACX,CAAA"}
package/lib/config.d.ts CHANGED
@@ -21,11 +21,13 @@ export declare class Config {
21
21
  ignoreVersionConflicts: boolean;
22
22
  noNamespace: boolean;
23
23
  noComments: boolean;
24
- noDebugComments: boolean;
25
- fixConflicts: boolean;
26
24
  promisify: boolean;
27
25
  npmScope: string;
28
- packageYarn: boolean;
26
+ workspace: boolean;
27
+ onlyVersionPrefix: boolean;
28
+ noPrettyPrint: boolean;
29
+ noAdvancedVariants: boolean;
30
+ package: boolean;
29
31
  };
30
32
  static configFilePath: string;
31
33
  /**
@@ -49,11 +51,13 @@ export declare class Config {
49
51
  configName: Options;
50
52
  noNamespace: Options;
51
53
  noComments: Options;
52
- noDebugComments: Options;
53
- fixConflicts: Options;
54
54
  promisify: Options;
55
55
  npmScope: Options;
56
- packageYarn: Options;
56
+ workspace: Options;
57
+ onlyVersionPrefix: Options;
58
+ noPrettyPrint: Options;
59
+ noAdvancedVariants: Options;
60
+ package: Options;
57
61
  };
58
62
  static listOptions: {
59
63
  modules: Options;
package/lib/config.js CHANGED
@@ -21,11 +21,16 @@ export class Config {
21
21
  ignoreVersionConflicts: false,
22
22
  noNamespace: false,
23
23
  noComments: false,
24
- noDebugComments: false,
25
- fixConflicts: true,
26
24
  promisify: true,
27
25
  npmScope: '@girs',
28
- packageYarn: false,
26
+ workspace: false,
27
+ onlyVersionPrefix: false,
28
+ noPrettyPrint: false,
29
+ // Disabled by default because advanced variants are complicated,
30
+ // it does impact performance (especially on older typescript versions)
31
+ // and we'd need to test it works with the updated bindings
32
+ noAdvancedVariants: true,
33
+ package: false,
29
34
  };
30
35
  static configFilePath = join(process.cwd(), Config.defaults.configName);
31
36
  /**
@@ -76,7 +81,7 @@ export class Config {
76
81
  },
77
82
  ignoreVersionConflicts: {
78
83
  type: 'boolean',
79
- description: 'Do not ask for package versions if multiple versions are found',
84
+ description: 'Skip prompts for library version selection when multiple versions are detected',
80
85
  default: Config.defaults.ignoreVersionConflicts,
81
86
  normalize: true,
82
87
  },
@@ -89,7 +94,7 @@ export class Config {
89
94
  },
90
95
  configName: {
91
96
  type: 'string',
92
- description: 'Name of the config if you want to use a different name',
97
+ description: 'Specify a custom name for the configuration file',
93
98
  default: Config.defaults.configName,
94
99
  normalize: true,
95
100
  },
@@ -107,18 +112,6 @@ export class Config {
107
112
  default: Config.defaults.noComments,
108
113
  normalize: true,
109
114
  },
110
- noDebugComments: {
111
- type: 'boolean',
112
- description: 'Do not generate debugging inline comments',
113
- default: Config.defaults.noDebugComments,
114
- normalize: true,
115
- },
116
- fixConflicts: {
117
- type: 'boolean',
118
- description: 'Fix Inheritance and implementation type conflicts',
119
- default: Config.defaults.fixConflicts,
120
- normalize: true,
121
- },
122
115
  promisify: {
123
116
  type: 'boolean',
124
117
  description: 'Generate promisified functions for async/finish calls',
@@ -131,10 +124,34 @@ export class Config {
131
124
  default: Config.defaults.npmScope,
132
125
  normalize: true,
133
126
  },
134
- packageYarn: {
127
+ workspace: {
128
+ type: 'boolean',
129
+ description: 'Uses the workspace protocol for the generated packages which can be used with package managers like Yarn and PNPM',
130
+ default: Config.defaults.workspace,
131
+ normalize: true,
132
+ },
133
+ onlyVersionPrefix: {
134
+ type: 'boolean',
135
+ description: 'Only use the version prefix for the ambient module exports. This is useful if, for whatever reason, you want to use different library versions of the same library in your project.',
136
+ default: Config.defaults.onlyVersionPrefix,
137
+ normalize: true,
138
+ },
139
+ noPrettyPrint: {
135
140
  type: 'boolean',
136
- description: 'Adds Yarn workspace support to the NPM packages',
137
- default: Config.defaults.packageYarn,
141
+ description: 'Do not prettify the generated types',
142
+ default: Config.defaults.noPrettyPrint,
143
+ normalize: true,
144
+ },
145
+ noAdvancedVariants: {
146
+ type: 'boolean',
147
+ description: 'Disable GLib.Variant class with string parsing',
148
+ default: Config.defaults.noAdvancedVariants,
149
+ normalize: true,
150
+ },
151
+ package: {
152
+ type: 'boolean',
153
+ description: 'Generate the typescript types with package.json support',
154
+ default: Config.defaults.package,
138
155
  normalize: true,
139
156
  },
140
157
  };
@@ -153,11 +170,13 @@ export class Config {
153
170
  configName: this.options.configName,
154
171
  noNamespace: this.options.noNamespace,
155
172
  noComments: this.options.noComments,
156
- noDebugComments: this.options.noDebugComments,
157
- fixConflicts: this.options.fixConflicts,
158
173
  promisify: this.options.promisify,
159
174
  npmScope: this.options.npmScope,
160
- packageYarn: this.options.packageYarn,
175
+ workspace: this.options.workspace,
176
+ onlyVersionPrefix: this.options.onlyVersionPrefix,
177
+ noPrettyPrint: this.options.noPrettyPrint,
178
+ noAdvancedVariants: this.options.noAdvancedVariants,
179
+ package: this.options.package,
161
180
  };
162
181
  static listOptions = {
163
182
  modules: this.options.modules,
@@ -248,19 +267,7 @@ export class Config {
248
267
  }
249
268
  static getOptionsGeneration(config) {
250
269
  const generateConfig = {
251
- girDirectories: config.girDirectories,
252
- root: config.root,
253
- outdir: config.outdir,
254
- verbose: config.verbose,
255
- noNamespace: config.noNamespace,
256
- noComments: config.noComments,
257
- noDebugComments: config.noDebugComments,
258
- fixConflicts: config.fixConflicts,
259
- promisify: config.promisify,
260
- npmScope: config.npmScope,
261
- packageYarn: config.packageYarn,
262
- noPrettyPrint: false,
263
- noAdvancedVariants: true,
270
+ ...config,
264
271
  };
265
272
  return generateConfig;
266
273
  }
@@ -276,21 +283,7 @@ export class Config {
276
283
  const configFile = await this.loadConfigFile(options.configName);
277
284
  const configFileData = configFile?.config || {};
278
285
  const config = {
279
- verbose: options.verbose,
280
- ignoreVersionConflicts: options.ignoreVersionConflicts,
281
- print: options.print,
282
- root: options.root,
283
- outdir: options.outdir,
284
- girDirectories: options.girDirectories,
285
- ignore: options.ignore,
286
- modules: options.modules,
287
- noNamespace: options.noNamespace,
288
- noComments: options.noComments,
289
- noDebugComments: options.noDebugComments,
290
- fixConflicts: options.fixConflicts,
291
- promisify: options.promisify,
292
- npmScope: options.npmScope,
293
- packageYarn: options.packageYarn,
286
+ ...options,
294
287
  };
295
288
  if (configFileData) {
296
289
  // verbose
@@ -341,16 +334,6 @@ export class Config {
341
334
  typeof configFileData.noComments === 'boolean') {
342
335
  config.noComments = configFileData.noComments;
343
336
  }
344
- // noDebugComments
345
- if (config.noDebugComments === Config.options.noDebugComments.default &&
346
- typeof configFileData.noDebugComments === 'boolean') {
347
- config.noDebugComments = configFileData.noDebugComments;
348
- }
349
- // fixConflicts
350
- if (config.fixConflicts === Config.options.fixConflicts.default &&
351
- typeof configFileData.fixConflicts === 'boolean') {
352
- config.fixConflicts = configFileData.fixConflicts;
353
- }
354
337
  // promisify
355
338
  if (config.promisify === Config.options.promisify.default &&
356
339
  typeof configFileData.promisify === 'boolean') {
@@ -360,10 +343,29 @@ export class Config {
360
343
  if (config.npmScope === Config.options.npmScope.default && configFileData.npmScope) {
361
344
  config.npmScope = configFileData.npmScope;
362
345
  }
363
- // packageYarn
364
- if (config.packageYarn === Config.options.packageYarn.default &&
365
- typeof configFileData.packageYarn === 'boolean') {
366
- config.packageYarn = configFileData.packageYarn;
346
+ // workspace
347
+ if (config.workspace === Config.options.workspace.default &&
348
+ typeof configFileData.workspace === 'boolean') {
349
+ config.workspace = configFileData.workspace;
350
+ }
351
+ // onlyVersionPrefix
352
+ if (config.onlyVersionPrefix === Config.options.onlyVersionPrefix.default &&
353
+ typeof configFileData.onlyVersionPrefix === 'boolean') {
354
+ config.onlyVersionPrefix = configFileData.onlyVersionPrefix;
355
+ }
356
+ // noPrettyPrint
357
+ if (config.noPrettyPrint === Config.options.noPrettyPrint.default &&
358
+ typeof configFileData.noPrettyPrint === 'boolean') {
359
+ config.noPrettyPrint = configFileData.noPrettyPrint;
360
+ }
361
+ // noAdvancedVariants
362
+ if (config.noAdvancedVariants === Config.options.noAdvancedVariants.default &&
363
+ typeof configFileData.noAdvancedVariants === 'boolean') {
364
+ config.noAdvancedVariants = configFileData.noAdvancedVariants;
365
+ }
366
+ // package
367
+ if (config.package === Config.options.package.default && typeof configFileData.package === 'boolean') {
368
+ config.package = configFileData.package;
367
369
  }
368
370
  }
369
371
  // If outdir is not absolute, make it absolute to the root path
package/lib/config.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"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"}
package/lib/generation-handler.js CHANGED
@@ -2,6 +2,7 @@ import { mkdir } from 'fs/promises';
2
2
  import { Logger, START_MODULE, FILE_PARSING_DONE, TSDATA_PARSING_DONE, GENERATING_TYPES_DONE, ERROR_NO_MODULE_SPECIFIED, } from '@ts-for-gir/lib';
3
3
  import { GeneratorType } from '@ts-for-gir/generator-base';
4
4
  import { TypeDefinitionGenerator } from '@ts-for-gir/generator-typescript';
5
+ import { HtmlDocGenerator } from '@ts-for-gir/generator-html-doc';
5
6
  export class GenerationHandler {
6
7
  config;
7
8
  log;
@@ -13,9 +14,9 @@ export class GenerationHandler {
13
14
  case GeneratorType.TYPES:
14
15
  this.generator = new TypeDefinitionGenerator(config);
15
16
  break;
16
- // case GeneratorType.HTML_DOC:
17
- // this.generator = new HtmlDocGenerator(config)
18
- // break
17
+ case GeneratorType.HTML_DOC:
18
+ this.generator = new HtmlDocGenerator(config);
19
+ break;
19
20
  default:
20
21
  throw new Error('Unknown Generator');
21
22
  }
@@ -40,7 +41,7 @@ export class GenerationHandler {
40
41
  this.log.log(` - ${girModule.packageName} ...`);
41
42
  await this.generator.generate(registry, girModule);
42
43
  }
43
- await this.generator.finish(registry);
44
+ await this.generator.finish(registry, girModules);
44
45
  this.log.success(GENERATING_TYPES_DONE);
45
46
  }
46
47
  }
package/lib/generation-handler.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"generation-handler.js","sourceRoot":"","sources":["../src/generation-handler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AACnC,OAAO,EAEH,MAAM,EACN,YAAY,EACZ,iBAAiB,EACjB,mBAAmB,EACnB,qBAAqB,EACrB,yBAAyB,GAC5B,MAAM,iBAAiB,CAAA;AACxB,OAAO,EAAE,aAAa,EAAa,MAAM,4BAA4B,CAAA;AACrE,OAAO,EAAE,uBAAuB,EAAE,MAAM,kCAAkC,CAAA;AAK1E,MAAM,OAAO,iBAAiB;IAKL;IAJrB,GAAG,CAAQ;IACX,SAAS,CAAW;IAEpB,YACqB,MAAyB,EAC1C,IAAmB;QADF,WAAM,GAAN,MAAM,CAAmB;QAG1C,IAAI,CAAC,GAAG,GAAG,IAAI,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,mBAAmB,CAAC,CAAA;QAE1D,QAAQ,IAAI,EAAE,CAAC;YACX,KAAK,aAAa,CAAC,KAAK;gBACpB,IAAI,CAAC,SAAS,GAAG,IAAI,uBAAuB,CAAC,MAAM,CAAC,CAAA;gBACpD,MAAK;YACT,+BAA+B;YAC/B,oDAAoD;YACpD,YAAY;YACZ;gBACI,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAA;QAC5C,CAAC;IACL,CAAC;IAEM,KAAK,CAAC,KAAK,CAAC,UAAuB,EAAE,QAAoB;QAC5D,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,CAAA;QAE3B,IAAI,UAAU,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC;YACzB,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,yBAAyB,CAAC,CAAA;QAC7C,CAAC;QAED,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAA;QAEhC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAA;QAElC,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;YACrB,MAAM,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;QACxD,CAAC;QAED,4CAA4C;QAC5C,QAAQ,CAAC,SAAS,CAAC;YACf,aAAa,EAAE,IAAI;YACnB,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,OAAO;SAC/B,CAAC,CAAA;QAEF,MAAM,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAA;QAEpC,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;YACjC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,SAAS,CAAC,WAAW,MAAM,CAAC,CAAA;YAC/C,MAAM,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAA;QACtD,CAAC;QAED,MAAM,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAA;QAErC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,qBAAqB,CAAC,CAAA;IAC3C,CAAC;CACJ"}
1
+ {"version":3,"file":"generation-handler.js","sourceRoot":"","sources":["../src/generation-handler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AACnC,OAAO,EAEH,MAAM,EACN,YAAY,EACZ,iBAAiB,EACjB,mBAAmB,EACnB,qBAAqB,EACrB,yBAAyB,GAC5B,MAAM,iBAAiB,CAAA;AACxB,OAAO,EAAE,aAAa,EAAa,MAAM,4BAA4B,CAAA;AACrE,OAAO,EAAE,uBAAuB,EAAE,MAAM,kCAAkC,CAAA;AAC1E,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAA;AAIjE,MAAM,OAAO,iBAAiB;IAKL;IAJrB,GAAG,CAAQ;IACX,SAAS,CAAW;IAEpB,YACqB,MAAyB,EAC1C,IAAmB;QADF,WAAM,GAAN,MAAM,CAAmB;QAG1C,IAAI,CAAC,GAAG,GAAG,IAAI,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,mBAAmB,CAAC,CAAA;QAE1D,QAAQ,IAAI,EAAE,CAAC;YACX,KAAK,aAAa,CAAC,KAAK;gBACpB,IAAI,CAAC,SAAS,GAAG,IAAI,uBAAuB,CAAC,MAAM,CAAC,CAAA;gBACpD,MAAK;YACT,KAAK,aAAa,CAAC,QAAQ;gBACvB,IAAI,CAAC,SAAS,GAAG,IAAI,gBAAgB,CAAC,MAAM,CAAC,CAAA;gBAC7C,MAAK;YACT;gBACI,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAA;QAC5C,CAAC;IACL,CAAC;IAEM,KAAK,CAAC,KAAK,CAAC,UAAuB,EAAE,QAAoB;QAC5D,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,CAAA;QAE3B,IAAI,UAAU,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC;YACzB,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,yBAAyB,CAAC,CAAA;QAC7C,CAAC;QAED,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAA;QAEhC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAA;QAElC,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;YACrB,MAAM,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;QACxD,CAAC;QAED,4CAA4C;QAC5C,QAAQ,CAAC,SAAS,CAAC;YACf,aAAa,EAAE,IAAI;YACnB,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,OAAO;SAC/B,CAAC,CAAA;QAEF,MAAM,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAA;QAEpC,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;YACjC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,SAAS,CAAC,WAAW,MAAM,CAAC,CAAA;YAC/C,MAAM,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAA;QACtD,CAAC;QAED,MAAM,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAA;QAEjD,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,qBAAqB,CAAC,CAAA;IAC3C,CAAC;CACJ"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@ts-for-gir/cli",
3
- "version": "4.0.0-beta.6",
3
+ "version": "4.0.0-beta.7",
4
4
  "description": "TypeScript type definition generator for GObject introspection GIR files",
5
5
  "module": "lib/index.js",
6
6
  "main": "lib/index.js",
@@ -54,28 +54,28 @@
54
54
  ],
55
55
  "devDependencies": {
56
56
  "@types/inquirer": "^9.0.7",
57
- "@types/node": "^20.14.10",
57
+ "@types/node": "^20.14.11",
58
58
  "@types/yargs": "^17.0.32",
59
- "@typescript-eslint/eslint-plugin": "^7.16.0",
60
- "@typescript-eslint/parser": "^7.16.0",
59
+ "@typescript-eslint/eslint-plugin": "^7.16.1",
60
+ "@typescript-eslint/parser": "^7.16.1",
61
61
  "eslint": "^8.57.0",
62
62
  "eslint-config-prettier": "^9.1.0",
63
- "eslint-plugin-prettier": "^5.1.3",
63
+ "eslint-plugin-prettier": "^5.2.1",
64
64
  "rimraf": "^6.0.1",
65
65
  "ts-node": "^10.9.2",
66
66
  "typescript": "^5.5.3"
67
67
  },
68
68
  "dependencies": {
69
69
  "@gi.ts/parser": "^2.0.0",
70
- "@ts-for-gir/generator-base": "^4.0.0-beta.6",
71
- "@ts-for-gir/generator-html-doc": "^4.0.0-beta.6",
72
- "@ts-for-gir/generator-typescript": "^4.0.0-beta.6",
73
- "@ts-for-gir/lib": "^4.0.0-beta.6",
70
+ "@ts-for-gir/generator-base": "^4.0.0-beta.7",
71
+ "@ts-for-gir/generator-html-doc": "^4.0.0-beta.7",
72
+ "@ts-for-gir/generator-typescript": "^4.0.0-beta.7",
73
+ "@ts-for-gir/lib": "^4.0.0-beta.7",
74
74
  "colorette": "^2.0.20",
75
75
  "cosmiconfig": "^9.0.0",
76
76
  "glob": "^11.0.0",
77
77
  "inquirer": "^9.3.5",
78
- "prettier": "^3.3.2",
78
+ "prettier": "^3.3.3",
79
79
  "yargs": "^17.7.2"
80
80
  }
81
81
  }
package/src/commands/generate.ts CHANGED
@@ -59,8 +59,6 @@ const examples: ReadonlyArray<[string, string?]> = [
59
59
  ],
60
60
  [`${Config.appName} generate Gtk*`, 'You can also use wild cards'],
61
61
  [`${Config.appName} generate '*'`, 'If you want to parse all of your locally installed gir modules run'],
62
- [`${Config.appName} generate '*' -e gjs`, 'Generate .d.ts. files only for gjs'],
63
- [`${Config.appName} generate '*' -e node`, 'Generate .d.ts. files only for node'],
64
62
  [`${Config.appName} generate --configName='.ts-for-gir.gtk4.rc.js`, 'Use a special config file'],
65
63
  [
66
64
  `${Config.appName} generate --ignore=Gtk-4.0 xrandr-1.3`,
package/src/config.ts CHANGED
@@ -31,11 +31,16 @@ export class Config {
31
31
  ignoreVersionConflicts: false,
32
32
  noNamespace: false,
33
33
  noComments: false,
34
- noDebugComments: false,
35
- fixConflicts: true,
36
34
  promisify: true,
37
35
  npmScope: '@girs',
38
- packageYarn: false,
36
+ workspace: false,
37
+ onlyVersionPrefix: false,
38
+ noPrettyPrint: false,
39
+ // Disabled by default because advanced variants are complicated,
40
+ // it does impact performance (especially on older typescript versions)
41
+ // and we'd need to test it works with the updated bindings
42
+ noAdvancedVariants: true,
43
+ package: false,
39
44
  }
40
45
 
41
46
  static configFilePath = join(process.cwd(), Config.defaults.configName)
@@ -88,7 +93,7 @@ export class Config {
88
93
  },
89
94
  ignoreVersionConflicts: {
90
95
  type: 'boolean',
91
- description: 'Do not ask for package versions if multiple versions are found',
96
+ description: 'Skip prompts for library version selection when multiple versions are detected',
92
97
  default: Config.defaults.ignoreVersionConflicts,
93
98
  normalize: true,
94
99
  },
@@ -101,7 +106,7 @@ export class Config {
101
106
  },
102
107
  configName: {
103
108
  type: 'string',
104
- description: 'Name of the config if you want to use a different name',
109
+ description: 'Specify a custom name for the configuration file',
105
110
  default: Config.defaults.configName,
106
111
  normalize: true,
107
112
  },
@@ -119,18 +124,6 @@ export class Config {
119
124
  default: Config.defaults.noComments,
120
125
  normalize: true,
121
126
  },
122
- noDebugComments: {
123
- type: 'boolean',
124
- description: 'Do not generate debugging inline comments',
125
- default: Config.defaults.noDebugComments,
126
- normalize: true,
127
- },
128
- fixConflicts: {
129
- type: 'boolean',
130
- description: 'Fix Inheritance and implementation type conflicts',
131
- default: Config.defaults.fixConflicts,
132
- normalize: true,
133
- },
134
127
  promisify: {
135
128
  type: 'boolean',
136
129
  description: 'Generate promisified functions for async/finish calls',
@@ -143,10 +136,36 @@ export class Config {
143
136
  default: Config.defaults.npmScope,
144
137
  normalize: true,
145
138
  },
146
- packageYarn: {
139
+ workspace: {
140
+ type: 'boolean',
141
+ description:
142
+ 'Uses the workspace protocol for the generated packages which can be used with package managers like Yarn and PNPM',
143
+ default: Config.defaults.workspace,
144
+ normalize: true,
145
+ },
146
+ onlyVersionPrefix: {
147
+ type: 'boolean',
148
+ description:
149
+ 'Only use the version prefix for the ambient module exports. This is useful if, for whatever reason, you want to use different library versions of the same library in your project.',
150
+ default: Config.defaults.onlyVersionPrefix,
151
+ normalize: true,
152
+ },
153
+ noPrettyPrint: {
154
+ type: 'boolean',
155
+ description: 'Do not prettify the generated types',
156
+ default: Config.defaults.noPrettyPrint,
157
+ normalize: true,
158
+ },
159
+ noAdvancedVariants: {
160
+ type: 'boolean',
161
+ description: 'Disable GLib.Variant class with string parsing',
162
+ default: Config.defaults.noAdvancedVariants,
163
+ normalize: true,
164
+ },
165
+ package: {
147
166
  type: 'boolean',
148
- description: 'Adds Yarn workspace support to the NPM packages',
149
- default: Config.defaults.packageYarn,
167
+ description: 'Generate the typescript types with package.json support',
168
+ default: Config.defaults.package,
150
169
  normalize: true,
151
170
  },
152
171
  }
@@ -166,11 +185,13 @@ export class Config {
166
185
  configName: this.options.configName,
167
186
  noNamespace: this.options.noNamespace,
168
187
  noComments: this.options.noComments,
169
- noDebugComments: this.options.noDebugComments,
170
- fixConflicts: this.options.fixConflicts,
171
188
  promisify: this.options.promisify,
172
189
  npmScope: this.options.npmScope,
173
- packageYarn: this.options.packageYarn,
190
+ workspace: this.options.workspace,
191
+ onlyVersionPrefix: this.options.onlyVersionPrefix,
192
+ noPrettyPrint: this.options.noPrettyPrint,
193
+ noAdvancedVariants: this.options.noAdvancedVariants,
194
+ package: this.options.package,
174
195
  }
175
196
 
176
197
  static listOptions = {
@@ -269,19 +290,7 @@ export class Config {
269
290
 
270
291
  public static getOptionsGeneration(config: UserConfig): OptionsGeneration {
271
292
  const generateConfig: OptionsGeneration = {
272
- girDirectories: config.girDirectories,
273
- root: config.root,
274
- outdir: config.outdir,
275
- verbose: config.verbose,
276
- noNamespace: config.noNamespace,
277
- noComments: config.noComments,
278
- noDebugComments: config.noDebugComments,
279
- fixConflicts: config.fixConflicts,
280
- promisify: config.promisify,
281
- npmScope: config.npmScope,
282
- packageYarn: config.packageYarn,
283
- noPrettyPrint: false,
284
- noAdvancedVariants: true,
293
+ ...config,
285
294
  }
286
295
  return generateConfig
287
296
  }
@@ -300,21 +309,7 @@ export class Config {
300
309
  const configFileData = configFile?.config || {}
301
310
 
302
311
  const config: UserConfig = {
303
- verbose: options.verbose,
304
- ignoreVersionConflicts: options.ignoreVersionConflicts,
305
- print: options.print,
306
- root: options.root,
307
- outdir: options.outdir,
308
- girDirectories: options.girDirectories,
309
- ignore: options.ignore,
310
- modules: options.modules,
311
- noNamespace: options.noNamespace,
312
- noComments: options.noComments,
313
- noDebugComments: options.noDebugComments,
314
- fixConflicts: options.fixConflicts,
315
- promisify: options.promisify,
316
- npmScope: options.npmScope,
317
- packageYarn: options.packageYarn,
312
+ ...options,
318
313
  }
319
314
 
320
315
  if (configFileData) {
@@ -376,20 +371,6 @@ export class Config {
376
371
  ) {
377
372
  config.noComments = configFileData.noComments
378
373
  }
379
- // noDebugComments
380
- if (
381
- config.noDebugComments === Config.options.noDebugComments.default &&
382
- typeof configFileData.noDebugComments === 'boolean'
383
- ) {
384
- config.noDebugComments = configFileData.noDebugComments
385
- }
386
- // fixConflicts
387
- if (
388
- config.fixConflicts === Config.options.fixConflicts.default &&
389
- typeof configFileData.fixConflicts === 'boolean'
390
- ) {
391
- config.fixConflicts = configFileData.fixConflicts
392
- }
393
374
  // promisify
394
375
  if (
395
376
  config.promisify === Config.options.promisify.default &&
@@ -401,12 +382,37 @@ export class Config {
401
382
  if (config.npmScope === Config.options.npmScope.default && configFileData.npmScope) {
402
383
  config.npmScope = configFileData.npmScope
403
384
  }
404
- // packageYarn
385
+ // workspace
405
386
  if (
406
- config.packageYarn === Config.options.packageYarn.default &&
407
- typeof configFileData.packageYarn === 'boolean'
387
+ config.workspace === Config.options.workspace.default &&
388
+ typeof configFileData.workspace === 'boolean'
408
389
  ) {
409
- config.packageYarn = configFileData.packageYarn
390
+ config.workspace = configFileData.workspace
391
+ }
392
+ // onlyVersionPrefix
393
+ if (
394
+ config.onlyVersionPrefix === Config.options.onlyVersionPrefix.default &&
395
+ typeof configFileData.onlyVersionPrefix === 'boolean'
396
+ ) {
397
+ config.onlyVersionPrefix = configFileData.onlyVersionPrefix
398
+ }
399
+ // noPrettyPrint
400
+ if (
401
+ config.noPrettyPrint === Config.options.noPrettyPrint.default &&
402
+ typeof configFileData.noPrettyPrint === 'boolean'
403
+ ) {
404
+ config.noPrettyPrint = configFileData.noPrettyPrint
405
+ }
406
+ // noAdvancedVariants
407
+ if (
408
+ config.noAdvancedVariants === Config.options.noAdvancedVariants.default &&
409
+ typeof configFileData.noAdvancedVariants === 'boolean'
410
+ ) {
411
+ config.noAdvancedVariants = configFileData.noAdvancedVariants
412
+ }
413
+ // package
414
+ if (config.package === Config.options.package.default && typeof configFileData.package === 'boolean') {
415
+ config.package = configFileData.package
410
416
  }
411
417
  }
412
418
 
package/src/generation-handler.ts CHANGED
@@ -10,7 +10,7 @@ import {
10
10
  } from '@ts-for-gir/lib'
11
11
  import { GeneratorType, Generator } from '@ts-for-gir/generator-base'
12
12
  import { TypeDefinitionGenerator } from '@ts-for-gir/generator-typescript'
13
- // import { HtmlDocGenerator } from '@ts-for-gir/generator-html-doc'
13
+ import { HtmlDocGenerator } from '@ts-for-gir/generator-html-doc'
14
14
 
15
15
  import type { OptionsGeneration, NSRegistry } from '@ts-for-gir/lib'
16
16
 
@@ -28,9 +28,9 @@ export class GenerationHandler {
28
28
  case GeneratorType.TYPES:
29
29
  this.generator = new TypeDefinitionGenerator(config)
30
30
  break
31
- // case GeneratorType.HTML_DOC:
32
- // this.generator = new HtmlDocGenerator(config)
33
- // break
31
+ case GeneratorType.HTML_DOC:
32
+ this.generator = new HtmlDocGenerator(config)
33
+ break
34
34
  default:
35
35
  throw new Error('Unknown Generator')
36
36
  }
@@ -64,7 +64,7 @@ export class GenerationHandler {
64
64
  await this.generator.generate(registry, girModule)
65
65
  }
66
66
 
67
- await this.generator.finish(registry)
67
+ await this.generator.finish(registry, girModules)
68
68
 
69
69
  this.log.success(GENERATING_TYPES_DONE)
70
70
  }