@prettier/plugin-oxc 0.1.0 → 0.1.2

package/index.mjs

@@ -2246,15 +2246,22 @@ function getPreferredQuote(text, preferredQuoteOrPreferSingleQuote) {
 var get_preferred_quote_default = getPreferredQuote;
 
 // src/utils/make-string.js
-var REGEX = /\\?(?<quote>["'])/gu;
+var REGEX = /\\(["'\\])|(["'])/gu;
 function makeString(rawText, enclosingQuote) {
-  return enclosingQuote + method_replace_all_default(
+  const otherQuote = enclosingQuote === '"' ? "'" : '"';
+  const raw = method_replace_all_default(
     /* OPTIONAL_OBJECT: false */
     0,
     rawText,
     REGEX,
-    (_, quote) => (quote === enclosingQuote ? "\\" : "") + quote
-  ) + enclosingQuote;
+    (match, escaped, unescaped) => {
+      if (escaped) {
+        return escaped === otherQuote ? otherQuote : match;
+      }
+      return unescaped === enclosingQuote ? "\\" + unescaped : unescaped;
+    }
+  );
+  return enclosingQuote + raw + enclosingQuote;
 }
 var make_string_default = makeString;
 
@@ -3891,10 +3898,13 @@ function printDocToString(doc, options2) {
     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 {
@@ -3912,7 +3922,7 @@ function printDocToString(doc, options2) {
           newLine
         ) : doc2;
         if (formatted2) {
-          out.push(formatted2);
+          output += formatted2;
           if (commands.length > 0) {
             position += get_string_width_default(formatted2);
           }
@@ -3928,15 +3938,12 @@ function printDocToString(doc, options2) {
           });
         }
         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, options2),
@@ -4175,7 +4182,7 @@ function printDocToString(doc, options2) {
           case MODE_FLAT:
             if (!doc2.hard) {
               if (!doc2.soft) {
-                out.push(" ");
+                output += " ";
                 position += 1;
               }
               break;
@@ -4194,17 +4201,17 @@ function printDocToString(doc, options2) {
               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 {
               trim();
-              out.push(newLine + indent2.value);
+              output += newLine + indent2.value;
               position = indent2.length;
             }
             break;
@@ -4227,32 +4234,38 @@ function printDocToString(doc, options2) {
       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 trim() {
     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;
     }
   }
 }
@@ -8761,6 +8774,7 @@ function printClassBody(path, options2, print3) {
   const isFlowTypeAnnotation = node.type === "ObjectTypeAnnotation";
   const isObjectType2 = !isClassBody(path);
   const separator = isObjectType2 ? line : hardline;
+  const hasDanglingComments = hasComment(node, CommentCheckFlags.Dangling);
   const [openingBrace, closingBrace] = isFlowTypeAnnotation && node.exact ? ["{|", "|}"] : "{}";
   let firstMember;
   iterateClassMembers(path, ({
@@ -8796,7 +8810,7 @@ function printClassBody(path, options2, print3) {
       }
     }
   });
-  if (hasComment(node, CommentCheckFlags.Dangling)) {
+  if (hasDanglingComments) {
     parts.push(printDanglingComments(path, options2));
   }
   if (node.type === "ObjectTypeAnnotation" && node.inexact) {
@@ -8815,7 +8829,7 @@ function printClassBody(path, options2, print3) {
     parts.push(printed);
   }
   if (isObjectType2) {
-    const shouldBreak = options2.objectWrap === "preserve" && firstMember && has_newline_in_range_default(options2.originalText, locStart(node), locStart(firstMember));
+    const shouldBreak = hasDanglingComments || options2.objectWrap === "preserve" && firstMember && has_newline_in_range_default(options2.originalText, locStart(node), locStart(firstMember));
     let content;
     if (parts.length === 0) {
       content = openingBrace + closingBrace;
@@ -10664,21 +10678,7 @@ function printTernaryOld(path, options2, print3) {
       parent.type !== node.type || parent[alternateNodePropertyName] === node || isParentTest ? part : options2.useTabs ? dedent(indent(part)) : align(Math.max(0, options2.tabWidth - 2), part)
     );
   }
-  const shouldBreak = [
-    consequentNodePropertyName,
-    alternateNodePropertyName,
-    ...testNodePropertyNames
-  ].some(
-    (property) => hasComment(
-      node[property],
-      (comment) => is_block_comment_default(comment) && has_newline_in_range_default(
-        options2.originalText,
-        locStart(comment),
-        locEnd(comment)
-      )
-    )
-  );
-  const maybeGroup = (doc) => parent === firstNonConditionalParent ? group(doc, { shouldBreak }) : shouldBreak ? [doc, breakParent] : doc;
+  const maybeGroup = (doc) => parent === firstNonConditionalParent ? group(doc) : doc;
   const breakClosingParen = !jsxMode && (isMemberExpression(parent) || parent.type === "NGPipeExpression" && parent.left === node) && !parent.computed;
   const shouldExtraIndent = shouldExtraIndentForConditionalExpression(path);
   const result = maybeGroup([

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@prettier/plugin-oxc",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "description": "Prettier Oxc plugin.",
   "exports": {
     ".": {