prettier 4.0.0-alpha.7 → 4.0.0-alpha.9

package/bin/prettier.cjs

@@ -16,14 +16,10 @@ var require_semver_compare = __commonJS({
       for (var i = 0; i < 3; i++) {
         var na = Number(pa[i]);
         var nb = Number(pb[i]);
-        if (na > nb)
-          return 1;
-        if (nb > na)
-          return -1;
-        if (!isNaN(na) && isNaN(nb))
-          return 1;
-        if (isNaN(na) && !isNaN(nb))
-          return -1;
+        if (na > nb) return 1;
+        if (nb > na) return -1;
+        if (!isNaN(na) && isNaN(nb)) return 1;
+        if (isNaN(na) && !isNaN(nb)) return -1;
       }
       return 0;
     };

package/doc.js

@@ -403,15 +403,6 @@ Expected it to be ${EXPECTED_TYPE_VALUES}.`;
   var get_string_width_default = getStringWidth;
 
   // src/document/utils.js
-  var getDocParts = (doc) => {
-    if (Array.isArray(doc)) {
-      return doc;
-    }
-    if (doc.type !== DOC_TYPE_FILL) {
-      throw new Error(`Expect doc to be 'array' or '${DOC_TYPE_FILL}'.`);
-    }
-    return doc.parts;
-  };
   function mapDoc(doc, cb) {
     if (typeof doc === "string") {
       return cb(doc);
@@ -512,7 +503,7 @@ Expected it to be ${EXPECTED_TYPE_VALUES}.`;
   function breakParentGroup(groupStack) {
     if (groupStack.length > 0) {
       const parentGroup = at_default(
-        /* isOptionalObject*/
+        /* isOptionalObject */
         false,
         groupStack,
         -1
@@ -569,12 +560,12 @@ Expected it to be ${EXPECTED_TYPE_VALUES}.`;
   function stripTrailingHardlineFromParts(parts) {
     parts = [...parts];
     while (parts.length >= 2 && at_default(
-      /* isOptionalObject*/
+      /* isOptionalObject */
       false,
       parts,
       -2
     ).type === DOC_TYPE_LINE && at_default(
-      /* isOptionalObject*/
+      /* isOptionalObject */
       false,
       parts,
       -1
@@ -583,7 +574,7 @@ Expected it to be ${EXPECTED_TYPE_VALUES}.`;
     }
     if (parts.length > 0) {
       const lastPart = stripTrailingHardlineFromDoc(at_default(
-        /* isOptionalObject*/
+        /* isOptionalObject */
         false,
         parts,
         -1
@@ -594,7 +585,6 @@ Expected it to be ${EXPECTED_TYPE_VALUES}.`;
   }
   function stripTrailingHardlineFromDoc(doc) {
     switch (get_doc_type_default(doc)) {
-      case DOC_TYPE_ALIGN:
       case DOC_TYPE_INDENT:
       case DOC_TYPE_INDENT_IF_BREAK:
       case DOC_TYPE_GROUP:
@@ -621,6 +611,7 @@ Expected it to be ${EXPECTED_TYPE_VALUES}.`;
         return stripTrailingHardlineFromParts(doc);
       case DOC_TYPE_STRING:
         return doc.replace(/[\n\r]*$/, "");
+      case DOC_TYPE_ALIGN:
       case DOC_TYPE_CURSOR:
       case DOC_TYPE_TRIM:
       case DOC_TYPE_LINE_SUFFIX_BOUNDARY:
@@ -671,7 +662,7 @@ Expected it to be ${EXPECTED_TYPE_VALUES}.`;
           }
           const [currentPart, ...restParts] = Array.isArray(part) ? part : [part];
           if (typeof currentPart === "string" && typeof at_default(
-            /* isOptionalObject*/
+            /* isOptionalObject */
             false,
             parts,
             -1
@@ -830,26 +821,25 @@ Expected it to be ${EXPECTED_TYPE_VALUES}.`;
     let trimCount = 0;
     let cursorCount = 0;
     let outIndex = out.length;
-    outer:
-      while (outIndex--) {
-        const last = out[outIndex];
-        if (last === CURSOR_PLACEHOLDER) {
-          cursorCount++;
-          continue;
-        }
-        if (false) {
-          throw new Error(`Unexpected value in trim: '${typeof last}'`);
-        }
-        for (let charIndex = last.length - 1; charIndex >= 0; charIndex--) {
-          const char = last[charIndex];
-          if (char === " " || char === "	") {
-            trimCount++;
-          } else {
-            out[outIndex] = last.slice(0, charIndex + 1);
-            break outer;
-          }
+    outer: while (outIndex--) {
+      const last = out[outIndex];
+      if (last === CURSOR_PLACEHOLDER) {
+        cursorCount++;
+        continue;
+      }
+      if (false) {
+        throw new Error(`Unexpected value in trim: '${typeof last}'`);
+      }
+      for (let charIndex = last.length - 1; charIndex >= 0; charIndex--) {
+        const char = last[charIndex];
+        if (char === " " || char === "	") {
+          trimCount++;
+        } else {
+          out[outIndex] = last.slice(0, charIndex + 1);
+          break outer;
         }
       }
+    }
     if (trimCount > 0 || cursorCount > 0) {
       out.length = outIndex + 1;
       while (cursorCount-- > 0) {
@@ -877,14 +867,15 @@ Expected it to be ${EXPECTED_TYPE_VALUES}.`;
         mode,
         doc
       } = cmds.pop();
-      switch (get_doc_type_default(doc)) {
+      const docType = get_doc_type_default(doc);
+      switch (docType) {
         case DOC_TYPE_STRING:
           out.push(doc);
           width -= get_string_width_default(doc);
           break;
         case DOC_TYPE_ARRAY:
         case DOC_TYPE_FILL: {
-          const parts = getDocParts(doc);
+          const parts = docType === DOC_TYPE_ARRAY ? doc : doc.parts;
           for (let i = parts.length - 1; i >= 0; i--) {
             cmds.push({
               mode,
@@ -911,7 +902,7 @@ Expected it to be ${EXPECTED_TYPE_VALUES}.`;
           }
           const groupMode = doc.break ? MODE_BREAK : mode;
           const contents = doc.expandedStates && groupMode === MODE_BREAK ? at_default(
-            /* isOptionalObject*/
+            /* isOptionalObject */
             false,
             doc.expandedStates,
             -1
@@ -978,7 +969,7 @@ Expected it to be ${EXPECTED_TYPE_VALUES}.`;
       switch (get_doc_type_default(doc2)) {
         case DOC_TYPE_STRING: {
           const formatted = newLine !== "\n" ? string_replace_all_default(
-            /* isOptionalObject*/
+            /* isOptionalObject */
             false,
             doc2,
             "\n",
@@ -1048,7 +1039,7 @@ Expected it to be ${EXPECTED_TYPE_VALUES}.`;
               } else {
                 if (doc2.expandedStates) {
                   const mostExpanded = at_default(
-                    /* isOptionalObject*/
+                    /* isOptionalObject */
                     false,
                     doc2.expandedStates,
                     -1
@@ -1096,7 +1087,7 @@ Expected it to be ${EXPECTED_TYPE_VALUES}.`;
           }
           if (doc2.id) {
             groupModeMap[doc2.id] = at_default(
-              /* isOptionalObject*/
+              /* isOptionalObject */
               false,
               cmds,
               -1

package/doc.mjs

@@ -368,15 +368,6 @@ function getStringWidth(text) {
 var get_string_width_default = getStringWidth;
 
 // src/document/utils.js
-var getDocParts = (doc) => {
-  if (Array.isArray(doc)) {
-    return doc;
-  }
-  if (doc.type !== DOC_TYPE_FILL) {
-    throw new Error(`Expect doc to be 'array' or '${DOC_TYPE_FILL}'.`);
-  }
-  return doc.parts;
-};
 function mapDoc(doc, cb) {
   if (typeof doc === "string") {
     return cb(doc);
@@ -477,7 +468,7 @@ function willBreak(doc) {
 function breakParentGroup(groupStack) {
   if (groupStack.length > 0) {
     const parentGroup = at_default(
-      /* isOptionalObject*/
+      /* isOptionalObject */
       false,
       groupStack,
       -1
@@ -534,12 +525,12 @@ function removeLines(doc) {
 function stripTrailingHardlineFromParts(parts) {
   parts = [...parts];
   while (parts.length >= 2 && at_default(
-    /* isOptionalObject*/
+    /* isOptionalObject */
     false,
     parts,
     -2
   ).type === DOC_TYPE_LINE && at_default(
-    /* isOptionalObject*/
+    /* isOptionalObject */
     false,
     parts,
     -1
@@ -548,7 +539,7 @@ function stripTrailingHardlineFromParts(parts) {
   }
   if (parts.length > 0) {
     const lastPart = stripTrailingHardlineFromDoc(at_default(
-      /* isOptionalObject*/
+      /* isOptionalObject */
       false,
       parts,
       -1
@@ -559,7 +550,6 @@ function stripTrailingHardlineFromParts(parts) {
 }
 function stripTrailingHardlineFromDoc(doc) {
   switch (get_doc_type_default(doc)) {
-    case DOC_TYPE_ALIGN:
     case DOC_TYPE_INDENT:
     case DOC_TYPE_INDENT_IF_BREAK:
     case DOC_TYPE_GROUP:
@@ -586,6 +576,7 @@ function stripTrailingHardlineFromDoc(doc) {
       return stripTrailingHardlineFromParts(doc);
     case DOC_TYPE_STRING:
       return doc.replace(/[\n\r]*$/, "");
+    case DOC_TYPE_ALIGN:
     case DOC_TYPE_CURSOR:
     case DOC_TYPE_TRIM:
     case DOC_TYPE_LINE_SUFFIX_BOUNDARY:
@@ -636,7 +627,7 @@ function cleanDocFn(doc) {
         }
         const [currentPart, ...restParts] = Array.isArray(part) ? part : [part];
         if (typeof currentPart === "string" && typeof at_default(
-          /* isOptionalObject*/
+          /* isOptionalObject */
           false,
           parts,
           -1
@@ -795,26 +786,25 @@ function trim2(out) {
   let trimCount = 0;
   let cursorCount = 0;
   let outIndex = out.length;
-  outer:
-    while (outIndex--) {
-      const last = out[outIndex];
-      if (last === CURSOR_PLACEHOLDER) {
-        cursorCount++;
-        continue;
-      }
-      if (false) {
-        throw new Error(`Unexpected value in trim: '${typeof last}'`);
-      }
-      for (let charIndex = last.length - 1; charIndex >= 0; charIndex--) {
-        const char = last[charIndex];
-        if (char === " " || char === "	") {
-          trimCount++;
-        } else {
-          out[outIndex] = last.slice(0, charIndex + 1);
-          break outer;
-        }
+  outer: while (outIndex--) {
+    const last = out[outIndex];
+    if (last === CURSOR_PLACEHOLDER) {
+      cursorCount++;
+      continue;
+    }
+    if (false) {
+      throw new Error(`Unexpected value in trim: '${typeof last}'`);
+    }
+    for (let charIndex = last.length - 1; charIndex >= 0; charIndex--) {
+      const char = last[charIndex];
+      if (char === " " || char === "	") {
+        trimCount++;
+      } else {
+        out[outIndex] = last.slice(0, charIndex + 1);
+        break outer;
       }
     }
+  }
   if (trimCount > 0 || cursorCount > 0) {
     out.length = outIndex + 1;
     while (cursorCount-- > 0) {
@@ -842,14 +832,15 @@ function fits(next, restCommands, width, hasLineSuffix, groupModeMap, mustBeFlat
       mode,
       doc
     } = cmds.pop();
-    switch (get_doc_type_default(doc)) {
+    const docType = get_doc_type_default(doc);
+    switch (docType) {
       case DOC_TYPE_STRING:
         out.push(doc);
         width -= get_string_width_default(doc);
         break;
       case DOC_TYPE_ARRAY:
       case DOC_TYPE_FILL: {
-        const parts = getDocParts(doc);
+        const parts = docType === DOC_TYPE_ARRAY ? doc : doc.parts;
         for (let i = parts.length - 1; i >= 0; i--) {
           cmds.push({
             mode,
@@ -876,7 +867,7 @@ function fits(next, restCommands, width, hasLineSuffix, groupModeMap, mustBeFlat
         }
         const groupMode = doc.break ? MODE_BREAK : mode;
         const contents = doc.expandedStates && groupMode === MODE_BREAK ? at_default(
-          /* isOptionalObject*/
+          /* isOptionalObject */
           false,
           doc.expandedStates,
           -1
@@ -943,7 +934,7 @@ function printDocToString(doc, options) {
     switch (get_doc_type_default(doc2)) {
       case DOC_TYPE_STRING: {
         const formatted = newLine !== "\n" ? string_replace_all_default(
-          /* isOptionalObject*/
+          /* isOptionalObject */
           false,
           doc2,
           "\n",
@@ -1013,7 +1004,7 @@ function printDocToString(doc, options) {
             } else {
               if (doc2.expandedStates) {
                 const mostExpanded = at_default(
-                  /* isOptionalObject*/
+                  /* isOptionalObject */
                   false,
                   doc2.expandedStates,
                   -1
@@ -1061,7 +1052,7 @@ function printDocToString(doc, options) {
         }
         if (doc2.id) {
           groupModeMap[doc2.id] = at_default(
-            /* isOptionalObject*/
+            /* isOptionalObject */
             false,
             cmds,
             -1