weapp-tailwindcss 5.0.0-next.3 → 5.0.0-next.7

package/dist/{generator-Y-Ikv4Fu.mjs → generator-CzfdCZyd.mjs}

@@ -1,11 +1,12 @@
-import { r as resolveTailwindcssOptions } from "./patcher-options-DQfR5xxT.mjs";
+import { a as createTailwindcssPatcher, c as resolveTailwindcssOptions } from "./cache-nq0_XJoS.mjs";
+import { t as ensureTailwindcssRuntimePatch } from "./runtime-patch-pGdCqAEu.mjs";
 import { createRequire } from "node:module";
 import postcss from "postcss";
-import { createStyleHandler } from "@weapp-tailwindcss/postcss";
 import path from "node:path";
 import process from "node:process";
-import { loadConfig } from "tailwindcss-config";
 import { createTailwindV4Engine, loadTailwindV4DesignSystem, resolveTailwindV4Source, resolveTailwindV4SourceFromPatchOptions } from "tailwindcss-patch";
+import { createStyleHandler, protectDynamicColorMixAlpha } from "@weapp-tailwindcss/postcss";
+import { loadConfig } from "tailwindcss-config";
 //#region src/tailwindcss/remove-unsupported-css.ts
 /**
 * 移除小程序不支持的 cascade layer 语法，同时保留 layer 内的实际规则。
@@ -24,9 +25,33 @@ function removeUnsupportedCascadeLayers(root) {
 const DEFAULT_WEAPP_VARIABLE_SCOPE = "page,.tw-root,wx-root-portal-content,:host";
 const CLASS_SELECTOR_RE = /(?:^|[^\w-])\.[_a-z\u00A0-\uFFFF\\-]/i;
 const PSEUDO_CONTENT_SELECTOR_RE = /^(?:::before|::after|:before|:after)(?:,(?:::before|::after|:before|:after))*$/;
+const MINI_PROGRAM_PREFLIGHT_SELECTORS = new Set([
+	"*",
+	"view",
+	"text",
+	":before",
+	":after",
+	"::before",
+	"::after"
+]);
+const PREFLIGHT_RESET_PROPS = new Set([
+	"box-sizing",
+	"border",
+	"border-width",
+	"border-style",
+	"border-color",
+	"margin",
+	"padding"
+]);
 function hasClassSelector(selector) {
 	return CLASS_SELECTOR_RE.test(selector);
 }
+function normalizeSelector$1(selector) {
+	return selector.trim().replace(/\s+/g, "");
+}
+function getRuleSelectors(rule) {
+	return rule.selector.split(",").map(normalizeSelector$1).filter(Boolean);
+}
 function isCustomPropertyRule(rule) {
 	let hasDeclaration = false;
 	let allCustomProperties = true;
@@ -47,13 +72,32 @@ function isPseudoContentInitRule(rule) {
 	});
 	return hasDeclaration && onlyContentVariable;
 }
+function isMiniProgramPreflightRule(rule) {
+	const selectors = getRuleSelectors(rule);
+	if (selectors.length === 0 || !selectors.every((selector) => MINI_PROGRAM_PREFLIGHT_SELECTORS.has(selector)) || !selectors.some((selector) => selector === "*" || selector === ":before" || selector === ":after" || selector === "::before" || selector === "::after")) return false;
+	let hasTailwindVariable = false;
+	let hasResetProp = false;
+	rule.walkDecls((decl) => {
+		if (decl.prop.startsWith("--tw-")) hasTailwindVariable = true;
+		if (PREFLIGHT_RESET_PROPS.has(decl.prop)) hasResetProp = true;
+	});
+	return hasTailwindVariable || hasResetProp;
+}
+function isKeyframesRule(rule) {
+	let parent = rule.parent;
+	while (parent) {
+		if (parent.type === "atrule" && parent.name.endsWith("keyframes")) return true;
+		parent = parent.parent;
+	}
+	return false;
+}
 /**
 * 裁剪 Tailwind 生成 CSS 中面向浏览器的 classless 规则。
 *
 * 生成模式面向小程序时只需要保留业务 utility 与 Tailwind 变量初始化；
 * 浏览器元素 reset、表单伪元素等 classless 规则不适合直接输出到小程序。
 */
