oxfmt 0.51.0 → 0.52.0

package/dist/{dist-DieWQ1D0.js → dist-CJyFMFm2.js}

@@ -1,12 +1,12 @@
-import { o as __toESM } from "./chunk-HkwdBwDg.js";
-import { n as init_babel, parsers as ra, t as babel_exports } from "./babel-Cs312VeV.js";
-import index_exports, { t as init_prettier } from "./prettier-D7Ly-aG0.js";
-import { a as sortClasses, b as __toESM$1, c as cacheForDirs, d as expiringMap, f as loadIfExists, g as __commonJSMin, i as sortClassList, l as spliceChangesIntoString, n as error, o as warn, p as maybeResolve, r as getTailwindConfig$1, u as visit } from "./sorter-BZkvDMjt-r7M4pM9t.js";
-import { parsers as fn, t as init_angular } from "./angular-BzDc3wVg.js";
-import { n as postcss_exports, parsers as en, t as init_postcss } from "./postcss-CS83Slco.js";
+import { o as __toESM } from "./chunk-CNf5ZN-e.js";
+import { n as init_babel, parsers as ra, t as babel_exports } from "./babel-DjR61Wf3.js";
+import index_exports, { t as init_prettier } from "./prettier-Cy-lZk4k.js";
+import { a as sortClasses, b as __toESM$1, c as cacheForDirs, d as expiringMap, f as loadIfExists, g as __commonJSMin, i as sortClassList, l as spliceChangesIntoString, n as error, o as warn, p as maybeResolve, r as getTailwindConfig$1, u as visit } from "./sorter-BZkvDMjt-C3eOnP5z.js";
+import { parsers as fn, t as init_angular } from "./angular-4Mc0TmPv.js";
+import { n as postcss_exports, parsers as en, t as init_postcss } from "./postcss-BFLfznNY.js";
 import * as path from "node:path";
 import { isAbsolute } from "path";
-//#region ../../node_modules/.pnpm/prettier-plugin-tailwindcss@0.0.0-insiders.3997fbd_prettier-plugin-svelte@3.5.2_prettie_a08864e9b63fbbe60e61e20100abcb82/node_modules/prettier-plugin-tailwindcss/dist/index.mjs
+//#region ../../node_modules/.pnpm/prettier-plugin-tailwindcss@0.0.0-insiders.2b6f3c2_prettier-plugin-svelte@4.0.1_prettie_b20d8b14d002a94b1de20f5a14f79b1e/node_modules/prettier-plugin-tailwindcss/dist/index.mjs
 init_angular();
 init_babel();
 init_postcss();
