prettier 3.7.0 → 3.7.1

package/doc.js

@@ -1096,10 +1096,13 @@ Expected it to be ${EXPECTED_TYPE_VALUES}.`;
       mode: MODE_BREAK,
       doc
     }];
-    let out = [];
+    let output = "";
     let shouldRemeasure = false;
     const lineSuffix2 = [];
     const cursorPositions = [];
+    const settledOutput = [];
+    const settledCursorPositions = [];
+    let settledTextLength = 0;
     propagateBreaks(doc);
     while (commands.length > 0) {
       const {
@@ -1117,7 +1120,7 @@ Expected it to be ${EXPECTED_TYPE_VALUES}.`;
             newLine
           ) : doc2;
           if (formatted2) {
-            out.push(formatted2);
+            output += formatted2;
             if (commands.length > 0) {
               position += get_string_width_default(formatted2);
             }
@@ -1133,15 +1136,12 @@ Expected it to be ${EXPECTED_TYPE_VALUES}.`;
             });
           }
           break;
-        case DOC_TYPE_CURSOR: {
+        case DOC_TYPE_CURSOR:
           if (cursorPositions.length >= 2) {
             throw new Error("There are too many 'cursor' in doc.");
           }
-          const text = out.join("");
-          out = [text];
-          cursorPositions.push(text.length - 1);
+          cursorPositions.push(settledTextLength + output.length);
           break;
-        }
         case DOC_TYPE_INDENT:
           commands.push({
             indent: makeIndent(indent2, options),
@@ -1380,7 +1380,7 @@ Expected it to be ${EXPECTED_TYPE_VALUES}.`;
             case MODE_FLAT:
               if (!doc2.hard) {
                 if (!doc2.soft) {
-                  out.push(" ");
+                  output += " ";
                   position += 1;
                 }
                 break;
@@ -1399,17 +1399,17 @@ Expected it to be ${EXPECTED_TYPE_VALUES}.`;
                 break;
               }
               if (doc2.literal) {
-                out.push(newLine);
+                output += newLine;
                 position = 0;
                 if (indent2.root) {
                   if (indent2.root.value) {
-                    out.push(indent2.root.value);
+                    output += indent2.root.value;
                   }
                   position = indent2.root.length;
                 }
               } else {
                 trim2();
-                out.push(newLine + indent2.value);
+                output += newLine + indent2.value;
                 position = indent2.length;
               }
               break;
@@ -1432,32 +1432,38 @@ Expected it to be ${EXPECTED_TYPE_VALUES}.`;
         lineSuffix2.length = 0;
       }
     }
-    const formatted = out.join("");
-    if (cursorPositions.length !== 2) {
+    const formatted = settledOutput.join("") + output;
+    const finalCursorPositions = [...settledCursorPositions, ...cursorPositions];
+    if (finalCursorPositions.length !== 2) {
       return {
         formatted
       };
     }
-    const cursorNodeStart = cursorPositions[0] + 1;
+    const cursorNodeStart = finalCursorPositions[0];
     return {
       formatted,
       cursorNodeStart,
       cursorNodeText: formatted.slice(cursorNodeStart, method_at_default(
         /* OPTIONAL_OBJECT: false */
         0,
-        cursorPositions,
+        finalCursorPositions,
         -1
-      ) + 1)
+      ))
     };
     function trim2() {
       const {
-        text,
+        text: trimmed,
         count
-      } = trimIndentation(out.join(""));
-      out = [text];
+      } = trimIndentation(output);
+      if (trimmed) {
+        settledOutput.push(trimmed);
+        settledTextLength += trimmed.length;
+      }
+      output = "";
       position -= count;
-      for (let index = 0; index < cursorPositions.length; index++) {
-        cursorPositions[index] = Math.min(cursorPositions[index], text.length - 1);
+      if (cursorPositions.length > 0) {
+        settledCursorPositions.push(...cursorPositions.map((position2) => Math.min(position2, settledTextLength)));
+        cursorPositions.length = 0;
       }
     }
   }

package/doc.mjs

@@ -1061,10 +1061,13 @@ function printDocToString(doc, options) {
     mode: MODE_BREAK,
     doc
   }];
-  let out = [];
+  let output = "";
   let shouldRemeasure = false;
   const lineSuffix2 = [];
   const cursorPositions = [];
