@effect/language-service 0.0.15 → 0.0.17

package/_mjs/refactors/toggleReturnTypeAnnotation.mjs

@@ -32,7 +32,7 @@ export default /*#__PURE__*/createRefactor({
         const returnTypeNodes = returnTypes.map(type => typeChecker.typeToTypeNode(type, node, ts.NodeBuilderFlags.NoTruncation)).filter(node => !!node);
         if (returnTypeNodes.length === 0) return;
         const returnTypeNode = returnTypeNodes.length === 1 ? returnTypeNodes[0] : ts.factory.createUnionTypeNode(returnTypeNodes);
-        AST.addReturnTypeAnnotation(ts, changeTracker)(sourceFile, node, returnTypeNode);
+        AST.addReturnTypeAnnotation(ts, changeTracker)(sourceFile, node, AST.simplifyTypeNode(ts)(returnTypeNode));
       }
     })));
   }

package/_mjs/refactors/toggleReturnTypeAnnotation.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"toggleReturnTypeAnnotation.mjs","mappings":"AAAA,SAASA,cAAc,QAAQ,+CAA+C;AAC9E,OAAO,KAAKC,GAAG,MAAM,oCAAoC;AACzD,SAASC,IAAI,QAAQ,yCAAyC;AAC9D,OAAO,KAAKC,CAAC,MAAM,uCAAuC;AAC1D,OAAO,KAAKC,EAAE,MAAM,8CAA8C;AASlE,4BAAeJ,cAAc,CAAC;EAC5BK,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,OAAOjB,IAAI,CACTD,GAAG,CAACmB,uBAAuB,CAACZ,EAAE,CAAC,CAACE,UAAU,EAAEC,SAAS,CAAC,EACtDP,EAAE,CAACiB,MAAM,CAACT,wBAAwB,CAAC,EACnCR,EAAE,CAACkB,IAAI,EACPnB,CAAC,CAACoB,GAAG,CACFV,IAAI,KAAM;MACTC,IAAI,EAAE,oDAAoD;MAC1DR,WAAW,EAAE,+BAA+B;MAC5CC,KAAK,EAAGiB,aAAa,IAAI;QACvB,MAAMC,WAAW,GAAGhB,OAAO,CAACiB,cAAc,EAAE;QAE5C,IAAIb,IAAI,CAACc,IAAI,EAAE;UACb1B,GAAG,CAAC2B,0BAA0B,CAACpB,EAAE,EAAEgB,aAAa,CAAC,CAACd,UAAU,EAAEG,IAAI,CAAC;UACnE;;QAGF,MAAMgB,YAAY,GAAGJ,WAAW,CAACK,iBAAiB,CAACjB,IAAI,CAAC;QACxD,MAAMkB,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,EAAEd,IAAI,EAAEL,EAAE,CAAC6B,gBAAgB,CAACC,YAAY,CAAC,CACzE,CAACjB,MAAM,CAAER,IAAI,IAA0B,CAAC,CAACA,IAAI,CAAC;QAC/C,IAAIsB,eAAe,CAACI,MAAM,KAAK,CAAC,EAAE;QAClC,MAAMC,cAAc,GAAGL,eAAe,CAACI,MAAM,KAAK,CAAC,GACjDJ,eAAe,CAAC,CAAC,CAAE,GACnB3B,EAAE,CAACiC,OAAO,CAACC,mBAAmB,CAACP,eAAe,CAAC;QAEjDlC,GAAG,CAAC0C,uBAAuB,CAACnC,EAAE,EAAEgB,aAAa,CAAC,CAACd,UAAU,EAAEG,IAAI,EAAE2B,cAAc,CAAC;MAClF;KACD,CAAC,CACH,CACF;EACH;CACH,CAAC","names":["createRefactor","AST","pipe","O","Ch","name","description","apply","ts","program","sourceFile","textRange","isConvertibleDeclaration","node","kind","SyntaxKind","FunctionDeclaration","FunctionExpression","ArrowFunction","MethodDeclaration","getNodesContainingRange","filter","head","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]}
+{"version":3,"file":"toggleReturnTypeAnnotation.mjs","mappings":"AAAA,SAASA,cAAc,QAAQ,+CAA+C;AAC9E,OAAO,KAAKC,GAAG,MAAM,oCAAoC;AACzD,SAASC,IAAI,QAAQ,yCAAyC;AAC9D,OAAO,KAAKC,CAAC,MAAM,uCAAuC;AAC1D,OAAO,KAAKC,EAAE,MAAM,8CAA8C;AASlE,4BAAeJ,cAAc,CAAC;EAC5BK,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,OAAOjB,IAAI,CACTD,GAAG,CAACmB,uBAAuB,CAACZ,EAAE,CAAC,CAACE,UAAU,EAAEC,SAAS,CAAC,EACtDP,EAAE,CAACiB,MAAM,CAACT,wBAAwB,CAAC,EACnCR,EAAE,CAACkB,IAAI,EACPnB,CAAC,CAACoB,GAAG,CACFV,IAAI,KAAM;MACTC,IAAI,EAAE,oDAAoD;MAC1DR,WAAW,EAAE,+BAA+B;MAC5CC,KAAK,EAAGiB,aAAa,IAAI;QACvB,MAAMC,WAAW,GAAGhB,OAAO,CAACiB,cAAc,EAAE;QAE5C,IAAIb,IAAI,CAACc,IAAI,EAAE;UACb1B,GAAG,CAAC2B,0BAA0B,CAACpB,EAAE,EAAEgB,aAAa,CAAC,CAACd,UAAU,EAAEG,IAAI,CAAC;UACnE;;QAGF,MAAMgB,YAAY,GAAGJ,WAAW,CAACK,iBAAiB,CAACjB,IAAI,CAAC;QACxD,MAAMkB,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,EAAEd,IAAI,EAAEL,EAAE,CAAC6B,gBAAgB,CAACC,YAAY,CAAC,CACzE,CAACjB,MAAM,CAAER,IAAI,IAA0B,CAAC,CAACA,IAAI,CAAC;QAC/C,IAAIsB,eAAe,CAACI,MAAM,KAAK,CAAC,EAAE;QAClC,MAAMC,cAAc,GAAGL,eAAe,CAACI,MAAM,KAAK,CAAC,GACjDJ,eAAe,CAAC,CAAC,CAAE,GACnB3B,EAAE,CAACiC,OAAO,CAACC,mBAAmB,CAACP,eAAe,CAAC;QAEjDlC,GAAG,CAAC0C,uBAAuB,CAACnC,EAAE,EAAEgB,aAAa,CAAC,CAACd,UAAU,EAAEG,IAAI,EAAEZ,GAAG,CAAC2C,gBAAgB,CAACpC,EAAE,CAAC,CAACgC,cAAc,CAAC,CAAC;MAC5G;KACD,CAAC,CACH,CACF;EACH;CACH,CAAC","names":["createRefactor","AST","pipe","O","Ch","name","description","apply","ts","program","sourceFile","textRange","isConvertibleDeclaration","node","kind","SyntaxKind","FunctionDeclaration","FunctionExpression","ArrowFunction","MethodDeclaration","getNodesContainingRange","filter","head","map","changeTracker","typeChecker","getTypeChecker","type","removeReturnTypeAnnotation","callableType","getTypeAtLocation","returnTypes","getCallSignatures","s","getReturnType","returnTypeNodes","typeToTypeNode","NodeBuilderFlags","NoTruncation","length","returnTypeNode","factory","createUnionTypeNode","addReturnTypeAnnotation","simplifyTypeNode"],"sourceRoot":"","sources":["../../../src/refactors/toggleReturnTypeAnnotation.ts"],"sourcesContent":[null]}

package/_mjs/refactors/toggleTypeAnnotation.mjs

@@ -22,7 +22,7 @@ export default /*#__PURE__*/createRefactor({
       const initializerType = typeChecker.getTypeAtLocation(initializer);
       const initializerTypeNode = typeChecker.typeToTypeNode(initializerType, node, ts.NodeBuilderFlags.NoTruncation);
       if (initializerTypeNode) {
-        changeTracker.insertNodeAt(sourceFile, node.name.end, initializerTypeNode, {
+        changeTracker.insertNodeAt(sourceFile, node.name.end, AST.simplifyTypeNode(ts)(initializerTypeNode), {
           prefix: ": "
         });
       }

package/_mjs/refactors/toggleTypeAnnotation.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"toggleTypeAnnotation.mjs","mappings":"AAAA,SAASA,cAAc,QAAQ,+CAA+C;AAC9E,OAAO,KAAKC,GAAG,MAAM,oCAAoC;AACzD,SAASC,IAAI,QAAQ,yCAAyC;AAC9D,OAAO,KAAKC,CAAC,MAAM,uCAAuC;AAC1D,OAAO,KAAKC,EAAE,MAAM,8CAA8C;AAElE,4BAAeJ,cAAc,CAAC;EAC5BK,IAAI,EAAE,6BAA6B;EACnCC,WAAW,EAAE,wBAAwB;EACrCC,KAAK,EAAE,CAACC,EAAE,EAAEC,OAAO,KACjB,CAACC,UAAU,EAAEC,SAAS,KACpBT,IAAI,CACFD,GAAG,CAACW,uBAAuB,CAACJ,EAAE,CAAC,CAACE,UAAU,EAAEC,SAAS,CAAC,EACtDP,EAAE,CAACS,MAAM,CAACL,EAAE,CAACM,qBAAqB,CAAC,EACnCV,EAAE,CAACS,MAAM,CAAEE,IAAI,IAAKd,GAAG,CAACe,aAAa,CAACL,SAAS,CAAC,CAACI,IAAI,CAACV,IAAI,CAAC,CAAC,EAC5DD,EAAE,CAACS,MAAM,CAAEE,IAAI,IAAK,CAAC,CAACA,IAAI,CAACE,WAAW,CAAC,EACvCb,EAAE,CAACc,IAAI,EACPf,CAAC,CAACgB,GAAG,CACFJ,IAAI,KAAM;IACTK,IAAI,EAAE,8CAA8C;IACpDd,WAAW,EAAE,wBAAwB;IACrCC,KAAK,EAAGc,aAAa,IAAI;MACvB,MAAMC,WAAW,GAAGb,OAAO,CAACc,cAAc,EAAE;MAE5C,IAAIR,IAAI,CAACS,IAAI,EAAE;QACbH,aAAa,CAACI,WAAW,CAACf,UAAU,EAAE;UAAEgB,GAAG,EAAEX,IAAI,CAACV,IAAI,CAACsB,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,EACJP,EAAE,CAACwB,gBAAgB,CAACC,YAAY,CACjC;MACD,IAAIH,mBAAmB,EAAE;QACvBT,aAAa,CAACa,YAAY,CAACxB,UAAU,EAAEK,IAAI,CAACV,IAAI,CAACsB,GAAG,EAAEG,mBAAmB,EAAE;UAAEK,MAAM,EAAE;QAAI,CAAE,CAAC;;IAEhG;GACD,CAAC,CACH;CAER,CAAC","names":["createRefactor","AST","pipe","O","Ch","name","description","apply","ts","program","sourceFile","textRange","getNodesContainingRange","filter","isVariableDeclaration","node","isNodeInRange","initializer","head","map","kind","changeTracker","typeChecker","getTypeChecker","type","deleteRange","pos","end","initializerType","getTypeAtLocation","initializerTypeNode","typeToTypeNode","NodeBuilderFlags","NoTruncation","insertNodeAt","prefix"],"sourceRoot":"","sources":["../../../src/refactors/toggleTypeAnnotation.ts"],"sourcesContent":[null]}
+{"version":3,"file":"toggleTypeAnnotation.mjs","mappings":"AAAA,SAASA,cAAc,QAAQ,+CAA+C;AAC9E,OAAO,KAAKC,GAAG,MAAM,oCAAoC;AACzD,SAASC,IAAI,QAAQ,yCAAyC;AAC9D,OAAO,KAAKC,CAAC,MAAM,uCAAuC;AAC1D,OAAO,KAAKC,EAAE,MAAM,8CAA8C;AAElE,4BAAeJ,cAAc,CAAC;EAC5BK,IAAI,EAAE,6BAA6B;EACnCC,WAAW,EAAE,wBAAwB;EACrCC,KAAK,EAAE,CAACC,EAAE,EAAEC,OAAO,KACjB,CAACC,UAAU,EAAEC,SAAS,KACpBT,IAAI,CACFD,GAAG,CAACW,uBAAuB,CAACJ,EAAE,CAAC,CAACE,UAAU,EAAEC,SAAS,CAAC,EACtDP,EAAE,CAACS,MAAM,CAACL,EAAE,CAACM,qBAAqB,CAAC,EACnCV,EAAE,CAACS,MAAM,CAAEE,IAAI,IAAKd,GAAG,CAACe,aAAa,CAACL,SAAS,CAAC,CAACI,IAAI,CAACV,IAAI,CAAC,CAAC,EAC5DD,EAAE,CAACS,MAAM,CAAEE,IAAI,IAAK,CAAC,CAACA,IAAI,CAACE,WAAW,CAAC,EACvCb,EAAE,CAACc,IAAI,EACPf,CAAC,CAACgB,GAAG,CACFJ,IAAI,KAAM;IACTK,IAAI,EAAE,8CAA8C;IACpDd,WAAW,EAAE,wBAAwB;IACrCC,KAAK,EAAGc,aAAa,IAAI;MACvB,MAAMC,WAAW,GAAGb,OAAO,CAACc,cAAc,EAAE;MAE5C,IAAIR,IAAI,CAACS,IAAI,EAAE;QACbH,aAAa,CAACI,WAAW,CAACf,UAAU,EAAE;UAAEgB,GAAG,EAAEX,IAAI,CAACV,IAAI,CAACsB,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,EACJP,EAAE,CAACwB,gBAAgB,CAACC,YAAY,CACjC;MACD,IAAIH,mBAAmB,EAAE;QACvBT,aAAa,CAACa,YAAY,CAACxB,UAAU,EAAEK,IAAI,CAACV,IAAI,CAACsB,GAAG,EAAE1B,GAAG,CAACkC,gBAAgB,CAAC3B,EAAE,CAAC,CAACsB,mBAAmB,CAAC,EAAE;UACnGM,MAAM,EAAE;SACT,CAAC;;IAEN;GACD,CAAC,CACH;CAER,CAAC","names":["createRefactor","AST","pipe","O","Ch","name","description","apply","ts","program","sourceFile","textRange","getNodesContainingRange","filter","isVariableDeclaration","node","isNodeInRange","initializer","head","map","kind","changeTracker","typeChecker","getTypeChecker","type","deleteRange","pos","end","initializerType","getTypeAtLocation","initializerTypeNode","typeToTypeNode","NodeBuilderFlags","NoTruncation","insertNodeAt","simplifyTypeNode","prefix"],"sourceRoot":"","sources":["../../../src/refactors/toggleTypeAnnotation.ts"],"sourcesContent":[null]}

package/_mjs/utils/AST.mjs

@@ -153,4 +153,34 @@ export function removeReturnTypeAnnotation(ts, changes) {
 export function getEffectModuleIdentifier(ts) {
   return sourceFile => pipe(findModuleImportIdentifierName(ts)(sourceFile, "@effect/io/Effect"), O.orElse(findModuleImportIdentifierName(ts)(sourceFile, "@effect/io/Effect")), O.getOrElse(() => "Effect"));
 }
+export function simplifyTypeNode(ts) {
+  function collectCallable(typeNode) {
+    // (() => 1) -> skip to inner node
+    if (ts.isParenthesizedTypeNode(typeNode)) return collectCallable(typeNode.type);
+    // () => 1 -> convert to call signature
+    if (ts.isFunctionTypeNode(typeNode)) {
+      return O.some([ts.factory.createCallSignature(typeNode.typeParameters, typeNode.parameters, typeNode.type)]);
+    }
+    // { ... } -> if every member is callsignature, return a merge of all of those
+    if (ts.isTypeLiteralNode(typeNode)) {
+      const allCallSignatures = typeNode.members.every(ts.isCallSignatureDeclaration);
+      if (allCallSignatures) return O.some(typeNode.members);
+    }
+    // ... & ... -> if both are callable, return merge of both
+    if (ts.isIntersectionTypeNode(typeNode)) {
+      const members = typeNode.types.map(collectCallable);
+      if (members.every(O.isSome)) {
+        return O.some(members.map(_ => O.isSome(_) ? _.value : []).flat());
+      }
+    }
+    return O.none;
+  }
+  return typeNode => {
+    const callSignatures = collectCallable(typeNode);
+    if (O.isSome(callSignatures) && callSignatures.value.length > 1) {
+      return ts.factory.createTypeLiteralNode(callSignatures.value);
+    }
+    return typeNode;
+  };
+}
 //# sourceMappingURL=AST.mjs.map

package/_mjs/utils/AST.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"AST.mjs","mappings":"AAAA,SAASA,IAAI,QAAQ,yCAAyC;AAC9D,OAAO,KAAKC,CAAC,MAAM,uCAAuC;AAC1D,OAAO,KAAKC,EAAE,MAAM,8CAA8C;AAwHlE,OAAM,MAAOC,gBAAgB;EAE3BC,YACWC,QAAgB;IAAhB,aAAQ,GAARA,QAAQ;IAFV,SAAI,GAAG,kBAAkB;EAG/B;;AAGL,OAAM,SAAUC,aAAa,CAACC,OAAmB;EAC/C,OAAQF,QAAgB,IAAI;IAC1B,MAAMG,UAAU,GAAGD,OAAO,CAACD,aAAa,CAACD,QAAQ,CAAC;IAClD,IAAI,CAACG,UAAU,EAAE;MACf,MAAM,IAAIL,gBAAgB,CAACE,QAAQ,CAAC;;IAEtC,OAAOG,UAAU;EACnB,CAAC;AACH;AAEA,OAAM,SAAUC,WAAW,CAACC,EAAiB;EAC3C,OAAO,CAACC,IAAoB,EAAEC,IAAsB,KAAK,CAAC,EAAEF,EAAE,CAACG,wBAAwB,CAACF,IAAI,CAAC,GAAGC,IAAI,CAAC;AACvG;AAEA;;;AAGA,OAAM,SAAUE,uBAAuB,CACrCJ,EAAiB;EAEjB,OAAQ,CAACF,UAAyB,EAAEO,SAAuB,KAAI;IAC7D,MAAMC,cAAc,GAAGN,EAAE,CAACO,kBAAkB,CAACF,SAAS,CAACG,GAAG,EAAEV,UAAU,CAAC;IACvE,IAAI,CAACQ,cAAc,EAAE,OAAOd,EAAE,CAACiB,KAAK;IAEpC,IAAIC,MAAM,GAAsBlB,EAAE,CAACiB,KAAK;IACxC,IAAIE,MAAM,GAAGL,cAAc;IAC3B,OAAOK,MAAM,EAAE;MACbD,MAAM,GAAGpB,IAAI,CAACoB,MAAM,EAAElB,EAAE,CAACoB,MAAM,CAACD,MAAM,CAAC,CAAC;MACxCA,MAAM,GAAGA,MAAM,CAACA,MAAM;;IAGxB,OAAOD,MAAM;EACf,CAAC;AACH;AAEA;;;AAGA,OAAM,SAAUG,WAAW,CAACC,eAAsC;EAChE,OAAO,OAAOA,eAAe,KAAK,QAAQ,GAAG;IAAEC,GAAG,EAAED,eAAe;IAAEN,GAAG,EAAEM;EAAe,CAAE,GAAGA,eAAe;AAC/G;AAEA,OAAM,SAAUE,oBAAoB,CAAClB,UAAyB,EAAEG,IAAa;EAC3E,MAAMgB,IAAI,GAAGhB,IAAI,CAACiB,OAAO,CAACpB,UAAU,CAAC;EACrC,OAAOmB,IAAI,CAACE,MAAM,GAAG,EAAE,GAAGF,IAAI,CAACG,SAAS,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,KAAK,GAAGH,IAAI;AAChE;AAEA,OAAM,SAAUI,UAAU,CAACrB,EAAiB;EAC1C,OAAO,CAAoBsB,QAAiB,EAAEC,IAAkC,KAAI;IAClF,IAAIb,MAAM,GAAgBlB,EAAE,CAACiB,KAAK;IAElC,SAASe,OAAO,CAACvB,IAAa;MAC5B,IAAIsB,IAAI,CAACtB,IAAI,CAAC,EAAES,MAAM,GAAGpB,IAAI,CAACoB,MAAM,EAAElB,EAAE,CAACoB,MAAM,CAACX,IAAI,CAAC,CAAC;MACtDD,EAAE,CAACyB,YAAY,CAACxB,IAAI,EAAEuB,OAAO,CAAC;IAChC;IAEAA,OAAO,CAACF,QAAQ,CAAC;IAEjB,OAAOZ,MAAM;EACf,CAAC;AACH;AAEA,OAAM,SAAUgB,iBAAiB,CAC/B1B,EAAiB;EAEjB,OAAQ,CAAC2B,QAAgB,EAAE7B,UAAyB,KAAI;IACtD,MAAM8B,aAAa,GAAG5B,EAAE,CAACO,kBAAkB,CAACoB,QAAQ,EAAE7B,UAAU,CAAC;IACjE,IACE8B,aAAa,IAAID,QAAQ,IAAIC,aAAa,CAACb,GAAG,KAC7Cf,EAAE,CAAC6B,YAAY,CAACD,aAAa,CAAC,IAAI5B,EAAE,CAAC8B,SAAS,CAACF,aAAa,CAAC1B,IAAI,CAAC,CAAC,EACpE;MACA,MAAM6B,YAAY,GAAG/B,EAAE,CAACO,kBAAkB,CAACqB,aAAa,CAACI,YAAY,EAAE,EAAElC,UAAU,EAAE,aAAcmC,SAAS,CAAE,EAAC;MAC/G,OAAO;QAAEF,YAAY,EAAExC,CAAC,CAAC2C,IAAI,CAACH,YAAY,CAAC;QAAEH,aAAa,EAAErC,CAAC,CAAC2C,IAAI,CAACN,aAAa;MAAC,CAAE;;IAErF,OAAO;MAAEG,YAAY,EAAExC,CAAC,CAAC4C,YAAY,CAACP,aAAa,CAAC;MAAEA,aAAa,EAAErC,CAAC,CAAC4C,YAAY,CAACP,aAAa;IAAC,CAAE;EACtG,CAAC;AACH;AAEA,OAAM,SAAUQ,aAAa,CAAC/B,SAAuB;EACnD,OAAQJ,IAAa,IAAKA,IAAI,CAACO,GAAG,IAAIH,SAAS,CAACG,GAAG,IAAIP,IAAI,CAACc,GAAG,IAAIV,SAAS,CAACU,GAAG;AAClF;AAEA,OAAM,SAAUsB,8BAA8B,CAC5CrC,EAAiB;EAEjB,OAAO,CAACF,UAAyB,EAAEwC,UAAkB,KAAI;IACvD,OAAO/C,CAAC,CAAC4C,YAAY,CAACnC,EAAE,CAACyB,YAAY,CAAC3B,UAAU,EAAGG,IAAI,IAAI;MACzD,IAAI,CAACD,EAAE,CAACuC,mBAAmB,CAACtC,IAAI,CAAC,EAAE;MACnC,MAAMuC,eAAe,GAAGvC,IAAI,CAACuC,eAAe;MAC5C,IAAI,CAACxC,EAAE,CAACyC,eAAe,CAACD,eAAe,CAAC,EAAE;MAC1C,IAAIA,eAAe,CAACvB,IAAI,KAAKqB,UAAU,EAAE;MACzC,MAAMI,YAAY,GAAGzC,IAAI,CAACyC,YAAY;MACtC,IAAI,CAACA,YAAY,EAAE;MACnB,MAAMC,aAAa,GAAGD,YAAY,CAACC,aAAa;MAChD,IAAI,CAACA,aAAa,EAAE;MACpB,IAAI,CAAC3C,EAAE,CAAC4C,iBAAiB,CAACD,aAAa,CAAC,EAAE;MAC1C,OAAOA,aAAa,CAACE,IAAI,CAAC5B,IAAI;IAChC,CAAC,CAAC,CAAC;EACL,CAAC;AACH;AAEA,OAAM,SAAU6B,8BAA8B,CAC5C9C,EAAiB;EAEjB,OAAO,CACLC,IAAuE,EACvE8C,UAAkB,EAClBC,OAAqD,KACnD;IACF,SAASxB,OAAO,CAACyB,CAAU;MACzB,IAAIjD,EAAE,CAACkD,iBAAiB,CAACD,CAAC,CAAC,EAAE;QAC3B,MAAME,UAAU,GAAGnD,EAAE,CAACoD,cAAc,CAACH,CAAC,CAACE,UAAU,EAAE3B,OAAO,EAAExB,EAAE,CAACqD,yBAAyB,CAAC;QAEzF,OAAOrD,EAAE,CAACsD,OAAO,CAACC,qBAAqB,CACrCvD,EAAE,CAACsD,OAAO,CAACE,WAAW,CAACxD,EAAE,CAACyD,UAAU,CAACC,aAAa,CAAC,EACnD1D,EAAE,CAACsD,OAAO,CAACK,oBAAoB,CAAC3D,EAAE,CAACsD,OAAO,CAACM,gBAAgB,CAAC,GAAG,CAAC,EAAE3B,SAAS,EAAE,CAACe,OAAO,CAACG,UAAU,CAAC,CAAC,CAAC,CACpG;;MAEH,OAAOnD,EAAE,CAACoD,cAAc,CAACH,CAAC,EAAEzB,OAAO,EAAExB,EAAE,CAACqD,yBAAyB,CAAC;IACpE;IACA,MAAMQ,aAAa,GAAGrC,OAAO,CAACvB,IAAI,CAAC6D,IAAK,CAAC;IAEzC,MAAMC,SAAS,GAAG/D,EAAE,CAACsD,OAAO,CAACU,wBAAwB,CACnD,EAAE,EACFhE,EAAE,CAACsD,OAAO,CAACE,WAAW,CAACxD,EAAE,CAACyD,UAAU,CAACC,aAAa,CAAC,EACnDzB,SAAS,EACT,EAAE,EACF,CAACjC,EAAE,CAACsD,OAAO,CAACW,0BAA0B,CAAChC,SAAS,EAAEA,SAAS,EAAE,GAAG,CAAC,CAAC,EAClEA,SAAS,EACT4B,aAAoB,CAAC;IAAA,CACtB;;IAED,MAAMK,gBAAgB,GAAGlE,EAAE,CAACsD,OAAO,CAACK,oBAAoB,CACtD3D,EAAE,CAACsD,OAAO,CAACa,8BAA8B,CACvCnE,EAAE,CAACsD,OAAO,CAACM,gBAAgB,CAACb,UAAU,CAAC,EACvC,KAAK,CACN,EACDd,SAAS,EACT,CAAC8B,SAAgB,CAAC,CACnB;IAED,IAAIK,YAAY,GAAGpE,EAAE,CAACG,wBAAwB,CAACF,IAAI,CAAC;IACpDmE,YAAY,IAAI,CAACpE,EAAE,CAACqE,aAAa,CAACC,KAAK;IACvC,MAAMC,YAAY,GAAGvE,EAAE,CAACsD,OAAO,CAACkB,gCAAgC,CAACJ,YAAY,CAAC;IAE9E,IAAIpE,EAAE,CAACyE,eAAe,CAACxE,IAAI,CAAC,EAAE;MAC5B,OAAOD,EAAE,CAACsD,OAAO,CAACoB,mBAAmB,CACnCH,YAAY,EACZtE,IAAI,CAAC0E,cAAc,EACnB1E,IAAI,CAAC2E,UAAU,EACf3C,SAAS,EACThC,IAAI,CAAC4E,sBAAsB,EAC3BX,gBAAgB,CACjB;;IAGH,MAAMY,OAAO,GAAG9E,EAAE,CAACsD,OAAO,CAACyB,WAAW,CAAC,CACrC/E,EAAE,CAACsD,OAAO,CAAC0B,qBAAqB,CAACd,gBAAgB,CAAC,CACnD,CAAC;IAEF,IAAIlE,EAAE,CAACiF,qBAAqB,CAAChF,IAAI,CAAC,EAAE;MAClC,OAAOD,EAAE,CAACsD,OAAO,CAAC4B,yBAAyB,CACzCX,YAAY,EACZtE,IAAI,CAACkF,aAAa,EAClBlF,IAAI,CAAC4C,IAAI,EACT5C,IAAI,CAAC0E,cAAc,EACnB1E,IAAI,CAAC2E,UAAU,EACf3C,SAAS,EACT6C,OAAO,CACR;;IAEH,OAAO9E,EAAE,CAACsD,OAAO,CAACU,wBAAwB,CACxCO,YAAY,EACZtE,IAAI,CAACkF,aAAa,EAClBlF,IAAI,CAAC4C,IAAI,EACT5C,IAAI,CAAC0E,cAAc,EACnB1E,IAAI,CAAC2E,UAAU,EACf3C,SAAS,EACT6C,OAAO,CACR;EACH,CAAC;AACH;AAEA,OAAM,SAAUM,uBAAuB,CACrCpF,EAAiB,EACjBqF,OAAqC;EAErC,OAAO,CACLvF,UAAyB,EACzBwF,WAIwB,EACxBC,QAAqB,KACnB;IACF,MAAMC,UAAU,GAAGxF,EAAE,CAACyF,eAAe,CAACH,WAAW,EAAEtF,EAAE,CAACyD,UAAU,CAACiC,eAAe,EAAE5F,UAAU,CAAC;IAC7F,MAAM6F,UAAU,GAAG3F,EAAE,CAACyE,eAAe,CAACa,WAAW,CAAC,IAAIE,UAAU,KAAKvD,SAAS;IAC9E,MAAM2D,OAAO,GAAGD,UAAU,GAAGL,WAAW,CAACV,UAAU,CAAC,CAAC,CAAC,GAAGY,UAAU;IACnE,IAAII,OAAO,EAAE;MACX,IAAID,UAAU,EAAE;QACdN,OAAO,CAACQ,gBAAgB,CAAC/F,UAAU,EAAE8F,OAAO,EAAE5F,EAAE,CAACsD,OAAO,CAACE,WAAW,CAACxD,EAAE,CAACyD,UAAU,CAACqC,cAAc,CAAC,CAAC;QACnGT,OAAO,CAACU,eAAe,CAACjG,UAAU,EAAE8F,OAAO,EAAE5F,EAAE,CAACsD,OAAO,CAACE,WAAW,CAACxD,EAAE,CAACyD,UAAU,CAACiC,eAAe,CAAC,CAAC;;MAErGL,OAAO,CAACW,YAAY,CAAClG,UAAU,EAAE8F,OAAO,CAAC7E,GAAG,EAAEwE,QAAQ,EAAE;QAAEU,MAAM,EAAE;MAAI,CAAE,CAAC;;EAE7E,CAAC;AACH;AAEA,OAAM,SAAUC,0BAA0B,CACxClG,EAAiB,EACjBqF,OAAqC;EAErC,OAAO,CACLvF,UAAyB,EACzBwF,WAIwB,KACtB;IACF,MAAME,UAAU,GAAGxF,EAAE,CAACyF,eAAe,CAACH,WAAW,EAAEtF,EAAE,CAACyD,UAAU,CAACiC,eAAe,EAAE5F,UAAU,CAAC;IAC7F,MAAM6F,UAAU,GAAG3F,EAAE,CAACyE,eAAe,CAACa,WAAW,CAAC,IAAIE,UAAU,KAAKvD,SAAS;IAC9E,MAAM2D,OAAO,GAAGD,UAAU,GAAGL,WAAW,CAACV,UAAU,CAAC,CAAC,CAAC,GAAGY,UAAU;IACnE,IAAII,OAAO,IAAIN,WAAW,CAACa,IAAI,EAAE;MAC/Bd,OAAO,CAACe,WAAW,CAACtG,UAAU,EAAE;QAAEU,GAAG,EAAEoF,OAAO,CAAC7E,GAAG;QAAEA,GAAG,EAAEuE,WAAW,CAACa,IAAI,CAACpF;MAAG,CAAE,CAAC;;EAEpF,CAAC;AACH;AAEA,OAAM,SAAUsF,yBAAyB,CAACrG,EAAiB;EACzD,OAAQF,UAAyB,IAC/BR,IAAI,CACF+C,8BAA8B,CAACrC,EAAE,CAAC,CAACF,UAAU,EAAE,mBAAmB,CAAC,EACnEP,CAAC,CAAC+G,MAAM,CAACjE,8BAA8B,CAACrC,EAAE,CAAC,CAACF,UAAU,EAAE,mBAAmB,CAAC,CAAC,EAC7EP,CAAC,CAACgH,SAAS,CACT,MAAM,QAAQ,CACf,CACF;AACL","names":["pipe","O","Ch","NoSuchSourceFile","constructor","fileName","getSourceFile","program","sourceFile","hasModifier","ts","node","kind","getCombinedModifierFlags","getNodesContainingRange","textRange","precedingToken","findPrecedingToken","pos","empty","result","parent","append","toTextRange","positionOrRange","end","getHumanReadableName","text","getText","length","substring","collectAll","rootNode","test","visitor","forEachChild","getRelevantTokens","position","previousToken","isMemberName","isKeyword","contextToken","getFullStart","undefined","some","fromNullable","isNodeInRange","findModuleImportIdentifierName","moduleName","isImportDeclaration","moduleSpecifier","isStringLiteral","importClause","namedBindings","isNamespaceImport","name","transformAsyncAwaitToEffectGen","effectName","onAwait","_","isAwaitExpression","expression","visitEachChild","nullTransformationContext","factory","createYieldExpression","createToken","SyntaxKind","AsteriskToken","createCallExpression","createIdentifier","generatorBody","body","generator","createFunctionExpression","createParameterDeclaration","effectGenCallExp","createPropertyAccessExpression","currentFlags","ModifierFlags","Async","newModifiers","createModifiersFromModifierFlags","isArrowFunction","createArrowFunction","typeParameters","parameters","equalsGreaterThanToken","newBody","createBlock","createReturnStatement","isFunctionDeclaration","createFunctionDeclaration","asteriskToken","addReturnTypeAnnotation","changes","declaration","typeNode","closeParen","findChildOfKind","CloseParenToken","needParens","endNode","insertNodeBefore","OpenParenToken","insertNodeAfter","insertNodeAt","prefix","removeReturnTypeAnnotation","type","deleteRange","getEffectModuleIdentifier","orElse","getOrElse"],"sourceRoot":"","sources":["../../../src/utils/AST.ts"],"sourcesContent":[null]}
+{"version":3,"file":"AST.mjs","mappings":"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","names":["pipe","O","Ch","NoSuchSourceFile","constructor","fileName","getSourceFile","program","sourceFile","hasModifier","ts","node","kind","getCombinedModifierFlags","getNodesContainingRange","textRange","precedingToken","findPrecedingToken","pos","empty","result","parent","append","toTextRange","positionOrRange","end","getHumanReadableName","text","getText","length","substring","collectAll","rootNode","test","visitor","forEachChild","getRelevantTokens","position","previousToken","isMemberName","isKeyword","contextToken","getFullStart","undefined","some","fromNullable","isNodeInRange","findModuleImportIdentifierName","moduleName","isImportDeclaration","moduleSpecifier","isStringLiteral","importClause","namedBindings","isNamespaceImport","name","transformAsyncAwaitToEffectGen","effectName","onAwait","_","isAwaitExpression","expression","visitEachChild","nullTransformationContext","factory","createYieldExpression","createToken","SyntaxKind","AsteriskToken","createCallExpression","createIdentifier","generatorBody","body","generator","createFunctionExpression","createParameterDeclaration","effectGenCallExp","createPropertyAccessExpression","currentFlags","ModifierFlags","Async","newModifiers","createModifiersFromModifierFlags","isArrowFunction","createArrowFunction","typeParameters","parameters","equalsGreaterThanToken","newBody","createBlock","createReturnStatement","isFunctionDeclaration","createFunctionDeclaration","asteriskToken","addReturnTypeAnnotation","changes","declaration","typeNode","closeParen","findChildOfKind","CloseParenToken","needParens","endNode","insertNodeBefore","OpenParenToken","insertNodeAfter","insertNodeAt","prefix","removeReturnTypeAnnotation","type","deleteRange","getEffectModuleIdentifier","orElse","getOrElse","simplifyTypeNode","collectCallable","isParenthesizedTypeNode","isFunctionTypeNode","createCallSignature","isTypeLiteralNode","allCallSignatures","members","every","isCallSignatureDeclaration","isIntersectionTypeNode","types","map","isSome","value","flat","none","callSignatures","createTypeLiteralNode"],"sourceRoot":"","sources":["../../../src/utils/AST.ts"],"sourcesContent":[null]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effect/language-service",
-  "version": "0.0.15",
+  "version": "0.0.17",
   "license": "MIT",
   "repository": {
     "type": "git",

package/refactors/toggleReturnTypeAnnotation.js

@@ -40,7 +40,7 @@ var _default = /*#__PURE__*/(0, _definition.createRefactor)({
         const returnTypeNodes = returnTypes.map(type => typeChecker.typeToTypeNode(type, node, ts.NodeBuilderFlags.NoTruncation)).filter(node => !!node);
         if (returnTypeNodes.length === 0) return;
         const returnTypeNode = returnTypeNodes.length === 1 ? returnTypeNodes[0] : ts.factory.createUnionTypeNode(returnTypeNodes);
-        AST.addReturnTypeAnnotation(ts, changeTracker)(sourceFile, node, returnTypeNode);
+        AST.addReturnTypeAnnotation(ts, changeTracker)(sourceFile, node, AST.simplifyTypeNode(ts)(returnTypeNode));
       }
     })));
   }

package/refactors/toggleReturnTypeAnnotation.js.map

@@ -1 +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;MACTC,IAAI,EAAE,oDAAoD;MAC1DR,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]}
+{"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;MACTC,IAAI,EAAE,oDAAoD;MAC1DR,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,EAAEO,GAAG,CAAC2B,gBAAgB,CAACvC,EAAE,CAAC,CAACmC,cAAc,CAAC,CAAC;MAC5G;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","simplifyTypeNode"],"sourceRoot":"","sources":["../../../src/refactors/toggleReturnTypeAnnotation.ts"],"sourcesContent":[null]}

