weapp-tailwindcss 5.2.14 → 5.3.1

package/dist/transform-DSRPiBWz.js

@@ -0,0 +1,201 @@
+import { n as generateCode, p as replaceWxml, r as createAttributeMatcher } from "./wxml-B7OAVpXJ.js";
+import { n as shouldEnableComponentLocalStyle, r as shouldEnablePageLocalStyle, t as UniAppXComponentLocalStyleCollector } from "./component-local-style-C2wC8o9F.js";
+import MagicString from "magic-string";
+import { NodeTypes, parse } from "@vue/compiler-dom";
+//#region src/uni-app-x/transform.ts
+function traverse(node, visitor) {
+	visitor(node);
+	if (Array.isArray(node.children)) {
+		for (const child of node.children) if (child && typeof child === "object" && "type" in child) traverse(child, visitor);
+	}
+}
+function updateStaticAttribute(ms, prop, offset, content = prop.value?.content) {
+	if (!prop.value) return;
+	const start = offset + prop.value.loc.start.offset + 1;
+	const end = offset + prop.value.loc.end.offset - 1;
+	if (start < end) ms.update(start, end, replaceWxml(content ?? ""));
+}
+function updateStaticAttributeWithLocalStyle(ms, prop, offset, collector, deep, content = prop.value?.content) {
+	if (!prop.value) return;
+	const start = offset + prop.value.loc.start.offset + 1;
+	const end = offset + prop.value.loc.end.offset - 1;
+	if (start < end) ms.update(start, end, collector.collectAndRewriteStaticClass(content ?? "", { deep }));
+}
+function updateDirectiveExpression(ms, prop, offset, jsHandler, runtimeSet) {
+	if (prop.exp?.type !== NodeTypes.SIMPLE_EXPRESSION) return;
+	const expression = prop.exp.content;
+	const start = offset + prop.exp.loc.start.offset;
+	const end = offset + prop.exp.loc.end.offset;
+	if (start >= end) return;
+	const generated = generateCode(expression, {
+		jsHandler,
+		runtimeSet,
+		wrapExpression: true
+	});
+	ms.update(start, end, generated);
+}
+function updateDirectiveExpressionWithLocalStyle(ms, prop, offset, jsHandler, collector, deep, runtimeSet) {
+	if (prop.exp?.type !== NodeTypes.SIMPLE_EXPRESSION) return;
+	const expression = prop.exp.content;
+	const start = offset + prop.exp.loc.start.offset;
+	const end = offset + prop.exp.loc.end.offset;
+	if (start >= end) return;
+	collector.collectRuntimeClasses(expression, {
+		deep,
+		wrapExpression: true
+	});
+	const generated = generateCode(expression, {
+		jsHandler,
+		runtimeSet,
+		wrapExpression: true
+	});
+	ms.update(start, end, collector.rewriteTransformedCode(generated, { wrapExpression: true }));
+}
+function shouldEnableLocalStyle(id, options) {
+	if (options.enableComponentLocalStyle && shouldEnableComponentLocalStyle(id)) return true;
+	if (options.enablePageLocalStyle && shouldEnablePageLocalStyle(id)) return true;
+	return false;
+}
+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
+	};
+}
+const defaultCreateJsHandlerOptions = { babelParserOptions: { plugins: ["typescript"] } };
+const UVUE_NVUE_RE = /\.(?:uvue|nvue)(?:\?.*)?$/;
+const SFC_BLOCK_RE = /<(template|script|style)\b([^>]*)>/gi;
+const SCRIPT_SETUP_RE = /(?:^|\s)setup(?:\s|=|$)/;
+const STYLE_SCOPED_RE = /(?:^|\s)scoped(?:\s|=|$)/i;
+function findSfcBlockEnd(code, type, contentStart) {
+	const closeTag = new RegExp(`<\\/${type}\\s*>`, "gi");
+	if (type !== "template") {
+		const match = closeTag.exec(code.slice(contentStart));
+		return match ? {
+			blockEnd: contentStart + match.index + match[0].length,
+			contentEnd: contentStart + match.index
+		} : void 0;
+	}
+	const tag = new RegExp(`<\\/?${type}\\b[^>]*>`, "gi");
+	tag.lastIndex = contentStart;
+	let depth = 1;
+	let match = tag.exec(code);
+	while (match) {
+		if (match[0].startsWith("</")) depth -= 1;
+		else if (!match[0].trimEnd().endsWith("/>")) depth += 1;
+		if (depth === 0) return {
+			blockEnd: tag.lastIndex,
+			contentEnd: match.index
+		};
+		match = tag.exec(code);
+	}
+}
+function parseSfc(code) {
+	const descriptor = {
+		errors: [],
+		styles: []
+	};
+	for (const match of code.matchAll(SFC_BLOCK_RE)) {
+		const type = match[1];
+		const attrs = match[2] ?? "";
+		const contentStart = (match.index ?? 0) + match[0].length;
+		const blockBoundary = findSfcBlockEnd(code, type, contentStart);
+		if (!blockBoundary) {
+			descriptor.errors.push(/* @__PURE__ */ new Error(`未闭合的 ${type} SFC 块`));
+			continue;
+		}
+		const { contentEnd } = blockBoundary;
+		const content = code.slice(contentStart, contentEnd);
+		const block = {
+			content,
+			start: contentStart,
+			end: contentEnd,
+			attrs
+		};
+		if (type === "template" && !descriptor.template) {
+			try {
+				descriptor.template = {
+					...block,
+					ast: parse(content)
+				};
+			} catch (error) {
+				descriptor.errors.push(error);
+				descriptor.template = block;
+			}
+			continue;
+		}
+		if (type === "script") {
+			if (SCRIPT_SETUP_RE.test(attrs)) descriptor.scriptSetup ?? (descriptor.scriptSetup = block);
+			else descriptor.script ?? (descriptor.script = block);
+			continue;
+		}
+		if (type === "style") descriptor.styles.push(block);
+	}
+	return descriptor;
+}
+function transformUVue(code, id, jsHandler, runtimeSet, options = {}) {
+	if (!UVUE_NVUE_RE.test(id)) return;
+	const { customAttributesEntities, disabledDefaultTemplateHandler = false } = options;
+	const matchCustomAttribute = createAttributeMatcher(customAttributesEntities);
+	const ms = new MagicString(code);
+	const descriptor = parseSfc(code);
+	const localStyleCollector = shouldEnableLocalStyle(id, options) ? new UniAppXComponentLocalStyleCollector(id, runtimeSet) : void 0;
+	if (descriptor.errors.length === 0) {
+		if (descriptor.template?.ast) {
+			const templateOffset = descriptor.template.start;
+			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) {
+					const { shouldHandle, shouldHandleCustom, shouldHandleDefault } = shouldHandleAttribute(tag, prop.name, disabledDefaultTemplateHandler, matchCustomAttribute);
+					if (!shouldHandle) continue;
+					if (localStyleCollector) updateStaticAttributeWithLocalStyle(ms, prop, templateOffset, localStyleCollector, options.webCustomAttributeDeep === true && shouldHandleCustom);
+					else updateStaticAttribute(ms, prop, templateOffset);
+					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, shouldHandleCustom } = shouldHandleAttribute(tag, attrName, disabledDefaultTemplateHandler, matchCustomAttribute);
+					if (!shouldHandle) continue;
+					if (localStyleCollector) updateDirectiveExpressionWithLocalStyle(ms, prop, templateOffset, jsHandler, localStyleCollector, options.webCustomAttributeDeep === true && shouldHandleCustom, runtimeSet);
+					else updateDirectiveExpression(ms, prop, templateOffset, jsHandler, runtimeSet);
+				}
+			});
+		}
+		if (descriptor.script) {
+			localStyleCollector?.collectRuntimeClasses(descriptor.script.content);
+			const { code } = jsHandler(descriptor.script.content, runtimeSet ?? /* @__PURE__ */ new Set(), defaultCreateJsHandlerOptions);
+			ms.update(descriptor.script.start, descriptor.script.end, localStyleCollector ? localStyleCollector.rewriteTransformedCode(code) : code);
+		}
+		if (descriptor.scriptSetup) {
+			localStyleCollector?.collectRuntimeClasses(descriptor.scriptSetup.content);
+			const { code } = jsHandler(descriptor.scriptSetup.content, runtimeSet ?? /* @__PURE__ */ new Set(), defaultCreateJsHandlerOptions);
+			ms.update(descriptor.scriptSetup.start, descriptor.scriptSetup.end, localStyleCollector ? localStyleCollector.rewriteTransformedCode(code) : code);
+		}
+		if (localStyleCollector?.hasStyles()) {
+			const scopedStyle = descriptor.styles.findLast((style) => STYLE_SCOPED_RE.test(style.attrs));
+			if (scopedStyle && options.onWebLocalStyleRules) options.onWebLocalStyleRules(localStyleCollector.toStyleRules());
+			else if (scopedStyle) {
+				const separator = scopedStyle.content.endsWith("\n") ? "" : "\n";
+				ms.appendLeft(scopedStyle.end, `${separator}${localStyleCollector.toStyleRules()}`);
+			} else ms.append(`\n${localStyleCollector.toStyleBlock()}`);
+		}
+	}
+	const result = {
+		code: ms.toString(),
+		map: null
+	};
+	Object.defineProperty(result, "map", {
+		configurable: true,
+		enumerable: true,
+		get() {
+			return ms.generateMap();
+		}
+	});
+	return result;
+}
+//#endregion
+export { transformUVue };

