weapp-tailwindcss 5.2.7 → 5.2.9

package/dist/{transform-BUEyOCT7.cjs → transform-GzbxfNGA.cjs}

@@ -2,6 +2,98 @@ const require_object = require("./object-C_Vr6_S5.cjs");
 const require_wxml = require("./wxml-DSMNuUaP.cjs");
 let _tailwindcss_mangle_engine = require("@tailwindcss-mangle/engine");
 let _vue_compiler_dom = require("@vue/compiler-dom");
+//#region src/uni-app-x/component-local-style-binding.ts
+const OPTIONS_CLASS_SECTIONS = /* @__PURE__ */ new Set(["computed", "methods"]);
+function readStaticName(path) {
+	if (path.isIdentifier()) return path.node.name;
+	if (path.isStringLiteral()) return path.node.value;
+}
+function isClassBindingName(path, names) {
+	const name = readStaticName(path);
+	return name !== void 0 && names.has(name);
+}
+function isExportDefaultOptionsObject(path) {
+	return path?.isObjectExpression() === true && path.parentPath?.isExportDefaultDeclaration() === true;
+}
+function isOptionsSectionMember(path) {
+	const sectionObject = path.parentPath;
+	if (!sectionObject?.isObjectExpression()) return false;
+	const sectionProperty = sectionObject.parentPath;
+	if (!sectionProperty?.isObjectProperty() || sectionProperty.get("value").node !== sectionObject.node) return false;
+	const sectionName = readStaticName(sectionProperty.get("key"));
+	return sectionName !== void 0 && OPTIONS_CLASS_SECTIONS.has(sectionName) && isExportDefaultOptionsObject(sectionProperty.parentPath);
+}
+function findContainingFunction(path) {
+	let current = path;
+	while (current) {
+		if (current.isFunction()) return current;
+		current = current.parentPath;
+	}
+}
+function isOptionsDataFunction(path) {
+	if (!path) return false;
+	if (path.isObjectMethod()) return readStaticName(path.get("key")) === "data" && isExportDefaultOptionsObject(path.parentPath);
+	if (!path.isFunctionExpression() && !path.isArrowFunctionExpression()) return false;
+	const property = path.parentPath;
+	return property?.isObjectProperty() === true && property.get("value").node === path.node && readStaticName(property.get("key")) === "data" && isExportDefaultOptionsObject(property.parentPath);
+}
+function isOptionsDataReturnMember(path) {
+	const dataObject = path.parentPath;
+	if (!dataObject?.isObjectExpression()) return false;
+	const parent = dataObject.parentPath;
+	if (parent?.isReturnStatement()) return isOptionsDataFunction(findContainingFunction(parent));
+	if (parent?.isArrowFunctionExpression() && parent.get("body").node === dataObject.node) return isOptionsDataFunction(parent);
+	return false;
+}
+function isProgramBinding(path, name, declaration) {
+	const binding = path.scope.getBinding(name);
+	return binding?.scope.path.isProgram() === true && (declaration === void 0 || binding.path.node === declaration);
+}
+function isClassAssignmentTarget(path, names) {
+	const directName = readStaticName(path);
+	if (directName !== void 0) return names.has(directName) && isProgramBinding(path, directName);
+	if (!path.isMemberExpression()) return false;
+	const object = path.get("object");
+	const property = path.get("property");
+	return object.isThisExpression() && isClassBindingName(property, names);
+}
+function collectClassBindingNames(ast, names) {
+	require_wxml.traverse(ast, { ReferencedIdentifier(path) {
+		names.add(path.node.name);
+	} });
+}
+function collectClassBindingRoots(ast, names) {
+	const roots = /* @__PURE__ */ new WeakSet();
+	if (names.size === 0) return roots;
+	require_wxml.traverse(ast, {
+		Program(path) {
+			for (const name of names) {
+				const binding = path.scope.getBinding(name);
+				if (binding?.scope === path.scope) roots.add(binding.path.node);
+			}
+		},
+		AssignmentExpression(path) {
+			if (isClassAssignmentTarget(path.get("left"), names)) roots.add(path.node);
+		},
+		ObjectMethod(path) {
+			if (isClassBindingName(path.get("key"), names) && isOptionsSectionMember(path)) roots.add(path.node);
+		},
+		ObjectProperty(path) {
+			if (isClassBindingName(path.get("key"), names) && (isOptionsSectionMember(path) || isOptionsDataReturnMember(path))) roots.add(path.node);
+		}
+	});
+	return roots;
+}
+function isClassBindingLiteralPath(path, roots) {
+	if (!roots) return false;
+	let current = path;
+	while (current) {
+		if (roots.has(current.node)) return true;
+		current = current.parentPath;
+	}
+	return false;
+}
+//#endregion
 //#region src/uni-app-x/component-local-style.ts
 const EXPRESSION_WRAPPER_PREFIX = "(\n";
 const EXPRESSION_WRAPPER_SUFFIX = "\n)";
