unplugin-tailwindcss-mangle 2.0.4 → 2.1.0

package/dist/esbuild.cjs

@@ -6,10 +6,12 @@ require('node:path');
 require('@tailwindcss-mangle/shared');
 require('@tailwindcss-mangle/config');
 require('fast-sort');
+require('modern-ahocorasick');
 require('node:fs/promises');
 require('micromatch');
 require('unplugin');
 require('@tailwindcss-mangle/core');
+require('magic-string');
 require('./shared/unplugin-tailwindcss-mangle.e90953c3.cjs');
 
 const esbuild = index.esbuild;

package/dist/esbuild.mjs

@@ -4,10 +4,12 @@ import 'node:path';
 import '@tailwindcss-mangle/shared';
 import '@tailwindcss-mangle/config';
 import 'fast-sort';
+import 'modern-ahocorasick';
 import 'node:fs/promises';
 import 'micromatch';
 import 'unplugin';
 import '@tailwindcss-mangle/core';
+import 'magic-string';
 import './shared/unplugin-tailwindcss-mangle.bbd58ece.mjs';
 
 const esbuild = unplugin.esbuild;

package/dist/index.cjs

@@ -4,17 +4,21 @@ const path = require('node:path');
 const fs$1 = require('node:fs/promises');
 const unplugin$1 = require('unplugin');
 const core = require('@tailwindcss-mangle/core');
+const MagicString = require('magic-string');
 const fs = require('node:fs');
 const shared = require('@tailwindcss-mangle/shared');
 const config = require('@tailwindcss-mangle/config');
 const fastSort = require('fast-sort');
+const AhoCorasick = require('modern-ahocorasick');
 const utils = require('./shared/unplugin-tailwindcss-mangle.e90953c3.cjs');
 require('micromatch');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e.default : e; }
 
 const fs__default$1 = /*#__PURE__*/_interopDefaultCompat(fs$1);
+const MagicString__default = /*#__PURE__*/_interopDefaultCompat(MagicString);
 const fs__default = /*#__PURE__*/_interopDefaultCompat(fs);
