prettier 1.11.0 → 1.11.1

package/index.js

@@ -187,7 +187,7 @@ function printKeyValues(key, valueOrArray) {
 unwrapExports(build);
 
 var name = "prettier";
-var version$1 = "1.11.0";
+var version$1 = "1.11.1";
 var description = "Prettier is an opinionated code formatter";
 var bin = {"prettier":"./bin/prettier.js"};
 var repository = "prettier/prettier";
@@ -197,7 +197,7 @@ var license = "MIT";
 var main = "./index.js";
 var engines = {"node":">=4"};
 var dependencies = {"@babel/code-frame":"7.0.0-beta.35","@glimmer/syntax":"0.30.3","babylon":"7.0.0-beta.34","camelcase":"4.1.0","chalk":"2.1.0","cjk-regex":"1.0.2","cosmiconfig":"3.1.0","dashify":"0.2.2","dedent":"0.7.0","diff":"3.2.0","editorconfig":"0.14.2","editorconfig-to-prettier":"0.0.6","emoji-regex":"6.5.1","escape-string-regexp":"1.0.5","esutils":"2.0.2","find-project-root":"1.1.1","flow-parser":"0.64.0","get-stream":"3.0.0","globby":"6.1.0","graphql":"0.12.3","gray-matter":"3.1.1","html-tag-names":"1.1.1","ignore":"3.3.7","jest-docblock":"22.2.2","json-stable-stringify":"1.0.1","leven":"2.1.0","mem":"1.1.0","minimatch":"3.0.4","minimist":"1.2.0","parse5":"3.0.3","postcss-less":"1.1.3","postcss-media-query-parser":"0.2.3","postcss-scss":"1.0.2","postcss-selector-parser":"2.2.3","postcss-values-parser":"1.3.2","read-pkg-up":"3.0.0","remark-frontmatter":"1.1.0","remark-parse":"5.0.0","resolve":"1.5.0","semver":"5.4.1","string-width":"2.1.1","typescript":"2.8.0-dev.20180222","typescript-eslint-parser":"14.0.0","unicode-regex":"1.0.1","unified":"6.1.6"};
-var devDependencies = {"babel-cli":"6.24.1","babel-preset-es2015":"6.24.1","codecov":"2.2.0","cross-env":"5.0.5","eslint":"4.1.1","eslint-config-prettier":"2.9.0","eslint-friendly-formatter":"3.0.0","eslint-plugin-import":"2.6.1","eslint-plugin-prettier":"2.4.0","eslint-plugin-react":"7.1.0","jest":"21.1.0","mkdirp":"0.5.1","prettier":"1.10.2","prettylint":"1.0.0","rimraf":"2.6.2","rollup":"0.47.6","rollup-plugin-commonjs":"8.2.6","rollup-plugin-json":"2.1.1","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.2.1","shelljs":"0.8.1","snapshot-diff":"0.2.2","strip-ansi":"4.0.0","sw-toolbox":"3.6.0","tempy":"0.2.1","uglify-es":"3.0.28","webpack":"2.6.1"};
+var devDependencies = {"babel-cli":"6.24.1","babel-preset-es2015":"6.24.1","codecov":"2.2.0","cross-env":"5.0.5","eslint":"4.1.1","eslint-config-prettier":"2.9.0","eslint-friendly-formatter":"3.0.0","eslint-plugin-import":"2.6.1","eslint-plugin-prettier":"2.4.0","eslint-plugin-react":"7.1.0","jest":"21.1.0","mkdirp":"0.5.1","prettier":"1.11.0","prettylint":"1.0.0","rimraf":"2.6.2","rollup":"0.47.6","rollup-plugin-commonjs":"8.2.6","rollup-plugin-json":"2.1.1","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.2.1","shelljs":"0.8.1","snapshot-diff":"0.2.2","strip-ansi":"4.0.0","sw-toolbox":"3.6.0","tempy":"0.2.1","uglify-es":"3.0.28","webpack":"2.6.1"};
 var scripts = {"prepublishOnly":"echo \"Error: must publish from dist/\" && exit 1","prepare-release":"yarn && yarn build && yarn test:dist","test":"jest","test:dist":"node ./scripts/test-dist.js","test-integration":"jest tests_integration","lint":"cross-env EFF_NO_LINK_RULES=true eslint . --format node_modules/eslint-friendly-formatter","lint-docs":"prettylint {.,docs,website,website/blog}/*.md","build":"node ./scripts/build/build.js","build-docs":"node ./scripts/build/build-docs.js","check-deps":"node ./scripts/check-deps.js"};
 var _package = {
 	name: name,
@@ -19377,7 +19377,7 @@ function loadPlugins(plugins) {
       }
 
       const pluginPath = resolve.sync(plugin, { basedir: process.cwd() });
-      return require(pluginPath);
+      return Object.assign({ name: plugin }, require(pluginPath));
     });
 
   return deduplicate(internalPlugins.concat(externalPlugins));
