prettier 2.6.1 → 2.6.2

package/LICENSE

@@ -337,7 +337,7 @@ License: MIT
 
 ----------------------------------------
 
-### @typescript-eslint/types@v5.16.0
+### @typescript-eslint/types@v5.17.0
 
 License: MIT
 Repository: <https://github.com/typescript-eslint/typescript-eslint.git>
@@ -366,7 +366,7 @@ Repository: <https://github.com/typescript-eslint/typescript-eslint.git>
 
 ----------------------------------------
 
-### @typescript-eslint/typescript-estree@v5.16.0
+### @typescript-eslint/typescript-estree@v5.17.0
 
 License: BSD-2-Clause
 Repository: <https://github.com/typescript-eslint/typescript-eslint.git>
@@ -400,7 +400,7 @@ Repository: <https://github.com/typescript-eslint/typescript-eslint.git>
 
 ----------------------------------------
 
-### @typescript-eslint/visitor-keys@v5.16.0
+### @typescript-eslint/visitor-keys@v5.17.0
 
 License: MIT
 Repository: <https://github.com/typescript-eslint/typescript-eslint.git>
@@ -560,23 +560,6 @@ By: Ika
 
 ----------------------------------------
 
-### ansi-regex@v5.0.1
-
-License: MIT
-By: Sindre Sorhus
-
-> MIT License
->
-> Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (sindresorhus.com)
->
-> Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
->
-> The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
->
-> THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-----------------------------------------
-
 ### ansi-regex@v6.0.1
 
 License: MIT
@@ -1440,7 +1423,7 @@ By: Sindre Sorhus
 
 ----------------------------------------
 
-### escape-string-regexp@v4.0.0
+### escape-string-regexp@v5.0.0
 
 License: MIT
 By: Sindre Sorhus
@@ -1946,7 +1929,7 @@ Repository: <git+https://github.com/mk-pmb/flatten-js.git>
 
 ----------------------------------------
 
-### flow-parser@v0.174.1
+### flow-parser@v0.175.0
 
 License: MIT
 By: Flow Team
@@ -2237,7 +2220,7 @@ By: Sindre Sorhus
 
 ----------------------------------------
 
-### html-element-attributes@v2.3.0
+### html-element-attributes@v3.1.0
 
 License: MIT
 By: Titus Wormer
@@ -2267,7 +2250,7 @@ By: Titus Wormer
 
 ----------------------------------------
 
-### html-tag-names@v1.1.5
+### html-tag-names@v2.0.1
 
 License: MIT
 By: Titus Wormer
@@ -2297,7 +2280,7 @@ By: Titus Wormer
 
 ----------------------------------------
 
-### html-void-elements@v1.0.5
+### html-void-elements@v2.0.1
 
 License: MIT
 By: Titus Wormer
@@ -3294,14 +3277,14 @@ By: Sindre Sorhus
 
 ----------------------------------------
 
-### leven@v3.1.0
+### leven@v4.0.0
 
 License: MIT
 By: Sindre Sorhus
 
 > MIT License
 >
-> Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (sindresorhus.com)
+> Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (https://sindresorhus.com)
 >
 > Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 >
@@ -3623,7 +3606,7 @@ Repository: <git@github.com:teambition/merge2.git>
 
 ----------------------------------------
 
-### meriyah@v4.2.0
+### meriyah@v4.2.1
 
 License: ISC
 By: Kenny F.
@@ -3639,7 +3622,7 @@ Repository: <https://github.com/meriyah/meriyah>
 
 ----------------------------------------
 
-### micromatch@v4.0.4
+### micromatch@v4.0.5
 
 License: MIT
 By: Jon Schlinkert
@@ -4802,23 +4785,6 @@ By: Sindre Sorhus
 
 ----------------------------------------
 
-### strip-ansi@v6.0.0
-
-License: MIT
-By: Sindre Sorhus
-
-> MIT License
->
-> Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (sindresorhus.com)
->
-> Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
->
-> The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
->
-> THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-----------------------------------------
-
 ### strip-ansi@v7.0.1
 
 License: MIT
@@ -5049,7 +5015,7 @@ Repository: <https://github.com/ajafff/tsutils>
 
 ----------------------------------------
 
-### typescript@v4.6.2
+### typescript@v4.6.3
 
 License: Apache-2.0
 By: Microsoft Corp.

package/cli.js

@@ -1593,24 +1593,6 @@ var require_fast_json_stable_stringify = __commonJS2({
     };
   }
 });
