oxfmt 0.49.0 → 0.50.0

package/dist/{plugin-CwlqDRt_.js → plugin-DOdiccQR.js}

@@ -1,7 +1,7 @@
-import { a as __toCommonJS, i as __require, t as __commonJSMin } from "./chunk-HkwdBwDg.js";
-import { n as init_babel, t as babel_exports } from "./babel-Cs312VeV.js";
-import { n as prettier_exports, t as init_prettier } from "./prettier-s1WPCGVk.js";
-//#region ../../node_modules/.pnpm/prettier-plugin-svelte@3.5.1_prettier@3.8.3_svelte@5.55.5_@typescript-eslint+types@8.59.2_/node_modules/prettier-plugin-svelte/plugin.js
+import { l as __require, o as __commonJSMin, u as __toCommonJS } from "./apis-CKvPKBJI.js";
+import { n as init_babel, t as babel_exports } from "./babel-DaNjvh9L.js";
+import { n as prettier_exports, t as init_prettier } from "./prettier-Cw36juP9.js";
+//#region ../../node_modules/.pnpm/prettier-plugin-svelte@3.5.2_prettier@3.8.3_svelte@5.55.5_@typescript-eslint+types@8.59.2_/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));
@@ -386,9 +386,35 @@ var require_plugin = /* @__PURE__ */ __commonJSMin(((exports) => {
 	}
 	/**
 	* `(foo = bar)` => `foo = bar`
+	* Also handles leading comments and line breaks before "(".
 	*/
 	function removeParentheses(doc) {
-		return trim([doc], (_doc) => _doc === "(" || _doc === ")")[0];
+		if (!Array.isArray(doc)) return trim([doc], (_doc) => _doc === "(" || _doc === ")")[0];
+		const transformed = [];
+		let i = 0;
+		let opened = false;
+		for (; i < doc.length; i++) {
+			const part = doc[i];
+			if (typeof part === "string" && part.startsWith("//")) transformed.push(part);
+			else if (typeof part === "string" && part.startsWith("/*")) {
+				transformed.push(part);
+				opened = true;
+			} else if (opened) {
+				transformed.push(part);
+				opened = typeof part !== "string" || !part.trim().endsWith("*/");
+			} else if (transformed.length > 0 && isLine(part)) {
+				transformed.push(part);
+				i++;
+				const next = doc[i];
+				if (typeof next !== "string" && !Array.isArray(next) && next.type === "break-parent") {
+					transformed.push(next);
+					i++;
+				}
+				break;
+			} else break;
+		}
+		transformed.push(...trim(doc.slice(i), (_doc) => _doc === "(" || _doc === ")"));
+		return transformed;
 	}
 	const unsupportedLanguages = [
 		"coffee",
@@ -397,6 +423,18 @@ var require_plugin = /* @__PURE__ */ __commonJSMin(((exports) => {
 		"stylus",
 		"sass"
 	];
+	/**
+	* Characters treated as interchangeable/collapsible HTML whitespace for layout.
+	* Excludes NBSP (U+00A0) and other Unicode separators — see prettier/prettier#5796.
+	*/
+	const ONLY_HTML_COLLAPSE_WHITESPACE_RE = /^[\t\n\f\r ]*$/;
+	const STARTS_WITH_HTML_COLLAPSE_WHITESPACE_RE = /^[\t\n\f\r ]/;
+	const ENDS_WITH_HTML_COLLAPSE_WHITESPACE_RE = /[\t\n\f\r ]$/;
+	const LEADING_HTML_COLLAPSE_WHITESPACE_RE = /^[\t\n\f\r ]+/;
+	const TRAILING_HTML_COLLAPSE_WHITESPACE_RE = /[\t\n\f\r ]+$/;
+	function isOnlyHtmlCollapseWhitespace(text) {
+		return ONLY_HTML_COLLAPSE_WHITESPACE_RE.test(text);
+	}
 	function isInlineElement(path, options, node) {
 		return node && node.type === "Element" && !isBlockElement(node, options) && !isPreTagContent(path);
 	}
@@ -472,7 +510,7 @@ var require_plugin = /* @__PURE__ */ __commonJSMin(((exports) => {
 		return !!root.html && !!root.html.children && root.html.children.includes(node);
 	}
 	function isEmptyTextNode(node) {
-		return !!node && node.type === "Text" && getUnencodedText(node).trim() === "";
+		return !!node && node.type === "Text" && isOnlyHtmlCollapseWhitespace(getUnencodedText(node));
 	}
 	function isIgnoreDirective(node) {
 		return !!node && node.type === "Comment" && node.data.trim() === "prettier-ignore";
@@ -584,18 +622,18 @@ var require_plugin = /* @__PURE__ */ __commonJSMin(((exports) => {
 		return new RegExp(`(\\n[\\t\\f\\r ]*){${nrLines}}$`).test(text);
 	}
 	function isTextNodeStartingWithWhitespace(node) {
-		return node.type === "Text" && /^\s/.test(getUnencodedText(node));
+		return node.type === "Text" && STARTS_WITH_HTML_COLLAPSE_WHITESPACE_RE.test(getUnencodedText(node));
 	}
 	function isTextNodeEndingWithWhitespace(node) {
-		return node.type === "Text" && /\s$/.test(getUnencodedText(node));
+		return node.type === "Text" && ENDS_WITH_HTML_COLLAPSE_WHITESPACE_RE.test(getUnencodedText(node));
 	}
 	function trimTextNodeRight(node) {
-		node.raw = node.raw && node.raw.trimRight();
-		node.data = node.data && node.data.trimRight();
+		node.raw = node.raw && node.raw.replace(TRAILING_HTML_COLLAPSE_WHITESPACE_RE, "");
+		node.data = node.data && node.data.replace(TRAILING_HTML_COLLAPSE_WHITESPACE_RE, "");
 	}
 	function trimTextNodeLeft(node) {
-		node.raw = node.raw && node.raw.trimLeft();
-		node.data = node.data && node.data.trimLeft();
+		node.raw = node.raw && node.raw.replace(LEADING_HTML_COLLAPSE_WHITESPACE_RE, "");
+		node.data = node.data && node.data.replace(LEADING_HTML_COLLAPSE_WHITESPACE_RE, "");
 	}
 	/**
 	* Remove all leading whitespace up until the first non-empty text node,
@@ -660,7 +698,7 @@ var require_plugin = /* @__PURE__ */ __commonJSMin(((exports) => {
 		const parentOpeningEnd = options.originalText.lastIndexOf("}", firstChild.start);
 		if (parentOpeningEnd > 0 && firstChild.start > parentOpeningEnd + 1) {
 			const textBetween = options.originalText.substring(parentOpeningEnd + 1, firstChild.start);
-			if (textBetween.trim() === "") return startsWithLinebreak(textBetween) ? "line" : "space";
+			if (ONLY_HTML_COLLAPSE_WHITESPACE_RE.test(textBetween)) return startsWithLinebreak(textBetween) ? "line" : "space";
 		}
 		return "none";
 	}
@@ -677,7 +715,7 @@ var require_plugin = /* @__PURE__ */ __commonJSMin(((exports) => {
 		const parentClosingStart = options.originalText.indexOf("{", lastChild.end);
 		if (parentClosingStart > 0 && lastChild.end < parentClosingStart) {
 			const textBetween = options.originalText.substring(lastChild.end, parentClosingStart);
-			if (textBetween.trim() === "") return endsWithLinebreak(textBetween) ? "line" : "space";
+			if (ONLY_HTML_COLLAPSE_WHITESPACE_RE.test(textBetween)) return endsWithLinebreak(textBetween) ? "line" : "space";
 		}
 		return "none";
 	}
@@ -696,7 +734,7 @@ var require_plugin = /* @__PURE__ */ __commonJSMin(((exports) => {
 	*/
 	function hugsStartOfNextNode(node, options) {
 		if (node.end === options.originalText.length) return false;
-		return !options.originalText.substring(node.end).match(/^\s/);
+		return !STARTS_WITH_HTML_COLLAPSE_WHITESPACE_RE.test(options.originalText.substring(node.end));
 	}
 	function isLastChildWithinParentBlockElement(path, options) {
 		const parent = path.getParentNode();
@@ -772,15 +810,16 @@ var require_plugin = /* @__PURE__ */ __commonJSMin(((exports) => {
 				if (children.length === 0 || children.every(isEmptyTextNode)) return "";
 				if (!isPreTagContent(path)) {
 					trimChildren(node.children, path);
-					const output = trim([printChildren(path, print, options)], (n) => isLine(n) || typeof n === "string" && n.trim() === "" || n === breakParent);
+					const output = trim([printChildren(path, print, options)], (n) => isLine(n) || typeof n === "string" && isOnlyHtmlCollapseWhitespace(n) || n === breakParent);
 					if (output.every((doc) => isEmptyDoc(doc))) return "";
 					return group([...output, hardline]);
 				} else return group(path.map(print, "children"));
 			case "Text": if (!isPreTagContent(path)) {
 				if (isEmptyTextNode(node)) {
-					const hasWhiteSpace = getUnencodedText(node).trim().length < getUnencodedText(node).length;
-					const hasOneOrMoreNewlines = /\n/.test(getUnencodedText(node));
-					if (/\n\r?\s*\n\r?/.test(getUnencodedText(node))) return [hardline, hardline];
+					const text = getUnencodedText(node);
+					const hasWhiteSpace = text.length > 0;
+					const hasOneOrMoreNewlines = /\n/.test(text);
+					if (/\n\r?[\t\n\f\r ]*\n\r?/.test(text)) return [hardline, hardline];
 					if (hasOneOrMoreNewlines) return hardline;
 					if (hasWhiteSpace) return line;
 					return "";
@@ -1438,24 +1477,29 @@ var require_plugin = /* @__PURE__ */ __commonJSMin(((exports) => {
 		return path.call(print, name);
 	}
 	function expandNode(node, original) {
-		let str = _expandNode(node);
+		let str = _expandNode(node, original);
 		if (node === null || node === void 0 ? void 0 : node.typeAnnotation) str += ": " + original.slice(node.typeAnnotation.typeAnnotation.start, node.typeAnnotation.typeAnnotation.end);
 		return str;
 	}
-	function _expandNode(node, parent) {
+	function _expandNode(node, original, parent) {
+		var _a, _b;
 		if (node === null) return "";
 		if (typeof node === "string") return " " + node;
 		switch (node.type) {
 			case "ArrayExpression":
-			case "ArrayPattern": return " [" + node.elements.map((el) => el === null ? " " : _expandNode(el)).join(",").slice(1) + "]";
-			case "AssignmentPattern": return _expandNode(node.left) + " =" + _expandNode(node.right);
+			case "ArrayPattern": return " [" + node.elements.map((el) => el === null ? " " : _expandNode(el, original)).join(",").slice(1) + "]";
+			case "AssignmentPattern": return _expandNode(node.left, original) + " =" + _expandNode(node.right, original);
 			case "Identifier": return " " + node.name;
 			case "Literal": return " " + node.raw;
-			case "ObjectExpression": return " {" + node.properties.map((p) => _expandNode(p, node)).join(",") + " }";
-			case "ObjectPattern": return " {" + node.properties.map(_expandNode).join(",") + " }";
-			case "Property": if (node.value.type === "ObjectPattern" || node.value.type === "ArrayPattern") return " " + node.key.name + ":" + _expandNode(node.value);
-			else if (node.value.type === "Identifier" && node.key.name !== node.value.name || parent && parent.type === "ObjectExpression") return _expandNode(node.key) + ":" + _expandNode(node.value);
-			else return _expandNode(node.value);
+			case "ObjectExpression": return " {" + node.properties.map((p) => _expandNode(p, original, node)).join(",") + " }";
+			case "ObjectPattern": return " {" + node.properties.map((p) => _expandNode(p, original)).join(",") + " }";
+			case "Property": {
+				let computedKeyInner = "";
+				if (node.computed) computedKeyInner = typeof ((_a = node.key) === null || _a === void 0 ? void 0 : _a.start) === "number" && typeof ((_b = node.key) === null || _b === void 0 ? void 0 : _b.end) === "number" ? original.slice(node.key.start, node.key.end) : _expandNode(node.key, original).trim();
+				if (node.value.type === "ObjectPattern" || node.value.type === "ArrayPattern") return (node.computed ? " [" + computedKeyInner + "]" : " " + node.key.name) + ":" + _expandNode(node.value, original);
+				else if (node.value.type === "Identifier" && node.key.name !== node.value.name || parent && parent.type === "ObjectExpression") return (node.computed ? " [" + computedKeyInner + "]" : _expandNode(node.key, original)) + ":" + _expandNode(node.value, original);
+				else return _expandNode(node.value, original);
+			}
 			case "RestElement": return " ..." + node.argument.name;
 		}
 		console.error(JSON.stringify(node, null, 4));

package/dist/{postcss-ZbUej7DN.js → postcss-D-ql-dm8.js}

@@ -1,4 +1,4 @@
-import { n as __esmMin, r as __exportAll } from "./chunk-HkwdBwDg.js";
+import { c as __exportAll, s as __esmMin } from "./apis-CKvPKBJI.js";
 //#region ../../node_modules/.pnpm/prettier@3.8.3/node_modules/prettier/plugins/postcss.mjs
 var postcss_exports = /* @__PURE__ */ __exportAll({
 	default: () => _l,

package/dist/{prettier-s1WPCGVk.js → prettier-Cw36juP9.js}

@@ -1,4 +1,4 @@
-import { n as __esmMin, r as __exportAll } from "./chunk-HkwdBwDg.js";
+import { c as __exportAll, s as __esmMin } from "./apis-CKvPKBJI.js";
 import { builtinModules, createRequire } from "module";
 import * as url from "url";
 import url2, { fileURLToPath, pathToFileURL } from "url";
@@ -2402,7 +2402,7 @@ async function loadConfigFromPackageYaml(file) {
 }
 async function loadYaml(file) {
 	const content = await read_file_default(file);
-	if (!parseYaml) ({__parsePrettierYamlConfig: parseYaml} = await import("./yaml-DLZBHI7f.js"));
+	if (!parseYaml) ({__parsePrettierYamlConfig: parseYaml} = await import("./yaml-Bqxyk-13.js"));
 	try {
 		return parseYaml(content);
 	} catch (error) {
@@ -15380,7 +15380,7 @@ ${codeblock}`, options8);
 		proseWrap: common_options_evaluate_default.proseWrap
 	};
 	estreePlugin = createParsersAndPrinters([{
-		importPlugin: () => import("./estree-DZBnPYMx.js"),
+		importPlugin: () => import("./estree-CzfNsl8m.js"),
 		printers: ["estree", "estree-json"]
 	}]);
 	options7 = {
@@ -15403,11 +15403,11 @@ ${codeblock}`, options8);
 	];
 	({parsers, printers} = createParsersAndPrinters([
 		{
-			importPlugin: () => import("./acorn-ay2Aj6GQ.js"),
+			importPlugin: () => import("./acorn-sBRpswSh.js"),
 			parsers: ["acorn", "espree"]
 		},
 		{
-			importPlugin: () => import("./angular-z1ZEe5V_.js"),
+			importPlugin: () => import("./angular-DtI-eDW8.js"),
 			parsers: [
 				"__ng_action",
 				"__ng_binding",
@@ -15416,7 +15416,7 @@ ${codeblock}`, options8);
 			]
 		},
 		{
-			importPlugin: () => import("./babel-Cs312VeV.js"),
+			importPlugin: () => import("./babel-DaNjvh9L.js"),
 			parsers: [
 				"babel",
 				"babel-flow",
@@ -15435,21 +15435,21 @@ ${codeblock}`, options8);
 			]
 		},
 		{
-			importPlugin: () => import("./flow-ChhAFZSt.js"),
+			importPlugin: () => import("./flow-c9AjoQam.js"),
 			parsers: ["flow"]
 		},
 		{
-			importPlugin: () => import("./glimmer-Cg8KQipT.js"),
+			importPlugin: () => import("./glimmer-D_zkI0w_.js"),
 			parsers: ["glimmer"],
 			printers: ["glimmer"]
 		},
 		{
-			importPlugin: () => import("./graphql-DsP-ifm0.js"),
+			importPlugin: () => import("./graphql-BFXkB4Nq.js"),
 			parsers: ["graphql"],
 			printers: ["graphql"]
 		},
 		{
-			importPlugin: () => import("./html-7pWx9LND.js"),
+			importPlugin: () => import("./html-DkcPxRXg.js"),
 			parsers: [
 				"html",
 				"angular",
@@ -15460,7 +15460,7 @@ ${codeblock}`, options8);
 			printers: ["html"]
 		},
 		{
-			importPlugin: () => import("./markdown-CCrs3bBt.js"),
+			importPlugin: () => import("./markdown-DVLNmbQg.js"),
 			parsers: [
 				"markdown",
 				"mdx",
@@ -15469,11 +15469,11 @@ ${codeblock}`, options8);
 			printers: ["mdast"]
 		},
 		{
-			importPlugin: () => import("./meriyah-TC7VDz8E.js"),
+			importPlugin: () => import("./meriyah-BGPf00Rn.js"),
 			parsers: ["meriyah"]
 		},
 		{
-			importPlugin: () => import("./postcss-ZbUej7DN.js"),
+			importPlugin: () => import("./postcss-D-ql-dm8.js"),
 			parsers: [
 				"css",
 				"less",
@@ -15482,11 +15482,11 @@ ${codeblock}`, options8);
 			printers: ["postcss"]
 		},
 		{
-			importPlugin: () => import("./typescript-Cgpjcksz.js"),
+			importPlugin: () => import("./typescript-C_eN_ThF.js"),
 			parsers: ["typescript"]
 		},
 		{
-			importPlugin: () => import("./yaml-DLZBHI7f.js"),
+			importPlugin: () => import("./yaml-Bqxyk-13.js"),
 			parsers: ["yaml"],
 			printers: ["yaml"]
 		}

package/dist/{prettier-plugin-oxfmt-BjdgYnLg.js → prettier-plugin-oxfmt-BlJcmKAv.js}

@@ -2,11 +2,45 @@ import { jsTextToDoc } from "./index.js";
 //#region src-js/libs/prettier-plugin-oxfmt/text-to-doc.ts
 const textToDoc = async (embeddedSourceText, textToDocOptions) => {
 	const { parser, parentParser, filepath, _oxfmtPluginOptionsJson } = textToDocOptions;
-	const doc = await jsTextToDoc(parser === "typescript" || parser === "babel-ts" ? filepath?.endsWith(".tsx") ? "tsx" : "ts" : "jsx", embeddedSourceText, _oxfmtPluginOptionsJson, detectParentContext(parentParser, textToDocOptions));
-	if (doc === null) throw new Error("`oxfmt::textToDoc()` failed. Use `OXC_LOG` env var to see Rust-side logs.");
-	return JSON.parse(doc);
+	const docJSON = await jsTextToDoc(parser === "typescript" || parser === "babel-ts" ? filepath?.endsWith(".tsx") ? "tsx" : "ts" : "jsx", embeddedSourceText, _oxfmtPluginOptionsJson, detectParentContext(parentParser, textToDocOptions));
+	if (docJSON === null) throw new Error("`oxfmt::textToDoc()` failed. Use `OXC_LOG` env var to see Rust-side logs.");
+	const { doc, refs } = JSON.parse(docJSON);
+	if (refs.length === 0) return doc;
+	return resolveRefs(doc, refs, Array.from({ length: refs.length }));
 };
 /**
+* Rust emits `Interned` sub-trees once into `refs` and references them via `{ _REF: <id> }` placeholders,
+* preventing exponential JSON blowup when the same sub-tree is duplicated variants.
+*
+* Restore shared object references so Prettier sees the original (memory-shared) structure.
+* Identity does not affect output because Prettier identifies groups by their `id` field,
+* not by JS object identity.
+*
+* The `_REF` key (uppercase, prefixed) is chosen to never collide with valid Prettier Doc node keys,
+* so the `typeof obj._REF === "number"` check uniquely identifies placeholders.
+*
+* Refs are resolved on-demand with memoization.
+* A ref `i` may reference any other ref `j` (including `j < i`) because Rust caches `Interned` by pointer
+* and an earlier-encountered `Interned` (smaller id) can also appear inside a later one's content.
+* Topological / reverse-order resolution would observe `undefined` holes, so we recurse lazily.
+*/
+function resolveRefs(node, rawRefs, cache) {
+	if (node === null || typeof node !== "object") return node;
+	if (Array.isArray(node)) return node.map((n) => resolveRefs(n, rawRefs, cache));
+	const obj = node;
+	if (typeof obj._REF === "number") {
+		const id = obj._REF;
+		const cached = cache[id];
+		if (cached !== void 0) return cached;
+		const resolved = resolveRefs(rawRefs[id], rawRefs, cache);
+		cache[id] = resolved;
+		return resolved;
+	}
+	const out = {};
+	for (const k in obj) out[k] = resolveRefs(obj[k], rawRefs, cache);
+	return out;
+}
+/**
 * Detects Vue fragment mode from Prettier's internal flags.
 *
 * When Prettier formats Vue SFC templates, it calls textToDoc with special flags: