kea-typegen 3.4.7 → 3.6.0

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.
package/CHANGELOG.md CHANGED
@@ -1,53 +1,76 @@
1
+ ## 3.6.0 - 2026-02-24
2
+
3
+ - Fix aliased typename paths in logic type files (e.g. `kea/lib/index` -> `kea`)
4
+
5
+ ## 3.5.0 - 2025-07-17
6
+
7
+ - Update to Prettier v3 adding `async` support
8
+
1
9
  ## 3.4.6 - 2025-06-23
10
+
2
11
  - Write the cache into the <root>/.typegen folder
3
12
 
4
13
  ## 3.4.6 - 2025-06-23
14
+
5
15
  - Create a "--use-cache" option to cache the generated types in ".typegen"
6
16
 
7
17
  ## 3.4.5 - 2025-06-23
18
+
8
19
  - Reuse old program when running "typegen:write" (small speedup)
9
20
 
10
21
  ## 3.4.4 - 2025-06-19
22
+
11
23
  - Upgrade to TypeScript 5.4
12
24
 
13
25
  ## 3.4.3 - 2025-06-19
26
+
14
27
  - Upgrade to TypeScript 5.2
15
28
 
16
29
  ## 3.4.2 - 2025-06-19
30
+
17
31
  - Upgrade to TypeScript 5.1
18
32
 
19
33
  ## 3.4.1 - 2025-06-13
34
+
20
35
  - Upgrade to TypeScript 5.0
21
36
 
22
37
  ## 3.3.7 - 2025-05-22
38
+
23
39
  - Support `lazyLoaders`
24
40
 
25
41
  ## 3.3.6 - 2025-01-21
42
+
26
43
  - Skip `..` in `path()`
27
44
 
28
45
  ## 3.3.5 - 2025-01-10
46
+
29
47
  - Resolve duplicate type imports in logic files
30
48
 
31
49
  ## 3.3.4 - 2023-12-04
50
+
32
51
  - Fix missing logic in connect.
33
52
 
34
53
  ## 3.3.0 - 2023-08-16
54
+
35
55
  - Sort printed unions and type literals in actions, reducers, etc. This is to keep the output deterministic.
36
56
 
37
57
  ## 3.2.3 - 2023-08-16
58
+
38
59
  - Fix deprecations and upgrade TypeScript
39
60
 
40
61
  ## 3.2.2 - 2023-08-16
62
+
41
63
  - Support kea-forms's paths in path cleanup.
42
64
 
43
65
  ## 3.2.1 - 2023-08-16
66
+
44
67
  - Also support `@types/` imports by removing `@types/`
45
68
 
46
69
  ## 3.2.0 - 2023-08-16
47
70
 
48
71
  - Clean up paths in generated import files
49
- - Convert `../../node_modules/*` to just `*`
50
- - Convert `../../node_modules/.pnpm/pkg@version/node_modules/*` to just `*`
72
+ - Convert `../../node_modules/*` to just `*`
73
+ - Convert `../../node_modules/.pnpm/pkg@version/node_modules/*` to just `*`
51
74
 
52
75
  ## 3.1.7 - 2023-08-16
53
76
 
@@ -76,8 +99,8 @@
76
99
  ## 3.1.0 - 2022-05-24
77
100
 
78
101
  - Remove support for importing local types by adding to the end of `logicType` in `kea<logicType<Something, Other, Another>>(...)`
79
- - Instead, `export` all local types, and typegen will import them in `logicType.ts` just like other types, even if they're declared in `logic.ts`.
80
- - This will bring a circular import in your code `logic.ts <-> logicType.ts`, but `tsc` seems not to care.
102
+ - Instead, `export` all local types, and typegen will import them in `logicType.ts` just like other types, even if they're declared in `logic.ts`.
103
+ - This will bring a circular import in your code `logic.ts <-> logicType.ts`, but `tsc` seems not to care.
81
104
 
82
105
  ## 3.0.0 - 2022-05-12
83
106
 
@@ -89,131 +112,131 @@
89
112
 
90
113
  ## 1.4.3 - 2022-03-18
91
114
 
92
- - Internal: plugins can specify which types they want to import from 'kea'
115
+ - Internal: plugins can specify which types they want to import from 'kea'
93
116
 
94
117
  ## 1.4.2 - 2021-12-13
95
118
 
96
- - Fix bug introduced with 1.4.1 if your `tsconfig.json` file does not contain a `types` array.
119
+ - Fix bug introduced with 1.4.1 if your `tsconfig.json` file does not contain a `types` array.
97
120
 
98
121
  ## 1.4.1 - 2021-12-12
99
122
 
100
- - Adds new option, `ignoreImportPaths`, to specify a list of files or folders that typegen will never import from, when adding imports inside `logicType.ts` files.
101
- - Automatically skips adding imports for global types, as specified via the `types` array in `tsconfig.json`. Each entry in the array (e.g. `node`) will add an import ignore path for `./node_modules/@types/node`. To revert this, set `"importGlobalTypes": true` inside `.kearc` or via the CLI.
123
+ - Adds new option, `ignoreImportPaths`, to specify a list of files or folders that typegen will never import from, when adding imports inside `logicType.ts` files.
124
+ - Automatically skips adding imports for global types, as specified via the `types` array in `tsconfig.json`. Each entry in the array (e.g. `node`) will add an import ignore path for `./node_modules/@types/node`. To revert this, set `"importGlobalTypes": true` inside `.kearc` or via the CLI.
102
125
 
103
126
  ## 1.4.0 - 2021-12-12
104
127
 
105
- - Support TypeScript 4.5+.
106
- - Now adds new type imports with `type`, such as: `import type { logicType } from './logicType`.
107
- - Refactor internals to create nodes newer `ts.factory` methods.
128
+ - Support TypeScript 4.5+.
129
+ - Now adds new type imports with `type`, such as: `import type { logicType } from './logicType`.
130
+ - Refactor internals to create nodes newer `ts.factory` methods.
108
131
 
109
132
  ## 1.3.0 - 2021-11-08
110
133
 
111
- - Write paths into logics with `--write-paths`. Can be configured in `.kearc` with `writePaths: true`
134
+ - Write paths into logics with `--write-paths`. Can be configured in `.kearc` with `writePaths: true`
112
135
 
113
136
  ## 1.2.2 - 2021-10-14
114
137
 
115
- - Loaders: Make the `payload` parameter on the `Success` action optional.
138
+ - Loaders: Make the `payload` parameter on the `Success` action optional.
116
139
 
117
140
  ## 1.2.1 - 2021-10-14
118
141
 
119
- - Improve `kea-loaders` 0.5.0 support
142
+ - Improve `kea-loaders` 0.5.0 support
120
143
 
121
144
  ## 1.2.0 - 2021-10-14
122
145
 
123
- - Support `kea-loaders` 0.5.0, add `payload` to the success action and `errorObject` to the failure action.
146
+ - Support `kea-loaders` 0.5.0, add `payload` to the success action and `errorObject` to the failure action.
124
147
 
125
148
  ## 1.1.6 - 2021-10-07
126
149
 
