tailwindcss-patch 6.0.0 → 6.0.2

package/dist/{chunk-AZHCF3SW.mjs → chunk-NHBD2ICP.mjs}

@@ -52,22 +52,21 @@ var CacheManager = class {
       strategy: "merge"
     };
   }
-  write(data) {
+  async write(data) {
     try {
-      const { dir, filename } = this.options;
-      fs.ensureDirSync(dir);
-      fs.outputFileSync(filename, JSON.stringify([...data], void 0, 2), "utf8");
+      const { filename } = this.options;
+      await fs.outputJSON(filename, [...data]);
       return filename;
     } catch {
       logger_default.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(JSON.parse(data));
+      if (await fs.exists(filename)) {
+        const data = await fs.readJSON(filename);
+        return new Set(data);
       }
     } catch {
       logger_default.error(`parse cache content fail! path:${filename}`);
@@ -783,6 +782,9 @@ var TailwindcssPatcher = class {
     if (packageInfo.version) {
       this.majorVersion = Number.parseInt(packageInfo.version[0]);
     }
+    if (this.patchOptions.tailwindcss?.version) {
+      this.majorVersion = this.patchOptions.tailwindcss.version;
+    }
     this.packageInfo = packageInfo;
     this.patch = () => {
       try {
@@ -825,9 +827,9 @@ var TailwindcssPatcher = class {
     const contexts = this.getContexts();
     return contexts.filter((x) => isObject(x)).map((x) => x.classCache);
   }
-  async getClassCacheSet(options) {
+  async getClassCacheSet() {
     const classSet = /* @__PURE__ */ new Set();
-    const { output, tailwindcss } = options ?? {};
+    const { output, tailwindcss } = this.patchOptions;
     if (this.majorVersion === 4) {
       const { v4 } = tailwindcss ?? {};
       if (Array.isArray(v4?.cssEntries)) {
@@ -888,17 +890,13 @@ var TailwindcssPatcher = class {
   /**
    * @description 在多个 tailwindcss 上下文时，这个方法将被执行多次，所以策略上应该使用 append
    */
-  async getClassSet(options) {
-    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);
@@ -918,10 +916,7 @@ var TailwindcssPatcher = class {
           majorVersion: this.majorVersion
         });
       }
-      const set = await this.getClassSet({
-        output,
-        tailwindcss
-      });
+      const set = await this.getClassSet();
       if (filename) {
         const classList = [...set];
         await fs4.outputJSON(filename, classList, {

package/dist/{chunk-P7C42UCO.js → chunk-S6WAH32W.js}

@@ -56,22 +56,21 @@ var CacheManager = class {
       strategy: "merge"
     };
   }
-  write(data) {
+  async write(data) {
     try {
-      const { dir, filename } = this.options;
-      _fsextra2.default.ensureDirSync(dir);
-      _fsextra2.default.outputFileSync(filename, JSON.stringify([...data], void 0, 2), "utf8");
+      const { filename } = this.options;
+      await _fsextra2.default.outputJSON(filename, [...data]);
       return filename;
     } catch (e2) {
       logger_default.error("write cache file fail!");
     }
   }
-  read() {
+  async read() {
     const { filename } = this.options;
     try {
-      if (_fsextra2.default.existsSync(filename)) {
-        const data = _fsextra2.default.readFileSync(filename, "utf8");
-        return new Set(JSON.parse(data));
+      if (await _fsextra2.default.exists(filename)) {
+        const data = await _fsextra2.default.readJSON(filename);
+        return new Set(data);
       }
     } catch (e3) {
       logger_default.error(`parse cache content fail! path:${filename}`);
@@ -787,10 +786,13 @@ var TailwindcssPatcher = (_class = class {
     if (packageInfo.version) {
       this.majorVersion = Number.parseInt(packageInfo.version[0]);
     }
+    if (_optionalChain([this, 'access', _23 => _23.patchOptions, 'access', _24 => _24.tailwindcss, 'optionalAccess', _25 => _25.version])) {
+      this.majorVersion = this.patchOptions.tailwindcss.version;
+    }
     this.packageInfo = packageInfo;
     this.patch = () => {
       try {
-        return internalPatch(_optionalChain([this, 'access', _23 => _23.packageInfo, 'optionalAccess', _24 => _24.packageJsonPath]), this.patchOptions);
+        return internalPatch(_optionalChain([this, 'access', _26 => _26.packageInfo, 'optionalAccess', _27 => _27.packageJsonPath]), this.patchOptions);
       } catch (error) {
         logger_default.error(`patch tailwindcss failed: ${error.message}`);
       }
@@ -829,12 +831,12 @@ var TailwindcssPatcher = (_class = class {
     const contexts = this.getContexts();
     return contexts.filter((x) => isObject(x)).map((x) => x.classCache);
   }
-  async getClassCacheSet(options) {
+  async getClassCacheSet() {
     const classSet = /* @__PURE__ */ new Set();
-    const { output, tailwindcss } = _nullishCoalesce(options, () => ( {}));
+    const { output, tailwindcss } = this.patchOptions;
     if (this.majorVersion === 4) {
       const { v4 } = _nullishCoalesce(tailwindcss, () => ( {}));
-      if (Array.isArray(_optionalChain([v4, 'optionalAccess', _25 => _25.cssEntries]))) {
+      if (Array.isArray(_optionalChain([v4, 'optionalAccess', _28 => _28.cssEntries]))) {
         const results = (await Promise.all(
           v4.cssEntries.map(async (x) => {
             if (await _fsextra2.default.exists(x)) {
@@ -846,11 +848,11 @@ var TailwindcssPatcher = (_class = class {
         )).filter((x) => x);
         for (const css of results) {
           const candidates = await extractValidCandidates({
-            base: _optionalChain([v4, 'optionalAccess', _26 => _26.base]),
+            base: _optionalChain([v4, 'optionalAccess', _29 => _29.base]),
             css,
-            sources: _optionalChain([v4, 'optionalAccess', _27 => _27.sources, 'optionalAccess', _28 => _28.map, 'call', _29 => _29((x) => {
+            sources: _optionalChain([v4, 'optionalAccess', _30 => _30.sources, 'optionalAccess', _31 => _31.map, 'call', _32 => _32((x) => {
               return {
-                base: _nullishCoalesce(_nullishCoalesce(x.base, () => ( _optionalChain([v4, 'optionalAccess', _30 => _30.base]))), () => ( _process2.default.cwd())),
+                base: _nullishCoalesce(_nullishCoalesce(x.base, () => ( _optionalChain([v4, 'optionalAccess', _33 => _33.base]))), () => ( _process2.default.cwd())),
                 pattern: x.pattern
               };
             })])
@@ -861,11 +863,11 @@ var TailwindcssPatcher = (_class = class {
         }
       } else {
         const candidates = await extractValidCandidates({
-          base: _optionalChain([v4, 'optionalAccess', _31 => _31.base]),
-          css: _optionalChain([v4, 'optionalAccess', _32 => _32.css]),
-          sources: _optionalChain([v4, 'optionalAccess', _33 => _33.sources, 'optionalAccess', _34 => _34.map, 'call', _35 => _35((x) => {
+          base: _optionalChain([v4, 'optionalAccess', _34 => _34.base]),
+          css: _optionalChain([v4, 'optionalAccess', _35 => _35.css]),
+          sources: _optionalChain([v4, 'optionalAccess', _36 => _36.sources, 'optionalAccess', _37 => _37.map, 'call', _38 => _38((x) => {
             return {
-              base: _nullishCoalesce(_nullishCoalesce(x.base, () => ( _optionalChain([v4, 'optionalAccess', _36 => _36.base]))), () => ( _process2.default.cwd())),
+              base: _nullishCoalesce(_nullishCoalesce(x.base, () => ( _optionalChain([v4, 'optionalAccess', _39 => _39.base]))), () => ( _process2.default.cwd())),
               pattern: x.pattern
             };
           })])
@@ -880,7 +882,7 @@ var TailwindcssPatcher = (_class = class {
         const keys = classCacheMap.keys();
         for (const key of keys) {
           const v = key.toString();
-          if (_optionalChain([output, 'optionalAccess', _37 => _37.removeUniversalSelector]) && v === "*") {
+          if (_optionalChain([output, 'optionalAccess', _40 => _40.removeUniversalSelector]) && v === "*") {
             continue;
           }
           classSet.add(v);
@@ -892,17 +894,13 @@ var TailwindcssPatcher = (_class = class {
   /**
    * @description 在多个 tailwindcss 上下文时，这个方法将被执行多次，所以策略上应该使用 append
    */
-  async getClassSet(options) {
-    const { output, tailwindcss } = _nullishCoalesce(options, () => ( {}));
+  async getClassSet() {
     const cacheStrategy = _nullishCoalesce(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);
@@ -922,10 +920,7 @@ var TailwindcssPatcher = (_class = class {
           majorVersion: this.majorVersion
         });
       }
-      const set = await this.getClassSet({
-        output,
-        tailwindcss
-      });
+      const set = await this.getClassSet();
       if (filename) {
         const classList = [...set];
         await _fsextra2.default.outputJSON(filename, classList, {

package/dist/cli.js

@@ -2,7 +2,7 @@
 
 
 
-var _chunkP7C42UCOjs = require('./chunk-P7C42UCO.js');
+var _chunkS6WAH32Wjs = require('./chunk-S6WAH32W.js');
 
 // src/cli.ts
 var _process = require('process'); var _process2 = _interopRequireDefault(_process);
@@ -14,21 +14,21 @@ function init() {
 }
 var cli = _cac2.default.call(void 0, );
 cli.command("install", "patch install").action(() => {
-  const twPatcher = new (0, _chunkP7C42UCOjs.TailwindcssPatcher)({
-    patch: _chunkP7C42UCOjs.getPatchOptions.call(void 0, )
+  const twPatcher = new (0, _chunkS6WAH32Wjs.TailwindcssPatcher)({
+    patch: _chunkS6WAH32Wjs.getPatchOptions.call(void 0, )
   });
   twPatcher.patch();
 });
 cli.command("init").action(async () => {
   await init();
-  _chunkP7C42UCOjs.logger_default.success(`\u2728 ${_config.CONFIG_NAME}.config.ts initialized!`);
+  _chunkS6WAH32Wjs.logger_default.success(`\u2728 ${_config.CONFIG_NAME}.config.ts initialized!`);
 });
 cli.command("extract").action(async () => {
   const { config } = await _config.getConfig.call(void 0, );
   if (config) {
-    const twPatcher = new (0, _chunkP7C42UCOjs.TailwindcssPatcher)();
+    const twPatcher = new (0, _chunkS6WAH32Wjs.TailwindcssPatcher)();
     const p = await twPatcher.extract(config.patch);
-    _chunkP7C42UCOjs.logger_default.success(`\u2728 tailwindcss-patch extract success! file path: ${p}`);
+    _chunkS6WAH32Wjs.logger_default.success(`\u2728 tailwindcss-patch extract success! file path: ${p}`);
   }
 });
 cli.help();

package/dist/cli.mjs

@@ -2,7 +2,7 @@ import {
   TailwindcssPatcher,
   getPatchOptions,
   logger_default
-} from "./chunk-AZHCF3SW.mjs";
+} from "./chunk-NHBD2ICP.mjs";
 
 // src/cli.ts
 import process from "node:process";

package/dist/index.d.mts

@@ -1,16 +1,19 @@
+import { PatchUserConfig } from '@tailwindcss-mangle/config';
+export { TailwindcssUserConfig, defineConfig } from '@tailwindcss-mangle/config';
+import { PackageJson } from 'pkg-types';
 import { Node, Rule } from 'postcss';
 import { Config } from 'tailwindcss';
-import { PatchUserConfig } from '@tailwindcss-mangle/config';
-export { defineConfig } from '@tailwindcss-mangle/config';
 import { GlobEntry } from '@tailwindcss/oxide';
 import * as consola from 'consola';
 
 type CacheStrategy = 'merge' | 'overwrite';
+
 interface PackageInfo {
     name: string;
     version: string | undefined;
     rootPath: string;
     packageJsonPath: string;
+    packageJson: PackageJson;
 }
 interface CacheOptions {
     dir?: string;
@@ -21,7 +24,7 @@ interface CacheOptions {
 interface InternalCacheOptions extends CacheOptions {
     enable?: boolean;
 }
-interface PatchOptions {
+interface PatchOptions extends PatchUserConfig {
     overwrite?: boolean;
     paths?: string[];
     basedir?: string;
@@ -100,8 +103,8 @@ declare class CacheManager {
     getOptions(options?: CacheOptions): Required<CacheOptions> & {
         filename: string;
     };
-    write(data: Set<string>): string | undefined;
-    read(): Set<string> | undefined;
+    write(data: Set<string>): Promise<string | undefined>;
+    read(): Promise<Set<string> | undefined>;
 }
 
 interface ExtractValidCandidatesOption {
@@ -120,15 +123,15 @@ declare class TailwindcssPatcher {
     packageInfo: PackageInfo;
     majorVersion?: number;
     constructor(options?: TailwindcssPatcherOptions);
-    setCache(set: Set<string>): string | undefined;
-    getCache(): Set<string> | undefined;
+    setCache(set: Set<string>): Promise<string | undefined> | undefined;
+    getCache(): Promise<Set<string> | undefined>;
     getContexts(): TailwindcssRuntimeContext[];
     getClassCaches(): TailwindcssClassCache[];
-    getClassCacheSet(options?: PatchUserConfig): Promise<Set<string>>;
+    getClassCacheSet(): Promise<Set<string>>;
     /**
      * @description 在多个 tailwindcss 上下文时，这个方法将被执行多次，所以策略上应该使用 append
      */
-    getClassSet(options?: PatchUserConfig): Promise<Set<string>>;
+    getClassSet(): Promise<Set<string>>;
     extract(options?: PatchUserConfig): Promise<string | undefined>;
     extractValidCandidates: typeof extractValidCandidates;
 }

package/dist/index.d.ts

@@ -1,16 +1,19 @@
+import { PatchUserConfig } from '@tailwindcss-mangle/config';
+export { TailwindcssUserConfig, defineConfig } from '@tailwindcss-mangle/config';
+import { PackageJson } from 'pkg-types';
 import { Node, Rule } from 'postcss';
 import { Config } from 'tailwindcss';
-import { PatchUserConfig } from '@tailwindcss-mangle/config';
-export { defineConfig } from '@tailwindcss-mangle/config';
 import { GlobEntry } from '@tailwindcss/oxide';
 import * as consola from 'consola';
 
 type CacheStrategy = 'merge' | 'overwrite';
+
 interface PackageInfo {
     name: string;
     version: string | undefined;
     rootPath: string;
     packageJsonPath: string;
+    packageJson: PackageJson;
 }
 interface CacheOptions {
     dir?: string;
@@ -21,7 +24,7 @@ interface CacheOptions {
 interface InternalCacheOptions extends CacheOptions {
     enable?: boolean;
 }
-interface PatchOptions {
+interface PatchOptions extends PatchUserConfig {
     overwrite?: boolean;
     paths?: string[];
     basedir?: string;
@@ -100,8 +103,8 @@ declare class CacheManager {
     getOptions(options?: CacheOptions): Required<CacheOptions> & {
         filename: string;
     };
-    write(data: Set<string>): string | undefined;
-    read(): Set<string> | undefined;
+    write(data: Set<string>): Promise<string | undefined>;
+    read(): Promise<Set<string> | undefined>;
 }
 
 interface ExtractValidCandidatesOption {
@@ -120,15 +123,15 @@ declare class TailwindcssPatcher {
     packageInfo: PackageInfo;
     majorVersion?: number;
     constructor(options?: TailwindcssPatcherOptions);
-    setCache(set: Set<string>): string | undefined;
-    getCache(): Set<string> | undefined;
+    setCache(set: Set<string>): Promise<string | undefined> | undefined;
+    getCache(): Promise<Set<string> | undefined>;
     getContexts(): TailwindcssRuntimeContext[];
     getClassCaches(): TailwindcssClassCache[];
-    getClassCacheSet(options?: PatchUserConfig): Promise<Set<string>>;
+    getClassCacheSet(): Promise<Set<string>>;
     /**
      * @description 在多个 tailwindcss 上下文时，这个方法将被执行多次，所以策略上应该使用 append
      */
-    getClassSet(options?: PatchUserConfig): Promise<Set<string>>;
+    getClassSet(): Promise<Set<string>>;
     extract(options?: PatchUserConfig): Promise<string | undefined>;
     extractValidCandidates: typeof extractValidCandidates;
 }

package/dist/index.js

@@ -7,7 +7,7 @@
 
 
 
-var _chunkP7C42UCOjs = require('./chunk-P7C42UCO.js');
+var _chunkS6WAH32Wjs = require('./chunk-S6WAH32W.js');
 
 // src/index.ts
 var _config = require('@tailwindcss-mangle/config');
@@ -21,4 +21,4 @@ var _config = require('@tailwindcss-mangle/config');
 
 
 
-exports.CacheManager = _chunkP7C42UCOjs.CacheManager; exports.TailwindcssPatcher = _chunkP7C42UCOjs.TailwindcssPatcher; exports.defineConfig = _config.defineConfig; exports.getCacheOptions = _chunkP7C42UCOjs.getCacheOptions; exports.internalPatch = _chunkP7C42UCOjs.internalPatch; exports.logger = _chunkP7C42UCOjs.logger_default; exports.monkeyPatchForExposingContextV2 = _chunkP7C42UCOjs.monkeyPatchForExposingContextV2; exports.monkeyPatchForExposingContextV3 = _chunkP7C42UCOjs.monkeyPatchForExposingContextV3; exports.monkeyPatchForSupportingCustomUnit = _chunkP7C42UCOjs.monkeyPatchForSupportingCustomUnit;
+exports.CacheManager = _chunkS6WAH32Wjs.CacheManager; exports.TailwindcssPatcher = _chunkS6WAH32Wjs.TailwindcssPatcher; exports.defineConfig = _config.defineConfig; exports.getCacheOptions = _chunkS6WAH32Wjs.getCacheOptions; exports.internalPatch = _chunkS6WAH32Wjs.internalPatch; exports.logger = _chunkS6WAH32Wjs.logger_default; exports.monkeyPatchForExposingContextV2 = _chunkS6WAH32Wjs.monkeyPatchForExposingContextV2; exports.monkeyPatchForExposingContextV3 = _chunkS6WAH32Wjs.monkeyPatchForExposingContextV3; exports.monkeyPatchForSupportingCustomUnit = _chunkS6WAH32Wjs.monkeyPatchForSupportingCustomUnit;

package/dist/index.mjs

@@ -7,7 +7,7 @@ import {
   monkeyPatchForExposingContextV2,
   monkeyPatchForExposingContextV3,
   monkeyPatchForSupportingCustomUnit
-} from "./chunk-AZHCF3SW.mjs";
+} from "./chunk-NHBD2ICP.mjs";
 
 // src/index.ts
 import { defineConfig } from "@tailwindcss-mangle/config";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tailwindcss-patch",
-  "version": "6.0.0",
+  "version": "6.0.2",
   "description": "patch tailwindcss for exposing context and extract classes",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",
@@ -62,7 +62,7 @@
     "postcss": "^8.5.2",
     "semver": "^7.7.1",
     "tailwindcss-config": "^1.0.0",
-    "@tailwindcss-mangle/config": "^5.0.0"
+    "@tailwindcss-mangle/config": "^5.0.1"
   },
   "devDependencies": {
     "@tailwindcss/node": "^4.0.6",