-var require_ansi_regex = __commonJS2({
-  "node_modules/ansi-regex/index.js"(exports2, module2) {
-    "use strict";
-    module2.exports = ({
-      onlyFirst = false
-    } = {}) => {
-      const pattern = ["[\\u001B\\u009B][[\\]()#;?]*(?:(?:(?:(?:;[-a-zA-Z\\d\\/#&.:=?%@~_]+)*|[a-zA-Z\\d]+(?:;[-a-zA-Z\\d\\/#&.:=?%@~_]*)*)?\\u0007)", "(?:(?:\\d{1,4}(?:;\\d{0,4})*)?[\\dA-PR-TZcf-ntqry=><~]))"].join("|");
-      return new RegExp(pattern, onlyFirst ? void 0 : "g");
-    };
-  }
-});
-var require_strip_ansi = __commonJS2({
-  "node_modules/strip-ansi/index.js"(exports2, module2) {
-    "use strict";
-    var ansiRegex = require_ansi_regex();
-    module2.exports = (string) => typeof string === "string" ? string.replace(ansiRegex(), "") : string;
-  }
-});
 var require_clone = __commonJS2({
   "node_modules/clone/clone.js"(exports2, module2) {
     var clone = function() {
@@ -1811,6 +1793,52 @@ var require_wcwidth = __commonJS2({
     }
   }
 });
+var require_strip_ansi = __commonJS2({
+  "vendors/strip-ansi.js"(exports2, module2) {
+    var __defProp = Object.defineProperty;
+    var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+    var __getOwnPropNames22 = Object.getOwnPropertyNames;
+    var __hasOwnProp = Object.prototype.hasOwnProperty;
+    var __export = (target, all) => {
+      for (var name in all)
+        __defProp(target, name, {
+          get: all[name],
+          enumerable: true
+        });
+    };
+    var __copyProps = (to, from, except, desc) => {
+      if (from && typeof from === "object" || typeof from === "function") {
+        for (let key of __getOwnPropNames22(from))
+          if (!__hasOwnProp.call(to, key) && key !== except)
+            __defProp(to, key, {
+              get: () => from[key],
+              enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
+            });
+      }
+      return to;
+    };
+    var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", {
+      value: true
+    }), mod);
+    var strip_ansi_exports = {};
+    __export(strip_ansi_exports, {
+      default: () => stripAnsi
+    });
+    module2.exports = __toCommonJS(strip_ansi_exports);
+    function ansiRegex({
+      onlyFirst = false
+    } = {}) {
+      const pattern = ["[\\u001B\\u009B][[\\]()#;?]*(?:(?:(?:(?:;[-a-zA-Z\\d\\/#&.:=?%@~_]+)*|[a-zA-Z\\d]+(?:;[-a-zA-Z\\d\\/#&.:=?%@~_]*)*)?\\u0007)", "(?:(?:\\d{1,4}(?:;\\d{0,4})*)?[\\dA-PR-TZcf-ntqry=><~]))"].join("|");
+      return new RegExp(pattern, onlyFirst ? void 0 : "g");
+    }
+    function stripAnsi(string) {
+      if (typeof string !== "string") {
+        throw new TypeError(`Expected a \`string\`, got \`${typeof string}\``);
+      }
+      return string.replace(ansiRegex(), "");
+    }
+  }
+});
 var require_chalk = __commonJS2({
   "vendors/chalk.js"(exports2, module2) {
     var __create = Object.create;
@@ -2362,8 +2390,10 @@ var require_logger = __commonJS2({
   "src/cli/logger.js"(exports2, module2) {
     "use strict";
     var readline = require("readline");
-    var stripAnsi = require_strip_ansi();
     var wcwidth = require_wcwidth();
+    var {
+      default: stripAnsi
+    } = require_strip_ansi();
     var {
       default: chalk
     } = require_chalk();
@@ -4020,61 +4050,6 @@ var require_camelcase = __commonJS2({
     module2.exports.default = camelCase;
   }
 });
-var require_leven = __commonJS2({
-  "node_modules/leven/index.js"(exports2, module2) {
-    "use strict";
-    var array = [];
-    var charCodeCache = [];
-    var leven = (left, right) => {
-      if (left === right) {
-        return 0;
-      }
-      const swap = left;
-      if (left.length > right.length) {
-        left = right;
-        right = swap;
-      }
-      let leftLength = left.length;
-      let rightLength = right.length;
-      while (leftLength > 0 && left.charCodeAt(~-leftLength) === right.charCodeAt(~-rightLength)) {
-        leftLength--;
-        rightLength--;
-      }
-      let start = 0;
-      while (start < leftLength && left.charCodeAt(start) === right.charCodeAt(start)) {
-        start++;
-      }
-      leftLength -= start;
-      rightLength -= start;
-      if (leftLength === 0) {
-        return rightLength;
-      }
-      let bCharCode;
-      let result;
-      let temp;
-      let temp2;
-      let i = 0;
-      let j = 0;
-      while (i < leftLength) {
-        charCodeCache[i] = left.charCodeAt(start + i);
-        array[i] = ++i;
-      }
-      while (j < rightLength) {
-        bCharCode = right.charCodeAt(start + j);
-        temp = j++;
-        result = j;
-        for (i = 0; i < leftLength; i++) {
-          temp2 = bCharCode === charCodeCache[i] ? temp : temp + 1;
-          temp = array[i];
-          result = array[i] = temp > result ? temp2 > result ? result + 1 : temp2 : temp2 > temp ? temp + 1 : temp2;
-        }
-      }
-      return result;
-    };
-    module2.exports = leven;
-    module2.exports.default = leven;
-  }
-});
 var require_minimist = __commonJS2({
   "node_modules/minimist/index.js"(exports2, module2) {
     module2.exports = function(args, opts) {
@@ -5372,23 +5347,118 @@ var require_create_minimist_options = __commonJS2({
     };
   }
 });
-var require_parse_cli_arguments = __commonJS2({
-  "src/cli/options/parse-cli-arguments.js"(exports2, module2) {
+var require_leven = __commonJS2({
+  "vendors/leven.js"(exports2, module2) {
+    var __defProp = Object.defineProperty;
+    var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+    var __getOwnPropNames22 = Object.getOwnPropertyNames;
+    var __hasOwnProp = Object.prototype.hasOwnProperty;
+    var __export = (target, all) => {
+      for (var name in all)
+        __defProp(target, name, {
+          get: all[name],
+          enumerable: true
+        });
+    };
+    var __copyProps = (to, from, except, desc) => {
+      if (from && typeof from === "object" || typeof from === "function") {
+        for (let key of __getOwnPropNames22(from))
+          if (!__hasOwnProp.call(to, key) && key !== except)
+            __defProp(to, key, {
+              get: () => from[key],
+              enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
+            });
+      }
+      return to;
+    };
+    var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", {
+      value: true
+    }), mod);
+    var leven_exports = {};
+    __export(leven_exports, {
+      default: () => leven
+    });
+    module2.exports = __toCommonJS(leven_exports);
+    var array = [];
+    var characterCodeCache = [];
+    function leven(first, second) {
+      if (first === second) {
+        return 0;
+      }
+      const swap = first;
+      if (first.length > second.length) {
+        first = second;
+        second = swap;
+      }
+      let firstLength = first.length;
+      let secondLength = second.length;
+      while (firstLength > 0 && first.charCodeAt(~-firstLength) === second.charCodeAt(~-secondLength)) {
+        firstLength--;
+        secondLength--;
+      }
+      let start = 0;
+      while (start < firstLength && first.charCodeAt(start) === second.charCodeAt(start)) {
+        start++;
+      }
+      firstLength -= start;
+      secondLength -= start;
+      if (firstLength === 0) {
+        return secondLength;
+      }
+      let bCharacterCode;
+      let result;
+      let temporary;
+      let temporary2;
+      let index = 0;
+      let index2 = 0;
+      while (index < firstLength) {
+        characterCodeCache[index] = first.charCodeAt(start + index);
+        array[index] = ++index;
+      }
+      while (index2 < secondLength) {
+        bCharacterCode = second.charCodeAt(start + index2);
+        temporary = index2++;
+        result = index2;
+        for (index = 0; index < firstLength; index++) {
+          temporary2 = bCharacterCode === characterCodeCache[index] ? temporary : temporary + 1;
+          temporary = array[index];
+          result = array[index] = temporary > result ? temporary2 > result ? result + 1 : temporary2 : temporary2 > temporary ? temporary + 1 : temporary2;
+        }
+      }
+      return result;
+    }
+  }
+});
+var require_normalize_cli_options = __commonJS2({
+  "src/cli/options/normalize-cli-options.js"(exports2, module2) {
     "use strict";
-    var pick = require_pick();
-    var camelCase = require_camelcase();
-    var leven = require_leven();
     var {
       default: chalk
     } = require_chalk();
     var {
-      optionsNormalizer: {
-        normalizeCliOptions
-      }
+      default: leven
+    } = require_leven();
+    var {
+      optionsNormalizer
     } = require_prettier_internal();
+    function normalizeCliOptions(options, optionInfos, opts) {
+      return optionsNormalizer.normalizeCliOptions(options, optionInfos, Object.assign({
+        colorsModule: chalk,
+        levenshteinDistance: leven
+      }, opts));
+    }
+    module2.exports = normalizeCliOptions;
+  }
+});
+var require_parse_cli_arguments = __commonJS2({
+  "src/cli/options/parse-cli-arguments.js"(exports2, module2) {
+    "use strict";
+    var pick = require_pick();
+    var camelCase = require_camelcase();
     var getContextOptions = require_get_context_options();
     var minimist = require_minimist2();
     var createMinimistOptions = require_create_minimist_options();
+    var normalizeCliOptions = require_normalize_cli_options();
     function parseArgv(rawArguments, detailedOptions, logger, keys) {
       const minimistOptions = createMinimistOptions(detailedOptions);
       let argv = minimist(rawArguments, minimistOptions);
@@ -5400,9 +5470,7 @@ var require_parse_cli_arguments = __commonJS2({
         argv = pick(argv, keys);
       }
       const normalized = normalizeCliOptions(argv, detailedOptions, {
-        logger,
-        colorsModule: chalk,
-        levenshteinDistance: leven
+        logger
       });
       return Object.assign(Object.assign({}, Object.fromEntries(Object.entries(normalized).map(([key, value]) => {
         const option = detailedOptions.find(({
@@ -8702,11 +8770,11 @@ var require_micromatch = __commonJS2({
           options.onResult(state);
         items.push(state.output);
       };
-      let matches = micromatch(list, patterns, Object.assign(Object.assign({}, options), {}, {
+      let matches = new Set(micromatch(list, patterns, Object.assign(Object.assign({}, options), {}, {
         onResult
-      }));
+      })));
       for (let item of items) {
-        if (!matches.includes(item)) {
+        if (!matches.has(item)) {
           result.add(item);
         }
       }
@@ -11273,16 +11341,13 @@ var require_get_options_for_file = __commonJS2({
   "src/cli/options/get-options-for-file.js"(exports2, module2) {
     "use strict";
     var dashify = require_dashify();
-    var leven = require_leven();
-    var {
-      default: chalk
-    } = require_chalk();
     var prettier2 = require("./index.js");
     var {
       optionsNormalizer
     } = require_prettier_internal();
     var minimist = require_minimist2();
     var createMinimistOptions = require_create_minimist_options();
+    var normalizeCliOptions = require_normalize_cli_options();
     function getOptions(argv, detailedOptions) {
       return Object.fromEntries(detailedOptions.filter(({
         forwardToApi
@@ -11304,14 +11369,12 @@ var require_get_options_for_file = __commonJS2({
     function parseArgsToOptions(context, overrideDefaults) {
       const minimistOptions = createMinimistOptions(context.detailedOptions);
       const apiDetailedOptionMap = createApiDetailedOptionMap(context.detailedOptions);
-      return getOptions(optionsNormalizer.normalizeCliOptions(minimist(context.rawArguments, {
+      return getOptions(normalizeCliOptions(minimist(context.rawArguments, {
         string: minimistOptions.string,
         boolean: minimistOptions.boolean,
         default: cliifyOptions(overrideDefaults, apiDetailedOptionMap)
       }), context.detailedOptions, {
-        logger: false,
-        colorsModule: chalk,
-        levenshteinDistance: leven
+        logger: false
       }), context.detailedOptions);
     }
     async function getOptionsOrDie(context, filePath) {