kea-typegen 1.1.6 → 1.3.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 +68 -30
- package/dist/package.json +2 -1
- package/dist/src/cli/typegen.js +2 -0
- package/dist/src/cli/typegen.js.map +1 -1
- package/dist/src/print/print.d.ts +1 -1
- package/dist/src/print/print.js +22 -10
- package/dist/src/print/print.js.map +1 -1
- package/dist/src/typegen.js +3 -3
- package/dist/src/typegen.js.map +1 -1
- package/dist/src/types.d.ts +3 -0
- package/dist/src/visit/visit.js +9 -1
- package/dist/src/visit/visit.js.map +1 -1
- package/dist/src/visit/visitLoaders.js +5 -1
- package/dist/src/visit/visitLoaders.js.map +1 -1
- package/dist/src/write/write.d.ts +4 -0
- package/dist/src/{import/writeLogicTypeImports.js → write/write.js} +50 -6
- package/dist/src/write/write.js.map +1 -0
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +2 -1
- package/samples/loadersLogicType.ts +55 -13
- package/samples/logicType.ts +13 -5
- package/src/__tests__/e2e/__snapshots__/loaders.ts.snap +24 -16
- package/src/cli/typegen.ts +2 -0
- package/src/print/print.ts +32 -17
- package/src/typegen.ts +4 -4
- package/src/types.ts +4 -1
- package/src/visit/visit.ts +9 -1
- package/src/visit/visitLoaders.ts +32 -0
- package/src/{import/writeLogicTypeImports.ts → write/write.ts} +102 -8
- package/dist/src/import/writeLogicTypeImports.d.ts +0 -3
- package/dist/src/import/writeLogicTypeImports.js.map +0 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,73 +1,111 @@
|
|
|
1
|
+
## 1.3.0 - 2021-11-08
|
|
2
|
+
|
|
3
|
+
- Write paths into logics with `--write-paths`. Can be configured in `.kearc` with `writePaths: true`
|
|
4
|
+
|
|
5
|
+
## 1.2.2 - 2021-10-14
|
|
6
|
+
|
|
7
|
+
- Loaders: Make the `payload` parameter on the `Success` action optional.
|
|
8
|
+
|
|
9
|
+
## 1.2.1 - 2021-10-14
|
|
10
|
+
|
|
11
|
+
- Improve `kea-loaders` 0.5.0 support
|
|
12
|
+
|
|
13
|
+
## 1.2.0 - 2021-10-14
|
|
14
|
+
|
|
15
|
+
- Support `kea-loaders` 0.5.0, add `payload` to the success action and `errorObject` to the failure action.
|
|
16
|
+
|
|
1
17
|
## 1.1.6 - 2021-10-07
|
|
2
|
-
|
|
18
|
+
|
|
19
|
+
- Support reducers with actions like `[otherLogic().actionTypes.bla]`
|
|
3
20
|
|
|
4
21
|
## 1.1.5 - 2021-07-14
|
|
5
|
-
|
|
22
|
+
|
|
23
|
+
- [Fix bug](https://github.com/keajs/kea-typegen/issues/28) with string constant types in action properties when connected with `connect`.
|
|
6
24
|
|
|
7
25
|
## 1.1.4 - 2021-07-13
|
|
8
|
-
|
|
26
|
+
|
|
27
|
+
- Support declaring `props: {} as SomeInterface`
|
|
9
28
|
|
|
10
29
|
## 1.1.3 - 2021-07-13
|
|
11
|
-
|
|
30
|
+
|
|
31
|
+
- Bugfixes
|
|
12
32
|
|
|
13
33
|
## 1.1.2 - 2021-07-12
|
|
14
|
-
|
|
34
|
+
|
|
35
|
+
- Export types and `runTypeGen` function
|
|
15
36
|
|
|
16
37
|
## 1.1.1 - 2021-07-12
|
|
17
|
-
|
|
38
|
+
|
|
39
|
+
- Fix main field in package.json
|
|
18
40
|
|
|
19
41
|
## 1.1.0 - 2021-07-12
|
|
20
|
-
|
|
42
|
+
|
|
43
|
+
- Experimental support for typegen plugins
|
|
21
44
|
|
|
22
45
|
## 1.0.4 - 2021-06-27
|
|
23
|
-
|
|
46
|
+
|
|
47
|
+
- Fix regression
|
|
24
48
|
|
|
25
49
|
## 1.0.3 - 2021-06-27
|
|
26
|
-
|
|
50
|
+
|
|
51
|
+
- Fix regression
|
|
27
52
|
|
|
28
53
|
## 1.0.2 - 2021-06-27
|
|
29
|
-
|
|
30
|
-
-
|
|
54
|
+
|
|
55
|
+
- Use explicitly specified function return types if present for actions and selectors (vs detection via compiler api).
|
|
56
|
+
- This helps with namespaced types like `This.That`, as the namespace information is lost in detected types.
|
|
31
57
|
|
|
32
58
|
## 1.0.1 - 2021-06-27
|
|
33
|
-
|
|
34
|
-
-
|
|
59
|
+
|
|
60
|
+
- Republish as 1.0.0 on npm is actually 0.7.2
|
|
61
|
+
- Only import `A` when encountering complex types like `A.B`
|
|
35
62
|
|
|
36
63
|
## 1.0.0 - 2021-06-26
|
|
37
|
-
|
|
64
|
+
|
|
65
|
+
- Support auto-importing referenced types into logic types
|
|
38
66
|
|
|
39
67
|
## 0.7.2 - 2021-05-30
|
|
40
|
-
|
|
68
|
+
|
|
69
|
+
- Support actions that return payloads with over 16 properties (fix ".. 4 more .." in the generated type).
|
|
41
70
|
|
|
42
71
|
## 0.7.1 - 2021-04-30
|
|
43
|
-
|
|
72
|
+
|
|
73
|
+
- Improve error display, condense logs
|
|
44
74
|
|
|
45
75
|
## 0.7.0 - 2021-04-26
|
|
46
|
-
|
|
47
|
-
-
|
|
76
|
+
|
|
77
|
+
- Fix various bugs from last version.
|
|
78
|
+
- Run with `--no-import` to skip automatically adding imports to logic types.
|
|
48
79
|
|
|
49
80
|
## 0.6.2 - 2021-04-25
|
|
50
|
-
|
|
51
|
-
-
|
|
52
|
-
-
|
|
81
|
+
|
|
82
|
+
- Automatically add `import { logicType } from './logicType'` statements
|
|
83
|
+
- Automatically add the type to `kea<logicType>()`
|
|
84
|
+
- 0.6.0 and 0.6.1 had some bugs, don't use.
|
|
53
85
|
|
|
54
86
|
## 0.5.4 - 2021-03-30
|
|
55
|
-
|
|
87
|
+
|
|
88
|
+
- Support reducers with selectors as defaults
|
|
56
89
|
|
|
57
90
|
## 0.5.3 - 2021-02-23
|
|
58
|
-
|
|
59
|
-
-
|
|
60
|
-
-
|
|
91
|
+
|
|
92
|
+
- Fix type bug with selectors
|
|
93
|
+
- Skip first comment line in generated types when comparing for overwrites
|
|
94
|
+
- Update deps
|
|
61
95
|
|
|
62
96
|
## 0.5.2 - 2021-02-23
|
|
63
|
-
|
|
97
|
+
|
|
98
|
+
- Update and clean up copy
|
|
64
99
|
|
|
65
100
|
## 0.5.1 - 2021-01-22
|
|
66
|
-
|
|
101
|
+
|
|
102
|
+
- Fix `kea-typegen write` recursive updates
|
|
67
103
|
|
|
68
104
|
## 0.5.0 - 2021-01-22
|
|
69
|
-
|
|
70
|
-
-
|
|
105
|
+
|
|
106
|
+
- Fix "Record<...>" style shortened types in selectors
|
|
107
|
+
- Add names to selectors
|
|
71
108
|
|
|
72
109
|
## 0.4.0 - 2020-12-29
|
|
73
|
-
|
|
110
|
+
|
|
111
|
+
- Fixed support for TypeScript 4.1
|
package/dist/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "kea-typegen",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.3.0",
|
|
4
4
|
"description": "Generate type definitions for kea logic",
|
|
5
5
|
"scripts": {
|
|
6
6
|
"start": "ts-node ./src/cli/typegen.ts",
|
|
@@ -11,6 +11,7 @@
|
|
|
11
11
|
"test": "jest",
|
|
12
12
|
"samples:check": "ts-node ./src/cli/typegen.ts check -c ./samples/tsconfig.json",
|
|
13
13
|
"samples:write": "ts-node ./src/cli/typegen.ts write -c ./samples/tsconfig.json",
|
|
14
|
+
"samples:write:paths": "ts-node ./src/cli/typegen.ts write -c ./samples/tsconfig.json --write-paths",
|
|
14
15
|
"samples:watch": "ts-node ./src/cli/typegen.ts watch -c ./samples/tsconfig.json",
|
|
15
16
|
"samples:write:posthog": "ts-node ./src/cli/typegen.ts write -c ../../PostHog/posthog/tsconfig.json",
|
|
16
17
|
"form-plugin:build": "cd form-plugin && yarn build && cd ..",
|
package/dist/src/cli/typegen.js
CHANGED
|
@@ -30,6 +30,7 @@ yargs
|
|
|
30
30
|
})
|
|
31
31
|
.option('quiet', { alias: 'q', describe: 'Write nothing to stdout', type: 'boolean' })
|
|
32
32
|
.option('no-import', { describe: 'Do not automatically import generated types in logic files', type: 'boolean' })
|
|
33
|
+
.option('write-paths', { describe: 'Write paths into logic files that have none', type: 'boolean' })
|
|
33
34
|
.option('verbose', { describe: 'Slightly more verbose output log', type: 'boolean' })
|
|
34
35
|
.demandCommand()
|
|
35
36
|
.help()
|
|
@@ -43,6 +44,7 @@ function parsedToAppOptions(parsedOptions) {
|
|
|
43
44
|
quiet: parsedOptions.quiet,
|
|
44
45
|
verbose: parsedOptions.verbose,
|
|
45
46
|
noImport: parsedOptions.noImport,
|
|
47
|
+
writePaths: parsedOptions.writePaths,
|
|
46
48
|
log: parsedOptions.quiet ? () => null : console.log.bind(console),
|
|
47
49
|
};
|
|
48
50
|
return appOptions;
|
|
@@ -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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"}
|
|
@@ -4,7 +4,7 @@ export declare function runThroughPrettier(sourceText: string, filePath: string)
|
|
|
4
4
|
export declare function printToFiles(program: ts.Program, appOptions: AppOptions, parsedLogics: ParsedLogic[]): {
|
|
5
5
|
filesToWrite: number;
|
|
6
6
|
writtenFiles: number;
|
|
7
|
-
|
|
7
|
+
filesToModify: number;
|
|
8
8
|
};
|
|
9
9
|
export declare function nodeToString(node: ts.Node): string;
|
|
10
10
|
export declare function parsedLogicToTypeString(parsedLogic: ParsedLogic, appOptions?: AppOptions): string;
|
package/dist/src/print/print.js
CHANGED
|
@@ -24,7 +24,7 @@ const printReducerOptions_1 = require("./printReducerOptions");
|
|
|
24
24
|
const printEvents_1 = require("./printEvents");
|
|
25
25
|
const printSharedListeners_1 = require("./printSharedListeners");
|
|
26
26
|
const printListeners_1 = require("./printListeners");
|
|
27
|
-
const
|
|
27
|
+
const write_1 = require("../write/write");
|
|
28
28
|
const printInternalExtraInput_1 = require("./printInternalExtraInput");
|
|
29
29
|
function runThroughPrettier(sourceText, filePath) {
|
|
30
30
|
const options = prettier.resolveConfig.sync(filePath);
|
|
@@ -55,7 +55,7 @@ function printToFiles(program, appOptions, parsedLogics) {
|
|
|
55
55
|
}
|
|
56
56
|
let writtenFiles = 0;
|
|
57
57
|
let filesToWrite = 0;
|
|
58
|
-
let
|
|
58
|
+
let filesToModify = 0;
|
|
59
59
|
Object.entries(groupedByFile).forEach(([fileName, parsedLogics]) => {
|
|
60
60
|
var _a;
|
|
61
61
|
const typeFileName = parsedLogics[0].typeFileName;
|
|
@@ -112,29 +112,41 @@ function printToFiles(program, appOptions, parsedLogics) {
|
|
|
112
112
|
log(`🤷 Unchanged: ${path.relative(process.cwd(), typeFileName)}`);
|
|
113
113
|
}
|
|
114
114
|
}
|
|
115
|
-
const
|
|
115
|
+
const parsedLogicNeedsTypeImport = (pl) => (pl.logicTypeImported === false ||
|
|
116
116
|
pl.logicTypeArguments.join(', ') !== [...pl.typeReferencesInLogicInput].sort().join(', ')) &&
|
|
117
|
-
pl.fileName.match(/\.tsx?$/)
|
|
117
|
+
pl.fileName.match(/\.tsx?$/);
|
|
118
|
+
const logicsNeedingImports = parsedLogics.filter(parsedLogicNeedsTypeImport);
|
|
118
119
|
if (logicsNeedingImports.length > 0) {
|
|
119
120
|
if (appOptions.write && !appOptions.noImport) {
|
|
120
|
-
|
|
121
|
-
|
|
121
|
+
write_1.writeTypeImports(appOptions, program, fileName, logicsNeedingImports, parsedLogics);
|
|
122
|
+
filesToModify += logicsNeedingImports.length;
|
|
122
123
|
}
|
|
123
124
|
else {
|
|
124
125
|
log(`❌ Will not write ${logicsNeedingImports.length} logic type import${logicsNeedingImports.length === 1 ? '' : 's'}`);
|
|
125
126
|
}
|
|
126
127
|
}
|
|
128
|
+
const parsedLogicNeedsPath = appOptions.writePaths ? (pl) => !pl.hasPathInLogic : () => false;
|
|
129
|
+
const logicsNeedingPaths = parsedLogics.filter(parsedLogicNeedsPath);
|
|
130
|
+
if (logicsNeedingPaths.length > 0) {
|
|
131
|
+
if (appOptions.write && !appOptions.noImport) {
|
|
132
|
+
write_1.writePaths(appOptions, program, fileName, logicsNeedingPaths);
|
|
133
|
+
filesToModify += logicsNeedingPaths.length;
|
|
134
|
+
}
|
|
135
|
+
else {
|
|
136
|
+
log(`❌ Will not write ${logicsNeedingPaths.length} logic path${logicsNeedingPaths.length === 1 ? '' : 's'}`);
|
|
137
|
+
}
|
|
138
|
+
}
|
|
127
139
|
});
|
|
128
|
-
if (writtenFiles === 0 &&
|
|
140
|
+
if (writtenFiles === 0 && filesToModify === 0) {
|
|
129
141
|
if (appOptions.write) {
|
|
130
142
|
log(`💚 ${parsedLogics.length} logic type${parsedLogics.length === 1 ? '' : 's'} up to date!`);
|
|
131
143
|
log('');
|
|
132
144
|
}
|
|
133
|
-
else if (filesToWrite > 0 ||
|
|
134
|
-
log(`🚨 Run "kea-typegen write" to save ${filesToWrite +
|
|
145
|
+
else if (filesToWrite > 0 || filesToModify > 0) {
|
|
146
|
+
log(`🚨 Run "kea-typegen write" to save ${filesToWrite + filesToModify} file${filesToWrite === 1 ? '' : 's'} to disk`);
|
|
135
147
|
}
|
|
136
148
|
}
|
|
137
|
-
return { filesToWrite, writtenFiles,
|
|
149
|
+
return { filesToWrite, writtenFiles, filesToModify };
|
|
138
150
|
}
|
|
139
151
|
exports.printToFiles = printToFiles;
|
|
140
152
|
function nodeToString(node) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"print.js","sourceRoot":"","sources":["../../../src/print/print.ts"],"names":[],"mappings":";;;AAAA,iCAAgC;AAChC,yBAAwB;AACxB,6BAA4B;AAC5B,qCAAoC;AAGpC,iDAA6C;AAC7C,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,qDAAiD;AACjD,+DAA2D;AAC3D,+CAA2C;AAC3C,iEAA6D;AAC7D,qDAAiD;AACjD,
|
|
1
|
+
{"version":3,"file":"print.js","sourceRoot":"","sources":["../../../src/print/print.ts"],"names":[],"mappings":"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"}
|
package/dist/src/typegen.js
CHANGED
|
@@ -79,7 +79,7 @@ function runTypeGen(appOptions) {
|
|
|
79
79
|
log(`🗒️ ${parsedLogics.length} logic${parsedLogics.length === 1 ? '' : 's'} found!`);
|
|
80
80
|
}
|
|
81
81
|
const response = print_1.printToFiles(program, appOptions, parsedLogics);
|
|
82
|
-
if (!appOptions.write && !appOptions.watch && (response.filesToWrite > 0 || response.
|
|
82
|
+
if (!appOptions.write && !appOptions.watch && (response.filesToWrite > 0 || response.filesToModify > 0)) {
|
|
83
83
|
process.exit(1);
|
|
84
84
|
}
|
|
85
85
|
return response;
|
|
@@ -88,8 +88,8 @@ function runTypeGen(appOptions) {
|
|
|
88
88
|
if (appOptions.write) {
|
|
89
89
|
let round = 0;
|
|
90
90
|
while ((round += 1)) {
|
|
91
|
-
const { writtenFiles,
|
|
92
|
-
if (writtenFiles === 0 &&
|
|
91
|
+
const { writtenFiles, filesToModify } = goThroughAllTheFiles(program, appOptions);
|
|
92
|
+
if (writtenFiles === 0 && filesToModify === 0) {
|
|
93
93
|
log(`👋 Finished writing files! Exiting.`);
|
|
94
94
|
process.exit(0);
|
|
95
95
|
}
|
package/dist/src/typegen.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"typegen.js","sourceRoot":"","sources":["../../src/typegen.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"typegen.js","sourceRoot":"","sources":["../../src/typegen.ts"],"names":[],"mappings":"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"}
|
package/dist/src/types.d.ts
CHANGED
|
@@ -32,6 +32,8 @@ export interface ParsedLogic {
|
|
|
32
32
|
logicTypeImported: boolean;
|
|
33
33
|
path: string[];
|
|
34
34
|
pathString: string;
|
|
35
|
+
hasPathInLogic: boolean;
|
|
36
|
+
hasKeyInLogic: boolean;
|
|
35
37
|
logicTypeArguments: string[];
|
|
36
38
|
constants: string[];
|
|
37
39
|
events: Record<string, boolean>;
|
|
@@ -62,6 +64,7 @@ export interface AppOptions {
|
|
|
62
64
|
quiet?: boolean;
|
|
63
65
|
verbose?: boolean;
|
|
64
66
|
noImport?: boolean;
|
|
67
|
+
writePaths?: boolean;
|
|
65
68
|
log: (message: string) => void;
|
|
66
69
|
}
|
|
67
70
|
export interface VisitKeaPropertyArguments {
|
package/dist/src/visit/visit.js
CHANGED
|
@@ -175,9 +175,11 @@ function visitKeaCalls(checker, parsedLogics, sourceFile, appOptions, pluginModu
|
|
|
175
175
|
propsType: undefined,
|
|
176
176
|
path: pathString.split('.'),
|
|
177
177
|
pathString: pathString,
|
|
178
|
+
hasKeyInLogic: false,
|
|
179
|
+
hasPathInLogic: false,
|
|
178
180
|
typeReferencesToImportFromFiles: {},
|
|
179
181
|
typeReferencesInLogicInput: new Set(),
|
|
180
|
-
extraInput: {}
|
|
182
|
+
extraInput: {},
|
|
181
183
|
};
|
|
182
184
|
const input = node.parent.arguments[0];
|
|
183
185
|
for (const inputProperty of input.properties) {
|
|
@@ -189,6 +191,12 @@ function visitKeaCalls(checker, parsedLogics, sourceFile, appOptions, pluginModu
|
|
|
189
191
|
continue;
|
|
190
192
|
}
|
|
191
193
|
const name = symbol.getName();
|
|
194
|
+
if (name === 'path') {
|
|
195
|
+
parsedLogic.hasPathInLogic = true;
|
|
196
|
+
}
|
|
197
|
+
if (name === 'key') {
|
|
198
|
+
parsedLogic.hasKeyInLogic = true;
|
|
199
|
+
}
|
|
192
200
|
let type = checker.getTypeOfSymbolAtLocation(symbol, symbol.valueDeclaration);
|
|
193
201
|
let typeNode = type ? checker.typeToTypeNode(type, undefined, undefined) : null;
|
|
194
202
|
if (typeNode && ts.isFunctionTypeNode(typeNode)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"visit.js","sourceRoot":"","sources":["../../../src/visit/visit.ts"],"names":[],"mappings":";;;AAAA,iCAAgC;AAChC,6BAA4B;AAE5B,oCAOiB;AACjB,iDAA6C;AAC7C,mDAA+C;AAC/C,qDAAiD;AACjD,iDAA6C;AAC7C,iDAA6C;AAC7C,2DAAuD;AACvD,6CAAyC;AACzC,yCAAqC;AACrC,2CAAuC;AACvC,qDAAiD;AACjD,qDAAiD;AACjD,+CAA2C;AAC3C,mDAA+C;AAC/C,iEAA6D;AAC7D,2DAAmD;AAEnD,MAAM,cAAc,GAAG;IACnB,OAAO,EAAE,2BAAY;IACrB,OAAO,EAAE,2BAAY;IACrB,SAAS,EAAE,+BAAc;IACzB,QAAQ,EAAE,6BAAa;IACvB,MAAM,EAAE,yBAAW;IACnB,GAAG,EAAE,mBAAQ;IACb,SAAS,EAAE,+BAAc;IACzB,OAAO,EAAE,2BAAY;IACrB,IAAI,EAAE,qBAAS;IACf,KAAK,EAAE,uBAAU;IACjB,QAAQ,EAAE,6BAAa;IACvB,SAAS,EAAE,+BAAc;IACzB,eAAe,EAAE,2CAAoB;IACrC,YAAY,EAAE,qCAAiB;CAClC,CAAA;AAED,SAAgB,YAAY,CAAC,OAAmB,EAAE,UAAuB;IACrE,MAAM,OAAO,GAAG,OAAO,CAAC,cAAc,EAAE,CAAA;IACxC,MAAM,YAAY,GAAkB,EAAE,CAAA;IACtC,MAAM,aAAa,GAAmB,EAAE,CAAA;IAExC,KAAK,MAAM,UAAU,IAAI,OAAO,CAAC,cAAc,EAAE,EAAE;QAC/C,IAAI,CAAC,UAAU,CAAC,iBAAiB,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;YAC3E,EAAE,CAAC,YAAY,CAAC,UAAU,EAAE,iBAAiB,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC,CAAA;SACzE;KACJ;IAED,KAAK,MAAM,UAAU,IAAI,OAAO,CAAC,cAAc,EAAE,EAAE;QAC/C,IAAI,CAAC,UAAU,CAAC,iBAAiB,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;YAC3E,IAAI,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,OAAO,EAAE;gBACrB,UAAU,CAAC,GAAG,CAAC,gBAAgB,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAA;aACtF;YACD,EAAE,CAAC,YAAY,CAAC,UAAU,EAAE,aAAa,CAAC,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,UAAU,EAAE,aAAa,CAAC,CAAC,CAAA;SAC3G;KACJ;IAED,OAAO,YAAY,CAAA;AACvB,CAAC;AArBD,oCAqBC;AAED,SAAgB,iBAAiB,CAAC,OAAuB,EAAE,aAA6B;IACpF,OAAO,SAAS,KAAK,CAAC,IAAa;;QAE/B,IACI,CAAC,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC;YACtB,CAAC,IAAI,CAAC,MAAM;YACZ,CAAC,EAAE,CAAC,gBAAgB,CAAC,IAAI,CAAC,MAAM,CAAC;YACjC,IAAI,CAAC,OAAO,EAAE,KAAK,cAAc,EACnC;YACE,EAAE,CAAC,YAAY,CAAC,IAAI,EAAE,KAAK,CAAC,CAAA;YAC5B,OAAM;SACT;QAGD,MAAM,YAAY,GAAG,MAAA,IAAI,CAAC,MAAM,CAAC,SAAS,0CAAG,CAAC,CAAC,CAAA;QAC/C,IAAI,EAAE,CAAC,yBAAyB,CAAC,YAAY,CAAC,EAAE;YAC5C,KAAK,MAAM,IAAI,IAAI,YAAY,CAAC,UAAU,EAAE;gBACxC,IAAI,EAAE,CAAC,oBAAoB,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,SAAS,EAAE;oBACpE,IAAI,EAAE,CAAC,wBAAwB,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE;wBAE/C,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,WAAW,CAAC,QAAQ,EAAE;4BAC5C,MAAM,UAAU,GAAG,EAAE,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,MAAM,CAAA;4BAC3E,MAAM,UAAU,GAAG,UAAU,CAAC,OAAO,EAAE,CAAA;4BACvC,MAAM,MAAM,GAAG,OAAO,CAAC,mBAAmB,CAAC,UAAU,CAAC,CAAA;4BAEtD,IAAI,MAAM,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,KAAK,UAAU,CAAC,EAAE;gCAClE,KAAK,IAAI,WAAW,IAAI,MAAM,CAAC,eAAe,EAAE,EAAE;oCAC9C,IAAI,OAAO,GAAY,WAAW,CAAA;oCAClC,OAAO,OAAO,EAAE;wCAEZ,IAAI,EAAE,CAAC,mBAAmB,CAAC,OAAO,CAAC,EAAE;4CACjC,MAAM,QAAQ,GAAG,uCAA+B,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;4CAClE,IAAI,CAAC,QAAQ,EAAE;gDACX,MAAK;6CACR;4CACD,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;4CAErC,KAAK,MAAM,QAAQ,IAAI,CAAC,YAAY,EAAE,YAAY,CAAC,EAAE;gDACjD,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAA;gDAElD,IAAI;oDACA,IAAI,aAAa,GAAG,OAAO,CAAC,WAAW,CAAC,CAAA;oDAExC,IAAI,aAAa,IAAI,aAAa,CAAC,OAAO,EAAE;wDACxC,aAAa,GAAG,aAAa,CAAC,OAAO,CAAA;qDACxC;oDAED,IAAI,OAAO,CAAA,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,gBAAgB,CAAA,KAAK,WAAW,EAAE;wDACxD,aAAa,CAAC,IAAI,CAAC;4DACf,IAAI,EAAE,UAAU;4DAChB,IAAI,EAAE,WAAW;4DACjB,gBAAgB,EAAE,aAAa,CAAC,gBAAgB;yDACnD,CAAC,CAAA;wDACF,MAAK;qDACR;iDACJ;gDAAC,OAAO,KAAK,EAAE;oDACZ,IAAI,KAAK,CAAC,IAAI,KAAK,kBAAkB,EAAE;wDACnC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;qDACvB;iDACJ;6CACJ;yCACJ;wCACD,OAAO,GAAG,OAAO,CAAC,MAAM,CAAA;qCAC3B;iCACJ;6BACJ;yBACJ;qBACJ;iBACJ;aACJ;SACJ;IACL,CAAC,CAAA;AACL,CAAC;AAxED,8CAwEC;AAED,SAAgB,aAAa,CACzB,OAAuB,EACvB,YAA2B,EAC3B,UAAyB,EACzB,UAAsB,EACtB,aAA6B;IAE7B,OAAO,SAAS,KAAK,CAAC,IAAa;;QAC/B,IAAI,CAAC,iBAAS,CAAC,IAAI,EAAE,OAAO,CAAC,EAAE;YAC3B,EAAE,CAAC,YAAY,CAAC,IAAI,EAAE,KAAK,CAAC,CAAA;YAC5B,OAAM;SACT;QAED,IAAI,SAAS,GAAG,OAAO,CAAA;QACvB,IAAI,EAAE,CAAC,gBAAgB,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,qBAAqB,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE;YAClF,SAAS,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,CAAA;SAChD;QAED,MAAM,aAAa,GAAG,GAAG,SAAS,MAAM,CAAA;QAExC,IAAI,kBAAkB,GAAG,EAAE,CAAA;QAC3B,IAAI,iBAAiB,GAAG,KAAK,CAAA;QAG7B,MAAM,gBAAgB,GAAG,EAAE,CAAC,gBAAgB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,CAAA;QAC1F,MAAM,eAAe,GAAG,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAG,CAAC,CAAC,CAAA;QAE7C,MAAM,UAAU,GAAG,0BAAkB,CAAC,UAAU,EAAE,UAAU,CAAC,QAAQ,CAAC,CAAA;QACtE,IAAI,YAAY,GAAG,UAAU,CAAC,QAAQ,CAAC,OAAO,CAAC,YAAY,EAAE,SAAS,CAAC,CAAA;QAEvE,IAAI,CAAA,MAAA,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,QAAQ,0CAAE,WAAW,MAAK,aAAa,EAAE;YAG1D,IAAI,eAAe,CAAC,aAAa,IAAI,eAAe,CAAC,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE;gBAC3E,kBAAkB,GAAI,eAAe,CAAC,aAA2B,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,IAAI,EAAE,CAAC,CAAA;aACvG;YAGD,MAAM,MAAM,GAAG,OAAO,CAAC,mBAAmB,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAA;YACpE,IAAI,MAAM,EAAE;gBACR,MAAM,WAAW,GAAG,MAAM,CAAC,eAAe,EAAE,CAAC,CAAC,CAAC,CAAA;gBAE/C,IAAI,EAAE,CAAC,iBAAiB,CAAC,WAAW,CAAC,EAAE;oBACnC,MAAM,QAAQ,GAAG,qCAA6B,CAAC,WAAW,EAAE,OAAO,CAAC,CAAA;oBACpE,iBAAiB,GAAG,QAAQ,KAAK,YAAY,CAAA;iBAChD;aACJ;SACJ;QAED,IAAI,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,QAAQ,MAAI,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,SAAS,CAAA,EAAE;YAC/C,MAAM,oBAAoB,GAAG,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAA;YAC7E,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,SAAS,EAAE,oBAAoB,CAAC,CAAA;SAC1E;QAED,MAAM,WAAW,GAAgB;YAC7B,OAAO;YACP,IAAI;YACJ,SAAS;YACT,iBAAiB;YACjB,aAAa;YACb,kBAAkB;YAClB,QAAQ,EAAE,UAAU,CAAC,QAAQ;YAC7B,YAAY;YACZ,OAAO,EAAE,EAAE;YACX,QAAQ,EAAE,EAAE;YACZ,SAAS,EAAE,EAAE;YACb,SAAS,EAAE,EAAE;YACb,SAAS,EAAE,EAAE;YACb,eAAe,EAAE,EAAE;YACnB,MAAM,EAAE,EAAE;YACV,YAAY,EAAE,EAAE;YAChB,OAAO,EAAE,SAAS;YAClB,SAAS,EAAE,SAAS;YACpB,IAAI,EAAE,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC;YAC3B,UAAU,EAAE,UAAU;YACtB,+BAA+B,EAAE,EAAE;YACnC,0BAA0B,EAAE,IAAI,GAAG,EAAE;YACrC,UAAU,EAAE,EAAE;SACjB,CAAA;QAED,MAAM,KAAK,GAAI,IAAI,CAAC,MAA4B,CAAC,SAAS,CAAC,CAAC,CAA+B,CAAA;QAE3F,KAAK,MAAM,aAAa,IAAI,KAAK,CAAC,UAAU,EAAE;YAC1C,IAAI,CAAC,EAAE,CAAC,oBAAoB,CAAC,aAAa,CAAC,EAAE;gBACzC,SAAQ;aACX;YAED,MAAM,MAAM,GAAG,OAAO,CAAC,mBAAmB,CAAC,aAAa,CAAC,IAAI,CAAC,CAAA;YAC9D,IAAI,CAAC,MAAM,EAAE;gBACT,SAAQ;aACX;YAED,MAAM,IAAI,GAAG,MAAM,CAAC,OAAO,EAAE,CAAA;
|
|
1
|
+
{"version":3,"file":"visit.js","sourceRoot":"","sources":["../../../src/visit/visit.ts"],"names":[],"mappings":"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"}
|
|
@@ -30,7 +30,7 @@ function visitLoaders(type, inputProperty, parsedLogic) {
|
|
|
30
30
|
if (objectLiteral) {
|
|
31
31
|
;
|
|
32
32
|
(objectLiteral.properties || []).forEach((property) => {
|
|
33
|
-
var _a, _b, _c;
|
|
33
|
+
var _a, _b, _c, _d, _e;
|
|
34
34
|
const loaderActionName = (_a = checker.getSymbolAtLocation(property.name)) === null || _a === void 0 ? void 0 : _a.getName();
|
|
35
35
|
if (loaderActionName === '__default') {
|
|
36
36
|
return;
|
|
@@ -72,9 +72,11 @@ function visitLoaders(type, inputProperty, parsedLogic) {
|
|
|
72
72
|
utils_1.gatherImports(returnTypeNode, checker, parsedLogic);
|
|
73
73
|
const successParameters = [
|
|
74
74
|
ts.createParameter(undefined, undefined, undefined, ts.createIdentifier(loaderName), undefined, returnTypeNode, undefined),
|
|
75
|
+
ts.createParameter(undefined, undefined, undefined, ts.createIdentifier('payload'), ts.createToken(ts.SyntaxKind.QuestionToken), (_d = parsedLogic.actions.find((a) => a.name === loaderActionName)) === null || _d === void 0 ? void 0 : _d.returnTypeNode, undefined),
|
|
75
76
|
];
|
|
76
77
|
const successReturnTypeNode = ts.createTypeLiteralNode([
|
|
77
78
|
ts.createPropertySignature(undefined, ts.createIdentifier(loaderName), undefined, returnTypeNode, undefined),
|
|
79
|
+
ts.createPropertySignature(undefined, ts.createIdentifier('payload'), ts.createToken(ts.SyntaxKind.QuestionToken), (_e = parsedLogic.actions.find((a) => a.name === loaderActionName)) === null || _e === void 0 ? void 0 : _e.returnTypeNode, undefined),
|
|
78
80
|
]);
|
|
79
81
|
parsedLogic.actions.push({
|
|
80
82
|
name: `${loaderActionName}Success`,
|
|
@@ -85,9 +87,11 @@ function visitLoaders(type, inputProperty, parsedLogic) {
|
|
|
85
87
|
if (!parsedLogic.actions.find(({ name }) => name === `${loaderActionName}Failure`)) {
|
|
86
88
|
const failureParameters = [
|
|
87
89
|
ts.createParameter(undefined, undefined, undefined, ts.createIdentifier('error'), undefined, ts.createKeywordTypeNode(ts.SyntaxKind.StringKeyword), undefined),
|
|
90
|
+
ts.createParameter(undefined, undefined, undefined, ts.createIdentifier('errorObject'), ts.createToken(ts.SyntaxKind.QuestionToken), ts.createKeywordTypeNode(ts.SyntaxKind.AnyKeyword), undefined),
|
|
88
91
|
];
|
|
89
92
|
const failureReturnTypeNode = ts.createTypeLiteralNode([
|
|
90
93
|
ts.createPropertySignature(undefined, ts.createIdentifier('error'), undefined, ts.createKeywordTypeNode(ts.SyntaxKind.StringKeyword), undefined),
|
|
94
|
+
ts.createPropertySignature(undefined, ts.createIdentifier('errorObject'), ts.createToken(ts.SyntaxKind.QuestionToken), ts.createKeywordTypeNode(ts.SyntaxKind.AnyKeyword), undefined),
|
|
91
95
|
]);
|
|
92
96
|
parsedLogic.actions.push({
|
|
93
97
|
name: `${loaderActionName}Failure`,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"visitLoaders.js","sourceRoot":"","sources":["../../../src/visit/visitLoaders.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"visitLoaders.js","sourceRoot":"","sources":["../../../src/visit/visitLoaders.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,4 @@
|
|
|
1
|
+
import { AppOptions, ParsedLogic } from '../types';
|
|
2
|
+
import * as ts from 'typescript';
|
|
3
|
+
export declare function writeTypeImports(appOptions: AppOptions, program: ts.Program, filename: string, parsedLogics: ParsedLogic[], allParsedLogics: ParsedLogic[]): void;
|
|
4
|
+
export declare function writePaths(appOptions: AppOptions, program: ts.Program, filename: string, parsedLogics: ParsedLogic[]): void;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.writePaths = exports.writeTypeImports = void 0;
|
|
4
4
|
const ts = require("typescript");
|
|
5
5
|
const utils_1 = require("../utils");
|
|
6
6
|
const fs = require("fs");
|
|
@@ -27,7 +27,7 @@ function addBackNewlines(oldText, newText) {
|
|
|
27
27
|
}
|
|
28
28
|
return diff.applyPatch(oldText, patch);
|
|
29
29
|
}
|
|
30
|
-
function
|
|
30
|
+
function writeTypeImports(appOptions, program, filename, parsedLogics, allParsedLogics) {
|
|
31
31
|
const { log } = appOptions;
|
|
32
32
|
const sourceFile = program.getSourceFile(filename);
|
|
33
33
|
const checker = program.getTypeChecker();
|
|
@@ -50,7 +50,9 @@ function writeLogicTypeImports(appOptions, program, filename, parsedLogics, allP
|
|
|
50
50
|
const { logicTypeName, typeReferencesInLogicInput } = parsedLogicMapByNode.get(node.expression);
|
|
51
51
|
return ts.createCall(node.expression, [
|
|
52
52
|
ts.createTypeReferenceNode(ts.createIdentifier(logicTypeName), typeReferencesInLogicInput.size > 0
|
|
53
|
-
? [...typeReferencesInLogicInput.values()]
|
|
53
|
+
? [...typeReferencesInLogicInput.values()]
|
|
54
|
+
.sort()
|
|
55
|
+
.map((type) => ts.createTypeReferenceNode(ts.createIdentifier(type), undefined))
|
|
54
56
|
: undefined),
|
|
55
57
|
], node.arguments);
|
|
56
58
|
}
|
|
@@ -98,6 +100,50 @@ function writeLogicTypeImports(appOptions, program, filename, parsedLogics, allP
|
|
|
98
100
|
return ts.visitNode(rootNode, visit);
|
|
99
101
|
};
|
|
100
102
|
};
|
|
103
|
+
writeFile(sourceFile, transformer, filename);
|
|
104
|
+
log(`🔥 Import added: ${path.relative(process.cwd(), filename)}`);
|
|
105
|
+
}
|
|
106
|
+
exports.writeTypeImports = writeTypeImports;
|
|
107
|
+
function writePaths(appOptions, program, filename, parsedLogics) {
|
|
108
|
+
const { log } = appOptions;
|
|
109
|
+
const sourceFile = program.getSourceFile(filename);
|
|
110
|
+
const checker = program.getTypeChecker();
|
|
111
|
+
const parsedLogicMapByNode = new Map();
|
|
112
|
+
for (const parsedLogic of parsedLogics) {
|
|
113
|
+
parsedLogicMapByNode.set(parsedLogic.node, parsedLogic);
|
|
114
|
+
}
|
|
115
|
+
const transformer = (context) => {
|
|
116
|
+
return (rootNode) => {
|
|
117
|
+
function visit(node) {
|
|
118
|
+
node = ts.visitEachChild(node, visit, context);
|
|
119
|
+
if (ts.isCallExpression(node) &&
|
|
120
|
+
utils_1.isKeaCall(node.expression, checker) &&
|
|
121
|
+
parsedLogicMapByNode.has(node.expression)) {
|
|
122
|
+
const { path, hasKeyInLogic } = parsedLogicMapByNode.get(node.expression);
|
|
123
|
+
return ts.createCall(node.expression, node.typeArguments, node.arguments.map((argument, i) => i === 0 && ts.isObjectLiteralExpression(argument)
|
|
124
|
+
? ts.createObjectLiteral([
|
|
125
|
+
hasKeyInLogic
|
|
126
|
+
? ts.createPropertyAssignment(ts.createIdentifier('path'), ts.createArrowFunction(undefined, undefined, [
|
|
127
|
+
ts.createParameter(undefined, undefined, undefined, ts.createIdentifier('key'), undefined, undefined, undefined),
|
|
128
|
+
], undefined, ts.createToken(ts.SyntaxKind.EqualsGreaterThanToken), ts.createArrayLiteral([
|
|
129
|
+
...path.map((str) => ts.createStringLiteral(str)),
|
|
130
|
+
ts.createIdentifier('key'),
|
|
131
|
+
], false)))
|
|
132
|
+
: ts.createPropertyAssignment(ts.createIdentifier('path'), ts.createArrayLiteral(path.map((str) => ts.createStringLiteral(str)), false)),
|
|
133
|
+
...argument.properties,
|
|
134
|
+
], true)
|
|
135
|
+
: argument));
|
|
136
|
+
}
|
|
137
|
+
return node;
|
|
138
|
+
}
|
|
139
|
+
return ts.visitNode(rootNode, visit);
|
|
140
|
+
};
|
|
141
|
+
};
|
|
142
|
+
writeFile(sourceFile, transformer, filename);
|
|
143
|
+
log(`🔥 Path added: ${path.relative(process.cwd(), filename)}`);
|
|
144
|
+
}
|
|
145
|
+
exports.writePaths = writePaths;
|
|
146
|
+
function writeFile(sourceFile, transformer, filename) {
|
|
101
147
|
const printer = ts.createPrinter();
|
|
102
148
|
const result = ts.transform(sourceFile, [transformer]);
|
|
103
149
|
const transformedSourceFile = result.transformed[0];
|
|
@@ -107,7 +153,5 @@ function writeLogicTypeImports(appOptions, program, filename, parsedLogics, allP
|
|
|
107
153
|
const oldText = sourceFile.getText();
|
|
108
154
|
const newestText = addBackNewlines(oldText, newText);
|
|
109
155
|
fs.writeFileSync(filename, newestText);
|
|
110
|
-
log(`🔥 Import added: ${path.relative(process.cwd(), filename)}`);
|
|
111
156
|
}
|
|
112
|
-
|
|
113
|
-
//# sourceMappingURL=writeLogicTypeImports.js.map
|
|
157
|
+
//# sourceMappingURL=write.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"write.js","sourceRoot":"","sources":["../../../src/write/write.ts"],"names":[],"mappings":"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"}
|