@tailwindcss-mangle/core 2.2.0 → 2.2.1

package/dist/index.cjs

@@ -13,8 +13,6 @@ const babel = require('@babel/core');
 const helperPluginUtils = require('@babel/helper-plugin-utils');
 const MagicString = require('magic-string');
 const escape = require('@ast-core/escape');
-const parser$1 = require('@babel/parser');
-const traverse$1 = require('@babel/traverse');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e.default : e; }
 
@@ -24,7 +22,6 @@ const postcss__default = /*#__PURE__*/_interopDefaultCompat(postcss);
 const parser__default = /*#__PURE__*/_interopDefaultCompat(parser);
 const babel__default = /*#__PURE__*/_interopDefaultCompat(babel);
 const MagicString__default = /*#__PURE__*/_interopDefaultCompat(MagicString);
-const traverse__default = /*#__PURE__*/_interopDefaultCompat(traverse$1);
 
 function isObject(value) {
   return value !== null && typeof value === "object";
@@ -360,46 +357,32 @@ function htmlHandler(rawSource, options) {
 
 const isProd = () => process.env.NODE_ENV === "production";
 
-function getStringLiteralCalleeName(path) {
-  if (path.parentPath.isCallExpression()) {
-    const callee = path.parentPath.get("callee");
-    if (callee.isIdentifier()) {
-      return callee.node.name;
-    }
-  }
-}
-function getTemplateElementCalleeName(path) {
-  if (path.parentPath.isTemplateLiteral()) {
-    const pp = path.parentPath;
-    if (pp.parentPath.isCallExpression()) {
-      const callee = pp.parentPath.get("callee");
-      if (callee.isIdentifier()) {
-        return callee.node.name;
-      }
-    }
+function between(x, min, max, included = false) {
+  if (typeof x !== "number") {
+    return false;
   }
+  return included ? x >= min && x <= max : x > min && x < max;
 }
 
 function handleValue$1(options) {
-  const { ctx, id, path, magicString, raw, replaceMap, offset = 0, escape: escape$1 = false, preserve = false } = options;
+  const { ctx, id, path, magicString, raw, replaceMap, offset = 0, escape: escape$1 = false, markedArray } = options;
   const node = path.node;
   let value = raw;
+  for (const [s, e] of markedArray) {
+    if (between(node.start, s, e) || between(node.end, s, e)) {
+      return;
+    }
+  }
   const arr = fastSort.sort(shared.splitCode(value)).desc((x) => x.length);
   for (const str of arr) {
     if (replaceMap.has(str)) {
       ctx.addToUsedBy(str, id);
-      if (preserve) {
-        ctx.addPreserveClass(str);
-      }
       const v = replaceMap.get(str);
       if (v) {
         value = value.replaceAll(str, v);
       }
     }
   }
-  if (preserve) {
-    return;
-  }
   if (typeof node.start === "number" && typeof node.end === "number" && value) {
     const start = node.start + offset;
     const end = node.end - offset;
@@ -410,11 +393,11 @@ function handleValue$1(options) {
 }
 const JsPlugin = helperPluginUtils.declare((api, options) => {
   api.assertVersion(7);
-  const { magicString, replaceMap, id, ctx } = options;
+  const { magicString, replaceMap, id, ctx, markedArray } = options;
   return {
     visitor: {
       StringLiteral: {
-        enter(p) {
+        exit(p) {
           const opts = {
             ctx,
             id,
@@ -424,17 +407,13 @@ const JsPlugin = helperPluginUtils.declare((api, options) => {
             replaceMap,
             offset: 1,
             escape: true,
-            preserve: false
+            markedArray
           };
-          const calleeName = getStringLiteralCalleeName(p);
-          if (calleeName && ctx.isPreserveFunction(calleeName)) {
-            opts.preserve = true;
-          }
           handleValue$1(opts);
         }
       },
       TemplateElement: {
-        enter(p) {
+        exit(p) {
           const opts = {
             ctx,
             id,
@@ -444,38 +423,90 @@ const JsPlugin = helperPluginUtils.declare((api, options) => {
             replaceMap,
             offset: 0,
             escape: false,
-            preserve: false
+            markedArray
           };
-          const calleeName = getTemplateElementCalleeName(p);
-          if (calleeName && ctx.isPreserveFunction(calleeName)) {
-            opts.preserve = true;
-          }
           handleValue$1(opts);
         }
       }
     }
   };
 });
-function transformSync(code, plugins, filename) {
-  babel__default.transformSync(code, {
-    presets: [
-      // ['@babel/preset-react', {}],
-      [
-        require("@babel/preset-typescript"),
-        {
-          allExtensions: true,
-          isTSX: true
-        }
-      ]
-    ],
+function transformSync(ast, code, plugins, filename) {
+  babel__default.transformFromAstSync(ast, code, {
+    presets: loadPresets(),
     plugins,
     filename
   });
 }
+function loadPresets() {
+  return [
+    [
+      require("@babel/preset-typescript"),
+      {
+        allExtensions: true,
+        isTSX: true
+      }
+    ]
+  ];
+}
 function preProcessJs(options) {
   const { code, replaceMap, id, ctx } = options;
   const magicString = typeof code === "string" ? new MagicString__default(code) : code;
+  let ast;
+  try {
+    const file = babel__default.parseSync(magicString.original, {
+      sourceType: "unambiguous",
+      presets: loadPresets()
+    });
+    if (file) {
+      ast = file;
+    } else {
+      return code.toString();
+    }
+  } catch {
+    return code.toString();
+  }
+  const markedArray = [];
+  babel__default.traverse(ast, {
+    CallExpression: {
+      enter(p) {
+        const callee = p.get("callee");
+        if (callee.isIdentifier() && ctx.isPreserveFunction(callee.node.name)) {
+          if (p.node.start && p.node.end) {
+            markedArray.push([p.node.start, p.node.end]);
+          }
+          p.traverse({
+            StringLiteral: {
+              enter(path) {
+                const node = path.node;
+                const value = node.value;
+                const arr = fastSort.sort(shared.splitCode(value)).desc((x) => x.length);
+                for (const str of arr) {
+                  if (replaceMap.has(str)) {
+                    ctx.addPreserveClass(str);
+                  }
+                }
+              }
+            },
+            TemplateElement: {
+              enter(path) {
+                const node = path.node;
+                const value = node.value.raw;
+                const arr = fastSort.sort(shared.splitCode(value)).desc((x) => x.length);
+                for (const str of arr) {
+                  if (replaceMap.has(str)) {
+                    ctx.addPreserveClass(str);
+                  }
+                }
+              }
+            }
+          });
+        }
+      }
+    }
+  });
   transformSync(
+    ast,
     magicString.original,
     [
       [
@@ -484,7 +515,8 @@ function preProcessJs(options) {
           magicString,
           replaceMap,
           id,
-          ctx
+          ctx,
+          markedArray
         }
       ]
     ],
@@ -506,10 +538,10 @@ function preProcessRawCode(options) {
     for (const regExpMatch of allArr) {
       let ast;
       try {
-        ast = parser$1.parse(regExpMatch[0], {
+        ast = babel__default.parseSync(regExpMatch[0], {
           sourceType: "unambiguous"
         });
-        traverse__default(ast, {
+        ast && babel__default.traverse(ast, {
           StringLiteral: {
             enter(p) {
               const arr2 = fastSort.sort(shared.splitCode(p.node.value)).desc((x) => x.length);
@@ -544,7 +576,7 @@ function preProcessRawCode(options) {
       const end = arr.index + arr[0].length;
       let shouldUpdate = true;
       for (const [ps, pe] of markArr) {
-        if (start > ps && start < pe || end < pe && end > ps) {
+        if (between(start, ps, pe) || between(end, ps, pe)) {
           shouldUpdate = false;
           break;
         }

package/dist/index.mjs

@@ -12,8 +12,6 @@ import babel, { transformSync as transformSync$1 } from '@babel/core';
 import { declare } from '@babel/helper-plugin-utils';
 import MagicString from 'magic-string';
 import { jsStringEscape } from '@ast-core/escape';
-import { parse as parse$1 } from '@babel/parser';
-import traverse$1 from '@babel/traverse';
 
 
 
@@ -358,46 +356,32 @@ function htmlHandler(rawSource, options) {
 
 const isProd = () => process.env.NODE_ENV === "production";
 
-function getStringLiteralCalleeName(path) {
-  if (path.parentPath.isCallExpression()) {
-    const callee = path.parentPath.get("callee");
-    if (callee.isIdentifier()) {
-      return callee.node.name;
-    }
-  }
-}
-function getTemplateElementCalleeName(path) {
-  if (path.parentPath.isTemplateLiteral()) {
-    const pp = path.parentPath;
-    if (pp.parentPath.isCallExpression()) {
-      const callee = pp.parentPath.get("callee");
-      if (callee.isIdentifier()) {
-        return callee.node.name;
-      }
-    }
+function between(x, min, max, included = false) {
+  if (typeof x !== "number") {
+    return false;
   }
+  return included ? x >= min && x <= max : x > min && x < max;
 }
 
 function handleValue$1(options) {
-  const { ctx, id, path, magicString, raw, replaceMap, offset = 0, escape = false, preserve = false } = options;
+  const { ctx, id, path, magicString, raw, replaceMap, offset = 0, escape = false, markedArray } = options;
   const node = path.node;
   let value = raw;
+  for (const [s, e] of markedArray) {
+    if (between(node.start, s, e) || between(node.end, s, e)) {
+      return;
+    }
+  }
   const arr = sort(splitCode(value)).desc((x) => x.length);
   for (const str of arr) {
     if (replaceMap.has(str)) {
       ctx.addToUsedBy(str, id);
-      if (preserve) {
-        ctx.addPreserveClass(str);
-      }
       const v = replaceMap.get(str);
       if (v) {
         value = value.replaceAll(str, v);
       }
     }
   }
-  if (preserve) {
-    return;
-  }
   if (typeof node.start === "number" && typeof node.end === "number" && value) {
     const start = node.start + offset;
     const end = node.end - offset;
@@ -408,11 +392,11 @@ function handleValue$1(options) {
 }
 const JsPlugin = declare((api, options) => {
   api.assertVersion(7);
-  const { magicString, replaceMap, id, ctx } = options;
+  const { magicString, replaceMap, id, ctx, markedArray } = options;
   return {
     visitor: {
       StringLiteral: {
-        enter(p) {
+        exit(p) {
           const opts = {
             ctx,
             id,
@@ -422,17 +406,13 @@ const JsPlugin = declare((api, options) => {
             replaceMap,
             offset: 1,
             escape: true,
-            preserve: false
+            markedArray
           };
-          const calleeName = getStringLiteralCalleeName(p);
-          if (calleeName && ctx.isPreserveFunction(calleeName)) {
-            opts.preserve = true;
-          }
           handleValue$1(opts);
         }
       },
       TemplateElement: {
-        enter(p) {
+        exit(p) {
           const opts = {
             ctx,
             id,
@@ -442,38 +422,90 @@ const JsPlugin = declare((api, options) => {
             replaceMap,
             offset: 0,
             escape: false,
-            preserve: false
+            markedArray
           };
-          const calleeName = getTemplateElementCalleeName(p);
-          if (calleeName && ctx.isPreserveFunction(calleeName)) {
-            opts.preserve = true;
-          }
           handleValue$1(opts);
         }
       }
     }
   };
 });
-function transformSync(code, plugins, filename) {
-  babel.transformSync(code, {
-    presets: [
-      // ['@babel/preset-react', {}],
-      [
-        require("@babel/preset-typescript"),
-        {
-          allExtensions: true,
-          isTSX: true
-        }
-      ]
-    ],
+function transformSync(ast, code, plugins, filename) {
+  babel.transformFromAstSync(ast, code, {
+    presets: loadPresets(),
     plugins,
     filename
   });
 }
+function loadPresets() {
+  return [
+    [
+      require("@babel/preset-typescript"),
+      {
+        allExtensions: true,
+        isTSX: true
+      }
+    ]
+  ];
+}
 function preProcessJs(options) {
   const { code, replaceMap, id, ctx } = options;
   const magicString = typeof code === "string" ? new MagicString(code) : code;
+  let ast;
+  try {
+    const file = babel.parseSync(magicString.original, {
+      sourceType: "unambiguous",
+      presets: loadPresets()
+    });
+    if (file) {
+      ast = file;
+    } else {
+      return code.toString();
+    }
+  } catch {
+    return code.toString();
+  }
+  const markedArray = [];
+  babel.traverse(ast, {
+    CallExpression: {
+      enter(p) {
+        const callee = p.get("callee");
+        if (callee.isIdentifier() && ctx.isPreserveFunction(callee.node.name)) {
+          if (p.node.start && p.node.end) {
+            markedArray.push([p.node.start, p.node.end]);
+          }
+          p.traverse({
+            StringLiteral: {
+              enter(path) {
+                const node = path.node;
+                const value = node.value;
+                const arr = sort(splitCode(value)).desc((x) => x.length);
+                for (const str of arr) {
+                  if (replaceMap.has(str)) {
+                    ctx.addPreserveClass(str);
+                  }
+                }
+              }
+            },
+            TemplateElement: {
+              enter(path) {
+                const node = path.node;
+                const value = node.value.raw;
+                const arr = sort(splitCode(value)).desc((x) => x.length);
+                for (const str of arr) {
+                  if (replaceMap.has(str)) {
+                    ctx.addPreserveClass(str);
+                  }
+                }
+              }
+            }
+          });
+        }
+      }
+    }
+  });
   transformSync(
+    ast,
     magicString.original,
     [
       [
@@ -482,7 +514,8 @@ function preProcessJs(options) {
           magicString,
           replaceMap,
           id,
-          ctx
+          ctx,
+          markedArray
         }
       ]
     ],
@@ -504,10 +537,10 @@ function preProcessRawCode(options) {
     for (const regExpMatch of allArr) {
       let ast;
       try {
-        ast = parse$1(regExpMatch[0], {
+        ast = babel.parseSync(regExpMatch[0], {
           sourceType: "unambiguous"
         });
-        traverse$1(ast, {
+        ast && babel.traverse(ast, {
           StringLiteral: {
             enter(p) {
               const arr2 = sort(splitCode(p.node.value)).desc((x) => x.length);
@@ -542,7 +575,7 @@ function preProcessRawCode(options) {
       const end = arr.index + arr[0].length;
       let shouldUpdate = true;
       for (const [ps, pe] of markArr) {
-        if (start > ps && start < pe || end < pe && end > ps) {
+        if (between(start, ps, pe) || between(end, ps, pe)) {
           shouldUpdate = false;
           break;
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tailwindcss-mangle/core",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "description": "The core of tailwindcss-mangle",
   "exports": {
     ".": {
@@ -39,9 +39,7 @@
     "@ast-core/escape": "^1.0.1",
     "@babel/core": "^7.22.19",
     "@babel/helper-plugin-utils": "^7.22.5",
-    "@babel/parser": "^7.22.16",
     "@babel/preset-typescript": "^7.22.15",
-    "@babel/traverse": "^7.22.19",
     "@babel/types": "^7.22.19",
     "fast-sort": "^3.4.0",
     "magic-string": "^0.30.3",
@@ -49,13 +47,12 @@
     "parse5": "^7.1.2",
     "postcss": "^8.4.29",
     "postcss-selector-parser": "^6.0.13",
-    "@tailwindcss-mangle/config": "^2.2.0",
-    "@tailwindcss-mangle/shared": "^2.2.0"
+    "@tailwindcss-mangle/config": "^2.2.1",
+    "@tailwindcss-mangle/shared": "^2.2.1"
   },
   "devDependencies": {
     "@parse5/tools": "^0.3.0",
     "@types/babel__core": "^7.20.1",
-    "@types/babel__traverse": "^7.20.1",
     "@types/micromatch": "^4.0.2",
     "@vue/compiler-core": "^3.3.4",
     "@vue/compiler-sfc": "^3.3.4"