Changeset 0c6b92a for imaps-frontend/node_modules/@babel/generator/lib/generators/methods.js

Timestamp:

12/12/24 17:06:06 (5 weeks ago)

Author:

stefan toskovski <stefantoska84@…>

Branches:

main

Parents:

d565449

Message:

Pred finalna verzija

File:

• imaps-frontend/node_modules/@babel/generator/lib/generators/methods.js (modified) (9 diffs)

imaps-frontend/node_modules/@babel/generator/lib/generators/methods.js

@@ -12 +12 @@
 exports._params = _params;
 exports._predicate = _predicate;
+exports._shouldPrintArrowParamsParens = _shouldPrintArrowParamsParens;
 var _t = require("@babel/types");
 var _index = require("../node/index.js");
@@ -18 +19 @@
 } = _t;
 function _params(node, idNode, parentNode) {
-  this.print(node.typeParameters, node);
+  this.print(node.typeParameters);
   const nameInfo = _getFuncIdName.call(this, idNode, parentNode);
   if (nameInfo) {
@@ -24 +25 @@
   }
   this.tokenChar(40);
-  this._parameters(node.params, node);
-  this.tokenChar(41);
+  this._parameters(node.params, ")");
   const noLineTerminator = node.type === "ArrowFunctionExpression";
-  this.print(node.returnType, node, noLineTerminator);
+  this.print(node.returnType, noLineTerminator);
   this._noLineTerminator = noLineTerminator;
 }
-function _parameters(parameters, parent) {
-  const exit = this.enterForStatementInit(false);
+function _parameters(parameters, endToken) {
+  const exit = this.enterDelimited();
+  const trailingComma = this.shouldPrintTrailingComma(endToken);
   const paramLength = parameters.length;
   for (let i = 0; i < paramLength; i++) {
-    this._param(parameters[i], parent);
-    if (i < parameters.length - 1) {
-      this.tokenChar(44);
+    this._param(parameters[i]);
+    if (trailingComma || i < paramLength - 1) {
+      this.token(",", null, i);
       this.space();
     }
   }
+  this.token(endToken);
   exit();
 }
-function _param(parameter, parent) {
-  this.printJoin(parameter.decorators, parameter);
-  this.print(parameter, parent);
+function _param(parameter) {
+  this.printJoin(parameter.decorators);
+  this.print(parameter);
   if (parameter.optional) {
     this.tokenChar(63);
   }
-  this.print(parameter.typeAnnotation, parameter);
+  this.print(parameter.typeAnnotation);
 }
 function _methodHead(node) {
@@ -68 +70 @@
   if (node.computed) {
     this.tokenChar(91);
-    this.print(key, node);
+    this.print(key);
     this.tokenChar(93);
   } else {
-    this.print(key, node);
+    this.print(key);
   }
   if (node.optional) {
@@ -84 +86 @@
     }
     this.space();
-    this.print(node.predicate, node, noLineTerminatorAfter);
+    this.print(node.predicate, noLineTerminatorAfter);
   }
 }
@@ -90 +92 @@
   if (node.async) {
     this.word("async");
-    this._endsWithInnerRaw = false;
+    if (!this.format.preserveFormat) {
+      this._endsWithInnerRaw = false;
+    }
     this.space();
   }
   this.word("function");
   if (node.generator) {
-    this._endsWithInnerRaw = false;
+    if (!this.format.preserveFormat) {
+      this._endsWithInnerRaw = false;
+    }
     this.tokenChar(42);
   }
   this.space();
   if (node.id) {
-    this.print(node.id, node);
+    this.print(node.id);
   }
   this._params(node, node.id, parent);
@@ -110 +116 @@
   this._functionHead(node, parent);
   this.space();
-  this.print(node.body, node);
+  this.print(node.body);
 }
 function ArrowFunctionExpression(node, parent) {
@@ -117 +123 @@
     this.space();
   }
-  let firstParam;
-  if (!this.format.retainLines && node.params.length === 1 && isIdentifier(firstParam = node.params[0]) && !hasTypesOrComments(node, firstParam)) {
-    this.print(firstParam, node, true);
+  if (this._shouldPrintArrowParamsParens(node)) {
+    this._params(node, undefined, parent);
   } else {
-    this._params(node, undefined, parent);
+    this.print(node.params[0], true);
   }
   this._predicate(node, true);
@@ -129 +134 @@
   this.space();
   this.tokenContext |= _index.TokenContext.arrowBody;
-  this.print(node.body, node);
+  this.print(node.body);
 }
-function hasTypesOrComments(node, param) {
-  var _param$leadingComment, _param$trailingCommen;
-  return !!(node.typeParameters || node.returnType || node.predicate || param.typeAnnotation || param.optional || (_param$leadingComment = param.leadingComments) != null && _param$leadingComment.length || (_param$trailingCommen = param.trailingComments) != null && _param$trailingCommen.length);
+function _shouldPrintArrowParamsParens(node) {
+  var _firstParam$leadingCo, _firstParam$trailingC;
+  if (node.params.length !== 1) return true;
+  if (node.typeParameters || node.returnType || node.predicate) {
+    return true;
+  }
+  const firstParam = node.params[0];
+  if (!isIdentifier(firstParam) || firstParam.typeAnnotation || firstParam.optional || (_firstParam$leadingCo = firstParam.leadingComments) != null && _firstParam$leadingCo.length || (_firstParam$trailingC = firstParam.trailingComments) != null && _firstParam$trailingC.length) {
+    return true;
+  }
+  if (this.tokenMap) {
+    if (node.loc == null) return true;
+    if (this.tokenMap.findMatching(node, "(") !== null) return true;
+    const arrowToken = this.tokenMap.findMatching(node, "=>");
+    if ((arrowToken == null ? void 0 : arrowToken.loc) == null) return true;
+    return arrowToken.loc.start.line !== node.loc.start.line;
+  }
+  if (this.format.retainLines) return true;
+  return false;
 }
 function _getFuncIdName(idNode, parent) {