tailwind-canonical 0.7.1 → 0.9.0

package/dist/core/config.js

@@ -7,6 +7,7 @@ export const CONFIG_FILENAMES = [
     'tailwind-canonical.config.mjs',
 ];
 const KNOWN_KEYS = [
+    'useDefaultTheme',
     'customTextTokens',
     'customSpacingTokens',
     'ignorePatterns',
@@ -141,6 +142,8 @@ export function validateConfig(input, filename = CONFIG_FILENAME) {
     }
     const cfg = input;
     assertKnownKeys(cfg, KNOWN_KEYS, 'unknown key', filename);
+    if ('useDefaultTheme' in cfg && typeof cfg.useDefaultTheme !== 'boolean')
+        fail(filename, 'useDefaultTheme must be a boolean');
     if ('customTextTokens' in cfg)
         assertPxTokenMap(cfg.customTextTokens, 'customTextTokens', filename);
     if ('customSpacingTokens' in cfg)
@@ -176,4 +179,4 @@ export function validateConfig(input, filename = CONFIG_FILENAME) {
     }
     return cfg;
 }
-export { loadConfig, resolveInitFilename } from '../io/config.js';
+export { findConfigPath, loadConfig, resolveInitFilename, } from '../io/config.js';

package/dist/core/consistency.d.ts

@@ -2,7 +2,12 @@ import { type ClassStringOpts } from './class-strings.js';
 import type { Config } from './rules.js';
 export type FileClasses = {
     file: string;
+    /** All class occurrences, used for color and scale statistics. */
     classes: string[];
+    /** Individual class strings, used for repeated-pattern detection.
+     * When omitted, `classes` is treated as one class string for compatibility.
+     */
+    classLists?: string[][];
 };
 export type ColorVariant = {
     token: string;

package/dist/core/consistency.js

@@ -9,7 +9,11 @@ function parseColor(cls, families, knownColors) {
         return null;
     // A known color without an explicit family forms its own family, so colors
     // newly added to the palette are grouped rather than silently dropped.
-    const family = families[color] ?? (knownColors.has(color) ? color : null);
+    const family = Object.hasOwn(families, color)
+        ? families[color]
+        : knownColors.has(color)
+            ? color
+            : null;
     if (!family)
         return null;
     return { property, family, token: `${color}-${shade}` };
@@ -22,7 +26,8 @@ function parseScale(cls, scaleProperties) {
     const base = stripVariants(cls);
     const negative = base.startsWith('-');
     const body = negative ? base.slice(1) : base;
-    const dash = body.lastIndexOf('-');
+    const bracket = body.indexOf('[');
+    const dash = body.lastIndexOf('-', bracket === -1 ? body.length : bracket);
     if (dash === -1)
         return null;
     const property = body.slice(0, dash);
@@ -149,20 +154,22 @@ function detectRareScaleValues(inconsistencies, minPropertyOccurrences, maxFiles
 // frequent sub-patterns (no k-subset itemset mining).
 function detectCombinations(input, minSize, minFiles, max) {
     const combos = new Map();
-    for (const { file, classes } of input) {
-        if (classes.length < minSize)
-            continue;
-        const unique = [...new Set(classes)].sort();
-        if (unique.length < minSize)
-            continue;
-        const key = unique.join(' ');
-        let entry = combos.get(key);
-        if (!entry) {
-            entry = { classes: unique, count: 0, files: new Set() };
-            combos.set(key, entry);
+    for (const { file, classes: allClasses, classLists } of input) {
+        for (const classes of classLists ?? [allClasses]) {
+            if (classes.length < minSize)
+                continue;
+            const unique = [...new Set(classes)].sort();
+            if (unique.length < minSize)
+                continue;
+            const key = unique.join(' ');
+            let entry = combos.get(key);
+            if (!entry) {
+                entry = { classes: unique, count: 0, files: new Set() };
+                combos.set(key, entry);
+            }
+            entry.count++;
+            entry.files.add(file);
         }
-        entry.count++;
-        entry.files.add(file);
     }
     return [...combos.values()]
         .filter((c) => c.files.size >= minFiles)

package/dist/core/deduplicator.js

@@ -186,6 +186,8 @@ const CORNER_MAP = {
     br: ['br'],
 };
 function parseRoundedCorner(cls) {
+    if (/^rounded-(?:s|e|ss|se|es|ee)(?:-|$)/.test(cls))
+        return null;
     const m = cls.match(/^rounded-(tl|tr|bl|br|t|b|l|r)(?:-(.+))?$/) ??
         cls.match(/^rounded()(?:-(.+))?$/);
     if (!m)
@@ -321,6 +323,8 @@ function keepLastOf(slots, indices) {
         slots[i] = [];
 }
 export function deduplicateClasses(classStr) {
+    if (classStr.includes('${'))
+        return classStr;
     const original = classStr.split(/\s+/).filter(Boolean);
     if (original.length <= 1)
         return classStr;

package/dist/core/merger.d.ts

@@ -1,4 +1,5 @@
 import { type ClassStringOpts } from './class-strings.js';
+export declare function mergeClasses(classes: string, twMerge: (classes: string) => string, opts?: Pick<ClassStringOpts, 'customTextTokens'>): string;
 export declare function mergeContent(content: string, twMerge: (classes: string) => string, opts?: ClassStringOpts): {
     result: string;
     count: number;

package/dist/core/merger.js

@@ -84,9 +84,12 @@ function restoreLeadingForUnsafeTextSizes(original, merged, customTextClasses) {
     }
     return restored.join(' ');
 }
-export function mergeContent(content, twMerge, opts = {}) {
+export function mergeClasses(classes, twMerge, opts = {}) {
     const customTextClasses = new Set(Object.values(opts.customTextTokens ?? {}).map((token) => `text-${token}`));
-    return replaceClassStrings(content, (classes) => restoreLeadingForUnsafeTextSizes(classes, twMerge(classes), customTextClasses), {
+    return restoreLeadingForUnsafeTextSizes(classes, twMerge(classes), customTextClasses);
+}
+export function mergeContent(content, twMerge, opts = {}) {
+    return replaceClassStrings(content, (classes) => mergeClasses(classes, twMerge, opts), {
         ...opts,
         isSuppressed: makeLineSuppressor(content),
     });

package/dist/core/rules.d.ts

@@ -26,6 +26,8 @@ type DefaultCommandConfig = {
     targets?: string[];
 };
 export type Config = {
+    /** Set false for custom themes: only explicitly configured px mappings apply. */
+    useDefaultTheme?: boolean;
     customTextTokens?: Record<number, string>;
     customSpacingTokens?: Record<number, string>;
     ignorePatterns?: RegExp[];
@@ -43,5 +45,10 @@ export type Config = {
     /** Target Tailwind major. v3 restricts suggestions to its discrete scale. */
     tailwindVersion?: 3 | 4;
 };
+/**
+ * Suggests the canonical form of a class, preserving its variants
+ * (`hover:`, `md:`, `[&:hover]:`), important modifier (`!p-4` / `p-4!`)
+ * and sign (`-mt-[8px]` / `mt-[-8px]` → `-mt-2`).
+ */
 export declare function suggestCanonical(cls: string, config?: Config): Suggestion | null;
 export {};