tailwindcss-patch 1.2.5 → 1.2.7

package/dist/cli.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var patcher = require('./patcher-d1886807.js');
+var patcher = require('./patcher-a07f477f.js');
 require('node:path');
 require('node:fs');
 require('semver');

package/dist/index.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var path = require('node:path');
 var fs = require('node:fs');
-var patcher = require('./patcher-d1886807.js');
+var patcher = require('./patcher-a07f477f.js');
 require('semver');
 require('@babel/types');
 require('@babel/generator');
@@ -43,7 +43,7 @@ function getClassCacheSet(basedir) {
     for (const classCacheMap of classCaches) {
         const keys = classCacheMap.keys();
         for (const key of keys) {
-            classSet.add(key);
+            classSet.add(key.toString());
         }
     }
     return classSet;
@@ -74,7 +74,8 @@ function getCacheOptions$1(options = {}) {
         cwd,
         dir,
         file,
-        filename
+        filename,
+        strategy: 'merge'
     };
 }
 function writeCache(data, options = {}) {
@@ -147,9 +148,25 @@ class TailwindcssPatcher {
     getCache() {
         return readCache(this.cacheOptions);
     }
-    getClassSet(basedir) {
+    getClassSet(options) {
+        var _a;
+        if (options === void 0) { options = {
+            cacheStrategy: (_a = this.cacheOptions.strategy) !== null && _a !== void 0 ? _a : 'merge'
+        }; }
+        const { basedir, cacheStrategy } = options;
         const set = getClassCacheSet(basedir);
-        set.size > 0 && this.setCache(set);
+        if (cacheStrategy === 'overwrite') {
+            set.size > 0 && this.setCache(set);
+        }
+        else if (cacheStrategy === 'merge') {
+            const cacheSet = this.getCache();
+            if (cacheSet) {
+                for (const x of cacheSet) {
+                    set.add(x);
+                }
+            }
+            this.setCache(set);
+        }
         return set;
     }
     getContexts(basedir) {

package/dist/{patcher-d1886807.js → patcher-a07f477f.js}

@@ -284,6 +284,7 @@ function internalPatch(pkgJsonPath, options) {
         const pkgJson = require(pkgJsonPath);
         const twDir = path__default["default"].dirname(pkgJsonPath);
         if (semver.gte(pkgJson.version, '3.0.0')) {
+            options.version = pkgJson.version;
             const result = monkeyPatchForExposingContext(twDir, options);
             return result;
         }

package/dist/types/class.d.ts

@@ -1,4 +1,4 @@
-import type { CacheOptions, InternalCacheOptions, InternalPatchOptions, TailwindcssPatcherOptions } from './type';
+import type { CacheOptions, InternalCacheOptions, InternalPatchOptions, TailwindcssPatcherOptions, CacheStrategy } from './type';
 export declare function getCacheOptions(options?: CacheOptions | boolean): InternalCacheOptions;
 export declare class TailwindcssPatcher {
     rawOptions: TailwindcssPatcherOptions;
@@ -9,6 +9,9 @@ export declare class TailwindcssPatcher {
     getPkgEntry(basedir?: string): string;
     setCache(set: Set<string>): string | undefined;
     getCache(): Set<string> | undefined;
-    getClassSet(basedir?: string): Set<string>;
-    getContexts(basedir?: string): any[];
+    getClassSet(options?: {
+        basedir?: string;
+        cacheStrategy?: CacheStrategy;
+    }): Set<string>;
+    getContexts(basedir?: string): import("./type").TailwindcssRuntimeContext[];
 }

package/dist/types/exposeContext.d.ts

@@ -1,9 +1,5 @@
-import type { Rule } from 'postcss';
+import type { TailwindcssClassCache, TailwindcssRuntimeContext } from './type';
 export declare function getTailwindcssEntry(basedir?: string): string;
-export declare function getContexts(basedir?: string): any[];
-export declare function getClassCaches(basedir?: string): Map<string, ({
-    layer: string;
-    options: Record<string, any>;
-    sort: Record<string, any>;
-} | Rule)[]>[];
+export declare function getContexts(basedir?: string): TailwindcssRuntimeContext[];
+export declare function getClassCaches(basedir?: string): TailwindcssClassCache[];
 export declare function getClassCacheSet(basedir?: string): Set<string>;

package/dist/types/type.d.ts

@@ -1,7 +1,11 @@
+import type { Rule, Node } from 'postcss';
+import type { Config } from 'tailwindcss';
+export type CacheStrategy = 'merge' | 'overwrite';
 export interface CacheOptions {
     dir?: string;
     cwd?: string;
     file?: string;
+    strategy?: CacheStrategy;
 }
 export type InternalCacheOptions = CacheOptions & {
     enable?: boolean;
@@ -17,8 +21,52 @@ export interface InternalPatchOptions {
     paths?: string[];
     basedir?: string;
     custom?: (dir: string, ctx: Record<string, any>) => void;
+    version?: string;
 }
 export interface TailwindcssPatcherOptions {
     cache?: CacheOptions | boolean;
     patch?: PatchOptions;
 }
+export type TailwindcssClassCache = Map<string, ({
+    layer: string;
+    options: Record<string, any>;
+    sort: Record<string, any>;
+} | Rule)[]>;
+export type TailwindcssRuntimeContext = {
+    applyClassCache: Map<any, any>;
+    candidateRuleCache: Map<string | String, Set<[
+        {
+            arbitrary: any;
+            index: any;
+            layer: string;
+            options: any[];
+            parallelIndex: any;
+            parentLayer: string;
+            variants: any;
+        },
+        Node
+    ]>>;
+    candidateRuleMap: Map<string | String, [object, Node][]>;
+    changedContent: any[];
+    classCache: TailwindcssClassCache;
+    disposables: any[];
+    getClassList: Function;
+    getClassOrder: Function;
+    getVariants: Function;
+    markInvalidUtilityCandidate: Function;
+    markInvalidUtilityNode: Function;
+    notClassCache: Set<String>;
+    offsets: {
+        layerPositions: object;
+        offsets: object;
+        reservedVariantBits: any;
+        variantOffsets: Map<string, any>;
+    };
+    postCssNodeCache: Map<object, [Node]>;
+    ruleCache: Set<[object, Node]>;
+    stylesheetCache: Record<string, Set<any>>;
+    tailwindConfig: Config;
+    userConfigPath: string | null;
+    variantMap: Map<string, [[object, Function]]>;
+    variantOptions: Map<string, object>;
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tailwindcss-patch",
-  "version": "1.2.5",
+  "version": "1.2.7",
   "description": "patch tailwindcss for exposing context",
   "main": "dist/index.js",
   "module": "./dist/index.mjs",
@@ -30,16 +30,16 @@
     "@types/semver": "^7.5.0",
     "defu": "^6.1.2",
     "pkg-types": "^1.0.3",
-    "postcss": "^8.4.24",
-    "tailwindcss": "^3.3.2"
+    "postcss": "^8.4.26",
+    "tailwindcss": "^3.3.3"
   },
   "dependencies": {
-    "@babel/generator": "^7.22.5",
-    "@babel/parser": "^7.22.5",
-    "@babel/traverse": "^7.22.5",
+    "@babel/generator": "^7.22.9",
+    "@babel/parser": "^7.22.7",
+    "@babel/traverse": "^7.22.8",
     "@babel/types": "^7.22.5",
     "resolve": "^1.22.2",
-    "semver": "^7.5.1"
+    "semver": "^7.5.4"
   },
   "homepage": "https://github.com/sonofmagic/tailwindcss-mangle",
   "repository": {