@@ -86,6 +178,7 @@ var UniAppXComponentLocalStyleCollector = class {
 		this.runtimeSet = runtimeSet;
 		require_object._defineProperty(this, "aliasByUtility", /* @__PURE__ */ new Map());
 		require_object._defineProperty(this, "aliasByLookup", /* @__PURE__ */ new Map());
+		require_object._defineProperty(this, "classBindingNames", /* @__PURE__ */ new Set());
 	}
 	ensureAlias(utility) {
 		const cached = this.aliasByUtility.get(utility);
@@ -112,17 +205,20 @@ var UniAppXComponentLocalStyleCollector = class {
 	collectRuntimeClasses(rawSource, options = {}) {
 		const wrapped = options.wrapExpression ? `${EXPRESSION_WRAPPER_PREFIX}${rawSource}${EXPRESSION_WRAPPER_SUFFIX}` : rawSource;
 		try {
-			const analysis = require_wxml.analyzeSource(require_wxml.babelParse(wrapped, {
+			const ast = require_wxml.babelParse(wrapped, {
 				plugins: ["typescript"],
 				sourceType: options.wrapExpression ? "module" : "unambiguous"
-			}), {}, void 0, false);
+			});
+			if (options.wrapExpression) collectClassBindingNames(ast, this.classBindingNames);
+			const classBindingRoots = options.wrapExpression ? void 0 : collectClassBindingRoots(ast, this.classBindingNames);
+			const analysis = require_wxml.analyzeSource(ast, {}, void 0, false);
 			for (const path of analysis.targetPaths) {
 				const { literal } = extractLiteralValue(path);
 				const candidates = (0, _tailwindcss_mangle_engine.splitCandidateTokens)(literal);
-				const classContext = options.wrapExpression || require_wxml.isClassContextLiteralPath(path);
+				const classContext = options.wrapExpression || require_wxml.isClassContextLiteralPath(path) || isClassBindingLiteralPath(path, classBindingRoots);
 				for (const candidate of candidates) {
-					if (!candidate || !classContext && !isRuntimeCandidate(candidate, this.runtimeSet)) continue;
-					if (isRuntimeCandidate(candidate, this.runtimeSet) && !hasTopLevelVariant(candidate)) this.ensureAlias(candidate);
+					if (!candidate || !classContext || !isRuntimeCandidate(candidate, this.runtimeSet)) continue;
+					if (!hasTopLevelVariant(candidate)) this.ensureAlias(candidate);
 				}
 			}
 		} catch {}
@@ -131,13 +227,16 @@ var UniAppXComponentLocalStyleCollector = class {
 		if (this.aliasByLookup.size === 0) return rawSource;
 		const wrapped = options.wrapExpression ? `${EXPRESSION_WRAPPER_PREFIX}${rawSource}${EXPRESSION_WRAPPER_SUFFIX}` : rawSource;
 		try {
-			const analysis = require_wxml.analyzeSource(require_wxml.babelParse(wrapped, {
+			const ast = require_wxml.babelParse(wrapped, {
 				plugins: ["typescript"],
 				sourceType: options.wrapExpression ? "module" : "unambiguous"
-			}), {}, void 0, false);
+			});
+			const classBindingRoots = options.wrapExpression ? void 0 : collectClassBindingRoots(ast, this.classBindingNames);
+			const analysis = require_wxml.analyzeSource(ast, {}, void 0, false);
 			if (analysis.targetPaths.length === 0) return rawSource;
 			const updater = new require_wxml.JsTokenUpdater();
 			for (const path of analysis.targetPaths) {
+				if (!options.wrapExpression && !require_wxml.isClassContextLiteralPath(path) && !isClassBindingLiteralPath(path, classBindingRoots)) continue;
 				const { literal, offset } = extractLiteralValue(path);
 				const candidates = (0, _tailwindcss_mangle_engine.splitCandidateTokens)(literal);
 				if (candidates.length === 0) continue;
@@ -177,13 +276,16 @@ var UniAppXComponentLocalStyleCollector = class {
 	}
 	toStyleBlock() {
 		if (!this.hasStyles()) return "";
-		const lines = ["<style scoped>"];
+		return `<style scoped>\n${this.toStyleRules()}</style>\n`;
+	}
+	toStyleRules() {
+		if (!this.hasStyles()) return "";
+		const lines = [];
 		for (const [utility, alias] of this.aliasByUtility) {
 			lines.push(`.${alias} {`);
 			lines.push(`  @apply ${utility};`);
 			lines.push("}");
 		}
-		lines.push("</style>");
 		return `${lines.join("\n")}\n`;
 	}
 };
@@ -251,10 +353,14 @@ function shouldHandleAttribute(tag, attrName, disabledDefaultTemplateHandler, ma
 }
 const defaultCreateJsHandlerOptions = { babelParserOptions: { plugins: ["typescript"] } };
 const UVUE_NVUE_RE = /\.(?:uvue|nvue)(?:\?.*)?$/;
-const SFC_BLOCK_RE = /<(template|script)\b([^>]*)>([\s\S]*?)<\/\1>/gi;
+const SFC_BLOCK_RE = /<(template|script|style)\b([^>]*)>([\s\S]*?)<\/\1>/gi;
 const SCRIPT_SETUP_RE = /(?:^|\s)setup(?:\s|=|$)/;
+const STYLE_SCOPED_RE = /(?:^|\s)scoped(?:\s|=|$)/i;
 function parseSfc(code) {
-	const descriptor = { errors: [] };
+	const descriptor = {
+		errors: [],
+		styles: []
+	};
 	for (const match of code.matchAll(SFC_BLOCK_RE)) {
 		const type = match[1];
 		const attrs = match[2] ?? "";
@@ -279,8 +385,12 @@ function parseSfc(code) {
 			}
 			continue;
 		}
-		if (type === "script") if (SCRIPT_SETUP_RE.test(attrs)) descriptor.scriptSetup ?? (descriptor.scriptSetup = block);
-		else descriptor.script ?? (descriptor.script = block);
+		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;
 }
@@ -322,7 +432,13 @@ function transformUVue(code, id, jsHandler, runtimeSet, options = {}) {
 			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()) ms.append(`\n${localStyleCollector.toStyleBlock()}`);
+		if (localStyleCollector?.hasStyles()) {
+			const scopedStyle = descriptor.styles.findLast((style) => STYLE_SCOPED_RE.test(style.attrs));
+			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(),

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

@@ -0,0 +1,6 @@
+import type { ParseResult } from '@babel/parser';
+import type { NodePath } from '@babel/traverse';
+import type { File, Node } from '@babel/types';
+export declare function collectClassBindingNames(ast: ParseResult<File>, names: Set<string>): void;
+export declare function collectClassBindingRoots(ast: ParseResult<File>, names: Set<string>): WeakSet<Node>;
+export declare function isClassBindingLiteralPath(path: NodePath<Node>, roots?: WeakSet<Node>): boolean;

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

@@ -9,6 +9,7 @@ export declare class UniAppXComponentLocalStyleCollector {
     private readonly runtimeSet?;
     private aliasByUtility;
     private aliasByLookup;
+    private classBindingNames;
     constructor(fileId: string, runtimeSet?: Set<string> | undefined);
     private ensureAlias;
     private rewriteLiteral;
@@ -17,5 +18,6 @@ export declare class UniAppXComponentLocalStyleCollector {
     rewriteTransformedCode(rawSource: string, options?: RewriteCodeOptions): string;
     hasStyles(): boolean;
     toStyleBlock(): string;
+    toStyleRules(): string;
 }
 export {};

package/dist/uni-app-x/vite/author-apply.d.ts

@@ -0,0 +1 @@
+export declare function retainUniAppXAuthorApplyCss(generatedCss: string, authorCss: string): string;

package/dist/uni-app-x/vite/harmony-apply.d.ts

@@ -4,6 +4,8 @@ interface HarmonyApplyHookContext {
 }
 interface CreateUniAppXHarmonyApplyExpanderOptions {
     generateCss?: ((id: string, code: string, hookContext?: HarmonyApplyHookContext & {
+        disableSourceScan?: boolean;
+        sourceCandidates?: Iterable<string>;
         transient?: boolean;
     }) => Promise<string | undefined> | string | undefined) | undefined;
     getResolvedConfig: () => ResolvedConfig | undefined;
@@ -12,7 +14,8 @@ interface CreateUniAppXHarmonyApplyExpanderOptions {
 }
 export declare function createUniAppXHarmonyApplyExpander(options: CreateUniAppXHarmonyApplyExpanderOptions): {
     expandStyles: (code: string, id: string, hookContext: HarmonyApplyHookContext) => Promise<string>;
-    rememberSource: (code: string, id: string) => void;
+    prepareStyles: (code: string, id: string) => string;
+    rememberSource: (code: string, id: string, authoritative?: boolean) => void;
     styleSources: Set<string>;
     utilities: Set<string>;
 };

package/dist/uni-app-x/vite/native-hmr.d.ts

@@ -2,6 +2,8 @@ import type { HmrContext } from 'vite';
 interface CreateUniAppXNativeHmrReloaderOptions {
     ensureRuntimeClassSet: (force?: boolean) => Promise<Set<string>>;
     isNativeAppBuildTarget: (id?: string) => boolean;
+    localStyleModuleIds: Iterable<string>;
+    syncSourceCandidates?: (ctx: HmrContext) => Promise<void>;
     tailwindRootCssModuleIds: Iterable<string>;
     viteProcessedCssSourceFiles: Iterable<string>;
 }

package/dist/uni-app-x/vite/plugin-options.d.ts

@@ -0,0 +1,29 @@
+import type { HmrContext, ResolvedConfig } from 'vite';
+import type { AppType, ICustomAttributesEntities, InternalUserDefinedOptions, JsHandler } from '../../types/index.js';
+export interface CreateUniAppXPluginsOptions {
+    appType: AppType;
+    customAttributesEntities: ICustomAttributesEntities;
+    disabledDefaultTemplateHandler: boolean | undefined;
+    mainCssChunkMatcher: NonNullable<InternalUserDefinedOptions['mainCssChunkMatcher']>;
+    runtimeState: {
+        readyPromise: Promise<unknown>;
+    };
+    styleHandler: InternalUserDefinedOptions['styleHandler'];
+    syncSourceCandidatesForHotUpdate?: ((ctx: HmrContext) => Promise<void>) | undefined;
+    tailwindRootCssModuleIds?: Iterable<string> | undefined;
+    generateCss?: ((id: string, code: string, hookContext?: {
+        addWatchFile?: (id: string) => void;
+        disableSourceScan?: boolean;
+        sourceCandidates?: Iterable<string>;
+        transient?: boolean;
+    }) => Promise<string | undefined> | string | undefined) | undefined;
+    jsHandler: JsHandler;
+    ensureRuntimeClassSet: (force?: boolean) => Promise<Set<string>>;
+    getResolvedConfig: () => ResolvedConfig | undefined;
+    isIosPlatform?: boolean;
+    isNativeAppStyleTarget?: (() => boolean) | undefined;
+    isWebGeneratorTarget?: (() => boolean) | undefined;
+    isEnabled?: (() => boolean) | undefined;
+    uniAppX?: InternalUserDefinedOptions['uniAppX'];
+    viteProcessedCssSourceFiles?: Iterable<string> | undefined;
+}

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

@@ -0,0 +1,15 @@
+export declare function isPreprocessorRequest(id: string, lang?: string): boolean;
+export declare function resolveUniAppXCssTarget(id: string): "uvue" | undefined;
+export declare function isCssModuleExport(code: string): boolean;
+interface ResolvePreprocessorTransformOptions {
+    isIosPlatform: boolean;
+    isNativeAppStyleTarget: boolean;
+    isWebGeneratorTarget: boolean;
+}
+export declare function resolvePreprocessorTransform(code: string, id: string, lang: string | undefined, options: ResolvePreprocessorTransformOptions): {
+    result: {
+        code: string;
+        map: null;
+    } | undefined;
+} | undefined;
+export {};

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

@@ -1,29 +1,8 @@
 import type { OutputAsset } from 'rollup';
-import type { Plugin, ResolvedConfig } from 'vite';
+import type { Plugin } from 'vite';
+import type { CreateUniAppXPluginsOptions } from './vite/plugin-options.js';
 import type { ICreateCacheReturnType } from '../cache/index.js';
-import type { AppType, CreateJsHandlerOptions, ICustomAttributesEntities, InternalUserDefinedOptions, JsHandler, LinkedJsModuleResult } from '../types/index.js';
-interface CreateUniAppXPluginsOptions {
-    appType: AppType;
-    customAttributesEntities: ICustomAttributesEntities;
-    disabledDefaultTemplateHandler: boolean | undefined;
-    mainCssChunkMatcher: NonNullable<InternalUserDefinedOptions['mainCssChunkMatcher']>;
-    runtimeState: {
-        readyPromise: Promise<unknown>;
-    };
-    styleHandler: InternalUserDefinedOptions['styleHandler'];
-    tailwindRootCssModuleIds?: Iterable<string> | undefined;
-    generateCss?: ((id: string, code: string, hookContext?: {
-        addWatchFile?: (id: string) => void;
-        transient?: boolean;
-    }) => Promise<string | undefined> | string | undefined) | undefined;
-    jsHandler: JsHandler;
-    ensureRuntimeClassSet: (force?: boolean) => Promise<Set<string>>;
-    getResolvedConfig: () => ResolvedConfig | undefined;
-    isIosPlatform?: boolean;
-    isEnabled?: (() => boolean) | undefined;
-    uniAppX?: InternalUserDefinedOptions['uniAppX'];
-    viteProcessedCssSourceFiles?: Iterable<string> | undefined;
-}
+import type { CreateJsHandlerOptions, InternalUserDefinedOptions, JsHandler, LinkedJsModuleResult } from '../types/index.js';
 export declare function createUniAppXPlugins(options: CreateUniAppXPluginsOptions): Plugin[];
 type ApplyLinkedResults = (linked: Record<string, LinkedJsModuleResult> | undefined) => void;
 interface CreateUniAppXAssetTaskOptions {

package/dist/{v4-generation-core-BrkM1vCs.cjs → v4-generation-core-BjHT6qGC.cjs}

@@ -1,10 +1,10 @@
 const require_rolldown_runtime = require("./rolldown-runtime-CVvi-lCc.cjs");
-const require_generator = require("./generator-BE34PYSC.cjs");
+const require_generator = require("./generator-B0dCFlP1.cjs");
 require("./auto-DtU6f3X6.cjs");
 const require_object = require("./object-C_Vr6_S5.cjs");
-const require_options = require("./options-hVsoTfwL.cjs");
+const require_options = require("./options-zpZez7qe.cjs");
 const require_wxml = require("./wxml-DSMNuUaP.cjs");
-const require_style_options = require("./style-options-B_ppaVIg.cjs");
+const require_style_options = require("./style-options-COpQc8fr.cjs");
 let node_fs = require("node:fs");
 let node_path = require("node:path");
 node_path = require_rolldown_runtime.__toESM(node_path, 1);
@@ -341,15 +341,17 @@ function createSourceCandidateStore(options = {}) {
 	}
 	async function syncCurrentSource(id, source) {
 		const normalizedId = cleanUrl(id);
-		transformCandidatesById.delete(normalizedId);
-		cssCandidatesById.delete(normalizedId);
-		transformSourceById.delete(normalizedId);
-		cssSourceById.delete(normalizedId);
-		recompute(normalizedId);
 		const previousFileCandidates = new Set(candidatesById.get(normalizedId) ?? []);
-		const nextCandidates = await resolveCandidates(source, resolveSourceCandidateExtension(normalizedId));
+		const extension = resolveSourceCandidateExtension(normalizedId);
+		const nextCandidates = await resolveCandidates(source, extension);
 		const affectedCandidates = /* @__PURE__ */ new Set([...previousFileCandidates, ...nextCandidates]);
 		const previousVisibleCandidates = collectVisibleCandidates(affectedCandidates);
+		if (extension !== "css") {
+			transformCandidatesById.delete(normalizedId);
+			cssCandidatesById.delete(normalizedId);
+			transformSourceById.delete(normalizedId);
+			cssSourceById.delete(normalizedId);
+		}
 		scanSourceById.set(normalizedId, source);
 		replaceScanLayer(normalizedId, nextCandidates);
 		return diffCandidateSets(previousVisibleCandidates, collectVisibleCandidates(affectedCandidates));
@@ -3199,14 +3201,17 @@ function collectGeneratorCssCandidates(css) {
 //#region src/bundlers/shared/generator-css/source-resolver/apply-reference.ts
 function resolveTailwindV4ApplyReference(options) {
 	const references = /* @__PURE__ */ new Set();
-	for (const source of options.cssSources ?? []) if (typeof source.file === "string" && source.file.length > 0 && typeof source.css === "string" && require_generator.hasTailwindRootDirectives(source.css, { importFallback: true }) && hasTailwindThemeDirective(source.css)) references.add(source.file);
+	for (const source of options.cssSources ?? []) if (typeof source.file === "string" && source.file.length > 0 && typeof source.css === "string" && require_generator.hasTailwindRootDirectives(source.css, { importFallback: true }) && hasTailwindApplyContextDirective(source.css)) references.add(source.file);
 	return references.size === 1 ? references.values().next().value : void 0;
 }
-function hasTailwindThemeDirective(css) {
+function hasTailwindApplyContextDirective(css) {
 	try {
 		let found = false;
-		_weapp_tailwindcss_postcss.postcss.parse(css).walkAtRules("theme", () => {
-			found = true;
+		_weapp_tailwindcss_postcss.postcss.parse(css).walkAtRules((rule) => {
+			if (rule.name === "theme" || rule.name === "config") {
+				found = true;
+				return false;
+			}
 		});
 		return found;
 	} catch {
@@ -4832,7 +4837,10 @@ async function executeGeneratorPipelineWithOwner(context) {
 		const sourceCss = options.deferCssAdaptation ? (0, _weapp_tailwindcss_postcss.removeMatchingLocalCssImports)(source.css, localImports) : source.css;
 		const generatorSource = options.disableSourceScan === true ? {
 			...source,
-			css: require_generator.removeTailwindSourceDirectives(sourceCss, { importFallback: generatorOptions.importFallback })
+			css: require_generator.removeTailwindSourceDirectives(sourceCss, {
+				importFallback: generatorOptions.importFallback,
+				preserveApplyContext: true
+			})
 		} : sourceCss === source.css ? source : {
 			...source,
 			css: sourceCss