oxfmt 0.49.0 → 0.51.0

package/dist/{sorter-l2HyESZg.js → sorter-D0Nd4qpi.js}

@@ -1,3 +1,2 @@
-import "./resolve-pWjAK-4f-BnquIxPb.js";
-import { r as getTailwindConfig, t as createSorter } from "./sorter-BZkvDMjt-y2u_e1ZW.js";
+import { r as getTailwindConfig, t as createSorter } from "./sorter-BZkvDMjt-r7M4pM9t.js";
 export { createSorter, getTailwindConfig };

package/dist/{v3-D-mr2VVh-Bw8A9MXh.js → v3-D-mr2VVh-DBBWnwM8.js}

@@ -1,9 +1,8 @@
-import { a as __toESM, i as __require, n as __esmMin, t as __commonJSMin } from "./chunk-DSjvVL_1-B3jw0SMn.js";
-import { t as bigSign } from "./utils-D8dQkKEd-Dgy5UIHl.js";
-import { t as createJiti } from "./jiti-Bb1dT6Cw-DezGRPD7.js";
+import { _ as __esmMin, b as __toESM, g as __commonJSMin, s as bigSign, y as __require } from "./sorter-BZkvDMjt-r7M4pM9t.js";
+import { t as createJiti } from "./jiti-Bb1dT6Cw-BtDs_aWX.js";
 import { fileURLToPath, pathToFileURL } from "node:url";
 import * as path from "node:path";
