kea-typegen 1.3.0 → 1.4.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 +6 -0
- package/dist/package.json +14 -14
- package/dist/src/__tests__/e2e/actions.js +4 -4
- package/dist/src/__tests__/e2e/actions.js.map +1 -1
- package/dist/src/__tests__/e2e/connect.js +6 -6
- package/dist/src/__tests__/e2e/connect.js.map +1 -1
- package/dist/src/__tests__/e2e/loaders.js +3 -3
- package/dist/src/__tests__/e2e/loaders.js.map +1 -1
- package/dist/src/__tests__/e2e/reducers.js +4 -4
- package/dist/src/__tests__/e2e/reducers.js.map +1 -1
- package/dist/src/__tests__/e2e/selectors.js +3 -3
- package/dist/src/__tests__/e2e/selectors.js.map +1 -1
- package/dist/src/__tests__/utils.js +7 -7
- package/dist/src/__tests__/utils.js.map +1 -1
- package/dist/src/cli/typegen.js +3 -3
- package/dist/src/cli/typegen.js.map +1 -1
- package/dist/src/print/print.d.ts +4 -4
- package/dist/src/print/print.js +35 -35
- package/dist/src/print/print.js.map +1 -1
- package/dist/src/print/printActionCreators.d.ts +1 -2
- package/dist/src/print/printActionCreators.js +7 -7
- package/dist/src/print/printActionCreators.js.map +1 -1
- package/dist/src/print/printActionKeys.d.ts +1 -2
- package/dist/src/print/printActionKeys.js +4 -4
- package/dist/src/print/printActionKeys.js.map +1 -1
- package/dist/src/print/printActionTypes.d.ts +1 -2
- package/dist/src/print/printActionTypes.js +4 -4
- package/dist/src/print/printActionTypes.js.map +1 -1
- package/dist/src/print/printActions.d.ts +1 -2
- package/dist/src/print/printActions.js +4 -4
- package/dist/src/print/printActions.js.map +1 -1
- package/dist/src/print/printConstants.d.ts +1 -2
- package/dist/src/print/printConstants.js +2 -2
- package/dist/src/print/printConstants.js.map +1 -1
- package/dist/src/print/printDefaults.d.ts +1 -2
- package/dist/src/print/printDefaults.js +3 -3
- package/dist/src/print/printDefaults.js.map +1 -1
- package/dist/src/print/printEvents.d.ts +1 -2
- package/dist/src/print/printEvents.js +3 -3
- package/dist/src/print/printEvents.js.map +1 -1
- package/dist/src/print/printInternalExtraInput.d.ts +1 -2
- package/dist/src/print/printInternalExtraInput.js +8 -8
- package/dist/src/print/printInternalExtraInput.js.map +1 -1
- package/dist/src/print/printInternalReducerActions.d.ts +1 -2
- package/dist/src/print/printInternalReducerActions.js +3 -4
- package/dist/src/print/printInternalReducerActions.js.map +1 -1
- package/dist/src/print/printInternalSelectorTypes.d.ts +1 -2
- package/dist/src/print/printInternalSelectorTypes.js +3 -3
- package/dist/src/print/printInternalSelectorTypes.js.map +1 -1
- package/dist/src/print/printKey.d.ts +1 -2
- package/dist/src/print/printKey.js +2 -2
- package/dist/src/print/printKey.js.map +1 -1
- package/dist/src/print/printListeners.d.ts +1 -2
- package/dist/src/print/printListeners.js +9 -9
- package/dist/src/print/printListeners.js.map +1 -1
- package/dist/src/print/printProps.d.ts +1 -2
- package/dist/src/print/printProps.js +6 -5
- package/dist/src/print/printProps.js.map +1 -1
- package/dist/src/print/printReducer.d.ts +1 -2
- package/dist/src/print/printReducer.js +6 -6
- package/dist/src/print/printReducer.js.map +1 -1
- package/dist/src/print/printReducerOptions.d.ts +1 -2
- package/dist/src/print/printReducerOptions.js +3 -3
- package/dist/src/print/printReducerOptions.js.map +1 -1
- package/dist/src/print/printReducers.d.ts +1 -2
- package/dist/src/print/printReducers.js +7 -7
- package/dist/src/print/printReducers.js.map +1 -1
- package/dist/src/print/printSelector.d.ts +1 -2
- package/dist/src/print/printSelector.js +4 -4
- package/dist/src/print/printSelector.js.map +1 -1
- package/dist/src/print/printSelectors.d.ts +1 -2
- package/dist/src/print/printSelectors.js +6 -6
- package/dist/src/print/printSelectors.js.map +1 -1
- package/dist/src/print/printSharedListeners.d.ts +1 -2
- package/dist/src/print/printSharedListeners.js +11 -11
- package/dist/src/print/printSharedListeners.js.map +1 -1
- package/dist/src/print/printValues.d.ts +1 -2
- package/dist/src/print/printValues.js +3 -3
- package/dist/src/print/printValues.js.map +1 -1
- package/dist/src/typegen.js +2 -2
- package/dist/src/typegen.js.map +1 -1
- package/dist/src/utils.js +15 -15
- package/dist/src/utils.js.map +1 -1
- package/dist/src/visit/__tests__/visit.js +2 -2
- package/dist/src/visit/__tests__/visit.js.map +1 -1
- package/dist/src/visit/visit.js +13 -13
- package/dist/src/visit/visit.js.map +1 -1
- package/dist/src/visit/visitActions.d.ts +2 -2
- package/dist/src/visit/visitActions.js +13 -11
- package/dist/src/visit/visitActions.js.map +1 -1
- package/dist/src/visit/visitConnect.js +4 -4
- package/dist/src/visit/visitConnect.js.map +1 -1
- package/dist/src/visit/visitDefaults.js +1 -1
- package/dist/src/visit/visitDefaults.js.map +1 -1
- package/dist/src/visit/visitKey.js +2 -2
- package/dist/src/visit/visitKey.js.map +1 -1
- package/dist/src/visit/visitListeners.js +5 -5
- package/dist/src/visit/visitListeners.js.map +1 -1
- package/dist/src/visit/visitLoaders.d.ts +2 -2
- package/dist/src/visit/visitLoaders.js +27 -27
- package/dist/src/visit/visitLoaders.js.map +1 -1
- package/dist/src/visit/visitProps.js +1 -1
- package/dist/src/visit/visitProps.js.map +1 -1
- package/dist/src/visit/visitReducers.js +4 -4
- package/dist/src/visit/visitReducers.js.map +1 -1
- package/dist/src/visit/visitSelectors.js +8 -8
- package/dist/src/visit/visitSelectors.js.map +1 -1
- package/dist/src/visit/visitSharedListeners.js +5 -5
- package/dist/src/visit/visitSharedListeners.js.map +1 -1
- package/dist/src/visit/visitWindowValues.js +1 -1
- package/dist/src/visit/visitWindowValues.js.map +1 -1
- package/dist/src/write/write.js +16 -15
- package/dist/src/write/write.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/form-plugin/lib/form-plugin/src/typegen.js +16 -15
- package/form-plugin/lib/src/types.d.ts +4 -1
- package/form-plugin/package.json +1 -1
- package/form-plugin/src/typegen.ts +25 -25
- package/form-plugin/tsconfig.json +0 -1
- package/form-plugin/yarn.lock +10 -10
- package/package.json +14 -14
- package/samples/autoImportLogic.ts +9 -3
- package/samples/autoImportLogicType.ts +1 -1
- package/src/__tests__/utils.ts +5 -5
- package/src/print/print.ts +33 -19
- package/src/print/printActionCreators.ts +12 -15
- package/src/print/printActionKeys.ts +5 -6
- package/src/print/printActionTypes.ts +6 -7
- package/src/print/printActions.ts +6 -13
- package/src/print/printConstants.ts +5 -6
- package/src/print/printDefaults.ts +5 -6
- package/src/print/printEvents.ts +8 -6
- package/src/print/printInternalExtraInput.ts +12 -13
- package/src/print/printInternalReducerActions.ts +5 -12
- package/src/print/printInternalSelectorTypes.ts +7 -8
- package/src/print/printKey.ts +2 -2
- package/src/print/printListeners.ts +16 -17
- package/src/print/printProps.ts +7 -7
- package/src/print/printReducer.ts +14 -15
- package/src/print/printReducerOptions.ts +4 -5
- package/src/print/printReducers.ts +13 -14
- package/src/print/printSelector.ts +8 -9
- package/src/print/printSelectors.ts +12 -13
- package/src/print/printSharedListeners.ts +20 -21
- package/src/print/printValues.ts +5 -6
- package/src/utils.ts +14 -14
- package/src/visit/visit.ts +2 -2
- package/src/visit/visitActions.ts +12 -10
- package/src/visit/visitListeners.ts +8 -8
- package/src/visit/visitLoaders.ts +49 -43
- package/src/visit/visitReducers.ts +1 -1
- package/src/visit/visitSelectors.ts +3 -3
- package/src/visit/visitSharedListeners.ts +8 -10
- package/src/write/write.ts +29 -24
|
@@ -5,7 +5,7 @@ const ts = require("typescript");
|
|
|
5
5
|
const utils_1 = require("../utils");
|
|
6
6
|
function visitListeners(type, inputProperty, parsedLogic) {
|
|
7
7
|
var _a;
|
|
8
|
-
const getActionType = utils_1.getActionTypeCreator(parsedLogic);
|
|
8
|
+
const getActionType = (0, utils_1.getActionTypeCreator)(parsedLogic);
|
|
9
9
|
const { checker } = parsedLogic;
|
|
10
10
|
let extraActions = {};
|
|
11
11
|
let objectLiteral = inputProperty.initializer;
|
|
@@ -16,7 +16,7 @@ function visitListeners(type, inputProperty, parsedLogic) {
|
|
|
16
16
|
objectLiteral = objectLiteral.expression;
|
|
17
17
|
}
|
|
18
18
|
if (ts.isObjectLiteralExpression(objectLiteral)) {
|
|
19
|
-
extraActions = utils_1.extractImportedActions(objectLiteral, checker, parsedLogic);
|
|
19
|
+
extraActions = (0, utils_1.extractImportedActions)(objectLiteral, checker, parsedLogic);
|
|
20
20
|
if (extraActions) {
|
|
21
21
|
Object.assign(parsedLogic.extraActions, extraActions);
|
|
22
22
|
}
|
|
@@ -41,9 +41,9 @@ function visitListeners(type, inputProperty, parsedLogic) {
|
|
|
41
41
|
parsedLogic.listeners.push({
|
|
42
42
|
name: action.name,
|
|
43
43
|
payload: action.returnTypeNode,
|
|
44
|
-
action: ts.createTypeLiteralNode([
|
|
45
|
-
ts.createPropertySignature(undefined, ts.createIdentifier('type'), undefined, ts.createLiteralTypeNode(ts.createStringLiteral(getActionType(action.name)))
|
|
46
|
-
ts.createPropertySignature(undefined, ts.createIdentifier('payload'), undefined, action.returnTypeNode
|
|
44
|
+
action: ts.factory.createTypeLiteralNode([
|
|
45
|
+
ts.factory.createPropertySignature(undefined, ts.factory.createIdentifier('type'), undefined, ts.factory.createLiteralTypeNode(ts.factory.createStringLiteral(getActionType(action.name)))),
|
|
46
|
+
ts.factory.createPropertySignature(undefined, ts.factory.createIdentifier('payload'), undefined, action.returnTypeNode),
|
|
47
47
|
]),
|
|
48
48
|
});
|
|
49
49
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"visitListeners.js","sourceRoot":"","sources":["../../../src/visit/visitListeners.ts"],"names":[],"mappings":";;;AACA,iCAAgC;AAChC,oCAAuE;AAEvE,SAAgB,cAAc,CAAC,IAAa,EAAE,aAAoC,EAAE,WAAwB;;IACxG,MAAM,aAAa,GAAG,4BAAoB,
|
|
1
|
+
{"version":3,"file":"visitListeners.js","sourceRoot":"","sources":["../../../src/visit/visitListeners.ts"],"names":[],"mappings":";;;AACA,iCAAgC;AAChC,oCAAuE;AAEvE,SAAgB,cAAc,CAAC,IAAa,EAAE,aAAoC,EAAE,WAAwB;;IACxG,MAAM,aAAa,GAAG,IAAA,4BAAoB,EAAC,WAAW,CAAC,CAAA;IACvD,MAAM,EAAE,OAAO,EAAE,GAAG,WAAW,CAAA;IAC/B,IAAI,YAAY,GAAG,EAAE,CAAA;IAErB,IAAI,aAAa,GAAG,aAAa,CAAC,WAAW,CAAA;IAE7C,IAAI,EAAE,CAAC,cAAc,CAAC,aAAa,CAAC,EAAE;QAClC,aAAa,GAAI,aAAqB,CAAC,IAAI,CAAA;KAC9C;IAED,IAAI,EAAE,CAAC,yBAAyB,CAAC,aAAa,CAAC,EAAE;QAC7C,aAAa,GAAG,aAAa,CAAC,UAAU,CAAA;KAC3C;IAED,IAAI,EAAE,CAAC,yBAAyB,CAAC,aAAa,CAAC,EAAE;QAC7C,YAAY,GAAG,IAAA,8BAAsB,EAAC,aAAa,EAAE,OAAO,EAAE,WAAW,CAAC,CAAA;QAE1E,IAAI,YAAY,EAAE;YACd,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,YAAY,EAAE,YAAY,CAAC,CAAA;SACxD;KACJ;IAED,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,aAAa,EAAE,EAAE;QACzC,MAAM,IAAI,GAAG,QAAQ,CAAC,OAAO,EAAE,CAAA;QAE/B,IAAI,YAAY,CAAC,IAAI,CAAC,EAAE;YACpB,MAAM,aAAa,GAAG,YAAY,CAAC,IAAI,CAAC,CAAA;YACxC,IAAI,aAAa,IAAI,EAAE,CAAC,cAAc,CAAC,aAAa,CAAC,EAAE;gBACnD,MAAM,gBAAgB,GAAG,aAAa,CAAC,IAAI,CAAA;gBAC3C,IAAI,gBAAgB,IAAI,EAAE,CAAC,iBAAiB,CAAC,gBAAgB,CAAC,EAAE;oBAC5D,MAAM,OAAO,GAAG,MAAC,gBAAgB,CAAC,OAAO,CAAC,IAAI,CAC1C,CAAC,CAAC,EAAE,EAAE,WAAC,OAAA,CAAA,MAAC,CAAC,CAAC,IAAsB,0CAAE,WAAW,MAAK,SAAS,CAAA,EAAA,CACrC,0CAAE,IAAI,CAAA;oBAChC,IAAI,OAAO,EAAE;wBACT,WAAW,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,gBAAgB,EAAE,OAAO,EAAE,CAAC,CAAA;qBAC1E;iBACJ;aACJ;SACJ;aAAM;YACH,MAAM,MAAM,GAAG,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,CAAA;YAC/D,IAAI,MAAM,EAAE;gBACR,WAAW,CAAC,SAAS,CAAC,IAAI,CAAC;oBACvB,IAAI,EAAE,MAAM,CAAC,IAAI;oBACjB,OAAO,EAAE,MAAM,CAAC,cAAc;oBAC9B,MAAM,EAAE,EAAE,CAAC,OAAO,CAAC,qBAAqB,CAAC;wBACrC,EAAE,CAAC,OAAO,CAAC,uBAAuB,CAC9B,SAAS,EACT,EAAE,CAAC,OAAO,CAAC,gBAAgB,CAAC,MAAM,CAAC,EACnC,SAAS,EACT,EAAE,CAAC,OAAO,CAAC,qBAAqB,CAC5B,EAAE,CAAC,OAAO,CAAC,mBAAmB,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAC7D,CACJ;wBACD,EAAE,CAAC,OAAO,CAAC,uBAAuB,CAC9B,SAAS,EACT,EAAE,CAAC,OAAO,CAAC,gBAAgB,CAAC,SAAS,CAAC,EACtC,SAAS,EACT,MAAM,CAAC,cAAc,CACxB;qBACJ,CAAC;iBACL,CAAC,CAAA;aACL;SACJ;KACJ;AACL,CAAC;AAjED,wCAiEC"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
import { ParsedLogic } from '../types';
|
|
2
|
-
import
|
|
3
|
-
export declare function visitLoaders(type:
|
|
2
|
+
import { PropertyAssignment, Type } from 'typescript';
|
|
3
|
+
export declare function visitLoaders(type: Type, inputProperty: PropertyAssignment, parsedLogic: ParsedLogic): void;
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.visitLoaders = void 0;
|
|
4
|
-
const ts = require("typescript");
|
|
5
|
-
const utils_1 = require("../utils");
|
|
6
4
|
const typescript_1 = require("typescript");
|
|
5
|
+
const utils_1 = require("../utils");
|
|
6
|
+
const typescript_2 = require("typescript");
|
|
7
7
|
function visitLoaders(type, inputProperty, parsedLogic) {
|
|
8
8
|
var _a;
|
|
9
9
|
const { checker } = parsedLogic;
|
|
@@ -12,20 +12,20 @@ function visitLoaders(type, inputProperty, parsedLogic) {
|
|
|
12
12
|
const value = property.valueDeclaration.initializer;
|
|
13
13
|
let defaultValue;
|
|
14
14
|
let objectLiteral;
|
|
15
|
-
if (
|
|
15
|
+
if ((0, typescript_1.isArrayLiteralExpression)(value)) {
|
|
16
16
|
defaultValue = value.elements[0];
|
|
17
17
|
objectLiteral = value.elements[1];
|
|
18
18
|
}
|
|
19
|
-
else if (
|
|
19
|
+
else if ((0, typescript_1.isObjectLiteralExpression)(value)) {
|
|
20
20
|
defaultValue = (_a = value.properties.find((property) => { var _a; return ((_a = checker.getSymbolAtLocation(property.name)) === null || _a === void 0 ? void 0 : _a.getName()) === '__default'; })) === null || _a === void 0 ? void 0 : _a.initializer;
|
|
21
21
|
objectLiteral = value;
|
|
22
22
|
}
|
|
23
|
-
const defaultValueTypeNode = utils_1.getAndGatherTypeNodeForDefaultValue(defaultValue, checker, parsedLogic);
|
|
24
|
-
utils_1.gatherImports(defaultValueTypeNode, checker, parsedLogic);
|
|
23
|
+
const defaultValueTypeNode = (0, utils_1.getAndGatherTypeNodeForDefaultValue)(defaultValue, checker, parsedLogic);
|
|
24
|
+
(0, utils_1.gatherImports)(defaultValueTypeNode, checker, parsedLogic);
|
|
25
25
|
parsedLogic.reducers.push({ name: loaderName, typeNode: defaultValueTypeNode });
|
|
26
26
|
parsedLogic.reducers.push({
|
|
27
27
|
name: `${loaderName}Loading`,
|
|
28
|
-
typeNode:
|
|
28
|
+
typeNode: typescript_1.factory.createKeywordTypeNode(typescript_1.SyntaxKind.BooleanKeyword),
|
|
29
29
|
});
|
|
30
30
|
if (objectLiteral) {
|
|
31
31
|
;
|
|
@@ -36,14 +36,14 @@ function visitLoaders(type, inputProperty, parsedLogic) {
|
|
|
36
36
|
return;
|
|
37
37
|
}
|
|
38
38
|
const func = property.initializer;
|
|
39
|
-
if (!
|
|
39
|
+
if (!(0, typescript_1.isFunctionLike)(func)) {
|
|
40
40
|
return;
|
|
41
41
|
}
|
|
42
42
|
const param = func.parameters ? func.parameters[0] : null;
|
|
43
|
-
const parameters = param ? [utils_1.getParameterDeclaration(param)] : [];
|
|
43
|
+
const parameters = param ? [(0, utils_1.getParameterDeclaration)(param)] : [];
|
|
44
44
|
if (!parsedLogic.actions.find(({ name }) => name === `${loaderActionName}`)) {
|
|
45
|
-
const returnTypeNode = (param === null || param === void 0 ? void 0 : param.type) ||
|
|
46
|
-
utils_1.gatherImports(param, checker, parsedLogic);
|
|
45
|
+
const returnTypeNode = (param === null || param === void 0 ? void 0 : param.type) || typescript_1.factory.createKeywordTypeNode(typescript_1.SyntaxKind.AnyKeyword);
|
|
46
|
+
(0, utils_1.gatherImports)(param, checker, parsedLogic);
|
|
47
47
|
parsedLogic.actions.push({ name: `${loaderActionName}`, parameters, returnTypeNode });
|
|
48
48
|
}
|
|
49
49
|
if (!parsedLogic.actions.find(({ name }) => name === `${loaderActionName}Success`)) {
|
|
@@ -53,30 +53,30 @@ function visitLoaders(type, inputProperty, parsedLogic) {
|
|
|
53
53
|
const signature = funcType === null || funcType === void 0 ? void 0 : funcType.getCallSignatures()[0];
|
|
54
54
|
const sigReturnType = signature === null || signature === void 0 ? void 0 : signature.getReturnType();
|
|
55
55
|
if (sigReturnType) {
|
|
56
|
-
const resolvedReturnType = checker.typeToTypeNode(sigReturnType, undefined,
|
|
57
|
-
if (!utils_1.isAnyUnknown(utils_1.unPromisify(resolvedReturnType))) {
|
|
56
|
+
const resolvedReturnType = checker.typeToTypeNode(sigReturnType, undefined, typescript_2.NodeBuilderFlags.NoTruncation);
|
|
57
|
+
if (!(0, utils_1.isAnyUnknown)((0, utils_1.unPromisify)(resolvedReturnType))) {
|
|
58
58
|
returnTypeNode = resolvedReturnType;
|
|
59
59
|
}
|
|
60
60
|
}
|
|
61
|
-
if (!returnTypeNode && !utils_1.isAnyUnknown(func.type)) {
|
|
61
|
+
if (!returnTypeNode && !(0, utils_1.isAnyUnknown)(func.type)) {
|
|
62
62
|
returnTypeNode = func.type;
|
|
63
63
|
}
|
|
64
64
|
}
|
|
65
65
|
if (!returnTypeNode) {
|
|
66
|
-
returnTypeNode = defaultValueTypeNode ||
|
|
66
|
+
returnTypeNode = defaultValueTypeNode || typescript_1.factory.createKeywordTypeNode(typescript_1.SyntaxKind.AnyKeyword);
|
|
67
67
|
}
|
|
68
|
-
if (
|
|
68
|
+
if ((0, typescript_1.isTypeReferenceNode)(returnTypeNode) &&
|
|
69
69
|
((_b = returnTypeNode.typeName) === null || _b === void 0 ? void 0 : _b.escapedText) === 'Promise') {
|
|
70
70
|
returnTypeNode = (_c = returnTypeNode.typeArguments) === null || _c === void 0 ? void 0 : _c[0];
|
|
71
71
|
}
|
|
72
|
-
utils_1.gatherImports(returnTypeNode, checker, parsedLogic);
|
|
72
|
+
(0, utils_1.gatherImports)(returnTypeNode, checker, parsedLogic);
|
|
73
73
|
const successParameters = [
|
|
74
|
-
|
|
75
|
-
|
|
74
|
+
typescript_1.factory.createParameterDeclaration(undefined, undefined, undefined, typescript_1.factory.createIdentifier(loaderName), undefined, returnTypeNode, undefined),
|
|
75
|
+
typescript_1.factory.createParameterDeclaration(undefined, undefined, undefined, typescript_1.factory.createIdentifier('payload'), typescript_1.factory.createToken(typescript_1.SyntaxKind.QuestionToken), (_d = parsedLogic.actions.find((a) => a.name === loaderActionName)) === null || _d === void 0 ? void 0 : _d.returnTypeNode, undefined),
|
|
76
76
|
];
|
|
77
|
-
const successReturnTypeNode =
|
|
78
|
-
|
|
79
|
-
|
|
77
|
+
const successReturnTypeNode = typescript_1.factory.createTypeLiteralNode([
|
|
78
|
+
typescript_1.factory.createPropertySignature(undefined, typescript_1.factory.createIdentifier(loaderName), undefined, returnTypeNode),
|
|
79
|
+
typescript_1.factory.createPropertySignature(undefined, typescript_1.factory.createIdentifier('payload'), typescript_1.factory.createToken(typescript_1.SyntaxKind.QuestionToken), (_e = parsedLogic.actions.find((a) => a.name === loaderActionName)) === null || _e === void 0 ? void 0 : _e.returnTypeNode),
|
|
80
80
|
]);
|
|
81
81
|
parsedLogic.actions.push({
|
|
82
82
|
name: `${loaderActionName}Success`,
|
|
@@ -86,12 +86,12 @@ function visitLoaders(type, inputProperty, parsedLogic) {
|
|
|
86
86
|
}
|
|
87
87
|
if (!parsedLogic.actions.find(({ name }) => name === `${loaderActionName}Failure`)) {
|
|
88
88
|
const failureParameters = [
|
|
89
|
-
|
|
90
|
-
|
|
89
|
+
typescript_1.factory.createParameterDeclaration(undefined, undefined, undefined, typescript_1.factory.createIdentifier('error'), undefined, typescript_1.factory.createKeywordTypeNode(typescript_1.SyntaxKind.StringKeyword), undefined),
|
|
90
|
+
typescript_1.factory.createParameterDeclaration(undefined, undefined, undefined, typescript_1.factory.createIdentifier('errorObject'), typescript_1.factory.createToken(typescript_1.SyntaxKind.QuestionToken), typescript_1.factory.createKeywordTypeNode(typescript_1.SyntaxKind.AnyKeyword), undefined),
|
|
91
91
|
];
|
|
92
|
-
const failureReturnTypeNode =
|
|
93
|
-
|
|
94
|
-
|
|
92
|
+
const failureReturnTypeNode = typescript_1.factory.createTypeLiteralNode([
|
|
93
|
+
typescript_1.factory.createPropertySignature(undefined, typescript_1.factory.createIdentifier('error'), undefined, typescript_1.factory.createKeywordTypeNode(typescript_1.SyntaxKind.StringKeyword)),
|
|
94
|
+
typescript_1.factory.createPropertySignature(undefined, typescript_1.factory.createIdentifier('errorObject'), typescript_1.factory.createToken(typescript_1.SyntaxKind.QuestionToken), typescript_1.factory.createKeywordTypeNode(typescript_1.SyntaxKind.AnyKeyword)),
|
|
95
95
|
]);
|
|
96
96
|
parsedLogic.actions.push({
|
|
97
97
|
name: `${loaderActionName}Failure`,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"visitLoaders.js","sourceRoot":"","sources":["../../../src/visit/visitLoaders.ts"],"names":[],"mappings":";;;AACA,
|
|
1
|
+
{"version":3,"file":"visitLoaders.js","sourceRoot":"","sources":["../../../src/visit/visitLoaders.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,7 @@ exports.visitProps = void 0;
|
|
|
4
4
|
const utils_1 = require("../utils");
|
|
5
5
|
function visitProps(type, inputProperty, parsedLogic) {
|
|
6
6
|
const { checker } = parsedLogic;
|
|
7
|
-
parsedLogic.propsType = utils_1.getAndGatherTypeNodeForDefaultValue(inputProperty.initializer, checker, parsedLogic);
|
|
7
|
+
parsedLogic.propsType = (0, utils_1.getAndGatherTypeNodeForDefaultValue)(inputProperty.initializer, checker, parsedLogic);
|
|
8
8
|
}
|
|
9
9
|
exports.visitProps = visitProps;
|
|
10
10
|
//# sourceMappingURL=visitProps.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"visitProps.js","sourceRoot":"","sources":["../../../src/visit/visitProps.ts"],"names":[],"mappings":";;;AAEA,oCAA8D;AAE9D,SAAgB,UAAU,CAAC,IAAa,EAAE,aAAoC,EAAE,WAAwB;IACpG,MAAM,EAAE,OAAO,EAAE,GAAG,WAAW,CAAA;IAC/B,WAAW,CAAC,SAAS,GAAG,2CAAmC,
|
|
1
|
+
{"version":3,"file":"visitProps.js","sourceRoot":"","sources":["../../../src/visit/visitProps.ts"],"names":[],"mappings":";;;AAEA,oCAA8D;AAE9D,SAAgB,UAAU,CAAC,IAAa,EAAE,aAAoC,EAAE,WAAwB;IACpG,MAAM,EAAE,OAAO,EAAE,GAAG,WAAW,CAAA;IAC/B,WAAW,CAAC,SAAS,GAAG,IAAA,2CAAmC,EAAC,aAAa,CAAC,WAAW,EAAE,OAAO,EAAE,WAAW,CAAC,CAAA;AAChH,CAAC;AAHD,gCAGC"}
|
|
@@ -15,21 +15,21 @@ function visitReducers(type, inputProperty, parsedLogic) {
|
|
|
15
15
|
let reducerOptions;
|
|
16
16
|
if (ts.isArrayLiteralExpression(value)) {
|
|
17
17
|
let defaultValue = value.elements[0];
|
|
18
|
-
typeNode = utils_1.getAndGatherTypeNodeForDefaultValue(defaultValue, checker, parsedLogic);
|
|
18
|
+
typeNode = (0, utils_1.getAndGatherTypeNodeForDefaultValue)(defaultValue, checker, parsedLogic);
|
|
19
19
|
if (ts.isFunctionTypeNode(typeNode)) {
|
|
20
20
|
typeNode = typeNode.type;
|
|
21
21
|
}
|
|
22
22
|
const actionObjects = value.elements[value.elements.length - 1];
|
|
23
|
-
extraActions = utils_1.extractImportedActions(actionObjects, checker, parsedLogic);
|
|
23
|
+
extraActions = (0, utils_1.extractImportedActions)(actionObjects, checker, parsedLogic);
|
|
24
24
|
if (value.elements.length > 2) {
|
|
25
25
|
const options = value.elements[value.elements.length - 2];
|
|
26
26
|
if (ts.isObjectLiteralExpression(options)) {
|
|
27
|
-
reducerOptions = ts_clone_node_1.cloneNode(checker.typeToTypeNode(checker.getTypeAtLocation(options), undefined, undefined));
|
|
27
|
+
reducerOptions = (0, ts_clone_node_1.cloneNode)(checker.typeToTypeNode(checker.getTypeAtLocation(options), undefined, undefined));
|
|
28
28
|
}
|
|
29
29
|
}
|
|
30
30
|
}
|
|
31
31
|
else if (ts.isObjectLiteralExpression(value)) {
|
|
32
|
-
typeNode = ts.createKeywordTypeNode(ts.SyntaxKind.AnyKeyword);
|
|
32
|
+
typeNode = ts.factory.createKeywordTypeNode(ts.SyntaxKind.AnyKeyword);
|
|
33
33
|
}
|
|
34
34
|
parsedLogic.reducers.push({ name, typeNode, reducerOptions });
|
|
35
35
|
if (Object.keys(extraActions).length > 0) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"visitReducers.js","sourceRoot":"","sources":["../../../src/visit/visitReducers.ts"],"names":[],"mappings":";;;AACA,iCAAgC;AAChC,oCAAsF;AACtF,2DAAmD;AAEnD,SAAgB,aAAa,CAAC,IAAa,EAAE,aAAoC,EAAE,WAAwB;IACvG,MAAM,EAAE,OAAO,EAAE,GAAG,WAAW,CAAA;IAE/B,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,aAAa,EAAE,EAAE;QACzC,MAAM,IAAI,GAAG,QAAQ,CAAC,OAAO,EAAE,CAAA;QAC/B,MAAM,KAAK,GAAI,QAAQ,CAAC,gBAA0C,CAAC,WAAW,CAAA;QAE9E,IAAI,KAAK,EAAE;YACP,IAAI,YAAY,GAAG,EAAE,CAAA;YACrB,IAAI,QAAQ,CAAA;YACZ,IAAI,cAAc,CAAA;YAElB,IAAI,EAAE,CAAC,wBAAwB,CAAC,KAAK,CAAC,EAAE;gBACpC,IAAI,YAAY,GAAG,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAA;gBACpC,QAAQ,GAAG,2CAAmC,
|
|
1
|
+
{"version":3,"file":"visitReducers.js","sourceRoot":"","sources":["../../../src/visit/visitReducers.ts"],"names":[],"mappings":";;;AACA,iCAAgC;AAChC,oCAAsF;AACtF,2DAAmD;AAEnD,SAAgB,aAAa,CAAC,IAAa,EAAE,aAAoC,EAAE,WAAwB;IACvG,MAAM,EAAE,OAAO,EAAE,GAAG,WAAW,CAAA;IAE/B,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,aAAa,EAAE,EAAE;QACzC,MAAM,IAAI,GAAG,QAAQ,CAAC,OAAO,EAAE,CAAA;QAC/B,MAAM,KAAK,GAAI,QAAQ,CAAC,gBAA0C,CAAC,WAAW,CAAA;QAE9E,IAAI,KAAK,EAAE;YACP,IAAI,YAAY,GAAG,EAAE,CAAA;YACrB,IAAI,QAAQ,CAAA;YACZ,IAAI,cAAc,CAAA;YAElB,IAAI,EAAE,CAAC,wBAAwB,CAAC,KAAK,CAAC,EAAE;gBACpC,IAAI,YAAY,GAAG,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAA;gBACpC,QAAQ,GAAG,IAAA,2CAAmC,EAAC,YAAY,EAAE,OAAO,EAAE,WAAW,CAAC,CAAA;gBAClF,IAAI,EAAE,CAAC,kBAAkB,CAAC,QAAQ,CAAC,EAAE;oBACjC,QAAQ,GAAG,QAAQ,CAAC,IAAI,CAAA;iBAC3B;gBAED,MAAM,aAAa,GAAG,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAA;gBAC/D,YAAY,GAAG,IAAA,8BAAsB,EAAC,aAAa,EAAE,OAAO,EAAE,WAAW,CAAC,CAAA;gBAE1E,IAAI,KAAK,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;oBAC3B,MAAM,OAAO,GAAG,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAA;oBACzD,IAAI,EAAE,CAAC,yBAAyB,CAAC,OAAO,CAAC,EAAE;wBACvC,cAAc,GAAG,IAAA,yBAAS,EACtB,OAAO,CAAC,cAAc,CAAC,OAAO,CAAC,iBAAiB,CAAC,OAAO,CAAC,EAAE,SAAS,EAAE,SAAS,CAAC,CACnF,CAAA;qBACJ;iBACJ;aACJ;iBAAM,IAAI,EAAE,CAAC,yBAAyB,CAAC,KAAK,CAAC,EAAE;gBAC5C,QAAQ,GAAG,EAAE,CAAC,OAAO,CAAC,qBAAqB,CAAC,EAAE,CAAC,UAAU,CAAC,UAAU,CAAC,CAAA;aACxE;YAED,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,cAAc,EAAE,CAAC,CAAA;YAE7D,IAAI,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE;gBACtC,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,YAAY,EAAE,YAAY,CAAC,CAAA;aACxD;SACJ;KACJ;AACL,CAAC;AAzCD,sCAyCC"}
|
|
@@ -32,7 +32,7 @@ function visitSelectors(type, inputProperty, parsedLogic) {
|
|
|
32
32
|
let functionTypes = [];
|
|
33
33
|
if (selectorInputTypeNode && ts.isTupleTypeNode(selectorInputTypeNode)) {
|
|
34
34
|
let takenNames = {};
|
|
35
|
-
functionTypes = (selectorInputTypeNode.elements || ts.createNodeArray([]))
|
|
35
|
+
functionTypes = (selectorInputTypeNode.elements || ts.factory.createNodeArray([]))
|
|
36
36
|
.filter((e) => ts.isTypeNode(e))
|
|
37
37
|
.map((selectorTypeNode, index) => {
|
|
38
38
|
let name = functionNames[index] || 'arg';
|
|
@@ -41,13 +41,13 @@ function visitSelectors(type, inputProperty, parsedLogic) {
|
|
|
41
41
|
name = `${name}${takenNames[name]}`;
|
|
42
42
|
}
|
|
43
43
|
if (ts.isFunctionTypeNode(selectorTypeNode)) {
|
|
44
|
-
utils_1.gatherImports(selectorTypeNode.type, checker, parsedLogic);
|
|
44
|
+
(0, utils_1.gatherImports)(selectorTypeNode.type, checker, parsedLogic);
|
|
45
45
|
}
|
|
46
46
|
return {
|
|
47
47
|
name,
|
|
48
48
|
type: ts.isFunctionTypeNode(selectorTypeNode)
|
|
49
|
-
? ts_clone_node_1.cloneNode(selectorTypeNode.type)
|
|
50
|
-
: ts.createKeywordTypeNode(ts.SyntaxKind.AnyKeyword),
|
|
49
|
+
? (0, ts_clone_node_1.cloneNode)(selectorTypeNode.type)
|
|
50
|
+
: ts.factory.createKeywordTypeNode(ts.SyntaxKind.AnyKeyword),
|
|
51
51
|
};
|
|
52
52
|
});
|
|
53
53
|
}
|
|
@@ -56,15 +56,15 @@ function visitSelectors(type, inputProperty, parsedLogic) {
|
|
|
56
56
|
const type = checker.getReturnTypeOfSignature(checker.getSignatureFromDeclaration(computedFunction));
|
|
57
57
|
let typeNode;
|
|
58
58
|
if (computedFunction.type) {
|
|
59
|
-
utils_1.gatherImports(computedFunction.type, checker, parsedLogic);
|
|
60
|
-
typeNode = ts_clone_node_1.cloneNode(computedFunction.type);
|
|
59
|
+
(0, utils_1.gatherImports)(computedFunction.type, checker, parsedLogic);
|
|
60
|
+
typeNode = (0, ts_clone_node_1.cloneNode)(computedFunction.type);
|
|
61
61
|
}
|
|
62
62
|
else if (type) {
|
|
63
63
|
typeNode = checker.typeToTypeNode(type, undefined, typescript_1.NodeBuilderFlags.NoTruncation);
|
|
64
|
-
utils_1.gatherImports(typeNode, checker, parsedLogic);
|
|
64
|
+
(0, utils_1.gatherImports)(typeNode, checker, parsedLogic);
|
|
65
65
|
}
|
|
66
66
|
else {
|
|
67
|
-
typeNode = ts.createKeywordTypeNode(ts.SyntaxKind.AnyKeyword);
|
|
67
|
+
typeNode = ts.factory.createKeywordTypeNode(ts.SyntaxKind.AnyKeyword);
|
|
68
68
|
}
|
|
69
69
|
parsedLogic.selectors.push({
|
|
70
70
|
name,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"visitSelectors.js","sourceRoot":"","sources":["../../../src/visit/visitSelectors.ts"],"names":[],"mappings":";;;AACA,iCAAgC;AAChC,2CAA6C;AAC7C,2DAAmD;AACnD,oCAAwC;AAExC,SAAgB,cAAc,CAAC,IAAa,EAAE,aAAoC,EAAE,WAAwB;;IACxG,MAAM,EAAE,OAAO,EAAE,GAAG,WAAW,CAAA;IAE/B,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,aAAa,EAAE,EAAE;QACzC,MAAM,IAAI,GAAG,QAAQ,CAAC,OAAO,EAAE,CAAA;QAC/B,MAAM,KAAK,GAAI,QAAQ,CAAC,gBAA0C,CAAC,WAAW,CAAA;QAC9E,IAAI,EAAE,CAAC,wBAAwB,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;YACjE,MAAM,aAAa,GAAG,KAAK,CAAC,QAAQ,CAAC,CAAC,CAA8C,CAAA;YACpF,MAAM,qBAAqB,GAAG,OAAO,CAAC,iBAAiB,CAAC,aAAa,CAAC,CAAA;YAEtE,MAAM,yBAAyB,GAAG,MAAA,qBAAqB,CAAC,iBAAiB,EAAE,CAAC,CAAC,CAAC,0CAAE,aAAa,EAAa,CAAA;YAC1G,MAAM,qBAAqB,GAAG,yBAAyB;gBACnD,CAAC,CAAC,OAAO,CAAC,cAAc,CAAC,yBAAyB,EAAE,aAAa,EAAE,6BAAgB,CAAC,YAAY,CAAC;gBACjG,CAAC,CAAC,IAAI,CAAA;YAEV,IAAI,aAAa,GAAG,EAAE,CAAA;YACtB,IAAI,EAAE,CAAC,wBAAwB,CAAC,aAAa,CAAC,IAAI,CAAC,EAAE;gBACjD,aAAa,GAAG,aAAa,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE;oBACxD,IAAI,EAAE,CAAC,0BAA0B,CAAC,OAAO,CAAC,EAAE;wBACxC,OAAO,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE,CAAA;qBAChC;yBAAM;wBACH,OAAO,IAAI,CAAA;qBACd;gBACL,CAAC,CAAC,CAAA;aACL;YAED,IAAI,aAAa,GAAG,EAAE,CAAA;YAEtB,IAAI,qBAAqB,IAAI,EAAE,CAAC,eAAe,CAAC,qBAAqB,CAAC,EAAE;gBACpE,IAAI,UAAU,GAA2B,EAAE,CAAA;gBAC3C,aAAa,GAAG,CAAC,qBAAqB,CAAC,QAAQ,IAAI,EAAE,CAAC,eAAe,CAAC,EAAE,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"visitSelectors.js","sourceRoot":"","sources":["../../../src/visit/visitSelectors.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,15 +13,15 @@ function visitSharedListeners(type, inputProperty, parsedLogic) {
|
|
|
13
13
|
let typeNode;
|
|
14
14
|
const firstParameter = value.parameters[0];
|
|
15
15
|
if (firstParameter) {
|
|
16
|
-
typeNode = ts_clone_node_1.cloneNode(checker.typeToTypeNode(checker.getTypeAtLocation(firstParameter), undefined, undefined));
|
|
17
|
-
utils_1.gatherImports(typeNode, checker, parsedLogic);
|
|
16
|
+
typeNode = (0, ts_clone_node_1.cloneNode)(checker.typeToTypeNode(checker.getTypeAtLocation(firstParameter), undefined, undefined));
|
|
17
|
+
(0, utils_1.gatherImports)(typeNode, checker, parsedLogic);
|
|
18
18
|
}
|
|
19
19
|
parsedLogic.sharedListeners.push({
|
|
20
20
|
name,
|
|
21
21
|
payload: typeNode,
|
|
22
|
-
action: ts.createTypeLiteralNode([
|
|
23
|
-
ts.createPropertySignature(undefined, ts.createIdentifier('type'), undefined, ts.createKeywordTypeNode(ts.SyntaxKind.StringKeyword)
|
|
24
|
-
ts.createPropertySignature(undefined, ts.createIdentifier('payload'), undefined, typeNode || ts.createKeywordTypeNode(ts.SyntaxKind.AnyKeyword)
|
|
22
|
+
action: ts.factory.createTypeLiteralNode([
|
|
23
|
+
ts.factory.createPropertySignature(undefined, ts.factory.createIdentifier('type'), undefined, ts.factory.createKeywordTypeNode(ts.SyntaxKind.StringKeyword)),
|
|
24
|
+
ts.factory.createPropertySignature(undefined, ts.factory.createIdentifier('payload'), undefined, typeNode || ts.factory.createKeywordTypeNode(ts.SyntaxKind.AnyKeyword)),
|
|
25
25
|
]),
|
|
26
26
|
});
|
|
27
27
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"visitSharedListeners.js","sourceRoot":"","sources":["../../../src/visit/visitSharedListeners.ts"],"names":[],"mappings":";;;AACA,iCAAgC;AAChC,2DAAmD;AACnD,oCAAwC;AAExC,SAAgB,oBAAoB,CAAC,IAAa,EAAE,aAAoC,EAAE,WAAwB;IAC9G,MAAM,EAAE,OAAO,EAAE,GAAG,WAAW,CAAA;IAE/B,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,aAAa,EAAE,EAAE;QACzC,MAAM,IAAI,GAAG,QAAQ,CAAC,OAAO,EAAE,CAAA;QAC/B,MAAM,KAAK,GAAI,QAAQ,CAAC,gBAA0C,CAAC,WAAW,CAAA;QAE9E,IAAI,KAAK,IAAI,EAAE,CAAC,cAAc,CAAC,KAAK,CAAC,EAAE;YACnC,IAAI,QAAQ,CAAA;YACZ,MAAM,cAAc,GAAG,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,CAAA;YAC1C,IAAI,cAAc,EAAE;gBAChB,QAAQ,GAAG,yBAAS,
|
|
1
|
+
{"version":3,"file":"visitSharedListeners.js","sourceRoot":"","sources":["../../../src/visit/visitSharedListeners.ts"],"names":[],"mappings":";;;AACA,iCAAgC;AAChC,2DAAmD;AACnD,oCAAwC;AAExC,SAAgB,oBAAoB,CAAC,IAAa,EAAE,aAAoC,EAAE,WAAwB;IAC9G,MAAM,EAAE,OAAO,EAAE,GAAG,WAAW,CAAA;IAE/B,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,aAAa,EAAE,EAAE;QACzC,MAAM,IAAI,GAAG,QAAQ,CAAC,OAAO,EAAE,CAAA;QAC/B,MAAM,KAAK,GAAI,QAAQ,CAAC,gBAA0C,CAAC,WAAW,CAAA;QAE9E,IAAI,KAAK,IAAI,EAAE,CAAC,cAAc,CAAC,KAAK,CAAC,EAAE;YACnC,IAAI,QAAQ,CAAA;YACZ,MAAM,cAAc,GAAG,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,CAAA;YAC1C,IAAI,cAAc,EAAE;gBAChB,QAAQ,GAAG,IAAA,yBAAS,EAChB,OAAO,CAAC,cAAc,CAAC,OAAO,CAAC,iBAAiB,CAAC,cAAc,CAAC,EAAE,SAAS,EAAE,SAAS,CAAC,CAC1F,CAAA;gBACD,IAAA,qBAAa,EAAC,QAAQ,EAAE,OAAO,EAAE,WAAW,CAAC,CAAA;aAChD;YAED,WAAW,CAAC,eAAe,CAAC,IAAI,CAAC;gBAC7B,IAAI;gBACJ,OAAO,EAAE,QAAQ;gBACjB,MAAM,EAAE,EAAE,CAAC,OAAO,CAAC,qBAAqB,CAAC;oBACrC,EAAE,CAAC,OAAO,CAAC,uBAAuB,CAC9B,SAAS,EACT,EAAE,CAAC,OAAO,CAAC,gBAAgB,CAAC,MAAM,CAAC,EACnC,SAAS,EACT,EAAE,CAAC,OAAO,CAAC,qBAAqB,CAAC,EAAE,CAAC,UAAU,CAAC,aAAa,CAAC,CAChE;oBACD,EAAE,CAAC,OAAO,CAAC,uBAAuB,CAC9B,SAAS,EACT,EAAE,CAAC,OAAO,CAAC,gBAAgB,CAAC,SAAS,CAAC,EACtC,SAAS,EACT,QAAQ,IAAI,EAAE,CAAC,OAAO,CAAC,qBAAqB,CAAC,EAAE,CAAC,UAAU,CAAC,UAAU,CAAC,CAEzE;iBACJ,CAAC;aACL,CAAC,CAAA;SACL;KACJ;AACL,CAAC;AAtCD,oDAsCC"}
|
|
@@ -13,7 +13,7 @@ function visitWindowValues(type, inputProperty, parsedLogic) {
|
|
|
13
13
|
const type = checker.getTypeOfSymbolAtLocation(property, value);
|
|
14
14
|
const signature = type.getCallSignatures()[0];
|
|
15
15
|
const typeNode = checker.typeToTypeNode(signature.getReturnType(), undefined, undefined);
|
|
16
|
-
utils_1.gatherImports(typeNode, checker, parsedLogic);
|
|
16
|
+
(0, utils_1.gatherImports)(typeNode, checker, parsedLogic);
|
|
17
17
|
parsedLogic.reducers.push({ name, typeNode });
|
|
18
18
|
}
|
|
19
19
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"visitWindowValues.js","sourceRoot":"","sources":["../../../src/visit/visitWindowValues.ts"],"names":[],"mappings":";;;AACA,iCAAgC;AAChC,oCAAwC;AAExC,SAAgB,iBAAiB,CAAC,IAAa,EAAE,aAAoC,EAAE,WAAwB;IAC3G,MAAM,EAAE,OAAO,EAAE,GAAG,WAAW,CAAA;IAE/B,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,aAAa,EAAE,EAAE;QACzC,MAAM,IAAI,GAAG,QAAQ,CAAC,OAAO,EAAE,CAAA;QAC/B,IAAI,EAAE,CAAC,oBAAoB,CAAC,QAAQ,CAAC,gBAAgB,CAAC,EAAE;YACpD,MAAM,KAAK,GAAG,QAAQ,CAAC,gBAAgB,CAAC,WAAW,CAAA;YAEnD,IAAI,KAAK,IAAI,EAAE,CAAC,cAAc,CAAC,KAAK,CAAC,EAAE;gBACnC,MAAM,IAAI,GAAG,OAAO,CAAC,yBAAyB,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAA;gBAC/D,MAAM,SAAS,GAAG,IAAI,CAAC,iBAAiB,EAAE,CAAC,CAAC,CAAC,CAAA;gBAC7C,MAAM,QAAQ,GAAG,OAAO,CAAC,cAAc,CAAC,SAAS,CAAC,aAAa,EAAE,EAAE,SAAS,EAAE,SAAS,CAAC,CAAA;gBACxF,qBAAa,
|
|
1
|
+
{"version":3,"file":"visitWindowValues.js","sourceRoot":"","sources":["../../../src/visit/visitWindowValues.ts"],"names":[],"mappings":";;;AACA,iCAAgC;AAChC,oCAAwC;AAExC,SAAgB,iBAAiB,CAAC,IAAa,EAAE,aAAoC,EAAE,WAAwB;IAC3G,MAAM,EAAE,OAAO,EAAE,GAAG,WAAW,CAAA;IAE/B,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,aAAa,EAAE,EAAE;QACzC,MAAM,IAAI,GAAG,QAAQ,CAAC,OAAO,EAAE,CAAA;QAC/B,IAAI,EAAE,CAAC,oBAAoB,CAAC,QAAQ,CAAC,gBAAgB,CAAC,EAAE;YACpD,MAAM,KAAK,GAAG,QAAQ,CAAC,gBAAgB,CAAC,WAAW,CAAA;YAEnD,IAAI,KAAK,IAAI,EAAE,CAAC,cAAc,CAAC,KAAK,CAAC,EAAE;gBACnC,MAAM,IAAI,GAAG,OAAO,CAAC,yBAAyB,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAA;gBAC/D,MAAM,SAAS,GAAG,IAAI,CAAC,iBAAiB,EAAE,CAAC,CAAC,CAAC,CAAA;gBAC7C,MAAM,QAAQ,GAAG,OAAO,CAAC,cAAc,CAAC,SAAS,CAAC,aAAa,EAAE,EAAE,SAAS,EAAE,SAAS,CAAC,CAAA;gBACxF,IAAA,qBAAa,EAAC,QAAQ,EAAE,OAAO,EAAE,WAAW,CAAC,CAAA;gBAE7C,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAA;aAChD;SACJ;KACJ;AACL,CAAC;AAlBD,8CAkBC"}
|
package/dist/src/write/write.js
CHANGED
|
@@ -7,6 +7,7 @@ const fs = require("fs");
|
|
|
7
7
|
const print_1 = require("../print/print");
|
|
8
8
|
const diff = require("diff");
|
|
9
9
|
const path = require("path");
|
|
10
|
+
const typescript_1 = require("typescript");
|
|
10
11
|
function addBackNewlines(oldText, newText) {
|
|
11
12
|
const patch = diff.parsePatch(diff.createPatch('file', oldText, newText, '', ''));
|
|
12
13
|
const hunks = patch[0].hunks;
|
|
@@ -39,20 +40,20 @@ function writeTypeImports(appOptions, program, filename, parsedLogics, allParsed
|
|
|
39
40
|
if (!importLocation.startsWith('.')) {
|
|
40
41
|
importLocation = `./${importLocation}`;
|
|
41
42
|
}
|
|
42
|
-
const createImportDeclaration = () =>
|
|
43
|
+
const createImportDeclaration = () => typescript_1.factory.createImportDeclaration(undefined, undefined, typescript_1.factory.createImportClause(true, undefined, typescript_1.factory.createNamedImports(allParsedLogics.map((l) => typescript_1.factory.createImportSpecifier(undefined, undefined, typescript_1.factory.createIdentifier(l.logicTypeName))))), typescript_1.factory.createStringLiteral(importLocation));
|
|
43
44
|
const transformer = (context) => {
|
|
44
45
|
return (rootNode) => {
|
|
45
46
|
function visit(node) {
|
|
46
47
|
node = ts.visitEachChild(node, visit, context);
|
|
47
48
|
if (ts.isCallExpression(node) &&
|
|
48
|
-
utils_1.isKeaCall(node.expression, checker) &&
|
|
49
|
+
(0, utils_1.isKeaCall)(node.expression, checker) &&
|
|
49
50
|
parsedLogicMapByNode.has(node.expression)) {
|
|
50
51
|
const { logicTypeName, typeReferencesInLogicInput } = parsedLogicMapByNode.get(node.expression);
|
|
51
|
-
return
|
|
52
|
-
|
|
52
|
+
return typescript_1.factory.createCallExpression(node.expression, [
|
|
53
|
+
typescript_1.factory.createTypeReferenceNode(typescript_1.factory.createIdentifier(logicTypeName), typeReferencesInLogicInput.size > 0
|
|
53
54
|
? [...typeReferencesInLogicInput.values()]
|
|
54
55
|
.sort()
|
|
55
|
-
.map((type) =>
|
|
56
|
+
.map((type) => typescript_1.factory.createTypeReferenceNode(typescript_1.factory.createIdentifier(type), undefined))
|
|
56
57
|
: undefined),
|
|
57
58
|
], node.arguments);
|
|
58
59
|
}
|
|
@@ -117,19 +118,19 @@ function writePaths(appOptions, program, filename, parsedLogics) {
|
|
|
117
118
|
function visit(node) {
|
|
118
119
|
node = ts.visitEachChild(node, visit, context);
|
|
119
120
|
if (ts.isCallExpression(node) &&
|
|
120
|
-
utils_1.isKeaCall(node.expression, checker) &&
|
|
121
|
+
(0, utils_1.isKeaCall)(node.expression, checker) &&
|
|
121
122
|
parsedLogicMapByNode.has(node.expression)) {
|
|
122
123
|
const { path, hasKeyInLogic } = parsedLogicMapByNode.get(node.expression);
|
|
123
|
-
return
|
|
124
|
-
?
|
|
124
|
+
return typescript_1.factory.createCallExpression(node.expression, node.typeArguments, node.arguments.map((argument, i) => i === 0 && ts.isObjectLiteralExpression(argument)
|
|
125
|
+
? typescript_1.factory.createObjectLiteralExpression([
|
|
125
126
|
hasKeyInLogic
|
|
126
|
-
?
|
|
127
|
-
|
|
128
|
-
], undefined,
|
|
129
|
-
...path.map((str) =>
|
|
130
|
-
|
|
127
|
+
? typescript_1.factory.createPropertyAssignment(typescript_1.factory.createIdentifier('path'), typescript_1.factory.createArrowFunction(undefined, undefined, [
|
|
128
|
+
typescript_1.factory.createParameterDeclaration(undefined, undefined, undefined, typescript_1.factory.createIdentifier('key'), undefined, undefined, undefined),
|
|
129
|
+
], undefined, typescript_1.factory.createToken(typescript_1.SyntaxKind.EqualsGreaterThanToken), typescript_1.factory.createArrayLiteralExpression([
|
|
130
|
+
...path.map((str) => typescript_1.factory.createStringLiteral(str)),
|
|
131
|
+
typescript_1.factory.createIdentifier('key'),
|
|
131
132
|
], false)))
|
|
132
|
-
:
|
|
133
|
+
: typescript_1.factory.createPropertyAssignment(typescript_1.factory.createIdentifier('path'), typescript_1.factory.createArrayLiteralExpression(path.map((str) => typescript_1.factory.createStringLiteral(str)), false)),
|
|
133
134
|
...argument.properties,
|
|
134
135
|
], true)
|
|
135
136
|
: argument));
|
|
@@ -148,7 +149,7 @@ function writeFile(sourceFile, transformer, filename) {
|
|
|
148
149
|
const result = ts.transform(sourceFile, [transformer]);
|
|
149
150
|
const transformedSourceFile = result.transformed[0];
|
|
150
151
|
const newContent = printer.printFile(transformedSourceFile);
|
|
151
|
-
const newText = print_1.runThroughPrettier(newContent, filename);
|
|
152
|
+
const newText = (0, print_1.runThroughPrettier)(newContent, filename);
|
|
152
153
|
result.dispose();
|
|
153
154
|
const oldText = sourceFile.getText();
|
|
154
155
|
const newestText = addBackNewlines(oldText, newText);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"write.js","sourceRoot":"","sources":["../../../src/write/write.ts"],"names":[],"mappings":";;;AACA,iCAAgC;AAChC,oCAAoC;AACpC,yBAAwB;AACxB,0CAAmD;AACnD,6BAA4B;AAC5B,6BAA4B;
|
|
1
|
+
{"version":3,"file":"write.js","sourceRoot":"","sources":["../../../src/write/write.ts"],"names":[],"mappings":"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"}
|