@codefast/cli 0.3.12 → 0.3.13-canary.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +206 -51
- package/dist/analyze-DvtJ3j9m.mjs +92 -0
- package/dist/arrange-Bbh62DrU.mjs +107 -0
- package/dist/arrange-BqP2DI3w.mjs +8 -0
- package/dist/ast-helpers-MDRYuIAk.mjs +115 -0
- package/dist/{bin.js → bin.mjs} +4 -1
- package/dist/caught-unknown-message-CRhkDWO7.mjs +20 -0
- package/dist/collectors-cn-BS8TTQ8O.mjs +61 -0
- package/dist/collectors-jsx-D9tL2ZPM.mjs +20 -0
- package/dist/collectors-tv-D2PXZaRt.mjs +170 -0
- package/dist/colors-BjdkCfGK.mjs +12 -0
- package/dist/commands/arrange.mjs +2 -0
- package/dist/commands/mirror.mjs +2 -0
- package/dist/commands/mirror.test.mjs +48 -0
- package/dist/commands/tag.mjs +2 -0
- package/dist/config-DVia_f9a.mjs +3 -0
- package/dist/config-reporter-SCcWDZc1.mjs +10 -0
- package/dist/constants-AtPhF-Ct.mjs +169 -0
- package/dist/constants-Bq5wdyLC.mjs +8 -0
- package/dist/dirent-list-BSDeRG5i.mjs +14 -0
- package/dist/engine-CcWEHSCq.mjs +287 -0
- package/dist/engine-DRTdkc5u.mjs +236 -0
- package/dist/errors-CFH4w6ic.mjs +15 -0
- package/dist/errors-CpU1ogfA.mjs +19 -0
- package/dist/formatters-DGE8jJ53.mjs +52 -0
- package/dist/group-file-ClW7XdD6.mjs +113 -0
- package/dist/grouping-c1grpCQT.mjs +235 -0
- package/dist/imports-DSVq1xhB.mjs +54 -0
- package/dist/lib/arrange/application/analyze.mjs +2 -0
- package/dist/lib/arrange/application/analyze.test.mjs +171 -0
- package/dist/lib/arrange/application/group-file.mjs +2 -0
- package/dist/lib/arrange/application/group-file.test.mjs +273 -0
- package/dist/lib/arrange/application/run-target.mjs +2 -0
- package/dist/lib/arrange/application/run-target.test.mjs +97 -0
- package/dist/lib/arrange/domain/ast/ast-helpers.mjs +2 -0
- package/dist/lib/arrange/domain/ast/ast-helpers.test.mjs +148 -0
- package/dist/lib/arrange/domain/ast/collectors-cn.mjs +2 -0
- package/dist/lib/arrange/domain/ast/collectors-cn.test.mjs +58 -0
- package/dist/lib/arrange/domain/ast/collectors-jsx.mjs +2 -0
- package/dist/lib/arrange/domain/ast/collectors-jsx.test.mjs +20 -0
- package/dist/lib/arrange/domain/ast/collectors-tv.mjs +2 -0
- package/dist/lib/arrange/domain/ast/collectors-tv.test.mjs +145 -0
- package/dist/lib/arrange/domain/ast/targets.mjs +2 -0
- package/dist/lib/arrange/domain/ast/targets.test.mjs +50 -0
- package/dist/lib/arrange/domain/constants.mjs +2 -0
- package/dist/lib/arrange/domain/errors.mjs +2 -0
- package/dist/lib/arrange/domain/grouping.mjs +2 -0
- package/dist/lib/arrange/domain/grouping.test.mjs +186 -0
- package/dist/lib/arrange/domain/imports.mjs +2 -0
- package/dist/lib/arrange/domain/imports.test.mjs +48 -0
- package/dist/lib/arrange/domain/tokenizer.mjs +2 -0
- package/dist/lib/arrange/domain/tokenizer.test.mjs +165 -0
- package/dist/lib/arrange/index.mjs +16 -0
- package/dist/lib/arrange/infra/walk.mjs +2 -0
- package/dist/lib/arrange/infra/walk.test.mjs +50 -0
- package/dist/lib/arrange/presentation/formatters.mjs +2 -0
- package/dist/lib/arrange/presentation/formatters.test.mjs +73 -0
- package/dist/lib/arrange/presentation/report.mjs +2 -0
- package/dist/lib/config/domain/schema.mjs +2 -0
- package/dist/lib/config/index.mjs +4 -0
- package/dist/lib/config/infra/loader.mjs +2 -0
- package/dist/lib/config/infra/loader.test.mjs +116 -0
- package/dist/lib/infra/caught-unknown-message.mjs +2 -0
- package/dist/lib/infra/config-reporter.mjs +2 -0
- package/dist/lib/infra/node-io.mjs +2 -0
- package/dist/lib/infra/workspace/repo-root.mjs +2 -0
- package/dist/lib/infra/workspace/repo-root.test.mjs +45 -0
- package/dist/lib/mirror/application/engine.mjs +2 -0
- package/dist/lib/mirror/application/sync.mjs +2 -0
- package/dist/lib/mirror/application/sync.test.mjs +482 -0
- package/dist/lib/mirror/domain/constants.mjs +2 -0
- package/dist/lib/mirror/domain/errors.mjs +2 -0
- package/dist/lib/mirror/domain/types.mjs +1 -0
- package/dist/lib/mirror/index.mjs +3 -0
- package/dist/lib/mirror/infra/dirent-list.mjs +2 -0
- package/dist/lib/mirror/infra/dirent-list.test.mjs +18 -0
- package/dist/lib/mirror/infra/package-filter.mjs +2 -0
- package/dist/lib/mirror/infra/package-filter.test.mjs +32 -0
- package/dist/lib/mirror/infra/path-normalizer.mjs +2 -0
- package/dist/lib/mirror/infra/update-pkg.mjs +2 -0
- package/dist/lib/mirror/infra/workspace-packages.mjs +2 -0
- package/dist/lib/mirror/infra/workspace-packages.test.mjs +167 -0
- package/dist/lib/mirror/presentation/reporter.mjs +2 -0
- package/dist/lib/tag/application/engine.mjs +2 -0
- package/dist/lib/tag/application/engine.test.mjs +159 -0
- package/dist/lib/tag/domain/types.mjs +1 -0
- package/dist/lib/tag/index.mjs +5 -0
- package/dist/lib/tag/infra/target-resolver.mjs +2 -0
- package/dist/lib/tag/presentation/colors.mjs +2 -0
- package/dist/lib/tag/presentation/tag-presenter.mjs +2 -0
- package/dist/lib/tag/presentation/tag-presenter.test.mjs +29 -0
- package/dist/loader-DpN-zl5g.mjs +78 -0
- package/dist/mirror-CbGiLXKT.mjs +2 -0
- package/dist/mirror-DqJE3ejL.mjs +66 -0
- package/dist/node-io-DFRbHO6m.mjs +30 -0
- package/dist/package-filter-C_8ryqvz.mjs +26 -0
- package/dist/path-normalizer-D4ceBO3l.mjs +7 -0
- package/dist/program-DR-H4tH3.mjs +34 -0
- package/dist/program.mjs +2 -0
- package/dist/repo-root-HmtIEm6J.mjs +22 -0
- package/dist/report-DYxvw34T.mjs +24 -0
- package/dist/reporter-CwIe_tAM.mjs +108 -0
- package/dist/run-target-CJWrqNT4.mjs +65 -0
- package/dist/schema-Or8RAARd.mjs +25 -0
- package/dist/sync-e1Sp-shi.mjs +157 -0
- package/dist/tag-Cd9JujU5.mjs +2 -0
- package/dist/tag-hEKVZ_-7.mjs +58 -0
- package/dist/tag-presenter-Cs66UBsH.mjs +63 -0
- package/dist/target-resolver-CR3FXMTy.mjs +170 -0
- package/dist/targets-pCTslnFh.mjs +106 -0
- package/dist/tokenizer-CeZx73Zu.mjs +216 -0
- package/dist/update-pkg-CnGfjWBy.mjs +37 -0
- package/dist/walk-DjgQn66n.mjs +33 -0
- package/dist/workspace-packages-K2NYTHJq.mjs +159 -0
- package/package.json +11 -11
- package/dist/bin.d.ts +0 -3
- package/dist/bin.d.ts.map +0 -1
- package/dist/commands/arrange.d.ts +0 -3
- package/dist/commands/arrange.d.ts.map +0 -1
- package/dist/commands/arrange.js +0 -114
- package/dist/commands/mirror.d.ts +0 -4
- package/dist/commands/mirror.d.ts.map +0 -1
- package/dist/commands/mirror.js +0 -63
- package/dist/lib/arrange/analyze.d.ts +0 -4
- package/dist/lib/arrange/analyze.d.ts.map +0 -1
- package/dist/lib/arrange/analyze.js +0 -105
- package/dist/lib/arrange/ast/collectors-cn.d.ts +0 -10
- package/dist/lib/arrange/ast/collectors-cn.d.ts.map +0 -1
- package/dist/lib/arrange/ast/collectors-cn.js +0 -84
- package/dist/lib/arrange/ast/collectors-jsx.d.ts +0 -4
- package/dist/lib/arrange/ast/collectors-jsx.d.ts.map +0 -1
- package/dist/lib/arrange/ast/collectors-jsx.js +0 -18
- package/dist/lib/arrange/ast/collectors-tv.d.ts +0 -13
- package/dist/lib/arrange/ast/collectors-tv.d.ts.map +0 -1
- package/dist/lib/arrange/ast/collectors-tv.js +0 -273
- package/dist/lib/arrange/ast/targets.d.ts +0 -8
- package/dist/lib/arrange/ast/targets.d.ts.map +0 -1
- package/dist/lib/arrange/ast/targets.js +0 -143
- package/dist/lib/arrange/ast/utils.d.ts +0 -36
- package/dist/lib/arrange/ast/utils.d.ts.map +0 -1
- package/dist/lib/arrange/ast/utils.js +0 -138
- package/dist/lib/arrange/constants.d.ts +0 -68
- package/dist/lib/arrange/constants.d.ts.map +0 -1
- package/dist/lib/arrange/constants.js +0 -179
- package/dist/lib/arrange/errors.d.ts +0 -14
- package/dist/lib/arrange/errors.d.ts.map +0 -1
- package/dist/lib/arrange/errors.js +0 -16
- package/dist/lib/arrange/formatters.d.ts +0 -16
- package/dist/lib/arrange/formatters.d.ts.map +0 -1
- package/dist/lib/arrange/formatters.js +0 -57
- package/dist/lib/arrange/group-file.d.ts +0 -4
- package/dist/lib/arrange/group-file.d.ts.map +0 -1
- package/dist/lib/arrange/group-file.js +0 -115
- package/dist/lib/arrange/grouping.d.ts +0 -41
- package/dist/lib/arrange/grouping.d.ts.map +0 -1
- package/dist/lib/arrange/grouping.js +0 -280
- package/dist/lib/arrange/imports.d.ts +0 -6
- package/dist/lib/arrange/imports.d.ts.map +0 -1
- package/dist/lib/arrange/imports.js +0 -74
- package/dist/lib/arrange/report.d.ts +0 -4
- package/dist/lib/arrange/report.d.ts.map +0 -1
- package/dist/lib/arrange/report.js +0 -37
- package/dist/lib/arrange/run-target.d.ts +0 -4
- package/dist/lib/arrange/run-target.d.ts.map +0 -1
- package/dist/lib/arrange/run-target.js +0 -28
- package/dist/lib/arrange/tokenizer.d.ts +0 -37
- package/dist/lib/arrange/tokenizer.d.ts.map +0 -1
- package/dist/lib/arrange/tokenizer.js +0 -390
- package/dist/lib/arrange/types.d.ts +0 -104
- package/dist/lib/arrange/types.d.ts.map +0 -1
- package/dist/lib/arrange/types.js +0 -7
- package/dist/lib/arrange/walk.d.ts +0 -4
- package/dist/lib/arrange/walk.d.ts.map +0 -1
- package/dist/lib/arrange/walk.js +0 -34
- package/dist/lib/arrange.d.ts +0 -41
- package/dist/lib/arrange.d.ts.map +0 -1
- package/dist/lib/arrange.js +0 -38
- package/dist/lib/infra/fs-contract.d.ts +0 -28
- package/dist/lib/infra/fs-contract.d.ts.map +0 -1
- package/dist/lib/infra/node-io.d.ts +0 -4
- package/dist/lib/infra/node-io.d.ts.map +0 -1
- package/dist/lib/infra/node-io.js +0 -27
- package/dist/lib/mirror/config.d.ts +0 -7
- package/dist/lib/mirror/config.d.ts.map +0 -1
- package/dist/lib/mirror/config.js +0 -146
- package/dist/lib/mirror/constants.d.ts +0 -10
- package/dist/lib/mirror/constants.d.ts.map +0 -1
- package/dist/lib/mirror/constants.js +0 -13
- package/dist/lib/mirror/engine.d.ts +0 -12
- package/dist/lib/mirror/engine.d.ts.map +0 -1
- package/dist/lib/mirror/engine.js +0 -248
- package/dist/lib/mirror/errors.d.ts +0 -10
- package/dist/lib/mirror/errors.d.ts.map +0 -1
- package/dist/lib/mirror/errors.js +0 -12
- package/dist/lib/mirror/package-filter.d.ts +0 -8
- package/dist/lib/mirror/package-filter.d.ts.map +0 -1
- package/dist/lib/mirror/package-filter.js +0 -33
- package/dist/lib/mirror/reporter.d.ts +0 -24
- package/dist/lib/mirror/reporter.d.ts.map +0 -1
- package/dist/lib/mirror/reporter.js +0 -126
- package/dist/lib/mirror/sync.d.ts +0 -4
- package/dist/lib/mirror/sync.d.ts.map +0 -1
- package/dist/lib/mirror/sync.js +0 -135
- package/dist/lib/mirror/types.d.ts +0 -81
- package/dist/lib/mirror/types.d.ts.map +0 -1
- package/dist/lib/mirror/update-pkg.d.ts +0 -13
- package/dist/lib/mirror/update-pkg.d.ts.map +0 -1
- package/dist/lib/mirror/update-pkg.js +0 -39
- package/dist/lib/mirror/workspace-packages.d.ts +0 -26
- package/dist/lib/mirror/workspace-packages.d.ts.map +0 -1
- package/dist/lib/mirror/workspace-packages.js +0 -160
- package/dist/lib/mirror.d.ts +0 -7
- package/dist/lib/mirror.d.ts.map +0 -1
- package/dist/lib/mirror.js +0 -5
- package/dist/lib/repo-root.d.ts +0 -7
- package/dist/lib/repo-root.d.ts.map +0 -1
- package/dist/lib/repo-root.js +0 -23
- package/dist/lib/shared/utils.d.ts +0 -9
- package/dist/lib/shared/utils.d.ts.map +0 -1
- package/dist/lib/shared/utils.js +0 -12
- package/dist/program.d.ts +0 -4
- package/dist/program.d.ts.map +0 -1
- package/dist/program.js +0 -38
- /package/dist/lib/{infra/fs-contract.js → arrange/domain/types.mjs} +0 -0
- /package/dist/lib/{mirror/types.js → infra/fs-contract.mjs} +0 -0
|
@@ -0,0 +1,113 @@
|
|
|
1
|
+
import { l as unwrapCnInsideTvCallReplacement, n as applyEditsDescending, o as lineOf, r as buildKnownCnTvBindings } from "./ast-helpers-MDRYuIAk.mjs";
|
|
2
|
+
import { a as listAllCnCallsInsideTvInSourceFile } from "./collectors-tv-D2PXZaRt.mjs";
|
|
3
|
+
import { a as targetReplaceStart, i as planGroupEditForTarget, t as collectGroupTargets } from "./targets-pCTslnFh.mjs";
|
|
4
|
+
import { n as ensureCnImport } from "./imports-DSVq1xhB.mjs";
|
|
5
|
+
import ts from "typescript";
|
|
6
|
+
//#region src/lib/arrange/application/group-file.ts
|
|
7
|
+
function printGroupFilePreview(logger, args) {
|
|
8
|
+
const { out } = logger;
|
|
9
|
+
const { filePath, reportTotal, cnInTvNoReplacement, cnInTvCalls, unwrapReplacementByCall, sourceText, sf, unwrapEdits, plannedGroupEdits } = args;
|
|
10
|
+
let header = `\n── ${filePath} (${reportTotal} site(s)`;
|
|
11
|
+
if (cnInTvNoReplacement > 0) header += `; plus ${cnInTvNoReplacement} cn() inside tv left unchanged (0 args)`;
|
|
12
|
+
header += `) ──`;
|
|
13
|
+
out(header);
|
|
14
|
+
for (const call of cnInTvCalls) {
|
|
15
|
+
const replacement = unwrapReplacementByCall.get(call);
|
|
16
|
+
if (replacement === void 0) {
|
|
17
|
+
out(` Line ${lineOf(sf, call)} [tv ⊃ cn]: cn(...) has no arguments — skipped`);
|
|
18
|
+
continue;
|
|
19
|
+
}
|
|
20
|
+
const start = call.getStart(sf);
|
|
21
|
+
const end = call.getEnd();
|
|
22
|
+
if (sourceText.slice(start, end) === replacement) continue;
|
|
23
|
+
out(` Line ${lineOf(sf, call)} [tv ⊃ cn → string/array]:`);
|
|
24
|
+
out(` ${replacement.split("\n").join("\n ")}`);
|
|
25
|
+
}
|
|
26
|
+
if (unwrapEdits.length > 0 && plannedGroupEdits.length > 0) out(" ([cn] / [tv] / [JSX className] lines below reflect content after unwrap of cn inside tv.)");
|
|
27
|
+
for (const plan of plannedGroupEdits) {
|
|
28
|
+
out(` Line ${lineOf(plan.lineSf, plan.reportNode)} [${plan.label}]:`);
|
|
29
|
+
out(` ${plan.replacement.split("\n").join("\n ")}`);
|
|
30
|
+
out(` // Buckets: ${JSON.stringify(plan.bucketSummary)}`);
|
|
31
|
+
}
|
|
32
|
+
}
|
|
33
|
+
function applyGroupFileWrites(filePath, options, fs, logger, unwrapEdits, textAfterUnwrap, plannedGroupEdits, cnInTvNoReplacement) {
|
|
34
|
+
const groupEdits = plannedGroupEdits.map((plannedEdit) => ({
|
|
35
|
+
start: plannedEdit.start,
|
|
36
|
+
end: plannedEdit.end,
|
|
37
|
+
replacement: plannedEdit.replacement,
|
|
38
|
+
jsxCn: plannedEdit.jsxCn
|
|
39
|
+
}));
|
|
40
|
+
const touchedJsxCn = groupEdits.some((groupEdit) => groupEdit.jsxCn);
|
|
41
|
+
let newText = groupEdits.length > 0 ? applyEditsDescending(textAfterUnwrap, groupEdits) : textAfterUnwrap;
|
|
42
|
+
const changed = unwrapEdits.length + groupEdits.length;
|
|
43
|
+
if (changed > 0) {
|
|
44
|
+
if (touchedJsxCn) newText = ensureCnImport(newText, filePath, options.cnImport);
|
|
45
|
+
fs.writeFileSync(filePath, newText, "utf8");
|
|
46
|
+
}
|
|
47
|
+
return {
|
|
48
|
+
filePath,
|
|
49
|
+
totalFound: changed + cnInTvNoReplacement,
|
|
50
|
+
changed
|
|
51
|
+
};
|
|
52
|
+
}
|
|
53
|
+
function groupFile(filePath, options, fs, logger) {
|
|
54
|
+
const sourceText = fs.readFileSync(filePath, "utf8");
|
|
55
|
+
const sf = ts.createSourceFile(filePath, sourceText, ts.ScriptTarget.Latest, true, filePath.endsWith(".tsx") ? ts.ScriptKind.TSX : ts.ScriptKind.TS);
|
|
56
|
+
const cnInTvCalls = listAllCnCallsInsideTvInSourceFile(sf, buildKnownCnTvBindings(sf));
|
|
57
|
+
const unwrapPlans = cnInTvCalls.map((call) => {
|
|
58
|
+
const replacement = unwrapCnInsideTvCallReplacement(call, sourceText, sf);
|
|
59
|
+
if (replacement === void 0) return void 0;
|
|
60
|
+
return {
|
|
61
|
+
start: call.getStart(sf),
|
|
62
|
+
end: call.getEnd(),
|
|
63
|
+
replacement,
|
|
64
|
+
call
|
|
65
|
+
};
|
|
66
|
+
}).filter((planOrUndefined) => planOrUndefined !== void 0);
|
|
67
|
+
const unwrapReplacementByCall = new Map(unwrapPlans.map((unwrapPlan) => [unwrapPlan.call, unwrapPlan.replacement]));
|
|
68
|
+
const unwrapEdits = unwrapPlans.filter((unwrapPlan) => sourceText.slice(unwrapPlan.start, unwrapPlan.end) !== unwrapPlan.replacement);
|
|
69
|
+
const textAfterUnwrap = unwrapEdits.length > 0 ? applyEditsDescending(sourceText, unwrapEdits) : sourceText;
|
|
70
|
+
const groupTargets = collectGroupTargets(ts.createSourceFile(filePath, textAfterUnwrap, ts.ScriptTarget.Latest, true, filePath.endsWith(".tsx") ? ts.ScriptKind.TSX : ts.ScriptKind.TS), filePath);
|
|
71
|
+
const cnInTvNoReplacement = cnInTvCalls.length - unwrapPlans.length;
|
|
72
|
+
const sortedTargets = [...groupTargets].sort((leftTarget, rightTarget) => targetReplaceStart(rightTarget) - targetReplaceStart(leftTarget));
|
|
73
|
+
const plannedGroupEdits = [];
|
|
74
|
+
for (const groupTarget of sortedTargets) {
|
|
75
|
+
const plan = planGroupEditForTarget(groupTarget, textAfterUnwrap, options.withClassName);
|
|
76
|
+
if (plan === void 0) continue;
|
|
77
|
+
if (textAfterUnwrap.slice(plan.start, plan.end) === plan.replacement) continue;
|
|
78
|
+
plannedGroupEdits.push(plan);
|
|
79
|
+
}
|
|
80
|
+
const editSitesCount = unwrapEdits.length + plannedGroupEdits.length;
|
|
81
|
+
const reportTotal = editSitesCount + cnInTvNoReplacement;
|
|
82
|
+
if (cnInTvCalls.length === 0 && groupTargets.length === 0) return {
|
|
83
|
+
filePath,
|
|
84
|
+
totalFound: 0,
|
|
85
|
+
changed: 0
|
|
86
|
+
};
|
|
87
|
+
if (!options.write) {
|
|
88
|
+
if (editSitesCount === 0 && cnInTvNoReplacement === 0) return {
|
|
89
|
+
filePath,
|
|
90
|
+
totalFound: 0,
|
|
91
|
+
changed: 0
|
|
92
|
+
};
|
|
93
|
+
printGroupFilePreview(logger, {
|
|
94
|
+
filePath,
|
|
95
|
+
reportTotal,
|
|
96
|
+
cnInTvNoReplacement,
|
|
97
|
+
cnInTvCalls,
|
|
98
|
+
unwrapReplacementByCall,
|
|
99
|
+
sourceText,
|
|
100
|
+
sf,
|
|
101
|
+
unwrapEdits,
|
|
102
|
+
plannedGroupEdits
|
|
103
|
+
});
|
|
104
|
+
return {
|
|
105
|
+
filePath,
|
|
106
|
+
totalFound: reportTotal,
|
|
107
|
+
changed: 0
|
|
108
|
+
};
|
|
109
|
+
}
|
|
110
|
+
return applyGroupFileWrites(filePath, options, fs, logger, unwrapEdits, textAfterUnwrap, plannedGroupEdits, cnInTvNoReplacement);
|
|
111
|
+
}
|
|
112
|
+
//#endregion
|
|
113
|
+
export { groupFile as t };
|
|
@@ -0,0 +1,235 @@
|
|
|
1
|
+
import { n as BUCKET_ORDER } from "./constants-AtPhF-Ct.mjs";
|
|
2
|
+
import { a as compositeSecondaryOrder, c as selectorKey, d as tokenizeClassString, i as classifyToken, l as stateKey, n as bucketsMergeCompatible, t as bucketsCompatible, u as stripVariants } from "./tokenizer-CeZx73Zu.mjs";
|
|
3
|
+
//#region src/lib/arrange/domain/grouping.ts
|
|
4
|
+
function isVariantKeyedBucket(bucket) {
|
|
5
|
+
return bucket === "selector" || bucket === "state" || bucket === "starting";
|
|
6
|
+
}
|
|
7
|
+
function variantGroupKey(bucket, classToken) {
|
|
8
|
+
return bucket === "selector" ? selectorKey(classToken) : stateKey(classToken);
|
|
9
|
+
}
|
|
10
|
+
/**
|
|
11
|
+
* True when `staticLiteralTexts` carries the **same partition** of Tailwind tokens as
|
|
12
|
+
* `suggestedGroups` from {@link suggestCnGroups}, ignoring order of arguments and
|
|
13
|
+
* order of tokens within each chunk.
|
|
14
|
+
*/
|
|
15
|
+
function areCnTailwindPartitionsEquivalent(staticLiteralTexts, suggestedGroups) {
|
|
16
|
+
const partitionSignatures = (chunks) => chunks.map((chunk) => {
|
|
17
|
+
const classTokens = tokenizeClassString(chunk);
|
|
18
|
+
return classTokens.length === 0 ? "" : [...classTokens].sort().join(" ");
|
|
19
|
+
}).filter((s) => s.length > 0).sort((a, b) => a.localeCompare(b));
|
|
20
|
+
const staticPartitionSigs = partitionSignatures(staticLiteralTexts);
|
|
21
|
+
const suggestedPartitionSigs = partitionSignatures(suggestedGroups);
|
|
22
|
+
if (staticPartitionSigs.length !== suggestedPartitionSigs.length) return false;
|
|
23
|
+
for (let i = 0; i < staticPartitionSigs.length; i++) if (staticPartitionSigs[i] !== suggestedPartitionSigs[i]) return false;
|
|
24
|
+
return true;
|
|
25
|
+
}
|
|
26
|
+
/** Dominant bucket of a whitespace-delimited class group (for merge heuristics). */
|
|
27
|
+
function dominantBucketOfGroup(groupStr) {
|
|
28
|
+
const counts = /* @__PURE__ */ new Map();
|
|
29
|
+
for (const classToken of tokenizeClassString(groupStr)) {
|
|
30
|
+
const tokenBucket = classifyToken(classToken);
|
|
31
|
+
counts.set(tokenBucket, (counts.get(tokenBucket) ?? 0) + 1);
|
|
32
|
+
}
|
|
33
|
+
let best = "other";
|
|
34
|
+
let bestN = 0;
|
|
35
|
+
for (const [bucket, count] of counts) {
|
|
36
|
+
if (count > bestN) {
|
|
37
|
+
best = bucket;
|
|
38
|
+
bestN = count;
|
|
39
|
+
continue;
|
|
40
|
+
}
|
|
41
|
+
if (count === bestN && BUCKET_ORDER[bucket] < BUCKET_ORDER[best]) best = bucket;
|
|
42
|
+
}
|
|
43
|
+
return best;
|
|
44
|
+
}
|
|
45
|
+
/** Dynamic cap: more tokens → allow more groups, within [BASE, CAP]. */
|
|
46
|
+
function dynamicMaxGroups(tokenCount) {
|
|
47
|
+
const byTokens = Math.ceil(tokenCount / 2) + 2;
|
|
48
|
+
return Math.max(4, Math.min(24, byTokens));
|
|
49
|
+
}
|
|
50
|
+
/**
|
|
51
|
+
* Merge singleton groups (< MIN_GROUP_TOKENS tokens) into their nearest
|
|
52
|
+
* neighbour. Prefers merging toward a bucket-compatible neighbor.
|
|
53
|
+
*
|
|
54
|
+
* Loop termination: each iteration either splices one element (shrinking the
|
|
55
|
+
* array, guaranteeing progress) or finds no singleton that can merge and exits
|
|
56
|
+
* via `changed = false`. Two mutually-incompatible singletons both hit
|
|
57
|
+
* `continue` and `changed` stays false, so the loop exits without spinning.
|
|
58
|
+
*/
|
|
59
|
+
function mergeSingletons(groups) {
|
|
60
|
+
if (groups.length <= 1) return groups;
|
|
61
|
+
const result = [...groups];
|
|
62
|
+
let changed = true;
|
|
63
|
+
while (changed) {
|
|
64
|
+
changed = false;
|
|
65
|
+
for (let i = 0; i < result.length; i++) if (tokenizeClassString(result[i]).length < 2) {
|
|
66
|
+
if (result.length === 1) break;
|
|
67
|
+
const myBucket = dominantBucketOfGroup(result[i]);
|
|
68
|
+
const prevCompat = i > 0 && bucketsMergeCompatible(myBucket, dominantBucketOfGroup(result[i - 1]));
|
|
69
|
+
const nextCompat = i < result.length - 1 && bucketsMergeCompatible(myBucket, dominantBucketOfGroup(result[i + 1]));
|
|
70
|
+
let mergeDir;
|
|
71
|
+
if (nextCompat && !prevCompat) mergeDir = "forward";
|
|
72
|
+
else if (prevCompat && !nextCompat) mergeDir = "backward";
|
|
73
|
+
else if (prevCompat && nextCompat) mergeDir = i < result.length - 1 ? "forward" : "backward";
|
|
74
|
+
else continue;
|
|
75
|
+
if (mergeDir === "forward") result[i + 1] = result[i] + " " + result[i + 1];
|
|
76
|
+
else result[i - 1] = result[i - 1] + " " + result[i];
|
|
77
|
+
result.splice(i, 1);
|
|
78
|
+
changed = true;
|
|
79
|
+
break;
|
|
80
|
+
}
|
|
81
|
+
}
|
|
82
|
+
return result;
|
|
83
|
+
}
|
|
84
|
+
/** Tie-break when two merge candidates are both {@link bucketsMergeCompatible} (same bucket or COMPATIBLE_BUCKET_SETS). */
|
|
85
|
+
function capMergePenalty(leftBucket, rightBucket) {
|
|
86
|
+
if (leftBucket === rightBucket) return 0;
|
|
87
|
+
if (bucketsCompatible(leftBucket, rightBucket)) return 0;
|
|
88
|
+
return 500;
|
|
89
|
+
}
|
|
90
|
+
/**
|
|
91
|
+
* Merge adjacent groups until total count ≤ maxGroups.
|
|
92
|
+
* Only merges pairs allowed by {@link bucketsMergeCompatible} — never glues incompatible
|
|
93
|
+
* buckets (which previously defaulted to penalty 0 and merged layout+state when over cap).
|
|
94
|
+
*
|
|
95
|
+
* Complexity: O(n²) in the number of groups — each merge pass scans all remaining adjacent
|
|
96
|
+
* pairs. In practice `n` is bounded by {@link MAX_GROUPS_CAP} (24) and typical class strings
|
|
97
|
+
* are well below that, so this is not a concern for the current usage pattern. If this ever
|
|
98
|
+
* runs in a high-throughput batch mode, consider a priority-queue approach.
|
|
99
|
+
*/
|
|
100
|
+
function capGroups(groups, maxGroups) {
|
|
101
|
+
const result = [...groups];
|
|
102
|
+
const lengths = result.map((groupStr) => tokenizeClassString(groupStr).length);
|
|
103
|
+
while (result.length > maxGroups) {
|
|
104
|
+
const mergePairCandidates = [];
|
|
105
|
+
for (let i = 0; i < result.length - 1; i++) {
|
|
106
|
+
const dominantLeft = dominantBucketOfGroup(result[i]);
|
|
107
|
+
const dominantRight = dominantBucketOfGroup(result[i + 1]);
|
|
108
|
+
if (!bucketsMergeCompatible(dominantLeft, dominantRight)) continue;
|
|
109
|
+
mergePairCandidates.push({
|
|
110
|
+
i,
|
|
111
|
+
size: lengths[i] + lengths[i + 1],
|
|
112
|
+
penalty: capMergePenalty(dominantLeft, dominantRight)
|
|
113
|
+
});
|
|
114
|
+
}
|
|
115
|
+
if (mergePairCandidates.length === 0) break;
|
|
116
|
+
let best = mergePairCandidates[0];
|
|
117
|
+
for (const candidate of mergePairCandidates) if (candidate.penalty < best.penalty || candidate.penalty === best.penalty && candidate.size < best.size) best = candidate;
|
|
118
|
+
const bestIdx = best.i;
|
|
119
|
+
result[bestIdx] = result[bestIdx] + " " + result[bestIdx + 1];
|
|
120
|
+
lengths[bestIdx] = lengths[bestIdx] + lengths[bestIdx + 1];
|
|
121
|
+
result.splice(bestIdx + 1, 1);
|
|
122
|
+
lengths.splice(bestIdx + 1, 1);
|
|
123
|
+
}
|
|
124
|
+
return result;
|
|
125
|
+
}
|
|
126
|
+
/**
|
|
127
|
+
* If a chunk is **only** bare `ease-*` timing (Motion), buffer it and prepend to the **first**
|
|
128
|
+
* **later** chunk that is predominantly `state` **and** contains some `animate-*` utility —
|
|
129
|
+
* skipping intermediate `state` chunks (`sm:…`, `group-data-[…]:…`, etc.) that sit between
|
|
130
|
+
* `ease-ui` and `data-open:animate-*`. If no such chunk exists, the ease chunk is left as-is.
|
|
131
|
+
*/
|
|
132
|
+
function mergeEaseTimingIntoFollowingAnimatedState(groups) {
|
|
133
|
+
const result = [...groups];
|
|
134
|
+
let changed = true;
|
|
135
|
+
while (changed) {
|
|
136
|
+
changed = false;
|
|
137
|
+
for (let i = 0; i < result.length; i++) {
|
|
138
|
+
if (!chunkIsOnlyEaseTimingMotion(result[i])) continue;
|
|
139
|
+
const easeStr = result[i];
|
|
140
|
+
let target = -1;
|
|
141
|
+
for (let j = i + 1; j < result.length; j++) {
|
|
142
|
+
if (dominantBucketOfGroup(result[j]) !== "state") continue;
|
|
143
|
+
if (!tokenizeClassString(result[j]).some((classToken) => /^animate/.test(stripVariants(classToken)))) continue;
|
|
144
|
+
target = j;
|
|
145
|
+
break;
|
|
146
|
+
}
|
|
147
|
+
if (target === -1) continue;
|
|
148
|
+
result[target] = `${easeStr} ${result[target]}`.trim();
|
|
149
|
+
result.splice(i, 1);
|
|
150
|
+
changed = true;
|
|
151
|
+
break;
|
|
152
|
+
}
|
|
153
|
+
}
|
|
154
|
+
return result;
|
|
155
|
+
}
|
|
156
|
+
function chunkIsOnlyEaseTimingMotion(groupStr) {
|
|
157
|
+
const classTokens = tokenizeClassString(groupStr);
|
|
158
|
+
if (classTokens.length === 0) return false;
|
|
159
|
+
return classTokens.every((classToken) => classifyToken(classToken) === "motion" && /^ease-/.test(stripVariants(classToken)));
|
|
160
|
+
}
|
|
161
|
+
function suggestCnGroups(classString) {
|
|
162
|
+
const tokens = tokenizeClassString(classString);
|
|
163
|
+
if (tokens.length === 0) return [];
|
|
164
|
+
const classified = tokens.map((classToken, index) => ({
|
|
165
|
+
classToken,
|
|
166
|
+
bucket: classifyToken(classToken),
|
|
167
|
+
index
|
|
168
|
+
}));
|
|
169
|
+
classified.sort((left, right) => {
|
|
170
|
+
const bucketOrderDiff = BUCKET_ORDER[left.bucket] - BUCKET_ORDER[right.bucket];
|
|
171
|
+
if (bucketOrderDiff !== 0) return bucketOrderDiff;
|
|
172
|
+
if (left.bucket === "composite" && right.bucket === "composite") {
|
|
173
|
+
const compositeOrderDiff = compositeSecondaryOrder(stripVariants(left.classToken)) - compositeSecondaryOrder(stripVariants(right.classToken));
|
|
174
|
+
if (compositeOrderDiff !== 0) return compositeOrderDiff;
|
|
175
|
+
}
|
|
176
|
+
return left.index - right.index;
|
|
177
|
+
});
|
|
178
|
+
const rawGroups = [];
|
|
179
|
+
/** Bucket of the last token already placed in the current run (pairwise compat with `COMPATIBLE_BUCKET_SETS`). */
|
|
180
|
+
let lastBucketInRun = null;
|
|
181
|
+
let currentStateKey = null;
|
|
182
|
+
let currentTokens = [];
|
|
183
|
+
const flush = () => {
|
|
184
|
+
if (currentTokens.length > 0) {
|
|
185
|
+
rawGroups.push(currentTokens.join(" "));
|
|
186
|
+
currentTokens = [];
|
|
187
|
+
}
|
|
188
|
+
lastBucketInRun = null;
|
|
189
|
+
currentStateKey = null;
|
|
190
|
+
};
|
|
191
|
+
for (const { classToken, bucket: tokenBucket } of classified) {
|
|
192
|
+
if (lastBucketInRun === null) {
|
|
193
|
+
lastBucketInRun = tokenBucket;
|
|
194
|
+
currentStateKey = isVariantKeyedBucket(tokenBucket) ? variantGroupKey(tokenBucket, classToken) : null;
|
|
195
|
+
currentTokens.push(classToken);
|
|
196
|
+
continue;
|
|
197
|
+
}
|
|
198
|
+
if (isVariantKeyedBucket(tokenBucket)) {
|
|
199
|
+
const key = variantGroupKey(tokenBucket, classToken);
|
|
200
|
+
if (currentStateKey !== null && key !== currentStateKey) {
|
|
201
|
+
flush();
|
|
202
|
+
lastBucketInRun = tokenBucket;
|
|
203
|
+
currentStateKey = key;
|
|
204
|
+
currentTokens.push(classToken);
|
|
205
|
+
continue;
|
|
206
|
+
}
|
|
207
|
+
}
|
|
208
|
+
if (!bucketsCompatible(tokenBucket, lastBucketInRun)) {
|
|
209
|
+
flush();
|
|
210
|
+
lastBucketInRun = tokenBucket;
|
|
211
|
+
currentStateKey = isVariantKeyedBucket(tokenBucket) ? variantGroupKey(tokenBucket, classToken) : null;
|
|
212
|
+
currentTokens.push(classToken);
|
|
213
|
+
continue;
|
|
214
|
+
}
|
|
215
|
+
if (isVariantKeyedBucket(tokenBucket)) currentStateKey = variantGroupKey(tokenBucket, classToken);
|
|
216
|
+
else if (currentStateKey !== null) currentStateKey = null;
|
|
217
|
+
lastBucketInRun = tokenBucket;
|
|
218
|
+
currentTokens.push(classToken);
|
|
219
|
+
}
|
|
220
|
+
flush();
|
|
221
|
+
const withEaseMerged = mergeEaseTimingIntoFollowingAnimatedState(mergeSingletons(rawGroups));
|
|
222
|
+
return capGroups(withEaseMerged, Math.max(dynamicMaxGroups(tokens.length), withEaseMerged.length));
|
|
223
|
+
}
|
|
224
|
+
/**
|
|
225
|
+
* One label per suggested group: a single bucket name, or `mixed:a+b` when that chunk
|
|
226
|
+
* spans multiple Tailwind buckets (matches `codefast arrange group` stdout).
|
|
227
|
+
*/
|
|
228
|
+
function summarizeGroupBucketLabels(groups) {
|
|
229
|
+
return groups.map((g) => {
|
|
230
|
+
const uniq = new Set(tokenizeClassString(g).map(classifyToken));
|
|
231
|
+
return uniq.size === 1 ? [...uniq][0] : `mixed:${[...uniq].sort().join("+")}`;
|
|
232
|
+
});
|
|
233
|
+
}
|
|
234
|
+
//#endregion
|
|
235
|
+
export { suggestCnGroups as a, mergeSingletons as i, capGroups as n, summarizeGroupBucketLabels as o, mergeEaseTimingIntoFollowingAnimatedState as r, areCnTailwindPartitionsEquivalent as t };
|
|
@@ -0,0 +1,54 @@
|
|
|
1
|
+
import ts from "typescript";
|
|
2
|
+
//#region src/lib/arrange/domain/imports.ts
|
|
3
|
+
function sourceFileImportsCn(sf) {
|
|
4
|
+
for (const statement of sf.statements) {
|
|
5
|
+
if (!ts.isImportDeclaration(statement) || !statement.importClause) continue;
|
|
6
|
+
const clause = statement.importClause;
|
|
7
|
+
if (clause.name?.text === "cn") return true;
|
|
8
|
+
if (clause.namedBindings && ts.isNamedImports(clause.namedBindings)) {
|
|
9
|
+
for (const importedBinding of clause.namedBindings.elements) if (importedBinding.name.text === "cn") return true;
|
|
10
|
+
}
|
|
11
|
+
}
|
|
12
|
+
return false;
|
|
13
|
+
}
|
|
14
|
+
/**
|
|
15
|
+
* Resolve the module specifier used when injecting a `cn` import into a file.
|
|
16
|
+
*/
|
|
17
|
+
function cnModuleSpecifierForFile(filePath, override) {
|
|
18
|
+
if (override) return override;
|
|
19
|
+
return "@codefast/tailwind-variants";
|
|
20
|
+
}
|
|
21
|
+
function findImportDeclarationFromModule(sf, moduleSpecifier) {
|
|
22
|
+
for (const statement of sf.statements) {
|
|
23
|
+
if (!ts.isImportDeclaration(statement)) continue;
|
|
24
|
+
const spec = statement.moduleSpecifier;
|
|
25
|
+
if (ts.isStringLiteral(spec) && spec.text === moduleSpecifier) return statement;
|
|
26
|
+
}
|
|
27
|
+
}
|
|
28
|
+
function ensureCnImport(sourceText, filePath, cnImportOverride) {
|
|
29
|
+
const sf = ts.createSourceFile(filePath, sourceText, ts.ScriptTarget.Latest, true, filePath.endsWith(".tsx") ? ts.ScriptKind.TSX : ts.ScriptKind.TS);
|
|
30
|
+
if (sourceFileImportsCn(sf)) return sourceText;
|
|
31
|
+
const moduleSpecifier = cnModuleSpecifierForFile(filePath, cnImportOverride);
|
|
32
|
+
const decl = findImportDeclarationFromModule(sf, moduleSpecifier);
|
|
33
|
+
if (decl?.importClause && !decl.importClause.isTypeOnly && decl.importClause.namedBindings && ts.isNamedImports(decl.importClause.namedBindings)) {
|
|
34
|
+
const elements = decl.importClause.namedBindings.elements;
|
|
35
|
+
if (elements.length > 0) {
|
|
36
|
+
const pos = elements[0].getStart(sf);
|
|
37
|
+
return `${sourceText.slice(0, pos)}cn, ${sourceText.slice(pos)}`;
|
|
38
|
+
}
|
|
39
|
+
}
|
|
40
|
+
const importLine = `import { cn } from "${moduleSpecifier}";`;
|
|
41
|
+
let firstImport = -1;
|
|
42
|
+
for (const statement of sf.statements) if (ts.isImportDeclaration(statement)) {
|
|
43
|
+
firstImport = statement.getStart(sf);
|
|
44
|
+
break;
|
|
45
|
+
}
|
|
46
|
+
const useClient = /^["']use client["'];?\s*\r?\n/.exec(sourceText);
|
|
47
|
+
let insertAt;
|
|
48
|
+
if (useClient) insertAt = useClient[0].length;
|
|
49
|
+
else if (firstImport !== -1) insertAt = firstImport;
|
|
50
|
+
else insertAt = 0;
|
|
51
|
+
return `${sourceText.slice(0, insertAt)}${importLine}\n${sourceText.slice(insertAt)}`;
|
|
52
|
+
}
|
|
53
|
+
//#endregion
|
|
54
|
+
export { ensureCnImport as n, cnModuleSpecifierForFile as t };
|
|
@@ -0,0 +1,171 @@
|
|
|
1
|
+
import { t as analyzeDirectory } from "../../../analyze-DvtJ3j9m.mjs";
|
|
2
|
+
import { t as printAnalyzeReport } from "../../../report-DYxvw34T.mjs";
|
|
3
|
+
import { n as createNodeCliLogger, t as createNodeCliFs } from "../../../node-io-DFRbHO6m.mjs";
|
|
4
|
+
import "../../../arrange-BqP2DI3w.mjs";
|
|
5
|
+
import fs from "node:fs";
|
|
6
|
+
import path from "node:path";
|
|
7
|
+
import os from "node:os";
|
|
8
|
+
//#region src/lib/arrange/application/analyze.test.ts
|
|
9
|
+
const arrangeFs = createNodeCliFs();
|
|
10
|
+
const arrangeLogger = createNodeCliLogger();
|
|
11
|
+
function captureStdout(fn) {
|
|
12
|
+
const chunks = [];
|
|
13
|
+
const spy = jest.spyOn(process.stdout, "write").mockImplementation((chunk) => {
|
|
14
|
+
chunks.push(typeof chunk === "string" ? chunk : Buffer.from(chunk).toString("utf8"));
|
|
15
|
+
return true;
|
|
16
|
+
});
|
|
17
|
+
try {
|
|
18
|
+
fn();
|
|
19
|
+
} finally {
|
|
20
|
+
spy.mockRestore();
|
|
21
|
+
}
|
|
22
|
+
return chunks.join("");
|
|
23
|
+
}
|
|
24
|
+
describe("analyzeDirectory + printAnalyzeReport", () => {
|
|
25
|
+
it("collects long cn / tv / JSX literals and nested cn in tv", () => {
|
|
26
|
+
const dir = fs.mkdtempSync(path.join(os.tmpdir(), "arr-analyze-"));
|
|
27
|
+
const long = "peer flex size-4 shrink-0 items-center justify-center rounded-sm border border-input text-primary-foreground shadow-xs outline-hidden transition hover:not-disabled:not-aria-checked:border-ring/60 focus-visible:border-ring focus-visible:ring-3 focus-visible:ring-ring/50 disabled:opacity-50";
|
|
28
|
+
const source = `import { cn, tv } from "@codefast/tailwind-variants";
|
|
29
|
+
|
|
30
|
+
cn("${long}");
|
|
31
|
+
export const styles = tv({ base: "${long}" });
|
|
32
|
+
export function X() { return <div className={"${long}"} />; }
|
|
33
|
+
export const nested = tv({ base: cn("x", "${long}") });
|
|
34
|
+
`;
|
|
35
|
+
try {
|
|
36
|
+
fs.writeFileSync(path.join(dir, "Report.tsx"), source, "utf8");
|
|
37
|
+
const report = analyzeDirectory(dir, arrangeFs);
|
|
38
|
+
expect(report.files).toBe(1);
|
|
39
|
+
expect(report.cnCallExpressions).toBeGreaterThanOrEqual(1);
|
|
40
|
+
expect(report.tvCallExpressions).toBeGreaterThanOrEqual(1);
|
|
41
|
+
expect(report.longCnStringLiterals.length).toBeGreaterThanOrEqual(1);
|
|
42
|
+
expect(report.longTvStringLiterals.length).toBeGreaterThanOrEqual(1);
|
|
43
|
+
expect(report.longJsxClassNameLiterals.length).toBeGreaterThanOrEqual(1);
|
|
44
|
+
expect(report.cnInsideTvCalls.length).toBeGreaterThanOrEqual(1);
|
|
45
|
+
const printed = captureStdout(() => printAnalyzeReport(dir, report, arrangeLogger));
|
|
46
|
+
expect(printed).toContain("Long cn(...)");
|
|
47
|
+
expect(printed).toContain("nested inside tv");
|
|
48
|
+
} finally {
|
|
49
|
+
fs.rmSync(dir, {
|
|
50
|
+
recursive: true,
|
|
51
|
+
force: true
|
|
52
|
+
});
|
|
53
|
+
}
|
|
54
|
+
});
|
|
55
|
+
it("truncates long-cn listing after MAX_REPORT_LINES", () => {
|
|
56
|
+
const dir = fs.mkdtempSync(path.join(os.tmpdir(), "arr-analyze-many-"));
|
|
57
|
+
const long = "peer flex size-4 shrink-0 items-center justify-center rounded-sm border border-input text-primary-foreground shadow-xs outline-hidden transition hover:not-disabled:not-aria-checked:border-ring/60 focus-visible:border-ring focus-visible:ring-3 focus-visible:ring-ring/50 disabled:opacity-50";
|
|
58
|
+
try {
|
|
59
|
+
let body = `import { cn } from "@codefast/tailwind-variants";\n`;
|
|
60
|
+
for (let i = 0; i < 42; i++) body += `cn("${long}");\n`;
|
|
61
|
+
fs.writeFileSync(path.join(dir, "Many.tsx"), body, "utf8");
|
|
62
|
+
const report = analyzeDirectory(dir, arrangeFs);
|
|
63
|
+
const printed = captureStdout(() => printAnalyzeReport(dir, report, arrangeLogger));
|
|
64
|
+
expect(report.longCnStringLiterals.length).toBeGreaterThan(40);
|
|
65
|
+
expect(printed).toMatch(/… and \d+ more/);
|
|
66
|
+
} finally {
|
|
67
|
+
fs.rmSync(dir, {
|
|
68
|
+
recursive: true,
|
|
69
|
+
force: true
|
|
70
|
+
});
|
|
71
|
+
}
|
|
72
|
+
});
|
|
73
|
+
it("truncates long-tv, JSX, and cn-inside-tv sections", () => {
|
|
74
|
+
const row = {
|
|
75
|
+
file: "x.tsx",
|
|
76
|
+
line: 1,
|
|
77
|
+
tokenCount: 22,
|
|
78
|
+
preview: "p".repeat(40)
|
|
79
|
+
};
|
|
80
|
+
const manyTv = Array.from({ length: 42 }, (_, i) => ({
|
|
81
|
+
...row,
|
|
82
|
+
line: i + 1
|
|
83
|
+
}));
|
|
84
|
+
const manyJsx = Array.from({ length: 42 }, (_, i) => ({
|
|
85
|
+
...row,
|
|
86
|
+
line: i + 1
|
|
87
|
+
}));
|
|
88
|
+
const manyNested = Array.from({ length: 42 }, (_, i) => ({
|
|
89
|
+
file: "x.tsx",
|
|
90
|
+
line: i + 1,
|
|
91
|
+
argCount: 1,
|
|
92
|
+
preview: "cn(...)"
|
|
93
|
+
}));
|
|
94
|
+
const matches = captureStdout(() => printAnalyzeReport("/tmp/arr-truncate", {
|
|
95
|
+
files: 1,
|
|
96
|
+
cnCallExpressions: 0,
|
|
97
|
+
tvCallExpressions: 1,
|
|
98
|
+
cnInsideTvCalls: manyNested,
|
|
99
|
+
longCnStringLiterals: [],
|
|
100
|
+
longTvStringLiterals: manyTv,
|
|
101
|
+
longJsxClassNameLiterals: manyJsx
|
|
102
|
+
}, arrangeLogger)).match(/… and \d+ more/g);
|
|
103
|
+
expect(matches?.length).toBeGreaterThanOrEqual(3);
|
|
104
|
+
});
|
|
105
|
+
it("does not count JSX className={identifier} as long literal", () => {
|
|
106
|
+
const dir = fs.mkdtempSync(path.join(os.tmpdir(), "arr-jsx-dyn-"));
|
|
107
|
+
try {
|
|
108
|
+
fs.writeFileSync(path.join(dir, "Dyn.tsx"), `export function F(cls: string) { return <div className={cls} />; }`, "utf8");
|
|
109
|
+
const report = analyzeDirectory(dir, arrangeFs);
|
|
110
|
+
expect(report.longJsxClassNameLiterals.length).toBe(0);
|
|
111
|
+
} finally {
|
|
112
|
+
fs.rmSync(dir, {
|
|
113
|
+
recursive: true,
|
|
114
|
+
force: true
|
|
115
|
+
});
|
|
116
|
+
}
|
|
117
|
+
});
|
|
118
|
+
it("analyzes tv compoundVariants with quoted className key", () => {
|
|
119
|
+
const dir = fs.mkdtempSync(path.join(os.tmpdir(), "arr-tv-quoted-"));
|
|
120
|
+
const long = "peer flex size-4 shrink-0 items-center justify-center rounded-sm border border-input text-primary-foreground shadow-xs outline-hidden transition hover:not-disabled:not-aria-checked:border-ring/60 focus-visible:border-ring focus-visible:ring-3 focus-visible:ring-ring/50 disabled:opacity-50";
|
|
121
|
+
try {
|
|
122
|
+
fs.writeFileSync(path.join(dir, "Quoted.tsx"), `import { tv } from "@codefast/tailwind-variants";
|
|
123
|
+
export const styles = tv({ compoundVariants: [{ "className": "${long}" }] });`, "utf8");
|
|
124
|
+
const report = analyzeDirectory(dir, arrangeFs);
|
|
125
|
+
expect(report.longTvStringLiterals.length).toBeGreaterThanOrEqual(1);
|
|
126
|
+
} finally {
|
|
127
|
+
fs.rmSync(dir, {
|
|
128
|
+
recursive: true,
|
|
129
|
+
force: true
|
|
130
|
+
});
|
|
131
|
+
}
|
|
132
|
+
});
|
|
133
|
+
it("analyzes tv array slots with nested cn", () => {
|
|
134
|
+
const dir = fs.mkdtempSync(path.join(os.tmpdir(), "arr-analyze-tv-array-"));
|
|
135
|
+
const long = "peer flex size-4 shrink-0 items-center justify-center rounded-sm border border-input text-primary-foreground shadow-xs outline-hidden transition hover:not-disabled:not-aria-checked:border-ring/60 focus-visible:border-ring focus-visible:ring-3 focus-visible:ring-ring/50 disabled:opacity-50";
|
|
136
|
+
try {
|
|
137
|
+
fs.writeFileSync(path.join(dir, "TvArray.tsx"), `import { cn, tv } from "@codefast/tailwind-variants";
|
|
138
|
+
export const styles = tv({ base: [cn("${long}"), "py-0"] });`, "utf8");
|
|
139
|
+
const report = analyzeDirectory(dir, arrangeFs);
|
|
140
|
+
expect(report.tvCallExpressions).toBeGreaterThanOrEqual(1);
|
|
141
|
+
expect(report.cnInsideTvCalls.length).toBeGreaterThanOrEqual(1);
|
|
142
|
+
} finally {
|
|
143
|
+
fs.rmSync(dir, {
|
|
144
|
+
recursive: true,
|
|
145
|
+
force: true
|
|
146
|
+
});
|
|
147
|
+
}
|
|
148
|
+
});
|
|
149
|
+
it("accepts legacy tailwind-variants imports during analyze pass (backward compat)", () => {
|
|
150
|
+
const dir = fs.mkdtempSync(path.join(os.tmpdir(), "arr-analyze-legacy-"));
|
|
151
|
+
const long = "peer flex size-4 shrink-0 items-center justify-center rounded-sm border border-input text-primary-foreground shadow-xs outline-hidden transition hover:not-disabled:not-aria-checked:border-ring/60 focus-visible:border-ring focus-visible:ring-3 focus-visible:ring-ring/50 disabled:opacity-50";
|
|
152
|
+
const source = `import { cn, tv } from "tailwind-variants";
|
|
153
|
+
|
|
154
|
+
cn("${long}");
|
|
155
|
+
export const styles = tv({ base: "${long}" });
|
|
156
|
+
`;
|
|
157
|
+
try {
|
|
158
|
+
fs.writeFileSync(path.join(dir, "Legacy.tsx"), source, "utf8");
|
|
159
|
+
const report = analyzeDirectory(dir, arrangeFs);
|
|
160
|
+
expect(report.cnCallExpressions).toBeGreaterThanOrEqual(1);
|
|
161
|
+
expect(report.tvCallExpressions).toBeGreaterThanOrEqual(1);
|
|
162
|
+
} finally {
|
|
163
|
+
fs.rmSync(dir, {
|
|
164
|
+
recursive: true,
|
|
165
|
+
force: true
|
|
166
|
+
});
|
|
167
|
+
}
|
|
168
|
+
});
|
|
169
|
+
});
|
|
170
|
+
//#endregion
|
|
171
|
+
export {};
|