fix

packages/babel-core/test/fixtures/transformation/source-maps/class/source-map.json

@@ -17,5 +17,5 @@
   "sourcesContent": [
     "class Test {\n  get bar() {\n    throw new Error(\"wow\");\n  }\n}\n\nvar test = new Test;\ntest.bar;"
   ],
-  "mappings": "IAAMA,IAAI;EAAA;;EAAA,SAAAA,KAAA;IAAAC,YAAA,CAAAC,cAAA,OAAAF,IAAA;EAAA;EAAAC,YAAA,CAAAE,WAAA,CAAAH,IAAA;IAAAI,GAAA;IAAAC,GAAA,EACR,SAAAA,CAAA,EAAU;MACR,MAAM,IAAIC,KAAK,CAAC,KAAK,CAAC;IACxB;EAAC;EAAA,OAAAN,IAAA;AAAA;AAGH,IAAIO,IAAI,GAAG,IAAIP,IAAI;AACnBO,IAAI,CAACC,GAAG"
+  "mappings": "IAAMA,IAAI;EAAA;;EAAA,SAAAA,KAAA;IAAAC,YAAA,CAAAC,cAAA,OAAAF,IAAA;EAAA;EAAAC,YAAA,CAAAE,WAAA,CAAAH,IAAA;IAAAI,GAAA;IAAAC,GAAA,EACR,SAAAA,CAAA,EAAU;MACR,MAAM,IAAIC,KAAK,CAAC,KAAK,CAAC;IACxB;EAAC;EAAA,OAAAN,IAAA;AAAA;AAGH,IAAIO,IAAI,GAAG,IAAIP,IAAI,CAAD,CAAC;AACnBO,IAAI,CAACC,GAAG"
 }

packages/babel-generator/src/generators/base.ts

@@ -48,9 +48,7 @@ export function BlockStatement(this: Printer, node: t.BlockStatement) {
 
   this.printSequence(node.body, node, { indent: true });
 
-  this.sourceWithOffset("end", node.loc, 0, -1);
-
-  this.rightBrace();
+  this.rightBrace(node);
 }
 
 export function Directive(this: Printer, node: t.Directive) {

packages/babel-generator/src/generators/classes.ts

@@ -78,9 +78,7 @@ export function ClassBody(this: Printer, node: t.ClassBody) {
 
     if (!this.endsWith(charCodes.lineFeed)) this.newline();
 
-    this.sourceWithOffset("end", node.loc, 0, -1);
-
-    this.rightBrace();
+    this.rightBrace(node);
   }
 }
 
@@ -224,9 +222,6 @@ export function StaticBlock(this: Printer, node: t.StaticBlock) {
     this.printSequence(node.body, node, {
       indent: true,
     });
-
-    this.sourceWithOffset("end", node.loc, 0, -1);
-
-    this.rightBrace();
+    this.rightBrace(node);
   }
 }

packages/babel-generator/src/generators/expressions.ts

