prettier 1.6.0 → 1.6.1

package/README.md

@@ -48,12 +48,10 @@ conforms to a consistent style. (See this [blog post](http://jlongster.com/A-Pre
   + [Range](#range)
   + [Parser](#parser)
   + [Filepath](#filepath)
-<!-- 
 * [Configuration File](#configuration-file)
   + [Basic Configuration](#basic-configuration)
   + [Configuration Overrides](#configuration-overrides)
   + [Configuration Schema](#configuration-schema)
--->
 * [Editor Integration](#editor-integration)
   + [Atom](#atom)
   + [Emacs](#emacs)
@@ -247,7 +245,7 @@ Another useful flag is `--list-different` (or `-l`) which prints the filenames o
 ```bash
 prettier --single-quote --list-different "src/**/*.js"
 ```
-<!--
+
 #### `--find-config-path` and `--config`
 
 If you are repeatedly formatting individual files with `prettier`, you will incur a small performance cost
@@ -270,7 +268,6 @@ such as a `config/` directory.
 
 If you don't have a configuration file, or want to ignore it if it does exist,
 you can pass `--no-config` instead.
--->
 
 #### `--debug-check`
 
@@ -412,8 +409,7 @@ prettier.formatWithCursor(" 1", { cursorOffset: 2 });
 // -> { formatted: '1;\n', cursorOffset: 1 }
 ```
 
-<!--
-#### `prettier.resolveConfig([filePath] [, options])`
+#### `prettier.resolveConfig([filePath [, options]])`
 
 `resolveConfig` can be used to resolve configuration for a given source file.
 The function optionally accepts an input file path as an argument, which defaults to the current working directory.
@@ -423,7 +419,7 @@ A promise is returned which will resolve to:
 
 The promise will be rejected if there was an error parsing the configuration file.
 
-If `options.withCache` is `false`, all caching will be bypassed.
+If `options.useCache` is `false`, all caching will be bypassed.
 
 ```js
 const text = fs.readFileSync(filePath, "utf8");
@@ -437,7 +433,6 @@ prettier.resolveConfig(filePath).then(options => {
 As you repeatedly call `resolveConfig`, the file system structure will be cached for performance.
 This function will clear the cache. Generally this is only needed for editor integrations that
 know that the file system has changed since the last format took place.
--->
 
 #### Custom Parser API
 
@@ -625,7 +620,6 @@ Default | CLI Override | API Override
 --------|--------------|-------------
 None | `--stdin-filepath <string>` | `filepath: "<string>"`
 
-<!--
 ## Configuration File
 
 Prettier uses [cosmiconfig](https://github.com/davidtheclark/cosmiconfig) for configuration file support.
@@ -708,7 +702,6 @@ For more information on how to use the CLI to locate a file, see the [CLI](#cli)
 ### Configuration Schema
 
 If you'd like a JSON schema to validate your configuration, one is available here: http://json.schemastore.org/prettierrc.
--->
 
 ## Editor Integration
 

package/bin/prettier.js

@@ -7895,12 +7895,12 @@ var parseJson_1 = function (json, filepath) {
   }
 };
 
-var path$8 = require$$0$1;
+var path$7 = require$$0$1;
 var readFile = readFile$1;
 var parseJson = parseJson_1;
 
 var loadPackageProp$1 = function (packageDir, options) {
-  var packagePath = path$8.join(packageDir, 'package.json');
+  var packagePath = path$7.join(packageDir, 'package.json');
 
   return readFile(packagePath).then(function (content) {
     if (!content) return null;
@@ -11904,7 +11904,7 @@ function tryRequire(content, filepath, cb) {
   }
 }
 
-var path$7 = require$$0$1;
+var path$6 = require$$0$1;
 var isDir = index$48;
 var loadPackageProp = loadPackageProp$1;
 var loadRc = loadRc$1;
@@ -11936,7 +11936,7 @@ var createExplorer$1 = function (options) {
     }
 
     if (configPath) {
-      var absoluteConfigPath = path$7.resolve(process.cwd(), configPath);
+      var absoluteConfigPath = path$6.resolve(process.cwd(), configPath);
       if (fileCache && fileCache.has(absoluteConfigPath)) {
         return fileCache.get(absoluteConfigPath);
       }
@@ -11948,13 +11948,13 @@ var createExplorer$1 = function (options) {
 
     if (!searchPath) return Promise.resolve(null);
 
-    var absoluteSearchPath = path$7.resolve(process.cwd(), searchPath);
+    var absoluteSearchPath = path$6.resolve(process.cwd(), searchPath);
 
     return isDirectory(absoluteSearchPath)
       .then(function (searchPathIsDirectory) {
         var directory = (searchPathIsDirectory)
           ? absoluteSearchPath
-          : path$7.dirname(absoluteSearchPath);
+          : path$6.dirname(absoluteSearchPath);
         return searchDirectory(directory);
       });
   }
@@ -11971,18 +11971,18 @@ var createExplorer$1 = function (options) {
       })
       .then(function (result) {
         if (result || !options.rc) return result;
-        return loadRc(path$7.join(directory, options.rc), options);
+        return loadRc(path$6.join(directory, options.rc), options);
       })
       .then(function (result) {
         if (result || !options.js) return result;
-        return loadJs(path$7.join(directory, options.js));
+        return loadJs(path$6.join(directory, options.js));
       })
       .then(function (result) {
         if (result) return result;
 
-        var splitPath = directory.split(path$7.sep);
+        var splitPath = directory.split(path$6.sep);
         var nextDirectory = (splitPath.length > 1)
-          ? splitPath.slice(0, -1).join(path$7.sep)
+          ? splitPath.slice(0, -1).join(path$6.sep)
           : null;
 
         if (!nextDirectory || directory === options.stopDir) return null;
@@ -12016,7 +12016,7 @@ function identityPromise(x) {
   return Promise.resolve(x);
 }
 
-var path$6 = require$$0$1;
+var path$5 = require$$0$1;
 var oshomedir = index$46;
 var minimist$1 = index$42;
 var assign = index$28;
@@ -12036,7 +12036,7 @@ var index$44 = function (moduleName, options) {
   }, options);
 
   if (options.argv && parsedCliArgs[options.argv]) {
-    options.configPath = path$6.resolve(parsedCliArgs[options.argv]);
+    options.configPath = path$5.resolve(parsedCliArgs[options.argv]);
   }
 
   return createExplorer(options);
@@ -12044,16 +12044,14 @@ var index$44 = function (moduleName, options) {
 
 const cosmiconfig = index$44;
 const minimatch$4 = minimatch_1;
-const path$5 = require$$0$1;
 
 const withCache = cosmiconfig("prettier");
 const noCache = cosmiconfig("prettier", { cache: false });
 
 function resolveConfig$1(filePath, opts) {
   const useCache = !(opts && opts.useCache === false);
-  const fileDir = filePath ? path$5.dirname(filePath) : undefined;
 
-  return (useCache ? withCache : noCache).load(fileDir).then(result => {
+  return (useCache ? withCache : noCache).load(filePath).then(result => {
     if (!result) {
       return null;
     }
@@ -13423,7 +13421,7 @@ const argv = minimist(args, {
     "debug-print-doc",
     "debug-check",
     "with-node-modules"
-  ],
+  ].concat(booleanOptionNames),
   string: [
     "cursor-offset",
     "range-start",
@@ -13432,7 +13430,7 @@ const argv = minimist(args, {
     "config",
     "find-config-path",
     "ignore-path"
-  ],
+  ].concat(stringOptionNames),
   default: {
     color: true,
     "ignore-path": ".prettierignore"
@@ -13444,14 +13442,8 @@ const argv = minimist(args, {
   },
   unknown: param => {
     if (param.startsWith("-")) {
-      const paramName = param.replace(/--(no-)?/, "");
-      if (
-        booleanOptionNames.indexOf(paramName) === -1 &&
-        stringOptionNames.indexOf(paramName) === -1
-      ) {
-        console.warn("Ignored unknown option: " + param + "\n");
-        return false;
-      }
+      console.warn("Ignored unknown option: " + param + "\n");
+      return false;
     }
   }
 });

package/index.js

@@ -1814,7 +1814,7 @@ var comments$1 = {
 };
 
 var name = "prettier";
-var version$1 = "1.6.0";
+var version$1 = "1.6.1";
 var description = "Prettier is an opinionated code formatter";
 var bin = {"prettier":"./bin/prettier.js"};
 var repository = "prettier/prettier";
@@ -1822,8 +1822,8 @@ var homepage = "https://prettier.io";
 var author = "James Long";
 var license = "MIT";
 var main = "./index.js";
-var dependencies = {"babel-code-frame":"7.0.0-alpha.12","babylon":"7.0.0-beta.17","chalk":"2.0.1","cosmiconfig":"2.2.2","dashify":"0.2.2","diff":"3.2.0","esutils":"2.0.2","flow-parser":"0.51.0","get-stream":"3.0.0","globby":"^6.1.0","graphql":"0.10.1","ignore":"^3.3.3","jest-validate":"20.0.3","minimatch":"3.0.4","minimist":"1.2.0","parse5":"3.0.2","postcss":"^6.0.1","postcss-less":"^1.0.0","postcss-media-query-parser":"0.2.3","postcss-scss":"1.0.0","postcss-selector-parser":"2.2.3","postcss-values-parser":"git://github.com/lydell/postcss-values-parser.git#af2c80b2bb558a6e7d61540d97f068f9fa162b38","strip-bom":"3.0.0","typescript":"2.5.1","typescript-eslint-parser":"git://github.com/eslint/typescript-eslint-parser.git#801d65585af6995a223136862944095b48f5c567"};
-var devDependencies = {"babel-cli":"6.24.1","babel-preset-es2015":"6.24.1","codecov":"2.2.0","cross-env":"5.0.1","cross-spawn":"5.1.0","eslint":"4.1.1","eslint-friendly-formatter":"3.0.0","eslint-plugin-import":"2.6.1","eslint-plugin-prettier":"2.1.2","eslint-plugin-react":"7.1.0","jest":"20.0.0","mkdirp":"^0.5.1","prettier":"1.5.2","rimraf":"2.6.1","rollup":"0.41.1","rollup-plugin-commonjs":"7.0.0","rollup-plugin-json":"2.1.0","rollup-plugin-node-builtins":"2.0.0","rollup-plugin-node-globals":"1.1.0","rollup-plugin-node-resolve":"2.0.0","rollup-plugin-replace":"1.1.1","shelljs":"0.7.8","sw-toolbox":"3.6.0","uglify-es":"3.0.15","webpack":"2.6.1"};
+var dependencies = {"babel-code-frame":"7.0.0-alpha.12","babylon":"7.0.0-beta.22","chalk":"2.0.1","cosmiconfig":"2.2.2","dashify":"0.2.2","diff":"3.2.0","esutils":"2.0.2","flow-parser":"0.51.0","get-stream":"3.0.0","globby":"^6.1.0","graphql":"0.10.1","ignore":"^3.3.3","jest-validate":"20.0.3","minimatch":"3.0.4","minimist":"1.2.0","parse5":"3.0.2","postcss":"^6.0.1","postcss-less":"^1.0.0","postcss-media-query-parser":"0.2.3","postcss-scss":"1.0.0","postcss-selector-parser":"2.2.3","postcss-values-parser":"git://github.com/lydell/postcss-values-parser.git#af2c80b2bb558a6e7d61540d97f068f9fa162b38","strip-bom":"3.0.0","typescript":"2.5.1","typescript-eslint-parser":"git://github.com/eslint/typescript-eslint-parser.git#801d65585af6995a223136862944095b48f5c567"};
+var devDependencies = {"babel-cli":"6.24.1","babel-preset-es2015":"6.24.1","codecov":"2.2.0","cross-env":"5.0.1","cross-spawn":"5.1.0","eslint":"4.1.1","eslint-friendly-formatter":"3.0.0","eslint-plugin-import":"2.6.1","eslint-plugin-prettier":"2.1.2","eslint-plugin-react":"7.1.0","jest":"20.0.0","mkdirp":"^0.5.1","prettier":"1.6.0","rimraf":"2.6.1","rollup":"0.41.1","rollup-plugin-commonjs":"7.0.0","rollup-plugin-json":"2.1.0","rollup-plugin-node-builtins":"2.0.0","rollup-plugin-node-globals":"1.1.0","rollup-plugin-node-resolve":"2.0.0","rollup-plugin-replace":"1.1.1","shelljs":"0.7.8","sw-toolbox":"3.6.0","uglify-es":"3.0.15","webpack":"2.6.1"};
 var scripts = {"test":"jest","test-integration":"jest tests_integration","lint":"cross-env EFF_NO_LINK_RULES=true eslint . --format node_modules/eslint-friendly-formatter","build":"./scripts/build/build.js"};
 var _package = {
 	name: name,
@@ -5532,7 +5532,8 @@ function genericPrintNoParens(path, options, print, args) {
         firstNonMemberParent = path.getParentNode(i);
         i++;
       } while (
-        firstNonMemberParent && firstNonMemberParent.type === "MemberExpression"
+        firstNonMemberParent &&
+        firstNonMemberParent.type === "MemberExpression"
       );
 
       const shouldInline =
@@ -7306,6 +7307,7 @@ function genericPrintNoParens(path, options, print, args) {
       const shouldIndent =
         parent.type !== "TypeParameterInstantiation" &&
         parent.type !== "GenericTypeAnnotation" &&
+        parent.type !== "TSTypeReference" &&
         !(
           (parent.type === "TypeAlias" ||
             parent.type === "VariableDeclarator") &&
@@ -9515,7 +9517,10 @@ function nodeStr(node, options, isFlowOrTypeScriptDirectiveLiteral) {
 }
 
 function printRegex(node) {
-  const flags = node.flags.split("").sort().join("");
+  const flags = node.flags
+    .split("")
+    .sort()
+    .join("");
   return `/${node.pattern}/${flags}`;
 }
 
@@ -15995,12 +16000,12 @@ var parseJson_1 = function (json, filepath) {
   }
 };
 
-var path$4 = require$$0$1;
+var path$3 = require$$0$1;
 var readFile = readFile$1;
 var parseJson = parseJson_1;
 
 var loadPackageProp$1 = function (packageDir, options) {
-  var packagePath = path$4.join(packageDir, 'package.json');
+  var packagePath = path$3.join(packageDir, 'package.json');
 
   return readFile(packagePath).then(function (content) {
     if (!content) return null;
@@ -20004,7 +20009,7 @@ function tryRequire(content, filepath, cb) {
   }
 }
 
-var path$3 = require$$0$1;
+var path$2 = require$$0$1;
 var isDir = index$56;
 var loadPackageProp = loadPackageProp$1;
 var loadRc = loadRc$1;
@@ -20036,7 +20041,7 @@ var createExplorer$1 = function (options) {
     }
 
     if (configPath) {
-      var absoluteConfigPath = path$3.resolve(process.cwd(), configPath);
+      var absoluteConfigPath = path$2.resolve(process.cwd(), configPath);
       if (fileCache && fileCache.has(absoluteConfigPath)) {
         return fileCache.get(absoluteConfigPath);
       }
@@ -20048,13 +20053,13 @@ var createExplorer$1 = function (options) {
 
     if (!searchPath) return Promise.resolve(null);
 
-    var absoluteSearchPath = path$3.resolve(process.cwd(), searchPath);
+    var absoluteSearchPath = path$2.resolve(process.cwd(), searchPath);
 
     return isDirectory(absoluteSearchPath)
       .then(function (searchPathIsDirectory) {
         var directory = (searchPathIsDirectory)
           ? absoluteSearchPath
-          : path$3.dirname(absoluteSearchPath);
+          : path$2.dirname(absoluteSearchPath);
         return searchDirectory(directory);
       });
   }
@@ -20071,18 +20076,18 @@ var createExplorer$1 = function (options) {
       })
       .then(function (result) {
         if (result || !options.rc) return result;
-        return loadRc(path$3.join(directory, options.rc), options);
+        return loadRc(path$2.join(directory, options.rc), options);
       })
       .then(function (result) {
         if (result || !options.js) return result;
-        return loadJs(path$3.join(directory, options.js));
+        return loadJs(path$2.join(directory, options.js));
       })
       .then(function (result) {
         if (result) return result;
 
-        var splitPath = directory.split(path$3.sep);
+        var splitPath = directory.split(path$2.sep);
         var nextDirectory = (splitPath.length > 1)
-          ? splitPath.slice(0, -1).join(path$3.sep)
+          ? splitPath.slice(0, -1).join(path$2.sep)
           : null;
 
         if (!nextDirectory || directory === options.stopDir) return null;
@@ -20116,7 +20121,7 @@ function identityPromise(x) {
   return Promise.resolve(x);
 }
 
-var path$2 = require$$0$1;
+var path$1 = require$$0$1;
 var oshomedir = index$50;
 var minimist = index$52;
 var assign = index$54;
@@ -20136,7 +20141,7 @@ var index$48 = function (moduleName, options) {
   }, options);
 
   if (options.argv && parsedCliArgs[options.argv]) {
-    options.configPath = path$2.resolve(parsedCliArgs[options.argv]);
+    options.configPath = path$1.resolve(parsedCliArgs[options.argv]);
   }
 
   return createExplorer(options);
@@ -20415,9 +20420,9 @@ function expand$1(str, isTop) {
 var minimatch_1 = minimatch$1;
 minimatch$1.Minimatch = Minimatch;
 
-var path$5 = { sep: '/' };
+var path$4 = { sep: '/' };
 try {
-  path$5 = require$$0$1;
+  path$4 = require$$0$1;
 } catch (er) {}
 
 var GLOBSTAR = minimatch$1.GLOBSTAR = Minimatch.GLOBSTAR = {};
@@ -20534,8 +20539,8 @@ function Minimatch (pattern, options) {
   pattern = pattern.trim();
 
   // windows support: need to use /, not \
-  if (path$5.sep !== '/') {
-    pattern = pattern.split(path$5.sep).join('/');
+  if (path$4.sep !== '/') {
+    pattern = pattern.split(path$4.sep).join('/');
   }
 
   this.options = options;
@@ -21123,8 +21128,8 @@ function match (f, partial) {
   var options = this.options;
 
   // windows: need to use /, not \
-  if (path$5.sep !== '/') {
-    f = f.split(path$5.sep).join('/');
+  if (path$4.sep !== '/') {
+    f = f.split(path$4.sep).join('/');
   }
 
   // treat the test path as a set of pathparts.
@@ -21338,16 +21343,14 @@ function regExpEscape (s) {
 
 const cosmiconfig = index$48;
 const minimatch = minimatch_1;
-const path$1 = require$$0$1;
 
 const withCache = cosmiconfig("prettier");
 const noCache = cosmiconfig("prettier", { cache: false });
 
 function resolveConfig(filePath, opts) {
   const useCache = !(opts && opts.useCache === false);
-  const fileDir = filePath ? path$1.dirname(filePath) : undefined;
 
-  return (useCache ? withCache : noCache).load(fileDir).then(result => {
+  return (useCache ? withCache : noCache).load(filePath).then(result => {
     if (!result) {
       return null;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prettier",
-  "version": "1.6.0",
+  "version": "1.6.1",
   "description": "Prettier is an opinionated code formatter",
   "bin": {
     "prettier": "./bin/prettier.js"
@@ -23,7 +23,7 @@
     "eslint-plugin-react": "7.1.0",
     "jest": "20.0.0",
     "mkdirp": "^0.5.1",
-    "prettier": "1.5.2",
+    "prettier": "1.6.0",
     "rimraf": "2.6.1",
     "rollup": "0.41.1",
     "rollup-plugin-commonjs": "7.0.0",