prettier 2.8.3 → 2.8.5

package/index.js

@@ -18317,8 +18317,12 @@ var require_editorconfig_to_prettier = __commonJS2({
       } else if (editorConfig.tab_width !== void 0) {
         result.tabWidth = editorConfig.tab_width;
       }
-      if (editorConfig.max_line_length && editorConfig.max_line_length !== "off") {
-        result.printWidth = editorConfig.max_line_length;
+      if (editorConfig.max_line_length) {
+        if (editorConfig.max_line_length === "off") {
+          result.printWidth = Number.POSITIVE_INFINITY;
+        } else {
+          result.printWidth = editorConfig.max_line_length;
+        }
       }
       if (editorConfig.quote_type === "single") {
         result.singleQuote = true;
@@ -23392,6 +23396,16 @@ var require_pragma = __commonJS2({
     };
   }
 });
+var require_is_type_cast_comment = __commonJS2({
+  "src/language-js/utils/is-type-cast-comment.js"(exports2, module2) {
+    "use strict";
+    var isBlockComment = require_is_block_comment();
+    function isTypeCastComment(comment) {
+      return isBlockComment(comment) && comment.value[0] === "*" && /@(?:type|satisfies)\b/.test(comment.value);
+    }
+    module2.exports = isTypeCastComment;
+  }
+});
 var require_comments2 = __commonJS2({
   "src/language-js/comments.js"(exports2, module2) {
     "use strict";
@@ -23429,6 +23443,7 @@ var require_comments2 = __commonJS2({
       locEnd
     } = require_loc();
     var isBlockComment = require_is_block_comment();
+    var isTypeCastComment = require_is_type_cast_comment();
     function handleOwnLineComment(context) {
       return [handleIgnoreComments, handleLastFunctionArgComments, handleMemberExpressionComments, handleIfStatementComments, handleWhileComments, handleTryStatementComments, handleClassComments, handleForComments, handleUnionTypeComments, handleOnlyComments, handleModuleSpecifiersComments, handleAssignmentPatternComments, handleMethodNameComments, handleLabeledStatementComments, handleBreakAndContinueStatementComments].some((fn) => fn(context));
     }
@@ -23937,9 +23952,6 @@ var require_comments2 = __commonJS2({
         return [...node.decorators || [], node.key, node.value.body];
       }
     }
-    function isTypeCastComment(comment) {
-      return isBlockComment(comment) && comment.value[0] === "*" && /@type\b/.test(comment.value);
-    }
     function willPrintOwnComments(path) {
       const node = path.getValue();
       const parent = path.getParentNode();
@@ -23950,7 +23962,6 @@ var require_comments2 = __commonJS2({
       handleOwnLineComment,
       handleEndOfLineComment,
       handleRemainingComment,
-      isTypeCastComment,
       getCommentChildNodes,
       willPrintOwnComments
     };
@@ -24037,6 +24048,9 @@ var require_needs_parens = __commonJS2({
         }
         case "Decorator": {
           if (name === "expression") {
+            if (isMemberExpression(node) && node.computed) {
+              return true;
+            }
             let hasCallExpression = false;
             let hasMemberExpression = false;
             let current = node;
@@ -24230,14 +24244,19 @@ var require_needs_parens = __commonJS2({
               return false;
           }
         case "TSConditionalType":
-          if (name === "extendsType" && parent.type === "TSConditionalType") {
-            return true;
-          }
         case "TSFunctionType":
         case "TSConstructorType":
           if (name === "extendsType" && parent.type === "TSConditionalType") {
-            const returnTypeAnnotation = (node.returnType || node.typeAnnotation).typeAnnotation;
-            if (returnTypeAnnotation.type === "TSInferType" && returnTypeAnnotation.typeParameter.constraint) {
+            if (node.type === "TSConditionalType") {
+              return true;
+            }
+            let {
+              typeAnnotation
+            } = node.returnType || node.typeAnnotation;
+            if (typeAnnotation.type === "TSTypePredicate" && typeAnnotation.typeAnnotation) {
+              typeAnnotation = typeAnnotation.typeAnnotation.typeAnnotation;
+            }
+            if (typeAnnotation.type === "TSInferType" && typeAnnotation.typeParameter.constraint) {
               return true;
             }
           }
@@ -24257,6 +24276,8 @@ var require_needs_parens = __commonJS2({
           return parent.type === "TSArrayType" || parent.type === "TSOptionalType" || parent.type === "TSRestType" || name === "objectType" && parent.type === "TSIndexedAccessType" || parent.type === "TSTypeOperator" || parent.type === "TSTypeAnnotation" && path.getParentNode(1).type.startsWith("TSJSDoc");
         case "TSTypeQuery":
           return name === "objectType" && parent.type === "TSIndexedAccessType" || name === "elementType" && parent.type === "TSArrayType";
+        case "TypeofTypeAnnotation":
+          return name === "objectType" && (parent.type === "IndexedAccessType" || parent.type === "OptionalIndexedAccessType") || name === "elementType" && parent.type === "ArrayTypeAnnotation";
         case "ArrayTypeAnnotation":
           return parent.type === "NullableTypeAnnotation";
         case "IntersectionTypeAnnotation":
@@ -24270,8 +24291,6 @@ var require_needs_parens = __commonJS2({
         }
         case "OptionalIndexedAccessType":
           return name === "objectType" && parent.type === "IndexedAccessType";
-        case "TypeofTypeAnnotation":
-          return name === "objectType" && (parent.type === "IndexedAccessType" || parent.type === "OptionalIndexedAccessType");
         case "StringLiteral":
         case "NumericLiteral":
         case "Literal":
@@ -27113,7 +27132,8 @@ var require_type_parameters = __commonJS2({
       isTSXFile,
       shouldPrintComma,
       getFunctionParameters,
-      isObjectType
+      isObjectType,
+      getTypeScriptMappedTypeModifier
     } = require_utils7();
     var {
       createGroupIdMapper
@@ -27159,9 +27179,12 @@ var require_type_parameters = __commonJS2({
     }
     function printTypeParameter(path, options, print) {
       const node = path.getValue();
-      const parts = [];
+      const parts = [node.type === "TSTypeParameter" && node.const ? "const " : ""];
       const parent = path.getParentNode();
       if (parent.type === "TSMappedType") {
+        if (parent.readonly) {
+          parts.push(getTypeScriptMappedTypeModifier(parent.readonly, "readonly"), " ");
+        }
         parts.push("[", print("name"));
         if (node.constraint) {
           parts.push(" in ", print("constraint"));
@@ -29203,7 +29226,7 @@ var require_typescript = __commonJS2({
           return [node.operator, " ", print("typeAnnotation")];
         case "TSMappedType": {
           const shouldBreak = hasNewlineInRange(options.originalText, locStart(node), locEnd(node));
-          return group(["{", indent([options.bracketSpacing ? line : softline, node.readonly ? [getTypeScriptMappedTypeModifier(node.readonly, "readonly"), " "] : "", printTypeScriptModifiers(path, options, print), print("typeParameter"), node.optional ? getTypeScriptMappedTypeModifier(node.optional, "?") : "", node.typeAnnotation ? ": " : "", print("typeAnnotation"), ifBreak(semi)]), printDanglingComments(path, options, true), options.bracketSpacing ? line : softline, "}"], {
+          return group(["{", indent([options.bracketSpacing ? line : softline, print("typeParameter"), node.optional ? getTypeScriptMappedTypeModifier(node.optional, "?") : "", node.typeAnnotation ? ": " : "", print("typeAnnotation"), ifBreak(semi)]), printDanglingComments(path, options, true), options.bracketSpacing ? line : softline, "}"], {
             shouldBreak
           });
         }
@@ -32057,20 +32080,16 @@ var require_clean3 = __commonJS2({
     module2.exports = clean;
   }
 });
-var require_html_void_elements = __commonJS2({
-  "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_html_void_elements_evaluate = __commonJS2({
+  "src/language-handlebars/html-void-elements.evaluate.js"(exports2, module2) {
+    module2.exports = ["area", "base", "br", "col", "command", "embed", "hr", "img", "input", "keygen", "link", "meta", "param", "source", "track", "wbr"];
   }
 });
 var require_utils9 = __commonJS2({
   "src/language-handlebars/utils.js"(exports2, module2) {
     "use strict";
-    var {
-      htmlVoidElements
-    } = require_html_void_elements();
     var getLast = require_get_last();
+    var htmlVoidElements = require_html_void_elements_evaluate();
     function isLastNodeOfSiblings(path) {
       const node = path.getValue();
       const parentNode = path.getParentNode(0);
@@ -32089,8 +32108,11 @@ var require_utils9 = __commonJS2({
       return isNodeOfSomeType(node, ["ElementNode"]) && typeof node.tag === "string" && !node.tag.startsWith(":") && (isUppercase(node.tag[0]) || node.tag.includes("."));
     }
     var voidTags = new Set(htmlVoidElements);
+    function isVoidTag(tag) {
+      return voidTags.has(tag.toLowerCase()) && !isUppercase(tag[0]);
+    }
     function isVoid(node) {
-      return voidTags.has(node.tag) || node.selfClosing === true || isGlimmerComponent(node) && node.children.every((node2) => isWhitespaceNode(node2));
+      return node.selfClosing === true || isVoidTag(node.tag) || isGlimmerComponent(node) && node.children.every((node2) => isWhitespaceNode(node2));
     }
     function isWhitespaceNode(node) {
       return isNodeOfSomeType(node, ["TextNode"]) && !/\S/.test(node.chars);
@@ -32477,30 +32499,23 @@ var require_printer_glimmer = __commonJS2({
     }
     function printOpenBlock(path, print2) {
       const node = path.getValue();
-      const openingMustache = printOpeningBlockOpeningMustache(node);
-      const closingMustache = printOpeningBlockClosingMustache(node);
-      const attributes = [printPath(path, print2)];
-      const params = printParams(path, print2);
-      if (params) {
-        attributes.push(line, params);
+      const parts = [];
+      const paramsDoc = printParams(path, print2);
+      if (paramsDoc) {
+        parts.push(group(paramsDoc));
       }
       if (isNonEmptyArray(node.program.blockParams)) {
-        const block = printBlockParams(node.program);
-        attributes.push(line, block);
+        parts.push(printBlockParams(node.program));
       }
-      return group([openingMustache, indent(attributes), softline, closingMustache]);
+      return group([printOpeningBlockOpeningMustache(node), printPath(path, print2), parts.length > 0 ? indent([line, join(line, parts)]) : "", softline, printOpeningBlockClosingMustache(node)]);
     }
     function printElseBlock(node, options) {
       return [options.htmlWhitespaceSensitivity === "ignore" ? hardline : "", printInverseBlockOpeningMustache(node), "else", printInverseBlockClosingMustache(node)];
     }
     function printElseIfLikeBlock(path, print2, ifLikeKeyword) {
       const node = path.getValue();
-      let blockParams = [];
-      if (isNonEmptyArray(node.program.blockParams)) {
-        blockParams = [line, printBlockParams(node.program)];
-      }
       const parentNode = path.getParentNode(1);
-      return group([printInverseBlockOpeningMustache(parentNode), indent(group([group(["else", line, ifLikeKeyword]), line, printParams(path, print2)])), indent(blockParams), softline, printInverseBlockClosingMustache(parentNode)]);
+      return group([printInverseBlockOpeningMustache(parentNode), ["else", " ", ifLikeKeyword], indent([line, group(printParams(path, print2)), ...isNonEmptyArray(node.program.blockParams) ? [line, printBlockParams(node.program)] : []]), softline, printInverseBlockClosingMustache(parentNode)]);
     }
     function printCloseBlock(path, print2, options) {
       const node = path.getValue();

package/package.json

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