weapp-tailwindcss 4.7.2 → 4.7.4

package/dist/{chunk-Z2H7M33Z.mjs → chunk-6IYMPBCH.mjs}

@@ -12,10 +12,12 @@ import {
   createTailwindPatchPromise
 } from "./chunk-667CYXAH.mjs";
 import {
+  createAttributeMatcher,
   generateCode,
   getCompilerContext,
+  toCustomAttributesEntities,
   vitePluginName
-} from "./chunk-JYCQWWYU.mjs";
+} from "./chunk-V35QS2PT.mjs";
 import {
   replaceWxml
 } from "./chunk-VSRDBMDB.mjs";
@@ -43,22 +45,40 @@ function traverse(node, visitor) {
     }
   }
 }
-function createClassAttributeUpdater(ms) {
-  return (prop) => {
-    if (prop.value) {
-      ms.update(prop.value.loc.start.offset + 1, prop.value.loc.end.offset - 1, replaceWxml(prop.value.content));
-    }
-  };
+function updateStaticAttribute(ms, prop) {
+  if (!prop.value) {
+    return;
+  }
+  const start = prop.value.loc.start.offset + 1;
+  const end = prop.value.loc.end.offset - 1;
+  if (start < end) {
+    ms.update(start, end, replaceWxml(prop.value.content));
+  }
 }
-function createClassDirectiveUpdater(ms, jsHandler, runtimeSet) {
-  return (prop) => {
-    if (prop.arg?.type === NodeTypes.SIMPLE_EXPRESSION && prop.arg.content === "class" && prop.exp?.type === NodeTypes.SIMPLE_EXPRESSION) {
-      const generated = generateCode(prop.exp.content, {
-        jsHandler,
-        runtimeSet
-      });
-      ms.update(prop.exp.loc.start.offset, prop.exp.loc.end.offset, generated);
-    }
+function updateDirectiveExpression(ms, prop, jsHandler, runtimeSet) {
+  if (prop.exp?.type !== NodeTypes.SIMPLE_EXPRESSION) {
+    return;
+  }
+  const start = prop.exp.loc.start.offset;
+  const end = prop.exp.loc.end.offset;
+  if (start >= end) {
+    return;
+  }
+  const generated = generateCode(prop.exp.content, {
+    jsHandler,
+    runtimeSet,
+    wrapExpression: true
+  });
+  ms.update(start, end, generated);
+}
+function shouldHandleAttribute(tag, attrName, disabledDefaultTemplateHandler, matchCustomAttribute) {
+  const lowerName = attrName.toLowerCase();
+  const shouldHandleDefault = !disabledDefaultTemplateHandler && lowerName === "class";
+  const shouldHandleCustom = matchCustomAttribute?.(tag, attrName) ?? false;
+  return {
+    shouldHandleDefault,
+    shouldHandleCustom,
+    shouldHandle: shouldHandleDefault || shouldHandleCustom
   };
 }
 var defaultCreateJsHandlerOptions = {
@@ -68,25 +88,48 @@ var defaultCreateJsHandlerOptions = {
     ]
   }
 };
-function transformUVue(code, id, jsHandler, runtimeSet) {
-  if (!/\.uvue(?:\?.*)?$/.test(id)) {
+function transformUVue(code, id, jsHandler, runtimeSet, options = {}) {
+  if (!/\.(?:uvue|nvue)(?:\?.*)?$/.test(id)) {
     return;
   }
+  const { customAttributesEntities, disabledDefaultTemplateHandler = false } = options;
+  const matchCustomAttribute = createAttributeMatcher(customAttributesEntities);
   const ms = new MagicString(code);
   const { descriptor, errors } = parse(code);
   if (errors.length === 0) {
     if (descriptor.template?.ast) {
-      const updateStaticClass = createClassAttributeUpdater(ms);
-      const updateDynamicClass = createClassDirectiveUpdater(ms, jsHandler, runtimeSet);
       traverse(descriptor.template.ast, (node) => {
         if (node.type !== NodeTypes.ELEMENT) {
           return;
         }
+        const tag = node.tag;
         for (const prop of node.props) {
-          if (prop.type === NodeTypes.ATTRIBUTE && prop.name === "class") {
-            updateStaticClass(prop);
-          } else if (prop.type === NodeTypes.DIRECTIVE && prop.name === "bind") {
-            updateDynamicClass(prop);
+          if (prop.type === NodeTypes.ATTRIBUTE) {
+            const { shouldHandle, shouldHandleDefault } = shouldHandleAttribute(
+              tag,
+              prop.name,
+              disabledDefaultTemplateHandler,
+              matchCustomAttribute
+            );
+            if (!shouldHandle) {
+              continue;
+            }
+            updateStaticAttribute(ms, prop);
+            if (shouldHandleDefault) {
+              continue;
+            }
+          } else if (prop.type === NodeTypes.DIRECTIVE && prop.name === "bind" && prop.arg?.type === NodeTypes.SIMPLE_EXPRESSION && prop.arg.isStatic) {
+            const attrName = prop.arg.content;
+            const { shouldHandle } = shouldHandleAttribute(
+              tag,
+              attrName,
+              disabledDefaultTemplateHandler,
+              matchCustomAttribute
+            );
+            if (!shouldHandle) {
+              continue;
+            }
+            updateDirectiveExpression(ms, prop, jsHandler, runtimeSet);
           }
         }
       });
@@ -243,6 +286,7 @@ function UnifiedViteWeappTailwindcssPlugin(options = {}) {
   const opts = getCompilerContext(options);
   const {
     disabled,
+    customAttributes,
     onEnd,
     onLoad,
     onStart,
@@ -254,14 +298,36 @@ function UnifiedViteWeappTailwindcssPlugin(options = {}) {
     appType,
     cache,
     twPatcher,
-    uniAppX
+    uniAppX,
+    disabledDefaultTemplateHandler
   } = opts;
   if (disabled) {
     return;
   }
+  const customAttributesEntities = toCustomAttributesEntities(customAttributes);
   const patchPromise = createTailwindPatchPromise(twPatcher);
   let runtimeSet;
+  let runtimeSetPromise;
   let resolvedConfig;
+  async function ensureRuntimeClassSet(force = false) {
+    await patchPromise;
+    if (!force && runtimeSet) {
+      return runtimeSet;
+    }
+    if (force || !runtimeSetPromise) {
+      const task2 = collectRuntimeClassSet(twPatcher, { force: force || !runtimeSet });
+      runtimeSetPromise = task2;
+    }
+    const task = runtimeSetPromise;
+    try {
+      runtimeSet = await task;
+      return runtimeSet;
+    } finally {
+      if (runtimeSetPromise === task) {
+        runtimeSetPromise = void 0;
+      }
+    }
+  }
   onLoad();
   const plugins = [
     {
@@ -297,8 +363,8 @@ function UnifiedViteWeappTailwindcssPlugin(options = {}) {
         }
         const moduleGraphOptions = createBundleModuleGraphOptions(outDir, jsEntries);
         const groupedEntries = getGroupedEntries(entries, opts);
-        runtimeSet = await collectRuntimeClassSet(twPatcher, { force: true });
-        debug("get runtimeSet, class count: %d", runtimeSet.size);
+        const runtime = await ensureRuntimeClassSet(true);
+        debug("get runtimeSet, class count: %d", runtime.size);
         const handleLinkedUpdate = (fileName, previous, next) => {
           onUpdate(fileName, previous, next);
           debug("js linked handle: %s", fileName);
@@ -510,11 +576,21 @@ function UnifiedViteWeappTailwindcssPlugin(options = {}) {
         name: "weapp-tailwindcss:uni-app-x:nvue",
         enforce: "pre",
         async buildStart() {
-          await patchPromise;
-          runtimeSet = await collectRuntimeClassSet(twPatcher, { force: true });
+          await ensureRuntimeClassSet(true);
         },
-        transform(code, id) {
-          return transformUVue(code, id, jsHandler, runtimeSet);
+        async transform(code, id) {
+          if (!/\.(?:uvue|nvue)(?:\?.*)?$/.test(id)) {
+            return;
+          }
+          const currentRuntimeSet = await ensureRuntimeClassSet();
+          const extraOptions = customAttributesEntities.length > 0 || disabledDefaultTemplateHandler ? {
+            customAttributesEntities,
+            disabledDefaultTemplateHandler
+          } : void 0;
+          if (extraOptions) {
+            return transformUVue(code, id, jsHandler, currentRuntimeSet, extraOptions);
+          }
+          return transformUVue(code, id, jsHandler, currentRuntimeSet);
         }
       }
     );

package/dist/{chunk-5BW6X6AJ.mjs → chunk-FPX2BD2A.mjs}

@@ -17,13 +17,13 @@ import {
 import {
   getCompilerContext,
   pluginName
-} from "./chunk-JYCQWWYU.mjs";
+} from "./chunk-V35QS2PT.mjs";
 import {
   getGroupedEntries
 } from "./chunk-ZNKIYZRQ.mjs";
 import {
   __dirname
-} from "./chunk-4EUTRMUC.mjs";
+} from "./chunk-SCOGAO45.mjs";
 
 // src/bundlers/webpack/BaseUnifiedPlugin/v5.ts
 import fs from "fs";

package/dist/{chunk-2SI3KT2H.js → chunk-HMTZ4JJN.js}

@@ -8,7 +8,7 @@ var _chunkLTJQUORKjs = require('./chunk-LTJQUORK.js');
 var _chunkBUMQQPAOjs = require('./chunk-BUMQQPAO.js');
 
 
-var _chunkFPDJ3BCMjs = require('./chunk-FPDJ3BCM.js');
+var _chunkQA6SPWSQjs = require('./chunk-QA6SPWSQ.js');
 
 // src/bundlers/gulp/index.ts
 var _buffer = require('buffer');
@@ -19,7 +19,7 @@ var _stream = require('stream'); var _stream2 = _interopRequireDefault(_stream);
 var debug = _chunkBUMQQPAOjs.createDebug.call(void 0, );
 var Transform = _stream2.default.Transform;
 function createPlugins(options = {}) {
-  const opts = _chunkFPDJ3BCMjs.getCompilerContext.call(void 0, options);
+  const opts = _chunkQA6SPWSQjs.getCompilerContext.call(void 0, options);
   const { templateHandler, styleHandler, jsHandler, cache, twPatcher } = opts;
   let runtimeSet = /* @__PURE__ */ new Set();
   const patchPromise = _chunkBUMQQPAOjs.createTailwindPatchPromise.call(void 0, twPatcher);

package/dist/{chunk-GNWJEIZZ.js → chunk-I6FBWASF.js}

@@ -15,7 +15,9 @@ var _chunkBUMQQPAOjs = require('./chunk-BUMQQPAO.js');
 
 
 
-var _chunkFPDJ3BCMjs = require('./chunk-FPDJ3BCM.js');
+
+
+var _chunkQA6SPWSQjs = require('./chunk-QA6SPWSQ.js');
 
 
 var _chunkDWAEHRHNjs = require('./chunk-DWAEHRHN.js');
@@ -43,22 +45,40 @@ function traverse(node, visitor) {
     }
   }
 }
-function createClassAttributeUpdater(ms) {
-  return (prop) => {
-    if (prop.value) {
-      ms.update(prop.value.loc.start.offset + 1, prop.value.loc.end.offset - 1, _chunkDWAEHRHNjs.replaceWxml.call(void 0, prop.value.content));
-    }
-  };
+function updateStaticAttribute(ms, prop) {
+  if (!prop.value) {
+    return;
+  }
+  const start = prop.value.loc.start.offset + 1;
+  const end = prop.value.loc.end.offset - 1;
+  if (start < end) {
+    ms.update(start, end, _chunkDWAEHRHNjs.replaceWxml.call(void 0, prop.value.content));
+  }
 }
-function createClassDirectiveUpdater(ms, jsHandler, runtimeSet) {
-  return (prop) => {
-    if (_optionalChain([prop, 'access', _ => _.arg, 'optionalAccess', _2 => _2.type]) === _compilerdom.NodeTypes.SIMPLE_EXPRESSION && prop.arg.content === "class" && _optionalChain([prop, 'access', _3 => _3.exp, 'optionalAccess', _4 => _4.type]) === _compilerdom.NodeTypes.SIMPLE_EXPRESSION) {
-      const generated = _chunkFPDJ3BCMjs.generateCode.call(void 0, prop.exp.content, {
-        jsHandler,
-        runtimeSet
-      });
-      ms.update(prop.exp.loc.start.offset, prop.exp.loc.end.offset, generated);
-    }
+function updateDirectiveExpression(ms, prop, jsHandler, runtimeSet) {
+  if (_optionalChain([prop, 'access', _ => _.exp, 'optionalAccess', _2 => _2.type]) !== _compilerdom.NodeTypes.SIMPLE_EXPRESSION) {
+    return;
+  }
+  const start = prop.exp.loc.start.offset;
+  const end = prop.exp.loc.end.offset;
+  if (start >= end) {
+    return;
+  }
+  const generated = _chunkQA6SPWSQjs.generateCode.call(void 0, prop.exp.content, {
+    jsHandler,
+    runtimeSet,
+    wrapExpression: true
+  });
+  ms.update(start, end, generated);
+}
+function shouldHandleAttribute(tag, attrName, disabledDefaultTemplateHandler, matchCustomAttribute) {
+  const lowerName = attrName.toLowerCase();
+  const shouldHandleDefault = !disabledDefaultTemplateHandler && lowerName === "class";
+  const shouldHandleCustom = _nullishCoalesce(_optionalChain([matchCustomAttribute, 'optionalCall', _3 => _3(tag, attrName)]), () => ( false));
+  return {
+    shouldHandleDefault,
+    shouldHandleCustom,
+    shouldHandle: shouldHandleDefault || shouldHandleCustom
   };
 }
 var defaultCreateJsHandlerOptions = {
@@ -68,25 +88,48 @@ var defaultCreateJsHandlerOptions = {
     ]
   }
 };
-function transformUVue(code, id, jsHandler, runtimeSet) {
-  if (!/\.uvue(?:\?.*)?$/.test(id)) {
+function transformUVue(code, id, jsHandler, runtimeSet, options = {}) {
+  if (!/\.(?:uvue|nvue)(?:\?.*)?$/.test(id)) {
     return;
   }
+  const { customAttributesEntities, disabledDefaultTemplateHandler = false } = options;
+  const matchCustomAttribute = _chunkQA6SPWSQjs.createAttributeMatcher.call(void 0, customAttributesEntities);
   const ms = new (0, _magicstring2.default)(code);
   const { descriptor, errors } = _compilersfc.parse.call(void 0, code);
   if (errors.length === 0) {
-    if (_optionalChain([descriptor, 'access', _5 => _5.template, 'optionalAccess', _6 => _6.ast])) {
-      const updateStaticClass = createClassAttributeUpdater(ms);
-      const updateDynamicClass = createClassDirectiveUpdater(ms, jsHandler, runtimeSet);
+    if (_optionalChain([descriptor, 'access', _4 => _4.template, 'optionalAccess', _5 => _5.ast])) {
       traverse(descriptor.template.ast, (node) => {
         if (node.type !== _compilerdom.NodeTypes.ELEMENT) {
           return;
         }
+        const tag = node.tag;
         for (const prop of node.props) {
-          if (prop.type === _compilerdom.NodeTypes.ATTRIBUTE && prop.name === "class") {
-            updateStaticClass(prop);
-          } else if (prop.type === _compilerdom.NodeTypes.DIRECTIVE && prop.name === "bind") {
-            updateDynamicClass(prop);
+          if (prop.type === _compilerdom.NodeTypes.ATTRIBUTE) {
+            const { shouldHandle, shouldHandleDefault } = shouldHandleAttribute(
+              tag,
+              prop.name,
+              disabledDefaultTemplateHandler,
+              matchCustomAttribute
+            );
+            if (!shouldHandle) {
+              continue;
+            }
+            updateStaticAttribute(ms, prop);
+            if (shouldHandleDefault) {
+              continue;
+            }
+          } else if (prop.type === _compilerdom.NodeTypes.DIRECTIVE && prop.name === "bind" && _optionalChain([prop, 'access', _6 => _6.arg, 'optionalAccess', _7 => _7.type]) === _compilerdom.NodeTypes.SIMPLE_EXPRESSION && prop.arg.isStatic) {
+            const attrName = prop.arg.content;
+            const { shouldHandle } = shouldHandleAttribute(
+              tag,
+              attrName,
+              disabledDefaultTemplateHandler,
+              matchCustomAttribute
+            );
+            if (!shouldHandle) {
+              continue;
+            }
+            updateDirectiveExpression(ms, prop, jsHandler, runtimeSet);
           }
         }
       });
@@ -235,14 +278,15 @@ function applyLinkedResults(linked, entries, onLinkedUpdate, onApplied) {
     } else {
       entry.output.source = code;
     }
-    _optionalChain([onApplied, 'optionalCall', _7 => _7(entry, code)]);
+    _optionalChain([onApplied, 'optionalCall', _8 => _8(entry, code)]);
     onLinkedUpdate(entry.fileName, previous, code);
   }
 }
 function UnifiedViteWeappTailwindcssPlugin(options = {}) {
-  const opts = _chunkFPDJ3BCMjs.getCompilerContext.call(void 0, options);
+  const opts = _chunkQA6SPWSQjs.getCompilerContext.call(void 0, options);
   const {
     disabled,
+    customAttributes,
     onEnd,
     onLoad,
     onStart,
@@ -254,18 +298,40 @@ function UnifiedViteWeappTailwindcssPlugin(options = {}) {
     appType,
     cache,
     twPatcher,
-    uniAppX
+    uniAppX,
+    disabledDefaultTemplateHandler
   } = opts;
   if (disabled) {
     return;
   }
+  const customAttributesEntities = _chunkQA6SPWSQjs.toCustomAttributesEntities.call(void 0, customAttributes);
   const patchPromise = _chunkBUMQQPAOjs.createTailwindPatchPromise.call(void 0, twPatcher);
   let runtimeSet;
+  let runtimeSetPromise;
   let resolvedConfig;
+  async function ensureRuntimeClassSet(force = false) {
+    await patchPromise;
+    if (!force && runtimeSet) {
+      return runtimeSet;
+    }
+    if (force || !runtimeSetPromise) {
+      const task2 = _chunkBUMQQPAOjs.collectRuntimeClassSet.call(void 0, twPatcher, { force: force || !runtimeSet });
+      runtimeSetPromise = task2;
+    }
+    const task = runtimeSetPromise;
+    try {
+      runtimeSet = await task;
+      return runtimeSet;
+    } finally {
+      if (runtimeSetPromise === task) {
+        runtimeSetPromise = void 0;
+      }
+    }
+  }
   onLoad();
   const plugins = [
     {
-      name: `${_chunkFPDJ3BCMjs.vitePluginName}:post`,
+      name: `${_chunkQA6SPWSQjs.vitePluginName}:post`,
       enforce: "post",
       configResolved(config) {
         resolvedConfig = config;
@@ -285,8 +351,8 @@ function UnifiedViteWeappTailwindcssPlugin(options = {}) {
         debug("start");
         onStart();
         const entries = Object.entries(bundle);
-        const rootDir = _optionalChain([resolvedConfig, 'optionalAccess', _8 => _8.root]) ? _path2.default.resolve(resolvedConfig.root) : _process2.default.cwd();
-        const outDir = _optionalChain([resolvedConfig, 'optionalAccess', _9 => _9.build, 'optionalAccess', _10 => _10.outDir]) ? _path2.default.resolve(rootDir, resolvedConfig.build.outDir) : rootDir;
+        const rootDir = _optionalChain([resolvedConfig, 'optionalAccess', _9 => _9.root]) ? _path2.default.resolve(resolvedConfig.root) : _process2.default.cwd();
+        const outDir = _optionalChain([resolvedConfig, 'optionalAccess', _10 => _10.build, 'optionalAccess', _11 => _11.outDir]) ? _path2.default.resolve(rootDir, resolvedConfig.build.outDir) : rootDir;
         const jsEntries = /* @__PURE__ */ new Map();
         for (const [fileName, output] of entries) {
           const entry = { fileName, output };
@@ -297,8 +363,8 @@ function UnifiedViteWeappTailwindcssPlugin(options = {}) {
         }
         const moduleGraphOptions = createBundleModuleGraphOptions(outDir, jsEntries);
         const groupedEntries = _chunkUW3WHSZ5js.getGroupedEntries.call(void 0, entries, opts);
-        runtimeSet = await _chunkBUMQQPAOjs.collectRuntimeClassSet.call(void 0, twPatcher, { force: true });
-        debug("get runtimeSet, class count: %d", runtimeSet.size);
+        const runtime = await ensureRuntimeClassSet(true);
+        debug("get runtimeSet, class count: %d", runtime.size);
         const handleLinkedUpdate = (fileName, previous, next) => {
           onUpdate(fileName, previous, next);
           debug("js linked handle: %s", fileName);
@@ -318,7 +384,7 @@ function UnifiedViteWeappTailwindcssPlugin(options = {}) {
           filename: absoluteFilename,
           moduleGraph: moduleGraphOptions,
           babelParserOptions: {
-            ..._nullishCoalesce(_optionalChain([extra, 'optionalAccess', _11 => _11.babelParserOptions]), () => ( {})),
+            ..._nullishCoalesce(_optionalChain([extra, 'optionalAccess', _12 => _12.babelParserOptions]), () => ( {})),
             sourceFilename: absoluteFilename
           }
         });
@@ -510,11 +576,21 @@ function UnifiedViteWeappTailwindcssPlugin(options = {}) {
         name: "weapp-tailwindcss:uni-app-x:nvue",
         enforce: "pre",
         async buildStart() {
-          await patchPromise;
-          runtimeSet = await _chunkBUMQQPAOjs.collectRuntimeClassSet.call(void 0, twPatcher, { force: true });
+          await ensureRuntimeClassSet(true);
         },
-        transform(code, id) {
-          return transformUVue(code, id, jsHandler, runtimeSet);
+        async transform(code, id) {
+          if (!/\.(?:uvue|nvue)(?:\?.*)?$/.test(id)) {
+            return;
+          }
+          const currentRuntimeSet = await ensureRuntimeClassSet();
+          const extraOptions = customAttributesEntities.length > 0 || disabledDefaultTemplateHandler ? {
+            customAttributesEntities,
+            disabledDefaultTemplateHandler
+          } : void 0;
+          if (extraOptions) {
+            return transformUVue(code, id, jsHandler, currentRuntimeSet, extraOptions);
+          }
+          return transformUVue(code, id, jsHandler, currentRuntimeSet);
         }
       }
     );

package/dist/{chunk-Q6PLZCM6.mjs → chunk-JII7EQ6K.mjs}

@@ -8,7 +8,7 @@ import {
 } from "./chunk-667CYXAH.mjs";
 import {
   getCompilerContext
-} from "./chunk-JYCQWWYU.mjs";
+} from "./chunk-V35QS2PT.mjs";
 
 // src/bundlers/gulp/index.ts
 import { Buffer } from "buffer";