@codefast/cli 0.3.13-canary.0 → 0.3.13-canary.1

package/dist/lib/arrange/domain/grouping.mjs

@@ -1,2 +1,235 @@
-import { a as suggestCnGroups, i as mergeSingletons, n as capGroups, o as summarizeGroupBucketLabels, r as mergeEaseTimingIntoFollowingAnimatedState, t as areCnTailwindPartitionsEquivalent } from "../../../grouping-c1grpCQT.mjs";
+import { BUCKET_ORDER } from "./constants.mjs";
+import { bucketsCompatible, bucketsMergeCompatible, classifyToken, compositeSecondaryOrder, selectorKey, stateKey, stripVariants, tokenizeClassString } from "./tokenizer.mjs";
+//#region src/lib/arrange/domain/grouping.ts
+function isVariantKeyedBucket(bucket) {
+	return bucket === "selector" || bucket === "state" || bucket === "starting";
+}
+function variantGroupKey(bucket, classToken) {
+	return bucket === "selector" ? selectorKey(classToken) : stateKey(classToken);
+}
+/**
+* True when `staticLiteralTexts` carries the **same partition** of Tailwind tokens as
+* `suggestedGroups` from {@link suggestCnGroups}, ignoring order of arguments and
+* order of tokens within each chunk.
+*/
+function areCnTailwindPartitionsEquivalent(staticLiteralTexts, suggestedGroups) {
+	const partitionSignatures = (chunks) => chunks.map((chunk) => {
+		const classTokens = tokenizeClassString(chunk);
+		return classTokens.length === 0 ? "" : [...classTokens].sort().join(" ");
+	}).filter((s) => s.length > 0).sort((a, b) => a.localeCompare(b));
+	const staticPartitionSigs = partitionSignatures(staticLiteralTexts);
+	const suggestedPartitionSigs = partitionSignatures(suggestedGroups);
+	if (staticPartitionSigs.length !== suggestedPartitionSigs.length) return false;
+	for (let i = 0; i < staticPartitionSigs.length; i++) if (staticPartitionSigs[i] !== suggestedPartitionSigs[i]) return false;
+	return true;
+}
+/** Dominant bucket of a whitespace-delimited class group (for merge heuristics). */
+function dominantBucketOfGroup(groupStr) {
+	const counts = /* @__PURE__ */ new Map();
+	for (const classToken of tokenizeClassString(groupStr)) {
+		const tokenBucket = classifyToken(classToken);
+		counts.set(tokenBucket, (counts.get(tokenBucket) ?? 0) + 1);
+	}
+	let best = "other";
+	let bestN = 0;
+	for (const [bucket, count] of counts) {
+		if (count > bestN) {
+			best = bucket;
+			bestN = count;
+			continue;
+		}
+		if (count === bestN && BUCKET_ORDER[bucket] < BUCKET_ORDER[best]) best = bucket;
+	}
+	return best;
+}
+/** Dynamic cap: more tokens → allow more groups, within [BASE, CAP]. */
+function dynamicMaxGroups(tokenCount) {
+	const byTokens = Math.ceil(tokenCount / 2) + 2;
+	return Math.max(4, Math.min(24, byTokens));
+}
+/**
+* Merge singleton groups (< MIN_GROUP_TOKENS tokens) into their nearest
+* neighbour. Prefers merging toward a bucket-compatible neighbor.
+*
+* Loop termination: each iteration either splices one element (shrinking the
+* array, guaranteeing progress) or finds no singleton that can merge and exits
+* via `changed = false`. Two mutually-incompatible singletons both hit
+* `continue` and `changed` stays false, so the loop exits without spinning.
+*/
+function mergeSingletons(groups) {
+	if (groups.length <= 1) return groups;
+	const result = [...groups];
+	let changed = true;
+	while (changed) {
+		changed = false;
+		for (let i = 0; i < result.length; i++) if (tokenizeClassString(result[i]).length < 2) {
+			if (result.length === 1) break;
+			const myBucket = dominantBucketOfGroup(result[i]);
+			const prevCompat = i > 0 && bucketsMergeCompatible(myBucket, dominantBucketOfGroup(result[i - 1]));
+			const nextCompat = i < result.length - 1 && bucketsMergeCompatible(myBucket, dominantBucketOfGroup(result[i + 1]));
+			let mergeDir;
+			if (nextCompat && !prevCompat) mergeDir = "forward";
+			else if (prevCompat && !nextCompat) mergeDir = "backward";
+			else if (prevCompat && nextCompat) mergeDir = i < result.length - 1 ? "forward" : "backward";
+			else continue;
+			if (mergeDir === "forward") result[i + 1] = result[i] + " " + result[i + 1];
+			else result[i - 1] = result[i - 1] + " " + result[i];
+			result.splice(i, 1);
+			changed = true;
+			break;
+		}
+	}
+	return result;
+}
+/** Tie-break when two merge candidates are both {@link bucketsMergeCompatible} (same bucket or COMPATIBLE_BUCKET_SETS). */
+function capMergePenalty(leftBucket, rightBucket) {
+	if (leftBucket === rightBucket) return 0;
+	if (bucketsCompatible(leftBucket, rightBucket)) return 0;
+	return 500;
+}
+/**
+* Merge adjacent groups until total count ≤ maxGroups.
+* Only merges pairs allowed by {@link bucketsMergeCompatible} — never glues incompatible
+* buckets (which previously defaulted to penalty 0 and merged layout+state when over cap).
+*
+* Complexity: O(n²) in the number of groups — each merge pass scans all remaining adjacent
+* pairs. In practice `n` is bounded by {@link MAX_GROUPS_CAP} (24) and typical class strings
+* are well below that, so this is not a concern for the current usage pattern. If this ever
+* runs in a high-throughput batch mode, consider a priority-queue approach.
+*/
+function capGroups(groups, maxGroups) {
+	const result = [...groups];
+	const lengths = result.map((groupStr) => tokenizeClassString(groupStr).length);
+	while (result.length > maxGroups) {
+		const mergePairCandidates = [];
+		for (let i = 0; i < result.length - 1; i++) {
+			const dominantLeft = dominantBucketOfGroup(result[i]);
+			const dominantRight = dominantBucketOfGroup(result[i + 1]);
+			if (!bucketsMergeCompatible(dominantLeft, dominantRight)) continue;
+			mergePairCandidates.push({
+				i,
+				size: lengths[i] + lengths[i + 1],
+				penalty: capMergePenalty(dominantLeft, dominantRight)
+			});
+		}
+		if (mergePairCandidates.length === 0) break;
+		let best = mergePairCandidates[0];
+		for (const candidate of mergePairCandidates) if (candidate.penalty < best.penalty || candidate.penalty === best.penalty && candidate.size < best.size) best = candidate;
+		const bestIdx = best.i;
+		result[bestIdx] = result[bestIdx] + " " + result[bestIdx + 1];
+		lengths[bestIdx] = lengths[bestIdx] + lengths[bestIdx + 1];
+		result.splice(bestIdx + 1, 1);
+		lengths.splice(bestIdx + 1, 1);
+	}
+	return result;
+}
+/**
+* If a chunk is **only** bare `ease-*` timing (Motion), buffer it and prepend to the **first**
+* **later** chunk that is predominantly `state` **and** contains some `animate-*` utility —
+* skipping intermediate `state` chunks (`sm:…`, `group-data-[…]:…`, etc.) that sit between
+* `ease-ui` and `data-open:animate-*`. If no such chunk exists, the ease chunk is left as-is.
+*/
+function mergeEaseTimingIntoFollowingAnimatedState(groups) {
+	const result = [...groups];
+	let changed = true;
+	while (changed) {
+		changed = false;
+		for (let i = 0; i < result.length; i++) {
+			if (!chunkIsOnlyEaseTimingMotion(result[i])) continue;
+			const easeStr = result[i];
+			let target = -1;
+			for (let j = i + 1; j < result.length; j++) {
+				if (dominantBucketOfGroup(result[j]) !== "state") continue;
+				if (!tokenizeClassString(result[j]).some((classToken) => /^animate/.test(stripVariants(classToken)))) continue;
+				target = j;
+				break;
+			}
+			if (target === -1) continue;
+			result[target] = `${easeStr} ${result[target]}`.trim();
+			result.splice(i, 1);
+			changed = true;
+			break;
+		}
+	}
+	return result;
+}
+function chunkIsOnlyEaseTimingMotion(groupStr) {
+	const classTokens = tokenizeClassString(groupStr);
+	if (classTokens.length === 0) return false;
+	return classTokens.every((classToken) => classifyToken(classToken) === "motion" && /^ease-/.test(stripVariants(classToken)));
+}
+function suggestCnGroups(classString) {
+	const tokens = tokenizeClassString(classString);
+	if (tokens.length === 0) return [];
+	const classified = tokens.map((classToken, index) => ({
+		classToken,
+		bucket: classifyToken(classToken),
+		index
+	}));
+	classified.sort((left, right) => {
+		const bucketOrderDiff = BUCKET_ORDER[left.bucket] - BUCKET_ORDER[right.bucket];
+		if (bucketOrderDiff !== 0) return bucketOrderDiff;
+		if (left.bucket === "composite" && right.bucket === "composite") {
+			const compositeOrderDiff = compositeSecondaryOrder(stripVariants(left.classToken)) - compositeSecondaryOrder(stripVariants(right.classToken));
+			if (compositeOrderDiff !== 0) return compositeOrderDiff;
+		}
+		return left.index - right.index;
+	});
+	const rawGroups = [];
+	/** Bucket of the last token already placed in the current run (pairwise compat with `COMPATIBLE_BUCKET_SETS`). */
+	let lastBucketInRun = null;
+	let currentStateKey = null;
+	let currentTokens = [];
+	const flush = () => {
+		if (currentTokens.length > 0) {
+			rawGroups.push(currentTokens.join(" "));
+			currentTokens = [];
+		}
+		lastBucketInRun = null;
+		currentStateKey = null;
+	};
+	for (const { classToken, bucket: tokenBucket } of classified) {
+		if (lastBucketInRun === null) {
+			lastBucketInRun = tokenBucket;
+			currentStateKey = isVariantKeyedBucket(tokenBucket) ? variantGroupKey(tokenBucket, classToken) : null;
+			currentTokens.push(classToken);
+			continue;
+		}
+		if (isVariantKeyedBucket(tokenBucket)) {
+			const key = variantGroupKey(tokenBucket, classToken);
+			if (currentStateKey !== null && key !== currentStateKey) {
+				flush();
+				lastBucketInRun = tokenBucket;
+				currentStateKey = key;
+				currentTokens.push(classToken);
+				continue;
+			}
+		}
+		if (!bucketsCompatible(tokenBucket, lastBucketInRun)) {
+			flush();
+			lastBucketInRun = tokenBucket;
+			currentStateKey = isVariantKeyedBucket(tokenBucket) ? variantGroupKey(tokenBucket, classToken) : null;
+			currentTokens.push(classToken);
+			continue;
+		}
+		if (isVariantKeyedBucket(tokenBucket)) currentStateKey = variantGroupKey(tokenBucket, classToken);
+		else if (currentStateKey !== null) currentStateKey = null;
+		lastBucketInRun = tokenBucket;
+		currentTokens.push(classToken);
+	}
+	flush();
+	const withEaseMerged = mergeEaseTimingIntoFollowingAnimatedState(mergeSingletons(rawGroups));
+	return capGroups(withEaseMerged, Math.max(dynamicMaxGroups(tokens.length), withEaseMerged.length));
+}
+/**
+* One label per suggested group: a single bucket name, or `mixed:a+b` when that chunk
+* spans multiple Tailwind buckets (matches `codefast arrange group` stdout).
+*/
+function summarizeGroupBucketLabels(groups) {
+	return groups.map((g) => {
+		const uniq = new Set(tokenizeClassString(g).map(classifyToken));
+		return uniq.size === 1 ? [...uniq][0] : `mixed:${[...uniq].sort().join("+")}`;
+	});
+}
+//#endregion
 export { areCnTailwindPartitionsEquivalent, capGroups, mergeEaseTimingIntoFollowingAnimatedState, mergeSingletons, suggestCnGroups, summarizeGroupBucketLabels };