+const AhoCorasick__default = /*#__PURE__*/_interopDefaultCompat(AhoCorasick);
 
 function isObject(value) {
   return value !== null && typeof value === "object";
@@ -59,13 +63,14 @@ function createDefu(merger) {
 const defu = createDefu();
 
 class Context {
-  constructor(opts) {
-    this.options = defu(opts, config.getDefaultMangleUserConfig());
+  constructor(opts = {}) {
+    this.options = opts;
     this.classSet = /* @__PURE__ */ new Set();
     this.replaceMap = /* @__PURE__ */ new Map();
     this.includeMatcher = utils.createGlobMatcher(this.options.include, true);
     this.excludeMatcher = utils.createGlobMatcher(this.options.exclude, false);
     this.classGenerator = new shared.ClassGenerator(this.options.classGenerator);
+    this.useAC = false;
   }
   mergeOptions(opts) {
     this.options = defu(this.options, opts);
@@ -91,11 +96,34 @@ class Context {
       hit.usedBy.add(file);
     }
   }
-  async initConfig() {
-    const { config: config$1 } = await config.getConfig();
+  search(str) {
+    const arr = this.ahoCorasick?.search(str) ?? [];
+    const map = /* @__PURE__ */ new Map();
+    for (const [end, classNames] of arr) {
+      for (const className of classNames) {
+        if (map.has(className)) {
+          const v = map.get(className);
+          if (v) {
+            v.push([end - className.length + 1, end + 1]);
+          }
+        } else {
+          map.set(className, [[end - className.length + 1, end + 1]]);
+        }
+      }
+    }
+    return {
+      map,
+      arr: fastSort.sort([...map.entries()]).desc((x) => x[0].length)
+    };
+  }
+  async initConfig(cwd) {
+    const { config: config$1, cwd: configCwd } = await config.getConfig(cwd);
     const mangleConfig = config$1?.mangle;
     this.mergeOptions(mangleConfig);
-    const jsonPath = this.options.classListPath ?? path.resolve(process.cwd(), config$1?.patch?.output?.filename);
+    let jsonPath = this.options.classListPath ?? path.resolve(process.cwd(), config$1?.patch?.output?.filename);
+    if (!path.isAbsolute(jsonPath)) {
+      jsonPath = path.resolve(configCwd ?? process.cwd(), jsonPath);
+    }
     if (jsonPath && fs__default.existsSync(jsonPath)) {
       const rawClassList = fs__default.readFileSync(jsonPath, "utf8");
       const list = JSON.parse(rawClassList);
@@ -106,9 +134,12 @@ class Context {
         }
       }
     }
+    const keywords = [];
     for (const cls of this.classSet) {
       this.classGenerator.generateClassName(cls);
+      keywords.push(cls);
     }
+    this.ahoCorasick = new AhoCorasick__default(keywords);
     for (const x of Object.entries(this.classGenerator.newClassMap)) {
       this.replaceMap.set(x[0], x[1].name);
     }
@@ -116,7 +147,7 @@ class Context {
   }
 }
 
-const unplugin = unplugin$1.createUnplugin((options = {}) => {
+const unplugin = unplugin$1.createUnplugin((options) => {
   const ctx = new Context(options);
   if (ctx.options.disabled) {
     return {
@@ -133,21 +164,43 @@ const unplugin = unplugin$1.createUnplugin((options = {}) => {
       return ctx.isInclude(id);
     },
     transform(code, id) {
+      const s = new MagicString__default(code);
       const replaceMap = ctx.getReplaceMap();
       if (/\.[jt]sx?$/.test(id)) {
-        const str = core.preProcessJs({
-          code,
+        return core.preProcessJs({
+          code: s,
           replaceMap,
           addToUsedBy: ctx.addToUsedBy.bind(ctx),
           id
         });
-        return str;
+      } else if (ctx.useAC) {
+        const { arr } = ctx.search(code);
+        const markArr = [];
+        for (const [cls, ranges] of arr) {
+          for (const [start, end] of ranges) {
+            const value = replaceMap.get(cls);
+            if (value) {
+              let flag = true;
+              for (const [ps, pe] of markArr) {
+                if (start > ps && start < pe || end < pe && end > start) {
+                  flag = false;
+                  break;
+                }
+              }
+              if (flag) {
+                markArr.push([start, end]);
+                s.update(start, end, value);
+              }
+            }
+          }
+        }
+        return s.toString();
       } else {
         for (const [key, value] of replaceMap) {
           code = code.replaceAll(key, value);
         }
+        return code;
       }
-      return code;
     },
     vite: {
       generateBundle: {
@@ -226,21 +279,18 @@ const unplugin = unplugin$1.createUnplugin((options = {}) => {
         const entries = Object.entries(ctx.classGenerator.newClassMap);
         if (entries.length > 0 && opts) {
           await utils.ensureDir(path.dirname(opts.filename));
-          await fs__default$1.writeFile(
-            opts.filename,
-            JSON.stringify(
-              entries.map((x) => {
-                return {
-                  origin: x[0],
-                  replacement: x[1].name,
-                  usedBy: [...x[1].usedBy]
-                };
-              }),
-              null,
-              2
-            ),
-            "utf8"
+          const output = JSON.stringify(
+            entries.map((x) => {
+              return {
+                origin: x[0],
+                replacement: x[1].name,
+                usedBy: [...x[1].usedBy]
+              };
+            }),
+            null,
+            opts.loose ? 2 : 0
           );
+          await fs__default$1.writeFile(opts.filename, output, "utf8");
           console.log(`\u2728 ${opts.filename} generated!`);
         }
       }

package/dist/index.mjs

@@ -1,11 +1,13 @@
-import { resolve, dirname } from 'node:path';
+import { resolve, isAbsolute, dirname } from 'node:path';
 import fs$1 from 'node:fs/promises';
 import { createUnplugin } from 'unplugin';
 import { preProcessJs, cssHandler, jsHandler, htmlHandler } from '@tailwindcss-mangle/core';
+import MagicString from 'magic-string';
 import fs from 'node:fs';
 import { ClassGenerator, defaultMangleClassFilter } from '@tailwindcss-mangle/shared';
-import { getDefaultMangleUserConfig, getConfig } from '@tailwindcss-mangle/config';
+import { getConfig } from '@tailwindcss-mangle/config';
 import { sort } from 'fast-sort';
+import AhoCorasick from 'modern-ahocorasick';
 import { c as createGlobMatcher, p as pluginName, g as getGroupedEntries, e as ensureDir } from './shared/unplugin-tailwindcss-mangle.bbd58ece.mjs';
 import 'micromatch';
 
@@ -52,13 +54,14 @@ function createDefu(merger) {
 const defu = createDefu();
 
 class Context {
-  constructor(opts) {
-    this.options = defu(opts, getDefaultMangleUserConfig());
+  constructor(opts = {}) {
+    this.options = opts;
     this.classSet = /* @__PURE__ */ new Set();
     this.replaceMap = /* @__PURE__ */ new Map();
     this.includeMatcher = createGlobMatcher(this.options.include, true);
     this.excludeMatcher = createGlobMatcher(this.options.exclude, false);
     this.classGenerator = new ClassGenerator(this.options.classGenerator);
+    this.useAC = false;
   }
   mergeOptions(opts) {
     this.options = defu(this.options, opts);
@@ -84,11 +87,34 @@ class Context {
       hit.usedBy.add(file);
     }
   }
-  async initConfig() {
-    const { config } = await getConfig();
+  search(str) {
+    const arr = this.ahoCorasick?.search(str) ?? [];
+    const map = /* @__PURE__ */ new Map();
+    for (const [end, classNames] of arr) {
+      for (const className of classNames) {
+        if (map.has(className)) {
+          const v = map.get(className);
+          if (v) {
+            v.push([end - className.length + 1, end + 1]);
+          }
+        } else {
+          map.set(className, [[end - className.length + 1, end + 1]]);
+        }
+      }
+    }
+    return {
+      map,
+      arr: sort([...map.entries()]).desc((x) => x[0].length)
+    };
+  }
+  async initConfig(cwd) {
+    const { config, cwd: configCwd } = await getConfig(cwd);
     const mangleConfig = config?.mangle;
     this.mergeOptions(mangleConfig);
-    const jsonPath = this.options.classListPath ?? resolve(process.cwd(), config?.patch?.output?.filename);
+    let jsonPath = this.options.classListPath ?? resolve(process.cwd(), config?.patch?.output?.filename);
+    if (!isAbsolute(jsonPath)) {
+      jsonPath = resolve(configCwd ?? process.cwd(), jsonPath);
+    }
     if (jsonPath && fs.existsSync(jsonPath)) {
       const rawClassList = fs.readFileSync(jsonPath, "utf8");
       const list = JSON.parse(rawClassList);
@@ -99,9 +125,12 @@ class Context {
         }
       }
     }
+    const keywords = [];
     for (const cls of this.classSet) {
       this.classGenerator.generateClassName(cls);
+      keywords.push(cls);
     }
+    this.ahoCorasick = new AhoCorasick(keywords);
     for (const x of Object.entries(this.classGenerator.newClassMap)) {
       this.replaceMap.set(x[0], x[1].name);
     }
@@ -109,7 +138,7 @@ class Context {
   }
 }
 
-const unplugin = createUnplugin((options = {}) => {
+const unplugin = createUnplugin((options) => {
   const ctx = new Context(options);
   if (ctx.options.disabled) {
     return {
@@ -126,21 +155,43 @@ const unplugin = createUnplugin((options = {}) => {
       return ctx.isInclude(id);
     },
     transform(code, id) {
+      const s = new MagicString(code);
       const replaceMap = ctx.getReplaceMap();
       if (/\.[jt]sx?$/.test(id)) {
-        const str = preProcessJs({
-          code,
+        return preProcessJs({
+          code: s,
           replaceMap,
           addToUsedBy: ctx.addToUsedBy.bind(ctx),
           id
         });
-        return str;
+      } else if (ctx.useAC) {
+        const { arr } = ctx.search(code);
+        const markArr = [];
+        for (const [cls, ranges] of arr) {
+          for (const [start, end] of ranges) {
+            const value = replaceMap.get(cls);
+            if (value) {
+              let flag = true;
+              for (const [ps, pe] of markArr) {
+                if (start > ps && start < pe || end < pe && end > start) {
+                  flag = false;
+                  break;
+                }
+              }
+              if (flag) {
+                markArr.push([start, end]);
+                s.update(start, end, value);
+              }
+            }
+          }
+        }
+        return s.toString();
       } else {
         for (const [key, value] of replaceMap) {
           code = code.replaceAll(key, value);
         }
+        return code;
       }
-      return code;
     },
     vite: {
       generateBundle: {
@@ -219,21 +270,18 @@ const unplugin = createUnplugin((options = {}) => {
         const entries = Object.entries(ctx.classGenerator.newClassMap);
         if (entries.length > 0 && opts) {
           await ensureDir(dirname(opts.filename));
-          await fs$1.writeFile(
-            opts.filename,
-            JSON.stringify(
-              entries.map((x) => {
-                return {
-                  origin: x[0],
-                  replacement: x[1].name,
-                  usedBy: [...x[1].usedBy]
-                };
-              }),
-              null,
-              2
-            ),
-            "utf8"
+          const output = JSON.stringify(
+            entries.map((x) => {
+              return {
+                origin: x[0],
+                replacement: x[1].name,
+                usedBy: [...x[1].usedBy]
+              };
+            }),
+            null,
+            opts.loose ? 2 : 0
           );
+          await fs$1.writeFile(opts.filename, output, "utf8");
           console.log(`\u2728 ${opts.filename} generated!`);
         }
       }

package/dist/nuxt.cjs

@@ -6,10 +6,12 @@ require('node:path');
 require('@tailwindcss-mangle/shared');
 require('@tailwindcss-mangle/config');
 require('fast-sort');
+require('modern-ahocorasick');
 require('node:fs/promises');
 require('micromatch');
 require('unplugin');
 require('@tailwindcss-mangle/core');
+require('magic-string');
 require('./shared/unplugin-tailwindcss-mangle.e90953c3.cjs');
 
 function nuxt(options = {}, nuxt) {

package/dist/nuxt.mjs

@@ -4,10 +4,12 @@ import 'node:path';
 import '@tailwindcss-mangle/shared';
 import '@tailwindcss-mangle/config';
 import 'fast-sort';
+import 'modern-ahocorasick';
 import 'node:fs/promises';
 import 'micromatch';
 import 'unplugin';
 import '@tailwindcss-mangle/core';
+import 'magic-string';
 import './shared/unplugin-tailwindcss-mangle.bbd58ece.mjs';
 
 function nuxt(options = {}, nuxt) {

package/dist/rollup.cjs

@@ -6,10 +6,12 @@ require('node:path');
 require('@tailwindcss-mangle/shared');
 require('@tailwindcss-mangle/config');
 require('fast-sort');
+require('modern-ahocorasick');
 require('node:fs/promises');
 require('micromatch');
 require('unplugin');
 require('@tailwindcss-mangle/core');
+require('magic-string');
 require('./shared/unplugin-tailwindcss-mangle.e90953c3.cjs');
 
 const rollup = index.rollup;

package/dist/rollup.mjs

@@ -4,10 +4,12 @@ import 'node:path';
 import '@tailwindcss-mangle/shared';
 import '@tailwindcss-mangle/config';
 import 'fast-sort';
+import 'modern-ahocorasick';
 import 'node:fs/promises';
 import 'micromatch';
 import 'unplugin';
 import '@tailwindcss-mangle/core';
+import 'magic-string';
 import './shared/unplugin-tailwindcss-mangle.bbd58ece.mjs';
 
 const rollup = unplugin.rollup;

package/dist/vite.cjs

@@ -6,10 +6,12 @@ require('node:path');
 require('@tailwindcss-mangle/shared');
 require('@tailwindcss-mangle/config');
 require('fast-sort');
+require('modern-ahocorasick');
 require('node:fs/promises');
 require('micromatch');
 require('unplugin');
 require('@tailwindcss-mangle/core');
+require('magic-string');
 require('./shared/unplugin-tailwindcss-mangle.e90953c3.cjs');
 
 const vite = index.vite;

package/dist/vite.mjs

@@ -4,10 +4,12 @@ import 'node:path';
 import '@tailwindcss-mangle/shared';
 import '@tailwindcss-mangle/config';
 import 'fast-sort';
+import 'modern-ahocorasick';
 import 'node:fs/promises';
 import 'micromatch';
 import 'unplugin';
 import '@tailwindcss-mangle/core';
+import 'magic-string';
 import './shared/unplugin-tailwindcss-mangle.bbd58ece.mjs';
 
 const vite = unplugin.vite;

package/dist/webpack.cjs

@@ -6,10 +6,12 @@ require('node:path');
 require('@tailwindcss-mangle/shared');
 require('@tailwindcss-mangle/config');
 require('fast-sort');
+require('modern-ahocorasick');
 require('node:fs/promises');
 require('micromatch');
 require('unplugin');
 require('@tailwindcss-mangle/core');
+require('magic-string');
 require('./shared/unplugin-tailwindcss-mangle.e90953c3.cjs');
 
 const webpack = index.webpack;

package/dist/webpack.mjs

@@ -4,10 +4,12 @@ import 'node:path';
 import '@tailwindcss-mangle/shared';
 import '@tailwindcss-mangle/config';
 import 'fast-sort';
+import 'modern-ahocorasick';
 import 'node:fs/promises';
 import 'micromatch';
 import 'unplugin';
 import '@tailwindcss-mangle/core';
+import 'magic-string';
 import './shared/unplugin-tailwindcss-mangle.bbd58ece.mjs';
 
 const webpack = unplugin.webpack;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "unplugin-tailwindcss-mangle",
-  "version": "2.0.4",
+  "version": "2.1.0",
   "description": "mangle tailwindcss utilities class plugin. support vite and webpack!",
   "main": "./dist/index.cjs",
   "module": "./dist/index.mjs",
@@ -66,11 +66,13 @@
   "license": "MIT",
   "dependencies": {
     "fast-sort": "^3.4.0",
+    "magic-string": "^0.30.2",
     "micromatch": "^4.0.5",
+    "modern-ahocorasick": "^1.0.0",
     "unplugin": "^1.4.0",
-    "@tailwindcss-mangle/config": "^2.0.4",
-    "@tailwindcss-mangle/core": "^2.0.4",
-    "@tailwindcss-mangle/shared": "^2.0.4"
+    "@tailwindcss-mangle/config": "^2.1.0",
+    "@tailwindcss-mangle/core": "^2.1.0",
+    "@tailwindcss-mangle/shared": "^2.1.0"
   },
   "publishConfig": {
     "access": "public",
@@ -82,13 +84,14 @@
     "css-loader": "^6.8.1",
     "html-webpack-plugin": "^5.5.3",
     "mini-css-extract-plugin": "^2.7.6",
+    "normalize-newline": "^4.1.0",
     "postcss": "^8.4.27",
     "postcss-loader": "^7.3.3",
     "tailwindcss": "^3.3.3",
     "vite": "^4.4.9",
     "webpack": "^5.88.2",
     "webpack-build-utils": "^0.0.4",
-    "tailwindcss-patch": "^2.0.4"
+    "tailwindcss-patch": "^2.1.0"
   },
   "homepage": "https://github.com/sonofmagic/tailwindcss-mangle",
   "repository": {