+  const settledOutput = [];
+  const settledCursorPositions = [];
+  let settledTextLength = 0;
   propagateBreaks(doc);
   while (commands.length > 0) {
     const {
@@ -1082,7 +1085,7 @@ function printDocToString(doc, options) {
           newLine
         ) : doc2;
         if (formatted2) {
-          out.push(formatted2);
+          output += formatted2;
           if (commands.length > 0) {
             position += get_string_width_default(formatted2);
           }
@@ -1098,15 +1101,12 @@ function printDocToString(doc, options) {
           });
         }
         break;
-      case DOC_TYPE_CURSOR: {
+      case DOC_TYPE_CURSOR:
         if (cursorPositions.length >= 2) {
           throw new Error("There are too many 'cursor' in doc.");
         }
-        const text = out.join("");
-        out = [text];
-        cursorPositions.push(text.length - 1);
+        cursorPositions.push(settledTextLength + output.length);
         break;
-      }
       case DOC_TYPE_INDENT:
         commands.push({
           indent: makeIndent(indent2, options),
@@ -1345,7 +1345,7 @@ function printDocToString(doc, options) {
           case MODE_FLAT:
             if (!doc2.hard) {
               if (!doc2.soft) {
-                out.push(" ");
+                output += " ";
                 position += 1;
               }
               break;
@@ -1364,17 +1364,17 @@ function printDocToString(doc, options) {
               break;
             }
             if (doc2.literal) {
-              out.push(newLine);
+              output += newLine;
               position = 0;
               if (indent2.root) {
                 if (indent2.root.value) {
-                  out.push(indent2.root.value);
+                  output += indent2.root.value;
                 }
                 position = indent2.root.length;
               }
             } else {
               trim2();
-              out.push(newLine + indent2.value);
+              output += newLine + indent2.value;
               position = indent2.length;
             }
             break;
@@ -1397,32 +1397,38 @@ function printDocToString(doc, options) {
       lineSuffix2.length = 0;
     }
   }
-  const formatted = out.join("");
-  if (cursorPositions.length !== 2) {
+  const formatted = settledOutput.join("") + output;
+  const finalCursorPositions = [...settledCursorPositions, ...cursorPositions];
+  if (finalCursorPositions.length !== 2) {
     return {
       formatted
     };
   }
-  const cursorNodeStart = cursorPositions[0] + 1;
+  const cursorNodeStart = finalCursorPositions[0];
   return {
     formatted,
     cursorNodeStart,
     cursorNodeText: formatted.slice(cursorNodeStart, method_at_default(
       /* OPTIONAL_OBJECT: false */
       0,
-      cursorPositions,
+      finalCursorPositions,
       -1
-    ) + 1)
+    ))
   };
   function trim2() {
     const {
-      text,
+      text: trimmed,
       count
-    } = trimIndentation(out.join(""));
-    out = [text];
+    } = trimIndentation(output);
+    if (trimmed) {
+      settledOutput.push(trimmed);
+      settledTextLength += trimmed.length;
+    }
+    output = "";
     position -= count;
-    for (let index = 0; index < cursorPositions.length; index++) {
-      cursorPositions[index] = Math.min(cursorPositions[index], text.length - 1);
+    if (cursorPositions.length > 0) {
+      settledCursorPositions.push(...cursorPositions.map((position2) => Math.min(position2, settledTextLength)));
+      cursorPositions.length = 0;
     }
   }
 }

package/index.cjs

@@ -631,7 +631,7 @@ __export(version_evaluate_exports, {
 var version_evaluate_default;
 var init_version_evaluate = __esm({
   "src/main/version.evaluate.js"() {
-    version_evaluate_default = "3.7.0";
+    version_evaluate_default = "3.7.1";
   }
 });
 

package/index.d.ts

@@ -766,14 +766,14 @@ export interface BooleanSupportOption extends BaseSupportOption<"boolean"> {
   oppositeDescription?: string | undefined;
 }
 
-export interface BooleanArraySupportOption
-  extends BaseSupportOption<"boolean"> {
+export interface BooleanArraySupportOption extends BaseSupportOption<"boolean"> {
   default?: Array<{ value: boolean[] }> | undefined;
   array: true;
 }
 
-export interface ChoiceSupportOption<Value = any>
-  extends BaseSupportOption<"choice"> {
+export interface ChoiceSupportOption<
+  Value = any,
+> extends BaseSupportOption<"choice"> {
   default?: Value | Array<{ value: Value }> | undefined;
   description: string;
   choices: Array<{

package/index.mjs

@@ -18471,7 +18471,7 @@ var object_omit_default = omit;
 import * as doc from "./doc.mjs";
 
 // src/main/version.evaluate.js
-var version_evaluate_default = "3.7.0";
+var version_evaluate_default = "3.7.1";
 
 // src/utils/public.js
 var public_exports = {};

package/internal/experimental-cli.mjs

@@ -2147,7 +2147,7 @@ var init_constants_evaluate = __esm({
       "angular",
       "lwc"
     ];
-    PRETTIER_VERSION = "3.7.0";
+    PRETTIER_VERSION = "3.7.1";
   }
 });
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prettier",
-  "version": "3.7.0",
+  "version": "3.7.1",
   "description": "Prettier is an opinionated code formatter",
   "bin": "./bin/prettier.cjs",
   "repository": "prettier/prettier",