package/dist/uni-app-x/component-local-style.d.ts

@@ -1,4 +1,5 @@
 interface RewriteCodeOptions {
+    deep?: boolean;
     wrapExpression?: boolean;
 }
 export declare function hasTopLevelVariant(candidate: string): boolean;
@@ -10,10 +11,11 @@ export declare class UniAppXComponentLocalStyleCollector {
     private aliasByUtility;
     private aliasByLookup;
     private classBindingNames;
+    private deepUtilities;
     constructor(fileId: string, runtimeSet?: Set<string> | undefined);
     private ensureAlias;
     private rewriteLiteral;
-    collectAndRewriteStaticClass(literal: string): string;
+    collectAndRewriteStaticClass(literal: string, options?: RewriteCodeOptions): string;
     collectRuntimeClasses(rawSource: string, options?: RewriteCodeOptions): void;
     rewriteTransformedCode(rawSource: string, options?: RewriteCodeOptions): string;
     hasStyles(): boolean;

package/dist/uni-app-x/transform.d.ts

@@ -5,6 +5,8 @@ interface TransformUVueOptions {
     disabledDefaultTemplateHandler?: boolean;
     enableComponentLocalStyle?: boolean;
     enablePageLocalStyle?: boolean;
+    webCustomAttributeDeep?: boolean;
+    onWebLocalStyleRules?: (rules: string) => void;
 }
 export declare function transformUVue(code: string, id: string, jsHandler: JsHandler, runtimeSet?: Set<string>, options?: TransformUVueOptions): undefined | TransformResult;
 export {};

package/dist/uni-app-x/vite/style-request.d.ts

@@ -1,6 +1,7 @@
 export declare function isPreprocessorRequest(id: string, lang?: string): boolean;
 export declare function resolveUniAppXCssTarget(id: string): "uvue" | undefined;
 export declare function isCssModuleExport(code: string): boolean;
+export declare function normalizeRelativeTailwindReferences(code: string, id: string): string;
 interface ResolvePreprocessorTransformOptions {
     isIosPlatform: boolean;
     isNativeAppStyleTarget: boolean;

package/dist/uni-app-x/vite/web-local-style.d.ts

@@ -0,0 +1,6 @@
+import type { HmrContext, ModuleNode } from 'vite';
+export declare function createUniAppXWebLocalStyleBridge(isEnabled: () => boolean): {
+    appendToStyle(code: string, id: string): string;
+    handleHotUpdate(ctx: HmrContext): ModuleNode[] | undefined;
+    remember(id: string, rules: string): void;
+};

package/dist/{v4-generation-core-CCnEsAgV.cjs → v4-generation-core-BfeXEc6R.cjs}

@@ -1,10 +1,10 @@
 const require_rolldown_runtime = require("./rolldown-runtime-Ctb5zv51.cjs");
-const require_generator = require("./generator-BXrWA7Sj.cjs");
+const require_generator = require("./generator-DKiYbTFR.cjs");
 require("./auto-DtU6f3X6.cjs");
 const require_object = require("./object-DbHtAXRk.cjs");
-const require_options = require("./options-DbYws6lr.cjs");
+const require_options = require("./options-CKZW99r4.cjs");
 const require_wxml = require("./wxml-CQmBCjOR.cjs");
-const require_style_options = require("./style-options-Cta1OP3i.cjs");
+const require_style_options = require("./style-options-PCgz2ywM.cjs");
 let node_fs = require("node:fs");
 let node_path = require("node:path");
 node_path = require_rolldown_runtime.__toESM(node_path, 1);
@@ -4848,9 +4848,9 @@ function resolveCompilationDependencies(dependencies) {
 	}));
 }
 async function executeGeneratorPipeline(context) {
-	return runCompilerOwnerActivity(context.runtimeState, () => executeGeneratorPipelineWithOwner(context));
+	return runCompilerOwnerActivity(context.runtimeState, () => executeGeneratorPipelineWithOwner(context, getCompilationSessionPool(context.runtimeState), getTailwindGenerationSessionPool(context.runtimeState)));
 }
