@openrewrite/rewrite 8.66.0-20251027-095903 → 8.66.0-20251027-133754

package/src/javascript/format.ts

@@ -1152,6 +1152,7 @@ export class TabsAndIndentsVisitor<P> extends JavaScriptVisitor<P> {
             const ifStmt = tree as J.If;
             if (ifStmt.thenPart.element.kind !== J.Kind.Block) {
                 indentShouldIncrease = true;
+                this.cursor.messages.set("else-indent", this.currentIndent);
             }
         } else if (tree.kind === J.Kind.WhileLoop) {
             const whileLoop = tree as J.WhileLoop;
@@ -1165,7 +1166,9 @@ export class TabsAndIndentsVisitor<P> extends JavaScriptVisitor<P> {
             }
         }
 
-        if (indentShouldIncrease) {
+        if (tree.kind === J.Kind.IfElse && this.cursor.getNearestMessage("else-indent") !== undefined) {
+            this.cursor.messages.set("indentToUse", this.cursor.getNearestMessage("else-indent"));
+        } else if (indentShouldIncrease) {
             this.cursor.messages.set("indentToUse", this.currentIndent + this.singleIndent);
         }
         return ret;
@@ -1179,7 +1182,12 @@ export class TabsAndIndentsVisitor<P> extends JavaScriptVisitor<P> {
         if (ret == undefined) {
             return ret;
         }
-        const relativeIndent = this.currentIndent;
+
+        if (tree.kind === J.Kind.IfElse && this.cursor.messages.get("else-indent") !== undefined) {
+            this.cursor.messages.set("indentToUse", this.cursor.messages.get("else-indent"));
+            this.cursor.messages.delete("else-indent");
+        }
+        const relativeIndent: string = this.currentIndent;
 
         return produce(ret, draft => {
             if (draft.prefix == undefined) {

package/src/javascript/index.ts

@@ -23,6 +23,7 @@ export * from "./preconditions";
 export * from "./templating";
 export * from "./method-matcher";
 
+export * from "./add-import";
 export * from "./remove-import";
 
 import "./print";

package/src/javascript/type-mapping.ts

@@ -214,7 +214,7 @@ export class JavaScriptTypeMapping {
         let declaredFormalTypeNames: string[] = [];
 
         // Handle different kinds of nodes that represent methods or method invocations
-        if (ts.isCallExpression(node)) {
+        if (ts.isCallOrNewExpression(node)) {
             // For method invocations (e.g., _.map(...))
             signature = this.checker.getResolvedSignature(node);
             if (!signature) {