@kurtinatlanta/prettier 3.8.0-dev → 3.8.0-hoyt.1

package/doc.js

@@ -970,10 +970,62 @@ Expected it to be ${EXPECTED_TYPE_VALUES}.`;
     return { text: trimmed, count: length };
   }
 
+  // src/document/printer/print-result.js
+  var printResult = class {
+    /** @type {string[]} */
+    #settledTexts = [];
+    #unsettledText = "";
+    #settledTextLength = 0;
+    /** @type {number[]} */
+    #settledPositions = [];
+    /** @type {number[]} */
+    #unsettledPositions = [];
+    #settle() {
+      const text = this.#unsettledText;
+      if (text !== "") {
+        this.#settledTexts.push(text);
+        this.#settledTextLength += text.length;
+        this.#unsettledText = "";
+      }
+      for (const position of this.#unsettledPositions) {
+        this.#settledPositions.push(Math.min(position, this.#settledTextLength));
+      }
+      this.#unsettledPositions.length = 0;
+    }
+    markPosition() {
+      if (this.#settledPositions.length + this.#unsettledPositions.length >= 2) {
+        throw new Error("There are too many 'cursor' in doc.");
+      }
+      this.#unsettledPositions.push(
+        this.#settledTextLength + this.#unsettledText.length
+      );
+    }
+    /**
+    @param {string} text
+    */
+    write(text) {
+      this.#unsettledText += text;
+    }
+    trim() {
+      const { text: trimmed, count } = trimIndentation(this.#unsettledText);
+      this.#unsettledText = trimmed;
+      this.#settle();
+      return count;
+    }
+    finish() {
+      this.#settle();
+      return {
+        text: this.#settledTexts.join(""),
+        positions: this.#settledPositions
+      };
+    }
+  };
+  var print_result_default = printResult;
+
   // src/document/printer/printer.js
-  var MODE_BREAK = Symbol("MODE_BREAK");
-  var MODE_FLAT = Symbol("MODE_FLAT");
-  var DOC_FILL_PRINTED_LENGTH = Symbol("DOC_FILL_PRINTED_LENGTH");
+  var MODE_BREAK = /* @__PURE__ */ Symbol("MODE_BREAK");
+  var MODE_FLAT = /* @__PURE__ */ Symbol("MODE_FLAT");
+  var DOC_FILL_PRINTED_LENGTH = /* @__PURE__ */ Symbol("DOC_FILL_PRINTED_LENGTH");
   function fits(next, restCommands, remainingWidth, hasLineSuffix, groupModeMap, mustBeFlat) {
     if (remainingWidth === Number.POSITIVE_INFINITY) {
       return true;
@@ -1095,13 +1147,9 @@ Expected it to be ${EXPECTED_TYPE_VALUES}.`;
       mode: MODE_BREAK,
       doc
     }];
-    let output = "";
     let shouldRemeasure = false;
     const lineSuffix2 = [];