127
- - Support reducers with actions like `[otherLogic().actionTypes.bla]`
150
+ - Support reducers with actions like `[otherLogic().actionTypes.bla]`
128
151
 
129
152
  ## 1.1.5 - 2021-07-14
130
153
 
131
- - [Fix bug](https://github.com/keajs/kea-typegen/issues/28) with string constant types in action properties when connected with `connect`.
154
+ - [Fix bug](https://github.com/keajs/kea-typegen/issues/28) with string constant types in action properties when connected with `connect`.
132
155
 
133
156
  ## 1.1.4 - 2021-07-13
134
157
 
135
- - Support declaring `props: {} as SomeInterface`
158
+ - Support declaring `props: {} as SomeInterface`
136
159
 
137
160
  ## 1.1.3 - 2021-07-13
138
161
 
139
- - Bugfixes
162
+ - Bugfixes
140
163
 
141
164
  ## 1.1.2 - 2021-07-12
142
165
 
143
- - Export types and `runTypeGen` function
166
+ - Export types and `runTypeGen` function
144
167
 
145
168
  ## 1.1.1 - 2021-07-12
146
169
 
147
- - Fix main field in package.json
170
+ - Fix main field in package.json
148
171
 
149
172
  ## 1.1.0 - 2021-07-12
150
173
 
151
- - Experimental support for typegen plugins
174
+ - Experimental support for typegen plugins
152
175
 
153
176
  ## 1.0.4 - 2021-06-27
154
177
 
155
- - Fix regression
178
+ - Fix regression
156
179
 
157
180
  ## 1.0.3 - 2021-06-27
158
181
 
159
- - Fix regression
182
+ - Fix regression
160
183
 
161
184
  ## 1.0.2 - 2021-06-27
162
185
 
163
- - Use explicitly specified function return types if present for actions and selectors (vs detection via compiler api).
164
- - This helps with namespaced types like `This.That`, as the namespace information is lost in detected types.
186
+ - Use explicitly specified function return types if present for actions and selectors (vs detection via compiler api).
187
+ - This helps with namespaced types like `This.That`, as the namespace information is lost in detected types.
165
188
 
166
189
  ## 1.0.1 - 2021-06-27
167
190
 
168
- - Republish as 1.0.0 on npm is actually 0.7.2
169
- - Only import `A` when encountering complex types like `A.B`
191
+ - Republish as 1.0.0 on npm is actually 0.7.2
192
+ - Only import `A` when encountering complex types like `A.B`
170
193
 
171
194
  ## 1.0.0 - 2021-06-26
172
195
 
173
- - Support auto-importing referenced types into logic types
196
+ - Support auto-importing referenced types into logic types
174
197
 
175
198
  ## 0.7.2 - 2021-05-30
176
199
 
177
- - Support actions that return payloads with over 16 properties (fix ".. 4 more .." in the generated type).
200
+ - Support actions that return payloads with over 16 properties (fix ".. 4 more .." in the generated type).
178
201
 
179
202
  ## 0.7.1 - 2021-04-30
180
203
 
181
- - Improve error display, condense logs
204
+ - Improve error display, condense logs
182
205
 
183
206
  ## 0.7.0 - 2021-04-26
184
207
 
185
- - Fix various bugs from last version.
186
- - Run with `--no-import` to skip automatically adding imports to logic types.
208
+ - Fix various bugs from last version.
209
+ - Run with `--no-import` to skip automatically adding imports to logic types.
187
210
 
188
211
  ## 0.6.2 - 2021-04-25
189
212
 
190
- - Automatically add `import { logicType } from './logicType'` statements
191
- - Automatically add the type to `kea<logicType>()`
192
- - 0.6.0 and 0.6.1 had some bugs, don't use.
213
+ - Automatically add `import { logicType } from './logicType'` statements
214
+ - Automatically add the type to `kea<logicType>()`
215
+ - 0.6.0 and 0.6.1 had some bugs, don't use.
193
216
 
194
217
  ## 0.5.4 - 2021-03-30
195
218
 
196
- - Support reducers with selectors as defaults
219
+ - Support reducers with selectors as defaults
197
220
 
198
221
  ## 0.5.3 - 2021-02-23
199
222
 
200
- - Fix type bug with selectors
201
- - Skip first comment line in generated types when comparing for overwrites
202
- - Update deps
223
+ - Fix type bug with selectors
224
+ - Skip first comment line in generated types when comparing for overwrites
225
+ - Update deps
203
226
 
204
227
  ## 0.5.2 - 2021-02-23
205
228
 
206
- - Update and clean up copy
229
+ - Update and clean up copy
207
230
 
208
231
  ## 0.5.1 - 2021-01-22
209
232
 
210
- - Fix `kea-typegen write` recursive updates
233
+ - Fix `kea-typegen write` recursive updates
211
234
 
212
235
  ## 0.5.0 - 2021-01-22
213
236
 
214
- - Fix "Record<...>" style shortened types in selectors
215
- - Add names to selectors
237
+ - Fix "Record<...>" style shortened types in selectors
238
+ - Add names to selectors
216
239
 
217
240
  ## 0.4.0 - 2020-12-29
218
241
 
219
- - Fixed support for TypeScript 4.1
242
+ - Fixed support for TypeScript 4.1
package/dist/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "kea-typegen",
3
- "version": "3.4.7",
3
+ "version": "3.6.0",
4
4
  "description": "Generate type definitions for kea logic",
5
5
  "scripts": {
6
6
  "start": "ts-node ./src/cli/typegen.ts",
@@ -8,7 +8,7 @@
8
8
  "build": "tsc -p .",
9
9
  "prepublishOnly": "npm run test && npm run clean && npm run build",
10
10
  "run-built-cli": "node dist/src/cli/typegen.js",
11
- "test": "jest",
11
+ "test": "node --experimental-vm-modules node_modules/.bin/jest",
12
12
  "samples:check": "ts-node ./src/cli/typegen.ts check -r ./samples",
13
13
  "samples:write": "ts-node ./src/cli/typegen.ts write -r ./samples --write-paths --delete",
14
14
  "samples:convert": "ts-node ./src/cli/typegen.ts write -r ./samples --convert-to-builders",
@@ -28,7 +28,7 @@
28
28
  "@babel/preset-env": "^7.22.10",
29
29
  "@babel/preset-typescript": "^7.22.5",
30
30
  "ts-clone-node": "^3.0.0",
31
- "prettier": "^2.8.8",
31
+ "prettier": "^3.6.2",
32
32
  "recast": "^0.23.4",
33
33
  "yargs": "^16.2.0"
34
34
  },
@@ -1,6 +1,10 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  const utils_1 = require("../utils");
4
+ const fs = require("fs");
5
+ const os = require("os");
6
+ const path = require("path");
7
+ const ts = require("typescript");
4
8
  const typescript_1 = require("typescript");
5
9
  test('sourceToSourceFile', () => {
6
10
  const source = 'var foo = 5;';
@@ -33,4 +37,49 @@ test('logicSourceToLogicType', () => {
33
37
  const string = (0, utils_1.logicSourceToLogicType)(logicSource);
34
38
  expect(string).toContain('export interface myRandomLogicType extends Logic {');
35
39
  });
40
+ test('gatherImports prefers source package path for re-exported npm types', () => {
41
+ const tempDir = fs.mkdtempSync(path.join(os.tmpdir(), 'kea-typegen-imports-'));
42
+ try {
43
+ const logicPath = path.join(tempDir, 'logic.ts');
44
+ const keaPath = path.join(tempDir, 'node_modules', 'kea', 'index.d.ts');
45
+ const reactGridLayoutIndexPath = path.join(tempDir, 'node_modules', 'react-grid-layout', 'index.d.ts');
46
+ const reactGridLayoutTypesPath = path.join(tempDir, 'node_modules', 'react-grid-layout', 'dist', 'types-BiXsdXr7.d.ts');
47
+ fs.mkdirSync(path.dirname(keaPath), { recursive: true });
48
+ fs.mkdirSync(path.dirname(reactGridLayoutTypesPath), { recursive: true });
49
+ fs.writeFileSync(logicPath, [
50
+ "import { kea } from 'kea'",
51
+ "import type { Layout, LayoutItem } from 'react-grid-layout'",
52
+ '',
53
+ 'export const dashboardLogic = kea({',
54
+ ' reducers: () => ({',
55
+ ' currentLayout: [null as Layout | null, {}],',
56
+ ' responsiveLayouts: [null as Record<string, LayoutItem[]> | null, {}],',
57
+ ' }),',
58
+ '})',
59
+ ].join('\n'));
60
+ fs.writeFileSync(keaPath, 'export function kea(input: any): any');
61
+ fs.writeFileSync(reactGridLayoutIndexPath, "export { L as Layout, a as LayoutItem } from './dist/types-BiXsdXr7'\n");
62
+ fs.writeFileSync(reactGridLayoutTypesPath, ['export type L = { i: string }', 'export type a = { x: number }'].join('\n'));
63
+ const program = ts.createProgram([logicPath], {
64
+ module: ts.ModuleKind.CommonJS,
65
+ moduleResolution: ts.ModuleResolutionKind.NodeJs,
66
+ target: ts.ScriptTarget.ES2020,
67
+ skipLibCheck: true,
68
+ });
69
+ const sourceFile = program.getSourceFile(logicPath);
70
+ if (!sourceFile) {
71
+ throw new Error('Expected test source file to exist');
72
+ }
73
+ const parsedLogic = {
74
+ node: sourceFile,
75
+ typeReferencesToImportFromFiles: {},
76
+ };
77
+ (0, utils_1.gatherImports)(sourceFile, program.getTypeChecker(), parsedLogic);
78
+ expect(parsedLogic.typeReferencesToImportFromFiles['react-grid-layout']).toEqual(new Set(['Layout', 'LayoutItem']));
79
+ expect(Object.keys(parsedLogic.typeReferencesToImportFromFiles).some((importPath) => importPath.includes('react-grid-layout/dist/types-BiXsdXr7'))).toBe(false);
80
+ }
81
+ finally {
82
+ fs.rmSync(tempDir, { recursive: true, force: true });
83
+ }
84
+ });
36
85
  //# sourceMappingURL=utils.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/__tests__/utils.ts"],"names":[],"mappings":";;AAAA,oCAAwF;AACxF,2CAAuC;AAEvC,IAAI,CAAC,oBAAoB,EAAE,GAAG,EAAE;IAC5B,MAAM,MAAM,GAAG,cAAc,CAAA;IAC7B,MAAM,WAAW,GAAG,IAAA,0BAAkB,EAAC,MAAM,CAAC,CAAA;IAC9C,MAAM,WAAW,GAAG,IAAA,0BAAkB,EAAC,MAAM,EAAE,eAAe,CAAC,CAAA;IAC/D,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;IACxC,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;IACxC,MAAM,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,CAAA;IAChD,MAAM,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,eAAe,CAAC,CAAA;IACrD,MAAM,CAAC,uBAAU,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,YAAY,CAAC,CAAA;IAC1D,MAAM,CAAC,uBAAU,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,YAAY,CAAC,CAAA;AAC9D,CAAC,CAAC,CAAA;AAEF,IAAI,CAAC,mBAAmB,EAAE,GAAG,EAAE;IAC3B,MAAM,MAAM,GAAG,cAAc,CAAA;IAC7B,MAAM,OAAO,GAAG,IAAA,yBAAiB,EAAC,MAAM,CAAC,CAAA;IACzC,MAAM,CAAC,OAAO,CAAC,CAAC,WAAW,CAAA;IAC3B,MAAM,CAAC,OAAO,OAAO,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;AACzD,CAAC,CAAC,CAAA;AAEF,IAAI,CAAC,wBAAwB,EAAE,GAAG,EAAE;IAChC,MAAM,WAAW,GAAG;;;;;;;;;KASnB,CAAA;IACD,MAAM,MAAM,GAAG,IAAA,8BAAsB,EAAC,WAAW,CAAC,CAAA;IAElD,MAAM,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,oDAAoD,CAAC,CAAA;AAClF,CAAC,CAAC,CAAA"}
1
+ {"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/__tests__/utils.ts"],"names":[],"mappings":";;AAAA,oCAAuG;AACvG,yBAAwB;AACxB,yBAAwB;AACxB,6BAA4B;AAC5B,iCAAgC;AAEhC,2CAAuC;AAEvC,IAAI,CAAC,oBAAoB,EAAE,GAAG,EAAE;IAC5B,MAAM,MAAM,GAAG,cAAc,CAAA;IAC7B,MAAM,WAAW,GAAG,IAAA,0BAAkB,EAAC,MAAM,CAAC,CAAA;IAC9C,MAAM,WAAW,GAAG,IAAA,0BAAkB,EAAC,MAAM,EAAE,eAAe,CAAC,CAAA;IAC/D,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;IACxC,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;IACxC,MAAM,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,CAAA;IAChD,MAAM,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,eAAe,CAAC,CAAA;IACrD,MAAM,CAAC,uBAAU,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,YAAY,CAAC,CAAA;IAC1D,MAAM,CAAC,uBAAU,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,YAAY,CAAC,CAAA;AAC9D,CAAC,CAAC,CAAA;AAEF,IAAI,CAAC,mBAAmB,EAAE,GAAG,EAAE;IAC3B,MAAM,MAAM,GAAG,cAAc,CAAA;IAC7B,MAAM,OAAO,GAAG,IAAA,yBAAiB,EAAC,MAAM,CAAC,CAAA;IACzC,MAAM,CAAC,OAAO,CAAC,CAAC,WAAW,CAAA;IAC3B,MAAM,CAAC,OAAO,OAAO,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;AACzD,CAAC,CAAC,CAAA;AAEF,IAAI,CAAC,wBAAwB,EAAE,GAAG,EAAE;IAChC,MAAM,WAAW,GAAG;;;;;;;;;KASnB,CAAA;IACD,MAAM,MAAM,GAAG,IAAA,8BAAsB,EAAC,WAAW,CAAC,CAAA;IAElD,MAAM,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,oDAAoD,CAAC,CAAA;AAClF,CAAC,CAAC,CAAA;AAEF,IAAI,CAAC,qEAAqE,EAAE,GAAG,EAAE;IAC7E,MAAM,OAAO,GAAG,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,EAAE,sBAAsB,CAAC,CAAC,CAAA;IAC9E,IAAI,CAAC;QACD,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,UAAU,CAAC,CAAA;QAChD,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,cAAc,EAAE,KAAK,EAAE,YAAY,CAAC,CAAA;QACvE,MAAM,wBAAwB,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,cAAc,EAAE,mBAAmB,EAAE,YAAY,CAAC,CAAA;QACtG,MAAM,wBAAwB,GAAG,IAAI,CAAC,IAAI,CACtC,OAAO,EACP,cAAc,EACd,mBAAmB,EACnB,MAAM,EACN,qBAAqB,CACxB,CAAA;QAED,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;QACxD,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,wBAAwB,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;QAEzE,EAAE,CAAC,aAAa,CACZ,SAAS,EACT;YACI,2BAA2B;YAC3B,6DAA6D;YAC7D,EAAE;YACF,qCAAqC;YACrC,wBAAwB;YACxB,qDAAqD;YACrD,+EAA+E;YAC/E,SAAS;YACT,IAAI;SACP,CAAC,IAAI,CAAC,IAAI,CAAC,CACf,CAAA;QACD,EAAE,CAAC,aAAa,CAAC,OAAO,EAAE,sCAAsC,CAAC,CAAA;QACjE,EAAE,CAAC,aAAa,CACZ,wBAAwB,EACxB,wEAAwE,CAC3E,CAAA;QACD,EAAE,CAAC,aAAa,CACZ,wBAAwB,EACxB,CAAC,+BAA+B,EAAE,+BAA+B,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAChF,CAAA;QAED,MAAM,OAAO,GAAG,EAAE,CAAC,aAAa,CAAC,CAAC,SAAS,CAAC,EAAE;YAC1C,MAAM,EAAE,EAAE,CAAC,UAAU,CAAC,QAAQ;YAC9B,gBAAgB,EAAE,EAAE,CAAC,oBAAoB,CAAC,MAAM;YAChD,MAAM,EAAE,EAAE,CAAC,YAAY,CAAC,MAAM;YAC9B,YAAY,EAAE,IAAI;SACrB,CAAC,CAAA;QACF,MAAM,UAAU,GAAG,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAA;QACnD,IAAI,CAAC,UAAU,EAAE,CAAC;YACd,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAA;QACzD,CAAC;QAED,MAAM,WAAW,GAAG;YAChB,IAAI,EAAE,UAAU;YAChB,+BAA+B,EAAE,EAAE;SACZ,CAAA;QAE3B,IAAA,qBAAa,EAAC,UAAU,EAAE,OAAO,CAAC,cAAc,EAAE,EAAE,WAAW,CAAC,CAAA;QAEhE,MAAM,CAAC,WAAW,CAAC,+BAA+B,CAAC,mBAAmB,CAAC,CAAC,CAAC,OAAO,CAC5E,IAAI,GAAG,CAAC,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC,CACpC,CAAA;QACD,MAAM,CACF,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,+BAA+B,CAAC,CAAC,IAAI,CAAC,CAAC,UAAU,EAAE,EAAE,CACzE,UAAU,CAAC,QAAQ,CAAC,uCAAuC,CAAC,CAC/D,CACJ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;IACjB,CAAC;YAAS,CAAC;QACP,EAAE,CAAC,MAAM,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAA;IACxD,CAAC;AACL,CAAC,CAAC,CAAA"}
@@ -7,14 +7,14 @@ const path = require("path");
7
7
  const fs = require("fs");
8
8
  const typegen_1 = require("../typegen");
9
9
  yargs
10
- .command('check', '- check what should be done', (yargs) => { }, (argv) => {
11
- (0, typegen_1.runTypeGen)({ ...includeKeaConfig(parsedToAppOptions(argv)), write: false, watch: false });
10
+ .command('check', '- check what should be done', {}, async (argv) => {
11
+ await (0, typegen_1.runTypeGen)({ ...includeKeaConfig(parsedToAppOptions(argv)), write: false, watch: false });
12
12
  })
13
- .command('write', '- write logicType.ts files', (yargs) => { }, (argv) => {
14
- (0, typegen_1.runTypeGen)({ ...includeKeaConfig(parsedToAppOptions(argv)), write: true, watch: false });
13
+ .command('write', '- write logicType.ts files', {}, async (argv) => {
14
+ await (0, typegen_1.runTypeGen)({ ...includeKeaConfig(parsedToAppOptions(argv)), write: true, watch: false });
15
15
  })
16
- .command('watch', '- watch for changes and write logicType.ts files', (yargs) => { }, (argv) => {
17
- (0, typegen_1.runTypeGen)({ ...includeKeaConfig(parsedToAppOptions(argv)), write: true, watch: true });
16
+ .command('watch', '- watch for changes and write logicType.ts files', {}, async (argv) => {
17
+ await (0, typegen_1.runTypeGen)({ ...includeKeaConfig(parsedToAppOptions(argv)), write: true, watch: true });
18
18
  })
19
19
  .option('config', { alias: 'c', describe: 'Path to tsconfig.json (otherwise auto-detected)', type: 'string' })
20
20
  .option('file', { alias: 'f', describe: "Single file to evaluate (can't be used with --config)", type: 'string' })
@@ -53,7 +53,8 @@ yargs
53
53
  .option('verbose', { describe: 'Slightly more verbose output log', type: 'boolean' })
54
54
  .demandCommand()
55
55
  .help()
56
- .wrap(80).argv;
56
+ .wrap(80)
57
+ .parse();
57
58
  function parsedToAppOptions(parsedOptions) {
58
59
  const { root, types, config, file, ...rest } = parsedOptions;
59
60
  const appOptions = {
@@ -84,14 +85,14 @@ function includeKeaConfig(appOptions) {
84
85
  try {
85
86
  rawData = fs.readFileSync(configFilePath);
86
87
  }
87
- catch (e) {
88
+ catch {
88
89
  console.error(`Error reading Kea config file: ${configFilePath}`);
89
90
  process.exit(1);
90
91
  }
91
92
  try {
92
93
  keaConfig = JSON.parse(rawData);
93
94
  }
94
- catch (e) {
95
+ catch {
95
96
  console.error(`Error parsing Kea config JSON: ${configFilePath}`);
96
97
  process.exit(1);
97
98
  }
@@ -1 +1 @@
1
- {"version":3,"file":"typegen.js","sourceRoot":"","sources":["../../../src/cli/typegen.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"typegen.js","sourceRoot":"","sources":["../../../src/cli/typegen.ts"],"names":[],"mappings":"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"}
@@ -1,11 +1,11 @@
1
1
  import { Node, Program } from 'typescript';
2
2
  import { AppOptions, ParsedLogic } from '../types';
3
- export declare function runThroughPrettier(sourceText: string, filePath: string): string;
4
- export declare function printToFiles(program: Program, appOptions: AppOptions, parsedLogics: ParsedLogic[]): {
3
+ export declare function runThroughPrettier(sourceText: string, filePath: string): Promise<string>;
4
+ export declare function printToFiles(program: Program, appOptions: AppOptions, parsedLogics: ParsedLogic[]): Promise<{
5
5
  filesToWrite: number;
6
6
  writtenFiles: number;
7
7
  filesToModify: number;
8
- };
8
+ }>;
9
9
  export declare function nodeToString(node: Node): string;
10
10
  export declare function parsedLogicToTypeString(parsedLogic: ParsedLogic, appOptions?: AppOptions): string;
11
11
  export declare function printLogicType(parsedLogic: ParsedLogic, appOptions?: AppOptions): void;
@@ -28,11 +28,11 @@ const writeTypeImports_1 = require("../write/writeTypeImports");
28
28
  const printInternalExtraInput_1 = require("./printInternalExtraInput");
29
29
  const convertToBuilders_1 = require("../write/convertToBuilders");
30
30
  const cache_1 = require("../cache");
31
- function runThroughPrettier(sourceText, filePath) {
32
- const options = prettier.resolveConfig.sync(filePath);
31
+ async function runThroughPrettier(sourceText, filePath) {
32
+ const options = await prettier.resolveConfig(filePath);
33
33
  if (options) {
34
34
  try {
35
- return prettier.format(sourceText, { ...options, filepath: filePath });
35
+ return await prettier.format(sourceText, { ...options, filepath: filePath });
36
36
  }
37
37
  catch (e) {
38
38
  console.error(`!! Prettier: Error formatting "${filePath}"`);
@@ -45,7 +45,8 @@ function runThroughPrettier(sourceText, filePath) {
45
45
  }
46
46
  }
47
47
  exports.runThroughPrettier = runThroughPrettier;
48
- function printToFiles(program, appOptions, parsedLogics) {
48
+ async function printToFiles(program, appOptions, parsedLogics) {
49
+ var _a;
49
50
  const { log } = appOptions;
50
51
  const groupedByFile = {};
51
52
  for (const parsedLogic of parsedLogics) {
@@ -64,13 +65,12 @@ function printToFiles(program, appOptions, parsedLogics) {
64
65
  let writtenFiles = 0;
65
66
  let filesToWrite = 0;
66
67
  let filesToModify = 0;
67
- Object.entries(groupedByFile).forEach(([fileName, parsedLogics]) => {
68
- var _a;
68
+ for (const [fileName, parsedLogics] of Object.entries(groupedByFile)) {
69
69
  const typeFileName = parsedLogics[0].typeFileName;
70
70
  const logicStrings = [];
71
71
  const requiredKeys = new Set(['Logic']);
72
72
  for (const parsedLogic of parsedLogics) {
73
- const logicTypeStirng = runThroughPrettier(nodeToString(parsedLogic.interfaceDeclaration), typeFileName);
73
+ const logicTypeStirng = await runThroughPrettier(nodeToString(parsedLogic.interfaceDeclaration), typeFileName);
74
74
  logicStrings.push(logicTypeStirng);
75
75
  for (const string of parsedLogic.importFromKeaInLogicType.values()) {
76
76
  requiredKeys.add(string);
@@ -167,7 +167,7 @@ function printToFiles(program, appOptions, parsedLogics) {
167
167
  const logicsNeedingImports = parsedLogics.filter(parsedLogicNeedsTypeImport);
168
168
  if (logicsNeedingImports.length > 0) {
169
169
  if (appOptions.write && !appOptions.noImport) {
170
- (0, writeTypeImports_1.writeTypeImports)(appOptions, program, fileName, logicsNeedingImports, parsedLogics);
170
+ await (0, writeTypeImports_1.writeTypeImports)(appOptions, program, fileName, logicsNeedingImports, parsedLogics);
171
171
  filesToModify += logicsNeedingImports.length;
172
172
  }
173
173
  else {
@@ -198,7 +198,7 @@ function printToFiles(program, appOptions, parsedLogics) {
198
198
  log(`❌ Will not write ${logicsNeedingConversion.length} logic path${logicsNeedingConversion.length === 1 ? '' : 's'}`);
199
199
  }
200
200
  }
201
- });
201
+ }
202
202
  if (writtenFiles === 0 && filesToModify === 0) {
203
203
  if (appOptions.write) {
204
204
  log(`💚 ${parsedLogics.length} logic type${parsedLogics.length === 1 ? '' : 's'} up to date!`);
@@ -1 +1 @@
1
- {"version":3,"file":"print.js","sourceRoot":"","sources":["../../../src/print/print.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"print.js","sourceRoot":"","sources":["../../../src/print/print.ts"],"names":[],"mappings":";;;AAAA,2CAYmB;AACnB,yBAAwB;AACxB,6BAA4B;AAC5B,qCAAoC;AAGpC,iDAA6C;AAC7C,2DAAuD;AACvD,mDAA+C;AAC/C,iDAA6C;AAC7C,mDAA+C;AAC/C,qDAAiD;AACjD,+CAA2C;AAC3C,6EAAyE;AACzE,uDAAmD;AACnD,yDAAqD;AACrD,+EAA2E;AAC3E,+DAA2D;AAC3D,6CAAyC;AACzC,yCAAqC;AACrC,mDAA+C;AAC/C,+CAA2C;AAC3C,iEAA6D;AAC7D,qDAAiD;AACjD,oDAAgD;AAChD,gEAA4D;AAC5D,uEAAmE;AACnE,kEAA8D;AAC9D,oCAA2C;AAEpC,KAAK,UAAU,kBAAkB,CAAC,UAAkB,EAAE,QAAgB;IACzE,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAA;IACtD,IAAI,OAAO,EAAE,CAAC;QACV,IAAI,CAAC;YACD,OAAO,MAAM,QAAQ,CAAC,MAAM,CAAC,UAAU,EAAE,EAAE,GAAG,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC,CAAA;QAChF,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACT,OAAO,CAAC,KAAK,CAAC,kCAAkC,QAAQ,GAAG,CAAC,CAAA;YAC5D,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAA;YACxB,OAAO,UAAU,CAAA;QACrB,CAAC;IACL,CAAC;SAAM,CAAC;QACJ,OAAO,UAAU,CAAA;IACrB,CAAC;AACL,CAAC;AAbD,gDAaC;AAGM,KAAK,UAAU,YAAY,CAC9B,OAAgB,EAChB,UAAsB,EACtB,YAA2B;;IAE3B,MAAM,EAAE,GAAG,EAAE,GAAG,UAAU,CAAA;IAE1B,MAAM,aAAa,GAAkC,EAAE,CAAA;IACvD,KAAK,MAAM,WAAW,IAAI,YAAY,EAAE,CAAC;QACrC,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,QAAQ,CAAC,EAAE,CAAC;YACvC,aAAa,CAAC,WAAW,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAA;QAC5C,CAAC;QACD,aAAa,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;QAGrD,cAAc,CAAC,WAAW,EAAE,UAAU,CAAC,CAAA;IAC3C,CAAC;IAGD,MAAM,sBAAsB,GAAG,UAAU,CAAC,iBAAiB;QACvD,CAAC,CAAC,EAAE;QACJ,CAAC,CAAC,CAAC,OAAO,CAAC,kBAAkB,EAAE,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,GAAG,CAC1C,CAAC,IAAI,EAAE,EAAE,CACL,IAAI,CAAC,IAAI,CACL,UAAU,CAAC,eAAe,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,QAAQ,EAC3F,cAAc,EACd,QAAQ,EACR,IAAI,CACP,GAAG,IAAI,CAAC,GAAG,CACnB,CAAA;IAGP,MAAM,kBAAkB,GAAG,CAAC,UAAU,CAAC,iBAAiB,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE,CAC/E,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,QAAQ,EAAE,UAAU,CAAC,CAChD,CAAA;IAED,MAAM,oBAAoB,GAAG,CAAC,GAAG,sBAAsB,EAAE,GAAG,kBAAkB,CAAC,CAAA;IAE/E,MAAM,YAAY,GAAG,CAAC,YAAoB,EAAE,EAAE,CAC1C,CAAC,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,YAAY,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAA;IAE9E,IAAI,YAAY,GAAG,CAAC,CAAA;IACpB,IAAI,YAAY,GAAG,CAAC,CAAA;IACpB,IAAI,aAAa,GAAG,CAAC,CAAA;IAErB,KAAK,MAAM,CAAC,QAAQ,EAAE,YAAY,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,CAAC;QACnE,MAAM,YAAY,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC,YAAY,CAAA;QAEjD,MAAM,YAAY,GAAG,EAAE,CAAA;QACvB,MAAM,YAAY,GAAG,IAAI,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,CAAA;QACvC,KAAK,MAAM,WAAW,IAAI,YAAY,EAAE,CAAC;YACrC,MAAM,eAAe,GAAG,MAAM,kBAAkB,CAC5C,YAAY,CAAC,WAAW,CAAC,oBAAoB,CAAC,EAC9C,YAAY,CACf,CAAA;YACD,YAAY,CAAC,IAAI,CAAC,eAAe,CAAC,CAAA;YAClC,KAAK,MAAM,MAAM,IAAI,WAAW,CAAC,wBAAwB,CAAC,MAAM,EAAE,EAAE,CAAC;gBACjE,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;YAC5B,CAAC;YACD,IAAI,WAAW,CAAC,eAAe,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACzC,YAAY,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAA;YAC1C,CAAC;QACL,CAAC;QAED,MAAM,MAAM,GAAG,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;QAExC,MAAM,eAAe,GAAG,IAAI,CAAC,IAAI,CAC7B,UAAU,CAAC,eAAe,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,QAAQ,EAC3F,cAAc,CACjB,CAAA;QAED,MAAM,YAAY,GAAG,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,+BAA+B,CAAC;aAC/E,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC;aACpC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,IAAI,CAAC,EAAE,EAAE;YAClB,IAAI,SAAS,GAAG,IAAI,CAAA;YAGpB,IAAI,SAAS,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;gBAC5B,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,EAAE,SAAS,CAAC,CAAA;YACnF,CAAC;YACD,IAAI,SAAS,CAAC,UAAU,CAAC,eAAe,CAAC,EAAE,CAAC;gBACxC,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,EAAE,SAAS,CAAC,CAAA;YACtE,CAAC;YAED,IAAI,SAAS,CAAC,UAAU,CAAC,eAAe,CAAC,EAAE,CAAC;gBACxC,SAAS,GAAG,SAAS,CAAC,SAAS,CAAC,eAAe,CAAC,MAAM,GAAG,CAAC,CAAC,CAAA;gBAC3D,IAAI,SAAS,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;oBAEjC,MAAM,KAAK,GAAG,0CAA0C,CAAA;oBACxD,MAAM,MAAM,GAAG,SAAS,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;oBACrC,IAAI,MAAM,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;wBAC9B,SAAS,GAAG,MAAM,CAAC,CAAC,CAAC,CAAA;oBACzB,CAAC;gBACL,CAAC;gBACD,IAAI,SAAS,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;oBAClC,SAAS,GAAG,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC,CAAA;gBACtC,CAAC;YACL,CAAC;YAGD,IAAI,SAAS,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;gBAC5B,SAAS,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,EAAE,SAAS,CAAC,CAAA;gBAChF,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;oBAC7B,SAAS,GAAG,KAAK,SAAS,EAAE,CAAA;gBAChC,CAAC;YACL,CAAC;YAGD,SAAS,GAAG,SAAS,CAAC,OAAO,CAAC,eAAe,EAAE,EAAE,CAAC,CAAA;YAGlD,IAAI,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,KAAK,CAAC,IAAI,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;gBACpE,SAAS,GAAG,SAAS,CAAC,SAAS,CAAC,CAAC,EAAE,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAA;YAC5D,CAAC;YAED,OAAO;gBACH,IAAI,EAAE,CAAC,GAAG,IAAI,CAAC,CAAC,IAAI,EAAE;gBACtB,QAAQ,EAAE,IAAI;gBACd,SAAS;aACZ,CAAA;QACL,CAAC,CAAC;aACD,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,YAAY,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;aAChD,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC,iBAAiB,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,SAAS,GAAG,CAAC;aACtF,IAAI,CAAC,IAAI,CAAC,CAAA;QAEf,MAAM,WAAW,GAAG;YAChB;gBACI,kCAAkC,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,mCAAmC;gBAC7F,UAAU,CAAC,YAAY,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,SAAS;aACzD;iBACI,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;iBAClB,IAAI,CAAC,IAAI,CAAC;YACf,iBAAiB,CAAC,GAAG,YAAY,CAAC,MAAM,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe;YACrE,YAAY;YACZ,MAAM;SACT;aACI,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;aAClB,IAAI,CAAC,MAAM,CAAC,CAAA;QAIjB,IAAI,cAAc,CAAA;QAElB,IAAI,CAAC;YACD,cAAc,GAAG,MAAA,EAAE,CAAC,YAAY,CAAC,YAAY,CAAC,0CAAE,QAAQ,EAAE,CAAA;QAC9D,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC,CAAA,CAAC;QAElB,IACI,CAAC,cAAc;YACf,CAAC,cAAc;gBACX,cAAc,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,WAAW,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,EACrG,CAAC;YACC,YAAY,IAAI,CAAC,CAAA;YACjB,IAAI,UAAU,CAAC,KAAK,EAAE,CAAC;gBACnB,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;gBAC7D,EAAE,CAAC,aAAa,CAAC,YAAY,EAAE,WAAW,CAAC,CAAA;gBAC3C,YAAY,IAAI,CAAC,CAAA;gBACjB,GAAG,CAAC,eAAe,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,YAAY,CAAC,EAAE,CAAC,CAAA;gBAChE,IAAA,wBAAgB,EAAC,YAAY,EAAE,UAAU,CAAC,CAAA;YAC9C,CAAC;iBAAM,CAAC;gBACJ,GAAG,CAAC,qBAAqB,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,YAAY,CAAC,EAAE,CAAC,CAAA;YAC1E,CAAC;QACL,CAAC;aAAM,CAAC;YACJ,IAAI,UAAU,CAAC,OAAO,EAAE,CAAC;gBACrB,GAAG,CAAC,iBAAiB,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,YAAY,CAAC,EAAE,CAAC,CAAA;YACtE,CAAC;QACL,CAAC;QAED,MAAM,0BAA0B,GAAG,CAAC,EAAe,EAAE,EAAE,CAEnD,CAAC,EAAE,CAAC,iBAAiB,KAAK,KAAK;YAE3B,EAAE,CAAC,kBAAkB,CAAC,MAAM,GAAG,CAAC,CAAC;YACrC,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,SAAS,CAAC,CAAA;QAGhC,MAAM,oBAAoB,GAAG,YAAY,CAAC,MAAM,CAAC,0BAA0B,CAAC,CAAA;QAC5E,IAAI,oBAAoB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAClC,IAAI,UAAU,CAAC,KAAK,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC;gBAC3C,MAAM,IAAA,mCAAgB,EAAC,UAAU,EAAE,OAAO,EAAE,QAAQ,EAAE,oBAAoB,EAAE,YAAY,CAAC,CAAA;gBACzF,aAAa,IAAI,oBAAoB,CAAC,MAAM,CAAA;YAChD,CAAC;iBAAM,CAAC;gBACJ,GAAG,CACC,oBAAoB,oBAAoB,CAAC,MAAM,qBAC3C,oBAAoB,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAC7C,EAAE,CACL,CAAA;YACL,CAAC;QACL,CAAC;QAGD,MAAM,oBAAoB,GAAG,UAAU,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,EAAe,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,cAAc,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,KAAK,CAAA;QAC1G,MAAM,kBAAkB,GAAG,YAAY,CAAC,MAAM,CAAC,oBAAoB,CAAC,CAAA;QACpE,IAAI,kBAAkB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAChC,IAAI,UAAU,CAAC,KAAK,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC;gBAC3C,IAAA,uBAAU,EAAC,UAAU,EAAE,OAAO,EAAE,QAAQ,EAAE,kBAAkB,CAAC,CAAA;gBAC7D,aAAa,IAAI,kBAAkB,CAAC,MAAM,CAAA;YAC9C,CAAC;iBAAM,CAAC;gBACJ,GAAG,CACC,oBAAoB,kBAAkB,CAAC,MAAM,cACzC,kBAAkB,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAC3C,EAAE,CACL,CAAA;YACL,CAAC;QACL,CAAC;QAGD,MAAM,0BAA0B,GAAG,UAAU,CAAC,iBAAiB;YAC3D,CAAC,CAAC,CAAC,EAAe,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,iBAAiB;YAC5C,CAAC,CAAC,GAAG,EAAE,CAAC,KAAK,CAAA;QACjB,MAAM,uBAAuB,GAAG,YAAY,CAAC,MAAM,CAAC,0BAA0B,CAAC,CAAA;QAC/E,IAAI,uBAAuB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACrC,IAAI,UAAU,CAAC,KAAK,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC;gBAC3C,IAAA,qCAAiB,EAAC,UAAU,EAAE,OAAO,EAAE,QAAQ,EAAE,uBAAuB,CAAC,CAAA;gBACzE,aAAa,IAAI,uBAAuB,CAAC,MAAM,CAAA;YACnD,CAAC;iBAAM,CAAC;gBACJ,GAAG,CACC,oBAAoB,uBAAuB,CAAC,MAAM,cAC9C,uBAAuB,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAChD,EAAE,CACL,CAAA;YACL,CAAC;QACL,CAAC;IACL,CAAC;IAED,IAAI,YAAY,KAAK,CAAC,IAAI,aAAa,KAAK,CAAC,EAAE,CAAC;QAC5C,IAAI,UAAU,CAAC,KAAK,EAAE,CAAC;YACnB,GAAG,CAAC,MAAM,YAAY,CAAC,MAAM,cAAc,YAAY,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,cAAc,CAAC,CAAA;YAC9F,GAAG,CAAC,EAAE,CAAC,CAAA;QACX,CAAC;aAAM,IAAI,YAAY,GAAG,CAAC,IAAI,aAAa,GAAG,CAAC,EAAE,CAAC;YAC/C,GAAG,CACC,sCAAsC,YAAY,GAAG,aAAa,QAC9D,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAC9B,UAAU,CACb,CAAA;QACL,CAAC;IACL,CAAC;IAED,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,aAAa,EAAE,CAAA;AACxD,CAAC;AA/OD,oCA+OC;AAED,SAAgB,YAAY,CAAC,IAAU;IACnC,MAAM,OAAO,GAAG,IAAA,0BAAa,EAAC,EAAE,OAAO,EAAE,wBAAW,CAAC,QAAQ,EAAE,CAAC,CAAA;IAChE,MAAM,UAAU,GAAG,IAAA,6BAAgB,EAAC,UAAU,EAAE,EAAE,EAAE,yBAAY,CAAC,MAAM,EAAE,KAAK,EAAE,uBAAU,CAAC,EAAE,CAAC,CAAA;IAC9F,OAAO,OAAO,CAAC,SAAS,CAAC,qBAAQ,CAAC,WAAW,EAAE,IAAI,EAAE,UAAU,CAAC,CAAA;AACpE,CAAC;AAJD,oCAIC;AAED,SAAgB,uBAAuB,CAAC,WAAwB,EAAE,UAAuB;IACrF,cAAc,CAAC,WAAW,EAAE,UAAU,CAAC,CAAA;IACvC,OAAO,YAAY,CAAC,WAAW,CAAC,oBAAoB,CAAC,CAAA;AACzD,CAAC;AAHD,0DAGC;AAED,SAAgB,cAAc,CAAC,WAAwB,EAAE,UAAuB;IAC5E,MAAM,mBAAmB,GAAG,WAAW,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAA;IAEtG,MAAM,eAAe,GAAoC;QACrD,cAAc,EAAE,IAAA,yCAAmB,EAAC,WAAW,EAAE,UAAU,CAAC;QAC5D,UAAU,EAAE,IAAA,iCAAe,EAAC,WAAW,EAAE,UAAU,CAAC;QACpD,WAAW,EAAE,IAAA,mCAAgB,EAAC,WAAW,EAAE,UAAU,CAAC;QACtD,OAAO,EAAE,IAAA,2BAAY,EAAC,WAAW,EAAE,UAAU,CAAC;QAC9C,YAAY,EAAE,IAAA,qCAAiB,EAAC,WAAW,EAAE,UAAU,CAAC;QACxD,QAAQ,EAAE,IAAA,6BAAa,EAAC,WAAW,CAAC;QACpC,MAAM,EAAE,IAAA,yBAAW,EAAC,WAAW,CAAC;QAChC,GAAG,EAAE,IAAA,mBAAQ,EAAC,WAAW,CAAC;QAC1B,SAAS,EAAE,IAAA,+BAAc,EAAC,WAAW,CAAC;QACtC,IAAI,EAAE,oBAAO,CAAC,mBAAmB,CAC7B,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,oBAAO,CAAC,qBAAqB,CAAC,oBAAO,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC,CAAC,CAC7F;QACD,UAAU,EAAE,oBAAO,CAAC,qBAAqB,CAAC,oBAAO,CAAC,mBAAmB,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;QAC9F,KAAK,EAAE,IAAA,uBAAU,EAAC,WAAW,CAAC;QAC9B,OAAO,EAAE,IAAA,2BAAY,EAAC,WAAW,CAAC;QAClC,QAAQ,EAAE,IAAA,6BAAa,EAAC,WAAW,CAAC;QACpC,QAAQ,EAAE,IAAA,6BAAa,EAAC,WAAW,CAAC;QACpC,SAAS,EAAE,IAAA,+BAAc,EAAC,WAAW,CAAC;QACtC,eAAe,EAAE,IAAA,2CAAoB,EAAC,WAAW,CAAC;QAClD,MAAM,EAAE,IAAA,yBAAW,EAAC,WAAW,CAAC;KACnC,CAAA;IACD,KAAK,MAAM,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,gBAAgB,CAAC,EAAE,CAAC;QAC1E,IAAI,IAAI,IAAI,eAAe,EAAE,CAAC;YAC1B,OAAO,CAAC,KAAK,CAAC,mCAAmC,IAAI,8CAA8C,CAAC,CAAA;QACxG,CAAC;aAAM,CAAC;YACJ,eAAe,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAA;QACpC,CAAC;IACL,CAAC;IACD,MAAM,mBAAmB,GAAoC;QACzD,MAAM,EAAE,oBAAO,CAAC,qBAAqB,CAAC,oBAAO,CAAC,UAAU,EAAE,CAAC;QAC3D,aAAa,EAAE,oBAAO,CAAC,qBAAqB,CACxC,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,oBAAO,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,oBAAO,CAAC,WAAW,EAAE,CACrE;QACD,iCAAiC,EAAE,mBAAmB,CAAC,CAAC,CAAC,IAAA,uDAA0B,EAAC,WAAW,CAAC,CAAC,CAAC,CAAC,IAAI;QACvG,kCAAkC,EAC9B,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,IAAA,yDAA2B,EAAC,WAAW,CAAC,CAAC,CAAC,CAAC,IAAI;QACtG,8BAA8B,EAC1B,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,IAAA,iDAAuB,EAAC,WAAW,CAAC,CAAC,CAAC,CAAC,IAAI;KACnG,CAAA;IAED,MAAM,qBAAqB,GAAG;QAC1B,GAAG,MAAM,CAAC,WAAW,CACjB,MAAM,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAC7F;QACD,GAAG,mBAAmB;KACzB,CAAA;IAED,WAAW,CAAC,oBAAoB,GAAG,oBAAO,CAAC,0BAA0B,CACjE,CAAC,oBAAO,CAAC,cAAc,CAAC,uBAAU,CAAC,aAAa,CAAC,CAAC,EAClD,oBAAO,CAAC,gBAAgB,CAAC,GAAG,WAAW,CAAC,SAAS,MAAM,CAAC,EACxD,SAAS,EACT;QACI,oBAAO,CAAC,oBAAoB,CAAC,uBAAU,CAAC,cAAc,EAAE;YACpD,oBAAO,CAAC,iCAAiC,CAAC,oBAAO,CAAC,gBAAgB,CAAC,OAAO,CAAC,EAAE,SAAS,CAAC;SAC1F,CAAC;KACL,EACD,MAAM,CAAC,OAAO,CAAC,qBAAqB,CAAC;SAChC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC;SAC/B,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,QAAQ,CAAC,EAAE,EAAE,CACtB,oBAAO,CAAC,uBAAuB,CAAC,SAAS,EAAE,oBAAO,CAAC,gBAAgB,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,QAAQ,CAAC,CAClG,CACR,CAAA;AACL,CAAC;AAlED,wCAkEC"}
@@ -1,2 +1,2 @@
1
1
  import { AppOptions } from './types';
2
- export declare function runTypeGen(appOptions: AppOptions): void;
2
+ export declare function runTypeGen(appOptions: AppOptions): Promise<void>;
@@ -11,7 +11,7 @@ if (parseInt(ts.versionMajorMinor.split('.')[0]) < 5) {
11
11
  ;
12
12
  ts.defaultMaximumTruncationLength = Infinity;
13
13
  }
14
- function runTypeGen(appOptions) {
14
+ async function runTypeGen(appOptions) {
15
15
  let program;
16
16
  let resetProgram;
17
17
  const { log } = appOptions;
@@ -37,7 +37,7 @@ function runTypeGen(appOptions) {
37
37
  const createProgram = ts.createEmitAndSemanticDiagnosticsBuilderProgram;
38
38
  const host = ts.createWatchCompilerHost(appOptions.tsConfigPath, compilerOptions.options, {
39
39
  ...ts.sys,
40
- writeFile(path, data, writeByteOrderMark) {
40
+ writeFile(_path, _data, _writeByteOrderMark) {
41
41
  return null;
42
42
  },
43
43
  }, createProgram, reportDiagnostic, reportWatchStatusChanged);
@@ -64,10 +64,10 @@ function runTypeGen(appOptions) {
64
64
  return origCreateProgram(rootNames, options, host, oldProgram);
65
65
  };
66
66
  const origPostProgramCreate = host.afterProgramCreate;
67
- host.afterProgramCreate = (prog) => {
67
+ host.afterProgramCreate = async (prog) => {
68
68
  program = prog.getProgram();
69
69
  origPostProgramCreate(prog);
70
- goThroughAllTheFiles(program, appOptions);
70
+ await goThroughAllTheFiles(program, appOptions);
71
71
  };
72
72
  ts.createWatchProgram(host);
73
73
  }
@@ -82,12 +82,12 @@ function runTypeGen(appOptions) {
82
82
  else {
83
83
  log(`⛔ No tsconfig.json found! No source file specified.`);
84
84
  }
85
- function goThroughAllTheFiles(program, appOptions) {
85
+ async function goThroughAllTheFiles(program, appOptions) {
86
86
  const parsedLogics = (0, visit_1.visitProgram)(program, appOptions);
87
87
  if (appOptions.verbose) {
88
88
  log(`🗒️ ${parsedLogics.length} logic${parsedLogics.length === 1 ? '' : 's'} found!`);
89
89
  }
90
- const response = (0, print_1.printToFiles)(program, appOptions, parsedLogics);
90
+ const response = await (0, print_1.printToFiles)(program, appOptions, parsedLogics);
91
91
  if (!appOptions.write && !appOptions.watch && (response.filesToWrite > 0 || response.filesToModify > 0)) {
92
92
  process.exit(1);
93
93
  }
@@ -100,7 +100,7 @@ function runTypeGen(appOptions) {
100
100
  }
101
101
  let round = 0;
102
102
  while ((round += 1)) {
103
- const { writtenFiles, filesToModify } = goThroughAllTheFiles(program, appOptions);
103
+ const { writtenFiles, filesToModify } = await goThroughAllTheFiles(program, appOptions);
104
104
  if (writtenFiles === 0 && filesToModify === 0) {
105
105
  log(`👋 Finished writing files! Exiting.`);
106
106
  process.exit(0);