fix: Correctly generate (a ?? b) as T (#15258)

* fix * update tests * revert
babel · Dec 8, 2022 · 67cb9f1 · 67cb9f1
1 parent b0878e0
commit 67cb9f1
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 5 deletions.
diff --git a/packages/babel-generator/src/node/parentheses.ts b/packages/babel-generator/src/node/parentheses.ts
@@ -90,6 +90,14 @@ const enum CheckParam {
   forOfHead = 1 << 5,
 }
 
+function isTSTypeExpression(node: t.Node) {
+  return (
+    isTSAsExpression(node) ||
+    isTSSatisfiesExpression(node) ||
+    isTSTypeAssertion(node)
+  );
+}
+
 const isClassExtendsClause = (
   node: t.Node,
   parent: t.Node,
@@ -369,9 +377,7 @@ export function ConditionalExpression(
     isBinary(parent) ||
     isConditionalExpression(parent, { test: node }) ||
     isAwaitExpression(parent) ||
-    isTSTypeAssertion(parent) ||
-    isTSAsExpression(parent) ||
-    isTSSatisfiesExpression(parent)
+    isTSTypeExpression(parent)
   ) {
     return true;
   }
@@ -406,6 +412,7 @@ export function LogicalExpression(
   node: t.LogicalExpression,
   parent: t.Node,
 ): boolean {
+  if (isTSTypeExpression(parent)) return true;
   switch (node.operator) {
     case "||":
       if (!isLogicalExpression(parent)) return false;

diff --git a/packages/babel-generator/test/fixtures/typescript/cast-need-parentheses/input.js b/packages/babel-generator/test/fixtures/typescript/cast-need-parentheses/input.js
@@ -1,3 +1,6 @@
 (<T> x).y;
 (x as T).y;
 x!.y;
+
+(point1 ?? point2 as Point);
+(point1 ?? point2) as Point;
diff --git a/packages/babel-generator/test/fixtures/typescript/cast-need-parentheses/output.js b/packages/babel-generator/test/fixtures/typescript/cast-need-parentheses/output.js
@@ -1,3 +1,5 @@
 (<T> x).y;
 (x as T).y;
-x!.y;
+x!.y;
+point1 ?? (point2 as Point);
+((point1 ?? point2) as Point);
diff --git a/...-optional-chaining/test/fixtures/transparent-expr-wrappers/ts-as-in-conditional/output.js b/...-optional-chaining/test/fixtures/transparent-expr-wrappers/ts-as-in-conditional/output.js
@@ -1,4 +1,4 @@
 a => {
   var _a$c;
-  ((a !== null && a !== void 0 && a.b as any) && (_a$c = a.c) !== null && _a$c !== void 0 && _a$c.d as any) ? 0 : 1;
+  ((((a !== null && a !== void 0 && a.b) as any) && (_a$c = a.c) !== null && _a$c !== void 0 && _a$c.d) as any) ? 0 : 1;
 };