-//#region ../../node_modules/.pnpm/prettier-plugin-tailwindcss@0.0.0-insiders.3997fbd_prettier-plugin-svelte@3.5.1_prettie_57f1f908c644a91a29f5821c3681dd20/node_modules/prettier-plugin-tailwindcss/dist/v3-D-mr2VVh.mjs
+//#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/v3-D-mr2VVh.mjs
 var getFilename, __filename;
 var init_esm_shims = __esmMin((() => {
 	getFilename = () => fileURLToPath(import.meta.url);

package/dist/{v4-C-HWEQJm-B81QD_Ac.js → v4-C-HWEQJm-OZwT-Lc8.js}

@@ -1,10 +1,9 @@
-import { r as __exportAll } from "./chunk-DSjvVL_1-B3jw0SMn.js";
-import { a as resolveJsFrom, i as resolveCssFrom } from "./resolve-pWjAK-4f-BnquIxPb.js";
-import { t as createJiti } from "./jiti-Bb1dT6Cw-DezGRPD7.js";
+import { h as resolveJsFrom, m as resolveCssFrom, v as __exportAll } from "./sorter-BZkvDMjt-r7M4pM9t.js";
+import { t as createJiti } from "./jiti-Bb1dT6Cw-BtDs_aWX.js";
 import { pathToFileURL } from "node:url";
 import * as path from "node:path";
 import * as fs from "node:fs/promises";
-//#region ../../node_modules/.pnpm/prettier-plugin-tailwindcss@0.0.0-insiders.3997fbd_prettier-plugin-svelte@3.5.1_prettie_57f1f908c644a91a29f5821c3681dd20/node_modules/prettier-plugin-tailwindcss/dist/v4-C-HWEQJm.mjs
+//#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/v4-C-HWEQJm.mjs
 var l$1 = {
 	inherit: "inherit",
 	current: "currentcolor",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oxfmt",
-  "version": "0.49.0",
+  "version": "0.51.0",
   "description": "Formatter for the JavaScript Oxidation Compiler",
   "keywords": [
     "formatter",
@@ -82,24 +82,24 @@
   },
   "preferUnplugged": true,
   "optionalDependencies": {
-    "@oxfmt/binding-darwin-arm64": "0.49.0",
-    "@oxfmt/binding-android-arm64": "0.49.0",
-    "@oxfmt/binding-win32-arm64-msvc": "0.49.0",
-    "@oxfmt/binding-linux-arm64-gnu": "0.49.0",
-    "@oxfmt/binding-linux-arm64-musl": "0.49.0",
-    "@oxfmt/binding-openharmony-arm64": "0.49.0",
-    "@oxfmt/binding-android-arm-eabi": "0.49.0",
-    "@oxfmt/binding-linux-arm-gnueabihf": "0.49.0",
-    "@oxfmt/binding-linux-arm-musleabihf": "0.49.0",
-    "@oxfmt/binding-win32-ia32-msvc": "0.49.0",
-    "@oxfmt/binding-linux-ppc64-gnu": "0.49.0",
-    "@oxfmt/binding-linux-riscv64-gnu": "0.49.0",
-    "@oxfmt/binding-linux-riscv64-musl": "0.49.0",
-    "@oxfmt/binding-linux-s390x-gnu": "0.49.0",
-    "@oxfmt/binding-darwin-x64": "0.49.0",
-    "@oxfmt/binding-win32-x64-msvc": "0.49.0",
-    "@oxfmt/binding-freebsd-x64": "0.49.0",
-    "@oxfmt/binding-linux-x64-gnu": "0.49.0",
-    "@oxfmt/binding-linux-x64-musl": "0.49.0"
+    "@oxfmt/binding-darwin-arm64": "0.51.0",
+    "@oxfmt/binding-android-arm64": "0.51.0",
+    "@oxfmt/binding-win32-arm64-msvc": "0.51.0",
+    "@oxfmt/binding-linux-arm64-gnu": "0.51.0",
+    "@oxfmt/binding-linux-arm64-musl": "0.51.0",
+    "@oxfmt/binding-openharmony-arm64": "0.51.0",
+    "@oxfmt/binding-android-arm-eabi": "0.51.0",
+    "@oxfmt/binding-linux-arm-gnueabihf": "0.51.0",
+    "@oxfmt/binding-linux-arm-musleabihf": "0.51.0",
+    "@oxfmt/binding-win32-ia32-msvc": "0.51.0",
+    "@oxfmt/binding-linux-ppc64-gnu": "0.51.0",
+    "@oxfmt/binding-linux-riscv64-gnu": "0.51.0",
+    "@oxfmt/binding-linux-riscv64-musl": "0.51.0",
+    "@oxfmt/binding-linux-s390x-gnu": "0.51.0",
+    "@oxfmt/binding-darwin-x64": "0.51.0",
+    "@oxfmt/binding-win32-x64-msvc": "0.51.0",
+    "@oxfmt/binding-freebsd-x64": "0.51.0",
+    "@oxfmt/binding-linux-x64-gnu": "0.51.0",
+    "@oxfmt/binding-linux-x64-musl": "0.51.0"
   }
 }

package/dist/chunk-DSjvVL_1-B3jw0SMn.js

@@ -1,36 +0,0 @@
-import { createRequire } from "node:module";
-//#region ../../node_modules/.pnpm/prettier-plugin-tailwindcss@0.0.0-insiders.3997fbd_prettier-plugin-svelte@3.5.1_prettie_57f1f908c644a91a29f5821c3681dd20/node_modules/prettier-plugin-tailwindcss/dist/chunk-DSjvVL_1.mjs
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __esmMin = (fn, res) => () => (fn && (res = fn(fn = 0)), res);
-var __commonJSMin = (cb, mod) => () => (mod || cb((mod = { exports: {} }).exports, mod), mod.exports);
-var __exportAll = (all, symbols) => {
-	let target = {};
-	for (var name in all) __defProp(target, name, {
-		get: all[name],
-		enumerable: true
-	});
-	if (symbols) __defProp(target, Symbol.toStringTag, { value: "Module" });
-	return target;
-};
-var __copyProps = (to, from, except, desc) => {
-	if (from && typeof from === "object" || typeof from === "function") for (var keys = __getOwnPropNames(from), i = 0, n = keys.length, key; i < n; i++) {
-		key = keys[i];
-		if (!__hasOwnProp.call(to, key) && key !== except) __defProp(to, key, {
-			get: ((k) => from[k]).bind(null, key),
-			enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
-		});
-	}
-	return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", {
-	value: mod,
-	enumerable: true
-}) : target, mod));
-var __require = /* @__PURE__ */ createRequire(import.meta.url);
-//#endregion
-export { __toESM as a, __require as i, __esmMin as n, __exportAll as r, __commonJSMin as t };

package/dist/sorter-BZkvDMjt-y2u_e1ZW.js