-    const cursorPositions = [];
-    const settledOutput = [];
-    const settledCursorPositions = [];
-    let settledTextLength = 0;
+    const result = new print_result_default();
     propagateBreaks(doc);
     while (commands.length > 0) {
       const {
@@ -1119,7 +1167,7 @@ Expected it to be ${EXPECTED_TYPE_VALUES}.`;
             newLine
           ) : doc2;
           if (formatted2) {
-            output += formatted2;
+            result.write(formatted2);
             if (commands.length > 0) {
               position += get_string_width_default(formatted2);
             }
@@ -1136,10 +1184,7 @@ Expected it to be ${EXPECTED_TYPE_VALUES}.`;
           }
           break;
         case DOC_TYPE_CURSOR:
-          if (cursorPositions.length >= 2) {
-            throw new Error("There are too many 'cursor' in doc.");
-          }
-          cursorPositions.push(settledTextLength + output.length);
+          result.markPosition();
           break;
         case DOC_TYPE_INDENT:
           commands.push({
@@ -1156,88 +1201,64 @@ Expected it to be ${EXPECTED_TYPE_VALUES}.`;
           });
           break;
         case DOC_TYPE_TRIM:
-          trim2();
+          position -= result.trim();
           break;
         case DOC_TYPE_GROUP:
-          switch (mode) {
-            case MODE_FLAT:
-              if (!shouldRemeasure) {
-                commands.push({
+          {
+            const command = (function printGroup() {
+              if (mode === MODE_FLAT && !shouldRemeasure) {
+                return {
                   indent: indent2,
                   mode: doc2.break ? MODE_BREAK : MODE_FLAT,
                   doc: doc2.contents
-                });
-                break;
+                };
               }
-            // fallthrough
-            case MODE_BREAK: {
               shouldRemeasure = false;
-              const next = {
+              const remainingWidth = width - position;
+              const hasLineSuffix = lineSuffix2.length > 0;
+              const flatCommand = {
                 indent: indent2,
                 mode: MODE_FLAT,
                 doc: doc2.contents
               };
-              const remainingWidth = width - position;
-              const hasLineSuffix = lineSuffix2.length > 0;
-              if (!doc2.break && fits(next, commands, remainingWidth, hasLineSuffix, groupModeMap)) {
-                commands.push(next);
-              } else {
-                if (doc2.expandedStates) {
-                  const mostExpanded = method_at_default(
-                    /* OPTIONAL_OBJECT: false */
-                    0,
-                    doc2.expandedStates,
-                    -1
-                  );
-                  if (doc2.break) {
-                    commands.push({
-                      indent: indent2,
-                      mode: MODE_BREAK,
-                      doc: mostExpanded
-                    });
-                    break;
-                  } else {
-                    for (let index = 1; index < doc2.expandedStates.length + 1; index++) {
-                      if (index >= doc2.expandedStates.length) {
-                        commands.push({
-                          indent: indent2,
-                          mode: MODE_BREAK,
-                          doc: mostExpanded
-                        });
-                        break;
-                      } else {
-                        const state = doc2.expandedStates[index];
-                        const cmd = {
-                          indent: indent2,
-                          mode: MODE_FLAT,
-                          doc: state
-                        };
-                        if (fits(cmd, commands, remainingWidth, hasLineSuffix, groupModeMap)) {
-                          commands.push(cmd);
-                          break;
-                        }
-                      }
-                    }
-                  }
-                } else {
-                  commands.push({
+              if (!doc2.break && fits(flatCommand, commands, remainingWidth, hasLineSuffix, groupModeMap)) {
+                return flatCommand;
+              }
+              if (!doc2.expandedStates) {
+                return {
+                  indent: indent2,
+                  mode: MODE_BREAK,
+                  doc: doc2.contents
+                };
+              }
+              if (!doc2.break) {
+                for (let index = 1; index < doc2.expandedStates.length - 1; index++) {
+                  const flatCommand2 = {
                     indent: indent2,
-                    mode: MODE_BREAK,
-                    doc: doc2.contents
-                  });
+                    mode: MODE_FLAT,
+                    doc: doc2.expandedStates[index]
+                  };
+                  if (fits(flatCommand2, commands, remainingWidth, hasLineSuffix, groupModeMap)) {
+                    return flatCommand2;
+                  }
                 }
               }
-              break;
+              return {
+                indent: indent2,
+                mode: MODE_BREAK,
+                doc: method_at_default(
+                  /* OPTIONAL_OBJECT: false */
+                  0,
+                  doc2.expandedStates,
+                  -1
+                )
+              };
+            })();
+            commands.push(command);
+            if (doc2.id) {
+              groupModeMap[doc2.id] = command.mode;
             }
           }
-          if (doc2.id) {
-            groupModeMap[doc2.id] = method_at_default(
-              /* OPTIONAL_OBJECT: false */
-              0,
-              commands,
-              -1
-            ).mode;
-          }
           break;
         // Fills each line with as much code as possible before moving to a new
         // line with the same indentation.
@@ -1379,7 +1400,7 @@ Expected it to be ${EXPECTED_TYPE_VALUES}.`;
             case MODE_FLAT:
               if (!doc2.hard) {
                 if (!doc2.soft) {
-                  output += " ";
+                  result.write(" ");
                   position += 1;
                 }
                 break;
@@ -1398,17 +1419,17 @@ Expected it to be ${EXPECTED_TYPE_VALUES}.`;
                 break;
               }
               if (doc2.literal) {
-                output += newLine;
+                result.write(newLine);
                 position = 0;
                 if (indent2.root) {
                   if (indent2.root.value) {
-                    output += indent2.root.value;
+                    result.write(indent2.root.value);
                   }
                   position = indent2.root.length;
                 }
               } else {
-                trim2();
-                output += newLine + indent2.value;
+                result.trim();
+                result.write(newLine + indent2.value);
                 position = indent2.length;
               }
               break;
@@ -1431,40 +1452,21 @@ Expected it to be ${EXPECTED_TYPE_VALUES}.`;
         lineSuffix2.length = 0;
       }
     }
-    const formatted = settledOutput.join("") + output;
-    const finalCursorPositions = [...settledCursorPositions, ...cursorPositions];
-    if (finalCursorPositions.length !== 2) {
+    const {
+      text: formatted,
+      positions: cursorPositions
+    } = result.finish();
+    if (cursorPositions.length !== 2) {
       return {
         formatted
       };
     }
-    const cursorNodeStart = finalCursorPositions[0];
+    const [cursorNodeStart, cursorNodeEnd] = cursorPositions;
     return {
       formatted,
       cursorNodeStart,
-      cursorNodeText: formatted.slice(cursorNodeStart, method_at_default(
-        /* OPTIONAL_OBJECT: false */
-        0,
-        finalCursorPositions,
-        -1
-      ))
+      cursorNodeText: formatted.slice(cursorNodeStart, cursorNodeEnd)
     };
-    function trim2() {
-      const {
-        text: trimmed,
-        count
-      } = trimIndentation(output);
-      if (trimmed) {
-        settledOutput.push(trimmed);
-        settledTextLength += trimmed.length;
-      }
-      output = "";
-      position -= count;
-      if (cursorPositions.length > 0) {
-        settledCursorPositions.push(...cursorPositions.map((position2) => Math.min(position2, settledTextLength)));
-        cursorPositions.length = 0;
-      }
-    }
   }
 
   // src/document/public.js

package/doc.mjs

@@ -935,10 +935,62 @@ function trimIndentation(text) {
   return { text: trimmed, count: length };
 }
 
+// src/document/printer/print-result.js
+var printResult = class {
+  /** @type {string[]} */
+  #settledTexts = [];
+  #unsettledText = "";
+  #settledTextLength = 0;
+  /** @type {number[]} */
+  #settledPositions = [];
+  /** @type {number[]} */
+  #unsettledPositions = [];
+  #settle() {
+    const text = this.#unsettledText;
+    if (text !== "") {
+      this.#settledTexts.push(text);
+      this.#settledTextLength += text.length;
+      this.#unsettledText = "";
+    }
+    for (const position of this.#unsettledPositions) {
+      this.#settledPositions.push(Math.min(position, this.#settledTextLength));
+    }
+    this.#unsettledPositions.length = 0;
+  }
+  markPosition() {
+    if (this.#settledPositions.length + this.#unsettledPositions.length >= 2) {
+      throw new Error("There are too many 'cursor' in doc.");
+    }
+    this.#unsettledPositions.push(
+      this.#settledTextLength + this.#unsettledText.length
+    );
+  }
+  /**
+  @param {string} text
+  */
+  write(text) {
+    this.#unsettledText += text;
+  }
+  trim() {
+    const { text: trimmed, count } = trimIndentation(this.#unsettledText);
+    this.#unsettledText = trimmed;
+    this.#settle();
+    return count;
+  }
+  finish() {
+    this.#settle();
+    return {
+      text: this.#settledTexts.join(""),
+      positions: this.#settledPositions
+    };
+  }
+};
+var print_result_default = printResult;
+
 // src/document/printer/printer.js
-var MODE_BREAK = Symbol("MODE_BREAK");
-var MODE_FLAT = Symbol("MODE_FLAT");
-var DOC_FILL_PRINTED_LENGTH = Symbol("DOC_FILL_PRINTED_LENGTH");
+var MODE_BREAK = /* @__PURE__ */ Symbol("MODE_BREAK");
+var MODE_FLAT = /* @__PURE__ */ Symbol("MODE_FLAT");
+var DOC_FILL_PRINTED_LENGTH = /* @__PURE__ */ Symbol("DOC_FILL_PRINTED_LENGTH");
 function fits(next, restCommands, remainingWidth, hasLineSuffix, groupModeMap, mustBeFlat) {
   if (remainingWidth === Number.POSITIVE_INFINITY) {
     return true;
@@ -1060,13 +1112,9 @@ function printDocToString(doc, options) {
     mode: MODE_BREAK,
     doc
   }];
-  let output = "";
   let shouldRemeasure = false;
   const lineSuffix2 = [];
-  const cursorPositions = [];
-  const settledOutput = [];
-  const settledCursorPositions = [];
-  let settledTextLength = 0;
+  const result = new print_result_default();
   propagateBreaks(doc);
   while (commands.length > 0) {
     const {
@@ -1084,7 +1132,7 @@ function printDocToString(doc, options) {
           newLine
         ) : doc2;
         if (formatted2) {
-          output += formatted2;
+          result.write(formatted2);
           if (commands.length > 0) {
             position += get_string_width_default(formatted2);
           }
@@ -1101,10 +1149,7 @@ function printDocToString(doc, options) {
         }
         break;
       case DOC_TYPE_CURSOR:
-        if (cursorPositions.length >= 2) {
-          throw new Error("There are too many 'cursor' in doc.");
-        }
-        cursorPositions.push(settledTextLength + output.length);
+        result.markPosition();
         break;
       case DOC_TYPE_INDENT:
         commands.push({
@@ -1121,88 +1166,64 @@ function printDocToString(doc, options) {
         });
         break;
       case DOC_TYPE_TRIM:
-        trim2();
+        position -= result.trim();
         break;
       case DOC_TYPE_GROUP:
-        switch (mode) {
-          case MODE_FLAT:
-            if (!shouldRemeasure) {
-              commands.push({
+        {
+          const command = (function printGroup() {
+            if (mode === MODE_FLAT && !shouldRemeasure) {
+              return {
                 indent: indent2,
                 mode: doc2.break ? MODE_BREAK : MODE_FLAT,
                 doc: doc2.contents
-              });
-              break;
+              };
             }
-          // fallthrough
-          case MODE_BREAK: {
             shouldRemeasure = false;
-            const next = {
+            const remainingWidth = width - position;
+            const hasLineSuffix = lineSuffix2.length > 0;
+            const flatCommand = {
               indent: indent2,
               mode: MODE_FLAT,
               doc: doc2.contents
             };
-            const remainingWidth = width - position;
-            const hasLineSuffix = lineSuffix2.length > 0;
-            if (!doc2.break && fits(next, commands, remainingWidth, hasLineSuffix, groupModeMap)) {
-              commands.push(next);
-            } else {
-              if (doc2.expandedStates) {
-                const mostExpanded = method_at_default(
-                  /* OPTIONAL_OBJECT: false */
-                  0,
-                  doc2.expandedStates,
-                  -1
-                );
-                if (doc2.break) {
-                  commands.push({
-                    indent: indent2,
-                    mode: MODE_BREAK,
-                    doc: mostExpanded
-                  });
-                  break;
-                } else {
-                  for (let index = 1; index < doc2.expandedStates.length + 1; index++) {
-                    if (index >= doc2.expandedStates.length) {
-                      commands.push({
-                        indent: indent2,
-                        mode: MODE_BREAK,
-                        doc: mostExpanded
-                      });
-                      break;
-                    } else {
-                      const state = doc2.expandedStates[index];
-                      const cmd = {
-                        indent: indent2,
-                        mode: MODE_FLAT,
-                        doc: state
-                      };
-                      if (fits(cmd, commands, remainingWidth, hasLineSuffix, groupModeMap)) {
-                        commands.push(cmd);
-                        break;
-                      }
-                    }
-                  }
-                }
-              } else {
-                commands.push({
+            if (!doc2.break && fits(flatCommand, commands, remainingWidth, hasLineSuffix, groupModeMap)) {
+              return flatCommand;
+            }
+            if (!doc2.expandedStates) {
+              return {
+                indent: indent2,
+                mode: MODE_BREAK,
+                doc: doc2.contents
+              };
+            }
+            if (!doc2.break) {
+              for (let index = 1; index < doc2.expandedStates.length - 1; index++) {
+                const flatCommand2 = {
                   indent: indent2,
-                  mode: MODE_BREAK,
-                  doc: doc2.contents
-                });
+                  mode: MODE_FLAT,
+                  doc: doc2.expandedStates[index]
+                };
+                if (fits(flatCommand2, commands, remainingWidth, hasLineSuffix, groupModeMap)) {
+                  return flatCommand2;
+                }
               }
             }
-            break;
+            return {
+              indent: indent2,
+              mode: MODE_BREAK,
+              doc: method_at_default(
+                /* OPTIONAL_OBJECT: false */
+                0,
+                doc2.expandedStates,
+                -1
+              )
+            };
+          })();
+          commands.push(command);
+          if (doc2.id) {
+            groupModeMap[doc2.id] = command.mode;
           }
         }
-        if (doc2.id) {
-          groupModeMap[doc2.id] = method_at_default(
-            /* OPTIONAL_OBJECT: false */
-            0,
-            commands,
-            -1
-          ).mode;
-        }
         break;
       // Fills each line with as much code as possible before moving to a new
       // line with the same indentation.
@@ -1344,7 +1365,7 @@ function printDocToString(doc, options) {
           case MODE_FLAT:
             if (!doc2.hard) {
               if (!doc2.soft) {
-                output += " ";
+                result.write(" ");
                 position += 1;
               }
               break;
@@ -1363,17 +1384,17 @@ function printDocToString(doc, options) {
               break;
             }
             if (doc2.literal) {
-              output += newLine;
+              result.write(newLine);
               position = 0;
               if (indent2.root) {
                 if (indent2.root.value) {
-                  output += indent2.root.value;
+                  result.write(indent2.root.value);
                 }
                 position = indent2.root.length;
               }
             } else {
-              trim2();
-              output += newLine + indent2.value;
+              result.trim();
+              result.write(newLine + indent2.value);
               position = indent2.length;
             }
             break;
@@ -1396,40 +1417,21 @@ function printDocToString(doc, options) {
       lineSuffix2.length = 0;
     }
   }
-  const formatted = settledOutput.join("") + output;
-  const finalCursorPositions = [...settledCursorPositions, ...cursorPositions];
-  if (finalCursorPositions.length !== 2) {
+  const {
+    text: formatted,
+    positions: cursorPositions
+  } = result.finish();
+  if (cursorPositions.length !== 2) {
     return {
       formatted
     };
   }
-  const cursorNodeStart = finalCursorPositions[0];
+  const [cursorNodeStart, cursorNodeEnd] = cursorPositions;
   return {
     formatted,
     cursorNodeStart,
-    cursorNodeText: formatted.slice(cursorNodeStart, method_at_default(
-      /* OPTIONAL_OBJECT: false */
-      0,
-      finalCursorPositions,
-      -1
-    ))
+    cursorNodeText: formatted.slice(cursorNodeStart, cursorNodeEnd)
   };
-  function trim2() {
-    const {
-      text: trimmed,
-      count
-    } = trimIndentation(output);
-    if (trimmed) {
-      settledOutput.push(trimmed);
-      settledTextLength += trimmed.length;
-    }
-    output = "";
-    position -= count;
-    if (cursorPositions.length > 0) {
-      settledCursorPositions.push(...cursorPositions.map((position2) => Math.min(position2, settledTextLength)));
-      cursorPositions.length = 0;
-    }
-  }
 }
 
 // src/document/public.js

package/index.cjs

@@ -647,7 +647,7 @@ __export(version_evaluate_exports, {
 var version_evaluate_default;
 var init_version_evaluate = __esm({
   "src/main/version.evaluate.js"() {
-    version_evaluate_default = "3.8.0-dev";
+    version_evaluate_default = "3.8.0-hoyt.1";
   }
 });