package/dist/lib/arrange/domain/imports.mjs

@@ -1,2 +1,54 @@
-import { n as ensureCnImport, t as cnModuleSpecifierForFile } from "../../../imports-DSVq1xhB.mjs";
+import ts from "typescript";
+//#region src/lib/arrange/domain/imports.ts
+function sourceFileImportsCn(sf) {
+	for (const statement of sf.statements) {
+		if (!ts.isImportDeclaration(statement) || !statement.importClause) continue;
+		const clause = statement.importClause;
+		if (clause.name?.text === "cn") return true;
+		if (clause.namedBindings && ts.isNamedImports(clause.namedBindings)) {
+			for (const importedBinding of clause.namedBindings.elements) if (importedBinding.name.text === "cn") return true;
+		}
+	}
+	return false;
+}
+/**
+* Resolve the module specifier used when injecting a `cn` import into a file.
+*/
+function cnModuleSpecifierForFile(filePath, override) {
+	if (override) return override;
+	return "@codefast/tailwind-variants";
+}
+function findImportDeclarationFromModule(sf, moduleSpecifier) {
+	for (const statement of sf.statements) {
+		if (!ts.isImportDeclaration(statement)) continue;
+		const spec = statement.moduleSpecifier;
+		if (ts.isStringLiteral(spec) && spec.text === moduleSpecifier) return statement;
+	}
+}
+function ensureCnImport(sourceText, filePath, cnImportOverride) {
+	const sf = ts.createSourceFile(filePath, sourceText, ts.ScriptTarget.Latest, true, filePath.endsWith(".tsx") ? ts.ScriptKind.TSX : ts.ScriptKind.TS);
+	if (sourceFileImportsCn(sf)) return sourceText;
+	const moduleSpecifier = cnModuleSpecifierForFile(filePath, cnImportOverride);
+	const decl = findImportDeclarationFromModule(sf, moduleSpecifier);
+	if (decl?.importClause && !decl.importClause.isTypeOnly && decl.importClause.namedBindings && ts.isNamedImports(decl.importClause.namedBindings)) {
+		const elements = decl.importClause.namedBindings.elements;
+		if (elements.length > 0) {
+			const pos = elements[0].getStart(sf);
+			return `${sourceText.slice(0, pos)}cn, ${sourceText.slice(pos)}`;
+		}
+	}
+	const importLine = `import { cn } from "${moduleSpecifier}";`;
+	let firstImport = -1;
+	for (const statement of sf.statements) if (ts.isImportDeclaration(statement)) {
+		firstImport = statement.getStart(sf);
+		break;
+	}
+	const useClient = /^["']use client["'];?\s*\r?\n/.exec(sourceText);
+	let insertAt;
+	if (useClient) insertAt = useClient[0].length;
+	else if (firstImport !== -1) insertAt = firstImport;
+	else insertAt = 0;
+	return `${sourceText.slice(0, insertAt)}${importLine}\n${sourceText.slice(insertAt)}`;
+}
+//#endregion
 export { cnModuleSpecifierForFile, ensureCnImport };

package/dist/lib/arrange/domain/tokenizer.mjs

@@ -1,2 +1,216 @@
-import { a as compositeSecondaryOrder, c as selectorKey, d as tokenizeClassString, i as classifyToken, l as stateKey, n as bucketsMergeCompatible, o as indexOfFirstVariantColon, r as classifyBareUtility, s as isArbitraryParentSelectorStateToken, t as bucketsCompatible, u as stripVariants } from "../../../tokenizer-CeZx73Zu.mjs";
+import { COMPATIBLE_BUCKET_SETS, RESPONSIVE_PREFIX, STATE_PREFIXES } from "./constants.mjs";
+//#region src/lib/arrange/domain/tokenizer.ts
+/**
+* Variant stems not covered by a single entry in STATE_PREFIXES (compound `has-*`,
+* numbered `nth-*`, media features, v4 `in-[…]`, child selectors `*` / `**`, …).
+* When these are missed, `isStateToken` is false and the variant is stripped — the
+* utility is then bucketed as if it were unconditional, which breaks preview grouping.
+*/
+function isCompoundOrMediaVariantPrefix(prefix) {
+	if (prefix === "*" || prefix === "**") return true;
+	if (prefix === "inert") return true;
+	if (prefix.startsWith("has-")) return true;
+	if (prefix.startsWith("in-[")) return true;
+	if (/^nth(?:-last)?(?:-of-type)?(?:-\d+|-\[)/.test(prefix) || /^nth-of-type-\d+$/.test(prefix) || /^nth-last-of-type-\d+$/.test(prefix)) return true;
+	if (/^(?:user-valid|user-invalid|contrast-more|contrast-less|forced-colors|inverted-colors)$/.test(prefix)) return true;
+	if (/^(?:any-)?pointer-(?:fine|coarse|none)$/.test(prefix)) return true;
+	if (/^(?:portrait|landscape|noscript)$/.test(prefix)) return true;
+	return false;
+}
+function tokenizeClassString(classString) {
+	return classString.trim().split(/\s+/).filter(Boolean);
+}
+/**
+* Index of the first `:` that separates a Tailwind variant segment from the rest.
+* Colons inside `[...]` (at positive bracket depth) are ignored so selectors like
+* `[&_a:hover]:text-red-500` split as `[&_a:hover]:` + `text-red-500`.
+*/
+function indexOfFirstVariantColon(text) {
+	let depth = 0;
+	for (let i = 0; i < text.length; i++) {
+		const ch = text[i];
+		if (ch === "[") depth++;
+		else if (ch === "]") depth = Math.max(0, depth - 1);
+		else if (ch === ":" && depth === 0) return i;
+	}
+	return -1;
+}
+function stripVariants(token) {
+	let withoutVariants = token;
+	const MAX_PASSES = 12;
+	for (let i = 0; i < MAX_PASSES; i++) {
+		const colonIdx = indexOfFirstVariantColon(withoutVariants);
+		if (colonIdx === -1) break;
+		withoutVariants = withoutVariants.slice(colonIdx + 1);
+	}
+	return withoutVariants;
+}
+/** Outermost variant segment: first `:` at bracket depth 0 → text before it. */
+function firstLeadingVariantPrefix(token) {
+	const colonIdx = indexOfFirstVariantColon(token);
+	if (colonIdx === -1) return;
+	return token.slice(0, colonIdx);
+}
+function isSelectorVariantToken(token) {
+	const prefix = firstLeadingVariantPrefix(token);
+	if (prefix === void 0) return false;
+	if (prefix === "*" || prefix === "**") return true;
+	if (prefix.startsWith("has-")) return true;
+	if (prefix.startsWith("in-[")) return true;
+	if (prefix.startsWith("group-[")) return true;
+	if (prefix.startsWith("peer-[")) return true;
+	if (prefix.startsWith("not-[")) return true;
+	return false;
+}
+function isStateToken(token) {
+	const prefix = firstLeadingVariantPrefix(token);
+	if (prefix === void 0) return false;
+	if (RESPONSIVE_PREFIX.test(token)) return true;
+	if (STATE_PREFIXES.has(prefix)) return true;
+	if (prefix.startsWith("data-[")) return true;
+	if (prefix.startsWith("aria-[")) return true;
+	if (prefix.startsWith("supports-[")) return true;
+	if (prefix.startsWith("in-data-")) return true;
+	if (/^data-(?!\[)/.test(prefix)) return true;
+	if (/^aria-/.test(prefix)) return true;
+	if (/^(group|peer)-/.test(prefix)) return true;
+	if (/^not-/.test(prefix)) return true;
+	if (isCompoundOrMediaVariantPrefix(prefix)) return true;
+	if (prefix.startsWith("[") && prefix.endsWith("]")) return true;
+	return false;
+}
+/**
+* Secondary sort inside the **composite** bucket: opacity / blend / isolation →
+* 3D context → 3D transforms → 2D transforms → filters → will-change.
+*/
+function compositeSecondaryOrder(bareUtility) {
+	const b = bareUtility;
+	if (/^opacity(?:-|$)/.test(b) || /^mix-blend-/.test(b) || /^isolation(?:-|$)/.test(b) || b === "isolate") return 0;
+	if (b === "transform-3d" || /^perspective(?:-|$)/.test(b)) return 10;
+	if (/^rotate-[xyz](?:-|$)/.test(b) || /^translate-z(?:-|$)/.test(b) || /^scale-z(?:-|$)/.test(b)) return 20;
+	if (/^translate(?:-|$)/.test(b) || /^scale(?:-|$)/.test(b) || /^rotate(?:-|$)/.test(b) || /^skew(?:-|$)/.test(b)) return 30;
+	if (/^transform(?:-(?:gpu|cpu|none))?$/.test(b)) return 35;
+	if (/^blur(?:-|$)/.test(b) || /^backdrop-/.test(b) || /^filter(?:-|$)/.test(b) || /^brightness-/.test(b) || /^contrast-/.test(b) || /^grayscale(?:-|$)/.test(b) || /^hue-rotate-/.test(b) || /^invert(?:-|$)/.test(b) || /^saturate-/.test(b) || /^sepia(?:-|$)/.test(b)) return 40;
+	if (/^will-change/.test(b)) return 50;
+	return 99;
+}
+/** Classify a **bare** utility (no `hover:` / `md:` / … prefixes). */
+function classifyBareUtility(bareUtility) {
+	const b = bareUtility;
+	if (/^@container(?:\/[a-z][a-z0-9-]*)?$/i.test(b)) return "existence";
+	if (/^(?:hidden|contents|sr-only|not-sr-only|list-item|flow-root)$/.test(b) || /^(?:block|inline-block|inline)$/.test(b)) return "existence";
+	if (/^table(?:$|-)/.test(b)) return "existence";
+	if (/^contain-/.test(b)) return "existence";
+	if (/^(?:group|peer)(?:\/[a-z][a-z0-9-]*)?$/.test(b)) return "existence";
+	if (/^(?:static|relative|absolute|fixed|sticky)$/.test(b)) return "position";
+	if (/^-?(?:inset|top|right|bottom|left|start|end)(?:-|\/|$)/.test(b) || /^-?(?:inset-x|inset-y|inset-s|inset-e)-/.test(b)) return "position";
+	if (/^-?z-/.test(b) || b === "z-auto") return "position";
+	if (/^(?:flex|inline-flex|grid|inline-grid|subgrid|masonry)(?:$|-)/.test(b) || /^(?:items|justify|justify-items|justify-self|content|self|place|place-content|place-items|place-self)-/.test(b) || /^-?(?:gap|space-[xy]|col-|row-|grid-|auto-cols|auto-rows|order-|order$)/.test(b) || /^-?(?:auto-flow|grid-flow)-/.test(b) || /^(?:columns-|break-after|break-before|break-inside)-/.test(b) || /^(?:float|clear)-/.test(b) || /^(?:wrap-|flex-wrap|flex-nowrap|flex-row|flex-col|flex-auto|flex-initial|flex-none|flex-1|flex-\[)/.test(b) || /^container$/.test(b)) return "layout";
+	if (/^-?(?:w|h|min-w|max-w|min-h|max-h|size|aspect|shrink|grow|basis)-/.test(b) || /^(?:shrink|grow)(?:$|-)/.test(b) || /^-?overflow-/.test(b) || /^-?object-/.test(b)) return "sizing";
+	if (/^-?(?:p|px|py|pt|pb|pl|pr|ps|pe|m|mx|my|mt|mb|ml|mr|ms|me)-/.test(b)) return "spacing";
+	if (/^-?(?:rounded|border|ring|divide|inset-ring)(?:-|\/|$)/.test(b) || /^(?:rounded|border|ring|divide|inset-ring)$/.test(b) || /^ring-offset-/.test(b)) return "shape";
+	if (/^-?bg-/.test(b) || /^(?:from|via|to)(?:-|\/|$)/.test(b) || /^bg-(?:linear|radial|conic)-/.test(b) || /^-?mask-/.test(b) || /^-?(?:fill|stroke)-/.test(b)) return "background";
+	if (/^-?(?:shadow|inset-shadow|drop-shadow|text-shadow)(?:-|\/|$)/.test(b) || /^(?:shadow|inset-shadow)$/.test(b) || /^-?outline(?:-|\/|$)/.test(b) || /^outline$/.test(b)) return "shadow";
+	if (/^-?(?:font|leading|tracking|list|indent|align|decoration|underline-offset|text-wrap|text-balance|text-pretty)-/.test(b) || /^-?(?:text-(?!shadow))/.test(b) || /^-?(?:whitespace|break|line-clamp|hyphens)-/.test(b) || /^(?:antialiased|subpixel-antialiased|italic|not-italic|overline|line-through|underline|no-underline|uppercase|lowercase|capitalize|normal-case|truncate|text-wrap|text-balance|text-pretty)$/.test(b) || /^text-wrap-/.test(b) || /^tabular-nums$|^slashed-zero$|^lining-nums$|^oldstyle-nums$|^proportional-nums$/.test(b)) return "typography";
+	if (/^opacity(?:-|$)/.test(b) || /^mix-blend-/.test(b) || /^isolation(?:-|$)/.test(b) || b === "isolate" || /^transform(?:-(?:gpu|cpu|none))?$/.test(b) || /^-?(?:translate|scale|rotate|skew)-/.test(b) || /^perspective(?:-|$)/.test(b) || b === "transform-3d" || /^blur(?:-|$)/.test(b) || /^backdrop-/.test(b) || /^filter(?:-|$)/.test(b) || /^brightness-/.test(b) || /^contrast-/.test(b) || /^grayscale(?:-|$)/.test(b) || /^hue-rotate-/.test(b) || /^invert(?:-|$)/.test(b) || /^saturate-/.test(b) || /^sepia(?:-|$)/.test(b) || /^will-change/.test(b)) return "composite";
+	if (/^(?:transition|duration|ease|delay|animate)(?:-|$)/.test(b) || /^ease-/.test(b)) return "motion";
+	if (/^(?:cursor|pointer-events|select|touch|scroll|scroll-m|scroll-p|overscroll|snap|resize|field-sizing|appearance|scheme|color-scheme|accent|caret)(?:-|$)/.test(b) || /^(?:cursor|select|resize)$/.test(b) || /^scroll-behavior/.test(b) || /^scroll-snap/.test(b) || /^touch-action/.test(b) || b === "inert") return "behavior";
+	return "other";
+}
+/**
+* Arbitrary **parent** selectors (`[&…]`, `[&>a]:…`, slot forms with `&` inside the bracket)
+* scope utilities to descendants — bucket as `selector` so they chunk apart from base layout/typography
+* and are labeled distinctly from interactive `state` variants (`hover:`, `data-[…]:`, …).
+* Pure arbitrary **properties** (`[--x]:`, `[color:red]`) have no `&` in the leading `[…]` segment.
+*/
+function isArbitraryParentSelectorStateToken(token) {
+	if (/^\[&/.test(token)) return true;
+	if (!token.startsWith("[")) return false;
+	const colonIdx = indexOfFirstVariantColon(token);
+	if (colonIdx === -1 || colonIdx === 0 || token[colonIdx - 1] !== "]") return false;
+	return token.slice(0, colonIdx).includes("&");
+}
+function classifyToken(token) {
+	if (isArbitraryParentSelectorStateToken(token)) return "selector";
+	if (isSelectorVariantToken(token)) return "selector";
+	if (/^@container(?:\/[a-z][a-z0-9-]*)?$/i.test(token)) return "existence";
+	if (token.startsWith("[")) {
+		const splitIdx = indexOfFirstVariantColon(token);
+		if (splitIdx === -1) return "arbitrary";
+		if (splitIdx === 0 || token[splitIdx - 1] !== "]") return "arbitrary";
+	}
+	if (firstLeadingVariantPrefix(token) === "starting") return "starting";
+	if (isStateToken(token)) return "state";
+	return classifyBareUtility(stripVariants(token));
+}
+/**
+* Stable key for `data-[…]` variants so unrelated selectors stay split, while
+* **branching on the full bracket** (e.g. `data-[vaul-drawer-direction=bottom]`
+* vs `=left`) keeps direction-specific utilities in separate state groups.
+*/
+function dataAttributeStem(token) {
+	const match = token.match(/^data-\[([^\]]*)\]/);
+	return match ? `data-[${match[1]}]` : "data";
+}
+/** Same idea as {@link dataAttributeStem} for `aria-[…]:` variants. */
+function ariaAttributeStem(token) {
+	const match = token.match(/^aria-\[([^\]]*)\]/);
+	return match ? `aria-[${match[1]}]` : "aria";
+}
+/** `in-data-[…]:` — normalize on the full bracket expression like {@link dataAttributeStem}. */
+function inDataAttributeStem(token) {
+	const match = token.match(/^in-data-\[([^\]]*)\]/);
+	return match ? `in-data-[${match[1]}]` : "in-data";
+}
+/**
+* Stable key for splitting adjacent `state` / `starting` tokens in {@link suggestCnGroups}
+* (`selector` uses {@link selectorKey}).
+* Uses the **full variant stack** (every `:` segment outside `[…]`), not only the
+* outermost prefix, so `@md/foo:[&>*]:w-auto` and `@md/foo:has-[…]:mt-px` stay in
+* separate groups while `hover:opacity` still keys as `hover` + `opacity`…
+*
+* `data-[…]` / `aria-[…]` normalize the first segment via {@link dataAttributeStem} /
+* {@link ariaAttributeStem} (full token required for bracket capture).
+*/
+function stateKey(token) {
+	const layers = [];
+	let rest = token;
+	while (rest.length > 0) {
+		const colonIdx = indexOfFirstVariantColon(rest);
+		if (colonIdx === -1) break;
+		layers.push(rest.slice(0, colonIdx));
+		rest = rest.slice(colonIdx + 1);
+	}
+	if (layers.length === 0) return token;
+	if (layers[0].startsWith("data-[")) layers[0] = dataAttributeStem(token);
+	else if (layers[0].startsWith("aria-[")) layers[0] = ariaAttributeStem(token);
+	else if (layers[0].startsWith("in-data-[")) layers[0] = inDataAttributeStem(token);
+	return layers.join("");
+}
+const SELECTOR_KEY_SEP = "";
+/**
+* Variant key for {@link Bucket} `"selector"` tokens in {@link suggestCnGroups}.
+* Reuses {@link stateKey} layer splitting, then normalizes common shadcn/Radix SVG patterns so
+* `[&_svg]:…` and `[&_svg:not([class*='size-'])]:…` stay in one chunk.
+*/
+function selectorKey(token) {
+	return stateKey(token).split(SELECTOR_KEY_SEP).map(normalizeSelectorVariantLayer).join(SELECTOR_KEY_SEP);
+}
+function normalizeSelectorVariantLayer(layer) {
+	if (layer === "[&_svg:not([class*='size-'])]") return "[&_svg]";
+	return layer;
+}
+function bucketsCompatible(a, b) {
+	if (a === b) return true;
+	return COMPATIBLE_BUCKET_SETS.some((bucketSet) => bucketSet.has(a) && bucketSet.has(b));
+}
+/** Like {@link bucketsCompatible}, but never merge two distinct state / starting / selector variant blobs. */
+function bucketsMergeCompatible(a, b) {
+	if (a === "state" && b === "state") return false;
+	if (a === "starting" && b === "starting") return false;
+	if (a === "selector" && b === "selector") return false;
+	if (a === "arbitrary" || b === "arbitrary") return false;
+	return bucketsCompatible(a, b);
+}
+//#endregion
 export { bucketsCompatible, bucketsMergeCompatible, classifyBareUtility, classifyToken, compositeSecondaryOrder, indexOfFirstVariantColon, isArbitraryParentSelectorStateToken, selectorKey, stateKey, stripVariants, tokenizeClassString };

package/dist/lib/arrange/index.mjs

@@ -1,16 +1,15 @@
-import { i as DEFAULT_ARRANGE_TARGET, o as LONG_STRING_TOKEN_THRESHOLD, p as MAX_STRIP_VARIANT_PASSES } from "../../constants-AtPhF-Ct.mjs";
-import { c as selectorKey, d as tokenizeClassString, i as classifyToken, l as stateKey, n as bucketsMergeCompatible, o as indexOfFirstVariantColon, t as bucketsCompatible, u as stripVariants } from "../../tokenizer-CeZx73Zu.mjs";
-import { a as mergeCnUnconditionalLiteralPoolForTest, r as forEachStringLiteralInClassExpression } from "../../collectors-cn-BS8TTQ8O.mjs";
-import { a as isCnOrTvIdentifier, i as indentOfLineContaining, l as unwrapCnInsideTvCallReplacement, n as applyEditsDescending, o as lineOf, r as buildKnownCnTvBindings, s as moduleLooksLikeCnTvReexport, t as KNOWN_CN_TV_MODULES } from "../../ast-helpers-MDRYuIAk.mjs";
-import { n as walkTsxFiles, t as DEFAULT_SKIP_DIRS } from "../../walk-DjgQn66n.mjs";
-import { t as analyzeDirectory } from "../../analyze-DvtJ3j9m.mjs";
-import { t as printAnalyzeReport } from "../../report-DYxvw34T.mjs";
-import { a as suggestCnGroups, i as mergeSingletons, n as capGroups, o as summarizeGroupBucketLabels, r as mergeEaseTimingIntoFollowingAnimatedState, t as areCnTailwindPartitionsEquivalent } from "../../grouping-c1grpCQT.mjs";
-import { a as formatJsxCnAttributeValue, i as formatCnCall, n as formatArray, r as formatCnArguments, t as escapeTsStringLiteralContent } from "../../formatters-DGE8jJ53.mjs";
-import { n as ensureCnImport, t as cnModuleSpecifierForFile } from "../../imports-DSVq1xhB.mjs";
-import { t as groupFile } from "../../group-file-ClW7XdD6.mjs";
-import { n as ArrangeErrorCode, t as ArrangeError } from "../../errors-CpU1ogfA.mjs";
-import { n as runOnTarget, t as runArrangeSync } from "../../run-target-CJWrqNT4.mjs";
-import { n as createNodeCliLogger, t as createNodeCliFs } from "../../node-io-DFRbHO6m.mjs";
-import "../../arrange-BqP2DI3w.mjs";
+import { DEFAULT_ARRANGE_TARGET, LONG_STRING_TOKEN_THRESHOLD, MAX_STRIP_VARIANT_PASSES } from "./domain/constants.mjs";
+import { bucketsCompatible, bucketsMergeCompatible, classifyToken, indexOfFirstVariantColon, selectorKey, stateKey, stripVariants, tokenizeClassString } from "./domain/tokenizer.mjs";
+import { forEachStringLiteralInClassExpression, mergeCnUnconditionalLiteralPoolForTest } from "./domain/ast/collectors-cn.mjs";
+import { KNOWN_CN_TV_MODULES, applyEditsDescending, buildKnownCnTvBindings, indentOfLineContaining, isCnOrTvIdentifier, lineOf, moduleLooksLikeCnTvReexport, unwrapCnInsideTvCallReplacement } from "./domain/ast/ast-helpers.mjs";
+import { DEFAULT_SKIP_DIRS, walkTsxFiles } from "./infra/walk.mjs";
+import { analyzeDirectory } from "./application/analyze.mjs";
+import { printAnalyzeReport } from "./presentation/report.mjs";
+import { areCnTailwindPartitionsEquivalent, capGroups, mergeEaseTimingIntoFollowingAnimatedState, mergeSingletons, suggestCnGroups, summarizeGroupBucketLabels } from "./domain/grouping.mjs";
+import { escapeTsStringLiteralContent, formatArray, formatCnArguments, formatCnCall, formatJsxCnAttributeValue } from "./presentation/formatters.mjs";
+import { cnModuleSpecifierForFile, ensureCnImport } from "./domain/imports.mjs";
+import { groupFile } from "./application/group-file.mjs";
+import { ArrangeError, ArrangeErrorCode } from "./domain/errors.mjs";
+import { runArrangeSync, runOnTarget } from "./application/run-target.mjs";
+import { createNodeCliFs, createNodeCliLogger } from "../infra/node-io.mjs";
 export { ArrangeError, ArrangeErrorCode, DEFAULT_ARRANGE_TARGET, DEFAULT_SKIP_DIRS, KNOWN_CN_TV_MODULES, LONG_STRING_TOKEN_THRESHOLD, MAX_STRIP_VARIANT_PASSES, analyzeDirectory, applyEditsDescending, areCnTailwindPartitionsEquivalent, bucketsCompatible, bucketsMergeCompatible, buildKnownCnTvBindings, capGroups, classifyToken, cnModuleSpecifierForFile, createNodeCliFs, createNodeCliLogger, ensureCnImport, escapeTsStringLiteralContent, forEachStringLiteralInClassExpression, formatArray, formatCnArguments, formatCnCall, formatJsxCnAttributeValue, groupFile, indentOfLineContaining, indexOfFirstVariantColon, isCnOrTvIdentifier, lineOf, mergeCnUnconditionalLiteralPoolForTest, mergeEaseTimingIntoFollowingAnimatedState, mergeSingletons, moduleLooksLikeCnTvReexport, printAnalyzeReport, runArrangeSync, runOnTarget, selectorKey, stateKey, stripVariants, suggestCnGroups, summarizeGroupBucketLabels, tokenizeClassString, unwrapCnInsideTvCallReplacement, walkTsxFiles };

package/dist/lib/arrange/infra/walk.mjs

@@ -1,2 +1,33 @@
-import { n as walkTsxFiles, t as DEFAULT_SKIP_DIRS } from "../../../walk-DjgQn66n.mjs";
+import path from "node:path";
+//#region src/lib/arrange/infra/walk.ts
+const DEFAULT_SKIP_DIRS = new Set([
+	"node_modules",
+	"dist",
+	".git",
+	".turbo",
+	".next",
+	".cache",
+	"out",
+	"build",
+	"coverage",
+	".vercel",
+	".output"
+]);
+function walkTsxFiles(rootDirectoryPath, fs) {
+	const result = [];
+	const visit = (entryPath) => {
+		if (fs.statSync(entryPath).isDirectory()) {
+			for (const childName of fs.readdirSync(entryPath)) {
+				if (DEFAULT_SKIP_DIRS.has(childName)) continue;
+				visit(path.join(entryPath, childName));
+			}
+			return;
+		}
+		if (entryPath.endsWith(".d.ts")) return;
+		if (entryPath.endsWith(".tsx") || entryPath.endsWith(".ts")) result.push(entryPath);
+	};
+	visit(rootDirectoryPath);
+	return result;
+}
+//#endregion
 export { DEFAULT_SKIP_DIRS, walkTsxFiles };

package/dist/lib/arrange/presentation/formatters.mjs

@@ -1,2 +1,52 @@
-import { a as formatJsxCnAttributeValue, i as formatCnCall, n as formatArray, r as formatCnArguments, t as escapeTsStringLiteralContent } from "../../../formatters-DGE8jJ53.mjs";
+import { indentOfLineContaining } from "../domain/ast/ast-helpers.mjs";
+//#region src/lib/arrange/presentation/formatters.ts
+function escapeTsStringLiteralContent(group) {
+	return group.replaceAll("\\", "\\\\").replaceAll("\"", "\\\"");
+}
+/**
+* Multiline fragment for use *inside* an existing `cn(...)` — replaces one
+* string argument with several, without producing `cn(cn(...))`.
+*/
+function formatCnArguments(groups, options) {
+	const indent = options?.indent ?? "  ";
+	const commaAfterLast = options?.commaAfterLastGroup ?? options?.trailingClassName ?? false;
+	const lines = [];
+	for (let i = 0; i < groups.length; i++) {
+		const group = groups[i];
+		const comma = i < groups.length - 1 || commaAfterLast ? "," : "";
+		lines.push(`${indent}"${escapeTsStringLiteralContent(group)}"${comma}`);
+	}
+	if (options?.trailingClassName) lines.push(`${indent}className,`);
+	return lines.join("\n");
+}
+function formatCnCall(groups, options) {
+	const lines = ["cn("];
+	const commaOnEachStringLine = groups.length > 1 || Boolean(options?.trailingClassName);
+	for (let i = 0; i < groups.length; i++) {
+		const group = groups[i];
+		const comma = commaOnEachStringLine ? "," : "";
+		lines.push(`  "${escapeTsStringLiteralContent(group)}"${comma}`);
+	}
+	if (options?.trailingClassName) lines.push("  className,");
+	lines.push(")");
+	return lines.join("\n");
+}
+function formatArray(groups) {
+	const lines = ["["];
+	for (let i = 0; i < groups.length; i++) {
+		const group = groups[i];
+		const comma = i < groups.length - 1 || groups.length > 1 ? "," : "";
+		lines.push(`  "${escapeTsStringLiteralContent(group)}"${comma}`);
+	}
+	lines.push("]");
+	return lines.join("\n");
+}
+function formatJsxCnAttributeValue(groups, source, valueNodeStart) {
+	const baseIndent = indentOfLineContaining(source, valueNodeStart);
+	return `{cn(\n${formatCnArguments(groups, {
+		indent: `${baseIndent}  `,
+		commaAfterLastGroup: groups.length > 1
+	})}\n${baseIndent})}`;
+}
+//#endregion
 export { escapeTsStringLiteralContent, formatArray, formatCnArguments, formatCnCall, formatJsxCnAttributeValue };