tailwind-canonical 0.8.0 → 0.9.0

package/dist/io/scanner.js

@@ -1,7 +1,7 @@
-import { readdirSync, statSync } from 'node:fs';
+import { existsSync, lstatSync, readdirSync, statSync, } from 'node:fs';
 import { glob } from 'node:fs/promises';
-import { join } from 'node:path';
-import { DEFAULT_EXTENSIONS, DEFAULT_IGNORE, globToRegex, isGlob, } from '../core/scanner.js';
+import { isAbsolute, join, matchesGlob, resolve } from 'node:path';
+import { DEFAULT_EXTENSIONS, DEFAULT_IGNORE, isGlob, } from '../core/scanner.js';
 export function scanFiles(target, options = {}) {
     const ignore = options.ignore ?? DEFAULT_IGNORE;
     const extensions = options.extensions ?? DEFAULT_EXTENSIONS;
@@ -21,7 +21,8 @@ export function scanFiles(target, options = {}) {
             if (entry.isDirectory()) {
                 walk(full);
             }
-            else if (extensions.some((ext) => entry.name.endsWith(ext))) {
+            else if (entry.isFile() &&
+                extensions.some((ext) => entry.name.endsWith(ext))) {
                 files.push(full);
             }
         }
@@ -42,10 +43,10 @@ export async function resolveTargets(patterns, options = {}) {
     const ignore = options.ignore ?? DEFAULT_IGNORE;
     const extensions = options.extensions ?? DEFAULT_EXTENSIONS;
     const positive = [];
-    const negativeRegexes = [];
+    const negativePatterns = [];
     for (const p of patterns) {
         if (p.startsWith('!')) {
-            negativeRegexes.push(globToRegex(p.slice(1)));
+            negativePatterns.push(p.slice(1).replace(/\\/g, '/'));
         }
         else {
             positive.push(p);
@@ -53,14 +54,15 @@ export async function resolveTargets(patterns, options = {}) {
     }
     const files = new Set();
     for (const pattern of positive) {
-        if (isGlob(pattern)) {
+        if (isGlob(pattern) && !existsSync(pattern)) {
             for await (const f of glob(pattern, {
                 exclude: (entry) => entry
                     .replace(/\\/g, '/')
                     .split('/')
                     .some((s) => ignore.includes(s)),
             })) {
-                if (extensions.some((ext) => f.endsWith(ext))) {
+                if (extensions.some((ext) => f.endsWith(ext)) &&
+                    lstatSync(f).isFile()) {
                     files.add(f);
                 }
             }
@@ -71,10 +73,24 @@ export async function resolveTargets(patterns, options = {}) {
             }
         }
     }
-    if (negativeRegexes.length > 0) {
+    if (negativePatterns.length > 0) {
+        const exclusions = negativePatterns.map((pattern) => ({
+            pattern,
+            literal: existsSync(pattern)
+                ? resolve(pattern).replace(/\\/g, '/')
+                : undefined,
+        }));
         for (const f of [...files]) {
             const normalized = f.replace(/\\/g, '/');
-            if (negativeRegexes.some((re) => re.test(normalized))) {
+            if (exclusions.some(({ pattern, literal }) => {
+                if (literal) {
+                    const full = resolve(f).replace(/\\/g, '/');
+                    return (full === literal ||
+                        full.startsWith(literal.endsWith('/') ? literal : `${literal}/`));
+                }
+                return (matchesGlob(normalized, pattern) ||
+                    (!isAbsolute(pattern) && matchesGlob(normalized, `**/${pattern}`)));
+            })) {
                 files.delete(f);
             }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tailwind-canonical",
-  "version": "0.8.0",
+  "version": "0.9.0",
   "description": "Lint and auto-fix Tailwind CSS arbitrary values that have canonical equivalents",
   "type": "module",
   "main": "./dist/index.js",
@@ -64,8 +64,8 @@
     "typescript": "^7.0.2"
   },
   "peerDependencies": {
-    "eslint": ">=8.0.0",
-    "tailwind-merge": ">=2.0.0"
+    "eslint": ">=8.57.1 <11",
+    "tailwind-merge": ">=2.0.0 <4"
   },
   "peerDependenciesMeta": {
     "eslint": {
@@ -80,8 +80,10 @@
     "dev": "tsc --watch",
     "test": "node --import=tsx/esm --test \"src/**/*.test.ts\"",
     "typecheck": "tsc --noEmit",
-    "lint": "biome check src/",
-    "lint:fix": "biome check --write src/",
-    "knip": "knip"
+    "lint": "biome check src/ scripts/",
+    "lint:fix": "biome check --write src/ scripts/",
+    "knip": "knip",
+    "benchmark": "pnpm build && node scripts/benchmark.mjs",
+    "test:compat": "node scripts/compatibility.mjs"
   }
 }