oxfmt 0.57.0 → 0.58.0

package/dist/{migrate-prettier-DrYAkU3F.js → migrate-prettier-BmSsy164.js}

@@ -9,7 +9,7 @@ import { readFile } from "node:fs/promises";
 async function runMigratePrettier() {
 	const cwd = process.cwd();
 	if (await hasOxfmtrcFile(cwd)) return exitWithError("Oxfmt configuration file already exists.");
-	const { resolveConfigFile, resolveConfig } = await import("./prettier-DKAx5A83.js");
+	const { resolveConfigFile, resolveConfig } = await import("./prettier-BByt4AhK.js");
 	const prettierConfigPath = await resolveConfigFile(join(cwd, "dummy.js"));
 	if (!prettierConfigPath) {
 		console.log("No Prettier configuration file found.");
@@ -31,24 +31,32 @@ async function runMigratePrettier() {
 		return exitWithError(`Failed to parse: ${prettierConfigPath}`);
 	}
 	const oxfmtrc = await createBlankOxfmtrcFile(cwd);
+	let hasTailwindcssPlugin = false;
 	let hasSortPackageJsonPlugin = false;
+	let hasSveltePlugin = false;
 	for (const [key, value] of Object.entries(prettierConfig ?? {})) {
 		if (key === "plugins" && Array.isArray(value)) {
-			for (const plugin of value) if (plugin === "prettier-plugin-tailwindcss") migrateTailwindOptions(prettierConfig, oxfmtrc);
+			for (const plugin of value) if (plugin === "prettier-plugin-tailwindcss") hasTailwindcssPlugin = true;
 			else if (plugin === "prettier-plugin-packagejson") hasSortPackageJsonPlugin = true;
+			else if (plugin === "prettier-plugin-svelte") hasSveltePlugin = true;
 			else if (typeof plugin === "string") console.error(`  - plugins: "${plugin}" is not supported, skipping...`);
 			else console.error(`  - plugins: custom plugin module is not supported, skipping...`);
 			continue;
 		}
+		if (key === "parser" || key === "filepath") continue;
+		if (key === "requirePragma" || key === "insertPragma") {
+			console.error(`  - "${key}" is not supported, skipping...`);
+			continue;
+		}
 		if (key === "endOfLine" && value === "auto") {
 			console.error(`  - "endOfLine: auto" is not supported, skipping...`);
 			continue;
 		}
 		if (key === "experimentalTernaries" || key === "experimentalOperatorPosition") {
-			console.error(`  - "${key}" is not supported in JS/TS files yet`);
+			console.error(`  - "${key}" is not supported yet`);
 			continue;
 		}
-		if (key.startsWith("tailwind")) continue;
+		if (key.startsWith("tailwind") || key.startsWith("svelte")) continue;
 		oxfmtrc[key] = value;
 	}
 	if (typeof oxfmtrc.printWidth !== "number") {
@@ -59,12 +67,19 @@ async function runMigratePrettier() {
 		oxfmtrc.sortPackageJson = {};
 		console.error(`  - Migrated "prettier-plugin-packagejson" to "sortPackageJson"`);
 	} else oxfmtrc.sortPackageJson = false;
-	if (oxfmtrc.embeddedLanguageFormatting !== "off") console.error(`  - "embeddedLanguageFormatting" in JS/TS files is not fully supported yet`);
+	if (hasTailwindcssPlugin) {
+		oxfmtrc.sortTailwindcss = migrateMappedOptions(prettierConfig, TAILWIND_OPTION_MAPPING, filterTailwindRegex);
+		console.log("Migrated prettier-plugin-tailwindcss options to sortTailwindcss");
+	}
+	if (hasSveltePlugin) {
+		oxfmtrc.svelte = migrateMappedOptions(prettierConfig, SVELTE_OPTION_MAPPING);
+		console.log("Migrated prettier-plugin-svelte options to svelte");
+	}
 	const ignores = await resolvePrettierIgnore(cwd);
 	if (ignores.length > 0) console.log("Migrated ignore patterns from `.prettierignore`");
 	delete oxfmtrc.ignorePatterns;
 	oxfmtrc.ignorePatterns = ignores;
-	if ("overrides" in oxfmtrc) console.warn(`  - "overrides" cannot be migrated automatically. See: https://github.com/oxc-project/oxc/issues/18215`);
+	if (await rawConfigHasOverrides(prettierConfigPath)) console.warn(`  - "overrides" cannot be migrated automatically. See: https://github.com/oxc-project/oxc/issues/18215`);
 	const jsonStr = JSON.stringify(oxfmtrc, null, 2);
 	try {
 		await saveOxfmtrcFile(cwd, jsonStr);
@@ -85,6 +100,14 @@ async function resolvePrettierIgnore(cwd) {
 	} catch {}
 	return ignores;
 }
+async function rawConfigHasOverrides(configPath) {
+	try {
+		const content = await readFile(configPath, "utf8");
+		return /^\s*(?:\[\[\s*overrides\s*\]\]|["']?overrides["']?\s*[:=])/mv.test(content);
+	} catch {
+		return false;
+	}
+}
 const TAILWIND_OPTION_MAPPING = {
 	config: "tailwindConfig",
 	stylesheet: "tailwindStylesheet",
@@ -93,44 +116,28 @@ const TAILWIND_OPTION_MAPPING = {
 	preserveWhitespace: "tailwindPreserveWhitespace",
 	preserveDuplicates: "tailwindPreserveDuplicates"
 };
-/**
-* Migrate prettier-plugin-tailwindcss options to Oxfmt's sortTailwindcss format.
-*
-* Prettier format:
-* ```json
-* {
-*   "plugins": ["prettier-plugin-tailwindcss"],
-*   "tailwindConfig": "./tailwind.config.js",
-*   "tailwindFunctions": ["clsx", "cn"]
-* }
-* ```
-*
-* Oxfmt format:
-* ```json
-* {
-*   "sortTailwindcss": {
-*     "config": "./tailwind.config.js",
-*     "functions": ["clsx", "cn"]
-*   }
-* }
-* ```
-*/
-function migrateTailwindOptions(prettierConfig, oxfmtrc) {
-	const tailwindOptions = {};
-	for (const [oxfmtKey, prettierKey] of Object.entries(TAILWIND_OPTION_MAPPING)) {
+const SVELTE_OPTION_MAPPING = {
+	allowShorthand: "svelteAllowShorthand",
+	indentScriptAndStyle: "svelteIndentScriptAndStyle",
+	sortOrder: "svelteSortOrder"
+};
+function migrateMappedOptions(prettierConfig, mapping, transform) {
+	const result = {};
+	for (const [oxfmtKey, prettierKey] of Object.entries(mapping)) {
 		const value = prettierConfig[prettierKey];
-		if (value !== void 0) {
-			if ((prettierKey == "tailwindFunctions" || prettierKey == "tailwindAttributes") && Array.isArray(value)) {
-				for (const item of value) if (typeof item === "string" && item.startsWith("/") && item.endsWith("/")) {
-					console.warn(`  - Do not support regex in "${prettierKey}" option yet, skipping: ${item}`);
-					continue;
-				}
-			}
-			tailwindOptions[oxfmtKey] = value;
-		}
+		if (value === void 0) continue;
+		result[oxfmtKey] = transform ? transform(prettierKey, value) : value;
 	}
-	oxfmtrc.sortTailwindcss = tailwindOptions;
-	console.log("Migrated prettier-plugin-tailwindcss options to sortTailwindcss");
+	return result;
+}
+function filterTailwindRegex(prettierKey, value) {
+	if (prettierKey !== "tailwindFunctions" && prettierKey !== "tailwindAttributes" || !Array.isArray(value)) return value;
+	return value.filter((item) => {
+		if (typeof item !== "string") return false;
+		const isRegex = item.startsWith("/") && item.endsWith("/");
+		if (isRegex) console.warn(`  - Regexp in "${prettierKey}" option is not supported, skipping: ${item}`);
+		return !isRegex;
+	});
 }
 //#endregion
 export { runMigratePrettier };

package/dist/{plugin-BuVceHGR.js → plugin-B4cguZ1l.js}

@@ -1,7 +1,7 @@
 import { a as __toCommonJS, i as __require, t as __commonJSMin } from "./rolldown-runtime-CE-6LUnI.js";
-import { n as init_babel, t as babel_exports } from "./babel-DLjwvkt5.js";
-import { n as prettier_exports, t as init_prettier } from "./prettier-DKAx5A83.js";
-//#region ../../node_modules/.pnpm/prettier-plugin-svelte@4.1.1_prettier@3.8.4_svelte@5.56.4_@typescript-eslint+types@8.62.0_/node_modules/prettier-plugin-svelte/plugin.js
+import { n as init_babel, t as babel_exports } from "./babel-DZD6u90w.js";
+import { n as prettier_exports, t as init_prettier } from "./prettier-BByt4AhK.js";
+//#region ../../node_modules/.pnpm/prettier-plugin-svelte@4.1.1_prettier@3.9.4_svelte@5.56.4_@typescript-eslint+types@8.62.0_/node_modules/prettier-plugin-svelte/plugin.js
 var require_plugin = /* @__PURE__ */ __commonJSMin(((exports) => {
 	Object.defineProperty(exports, "__esModule", { value: true });
 	var prettierPluginBabel = (init_babel(), __toCommonJS(babel_exports));
@@ -148,7 +148,8 @@ var require_plugin = /* @__PURE__ */ __commonJSMin(((exports) => {
 			const newSource = _source.replace(regex, (match, attributes, content, index) => {
 				if (match.startsWith("<!--") || withinOtherSpan(index)) return match;
 				if (langTsRegex.test(attributes)) isTypescript = true;
-				const newContent = `<${tagName}${attributes} ${snippedTagContentAttribute}="${stringToBase64(content)}">${placeholder}</${tagName}>`;
+				const encodedContent = stringToBase64(content);
+				const newContent = `<${tagName}${attributes} ${snippedTagContentAttribute}="${encodedContent}">${placeholder}</${tagName}>`;
 				const lengthDiff = match.length - newContent.length;
 				newScriptMatchSpans = adjustSpans(scriptMatchSpans, newScriptMatchSpans);
 				newStyleMatchSpans = adjustSpans(styleMatchSpans, newStyleMatchSpans);
@@ -1565,7 +1566,8 @@ var require_plugin = /* @__PURE__ */ __commonJSMin(((exports) => {
 	*/
 	function splitTextToDocs(node) {
 		const text = getUnencodedText(node);
-		let docs = join(line, text.split(/[\t\n\f\r ]+/)).filter((doc) => doc !== "");
+		const lines = text.split(/[\t\n\f\r ]+/);
+		let docs = join(line, lines).filter((doc) => doc !== "");
 		if (startsWithLinebreak(text)) docs[0] = hardline;
 		if (startsWithLinebreak(text, 2)) docs = [hardline, ...docs];
 		if (endsWithLinebreak(text)) docs[docs.length - 1] = hardline;
@@ -1795,7 +1797,8 @@ var require_plugin = /* @__PURE__ */ __commonJSMin(((exports) => {
 				const body = yield textToDoc(content, { parser });
 				if (parser === "pug" && typeof body === "string") {
 					const whitespace = options.useTabs ? "	" : " ".repeat(options.pugTabWidth && options.pugTabWidth > 0 ? options.pugTabWidth : options.tabWidth);
-					return [hardline$1, body.split("\n").map((line) => line ? whitespace + line : line).join("\n")];
+					const pugBody = body.split("\n").map((line) => line ? whitespace + line : line).join("\n");
+					return [hardline$1, pugBody];
 				}
 				const indentIfDesired = (doc) => options.svelteIndentScriptAndStyle ? indent$1(doc) : doc;
 				trimRight([body], isLine);
@@ -1817,13 +1820,14 @@ var require_plugin = /* @__PURE__ */ __commonJSMin(((exports) => {
 				emptyLineAfter: false
 			}));
 			const body = isNodeSupportedLanguage(node) && !isIgnoreDirective((_b = previousComments[previousComments.length - 1]) === null || _b === void 0 ? void 0 : _b.comment) && (tag !== "template" || options.plugins.some((plugin) => typeof plugin !== "string" && !(plugin instanceof URL) && plugin.name === "prettier-plugin-svelte" && plugin.parsers && plugin.parsers.pug)) ? content.trim() !== "" ? yield formatBodyContent(content) : content === "" ? "" : hardline$1 : preformattedBody(content);
+			const openingTag = group$1([
+				"<",
+				tag,
+				indent$1(group$1([...path.map(printWithPrependedAttributeLine(node, options, print), "attributes"), isBracketSameLine(options) ? "" : dedent$1(softline$1)])),
+				">"
+			]);
 			let result = group$1([
-				group$1([
-					"<",
-					tag,
-					indent$1(group$1([...path.map(printWithPrependedAttributeLine(node, options, print), "attributes"), isBracketSameLine(options) ? "" : dedent$1(softline$1)])),
-					">"
-				]),
+				openingTag,
 				body,
 				"</",
 				tag,