tailwind-canonical 0.1.9 → 0.2.1
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 +101 -4
- package/dist/cli/index.js +126 -9
- package/dist/cli/index.js.map +1 -1
- package/dist/core/analyzer.d.ts.map +1 -1
- package/dist/core/analyzer.js +14 -19
- package/dist/core/analyzer.js.map +1 -1
- package/dist/core/class-strings.d.ts +3 -0
- package/dist/core/class-strings.d.ts.map +1 -1
- package/dist/core/class-strings.js +17 -5
- package/dist/core/class-strings.js.map +1 -1
- package/dist/core/consistency.d.ts +46 -0
- package/dist/core/consistency.d.ts.map +1 -0
- package/dist/core/consistency.js +251 -0
- package/dist/core/consistency.js.map +1 -0
- package/dist/core/deduplicator.d.ts.map +1 -1
- package/dist/core/deduplicator.js +53 -3
- package/dist/core/deduplicator.js.map +1 -1
- package/dist/core/fixer.d.ts.map +1 -1
- package/dist/core/fixer.js +1 -0
- package/dist/core/fixer.js.map +1 -1
- package/dist/core/rules.d.ts +3 -0
- package/dist/core/rules.d.ts.map +1 -1
- package/dist/core/rules.js +0 -1
- package/dist/core/rules.js.map +1 -1
- package/dist/core/scanner.d.ts +1 -0
- package/dist/core/scanner.d.ts.map +1 -1
- package/dist/core/scanner.js +69 -39
- package/dist/core/scanner.js.map +1 -1
- package/dist/core/sorter.d.ts +4 -2
- package/dist/core/sorter.d.ts.map +1 -1
- package/dist/core/sorter.js +49 -20
- package/dist/core/sorter.js.map +1 -1
- package/dist/eslint/plugin.d.ts.map +1 -1
- package/dist/eslint/plugin.js +4 -5
- package/dist/eslint/plugin.js.map +1 -1
- package/dist/index.d.ts +5 -2
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +3 -2
- package/dist/index.js.map +1 -1
- package/package.json +12 -15
package/dist/core/scanner.js
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { readdirSync, statSync } from 'node:fs';
|
|
2
|
+
import { glob } from 'node:fs/promises';
|
|
2
3
|
import { join } from 'node:path';
|
|
3
4
|
const DEFAULT_EXTENSIONS = ['.tsx', '.ts', '.jsx', '.js', '.vue', '.svelte'];
|
|
4
5
|
const DEFAULT_IGNORE = [
|
|
@@ -10,11 +11,12 @@ const DEFAULT_IGNORE = [
|
|
|
10
11
|
'coverage',
|
|
11
12
|
];
|
|
12
13
|
function isGlob(target) {
|
|
13
|
-
return target.includes('*') || target.includes('?');
|
|
14
|
+
return target.includes('*') || target.includes('?') || target.includes('{');
|
|
14
15
|
}
|
|
15
16
|
function globToRegex(pattern) {
|
|
16
17
|
let i = 0;
|
|
17
|
-
|
|
18
|
+
const anchored = pattern.startsWith('/') || /^[A-Za-z]:/.test(pattern);
|
|
19
|
+
let re = anchored ? '^' : '(?:^|/)';
|
|
18
20
|
while (i < pattern.length) {
|
|
19
21
|
const c = pattern[i];
|
|
20
22
|
if (c === '*' && pattern[i + 1] === '*') {
|
|
@@ -31,6 +33,21 @@ function globToRegex(pattern) {
|
|
|
31
33
|
re += '[^/]';
|
|
32
34
|
i++;
|
|
33
35
|
}
|
|
36
|
+
else if (c === '{') {
|
|
37
|
+
const close = pattern.indexOf('}', i);
|
|
38
|
+
if (close === -1) {
|
|
39
|
+
re += '\\{';
|
|
40
|
+
i++;
|
|
41
|
+
}
|
|
42
|
+
else {
|
|
43
|
+
const alts = pattern
|
|
44
|
+
.slice(i + 1, close)
|
|
45
|
+
.split(',')
|
|
46
|
+
.map((a) => a.replace(/[.+^${}()|[\]\\]/g, '\\$&'));
|
|
47
|
+
re += `(?:${alts.join('|')})`;
|
|
48
|
+
i = close + 1;
|
|
49
|
+
}
|
|
50
|
+
}
|
|
34
51
|
else if (/[.+^${}()|[\]\\]/.test(c)) {
|
|
35
52
|
re += `\\${c}`;
|
|
36
53
|
i++;
|
|
@@ -42,48 +59,18 @@ function globToRegex(pattern) {
|
|
|
42
59
|
}
|
|
43
60
|
return new RegExp(`${re}$`);
|
|
44
61
|
}
|
|
45
|
-
function globBase(pattern) {
|
|
46
|
-
const firstGlob = pattern.search(/[*?]/);
|
|
47
|
-
if (firstGlob === -1)
|
|
48
|
-
return pattern;
|
|
49
|
-
const before = pattern.slice(0, firstGlob);
|
|
50
|
-
const lastSlash = before.lastIndexOf('/');
|
|
51
|
-
return lastSlash === -1 ? '.' : before.slice(0, lastSlash) || '.';
|
|
52
|
-
}
|
|
53
62
|
export function scanFiles(target, options = {}) {
|
|
54
63
|
const ignore = options.ignore ?? DEFAULT_IGNORE;
|
|
55
|
-
if (isGlob(target)) {
|
|
56
|
-
const regex = globToRegex(target);
|
|
57
|
-
const base = globBase(target);
|
|
58
|
-
const files = [];
|
|
59
|
-
function walkGlob(current, rel) {
|
|
60
|
-
let entries;
|
|
61
|
-
try {
|
|
62
|
-
entries = readdirSync(current, { withFileTypes: true });
|
|
63
|
-
}
|
|
64
|
-
catch {
|
|
65
|
-
return;
|
|
66
|
-
}
|
|
67
|
-
for (const entry of entries) {
|
|
68
|
-
if (ignore.includes(entry.name))
|
|
69
|
-
continue;
|
|
70
|
-
const full = join(current, entry.name);
|
|
71
|
-
const relEntry = rel ? `${rel}/${entry.name}` : entry.name;
|
|
72
|
-
if (entry.isDirectory()) {
|
|
73
|
-
walkGlob(full, relEntry);
|
|
74
|
-
}
|
|
75
|
-
else if (regex.test(relEntry)) {
|
|
76
|
-
files.push(full);
|
|
77
|
-
}
|
|
78
|
-
}
|
|
79
|
-
}
|
|
80
|
-
walkGlob(base, base === '.' ? '' : base);
|
|
81
|
-
return files;
|
|
82
|
-
}
|
|
83
64
|
const extensions = options.extensions ?? DEFAULT_EXTENSIONS;
|
|
84
65
|
const files = [];
|
|
85
66
|
function walk(current) {
|
|
86
|
-
|
|
67
|
+
let entries;
|
|
68
|
+
try {
|
|
69
|
+
entries = readdirSync(current, { withFileTypes: true });
|
|
70
|
+
}
|
|
71
|
+
catch {
|
|
72
|
+
return;
|
|
73
|
+
}
|
|
87
74
|
for (const entry of entries) {
|
|
88
75
|
if (ignore.includes(entry.name))
|
|
89
76
|
continue;
|
|
@@ -102,4 +89,47 @@ export function scanFiles(target, options = {}) {
|
|
|
102
89
|
walk(target);
|
|
103
90
|
return files;
|
|
104
91
|
}
|
|
92
|
+
export async function resolveTargets(patterns, options = {}) {
|
|
93
|
+
const ignore = options.ignore ?? DEFAULT_IGNORE;
|
|
94
|
+
const extensions = options.extensions ?? DEFAULT_EXTENSIONS;
|
|
95
|
+
const positive = [];
|
|
96
|
+
const negativeRegexes = [];
|
|
97
|
+
for (const p of patterns) {
|
|
98
|
+
if (p.startsWith('!')) {
|
|
99
|
+
negativeRegexes.push(globToRegex(p.slice(1)));
|
|
100
|
+
}
|
|
101
|
+
else {
|
|
102
|
+
positive.push(p);
|
|
103
|
+
}
|
|
104
|
+
}
|
|
105
|
+
const files = new Set();
|
|
106
|
+
for (const pattern of positive) {
|
|
107
|
+
if (isGlob(pattern)) {
|
|
108
|
+
for await (const f of glob(pattern, {
|
|
109
|
+
exclude: (f) => f
|
|
110
|
+
.replace(/\\/g, '/')
|
|
111
|
+
.split('/')
|
|
112
|
+
.some((s) => ignore.includes(s)),
|
|
113
|
+
})) {
|
|
114
|
+
if (extensions.some((ext) => f.endsWith(ext))) {
|
|
115
|
+
files.add(f);
|
|
116
|
+
}
|
|
117
|
+
}
|
|
118
|
+
}
|
|
119
|
+
else {
|
|
120
|
+
for (const f of scanFiles(pattern, options)) {
|
|
121
|
+
files.add(f);
|
|
122
|
+
}
|
|
123
|
+
}
|
|
124
|
+
}
|
|
125
|
+
if (negativeRegexes.length > 0) {
|
|
126
|
+
for (const f of [...files]) {
|
|
127
|
+
const normalized = f.replace(/\\/g, '/');
|
|
128
|
+
if (negativeRegexes.some((re) => re.test(normalized))) {
|
|
129
|
+
files.delete(f);
|
|
130
|
+
}
|
|
131
|
+
}
|
|
132
|
+
}
|
|
133
|
+
return [...files].sort();
|
|
134
|
+
}
|
|
105
135
|
//# sourceMappingURL=scanner.js.map
|
package/dist/core/scanner.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scanner.js","sourceRoot":"","sources":["../../src/core/scanner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,WAAW,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAC7D,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEjC,MAAM,kBAAkB,GAAG,CAAC,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC;AAC7E,MAAM,cAAc,GAAG;IACrB,cAAc;IACd,OAAO;IACP,MAAM;IACN,MAAM;IACN,OAAO;IACP,UAAU;CACX,CAAC;AAOF,SAAS,MAAM,CAAC,MAAc;IAC5B,OAAO,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"scanner.js","sourceRoot":"","sources":["../../src/core/scanner.ts"],"names":[],"mappings":"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"}
|
package/dist/core/sorter.d.ts
CHANGED
|
@@ -1,4 +1,6 @@
|
|
|
1
1
|
import { type ClassStringOpts } from './class-strings.js';
|
|
2
|
-
export
|
|
3
|
-
export declare
|
|
2
|
+
export type SortCategory = 'layout' | 'position' | 'inset' | 'display' | 'flex-grid' | 'sizing' | 'border' | 'spacing' | 'typography' | 'colors' | 'effects' | 'transitions' | 'transforms' | 'interactivity' | 'accessibility';
|
|
3
|
+
export declare const DEFAULT_SORT_ORDER: SortCategory[];
|
|
4
|
+
export declare function sortClasses(classStr: string, sortOrder?: SortCategory[]): string;
|
|
5
|
+
export declare function sortFile(filePath: string, opts?: ClassStringOpts, sortOrder?: SortCategory[]): number;
|
|
4
6
|
//# sourceMappingURL=sorter.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sorter.d.ts","sourceRoot":"","sources":["../../src/core/sorter.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,eAAe,EAAuB,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"sorter.d.ts","sourceRoot":"","sources":["../../src/core/sorter.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,eAAe,EAAuB,MAAM,oBAAoB,CAAC;AAiE/E,MAAM,MAAM,YAAY,GACpB,QAAQ,GACR,UAAU,GACV,OAAO,GACP,SAAS,GACT,WAAW,GACX,QAAQ,GACR,QAAQ,GACR,SAAS,GACT,YAAY,GACZ,QAAQ,GACR,SAAS,GACT,aAAa,GACb,YAAY,GACZ,eAAe,GACf,eAAe,CAAC;AAEpB,eAAO,MAAM,kBAAkB,EAAE,YAAY,EAgB5C,CAAC;AA8EF,wBAAgB,WAAW,CACzB,QAAQ,EAAE,MAAM,EAChB,SAAS,CAAC,EAAE,YAAY,EAAE,GACzB,MAAM,CAsBR;AAED,wBAAgB,QAAQ,CACtB,QAAQ,EAAE,MAAM,EAChB,IAAI,GAAE,eAAoB,EAC1B,SAAS,CAAC,EAAE,YAAY,EAAE,GACzB,MAAM,CASR"}
|
package/dist/core/sorter.js
CHANGED
|
@@ -51,48 +51,76 @@ const RE_TRANSITIONS = /^(transition|duration|ease|delay|animate|will-change)[-]
|
|
|
51
51
|
const RE_TRANSFORMS = /^(scale|rotate|translate|skew|origin)[-]/;
|
|
52
52
|
const RE_INTERACTIVITY = /^(cursor|pointer-events|select|appearance|resize|scroll|snap|touch)[-]/;
|
|
53
53
|
const RE_BREAKPOINTS = /^(sm|md|lg|xl|2xl)$/;
|
|
54
|
+
export const DEFAULT_SORT_ORDER = [
|
|
55
|
+
'layout',
|
|
56
|
+
'position',
|
|
57
|
+
'inset',
|
|
58
|
+
'display',
|
|
59
|
+
'flex-grid',
|
|
60
|
+
'sizing',
|
|
61
|
+
'border',
|
|
62
|
+
'spacing',
|
|
63
|
+
'typography',
|
|
64
|
+
'colors',
|
|
65
|
+
'effects',
|
|
66
|
+
'transitions',
|
|
67
|
+
'transforms',
|
|
68
|
+
'interactivity',
|
|
69
|
+
'accessibility',
|
|
70
|
+
];
|
|
54
71
|
function getCategory(cls) {
|
|
55
72
|
const base = cls.includes(':') ? cls.slice(cls.lastIndexOf(':') + 1) : cls;
|
|
56
73
|
if (base === 'container' || RE_LAYOUT.test(base))
|
|
57
|
-
return
|
|
74
|
+
return 'layout';
|
|
58
75
|
if (POSITION_CLASSES.has(base))
|
|
59
|
-
return
|
|
76
|
+
return 'position';
|
|
60
77
|
if (RE_INSET.test(base))
|
|
61
|
-
return
|
|
78
|
+
return 'inset';
|
|
62
79
|
if (DISPLAY_CLASSES.has(base))
|
|
63
|
-
return
|
|
80
|
+
return 'display';
|
|
64
81
|
if (base === 'grow' || base === 'shrink' || RE_FLEX_GRID.test(base))
|
|
65
|
-
return
|
|
82
|
+
return 'flex-grid';
|
|
66
83
|
if (RE_SIZING.test(base))
|
|
67
|
-
return
|
|
84
|
+
return 'sizing';
|
|
68
85
|
if (base === 'rounded' ||
|
|
69
86
|
base === 'border' ||
|
|
70
87
|
base === 'ring' ||
|
|
71
88
|
base === 'outline' ||
|
|
72
89
|
RE_BORDER.test(base))
|
|
73
|
-
return
|
|
90
|
+
return 'border';
|
|
74
91
|
if (RE_SPACING.test(base))
|
|
75
|
-
return
|
|
92
|
+
return 'spacing';
|
|
76
93
|
if (TEXT_SIZES.test(base) ||
|
|
77
94
|
RE_TYPOGRAPHY.test(base) ||
|
|
78
95
|
TYPOGRAPHY_KEYWORDS.has(base))
|
|
79
|
-
return
|
|
96
|
+
return 'typography';
|
|
80
97
|
if (RE_COLORS.test(base))
|
|
81
|
-
return
|
|
98
|
+
return 'colors';
|
|
82
99
|
if (base === 'shadow' ||
|
|
83
100
|
base === 'blur' ||
|
|
84
101
|
['grayscale', 'invert', 'sepia'].includes(base) ||
|
|
85
102
|
RE_EFFECTS.test(base))
|
|
86
|
-
return
|
|
103
|
+
return 'effects';
|
|
87
104
|
if (base === 'transition' || RE_TRANSITIONS.test(base))
|
|
88
|
-
return
|
|
105
|
+
return 'transitions';
|
|
89
106
|
if (RE_TRANSFORMS.test(base))
|
|
90
|
-
return
|
|
107
|
+
return 'transforms';
|
|
91
108
|
if (RE_INTERACTIVITY.test(base))
|
|
92
|
-
return
|
|
109
|
+
return 'interactivity';
|
|
93
110
|
if (base === 'sr-only' || base === 'not-sr-only')
|
|
94
|
-
return
|
|
95
|
-
return
|
|
111
|
+
return 'accessibility';
|
|
112
|
+
return null;
|
|
113
|
+
}
|
|
114
|
+
function buildRank(order) {
|
|
115
|
+
const ranks = new Map();
|
|
116
|
+
order.forEach((name, i) => {
|
|
117
|
+
if (!ranks.has(name))
|
|
118
|
+
ranks.set(name, i);
|
|
119
|
+
});
|
|
120
|
+
const end = order.length;
|
|
121
|
+
return (category) => category !== null && ranks.has(category)
|
|
122
|
+
? ranks.get(category)
|
|
123
|
+
: end;
|
|
96
124
|
}
|
|
97
125
|
function getVariantOrder(cls) {
|
|
98
126
|
if (!cls.includes(':'))
|
|
@@ -104,14 +132,15 @@ function getVariantOrder(cls) {
|
|
|
104
132
|
return 2;
|
|
105
133
|
return 3;
|
|
106
134
|
}
|
|
107
|
-
export function sortClasses(classStr) {
|
|
135
|
+
export function sortClasses(classStr, sortOrder) {
|
|
108
136
|
const classes = classStr.split(/\s+/).filter(Boolean);
|
|
109
137
|
if (classes.length <= 1)
|
|
110
138
|
return classStr;
|
|
139
|
+
const rank = buildRank(sortOrder?.length ? sortOrder : DEFAULT_SORT_ORDER);
|
|
111
140
|
return classes
|
|
112
141
|
.map((cls, i) => ({
|
|
113
142
|
cls,
|
|
114
|
-
cat: getCategory(cls),
|
|
143
|
+
cat: rank(getCategory(cls)),
|
|
115
144
|
variant: getVariantOrder(cls),
|
|
116
145
|
i,
|
|
117
146
|
}))
|
|
@@ -127,9 +156,9 @@ export function sortClasses(classStr) {
|
|
|
127
156
|
.map((x) => x.cls)
|
|
128
157
|
.join(' ');
|
|
129
158
|
}
|
|
130
|
-
export function sortFile(filePath, opts = {}) {
|
|
159
|
+
export function sortFile(filePath, opts = {}, sortOrder) {
|
|
131
160
|
const content = readFileSync(filePath, 'utf8');
|
|
132
|
-
const { result, count } = replaceClassStrings(content, sortClasses, opts);
|
|
161
|
+
const { result, count } = replaceClassStrings(content, (s) => sortClasses(s, sortOrder), opts);
|
|
133
162
|
if (count > 0)
|
|
134
163
|
writeFileSync(filePath, result, 'utf8');
|
|
135
164
|
return count;
|
package/dist/core/sorter.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sorter.js","sourceRoot":"","sources":["../../src/core/sorter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AACtD,OAAO,EAAwB,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAE/E,MAAM,eAAe,GAAG,IAAI,GAAG,CAAC;IAC9B,OAAO;IACP,cAAc;IACd,QAAQ;IACR,MAAM;IACN,aAAa;IACb,MAAM;IACN,aAAa;IACb,OAAO;IACP,cAAc;IACd,WAAW;IACX,UAAU;IACV,WAAW;IACX,QAAQ;IACR,WAAW;CACZ,CAAC,CAAC;AAEH,MAAM,gBAAgB,GAAG,IAAI,GAAG,CAAC;IAC/B,QAAQ;IACR,OAAO;IACP,UAAU;IACV,UAAU;IACV,QAAQ;CACT,CAAC,CAAC;AAEH,MAAM,mBAAmB,GAAG,IAAI,GAAG,CAAC;IAClC,UAAU;IACV,WAAW;IACX,WAAW;IACX,YAAY;IACZ,aAAa;IACb,WAAW;IACX,cAAc;IACd,cAAc;IACd,QAAQ;IACR,YAAY;IACZ,aAAa;IACb,sBAAsB;CACvB,CAAC,CAAC;AAEH,MAAM,UAAU,GACd,+FAA+F,CAAC;AAElG,MAAM,SAAS,GACb,oEAAoE,CAAC;AACvE,MAAM,QAAQ,GAAG,qCAAqC,CAAC;AACvD,MAAM,YAAY,GAChB,0GAA0G,CAAC;AAC7G,MAAM,SAAS,GAAG,+CAA+C,CAAC;AAClE,MAAM,SAAS,GAAG,0CAA0C,CAAC;AAC7D,MAAM,UAAU,GAAG,2DAA2D,CAAC;AAC/E,MAAM,aAAa,GACjB,mEAAmE,CAAC;AACtE,MAAM,SAAS,GAAG,oDAAoD,CAAC;AACvE,MAAM,UAAU,GACd,kIAAkI,CAAC;AACrI,MAAM,cAAc,GAClB,0DAA0D,CAAC;AAC7D,MAAM,aAAa,GAAG,0CAA0C,CAAC;AACjE,MAAM,gBAAgB,GACpB,wEAAwE,CAAC;AAC3E,MAAM,cAAc,GAAG,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"sorter.js","sourceRoot":"","sources":["../../src/core/sorter.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../src/eslint/plugin.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,MAAM,EAAoB,MAAM,kBAAkB,CAAC;AAIjE,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC;IACnB,MAAM,EAAE,CAAC,UAAU,EAAE;QACnB,IAAI,EAAE,OAAO,CAAC;QACd,OAAO,EAAE,MAAM,CAAC;QAChB,GAAG,CAAC,EAAE,CAAC,KAAK,EAAE;YACZ,WAAW,EAAE,CAAC,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC;SACvD,KAAK,OAAO,CAAC;KACf,KAAK,IAAI,CAAC;CACZ,CAAC;;;;;;;;;;;;;;;;;;;;;;;4BAqBgB,WAAW;gCAGG;oBAC1B,KAAK,EAAE,OAAO,CAAC;oBACf,GAAG,CAAC,EAAE,MAAM,CAAC;oBACb,IAAI,EAAE,MAAM,CAAC;iBACd;
|
|
1
|
+
{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../src/eslint/plugin.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,MAAM,EAAoB,MAAM,kBAAkB,CAAC;AAIjE,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC;IACnB,MAAM,EAAE,CAAC,UAAU,EAAE;QACnB,IAAI,EAAE,OAAO,CAAC;QACd,OAAO,EAAE,MAAM,CAAC;QAChB,GAAG,CAAC,EAAE,CAAC,KAAK,EAAE;YACZ,WAAW,EAAE,CAAC,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC;SACvD,KAAK,OAAO,CAAC;KACf,KAAK,IAAI,CAAC;CACZ,CAAC;;;;;;;;;;;;;;;;;;;;;;;4BAqBgB,WAAW;gCAGG;oBAC1B,KAAK,EAAE,OAAO,CAAC;oBACf,GAAG,CAAC,EAAE,MAAM,CAAC;oBACb,IAAI,EAAE,MAAM,CAAC;iBACd;sCAuBuB;oBACpB,MAAM,EAAE,KAAK,CAAC;wBACZ,KAAK,EAAE;4BAAE,GAAG,EAAE,MAAM,CAAA;yBAAE,CAAC;wBACvB,IAAI,EAAE,MAAM,CAAC;qBACd,CAAC,CAAC;iBACJ;;;;;;;;;;;;4BAqBW,WAAW,GAAG;gBAAE,OAAO,EAAE,EAAE,CAAA;aAAE;gCAWf;oBAC1B,KAAK,EAAE,OAAO,CAAC;oBACf,GAAG,CAAC,EAAE,MAAM,CAAC;oBACb,IAAI,EAAE,MAAM,CAAC;iBACd;sCAiBuB;oBACpB,MAAM,EAAE,KAAK,CAAC;wBAAE,KAAK,EAAE;4BAAE,GAAG,EAAE,MAAM,CAAA;yBAAE,CAAC;wBAAC,IAAI,EAAE,MAAM,CAAA;qBAAE,CAAC,CAAC;iBACzD;;;;;;;;;;;;;AASP,wBAaE"}
|
package/dist/eslint/plugin.js
CHANGED
|
@@ -24,8 +24,9 @@ const noArbitraryCanonical = {
|
|
|
24
24
|
function checkLiteral(node) {
|
|
25
25
|
if (typeof node.value !== 'string')
|
|
26
26
|
return;
|
|
27
|
-
const
|
|
28
|
-
|
|
27
|
+
const value = node.value;
|
|
28
|
+
const corrected = value.replace(/\S+/g, (token) => suggestCanonical(token, config)?.canonical ?? token);
|
|
29
|
+
for (const cls of value.split(/\s+/)) {
|
|
29
30
|
const suggestion = suggestCanonical(cls, config);
|
|
30
31
|
if (!suggestion)
|
|
31
32
|
continue;
|
|
@@ -33,10 +34,8 @@ const noArbitraryCanonical = {
|
|
|
33
34
|
node,
|
|
34
35
|
message: `Use canonical class '${suggestion.canonical}' instead of '${suggestion.original}'`,
|
|
35
36
|
fix(fixer) {
|
|
36
|
-
const fixed = node.value;
|
|
37
|
-
const newVal = fixed.replace(cls, suggestion.canonical);
|
|
38
37
|
const quote = node.raw?.startsWith('"') ? '"' : "'";
|
|
39
|
-
return fixer.replaceText(node, `${quote}${
|
|
38
|
+
return fixer.replaceText(node, `${quote}${corrected}${quote}`);
|
|
40
39
|
},
|
|
41
40
|
});
|
|
42
41
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugin.js","sourceRoot":"","sources":["../../src/eslint/plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAe,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAEjE,MAAM,QAAQ,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAahD,MAAM,oBAAoB,GAAG;IAC3B,IAAI,EAAE;QACJ,IAAI,EAAE,YAAqB;QAC3B,OAAO,EAAE,MAAe;QACxB,MAAM,EAAE;YACN;gBACE,IAAI,EAAE,QAAQ;gBACd,UAAU,EAAE;oBACV,gBAAgB,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;oBACpC,mBAAmB,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;iBACxC;gBACD,oBAAoB,EAAE,KAAK;aAC5B;SACF;QACD,QAAQ,EAAE;YACR,YAAY,EACV,+DAA+D;SAClE;KACF;IACD,MAAM,CAAC,OAAoB;QACzB,MAAM,MAAM,GAAW,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QAEhD,SAAS,YAAY,CAAC,IAIrB;YACC,IAAI,OAAO,IAAI,CAAC,KAAK,KAAK,QAAQ;gBAAE,OAAO;YAC3C,MAAM,
|
|
1
|
+
{"version":3,"file":"plugin.js","sourceRoot":"","sources":["../../src/eslint/plugin.ts"],"names":[],"mappings":"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"}
|
package/dist/index.d.ts
CHANGED
|
@@ -2,11 +2,14 @@ export type { Finding } from './core/analyzer.js';
|
|
|
2
2
|
export { analyzeFile } from './core/analyzer.js';
|
|
3
3
|
export type { ClassStringOpts } from './core/class-strings.js';
|
|
4
4
|
export { extractClassStrings, replaceClassStrings, } from './core/class-strings.js';
|
|
5
|
+
export type { ClassCombination, ColorVariant, ColorVariantGroup, ConsistencyOptions, ConsistencyReport, FileClasses, ScaleInconsistency, ScaleValue, } from './core/consistency.js';
|
|
6
|
+
export { analyzeConsistency, analyzeConsistencyFiles, collectClasses, } from './core/consistency.js';
|
|
5
7
|
export { dedupeFile, deduplicateClasses } from './core/deduplicator.js';
|
|
6
8
|
export { fixFile } from './core/fixer.js';
|
|
7
9
|
export { mergeFile } from './core/merger.js';
|
|
8
10
|
export type { Config, Suggestion } from './core/rules.js';
|
|
9
11
|
export { suggestCanonical } from './core/rules.js';
|
|
10
|
-
export { scanFiles } from './core/scanner.js';
|
|
11
|
-
export {
|
|
12
|
+
export { resolveTargets, scanFiles } from './core/scanner.js';
|
|
13
|
+
export type { SortCategory } from './core/sorter.js';
|
|
14
|
+
export { DEFAULT_SORT_ORDER, sortClasses, sortFile } from './core/sorter.js';
|
|
12
15
|
//# sourceMappingURL=index.d.ts.map
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,YAAY,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACjD,YAAY,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC/D,OAAO,EACL,mBAAmB,EACnB,mBAAmB,GACpB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,UAAU,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AACxE,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAC1C,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,YAAY,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC1D,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,YAAY,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACjD,YAAY,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC/D,OAAO,EACL,mBAAmB,EACnB,mBAAmB,GACpB,MAAM,yBAAyB,CAAC;AACjC,YAAY,EACV,gBAAgB,EAChB,YAAY,EACZ,iBAAiB,EACjB,kBAAkB,EAClB,iBAAiB,EACjB,WAAW,EACX,kBAAkB,EAClB,UAAU,GACX,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EACL,kBAAkB,EAClB,uBAAuB,EACvB,cAAc,GACf,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,UAAU,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AACxE,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAC1C,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,YAAY,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC1D,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC9D,YAAY,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,kBAAkB,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC"}
|
package/dist/index.js
CHANGED
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
export { analyzeFile } from './core/analyzer.js';
|
|
2
2
|
export { extractClassStrings, replaceClassStrings, } from './core/class-strings.js';
|
|
3
|
+
export { analyzeConsistency, analyzeConsistencyFiles, collectClasses, } from './core/consistency.js';
|
|
3
4
|
export { dedupeFile, deduplicateClasses } from './core/deduplicator.js';
|
|
4
5
|
export { fixFile } from './core/fixer.js';
|
|
5
6
|
export { mergeFile } from './core/merger.js';
|
|
6
7
|
export { suggestCanonical } from './core/rules.js';
|
|
7
|
-
export { scanFiles } from './core/scanner.js';
|
|
8
|
-
export { sortClasses, sortFile } from './core/sorter.js';
|
|
8
|
+
export { resolveTargets, scanFiles } from './core/scanner.js';
|
|
9
|
+
export { DEFAULT_SORT_ORDER, sortClasses, sortFile } from './core/sorter.js';
|
|
9
10
|
//# sourceMappingURL=index.js.map
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAEjD,OAAO,EACL,mBAAmB,EACnB,mBAAmB,GACpB,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAEjD,OAAO,EACL,mBAAmB,EACnB,mBAAmB,GACpB,MAAM,yBAAyB,CAAC;AAWjC,OAAO,EACL,kBAAkB,EAClB,uBAAuB,EACvB,cAAc,GACf,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,UAAU,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AACxE,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAC1C,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAE7C,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAE9D,OAAO,EAAE,kBAAkB,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,9 +1,8 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "tailwind-canonical",
|
|
3
|
-
"version": "0.1
|
|
3
|
+
"version": "0.2.1",
|
|
4
4
|
"description": "Lint and auto-fix Tailwind CSS arbitrary values that have canonical equivalents",
|
|
5
5
|
"type": "module",
|
|
6
|
-
"packageManager": "pnpm@11.4.0",
|
|
7
6
|
"main": "./dist/index.js",
|
|
8
7
|
"types": "./dist/index.d.ts",
|
|
9
8
|
"exports": {
|
|
@@ -34,22 +33,11 @@
|
|
|
34
33
|
"homepage": "https://github.com/peak-lab/tailwind-canonical#readme",
|
|
35
34
|
"author": "Fahari Hamada Sidi",
|
|
36
35
|
"engines": {
|
|
37
|
-
"node": ">=
|
|
36
|
+
"node": ">=22"
|
|
38
37
|
},
|
|
39
38
|
"publishConfig": {
|
|
40
39
|
"access": "public"
|
|
41
40
|
},
|
|
42
|
-
"scripts": {
|
|
43
|
-
"build": "tsc",
|
|
44
|
-
"dev": "tsc --watch",
|
|
45
|
-
"test": "node --import=tsx/esm --test \"src/**/*.test.ts\"",
|
|
46
|
-
"typecheck": "tsc --noEmit",
|
|
47
|
-
"lint": "biome check src/",
|
|
48
|
-
"lint:fix": "biome check --write src/",
|
|
49
|
-
"prepare": "lefthook install || true",
|
|
50
|
-
"prepublishOnly": "pnpm build",
|
|
51
|
-
"knip": "knip"
|
|
52
|
-
},
|
|
53
41
|
"keywords": [
|
|
54
42
|
"tailwind",
|
|
55
43
|
"tailwindcss",
|
|
@@ -79,5 +67,14 @@
|
|
|
79
67
|
"tailwind-merge": {
|
|
80
68
|
"optional": true
|
|
81
69
|
}
|
|
70
|
+
},
|
|
71
|
+
"scripts": {
|
|
72
|
+
"build": "tsc",
|
|
73
|
+
"dev": "tsc --watch",
|
|
74
|
+
"test": "node --import=tsx/esm --test \"src/**/*.test.ts\"",
|
|
75
|
+
"typecheck": "tsc --noEmit",
|
|
76
|
+
"lint": "biome check src/",
|
|
77
|
+
"lint:fix": "biome check --write src/",
|
|
78
|
+
"knip": "knip"
|
|
82
79
|
}
|
|
83
|
-
}
|
|
80
|
+
}
|