Set correct path.context un push/unshiftContainer (#12394)

babel · Nov 25, 2020 · 695abb8 · 695abb8
1 parent 0f3db5d
commit 695abb8
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 2 deletions.
diff --git a/packages/babel-traverse/src/context.js b/packages/babel-traverse/src/context.js
@@ -42,6 +42,8 @@ export default class TraversalContext {
   }
 
   create(node, obj, key, listKey): NodePath {
+    // We don't need to `.setContext()` here, since `.visitQueue()` already
+    // calls `.pushContext`.
     return NodePath.get({
       parentPath: this.parentPath,
       parent: node,

diff --git a/packages/babel-traverse/src/path/modification.js b/packages/babel-traverse/src/path/modification.js
@@ -217,7 +217,7 @@ export function unshiftContainer(listKey, nodes) {
     container: this.node[listKey],
     listKey,
     key: 0,
-  });
+  }).setContext(this.context);
 
   return path._containerInsertBefore(nodes);
 }
@@ -237,7 +237,7 @@ export function pushContainer(listKey, nodes) {
     container: container,
     listKey,
     key: container.length,
-  });
+  }).setContext(this.context);
 
   return path.replaceWithMultiple(nodes);
 }

diff --git a/packages/babel-traverse/test/modification.js b/packages/babel-traverse/test/modification.js
@@ -49,6 +49,26 @@ describe("modification", function () {
         },
       });
     });
+
+    it("should set the correct path.context", function () {
+      expect.assertions(2);
+
+      const ast = parse("[b];");
+      traverse(ast, {
+        skipKeys: ["consequent"],
+        ExpressionStatement(path) {
+          path.traverse({ Identifier() {}, skipKeys: [] });
+
+          const arr = path.get("expression");
+          const x = arr.pushContainer("elements", [
+            { type: "Identifier", name: "x" },
+          ])[0];
+
+          expect(x.node.name).toBe("x");
+          expect(x.opts.skipKeys).toEqual(["consequent"]);
+        },
+      });
+    });
   });
   describe("unshiftContainer", function () {
     it("unshifts identifier into params", function () {
@@ -78,6 +98,26 @@ describe("modification", function () {
         },
       });
     });
+
+    it("should set the correct path.context", function () {
+      expect.assertions(2);
+
+      const ast = parse("[b];");
+      traverse(ast, {
+        skipKeys: ["consequent"],
+        ExpressionStatement(path) {
+          path.traverse({ Identifier() {}, skipKeys: [] });
+
+          const arr = path.get("expression");
+          const x = arr.unshiftContainer("elements", [
+            { type: "Identifier", name: "x" },
+          ])[0];
+
+          expect(x.node.name).toBe("x");
+          expect(x.opts.skipKeys).toEqual(["consequent"]);
+        },
+      });
+    });
   });
 
   describe("insertBefore", function () {