tailwind-canonical 0.1.2 → 0.1.9
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 +156 -24
- package/dist/cli/index.js +142 -17
- package/dist/cli/index.js.map +1 -1
- package/dist/core/analyzer.d.ts.map +1 -1
- package/dist/core/analyzer.js +4 -8
- package/dist/core/analyzer.js.map +1 -1
- package/dist/core/class-strings.d.ts +13 -0
- package/dist/core/class-strings.d.ts.map +1 -0
- package/dist/core/class-strings.js +116 -0
- package/dist/core/class-strings.js.map +1 -0
- package/dist/core/deduplicator.d.ts +4 -0
- package/dist/core/deduplicator.d.ts.map +1 -0
- package/dist/core/deduplicator.js +383 -0
- package/dist/core/deduplicator.js.map +1 -0
- package/dist/core/fixer.d.ts.map +1 -1
- package/dist/core/fixer.js +13 -18
- package/dist/core/fixer.js.map +1 -1
- package/dist/core/merger.d.ts +2 -1
- package/dist/core/merger.d.ts.map +1 -1
- package/dist/core/merger.js +5 -14
- package/dist/core/merger.js.map +1 -1
- package/dist/core/rules.d.ts +1 -0
- package/dist/core/rules.d.ts.map +1 -1
- package/dist/core/rules.js +43 -55
- package/dist/core/rules.js.map +1 -1
- package/dist/core/scanner.d.ts +1 -1
- package/dist/core/scanner.d.ts.map +1 -1
- package/dist/core/scanner.js +74 -5
- package/dist/core/scanner.js.map +1 -1
- package/dist/core/sorter.d.ts +4 -0
- package/dist/core/sorter.d.ts.map +1 -0
- package/dist/core/sorter.js +137 -0
- package/dist/core/sorter.js.map +1 -0
- package/dist/index.d.ts +4 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +3 -0
- package/dist/index.js.map +1 -1
- package/package.json +15 -10
|
@@ -0,0 +1,383 @@
|
|
|
1
|
+
import { readFileSync, writeFileSync } from 'node:fs';
|
|
2
|
+
import { replaceClassStrings } from './class-strings.js';
|
|
3
|
+
const DISPLAY_GROUP = new Set([
|
|
4
|
+
'block',
|
|
5
|
+
'inline-block',
|
|
6
|
+
'inline',
|
|
7
|
+
'flex',
|
|
8
|
+
'inline-flex',
|
|
9
|
+
'table',
|
|
10
|
+
'inline-table',
|
|
11
|
+
'table-caption',
|
|
12
|
+
'table-cell',
|
|
13
|
+
'table-column',
|
|
14
|
+
'table-column-group',
|
|
15
|
+
'table-footer-group',
|
|
16
|
+
'table-header-group',
|
|
17
|
+
'table-row-group',
|
|
18
|
+
'table-row',
|
|
19
|
+
'flow-root',
|
|
20
|
+
'grid',
|
|
21
|
+
'inline-grid',
|
|
22
|
+
'contents',
|
|
23
|
+
'list-item',
|
|
24
|
+
'hidden',
|
|
25
|
+
]);
|
|
26
|
+
const POSITION_GROUP = new Set([
|
|
27
|
+
'static',
|
|
28
|
+
'fixed',
|
|
29
|
+
'absolute',
|
|
30
|
+
'relative',
|
|
31
|
+
'sticky',
|
|
32
|
+
]);
|
|
33
|
+
const SIDE_MAP = {
|
|
34
|
+
p: ['t', 'b', 'l', 'r'],
|
|
35
|
+
m: ['t', 'b', 'l', 'r'],
|
|
36
|
+
border: ['t', 'b', 'l', 'r'],
|
|
37
|
+
inset: ['t', 'b', 'l', 'r'],
|
|
38
|
+
gap: ['t', 'b', 'l', 'r'],
|
|
39
|
+
'scroll-p': ['t', 'b', 'l', 'r'],
|
|
40
|
+
'scroll-m': ['t', 'b', 'l', 'r'],
|
|
41
|
+
px: ['l', 'r'],
|
|
42
|
+
mx: ['l', 'r'],
|
|
43
|
+
'border-x': ['l', 'r'],
|
|
44
|
+
'inset-x': ['l', 'r'],
|
|
45
|
+
'gap-x': ['l', 'r'],
|
|
46
|
+
'scroll-px': ['l', 'r'],
|
|
47
|
+
'scroll-mx': ['l', 'r'],
|
|
48
|
+
py: ['t', 'b'],
|
|
49
|
+
my: ['t', 'b'],
|
|
50
|
+
'border-y': ['t', 'b'],
|
|
51
|
+
'inset-y': ['t', 'b'],
|
|
52
|
+
'gap-y': ['t', 'b'],
|
|
53
|
+
'scroll-py': ['t', 'b'],
|
|
54
|
+
'scroll-my': ['t', 'b'],
|
|
55
|
+
pt: ['t'],
|
|
56
|
+
mt: ['t'],
|
|
57
|
+
'border-t': ['t'],
|
|
58
|
+
top: ['t'],
|
|
59
|
+
'scroll-pt': ['t'],
|
|
60
|
+
'scroll-mt': ['t'],
|
|
61
|
+
pb: ['b'],
|
|
62
|
+
mb: ['b'],
|
|
63
|
+
'border-b': ['b'],
|
|
64
|
+
bottom: ['b'],
|
|
65
|
+
'scroll-pb': ['b'],
|
|
66
|
+
'scroll-mb': ['b'],
|
|
67
|
+
pl: ['l'],
|
|
68
|
+
ml: ['l'],
|
|
69
|
+
'border-l': ['l'],
|
|
70
|
+
left: ['l'],
|
|
71
|
+
'scroll-pl': ['l'],
|
|
72
|
+
'scroll-ml': ['l'],
|
|
73
|
+
pr: ['r'],
|
|
74
|
+
mr: ['r'],
|
|
75
|
+
'border-r': ['r'],
|
|
76
|
+
right: ['r'],
|
|
77
|
+
'scroll-pr': ['r'],
|
|
78
|
+
'scroll-mr': ['r'],
|
|
79
|
+
};
|
|
80
|
+
const FAMILIES = [
|
|
81
|
+
{
|
|
82
|
+
kind: 'p',
|
|
83
|
+
full: 'p',
|
|
84
|
+
x: 'px',
|
|
85
|
+
y: 'py',
|
|
86
|
+
t: 'pt',
|
|
87
|
+
b: 'pb',
|
|
88
|
+
l: 'pl',
|
|
89
|
+
r: 'pr',
|
|
90
|
+
regex: /^(p|px|py|pt|pb|pl|pr)-(.+)$/,
|
|
91
|
+
},
|
|
92
|
+
{
|
|
93
|
+
kind: 'm',
|
|
94
|
+
full: 'm',
|
|
95
|
+
x: 'mx',
|
|
96
|
+
y: 'my',
|
|
97
|
+
t: 'mt',
|
|
98
|
+
b: 'mb',
|
|
99
|
+
l: 'ml',
|
|
100
|
+
r: 'mr',
|
|
101
|
+
regex: /^(m|mx|my|mt|mb|ml|mr)-(.+)$/,
|
|
102
|
+
},
|
|
103
|
+
{
|
|
104
|
+
kind: 'border-width',
|
|
105
|
+
full: 'border',
|
|
106
|
+
x: 'border-x',
|
|
107
|
+
y: 'border-y',
|
|
108
|
+
t: 'border-t',
|
|
109
|
+
b: 'border-b',
|
|
110
|
+
l: 'border-l',
|
|
111
|
+
r: 'border-r',
|
|
112
|
+
regex: /^(border|border-x|border-y|border-t|border-b|border-l|border-r)-(\d.*)$/,
|
|
113
|
+
},
|
|
114
|
+
{
|
|
115
|
+
kind: 'inset',
|
|
116
|
+
full: 'inset',
|
|
117
|
+
x: 'inset-x',
|
|
118
|
+
y: 'inset-y',
|
|
119
|
+
t: 'top',
|
|
120
|
+
b: 'bottom',
|
|
121
|
+
l: 'left',
|
|
122
|
+
r: 'right',
|
|
123
|
+
regex: /^(inset-x|inset-y|inset|top|bottom|left|right)-(.+)$/,
|
|
124
|
+
},
|
|
125
|
+
{
|
|
126
|
+
kind: 'gap',
|
|
127
|
+
full: 'gap',
|
|
128
|
+
x: 'gap-x',
|
|
129
|
+
y: 'gap-y',
|
|
130
|
+
t: 'gap-y',
|
|
131
|
+
b: 'gap-y',
|
|
132
|
+
l: 'gap-x',
|
|
133
|
+
r: 'gap-x',
|
|
134
|
+
regex: /^(gap-x|gap-y|gap)-(.+)$/,
|
|
135
|
+
},
|
|
136
|
+
{
|
|
137
|
+
kind: 'scroll-p',
|
|
138
|
+
full: 'scroll-p',
|
|
139
|
+
x: 'scroll-px',
|
|
140
|
+
y: 'scroll-py',
|
|
141
|
+
t: 'scroll-pt',
|
|
142
|
+
b: 'scroll-pb',
|
|
143
|
+
l: 'scroll-pl',
|
|
144
|
+
r: 'scroll-pr',
|
|
145
|
+
regex: /^(scroll-p|scroll-px|scroll-py|scroll-pt|scroll-pb|scroll-pl|scroll-pr)-(.+)$/,
|
|
146
|
+
},
|
|
147
|
+
{
|
|
148
|
+
kind: 'scroll-m',
|
|
149
|
+
full: 'scroll-m',
|
|
150
|
+
x: 'scroll-mx',
|
|
151
|
+
y: 'scroll-my',
|
|
152
|
+
t: 'scroll-mt',
|
|
153
|
+
b: 'scroll-mb',
|
|
154
|
+
l: 'scroll-ml',
|
|
155
|
+
r: 'scroll-mr',
|
|
156
|
+
regex: /^(scroll-m|scroll-mx|scroll-my|scroll-mt|scroll-mb|scroll-ml|scroll-mr)-(.+)$/,
|
|
157
|
+
},
|
|
158
|
+
];
|
|
159
|
+
function parseBoxClass(cls) {
|
|
160
|
+
for (const family of FAMILIES) {
|
|
161
|
+
const m = cls.match(family.regex);
|
|
162
|
+
if (!m)
|
|
163
|
+
continue;
|
|
164
|
+
const sides = {};
|
|
165
|
+
for (const side of SIDE_MAP[m[1]] ?? [])
|
|
166
|
+
sides[side] = m[2];
|
|
167
|
+
return { family, sides };
|
|
168
|
+
}
|
|
169
|
+
return null;
|
|
170
|
+
}
|
|
171
|
+
function collapseBox(box, f) {
|
|
172
|
+
const { t, b, l, r } = box;
|
|
173
|
+
const fmt = (pfx, val) => `${pfx}-${val}`;
|
|
174
|
+
if (t && b && l && r) {
|
|
175
|
+
if (t === b && b === l && l === r)
|
|
176
|
+
return fmt(f.full, t);
|
|
177
|
+
if (t === b && l === r)
|
|
178
|
+
return `${fmt(f.y, t)} ${fmt(f.x, l)}`;
|
|
179
|
+
if (l === r)
|
|
180
|
+
return `${fmt(f.x, l)} ${fmt(f.t, t)} ${fmt(f.b, b)}`;
|
|
181
|
+
if (t === b)
|
|
182
|
+
return `${fmt(f.y, t)} ${fmt(f.l, l)} ${fmt(f.r, r)}`;
|
|
183
|
+
return `${fmt(f.t, t)} ${fmt(f.b, b)} ${fmt(f.l, l)} ${fmt(f.r, r)}`;
|
|
184
|
+
}
|
|
185
|
+
const parts = [];
|
|
186
|
+
if (l && r) {
|
|
187
|
+
parts.push(l === r ? fmt(f.x, l) : `${fmt(f.l, l)} ${fmt(f.r, r)}`);
|
|
188
|
+
}
|
|
189
|
+
else {
|
|
190
|
+
if (l)
|
|
191
|
+
parts.push(fmt(f.l, l));
|
|
192
|
+
if (r)
|
|
193
|
+
parts.push(fmt(f.r, r));
|
|
194
|
+
}
|
|
195
|
+
if (t && b) {
|
|
196
|
+
parts.push(t === b ? fmt(f.y, t) : `${fmt(f.t, t)} ${fmt(f.b, b)}`);
|
|
197
|
+
}
|
|
198
|
+
else {
|
|
199
|
+
if (t)
|
|
200
|
+
parts.push(fmt(f.t, t));
|
|
201
|
+
if (b)
|
|
202
|
+
parts.push(fmt(f.b, b));
|
|
203
|
+
}
|
|
204
|
+
return parts.join(' ');
|
|
205
|
+
}
|
|
206
|
+
function parseRoundedCorner(cls) {
|
|
207
|
+
const sideM = cls.match(/^rounded-(tl|tr|bl|br|t|b|l|r)(?:-(.+))?$/);
|
|
208
|
+
if (sideM) {
|
|
209
|
+
const side = sideM[1];
|
|
210
|
+
const val = sideM[2] ?? '';
|
|
211
|
+
const c = {};
|
|
212
|
+
if (side === 't') {
|
|
213
|
+
c.tl = val;
|
|
214
|
+
c.tr = val;
|
|
215
|
+
}
|
|
216
|
+
else if (side === 'b') {
|
|
217
|
+
c.bl = val;
|
|
218
|
+
c.br = val;
|
|
219
|
+
}
|
|
220
|
+
else if (side === 'l') {
|
|
221
|
+
c.tl = val;
|
|
222
|
+
c.bl = val;
|
|
223
|
+
}
|
|
224
|
+
else if (side === 'r') {
|
|
225
|
+
c.tr = val;
|
|
226
|
+
c.br = val;
|
|
227
|
+
}
|
|
228
|
+
else {
|
|
229
|
+
c[side] = val;
|
|
230
|
+
}
|
|
231
|
+
return { corners: c };
|
|
232
|
+
}
|
|
233
|
+
const allM = cls.match(/^rounded(?:-(.+))?$/);
|
|
234
|
+
if (allM) {
|
|
235
|
+
const val = allM[1] ?? '';
|
|
236
|
+
return { corners: { tl: val, tr: val, bl: val, br: val } };
|
|
237
|
+
}
|
|
238
|
+
return null;
|
|
239
|
+
}
|
|
240
|
+
function collapseCorners(c) {
|
|
241
|
+
const { tl, tr, bl, br } = c;
|
|
242
|
+
const mk = (pfx, val) => (val === '' ? pfx : `${pfx}-${val}`);
|
|
243
|
+
if (tl !== null && tr !== null && bl !== null && br !== null) {
|
|
244
|
+
if (tl === tr && tr === bl && bl === br)
|
|
245
|
+
return mk('rounded', tl);
|
|
246
|
+
if (tl === tr && bl === br)
|
|
247
|
+
return `${mk('rounded-t', tl)} ${mk('rounded-b', bl)}`;
|
|
248
|
+
if (tl === bl && tr === br)
|
|
249
|
+
return `${mk('rounded-l', tl)} ${mk('rounded-r', tr)}`;
|
|
250
|
+
const parts = [];
|
|
251
|
+
if (tl === tr)
|
|
252
|
+
parts.push(mk('rounded-t', tl));
|
|
253
|
+
else {
|
|
254
|
+
parts.push(mk('rounded-tl', tl));
|
|
255
|
+
parts.push(mk('rounded-tr', tr));
|
|
256
|
+
}
|
|
257
|
+
if (bl === br)
|
|
258
|
+
parts.push(mk('rounded-b', bl));
|
|
259
|
+
else {
|
|
260
|
+
parts.push(mk('rounded-bl', bl));
|
|
261
|
+
parts.push(mk('rounded-br', br));
|
|
262
|
+
}
|
|
263
|
+
return parts.join(' ');
|
|
264
|
+
}
|
|
265
|
+
const handled = { tl: false, tr: false, bl: false, br: false };
|
|
266
|
+
const parts = [];
|
|
267
|
+
if (tl !== null && bl !== null && tl === bl) {
|
|
268
|
+
parts.push(mk('rounded-l', tl));
|
|
269
|
+
handled.tl = true;
|
|
270
|
+
handled.bl = true;
|
|
271
|
+
}
|
|
272
|
+
if (tr !== null && br !== null && tr === br) {
|
|
273
|
+
parts.push(mk('rounded-r', tr));
|
|
274
|
+
handled.tr = true;
|
|
275
|
+
handled.br = true;
|
|
276
|
+
}
|
|
277
|
+
if (!handled.tl && !handled.tr && tl !== null && tr !== null && tl === tr) {
|
|
278
|
+
parts.push(mk('rounded-t', tl));
|
|
279
|
+
handled.tl = true;
|
|
280
|
+
handled.tr = true;
|
|
281
|
+
}
|
|
282
|
+
if (!handled.bl && !handled.br && bl !== null && br !== null && bl === br) {
|
|
283
|
+
parts.push(mk('rounded-b', bl));
|
|
284
|
+
handled.bl = true;
|
|
285
|
+
handled.br = true;
|
|
286
|
+
}
|
|
287
|
+
if (!handled.tl && tl !== null)
|
|
288
|
+
parts.push(mk('rounded-tl', tl));
|
|
289
|
+
if (!handled.tr && tr !== null)
|
|
290
|
+
parts.push(mk('rounded-tr', tr));
|
|
291
|
+
if (!handled.bl && bl !== null)
|
|
292
|
+
parts.push(mk('rounded-bl', bl));
|
|
293
|
+
if (!handled.br && br !== null)
|
|
294
|
+
parts.push(mk('rounded-br', br));
|
|
295
|
+
return parts.join(' ');
|
|
296
|
+
}
|
|
297
|
+
// ─── Public API ───────────────────────────────────────────────────────────────
|
|
298
|
+
function pushCollapsed(result, collapsed, classes) {
|
|
299
|
+
const original = classes.filter((c, i) => classes.indexOf(c) === i).join(' ');
|
|
300
|
+
result.push(...(collapsed === original ? original.split(' ') : collapsed.split(' ')));
|
|
301
|
+
}
|
|
302
|
+
export function deduplicateClasses(classStr) {
|
|
303
|
+
const classes = classStr.split(/\s+/).filter(Boolean);
|
|
304
|
+
if (classes.length <= 1)
|
|
305
|
+
return classStr;
|
|
306
|
+
let displayWinner = null;
|
|
307
|
+
let positionWinner = null;
|
|
308
|
+
const seen = new Set();
|
|
309
|
+
const others = [];
|
|
310
|
+
const boxGroups = new Map();
|
|
311
|
+
const corners = { tl: null, tr: null, bl: null, br: null };
|
|
312
|
+
const cornersClasses = [];
|
|
313
|
+
for (const cls of classes) {
|
|
314
|
+
if (DISPLAY_GROUP.has(cls)) {
|
|
315
|
+
displayWinner = cls;
|
|
316
|
+
continue;
|
|
317
|
+
}
|
|
318
|
+
if (POSITION_GROUP.has(cls)) {
|
|
319
|
+
positionWinner = cls;
|
|
320
|
+
continue;
|
|
321
|
+
}
|
|
322
|
+
const parsed = parseBoxClass(cls);
|
|
323
|
+
if (parsed) {
|
|
324
|
+
const { family, sides } = parsed;
|
|
325
|
+
let group = boxGroups.get(family.kind);
|
|
326
|
+
if (!group) {
|
|
327
|
+
group = { family, box: { t: '', b: '', l: '', r: '' }, classes: [] };
|
|
328
|
+
boxGroups.set(family.kind, group);
|
|
329
|
+
}
|
|
330
|
+
group.classes.push(cls);
|
|
331
|
+
if (sides.t !== undefined)
|
|
332
|
+
group.box.t = sides.t;
|
|
333
|
+
if (sides.b !== undefined)
|
|
334
|
+
group.box.b = sides.b;
|
|
335
|
+
if (sides.l !== undefined)
|
|
336
|
+
group.box.l = sides.l;
|
|
337
|
+
if (sides.r !== undefined)
|
|
338
|
+
group.box.r = sides.r;
|
|
339
|
+
continue;
|
|
340
|
+
}
|
|
341
|
+
const roundedParsed = parseRoundedCorner(cls);
|
|
342
|
+
if (roundedParsed) {
|
|
343
|
+
cornersClasses.push(cls);
|
|
344
|
+
const { corners: c } = roundedParsed;
|
|
345
|
+
if (c.tl !== undefined)
|
|
346
|
+
corners.tl = c.tl;
|
|
347
|
+
if (c.tr !== undefined)
|
|
348
|
+
corners.tr = c.tr;
|
|
349
|
+
if (c.bl !== undefined)
|
|
350
|
+
corners.bl = c.bl;
|
|
351
|
+
if (c.br !== undefined)
|
|
352
|
+
corners.br = c.br;
|
|
353
|
+
continue;
|
|
354
|
+
}
|
|
355
|
+
if (!seen.has(cls)) {
|
|
356
|
+
seen.add(cls);
|
|
357
|
+
others.push(cls);
|
|
358
|
+
}
|
|
359
|
+
}
|
|
360
|
+
const result = [];
|
|
361
|
+
if (displayWinner)
|
|
362
|
+
result.push(displayWinner);
|
|
363
|
+
if (positionWinner)
|
|
364
|
+
result.push(positionWinner);
|
|
365
|
+
for (const { family, box, classes: groupClasses } of boxGroups.values()) {
|
|
366
|
+
if (groupClasses.length === 0)
|
|
367
|
+
continue;
|
|
368
|
+
pushCollapsed(result, collapseBox(box, family), groupClasses);
|
|
369
|
+
}
|
|
370
|
+
if (cornersClasses.length > 0) {
|
|
371
|
+
pushCollapsed(result, collapseCorners(corners), cornersClasses);
|
|
372
|
+
}
|
|
373
|
+
result.push(...others);
|
|
374
|
+
return result.join(' ');
|
|
375
|
+
}
|
|
376
|
+
export function dedupeFile(filePath, opts = {}) {
|
|
377
|
+
const content = readFileSync(filePath, 'utf8');
|
|
378
|
+
const { result, count } = replaceClassStrings(content, deduplicateClasses, opts);
|
|
379
|
+
if (count > 0)
|
|
380
|
+
writeFileSync(filePath, result, 'utf8');
|
|
381
|
+
return count;
|
|
382
|
+
}
|
|
383
|
+
//# sourceMappingURL=deduplicator.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"deduplicator.js","sourceRoot":"","sources":["../../src/core/deduplicator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AACtD,OAAO,EAAwB,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAE/E,MAAM,aAAa,GAAG,IAAI,GAAG,CAAC;IAC5B,OAAO;IACP,cAAc;IACd,QAAQ;IACR,MAAM;IACN,aAAa;IACb,OAAO;IACP,cAAc;IACd,eAAe;IACf,YAAY;IACZ,cAAc;IACd,oBAAoB;IACpB,oBAAoB;IACpB,oBAAoB;IACpB,iBAAiB;IACjB,WAAW;IACX,WAAW;IACX,MAAM;IACN,aAAa;IACb,UAAU;IACV,WAAW;IACX,QAAQ;CACT,CAAC,CAAC;AAEH,MAAM,cAAc,GAAG,IAAI,GAAG,CAAC;IAC7B,QAAQ;IACR,OAAO;IACP,UAAU;IACV,UAAU;IACV,QAAQ;CACT,CAAC,CAAC;AAkBH,MAAM,QAAQ,GAA6C;IACzD,CAAC,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC;IACvB,CAAC,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC;IACvB,MAAM,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC;IAC5B,KAAK,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC;IAC3B,GAAG,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC;IACzB,UAAU,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC;IAChC,UAAU,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC;IAChC,EAAE,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC;IACd,EAAE,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC;IACd,UAAU,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC;IACtB,SAAS,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC;IACrB,OAAO,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC;IACnB,WAAW,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC;IACvB,WAAW,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC;IACvB,EAAE,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC;IACd,EAAE,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC;IACd,UAAU,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC;IACtB,SAAS,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC;IACrB,OAAO,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC;IACnB,WAAW,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC;IACvB,WAAW,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC;IACvB,EAAE,EAAE,CAAC,GAAG,CAAC;IACT,EAAE,EAAE,CAAC,GAAG,CAAC;IACT,UAAU,EAAE,CAAC,GAAG,CAAC;IACjB,GAAG,EAAE,CAAC,GAAG,CAAC;IACV,WAAW,EAAE,CAAC,GAAG,CAAC;IAClB,WAAW,EAAE,CAAC,GAAG,CAAC;IAClB,EAAE,EAAE,CAAC,GAAG,CAAC;IACT,EAAE,EAAE,CAAC,GAAG,CAAC;IACT,UAAU,EAAE,CAAC,GAAG,CAAC;IACjB,MAAM,EAAE,CAAC,GAAG,CAAC;IACb,WAAW,EAAE,CAAC,GAAG,CAAC;IAClB,WAAW,EAAE,CAAC,GAAG,CAAC;IAClB,EAAE,EAAE,CAAC,GAAG,CAAC;IACT,EAAE,EAAE,CAAC,GAAG,CAAC;IACT,UAAU,EAAE,CAAC,GAAG,CAAC;IACjB,IAAI,EAAE,CAAC,GAAG,CAAC;IACX,WAAW,EAAE,CAAC,GAAG,CAAC;IAClB,WAAW,EAAE,CAAC,GAAG,CAAC;IAClB,EAAE,EAAE,CAAC,GAAG,CAAC;IACT,EAAE,EAAE,CAAC,GAAG,CAAC;IACT,UAAU,EAAE,CAAC,GAAG,CAAC;IACjB,KAAK,EAAE,CAAC,GAAG,CAAC;IACZ,WAAW,EAAE,CAAC,GAAG,CAAC;IAClB,WAAW,EAAE,CAAC,GAAG,CAAC;CACnB,CAAC;AAEF,MAAM,QAAQ,GAAgB;IAC5B;QACE,IAAI,EAAE,GAAG;QACT,IAAI,EAAE,GAAG;QACT,CAAC,EAAE,IAAI;QACP,CAAC,EAAE,IAAI;QACP,CAAC,EAAE,IAAI;QACP,CAAC,EAAE,IAAI;QACP,CAAC,EAAE,IAAI;QACP,CAAC,EAAE,IAAI;QACP,KAAK,EAAE,8BAA8B;KACtC;IACD;QACE,IAAI,EAAE,GAAG;QACT,IAAI,EAAE,GAAG;QACT,CAAC,EAAE,IAAI;QACP,CAAC,EAAE,IAAI;QACP,CAAC,EAAE,IAAI;QACP,CAAC,EAAE,IAAI;QACP,CAAC,EAAE,IAAI;QACP,CAAC,EAAE,IAAI;QACP,KAAK,EAAE,8BAA8B;KACtC;IACD;QACE,IAAI,EAAE,cAAc;QACpB,IAAI,EAAE,QAAQ;QACd,CAAC,EAAE,UAAU;QACb,CAAC,EAAE,UAAU;QACb,CAAC,EAAE,UAAU;QACb,CAAC,EAAE,UAAU;QACb,CAAC,EAAE,UAAU;QACb,CAAC,EAAE,UAAU;QACb,KAAK,EACH,yEAAyE;KAC5E;IACD;QACE,IAAI,EAAE,OAAO;QACb,IAAI,EAAE,OAAO;QACb,CAAC,EAAE,SAAS;QACZ,CAAC,EAAE,SAAS;QACZ,CAAC,EAAE,KAAK;QACR,CAAC,EAAE,QAAQ;QACX,CAAC,EAAE,MAAM;QACT,CAAC,EAAE,OAAO;QACV,KAAK,EAAE,sDAAsD;KAC9D;IACD;QACE,IAAI,EAAE,KAAK;QACX,IAAI,EAAE,KAAK;QACX,CAAC,EAAE,OAAO;QACV,CAAC,EAAE,OAAO;QACV,CAAC,EAAE,OAAO;QACV,CAAC,EAAE,OAAO;QACV,CAAC,EAAE,OAAO;QACV,CAAC,EAAE,OAAO;QACV,KAAK,EAAE,0BAA0B;KAClC;IACD;QACE,IAAI,EAAE,UAAU;QAChB,IAAI,EAAE,UAAU;QAChB,CAAC,EAAE,WAAW;QACd,CAAC,EAAE,WAAW;QACd,CAAC,EAAE,WAAW;QACd,CAAC,EAAE,WAAW;QACd,CAAC,EAAE,WAAW;QACd,CAAC,EAAE,WAAW;QACd,KAAK,EACH,+EAA+E;KAClF;IACD;QACE,IAAI,EAAE,UAAU;QAChB,IAAI,EAAE,UAAU;QAChB,CAAC,EAAE,WAAW;QACd,CAAC,EAAE,WAAW;QACd,CAAC,EAAE,WAAW;QACd,CAAC,EAAE,WAAW;QACd,CAAC,EAAE,WAAW;QACd,CAAC,EAAE,WAAW;QACd,KAAK,EACH,+EAA+E;KAClF;CACF,CAAC;AAEF,SAAS,aAAa,CACpB,GAAW;IAEX,KAAK,MAAM,MAAM,IAAI,QAAQ,EAAE,CAAC;QAC9B,MAAM,CAAC,GAAG,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAClC,IAAI,CAAC,CAAC;YAAE,SAAS;QACjB,MAAM,KAAK,GAAiB,EAAE,CAAC;QAC/B,KAAK,MAAM,IAAI,IAAI,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE;YAAE,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;QAC5D,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC;IAC3B,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAS,WAAW,CAAC,GAAQ,EAAE,CAAY;IACzC,MAAM,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,GAAG,GAAG,CAAC;IAC3B,MAAM,GAAG,GAAG,CAAC,GAAW,EAAE,GAAW,EAAE,EAAE,CAAC,GAAG,GAAG,IAAI,GAAG,EAAE,CAAC;IAE1D,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;QACrB,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC;YAAE,OAAO,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;QACzD,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC;YAAE,OAAO,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC;QAC/D,IAAI,CAAC,KAAK,CAAC;YAAE,OAAO,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC;QACnE,IAAI,CAAC,KAAK,CAAC;YAAE,OAAO,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC;QACnE,OAAO,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC;IACvE,CAAC;IAED,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;QACX,KAAK,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;IACtE,CAAC;SAAM,CAAC;QACN,IAAI,CAAC;YAAE,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QAC/B,IAAI,CAAC;YAAE,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IACjC,CAAC;IACD,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;QACX,KAAK,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;IACtE,CAAC;SAAM,CAAC;QACN,IAAI,CAAC;YAAE,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QAC/B,IAAI,CAAC;YAAE,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IACjC,CAAC;IACD,OAAO,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AACzB,CAAC;AAWD,SAAS,kBAAkB,CACzB,GAAW;IAEX,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,2CAA2C,CAAC,CAAC;IACrE,IAAI,KAAK,EAAE,CAAC;QACV,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;QACtB,MAAM,GAAG,GAAG,KAAK,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QAC3B,MAAM,CAAC,GAA2C,EAAE,CAAC;QACrD,IAAI,IAAI,KAAK,GAAG,EAAE,CAAC;YACjB,CAAC,CAAC,EAAE,GAAG,GAAG,CAAC;YACX,CAAC,CAAC,EAAE,GAAG,GAAG,CAAC;QACb,CAAC;aAAM,IAAI,IAAI,KAAK,GAAG,EAAE,CAAC;YACxB,CAAC,CAAC,EAAE,GAAG,GAAG,CAAC;YACX,CAAC,CAAC,EAAE,GAAG,GAAG,CAAC;QACb,CAAC;aAAM,IAAI,IAAI,KAAK,GAAG,EAAE,CAAC;YACxB,CAAC,CAAC,EAAE,GAAG,GAAG,CAAC;YACX,CAAC,CAAC,EAAE,GAAG,GAAG,CAAC;QACb,CAAC;aAAM,IAAI,IAAI,KAAK,GAAG,EAAE,CAAC;YACxB,CAAC,CAAC,EAAE,GAAG,GAAG,CAAC;YACX,CAAC,CAAC,EAAE,GAAG,GAAG,CAAC;QACb,CAAC;aAAM,CAAC;YACN,CAAC,CAAC,IAAqB,CAAC,GAAG,GAAG,CAAC;QACjC,CAAC;QACD,OAAO,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC;IACxB,CAAC;IAED,MAAM,IAAI,GAAG,GAAG,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAC;IAC9C,IAAI,IAAI,EAAE,CAAC;QACT,MAAM,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QAC1B,OAAO,EAAE,OAAO,EAAE,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE,CAAC;IAC7D,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAS,eAAe,CAAC,CAAU;IACjC,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,GAAG,CAAC,CAAC;IAC7B,MAAM,EAAE,GAAG,CAAC,GAAW,EAAE,GAAW,EAAE,EAAE,CAAC,CAAC,GAAG,KAAK,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,GAAG,IAAI,GAAG,EAAE,CAAC,CAAC;IAE9E,IAAI,EAAE,KAAK,IAAI,IAAI,EAAE,KAAK,IAAI,IAAI,EAAE,KAAK,IAAI,IAAI,EAAE,KAAK,IAAI,EAAE,CAAC;QAC7D,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE;YAAE,OAAO,EAAE,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;QAClE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE;YACxB,OAAO,GAAG,EAAE,CAAC,WAAW,EAAE,EAAE,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,EAAE,CAAC,EAAE,CAAC;QACzD,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE;YACxB,OAAO,GAAG,EAAE,CAAC,WAAW,EAAE,EAAE,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,EAAE,CAAC,EAAE,CAAC;QACzD,MAAM,KAAK,GAAa,EAAE,CAAC;QAC3B,IAAI,EAAE,KAAK,EAAE;YAAE,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC,CAAC;aAC1C,CAAC;YACJ,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC,CAAC;YACjC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC,CAAC;QACnC,CAAC;QACD,IAAI,EAAE,KAAK,EAAE;YAAE,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC,CAAC;aAC1C,CAAC;YACJ,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC,CAAC;YACjC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC,CAAC;QACnC,CAAC;QACD,OAAO,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACzB,CAAC;IAED,MAAM,OAAO,GAAG,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC;IAC/D,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,IAAI,EAAE,KAAK,IAAI,IAAI,EAAE,KAAK,IAAI,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC;QAC5C,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC,CAAC;QAChC,OAAO,CAAC,EAAE,GAAG,IAAI,CAAC;QAClB,OAAO,CAAC,EAAE,GAAG,IAAI,CAAC;IACpB,CAAC;IACD,IAAI,EAAE,KAAK,IAAI,IAAI,EAAE,KAAK,IAAI,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC;QAC5C,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC,CAAC;QAChC,OAAO,CAAC,EAAE,GAAG,IAAI,CAAC;QAClB,OAAO,CAAC,EAAE,GAAG,IAAI,CAAC;IACpB,CAAC;IACD,IAAI,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,KAAK,IAAI,IAAI,EAAE,KAAK,IAAI,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC;QAC1E,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC,CAAC;QAChC,OAAO,CAAC,EAAE,GAAG,IAAI,CAAC;QAClB,OAAO,CAAC,EAAE,GAAG,IAAI,CAAC;IACpB,CAAC;IACD,IAAI,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,KAAK,IAAI,IAAI,EAAE,KAAK,IAAI,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC;QAC1E,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC,CAAC;QAChC,OAAO,CAAC,EAAE,GAAG,IAAI,CAAC;QAClB,OAAO,CAAC,EAAE,GAAG,IAAI,CAAC;IACpB,CAAC;IACD,IAAI,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,KAAK,IAAI;QAAE,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC,CAAC;IACjE,IAAI,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,KAAK,IAAI;QAAE,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC,CAAC;IACjE,IAAI,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,KAAK,IAAI;QAAE,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC,CAAC;IACjE,IAAI,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,KAAK,IAAI;QAAE,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC,CAAC;IACjE,OAAO,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AACzB,CAAC;AAED,iFAAiF;AAEjF,SAAS,aAAa,CACpB,MAAgB,EAChB,SAAiB,EACjB,OAAiB;IAEjB,MAAM,QAAQ,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC9E,MAAM,CAAC,IAAI,CACT,GAAG,CAAC,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CACzE,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,QAAgB;IACjD,MAAM,OAAO,GAAG,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IACtD,IAAI,OAAO,CAAC,MAAM,IAAI,CAAC;QAAE,OAAO,QAAQ,CAAC;IAEzC,IAAI,aAAa,GAAkB,IAAI,CAAC;IACxC,IAAI,cAAc,GAAkB,IAAI,CAAC;IACzC,MAAM,IAAI,GAAG,IAAI,GAAG,EAAU,CAAC;IAC/B,MAAM,MAAM,GAAa,EAAE,CAAC;IAC5B,MAAM,SAAS,GAAG,IAAI,GAAG,EAGtB,CAAC;IACJ,MAAM,OAAO,GAAY,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC;IACpE,MAAM,cAAc,GAAa,EAAE,CAAC;IAEpC,KAAK,MAAM,GAAG,IAAI,OAAO,EAAE,CAAC;QAC1B,IAAI,aAAa,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;YAC3B,aAAa,GAAG,GAAG,CAAC;YACpB,SAAS;QACX,CAAC;QACD,IAAI,cAAc,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;YAC5B,cAAc,GAAG,GAAG,CAAC;YACrB,SAAS;QACX,CAAC;QAED,MAAM,MAAM,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC;QAClC,IAAI,MAAM,EAAE,CAAC;YACX,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,CAAC;YACjC,IAAI,KAAK,GAAG,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YACvC,IAAI,CAAC,KAAK,EAAE,CAAC;gBACX,KAAK,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC;gBACrE,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;YACpC,CAAC;YACD,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YACxB,IAAI,KAAK,CAAC,CAAC,KAAK,SAAS;gBAAE,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC;YACjD,IAAI,KAAK,CAAC,CAAC,KAAK,SAAS;gBAAE,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC;YACjD,IAAI,KAAK,CAAC,CAAC,KAAK,SAAS;gBAAE,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC;YACjD,IAAI,KAAK,CAAC,CAAC,KAAK,SAAS;gBAAE,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC;YACjD,SAAS;QACX,CAAC;QAED,MAAM,aAAa,GAAG,kBAAkB,CAAC,GAAG,CAAC,CAAC;QAC9C,IAAI,aAAa,EAAE,CAAC;YAClB,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YACzB,MAAM,EAAE,OAAO,EAAE,CAAC,EAAE,GAAG,aAAa,CAAC;YACrC,IAAI,CAAC,CAAC,EAAE,KAAK,SAAS;gBAAE,OAAO,CAAC,EAAE,GAAG,CAAC,CAAC,EAAE,CAAC;YAC1C,IAAI,CAAC,CAAC,EAAE,KAAK,SAAS;gBAAE,OAAO,CAAC,EAAE,GAAG,CAAC,CAAC,EAAE,CAAC;YAC1C,IAAI,CAAC,CAAC,EAAE,KAAK,SAAS;gBAAE,OAAO,CAAC,EAAE,GAAG,CAAC,CAAC,EAAE,CAAC;YAC1C,IAAI,CAAC,CAAC,EAAE,KAAK,SAAS;gBAAE,OAAO,CAAC,EAAE,GAAG,CAAC,CAAC,EAAE,CAAC;YAC1C,SAAS;QACX,CAAC;QAED,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;YACnB,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YACd,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACnB,CAAC;IACH,CAAC;IAED,MAAM,MAAM,GAAa,EAAE,CAAC;IAC5B,IAAI,aAAa;QAAE,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;IAC9C,IAAI,cAAc;QAAE,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;IAEhD,KAAK,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,YAAY,EAAE,IAAI,SAAS,CAAC,MAAM,EAAE,EAAE,CAAC;QACxE,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC;YAAE,SAAS;QACxC,aAAa,CAAC,MAAM,EAAE,WAAW,CAAC,GAAG,EAAE,MAAM,CAAC,EAAE,YAAY,CAAC,CAAC;IAChE,CAAC;IAED,IAAI,cAAc,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC9B,aAAa,CAAC,MAAM,EAAE,eAAe,CAAC,OAAO,CAAC,EAAE,cAAc,CAAC,CAAC;IAClE,CAAC;IAED,MAAM,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,CAAC;IACvB,OAAO,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAC1B,CAAC;AAED,MAAM,UAAU,UAAU,CACxB,QAAgB,EAChB,OAAwB,EAAE;IAE1B,MAAM,OAAO,GAAG,YAAY,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;IAC/C,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,mBAAmB,CAC3C,OAAO,EACP,kBAAkB,EAClB,IAAI,CACL,CAAC;IACF,IAAI,KAAK,GAAG,CAAC;QAAE,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IACvD,OAAO,KAAK,CAAC;AACf,CAAC"}
|
package/dist/core/fixer.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fixer.d.ts","sourceRoot":"","sources":["../../src/core/fixer.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"fixer.d.ts","sourceRoot":"","sources":["../../src/core/fixer.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,MAAM,EAAoB,MAAM,YAAY,CAAC;AAE3D,wBAAgB,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,GAAE,MAAW,GAAG,MAAM,CAoBrE"}
|
package/dist/core/fixer.js
CHANGED
|
@@ -1,27 +1,22 @@
|
|
|
1
1
|
import { readFileSync, writeFileSync } from 'node:fs';
|
|
2
|
+
import { replaceClassStrings } from './class-strings.js';
|
|
2
3
|
import { suggestCanonical } from './rules.js';
|
|
3
4
|
export function fixFile(filePath, config = {}) {
|
|
4
|
-
|
|
5
|
+
const content = readFileSync(filePath, 'utf8');
|
|
5
6
|
let count = 0;
|
|
6
|
-
const
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
return cls;
|
|
17
|
-
});
|
|
18
|
-
return full
|
|
19
|
-
.replace(raw, fixed)
|
|
20
|
-
.replace(/["'`]/, quote)
|
|
21
|
-
.replace(/["'`]$/, quote);
|
|
7
|
+
const transform = (raw) => raw.replace(/[^\s]+/g, (cls) => {
|
|
8
|
+
const s = suggestCanonical(cls, config);
|
|
9
|
+
if (s) {
|
|
10
|
+
count++;
|
|
11
|
+
return s.canonical;
|
|
12
|
+
}
|
|
13
|
+
return cls;
|
|
14
|
+
});
|
|
15
|
+
const { result } = replaceClassStrings(content, transform, {
|
|
16
|
+
functionNames: config.functionNames,
|
|
22
17
|
});
|
|
23
18
|
if (count > 0)
|
|
24
|
-
writeFileSync(filePath,
|
|
19
|
+
writeFileSync(filePath, result, 'utf8');
|
|
25
20
|
return count;
|
|
26
21
|
}
|
|
27
22
|
//# sourceMappingURL=fixer.js.map
|
package/dist/core/fixer.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fixer.js","sourceRoot":"","sources":["../../src/core/fixer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AACtD,OAAO,EAAe,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAE3D,MAAM,UAAU,OAAO,CAAC,QAAgB,EAAE,SAAiB,EAAE;IAC3D,
|
|
1
|
+
{"version":3,"file":"fixer.js","sourceRoot":"","sources":["../../src/core/fixer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AACtD,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AACzD,OAAO,EAAe,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAE3D,MAAM,UAAU,OAAO,CAAC,QAAgB,EAAE,SAAiB,EAAE;IAC3D,MAAM,OAAO,GAAG,YAAY,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;IAC/C,IAAI,KAAK,GAAG,CAAC,CAAC;IAEd,MAAM,SAAS,GAAG,CAAC,GAAW,EAAE,EAAE,CAChC,GAAG,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC,GAAW,EAAE,EAAE;QACrC,MAAM,CAAC,GAAG,gBAAgB,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;QACxC,IAAI,CAAC,EAAE,CAAC;YACN,KAAK,EAAE,CAAC;YACR,OAAO,CAAC,CAAC,SAAS,CAAC;QACrB,CAAC;QACD,OAAO,GAAG,CAAC;IACb,CAAC,CAAC,CAAC;IAEL,MAAM,EAAE,MAAM,EAAE,GAAG,mBAAmB,CAAC,OAAO,EAAE,SAAS,EAAE;QACzD,aAAa,EAAE,MAAM,CAAC,aAAa;KACpC,CAAC,CAAC;IAEH,IAAI,KAAK,GAAG,CAAC;QAAE,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IACvD,OAAO,KAAK,CAAC;AACf,CAAC"}
|
package/dist/core/merger.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"merger.d.ts","sourceRoot":"","sources":["../../src/core/merger.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"merger.d.ts","sourceRoot":"","sources":["../../src/core/merger.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,eAAe,EAAuB,MAAM,oBAAoB,CAAC;AAE/E,wBAAsB,SAAS,CAC7B,QAAQ,EAAE,MAAM,EAChB,IAAI,GAAE,eAAoB,GACzB,OAAO,CAAC,MAAM,CAAC,CAMjB"}
|
package/dist/core/merger.js
CHANGED
|
@@ -1,20 +1,11 @@
|
|
|
1
1
|
import { readFileSync, writeFileSync } from 'node:fs';
|
|
2
|
-
|
|
2
|
+
import { replaceClassStrings } from './class-strings.js';
|
|
3
|
+
export async function mergeFile(filePath, opts = {}) {
|
|
3
4
|
const { twMerge } = await import('tailwind-merge');
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
const CLASS_ATTR_REGEX = /className\s*=\s*(?:"([^"]+)"|'([^']+)'|`([^`]+)`)/g;
|
|
7
|
-
content = content.replace(CLASS_ATTR_REGEX, (full, dq, sq, bt) => {
|
|
8
|
-
const raw = dq ?? sq ?? bt ?? '';
|
|
9
|
-
const quote = dq !== undefined ? '"' : sq !== undefined ? "'" : '`';
|
|
10
|
-
const merged = twMerge(raw);
|
|
11
|
-
if (merged === raw)
|
|
12
|
-
return full;
|
|
13
|
-
count++;
|
|
14
|
-
return `className=${quote}${merged}${quote}`;
|
|
15
|
-
});
|
|
5
|
+
const content = readFileSync(filePath, 'utf8');
|
|
6
|
+
const { result, count } = replaceClassStrings(content, twMerge, opts);
|
|
16
7
|
if (count > 0)
|
|
17
|
-
writeFileSync(filePath,
|
|
8
|
+
writeFileSync(filePath, result, 'utf8');
|
|
18
9
|
return count;
|
|
19
10
|
}
|
|
20
11
|
//# sourceMappingURL=merger.js.map
|
package/dist/core/merger.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"merger.js","sourceRoot":"","sources":["../../src/core/merger.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"merger.js","sourceRoot":"","sources":["../../src/core/merger.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AACtD,OAAO,EAAwB,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAE/E,MAAM,CAAC,KAAK,UAAU,SAAS,CAC7B,QAAgB,EAChB,OAAwB,EAAE;IAE1B,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,MAAM,CAAC,gBAAgB,CAAC,CAAC;IACnD,MAAM,OAAO,GAAG,YAAY,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;IAC/C,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,mBAAmB,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;IACtE,IAAI,KAAK,GAAG,CAAC;QAAE,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IACvD,OAAO,KAAK,CAAC;AACf,CAAC"}
|
package/dist/core/rules.d.ts
CHANGED
|
@@ -7,6 +7,7 @@ export type Config = {
|
|
|
7
7
|
customTextTokens?: Record<number, string>;
|
|
8
8
|
customSpacingTokens?: Record<number, string>;
|
|
9
9
|
ignorePatterns?: RegExp[];
|
|
10
|
+
functionNames?: string[];
|
|
10
11
|
};
|
|
11
12
|
export declare function suggestCanonical(cls: string, config?: Config): Suggestion | null;
|
|
12
13
|
//# sourceMappingURL=rules.d.ts.map
|
package/dist/core/rules.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rules.d.ts","sourceRoot":"","sources":["../../src/core/rules.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,UAAU,GAAG;IACvB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,OAAO,CAAC;CACxB,CAAC;
|
|
1
|
+
{"version":3,"file":"rules.d.ts","sourceRoot":"","sources":["../../src/core/rules.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,UAAU,GAAG;IACvB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,OAAO,CAAC;CACxB,CAAC;AAuHF,MAAM,MAAM,MAAM,GAAG;IACnB,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC1C,mBAAmB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC7C,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAC1B,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;CAC1B,CAAC;AAMF,wBAAgB,gBAAgB,CAC9B,GAAG,EAAE,MAAM,EACX,MAAM,GAAE,MAAW,GAClB,UAAU,GAAG,IAAI,CAuHnB"}
|
package/dist/core/rules.js
CHANGED
|
@@ -16,19 +16,7 @@ const TEXT_SIZE_MAP = {
|
|
|
16
16
|
60: '6xl',
|
|
17
17
|
72: '7xl',
|
|
18
18
|
};
|
|
19
|
-
const
|
|
20
|
-
12: 'xs',
|
|
21
|
-
14: 'sm',
|
|
22
|
-
16: 'base',
|
|
23
|
-
18: 'lg',
|
|
24
|
-
20: 'xl',
|
|
25
|
-
24: '2xl',
|
|
26
|
-
30: '3xl',
|
|
27
|
-
36: '4xl',
|
|
28
|
-
48: '5xl',
|
|
29
|
-
60: '6xl',
|
|
30
|
-
72: '7xl',
|
|
31
|
-
};
|
|
19
|
+
const BUILT_IN_TEXT_PX = new Set([12, 14, 16, 18, 20, 24, 30, 36, 48, 60, 72]);
|
|
32
20
|
const ROUNDED_MAP = {
|
|
33
21
|
2: 'sm',
|
|
34
22
|
4: 'sm',
|
|
@@ -74,6 +62,43 @@ const FRACTION_PREFIXES = [
|
|
|
74
62
|
'translate-x',
|
|
75
63
|
'translate-y',
|
|
76
64
|
];
|
|
65
|
+
const SPACING_PREFIXES = [
|
|
66
|
+
'h',
|
|
67
|
+
'w',
|
|
68
|
+
'p',
|
|
69
|
+
'px',
|
|
70
|
+
'py',
|
|
71
|
+
'pt',
|
|
72
|
+
'pb',
|
|
73
|
+
'pl',
|
|
74
|
+
'pr',
|
|
75
|
+
'm',
|
|
76
|
+
'mx',
|
|
77
|
+
'my',
|
|
78
|
+
'mt',
|
|
79
|
+
'mb',
|
|
80
|
+
'ml',
|
|
81
|
+
'mr',
|
|
82
|
+
'gap',
|
|
83
|
+
'gap-x',
|
|
84
|
+
'gap-y',
|
|
85
|
+
'top',
|
|
86
|
+
'left',
|
|
87
|
+
'right',
|
|
88
|
+
'bottom',
|
|
89
|
+
'inset',
|
|
90
|
+
'size',
|
|
91
|
+
'min-h',
|
|
92
|
+
'max-h',
|
|
93
|
+
'min-w',
|
|
94
|
+
'max-w',
|
|
95
|
+
'translate-x',
|
|
96
|
+
'translate-y',
|
|
97
|
+
'space-x',
|
|
98
|
+
'space-y',
|
|
99
|
+
];
|
|
100
|
+
const SPACING_PX_RE = new RegExp(`^(${SPACING_PREFIXES.join('|')})-\\[(\\d+)px\\]$`);
|
|
101
|
+
const SPACING_REM_RE = new RegExp(`^(${SPACING_PREFIXES.join('|')})-\\[(\\d+(?:\\.\\d+)?)rem\\]$`);
|
|
77
102
|
const OPACITY_SCALE = new Set([
|
|
78
103
|
0, 5, 10, 20, 25, 30, 40, 50, 60, 70, 75, 80, 90, 95, 100,
|
|
79
104
|
]);
|
|
@@ -93,7 +118,7 @@ export function suggestCanonical(cls, config = {}) {
|
|
|
93
118
|
return {
|
|
94
119
|
original: cls,
|
|
95
120
|
canonical: `text-${token}`,
|
|
96
|
-
isCustomToken: !
|
|
121
|
+
isCustomToken: !BUILT_IN_TEXT_PX.has(px),
|
|
97
122
|
};
|
|
98
123
|
}
|
|
99
124
|
// text-[N.Nrem]
|
|
@@ -106,47 +131,11 @@ export function suggestCanonical(cls, config = {}) {
|
|
|
106
131
|
return {
|
|
107
132
|
original: cls,
|
|
108
133
|
canonical: `text-${token}`,
|
|
109
|
-
isCustomToken: !
|
|
134
|
+
isCustomToken: !BUILT_IN_TEXT_PX.has(px),
|
|
110
135
|
};
|
|
111
136
|
}
|
|
112
|
-
const spacingPrefixes = [
|
|
113
|
-
'h',
|
|
114
|
-
'w',
|
|
115
|
-
'p',
|
|
116
|
-
'px',
|
|
117
|
-
'py',
|
|
118
|
-
'pt',
|
|
119
|
-
'pb',
|
|
120
|
-
'pl',
|
|
121
|
-
'pr',
|
|
122
|
-
'm',
|
|
123
|
-
'mx',
|
|
124
|
-
'my',
|
|
125
|
-
'mt',
|
|
126
|
-
'mb',
|
|
127
|
-
'ml',
|
|
128
|
-
'mr',
|
|
129
|
-
'gap',
|
|
130
|
-
'gap-x',
|
|
131
|
-
'gap-y',
|
|
132
|
-
'top',
|
|
133
|
-
'left',
|
|
134
|
-
'right',
|
|
135
|
-
'bottom',
|
|
136
|
-
'inset',
|
|
137
|
-
'size',
|
|
138
|
-
'min-h',
|
|
139
|
-
'max-h',
|
|
140
|
-
'min-w',
|
|
141
|
-
'max-w',
|
|
142
|
-
'translate-x',
|
|
143
|
-
'translate-y',
|
|
144
|
-
'space-x',
|
|
145
|
-
'space-y',
|
|
146
|
-
];
|
|
147
|
-
const spacingPxRegex = new RegExp(`^(${spacingPrefixes.join('|')})-\\[(\\d+)px\\]$`);
|
|
148
137
|
// spacing-[Npx]
|
|
149
|
-
const spacingPxMatch = cls.match(
|
|
138
|
+
const spacingPxMatch = cls.match(SPACING_PX_RE);
|
|
150
139
|
if (spacingPxMatch) {
|
|
151
140
|
const prefix = spacingPxMatch[1];
|
|
152
141
|
const px = parseInt(spacingPxMatch[2], 10);
|
|
@@ -167,8 +156,7 @@ export function suggestCanonical(cls, config = {}) {
|
|
|
167
156
|
return null;
|
|
168
157
|
}
|
|
169
158
|
// spacing-[N.Nrem]
|
|
170
|
-
const
|
|
171
|
-
const spacingRemMatch = cls.match(spacingRemRegex);
|
|
159
|
+
const spacingRemMatch = cls.match(SPACING_REM_RE);
|
|
172
160
|
if (spacingRemMatch) {
|
|
173
161
|
const prefix = spacingRemMatch[1];
|
|
174
162
|
const px = remToPx(parseFloat(spacingRemMatch[2]));
|
|
@@ -226,7 +214,7 @@ export function suggestCanonical(cls, config = {}) {
|
|
|
226
214
|
return null;
|
|
227
215
|
return {
|
|
228
216
|
original: cls,
|
|
229
|
-
canonical: `${prefix
|
|
217
|
+
canonical: `${prefix}-${token}`,
|
|
230
218
|
isCustomToken: false,
|
|
231
219
|
};
|
|
232
220
|
}
|