prettier 3.0.0-alpha.2 → 3.0.0-alpha.4

package/doc.js

@@ -194,7 +194,7 @@
     }
     return { type: DOC_TYPE_FILL, parts };
   }
-  function ifBreak(breakContents, flatContents, opts = {}) {
+  function ifBreak(breakContents, flatContents = "", opts = {}) {
     if (false) {
       if (breakContents) {
         assertDoc(breakContents);
@@ -469,12 +469,7 @@ Expected it to be ${EXPECTED_TYPE_VALUES}.`;
           break;
         }
         case DOC_TYPE_IF_BREAK:
-          if (doc2.flatContents) {
-            docsStack.push(doc2.flatContents);
-          }
-          if (doc2.breakContents) {
-            docsStack.push(doc2.breakContents);
-          }
+          docsStack.push(doc2.flatContents, doc2.breakContents);
           break;
         case DOC_TYPE_GROUP:
           if (shouldTraverseConditionalGroups && doc2.expandedStates) {
@@ -539,19 +534,12 @@ Expected it to be ${EXPECTED_TYPE_VALUES}.`;
             ...doc2,
             parts: doc2.parts.map(rec)
           });
-        case DOC_TYPE_IF_BREAK: {
-          let {
-            breakContents,
-            flatContents
-          } = doc2;
-          breakContents && (breakContents = rec(breakContents));
-          flatContents && (flatContents = rec(flatContents));
+        case DOC_TYPE_IF_BREAK:
           return cb({
             ...doc2,
-            breakContents,
-            flatContents
+            breakContents: rec(doc2.breakContents),
+            flatContents: rec(doc2.flatContents)
           });
-        }
         case DOC_TYPE_GROUP: {
           let {
             expandedStates,
@@ -652,74 +640,73 @@ Expected it to be ${EXPECTED_TYPE_VALUES}.`;
         }
       }
     }
-    traverse_doc_default(
-      doc,
-      propagateBreaksOnEnterFn,
-      propagateBreaksOnExitFn,
-      true
-    );
+    traverse_doc_default(doc, propagateBreaksOnEnterFn, propagateBreaksOnExitFn, true);
   }
   function removeLinesFn(doc) {
     if (doc.type === DOC_TYPE_LINE && !doc.hard) {
       return doc.soft ? "" : " ";
     }
     if (doc.type === DOC_TYPE_IF_BREAK) {
-      return doc.flatContents || "";
+      return doc.flatContents;
     }
     return doc;
   }
   function removeLines(doc) {
     return mapDoc(doc, removeLinesFn);
   }
-  var isHardline = (doc, nextDoc) => doc && doc.type === DOC_TYPE_LINE && doc.hard && nextDoc && nextDoc.type === DOC_TYPE_BREAK_PARENT;
-  function stripDocTrailingHardlineFromDoc(doc) {
-    if (!doc) {
-      return doc;
+  function stripTrailingHardlineFromParts(parts) {
+    parts = [...parts];
+    while (parts.length >= 2 && at_default(false, parts, -2).type === DOC_TYPE_LINE && at_default(false, parts, -1).type === DOC_TYPE_BREAK_PARENT) {
+      parts.length -= 2;
     }
-    if (Array.isArray(doc) || doc.type === DOC_TYPE_FILL) {
-      const parts = getDocParts(doc);
-      while (parts.length > 1 && isHardline(...parts.slice(-2))) {
-        parts.length -= 2;
-      }
-      if (parts.length > 0) {
-        const lastPart = stripDocTrailingHardlineFromDoc(at_default(false, parts, -1));
-        parts[parts.length - 1] = lastPart;
-      }
-      return Array.isArray(doc) ? parts : {
-        ...doc,
-        parts
-      };
+    if (parts.length > 0) {
+      const lastPart = stripTrailingHardlineFromDoc(at_default(false, parts, -1));
+      parts[parts.length - 1] = lastPart;
     }
-    switch (doc.type) {
+    return 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:
       case DOC_TYPE_LINE_SUFFIX:
       case DOC_TYPE_LABEL: {
-        const contents = stripDocTrailingHardlineFromDoc(doc.contents);
+        const contents = stripTrailingHardlineFromDoc(doc.contents);
         return {
           ...doc,
           contents
         };
       }
-      case DOC_TYPE_IF_BREAK: {
-        const breakContents = stripDocTrailingHardlineFromDoc(doc.breakContents);
-        const flatContents = stripDocTrailingHardlineFromDoc(doc.flatContents);
+      case DOC_TYPE_IF_BREAK:
         return {
           ...doc,
-          breakContents,
-          flatContents
+          breakContents: stripTrailingHardlineFromDoc(doc.breakContents),
+          flatContents: stripTrailingHardlineFromDoc(doc.flatContents)
         };
-      }
+      case DOC_TYPE_FILL:
+        return {
+          ...doc,
+          parts: stripTrailingHardlineFromParts(doc.parts)
+        };
+      case DOC_TYPE_ARRAY:
+        return stripTrailingHardlineFromParts(doc);
+      case DOC_TYPE_STRING:
+        return doc.replace(/[\n\r]*$/, "");
+      case DOC_TYPE_CURSOR:
+      case DOC_TYPE_TRIM:
+      case DOC_TYPE_LINE_SUFFIX_BOUNDARY:
+      case DOC_TYPE_LINE:
+      case DOC_TYPE_BREAK_PARENT:
+        break;
+      default:
+        throw new invalid_doc_error_default(doc);
     }
     return doc;
   }
   function stripTrailingHardline(doc) {
-    if (typeof doc === "string") {
-      return doc.replace(/(?:\r?\n)*$/, "");
-    }
-    return stripDocTrailingHardlineFromDoc(cleanDoc(doc));
+    return stripTrailingHardlineFromDoc(cleanDoc(doc));
   }
   function cleanDocFn(doc) {
     switch (get_doc_type_default(doc)) {
@@ -1379,6 +1366,7 @@ Expected it to be ${EXPECTED_TYPE_VALUES}.`;
   });
   init_define_process();
   function flattenDoc(doc) {
+    var _a;
     if (!doc) {
       return "";
     }
@@ -1407,7 +1395,7 @@ Expected it to be ${EXPECTED_TYPE_VALUES}.`;
       return {
         ...doc,
         contents: flattenDoc(doc.contents),
-        expandedStates: doc.expandedStates && doc.expandedStates.map(flattenDoc)
+        expandedStates: (_a = doc.expandedStates) == null ? void 0 : _a.map(flattenDoc)
       };
     }
     if (doc.type === DOC_TYPE_FILL) {

package/doc.mjs

@@ -161,7 +161,7 @@ function fill(parts) {
   }
   return { type: DOC_TYPE_FILL, parts };
 }
-function ifBreak(breakContents, flatContents, opts = {}) {
+function ifBreak(breakContents, flatContents = "", opts = {}) {
   if (false) {
     if (breakContents) {
       assertDoc(breakContents);
@@ -436,12 +436,7 @@ function traverseDoc(doc, onEnter, onExit, shouldTraverseConditionalGroups) {
         break;
       }
       case DOC_TYPE_IF_BREAK:
-        if (doc2.flatContents) {
-          docsStack.push(doc2.flatContents);
-        }
-        if (doc2.breakContents) {
-          docsStack.push(doc2.breakContents);
-        }
+        docsStack.push(doc2.flatContents, doc2.breakContents);
         break;
       case DOC_TYPE_GROUP:
         if (shouldTraverseConditionalGroups && doc2.expandedStates) {
@@ -506,19 +501,12 @@ function mapDoc(doc, cb) {
           ...doc2,
           parts: doc2.parts.map(rec)
         });
-      case DOC_TYPE_IF_BREAK: {
-        let {
-          breakContents,
-          flatContents
-        } = doc2;
-        breakContents && (breakContents = rec(breakContents));
-        flatContents && (flatContents = rec(flatContents));
+      case DOC_TYPE_IF_BREAK:
         return cb({
           ...doc2,
-          breakContents,
-          flatContents
+          breakContents: rec(doc2.breakContents),
+          flatContents: rec(doc2.flatContents)
         });
-      }
       case DOC_TYPE_GROUP: {
         let {
           expandedStates,
@@ -619,74 +607,73 @@ function propagateBreaks(doc) {
       }
     }
   }
-  traverse_doc_default(
-    doc,
-    propagateBreaksOnEnterFn,
-    propagateBreaksOnExitFn,
-    true
-  );
+  traverse_doc_default(doc, propagateBreaksOnEnterFn, propagateBreaksOnExitFn, true);
 }
 function removeLinesFn(doc) {
   if (doc.type === DOC_TYPE_LINE && !doc.hard) {
     return doc.soft ? "" : " ";
   }
   if (doc.type === DOC_TYPE_IF_BREAK) {
-    return doc.flatContents || "";
+    return doc.flatContents;
   }
   return doc;
 }
 function removeLines(doc) {
   return mapDoc(doc, removeLinesFn);
 }
-var isHardline = (doc, nextDoc) => doc && doc.type === DOC_TYPE_LINE && doc.hard && nextDoc && nextDoc.type === DOC_TYPE_BREAK_PARENT;
-function stripDocTrailingHardlineFromDoc(doc) {
-  if (!doc) {
-    return doc;
+function stripTrailingHardlineFromParts(parts) {
+  parts = [...parts];
+  while (parts.length >= 2 && at_default(false, parts, -2).type === DOC_TYPE_LINE && at_default(false, parts, -1).type === DOC_TYPE_BREAK_PARENT) {
+    parts.length -= 2;
   }
-  if (Array.isArray(doc) || doc.type === DOC_TYPE_FILL) {
-    const parts = getDocParts(doc);
-    while (parts.length > 1 && isHardline(...parts.slice(-2))) {
-      parts.length -= 2;
-    }
-    if (parts.length > 0) {
-      const lastPart = stripDocTrailingHardlineFromDoc(at_default(false, parts, -1));
-      parts[parts.length - 1] = lastPart;
-    }
-    return Array.isArray(doc) ? parts : {
-      ...doc,
-      parts
-    };
+  if (parts.length > 0) {
+    const lastPart = stripTrailingHardlineFromDoc(at_default(false, parts, -1));
+    parts[parts.length - 1] = lastPart;
   }
-  switch (doc.type) {
+  return 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:
     case DOC_TYPE_LINE_SUFFIX:
     case DOC_TYPE_LABEL: {
-      const contents = stripDocTrailingHardlineFromDoc(doc.contents);
+      const contents = stripTrailingHardlineFromDoc(doc.contents);
       return {
         ...doc,
         contents
       };
     }
-    case DOC_TYPE_IF_BREAK: {
-      const breakContents = stripDocTrailingHardlineFromDoc(doc.breakContents);
-      const flatContents = stripDocTrailingHardlineFromDoc(doc.flatContents);
+    case DOC_TYPE_IF_BREAK:
       return {
         ...doc,
-        breakContents,
-        flatContents
+        breakContents: stripTrailingHardlineFromDoc(doc.breakContents),
+        flatContents: stripTrailingHardlineFromDoc(doc.flatContents)
       };
-    }
+    case DOC_TYPE_FILL:
+      return {
+        ...doc,
+        parts: stripTrailingHardlineFromParts(doc.parts)
+      };
+    case DOC_TYPE_ARRAY:
+      return stripTrailingHardlineFromParts(doc);
+    case DOC_TYPE_STRING:
+      return doc.replace(/[\n\r]*$/, "");
+    case DOC_TYPE_CURSOR:
+    case DOC_TYPE_TRIM:
+    case DOC_TYPE_LINE_SUFFIX_BOUNDARY:
+    case DOC_TYPE_LINE:
+    case DOC_TYPE_BREAK_PARENT:
+      break;
+    default:
+      throw new invalid_doc_error_default(doc);
   }
   return doc;
 }
 function stripTrailingHardline(doc) {
-  if (typeof doc === "string") {
-    return doc.replace(/(?:\r?\n)*$/, "");
-  }
-  return stripDocTrailingHardlineFromDoc(cleanDoc(doc));
+  return stripTrailingHardlineFromDoc(cleanDoc(doc));
 }
 function cleanDocFn(doc) {
   switch (get_doc_type_default(doc)) {
@@ -1346,6 +1333,7 @@ __export(debug_exports, {
 });
 init_define_process();
 function flattenDoc(doc) {
+  var _a;
   if (!doc) {
     return "";
   }
@@ -1374,7 +1362,7 @@ function flattenDoc(doc) {
     return {
       ...doc,
       contents: flattenDoc(doc.contents),
-      expandedStates: doc.expandedStates && doc.expandedStates.map(flattenDoc)
+      expandedStates: (_a = doc.expandedStates) == null ? void 0 : _a.map(flattenDoc)
     };
   }
   if (doc.type === DOC_TYPE_FILL) {

package/index.cjs

@@ -280,31 +280,6 @@ var init_get_string_width = __esm({
 });
 
 // src/common/util.js
-function skip2(chars) {
-  return (text, index, opts) => {
-    const backwards = opts && opts.backwards;
-    if (index === false) {
-      return false;
-    }
-    const { length } = text;
-    let cursor = index;
-    while (cursor >= 0 && cursor < length) {
-      const c = text.charAt(cursor);
-      if (chars instanceof RegExp) {
-        if (!chars.test(c)) {
-          return cursor;
-        }
-      } else if (!chars.includes(c)) {
-        return cursor;
-      }
-      backwards ? cursor-- : cursor++;
-    }
-    if (cursor === -1 || cursor === length) {
-      return cursor;
-    }
-    return false;
-  };
-}
 function hasNewline(text, index, opts = {}) {
   const idx = skipSpaces(text, opts.backwards ? index - 1 : index, opts);
   const idx2 = skip_newline_default(text, idx, opts);
@@ -467,7 +442,7 @@ __export(util_shared_exports, {
   isNextLineEmptyAfterIndex: () => isNextLineEmptyAfterIndex,
   isPreviousLineEmpty: () => isPreviousLineEmpty,
   makeString: () => makeString,
-  skip: () => skip2,
+  skip: () => skip,
   skipEverythingButNewLine: () => skipEverythingButNewLine,
   skipInlineComment: () => skip_inline_comment_default,
   skipNewline: () => skip_newline_default,
@@ -485,7 +460,7 @@ var init_util_shared = __esm({
 // src/main/version.evaluate.cjs
 var require_version_evaluate = __commonJS({
   "src/main/version.evaluate.cjs"(exports2, module2) {
-    module2.exports = "3.0.0-alpha.2";
+    module2.exports = "3.0.0-alpha.4";
   }
 });
 
@@ -503,10 +478,26 @@ var functionNames = [
 ];
 var prettier = /* @__PURE__ */ Object.create(null);
 for (const name of functionNames) {
-  prettier[name] = function(...args) {
-    return prettierPromise.then((prettier2) => prettier2[name](...args));
+  prettier[name] = async (...args) => {
+    const prettier2 = await prettierPromise;
+    return prettier2[name](...args);
+  };
+}
+var debugApiFunctionNames = [
+  "parse",
+  "formatAST",
+  "formatDoc",
+  "printToDoc",
+  "printDocToString"
+];
+var debugApis = /* @__PURE__ */ Object.create(null);
+for (const name of debugApiFunctionNames) {
+  debugApis[name] = async (...args) => {
+    const prettier2 = await prettierPromise;
+    return prettier2.__debug[name](...args);
   };
 }
+prettier.__debug = debugApis;
 if (true) {
   prettier.util = (init_util_shared(), __toCommonJS(util_shared_exports));
   prettier.doc = require("./doc.js");