update

node_modules/@babel/helper-wrap-function/lib/index.js

@@ -5,17 +5,20 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = wrapFunction;
 
-var _helperFunctionName = _interopRequireDefault(require("@babel/helper-function-name"));
+var _helperFunctionName = require("@babel/helper-function-name");
 
-var _template = _interopRequireDefault(require("@babel/template"));
+var _template = require("@babel/template");
 
-var t = _interopRequireWildcard(require("@babel/types"));
+var _t = require("@babel/types");
 
-function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function () { return cache; }; return cache; }
-
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+const {
+  blockStatement,
+  callExpression,
+  functionExpression,
+  isAssignmentPattern,
+  isRestElement,
+  returnStatement
+} = _t;
 
 const buildAnonymousExpressionWrapper = _template.default.expression(`
   (function () {
@@ -36,7 +39,7 @@ const buildNamedExpressionWrapper = _template.default.expression(`
   })()
 `);
 
-const buildDeclarationWrapper = (0, _template.default)(`
+const buildDeclarationWrapper = _template.default.statements(`
   function NAME(PARAMS) { return REF.apply(this, arguments); }
   function REF() {
     REF = FUNCTION;
@@ -47,21 +50,23 @@ const buildDeclarationWrapper = (0, _template.default)(`
 function classOrObjectMethod(path, callId) {
   const node = path.node;
   const body = node.body;
-  const container = t.functionExpression(null, [], t.blockStatement(body.body), true);
-  body.body = [t.returnStatement(t.callExpression(t.callExpression(callId, [container]), []))];
+  const container = functionExpression(null, [], blockStatement(body.body), true);
+  body.body = [returnStatement(callExpression(callExpression(callId, [container]), []))];
   node.async = false;
   node.generator = false;
   path.get("body.body.0.argument.callee.arguments.0").unwrapFunctionEnvironment();
 }
 
-function plainFunction(path, callId) {
+function plainFunction(path, callId, noNewArrows, ignoreFunctionLength) {
   const node = path.node;
   const isDeclaration = path.isFunctionDeclaration();
   const functionId = node.id;
   const wrapper = isDeclaration ? buildDeclarationWrapper : functionId ? buildNamedExpressionWrapper : buildAnonymousExpressionWrapper;
 
   if (path.isArrowFunctionExpression()) {
-    path.arrowFunctionToExpression();
+    path.arrowFunctionToExpression({
+      noNewArrows
+    });
   }
 
   node.id = null;
@@ -70,23 +75,22 @@ function plainFunction(path, callId) {
     node.type = "FunctionExpression";
   }
 
-  const built = t.callExpression(callId, [node]);
+  const built = callExpression(callId, [node]);
+  const params = [];
+
+  for (const param of node.params) {
+    if (isAssignmentPattern(param) || isRestElement(param)) {
+      break;
+    }
+
+    params.push(path.scope.generateUidIdentifier("x"));
+  }
+
   const container = wrapper({
     NAME: functionId || null,
     REF: path.scope.generateUidIdentifier(functionId ? functionId.name : "ref"),
     FUNCTION: built,
-    PARAMS: node.params.reduce((acc, param) => {
-      acc.done = acc.done || t.isAssignmentPattern(param) || t.isRestElement(param);
-
-      if (!acc.done) {
-        acc.params.push(path.scope.generateUidIdentifier("x"));
-      }
-
-      return acc;
-    }, {
-      params: [],
-      done: false
-    }).params
+    PARAMS: params
   });
 
   if (isDeclaration) {
@@ -103,7 +107,7 @@ function plainFunction(path, callId) {
       });
     }
 
-    if (!retFunction || retFunction.id || node.params.length) {
+    if (!retFunction || retFunction.id || !ignoreFunctionLength && params.length) {
       path.replaceWith(container);
     } else {
       path.replaceWith(built);
@@ -111,10 +115,10 @@ function plainFunction(path, callId) {
   }
 }
 
-function wrapFunction(path, callId) {
-  if (path.isClassMethod() || path.isObjectMethod()) {
+function wrapFunction(path, callId, noNewArrows = true, ignoreFunctionLength = false) {
+  if (path.isMethod()) {
     classOrObjectMethod(path, callId);
   } else {
-    plainFunction(path, callId);
+    plainFunction(path, callId, noNewArrows, ignoreFunctionLength);
   }
 }