@@ -417,7 +417,6 @@ function transformAst({ ast, env, opts }) {
 function defineTransform(opts) {
 	return opts;
 }
-const ESCAPE_SEQUENCE_PATTERN = /\\(['"\\nrtbfv0-7xuU])/g;
 function tryParseAngularAttribute(value, env) {
 	try {
 		return fn.__ng_directive.parse(value, env.options);
@@ -678,26 +677,29 @@ function sortStringLiteral(node, { env, removeDuplicates, collapseWhitespace = {
 	start: true,
 	end: true
 } }) {
-	var _node$extra3, _node$extra4;
-	let result = sortClasses(node.value, {
+	var _node$extra3;
+	let raw = ((_node$extra3 = node.extra) === null || _node$extra3 === void 0 ? void 0 : _node$extra3.raw) ?? node.raw;
+	let quote = raw[0];
+	let rawContent = raw.slice(1, -1);
+	let sortedRaw = sortClasses(rawContent, {
 		env,
 		removeDuplicates,
 		collapseWhitespace
 	});
-	if (!(result !== node.value)) return false;
-	node.value = result;
-	let raw = ((_node$extra3 = node.extra) === null || _node$extra3 === void 0 ? void 0 : _node$extra3.raw) ?? node.raw;
-	let quote = raw[0];
-	let originalRawContent = raw.slice(1, -1);
-	let originalValue = ((_node$extra4 = node.extra) === null || _node$extra4 === void 0 ? void 0 : _node$extra4.rawValue) ?? node.value;
-	if (node.extra) {
-		if (originalRawContent !== originalValue && originalValue.includes("\\")) result = result.replace(ESCAPE_SEQUENCE_PATTERN, "\\\\$1");
-		node.extra = {
-			...node.extra,
-			rawValue: result,
-			raw: quote + result + quote
-		};
-	} else node.raw = quote + result + quote;
+	if (sortedRaw === rawContent) return false;
+	let sortedCooked = rawContent === node.value ? sortedRaw : sortClasses(node.value, {
+		env,
+		removeDuplicates,
+		collapseWhitespace
+	});
+	node.value = sortedCooked;
+	let newRaw = quote + sortedRaw + quote;
+	if (node.extra) node.extra = {
+		...node.extra,
+		rawValue: sortedCooked,
+		raw: newRaw
+	};
+	else node.raw = newRaw;
 	return true;
 }
 function isStringLiteral(node) {
@@ -979,25 +981,26 @@ function transformSvelte(ast, env) {
 	let { matcher, changes } = env;
 	for (let attr of ast.attributes ?? []) {
 		if (!matcher.hasStaticAttr(attr.name) || attr.type !== "Attribute") continue;
-		for (let i = 0; i < attr.value.length; i++) {
-			let value = attr.value[i];
+		let values = getSvelteAttributeValues(attr);
+		for (let i = 0; i < values.length; i++) {
+			let value = values[i];
 			if (value.type === "Text") {
 				let same = value.raw === value.data;
 				value.raw = sortClasses(value.raw, {
 					env,
 					ignoreFirst: i > 0 && !/^\s/.test(value.raw),
-					ignoreLast: i < attr.value.length - 1 && !/\s$/.test(value.raw),
+					ignoreLast: i < values.length - 1 && !/\s$/.test(value.raw),
 					removeDuplicates: true,
 					collapseWhitespace: false
 				});
 				value.data = same ? value.raw : sortClasses(value.data, {
 					env,
 					ignoreFirst: i > 0 && !/^\s/.test(value.data),
-					ignoreLast: i < attr.value.length - 1 && !/\s$/.test(value.data),
+					ignoreLast: i < values.length - 1 && !/\s$/.test(value.data),
 					removeDuplicates: true,
 					collapseWhitespace: false
 				});
-			} else if (value.type === "MustacheTag") visit(value.expression, {
+			} else if (value.type === "MustacheTag" || value.type === "ExpressionTag") visit(value.expression, {
 				Literal(node) {
 					if (isStringLiteral(node)) {
 						let before = node.raw;
@@ -1029,27 +1032,44 @@ function transformSvelte(ast, env) {
 			});
 		}
 	}
-	for (let child of ast.children ?? []) transformSvelte(child, env);
-	if (ast.type === "IfBlock") {
-		var _ast$else;
-		for (let child of ((_ast$else = ast.else) === null || _ast$else === void 0 ? void 0 : _ast$else.children) ?? []) transformSvelte(child, env);
-	}
-	if (ast.type === "AwaitBlock") {
-		let nodes = [
-			ast.pending,
-			ast.then,
-			ast.catch
-		];
-		for (let child of nodes) transformSvelte(child, env);
-	}
-	if (ast.html) transformSvelte(ast.html, env);
+	for (let child of getSvelteChildNodes(ast)) transformSvelte(child, env);
+}
+function getSvelteAttributeValues(attr) {
+	if (Array.isArray(attr.value)) return attr.value;
+	if (attr.value && typeof attr.value === "object") return [attr.value];
+	return [];
+}
+function getSvelteChildNodes(node) {
+	let children = [];
+	for (let key of [
+		"children",
+		"nodes",
+		"fragment",
+		"html",
+		"else",
+		"consequent",
+		"alternate",
+		"body",
+		"fallback",
+		"pending",
+		"then",
+		"catch"
+	]) children.push(...getSvelteNodes(node[key]));
+	return children;
+}
+function getSvelteNodes(value) {
+	if (Array.isArray(value)) return value.filter((node) => node === null || node === void 0 ? void 0 : node.type);
+	if (Array.isArray(value === null || value === void 0 ? void 0 : value.nodes)) return value.nodes;
+	if (Array.isArray(value === null || value === void 0 ? void 0 : value.children)) return value.children;
+	if (value === null || value === void 0 ? void 0 : value.type) return [value];
+	return [];
 }
 const { parsers, printers } = createPlugin([
 	defineTransform({
 		staticAttrs: ["class"],
 		load: [{
 			name: "prettier/plugins/html",
-			importer: () => import("./html-ENhiK7MR.js")
+			importer: () => import("./html-Cqnv8X__.js")
 		}],
 		compatible: ["prettier-plugin-organize-attributes"],
 		parsers: {
@@ -1064,7 +1084,7 @@ const { parsers, printers } = createPlugin([
 		staticAttrs: ["class"],
 		load: [{
 			name: "prettier/plugins/glimmer",
-			importer: () => import("./glimmer-C2ccnwyy.js")
+			importer: () => import("./glimmer-ubhL-0tG.js")
 		}],
 		parsers: { glimmer: {} },
 		transform: transformGlimmer
@@ -1096,19 +1116,19 @@ const { parsers, printers } = createPlugin([
 			__js_expression: { load: [babel_exports] },
 			typescript: { load: [{
 				name: "prettier/plugins/typescript",
-				importer: () => import("./typescript-DkgFgfZO.js")
+				importer: () => import("./typescript-lqJOqGcK.js")
 			}] },
 			meriyah: { load: [{
 				name: "prettier/plugins/meriyah",
-				importer: () => import("./meriyah-C-N-xeFc.js")
+				importer: () => import("./meriyah-DESRG6oe.js")
 			}] },
 			acorn: { load: [{
 				name: "prettier/plugins/acorn",
-				importer: () => import("./acorn-Cz3eAoi8.js")
+				importer: () => import("./acorn-C-l7ouWN.js")
 			}] },
 			flow: { load: [{
 				name: "prettier/plugins/flow",
-				importer: () => import("./flow-Bj4lBR-Y.js")
+				importer: () => import("./flow-Cz3mJAtC.js")
 			}] },
 			oxc: { load: [{
 				name: "@prettier/plugin-oxc",
@@ -1139,7 +1159,7 @@ const { parsers, printers } = createPlugin([
 		staticAttrs: ["class"],
 		load: [{
 			name: "prettier-plugin-svelte",
-			importer: () => import("./plugin-DiRKvkOT.js").then((m) => /* @__PURE__ */ __toESM(m.default, 1))
+			importer: () => import("./plugin-C4twtOn4.js").then((m) => /* @__PURE__ */ __toESM(m.default, 1))
 		}],
 		parsers: { svelte: {} },
 		printers: { "svelte-ast": {} },

package/dist/{estree-BL2Xy2uB.js → estree-DHQPBKqf.js}

@@ -1,4 +1,4 @@
-import { n as __esmMin } from "./chunk-HkwdBwDg.js";
+import { n as __esmMin } from "./chunk-CNf5ZN-e.js";
 //#region ../../node_modules/.pnpm/prettier@3.8.3/node_modules/prettier/plugins/estree.mjs
 function ka(e) {
 	return this[e < 0 ? this.length + e : e];

package/dist/{flow-Bj4lBR-Y.js → flow-Cz3mJAtC.js}

@@ -1,4 +1,4 @@
-import { n as __esmMin } from "./chunk-HkwdBwDg.js";
+import { n as __esmMin } from "./chunk-CNf5ZN-e.js";
 //#region ../../node_modules/.pnpm/prettier@3.8.3/node_modules/prettier/plugins/flow.mjs
 function iI0(a0, ox) {
 	let Yx = /* @__PURE__ */ new SyntaxError(a0 + " (" + ox.loc.start.line + ":" + ox.loc.start.column + ")");

package/dist/{glimmer-C2ccnwyy.js → glimmer-ubhL-0tG.js}

@@ -1,4 +1,4 @@
-import { n as __esmMin } from "./chunk-HkwdBwDg.js";
+import { n as __esmMin } from "./chunk-CNf5ZN-e.js";
 //#region ../../node_modules/.pnpm/prettier@3.8.3/node_modules/prettier/plugins/glimmer.mjs
 function Yn(e) {
 	return this[e < 0 ? this.length + e : e];

package/dist/{graphql-D73FSqwO.js → graphql-Cl0TIiHU.js}

@@ -1,4 +1,4 @@
-import { n as __esmMin } from "./chunk-HkwdBwDg.js";
+import { n as __esmMin } from "./chunk-CNf5ZN-e.js";
 //#region ../../node_modules/.pnpm/prettier@3.8.3/node_modules/prettier/plugins/graphql.mjs
 function x(e) {
 	return S(e), {

package/dist/{html-ENhiK7MR.js → html-Cqnv8X__.js}

@@ -1,4 +1,4 @@
-import { n as __esmMin } from "./chunk-HkwdBwDg.js";
+import { n as __esmMin } from "./chunk-CNf5ZN-e.js";
 //#region ../../node_modules/.pnpm/prettier@3.8.3/node_modules/prettier/plugins/html.mjs
 function ns(e) {
 	return this[e < 0 ? this.length + e : e];

package/dist/index.js

@@ -1,5 +1,5 @@
-import { n as jsTextToDoc$1, t as format$1 } from "./bindings-qpSSlUMn.js";
-import { i as sortTailwindClasses, n as formatEmbeddedDoc, r as formatFile, t as formatEmbeddedCode } from "./apis-H4bwlBNm.js";
+import { n as jsTextToDoc$1, t as format$1 } from "./bindings-BJw0GhQr.js";
+import { i as sortTailwindClasses, n as formatEmbeddedDoc, r as formatFile, t as formatEmbeddedCode } from "./apis-Cc9jzUH4.js";
 //#region src-js/index.ts
 /**
 * Define an oxfmt configuration with type inference.

package/dist/{init-BbKOMZ57.js → init-DGfXRYLw.js}

@@ -1,4 +1,4 @@
-import { i as saveOxfmtrcFile, n as exitWithError, r as hasOxfmtrcFile, t as createBlankOxfmtrcFile } from "./shared-BTEY2VsW.js";
+import { i as saveOxfmtrcFile, n as exitWithError, r as hasOxfmtrcFile, t as createBlankOxfmtrcFile } from "./shared-BiMl-bLP.js";
 //#region src-js/cli/migration/init.ts
 /**
 * Run the `--init` command to scaffold a default `.oxfmtrc.json` file.

package/dist/{jiti-Bb1dT6Cw-BtDs_aWX.js → jiti-Bb1dT6Cw-B_5IaZk7.js}

@@ -1,6 +1,6 @@
-import { b as __toESM, g as __commonJSMin, y as __require } from "./sorter-BZkvDMjt-r7M4pM9t.js";
+import { b as __toESM, g as __commonJSMin, y as __require } from "./sorter-BZkvDMjt-C3eOnP5z.js";
 import { createRequire } from "node:module";
-//#region ../../node_modules/.pnpm/prettier-plugin-tailwindcss@0.0.0-insiders.3997fbd_prettier-plugin-svelte@3.5.2_prettie_a08864e9b63fbbe60e61e20100abcb82/node_modules/prettier-plugin-tailwindcss/dist/jiti-Bb1dT6Cw.mjs
+//#region ../../node_modules/.pnpm/prettier-plugin-tailwindcss@0.0.0-insiders.2b6f3c2_prettier-plugin-svelte@4.0.1_prettie_b20d8b14d002a94b1de20f5a14f79b1e/node_modules/prettier-plugin-tailwindcss/dist/jiti-Bb1dT6Cw.mjs
 var require_jiti = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	(() => {
 		var e = { "./node_modules/.pnpm/mlly@1.8.0/node_modules/mlly/dist lazy recursive": function(e) {

package/dist/{markdown-CDTH7TpJ.js → markdown-Eujfu-fQ.js}

@@ -1,4 +1,4 @@
-import { n as __esmMin } from "./chunk-HkwdBwDg.js";
+import { n as __esmMin } from "./chunk-CNf5ZN-e.js";
 //#region ../../node_modules/.pnpm/prettier@3.8.3/node_modules/prettier/plugins/markdown.mjs
 function yl(e) {
 	return this[e < 0 ? this.length + e : e];

package/dist/{meriyah-C-N-xeFc.js → meriyah-DESRG6oe.js}

@@ -1,4 +1,4 @@
-import { n as __esmMin } from "./chunk-HkwdBwDg.js";
+import { n as __esmMin } from "./chunk-CNf5ZN-e.js";
 //#region ../../node_modules/.pnpm/prettier@3.8.3/node_modules/prettier/plugins/meriyah.mjs
 function Se(e) {
 	return e <= 127 ? _2[e] > 0 : Ct(e);

package/dist/{migrate-biome-BMqs7-eg.js → migrate-biome-P928W9-y.js}

@@ -1,4 +1,4 @@
-import { i as saveOxfmtrcFile, n as exitWithError, r as hasOxfmtrcFile, t as createBlankOxfmtrcFile } from "./shared-BTEY2VsW.js";
+import { i as saveOxfmtrcFile, n as exitWithError, r as hasOxfmtrcFile, t as createBlankOxfmtrcFile } from "./shared-BiMl-bLP.js";
 import { join } from "node:path";
 import { readFile } from "node:fs/promises";
 //#region src-js/cli/migration/migrate-biome.ts

package/dist/{migrate-prettier-CBzqnxHw.js → migrate-prettier-CotsZUFl.js}

@@ -1,4 +1,4 @@
-import { i as saveOxfmtrcFile, n as exitWithError, r as hasOxfmtrcFile, t as createBlankOxfmtrcFile } from "./shared-BTEY2VsW.js";
+import { i as saveOxfmtrcFile, n as exitWithError, r as hasOxfmtrcFile, t as createBlankOxfmtrcFile } from "./shared-BiMl-bLP.js";
 import { join } from "node:path";
 import { readFile } from "node:fs/promises";
 //#region src-js/cli/migration/migrate-prettier.ts
@@ -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-D7Ly-aG0.js");
+	const { resolveConfigFile, resolveConfig } = await import("./prettier-Cy-lZk4k.js");
 	const prettierConfigPath = await resolveConfigFile(join(cwd, "dummy.js"));
 	if (!prettierConfigPath) {
 		console.log("No Prettier configuration file found.");