@@ -1,212 +0,0 @@
-import { a as resolveJsFrom, t as expiringMap } from "./resolve-pWjAK-4f-BnquIxPb.js";
-import { n as cacheForDirs, t as bigSign } from "./utils-D8dQkKEd-Dgy5UIHl.js";
-import { pathToFileURL } from "node:url";
-import * as path from "node:path";
-import { dirname, resolve } from "path";
-import { readdirSync, statSync } from "fs";
-//#region ../../node_modules/.pnpm/prettier-plugin-tailwindcss@0.0.0-insiders.3997fbd_prettier-plugin-svelte@3.5.1_prettie_57f1f908c644a91a29f5821c3681dd20/node_modules/prettier-plugin-tailwindcss/dist/sorter-BZkvDMjt.mjs
-let seen = /* @__PURE__ */ new Set();
-function warn(key, arg, ...args) {
-	if (seen.has(key)) return;
-	seen.add(key);
-	console.warn(arg, ...args);
-}
-function error(key, arg, ...args) {
-	if (seen.has(key)) return;
-	seen.add(key);
-	console.error(arg, ...args);
-}
-function sync_default(start, callback) {
-	let dir = resolve(".", start);
-	let tmp;
-	if (!statSync(dir).isDirectory()) dir = dirname(dir);
-	while (true) {
-		tmp = callback(dir, readdirSync(dir));
-		if (tmp) return resolve(dir, tmp);
-		dir = dirname(tmp = dir);
-		if (tmp === dir) break;
-	}
-}
-function sortClasses(classStr, { env, ignoreFirst = false, ignoreLast = false, removeDuplicates = true, collapseWhitespace = {
-	start: true,
-	end: true
-} }) {
-	if (typeof classStr !== "string" || classStr === "") return classStr;
-	if (classStr.includes("{{")) return classStr;
-	if (env.options.tailwindPreserveWhitespace) collapseWhitespace = false;
-	if (env.options.tailwindPreserveDuplicates) removeDuplicates = false;
-	if (collapseWhitespace && /^[\t\r\f\n ]+$/.test(classStr)) return " ";
-	let result = "";
-	let parts = classStr.split(/([\t\r\f\n ]+)/);
-	let classes = parts.filter((_, i) => i % 2 === 0);
-	let whitespace = parts.filter((_, i) => i % 2 !== 0);
-	if (classes[classes.length - 1] === "") classes.pop();
-	if (collapseWhitespace) whitespace = whitespace.map(() => " ");
-	let prefix = "";
-	if (ignoreFirst) prefix = `${classes.shift() ?? ""}${whitespace.shift() ?? ""}`;
-	let suffix = "";
-	if (ignoreLast) suffix = `${whitespace.pop() ?? ""}${classes.pop() ?? ""}`;
-	let { classList, removedIndices } = sortClassList({
-		classList: classes,
-		api: env.context,
-		removeDuplicates
-	});
-	whitespace = whitespace.filter((_, index) => !removedIndices.has(index + 1));
-	for (let i = 0; i < classList.length; i++) result += `${classList[i]}${whitespace[i] ?? ""}`;
-	if (collapseWhitespace) {
-		prefix = prefix.replace(/\s+$/g, " ");
-		suffix = suffix.replace(/^\s+/g, " ");
-		result = result.replace(/^\s+/, collapseWhitespace.start ? "" : " ").replace(/\s+$/, collapseWhitespace.end ? "" : " ");
-	}
-	return prefix + result + suffix;
-}
-function sortClassList({ classList, api, removeDuplicates }) {
-	let orderedClasses = api.getClassOrder(classList);
-	orderedClasses.sort(([nameA, a], [nameZ, z]) => {
-		if (nameA === "..." || nameA === "…") return 1;
-		if (nameZ === "..." || nameZ === "…") return -1;
-		if (a === z) return 0;
-		if (a === null) return -1;
-		if (z === null) return 1;
-		return bigSign(a - z);
-	});
-	let removedIndices = /* @__PURE__ */ new Set();
-	if (removeDuplicates) {
-		let seenClasses = /* @__PURE__ */ new Set();
-		orderedClasses = orderedClasses.filter(([cls, order], index) => {
-			if (seenClasses.has(cls)) {
-				removedIndices.add(index);
-				return false;
-			}
-			if (order !== null) seenClasses.add(cls);
-			return true;
-		});
-	}
-	return {
-		classList: orderedClasses.map(([className]) => className),
-		removedIndices
-	};
-}
-function resolveIfRelative(base, filePath) {
-	if (!filePath) return null;
-	return path.isAbsolute(filePath) ? filePath : path.resolve(base, filePath);
-}
-let pathToApiMap = expiringMap(1e4);
-async function getTailwindConfig(options) {
-	let base = options.base ?? process.cwd();
-	let inputDir = options.filepath ? path.dirname(options.filepath) : base;
-	let configPath = resolveIfRelative(base, options.configPath);
-	let stylesheetPath = resolveIfRelative(base, options.stylesheetPath);
-	let [mod, pkgDir] = await resolveTailwindPath({ packageName: options.packageName }, inputDir);
-	let stylesheet = resolveStylesheet(stylesheetPath, base);
-	let jsConfig = resolveJsConfigPath(configPath);
-	if (!stylesheet && !(mod === null || mod === void 0 ? void 0 : mod.__unstable__loadDesignSystem)) jsConfig = jsConfig ?? findClosestJsConfig(inputDir);
-	if (jsConfig) {
-		if (!stylesheet) return pathToApiMap.remember(`${pkgDir}:${jsConfig}`, async () => {
-			const { loadV3 } = await import("./v3-D-mr2VVh-Bw8A9MXh.js");
-			return loadV3(pkgDir, jsConfig);
-		});
-		error("explicit-stylesheet-and-config-together", base, `You have specified a Tailwind CSS stylesheet and a Tailwind CSS config at the same time. Use stylesheetPath unless you are using v3. Preferring the stylesheet.`);
-	}
-	if (mod && !mod.__unstable__loadDesignSystem) {
-		if (!stylesheet) return pathToApiMap.remember(`${pkgDir}:${jsConfig}`, async () => {
-			const { loadV3 } = await import("./v3-D-mr2VVh-Bw8A9MXh.js");
-			return loadV3(pkgDir, jsConfig);
-		});
-		mod = null;
-		error("stylesheet-unsupported", base, "You have specified a Tailwind CSS stylesheet but your installed version of Tailwind CSS does not support this feature.");
-	}
-	if (mod && mod.__unstable__loadDesignSystem && pkgDir) stylesheet ?? (stylesheet = `${pkgDir}/theme.css`);
-	return pathToApiMap.remember(`${pkgDir}:${stylesheet}`, async () => {
-		const { loadV4 } = await import("./v4-C-HWEQJm-B81QD_Ac.js");
-		return loadV4(mod, stylesheet);
-	});
-}
-let resolvedModCache = expiringMap(1e4);
-async function resolveTailwindPath(options, baseDir) {
-	let pkgName = options.packageName ?? "tailwindcss";
-	let makeKey = (dir) => `${pkgName}:${dir}`;
-	let cached = resolvedModCache.get(makeKey(baseDir));
-	if (cached !== void 0) return cached;
-	let resolve = async () => {
-		let pkgDir = null;
-		let mod = null;
-		try {
-			mod = await import(pathToFileURL(resolveJsFrom(baseDir, pkgName)).toString());
-			let pkgFile = resolveJsFrom(baseDir, `${pkgName}/package.json`);
-			pkgDir = path.dirname(pkgFile);
-		} catch {}
-		return [mod, pkgDir];
-	};
-	let result = await resolve();
-	let [, pkgDir] = result;
-	if (pkgDir) cacheForDirs(resolvedModCache, baseDir, result, pkgDir, makeKey);
-	else resolvedModCache.set(makeKey(baseDir), result);
-	return result;
-}
-function resolveJsConfigPath(configPath) {
-	if (!configPath) return null;
-	if (configPath.endsWith(".css")) return null;
-	return configPath;
-}
-let configPathCache = /* @__PURE__ */ new Map();
-function findClosestJsConfig(inputDir) {
-	let cached = configPathCache.get(inputDir);
-	if (cached !== void 0) return cached;
-	let configPath = null;
-	try {
-		configPath = sync_default(inputDir, (_, names) => {
-			if (names.includes("tailwind.config.js")) return "tailwind.config.js";
-			if (names.includes("tailwind.config.cjs")) return "tailwind.config.cjs";
-			if (names.includes("tailwind.config.mjs")) return "tailwind.config.mjs";
-			if (names.includes("tailwind.config.ts")) return "tailwind.config.ts";
-		}) ?? null;
-	} catch {}
-	if (configPath) cacheForDirs(configPathCache, inputDir, configPath, path.dirname(configPath));
-	else configPathCache.set(inputDir, null);
-	return configPath;
-}
-function resolveStylesheet(stylesheetPath, base) {
-	if (!stylesheetPath) return null;
-	if (stylesheetPath.endsWith(".js") || stylesheetPath.endsWith(".mjs") || stylesheetPath.endsWith(".cjs") || stylesheetPath.endsWith(".ts") || stylesheetPath.endsWith(".mts") || stylesheetPath.endsWith(".cts")) error("stylesheet-is-js-file", base, "Your `stylesheetPath` option points to a JS/TS config file. You must point to your project's `.css` file for v4 projects.");
-	else if (stylesheetPath.endsWith(".sass") || stylesheetPath.endsWith(".scss") || stylesheetPath.endsWith(".less") || stylesheetPath.endsWith(".styl")) error("stylesheet-is-preprocessor-file", base, "Your `stylesheetPath` option points to a preprocessor file. This is unsupported and you may get unexpected results.");
-	else if (!stylesheetPath.endsWith(".css")) error("stylesheet-is-not-css-file", base, "Your `stylesheetPath` option does not point to a CSS file. This is unsupported and you may get unexpected results.");
-	return stylesheetPath;
-}
-async function createSorter(opts) {
-	let preserveDuplicates = opts.preserveDuplicates ?? false;
-	let preserveWhitespace = opts.preserveWhitespace ?? false;
-	let api = await getTailwindConfig({
-		base: opts.base,
-		filepath: opts.filepath,
-		configPath: opts.configPath,
-		stylesheetPath: opts.stylesheetPath,
-		packageName: opts.packageName
-	});
-	let env = {
-		context: api,
-		changes: [],
-		options: {
-			tailwindPreserveWhitespace: preserveWhitespace,
-			tailwindPreserveDuplicates: preserveDuplicates,
-			tailwindPackageName: opts.packageName
-		},
-		matcher: void 0
-	};
-	return {
-		sortClassLists(classes) {
-			return classes.map((list) => {
-				return sortClassList({
-					api,
-					classList: list,
-					removeDuplicates: !preserveDuplicates
-				}).classList;
-			});
-		},
-		sortClassAttributes(classes) {
-			return classes.map((list) => sortClasses(list, { env }));
-		}
-	};
-}
-//#endregion
-export { sortClasses as a, sortClassList as i, error as n, warn as o, getTailwindConfig as r, createSorter as t };

