prettier 1.16.0 → 1.16.4

package/standalone.js

@@ -5,7 +5,7 @@
 }(this, (function () { 'use strict';
 
 var name = "prettier";
-var version$1 = "1.16.0";
+var version$1 = "1.16.4";
 var description = "Prettier is an opinionated code formatter";
 var bin = {
   "prettier": "./bin/prettier.js"
@@ -47,6 +47,7 @@ var dependencies = {
   "html-styles": "1.0.0",
   "html-tag-names": "1.1.2",
   "ignore": "3.3.7",
+  "is-ci": "2.0.0",
   "jest-docblock": "23.2.0",
   "json-stable-stringify": "1.0.1",
   "leven": "2.1.0",
@@ -100,7 +101,7 @@ var devDependencies = {
   "jest-snapshot-serializer-raw": "1.1.0",
   "jest-watch-typeahead": "0.1.0",
   "mkdirp": "0.5.1",
-  "prettier": "1.15.3",
+  "prettier": "1.16.3",
   "prettylint": "1.0.0",
   "rimraf": "2.6.2",
   "rollup": "0.47.6",
@@ -6495,6 +6496,7 @@ function getSupportInfo$2(version, opts) {
     });
   });
   var usePostCssParser = semver.lt(version, "1.7.1");
+  var useBabylonParser = semver.lt(version, "1.16.0");
   var languages = plugins.reduce(function (all, plugin) {
     return all.concat(plugin.languages || []);
   }, []).filter(filterSince).map(function (language) {
@@ -6509,6 +6511,15 @@ function getSupportInfo$2(version, opts) {
       return Object.assign({}, language, {
         parsers: ["typescript"]
       });
+    } // "babylon" was renamed to "babel" in 1.16.0
+
+
+    if (useBabylonParser && language.parsers.indexOf("babel") !== -1) {
+      return Object.assign({}, language, {
+        parsers: language.parsers.map(function (parser) {
+          return parser === "babel" ? "babylon" : parser;
+        })
+      });
     }
 
     if (usePostCssParser && (language.name === "CSS" || language.group === "CSS")) {
@@ -21152,8 +21163,8 @@ function printClosingTagEndMarker(node, options) {
 
 function getTextValueParts(node) {
   var value = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : node.value;
-  return node.parent.isWhitespaceSensitive ? node.parent.isIndentationSensitive ? replaceEndOfLineWith$1(value, literalline$2) : replaceEndOfLineWith$1(dedentString(value.replace(/^\s*?\n|\n\s*?$/g, "")), hardline$7) : // non-breaking whitespace: 0xA0
-  join$5(line$6, value.split(/[^\S\xA0]+/)).parts;
+  return node.parent.isWhitespaceSensitive ? node.parent.isIndentationSensitive ? replaceEndOfLineWith$1(value, literalline$2) : replaceEndOfLineWith$1(dedentString(value.replace(/^\s*?\n|\n\s*?$/g, "")), hardline$7) : // https://infra.spec.whatwg.org/#ascii-whitespace
+  join$5(line$6, value.split(/[\t\n\f\r ]+/)).parts;
 }
 
 function printEmbeddedAttributeValue(node, originalTextToDoc, options) {
@@ -22705,9 +22716,62 @@ function hasClosureCompilerTypeCastComment(text, path, locStart, locEnd) {
 
   function hasTypeCastComment(node) {
     return node.comments && node.comments.some(function (comment) {
-      return comment.leading && comments$3.isBlockComment(comment) && comment.value.match(/^\*\s*@type\s*{[^}]+}\s*$/) && util.getNextNonSpaceNonCommentCharacter(text, comment, locEnd) === "(";
+      return comment.leading && comments$3.isBlockComment(comment) && isTypeCastComment(comment.value) && util.getNextNonSpaceNonCommentCharacter(text, comment, locEnd) === "(";
     });
   }
+
+  function isTypeCastComment(comment) {
+    var trimmed = comment.trim();
+
+    if (!/^\*\s*@type\s*\{[^]+\}$/.test(trimmed)) {
+      return false;
+    }
+
+    var isCompletelyClosed = false;
+    var unpairedBracketCount = 0;
+    var _iteratorNormalCompletion = true;
+    var _didIteratorError = false;
+    var _iteratorError = undefined;
+
+    try {
+      for (var _iterator = trimmed[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+        var char = _step.value;
+
+        if (char === "{") {
+          if (isCompletelyClosed) {
+            return false;
+          }
+
+          unpairedBracketCount++;
+        } else if (char === "}") {
+          if (unpairedBracketCount === 0) {
+            return false;
+          }
+
+          unpairedBracketCount--;
+
+          if (unpairedBracketCount === 0) {
+            isCompletelyClosed = true;
+          }
+        }
+      }
+    } catch (err) {
+      _didIteratorError = true;
+      _iteratorError = err;
+    } finally {
+      try {
+        if (!_iteratorNormalCompletion && _iterator.return != null) {
+          _iterator.return();
+        }
+      } finally {
+        if (_didIteratorError) {
+          throw _iteratorError;
+        }
+      }
+    }
+
+    return unpairedBracketCount === 0;
+  }
 }
 
 function needsParens(path, options) {
@@ -22764,6 +22828,42 @@ function needsParens(path, options) {
     return true;
   }
 
+  if (parent.type === "Decorator" && parent.expression === node) {
+    var hasCallExpression = false;
+    var hasMemberExpression = false;
+    var current = node;
+
+    while (current) {
+      switch (current.type) {
+        case "MemberExpression":
+          hasMemberExpression = true;
+          current = current.object;
+          break;
+
+        case "CallExpression":
+          if (
+          /** @(x().y) */
+          hasMemberExpression ||
+          /** @(x().y()) */
+          hasCallExpression) {
+            return true;
+          }
+
+          hasCallExpression = true;
+          current = current.callee;
+          break;
+
+        case "Identifier":
+          return false;
+
+        default:
+          return true;
+      }
+    }
+
+    return true;
+  }
+
   if (parent.type === "ArrowFunctionExpression" && parent.body === node && node.type !== "SequenceExpression" && // these have parens added anyway
   util.startsWithNoLookaheadToken(node,
   /* forbidFunctionClassAndDoExpr */
@@ -22900,9 +23000,6 @@ function needsParens(path, options) {
         case "AssignmentExpression":
           return parent.left === node && (node.type === "TSTypeAssertion" || node.type === "TSAsExpression");
 
-        case "Decorator":
-          return parent.expression === node && (node.type === "TSTypeAssertion" || node.type === "TSAsExpression");
-
         case "BinaryExpression":
         case "LogicalExpression":
           {
@@ -22952,6 +23049,14 @@ function needsParens(path, options) {
     case "TSParenthesizedType":
       {
         var grandParent = path.getParentNode(1);
+        /**
+         * const foo = (): (() => void) => (): void => null;
+         *                 ^          ^
+         */
+
+        if (getUnparenthesizedNode(node).type === "TSFunctionType" && parent.type === "TSTypeAnnotation" && grandParent.type === "ArrowFunctionExpression" && grandParent.returnType === parent) {
+          return true;
+        }
 
         if ((parent.type === "TSTypeParameter" || parent.type === "TypeParameter" || parent.type === "TSTypeAliasDeclaration" || parent.type === "TSTypeAnnotation" || parent.type === "TSParenthesizedType" || parent.type === "TSTypeParameterInstantiation") && grandParent.type !== "TSTypeOperator" && grandParent.type !== "TSOptionalType") {
           return false;
@@ -23212,6 +23317,10 @@ function isStatement(node) {
   return node.type === "BlockStatement" || node.type === "BreakStatement" || node.type === "ClassBody" || node.type === "ClassDeclaration" || node.type === "ClassMethod" || node.type === "ClassProperty" || node.type === "ClassPrivateProperty" || node.type === "ContinueStatement" || node.type === "DebuggerStatement" || node.type === "DeclareClass" || node.type === "DeclareExportAllDeclaration" || node.type === "DeclareExportDeclaration" || node.type === "DeclareFunction" || node.type === "DeclareInterface" || node.type === "DeclareModule" || node.type === "DeclareModuleExports" || node.type === "DeclareVariable" || node.type === "DoWhileStatement" || node.type === "ExportAllDeclaration" || node.type === "ExportDefaultDeclaration" || node.type === "ExportNamedDeclaration" || node.type === "ExpressionStatement" || node.type === "ForAwaitStatement" || node.type === "ForInStatement" || node.type === "ForOfStatement" || node.type === "ForStatement" || node.type === "FunctionDeclaration" || node.type === "IfStatement" || node.type === "ImportDeclaration" || node.type === "InterfaceDeclaration" || node.type === "LabeledStatement" || node.type === "MethodDefinition" || node.type === "ReturnStatement" || node.type === "SwitchStatement" || node.type === "ThrowStatement" || node.type === "TryStatement" || node.type === "TSAbstractClassDeclaration" || node.type === "TSDeclareFunction" || node.type === "TSEnumDeclaration" || node.type === "TSImportEqualsDeclaration" || node.type === "TSInterfaceDeclaration" || node.type === "TSModuleDeclaration" || node.type === "TSNamespaceExportDeclaration" || node.type === "TypeAlias" || node.type === "VariableDeclaration" || node.type === "WhileStatement" || node.type === "WithStatement";
 }
 
+function getUnparenthesizedNode(node) {
+  return node.type === "TSParenthesizedType" ? getUnparenthesizedNode(node.typeAnnotation) : node;
+}
+
 function endsWithRightBracket(node) {
   switch (node.type) {
     case "ObjectExpression":
@@ -26125,7 +26234,7 @@ function printArgumentsList(path, options, print) {
   } // useEffect(() => { ... }, [foo, bar, baz])
 
 
-  if (args.length === 2 && args[0].type === "ArrowFunctionExpression" && args[0].body.type === "BlockStatement" && args[1].type === "ArrayExpression" && !args.find(function (arg) {
+  if (args.length === 2 && args[0].type === "ArrowFunctionExpression" && args[0].params.length === 0 && args[0].body.type === "BlockStatement" && args[1].type === "ArrayExpression" && !args.find(function (arg) {
     return arg.leadingComments || arg.trailingComments;
   })) {
     return concat$11(["(", path.call(print, "arguments", 0), ", ", path.call(print, "arguments", 1), ")"]);
@@ -28453,6 +28562,8 @@ var cjkPattern = json$9.cjkPattern;
 var kPattern = json$9.kPattern;
 var punctuationPattern$1 = json$9.punctuationPattern;
 var getLast$5 = util.getLast;
+var INLINE_NODE_TYPES$1 = ["liquidNode", "inlineCode", "emphasis", "strong", "delete", "link", "linkReference", "image", "imageReference", "footnote", "footnoteReference", "sentence", "whitespace", "word", "break", "inlineMath"];
+var INLINE_NODE_WRAPPER_TYPES$1 = INLINE_NODE_TYPES$1.concat(["tableCell", "paragraph", "heading"]);
 var kRegex = new RegExp(kPattern);
 var punctuationRegex = new RegExp(punctuationPattern$1);
 /**
@@ -28604,7 +28715,9 @@ var utils$10 = {
   splitText: splitText$1,
   punctuationPattern: punctuationPattern$1,
   getFencedCodeBlockValue: getFencedCodeBlockValue$2,
-  getOrderedListItemInfo: getOrderedListItemInfo$1
+  getOrderedListItemInfo: getOrderedListItemInfo$1,
+  INLINE_NODE_TYPES: INLINE_NODE_TYPES$1,
+  INLINE_NODE_WRAPPER_TYPES: INLINE_NODE_WRAPPER_TYPES$1
 };
 
 var _require$$0$builders$9 = doc.builders;
@@ -28998,12 +29111,12 @@ var getFencedCodeBlockValue = utils$10.getFencedCodeBlockValue;
 var getOrderedListItemInfo = utils$10.getOrderedListItemInfo;
 var splitText = utils$10.splitText;
 var punctuationPattern = utils$10.punctuationPattern;
+var INLINE_NODE_TYPES = utils$10.INLINE_NODE_TYPES;
+var INLINE_NODE_WRAPPER_TYPES = utils$10.INLINE_NODE_WRAPPER_TYPES;
 var replaceEndOfLineWith$2 = util.replaceEndOfLineWith;
 var TRAILING_HARDLINE_NODES = ["importExport"];
 var SINGLE_LINE_NODE_TYPES = ["heading", "tableCell", "link"];
 var SIBLING_NODE_TYPES = ["listItem", "definition", "footnoteDefinition"];
-var INLINE_NODE_TYPES = ["liquidNode", "inlineCode", "emphasis", "strong", "delete", "link", "linkReference", "image", "imageReference", "footnote", "footnoteReference", "sentence", "whitespace", "word", "break", "inlineMath"];
-var INLINE_NODE_WRAPPER_TYPES = INLINE_NODE_TYPES.concat(["tableCell", "paragraph", "heading"]);
 
 function genericPrint$5(path, options, print) {
   var node = path.getValue();