prettier 1.19.0 → 1.19.1

package/bin-prettier.js

@@ -12,7 +12,7 @@ var events$1 = _interopDefault(require('events'));
 var readline$1 = _interopDefault(require('readline'));
 
 var name = "prettier";
-var version = "1.19.0";
+var version = "1.19.1";
 var description = "Prettier is an opinionated code formatter";
 var bin = {
 	prettier: "./bin/prettier.js"
@@ -48,7 +48,7 @@ var dependencies = {
 	"find-parent-dir": "0.3.0",
 	"find-project-root": "1.1.1",
 	"flow-parser": "0.111.3",
-	"get-stream": "5.1.0",
+	"get-stream": "4.1.0",
 	globby: "6.1.0",
 	graphql: "14.5.8",
 	"html-element-attributes": "2.2.0",
@@ -108,7 +108,7 @@ var devDependencies = {
 	"jest-snapshot-serializer-raw": "1.1.0",
 	"jest-watch-typeahead": "0.4.0",
 	mkdirp: "0.5.1",
-	prettier: "1.18.2",
+	prettier: "1.19.0",
 	prettylint: "1.0.0",
 	rimraf: "3.0.0",
 	rollup: "1.26.3",
@@ -142,7 +142,7 @@ var scripts = {
 	build: "node --max-old-space-size=3072 ./scripts/build/build.js",
 	"build-docs": "node ./scripts/build-docs.js",
 	"check-deps": "node ./scripts/check-deps.js",
-	spellcheck: "npx -p cspell@4.0.31 cspell {bin,scripts,src}/**/*.js {docs,website/blog}/**/*.md CHANGELOG.unreleased.md"
+	spellcheck: "npx -p cspell@4.0.31 cspell {bin,scripts,src}/**/*.js {docs,website/blog,changelog_unreleased}/**/*.md"
 };
 var _package = {
 	name: name,
@@ -34370,7 +34370,8 @@ function printTypeParameters(path, options, print, paramsKey) {
   var grandparent = path.getNode(2);
   var greatGreatGrandParent = path.getNode(4);
   var isParameterInTestCall = grandparent != null && isTestCall$1(grandparent);
-  var shouldInline = isParameterInTestCall || n[paramsKey].length === 0 || n[paramsKey].length === 1 && (shouldHugType(n[paramsKey][0]) || n[paramsKey][0].type === "GenericTypeAnnotation" && shouldHugType(n[paramsKey][0].id) || n[paramsKey][0].type === "TSTypeReference" && shouldHugType(n[paramsKey][0].typeName) || n[paramsKey][0].type === "NullableTypeAnnotation" || greatGreatGrandParent && greatGreatGrandParent.type === "VariableDeclarator" && grandparent && grandparent.type === "TSTypeAnnotation" && n[paramsKey][0].type !== "TSConditionalType" && n[paramsKey][0].type !== "TSMappedType");
+  var shouldInline = isParameterInTestCall || n[paramsKey].length === 0 || n[paramsKey].length === 1 && (shouldHugType(n[paramsKey][0]) || n[paramsKey][0].type === "GenericTypeAnnotation" && shouldHugType(n[paramsKey][0].id) || n[paramsKey][0].type === "TSTypeReference" && shouldHugType(n[paramsKey][0].typeName) || n[paramsKey][0].type === "NullableTypeAnnotation" || // See https://github.com/prettier/prettier/pull/6467 for the context.
+  greatGreatGrandParent && greatGreatGrandParent.type === "VariableDeclarator" && grandparent && grandparent.type === "TSTypeAnnotation" && n[paramsKey][0].type !== "TSUnionType" && n[paramsKey][0].type !== "UnionTypeAnnotation" && n[paramsKey][0].type !== "TSConditionalType" && n[paramsKey][0].type !== "TSMappedType");
 
   if (shouldInline) {
     return concat$6(["<", join$4(", ", path.map(print, paramsKey)), ">"]);
@@ -42971,7 +42972,7 @@ var options$6 = {
     }]
   },
   vueIndentScriptAndStyle: {
-    since: "1.19.0-beta.1",
+    since: "1.19.0",
     category: CATEGORY_HTML,
     type: "boolean",
     default: false,

package/index.js

@@ -10,7 +10,7 @@ var util$2 = _interopDefault(require('util'));
 var events$1 = _interopDefault(require('events'));
 
 var name = "prettier";
-var version = "1.19.0";
+var version = "1.19.1";
 var description = "Prettier is an opinionated code formatter";
 var bin = {
 	prettier: "./bin/prettier.js"
@@ -46,7 +46,7 @@ var dependencies = {
 	"find-parent-dir": "0.3.0",
 	"find-project-root": "1.1.1",
 	"flow-parser": "0.111.3",
-	"get-stream": "5.1.0",
+	"get-stream": "4.1.0",
 	globby: "6.1.0",
 	graphql: "14.5.8",
 	"html-element-attributes": "2.2.0",
@@ -106,7 +106,7 @@ var devDependencies = {
 	"jest-snapshot-serializer-raw": "1.1.0",
 	"jest-watch-typeahead": "0.4.0",
 	mkdirp: "0.5.1",
-	prettier: "1.18.2",
+	prettier: "1.19.0",
 	prettylint: "1.0.0",
 	rimraf: "3.0.0",
 	rollup: "1.26.3",
@@ -140,7 +140,7 @@ var scripts = {
 	build: "node --max-old-space-size=3072 ./scripts/build/build.js",
 	"build-docs": "node ./scripts/build-docs.js",
 	"check-deps": "node ./scripts/check-deps.js",
-	spellcheck: "npx -p cspell@4.0.31 cspell {bin,scripts,src}/**/*.js {docs,website/blog}/**/*.md CHANGELOG.unreleased.md"
+	spellcheck: "npx -p cspell@4.0.31 cspell {bin,scripts,src}/**/*.js {docs,website/blog,changelog_unreleased}/**/*.md"
 };
 var _package = {
 	name: name,
@@ -34364,7 +34364,8 @@ function printTypeParameters(path, options, print, paramsKey) {
   var grandparent = path.getNode(2);
   var greatGreatGrandParent = path.getNode(4);
   var isParameterInTestCall = grandparent != null && isTestCall$1(grandparent);
-  var shouldInline = isParameterInTestCall || n[paramsKey].length === 0 || n[paramsKey].length === 1 && (shouldHugType(n[paramsKey][0]) || n[paramsKey][0].type === "GenericTypeAnnotation" && shouldHugType(n[paramsKey][0].id) || n[paramsKey][0].type === "TSTypeReference" && shouldHugType(n[paramsKey][0].typeName) || n[paramsKey][0].type === "NullableTypeAnnotation" || greatGreatGrandParent && greatGreatGrandParent.type === "VariableDeclarator" && grandparent && grandparent.type === "TSTypeAnnotation" && n[paramsKey][0].type !== "TSConditionalType" && n[paramsKey][0].type !== "TSMappedType");
+  var shouldInline = isParameterInTestCall || n[paramsKey].length === 0 || n[paramsKey].length === 1 && (shouldHugType(n[paramsKey][0]) || n[paramsKey][0].type === "GenericTypeAnnotation" && shouldHugType(n[paramsKey][0].id) || n[paramsKey][0].type === "TSTypeReference" && shouldHugType(n[paramsKey][0].typeName) || n[paramsKey][0].type === "NullableTypeAnnotation" || // See https://github.com/prettier/prettier/pull/6467 for the context.
+  greatGreatGrandParent && greatGreatGrandParent.type === "VariableDeclarator" && grandparent && grandparent.type === "TSTypeAnnotation" && n[paramsKey][0].type !== "TSUnionType" && n[paramsKey][0].type !== "UnionTypeAnnotation" && n[paramsKey][0].type !== "TSConditionalType" && n[paramsKey][0].type !== "TSMappedType");
 
   if (shouldInline) {
     return concat$6(["<", join$4(", ", path.map(print, paramsKey)), ">"]);
@@ -42965,7 +42966,7 @@ var options$6 = {
     }]
   },
   vueIndentScriptAndStyle: {
-    since: "1.19.0-beta.1",
+    since: "1.19.0",
     category: CATEGORY_HTML,
     type: "boolean",
     default: false,

package/package.json

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

package/standalone.js

@@ -5,7 +5,7 @@
 }(this, (function () { 'use strict';
 
   var name = "prettier";
-  var version = "1.19.0";
+  var version = "1.19.1";
   var description = "Prettier is an opinionated code formatter";
   var bin = {
   	prettier: "./bin/prettier.js"
@@ -41,7 +41,7 @@
   	"find-parent-dir": "0.3.0",
   	"find-project-root": "1.1.1",
   	"flow-parser": "0.111.3",
-  	"get-stream": "5.1.0",
+  	"get-stream": "4.1.0",
   	globby: "6.1.0",
   	graphql: "14.5.8",
   	"html-element-attributes": "2.2.0",
@@ -101,7 +101,7 @@
   	"jest-snapshot-serializer-raw": "1.1.0",
   	"jest-watch-typeahead": "0.4.0",
   	mkdirp: "0.5.1",
-  	prettier: "1.18.2",
+  	prettier: "1.19.0",
   	prettylint: "1.0.0",
   	rimraf: "3.0.0",
   	rollup: "1.26.3",
@@ -135,7 +135,7 @@
   	build: "node --max-old-space-size=3072 ./scripts/build/build.js",
   	"build-docs": "node ./scripts/build-docs.js",
   	"check-deps": "node ./scripts/check-deps.js",
-  	spellcheck: "npx -p cspell@4.0.31 cspell {bin,scripts,src}/**/*.js {docs,website/blog}/**/*.md CHANGELOG.unreleased.md"
+  	spellcheck: "npx -p cspell@4.0.31 cspell {bin,scripts,src}/**/*.js {docs,website/blog,changelog_unreleased}/**/*.md"
   };
   var _package = {
   	name: name,
@@ -21705,7 +21705,7 @@
       }]
     },
     vueIndentScriptAndStyle: {
-      since: "1.19.0-beta.1",
+      since: "1.19.0",
       category: CATEGORY_HTML,
       type: "boolean",
       default: false,
@@ -27956,7 +27956,8 @@
     var grandparent = path.getNode(2);
     var greatGreatGrandParent = path.getNode(4);
     var isParameterInTestCall = grandparent != null && isTestCall$1(grandparent);
-    var shouldInline = isParameterInTestCall || n[paramsKey].length === 0 || n[paramsKey].length === 1 && (shouldHugType(n[paramsKey][0]) || n[paramsKey][0].type === "GenericTypeAnnotation" && shouldHugType(n[paramsKey][0].id) || n[paramsKey][0].type === "TSTypeReference" && shouldHugType(n[paramsKey][0].typeName) || n[paramsKey][0].type === "NullableTypeAnnotation" || greatGreatGrandParent && greatGreatGrandParent.type === "VariableDeclarator" && grandparent && grandparent.type === "TSTypeAnnotation" && n[paramsKey][0].type !== "TSConditionalType" && n[paramsKey][0].type !== "TSMappedType");
+    var shouldInline = isParameterInTestCall || n[paramsKey].length === 0 || n[paramsKey].length === 1 && (shouldHugType(n[paramsKey][0]) || n[paramsKey][0].type === "GenericTypeAnnotation" && shouldHugType(n[paramsKey][0].id) || n[paramsKey][0].type === "TSTypeReference" && shouldHugType(n[paramsKey][0].typeName) || n[paramsKey][0].type === "NullableTypeAnnotation" || // See https://github.com/prettier/prettier/pull/6467 for the context.
+    greatGreatGrandParent && greatGreatGrandParent.type === "VariableDeclarator" && grandparent && grandparent.type === "TSTypeAnnotation" && n[paramsKey][0].type !== "TSUnionType" && n[paramsKey][0].type !== "UnionTypeAnnotation" && n[paramsKey][0].type !== "TSConditionalType" && n[paramsKey][0].type !== "TSMappedType");
 
     if (shouldInline) {
       return concat$d(["<", join$9(", ", path.map(print, paramsKey)), ">"]);

package/third-party.js

@@ -33,55 +33,6 @@ function _createClass(Constructor, protoProps, staticProps) {
   return Constructor;
 }
 
-function _defineProperty(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value: value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-
-  return obj;
-}
-
-function ownKeys(object, enumerableOnly) {
-  var keys = Object.keys(object);
-
-  if (Object.getOwnPropertySymbols) {
-    var symbols = Object.getOwnPropertySymbols(object);
-    if (enumerableOnly) symbols = symbols.filter(function (sym) {
-      return Object.getOwnPropertyDescriptor(object, sym).enumerable;
-    });
-    keys.push.apply(keys, symbols);
-  }
-
-  return keys;
-}
-
-function _objectSpread2(target) {
-  for (var i = 1; i < arguments.length; i++) {
-    var source = arguments[i] != null ? arguments[i] : {};
-
-    if (i % 2) {
-      ownKeys(source, true).forEach(function (key) {
-        _defineProperty(target, key, source[key]);
-      });
-    } else if (Object.getOwnPropertyDescriptors) {
-      Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));
-    } else {
-      ownKeys(source).forEach(function (key) {
-        Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
-      });
-    }
-  }
-
-  return target;
-}
-
 function _inherits(subClass, superClass) {
   if (typeof superClass !== "function" && superClass !== null) {
     throw new TypeError("Super expression must either be null or a function");
@@ -5232,28 +5183,30 @@ var pump = function pump() {
 
 var pump_1 = pump;
 
-var PassThroughStream = stream.PassThrough;
+var PassThrough = stream.PassThrough;
 
 var bufferStream = function bufferStream(options) {
-  options = _objectSpread2({}, options);
+  options = Object.assign({}, options);
   var _options = options,
       array = _options.array;
   var _options2 = options,
       encoding = _options2.encoding;
-  var isBuffer = encoding === 'buffer';
+  var buffer = encoding === 'buffer';
   var objectMode = false;
 
   if (array) {
-    objectMode = !(encoding || isBuffer);
+    objectMode = !(encoding || buffer);
   } else {
     encoding = encoding || 'utf8';
   }
 
-  if (isBuffer) {
+  if (buffer) {
     encoding = null;
   }
 
-  var stream = new PassThroughStream({
+  var len = 0;
+  var ret = [];
+  var stream = new PassThrough({
     objectMode
   });
 
@@ -5261,28 +5214,26 @@ var bufferStream = function bufferStream(options) {
     stream.setEncoding(encoding);
   }
 
-  var length = 0;
-  var chunks = [];
   stream.on('data', function (chunk) {
-    chunks.push(chunk);
+    ret.push(chunk);
 
     if (objectMode) {
-      length = chunks.length;
+      len = ret.length;
     } else {
-      length += chunk.length;
+      len += chunk.length;
     }
   });
 
   stream.getBufferedValue = function () {
     if (array) {
-      return chunks;
+      return ret;
     }
 
-    return isBuffer ? Buffer.concat(chunks, length) : chunks.join('');
+    return buffer ? Buffer.concat(ret, len) : ret.join('');
   };
 
   stream.getBufferedLength = function () {
-    return length;
+    return len;
   };
 
   return stream;
@@ -5307,79 +5258,59 @@ function (_Error) {
 }(_wrapNativeSuper(Error));
 
 function getStream(inputStream, options) {
-  var _options, maxBuffer, stream;
-
-  return regeneratorRuntime.async(function getStream$(_context) {
-    while (1) {
-      switch (_context.prev = _context.next) {
-        case 0:
-          if (inputStream) {
-            _context.next = 2;
-            break;
-          }
+  if (!inputStream) {
+    return Promise.reject(new Error('Expected a stream'));
+  }
 
-          return _context.abrupt("return", Promise.reject(new Error('Expected a stream')));
-
-        case 2:
-          options = _objectSpread2({
-            maxBuffer: Infinity
-          }, options);
-          _options = options, maxBuffer = _options.maxBuffer;
-          _context.next = 6;
-          return regeneratorRuntime.awrap(new Promise(function (resolve, reject) {
-            var rejectPromise = function rejectPromise(error) {
-              if (error) {
-                // A null check
-                error.bufferedData = stream.getBufferedValue();
-              }
-
-              reject(error);
-            };
-
-            stream = pump_1(inputStream, bufferStream(options), function (error) {
-              if (error) {
-                rejectPromise(error);
-                return;
-              }
-
-              resolve();
-            });
-            stream.on('data', function () {
-              if (stream.getBufferedLength() > maxBuffer) {
-                rejectPromise(new MaxBufferError());
-              }
-            });
-          }));
+  options = Object.assign({
+    maxBuffer: Infinity
+  }, options);
+  var _options = options,
+      maxBuffer = _options.maxBuffer;
+  var stream;
+  return new Promise(function (resolve, reject) {
+    var rejectPromise = function rejectPromise(error) {
+      if (error) {
+        // A null check
+        error.bufferedData = stream.getBufferedValue();
+      }
 
-        case 6:
-          return _context.abrupt("return", stream.getBufferedValue());
+      reject(error);
+    };
 
-        case 7:
-        case "end":
-          return _context.stop();
+    stream = pump_1(inputStream, bufferStream(options), function (error) {
+      if (error) {
+        rejectPromise(error);
+        return;
       }
-    }
+
+      resolve();
+    });
+    stream.on('data', function () {
+      if (stream.getBufferedLength() > maxBuffer) {
+        rejectPromise(new MaxBufferError());
+      }
+    });
+  }).then(function () {
+    return stream.getBufferedValue();
   });
 }
 
-var getStream_1 = getStream; // TODO: Remove this for the next major release
-
-var default_1 = getStream;
+var getStream_1 = getStream;
 
 var buffer = function buffer(stream, options) {
-  return getStream(stream, _objectSpread2({}, options, {
+  return getStream(stream, Object.assign({}, options, {
     encoding: 'buffer'
   }));
 };
 
 var array = function array(stream, options) {
-  return getStream(stream, _objectSpread2({}, options, {
+  return getStream(stream, Object.assign({}, options, {
     array: true
   }));
 };
 
 var MaxBufferError_1 = MaxBufferError;
-getStream_1.default = default_1;
 getStream_1.buffer = buffer;
 getStream_1.array = array;
 getStream_1.MaxBufferError = MaxBufferError_1;