Ensure that requeueComputedKeyAndDecorators is available (#16695)

nicolo-ribaudo · JLHwung · web-flow · commit 6a15d7ac83e1 · 2024-07-29T21:22:12.000-04:00
* Ensure that `requeueComputedKeyAndDecorators` is available

* Try fixing cycle

* import path/context first

---------

Co-authored-by: Huáng Jùnliàng &lt;jlhwung@gmail.com&gt;
diff --git a/packages/babel-core/src/config/files/configuration.ts b/packages/babel-core/src/config/files/configuration.ts
@@ -90,8 +90,7 @@ function* readConfigCode(
 
   // @ts-expect-error todo(flow->ts)
   if (typeof options.then === "function") {
-    // @ts-expect-error We use ?. in case options is a thenable
-    // but not a promise
+    // @ts-expect-error We use ?. in case options is a thenable but not a promise
     options.catch?.(() => {});
 
     throw new ConfigError(
diff --git a/packages/babel-traverse/src/index.ts b/packages/babel-traverse/src/index.ts
@@ -1,3 +1,4 @@
+import "./path/context.ts"; // We have some cycles, this ensures correct order to avoid TDZ
 import * as visitors from "./visitors.ts";
 import {
   VISITOR_KEYS,
diff --git a/packages/babel-traverse/src/scope/lib/renamer.ts b/packages/babel-traverse/src/scope/lib/renamer.ts
@@ -4,6 +4,7 @@ import type { NodePath, Visitor } from "../../index.ts";
 import { traverseNode } from "../../traverse-node.ts";
 import { explode } from "../../visitors.ts";
 import type { Identifier } from "@babel/types";
+import { requeueComputedKeyAndDecorators } from "../../path/context.ts";
 
 const renameVisitor: Visitor<Renamer> = {
   ReferencedIdentifier({ node }, state) {
@@ -21,7 +22,15 @@ const renameVisitor: Visitor<Renamer> = {
     ) {
       path.skip();
       if (path.isMethod()) {
-        path.requeueComputedKeyAndDecorators();
+        if (
+          !process.env.BABEL_8_BREAKING &&
+          !path.requeueComputedKeyAndDecorators
+        ) {
+          // See https://github.com/babel/babel/issues/16694
+          requeueComputedKeyAndDecorators.call(path);
+        } else {
+          path.requeueComputedKeyAndDecorators();
+        }
       }
     }
   },
diff --git a/packages/babel-traverse/src/visitors.ts b/packages/babel-traverse/src/visitors.ts
@@ -10,6 +10,7 @@ import {
 } from "@babel/types";
 import type { ExplodedVisitor, NodePath, Visitor } from "./index.ts";
 import type { ExplVisitNode, VisitNodeFunction, VisitPhase } from "./types.ts";
+import { requeueComputedKeyAndDecorators } from "./path/context.ts";
 
 type VIRTUAL_TYPES = keyof typeof virtualTypes;
 function isVirtualType(type: string): type is VIRTUAL_TYPES {
@@ -406,13 +407,29 @@ const _environmentVisitor: Visitor = {
 
     path.skip();
     if (path.isMethod()) {
-      path.requeueComputedKeyAndDecorators();
+      if (
+        !process.env.BABEL_8_BREAKING &&
+        !path.requeueComputedKeyAndDecorators
+      ) {
+        // See https://github.com/babel/babel/issues/16694
+        requeueComputedKeyAndDecorators.call(path);
+      } else {
+        path.requeueComputedKeyAndDecorators();
+      }
     }
   },
   Property(path) {
     if (path.isObjectProperty()) return;
     path.skip();
-    path.requeueComputedKeyAndDecorators();
+    if (
+      !process.env.BABEL_8_BREAKING &&
+      !path.requeueComputedKeyAndDecorators
+    ) {
+      // See https://github.com/babel/babel/issues/16694
+      requeueComputedKeyAndDecorators.call(path);
+    } else {
+      path.requeueComputedKeyAndDecorators();
+    }
   },
 };
 

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+import "./path/context.ts"; // We have some cycles, this ensures correct order to avoid TDZ`
`1`	`2`	`import * as visitors from "./visitors.ts";`
`2`	`3`	`import {`
`3`	`4`	`VISITOR_KEYS,`