package/dist/utils-D8dQkKEd-Dgy5UIHl.js

@@ -1,81 +0,0 @@
-import * as path from "node:path";
-//#region ../../node_modules/.pnpm/prettier-plugin-tailwindcss@0.0.0-insiders.3997fbd_prettier-plugin-svelte@3.5.1_prettie_57f1f908c644a91a29f5821c3681dd20/node_modules/prettier-plugin-tailwindcss/dist/utils-D8dQkKEd.mjs
-function isNodeLike(value) {
-	return typeof (value === null || value === void 0 ? void 0 : value.type) === "string";
-}
-function visit(ast, callbackMap) {
-	function _visit(node, path, meta) {
-		if (typeof callbackMap === "function") {
-			if (callbackMap(node, path, meta) === false) return;
-		} else if (node.type in callbackMap) {
-			if (callbackMap[node.type](node, path, meta) === false) return;
-		}
-		const keys = Object.keys(node);
-		for (let i = 0; i < keys.length; i++) {
-			const child = node[keys[i]];
-			if (Array.isArray(child)) {
-				for (let j = 0; j < child.length; j++) if (isNodeLike(child[j])) {
-					let newMeta = { ...meta };
-					let newPath = [{
-						node: child[j],
-						parent: node,
-						key: keys[i],
-						index: j,
-						meta: newMeta
-					}, ...path];
-					_visit(child[j], newPath, newMeta);
-				}
-			} else if (isNodeLike(child)) {
-				let newMeta = { ...meta };
-				_visit(child, [{
-					node: child,
-					parent: node,
-					key: keys[i],
-					index: i,
-					meta: newMeta
-				}, ...path], newMeta);
-			}
-		}
-	}
-	let newMeta = {};
-	_visit(ast, [{
-		node: ast,
-		parent: null,
-		key: null,
-		index: null,
-		meta: newMeta
-	}], newMeta);
-}
-function spliceChangesIntoString(str, changes) {
-	if (!changes[0]) return str;
-	changes.sort((a, b) => {
-		return a.end - b.end || a.start - b.start;
-	});
-	let result = "";
-	let previous = changes[0];
-	result += str.slice(0, previous.start);
-	result += previous.after;
-	for (let i = 1; i < changes.length; ++i) {
-		let change = changes[i];
-		result += str.slice(previous.end, change.start);
-		result += change.after;
-		previous = change;
-	}
-	result += str.slice(previous.end);
-	return result;
-}
-function bigSign(bigIntValue) {
-	return Number(bigIntValue > 0n) - Number(bigIntValue < 0n);
-}
-function cacheForDirs(cache, inputDir, value, targetDir, makeKey = (dir) => dir) {
-	let dir = inputDir;
-	while (dir !== path.dirname(dir) && dir.length >= targetDir.length) {
-		const key = makeKey(dir);
-		if (cache.get(key) !== void 0) break;
-		cache.set(key, value);
-		if (dir === targetDir) break;
-		dir = path.dirname(dir);
-	}
-}
-//#endregion
-export { visit as i, cacheForDirs as n, spliceChangesIntoString as r, bigSign as t };