package/refactors/toggleTypeAnnotation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"toggleTypeAnnotation.d.ts","sourceRoot":"","sources":["../../../src/refactors/toggleTypeAnnotation.ts"],"names":[],"mappings":";AAMA,wBAqCE"}
+{"version":3,"file":"toggleTypeAnnotation.d.ts","sourceRoot":"","sources":["../../../src/refactors/toggleTypeAnnotation.ts"],"names":[],"mappings":";AAMA,wBAuCE"}

package/refactors/toggleTypeAnnotation.js

@@ -30,7 +30,7 @@ var _default = /*#__PURE__*/(0, _definition.createRefactor)({
       const initializerType = typeChecker.getTypeAtLocation(initializer);
       const initializerTypeNode = typeChecker.typeToTypeNode(initializerType, node, ts.NodeBuilderFlags.NoTruncation);
       if (initializerTypeNode) {
-        changeTracker.insertNodeAt(sourceFile, node.name.end, initializerTypeNode, {
+        changeTracker.insertNodeAt(sourceFile, node.name.end, AST.simplifyTypeNode(ts)(initializerTypeNode), {
           prefix: ": "
         });
       }

package/refactors/toggleTypeAnnotation.js.map

@@ -1 +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;IACTM,IAAI,EAAE,8CAA8C;IACpDjB,WAAW,EAAE,wBAAwB;IACrCC,KAAK,EAAGiB,aAAa,IAAI;MACvB,MAAMC,WAAW,GAAGhB,OAAO,CAACiB,cAAc,EAAE;MAE5C,IAAIT,IAAI,CAACU,IAAI,EAAE;QACbH,aAAa,CAACI,WAAW,CAAClB,UAAU,EAAE;UAAEmB,GAAG,EAAEZ,IAAI,CAACZ,IAAI,CAACyB,GAAG;UAAEA,GAAG,EAAEb,IAAI,CAACU,IAAI,CAACG;QAAG,CAAE,CAAC;QACjF;;MAGF,MAAMX,WAAW,GAAGF,IAAI,CAACE,WAAY;MACrC,MAAMY,eAAe,GAAGN,WAAW,CAACO,iBAAiB,CAACb,WAAW,CAAC;MAClE,MAAMc,mBAAmB,GAAGR,WAAW,CAACS,cAAc,CACpDH,eAAe,EACfd,IAAI,EACJT,EAAE,CAAC2B,gBAAgB,CAACC,YAAY,CACjC;MACD,IAAIH,mBAAmB,EAAE;QACvBT,aAAa,CAACa,YAAY,CAAC3B,UAAU,EAAEO,IAAI,CAACZ,IAAI,CAACyB,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","kind","changeTracker","typeChecker","getTypeChecker","type","deleteRange","pos","end","initializerType","getTypeAtLocation","initializerTypeNode","typeToTypeNode","NodeBuilderFlags","NoTruncation","insertNodeAt","prefix"],"sourceRoot":"","sources":["../../../src/refactors/toggleTypeAnnotation.ts"],"sourcesContent":[null]}
+{"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;IACTM,IAAI,EAAE,8CAA8C;IACpDjB,WAAW,EAAE,wBAAwB;IACrCC,KAAK,EAAGiB,aAAa,IAAI;MACvB,MAAMC,WAAW,GAAGhB,OAAO,CAACiB,cAAc,EAAE;MAE5C,IAAIT,IAAI,CAACU,IAAI,EAAE;QACbH,aAAa,CAACI,WAAW,CAAClB,UAAU,EAAE;UAAEmB,GAAG,EAAEZ,IAAI,CAACZ,IAAI,CAACyB,GAAG;UAAEA,GAAG,EAAEb,IAAI,CAACU,IAAI,CAACG;QAAG,CAAE,CAAC;QACjF;;MAGF,MAAMX,WAAW,GAAGF,IAAI,CAACE,WAAY;MACrC,MAAMY,eAAe,GAAGN,WAAW,CAACO,iBAAiB,CAACb,WAAW,CAAC;MAClE,MAAMc,mBAAmB,GAAGR,WAAW,CAACS,cAAc,CACpDH,eAAe,EACfd,IAAI,EACJT,EAAE,CAAC2B,gBAAgB,CAACC,YAAY,CACjC;MACD,IAAIH,mBAAmB,EAAE;QACvBT,aAAa,CAACa,YAAY,CAAC3B,UAAU,EAAEO,IAAI,CAACZ,IAAI,CAACyB,GAAG,EAAElB,GAAG,CAAC0B,gBAAgB,CAAC9B,EAAE,CAAC,CAACyB,mBAAmB,CAAC,EAAE;UACnGM,MAAM,EAAE;SACT,CAAC;;IAEN;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","kind","changeTracker","typeChecker","getTypeChecker","type","deleteRange","pos","end","initializerType","getTypeAtLocation","initializerTypeNode","typeToTypeNode","NodeBuilderFlags","NoTruncation","insertNodeAt","simplifyTypeNode","prefix"],"sourceRoot":"","sources":["../../../src/refactors/toggleTypeAnnotation.ts"],"sourcesContent":[null]}

package/utils/AST.d.ts

@@ -114,4 +114,5 @@ export declare function transformAsyncAwaitToEffectGen(ts: TypeScriptApi): (node
 export declare function addReturnTypeAnnotation(ts: TypeScriptApi, changes: ts.textChanges.ChangeTracker): (sourceFile: ts.SourceFile, declaration: ts.FunctionDeclaration | ts.FunctionExpression | ts.ArrowFunction | ts.MethodDeclaration, typeNode: ts.TypeNode) => void;
 export declare function removeReturnTypeAnnotation(ts: TypeScriptApi, changes: ts.textChanges.ChangeTracker): (sourceFile: ts.SourceFile, declaration: ts.FunctionDeclaration | ts.FunctionExpression | ts.ArrowFunction | ts.MethodDeclaration) => void;
 export declare function getEffectModuleIdentifier(ts: TypeScriptApi): (sourceFile: ts.SourceFile) => string;
+export declare function simplifyTypeNode(ts: TypeScriptApi): (typeNode: ts.TypeNode) => ts.TypeNode;
 //# sourceMappingURL=AST.d.ts.map

package/utils/AST.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AST.d.ts","sourceRoot":"","sources":["../../../src/utils/AST.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"AST.d.ts","sourceRoot":"","sources":["../../../src/utils/AST.ts"],"names":[],"mappings":"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"}

package/utils/AST.js

@@ -15,6 +15,7 @@ exports.getSourceFile = getSourceFile;
 exports.hasModifier = hasModifier;
 exports.isNodeInRange = isNodeInRange;
 exports.removeReturnTypeAnnotation = removeReturnTypeAnnotation;
+exports.simplifyTypeNode = simplifyTypeNode;
 exports.toTextRange = toTextRange;
 exports.transformAsyncAwaitToEffectGen = transformAsyncAwaitToEffectGen;
 var _Function = /*#__PURE__*/require("@effect/language-service/utils/Function");
@@ -175,4 +176,34 @@ function removeReturnTypeAnnotation(ts, changes) {
 function getEffectModuleIdentifier(ts) {
   return sourceFile => (0, _Function.pipe)(findModuleImportIdentifierName(ts)(sourceFile, "@effect/io/Effect"), O.orElse(findModuleImportIdentifierName(ts)(sourceFile, "@effect/io/Effect")), O.getOrElse(() => "Effect"));
 }
+function simplifyTypeNode(ts) {
+  function collectCallable(typeNode) {
+    // (() => 1) -> skip to inner node
+    if (ts.isParenthesizedTypeNode(typeNode)) return collectCallable(typeNode.type);
+    // () => 1 -> convert to call signature
+    if (ts.isFunctionTypeNode(typeNode)) {
+      return O.some([ts.factory.createCallSignature(typeNode.typeParameters, typeNode.parameters, typeNode.type)]);
+    }
+    // { ... } -> if every member is callsignature, return a merge of all of those
+    if (ts.isTypeLiteralNode(typeNode)) {
+      const allCallSignatures = typeNode.members.every(ts.isCallSignatureDeclaration);
+      if (allCallSignatures) return O.some(typeNode.members);
+    }
+    // ... & ... -> if both are callable, return merge of both
+    if (ts.isIntersectionTypeNode(typeNode)) {
+      const members = typeNode.types.map(collectCallable);
+      if (members.every(O.isSome)) {
+        return O.some(members.map(_ => O.isSome(_) ? _.value : []).flat());
+      }
+    }
+    return O.none;
+  }
+  return typeNode => {
+    const callSignatures = collectCallable(typeNode);
+    if (O.isSome(callSignatures) && callSignatures.value.length > 1) {
+      return ts.factory.createTypeLiteralNode(callSignatures.value);
+    }
+    return typeNode;
+  };
+}
 //# sourceMappingURL=AST.js.map

package/utils/AST.js.map

@@ -1 +1 @@
-{"version":3,"file":"AST.js","mappings":"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","names":["NoSuchSourceFile","constructor","fileName","getSourceFile","program","sourceFile","hasModifier","ts","node","kind","getCombinedModifierFlags","getNodesContainingRange","textRange","precedingToken","findPrecedingToken","pos","Ch","empty","result","parent","append","toTextRange","positionOrRange","end","getHumanReadableName","text","getText","length","substring","collectAll","rootNode","test","visitor","forEachChild","getRelevantTokens","position","previousToken","isMemberName","isKeyword","contextToken","getFullStart","undefined","O","some","fromNullable","isNodeInRange","findModuleImportIdentifierName","moduleName","isImportDeclaration","moduleSpecifier","isStringLiteral","importClause","namedBindings","isNamespaceImport","name","transformAsyncAwaitToEffectGen","effectName","onAwait","_","isAwaitExpression","expression","visitEachChild","nullTransformationContext","factory","createYieldExpression","createToken","SyntaxKind","AsteriskToken","createCallExpression","createIdentifier","generatorBody","body","generator","createFunctionExpression","createParameterDeclaration","effectGenCallExp","createPropertyAccessExpression","currentFlags","ModifierFlags","Async","newModifiers","createModifiersFromModifierFlags","isArrowFunction","createArrowFunction","typeParameters","parameters","equalsGreaterThanToken","newBody","createBlock","createReturnStatement","isFunctionDeclaration","createFunctionDeclaration","asteriskToken","addReturnTypeAnnotation","changes","declaration","typeNode","closeParen","findChildOfKind","CloseParenToken","needParens","endNode","insertNodeBefore","OpenParenToken","insertNodeAfter","insertNodeAt","prefix","removeReturnTypeAnnotation","type","deleteRange","getEffectModuleIdentifier","orElse","getOrElse"],"sourceRoot":"","sources":["../../../src/utils/AST.ts"],"sourcesContent":[null]}
+{"version":3,"file":"AST.js","mappings":"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","names":["NoSuchSourceFile","constructor","fileName","getSourceFile","program","sourceFile","hasModifier","ts","node","kind","getCombinedModifierFlags","getNodesContainingRange","textRange","precedingToken","findPrecedingToken","pos","Ch","empty","result","parent","append","toTextRange","positionOrRange","end","getHumanReadableName","text","getText","length","substring","collectAll","rootNode","test","visitor","forEachChild","getRelevantTokens","position","previousToken","isMemberName","isKeyword","contextToken","getFullStart","undefined","O","some","fromNullable","isNodeInRange","findModuleImportIdentifierName","moduleName","isImportDeclaration","moduleSpecifier","isStringLiteral","importClause","namedBindings","isNamespaceImport","name","transformAsyncAwaitToEffectGen","effectName","onAwait","_","isAwaitExpression","expression","visitEachChild","nullTransformationContext","factory","createYieldExpression","createToken","SyntaxKind","AsteriskToken","createCallExpression","createIdentifier","generatorBody","body","generator","createFunctionExpression","createParameterDeclaration","effectGenCallExp","createPropertyAccessExpression","currentFlags","ModifierFlags","Async","newModifiers","createModifiersFromModifierFlags","isArrowFunction","createArrowFunction","typeParameters","parameters","equalsGreaterThanToken","newBody","createBlock","createReturnStatement","isFunctionDeclaration","createFunctionDeclaration","asteriskToken","addReturnTypeAnnotation","changes","declaration","typeNode","closeParen","findChildOfKind","CloseParenToken","needParens","endNode","insertNodeBefore","OpenParenToken","insertNodeAfter","insertNodeAt","prefix","removeReturnTypeAnnotation","type","deleteRange","getEffectModuleIdentifier","orElse","getOrElse","simplifyTypeNode","collectCallable","isParenthesizedTypeNode","isFunctionTypeNode","createCallSignature","isTypeLiteralNode","allCallSignatures","members","every","isCallSignatureDeclaration","isIntersectionTypeNode","types","map","isSome","value","flat","none","callSignatures","createTypeLiteralNode"],"sourceRoot":"","sources":["../../../src/utils/AST.ts"],"sourcesContent":[null]}