@effect/language-service 0.0.11 → 0.0.12
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/_mjs/diagnostics/definition.mjs.map +1 -1
- package/_mjs/diagnostics/ensureGetCallTrace.mjs +5 -8
- package/_mjs/diagnostics/ensureGetCallTrace.mjs.map +1 -1
- package/_mjs/diagnostics/noSyncWithConstant.mjs +8 -11
- package/_mjs/diagnostics/noSyncWithConstant.mjs.map +1 -1
- package/_mjs/eslint-rules/no-curry-arrow.mjs +2 -2
- package/_mjs/eslint-rules/no-curry-arrow.mjs.map +1 -1
- package/_mjs/index.mjs +24 -27
- package/_mjs/index.mjs.map +1 -1
- package/_mjs/refactors/addPipe.mjs +12 -18
- package/_mjs/refactors/addPipe.mjs.map +1 -1
- package/_mjs/refactors/asyncAwaitToGen.mjs +12 -18
- package/_mjs/refactors/asyncAwaitToGen.mjs.map +1 -1
- package/_mjs/refactors/asyncAwaitToGenTryPromise.mjs +17 -23
- package/_mjs/refactors/asyncAwaitToGenTryPromise.mjs.map +1 -1
- package/_mjs/refactors/definition.mjs.map +1 -1
- package/_mjs/refactors/functionToArrow.mjs +31 -36
- package/_mjs/refactors/functionToArrow.mjs.map +1 -1
- package/_mjs/refactors/noSyncWithConstant.mjs +10 -14
- package/_mjs/refactors/noSyncWithConstant.mjs.map +1 -1
- package/_mjs/refactors/removeCurryArrow.mjs +12 -18
- package/_mjs/refactors/removeCurryArrow.mjs.map +1 -1
- package/_mjs/refactors/removePipe.mjs +11 -17
- package/_mjs/refactors/removePipe.mjs.map +1 -1
- package/_mjs/refactors/toggleReturnTypeAnnotation.mjs +10 -15
- package/_mjs/refactors/toggleReturnTypeAnnotation.mjs.map +1 -1
- package/_mjs/refactors/toggleTypeAnnotation.mjs +25 -31
- package/_mjs/refactors/toggleTypeAnnotation.mjs.map +1 -1
- package/_mjs/refactors/wrapWithPipe.mjs +5 -8
- package/_mjs/refactors/wrapWithPipe.mjs.map +1 -1
- package/_mjs/{utils.mjs → utils/AST.mjs} +81 -4
- package/_mjs/utils/AST.mjs.map +1 -0
- package/_mjs/utils/Function.mjs +31 -0
- package/_mjs/utils/Function.mjs.map +1 -0
- package/_mjs/utils/Option.mjs +14 -0
- package/_mjs/utils/Option.mjs.map +1 -0
- package/_mjs/utils/ReadonlyArray.mjs +12 -0
- package/_mjs/utils/ReadonlyArray.mjs.map +1 -0
- package/diagnostics/definition.d.ts +3 -3
- package/diagnostics/definition.d.ts.map +1 -1
- package/diagnostics/definition.js.map +1 -1
- package/diagnostics/ensureGetCallTrace.d.ts.map +1 -1
- package/diagnostics/ensureGetCallTrace.js +5 -8
- package/diagnostics/ensureGetCallTrace.js.map +1 -1
- package/diagnostics/noSyncWithConstant.d.ts +1 -1
- package/diagnostics/noSyncWithConstant.d.ts.map +1 -1
- package/diagnostics/noSyncWithConstant.js +8 -11
- package/diagnostics/noSyncWithConstant.js.map +1 -1
- package/eslint-rules/no-curry-arrow.js +2 -2
- package/eslint-rules/no-curry-arrow.js.map +1 -1
- package/index.js +25 -28
- package/index.js.map +1 -1
- package/package.json +1 -3
- package/refactors/addPipe.d.ts.map +1 -1
- package/refactors/addPipe.js +12 -18
- package/refactors/addPipe.js.map +1 -1
- package/refactors/asyncAwaitToGen.d.ts.map +1 -1
- package/refactors/asyncAwaitToGen.js +12 -18
- package/refactors/asyncAwaitToGen.js.map +1 -1
- package/refactors/asyncAwaitToGenTryPromise.d.ts.map +1 -1
- package/refactors/asyncAwaitToGenTryPromise.js +17 -23
- package/refactors/asyncAwaitToGenTryPromise.js.map +1 -1
- package/refactors/definition.d.ts +7 -6
- package/refactors/definition.d.ts.map +1 -1
- package/refactors/definition.js.map +1 -1
- package/refactors/functionToArrow.d.ts.map +1 -1
- package/refactors/functionToArrow.js +31 -36
- package/refactors/functionToArrow.js.map +1 -1
- package/refactors/noSyncWithConstant.d.ts.map +1 -1
- package/refactors/noSyncWithConstant.js +10 -14
- package/refactors/noSyncWithConstant.js.map +1 -1
- package/refactors/removeCurryArrow.d.ts.map +1 -1
- package/refactors/removeCurryArrow.js +12 -18
- package/refactors/removeCurryArrow.js.map +1 -1
- package/refactors/removePipe.d.ts.map +1 -1
- package/refactors/removePipe.js +11 -17
- package/refactors/removePipe.js.map +1 -1
- package/refactors/toggleReturnTypeAnnotation.d.ts.map +1 -1
- package/refactors/toggleReturnTypeAnnotation.js +10 -15
- package/refactors/toggleReturnTypeAnnotation.js.map +1 -1
- package/refactors/toggleTypeAnnotation.d.ts.map +1 -1
- package/refactors/toggleTypeAnnotation.js +25 -31
- package/refactors/toggleTypeAnnotation.js.map +1 -1
- package/refactors/wrapWithPipe.d.ts.map +1 -1
- package/refactors/wrapWithPipe.js +5 -8
- package/refactors/wrapWithPipe.js.map +1 -1
- package/{ast.d.ts → utils/AST.d.ts} +17 -10
- package/utils/AST.d.ts.map +1 -0
- package/{utils.js → utils/AST.js} +91 -4
- package/utils/AST.js.map +1 -0
- package/utils/Function.d.ts +21 -0
- package/utils/Function.d.ts.map +1 -0
- package/utils/Function.js +37 -0
- package/utils/Function.js.map +1 -0
- package/utils/Option.d.ts +17 -0
- package/utils/Option.d.ts.map +1 -0
- package/utils/Option.js +28 -0
- package/utils/Option.js.map +1 -0
- package/utils/ReadonlyArray.d.ts +17 -0
- package/utils/ReadonlyArray.d.ts.map +1 -0
- package/utils/ReadonlyArray.js +30 -0
- package/utils/ReadonlyArray.js.map +1 -0
- package/_mjs/ast.mjs +0 -80
- package/_mjs/ast.mjs.map +0 -1
- package/_mjs/utils.mjs.map +0 -1
- package/ast.d.ts.map +0 -1
- package/ast.js +0 -100
- package/ast.js.map +0 -1
- package/utils.d.ts +0 -17
- package/utils.d.ts.map +0 -1
- package/utils.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"definition.d.ts","sourceRoot":"","sources":["../../../src/refactors/definition.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,
|
|
1
|
+
{"version":3,"file":"definition.d.ts","sourceRoot":"","sources":["../../../src/refactors/definition.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,GAAG,MAAM,oCAAoC,CAAA;AAC9D,OAAO,KAAK,KAAK,CAAC,MAAM,uCAAuC,CAAA;AAC/D,OAAO,KAAK,EAAE,MAAM,gCAAgC,CAAA;AAEpD,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,MAAM,CAAA;IACZ,WAAW,EAAE,MAAM,CAAA;IACnB,KAAK,EAAE,CAAC,EAAE,EAAE,GAAG,CAAC,aAAa,EAAE,OAAO,EAAE,EAAE,CAAC,OAAO,KAAK,CACrD,UAAU,EAAE,EAAE,CAAC,UAAU,EACzB,SAAS,EAAE,EAAE,CAAC,SAAS,KACpB,CAAC,CAAC,MAAM,CAAC,4BAA4B,CAAC,CAAA;CAC5C;AAED,MAAM,WAAW,4BAA4B;IAC3C,WAAW,EAAE,MAAM,CAAA;IACnB,KAAK,EAAE,CAAC,aAAa,EAAE,EAAE,CAAC,WAAW,CAAC,aAAa,KAAK,IAAI,CAAA;CAC7D;AAED,wBAAgB,cAAc,CAAC,UAAU,EAAE,kBAAkB,sBAE5D"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"definition.js","mappings":";;;;;;
|
|
1
|
+
{"version":3,"file":"definition.js","mappings":";;;;;;AAkBM,SAAUA,cAAc,CAACC,UAA8B;EAC3D,OAAOA,UAAU;AACnB","names":["createRefactor","definition"],"sourceRoot":"","sources":["../../../src/refactors/definition.ts"],"sourcesContent":[null]}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"functionToArrow.d.ts","sourceRoot":"","sources":["../../../src/refactors/functionToArrow.ts"],"names":[],"mappings":";
|
|
1
|
+
{"version":3,"file":"functionToArrow.d.ts","sourceRoot":"","sources":["../../../src/refactors/functionToArrow.ts"],"names":[],"mappings":";AAMA,wBAmEE"}
|
|
@@ -4,49 +4,44 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
6
|
exports.default = void 0;
|
|
7
|
-
var T = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/io/Effect"));
|
|
8
|
-
var AST = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/language-service/ast"));
|
|
9
7
|
var _definition = /*#__PURE__*/require("@effect/language-service/refactors/definition");
|
|
10
|
-
var
|
|
11
|
-
var _Function = /*#__PURE__*/require("@
|
|
12
|
-
var O = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@
|
|
8
|
+
var AST = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/language-service/utils/AST"));
|
|
9
|
+
var _Function = /*#__PURE__*/require("@effect/language-service/utils/Function");
|
|
10
|
+
var O = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/language-service/utils/Option"));
|
|
11
|
+
var Ch = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/language-service/utils/ReadonlyArray"));
|
|
13
12
|
function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
|
|
14
13
|
function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
|
|
15
14
|
var _default = /*#__PURE__*/(0, _definition.createRefactor)({
|
|
16
15
|
name: "effect/functionToArrow",
|
|
17
16
|
description: "Convert to arrow",
|
|
18
|
-
apply: (sourceFile, textRange) =>
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
const
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
const statement = body.statements[0];
|
|
28
|
-
if (statement && ts.isReturnStatement(statement) && statement.expression) {
|
|
29
|
-
newBody = statement.expression;
|
|
30
|
-
}
|
|
17
|
+
apply: ts => (sourceFile, textRange) => (0, _Function.pipe)((0, _Function.pipe)(AST.getNodesContainingRange(ts)(sourceFile, textRange), Ch.filter(ts.isFunctionDeclaration)), Ch.concat((0, _Function.pipe)(AST.getNodesContainingRange(ts)(sourceFile, textRange), Ch.filter(ts.isMethodDeclaration))), Ch.filter(node => !!node.body), Ch.filter(node => !!node.name && AST.isNodeInRange(textRange)(node.name)), Ch.head, O.map(node => ({
|
|
18
|
+
description: "Convert to arrow",
|
|
19
|
+
apply: changeTracker => {
|
|
20
|
+
const body = node.body;
|
|
21
|
+
let newBody = ts.factory.createBlock(body.statements);
|
|
22
|
+
if (body.statements.length === 1) {
|
|
23
|
+
const statement = body.statements[0];
|
|
24
|
+
if (statement && ts.isReturnStatement(statement) && statement.expression) {
|
|
25
|
+
newBody = statement.expression;
|
|
31
26
|
}
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
}
|
|
49
|
-
})
|
|
27
|
+
}
|
|
28
|
+
let arrowFlags = ts.getCombinedModifierFlags(node);
|
|
29
|
+
arrowFlags &= ~ts.ModifierFlags.Export;
|
|
30
|
+
arrowFlags &= ~ts.ModifierFlags.Default;
|
|
31
|
+
const arrowModifiers = ts.factory.createModifiersFromModifierFlags(arrowFlags);
|
|
32
|
+
const arrowFunction = ts.factory.createArrowFunction(arrowModifiers, node.typeParameters, node.parameters, undefined, ts.factory.createToken(ts.SyntaxKind.EqualsGreaterThanToken), newBody);
|
|
33
|
+
let constFlags = ts.getCombinedModifierFlags(node);
|
|
34
|
+
constFlags &= ~arrowFlags;
|
|
35
|
+
const constModifiers = ts.factory.createModifiersFromModifierFlags(constFlags);
|
|
36
|
+
let newDeclaration = node;
|
|
37
|
+
if (ts.isMethodDeclaration(node)) {
|
|
38
|
+
newDeclaration = ts.factory.createPropertyDeclaration(constModifiers, node.name, undefined, undefined, arrowFunction);
|
|
39
|
+
} else if (ts.isFunctionDeclaration(node)) {
|
|
40
|
+
newDeclaration = ts.factory.createVariableStatement(constModifiers, ts.factory.createVariableDeclarationList([ts.factory.createVariableDeclaration(node.name, undefined, undefined, arrowFunction)], ts.NodeFlags.Const));
|
|
41
|
+
}
|
|
42
|
+
changeTracker.replaceNode(sourceFile, node, newDeclaration);
|
|
43
|
+
}
|
|
44
|
+
})))
|
|
50
45
|
});
|
|
51
46
|
exports.default = _default;
|
|
52
47
|
//# sourceMappingURL=functionToArrow.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"functionToArrow.js","mappings":";;;;;;AAAA;AACA;AACA;AACA;AACA;
|
|
1
|
+
{"version":3,"file":"functionToArrow.js","mappings":"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","names":["name","description","apply","ts","sourceFile","textRange","AST","getNodesContainingRange","Ch","filter","isFunctionDeclaration","concat","isMethodDeclaration","node","body","isNodeInRange","head","O","map","changeTracker","newBody","factory","createBlock","statements","length","statement","isReturnStatement","expression","arrowFlags","getCombinedModifierFlags","ModifierFlags","Export","Default","arrowModifiers","createModifiersFromModifierFlags","arrowFunction","createArrowFunction","typeParameters","parameters","undefined","createToken","SyntaxKind","EqualsGreaterThanToken","constFlags","constModifiers","newDeclaration","createPropertyDeclaration","createVariableStatement","createVariableDeclarationList","createVariableDeclaration","NodeFlags","Const","replaceNode"],"sourceRoot":"","sources":["../../../src/refactors/functionToArrow.ts"],"sourcesContent":[null]}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"noSyncWithConstant.d.ts","sourceRoot":"","sources":["../../../src/refactors/noSyncWithConstant.ts"],"names":[],"mappings":";
|
|
1
|
+
{"version":3,"file":"noSyncWithConstant.d.ts","sourceRoot":"","sources":["../../../src/refactors/noSyncWithConstant.ts"],"names":[],"mappings":";AAUA,wBA6CE"}
|
|
@@ -4,40 +4,36 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
6
|
exports.default = void 0;
|
|
7
|
-
var T = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/io/Effect"));
|
|
8
|
-
var AST = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/language-service/ast"));
|
|
9
7
|
var _noSyncWithConstant = /*#__PURE__*/require("@effect/language-service/diagnostics/noSyncWithConstant");
|
|
10
8
|
var _definition = /*#__PURE__*/require("@effect/language-service/refactors/definition");
|
|
11
|
-
var
|
|
12
|
-
var
|
|
13
|
-
var
|
|
14
|
-
var
|
|
9
|
+
var AST = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/language-service/utils/AST"));
|
|
10
|
+
var _Function = /*#__PURE__*/require("@effect/language-service/utils/Function");
|
|
11
|
+
var O = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/language-service/utils/Option"));
|
|
12
|
+
var Ch = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/language-service/utils/ReadonlyArray"));
|
|
15
13
|
function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
|
|
16
14
|
function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
|
|
17
15
|
var _default = /*#__PURE__*/(0, _definition.createRefactor)({
|
|
18
16
|
name: "effect/addPipe",
|
|
19
17
|
description: "Rewrite using pipe",
|
|
20
|
-
apply: (sourceFile, textRange) =>
|
|
21
|
-
const
|
|
22
|
-
const effectIdentifier = (0, _utils.getEffectModuleIdentifier)(ts)(sourceFile);
|
|
18
|
+
apply: ts => (sourceFile, textRange) => {
|
|
19
|
+
const effectIdentifier = AST.getEffectModuleIdentifier(ts)(sourceFile);
|
|
23
20
|
const nodes = (0, _Function.pipe)(AST.getNodesContainingRange(ts)(sourceFile, textRange), Ch.reverse, Ch.fromIterable, Ch.filter(AST.isNodeInRange(textRange)));
|
|
24
21
|
for (const methodName of Object.keys(_noSyncWithConstant.noSyncWithConstantMethodsMap)) {
|
|
25
22
|
const suggestedMethodName = _noSyncWithConstant.noSyncWithConstantMethodsMap[methodName];
|
|
26
23
|
const refactor = (0, _Function.pipe)(nodes, Ch.filter((0, _noSyncWithConstant.isEffectSyncWithConstantCall)(ts)(effectIdentifier, methodName)), Ch.head, O.map(node => ({
|
|
27
24
|
description: `Rewrite ${methodName} to ${suggestedMethodName}`,
|
|
28
|
-
apply:
|
|
29
|
-
const changeTracker = yield* $(T.service(AST.ChangeTrackerApi));
|
|
25
|
+
apply: changeTracker => {
|
|
30
26
|
const arg = node.arguments[0];
|
|
31
|
-
if (ts.isArrowFunction(arg) &&
|
|
27
|
+
if (ts.isArrowFunction(arg) && AST.isLiteralConstantValue(ts)(arg.body)) {
|
|
32
28
|
const newNode = ts.factory.updateCallExpression(node, ts.factory.createPropertyAccessExpression(ts.factory.createIdentifier(effectIdentifier), suggestedMethodName), node.typeArguments, ts.factory.createNodeArray([arg.body]));
|
|
33
29
|
changeTracker.replaceNode(sourceFile, node, newNode);
|
|
34
30
|
}
|
|
35
|
-
}
|
|
31
|
+
}
|
|
36
32
|
})));
|
|
37
33
|
if (O.isSome(refactor)) return refactor;
|
|
38
34
|
}
|
|
39
35
|
return O.none;
|
|
40
|
-
}
|
|
36
|
+
}
|
|
41
37
|
});
|
|
42
38
|
exports.default = _default;
|
|
43
39
|
//# sourceMappingURL=noSyncWithConstant.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"noSyncWithConstant.js","mappings":";;;;;;AAAA;
|
|
1
|
+
{"version":3,"file":"noSyncWithConstant.js","mappings":";;;;;;AAAA;AAIA;AACA;AACA;AACA;AACA;AAAkE;AAAA;AAAA,4BAEnD,8BAAc,EAAC;EAC5BA,IAAI,EAAE,gBAAgB;EACtBC,WAAW,EAAE,oBAAoB;EACjCC,KAAK,EAAGC,EAAE,IACR,CAACC,UAAU,EAAEC,SAAS,KAAI;IACxB,MAAMC,gBAAgB,GAAGC,GAAG,CAACC,yBAAyB,CAACL,EAAE,CAAC,CAACC,UAAU,CAAC;IAEtE,MAAMK,KAAK,GAAG,kBAAI,EAChBF,GAAG,CAACG,uBAAuB,CAACP,EAAE,CAAC,CAACC,UAAU,EAAEC,SAAS,CAAC,EACtDM,EAAE,CAACC,OAAO,EACVD,EAAE,CAACE,YAAY,EACfF,EAAE,CAACG,MAAM,CAACP,GAAG,CAACQ,aAAa,CAACV,SAAS,CAAC,CAAC,CACxC;IAED,KAAK,MAAMW,UAAU,IAAIC,MAAM,CAACC,IAAI,CAACC,gDAA4B,CAAC,EAAE;MAClE,MAAMC,mBAAmB,GAAWD,gDAA4B,CAACH,UAAU,CAAE;MAC7E,MAAMK,QAAQ,GAAG,kBAAI,EACnBZ,KAAK,EACLE,EAAE,CAACG,MAAM,CAAC,oDAA4B,EAACX,EAAE,CAAC,CAACG,gBAAgB,EAAEU,UAAU,CAAC,CAAC,EACzEL,EAAE,CAACW,IAAI,EACPC,CAAC,CAACC,GAAG,CAAEC,IAAI,KAAM;QACfxB,WAAW,EAAE,WAAWe,UAAU,OAAOI,mBAAmB,EAAE;QAC9DlB,KAAK,EAAGwB,aAA2C,IAAI;UACrD,MAAMC,GAAG,GAAGF,IAAI,CAACG,SAAS,CAAC,CAAC,CAAC;UAC7B,IAAIzB,EAAE,CAAC0B,eAAe,CAACF,GAAG,CAAC,IAAIpB,GAAG,CAACuB,sBAAsB,CAAC3B,EAAE,CAAC,CAACwB,GAAG,CAACI,IAAI,CAAC,EAAE;YACvE,MAAMC,OAAO,GAAG7B,EAAE,CAAC8B,OAAO,CAACC,oBAAoB,CAC7CT,IAAI,EACJtB,EAAE,CAAC8B,OAAO,CAACE,8BAA8B,CACvChC,EAAE,CAAC8B,OAAO,CAACG,gBAAgB,CAAC9B,gBAAgB,CAAC,EAC7Cc,mBAAmB,CACpB,EACDK,IAAI,CAACY,aAAa,EAClBlC,EAAE,CAAC8B,OAAO,CAACK,eAAe,CAAC,CAACX,GAAG,CAACI,IAAI,CAAC,CAAC,CACvC;YAEDL,aAAa,CAACa,WAAW,CAACnC,UAAU,EAAEqB,IAAI,EAAEO,OAAO,CAAC;;QAExD;OACD,CAAC,CAAC,CACJ;MACD,IAAIT,CAAC,CAACiB,MAAM,CAACnB,QAAQ,CAAC,EAAE,OAAOA,QAAQ;;IAGzC,OAAOE,CAAC,CAACkB,IAAI;EACf;CACH,CAAC;AAAA","names":["name","description","apply","ts","sourceFile","textRange","effectIdentifier","AST","getEffectModuleIdentifier","nodes","getNodesContainingRange","Ch","reverse","fromIterable","filter","isNodeInRange","methodName","Object","keys","noSyncWithConstantMethodsMap","suggestedMethodName","refactor","head","O","map","node","changeTracker","arg","arguments","isArrowFunction","isLiteralConstantValue","body","newNode","factory","updateCallExpression","createPropertyAccessExpression","createIdentifier","typeArguments","createNodeArray","replaceNode","isSome","none"],"sourceRoot":"","sources":["../../../src/refactors/noSyncWithConstant.ts"],"sourcesContent":[null]}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"removeCurryArrow.d.ts","sourceRoot":"","sources":["../../../src/refactors/removeCurryArrow.ts"],"names":[],"mappings":";
|
|
1
|
+
{"version":3,"file":"removeCurryArrow.d.ts","sourceRoot":"","sources":["../../../src/refactors/removeCurryArrow.ts"],"names":[],"mappings":";AAMA,wBAkBE"}
|
|
@@ -4,30 +4,24 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
6
|
exports.default = void 0;
|
|
7
|
-
var T = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/io/Effect"));
|
|
8
|
-
var AST = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/language-service/ast"));
|
|
9
7
|
var _definition = /*#__PURE__*/require("@effect/language-service/refactors/definition");
|
|
10
|
-
var
|
|
11
|
-
var
|
|
12
|
-
var
|
|
13
|
-
var
|
|
8
|
+
var AST = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/language-service/utils/AST"));
|
|
9
|
+
var _Function = /*#__PURE__*/require("@effect/language-service/utils/Function");
|
|
10
|
+
var O = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/language-service/utils/Option"));
|
|
11
|
+
var Ch = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/language-service/utils/ReadonlyArray"));
|
|
14
12
|
function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
|
|
15
13
|
function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
|
|
16
14
|
var _default = /*#__PURE__*/(0, _definition.createRefactor)({
|
|
17
15
|
name: "effect/removeCurryArrow",
|
|
18
16
|
description: "Remove arrow",
|
|
19
|
-
apply: (sourceFile, textRange) =>
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
changeTracker.replaceNode(sourceFile, node, newNode);
|
|
28
|
-
})
|
|
29
|
-
})));
|
|
30
|
-
})
|
|
17
|
+
apply: ts => (sourceFile, textRange) => (0, _Function.pipe)(AST.getNodesContainingRange(ts)(sourceFile, textRange), Ch.filter(AST.isCurryArrow(ts)), Ch.head, O.map(node => ({
|
|
18
|
+
description: `Remove arrow ${AST.getHumanReadableName(sourceFile, node.body)}`,
|
|
19
|
+
apply: changeTracker => {
|
|
20
|
+
if (!ts.isCallExpression(node.body)) return;
|
|
21
|
+
const newNode = node.body.expression;
|
|
22
|
+
changeTracker.replaceNode(sourceFile, node, newNode);
|
|
23
|
+
}
|
|
24
|
+
})))
|
|
31
25
|
});
|
|
32
26
|
exports.default = _default;
|
|
33
27
|
//# sourceMappingURL=removeCurryArrow.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"removeCurryArrow.js","mappings":";;;;;;AAAA;AACA;AACA;AACA;AACA;
|
|
1
|
+
{"version":3,"file":"removeCurryArrow.js","mappings":";;;;;;AAAA;AACA;AACA;AACA;AACA;AAAkE;AAAA;AAAA,4BAEnD,8BAAc,EAAC;EAC5BA,IAAI,EAAE,yBAAyB;EAC/BC,WAAW,EAAE,cAAc;EAC3BC,KAAK,EAAGC,EAAE,IACR,CAACC,UAAU,EAAEC,SAAS,KACpB,kBAAI,EACFC,GAAG,CAACC,uBAAuB,CAACJ,EAAE,CAAC,CAACC,UAAU,EAAEC,SAAS,CAAC,EACtDG,EAAE,CAACC,MAAM,CAACH,GAAG,CAACI,YAAY,CAACP,EAAE,CAAC,CAAC,EAC/BK,EAAE,CAACG,IAAI,EACPC,CAAC,CAACC,GAAG,CAAEC,IAAI,KAAM;IACfb,WAAW,EAAE,gBAAgBK,GAAG,CAACS,oBAAoB,CAACX,UAAU,EAAEU,IAAI,CAACE,IAAI,CAAC,EAAE;IAC9Ed,KAAK,EAAGe,aAAa,IAAI;MACvB,IAAI,CAACd,EAAE,CAACe,gBAAgB,CAACJ,IAAI,CAACE,IAAI,CAAC,EAAE;MACrC,MAAMG,OAAO,GAAGL,IAAI,CAACE,IAAI,CAACI,UAAU;MACpCH,aAAa,CAACI,WAAW,CAACjB,UAAU,EAAEU,IAAI,EAAEK,OAAO,CAAC;IACtD;GACD,CAAC,CAAC;CAEV,CAAC;AAAA","names":["name","description","apply","ts","sourceFile","textRange","AST","getNodesContainingRange","Ch","filter","isCurryArrow","head","O","map","node","getHumanReadableName","body","changeTracker","isCallExpression","newNode","expression","replaceNode"],"sourceRoot":"","sources":["../../../src/refactors/removeCurryArrow.ts"],"sourcesContent":[null]}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"removePipe.d.ts","sourceRoot":"","sources":["../../../src/refactors/removePipe.ts"],"names":[],"mappings":";
|
|
1
|
+
{"version":3,"file":"removePipe.d.ts","sourceRoot":"","sources":["../../../src/refactors/removePipe.ts"],"names":[],"mappings":";AAMA,wBAyBE"}
|
package/refactors/removePipe.js
CHANGED
|
@@ -4,29 +4,23 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
6
|
exports.default = void 0;
|
|
7
|
-
var T = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/io/Effect"));
|
|
8
|
-
var AST = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/language-service/ast"));
|
|
9
7
|
var _definition = /*#__PURE__*/require("@effect/language-service/refactors/definition");
|
|
10
|
-
var
|
|
11
|
-
var
|
|
12
|
-
var
|
|
13
|
-
var
|
|
8
|
+
var AST = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/language-service/utils/AST"));
|
|
9
|
+
var _Function = /*#__PURE__*/require("@effect/language-service/utils/Function");
|
|
10
|
+
var O = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/language-service/utils/Option"));
|
|
11
|
+
var Ch = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/language-service/utils/ReadonlyArray"));
|
|
14
12
|
function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
|
|
15
13
|
function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
|
|
16
14
|
var _default = /*#__PURE__*/(0, _definition.createRefactor)({
|
|
17
15
|
name: "effect/removePipe",
|
|
18
16
|
description: "Remove pipe call",
|
|
19
|
-
apply: (sourceFile, textRange) =>
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
changeTracker.replaceNode(sourceFile, node, newNode);
|
|
27
|
-
})
|
|
28
|
-
})));
|
|
29
|
-
})
|
|
17
|
+
apply: ts => (sourceFile, textRange) => (0, _Function.pipe)(AST.getNodesContainingRange(ts)(sourceFile, textRange), Ch.filter(AST.isPipeCall(ts)), Ch.filter(node => AST.isNodeInRange(textRange)(node.expression)), Ch.filter(node => node.arguments.length > 1), Ch.head, O.map(node => ({
|
|
18
|
+
description: "Remove pipe call",
|
|
19
|
+
apply: changeTracker => {
|
|
20
|
+
const newNode = node.arguments.slice(1).reduce((inner, exp) => ts.factory.createCallExpression(exp, undefined, [inner]), node.arguments[0]);
|
|
21
|
+
changeTracker.replaceNode(sourceFile, node, newNode);
|
|
22
|
+
}
|
|
23
|
+
})))
|
|
30
24
|
});
|
|
31
25
|
exports.default = _default;
|
|
32
26
|
//# sourceMappingURL=removePipe.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"removePipe.js","mappings":";;;;;;AAAA;AACA;AACA;AACA;AACA;
|
|
1
|
+
{"version":3,"file":"removePipe.js","mappings":";;;;;;AAAA;AACA;AACA;AACA;AACA;AAAkE;AAAA;AAAA,4BAEnD,8BAAc,EAAC;EAC5BA,IAAI,EAAE,mBAAmB;EACzBC,WAAW,EAAE,kBAAkB;EAC/BC,KAAK,EAAGC,EAAE,IACR,CAACC,UAAU,EAAEC,SAAS,KACpB,kBAAI,EACFC,GAAG,CAACC,uBAAuB,CAACJ,EAAE,CAAC,CAACC,UAAU,EAAEC,SAAS,CAAC,EACtDG,EAAE,CAACC,MAAM,CAACH,GAAG,CAACI,UAAU,CAACP,EAAE,CAAC,CAAC,EAC7BK,EAAE,CAACC,MAAM,CAAEE,IAAI,IAAKL,GAAG,CAACM,aAAa,CAACP,SAAS,CAAC,CAACM,IAAI,CAACE,UAAU,CAAC,CAAC,EAClEL,EAAE,CAACC,MAAM,CACNE,IAAI,IAAKA,IAAI,CAACG,SAAS,CAACC,MAAM,GAAG,CAAC,CACpC,EACDP,EAAE,CAACQ,IAAI,EACPC,CAAC,CAACC,GAAG,CAAEP,IAAI,KAAM;IACfV,WAAW,EAAE,kBAAkB;IAC/BC,KAAK,EAAGiB,aAAa,IAAI;MACvB,MAAMC,OAAO,GAAGT,IAAI,CAACG,SAAS,CAACO,KAAK,CAAC,CAAC,CAAC,CAACC,MAAM,CAC5C,CAACC,KAAK,EAAEC,GAAG,KAAKrB,EAAE,CAACsB,OAAO,CAACC,oBAAoB,CAACF,GAAG,EAAEG,SAAS,EAAE,CAACJ,KAAK,CAAC,CAAC,EACxEZ,IAAI,CAACG,SAAS,CAAC,CAAC,CAAE,CACnB;MAEDK,aAAa,CAACS,WAAW,CAACxB,UAAU,EAAEO,IAAI,EAAES,OAAO,CAAC;IACtD;GACD,CAAC,CAAC;CAEV,CAAC;AAAA","names":["name","description","apply","ts","sourceFile","textRange","AST","getNodesContainingRange","Ch","filter","isPipeCall","node","isNodeInRange","expression","arguments","length","head","O","map","changeTracker","newNode","slice","reduce","inner","exp","factory","createCallExpression","undefined","replaceNode"],"sourceRoot":"","sources":["../../../src/refactors/removePipe.ts"],"sourcesContent":[null]}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"toggleReturnTypeAnnotation.d.ts","sourceRoot":"","sources":["../../../src/refactors/toggleReturnTypeAnnotation.ts"],"names":[],"mappings":";
|
|
1
|
+
{"version":3,"file":"toggleReturnTypeAnnotation.d.ts","sourceRoot":"","sources":["../../../src/refactors/toggleReturnTypeAnnotation.ts"],"names":[],"mappings":";AAaA,wBAgDE"}
|
|
@@ -4,20 +4,17 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
6
|
exports.default = void 0;
|
|
7
|
-
var T = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/io/Effect"));
|
|
8
|
-
var AST = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/language-service/ast"));
|
|
9
7
|
var _definition = /*#__PURE__*/require("@effect/language-service/refactors/definition");
|
|
10
|
-
var
|
|
11
|
-
var
|
|
12
|
-
var
|
|
13
|
-
var
|
|
8
|
+
var AST = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/language-service/utils/AST"));
|
|
9
|
+
var _Function = /*#__PURE__*/require("@effect/language-service/utils/Function");
|
|
10
|
+
var O = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/language-service/utils/Option"));
|
|
11
|
+
var Ch = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/language-service/utils/ReadonlyArray"));
|
|
14
12
|
function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
|
|
15
13
|
function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
|
|
16
14
|
var _default = /*#__PURE__*/(0, _definition.createRefactor)({
|
|
17
15
|
name: "effect/toggleReturnTypeAnnotation",
|
|
18
16
|
description: "Toggle return type annotation",
|
|
19
|
-
apply: (
|
|
20
|
-
const ts = yield* $(T.service(AST.TypeScriptApi));
|
|
17
|
+
apply: (ts, program) => (sourceFile, textRange) => {
|
|
21
18
|
function isConvertibleDeclaration(node) {
|
|
22
19
|
switch (node.kind) {
|
|
23
20
|
case ts.SyntaxKind.FunctionDeclaration:
|
|
@@ -31,12 +28,10 @@ var _default = /*#__PURE__*/(0, _definition.createRefactor)({
|
|
|
31
28
|
}
|
|
32
29
|
return (0, _Function.pipe)(AST.getNodesContainingRange(ts)(sourceFile, textRange), Ch.filter(isConvertibleDeclaration), Ch.head, O.map(node => ({
|
|
33
30
|
description: "Toggle return type annotation",
|
|
34
|
-
apply:
|
|
35
|
-
const program = yield* $(T.service(AST.TypeScriptProgram));
|
|
31
|
+
apply: changeTracker => {
|
|
36
32
|
const typeChecker = program.getTypeChecker();
|
|
37
|
-
const changeTracker = yield* $(T.service(AST.ChangeTrackerApi));
|
|
38
33
|
if (node.type) {
|
|
39
|
-
|
|
34
|
+
AST.removeReturnTypeAnnotation(ts, changeTracker)(sourceFile, node);
|
|
40
35
|
return;
|
|
41
36
|
}
|
|
42
37
|
const callableType = typeChecker.getTypeAtLocation(node);
|
|
@@ -44,10 +39,10 @@ var _default = /*#__PURE__*/(0, _definition.createRefactor)({
|
|
|
44
39
|
const returnTypeNodes = returnTypes.map(type => typeChecker.typeToTypeNode(type, node, ts.NodeBuilderFlags.NoTruncation)).filter(node => !!node);
|
|
45
40
|
if (returnTypeNodes.length === 0) return;
|
|
46
41
|
const returnTypeNode = returnTypeNodes.length === 1 ? returnTypeNodes[0] : ts.factory.createUnionTypeNode(returnTypeNodes);
|
|
47
|
-
|
|
48
|
-
}
|
|
42
|
+
AST.addReturnTypeAnnotation(ts, changeTracker)(sourceFile, node, returnTypeNode);
|
|
43
|
+
}
|
|
49
44
|
})));
|
|
50
|
-
}
|
|
45
|
+
}
|
|
51
46
|
});
|
|
52
47
|
exports.default = _default;
|
|
53
48
|
//# sourceMappingURL=toggleReturnTypeAnnotation.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"toggleReturnTypeAnnotation.js","mappings":";;;;;;AAAA;AACA;AACA;AACA;AACA;
|
|
1
|
+
{"version":3,"file":"toggleReturnTypeAnnotation.js","mappings":";;;;;;AAAA;AACA;AACA;AACA;AACA;AAAkE;AAAA;AAAA,4BASnD,8BAAc,EAAC;EAC5BA,IAAI,EAAE,mCAAmC;EACzCC,WAAW,EAAE,+BAA+B;EAC5CC,KAAK,EAAE,CAACC,EAAE,EAAEC,OAAO,KACjB,CAACC,UAAU,EAAEC,SAAS,KAAI;IACxB,SAASC,wBAAwB,CAACC,IAAa;MAC7C,QAAQA,IAAI,CAACC,IAAI;QACf,KAAKN,EAAE,CAACO,UAAU,CAACC,mBAAmB;QACtC,KAAKR,EAAE,CAACO,UAAU,CAACE,kBAAkB;QACrC,KAAKT,EAAE,CAACO,UAAU,CAACG,aAAa;QAChC,KAAKV,EAAE,CAACO,UAAU,CAACI,iBAAiB;UAClC,OAAO,IAAI;QACb;UACE,OAAO,KAAK;MAAA;IAElB;IAEA,OAAO,kBAAI,EACTC,GAAG,CAACC,uBAAuB,CAACb,EAAE,CAAC,CAACE,UAAU,EAAEC,SAAS,CAAC,EACtDW,EAAE,CAACC,MAAM,CAACX,wBAAwB,CAAC,EACnCU,EAAE,CAACE,IAAI,EACPC,CAAC,CAACC,GAAG,CACFb,IAAI,KAAM;MACTP,WAAW,EAAE,+BAA+B;MAC5CC,KAAK,EAAGoB,aAAa,IAAI;QACvB,MAAMC,WAAW,GAAGnB,OAAO,CAACoB,cAAc,EAAE;QAE5C,IAAIhB,IAAI,CAACiB,IAAI,EAAE;UACbV,GAAG,CAACW,0BAA0B,CAACvB,EAAE,EAAEmB,aAAa,CAAC,CAACjB,UAAU,EAAEG,IAAI,CAAC;UACnE;;QAGF,MAAMmB,YAAY,GAAGJ,WAAW,CAACK,iBAAiB,CAACpB,IAAI,CAAC;QACxD,MAAMqB,WAAW,GAAGF,YAAY,CAACG,iBAAiB,EAAE,CAACT,GAAG,CAAEU,CAAC,IAAKA,CAAC,CAACC,aAAa,EAAE,CAAC;QAClF,MAAMC,eAAe,GAAGJ,WAAW,CAACR,GAAG,CAAEI,IAAI,IAC3CF,WAAW,CAACW,cAAc,CAACT,IAAI,EAAEjB,IAAI,EAAEL,EAAE,CAACgC,gBAAgB,CAACC,YAAY,CAAC,CACzE,CAAClB,MAAM,CAAEV,IAAI,IAA0B,CAAC,CAACA,IAAI,CAAC;QAC/C,IAAIyB,eAAe,CAACI,MAAM,KAAK,CAAC,EAAE;QAClC,MAAMC,cAAc,GAAGL,eAAe,CAACI,MAAM,KAAK,CAAC,GACjDJ,eAAe,CAAC,CAAC,CAAE,GACnB9B,EAAE,CAACoC,OAAO,CAACC,mBAAmB,CAACP,eAAe,CAAC;QAEjDlB,GAAG,CAAC0B,uBAAuB,CAACtC,EAAE,EAAEmB,aAAa,CAAC,CAACjB,UAAU,EAAEG,IAAI,EAAE8B,cAAc,CAAC;MAClF;KACD,CAAC,CACH,CACF;EACH;CACH,CAAC;AAAA","names":["name","description","apply","ts","program","sourceFile","textRange","isConvertibleDeclaration","node","kind","SyntaxKind","FunctionDeclaration","FunctionExpression","ArrowFunction","MethodDeclaration","AST","getNodesContainingRange","Ch","filter","head","O","map","changeTracker","typeChecker","getTypeChecker","type","removeReturnTypeAnnotation","callableType","getTypeAtLocation","returnTypes","getCallSignatures","s","getReturnType","returnTypeNodes","typeToTypeNode","NodeBuilderFlags","NoTruncation","length","returnTypeNode","factory","createUnionTypeNode","addReturnTypeAnnotation"],"sourceRoot":"","sources":["../../../src/refactors/toggleReturnTypeAnnotation.ts"],"sourcesContent":[null]}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"toggleTypeAnnotation.d.ts","sourceRoot":"","sources":["../../../src/refactors/toggleTypeAnnotation.ts"],"names":[],"mappings":";
|
|
1
|
+
{"version":3,"file":"toggleTypeAnnotation.d.ts","sourceRoot":"","sources":["../../../src/refactors/toggleTypeAnnotation.ts"],"names":[],"mappings":";AAMA,wBAoCE"}
|
|
@@ -4,43 +4,37 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
6
|
exports.default = void 0;
|
|
7
|
-
var T = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/io/Effect"));
|
|
8
|
-
var AST = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/language-service/ast"));
|
|
9
7
|
var _definition = /*#__PURE__*/require("@effect/language-service/refactors/definition");
|
|
10
|
-
var
|
|
11
|
-
var _Function = /*#__PURE__*/require("@
|
|
12
|
-
var O = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@
|
|
8
|
+
var AST = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/language-service/utils/AST"));
|
|
9
|
+
var _Function = /*#__PURE__*/require("@effect/language-service/utils/Function");
|
|
10
|
+
var O = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/language-service/utils/Option"));
|
|
11
|
+
var Ch = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/language-service/utils/ReadonlyArray"));
|
|
13
12
|
function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
|
|
14
13
|
function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
|
|
15
14
|
var _default = /*#__PURE__*/(0, _definition.createRefactor)({
|
|
16
15
|
name: "effect/toggleTypeAnnotation",
|
|
17
16
|
description: "Toggle type annotation",
|
|
18
|
-
apply: (sourceFile, textRange) =>
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
});
|
|
40
|
-
}
|
|
41
|
-
})
|
|
42
|
-
})));
|
|
43
|
-
})
|
|
17
|
+
apply: (ts, program) => (sourceFile, textRange) => (0, _Function.pipe)(AST.getNodesContainingRange(ts)(sourceFile, textRange), Ch.filter(ts.isVariableDeclaration), Ch.filter(node => AST.isNodeInRange(textRange)(node.name)), Ch.filter(node => !!node.initializer), Ch.head, O.map(node => ({
|
|
18
|
+
description: "Toggle type annotation",
|
|
19
|
+
apply: changeTracker => {
|
|
20
|
+
const typeChecker = program.getTypeChecker();
|
|
21
|
+
if (node.type) {
|
|
22
|
+
changeTracker.deleteRange(sourceFile, {
|
|
23
|
+
pos: node.name.end,
|
|
24
|
+
end: node.type.end
|
|
25
|
+
});
|
|
26
|
+
return;
|
|
27
|
+
}
|
|
28
|
+
const initializer = node.initializer;
|
|
29
|
+
const initializerType = typeChecker.getTypeAtLocation(initializer);
|
|
30
|
+
const initializerTypeNode = typeChecker.typeToTypeNode(initializerType, node, ts.NodeBuilderFlags.NoTruncation);
|
|
31
|
+
if (initializerTypeNode) {
|
|
32
|
+
changeTracker.insertNodeAt(sourceFile, node.name.end, initializerTypeNode, {
|
|
33
|
+
prefix: ": "
|
|
34
|
+
});
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
})))
|
|
44
38
|
});
|
|
45
39
|
exports.default = _default;
|
|
46
40
|
//# sourceMappingURL=toggleTypeAnnotation.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"toggleTypeAnnotation.js","mappings":";;;;;;AAAA;AACA;AACA;AACA;AACA;
|
|
1
|
+
{"version":3,"file":"toggleTypeAnnotation.js","mappings":";;;;;;AAAA;AACA;AACA;AACA;AACA;AAAkE;AAAA;AAAA,4BAEnD,8BAAc,EAAC;EAC5BA,IAAI,EAAE,6BAA6B;EACnCC,WAAW,EAAE,wBAAwB;EACrCC,KAAK,EAAE,CAACC,EAAE,EAAEC,OAAO,KACjB,CAACC,UAAU,EAAEC,SAAS,KACpB,kBAAI,EACFC,GAAG,CAACC,uBAAuB,CAACL,EAAE,CAAC,CAACE,UAAU,EAAEC,SAAS,CAAC,EACtDG,EAAE,CAACC,MAAM,CAACP,EAAE,CAACQ,qBAAqB,CAAC,EACnCF,EAAE,CAACC,MAAM,CAAEE,IAAI,IAAKL,GAAG,CAACM,aAAa,CAACP,SAAS,CAAC,CAACM,IAAI,CAACZ,IAAI,CAAC,CAAC,EAC5DS,EAAE,CAACC,MAAM,CAAEE,IAAI,IAAK,CAAC,CAACA,IAAI,CAACE,WAAW,CAAC,EACvCL,EAAE,CAACM,IAAI,EACPC,CAAC,CAACC,GAAG,CACFL,IAAI,KAAM;IACTX,WAAW,EAAE,wBAAwB;IACrCC,KAAK,EAAGgB,aAAa,IAAI;MACvB,MAAMC,WAAW,GAAGf,OAAO,CAACgB,cAAc,EAAE;MAE5C,IAAIR,IAAI,CAACS,IAAI,EAAE;QACbH,aAAa,CAACI,WAAW,CAACjB,UAAU,EAAE;UAAEkB,GAAG,EAAEX,IAAI,CAACZ,IAAI,CAACwB,GAAG;UAAEA,GAAG,EAAEZ,IAAI,CAACS,IAAI,CAACG;QAAG,CAAE,CAAC;QACjF;;MAGF,MAAMV,WAAW,GAAGF,IAAI,CAACE,WAAY;MACrC,MAAMW,eAAe,GAAGN,WAAW,CAACO,iBAAiB,CAACZ,WAAW,CAAC;MAClE,MAAMa,mBAAmB,GAAGR,WAAW,CAACS,cAAc,CACpDH,eAAe,EACfb,IAAI,EACJT,EAAE,CAAC0B,gBAAgB,CAACC,YAAY,CACjC;MACD,IAAIH,mBAAmB,EAAE;QACvBT,aAAa,CAACa,YAAY,CAAC1B,UAAU,EAAEO,IAAI,CAACZ,IAAI,CAACwB,GAAG,EAAEG,mBAAmB,EAAE;UAAEK,MAAM,EAAE;QAAI,CAAE,CAAC;;IAEhG;GACD,CAAC,CACH;CAER,CAAC;AAAA","names":["name","description","apply","ts","program","sourceFile","textRange","AST","getNodesContainingRange","Ch","filter","isVariableDeclaration","node","isNodeInRange","initializer","head","O","map","changeTracker","typeChecker","getTypeChecker","type","deleteRange","pos","end","initializerType","getTypeAtLocation","initializerTypeNode","typeToTypeNode","NodeBuilderFlags","NoTruncation","insertNodeAt","prefix"],"sourceRoot":"","sources":["../../../src/refactors/toggleTypeAnnotation.ts"],"sourcesContent":[null]}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wrapWithPipe.d.ts","sourceRoot":"","sources":["../../../src/refactors/wrapWithPipe.ts"],"names":[],"mappings":";
|
|
1
|
+
{"version":3,"file":"wrapWithPipe.d.ts","sourceRoot":"","sources":["../../../src/refactors/wrapWithPipe.ts"],"names":[],"mappings":";AAGA,wBAeE"}
|
|
@@ -4,26 +4,23 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
6
|
exports.default = void 0;
|
|
7
|
-
var T = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/io/Effect"));
|
|
8
|
-
var AST = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/language-service/ast"));
|
|
9
7
|
var _definition = /*#__PURE__*/require("@effect/language-service/refactors/definition");
|
|
10
|
-
var O = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@
|
|
8
|
+
var O = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/language-service/utils/Option"));
|
|
11
9
|
function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
|
|
12
10
|
function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
|
|
13
11
|
var _default = /*#__PURE__*/(0, _definition.createRefactor)({
|
|
14
12
|
name: "effect/wrapWithPipe",
|
|
15
13
|
description: "Wrap with pipe",
|
|
16
|
-
apply: (
|
|
14
|
+
apply: () => (sourceFile, textRange) => {
|
|
17
15
|
if (textRange.end - textRange.pos === 0) return O.none;
|
|
18
16
|
return O.some({
|
|
19
17
|
description: `Wrap with pipe(...)`,
|
|
20
|
-
apply:
|
|
21
|
-
const changeTracker = yield* $(T.service(AST.ChangeTrackerApi));
|
|
18
|
+
apply: changeTracker => {
|
|
22
19
|
changeTracker.insertText(sourceFile, textRange.pos, "pipe(");
|
|
23
20
|
changeTracker.insertText(sourceFile, textRange.end, ")");
|
|
24
|
-
}
|
|
21
|
+
}
|
|
25
22
|
});
|
|
26
|
-
}
|
|
23
|
+
}
|
|
27
24
|
});
|
|
28
25
|
exports.default = _default;
|
|
29
26
|
//# sourceMappingURL=wrapWithPipe.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wrapWithPipe.js","mappings":";;;;;;AAAA;AACA;
|
|
1
|
+
{"version":3,"file":"wrapWithPipe.js","mappings":";;;;;;AAAA;AACA;AAA0D;AAAA;AAAA,4BAE3C,8BAAc,EAAC;EAC5BA,IAAI,EAAE,qBAAqB;EAC3BC,WAAW,EAAE,gBAAgB;EAC7BC,KAAK,EAAE,MACL,CAACC,UAAU,EAAEC,SAAS,KAAI;IACxB,IAAIA,SAAS,CAACC,GAAG,GAAGD,SAAS,CAACE,GAAG,KAAK,CAAC,EAAE,OAAOC,CAAC,CAACC,IAAI;IAEtD,OAAOD,CAAC,CAACE,IAAI,CAAC;MACZR,WAAW,EAAE,qBAAqB;MAClCC,KAAK,EAAGQ,aAAa,IAAI;QACvBA,aAAa,CAACC,UAAU,CAACR,UAAU,EAAEC,SAAS,CAACE,GAAG,EAAE,OAAO,CAAC;QAC5DI,aAAa,CAACC,UAAU,CAACR,UAAU,EAAEC,SAAS,CAACC,GAAG,EAAE,GAAG,CAAC;MAC1D;KACD,CAAC;EACJ;CACH,CAAC;AAAA","names":["name","description","apply","sourceFile","textRange","end","pos","O","none","some","changeTracker","insertText"],"sourceRoot":"","sources":["../../../src/refactors/wrapWithPipe.ts"],"sourcesContent":[null]}
|