kea-typegen 3.4.6 → 3.5.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 +67 -45
- package/dist/package.json +3 -3
- package/dist/src/cache.js +1 -1
- package/dist/src/cache.js.map +1 -1
- package/dist/src/cli/typegen.js +10 -9
- package/dist/src/cli/typegen.js.map +1 -1
- package/dist/src/print/print.d.ts +3 -3
- package/dist/src/print/print.js +9 -9
- package/dist/src/print/print.js.map +1 -1
- package/dist/src/typegen.d.ts +1 -1
- package/dist/src/typegen.js +7 -7
- package/dist/src/typegen.js.map +1 -1
- package/dist/src/write/convertToBuilders.d.ts +1 -1
- package/dist/src/write/convertToBuilders.js +2 -2
- package/dist/src/write/convertToBuilders.js.map +1 -1
- package/dist/src/write/writePaths.d.ts +1 -1
- package/dist/src/write/writePaths.js +3 -3
- package/dist/src/write/writePaths.js.map +1 -1
- package/dist/src/write/writeTypeImports.d.ts +1 -1
- package/dist/src/write/writeTypeImports.js +2 -2
- package/dist/src/write/writeTypeImports.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +3 -3
- package/src/cache.ts +1 -1
- package/src/cli/typegen.ts +13 -27
- package/src/print/print.ts +12 -9
- package/src/typegen.ts +8 -8
- package/src/write/convertToBuilders.ts +3 -3
- package/src/write/writePaths.ts +9 -4
- package/src/write/writeTypeImports.ts +2 -2
package/CHANGELOG.md
CHANGED
|
@@ -1,50 +1,72 @@
|
|
|
1
|
+
## 3.5.0 - 2025-07-17
|
|
2
|
+
|
|
3
|
+
- Update to Prettier v3 adding `async` support
|
|
4
|
+
|
|
5
|
+
## 3.4.6 - 2025-06-23
|
|
6
|
+
|
|
7
|
+
- Write the cache into the <root>/.typegen folder
|
|
8
|
+
|
|
1
9
|
## 3.4.6 - 2025-06-23
|
|
10
|
+
|
|
2
11
|
- Create a "--use-cache" option to cache the generated types in ".typegen"
|
|
3
12
|
|
|
4
13
|
## 3.4.5 - 2025-06-23
|
|
14
|
+
|
|
5
15
|
- Reuse old program when running "typegen:write" (small speedup)
|
|
6
16
|
|
|
7
17
|
## 3.4.4 - 2025-06-19
|
|
18
|
+
|
|
8
19
|
- Upgrade to TypeScript 5.4
|
|
9
20
|
|
|
10
21
|
## 3.4.3 - 2025-06-19
|
|
22
|
+
|
|
11
23
|
- Upgrade to TypeScript 5.2
|
|
12
24
|
|
|
13
25
|
## 3.4.2 - 2025-06-19
|
|
26
|
+
|
|
14
27
|
- Upgrade to TypeScript 5.1
|
|
15
28
|
|
|
16
29
|
## 3.4.1 - 2025-06-13
|
|
30
|
+
|
|
17
31
|
- Upgrade to TypeScript 5.0
|
|
18
32
|
|
|
19
33
|
## 3.3.7 - 2025-05-22
|
|
34
|
+
|
|
20
35
|
- Support `lazyLoaders`
|
|
21
36
|
|
|
22
37
|
## 3.3.6 - 2025-01-21
|
|
38
|
+
|
|
23
39
|
- Skip `..` in `path()`
|
|
24
40
|
|
|
25
41
|
## 3.3.5 - 2025-01-10
|
|
42
|
+
|
|
26
43
|
- Resolve duplicate type imports in logic files
|
|
27
44
|
|
|
28
45
|
## 3.3.4 - 2023-12-04
|
|
46
|
+
|
|
29
47
|
- Fix missing logic in connect.
|
|
30
48
|
|
|
31
49
|
## 3.3.0 - 2023-08-16
|
|
50
|
+
|
|
32
51
|
- Sort printed unions and type literals in actions, reducers, etc. This is to keep the output deterministic.
|
|
33
52
|
|
|
34
53
|
## 3.2.3 - 2023-08-16
|
|
54
|
+
|
|
35
55
|
- Fix deprecations and upgrade TypeScript
|
|
36
56
|
|
|
37
57
|
## 3.2.2 - 2023-08-16
|
|
58
|
+
|
|
38
59
|
- Support kea-forms's paths in path cleanup.
|
|
39
60
|
|
|
40
61
|
## 3.2.1 - 2023-08-16
|
|
62
|
+
|
|
41
63
|
- Also support `@types/` imports by removing `@types/`
|
|
42
64
|
|
|
43
65
|
## 3.2.0 - 2023-08-16
|
|
44
66
|
|
|
45
67
|
- Clean up paths in generated import files
|
|
46
|
-
|
|
47
|
-
|
|
68
|
+
- Convert `../../node_modules/*` to just `*`
|
|
69
|
+
- Convert `../../node_modules/.pnpm/pkg@version/node_modules/*` to just `*`
|
|
48
70
|
|
|
49
71
|
## 3.1.7 - 2023-08-16
|
|
50
72
|
|
|
@@ -73,8 +95,8 @@
|
|
|
73
95
|
## 3.1.0 - 2022-05-24
|
|
74
96
|
|
|
75
97
|
- Remove support for importing local types by adding to the end of `logicType` in `kea<logicType<Something, Other, Another>>(...)`
|
|
76
|
-
- 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`.
|
|
77
|
-
- This will bring a circular import in your code `logic.ts <-> logicType.ts`, but `tsc` seems not to care.
|
|
98
|
+
- 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`.
|
|
99
|
+
- This will bring a circular import in your code `logic.ts <-> logicType.ts`, but `tsc` seems not to care.
|
|
78
100
|
|
|
79
101
|
## 3.0.0 - 2022-05-12
|
|
80
102
|
|
|
@@ -86,131 +108,131 @@
|
|
|
86
108
|
|
|
87
109
|
## 1.4.3 - 2022-03-18
|
|
88
110
|
|
|
89
|
-
-
|
|
111
|
+
- Internal: plugins can specify which types they want to import from 'kea'
|
|
90
112
|
|
|
91
113
|
## 1.4.2 - 2021-12-13
|
|
92
114
|
|
|
93
|
-
-
|
|
115
|
+
- Fix bug introduced with 1.4.1 if your `tsconfig.json` file does not contain a `types` array.
|
|
94
116
|
|
|
95
117
|
## 1.4.1 - 2021-12-12
|
|
96
118
|
|
|
97
|
-
-
|
|
98
|
-
-
|
|
119
|
+
- 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.
|
|
120
|
+
- 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.
|
|
99
121
|
|
|
100
122
|
## 1.4.0 - 2021-12-12
|
|
101
123
|
|
|
102
|
-
-
|
|
103
|
-
-
|
|
104
|
-
-
|
|
124
|
+
- Support TypeScript 4.5+.
|
|
125
|
+
- Now adds new type imports with `type`, such as: `import type { logicType } from './logicType`.
|
|
126
|
+
- Refactor internals to create nodes newer `ts.factory` methods.
|
|
105
127
|
|
|
106
128
|
## 1.3.0 - 2021-11-08
|
|
107
129
|
|
|
108
|
-
-
|
|
130
|
+
- Write paths into logics with `--write-paths`. Can be configured in `.kearc` with `writePaths: true`
|
|
109
131
|
|
|
110
132
|
## 1.2.2 - 2021-10-14
|
|
111
133
|
|
|
112
|
-
-
|
|
134
|
+
- Loaders: Make the `payload` parameter on the `Success` action optional.
|
|
113
135
|
|
|
114
136
|
## 1.2.1 - 2021-10-14
|
|
115
137
|
|
|
116
|
-
-
|
|
138
|
+
- Improve `kea-loaders` 0.5.0 support
|
|
117
139
|
|
|
118
140
|
## 1.2.0 - 2021-10-14
|
|
119
141
|
|
|
120
|
-
-
|
|
142
|
+
- Support `kea-loaders` 0.5.0, add `payload` to the success action and `errorObject` to the failure action.
|
|
121
143
|
|
|
122
144
|
## 1.1.6 - 2021-10-07
|
|
123
145
|
|
|
124
|
-
-
|
|
146
|
+
- Support reducers with actions like `[otherLogic().actionTypes.bla]`
|
|
125
147
|
|
|
126
148
|
## 1.1.5 - 2021-07-14
|
|
127
149
|
|
|
128
|
-
-
|
|
150
|
+
- [Fix bug](https://github.com/keajs/kea-typegen/issues/28) with string constant types in action properties when connected with `connect`.
|
|
129
151
|
|
|
130
152
|
## 1.1.4 - 2021-07-13
|
|
131
153
|
|
|
132
|
-
-
|
|
154
|
+
- Support declaring `props: {} as SomeInterface`
|
|
133
155
|
|
|
134
156
|
## 1.1.3 - 2021-07-13
|
|
135
157
|
|
|
136
|
-
-
|
|
158
|
+
- Bugfixes
|
|
137
159
|
|
|
138
160
|
## 1.1.2 - 2021-07-12
|
|
139
161
|
|
|
140
|
-
-
|
|
162
|
+
- Export types and `runTypeGen` function
|
|
141
163
|
|
|
142
164
|
## 1.1.1 - 2021-07-12
|
|
143
165
|
|
|
144
|
-
-
|
|
166
|
+
- Fix main field in package.json
|
|
145
167
|
|
|
146
168
|
## 1.1.0 - 2021-07-12
|
|
147
169
|
|
|
148
|
-
-
|
|
170
|
+
- Experimental support for typegen plugins
|
|
149
171
|
|
|
150
172
|
## 1.0.4 - 2021-06-27
|
|
151
173
|
|
|
152
|
-
-
|
|
174
|
+
- Fix regression
|
|
153
175
|
|
|
154
176
|
## 1.0.3 - 2021-06-27
|
|
155
177
|
|
|
156
|
-
-
|
|
178
|
+
- Fix regression
|
|
157
179
|
|
|
158
180
|
## 1.0.2 - 2021-06-27
|
|
159
181
|
|
|
160
|
-
-
|
|
161
|
-
-
|
|
182
|
+
- Use explicitly specified function return types if present for actions and selectors (vs detection via compiler api).
|
|
183
|
+
- This helps with namespaced types like `This.That`, as the namespace information is lost in detected types.
|
|
162
184
|
|
|
163
185
|
## 1.0.1 - 2021-06-27
|
|
164
186
|
|
|
165
|
-
-
|
|
166
|
-
-
|
|
187
|
+
- Republish as 1.0.0 on npm is actually 0.7.2
|
|
188
|
+
- Only import `A` when encountering complex types like `A.B`
|
|
167
189
|
|
|
168
190
|
## 1.0.0 - 2021-06-26
|
|
169
191
|
|
|
170
|
-
-
|
|
192
|
+
- Support auto-importing referenced types into logic types
|
|
171
193
|
|
|
172
194
|
## 0.7.2 - 2021-05-30
|
|
173
195
|
|
|
174
|
-
-
|
|
196
|
+
- Support actions that return payloads with over 16 properties (fix ".. 4 more .." in the generated type).
|
|
175
197
|
|
|
176
198
|
## 0.7.1 - 2021-04-30
|
|
177
199
|
|
|
178
|
-
-
|
|
200
|
+
- Improve error display, condense logs
|
|
179
201
|
|
|
180
202
|
## 0.7.0 - 2021-04-26
|
|
181
203
|
|
|
182
|
-
-
|
|
183
|
-
-
|
|
204
|
+
- Fix various bugs from last version.
|
|
205
|
+
- Run with `--no-import` to skip automatically adding imports to logic types.
|
|
184
206
|
|
|
185
207
|
## 0.6.2 - 2021-04-25
|
|
186
208
|
|
|
187
|
-
-
|
|
188
|
-
-
|
|
189
|
-
-
|
|
209
|
+
- Automatically add `import { logicType } from './logicType'` statements
|
|
210
|
+
- Automatically add the type to `kea<logicType>()`
|
|
211
|
+
- 0.6.0 and 0.6.1 had some bugs, don't use.
|
|
190
212
|
|
|
191
213
|
## 0.5.4 - 2021-03-30
|
|
192
214
|
|
|
193
|
-
-
|
|
215
|
+
- Support reducers with selectors as defaults
|
|
194
216
|
|
|
195
217
|
## 0.5.3 - 2021-02-23
|
|
196
218
|
|
|
197
|
-
-
|
|
198
|
-
-
|
|
199
|
-
-
|
|
219
|
+
- Fix type bug with selectors
|
|
220
|
+
- Skip first comment line in generated types when comparing for overwrites
|
|
221
|
+
- Update deps
|
|
200
222
|
|
|
201
223
|
## 0.5.2 - 2021-02-23
|
|
202
224
|
|
|
203
|
-
-
|
|
225
|
+
- Update and clean up copy
|
|
204
226
|
|
|
205
227
|
## 0.5.1 - 2021-01-22
|
|
206
228
|
|
|
207
|
-
-
|
|
229
|
+
- Fix `kea-typegen write` recursive updates
|
|
208
230
|
|
|
209
231
|
## 0.5.0 - 2021-01-22
|
|
210
232
|
|
|
211
|
-
-
|
|
212
|
-
-
|
|
233
|
+
- Fix "Record<...>" style shortened types in selectors
|
|
234
|
+
- Add names to selectors
|
|
213
235
|
|
|
214
236
|
## 0.4.0 - 2020-12-29
|
|
215
237
|
|
|
216
|
-
-
|
|
238
|
+
- 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.
|
|
3
|
+
"version": "3.5.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": "^
|
|
31
|
+
"prettier": "^3.6.2",
|
|
32
32
|
"recast": "^0.23.4",
|
|
33
33
|
"yargs": "^16.2.0"
|
|
34
34
|
},
|
package/dist/src/cache.js
CHANGED
|
@@ -5,7 +5,7 @@ const fs = require("fs");
|
|
|
5
5
|
const path = require("path");
|
|
6
6
|
const visit_1 = require("./visit/visit");
|
|
7
7
|
function cachePath(appOptions, fileName) {
|
|
8
|
-
return path.join(
|
|
8
|
+
return path.join(process.cwd(), '.typegen', path.relative(process.cwd(), fileName));
|
|
9
9
|
}
|
|
10
10
|
exports.cachePath = cachePath;
|
|
11
11
|
function restoreCachedTypes(program, appOptions, log) {
|
package/dist/src/cache.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cache.js","sourceRoot":"","sources":["../../src/cache.ts"],"names":[],"mappings":";;;AAAA,yBAAwB;AACxB,6BAA4B;AAG5B,yCAA4C;AAE5C,SAAgB,SAAS,CAAC,UAAsB,EAAE,QAAgB;IAC9D,OAAO,IAAI,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"cache.js","sourceRoot":"","sources":["../../src/cache.ts"],"names":[],"mappings":";;;AAAA,yBAAwB;AACxB,6BAA4B;AAG5B,yCAA4C;AAE5C,SAAgB,SAAS,CAAC,UAAsB,EAAE,QAAgB;IAC9D,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,UAAU,EAAE,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,QAAQ,CAAC,CAAC,CAAA;AACvF,CAAC;AAFD,8BAEC;AAED,SAAgB,kBAAkB,CAAC,OAAgB,EAAE,UAAsB,EAAE,GAA0B;IACnG,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC;QACvB,OAAO,KAAK,CAAA;IAChB,CAAC;IACD,MAAM,YAAY,GAAG,IAAA,oBAAY,EAAC,OAAO,EAAE,UAAU,CAAC,CAAA;IACtD,IAAI,QAAQ,GAAG,KAAK,CAAA;IACpB,KAAK,MAAM,EAAE,IAAI,YAAY,EAAE,CAAC;QAC5B,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,EAAE,CAAC,YAAY,CAAC,EAAE,CAAC;YAClC,MAAM,IAAI,GAAG,SAAS,CAAC,UAAU,EAAE,EAAE,CAAC,YAAY,CAAC,CAAA;YACnD,IAAI,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;gBACtB,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,YAAY,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;gBAChE,EAAE,CAAC,YAAY,CAAC,IAAI,EAAE,EAAE,CAAC,YAAY,CAAC,CAAA;gBACtC,GAAG,CAAC,2BAA2B,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,EAAE,CAAC,YAAY,CAAC,EAAE,CAAC,CAAA;gBAC/E,QAAQ,GAAG,IAAI,CAAA;YACnB,CAAC;QACL,CAAC;IACL,CAAC;IACD,OAAO,QAAQ,CAAA;AACnB,CAAC;AAlBD,gDAkBC;AAED,SAAgB,gBAAgB,CAAC,QAAgB,EAAE,UAAsB;IACrE,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC;QACvB,OAAM;IACV,CAAC;IACD,MAAM,IAAI,GAAG,SAAS,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAA;IAC5C,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;IACrD,EAAE,CAAC,YAAY,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAA;AACnC,CAAC;AAPD,4CAOC"}
|
package/dist/src/cli/typegen.js
CHANGED
|
@@ -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',
|
|
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',
|
|
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',
|
|
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)
|
|
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
|
|
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
|
|
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":";;;AAEA,iCAAgC;AAChC,+BAA8B;AAC9B,6BAA4B;AAC5B,yBAAwB;AAExB,wCAAuC;AAEvC,KAAK;KACA,OAAO,
|
|
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;
|
package/dist/src/print/print.js
CHANGED
|
@@ -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
|
|
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
|
-
|
|
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":";;;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;AAE3C,SAAgB,kBAAkB,CAAC,UAAkB,EAAE,QAAgB;IACnE,MAAM,OAAO,GAAG,QAAQ,CAAC,aAAa,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;IACrD,IAAI,OAAO,EAAE,CAAC;QACV,IAAI,CAAC;YACD,OAAO,QAAQ,CAAC,MAAM,CAAC,UAAU,EAAE,EAAE,GAAG,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC,CAAA;QAC1E,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;AAGD,SAAgB,YAAY,CACxB,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,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ,EAAE,YAAY,CAAC,EAAE,EAAE;;QAC/D,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,kBAAkB,CAAC,YAAY,CAAC,WAAW,CAAC,oBAAoB,CAAC,EAAE,YAAY,CAAC,CAAA;YACxG,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,IAAA,mCAAgB,EAAC,UAAU,EAAE,OAAO,EAAE,QAAQ,EAAE,oBAAoB,EAAE,YAAY,CAAC,CAAA;gBACnF,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,CAAC,CAAA;IAEF,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;AA5OD,oCA4OC;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
|
+
{"version":3,"file":"print.js","sourceRoot":"","sources":["../../../src/print/print.ts"],"names":[],"mappings":"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"}
|
package/dist/src/typegen.d.ts
CHANGED
|
@@ -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>;
|
package/dist/src/typegen.js
CHANGED
|
@@ -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(
|
|
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);
|
package/dist/src/typegen.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"typegen.js","sourceRoot":"","sources":["../../src/typegen.ts"],"names":[],"mappings":";;;AAAA,iCAAgC;AAChC,6BAA4B;AAC5B,yCAA4C;AAC5C,yCAA4C;AAG5C,kDAAyC;AACzC,mCAA4C;AAO5C,IAAI,QAAQ,CAAC,EAAE,CAAC,iBAAiB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC;IACnD,CAAC;IAAC,EAAU,CAAC,8BAA8B,GAAG,QAAQ,CAAA;AAC1D,CAAC;
|
|
1
|
+
{"version":3,"file":"typegen.js","sourceRoot":"","sources":["../../src/typegen.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
import { AppOptions, ParsedLogic } from '../types';
|
|
2
2
|
import * as ts from 'typescript';
|
|
3
|
-
export declare function convertToBuilders(appOptions: AppOptions, program: ts.Program, filename: string, parsedLogics: ParsedLogic[]): void
|
|
3
|
+
export declare function convertToBuilders(appOptions: AppOptions, program: ts.Program, filename: string, parsedLogics: ParsedLogic[]): Promise<void>;
|
|
@@ -32,7 +32,7 @@ const supportedProperties = {
|
|
|
32
32
|
urlToAction: 'kea-router',
|
|
33
33
|
events: 'kea',
|
|
34
34
|
};
|
|
35
|
-
function convertToBuilders(appOptions, program, filename, parsedLogics) {
|
|
35
|
+
async function convertToBuilders(appOptions, program, filename, parsedLogics) {
|
|
36
36
|
var _a;
|
|
37
37
|
const { log } = appOptions;
|
|
38
38
|
const sourceFile = program.getSourceFile(filename);
|
|
@@ -96,7 +96,7 @@ function convertToBuilders(appOptions, program, filename, parsedLogics) {
|
|
|
96
96
|
}
|
|
97
97
|
}
|
|
98
98
|
}
|
|
99
|
-
const newText = (0, print_1.runThroughPrettier)((0, recast_1.print)(ast).code, filename);
|
|
99
|
+
const newText = await (0, print_1.runThroughPrettier)((0, recast_1.print)(ast).code, filename);
|
|
100
100
|
fs.writeFileSync(filename, newText);
|
|
101
101
|
log(`🔥 Converted to builders: ${osPath.relative(process.cwd(), filename)}`);
|
|
102
102
|
}
|