@herb-tools/tailwind-class-sorter 0.8.9 → 0.9.0

package/package.json

@@ -2,7 +2,7 @@
   "type": "module",
   "name": "@herb-tools/tailwind-class-sorter",
   "description": "Standalone Tailwind CSS class sorter with Prettier plugin compatibility, extracted from tailwindlabs/prettier-plugin-tailwindcss",
-  "version": "0.8.9",
+  "version": "0.9.0",
   "license": "MIT",
   "main": "./dist/tailwind-class-sorter.cjs",
   "module": "./dist/tailwind-class-sorter.esm.js",
@@ -36,20 +36,20 @@
     "pretest": "yarn setup-fixtures",
     "test": "vitest run",
     "test:watch": "vitest --watch",
-    "prepublishOnly": "yarn clean && yarn build"
+    "prepublishOnly": "yarn clean && yarn build && yarn test"
   },
   "dependencies": {
     "clear-module": "^4.1.2",
     "escalade": "^3.2.0",
     "jiti": "^2.5.1",
-    "postcss": "^8.5.6",
+    "postcss": "^8.5.8",
     "postcss-import": "^16.1.1"
   },
   "devDependencies": {
-    "@types/node": "^25.0.10",
+    "@types/node": "^25.2.2",
     "dedent": "^1.7.0",
-    "esbuild": "^0.27.1",
-    "rimraf": "^6.1.2",
+    "esbuild": "^0.27.3",
+    "rimraf": "^6.1.3",
     "tailwindcss": "^3.4.17",
     "tsup": "^8.5.1",
     "vitest": "^4.0.0"

package/src/config.ts

@@ -13,23 +13,23 @@ import { expiringMap } from './expiring-map.js'
 import { resolveCssFrom, resolveJsFrom } from './resolve'
 import type { ContextContainer, SortTailwindClassesOptions } from './types'
 
-let sourceToPathMap = new Map<string, string | null>()
-let sourceToEntryMap = new Map<string, string | null>()
-let pathToContextMap = expiringMap<string | null, ContextContainer>(10_000)
+const sourceToPathMap = new Map<string, string | null>()
+const sourceToEntryMap = new Map<string, string | null>()
+const pathToContextMap = expiringMap<string | null, ContextContainer>(10_000)
 
 export async function getTailwindConfig(
   options: SortTailwindClassesOptions = {},
 ): Promise<ContextContainer> {
-  let pkgName = 'tailwindcss'
+  const pkgName = 'tailwindcss'
 
-  let key = [
+  const key = [
     options.baseDir ?? process.cwd(),
     options.tailwindStylesheet ?? '',
     options.tailwindConfig ?? '',
     pkgName,
   ].join(':')
 
-  let baseDir = getBaseDir(options)
+  const baseDir = getBaseDir(options)
 
   // Map the source file to it's associated Tailwind config file
   let configPath = sourceToPathMap.get(key)
@@ -45,14 +45,14 @@ export async function getTailwindConfig(
   }
 
   // Now see if we've loaded the Tailwind config file before (and it's still valid)
-  let contextKey = `${pkgName}:${configPath}:${entryPoint}`
-  let existing = pathToContextMap.get(contextKey)
+  const contextKey = `${pkgName}:${configPath}:${entryPoint}`
+  const existing = pathToContextMap.get(contextKey)
   if (existing) {
     return existing
   }
 
   // By this point we know we need to load the Tailwind config file
-  let result = await loadTailwindConfig(
+  const result = await loadTailwindConfig(
     baseDir,
     pkgName,
     configPath,
@@ -85,7 +85,7 @@ async function loadTailwindConfig(
   let tailwindConfig: RequiredConfig = { content: [] }
 
   try {
-    let pkgPath = resolveJsFrom(baseDir, pkgName)
+    const pkgPath = resolveJsFrom(baseDir, pkgName)
     let pkgJsonPath: string
 
     try {
@@ -115,14 +115,14 @@ async function loadTailwindConfig(
       }
     }
 
-    let pkgDir = path.dirname(pkgJsonPath)
+    const pkgDir = path.dirname(pkgJsonPath)
 
     try {
-      let v4 = await loadV4(baseDir, pkgDir, pkgName, entryPoint)
+      const v4 = await loadV4(baseDir, pkgDir, pkgName, entryPoint)
       if (v4) {
         return v4
       }
-    } catch (err) {
+    } catch (_error) {
       // V4 loading failed, will try v3 below
     }
 
@@ -136,7 +136,7 @@ async function loadTailwindConfig(
 
     // Prior to `tailwindcss@3.3.0` this won't exist so we load it last
     loadConfig = require(path.join(pkgDir, 'loadConfig'))
-  } catch (err: any) {
+  } catch (_error: any) {
     // Tailwind isn't installed or loading failed, will use defaults
   }
 
@@ -159,7 +159,7 @@ async function loadTailwindConfig(
 
   tailwindConfig.content = ['no-op']
 
-  let context = createContext(resolveConfig(tailwindConfig))
+  const context = createContext(resolveConfig(tailwindConfig))
 
   return {
     context,
@@ -183,13 +183,13 @@ function createLoader<T>({
   filepath: string
   onError: (id: string, error: unknown, resourceType: string) => T
 }) {
-  let cacheKey = `${+Date.now()}`
+  const cacheKey = `${+Date.now()}`
 
   async function loadFile(id: string, base: string, resourceType: string) {
     try {
-      let resolved = resolveJsFrom(base, id)
+      const resolved = resolveJsFrom(base, id)
 
-      let url = pathToFileURL(resolved)
+      const url = pathToFileURL(resolved)
       url.searchParams.append('t', cacheKey)
 
       return await jiti.import(url.href, { default: true })
@@ -199,7 +199,7 @@ function createLoader<T>({
   }
 
   if (legacy) {
-    let baseDir = path.dirname(filepath)
+    const baseDir = path.dirname(filepath)
     return (id: string) => loadFile(id, baseDir, 'module')
   }
 
@@ -218,9 +218,9 @@ async function loadV4(
   entryPoint: string | null,
 ) {
   // Import Tailwind — if this is v4 it'll have APIs we can use directly
-  let pkgPath = resolveJsFrom(baseDir, pkgName)
+  const pkgPath = resolveJsFrom(baseDir, pkgName)
 
-  let tw = await import(pathToFileURL(pkgPath).toString())
+  const tw = await import(pathToFileURL(pkgPath).toString())
 
   // This is not Tailwind v4
   if (!tw.__unstable__loadDesignSystem) {
@@ -231,12 +231,12 @@ async function loadV4(
   entryPoint = entryPoint ?? `${pkgDir}/theme.css`
 
   // Create a Jiti instance that can be used to load plugins and config files
-  let jiti = createJiti(import.meta.url, {
+  const jiti = createJiti(import.meta.url, {
     moduleCache: false,
     fsCache: false,
   })
 
-  let importBasePath = path.dirname(entryPoint)
+  const importBasePath = path.dirname(entryPoint)
 
   // Resolve imports in the entrypoint to a flat CSS tree
   let css = await fs.readFile(entryPoint, 'utf-8')
@@ -256,14 +256,14 @@ async function loadV4(
   } catch {}
 
   if (!supportsImports) {
-    let resolveImports = postcss([postcssImport()])
-    let result = await resolveImports.process(css, { from: entryPoint })
+    const resolveImports = postcss([postcssImport()])
+    const result = await resolveImports.process(css, { from: entryPoint })
     css = result.css
   }
 
   // Load the design system and set up a compatible context object that is
   // usable by the rest of the plugin
-  let design = await tw.__unstable__loadDesignSystem(css, {
+  const design = await tw.__unstable__loadDesignSystem(css, {
     base: importBasePath,
 
     // v4.0.0-alpha.25+
@@ -283,7 +283,7 @@ async function loadV4(
     }),
 
     loadStylesheet: async (id: string, base: string) => {
-      let resolved = resolveCssFrom(base, id)
+      const resolved = resolveCssFrom(base, id)
 
       return {
         base: path.dirname(resolved),

package/src/expiring-map.ts

@@ -4,11 +4,11 @@ interface ExpiringMap<K, V> {
 }
 
 export function expiringMap<K, V>(duration: number): ExpiringMap<K, V> {
-  let map = new Map<K, { value: V; expiration: Date }>()
+  const map = new Map<K, { value: V; expiration: Date }>()
 
   return {
     get(key: K) {
-      let result = map.get(key)
+      const result = map.get(key)
       if (!result) return undefined
       if (result.expiration <= new Date()) {
         map.delete(key)
@@ -19,7 +19,7 @@ export function expiringMap<K, V>(duration: number): ExpiringMap<K, V> {
     },
 
     set(key: K, value: V) {
-      let expiration = new Date()
+      const expiration = new Date()
       expiration.setMilliseconds(expiration.getMilliseconds() + duration)
 
       map.set(key, {

package/src/resolve.ts

@@ -53,10 +53,10 @@ export function maybeResolve(name: string) {
 }
 
 export async function loadIfExists<T>(name: string): Promise<T | null> {
-  let modpath = maybeResolve(name)
+  const modpath = maybeResolve(name)
 
   if (modpath) {
-    let mod = await import(name)
+    const mod = await import(name)
     return mod.default ?? mod
   }
 

package/src/sorting.ts

@@ -8,7 +8,7 @@ function prefixCandidate(
   context: TailwindContext,
   selector: string,
 ): string {
-  let prefix = context.tailwindConfig.prefix
+  const prefix = context.tailwindConfig.prefix
   return typeof prefix === 'function' ? prefix(selector) : prefix + selector
 }
 
@@ -25,14 +25,14 @@ function getClassOrderPolyfill(
   // that don't exist on their own. This will result in them "not existing" and
   // sorting could be weird since you still require them in order to make the
   // host utitlies work properly. (Thanks Biology)
-  let parasiteUtilities = new Set([
+  const parasiteUtilities = new Set([
     prefixCandidate(env.context, 'group'),
     prefixCandidate(env.context, 'peer'),
   ])
 
-  let classNamesWithOrder: [string, bigint | null][] = []
+  const classNamesWithOrder: [string, bigint | null][] = []
 
-  for (let className of classes) {
+  for (const className of classes) {
     let order: bigint | null =
       env
         .generateRules(new Set([className]), env.context)
@@ -56,7 +56,7 @@ function reorderClasses(classList: string[], { env }: { env: SortEnv }) {
     return classList.map(name => [name, null] as [string, bigint | null])
   }
 
-  let orderedClasses = env.context.getClassOrder
+  const orderedClasses = env.context.getClassOrder
     ? env.context.getClassOrder(classList)
     : getClassOrderPolyfill(classList, { env })
 
@@ -109,8 +109,9 @@ export function sortClasses(
   }
 
   let result = ''
-  let parts = classStr.split(/([\t\r\f\n ]+)/)
-  let classes = parts.filter((_, i) => i % 2 === 0)
+  const parts = classStr.split(/([\t\r\f\n ]+)/)
+  const classes = parts.filter((_, i) => i % 2 === 0)
+
   let whitespace = parts.filter((_, i) => i % 2 !== 0)
 
   if (classes[classes.length - 1] === '') {
@@ -131,7 +132,7 @@ export function sortClasses(
     suffix = `${whitespace.pop() ?? ''}${classes.pop() ?? ''}`
   }
 
-  let { classList, removedIndices } = sortClassList(classes, {
+  const { classList, removedIndices } = sortClassList(classes, {
     env,
     removeDuplicates,
   })
@@ -173,10 +174,10 @@ export function sortClassList(
     removeDuplicates = false
   }
 
-  let removedIndices = new Set<number>()
+  const removedIndices = new Set<number>()
 
   if (removeDuplicates) {
-    let seenClasses = new Set<string>()
+    const seenClasses = new Set<string>()
 
     orderedClasses = orderedClasses.filter(([cls, order], index) => {
       if (seenClasses.has(cls)) {