chore: bump version

Author: sonofmagic

.changeset/blue-walls-smoke.md

@@ -0,0 +1,5 @@
+---
+"tailwindcss-patch": patch
+---
+
+feat!: remove getClassSet params and set default patch options

packages/tailwindcss-patch/src/core/cache.ts

@@ -49,24 +49,23 @@ export class CacheManager {
     }
   }
 
-  write(data: Set<string>) {
+  async write(data: Set<string>) {
     try {
-      const { dir, filename } = this.options
-      fs.ensureDirSync(dir)
-      fs.outputFileSync(filename, JSON.stringify([...data], undefined, 2), 'utf8')
+      const { filename } = this.options
+      await fs.outputJSON(filename, [...data])
       return filename
     }
     catch {
       logger.error('write cache file fail!')
     }
   }
 
-  read() {
+  async read() {
     const { filename } = this.options
     try {
-      if (fs.existsSync(filename)) {
-        const data = fs.readFileSync(filename, 'utf8')
-        return new Set<string>(JSON.parse(data))
+      if (await fs.exists(filename)) {
+        const data = await fs.readJSON(filename)
+        return new Set<string>(data)
       }
     }
     catch {

packages/tailwindcss-patch/src/core/patcher.ts

@@ -89,9 +89,9 @@ export class TailwindcssPatcher {
     return contexts.filter(x => isObject(x)).map(x => x.classCache)
   }
 
-  async getClassCacheSet(options?: PatchUserConfig): Promise<Set<string>> {
+  async getClassCacheSet(): Promise<Set<string>> {
     const classSet = new Set<string>()
-    const { output, tailwindcss } = options ?? {}
+    const { output, tailwindcss } = this.patchOptions
     if (this.majorVersion === 4) {
       const { v4 } = tailwindcss ?? {}
       if (Array.isArray(v4?.cssEntries)) {
@@ -161,18 +161,14 @@ export class TailwindcssPatcher {
   /**
    * @description 在多个 tailwindcss 上下文时，这个方法将被执行多次，所以策略上应该使用 append
    */
-  async getClassSet(options?: PatchUserConfig) {
-    const { output, tailwindcss } = options ?? {}
+  async getClassSet() {
     const cacheStrategy = this.cacheOptions.strategy ?? 'merge'
-    const set = await this.getClassCacheSet({
-      output,
-      tailwindcss,
-    })
+    const set = await this.getClassCacheSet()
     if (cacheStrategy === 'overwrite') {
       set.size > 0 && this.setCache(set)
     }
     else if (cacheStrategy === 'merge') {
-      const cacheSet = this.getCache()
+      const cacheSet = await this.getCache()
       if (cacheSet) {
         for (const x of cacheSet) {
           set.add(x)
@@ -196,10 +192,7 @@ export class TailwindcssPatcher {
         })
       }
 
-      const set = await this.getClassSet({
-        output,
-        tailwindcss,
-      })
+      const set = await this.getClassSet()
       if (filename) {
         const classList = [...set]
         await fs.outputJSON(filename, classList, {

packages/tailwindcss-patch/src/types.ts

@@ -1,4 +1,6 @@
 /* eslint-disable ts/no-unsafe-function-type */
+import type { PatchUserConfig } from '@tailwindcss-mangle/config'
+import type { PackageJson } from 'pkg-types'
 import type { Node, Rule } from 'postcss'
 import type { Config } from 'tailwindcss'
 
@@ -9,6 +11,7 @@ export interface PackageInfo {
   version: string | undefined
   rootPath: string
   packageJsonPath: string
+  packageJson: PackageJson
 }
 
 export interface CacheOptions {
@@ -22,7 +25,7 @@ export interface InternalCacheOptions extends CacheOptions {
   enable?: boolean
 }
 
-export interface PatchOptions {
+export interface PatchOptions extends PatchUserConfig {
   overwrite?: boolean
   paths?: string[]
   basedir?: string

packages/tailwindcss-patch/test/cache.test.ts

@@ -30,25 +30,25 @@ describe('cache', () => {
     expect(fs.existsSync(dir)).toBe(false)
   })
 
-  it('write and read cache default option', () => {
+  it('write and read cache default option', async () => {
     // const opt = getCacheOptions()
     const opt = {
       dir: path.resolve(__dirname, 'fixtures/cache'),
       file: 'raw-method.json',
     }
     cm = new CacheManager(opt)
     let cache: Set<string> | undefined
-    cache = cm.read()
+    cache = await cm.read()
     // expect(cache).toBe(undefined)
-    cm.write(new Set(['a', 'b', 'c']))
-    cache = cm.read()
+    await cm.write(new Set(['a', 'b', 'c']))
+    cache = await cm.read()
     expect(cache).toBeDefined()
     if (cache) {
       expect(cache.size).toBe(3)
     }
   })
 
-  it('read broken cache', () => {
+  it('read broken cache', async () => {
     // const opt = getCacheOptions()
 
     const dir = path.resolve(__dirname, './fixtures', `${pkgName}-broken`)
@@ -65,7 +65,7 @@ describe('cache', () => {
       dir,
     })
     expect(fs.existsSync(filepath)).toBe(true)
-    const cache = cm.read()
+    const cache = await cm.read()
     expect(cache).toBe(undefined)
     expect(fs.existsSync(filepath)).toBe(false)
   })
@@ -78,12 +78,14 @@ describe('cache', () => {
         file: 'merge-multiple-context.json',
       },
     })
-    twPatcher.setCache(new Set())
+    await twPatcher.setCache(new Set())
     await getCss(['text-[100px]'])
     let ctxs = twPatcher.getContexts()
     expect(ctxs.length).toBe(1)
     let set = await twPatcher.getClassSet({
-      removeUniversalSelector: false,
+      output: {
+        removeUniversalSelector: false,
+      },
     })
     expect(set.size).toBeGreaterThan(0)
     expect(set.size).toBe(2)

packages/tailwindcss-patch/test/fixtures/cache/index.json

@@ -1,7 +1 @@
-[
-  "*",
-  "bg-[#123456]",
-  "font-bold",
-  "text-3xl",
-  "underline"
-]
+["*","bg-[#123456]","font-bold","text-3xl","underline"]

packages/tailwindcss-patch/test/fixtures/cache/merge-multiple-context.json

@@ -1,5 +1 @@
-[
-  "*",
-  "text-[99px]",
-  "text-[100px]"
-]
+["*","text-[99px]","text-[100px]"]

packages/tailwindcss-patch/test/fixtures/cache/raw-method.json

@@ -1,5 +1 @@
-[
-  "a",
-  "b",
-  "c"
-]
+["a","b","c"]

packages/tailwindcss-patch/test/tw-patcher.test.ts

@@ -12,7 +12,9 @@ describe('class', () => {
     const ctxs = twPatcher.getContexts()
     expect(ctxs.length).toBe(1)
     const set = await twPatcher.getClassSet({
-      removeUniversalSelector: false,
+      output: {
+        removeUniversalSelector: false,
+      },
     })
     expect(set.size).toBeGreaterThan(0)
     expect(set.size).toBe(4)
@@ -23,21 +25,24 @@ describe('class', () => {
     const twPatcher = new TailwindcssPatcher({
       cache: {
         dir,
+        strategy: 'overwrite',
+      },
+      patch: {
+        output: {
+          removeUniversalSelector: false,
+        },
       },
     })
-    const res = twPatcher.getCache()
+    const res = await twPatcher.getCache()
     expect(res instanceof Set).toBe(true)
     expect(res?.size).toBe(5)
-    const p = twPatcher.setCache(new Set(['*', 'bg-[#123456]', 'font-bold', 'text-3xl', 'underline']))
+    const p = await twPatcher.setCache(new Set(['*', 'bg-[#123456]', 'font-bold', 'text-3xl', 'underline']))
     expect(p).toBe(path.resolve(dir, 'index.json'))
     twPatcher.patch()
     await getCss([getTestCase('hello-world.html'), getTestCase('hello-world.js')])
     const ctxs = twPatcher.getContexts()
     expect(ctxs.length).toBe(1)
-    const set = await twPatcher.getClassSet({
-      cacheStrategy: 'overwrite',
-      removeUniversalSelector: false,
-    })
+    const set = await twPatcher.getClassSet()
     expect(set.size).toBeGreaterThan(0)
     expect(set.size).toBe(5)
   })

packages/tailwindcss-patch/test/v4.test.ts

@@ -38,23 +38,24 @@ describe('v4', () => {
   })
 
   it('tailwindcssPatcher getClassSet case 2', async () => {
-    const patcher = new TailwindcssPatcher()
-    patcher.majorVersion = 4
-    const candidates = await patcher.getClassSet({
-      tailwindcss: {
-        v4: {
-          base: import.meta.dirname,
-          css: await fs.readFile(path.resolve(import.meta.dirname, './fixtures/v4/index.css'), 'utf8'),
-          sources: [
-            {
-              base: import.meta.dirname,
-              pattern: path.resolve(import.meta.dirname, './fixtures/v4/**/*.html'),
-            },
-          ],
+    const patcher = new TailwindcssPatcher({
+      patch: {
+        tailwindcss: {
+          v4: {
+            base: import.meta.dirname,
+            css: await fs.readFile(path.resolve(import.meta.dirname, './fixtures/v4/index.css'), 'utf8'),
+            sources: [
+              {
+                base: import.meta.dirname,
+                pattern: path.resolve(import.meta.dirname, './fixtures/v4/**/*.html'),
+              },
+            ],
+          },
         },
       },
-
     })
+    patcher.majorVersion = 4
+    const candidates = await patcher.getClassSet()
     expect(candidates).toMatchSnapshot()
   })