@codefast/cli 0.3.16-canary.2 → 0.4.0-canary.4

package/dist/arrange/domain/ast/collectors-tv.mjs

@@ -1,8 +1,8 @@
-import "../constants.mjs";
-import { tokenizeClassString } from "../tailwind-token.mjs";
 import { forEachDomainChild, isDomainArrayLiteralExpression, isDomainCallExpression, isDomainObjectLiteralExpression, isDomainPropertyAssignment, isDomainSpreadElement, isDomainTailwindClassLiteral } from "./ast-node.mjs";
+import "../constants.mjs";
 import { CN_APPLY_LITERAL_WALK_OPTS, collectUnconditionalTailwindLiteralsFromCnArguments, forEachStringLiteralInClassExpression, isUnsafeLiteralForCnStyleApplySplit } from "./collectors-cn.mjs";
 import { buildKnownCnTvBindings, isCnOrTvIdentifier, propertyAssignmentNameText } from "./helpers.mjs";
+import { tokenizeClassString } from "../tailwind-token.mjs";
 //#region src/arrange/domain/ast/collectors-tv.ts
 /**
 * @since 0.3.16-canary.0

package/dist/arrange/domain/ast/helpers.mjs

@@ -1,5 +1,5 @@
-import { EMPTY_CN_TV_BINDINGS } from "../constants.mjs";
 import { isDomainIdentifier, isDomainImportDeclaration, isDomainNamedImports, isDomainNamespaceImport, isDomainPropertyAccessExpression, isDomainStringLiteral, lineOfSourcePosition } from "./ast-node.mjs";
+import { EMPTY_CN_TV_BINDINGS } from "../constants.mjs";
 import { applyEditsDescending, indentOfLineContaining } from "../../../core/source-text-edit.mjs";
 //#region src/arrange/domain/ast/helpers.ts
 /**
@@ -21,7 +21,7 @@ const KNOWN_CN_TV_MODULES = new Set([
 function moduleLooksLikeCnTvReexport(moduleSpecifier) {
 	const norm = moduleSpecifier.replace(/\\/g, "/");
 	if (/(?:^|[./])utils(?:\/|$)/.test(norm)) return true;
-	if (/\/utils\//.test(norm) || /\/utils$/.test(norm)) return true;
+	if (/\/utils\//.test(norm) || norm.endsWith("/utils")) return true;
 	if (/(?:^|\/)cn\.tsx?$/.test(norm)) return true;
 	return false;
 }

package/dist/arrange/domain/ast/simplify-targets.mjs

@@ -0,0 +1,109 @@
+import { forEachDomainChild, isDomainArrayLiteralExpression, isDomainCallExpression, isDomainJsxAttribute, isDomainJsxExpression, isDomainObjectLiteralExpression, isDomainPropertyAssignment, isDomainSpreadElement, isDomainTailwindClassLiteral } from "./ast-node.mjs";
+import "../constants.mjs";
+import { indentOfLineContaining } from "../../../core/source-text-edit.mjs";
+import { buildKnownCnTvBindings, isCnOrTvIdentifier } from "./helpers.mjs";
+import { escapeTsStringLiteralContent } from "../source-text-formatters.mjs";
+//#region src/arrange/domain/ast/simplify-targets.ts
+function toFlatString(text) {
+	return `"${escapeTsStringLiteralContent(text.trim())}"`;
+}
+function joinLiterals(args) {
+	return args.filter(isDomainTailwindClassLiteral).map((lit) => lit.text).join(" ");
+}
+function isAllStaticLiterals(args) {
+	return args.length > 0 && args.every(isDomainTailwindClassLiteral);
+}
+/**
+* For a cn() call that has both static and dynamic args:
+* - Merge ALL static string literals (regardless of position) into one string.
+* - Place the merged string first.
+* - Append all dynamic args in their original relative order.
+*
+* Returns `null` when nothing changes (0 statics, or already 1 static at arg[0]).
+*/
+function buildMixedCnReplacement(call, sourceText) {
+	const args = [...call.arguments];
+	if (args.length === 0) return null;
+	const staticTexts = [];
+	const dynamicSrcs = [];
+	for (const arg of args) if (isDomainTailwindClassLiteral(arg)) staticTexts.push(arg.text);
+	else dynamicSrcs.push(sourceText.slice(arg.pos, arg.end));
+	if (staticTexts.length === 0) return null;
+	const firstArg = args[0];
+	if (staticTexts.length === 1 && firstArg !== void 0 && isDomainTailwindClassLiteral(firstArg)) return null;
+	const flatStatic = staticTexts.join(" ").trim();
+	const baseIndent = indentOfLineContaining(sourceText, call.pos);
+	const argIndent = `${baseIndent}  `;
+	return `cn(\n${[`${argIndent}"${escapeTsStringLiteralContent(flatStatic)}",`, ...dynamicSrcs.map((src) => `${argIndent}${src},`)].join("\n")}\n${baseIndent})`;
+}
+function collectTvArrayEdits(obj, results, depth) {
+	if (depth > 12) return;
+	for (const prop of obj.properties) {
+		if (!isDomainPropertyAssignment(prop)) continue;
+		const init = prop.initializer;
+		if (isDomainArrayLiteralExpression(init)) {
+			const elements = [...init.elements];
+			if (!elements.some(isDomainSpreadElement) && elements.length > 0 && isAllStaticLiterals(elements)) results.push({
+				start: init.pos,
+				end: init.end,
+				replacement: toFlatString(joinLiterals(elements)),
+				label: "tv-array"
+			});
+		} else if (isDomainObjectLiteralExpression(init)) collectTvArrayEdits(init, results, depth + 1);
+	}
+}
+/**
+* Collect all simplify edits for a source file:
+* - Arrays of pure string literals inside tv() slots → flat string
+* - cn() calls whose every argument is a static string literal → flat string (unwrap cn)
+* - cn() calls with mixed static + dynamic args → merge adjacent statics into one string
+* - JSX className={cn(...all-static...)} → className="flat string"
+*
+* @since 0.3.16-canary.0
+*/
+function collectSimplifyTargets(sourceFile) {
+	const sourceText = sourceFile.text;
+	const results = [];
+	const knownBindings = buildKnownCnTvBindings(sourceFile);
+	const seenCnPos = /* @__PURE__ */ new Set();
+	const visitNode = (node) => {
+		if (isDomainCallExpression(node)) {
+			if (isCnOrTvIdentifier(node.expression, "tv", knownBindings)) {
+				const arg0 = node.arguments[0];
+				if (arg0 && isDomainObjectLiteralExpression(arg0)) collectTvArrayEdits(arg0, results, 0);
+			} else if (isCnOrTvIdentifier(node.expression, "cn", knownBindings) && !seenCnPos.has(node.pos)) {
+				seenCnPos.add(node.pos);
+				const args = [...node.arguments];
+				if (isAllStaticLiterals(args)) {
+					const flat = joinLiterals(args);
+					const parent = node.parent;
+					if (parent && isDomainJsxExpression(parent) && parent.parent && isDomainJsxAttribute(parent.parent)) results.push({
+						start: parent.pos,
+						end: parent.end,
+						replacement: toFlatString(flat),
+						label: "jsx-cn"
+					});
+					else results.push({
+						start: node.pos,
+						end: node.end,
+						replacement: toFlatString(flat),
+						label: "cn-static"
+					});
+				} else {
+					const replacement = buildMixedCnReplacement(node, sourceText);
+					if (replacement !== null) results.push({
+						start: node.pos,
+						end: node.end,
+						replacement,
+						label: "cn-merge"
+					});
+				}
+			}
+		}
+		forEachDomainChild(node, visitNode);
+	};
+	for (const stmt of sourceFile.statements) visitNode(stmt);
+	return results;
+}
+//#endregion
+export { collectSimplifyTargets };

package/dist/arrange/domain/ast/targets.mjs

@@ -1,12 +1,12 @@
+import { forEachDomainChild, isDomainArrayLiteralExpression, isDomainJsxAttribute, isDomainPropertyAssignment, isDomainTailwindClassLiteral } from "./ast-node.mjs";
 import "../constants.mjs";
-import { tokenizeClassString } from "../tailwind-token.mjs";
-import { forEachDomainChild, isDomainArrayLiteralExpression, isDomainJsxAttribute, isDomainTailwindClassLiteral } from "./ast-node.mjs";
 import { isUnsafeLiteralForCnStyleApplySplit } from "./collectors-cn.mjs";
 import { jsxClassNameStaticLiteral } from "./collectors-jsx.mjs";
 import { endAfterOptionalCommaFollowingInSource, indentOfLineContaining, textPrefixFromLineStartToPosition } from "../../../core/source-text-edit.mjs";
+import { tokenizeClassString } from "../tailwind-token.mjs";
 import { collectGroupableStringNodes, slotClassString } from "./collectors-tv.mjs";
-import { areCnTailwindPartitionsEquivalent, suggestCnGroups, summarizeGroupBucketLabels } from "../grouping.mjs";
 import { escapeTsStringLiteralContent, formatArray, formatArrayElementsAsSiblingLines, formatJsxCnAttributeValue } from "../source-text-formatters.mjs";
+import { areCnTailwindPartitionsEquivalent, suggestCnGroups, summarizeGroupBucketLabels } from "../grouping.mjs";
 //#region src/arrange/domain/ast/targets.ts
 /**
 * @since 0.3.16-canary.0
@@ -62,7 +62,7 @@ function formatCnCallReplacement(stringNode, sourceText, withClassName) {
 	for (const dynamicArgumentSource of dynamicArgTexts) allArgs.push(`${argIndent}${dynamicArgumentSource}`);
 	if (withClassName) allArgs.push(`${argIndent}className`);
 	const commaAfterLastArg = allArgs.length > 1;
-	return `cn(\n${allArgs.map((argLine, lineIndex) => lineIndex < allArgs.length - 1 || commaAfterLastArg ? `${argLine},` : `${argLine}`).join("\n")}\n${baseIndent})`;
+	return `cn(\n${allArgs.map((argLine, lineIndex) => lineIndex < allArgs.length - 1 || commaAfterLastArg ? `${argLine},` : argLine).join("\n")}\n${baseIndent})`;
 }
 /**
 * @since 0.3.16-canary.0
@@ -88,14 +88,29 @@ function planGroupEditForTarget(target, textAfterUnwrap, withClassName) {
 	if (areCnTailwindPartitionsEquivalent(target.item.nodes.map((classLiteral) => classLiteral.text), groups)) return;
 	if (!target.item.cnCall) {
 		const anchorClassLiteral = target.item.primaryClassLiteral;
-		const parentArray = target.item.nodes.length > 1 && anchorClassLiteral.parent !== null && isDomainArrayLiteralExpression(anchorClassLiteral.parent) ? anchorClassLiteral.parent : null;
-		const start = parentArray ? parentArray.pos : anchorClassLiteral.pos;
-		const end = parentArray ? parentArray.end : endAfterOptionalCommaFollowingInSource(textAfterUnwrap, anchorClassLiteral.end);
-		const baseIndent = indentOfLineContaining(textAfterUnwrap, start);
+		const parentNode = anchorClassLiteral.parent;
+		const parentArray = target.item.nodes.length > 1 && parentNode !== null && isDomainArrayLiteralExpression(parentNode) ? parentNode : null;
+		const bareStringProperty = !parentArray && parentNode !== null && isDomainPropertyAssignment(parentNode);
+		if (parentArray || bareStringProperty) {
+			const start = parentArray ? parentArray.pos : anchorClassLiteral.pos;
+			const end = parentArray ? parentArray.end : anchorClassLiteral.end;
+			const baseIndent = indentOfLineContaining(textAfterUnwrap, start);
+			return {
+				start,
+				end,
+				replacement: formatArray(groups).split("\n").map((line, lineIndex) => lineIndex === 0 ? line : `${baseIndent}${line}`).join("\n"),
+				bucketSummary: summarizeGroupBucketLabels(groups),
+				jsxCn: false,
+				lineSf: target.item.sf,
+				reportNode: anchorClassLiteral,
+				label: target.item.isTvContext ? "tv" : "cn"
+			};
+		}
+		const start = anchorClassLiteral.pos;
 		return {
 			start,
-			end,
-			replacement: parentArray ? formatArray(groups).split("\n").map((line, lineIndex) => lineIndex === 0 ? line : `${baseIndent}${line}`).join("\n") : formatArrayElementsAsSiblingLines(groups, textPrefixFromLineStartToPosition(textAfterUnwrap, start)),
+			end: endAfterOptionalCommaFollowingInSource(textAfterUnwrap, anchorClassLiteral.end),
+			replacement: formatArrayElementsAsSiblingLines(groups, textPrefixFromLineStartToPosition(textAfterUnwrap, start)),
 			bucketSummary: summarizeGroupBucketLabels(groups),
 			jsxCn: false,
 			lineSf: target.item.sf,

package/dist/arrange/domain/grouping-service.mjs

@@ -42,7 +42,7 @@ function tryBuildGroupFileWorkPlan(input) {
 	if (domainSfGrouped.text !== unwrap.textAfterUnwrap) throw new Error("Domain invariant: domainSfGrouped.text must match unwrap phase textAfterUnwrap");
 	const groupTargets = collectGroupTargets(domainSfGrouped, filePath);
 	if (unwrap.cnInTvCalls.length === 0 && groupTargets.length === 0) return null;
-	const sortedTargets = [...groupTargets].sort((leftTarget, rightTarget) => targetReplaceStart(rightTarget) - targetReplaceStart(leftTarget));
+	const sortedTargets = [...groupTargets].toSorted((leftTarget, rightTarget) => targetReplaceStart(rightTarget) - targetReplaceStart(leftTarget));
 	const plannedGroupEdits = [];
 	for (const groupTarget of sortedTargets) {
 		const plan = planGroupEditForTarget(groupTarget, unwrap.textAfterUnwrap, withClassName);

package/dist/arrange/domain/grouping.mjs

@@ -72,7 +72,7 @@ function compareClassifiedTailwindTokensForCnGrouping(left, right, firstVariantK
 function areCnTailwindPartitionsEquivalent(staticLiteralTexts, suggestedGroups) {
 	const partitionSignatures = (chunks) => chunks.map((chunk) => {
 		const classTokens = tokenizeClassString(chunk);
-		return classTokens.length === 0 ? "" : [...classTokens].sort(compareClassTokensCanonically).join(" ");
+		return classTokens.length === 0 ? "" : [...classTokens].toSorted(compareClassTokensCanonically).join(" ");
 	}).filter((s) => s.length > 0).sort(compareClassTokensCanonically);
 	const staticPartitionSigs = partitionSignatures(staticLiteralTexts);
 	const suggestedPartitionSigs = partitionSignatures(suggestedGroups);
@@ -230,7 +230,7 @@ function mergeEaseTimingIntoFollowingAnimatedState(groups) {
 				const chunkJ = result[j];
 				if (chunkJ === void 0) throw new Error("invariant: mergeEase following chunk missing");
 				if (dominantBucketOfGroup(chunkJ) !== "state") continue;
-				if (!tokenizeClassString(chunkJ).some((classToken) => /^animate/.test(stripVariants(classToken)))) continue;
+				if (!tokenizeClassString(chunkJ).some((classToken) => stripVariants(classToken).startsWith("animate"))) continue;
 				target = j;
 				break;
 			}
@@ -248,7 +248,7 @@ function mergeEaseTimingIntoFollowingAnimatedState(groups) {
 function chunkIsOnlyEaseTimingMotion(groupStr) {
 	const classTokens = tokenizeClassString(groupStr);
 	if (classTokens.length === 0) return false;
-	return classTokens.every((classToken) => classifyToken(classToken) === "motion" && /^ease-/.test(stripVariants(classToken)));
+	return classTokens.every((classToken) => classifyToken(classToken) === "motion" && stripVariants(classToken).startsWith("ease-"));
 }
 /**
 * @since 0.3.16-canary.0
@@ -328,9 +328,9 @@ function suggestCnGroups(classString) {
 function summarizeGroupBucketLabels(groups) {
 	return groups.map((g) => {
 		const uniq = new Set(tokenizeClassString(g).map(classifyToken));
-		if (uniq.size !== 1) return `mixed:${[...uniq].sort(compareClassTokensCanonically).join("+")}`;
+		if (uniq.size !== 1) return `mixed:${[...uniq].toSorted(compareClassTokensCanonically).join("+")}`;
 		const onlyBucket = [...uniq][0];
-		if (onlyBucket === void 0) return `mixed:${[...uniq].sort(compareClassTokensCanonically).join("+")}`;
+		if (onlyBucket === void 0) return `mixed:${[...uniq].toSorted(compareClassTokensCanonically).join("+")}`;
 		return onlyBucket;
 	});
 }

package/dist/arrange/domain/imports.mjs

@@ -1,4 +1,5 @@
-import { isDomainImportDeclaration, isDomainNamedImports, isDomainStringLiteral } from "./ast/ast-node.mjs";
+import { forEachDomainChild, isDomainIdentifier, isDomainImportDeclaration, isDomainNamedImports, isDomainStringLiteral } from "./ast/ast-node.mjs";
+import { endAfterOptionalCommaFollowingInSource } from "../../core/source-text-edit.mjs";
 //#region src/arrange/domain/imports.ts
 function sourceFileImportsCn(sourceFile) {
 	for (const statement of sourceFile.statements) {
@@ -25,6 +26,53 @@ function findImportDeclarationFromModule(sourceFile, moduleSpecifier) {
 		if (isDomainStringLiteral(spec) && spec.text === moduleSpecifier) return statement;
 	}
 }
+function cnIsUsedInBody(node) {
+	if (isDomainIdentifier(node) && node.text === "cn") return true;
+	let found = false;
+	forEachDomainChild(node, (child) => {
+		if (!found) found = cnIsUsedInBody(child);
+	});
+	return found;
+}
+function removeCnSpecifier(sourceText, specifier, allSpecifiers) {
+	const idx = allSpecifiers.indexOf(specifier);
+	if (idx === 0) {
+		const next = allSpecifiers[1];
+		if (!next) return sourceText;
+		return sourceText.slice(0, specifier.pos) + sourceText.slice(next.pos);
+	}
+	const prev = allSpecifiers[idx - 1];
+	if (!prev) return sourceText;
+	const endWithTrailingComma = endAfterOptionalCommaFollowingInSource(sourceText, specifier.end);
+	return sourceText.slice(0, prev.end) + sourceText.slice(endWithTrailingComma);
+}
+/**
+* After simplify rewrites, drop the `cn` import specifier when `cn` is no
+* longer referenced anywhere outside the import declarations.
+*
+* @since 0.3.16-canary.0
+*/
+function dropCnImportIfUnused(sourceFile) {
+	const sourceText = sourceFile.text;
+	for (const stmt of sourceFile.statements) {
+		if (isDomainImportDeclaration(stmt)) continue;
+		if (cnIsUsedInBody(stmt)) return sourceText;
+	}
+	for (const stmt of sourceFile.statements) {
+		if (!isDomainImportDeclaration(stmt) || !stmt.importClause) continue;
+		const clause = stmt.importClause;
+		if (!clause.namedBindings || !isDomainNamedImports(clause.namedBindings)) continue;
+		const elements = clause.namedBindings.elements;
+		const cnSpecifier = elements.find((el) => el.name.text === "cn");
+		if (!cnSpecifier) continue;
+		if (elements.length === 1) {
+			const lineEnd = sourceText.indexOf("\n", stmt.end);
+			return sourceText.slice(0, stmt.pos) + (lineEnd !== -1 ? sourceText.slice(lineEnd + 1) : sourceText.slice(stmt.end));
+		}
+		return removeCnSpecifier(sourceText, cnSpecifier, elements);
+	}
+	return sourceText;
+}
 /**
 * @since 0.3.16-canary.0
 */
@@ -56,4 +104,4 @@ function ensureCnImport(sourceFile, cnImportOverride) {
 	return `${sourceText.slice(0, insertAt)}${importLine}\n${sourceText.slice(insertAt)}`;
 }
 //#endregion
-export { ensureCnImport };
+export { dropCnImportIfUnused, ensureCnImport };

package/dist/arrange/domain/token-classifier.mjs

@@ -50,9 +50,9 @@ function isStateToken(token) {
 	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 (prefix.startsWith("aria-")) return true;
 	if (/^(group|peer)-/.test(prefix)) return true;
-	if (/^not-/.test(prefix)) return true;
+	if (prefix.startsWith("not-")) return true;
 	if (isCompoundOrMediaVariantPrefix(prefix)) return true;
 	if (prefix.startsWith("[") && prefix.endsWith("]")) return true;
 	return false;
@@ -65,13 +65,13 @@ function isStateToken(token) {
 */
 function compositeSecondaryOrder(bareUtility) {
 	const b = bareUtility;
-	if (/^opacity(?:-|$)/.test(b) || /^mix-blend-/.test(b) || /^isolation(?:-|$)/.test(b) || b === "isolate") return 0;
+	if (/^opacity(?:-|$)/.test(b) || b.startsWith("mix-blend-") || /^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;
+	if (/^blur(?:-|$)/.test(b) || b.startsWith("backdrop-") || /^filter(?:-|$)/.test(b) || b.startsWith("brightness-") || b.startsWith("contrast-") || /^grayscale(?:-|$)/.test(b) || b.startsWith("hue-rotate-") || /^invert(?:-|$)/.test(b) || b.startsWith("saturate-") || /^sepia(?:-|$)/.test(b)) return 40;
+	if (b.startsWith("will-change")) return 50;
 	return 99;
 }
 /**
@@ -82,7 +82,7 @@ function classifyBareUtility(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 (b.startsWith("contain-")) 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";
@@ -90,13 +90,13 @@ function classifyBareUtility(bareUtility) {
 	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 (/^-?(?:rounded|border|ring|divide|inset-ring)(?:-|\/|$)/.test(b) || /^(?:rounded|border|ring|divide|inset-ring)$/.test(b) || b.startsWith("ring-offset-")) 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";
+	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) || b.startsWith("text-wrap-") || /^tabular-nums$|^slashed-zero$|^lining-nums$|^oldstyle-nums$|^proportional-nums$/.test(b)) return "typography";
+	if (/^opacity(?:-|$)/.test(b) || b.startsWith("mix-blend-") || /^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) || b.startsWith("backdrop-") || /^filter(?:-|$)/.test(b) || b.startsWith("brightness-") || b.startsWith("contrast-") || /^grayscale(?:-|$)/.test(b) || b.startsWith("hue-rotate-") || /^invert(?:-|$)/.test(b) || b.startsWith("saturate-") || /^sepia(?:-|$)/.test(b) || b.startsWith("will-change")) return "composite";
+	if (/^(?:transition|duration|ease|delay|animate)(?:-|$)/.test(b) || b.startsWith("ease-")) 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) || b.startsWith("scroll-behavior") || b.startsWith("scroll-snap") || b.startsWith("touch-action") || b === "inert") return "behavior";
 	return "other";
 }
 /**
@@ -106,7 +106,7 @@ function classifyBareUtility(bareUtility) {
 * Pure arbitrary **properties** (`[--x]:`, `[color:red]`) have no `&` in the leading `[…]` segment.
 */
 function isArbitraryParentSelectorStateToken(token) {
-	if (/^\[&/.test(token)) return true;
+	if (token.startsWith("[&")) return true;
 	if (!token.startsWith("[")) return false;
 	const colonIdx = indexOfFirstVariantColon(token);
 	if (colonIdx === -1 || colonIdx === 0 || token[colonIdx - 1] !== "]") return false;

package/dist/arrange/output.mjs

@@ -1,6 +1,6 @@
-import { logger } from "../core/logger.mjs";
 import "./domain/constants.mjs";
 import { lineOf } from "./domain/ast/helpers.mjs";
+import { logger } from "../core/logger.mjs";
 import path from "node:path";
 //#region src/arrange/output.ts
 /**
@@ -30,13 +30,21 @@ function printAnalyzeReport(resolvedTargetPath, report) {
 function printSyncResult(result, write) {
 	logger.out(`\nTotal: ${result.filePaths.length} file(s), ${result.totalFound} site(s) (cn/tv/JSX className) to review.`);
 	if (write) logger.out(`Applied: ${result.totalChanged} site(s) updated.`);
-	else logger.out(`(Run "apply" to write changes, or "pnpm cli:arrange-apply" / "pnpm exec codefast arrange apply")`);
+	else logger.out(`(Re-run without --dry-run to write changes, or "pnpm cli:arrange" / "pnpm exec codefast arrange")`);
 	if (write ? result.totalChanged > 0 : result.totalFound > 0) logger.out("Note: class order may change across concern groups — smoke-test the UI if you rely on cascade order.");
 	if (result.hookError !== null) logger.err(result.hookError);
 }
 /**
 * @since 0.3.16-canary.0
 */
+function printSimplifyResult(result, write) {
+	logger.out(`\nTotal: ${result.filePaths.length} file(s), ${result.totalFound} site(s) to simplify.`);
+	if (write) logger.out(`Applied: ${result.totalChanged} site(s) updated.`);
+	else logger.out(`(Run "simplify" to write changes, or "pnpm cli:arrange-simplify" / "pnpm exec codefast arrange simplify")`);
+}
+/**
+* @since 0.3.16-canary.0
+*/
 function printGroupFilePreviewFromWork(work) {
 	printGroupFilePreviewBody({
 		filePath: work.filePath,
@@ -76,4 +84,4 @@ function printGroupFilePreviewBody(args) {
 	}
 }
 //#endregion
-export { printAnalyzeReport, printGroupFilePreviewFromWork, printSyncResult };
+export { printAnalyzeReport, printGroupFilePreviewFromWork, printSimplifyResult, printSyncResult };

package/dist/arrange/process-file.mjs

@@ -1,6 +1,6 @@
 import { parseDomainSourceFile } from "./source-parse.mjs";
-import { buildGroupFileUnwrapState, countPersistedGroupFileEdits, groupFileDryRunNoEdits, groupFileEditsTouchJsxCn, groupFilePreviewTotals, groupFileWorkHasNothingToReport, mergeGroupFileBodyText, tryBuildGroupFileWorkPlan } from "./domain/grouping-service.mjs";
 import { ensureCnImport } from "./domain/imports.mjs";
+import { buildGroupFileUnwrapState, countPersistedGroupFileEdits, groupFileDryRunNoEdits, groupFileEditsTouchJsxCn, groupFilePreviewTotals, groupFileWorkHasNothingToReport, mergeGroupFileBodyText, tryBuildGroupFileWorkPlan } from "./domain/grouping-service.mjs";
 //#region src/arrange/process-file.ts
 /**
 * @since 0.3.16-canary.0

package/dist/arrange/scan-target.mjs

@@ -3,13 +3,22 @@ import { logger } from "../core/logger.mjs";
 import { walkTsxFiles } from "../core/workspace/typescript-walk.mjs";
 import path from "node:path";
 //#region src/arrange/scan-target.ts
+const TEST_FILE_PATTERN = /\.(?:test|spec)\.[cm]?[jt]sx?$/;
+/**
+* Test/spec files are excluded from directory scans: arrange rewrites class strings,
+* and a `cn(...)` inside an assertion (e.g. `expect(cn("a", "b"))`) is intentional test
+* data, not styling to reformat. An explicit single-file target is still honored.
+*/
+function isTestFile(filePath) {
+	return TEST_FILE_PATTERN.test(path.basename(filePath));
+}
 /**
 * @since 0.3.16-canary.0
 */
 function scanArrangeTargets(fs, targetPath) {
 	const resolvedTargetPath = path.resolve(targetPath);
 	if (fs.statSync(resolvedTargetPath).isDirectory()) try {
-		return walkTsxFiles(resolvedTargetPath, fs);
+		return walkTsxFiles(resolvedTargetPath, fs).filter((filePath) => !isTestFile(filePath));
 	} catch (caughtError) {
 		logger.err(`[file-walker] ${messageFrom(caughtError)}`);
 		throw caughtError;

package/dist/arrange/simplify-process-file.mjs

@@ -0,0 +1,35 @@
+import { applyEditsDescending } from "../core/source-text-edit.mjs";
+import { parseDomainSourceFile } from "./source-parse.mjs";
+import { collectSimplifyTargets } from "./domain/ast/simplify-targets.mjs";
+import { dropCnImportIfUnused } from "./domain/imports.mjs";
+//#region src/arrange/simplify-process-file.ts
+/**
+* @since 0.3.16-canary.0
+*/
+function processArrangeSimplifyFile(fs, args) {
+	const { filePath, write } = args;
+	const sourceText = fs.readFileSync(filePath, "utf8");
+	const meaningful = collectSimplifyTargets(parseDomainSourceFile(filePath, sourceText)).filter((edit) => sourceText.slice(edit.start, edit.end) !== edit.replacement);
+	const textAfterEdits = meaningful.length > 0 ? applyEditsDescending(sourceText, meaningful) : sourceText;
+	const textAfterImportDrop = dropCnImportIfUnused(parseDomainSourceFile(filePath, textAfterEdits));
+	const importDropped = textAfterImportDrop !== textAfterEdits;
+	const totalFound = meaningful.length + (importDropped ? 1 : 0);
+	if (totalFound === 0) return {
+		filePath,
+		totalFound: 0,
+		changed: 0
+	};
+	if (!write) return {
+		filePath,
+		totalFound,
+		changed: 0
+	};
+	fs.writeFileSync(filePath, textAfterImportDrop, "utf8");
+	return {
+		filePath,
+		totalFound,
+		changed: totalFound
+	};
+}
+//#endregion
+export { processArrangeSimplifyFile };

package/dist/arrange/simplify-sync.mjs

@@ -0,0 +1,32 @@
+import { scanArrangeTargets } from "./scan-target.mjs";
+import { ok } from "../core/result.mjs";
+import { processArrangeSimplifyFile } from "./simplify-process-file.mjs";
+//#region src/arrange/simplify-sync.ts
+/**
+* @since 0.3.16-canary.0
+*/
+async function runArrangeSimplify(fs, args) {
+	const filePaths = scanArrangeTargets(fs, args.targetPath);
+	const modifiedFiles = [];
+	let totalFound = 0;
+	let totalChanged = 0;
+	for (const filePath of filePaths) {
+		const result = processArrangeSimplifyFile(fs, {
+			filePath,
+			write: args.write
+		});
+		totalFound += result.totalFound;
+		totalChanged += result.changed;
+		if (result.changed > 0) modifiedFiles.push(result.filePath);
+	}
+	return ok({
+		filePaths,
+		modifiedFiles,
+		totalFound,
+		totalChanged,
+		hookError: null,
+		previewPlans: []
+	});
+}
+//#endregion
+export { runArrangeSimplify };

package/dist/arrange/suggest.mjs

@@ -1,5 +1,5 @@
-import { suggestCnGroups, summarizeGroupBucketLabels } from "./domain/grouping.mjs";
 import { formatArray, formatCnCall } from "./domain/source-text-formatters.mjs";
+import { suggestCnGroups, summarizeGroupBucketLabels } from "./domain/grouping.mjs";
 //#region src/arrange/suggest.ts
 /**
 * @since 0.3.16-canary.0

package/dist/arrange/sync.mjs

@@ -1,6 +1,6 @@
 import { messageFrom } from "../core/errors.mjs";
-import { ok } from "../core/result.mjs";
 import { scanArrangeTargets } from "./scan-target.mjs";
+import { ok } from "../core/result.mjs";
 import { processArrangeGroupFile } from "./process-file.mjs";
 //#region src/arrange/sync.ts
 async function runOnAfterWriteHook(hook, modifiedFiles) {

package/dist/arrange/workspace.mjs

@@ -1,8 +1,8 @@
 import { AppError, messageFrom } from "../core/errors.mjs";
 import { err, ok } from "../core/result.mjs";
+import { resolveArrangeTargetPath } from "./resolve-target.mjs";
 import { loadCodefastConfig } from "../core/config.mjs";
 import { findRepoRoot } from "../core/workspace/resolver.mjs";
-import { resolveArrangeTargetPath } from "./resolve-target.mjs";
 //#region src/arrange/workspace.ts
 /**
 * @since 0.3.16-canary.0

package/dist/cli.mjs

@@ -22,7 +22,7 @@ function readVersion() {
 */
 async function runCli(argv) {
 	const program = new Command();
-	program.name("codefast").description("Codefast monorepo developer CLI").version(readVersion()).option("--no-color", "Disable ANSI color output").configureHelp({ sortSubcommands: true }).showHelpAfterError("(use --help for usage)");
+	program.name("codefast").description("Codefast monorepo developer CLI").version(readVersion()).option("--no-color", "Disable ANSI color output").enablePositionalOptions().configureHelp({ sortSubcommands: true }).showHelpAfterError("(use --help for usage)");
 	program.addCommand(createArrangeCommand());
 	program.addCommand(createMirrorCommand());
 	program.addCommand(createTagCommand());

package/dist/core/cli/result-handle.mjs

@@ -1,6 +1,6 @@
+import { logger } from "../logger.mjs";
 import { formatAppError } from "./format-error.mjs";
 import "../exit-codes.mjs";
-import { logger } from "../logger.mjs";
 import { isVerboseCliDiagnostics } from "../verbose-diagnostics.mjs";
 import process from "node:process";
 //#region src/core/cli/result-handle.ts

package/dist/core/config/schema.mjs

@@ -1,20 +1,41 @@
 import { z } from "zod";
 //#region src/core/config/schema.ts
 const afterWriteHookSchema = z.custom((value) => typeof value === "function", { message: "Expected a function" });
+const mirrorCssConfigSchema = z.union([z.boolean(), z.object({
+	enabled: z.boolean().optional(),
+	customExports: z.record(z.string(), z.string()).optional(),
+	forceExportFiles: z.boolean().optional()
+}).strict()]);
 /**
+* Per-package mirror configuration. Setting a package to `false` skips it entirely.
+*
+* - `source` — include a `source` condition pointing to the original `.ts` file (default `true`).
+*   Pass a string to override the root-export source path explicitly.
+* - `types` — include the `types` condition when `.d.ts` files exist (default `true`).
+* - `import` — include the `import` condition (default `true`).
+* - `css` — CSS export configuration (wildcard or per-file).
+*
 * @since 0.3.16-canary.0
 */
-const mirrorConfigSchema = z.object({
-	skipPackages: z.array(z.string()).optional(),
-	pathTransformations: z.record(z.string(), z.object({ removePrefix: z.string().optional() }).strict()).optional(),
-	customExports: z.record(z.string(), z.record(z.string(), z.string())).optional(),
-	cssExports: z.record(z.string(), z.union([z.boolean(), z.object({
-		enabled: z.boolean().optional(),
-		customExports: z.record(z.string(), z.string()).optional(),
-		forceExportFiles: z.boolean().optional()
-	}).strict()])).optional()
+const mirrorPackageConfigSchema = z.object({
+	/** Preserve the existing `package.json#exports` map and only add missing conditions
+	*  (`source`, `types`, `import`). No dist/ scan is performed. */
+	preserve: z.boolean().optional(),
+	strip: z.string().optional(),
+	exports: z.record(z.string(), z.string()).optional(),
+	source: z.union([z.boolean(), z.string()]).default(true),
+	types: z.boolean().default(true),
+	import: z.boolean().default(true),
+	css: mirrorCssConfigSchema.optional()
 }).strict();
 /**
+* Mirror config: a record keyed by package name. Set a package to `false` to skip it;
+* omit it entirely to process it with default settings.
+*
+* @since 0.3.16-canary.0
+*/
+const mirrorConfigSchema = z.record(z.string(), z.union([z.literal(false), mirrorPackageConfigSchema]));
+/**
 * @since 0.3.16-canary.0
 */
 const codefastTagConfigSchema = z.object({
@@ -36,4 +57,4 @@ const codefastConfigRootSchema = z.object({
 	arrange: codefastArrangeConfigSchema.optional()
 }).strict();
 //#endregion
-export { codefastArrangeConfigSchema, codefastConfigRootSchema, codefastTagConfigSchema, mirrorConfigSchema };
+export { codefastArrangeConfigSchema, codefastConfigRootSchema, codefastTagConfigSchema, mirrorConfigSchema, mirrorPackageConfigSchema };