@prettier/plugin-oxc 0.0.1 → 0.0.3

package/README.md

@@ -1,5 +1,8 @@
 # @prettier/plugin-oxc
 
+[![Npm Version](https://img.shields.io/npm/v/@prettier/plugin-oxc.svg?style=flat-square)](https://www.npmjs.com/package/@prettier/plugin-oxc)
+[![MIT License](https://img.shields.io/npm/l/@prettier/plugin-oxc.svg?style=flat-square)](https://github.com/prettier/prettier/blob/main/license)
+
 > Prettier [Oxc](https://oxc.rs/) plugin.
 
 ## Install
@@ -17,6 +20,8 @@ plugins:
   - "@prettier/plugin-oxc"
 ```
 
+**Requires prettier >= 3.6**
+
 Or config explicitly
 
 ```yaml

package/THIRD-PARTY-NOTICES.md

@@ -153,7 +153,7 @@ Repository: <https://github.com/jestjs/jest.git>
 
 ----------------------------------------
 
-## prettier@v3.6.0-dev
+## prettier@v3.7.0-dev
 
 > Prettier is an opinionated code formatter
 

package/index.mjs

@@ -1921,30 +1921,26 @@ async function parseJs(text, options2) {
   return postprocess_default(ast, { text, parser: "oxc" });
 }
 async function parseTs(text, options2) {
-  let filepath = options2 == null ? void 0 : options2.filepath;
+  const filepath = options2 == null ? void 0 : options2.filepath;
   const sourceType = getSourceType(filepath);
   const parseOptions = { sourceType, astType: "ts" };
   const isKnownJsx = typeof filepath === "string" && /\.(?:jsx|tsx)$/iu.test(filepath);
-  let parseOptionsCombinations = [];
-  if (isKnownJsx) {
-    parseOptionsCombinations = [{ ...parseOptions, lang: "tsx" }];
-  } else {
+  const isDtsFile = typeof filepath === "string" && filepath.toLowerCase().endsWith(".d.ts");
+  let filenameCombinations = [isDtsFile ? "prettier.d.ts" : "prettier.tsx"];
+  if (!isDtsFile && !isKnownJsx) {
     const shouldEnableJsx = jsx_regexp_evaluate_default.test(text);
-    parseOptionsCombinations = [shouldEnableJsx, !shouldEnableJsx].map(
-      (shouldEnableJsx2) => ({
-        ...parseOptions,
-        lang: shouldEnableJsx2 ? "tsx" : "ts"
-      })
-    );
-  }
-  if (typeof filepath !== "string") {
-    filepath = "prettier.tsx";
+    filenameCombinations = [
+      ...[shouldEnableJsx, !shouldEnableJsx].map(
+        (shouldEnableJsx2) => shouldEnableJsx2 ? "prettier.tsx" : "prettier.ts"
+      ),
+      "prettier.d.ts"
+    ];
   }
   let result;
   try {
     result = await tryCombinationsAsync(
-      parseOptionsCombinations.map(
-        (parseOptions2) => () => parseWithOptions(filepath, text, parseOptions2)
+      filenameCombinations.map(
+        (filename) => () => parseWithOptions(filename, text, parseOptions)
       )
     );
   } catch ({
@@ -6803,12 +6799,7 @@ function maybeWrapJsxElementInParens(path, elem, options2) {
   if (NO_WRAP_PARENTS.has(parent.type)) {
     return elem;
   }
-  const shouldBreak = path.match(
-    void 0,
-    (node) => node.type === "ArrowFunctionExpression",
-    isCallExpression,
-    (node) => node.type === "JSXExpressionContainer"
-  );
+  const shouldBreak = shouldBreakJsxElement(path);
   const needsParens2 = needs_parens_default(path, options2);
   return group(
     [
@@ -6820,6 +6811,26 @@ function maybeWrapJsxElementInParens(path, elem, options2) {
     { shouldBreak }
   );
 }
+function shouldBreakJsxElement(path) {
+  return path.match(
+    void 0,
+    (node) => node.type === "ArrowFunctionExpression",
+    isCallExpression
+  ) && // Babel
+  (path.match(
+    void 0,
+    void 0,
+    void 0,
+    (node) => node.type === "JSXExpressionContainer"
+  ) || // Estree
+  path.match(
+    void 0,
+    void 0,
+    void 0,
+    (node) => node.type === "ChainExpression",
+    (node) => node.type === "JSXExpressionContainer"
+  ));
+}
 function printJsxAttribute(path, options2, print3) {
   const { node } = path;
   const parts = [];
@@ -7473,6 +7484,10 @@ function printCallArguments(path, options2, print3) {
     !options2.parser.startsWith("__ng_") && // Dynamic imports cannot have trailing commas
     node.type !== "ImportExpression" && node.type !== "TSImportType" && shouldPrintComma(options2, "all") ? "," : ""
   );
+  if (node.type === "TSImportType" && args.length === 1 && (args[0].type === "TSLiteralType" && isStringLiteral(args[0].literal) || // TODO: Remove this when update Babel to v8
+  isStringLiteral(args[0])) && !hasComment(args[0])) {
+    return group(["(", ...printedArguments, ifBreak(maybeTrailingComma), ")"]);
+  }
   function allArgsBrokenOut() {
     return group(
       ["(", indent([line, ...printedArguments]), maybeTrailingComma, line, ")"],
@@ -10363,7 +10378,11 @@ function printObject(path, options2, print3) {
     propsAndLoc,
     -1
   )) == null ? void 0 : _a.node;
-  const canHaveTrailingSeparator = !(node.inexact || node.hasUnknownMembers || lastElem && (lastElem.type === "RestElement" || (lastElem.type === "TSPropertySignature" || lastElem.type === "TSCallSignatureDeclaration" || lastElem.type === "TSMethodSignature" || lastElem.type === "TSConstructSignatureDeclaration" || lastElem.type === "TSIndexSignature") && hasComment(lastElem, CommentCheckFlags.PrettierIgnore)));
+  const canHaveTrailingSeparator = !(node.inexact || node.hasUnknownMembers || lastElem && (lastElem.type === "RestElement" || (lastElem.type === "TSPropertySignature" || lastElem.type === "TSCallSignatureDeclaration" || lastElem.type === "TSMethodSignature" || lastElem.type === "TSConstructSignatureDeclaration" || lastElem.type === "TSIndexSignature") && hasComment(lastElem, CommentCheckFlags.PrettierIgnore)) || // https://github.com/microsoft/TypeScript/issues/61916
+  path.match(
+    void 0,
+    (node2, key2) => node2.type === "TSImportType" && key2 === "options"
+  ));
   let content;
   if (props.length === 0) {
     if (!hasComment(node, CommentCheckFlags.Dangling)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@prettier/plugin-oxc",
-  "version": "0.0.1",
+  "version": "0.0.3",
   "description": "Prettier Oxc plugin.",
   "exports": {
     ".": {
@@ -31,7 +31,7 @@
     "package.json"
   ],
   "dependencies": {
-    "oxc-parser": "0.73.2"
+    "oxc-parser": "0.74.0"
   },
   "publishConfig": {
     "access": "public",