Fix reused nodes - part 3

babel · Jul 10, 2020 · a9a4bc8 · a9a4bc8
1 parent 5da54d9
commit a9a4bc8
Show file tree

Hide file tree

Showing 22 changed files with 85 additions and 61 deletions.
diff --git a/packages/babel-helper-builder-react-jsx-experimental/src/index.js b/packages/babel-helper-builder-react-jsx-experimental/src/index.js
@@ -457,7 +457,7 @@ You can set \`throwIfNamespace: false\` to bypass this warning.`,
     }
 
     return makeTrace(
-      state.fileNameIdentifier,
+      t.cloneNode(state.fileNameIdentifier),
       location.start.line,
       location.start.column,
     );

diff --git a/packages/babel-helper-create-class-features-plugin/src/decorators.js b/packages/babel-helper-create-class-features-plugin/src/decorators.js
@@ -137,7 +137,7 @@ export function buildDecoratedClass(ref, path, elements, file) {
   let replacement = template.expression.ast`
     ${addDecorateHelper(file)}(
       ${classDecorators || t.nullLiteral()},
-      function (${initializeId}, ${superClass ? superId : null}) {
+      function (${initializeId}, ${superClass ? t.cloneNode(superId) : null}) {
         ${node}
         return { F: ${t.cloneNode(node.id)}, d: ${definitions} };
       },
@@ -158,7 +158,7 @@ export function buildDecoratedClass(ref, path, elements, file) {
   }
 
   return {
-    instanceNodes: [template.statement.ast`${initializeId}(this)`],
+    instanceNodes: [template.statement.ast`${t.cloneNode(initializeId)}(this)`],
     wrapClass(path) {
       path.replaceWith(replacement);
       return path.get(classPathDesc);

diff --git a/packages/babel-helper-create-class-features-plugin/src/fields.js b/packages/babel-helper-create-class-features-plugin/src/fields.js
@@ -45,8 +45,9 @@ export function buildPrivateNamesNodes(privateNamesMap, loose, state) {
     // In spec mode, only instance fields need a "private name" initializer
     // because static fields are directly assigned to a variable in the
     // buildPrivateStaticFieldInitSpec function.
-    const { id, static: isStatic, method: isMethod, getId, setId } = value;
+    const { static: isStatic, method: isMethod, getId, setId } = value;
     const isAccessor = getId || setId;
+    const id = t.cloneNode(value.id);
     if (loose) {
       initNodes.push(
         template.statement.ast`
@@ -157,7 +158,7 @@ const privateInVisitor = privateNameVisitorFactory({
     if (loose) {
       const { id } = privateNamesMap.get(name);
       path.replaceWith(template.expression.ast`
-        Object.prototype.hasOwnProperty.call(${right}, ${id})
+        Object.prototype.hasOwnProperty.call(${right}, ${t.cloneNode(id)})
       `);
       return;
     }
@@ -169,7 +170,7 @@ const privateInVisitor = privateNameVisitorFactory({
       return;
     }
 
-    path.replaceWith(template.expression.ast`${id}.has(${right})`);
+    path.replaceWith(template.expression.ast`${t.cloneNode(id)}.has(${right})`);
   },
 });
 
@@ -327,8 +328,8 @@ const privateNameHandlerLoose = {
 
     return template.expression`BASE(REF, PROP)[PROP]`({
       BASE: file.addHelper("classPrivateFieldLooseBase"),
-      REF: object,
-      PROP: privateNamesMap.get(name).id,
+      REF: t.cloneNode(object),
+      PROP: t.cloneNode(privateNamesMap.get(name).id),
     });
   },
 
@@ -387,7 +388,7 @@ function buildPrivateFieldInitLoose(ref, prop, privateNamesMap) {
   const value = prop.node.value || prop.scope.buildUndefinedNode();
 
   return template.statement.ast`
-    Object.defineProperty(${ref}, ${id}, {
+    Object.defineProperty(${ref}, ${t.cloneNode(id)}, {
       // configurable is false by default
       // enumerable is false by default
       writable: true,
@@ -400,7 +401,7 @@ function buildPrivateInstanceFieldInitSpec(ref, prop, privateNamesMap) {
   const { id } = privateNamesMap.get(prop.node.key.id.name);
   const value = prop.node.value || prop.scope.buildUndefinedNode();
 
-  return template.statement.ast`${id}.set(${ref}, {
+  return template.statement.ast`${t.cloneNode(id)}.set(${ref}, {
     // configurable is always false for private elements
     // enumerable is always false for private elements
     writable: true,
@@ -422,7 +423,7 @@ function buildPrivateStaticFieldInitSpec(prop, privateNamesMap) {
     });
 
     return template.statement.ast`
-      var ${id.name} = {
+      var ${t.cloneNode(id)} = {
         // configurable is false by default
         // enumerable is false by default
         // writable is false by default
@@ -434,7 +435,7 @@ function buildPrivateStaticFieldInitSpec(prop, privateNamesMap) {
 
   const value = prop.node.value || prop.scope.buildUndefinedNode();
   return template.statement.ast`
-    var ${id} = {
+    var ${t.cloneNode(id)} = {
       // configurable is false by default
       // enumerable is false by default
       writable: true,
@@ -603,14 +604,14 @@ function buildPrivateMethodDeclaration(prop, privateNamesMap, loose = false) {
   if (isStatic && !loose) {
     return t.variableDeclaration("var", [
       t.variableDeclarator(
-        id,
+        t.cloneNode(id),
         t.functionExpression(id, params, body, generator, async),
       ),
     ]);
   }
 
   return t.variableDeclaration("var", [
-    t.variableDeclarator(methodId, methodValue),
+    t.variableDeclarator(t.cloneNode(methodId), methodValue),
   ]);
 }
 

diff --git a/packages/babel-helper-create-class-features-plugin/src/index.js b/packages/babel-helper-create-class-features-plugin/src/index.js
@@ -1,3 +1,4 @@
+import { types as t } from "@babel/core";
 import nameFunction from "@babel/helper-function-name";
 import splitExportDeclaration from "@babel/helper-split-export-declaration";
 import {
@@ -129,7 +130,7 @@ export function createClassFeaturePlugin({
           nameFunction(path);
           ref = path.scope.generateUidIdentifier("class");
         } else {
-          ref = path.node.id;
+          ref = t.cloneNode(path.node.id);
         }
 
         // NODE: These three functions don't support decorators yet,

diff --git a/packages/babel-helper-create-class-features-plugin/src/misc.js b/packages/babel-helper-create-class-features-plugin/src/misc.js
@@ -72,8 +72,14 @@ export function injectInitialization(path, constructor, nodes, renamer) {
   if (isDerived) {
     const bareSupers = [];
     constructor.traverse(findBareSupers, bareSupers);
+    let isFirst = true;
     for (const bareSuper of bareSupers) {
-      bareSuper.insertAfter(nodes);
+      if (isFirst) {
+        bareSuper.insertAfter(nodes);
+        isFirst = false;
+      } else {
+        bareSuper.insertAfter(nodes.map(n => t.cloneNode(n)));
+      }
     }
   } else {
     constructor.get("body").unshiftContainer("body", nodes);

diff --git a/packages/babel-helper-member-expression-to-functions/src/index.js b/packages/babel-helper-member-expression-to-functions/src/index.js
@@ -235,8 +235,12 @@ const handle = {
             t.binaryExpression(
               "===",
               baseNeedsMemoised
-                ? t.assignmentExpression("=", baseRef, startingNode)
-                : baseRef,
+                ? t.assignmentExpression(
+                    "=",
+                    t.cloneNode(baseRef),
+                    t.cloneNode(startingNode),
+                  )
+                : t.cloneNode(baseRef),
               t.nullLiteral(),
             ),
             t.binaryExpression(
@@ -263,7 +267,7 @@ const handle = {
               false,
               true,
             ),
-            [context, ...endParent.arguments],
+            [t.cloneNode(context), ...endParent.arguments],
             false,
           ),
         );

diff --git a/packages/babel-helper-module-transforms/src/rewrite-live-references.js b/packages/babel-helper-module-transforms/src/rewrite-live-references.js
@@ -337,7 +337,9 @@ const rewriteReferencesVisitor = {
       path
         .get("left")
         .replaceWith(
-          t.variableDeclaration("let", [t.variableDeclarator(newLoopId)]),
+          t.variableDeclaration("let", [
+            t.variableDeclarator(t.cloneNode(newLoopId)),
+          ]),
         );
       scope.registerDeclaration(path.get("left"));
     }

diff --git a/packages/babel-plugin-proposal-async-generator-functions/src/for-await.js b/packages/babel-plugin-proposal-async-generator-functions/src/for-await.js
@@ -61,7 +61,7 @@ export default function (path, { getAsyncIterator }) {
     ITERATOR_KEY: scope.generateUidIdentifier("iterator"),
     GET_ITERATOR: getAsyncIterator,
     OBJECT: node.right,
-    STEP_VALUE: stepValue,
+    STEP_VALUE: t.cloneNode(stepValue),
     STEP_KEY: stepKey,
   });
 

diff --git a/packages/babel-plugin-proposal-decorators/src/transformer-legacy.js b/packages/babel-plugin-proposal-decorators/src/transformer-legacy.js
@@ -160,7 +160,7 @@ function applyTargetDecorators(path, state, decoratedProps) {
       acc = acc.concat([
         t.assignmentExpression(
           "=",
-          descriptor,
+          t.cloneNode(descriptor),
           t.callExpression(state.addHelper("applyDecoratedDescriptor"), [
             t.cloneNode(target),
             t.cloneNode(property),

diff --git a/packages/babel-plugin-proposal-function-bind/src/index.js b/packages/babel-plugin-proposal-function-bind/src/index.js
@@ -7,7 +7,7 @@ export default declare(api => {
 
   function getTempId(scope) {
     let id = scope.path.getData("functionBind");
-    if (id) return id;
+    if (id) return t.cloneNode(id);
 
     id = scope.generateDeclaredUidIdentifier("context");
     return scope.path.setData("functionBind", id);
@@ -35,7 +35,7 @@ export default declare(api => {
         bind.callee.object,
       );
     }
-    return tempId;
+    return t.cloneNode(tempId);
   }
 
   return {

diff --git a/packages/babel-plugin-proposal-partial-application/src/index.js b/packages/babel-plugin-proposal-partial-application/src/index.js
@@ -97,27 +97,27 @@ export default declare(api => {
               "=",
               t.cloneNode(functionLVal),
               t.memberExpression(
-                receiverLVal,
+                t.cloneNode(receiverLVal),
                 node.callee.property,
                 false,
                 false,
               ),
             ),
             ...argsInitializers,
             t.functionExpression(
-              node.callee.property,
+              t.cloneNode(node.callee.property),
               placeholdersParams,
               t.blockStatement(
                 [
                   t.returnStatement(
                     t.callExpression(
                       t.memberExpression(
-                        functionLVal,
+                        t.cloneNode(functionLVal),
                         t.identifier("call"),
                         false,
                         false,
                       ),
-                      [receiverLVal, ...args],
+                      [t.cloneNode(receiverLVal), ...args],
                     ),
                   ),
                 ],
@@ -132,10 +132,14 @@ export default declare(api => {
             t.assignmentExpression("=", t.cloneNode(functionLVal), node.callee),
             ...argsInitializers,
             t.functionExpression(
-              node.callee,
+              t.cloneNode(node.callee),
               placeholdersParams,
               t.blockStatement(
-                [t.returnStatement(t.callExpression(functionLVal, args))],
+                [
+                  t.returnStatement(
+                    t.callExpression(t.cloneNode(functionLVal), args),
+                  ),
+                ],
                 [],
               ),
               false,

diff --git a/packages/babel-plugin-proposal-pipeline-operator/src/buildOptimizedSequenceExpression.js b/packages/babel-plugin-proposal-pipeline-operator/src/buildOptimizedSequenceExpression.js
@@ -30,7 +30,7 @@ const buildOptimizedSequenceExpression = ({ assign, call, path }) => {
 
     call.callee = evalSequence;
 
-    path.scope.push({ id: placeholderNode });
+    path.scope.push({ id: t.cloneNode(placeholderNode) });
 
     return t.sequenceExpression([assign, call]);
   }
@@ -40,7 +40,7 @@ const buildOptimizedSequenceExpression = ({ assign, call, path }) => {
     return t.sequenceExpression([pipelineLeft, calledExpression.body]);
   }
 
-  path.scope.push({ id: placeholderNode });
+  path.scope.push({ id: t.cloneNode(placeholderNode) });
 
   if (param) {
     path.get("right").scope.rename(param.name, placeholderNode.name);

diff --git a/packages/babel-plugin-proposal-pipeline-operator/src/smartVisitor.js b/packages/babel-plugin-proposal-pipeline-operator/src/smartVisitor.js
@@ -2,7 +2,7 @@ import { types as t } from "@babel/core";
 
 const updateTopicReferenceVisitor = {
   PipelinePrimaryTopicReference(path) {
-    path.replaceWith(this.topicId);
+    path.replaceWith(t.cloneNode(this.topicId));
   },
   PipelineTopicExpression(path) {
     path.skip();

diff --git a/packages/babel-plugin-transform-block-scoping/src/index.js b/packages/babel-plugin-transform-block-scoping/src/index.js
@@ -33,7 +33,7 @@ export default declare((api, opts) => {
             const decl = node.declarations[i];
             const assign = t.assignmentExpression(
               "=",
-              decl.id,
+              t.cloneNode(decl.id),
               decl.init || scope.buildUndefinedNode(),
             );
             assign._ignoreBlockScopingTDZ = true;

diff --git a/packages/babel-plugin-transform-modules-amd/src/index.js b/packages/babel-plugin-transform-modules-amd/src/index.js
@@ -71,8 +71,8 @@ export default declare((api, options) => {
             new Promise((${resolveId}, ${rejectId}) =>
               ${requireId}(
                 [${getImportSource(t, path.node)}],
-                imported => ${resolveId}(${result}),
-                ${rejectId}
+                imported => ${t.cloneNode(resolveId)}(${result}),
+                ${t.cloneNode(rejectId)}
               )
             )`,
         );
@@ -84,7 +84,7 @@ export default declare((api, options) => {
             if (requireId) {
               injectWrapper(
                 path,
-                buildAnonymousWrapper({ REQUIRE: requireId }),
+                buildAnonymousWrapper({ REQUIRE: t.cloneNode(requireId) }),
               );
             }
             return;
@@ -94,7 +94,7 @@ export default declare((api, options) => {
           const importNames = [];
           if (requireId) {
             amdArgs.push(t.stringLiteral("require"));
-            importNames.push(requireId);
+            importNames.push(t.cloneNode(requireId));
           }
 
           let moduleName = getModuleName(this.file.opts, options);