Bug fix for goog.requireDynamic() transpilation

PiperOrigin-RevId: 503175436

Author: Closure Team

src/com/google/javascript/jscomp/ClosureRewriteModule.java

@@ -1314,10 +1314,22 @@ private void updateGoogRequireDynamicCallInThen(Node call) {
                   objectPatternOrNameNode.getString(), exportedNamespaceNameNode)
               .srcrefTreeIfMissing(call);
     }
-    functionBody.addChildToFront(declarationNode);
+
+    // If right hand side of the callback arrow function is an expression instead of BLOCK,
+    // e.g., `({Foo}) => Foo` instead of `() => { return Foo; }`, create a BLOCK to host the
+    // expression.
+    if (functionBody.isBlock()) {
+      functionBody.addChildToFront(declarationNode);
+      compiler.reportChangeToEnclosingScope(declarationNode);
+    } else {
+      Node returnStmt = this.astFactory.createReturn(functionBody.detach());
+      Node newBlock = this.astFactory.createBlock(returnStmt).srcrefTree(call);
+      newBlock.insertAfter(paramListNode);
+      newBlock.addChildToFront(declarationNode);
+      compiler.reportChangeToEnclosingScope(newBlock);
+    }
 
     compiler.reportChangeToEnclosingScope(call);
-    compiler.reportChangeToEnclosingScope(declarationNode);
   }
 
   // Rewrite

test/com/google/javascript/jscomp/ClosureRewriteModuleTest.java

@@ -1216,6 +1216,46 @@ public void testGoogRequireDynamic_then_destructuringPattern() {
                 "}")));
   }
 
+  @Test
+  public void testGoogRequireDynamic_then_destructuringPattern_withExpressionBody() {
+    test(
+        srcs(
+            lines("goog.module('a.b.c');", "exports.Foo=class{}"),
+            lines(
+                "async function test() {", //
+                "  goog.requireDynamic('a.b.c').then(({Foo}) => Foo);",
+                "}")),
+        expected(
+            lines(
+                "/** @const */ var module$exports$a$b$c = {};",
+                "/** @const */ module$exports$a$b$c.Foo = class {}"),
+            lines(
+                "async function test() {", //
+                "  goog.importHandler_('sG5M4c').then(() => { ",
+                "     const {Foo} = module$exports$a$b$c;",
+                "     return Foo;",
+                "  });",
+                "}")));
+    test(
+        srcs(
+            lines("goog.module('a.b.c');", "exports.Foo=class{}"),
+            lines(
+                "async function test() {", //
+                "  goog.requireDynamic('a.b.c').then(({Foo}) => console.log(Foo));",
+                "}")),
+        expected(
+            lines(
+                "/** @const */ var module$exports$a$b$c = {};",
+                "/** @const */ module$exports$a$b$c.Foo = class {}"),
+            lines(
+                "async function test() {", //
+                "  goog.importHandler_('sG5M4c').then(() => { ",
+                "     const {Foo} = module$exports$a$b$c;",
+                "     return console.log(Foo);",
+                "  });",
+                "}")));
+  }
+
   @Test
   public void testGoogRequireDynamic_then_name() {
     test(