-async function executeGeneratorPipelineWithOwner(context) {
+async function executeGeneratorPipelineWithOwner(context, compilationPool, generationSession) {
 	const { cssHandlerOptions, debug, file, generatorBranch, generatorOptions, generatorRawSource, getSourceCandidatesForEntries, hasGeneratedCss, hasGeneratedMarkers, localImports, majorVersion, normalizeGeneratorSource, normalizedCssSources, options, opts, runtime, runtimeState, useMiniProgramCssBranch } = context;
 	await runtimeState.readyPromise;
 	const currentCssCandidates = collectGeneratorCssCandidates(generatorRawSource);
@@ -4873,7 +4873,6 @@ async function executeGeneratorPipelineWithOwner(context) {
 	const generatorStyleOptions = resolveGeneratorStyleOptions(opts, cssHandlerOptions, generatorOptions.styleOptions);
 	const configuredContainerCompat = hasConfiguredContainerCompatSources(generatorSourceRecords.map((record) => record.source));
 	const sourceConcurrency = resolveGeneratorSourceConcurrency();
-	const generationSession = getTailwindGenerationSessionPool(runtimeState);
 	const preparedGenerationInputs = (await runWithConcurrency(generatorSourceRecords.map((record, index) => async () => {
 		const { metadata: sourceMetadata, source } = record;
 		const sourceCss = options.deferCssAdaptation ? (0, _weapp_tailwindcss_postcss.removeMatchingLocalCssImports)(source.css, localImports) : source.css;
@@ -4921,7 +4920,7 @@ async function executeGeneratorPipelineWithOwner(context) {
 				generated: await generationSession.generate(input.generatorSource, {
 					bareArbitraryValues: generatorOptions.bareArbitraryValues,
 					candidates: currentCandidates,
-					incrementalCache: true,
+					incrementalCache: options.incrementalCache ?? true,
 					scanSources: options.disableSourceScan === true ? false : shouldScanTailwindV4Sources(majorVersion, generatorOptions.target, currentCandidates, input.isolateCssSource),
 					styleOptions: generatorStyleOptions,
 					target: generatorOptions.target
@@ -4933,7 +4932,7 @@ async function executeGeneratorPipelineWithOwner(context) {
 	let compilationRevision;
 	let generated;
 	if (options.compilation?.enabled) {
-		const execution = await getCompilationSessionPool(runtimeState).run({
+		const execution = await compilationPool.run({
 			scope: options.compilation.scope,
 			outputId: options.outputFile ?? file,
 			changes: options.compilation.changes,
@@ -5189,9 +5188,9 @@ async function generateCssByGenerator(options) {
 //#endregion
 //#region src/bundlers/shared/generator-css/validate.ts
 async function validateCandidatesByGenerator(options) {
-	return runCompilerOwnerActivity(options.runtimeState, () => validateCandidatesByGeneratorWithOwner(options));
+	return runCompilerOwnerActivity(options.runtimeState, () => validateCandidatesByGeneratorWithOwner(options, getTailwindGenerationSessionPool(options.runtimeState)));
 }
-async function validateCandidatesByGeneratorWithOwner(options) {
+async function validateCandidatesByGeneratorWithOwner(options, generationSession) {
 	const { candidates, cssHandlerOptions, debug, file, opts, rawSource, runtimeState } = options;
 	const majorVersion = runtimeState.tailwindRuntime.majorVersion;
 	if (majorVersion !== 4 || candidates.size === 0) return /* @__PURE__ */ new Set();
@@ -5206,7 +5205,6 @@ async function validateCandidatesByGeneratorWithOwner(options) {
 				cssEntries: opts.cssEntries,
 				runtime: candidates
 			});
-			const generationSession = getTailwindGenerationSessionPool(runtimeState);
 			const classSets = await Promise.all(sourceRecords.map(async ({ source }) => {
 				return generationSession.validateCandidates(source, candidates);
 			}));