-function pruneMiniProgramGeneratedCss(css) {
+function pruneMiniProgramGeneratedCss(css, options = {}) {
 	const root = postcss.parse(css);
 	root.walkComments((comment) => {
 		comment.remove();
@@ -63,8 +107,10 @@ function pruneMiniProgramGeneratedCss(css) {
 		atRule.remove();
 	});
 	root.walkRules((rule) => {
+		if (isKeyframesRule(rule)) return;
 		if (hasClassSelector(rule.selector)) return;
 		if (isPseudoContentInitRule(rule)) return;
+		if (options.preservePreflight && isMiniProgramPreflightRule(rule)) return;
 		if (isCustomPropertyRule(rule)) {
 			rule.selector = DEFAULT_WEAPP_VARIABLE_SCOPE;
 			return;
@@ -84,14 +130,63 @@ const defaultStyleHandler$1 = createStyleHandler({
 	isMainChunk: true,
 	majorVersion: 3
 });
+const MINI_PROGRAM_V3_PREFLIGHT_SELECTOR = "view,text,::before,::after";
+const V3_PREFLIGHT_RESET_PROPS = new Set([
+	"box-sizing",
+	"border",
+	"border-width",
+	"border-style",
+	"border-color",
+	"margin",
+	"padding"
+]);
+function normalizeSelector(selector) {
+	return selector.trim().replace(/\s+/g, "");
+}
+function isMiniProgramV3PreflightRule(rule) {
+	return normalizeSelector(rule.selector) === MINI_PROGRAM_V3_PREFLIGHT_SELECTOR;
+}
+function hasResetDeclaration(rule) {
+	let found = false;
+	rule.walkDecls((decl) => {
+		if (V3_PREFLIGHT_RESET_PROPS.has(decl.prop)) found = true;
+	});
+	return found;
+}
+function createPreflightDeclarations(cssPreflight) {
+	if (!cssPreflight || typeof cssPreflight !== "object") return [];
+	return Object.entries(cssPreflight).filter((entry) => entry[1] !== false).map(([prop, value]) => postcss.decl({
+		prop,
+		value: value.toString()
+	}));
+}
+function ensureMiniProgramV3PreflightReset(css, cssPreflight) {
+	const declarations = createPreflightDeclarations(cssPreflight);
+	if (declarations.length === 0) return css;
+	try {
+		const root = postcss.parse(css);
+		let targetRule;
+		let hasReset = false;
+		root.walkRules((rule) => {
+			if (!isMiniProgramV3PreflightRule(rule)) return;
+			targetRule ?? (targetRule = rule);
+			if (hasResetDeclaration(rule)) hasReset = true;
+		});
+		if (!targetRule || hasReset) return css;
+		targetRule.append(...declarations.map((decl) => decl.clone()));
+		return root.toString();
+	} catch {
+		return css;
+	}
+}
 async function transformTailwindV3CssToWeapp(css, options) {
-	return pruneMiniProgramGeneratedCss((await defaultStyleHandler$1(css, {
+	return ensureMiniProgramV3PreflightReset(pruneMiniProgramGeneratedCss((await defaultStyleHandler$1(css, {
 		cssChildCombinatorReplaceValue: ["view", "text"],
 		cssRemoveHoverPseudoClass: true,
 		isMainChunk: true,
 		majorVersion: 3,
 		...options
-	})).css);
+	})).css, { preservePreflight: true }), options?.cssPreflight);
 }
 async function transformTailwindV3CssByTarget(css, target, options) {
 	return target === "weapp" ? transformTailwindV3CssToWeapp(css, options) : css;
@@ -158,8 +253,23 @@ function collectDependencyMessages(result) {
 	for (const message of result.messages) if (message.type === "dependency" && typeof message.file === "string") dependencies.add(message.file);
 	return dependencies;
 }
+function createRuntimeReadyPromise(source) {
+	return ensureTailwindcssRuntimePatch(createTailwindcssPatcher({
+		basedir: source.cwd,
+		supportCustomLengthUnitsPatch: true,
+		tailwindcss: {
+			config: source.config,
+			cwd: source.cwd,
+			packageName: source.packageName,
+			postcssPlugin: source.postcssPlugin,
+			version: 3
+		}
+	}), { clearRequireCache: true });
+}
 function createTailwindV3Engine(source) {
+	const runtimeReadyPromise = createRuntimeReadyPromise(source);
 	async function generate(options = {}) {
+		await runtimeReadyPromise;
 		const { styleOptions, target = "weapp" } = options;
 		const tailwindcss = loadTailwindcssPlugin(source);
 		const result = await postcss([tailwindcss(createTailwindConfig(source, options))]).process(source.css, { from: void 0 });
@@ -301,17 +411,18 @@ function normalizeTailwindV4GeneratedUrlValues(css) {
 	});
 }
 async function transformTailwindV4CssToWeapp(css, options) {
-	return pruneMiniProgramGeneratedCss((await defaultStyleHandler(normalizeTailwindV4GeneratedUrlValues(css), {
+	const protectedCss = protectDynamicColorMixAlpha(normalizeTailwindV4GeneratedUrlValues(css));
+	const result = await defaultStyleHandler(protectedCss.css, {
 		cssChildCombinatorReplaceValue: ["view", "text"],
 		cssRemoveHoverPseudoClass: true,
 		isMainChunk: true,
 		majorVersion: 4,
 		...options
-	})).css);
+	});
+	return pruneMiniProgramGeneratedCss(protectedCss.restore(result.css));
 }
 async function transformTailwindV4CssByTarget(css, target, options) {
-	const compatibleCss = normalizeTailwindV4GeneratedUrlValues(css);
-	return target === "weapp" ? transformTailwindV4CssToWeapp(compatibleCss, options) : compatibleCss;
+	return target === "weapp" ? transformTailwindV4CssToWeapp(css, options) : css;
 }
 //#endregion
 //#region src/tailwindcss/v4-engine/tailwind-v3-default-colors.ts
@@ -1064,16 +1175,117 @@ function applyMiniProgramTailwindV4DefaultColorCss(css) {
 	if (insertionIndex === 0) return `${themeCss}\n${css}`;
 	return `${css.slice(0, insertionIndex)}\n${themeCss}\n${css.slice(insertionIndex)}`;
 }
+function parseImportSourceParam(params) {
+	const match = /\bsource\(\s*(none|(['"])(.*?)\2)\s*\)/.exec(params);
+	if (!match) return;
+	return {
+		none: match[1] === "none",
+		sourcePath: match[3]
+	};
+}
+function isTailwindCssImport(params) {
+	return /^\s*(['"])tailwindcss(?:\/[^'"]*)?\1/.test(params);
+}
+function parseCssImportSpecifier$1(params) {
+	const value = params.trim();
+	const quoted = /^(['"])(.*?)\1/.exec(value);
+	if (quoted) return quoted[2];
+	const url = /^url\(\s*(?:(['"])(.*?)\1|([^'")\s]+))\s*\)/.exec(value);
+	return url?.[2] ?? url?.[3];
+}
+function isTailwindCssPreflightImport(params) {
+	const specifier = parseCssImportSpecifier$1(params);
+	return specifier === "tailwindcss/preflight.css" || specifier === "tailwindcss/preflight";
+}
+function hasImportLayerOption(params) {
+	return /\blayer(?:\s*\(|\s*$)/.test(params);
+}
+function removeUnlayeredTailwindV4PreflightImports(css) {
+	if (!css.includes("preflight")) return css;
+	let root;
+	try {
+		root = postcss.parse(css);
+	} catch {
+		return css;
+	}
+	let changed = false;
+	root.walkAtRules("import", (rule) => {
+		if (isTailwindCssPreflightImport(rule.params) && !hasImportLayerOption(rule.params)) {
+			rule.remove();
+			changed = true;
+		}
+	});
+	return changed ? root.toString() : css;
+}
+function parseSourceFileParam(params) {
+	const value = params.trim();
+	if (!value || value === "none" || value.startsWith("inline(")) return;
+	const negated = value.startsWith("not ");
+	const sourceValue = negated ? value.slice(4).trim() : value;
+	if (sourceValue.startsWith("inline(")) return;
+	const match = /^(['"])(.+)\1$/.exec(sourceValue);
+	return match?.[2] ? {
+		negated,
+		pattern: match[2]
+	} : void 0;
+}
+function resolveSourceBase(base, sourcePath) {
+	return path.isAbsolute(sourcePath) ? sourcePath : path.resolve(base, sourcePath);
+}
+function resolveCssDefinedScanSources(source) {
+	let importSourceBase;
+	let hasSourceNone = false;
+	const sourcePatterns = [];
+	const from = source.dependencies[0];
+	let root;
+	try {
+		root = postcss.parse(source.css, { from });
+	} catch {
+		return;
+	}
+	root.walkAtRules((rule) => {
+		if (rule.name === "import") {
+			if (!isTailwindCssImport(rule.params)) return;
+			const sourceParam = parseImportSourceParam(rule.params);
+			if (sourceParam?.none) hasSourceNone = true;
+			if (sourceParam?.sourcePath) importSourceBase = resolveSourceBase(source.base, sourceParam.sourcePath);
+			return;
+		}
+		if (rule.name !== "source") return;
+		const sourcePattern = parseSourceFileParam(rule.params);
+		if (!sourcePattern) return;
+		sourcePatterns.push({
+			base: source.base,
+			negated: sourcePattern.negated,
+			pattern: sourcePattern.pattern
+		});
+	});
+	if (!importSourceBase) {
+		if (hasSourceNone) return sourcePatterns.length > 0 ? sourcePatterns : false;
+		return;
+	}
+	return [{
+		base: importSourceBase,
+		negated: false,
+		pattern: "**/*"
+	}, ...sourcePatterns];
+}
+function resolveScanSources(source, scanSources) {
+	if (scanSources !== true) return scanSources;
+	return resolveCssDefinedScanSources(source) ?? scanSources;
+}
 function createTailwindV4Engine$1(source) {
 	async function generate(options = {}) {
 		const { scanSources = true, styleOptions, tailwindcssV3Compatibility, target = "weapp", ...patchOptions } = options;
-		const sourceCss = tailwindcssV3Compatibility ?? target === "weapp" ? applyTailwindV3CompatibilityCss(source.css) : target === "weapp" ? applyMiniProgramTailwindV4DefaultColorCss(source.css) : source.css;
+		const shouldApplyTailwindV3Compatibility = tailwindcssV3Compatibility ?? target === "weapp";
+		const filteredSourceCss = target === "weapp" ? removeUnlayeredTailwindV4PreflightImports(source.css) : source.css;
+		const sourceCss = shouldApplyTailwindV3Compatibility ? applyTailwindV3CompatibilityCss(filteredSourceCss) : target === "weapp" ? applyMiniProgramTailwindV4DefaultColorCss(filteredSourceCss) : filteredSourceCss;
 		const candidates = target === "weapp" ? filterUnsupportedMiniProgramTailwindV4Candidates(patchOptions.candidates) : patchOptions.candidates;
 		const result = await createTailwindV4Engine(sourceCss === source.css ? source : {
 			...source,
 			css: sourceCss
 		}).generate({
-			scanSources,
+			scanSources: resolveScanSources(source, scanSources),
 			...patchOptions,
 			candidates
 		});
@@ -1097,7 +1309,7 @@ function createTailwindV4Engine$1(source) {
 //#region src/tailwindcss/v4-engine/source.ts
 function isPostcssPluginImportTarget(value) {
 	if (!value) return false;
-	return value === "@tailwindcss/postcss" || value === "@tailwindcss/postcss7-compat" || value.includes("/postcss");
+	return value === "@tailwindcss/postcss" || value.includes("/postcss");
 }
 function uniqueDefined(values) {
 	return [...new Set(values.filter((value) => typeof value === "string" && value.length > 0))];
@@ -1110,6 +1322,51 @@ function readConfiguredV4Base(tailwindOptions) {
 	if (typeof v4 !== "object" || v4 === null) return;
 	return v4.configuredBase;
 }
+function isBarePackageSpecifier(specifier) {
+	return !specifier.startsWith(".") && !specifier.startsWith("/") && !specifier.includes("\\") && !/^[a-z][a-z\d+.-]*:/i.test(specifier);
+}
+function parseCssImportSpecifier(params) {
+	const value = params.trim();
+	const quoted = /^(['"])(.*?)\1/.exec(value);
+	if (quoted) return {
+		quote: quoted[1],
+		raw: quoted[0],
+		specifier: quoted[2]
+	};
+	const url = /^url\(\s*(?:(['"])(.*?)\1|([^'")\s]+))\s*\)/.exec(value);
+	if (!url) return;
+	return {
+		quote: url[1],
+		raw: url[0],
+		specifier: url[2] ?? url[3]
+	};
+}
+function quoteCssImportSpecifier(specifier, quote = "\"") {
+	return `${quote}${specifier.replaceAll("\\", "\\\\").replaceAll(quote, `\\${quote}`)}${quote}`;
+}
+function createTailwindV4CssImportSpecifierSet(packageName) {
+	const specifiers = new Set(["tailwindcss"]);
+	if (packageName && isBarePackageSpecifier(packageName)) specifiers.add(packageName);
+	return specifiers;
+}
+function normalizeTailwindV4CssPackageImports(css, packageName) {
+	if (!css.includes("tailwindcss")) return css;
+	let root;
+	try {
+		root = postcss.parse(css);
+	} catch {
+		return css;
+	}
+	const importSpecifiers = createTailwindV4CssImportSpecifierSet(packageName);
+	let changed = false;
+	root.walkAtRules("import", (rule) => {
+		const parsed = parseCssImportSpecifier(rule.params);
+		if (!parsed || !importSpecifiers.has(parsed.specifier)) return;
+		rule.params = rule.params.replace(parsed.raw, quoteCssImportSpecifier(`${parsed.specifier}/index.css`, parsed.quote));
+		changed = true;
+	});
+	return changed ? root.toString() : css;
+}
 function resolveTailwindCssImportTarget(patcher) {
 	const configuredPackageName = resolveTailwindcssOptions(patcher.options)?.packageName;
 	if (typeof configuredPackageName === "string" && configuredPackageName.length > 0 && !isPostcssPluginImportTarget(configuredPackageName)) return configuredPackageName;
@@ -1134,27 +1391,24 @@ function resolveTailwindV4SourceOptionsFromPatcher(patcher) {
 	};
 }
 function resolveTailwindV4Source$1(options) {
-	return resolveTailwindV4Source(options);
+	return resolveTailwindV4Source(options?.css === void 0 ? options : {
+		...options,
+		css: normalizeTailwindV4CssPackageImports(options.css, options.packageName)
+	});
 }
 async function resolveTailwindV4SourceFromPatcher(patcher) {
-	return resolveTailwindV4Source(resolveTailwindV4SourceOptionsFromPatcher(patcher));
+	return resolveTailwindV4Source$1(resolveTailwindV4SourceOptionsFromPatcher(patcher));
 }
 //#endregion
 //#region src/generator/options.ts
 function normalizeWeappTailwindcssGeneratorOptions(options) {
-	if (options === false) return {
-		mode: "off",
-		target: "weapp",
-		tailwindcssV3Compatibility: true
-	};
-	if (options === true || options == null) return {
-		mode: "auto",
+	if (options == null) return {
 		target: "weapp",
 		tailwindcssV3Compatibility: true
 	};
 	return {
-		mode: options.mode ?? "auto",
 		target: options.target ?? "weapp",
+		config: options.config,
 		styleOptions: options.styleOptions,
 		tailwindcssV3Compatibility: options.tailwindcssV3Compatibility ?? (options.target ?? "weapp") === "weapp"
 	};