@codefast/cli 0.3.14-canary.1 → 0.3.14

package/dist/lib/arrange/{presentation/prepare-arrange.orchestrator.mjs → application/use-cases/prepare-arrange-workspace.use-case.mjs}

@@ -1,12 +1,11 @@
-import { CliFsToken } from "../../core/operational/contracts/tokens.mjs";
-import { appError } from "../../core/domain/errors.domain.mjs";
-import { err, ok } from "../../core/domain/result.model.mjs";
-import { messageFromCaughtUnknown } from "../../core/application/utils/caught-unknown-message.util.mjs";
-import { findRepoRoot } from "../../infra/workspace/repo-root.adapter.mjs";
-import { resolveArrangeCliTargetPath } from "./resolve-arrange-cli-target.presenter.mjs";
-import { TryLoadCodefastConfigPresenterToken } from "../../core/contracts/tokens.mjs";
+import { WorkspaceResolverPortToken } from "../../contracts/tokens.mjs";
+import { CliFsToken, LoadCodefastConfigUseCaseToken } from "../../../core/contracts/tokens.mjs";
+import { AppError } from "../../../core/domain/errors.domain.mjs";
+import { err, ok } from "../../../core/domain/result.model.mjs";
+import { messageFromCaughtUnknown } from "../../../core/domain/caught-unknown-message.value-object.mjs";
+import { resolveArrangeTargetPath } from "../services/arrange-target-path-resolver.service.mjs";
 import { inject, injectable } from "@codefast/di";
-//#region src/lib/arrange/presentation/prepare-arrange.orchestrator.ts
+//#region src/lib/arrange/application/use-cases/prepare-arrange-workspace.use-case.ts
 function toPrimitive(input, hint) {
 	if (typeof input !== "object" || input === null) return input;
 	var prim = input[Symbol.toPrimitive];
@@ -217,32 +216,38 @@ function _apply_decs_2311(targetClass, classDecs, memberDecs, classDecsHaveThis,
 	};
 }
 let _dec, _initClass;
-_dec = injectable([inject(CliFsToken), inject(TryLoadCodefastConfigPresenterToken)]);
-let _PrepareArrangeOrchestrator;
+_dec = injectable([
+	inject(CliFsToken),
+	inject(LoadCodefastConfigUseCaseToken),
+	inject(WorkspaceResolverPortToken)
+]);
+let _PrepareArrangeWorkspaceUseCaseImpl;
 (class {
 	fs;
-	tryLoadCodefastConfig;
+	loadCodefastConfig;
+	workspaceResolver;
 	static {
-		({c: [_PrepareArrangeOrchestrator, _initClass]} = _apply_decs_2311(this, [_dec], []));
+		({c: [_PrepareArrangeWorkspaceUseCaseImpl, _initClass]} = _apply_decs_2311(this, [_dec], []));
 	}
-	constructor(fs, tryLoadCodefastConfig) {
+	constructor(fs, loadCodefastConfig, workspaceResolver) {
 		this.fs = fs;
-		this.tryLoadCodefastConfig = tryLoadCodefastConfig;
+		this.loadCodefastConfig = loadCodefastConfig;
+		this.workspaceResolver = workspaceResolver;
 	}
 	async execute(args) {
-		const resolvedTarget = resolveArrangeCliTargetPath({
+		const resolvedTarget = resolveArrangeTargetPath({
 			fs: this.fs,
 			currentWorkingDirectory: args.currentWorkingDirectory,
 			rawTarget: args.rawTarget
 		});
-		if (!this.fs.existsSync(resolvedTarget)) return err(appError("NOT_FOUND", `Not found: ${resolvedTarget}`));
+		if (!this.fs.existsSync(resolvedTarget)) return err(new AppError("NOT_FOUND", `Not found: ${resolvedTarget}`));
 		let rootDir;
 		try {
-			rootDir = findRepoRoot(this.fs, args.currentWorkingDirectory);
+			rootDir = this.workspaceResolver.findRepoRoot(args.currentWorkingDirectory);
 		} catch (caughtError) {
-			return err(appError("INFRA_FAILURE", messageFromCaughtUnknown(caughtError), caughtError));
+			return err(new AppError("INFRA_FAILURE", messageFromCaughtUnknown(caughtError), caughtError));
 		}
-		const loadedOutcome = await this.tryLoadCodefastConfig.execute(rootDir);
+		const loadedOutcome = await this.loadCodefastConfig.execute(rootDir);
 		if (!loadedOutcome.ok) return loadedOutcome;
 		return ok({
 			resolvedTarget,
@@ -255,4 +260,4 @@ let _PrepareArrangeOrchestrator;
 	}
 });
 //#endregion
-export { _PrepareArrangeOrchestrator as PrepareArrangeOrchestrator };
+export { _PrepareArrangeWorkspaceUseCaseImpl as PrepareArrangeWorkspaceUseCaseImpl };

package/dist/lib/arrange/application/use-cases/run-arrange-sync.use-case.mjs

@@ -1,8 +1,6 @@
-import { ArrangeFileProcessorToken, ArrangeTargetScannerToken } from "../../contracts/tokens.mjs";
-import { CliFsToken } from "../../../core/operational/contracts/tokens.mjs";
-import { appError } from "../../../core/domain/errors.domain.mjs";
-import { err, ok } from "../../../core/domain/result.model.mjs";
-import { messageFromCaughtUnknown } from "../../../core/application/utils/caught-unknown-message.util.mjs";
+import { ArrangeFileProcessorServiceToken, ArrangeTargetScannerServiceToken } from "../../contracts/tokens.mjs";
+import { ok } from "../../../core/domain/result.model.mjs";
+import { messageFromCaughtUnknown } from "../../../core/domain/caught-unknown-message.value-object.mjs";
 import { inject, injectable } from "@codefast/di";
 //#region src/lib/arrange/application/use-cases/run-arrange-sync.use-case.ts
 function toPrimitive(input, hint) {
@@ -224,31 +222,22 @@ async function runOnAfterWriteHook(hook, modifiedFiles) {
 		return `[arrange] onAfterWrite hook failed: ${messageFromCaughtUnknown(caughtHookError)}`;
 	}
 }
-_dec = injectable([
-	inject(CliFsToken),
-	inject(ArrangeTargetScannerToken),
-	inject(ArrangeFileProcessorToken)
-]);
+_dec = injectable([inject(ArrangeTargetScannerServiceToken), inject(ArrangeFileProcessorServiceToken)]);
 let _RunArrangeSyncUseCaseImpl;
 (class {
-	fs;
 	targetScanner;
 	fileProcessor;
 	static {
 		({c: [_RunArrangeSyncUseCaseImpl, _initClass]} = _apply_decs_2311(this, [_dec], []));
 	}
-	constructor(fs, targetScanner, fileProcessor) {
-		this.fs = fs;
+	constructor(targetScanner, fileProcessor) {
 		this.targetScanner = targetScanner;
 		this.fileProcessor = fileProcessor;
 	}
 	async execute(request) {
-		if (!this.fs.existsSync(request.targetPath)) return err(appError("NOT_FOUND", `Not found: ${request.targetPath}`));
-		const filePaths = this.targetScanner.scanTarget({
-			targetPath: request.targetPath,
-			fs: this.fs
-		});
+		const filePaths = this.targetScanner.scanTarget({ targetPath: request.targetPath });
 		const modifiedFiles = [];
+		const previewPlans = [];
 		let totalFound = 0;
 		let totalChanged = 0;
 		const groupOptions = {
@@ -264,6 +253,7 @@ let _RunArrangeSyncUseCaseImpl;
 			totalFound += fileProcessResult.totalFound;
 			totalChanged += fileProcessResult.changed;
 			if (fileProcessResult.changed > 0) modifiedFiles.push(fileProcessResult.filePath);
+			if (fileProcessResult.workPlan) previewPlans.push(fileProcessResult.workPlan);
 		}
 		const arrangeConfig = request.config;
 		const hookError = request.write && modifiedFiles.length > 0 ? await runOnAfterWriteHook(arrangeConfig?.onAfterWrite, modifiedFiles) : null;
@@ -272,7 +262,8 @@ let _RunArrangeSyncUseCaseImpl;
 			modifiedFiles,
 			totalFound,
 			totalChanged,
-			hookError
+			hookError,
+			previewPlans
 		});
 	}
 	static {

package/dist/lib/arrange/application/use-cases/suggest-cn-groups.use-case.mjs

@@ -1,6 +1,6 @@
-import { suggestCnGroups, summarizeGroupBucketLabels } from "../../domain/grouping.domain.mjs";
+import { TailwindGroupingServiceToken } from "../../contracts/tokens.mjs";
 import { formatArray, formatCnCall } from "../../domain/source-text-formatters.formatter.mjs";
-import { injectable } from "@codefast/di";
+import { inject, injectable } from "@codefast/di";
 //#region src/lib/arrange/application/use-cases/suggest-cn-groups.use-case.ts
 function toPrimitive(input, hint) {
 	if (typeof input !== "object" || input === null) return input;
@@ -212,17 +212,21 @@ function _apply_decs_2311(targetClass, classDecs, memberDecs, classDecsHaveThis,
 	};
 }
 let _dec, _initClass;
-_dec = injectable([]);
+_dec = injectable([inject(TailwindGroupingServiceToken)]);
 let _SuggestCnGroupsUseCaseImpl;
 (class {
+	grouping;
 	static {
 		({c: [_SuggestCnGroupsUseCaseImpl, _initClass]} = _apply_decs_2311(this, [_dec], []));
 	}
+	constructor(grouping) {
+		this.grouping = grouping;
+	}
 	execute(request) {
-		const groups = suggestCnGroups(request.inlineClasses);
+		const groups = this.grouping.suggestGroups(request.inlineClasses);
 		return {
 			primaryLine: request.emitTvStyleArray ? formatArray(groups) : formatCnCall(groups, { trailingClassName: request.trailingClassName }),
-			bucketsCommentLine: `// Buckets: ${JSON.stringify(summarizeGroupBucketLabels(groups))}`
+			bucketsCommentLine: `// Buckets: ${JSON.stringify(this.grouping.summarizeBucketLabels(groups))}`
 		};
 	}
 	static {

package/dist/lib/arrange/arrange.module.mjs

@@ -1,27 +1,31 @@
-import { AnalyzeDirectoryUseCaseToken, ArrangeFileProcessorToken, ArrangeTargetScannerToken, DomainSourceParserPortToken, FileWalkerPortToken, GroupFilePreviewPortToken, RunArrangeSyncUseCaseToken, SuggestCnGroupsUseCaseToken } from "./contracts/tokens.mjs";
-import { CliLoggerToken } from "../core/operational/contracts/tokens.mjs";
+import { AnalyzeDirectoryUseCaseToken, ArrangeFileProcessorServiceToken, ArrangeTargetScannerServiceToken, DomainSourceParserPortToken, FileWalkerPortToken, PrepareArrangeWorkspaceUseCaseToken, RunArrangeSyncUseCaseToken, SuggestCnGroupsUseCaseToken, TailwindGroupingServiceToken, WorkspaceResolverPortToken } from "./contracts/tokens.mjs";
+import { CliLoggerToken } from "../core/contracts/tokens.mjs";
 import { ArrangeFileProcessorServiceImpl as _ArrangeFileProcessorServiceImpl } from "./application/services/arrange-file-processor.service.mjs";
 import { ArrangeTargetScannerServiceImpl as _ArrangeTargetScannerServiceImpl } from "./application/services/arrange-target-scanner.service.mjs";
 import { AnalyzeDirectoryUseCaseImpl as _AnalyzeDirectoryUseCaseImpl } from "./application/use-cases/analyze-directory.use-case.mjs";
 import { RunArrangeSyncUseCaseImpl as _RunArrangeSyncUseCaseImpl } from "./application/use-cases/run-arrange-sync.use-case.mjs";
 import { SuggestCnGroupsUseCaseImpl as _SuggestCnGroupsUseCaseImpl } from "./application/use-cases/suggest-cn-groups.use-case.mjs";
-import { DomainSourceParserAdapter as _DomainSourceParserAdapter } from "./infra/domain-source-parser.adapter.mjs";
-import { FileWalkerAdapter as _FileWalkerAdapter } from "./infra/file-walker.adapter.mjs";
-import { GroupFilePreviewPresenterAdapter as _GroupFilePreviewPresenterAdapter } from "./presentation/group-file-preview.presenter.mjs";
-import { withOptionalPortTelemetry } from "../core/infra/logging-decorator.adapter.mjs";
-import { InfraModule } from "../core/infra/infra.module.mjs";
+import { DomainSourceParserAdapter as _DomainSourceParserAdapter } from "./adapters/secondary/domain-source-parser.adapter.mjs";
+import { FileWalkerAdapter as _FileWalkerAdapter } from "./adapters/secondary/file-walker.adapter.mjs";
+import { WorkspaceResolverAdapter as _WorkspaceResolverAdapter } from "./adapters/secondary/workspace-resolver.adapter.mjs";
+import { TailwindGroupingServiceImpl as _TailwindGroupingServiceImpl } from "./domain/tailwind-grouping.service.mjs";
+import { PrepareArrangeWorkspaceUseCaseImpl as _PrepareArrangeWorkspaceUseCaseImpl } from "./application/use-cases/prepare-arrange-workspace.use-case.mjs";
+import { withOptionalPortTelemetry } from "../core/infrastructure/port-telemetry.decorator.mjs";
+import { InfrastructureModule } from "../core/infrastructure/infrastructure.module.mjs";
 import { Module } from "@codefast/di";
 //#region src/lib/arrange/arrange.module.ts
 const ArrangeModule = Module.create("cli-arrange", (moduleBuilder) => {
-	moduleBuilder.import(InfraModule);
-	moduleBuilder.bind(FileWalkerPortToken).to(_FileWalkerAdapter).onActivation((ctx, implementation) => withOptionalPortTelemetry("FileWalkerPort", implementation, ctx.resolve(CliLoggerToken))).singleton();
-	moduleBuilder.bind(DomainSourceParserPortToken).to(_DomainSourceParserAdapter).onActivation((ctx, implementation) => withOptionalPortTelemetry("DomainSourceParserPort", implementation, ctx.resolve(CliLoggerToken))).singleton();
-	moduleBuilder.bind(GroupFilePreviewPortToken).to(_GroupFilePreviewPresenterAdapter).onActivation((ctx, implementation) => withOptionalPortTelemetry("GroupFilePreviewPort", implementation, ctx.resolve(CliLoggerToken))).singleton();
+	moduleBuilder.import(InfrastructureModule);
+	moduleBuilder.bind(FileWalkerPortToken).to(_FileWalkerAdapter).singleton().onActivation((ctx, implementation) => withOptionalPortTelemetry("FileWalkerPort", implementation, ctx.resolve(CliLoggerToken)));
+	moduleBuilder.bind(DomainSourceParserPortToken).to(_DomainSourceParserAdapter).singleton().onActivation((ctx, implementation) => withOptionalPortTelemetry("DomainSourceParserPort", implementation, ctx.resolve(CliLoggerToken)));
+	moduleBuilder.bind(WorkspaceResolverPortToken).to(_WorkspaceResolverAdapter).singleton();
+	moduleBuilder.bind(TailwindGroupingServiceToken).to(_TailwindGroupingServiceImpl).singleton();
 	moduleBuilder.bind(AnalyzeDirectoryUseCaseToken).to(_AnalyzeDirectoryUseCaseImpl).singleton();
-	moduleBuilder.bind(ArrangeTargetScannerToken).to(_ArrangeTargetScannerServiceImpl).singleton();
-	moduleBuilder.bind(ArrangeFileProcessorToken).to(_ArrangeFileProcessorServiceImpl).singleton();
+	moduleBuilder.bind(ArrangeTargetScannerServiceToken).to(_ArrangeTargetScannerServiceImpl).singleton();
+	moduleBuilder.bind(ArrangeFileProcessorServiceToken).to(_ArrangeFileProcessorServiceImpl).singleton();
 	moduleBuilder.bind(RunArrangeSyncUseCaseToken).to(_RunArrangeSyncUseCaseImpl).singleton();
 	moduleBuilder.bind(SuggestCnGroupsUseCaseToken).to(_SuggestCnGroupsUseCaseImpl).singleton();
+	moduleBuilder.bind(PrepareArrangeWorkspaceUseCaseToken).to(_PrepareArrangeWorkspaceUseCaseImpl).singleton();
 });
 //#endregion
 export { ArrangeModule };

package/dist/lib/arrange/contracts/tokens.mjs

@@ -3,12 +3,13 @@ import { token } from "@codefast/di";
 const FileWalkerPortToken = token("FileWalkerPort");
 const DomainSourceParserPortToken = token("DomainSourceParserPort");
 const GroupFilePreviewPortToken = token("GroupFilePreviewPort");
-const ArrangeTargetScannerToken = token("ArrangeTargetScannerService");
-const ArrangeFileProcessorToken = token("ArrangeFileProcessorService");
+const ArrangeTargetScannerServiceToken = token("ArrangeTargetScannerService");
+const ArrangeFileProcessorServiceToken = token("ArrangeFileProcessorService");
 const AnalyzeDirectoryUseCaseToken = token("AnalyzeDirectoryUseCase");
 const RunArrangeSyncUseCaseToken = token("RunArrangeSyncUseCase");
 const SuggestCnGroupsUseCaseToken = token("SuggestCnGroupsUseCase");
-const PrepareArrangeOrchestratorToken = token("PrepareArrangeOrchestrator");
-const PresentAnalyzeReportPresenterToken = token("PresentAnalyzeReportPresenter");
+const PrepareArrangeWorkspaceUseCaseToken = token("PrepareArrangeWorkspaceUseCase");
+const WorkspaceResolverPortToken = token("WorkspaceResolverPort");
+const TailwindGroupingServiceToken = token("TailwindGroupingService");
 //#endregion
-export { AnalyzeDirectoryUseCaseToken, ArrangeFileProcessorToken, ArrangeTargetScannerToken, DomainSourceParserPortToken, FileWalkerPortToken, GroupFilePreviewPortToken, PrepareArrangeOrchestratorToken, PresentAnalyzeReportPresenterToken, RunArrangeSyncUseCaseToken, SuggestCnGroupsUseCaseToken };
+export { AnalyzeDirectoryUseCaseToken, ArrangeFileProcessorServiceToken, ArrangeTargetScannerServiceToken, DomainSourceParserPortToken, FileWalkerPortToken, GroupFilePreviewPortToken, PrepareArrangeWorkspaceUseCaseToken, RunArrangeSyncUseCaseToken, SuggestCnGroupsUseCaseToken, TailwindGroupingServiceToken, WorkspaceResolverPortToken };

package/dist/lib/arrange/domain/arrange-analyze.service.mjs

@@ -2,7 +2,7 @@ import "./constants.domain.mjs";
 import { forEachDomainChild, isDomainCallExpression, isDomainJsxAttribute, isDomainObjectLiteralExpression } from "./ast/ast-node.model.mjs";
 import { buildKnownCnTvBindings, isCnOrTvIdentifier, lineOf } from "./ast/ast-helpers.helper.mjs";
 import { forEachStringLiteralInClassExpression } from "./ast/collectors-cn.collector.mjs";
-import { tokenizeClassString } from "./tokenizer.util.mjs";
+import { tokenizeClassString } from "./tailwind-token.value-object.mjs";
 import { collectCnCallsInsideTv, traverseTvObject } from "./ast/collectors-tv.collector.mjs";
 import { jsxClassNameStaticLiteral } from "./ast/collectors-jsx.collector.mjs";
 //#region src/lib/arrange/domain/arrange-analyze.service.ts

package/dist/lib/arrange/domain/ast/ast-helpers.helper.mjs

@@ -88,4 +88,4 @@ function lineOf(sourceFile, node) {
 	return lines.join("\n");
 }
 //#endregion
-export { KNOWN_CN_TV_MODULES, applyEditsDescending, buildKnownCnTvBindings, indentOfLineContaining, isCnOrTvIdentifier, lineOf, moduleLooksLikeCnTvReexport, propertyAssignmentNameText, unwrapCnInsideTvCallReplacement };
+export { applyEditsDescending, buildKnownCnTvBindings, isCnOrTvIdentifier, lineOf, propertyAssignmentNameText, unwrapCnInsideTvCallReplacement };

package/dist/lib/arrange/domain/ast/ast-node.model.mjs

@@ -49,9 +49,6 @@ function isDomainTailwindClassLiteral(node) {
 function isDomainImportDeclaration(node) {
 	return node.kind === 5;
 }
-function isDomainImportClause(node) {
-	return node !== void 0 && node.kind === 6;
-}
 function isDomainNamedImports(node) {
 	return node.kind === 7;
 }
@@ -82,9 +79,6 @@ function isDomainJsxAttribute(node) {
 function isDomainJsxExpression(node) {
 	return node.kind === 24;
 }
-function isDomainExpressionStatement(node) {
-	return node.kind === 22;
-}
 function forEachDomainChild(node, visit) {
 	switch (node.kind) {
 		case 1:
@@ -157,20 +151,6 @@ function forEachDomainChild(node, visit) {
 		default: return;
 	}
 }
-function forEachDomainDescendant(node, visit) {
-	visit(node);
-	forEachDomainChild(node, (child) => forEachDomainDescendant(child, visit));
-}
-function forEachDomainDescendantFromSourceFile(sourceFile, visit) {
-	for (const statement of sourceFile.statements) forEachDomainDescendant(statement, visit);
-}
-function findFirstDomainDescendantWhere(sourceFile, predicate) {
-	let found;
-	forEachDomainDescendantFromSourceFile(sourceFile, (n) => {
-		if (found === void 0 && predicate(n)) found = n;
-	});
-	return found;
-}
 function lineOfSourcePosition(sourceText, pos) {
 	const boundedPos = Math.max(0, Math.min(pos, sourceText.length));
 	let line = 1;
@@ -178,4 +158,4 @@ function lineOfSourcePosition(sourceText, pos) {
 	return line;
 }
 //#endregion
-export { DomainBinaryOperator, DomainSyntaxKind, findFirstDomainDescendantWhere, forEachDomainChild, forEachDomainDescendant, forEachDomainDescendantFromSourceFile, isDomainArrayLiteralExpression, isDomainCallExpression, isDomainExpressionStatement, isDomainIdentifier, isDomainImportClause, isDomainImportDeclaration, isDomainJsxAttribute, isDomainJsxExpression, isDomainNamedImports, isDomainNamespaceImport, isDomainNoSubstitutionTemplateLiteral, isDomainObjectLiteralExpression, isDomainPropertyAccessExpression, isDomainPropertyAssignment, isDomainSpreadElement, isDomainStringLiteral, isDomainTailwindClassLiteral, lineOfSourcePosition };
+export { DomainBinaryOperator, DomainSyntaxKind, forEachDomainChild, isDomainArrayLiteralExpression, isDomainCallExpression, isDomainIdentifier, isDomainImportDeclaration, isDomainJsxAttribute, isDomainJsxExpression, isDomainNamedImports, isDomainNamespaceImport, isDomainObjectLiteralExpression, isDomainPropertyAccessExpression, isDomainPropertyAssignment, isDomainSpreadElement, isDomainStringLiteral, isDomainTailwindClassLiteral, lineOfSourcePosition };

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

@@ -2,7 +2,7 @@ import "../constants.domain.mjs";
 import { forEachDomainChild, isDomainArrayLiteralExpression, isDomainCallExpression, isDomainObjectLiteralExpression, isDomainPropertyAssignment, isDomainSpreadElement, isDomainTailwindClassLiteral } from "./ast-node.model.mjs";
 import { buildKnownCnTvBindings, isCnOrTvIdentifier, propertyAssignmentNameText } from "./ast-helpers.helper.mjs";
 import { CN_APPLY_LITERAL_WALK_OPTS, collectUnconditionalTailwindLiteralsFromCnArguments, forEachStringLiteralInClassExpression, isUnsafeLiteralForCnStyleApplySplit } from "./collectors-cn.collector.mjs";
-import { tokenizeClassString } from "../tokenizer.util.mjs";
+import { tokenizeClassString } from "../tailwind-token.value-object.mjs";
 //#region src/lib/arrange/domain/ast/collectors-tv.collector.ts
 function traverseTvObject(sourceFile, obj, visitor, depth = 0, knownBindings) {
 	if (depth > 12) return;
@@ -171,4 +171,4 @@ function collectGroupableStringNodes(sourceFile) {
 	return results;
 }
 //#endregion
-export { collectCnCallsInsideTv, collectGroupableStringNodes, collectTvSlots, emitTvSlot, listAllCnCallsInsideTvInSourceFile, makeStringNode, slotClassString, traverseTvObject };
+export { collectCnCallsInsideTv, collectGroupableStringNodes, listAllCnCallsInsideTvInSourceFile, slotClassString, traverseTvObject };

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

@@ -1,11 +1,11 @@
 import "../constants.domain.mjs";
-import { indentOfLineContaining } from "../../../shared/source-code/domain/text-edit.model.mjs";
+import { endAfterOptionalCommaFollowingInSource, indentOfLineContaining, textPrefixFromLineStartToPosition } from "../../../shared/source-code/domain/text-edit.model.mjs";
 import { forEachDomainChild, isDomainArrayLiteralExpression, isDomainJsxAttribute, isDomainTailwindClassLiteral } from "./ast-node.model.mjs";
 import { isUnsafeLiteralForCnStyleApplySplit } from "./collectors-cn.collector.mjs";
-import { tokenizeClassString } from "../tokenizer.util.mjs";
+import { tokenizeClassString } from "../tailwind-token.value-object.mjs";
 import { collectGroupableStringNodes, slotClassString } from "./collectors-tv.collector.mjs";
 import { areCnTailwindPartitionsEquivalent, suggestCnGroups, summarizeGroupBucketLabels } from "../grouping.domain.mjs";
-import { escapeTsStringLiteralContent, formatArray, formatJsxCnAttributeValue } from "../source-text-formatters.formatter.mjs";
+import { escapeTsStringLiteralContent, formatArray, formatArrayElementsAsSiblingLines, formatJsxCnAttributeValue } from "../source-text-formatters.formatter.mjs";
 import { jsxClassNameStaticLiteral } from "./collectors-jsx.collector.mjs";
 //#region src/lib/arrange/domain/ast/targets.model.ts
 function targetReplaceStart(target) {
@@ -81,12 +81,12 @@ function planGroupEditForTarget(target, textAfterUnwrap, withClassName) {
 		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 : anchorClassLiteral.end;
+		const end = parentArray ? parentArray.end : endAfterOptionalCommaFollowingInSource(textAfterUnwrap, 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"),
+			replacement: parentArray ? formatArray(groups).split("\n").map((line, lineIndex) => lineIndex === 0 ? line : `${baseIndent}${line}`).join("\n") : formatArrayElementsAsSiblingLines(groups, textPrefixFromLineStartToPosition(textAfterUnwrap, start)),
 			bucketSummary: summarizeGroupBucketLabels(groups),
 			jsxCn: false,
 			lineSf: target.item.sf,
@@ -107,4 +107,4 @@ function planGroupEditForTarget(target, textAfterUnwrap, withClassName) {
 	};
 }
 //#endregion
-export { collectGroupTargets, collectLongJsxClassNameTargets, formatCnCallReplacement, planGroupEditForTarget, targetReplaceStart };
+export { collectGroupTargets, planGroupEditForTarget, targetReplaceStart };

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

@@ -1,5 +1,6 @@
 import { BUCKET_ORDER } from "./constants.domain.mjs";
-import { bucketsCompatible, bucketsMergeCompatible, classifyToken, compositeSecondaryOrder, selectorKey, stateKey, stripVariants, tokenizeClassString } from "./tokenizer.util.mjs";
+import { stripVariants, tokenizeClassString } from "./tailwind-token.value-object.mjs";
+import { bucketsCompatible, bucketsMergeCompatible, classifyToken, compositeSecondaryOrder, selectorKey, stateKey } from "./tailwind-token-classifier.domain-service.mjs";
 //#region src/lib/arrange/domain/grouping.domain.ts
 /**
 * `cn()` grouping: bucket sequence is {@link BUCKET_ORDER} only; tokens are classified with
@@ -313,4 +314,4 @@ function suggestCnGroups(classString) {
 	});
 }
 //#endregion
-export { areCnTailwindPartitionsEquivalent, capGroups, mergeEaseTimingIntoFollowingAnimatedState, mergeSingletons, suggestCnGroups, summarizeGroupBucketLabels };
+export { areCnTailwindPartitionsEquivalent, suggestCnGroups, summarizeGroupBucketLabels };

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

@@ -52,4 +52,4 @@ function ensureCnImport(sourceFile, cnImportOverride) {
 	return `${sourceText.slice(0, insertAt)}${importLine}\n${sourceText.slice(insertAt)}`;
 }
 //#endregion
-export { cnModuleSpecifierForFile, ensureCnImport };
+export { ensureCnImport };

package/dist/lib/arrange/domain/source-text-formatters.formatter.mjs

@@ -3,6 +3,9 @@ import { indentOfLineContaining } from "../../shared/source-code/domain/text-edi
 function escapeTsStringLiteralContent(group) {
 	return group.replaceAll("\\", "\\\\").replaceAll("\"", "\\\"");
 }
+/** Trailing comma on multiline Tailwind group lists (matches prior `cn` / `tv` array style). */ function commaAfterTailwindGroupLine(groupIndex, groupCount) {
+	return groupIndex < groupCount - 1 || groupCount > 1 ? "," : "";
+}
 /**
 * Multiline fragment for use *inside* an existing `cn(...)` — replaces one
 * string argument with several, without producing `cn(cn(...))`.
@@ -37,12 +40,26 @@ function formatArray(groups) {
 	for (let i = 0; i < groups.length; i++) {
 		const group = groups[i];
 		if (group === void 0) throw new Error("invariant: formatArray group missing");
-		const comma = i < groups.length - 1 || groups.length > 1 ? "," : "";
+		const comma = commaAfterTailwindGroupLine(i, groups.length);
 		lines.push(`  "${escapeTsStringLiteralContent(group)}"${comma}`);
 	}
 	lines.push("]");
 	return lines.join("\n");
 }
+/**
+* Multiple string literals as sequential lines for insertion **inside** an existing array
+* (e.g. `tv({ base: [ … ] })` — avoids `[[ "a", "b" ]]` when replacing one long string).
+*/ function formatArrayElementsAsSiblingLines(groups, continuationPrefix) {
+	const segments = [];
+	for (let i = 0; i < groups.length; i++) {
+		const group = groups[i];
+		if (group === void 0) throw new Error("invariant: formatArrayElementsAsSiblingLines group missing");
+		const comma = commaAfterTailwindGroupLine(i, groups.length);
+		const segment = `"${escapeTsStringLiteralContent(group)}"${comma}`;
+		segments.push(i === 0 ? segment : `\n${continuationPrefix}${segment}`);
+	}
+	return segments.join("");
+}
 function formatJsxCnAttributeValue(groups, source, valueNodeStart) {
 	const baseIndent = indentOfLineContaining(source, valueNodeStart);
 	return `{cn(\n${formatCnArguments(groups, {
@@ -51,4 +68,4 @@ function formatJsxCnAttributeValue(groups, source, valueNodeStart) {
 	})}\n${baseIndent})}`;
 }
 //#endregion
-export { escapeTsStringLiteralContent, formatArray, formatCnArguments, formatCnCall, formatJsxCnAttributeValue };
+export { escapeTsStringLiteralContent, formatArray, formatArrayElementsAsSiblingLines, formatCnCall, formatJsxCnAttributeValue };

package/dist/lib/{tag/presentation/create-tag-progress-listener.presenter.mjs → arrange/domain/tailwind-grouping.service.mjs}

@@ -1,6 +1,6 @@
-import { createTagProgressListener } from "./tag-sync.presenter.mjs";
+import { suggestCnGroups, summarizeGroupBucketLabels } from "./grouping.domain.mjs";
 import { injectable } from "@codefast/di";
-//#region src/lib/tag/presentation/create-tag-progress-listener.presenter.ts
+//#region src/lib/arrange/domain/tailwind-grouping.service.ts
 function toPrimitive(input, hint) {
 	if (typeof input !== "object" || input === null) return input;
 	var prim = input[Symbol.toPrimitive];
@@ -212,17 +212,20 @@ function _apply_decs_2311(targetClass, classDecs, memberDecs, classDecsHaveThis,
 }
 let _dec, _initClass;
 _dec = injectable([]);
-let _CreateTagProgressListenerPresenterImpl;
+let _TailwindGroupingServiceImpl;
 (class {
 	static {
-		({c: [_CreateTagProgressListenerPresenterImpl, _initClass]} = _apply_decs_2311(this, [_dec], []));
+		({c: [_TailwindGroupingServiceImpl, _initClass]} = _apply_decs_2311(this, [_dec], []));
 	}
-	create(emitLine) {
-		return createTagProgressListener(emitLine);
+	suggestGroups(classString) {
+		return suggestCnGroups(classString);
+	}
+	summarizeBucketLabels(groups) {
+		return summarizeGroupBucketLabels(groups);
 	}
 	static {
 		_initClass();
 	}
 });
 //#endregion
-export { _CreateTagProgressListenerPresenterImpl as CreateTagProgressListenerPresenterImpl };
+export { _TailwindGroupingServiceImpl as TailwindGroupingServiceImpl };

package/dist/lib/arrange/domain/{tokenizer.util.mjs → tailwind-token-classifier.domain-service.mjs}

@@ -1,5 +1,6 @@
 import { COMPATIBLE_BUCKET_SETS, RESPONSIVE_PREFIX, STATE_PREFIXES } from "./constants.domain.mjs";
-//#region src/lib/arrange/domain/tokenizer.util.ts
+import { indexOfFirstVariantColon, stripVariants } from "./tailwind-token.value-object.mjs";
+//#region src/lib/arrange/domain/tailwind-token-classifier.domain-service.ts
 /**
 * Bare-token classification is **total** (always returns a {@link Bucket}). The `Result` pattern
 * (`isOk` / `isErr`) belongs at arrange use-case / I/O boundaries, not on this hot path.
@@ -19,33 +20,6 @@ import { COMPATIBLE_BUCKET_SETS, RESPONSIVE_PREFIX, STATE_PREFIXES } from "./con
 	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) {
@@ -216,4 +190,4 @@ function bucketsCompatible(a, b) {
 	return bucketsCompatible(a, b);
 }
 //#endregion
-export { bucketsCompatible, bucketsMergeCompatible, classifyBareUtility, classifyToken, compositeSecondaryOrder, indexOfFirstVariantColon, isArbitraryParentSelectorStateToken, selectorKey, stateKey, stripVariants, tokenizeClassString };
+export { bucketsCompatible, bucketsMergeCompatible, classifyToken, compositeSecondaryOrder, selectorKey, stateKey };

package/dist/lib/arrange/domain/tailwind-token.value-object.mjs

@@ -0,0 +1,31 @@
+import "./constants.domain.mjs";
+//#region src/lib/arrange/domain/tailwind-token.value-object.ts
+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 maxStripVariantPasses = 12;
+	for (let i = 0; i < maxStripVariantPasses; i++) {
+		const colonIdx = indexOfFirstVariantColon(withoutVariants);
+		if (colonIdx === -1) break;
+		withoutVariants = withoutVariants.slice(colonIdx + 1);
+	}
+	return withoutVariants;
+}
+//#endregion
+export { indexOfFirstVariantColon, stripVariants, tokenizeClassString };

package/dist/lib/arrange/{infra/ts-ast-translator.adapter.mjs → infrastructure/typescript-ast-translator.adapter.mjs}

@@ -1,6 +1,6 @@
 import { DomainBinaryOperator, DomainSyntaxKind } from "../domain/ast/ast-node.model.mjs";
 import ts from "typescript";
-//#region src/lib/arrange/infra/ts-ast-translator.adapter.ts
+//#region src/lib/arrange/infrastructure/typescript-ast-translator.adapter.ts
 /**
 * Anti-corruption layer: maps TypeScript compiler AST to arrange domain AST.
 * This module is the only place that imports `typescript` for arrange AST translation.
@@ -352,4 +352,4 @@ function parseDomainSourceFile(filePath, sourceText) {
 	return translateTypeScriptSourceFile(ts.createSourceFile(filePath, sourceText, ts.ScriptTarget.Latest, true, scriptKind));
 }
 //#endregion
-export { parseDomainSourceFile, translateNode, translateTypeScriptSourceFile };
+export { parseDomainSourceFile };