prettier 1.13.3 → 1.13.7

package/standalone.js

@@ -5,7 +5,7 @@
 }(this, (function () { 'use strict';
 
 var name = "prettier";
-var version$1 = "1.13.3";
+var version$1 = "1.13.7";
 var description = "Prettier is an opinionated code formatter";
 var bin = {
   "prettier": "./bin/prettier.js"
@@ -36,7 +36,7 @@ var dependencies = {
   "esutils": "2.0.2",
   "find-parent-dir": "0.3.0",
   "find-project-root": "1.1.1",
-  "flow-parser": "0.73.0",
+  "flow-parser": "0.75.0",
   "get-stream": "3.0.0",
   "globby": "6.1.0",
   "graphql": "0.13.2",
@@ -60,7 +60,7 @@ var dependencies = {
   "semver": "5.4.1",
   "string-width": "2.1.1",
   "typescript": "2.9.0-dev.20180421",
-  "typescript-eslint-parser": "eslint/typescript-eslint-parser#2960b002746c01fb9cb15bb5f4c1e7e925c6519a",
+  "typescript-eslint-parser": "16.0.0",
   "unicode-regex": "1.0.1",
   "unified": "6.1.6"
 };
@@ -79,7 +79,7 @@ var devDependencies = {
   "eslint-plugin-react": "7.7.0",
   "jest": "21.1.0",
   "mkdirp": "0.5.1",
-  "prettier": "1.13.2",
+  "prettier": "1.13.4",
   "prettylint": "1.0.0",
   "rimraf": "2.6.2",
   "rollup": "0.47.6",
@@ -7274,7 +7274,7 @@ function resolveParser$1(opts, parsers) {
 
     try {
       return {
-        parse: eval("require")(path$4.resolve(process.cwd(), opts.parser)),
+        parse: require(path$4.resolve(process.cwd(), opts.parser)),
         astFormat: "estree",
         locStart: locStart,
         locEnd: locEnd
@@ -9148,8 +9148,7 @@ function printDocToString(doc, options) {
                     out.pop();
                   }
 
-                  if (out.length && typeof out[out.length - 1] === "string" && (options.parser !== "markdown" || // preserve markdown's `break` node (two trailing spaces)
-                  !/\S {2}$/.test(out[out.length - 1]))) {
+                  if (out.length && typeof out[out.length - 1] === "string") {
                     out[out.length - 1] = out[out.length - 1].replace(/[^\S\n]*$/, "");
                   }
                 }
@@ -10507,6 +10506,13 @@ function attachComments(text, ast, opts) {
 }
 
 function coreFormat(text, opts, addAlignmentSize) {
+  if (!text || !text.trim().length) {
+    return {
+      formatted: "",
+      cursorOffset: 0
+    };
+  }
+
   addAlignmentSize = addAlignmentSize || 0;
   var parsed = parser.parse(text, opts);
   var ast = parsed.ast;
@@ -11902,12 +11908,22 @@ var comments$3 = {
   isBlockComment: isBlockComment
 };
 
-function hasClosureCompilerTypeCastComment(text, node, locEnd) {
+function hasClosureCompilerTypeCastComment(text, path, locStart, locEnd) {
   // https://github.com/google/closure-compiler/wiki/Annotating-Types#type-casts
   // Syntax example: var x = /** @type {string} */ (fruit);
-  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) === "(";
-  });
+  var n = path.getValue();
+  return util.getNextNonSpaceNonCommentCharacter(text, n, locEnd) === ")" && (hasTypeCastComment(n) || hasAncestorTypeCastComment(0)); // for sub-item: /** @type {array} */ (numberOrString).map(x => x);
+
+  function hasAncestorTypeCastComment(index) {
+    var ancestor = path.getParentNode(index);
+    return ancestor && util.getNextNonSpaceNonCommentCharacter(text, ancestor, locEnd) !== ")" && /^[\s(]*$/.test(text.slice(locStart(ancestor), locStart(n))) ? hasTypeCastComment(ancestor) || hasAncestorTypeCastComment(index + 1) : false;
+  }
+
+  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) === "(";
+    });
+  }
 }
 
 function needsParens(path, options) {
@@ -11933,7 +11949,7 @@ function needsParens(path, options) {
   // parentheses.
 
 
-  if (hasClosureCompilerTypeCastComment(options.originalText, node, options.locEnd)) {
+  if (hasClosureCompilerTypeCastComment(options.originalText, path, options.locStart, options.locEnd)) {
     return true;
   } // Identifiers never need parentheses.
 
@@ -14078,7 +14094,6 @@ function printPathNoParens(path, options, print, args) {
 
     case "DeclareInterface":
     case "InterfaceDeclaration":
-    case "InterfaceType":
     case "InterfaceTypeAnnotation":
       {
         if (n.type === "DeclareInterface" || isNodeStartingWithDeclare(n, options)) {
@@ -14483,7 +14498,7 @@ function printPathNoParens(path, options, print, args) {
 
     case "TSLastTypeNode":
       // TSImportType
-      return concat$4([!n.isTypeOf ? "" : "typeof ", "import(", path.call(print, "argument"), ")", !n.qualifier ? "" : concat$4([".", path.call(print, "qualifier")])]);
+      return concat$4([!n.isTypeOf ? "" : "typeof ", "import(", path.call(print, "argument"), ")", !n.qualifier ? "" : concat$4([".", path.call(print, "qualifier")]), printTypeParameters(path, options, print, "typeParameters")]);
 
     case "TSLiteralType":
       return path.call(print, "literal");
@@ -15539,12 +15554,13 @@ function printMemberChain(path, options, print) {
   //     .map(x => x)
   //
   // In order to detect those cases, we use an heuristic: if the first
-  // node is an identifier with the name starting with a capital letter.
-  // The rationale is that they are likely to be factories.
+  // node is an identifier with the name starting with a capital
+  // letter or just a sequence of _$. The rationale is that they are
+  // likely to be factories.
 
 
   function isFactory(name) {
-    return /^[A-Z]/.test(name);
+    return /^[A-Z]|^[_$]+$/.test(name);
   } // In case the Identifier is shorter than tab width, we can keep the
   // first call in a single line, if it's an ExpressionStatement.
   //
@@ -16686,6 +16702,10 @@ function genericPrint$2(path, options, print) {
 
     case "Identifier":
       return JSON.stringify(node.name);
+
+    default:
+      /* istanbul ignore next */
+      throw new Error("unknown type: " + JSON.stringify(node.type));
   }
 }
 
@@ -18026,13 +18046,16 @@ function genericPrint$4(path, options, print) {
         var parts = [];
         path.map(function (pathChild, index) {
           parts.push(concat$8([pathChild.call(print)]));
-          parts.push(hardline$7);
 
-          if (index !== n.definitions.length - 1 && isNextLineEmpty$4(options.originalText, pathChild.getValue(), options)) {
+          if (index !== n.definitions.length - 1) {
             parts.push(hardline$7);
+
+            if (isNextLineEmpty$4(options.originalText, pathChild.getValue(), options)) {
+              parts.push(hardline$7);
+            }
           }
         }, "definitions");
-        return concat$8(parts, hardline$7);
+        return concat$8([concat$8(parts), hardline$7]);
       }
 
     case "OperationDefinition":
@@ -18337,9 +18360,9 @@ var languageGraphql = {
 
 var _require$$0$builders$5 = doc.builders;
 var hardline$9 = _require$$0$builders$5.hardline;
-var literalline$3 = _require$$0$builders$5.literalline;
+var literalline$4 = _require$$0$builders$5.literalline;
 var concat$10 = _require$$0$builders$5.concat;
-var markAsRoot$1 = _require$$0$builders$5.markAsRoot;
+var markAsRoot$2 = _require$$0$builders$5.markAsRoot;
 var mapDoc$4 = doc.utils.mapDoc;
 
 function embed$2(path, print, textToDoc, options) {
@@ -18356,7 +18379,7 @@ function embed$2(path, print, textToDoc, options) {
       var doc$$2 = textToDoc(node.value, {
         parser: parser
       });
-      return markAsRoot$1(concat$10([style, node.lang, hardline$9, replaceNewlinesWithLiterallines(doc$$2), style]));
+      return markAsRoot$2(concat$10([style, node.lang, hardline$9, replaceNewlinesWithLiterallines(doc$$2), style]));
     }
   }
 
@@ -18382,7 +18405,7 @@ function embed$2(path, print, textToDoc, options) {
   function replaceNewlinesWithLiterallines(doc$$2) {
     return mapDoc$4(doc$$2, function (currentDoc) {
       return typeof currentDoc === "string" && currentDoc.includes("\n") ? concat$10(currentDoc.split(/(\n)/g).map(function (v, i) {
-        return i % 2 === 0 ? v : literalline$3;
+        return i % 2 === 0 ? v : literalline$4;
       })) : currentDoc;
     });
   }
@@ -18446,6 +18469,8 @@ var _require$$0$builders$4 = doc.builders;
 var concat$9 = _require$$0$builders$4.concat;
 var join$7 = _require$$0$builders$4.join;
 var line$6 = _require$$0$builders$4.line;
+var literalline$3 = _require$$0$builders$4.literalline;
+var markAsRoot$1 = _require$$0$builders$4.markAsRoot;
 var hardline$8 = _require$$0$builders$4.hardline;
 var softline$5 = _require$$0$builders$4.softline;
 var fill$4 = _require$$0$builders$4.fill;
@@ -18578,7 +18603,9 @@ function genericPrint$5(path, options, print) {
       {
         var _parentNode2 = path.getParentNode();
 
-        return replaceNewlinesWithHardlines(_parentNode2.type === "root" && util.getLast(_parentNode2.children) === node ? node.value.trimRight() : node.value);
+        var value = _parentNode2.type === "root" && util.getLast(_parentNode2.children) === node ? node.value.trimRight() : node.value;
+        var isHtmlComment = /^<!--[\s\S]*-->$/.test(value);
+        return replaceNewlinesWith(value, isHtmlComment ? hardline$8 : markAsRoot$1(literalline$3));
       }
 
     case "list":
@@ -18656,10 +18683,10 @@ function genericPrint$5(path, options, print) {
       return printChildren(path, options, print);
 
     case "break":
-      return concat$9([/\s/.test(options.originalText[node.position.start.offset]) ? "  " : "\\", hardline$8]);
+      return /\s/.test(options.originalText[node.position.start.offset]) ? concat$9(["  ", markAsRoot$1(literalline$3)]) : concat$9(["\\", hardline$8]);
 
     case "liquidNode":
-      return replaceNewlinesWithHardlines(node.value);
+      return replaceNewlinesWith(node.value, hardline$8);
 
     case "tableRow": // handled in "table"
 
@@ -18703,8 +18730,8 @@ function getNthListSiblingIndex(node, parentNode) {
   });
 }
 
-function replaceNewlinesWithHardlines(str) {
-  return join$7(hardline$8, str.split("\n"));
+function replaceNewlinesWith(str, doc$$2) {
+  return join$7(doc$$2, str.split("\n"));
 }
 
 function getNthSiblingIndex(node, parentNode, condition) {
@@ -18975,7 +19002,8 @@ function shouldPrePrintDoubleHardline(node, data) {
   var isInTightListItem = data.parentNode.type === "listItem" && !data.parentNode.loose;
   var isPrevNodeLooseListItem = data.prevNode && data.prevNode.type === "listItem" && data.prevNode.loose;
   var isPrevNodePrettierIgnore = isPrettierIgnore(data.prevNode) === "next";
-  return isPrevNodeLooseListItem || !(isSiblingNode || isInTightListItem || isPrevNodePrettierIgnore);
+  var isBlockHtmlWithoutBlankLineBetweenPrevHtml = node.type === "html" && data.prevNode && data.prevNode.type === "html" && data.prevNode.position.end.line + 1 === node.position.start.line;
+  return isPrevNodeLooseListItem || !(isSiblingNode || isInTightListItem || isPrevNodePrettierIgnore || isBlockHtmlWithoutBlankLineBetweenPrevHtml);
 }
 
 function shouldPrePrintTripleHardline(node, data) {