fix: fix eval order

Author: hackwaly

lib/index.js

@@ -14,9 +14,6 @@ const normalizeOptions = options => ({
     || defaultWrappersConfig,
 });
 
-const findContainer = (path, t) => (path.node.body
-  ? path : findContainer(path.parentPath, t));
-
 const findCandidateNameForExpression = (path) => {
   let id;
   path.find((currentPath) => {
@@ -67,14 +64,26 @@ module.exports = function displayNamePlugin(babel, options = {}) {
     });
 
     if (args && displayName) {
-      const nodes = t.expressionStatement(
-        t.assignmentExpression(
-          '=',
-          t.memberExpression(nameNodeId, t.identifier('displayName')),
-          t.stringLiteral(displayName),
+      const tempId = path.scope.generateUidIdentifier();
+      path.replaceWith(
+        t.callExpression(
+          t.arrowFunctionExpression(
+            [t.cloneNode(tempId)],
+            t.blockStatement([
+              t.expressionStatement(
+                t.assignmentExpression(
+                  '=',
+                  t.memberExpression(t.cloneNode(tempId), t.identifier('displayName')),
+                  t.stringLiteral(displayName),
+                ),
+              ),
+              t.returnStatement(t.cloneNode(tempId)),
+            ]),
+          ),
+          [path.node],
         ),
       );
-      findContainer(path, t).pushContainer('body', nodes);
+      path.skip();
     }
   };
 

test/fixtures/normal/constant/output.mjs

@@ -1,4 +1,6 @@
 const React = require('react');
 
-const Name = React.memo(() => null);
-Name.displayName = "Memo(Name)";
+const Name = (_temp => {
+  _temp.displayName = "Memo(Name)";
+  return _temp;
+})(React.memo(() => null));

test/fixtures/normal/destructed-import/output.mjs

@@ -1,3 +1,6 @@
 import { memo } from 'react';
-const Name = memo(() => null);
-Name.displayName = "Memo(Name)";
+
+const Name = (_temp => {
+  _temp.displayName = "Memo(Name)";
+  return _temp;
+})(memo(() => null));

test/fixtures/normal/destructed-require/output.mjs

@@ -2,5 +2,7 @@ const {
   memo
 } = require('react');
 
-const Name = memo(() => null);
-Name.displayName = "Memo(Name)";
+const Name = (_temp => {
+  _temp.displayName = "Memo(Name)";
+  return _temp;
+})(memo(() => null));

test/fixtures/normal/inner-scope/output.mjs

@@ -3,7 +3,9 @@ const {
 } = require('react');
 
 const Outer = () => {
-  const Name = memo(() => null);
-  Name.displayName = "Memo(Name)";
+  const Name = (_temp => {
+    _temp.displayName = "Memo(Name)";
+    return _temp;
+  })(memo(() => null));
 };