@@ -9,17 +9,18 @@ import type * as t from "@babel/types";
 import * as n from "../node";
 
 export function UnaryExpression(this: Printer, node: t.UnaryExpression) {
+  const { operator } = node;
   if (
-    node.operator === "void" ||
-    node.operator === "delete" ||
-    node.operator === "typeof" ||
+    operator === "void" ||
+    operator === "delete" ||
+    operator === "typeof" ||
     // throwExpressions
-    node.operator === "throw"
+    operator === "throw"
   ) {
-    this.word(node.operator);
+    this.word(operator);
     this.space();
   } else {
-    this.token(node.operator);
+    this.token(operator);
   }
 
   this.print(node.argument, node);
@@ -41,7 +42,7 @@ export function ParenthesizedExpression(
 ) {
   this.token("(");
   this.print(node.expression, node);
-  this.token(")");
+  this.rightParens(node);
 }
 
 export function UpdateExpression(this: Printer, node: t.UpdateExpression) {
@@ -97,7 +98,7 @@ export function NewExpression(
   }
   this.token("(");
   this.printList(node.arguments, node);
-  this.token(")");
+  this.rightParens(node);
 }
 
 export function SequenceExpression(this: Printer, node: t.SequenceExpression) {
@@ -169,30 +170,32 @@ export function OptionalMemberExpression(
   this: Printer,
   node: t.OptionalMemberExpression,
 ) {
+  let { computed } = node;
+  const { optional, property } = node;
+
   this.print(node.object, node);
 
-  if (!node.computed && isMemberExpression(node.property)) {
+  if (!computed && isMemberExpression(property)) {
     throw new TypeError("Got a MemberExpression for MemberExpression property");
   }
 
-  let computed = node.computed;
   // @ts-expect-error todo(flow->ts) maybe instead of typeof check specific literal types?
-  if (isLiteral(node.property) && typeof node.property.value === "number") {
+  if (isLiteral(property) && typeof property.value === "number") {
     computed = true;
   }
-  if (node.optional) {
+  if (optional) {
     this.token("?.");
   }
 
   if (computed) {
     this.token("[");
-    this.print(node.property, node);
+    this.print(property, node);
     this.token("]");
   } else {
-    if (!node.optional) {
+    if (!optional) {
       this.token(".");
     }
-    this.print(node.property, node);
+    this.print(property, node);
   }
 }
 
@@ -212,7 +215,7 @@ export function OptionalCallExpression(
 
   this.token("(");
   this.printList(node.arguments, node);
-  this.token(")");
+  this.rightParens(node);
 }
 
 export function CallExpression(this: Printer, node: t.CallExpression) {
@@ -222,7 +225,7 @@ export function CallExpression(this: Printer, node: t.CallExpression) {
   this.print(node.typeParameters, node); // TS
   this.token("(");
   this.printList(node.arguments, node);
-  this.token(")");
+  this.rightParens(node);
 }
 
 export function Import(this: Printer) {
@@ -377,6 +380,5 @@ export function ModuleExpression(this: Printer, node: t.ModuleExpression) {
   }
   this.print(body, node);
   this.dedent();
-  this.sourceWithOffset("end", node.loc, 0, -1);
-  this.rightBrace();
+  this.rightBrace(node);
 }

packages/babel-generator/src/generators/statements.ts

@@ -224,7 +224,7 @@ export function SwitchStatement(this: Printer, node: t.SwitchStatement) {
     },
   });
 
-  this.token("}");
+  this.rightBrace(node);
 }
 
 export function SwitchCase(this: Printer, node: t.SwitchCase) {

packages/babel-generator/src/generators/typescript.ts

@@ -317,9 +317,7 @@ function tsPrintBraced(printer: Printer, members: t.Node[], node: t.Node) {
     printer.dedent();
   }
 
-  printer.sourceWithOffset("end", node.loc, 0, -1);
-
-  printer.rightBrace();
+  printer.rightBrace(node);
 }
 
 export function TSArrayType(this: Printer, node: t.TSArrayType) {

packages/babel-generator/src/printer.ts

@@ -174,13 +174,19 @@ class Printer {
    * Add a right brace to the buffer.
    */
 
-  rightBrace(): void {
+  rightBrace(node: t.Node): void {
     if (this.format.minified) {
       this._buf.removeLastSemicolon();
     }
+    this.sourceWithOffset("end", node.loc, 0, -1);
     this.token("}");
   }
 
+  rightParens(node: t.Node): void {
+    this.sourceWithOffset("end", node.loc, 0, -1);
+    this.token(")");
+  }
+
   /**
    * Add a space to the buffer unless it is compact.
    */
@@ -240,7 +246,6 @@ class Printer {
   /**
    * Writes a simple token.
    */
-
   token(str: string, maybeNewline = false): void {
     this._maybePrintInnerComments();
 
@@ -270,8 +275,6 @@ class Printer {
   tokenChar(char: number): void {
     this._maybePrintInnerComments();
 
-    // space is mandatory to avoid outputting <!--
-    // http://javascript.spec.whatwg.org/#comment-syntax
     const lastChar = this.getLastChar();
     if (
       // Need spaces for operators of the same kind to avoid: `a+++b`
@@ -655,19 +658,13 @@ class Printer {
     this._insideAux = node.loc == undefined;
     this._maybeAddAuxComment(this._insideAux && !oldInAux);
 
-    let shouldPrintParens = false;
-    if (forceParens) {
-      shouldPrintParens = true;
-    } else if (
-      format.retainFunctionParens &&
-      nodeType === "FunctionExpression" &&
-      node.extra &&
-      node.extra.parenthesized
-    ) {
-      shouldPrintParens = true;
-    } else {
-      shouldPrintParens = needsParens(node, parent, this._printStack);
-    }
+    const shouldPrintParens =
+      forceParens ||
+      (format.retainFunctionParens &&
+        nodeType === "FunctionExpression" &&
+        node.extra?.parenthesized) ||
+      needsParens(node, parent, this._printStack);
+
     if (shouldPrintParens) {
       this.token("(");
       this._endsWithInnerRaw = false;
@@ -895,12 +892,14 @@ class Printer {
   }
 
   _printNewline(newLine: boolean, opts: AddNewlinesOptions) {
+    const format = this.format;
+
     // Fast path since 'this.newline' does nothing when not tracking lines.
-    if (this.format.retainLines || this.format.compact) return;
+    if (format.retainLines || format.compact) return;
 
     // Fast path for concise since 'this.newline' just inserts a space when
     // concise formatting is in use.
-    if (this.format.concise) {
+    if (format.concise) {
       this.space();
       return;
     }

packages/babel-generator/test/fixtures/regression/comment-before-parentheses-return-arg-createParenthesizedExpressions/options.json

@@ -1,4 +1,4 @@
 {
   "retainLines": true,
-  "createParenthesizedExpressions": true
+  "parserOpts": { "createParenthesizedExpressions": true }
 }

packages/babel-generator/test/fixtures/regression/comment-before-parentheses-return-arg-createParenthesizedExpressions/output.js

@@ -1,16 +1,17 @@
 function assertElement(assertFn, shouldBeElement, opt_message) {
-  return (/** @type {!Ele	ment} */
+  return (/** @type {!Ele	ment} */(
     assertType_(
     assertFn,
     shouldBeElement,
     isElement(shouldBeElement),
     'Element expected',
-    opt_message));
-
-
+    opt_message
+    )
+    ));
 }
 
-const slot = /** @type {!HTMLSlotElement} */e.target;
+const slot = /** @type {!HTMLSlotElement} */(e.target);
 
 assertElement(
-/** @type {Element} */el);
+/** @type {Element} */(el)
+);

packages/babel-generator/test/fixtures/sourcemaps/call-identifiers/source-map.json

@@ -11,5 +11,5 @@
   "sourcesContent": [
     "foo;\nfoo();\nfoo().bar;\nobj.foo;\nobj.foo();\nobj.foo.bar;\nobj.foo().bar;\n{\n  foo;\n  foo();\n  foo().bar;\n  obj.foo;\n  obj.foo();\n  obj.foo.bar;\n  obj.foo().bar;\n}"
   ],
-  "mappings": "AAAAA,GAAG;AACHA,GAAG,EAAE;AACLA,GAAG,EAAE,CAACC,GAAG;AACTC,GAAG,CAACF,GAAG;AACPE,GAAG,CAACF,GAAG,EAAE;AACTE,GAAG,CAACF,GAAG,CAACC,GAAG;AACXC,GAAG,CAACF,GAAG,EAAE,CAACC,GAAG;AACb;EACED,GAAG;EACHA,GAAG,EAAE;EACLA,GAAG,EAAE,CAACC,GAAG;EACTC,GAAG,CAACF,GAAG;EACPE,GAAG,CAACF,GAAG,EAAE;EACTE,GAAG,CAACF,GAAG,CAACC,GAAG;EACXC,GAAG,CAACF,GAAG,EAAE,CAACC,GAAG;AACf"
+  "mappings": "AAAAA,GAAG;AACHA,GAAG,CAAC,CAAC;AACLA,GAAG,CAAC,CAAC,CAACC,GAAG;AACTC,GAAG,CAACF,GAAG;AACPE,GAAG,CAACF,GAAG,CAAC,CAAC;AACTE,GAAG,CAACF,GAAG,CAACC,GAAG;AACXC,GAAG,CAACF,GAAG,CAAC,CAAC,CAACC,GAAG;AACb;EACED,GAAG;EACHA,GAAG,CAAC,CAAC;EACLA,GAAG,CAAC,CAAC,CAACC,GAAG;EACTC,GAAG,CAACF,GAAG;EACPE,GAAG,CAACF,GAAG,CAAC,CAAC;EACTE,GAAG,CAACF,GAAG,CAACC,GAAG;EACXC,GAAG,CAACF,GAAG,CAAC,CAAC,CAACC,GAAG;AACf"
 }

packages/babel-generator/test/fixtures/sourcemaps/comment-before-parentheses-return-arg-createParenthesizedExpressions/input.js

@@ -0,0 +1,17 @@
+function assertElement(assertFn, shouldBeElement, opt_message) {
+  return /** @type {!Ele	ment} */ (
+	  assertType_(
+	    assertFn,
+		  shouldBeElement,
+		  isElement(shouldBeElement),
+		  'Element expected',
+		  opt_message
+	  )
+	);
+}
+
+const slot = /** @type {!HTMLSlotElement} */ (e.target);
+
+assertElement(
+  /** @type {Element} */ (el),
+);

packages/babel-generator/test/fixtures/sourcemaps/comment-before-parentheses-return-arg-createParenthesizedExpressions/options.json

@@ -0,0 +1,5 @@
+{
+  "retainLines": true,
+  "parserOpts": { "createParenthesizedExpressions": true },
+  "sourceMaps": true
+}

packages/babel-generator/test/fixtures/sourcemaps/comment-before-parentheses-return-arg-createParenthesizedExpressions/output.js

@@ -0,0 +1,17 @@
+function assertElement(assertFn, shouldBeElement, opt_message) {
+  return (/** @type {!Ele	ment} */(
+    assertType_(
+    assertFn,
+    shouldBeElement,
+    isElement(shouldBeElement),
+    'Element expected',
+    opt_message
+    )
+    ));
+}
+
+const slot = /** @type {!HTMLSlotElement} */(e.target);
+
+assertElement(
+/** @type {Element} */(el)
+);

packages/babel-generator/test/fixtures/sourcemaps/comment-before-parentheses-return-arg-createParenthesizedExpressions/source-map.json

@@ -0,0 +1,22 @@
+{
+  "version": 3,
+  "names": [
+    "assertElement",
+    "assertFn",
+    "shouldBeElement",
+    "opt_message",
+    "assertType_",
+    "isElement",
+    "slot",
+    "e",
+    "target",
+    "el"
+  ],
+  "sources": [
+    "fixtures/sourcemaps/comment-before-parentheses-return-arg-createParenthesizedExpressions/input.js"
+  ],
+  "sourcesContent": [
+    "function assertElement(assertFn, shouldBeElement, opt_message) {\n  return /** @type {!Ele\tment} */ (\n\t  assertType_(\n\t    assertFn,\n\t\t  shouldBeElement,\n\t\t  isElement(shouldBeElement),\n\t\t  'Element expected',\n\t\t  opt_message\n\t  )\n\t);\n}\n\nconst slot = /** @type {!HTMLSlotElement} */ (e.target);\n\nassertElement(\n  /** @type {Element} */ (el),\n);"
+  ],
+  "mappings": "AAAA,SAASA,aAAaA,CAACC,QAAQ,EAAEC,eAAe,EAAEC,WAAW,EAAE;EAC7D,OAAO,yBAAyB;IAC/BC,WAAW;IACTH,QAAQ;IACTC,eAAe;IACfG,SAAS,CAACH,eAAe,CAAC;IAC1B,kBAAkB;IAClBC;IACD;IACF,CAAC;AACF;;AAEA,MAAMG,IAAI,GAAG,+BAAgC,CAACC,CAAC,CAACC,MAAM,CAAC;;AAEvDR,aAAa;AACX,sBAAuB,CAACS,EAAE;AAC5B,CAAC"
+}

packages/babel-generator/test/fixtures/sourcemaps/comment-before-parentheses-return-arg/input.js

@@ -0,0 +1,17 @@
+function assertElement(assertFn, shouldBeElement, opt_message) {
+  return /** @type {!Ele	ment} */ (
+	  assertType_(
+	    assertFn,
+		  shouldBeElement,
+		  isElement(shouldBeElement),
+		  'Element expected',
+		  opt_message
+	  )
+	);
+}
+
+const slot = /** @type {!HTMLSlotElement} */ (e.target);
+
+assertElement(
+  /** @type {Element} */ (el),
+);

packages/babel-generator/test/fixtures/sourcemaps/comment-before-parentheses-return-arg/options.json

@@ -0,0 +1,4 @@
+{
+  "retainLines": true,
+  "sourceMaps": true
+}