Files

Return to Package Diff Home.
Brought to you by Intrinsic.

Package Diff: prettier @ 1.17.0 .. 1.17.1

bin-prettier.js

@@ -14,7 +14,7 @@
var readline = _interopDefault(require('readline'));
var name = "prettier";
-var version$1 = "1.17.0";
+var version$1 = "1.17.1";
var description = "Prettier is an opinionated code formatter";
var bin = {
"prettier": "./bin/prettier.js"
@@ -110,7 +110,7 @@
"jest-snapshot-serializer-raw": "1.1.0",
"jest-watch-typeahead": "0.1.0",
"mkdirp": "0.5.1",
- "prettier": "1.16.4",
+ "prettier": "1.17.0",
"prettylint": "1.0.0",
"rimraf": "2.6.2",
"rollup": "0.47.6",
@@ -13965,7 +13965,6 @@
var rangeResult = coreFormat(rangeString, Object.assign({}, opts, {
rangeStart: 0,
rangeEnd: Infinity,
- printWidth: opts.printWidth - alignmentSize,
// track the cursor offset only if it's within our range
cursorOffset: opts.cursorOffset >= rangeStart && opts.cursorOffset < rangeEnd ? opts.cursorOffset - rangeStart : -1
}), alignmentSize); // Since the range contracts to avoid trailing whitespace,
@@ -22827,27 +22826,36 @@
var hasFlowShorthandAnnotationComment$1 = utils$4.hasFlowShorthandAnnotationComment;
-function hasClosureCompilerTypeCastComment(text, path$$1, locStart, locEnd) {
+function hasClosureCompilerTypeCastComment(text, path$$1) {
// https://github.com/google/closure-compiler/wiki/Annotating-Types#type-casts
// Syntax example: var x = /** @type {string} */ (fruit);
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);
+ return isParenthesized(n) && (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;
+ return ancestor && !isParenthesized(ancestor) ? hasTypeCastComment(ancestor) || hasAncestorTypeCastComment(index + 1) : false;
}
function hasTypeCastComment(node) {
return node.comments && node.comments.some(function (comment) {
- return comment.leading && comments$3.isBlockComment(comment) && isTypeCastComment(comment.value) && util$1.getNextNonSpaceNonCommentCharacter(text, comment, locEnd) === "(";
+ return comment.leading && comments$3.isBlockComment(comment) && isTypeCastComment(comment.value);
});
}
+ function isParenthesized(node) {
+ // Closure typecast comments only really make sense when _not_ using
+ // typescript or flow parsers, so we take advantage of the babel parser's
+ // parenthesized expressions.
+ return node.extra && node.extra.parenthesized;
+ }
+
function isTypeCastComment(comment) {
- var trimmed = comment.trim();
+ var cleaned = comment.trim().split("\n").map(function (line) {
+ return line.replace(/^[\s*]+/, "");
+ }).join(" ").trim();
- if (!/^\*\s*@type\s*\{[^]+\}$/.test(trimmed)) {
+ if (!/^@type\s+\{[^]+\}$/.test(cleaned)) {
return false;
}
@@ -22858,7 +22866,7 @@
var _iteratorError = undefined;
try {
- for (var _iterator = trimmed[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+ for (var _iterator = cleaned[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
var char = _step.value;
if (char === "{") {
@@ -22926,7 +22934,7 @@
// parentheses.
- if (hasClosureCompilerTypeCastComment(options.originalText, path$$1, options.locStart, options.locEnd)) {
+ if (hasClosureCompilerTypeCastComment(options.originalText, path$$1)) {
return true;
}
@@ -23237,6 +23245,7 @@
case "TSAsExpression":
case "TSNonNullExpression":
case "BindExpression":
+ case "OptionalMemberExpression":
return true;
case "MemberExpression":
@@ -30230,8 +30239,8 @@
case "BlockStatement":
{
var pp = path$$1.getParentNode(1);
- var isElseIf = pp && pp.inverse && pp.inverse.body[0] === n && pp.inverse.body[0].path.parts[0] === "if";
- var hasElseIf = n.inverse && n.inverse.body[0] && n.inverse.body[0].type === "BlockStatement" && n.inverse.body[0].path.parts[0] === "if";
+ var isElseIf = pp && pp.inverse && pp.inverse.body.length === 1 && pp.inverse.body[0] === n && pp.inverse.body[0].path.parts[0] === "if";
+ var hasElseIf = n.inverse && n.inverse.body.length === 1 && n.inverse.body[0].type === "BlockStatement" && n.inverse.body[0].path.parts[0] === "if";
var indentElse = hasElseIf ? function (a) {
return a;
} : indent$6;

index.js

@@ -12,7 +12,7 @@
var thirdParty__default = thirdParty['default'];
var name = "prettier";
-var version$1 = "1.17.0";
+var version$1 = "1.17.1";
var description = "Prettier is an opinionated code formatter";
var bin = {
"prettier": "./bin/prettier.js"
@@ -108,7 +108,7 @@
"jest-snapshot-serializer-raw": "1.1.0",
"jest-watch-typeahead": "0.1.0",
"mkdirp": "0.5.1",
- "prettier": "1.16.4",
+ "prettier": "1.17.0",
"prettylint": "1.0.0",
"rimraf": "2.6.2",
"rollup": "0.47.6",
@@ -13963,7 +13963,6 @@
var rangeResult = coreFormat(rangeString, Object.assign({}, opts, {
rangeStart: 0,
rangeEnd: Infinity,
- printWidth: opts.printWidth - alignmentSize,
// track the cursor offset only if it's within our range
cursorOffset: opts.cursorOffset >= rangeStart && opts.cursorOffset < rangeEnd ? opts.cursorOffset - rangeStart : -1
}), alignmentSize); // Since the range contracts to avoid trailing whitespace,
@@ -22825,27 +22824,36 @@
var hasFlowShorthandAnnotationComment$1 = utils$4.hasFlowShorthandAnnotationComment;
-function hasClosureCompilerTypeCastComment(text, path$$1, locStart, locEnd) {
+function hasClosureCompilerTypeCastComment(text, path$$1) {
// https://github.com/google/closure-compiler/wiki/Annotating-Types#type-casts
// Syntax example: var x = /** @type {string} */ (fruit);
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);
+ return isParenthesized(n) && (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;
+ return ancestor && !isParenthesized(ancestor) ? hasTypeCastComment(ancestor) || hasAncestorTypeCastComment(index + 1) : false;
}
function hasTypeCastComment(node) {
return node.comments && node.comments.some(function (comment) {
- return comment.leading && comments$3.isBlockComment(comment) && isTypeCastComment(comment.value) && util$1.getNextNonSpaceNonCommentCharacter(text, comment, locEnd) === "(";
+ return comment.leading && comments$3.isBlockComment(comment) && isTypeCastComment(comment.value);
});
}
+ function isParenthesized(node) {
+ // Closure typecast comments only really make sense when _not_ using
+ // typescript or flow parsers, so we take advantage of the babel parser's
+ // parenthesized expressions.
+ return node.extra && node.extra.parenthesized;
+ }
+
function isTypeCastComment(comment) {
- var trimmed = comment.trim();
+ var cleaned = comment.trim().split("\n").map(function (line) {
+ return line.replace(/^[\s*]+/, "");
+ }).join(" ").trim();
- if (!/^\*\s*@type\s*\{[^]+\}$/.test(trimmed)) {
+ if (!/^@type\s+\{[^]+\}$/.test(cleaned)) {
return false;
}
@@ -22856,7 +22864,7 @@
var _iteratorError = undefined;
try {
- for (var _iterator = trimmed[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+ for (var _iterator = cleaned[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
var char = _step.value;
if (char === "{") {
@@ -22924,7 +22932,7 @@
// parentheses.
- if (hasClosureCompilerTypeCastComment(options.originalText, path$$1, options.locStart, options.locEnd)) {
+ if (hasClosureCompilerTypeCastComment(options.originalText, path$$1)) {
return true;
}
@@ -23235,6 +23243,7 @@
case "TSAsExpression":
case "TSNonNullExpression":
case "BindExpression":
+ case "OptionalMemberExpression":
return true;
case "MemberExpression":
@@ -30228,8 +30237,8 @@
case "BlockStatement":
{
var pp = path$$1.getParentNode(1);
- var isElseIf = pp && pp.inverse && pp.inverse.body[0] === n && pp.inverse.body[0].path.parts[0] === "if";
- var hasElseIf = n.inverse && n.inverse.body[0] && n.inverse.body[0].type === "BlockStatement" && n.inverse.body[0].path.parts[0] === "if";
+ var isElseIf = pp && pp.inverse && pp.inverse.body.length === 1 && pp.inverse.body[0] === n && pp.inverse.body[0].path.parts[0] === "if";
+ var hasElseIf = n.inverse && n.inverse.body.length === 1 && n.inverse.body[0].type === "BlockStatement" && n.inverse.body[0].path.parts[0] === "if";
var indentElse = hasElseIf ? function (a) {
return a;
} : indent$6;

package.json

@@ -1,6 +1,6 @@
{
"name": "prettier",
- "version": "1.17.0",
+ "version": "1.17.1",
"description": "Prettier is an opinionated code formatter",
"bin": "./bin-prettier.js",
"repository": "prettier/prettier",

standalone.js

@@ -5,7 +5,7 @@
}(this, (function () { 'use strict';
var name = "prettier";
-var version$1 = "1.17.0";
+var version$1 = "1.17.1";
var description = "Prettier is an opinionated code formatter";
var bin = {
"prettier": "./bin/prettier.js"
@@ -101,7 +101,7 @@
"jest-snapshot-serializer-raw": "1.1.0",
"jest-watch-typeahead": "0.1.0",
"mkdirp": "0.5.1",
- "prettier": "1.16.4",
+ "prettier": "1.17.0",
"prettylint": "1.0.0",
"rimraf": "2.6.2",
"rollup": "0.47.6",
@@ -16289,7 +16289,6 @@
var rangeResult = coreFormat(rangeString, Object.assign({}, opts, {
rangeStart: 0,
rangeEnd: Infinity,
- printWidth: opts.printWidth - alignmentSize,
// track the cursor offset only if it's within our range
cursorOffset: opts.cursorOffset >= rangeStart && opts.cursorOffset < rangeEnd ? opts.cursorOffset - rangeStart : -1
}), alignmentSize); // Since the range contracts to avoid trailing whitespace,
@@ -18543,8 +18542,8 @@
case "BlockStatement":
{
var pp = path.getParentNode(1);
- var isElseIf = pp && pp.inverse && pp.inverse.body[0] === n && pp.inverse.body[0].path.parts[0] === "if";
- var hasElseIf = n.inverse && n.inverse.body[0] && n.inverse.body[0].type === "BlockStatement" && n.inverse.body[0].path.parts[0] === "if";
+ var isElseIf = pp && pp.inverse && pp.inverse.body.length === 1 && pp.inverse.body[0] === n && pp.inverse.body[0].path.parts[0] === "if";
+ var hasElseIf = n.inverse && n.inverse.body.length === 1 && n.inverse.body[0].type === "BlockStatement" && n.inverse.body[0].path.parts[0] === "if";
var indentElse = hasElseIf ? function (a) {
return a;
} : indent$4;
@@ -22707,27 +22706,36 @@
var hasFlowShorthandAnnotationComment$1 = utils$8.hasFlowShorthandAnnotationComment;
-function hasClosureCompilerTypeCastComment(text, path, locStart, locEnd) {
+function hasClosureCompilerTypeCastComment(text, path) {
// https://github.com/google/closure-compiler/wiki/Annotating-Types#type-casts
// Syntax example: var x = /** @type {string} */ (fruit);
var n = path.getValue();
- return util.getNextNonSpaceNonCommentCharacter(text, n, locEnd) === ")" && (hasTypeCastComment(n) || hasAncestorTypeCastComment(0)); // for sub-item: /** @type {array} */ (numberOrString).map(x => x);
+ return isParenthesized(n) && (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;
+ return ancestor && !isParenthesized(ancestor) ? hasTypeCastComment(ancestor) || hasAncestorTypeCastComment(index + 1) : false;
}
function hasTypeCastComment(node) {
return node.comments && node.comments.some(function (comment) {
- return comment.leading && comments$3.isBlockComment(comment) && isTypeCastComment(comment.value) && util.getNextNonSpaceNonCommentCharacter(text, comment, locEnd) === "(";
+ return comment.leading && comments$3.isBlockComment(comment) && isTypeCastComment(comment.value);
});
}
+ function isParenthesized(node) {
+ // Closure typecast comments only really make sense when _not_ using
+ // typescript or flow parsers, so we take advantage of the babel parser's
+ // parenthesized expressions.
+ return node.extra && node.extra.parenthesized;
+ }
+
function isTypeCastComment(comment) {
- var trimmed = comment.trim();
+ var cleaned = comment.trim().split("\n").map(function (line) {
+ return line.replace(/^[\s*]+/, "");
+ }).join(" ").trim();
- if (!/^\*\s*@type\s*\{[^]+\}$/.test(trimmed)) {
+ if (!/^@type\s+\{[^]+\}$/.test(cleaned)) {
return false;
}
@@ -22738,7 +22746,7 @@
var _iteratorError = undefined;
try {
- for (var _iterator = trimmed[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+ for (var _iterator = cleaned[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
var char = _step.value;
if (char === "{") {
@@ -22806,7 +22814,7 @@
// parentheses.
- if (hasClosureCompilerTypeCastComment(options.originalText, path, options.locStart, options.locEnd)) {
+ if (hasClosureCompilerTypeCastComment(options.originalText, path)) {
return true;
}
@@ -23117,6 +23125,7 @@
case "TSAsExpression":
case "TSNonNullExpression":
case "BindExpression":
+ case "OptionalMemberExpression":
return true;
case "MemberExpression":