@@ -19858,6 +19858,16 @@ function getSupportInfo$1(version, opts) {
       }
 
       return newOption;
+    })
+    .map(option => {
+      const filteredPlugins = plugins.filter(
+        plugin => plugin.defaultOptions && plugin.defaultOptions[option.name]
+      );
+      const pluginDefaults = filteredPlugins.reduce((reduced, plugin) => {
+        reduced[plugin.name] = plugin.defaultOptions[option.name];
+        return reduced;
+      }, {});
+      return Object.assign(option, { pluginDefaults });
     });
 
   const usePostCssParser = semver.lt(version, "1.7.1");
@@ -23132,25 +23142,23 @@ function parse$4(text, opts) {
 
 var parser$3 = { parse: parse$4, resolveParser: resolveParser$1 };
 
-function getPrinter(options) {
+function getPlugin(options) {
   const astFormat = options.astFormat;
 
   if (!astFormat) {
-    throw new Error("getPrinter() requires astFormat to be set");
+    throw new Error("getPlugin() requires astFormat to be set");
   }
   const printerPlugin = options.plugins.find(
     plugin => plugin.printers[astFormat]
   );
   if (!printerPlugin) {
-    throw new Error(
-      `Couldn't find printer plugin for AST format "${astFormat}"`
-    );
+    throw new Error(`Couldn't find plugin for AST format "${astFormat}"`);
   }
 
-  return printerPlugin.printers[astFormat];
+  return printerPlugin;
 }
 
-var getPrinter_1 = getPrinter;
+var getPlugin_1 = getPlugin;
 
 const getSupportInfo$2 = support.getSupportInfo;
 
@@ -23177,7 +23185,8 @@ function normalize$2(options, opts) {
   const supportOptions = getSupportInfo$2(null, {
     plugins,
     pluginsLoaded: true,
-    showUnreleased: true
+    showUnreleased: true,
+    showDeprecated: true
   }).options;
   const defaults = supportOptions.reduce(
     (reduced, optionInfo) =>
@@ -23200,15 +23209,41 @@ function normalize$2(options, opts) {
     }
   }
 
-  const parser = resolveParser(rawOptions);
+  const parser = resolveParser(
+    !rawOptions.parser
+      ? rawOptions
+      : // handle deprecated parsers
+        optionsNormalizer.normalizeApiOptions(
+          rawOptions,
+          [supportOptions.find(x => x.name === "parser")],
+          { passThrough: true, logger: false }
+        )
+  );
   rawOptions.astFormat = parser.astFormat;
   rawOptions.locEnd = parser.locEnd;
   rawOptions.locStart = parser.locStart;
-  rawOptions.printer = getPrinter_1(rawOptions);
 
-  Object.keys(defaults).forEach(k => {
+  const plugin = getPlugin_1(rawOptions);
+  rawOptions.printer = plugin.printers[rawOptions.astFormat];
+
+  const pluginDefaults = supportOptions
+    .filter(
+      optionInfo =>
+        optionInfo.pluginDefaults && optionInfo.pluginDefaults[plugin.name]
+    )
+    .reduce(
+      (reduced, optionInfo) =>
+        Object.assign(reduced, {
+          [optionInfo.name]: optionInfo.pluginDefaults[plugin.name]
+        }),
+      {}
+    );
+
+  const mixedDefaults = Object.assign({}, defaults, pluginDefaults);
+
+  Object.keys(mixedDefaults).forEach(k => {
     if (rawOptions[k] == null) {
-      rawOptions[k] = defaults[k];
+      rawOptions[k] = mixedDefaults[k];
     }
   });
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prettier",
-  "version": "1.11.0",
+  "version": "1.11.1",
   "description": "Prettier is an opinionated code formatter",
   "bin": "./bin-prettier.js",
   "repository": "prettier/prettier",
@@ -24,7 +24,7 @@
     "eslint-plugin-react": "7.1.0",
     "jest": "21.1.0",
     "mkdirp": "0.5.1",
-    "prettier": "1.10.2",
+    "prettier": "1.11.0",
     "prettylint": "1.0.0",
     "rimraf": "2.6.2",
     "rollup": "0.47.6",