prettier 1.13.3 → 1.13.7

package/index.js

@@ -12,7 +12,7 @@ var thirdParty = require('./third-party');
 var thirdParty__default = thirdParty['default'];
 
 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"
@@ -43,7 +43,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",
@@ -67,7 +67,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"
 };
@@ -86,7 +86,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",
@@ -6962,7 +6962,7 @@ function resolveParser$1(opts, parsers) {
 
     try {
       return {
-        parse: eval("require")(path.resolve(process.cwd(), opts.parser)),
+        parse: require(path.resolve(process.cwd(), opts.parser)),
         astFormat: "estree",
         locStart,
         locEnd
@@ -8827,8 +8827,7 @@ function printDocToString$1(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]*$/, "");
                   }
                 }
@@ -10186,6 +10185,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;
@@ -10776,22 +10782,76 @@ typeof process !== 'undefined' && (process.env && process.env.IGNORE_TEST_WIN32
   };
 }
 
-function createIgnorer(ignorePath, withNodeModules) {
-  var ignoreText = "";
+/**
+ * @param {string} filename
+ * @returns {Promise<null | string>}
+ */
 
-  if (ignorePath) {
-    var resolvedIgnorePath = path.resolve(ignorePath);
 
-    try {
-      ignoreText = fs.readFileSync(resolvedIgnorePath, "utf8");
-    } catch (readError) {
-      if (readError.code !== "ENOENT") {
-        throw new Error(`Unable to read ${resolvedIgnorePath}: ${readError.message}`);
+function getFileContentOrNull(filename) {
+  return new Promise(function (resolve, reject) {
+    fs.readFile(filename, "utf8", function (error, data) {
+      if (error && error.code !== "ENOENT") {
+        reject(createError(filename, error));
+      } else {
+        resolve(error ? null : data);
       }
+    });
+  });
+}
+/**
+ * @param {string} filename
+ * @returns {null | string}
+ */
+
+
+getFileContentOrNull.sync = function (filename) {
+  try {
+    return fs.readFileSync(filename, "utf8");
+  } catch (error) {
+    if (error && error.code === "ENOENT") {
+      return null;
     }
+
+    throw createError(filename, error);
   }
+};
+
+function createError(filename, error) {
+  return new Error(`Unable to read ${filename}: ${error.message}`);
+}
+
+var getFileContentOrNull_1 = getFileContentOrNull;
+
+/**
+ * @param {undefined | string} ignorePath
+ * @param {undefined | boolean} withNodeModules
+ */
+
+
+function createIgnorer(ignorePath, withNodeModules) {
+  return (!ignorePath ? Promise.resolve(null) : getFileContentOrNull_1(path.resolve(ignorePath))).then(function (ignoreContent) {
+    return _createIgnorer(ignoreContent, withNodeModules);
+  });
+}
+/**
+ * @param {undefined | string} ignorePath
+ * @param {undefined | boolean} withNodeModules
+ */
+
+
+createIgnorer.sync = function (ignorePath, withNodeModules) {
+  var ignoreContent = !ignorePath ? null : getFileContentOrNull_1.sync(path.resolve(ignorePath));
+  return _createIgnorer(ignoreContent, withNodeModules);
+};
+/**
+ * @param {null | string} ignoreContent
+ * @param {undefined | boolean} withNodeModules
+ */
 
-  var ignorer = ignore().add(ignoreText);
+
+function _createIgnorer(ignoreContent, withNodeModules) {
+  var ignorer = ignore().add(ignoreContent || "");
 
   if (!withNodeModules) {
     ignorer.add("node_modules");
@@ -10802,9 +10862,15 @@ function createIgnorer(ignorePath, withNodeModules) {
 
 var createIgnorer_1 = createIgnorer;
 
+/**
+ * @typedef {{ ignorePath?: string, withNodeModules?: boolean, plugins: object }} FileInfoOptions
+ * @typedef {{ ignored: boolean, inferredParser: string | null }} FileInfoResult
+ */
+
 /**
  * @param {string} filePath
- * @param {{ ignorePath?: string, withNodeModules?: boolean, plugins: object }} opts
+ * @param {FileInfoOptions} opts
+ * @returns {Promise<FileInfoResult>}
  *
  * Please note that prettier.getFileInfo() expects opts.plugins to be an array of paths,
  * not an object. A transformation from this array to an object is automatically done
@@ -10812,25 +10878,32 @@ var createIgnorer_1 = createIgnorer;
  */
 
 
-function _getFileInfo(filePath, opts) {
-  var ignored = false;
-  var ignorer = createIgnorer_1(opts.ignorePath, opts.withNodeModules);
-  ignored = ignorer.ignores(filePath);
-  var inferredParser = options.inferParser(filePath, opts.plugins) || null;
+function getFileInfo(filePath, opts) {
+  return createIgnorer_1(opts.ignorePath, opts.withNodeModules).then(function (ignorer) {
+    return _getFileInfo(ignorer, filePath, opts.plugins);
+  });
+}
+/**
+ * @param {string} filePath
+ * @param {FileInfoOptions} opts
+ * @returns {FileInfoResult}
+ */
+
+
+getFileInfo.sync = function (filePath, opts) {
+  var ignorer = createIgnorer_1.sync(opts.ignorePath, opts.withNodeModules);
+  return _getFileInfo(ignorer, filePath, opts.plugins);
+};
+
+function _getFileInfo(ignorer, filePath, plugins) {
+  var ignored = ignorer.ignores(filePath);
+  var inferredParser = options.inferParser(filePath, plugins) || null;
   return {
     ignored,
     inferredParser
   };
-} // the method has been implemented as asynchronous to avoid possible breaking changes in future
-
-
-function getFileInfo(filePath, opts) {
-  return Promise.resolve().then(function () {
-    return _getFileInfo(filePath, opts);
-  });
 }
 
-getFileInfo.sync = _getFileInfo;
 var getFileInfo_1 = getFileInfo;
 
 var lodash_uniqby = createCommonjsModule(function (module, exports) {
@@ -18723,12 +18796,22 @@ var comments$3 = {
   isBlockComment
 };
 
-function hasClosureCompilerTypeCastComment(text, node, locEnd) {
+function hasClosureCompilerTypeCastComment(text, path$$1, 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$1.getNextNonSpaceNonCommentCharacter(text, comment, locEnd) === "(";
-  });
+  var n = path$$1.getValue();
+  return util$1.getNextNonSpaceNonCommentCharacter(text, n, locEnd) === ")" && (hasTypeCastComment(n) || hasAncestorTypeCastComment(0)); // for sub-item: /** @type {array} */ (numberOrString).map(x => x);
+
+  function hasAncestorTypeCastComment(index) {
+    var ancestor = path$$1.getParentNode(index);
+    return ancestor && util$1.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$1.getNextNonSpaceNonCommentCharacter(text, comment, locEnd) === "(";
+    });
+  }
 }
 
 function needsParens(path$$1, options) {
@@ -18754,7 +18837,7 @@ function needsParens(path$$1, options) {
   // parentheses.
 
 
-  if (hasClosureCompilerTypeCastComment(options.originalText, node, options.locEnd)) {
+  if (hasClosureCompilerTypeCastComment(options.originalText, path$$1, options.locStart, options.locEnd)) {
     return true;
   } // Identifiers never need parentheses.
 
@@ -20899,7 +20982,6 @@ function printPathNoParens(path$$1, options, print, args) {
 
     case "DeclareInterface":
     case "InterfaceDeclaration":
-    case "InterfaceType":
     case "InterfaceTypeAnnotation":
       {
         if (n.type === "DeclareInterface" || isNodeStartingWithDeclare(n, options)) {
@@ -21304,7 +21386,7 @@ function printPathNoParens(path$$1, options, print, args) {
 
     case "TSLastTypeNode":
       // TSImportType
-      return concat$4([!n.isTypeOf ? "" : "typeof ", "import(", path$$1.call(print, "argument"), ")", !n.qualifier ? "" : concat$4([".", path$$1.call(print, "qualifier")])]);
+      return concat$4([!n.isTypeOf ? "" : "typeof ", "import(", path$$1.call(print, "argument"), ")", !n.qualifier ? "" : concat$4([".", path$$1.call(print, "qualifier")]), printTypeParameters(path$$1, options, print, "typeParameters")]);
 
     case "TSLiteralType":
       return path$$1.call(print, "literal");
@@ -22360,12 +22442,13 @@ function printMemberChain(path$$1, 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.
   //
@@ -23507,6 +23590,10 @@ function genericPrint$2(path$$1, options, print) {
 
     case "Identifier":
       return JSON.stringify(node.name);
+
+    default:
+      /* istanbul ignore next */
+      throw new Error("unknown type: " + JSON.stringify(node.type));
   }
 }
 
@@ -25139,13 +25226,16 @@ function genericPrint$4(path$$1, options, print) {
         var parts = [];
         path$$1.map(function (pathChild, index) {
           parts.push(concat$9([pathChild.call(print)]));
-          parts.push(hardline$8);
 
-          if (index !== n.definitions.length - 1 && isNextLineEmpty$4(options.originalText, pathChild.getValue(), options)) {
+          if (index !== n.definitions.length - 1) {
             parts.push(hardline$8);
+
+            if (isNextLineEmpty$4(options.originalText, pathChild.getValue(), options)) {
+              parts.push(hardline$8);
+            }
           }
         }, "definitions");
-        return concat$9(parts, hardline$8);
+        return concat$9([concat$9(parts), hardline$8]);
       }
 
     case "OperationDefinition":
@@ -25450,9 +25540,9 @@ var languageGraphql = {
 
 var _require$$0$builders$6 = doc.builders;
 var hardline$10 = _require$$0$builders$6.hardline;
-var literalline$3 = _require$$0$builders$6.literalline;
+var literalline$4 = _require$$0$builders$6.literalline;
 var concat$11 = _require$$0$builders$6.concat;
-var markAsRoot$1 = _require$$0$builders$6.markAsRoot;
+var markAsRoot$2 = _require$$0$builders$6.markAsRoot;
 var mapDoc$4 = doc.utils.mapDoc;
 
 function embed$2(path$$1, print, textToDoc, options) {
@@ -25469,7 +25559,7 @@ function embed$2(path$$1, print, textToDoc, options) {
       var doc$$2 = textToDoc(node.value, {
         parser
       });
-      return markAsRoot$1(concat$11([style, node.lang, hardline$10, replaceNewlinesWithLiterallines(doc$$2), style]));
+      return markAsRoot$2(concat$11([style, node.lang, hardline$10, replaceNewlinesWithLiterallines(doc$$2), style]));
     }
   }
 
@@ -25495,7 +25585,7 @@ function embed$2(path$$1, print, textToDoc, options) {
   function replaceNewlinesWithLiterallines(doc$$2) {
     return mapDoc$4(doc$$2, function (currentDoc) {
       return typeof currentDoc === "string" && currentDoc.includes("\n") ? concat$11(currentDoc.split(/(\n)/g).map(function (v, i) {
-        return i % 2 === 0 ? v : literalline$3;
+        return i % 2 === 0 ? v : literalline$4;
       })) : currentDoc;
     });
   }
@@ -25559,6 +25649,8 @@ var _require$$0$builders$5 = doc.builders;
 var concat$10 = _require$$0$builders$5.concat;
 var join$8 = _require$$0$builders$5.join;
 var line$7 = _require$$0$builders$5.line;
+var literalline$3 = _require$$0$builders$5.literalline;
+var markAsRoot$1 = _require$$0$builders$5.markAsRoot;
 var hardline$9 = _require$$0$builders$5.hardline;
 var softline$6 = _require$$0$builders$5.softline;
 var fill$4 = _require$$0$builders$5.fill;
@@ -25691,7 +25783,9 @@ function genericPrint$5(path$$1, options, print) {
       {
         var _parentNode2 = path$$1.getParentNode();
 
-        return replaceNewlinesWithHardlines(_parentNode2.type === "root" && util$1.getLast(_parentNode2.children) === node ? node.value.trimRight() : node.value);
+        var value = _parentNode2.type === "root" && util$1.getLast(_parentNode2.children) === node ? node.value.trimRight() : node.value;
+        var isHtmlComment = /^<!--[\s\S]*-->$/.test(value);
+        return replaceNewlinesWith(value, isHtmlComment ? hardline$9 : markAsRoot$1(literalline$3));
       }
 
     case "list":
@@ -25769,10 +25863,10 @@ function genericPrint$5(path$$1, options, print) {
       return printChildren(path$$1, options, print);
 
     case "break":
-      return concat$10([/\s/.test(options.originalText[node.position.start.offset]) ? "  " : "\\", hardline$9]);
+      return /\s/.test(options.originalText[node.position.start.offset]) ? concat$10(["  ", markAsRoot$1(literalline$3)]) : concat$10(["\\", hardline$9]);
 
     case "liquidNode":
-      return replaceNewlinesWithHardlines(node.value);
+      return replaceNewlinesWith(node.value, hardline$9);
 
     case "tableRow": // handled in "table"
 
@@ -25816,8 +25910,8 @@ function getNthListSiblingIndex(node, parentNode) {
   });
 }
 
-function replaceNewlinesWithHardlines(str) {
-  return join$8(hardline$9, str.split("\n"));
+function replaceNewlinesWith(str, doc$$2) {
+  return join$8(doc$$2, str.split("\n"));
 }
 
 function getNthSiblingIndex(node, parentNode, condition) {
@@ -26088,7 +26182,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) {
@@ -26623,6 +26718,11 @@ var languageVue = {
   printers: printers$6
 };
 
+// plugin will look for `eval("require")()` and transform to `require()` in the bundle,
+// and rewrite the paths to require from the top-level.
+// We need to list the parsers and getters so we can load them only when necessary.
+
+
 var internalPlugins = [// JS
 languageJs, {
   parsers: {
@@ -26782,7 +26882,7 @@ function loadPlugins(plugins, pluginSearchDirs) {
   var externalPlugins = lodash_uniqby(externalManualLoadPluginInfos.concat(externalAutoLoadPluginInfos), "requirePath").map(function (externalPluginInfo) {
     return Object.assign({
       name: externalPluginInfo.name
-    }, eval("require")(externalPluginInfo.requirePath));
+    }, require(externalPluginInfo.requirePath));
   });
   return internalPlugins.concat(externalPlugins);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prettier",
-  "version": "1.13.3",
+  "version": "1.13.7",
   "description": "Prettier is an opinionated code formatter",
   "bin": "./bin-prettier.js",
   "repository": "prettier/prettier",
@@ -13,5 +13,8 @@
   },
   "scripts": {
     "prepublishOnly": "node -e \"assert.equal(require('.').version, require('..').version)\""
-  }
+  },
+  "files": [
+    "*.js"
+  ]
 }