prettier 2.6.1 → 2.6.2

package/index.js

@@ -1809,14 +1809,43 @@ var require_array = __commonJS2({
   }
 });
 var require_escape_string_regexp = __commonJS2({
-  "node_modules/escape-string-regexp/index.js"(exports2, module2) {
-    "use strict";
-    module2.exports = (string) => {
+  "vendors/escape-string-regexp.js"(exports2, module2) {
+    var __defProp2 = Object.defineProperty;
+    var __getOwnPropDesc2 = Object.getOwnPropertyDescriptor;
+    var __getOwnPropNames22 = Object.getOwnPropertyNames;
+    var __hasOwnProp2 = Object.prototype.hasOwnProperty;
+    var __export2 = (target, all) => {
+      for (var name in all)
+        __defProp2(target, name, {
+          get: all[name],
+          enumerable: true
+        });
+    };
+    var __copyProps2 = (to, from, except, desc) => {
+      if (from && typeof from === "object" || typeof from === "function") {
+        for (let key of __getOwnPropNames22(from))
+          if (!__hasOwnProp2.call(to, key) && key !== except)
+            __defProp2(to, key, {
+              get: () => from[key],
+              enumerable: !(desc = __getOwnPropDesc2(from, key)) || desc.enumerable
+            });
+      }
+      return to;
+    };
+    var __toCommonJS2 = (mod) => __copyProps2(__defProp2({}, "__esModule", {
+      value: true
+    }), mod);
+    var escape_string_regexp_exports = {};
+    __export2(escape_string_regexp_exports, {
+      default: () => escapeStringRegexp
+    });
+    module2.exports = __toCommonJS2(escape_string_regexp_exports);
+    function escapeStringRegexp(string) {
       if (typeof string !== "string") {
         throw new TypeError("Expected a string");
       }
       return string.replace(/[|\\{}()[\]^$+*?.]/g, "\\$&").replace(/-/g, "\\x2d");
-    };
+    }
   }
 });
 var require_get_last = __commonJS2({
@@ -3004,7 +3033,9 @@ var require_get_next_non_space_non_comment_character_index_with_start_index = __
 var require_util = __commonJS2({
   "src/common/util.js"(exports2, module2) {
     "use strict";
-    var escapeStringRegexp = require_escape_string_regexp();
+    var {
+      default: escapeStringRegexp
+    } = require_escape_string_regexp();
     var getLast = require_get_last();
     var {
       getSupportInfo: getSupportInfo2
@@ -11708,11 +11739,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);
         }
       }
@@ -32845,8 +32876,11 @@ var require_printer_postcss = __commonJS2({
               parts[1] = group(parts[1]);
               return group(dedent(printed2));
             }
-            if (!isLast && child.type === "value-comma_group" && child.groups && child.groups[0].type !== "value-paren_group" && isNextLineEmpty(options.originalText, getLast(child.groups), locEnd)) {
-              printed2.push(hardline);
+            if (!isLast && child.type === "value-comma_group" && isNonEmptyArray(child.groups)) {
+              const last = getLast(child.groups);
+              if (last.source && isNextLineEmpty(options.originalText, last, locEnd)) {
+                printed2.push(hardline);
+              }
             }
             return printed2;
           }, "groups"))]), ifBreak(!isLastItemComment && isSCSS(options.parser, options.originalText) && isSCSSMapItem && shouldPrintComma(options) ? "," : ""), softline, node.close ? print("close") : ""], {
@@ -33102,14 +33136,18 @@ var require_clean3 = __commonJS2({
   }
 });
 var require_html_void_elements = __commonJS2({
-  "node_modules/html-void-elements/index.json"(exports2, module2) {
-    module2.exports = ["area", "base", "basefont", "bgsound", "br", "col", "command", "embed", "frame", "hr", "image", "img", "input", "isindex", "keygen", "link", "menuitem", "meta", "nextid", "param", "source", "track", "wbr"];
+  "vendors/html-void-elements.json"(exports2, module2) {
+    module2.exports = {
+      htmlVoidElements: ["area", "base", "basefont", "bgsound", "br", "col", "command", "embed", "frame", "hr", "image", "img", "input", "isindex", "keygen", "link", "menuitem", "meta", "nextid", "param", "source", "track", "wbr"]
+    };
   }
 });
 var require_utils9 = __commonJS2({
   "src/language-handlebars/utils.js"(exports2, module2) {
     "use strict";
-    var htmlVoidElements = require_html_void_elements();
+    var {
+      htmlVoidElements
+    } = require_html_void_elements();
     var getLast = require_get_last();
     function isLastNodeOfSiblings(path) {
       const node = path.getValue();
@@ -33809,10 +33847,10 @@ var require_printer_graphql = __commonJS2({
           return ["fragment ", print("name"), isNonEmptyArray(node.variableDefinitions) ? group(["(", indent([softline, join([ifBreak("", ", "), softline], path.map(print, "variableDefinitions"))]), softline, ")"]) : "", " on ", print("typeCondition"), printDirectives(path, print, node), " ", print("selectionSet")];
         }
         case "SelectionSet": {
-          return ["{", indent([hardline, join(hardline, path.call((selectionsPath) => printSequence(selectionsPath, options, print), "selections"))]), hardline, "}"];
+          return ["{", indent([hardline, join(hardline, printSequence(path, options, print, "selections"))]), hardline, "}"];
         }
         case "Field": {
-          return group([node.alias ? [print("alias"), ": "] : "", print("name"), node.arguments.length > 0 ? group(["(", indent([softline, join([ifBreak("", ", "), softline], path.call((argsPath) => printSequence(argsPath, options, print), "arguments"))]), softline, ")"]) : "", printDirectives(path, print, node), node.selectionSet ? " " : "", print("selectionSet")]);
+          return group([node.alias ? [print("alias"), ": "] : "", print("name"), node.arguments.length > 0 ? group(["(", indent([softline, join([ifBreak("", ", "), softline], printSequence(path, options, print, "arguments"))]), softline, ")"]) : "", printDirectives(path, print, node), node.selectionSet ? " " : "", print("selectionSet")]);
         }
         case "Name": {
           return node.value;
@@ -33848,7 +33886,7 @@ var require_printer_graphql = __commonJS2({
           return [print("name"), ": ", print("value")];
         }
         case "Directive": {
-          return ["@", print("name"), node.arguments.length > 0 ? group(["(", indent([softline, join([ifBreak("", ", "), softline], path.call((argsPath) => printSequence(argsPath, options, print), "arguments"))]), softline, ")"]) : ""];
+          return ["@", print("name"), node.arguments.length > 0 ? group(["(", indent([softline, join([ifBreak("", ", "), softline], printSequence(path, options, print, "arguments"))]), softline, ")"]) : ""];
         }
         case "NamedType": {
           return print("name");
@@ -33858,17 +33896,17 @@ var require_printer_graphql = __commonJS2({
         }
         case "ObjectTypeExtension":
         case "ObjectTypeDefinition": {
-          return [print("description"), node.description ? hardline : "", node.kind === "ObjectTypeExtension" ? "extend " : "", "type ", print("name"), node.interfaces.length > 0 ? [" implements ", ...printInterfaces(path, options, print)] : "", printDirectives(path, print, node), node.fields.length > 0 ? [" {", indent([hardline, join(hardline, path.call((fieldsPath) => printSequence(fieldsPath, options, print), "fields"))]), hardline, "}"] : ""];
+          return [print("description"), node.description ? hardline : "", node.kind === "ObjectTypeExtension" ? "extend " : "", "type ", print("name"), node.interfaces.length > 0 ? [" implements ", ...printInterfaces(path, options, print)] : "", printDirectives(path, print, node), node.fields.length > 0 ? [" {", indent([hardline, join(hardline, printSequence(path, options, print, "fields"))]), hardline, "}"] : ""];
         }
         case "FieldDefinition": {
-          return [print("description"), node.description ? hardline : "", print("name"), node.arguments.length > 0 ? group(["(", indent([softline, join([ifBreak("", ", "), softline], path.call((argsPath) => printSequence(argsPath, options, print), "arguments"))]), softline, ")"]) : "", ": ", print("type"), printDirectives(path, print, node)];
+          return [print("description"), node.description ? hardline : "", print("name"), node.arguments.length > 0 ? group(["(", indent([softline, join([ifBreak("", ", "), softline], printSequence(path, options, print, "arguments"))]), softline, ")"]) : "", ": ", print("type"), printDirectives(path, print, node)];
         }
         case "DirectiveDefinition": {
-          return [print("description"), node.description ? hardline : "", "directive ", "@", print("name"), node.arguments.length > 0 ? group(["(", indent([softline, join([ifBreak("", ", "), softline], path.call((argsPath) => printSequence(argsPath, options, print), "arguments"))]), softline, ")"]) : "", node.repeatable ? " repeatable" : "", " on ", join(" | ", path.map(print, "locations"))];
+          return [print("description"), node.description ? hardline : "", "directive ", "@", print("name"), node.arguments.length > 0 ? group(["(", indent([softline, join([ifBreak("", ", "), softline], printSequence(path, options, print, "arguments"))]), softline, ")"]) : "", node.repeatable ? " repeatable" : "", " on ", join(" | ", path.map(print, "locations"))];
         }
         case "EnumTypeExtension":
         case "EnumTypeDefinition": {
-          return [print("description"), node.description ? hardline : "", node.kind === "EnumTypeExtension" ? "extend " : "", "enum ", print("name"), printDirectives(path, print, node), node.values.length > 0 ? [" {", indent([hardline, join(hardline, path.call((valuesPath) => printSequence(valuesPath, options, print), "values"))]), hardline, "}"] : ""];
+          return [print("description"), node.description ? hardline : "", node.kind === "EnumTypeExtension" ? "extend " : "", "enum ", print("name"), printDirectives(path, print, node), node.values.length > 0 ? [" {", indent([hardline, join(hardline, printSequence(path, options, print, "values"))]), hardline, "}"] : ""];
         }
         case "EnumValueDefinition": {
           return [print("description"), node.description ? hardline : "", print("name"), printDirectives(path, print, node)];
@@ -33878,17 +33916,17 @@ var require_printer_graphql = __commonJS2({
         }
         case "InputObjectTypeExtension":
         case "InputObjectTypeDefinition": {
-          return [print("description"), node.description ? hardline : "", node.kind === "InputObjectTypeExtension" ? "extend " : "", "input ", print("name"), printDirectives(path, print, node), node.fields.length > 0 ? [" {", indent([hardline, join(hardline, path.call((fieldsPath) => printSequence(fieldsPath, options, print), "fields"))]), hardline, "}"] : ""];
+          return [print("description"), node.description ? hardline : "", node.kind === "InputObjectTypeExtension" ? "extend " : "", "input ", print("name"), printDirectives(path, print, node), node.fields.length > 0 ? [" {", indent([hardline, join(hardline, printSequence(path, options, print, "fields"))]), hardline, "}"] : ""];
         }
         case "SchemaDefinition": {
-          return [print("description"), node.description ? hardline : "", "schema", printDirectives(path, print, node), " {", node.operationTypes.length > 0 ? indent([hardline, join(hardline, path.call((opsPath) => printSequence(opsPath, options, print), "operationTypes"))]) : "", hardline, "}"];
+          return [print("description"), node.description ? hardline : "", "schema", printDirectives(path, print, node), " {", node.operationTypes.length > 0 ? indent([hardline, join(hardline, printSequence(path, options, print, "operationTypes"))]) : "", hardline, "}"];
         }
         case "OperationTypeDefinition": {
           return [print("operation"), ": ", print("type")];
         }
         case "InterfaceTypeExtension":
         case "InterfaceTypeDefinition": {
-          return [print("description"), node.description ? hardline : "", node.kind === "InterfaceTypeExtension" ? "extend " : "", "interface ", print("name"), node.interfaces.length > 0 ? [" implements ", ...printInterfaces(path, options, print)] : "", printDirectives(path, print, node), node.fields.length > 0 ? [" {", indent([hardline, join(hardline, path.call((fieldsPath) => printSequence(fieldsPath, options, print), "fields"))]), hardline, "}"] : ""];
+          return [print("description"), node.description ? hardline : "", node.kind === "InterfaceTypeExtension" ? "extend " : "", "interface ", print("name"), node.interfaces.length > 0 ? [" implements ", ...printInterfaces(path, options, print)] : "", printDirectives(path, print, node), node.fields.length > 0 ? [" {", indent([hardline, join(hardline, printSequence(path, options, print, "fields"))]), hardline, "}"] : ""];
         }
         case "FragmentSpread": {
           return ["...", print("name"), printDirectives(path, print, node)];
@@ -33924,15 +33962,14 @@ var require_printer_graphql = __commonJS2({
       }
       return [" ", group(indent([softline, printed]))];
     }
-    function printSequence(sequencePath, options, print) {
-      const count = sequencePath.getValue().length;
-      return sequencePath.map((path, i) => {
+    function printSequence(path, options, print, property) {
+      return path.map((path2, index, sequence) => {
         const printed = print();
-        if (isNextLineEmpty(options.originalText, path.getValue(), locEnd) && i < count - 1) {
+        if (index < sequence.length - 1 && isNextLineEmpty(options.originalText, path2.getValue(), locEnd)) {
           return [printed, hardline];
         }
         return printed;
-      });
+      }, property);
     }
     function canAttachComment(node) {
       return node.kind && node.kind !== "Comment";

package/package.json

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