weapp-tailwindcss 5.1.2 → 5.1.4

package/dist/{v4-engine-ON_oSLfO.js → v4-engine-CKtsdKxK.js}

@@ -1,17 +1,17 @@
-const require_chunk = require("./chunk-emK7D4bc.js");
+const require_rolldown_runtime = require("./rolldown-runtime-emK7D4bc.js");
 require("./auto-DtU6f3X6.js");
 let node_fs = require("node:fs");
-node_fs = require_chunk.__toESM(node_fs);
+node_fs = require_rolldown_runtime.__toESM(node_fs);
 let node_path = require("node:path");
-node_path = require_chunk.__toESM(node_path);
+node_path = require_rolldown_runtime.__toESM(node_path);
 let node_process = require("node:process");
-node_process = require_chunk.__toESM(node_process);
+node_process = require_rolldown_runtime.__toESM(node_process);
 let _tailwindcss_mangle_engine = require("@tailwindcss-mangle/engine");
 let _weapp_tailwindcss_postcss = require("@weapp-tailwindcss/postcss");
 let lru_cache = require("lru-cache");
 let node_fs_promises = require("node:fs/promises");
 let micromatch = require("micromatch");
-micromatch = require_chunk.__toESM(micromatch);
+micromatch = require_rolldown_runtime.__toESM(micromatch);
 let node_module = require("node:module");
 //#region src/runtime-branch/generator-target-env.ts
 const explicitGeneratorTargetEnvKeys = ["WEAPP_TW_TARGET", "WEAPP_TAILWINDCSS_TARGET"];
@@ -68,6 +68,15 @@ function filterUnsupportedMiniProgramTailwindV4Candidates(candidates) {
 	return new Set([...candidates].filter((candidate) => !isUnsupportedMiniProgramTailwindV4Candidate(candidate)));
 }
 //#endregion
+//#region src/tailwindcss/v4-engine/css-macro-source.ts
+function resolveCssMacroTailwindV4Source(source) {
+	const css = (0, _weapp_tailwindcss_postcss.transformCssMacroTailwindV4Source)(source.css);
+	return css === source.css ? source : {
+		...source,
+		css
+	};
+}
+//#endregion
 //#region src/tailwindcss/v4-engine/tailwind-v4-default-colors.ts
 const TAILWIND_V4_COLOR_STEPS = [
 	"50",
@@ -1169,7 +1178,7 @@ function createIncrementalStyleOptions(styleOptions) {
 	};
 }
 function resolveStyleOptions(source, options) {
-	return (0, _weapp_tailwindcss_postcss.hasCssMacroTailwindV4Directive)(source.css) ? (0, _weapp_tailwindcss_postcss.withCssMacroStyleOptions)(options) : options;
+	return (0, _weapp_tailwindcss_postcss.hasCssMacroTailwindV4Source)(source.css) ? (0, _weapp_tailwindcss_postcss.withCssMacroStyleOptions)(options) : options;
 }
 function collectCustomPropertyValues(css) {
 	const values = /* @__PURE__ */ new Map();
@@ -1236,11 +1245,11 @@ function createTailwindV4Engine(source) {
 	async function generateOnce(generateSource, options = {}) {
 		const { scanSources = true, styleOptions, target = "weapp", ...patchOptions } = options;
 		const resolvedStyleOptions = resolveStyleOptions(generateSource, styleOptions);
-		const engine = (0, _tailwindcss_mangle_engine.createTailwindV4Engine)(createCompatibleSource(generateSource, target));
+		const engine = (0, _tailwindcss_mangle_engine.createTailwindV4Engine)(createCompatibleSource(resolveCssMacroTailwindV4Source(generateSource), target));
 		const resolvedScanSources = await resolveScanSources(generateSource, scanSources);
 		const delegateSourceScan = shouldDelegateWebSourceScanToTailwind(target, resolvedScanSources);
 		const filesystemCandidates = !delegateSourceScan && Array.isArray(resolvedScanSources) ? new Set(await (0, _tailwindcss_mangle_engine.extractRawCandidates)(resolvedScanSources, { ...patchOptions.bareArbitraryValues === void 0 ? {} : { bareArbitraryValues: patchOptions.bareArbitraryValues } })) : void 0;
-		const normalizedCandidates = normalizeTargetRpxLengthCandidates(resolveTargetCandidates(new Set([...collectCandidates(patchOptions.candidates), ...filesystemCandidates ?? []]), target), target, resolvedStyleOptions);
+		const normalizedCandidates = normalizeTargetRpxLengthCandidates(resolveTargetCandidates(/* @__PURE__ */ new Set([...collectCandidates(patchOptions.candidates), ...filesystemCandidates ?? []]), target), target, resolvedStyleOptions);
 		const result = await engine.generate(omitUndefined({
 			scanSources: delegateSourceScan ? resolvedScanSources : false,
 			...patchOptions,
@@ -1259,13 +1268,14 @@ function createTailwindV4Engine(source) {
 	}
 	async function generateWithIncrementalCache(options = {}) {
 		const target = options.target ?? "weapp";
-		const compatibleSource = createCompatibleSource(source, target);
+		const cssMacroSource = resolveCssMacroTailwindV4Source(source);
+		const compatibleSource = createCompatibleSource(cssMacroSource, target);
 		const requestedCandidates = resolveTargetCandidates(options.candidates, target);
 		const styleOptions = resolveStyleOptions(source, options.styleOptions);
-		if ((options.sources?.length ?? 0) > 0 || options.bareArbitraryValues !== void 0 || Array.isArray(options.scanSources)) return generateOnce(source, options);
+		if ((options.sources?.length ?? 0) > 0 || options.bareArbitraryValues !== void 0 || Array.isArray(options.scanSources)) return generateOnce(cssMacroSource, options);
 		const cacheKey = createIncrementalGenerateCacheKey(compatibleSource, target, styleOptions);
 		if (options.scanSources === true) return runIncrementalGenerateTask(cacheKey, requestedCandidates, options.scanSources, async () => {
-			const generated = await generateOnce(source, options);
+			const generated = await generateOnce(cssMacroSource, options);
 			if (!seedIncrementalGenerateCache({
 				compatibleSource,
 				generated,
@@ -1278,7 +1288,7 @@ function createTailwindV4Engine(source) {
 		const cached = incrementalGenerateCache.get(cacheKey);
 		if (cached) {
 			if (hasRemovedCandidates(cached.seenCandidates, requestedCandidates)) return runIncrementalGenerateTask(cacheKey, requestedCandidates, options.scanSources, async () => {
-				const generated = await generateOnce(source, options);
+				const generated = await generateOnce(cssMacroSource, options);
 				if (!seedIncrementalGenerateCache({
 					compatibleSource,
 					generated,
@@ -1302,7 +1312,7 @@ function createTailwindV4Engine(source) {
 				target: cached.target
 			};
 			if (shouldRebuildIncrementalEntry(cached, requestedCandidates, missingCandidates)) return runIncrementalGenerateTask(cacheKey, requestedCandidates, options.scanSources, async () => {
-				const generated = await generateOnce(source, options);
+				const generated = await generateOnce(cssMacroSource, options);
 				if (!seedIncrementalGenerateCache({
 					compatibleSource,
 					generated,
@@ -1352,7 +1362,7 @@ function createTailwindV4Engine(source) {
 			});
 		}
 		return runIncrementalGenerateTask(cacheKey, requestedCandidates, options.scanSources, async () => {
-			const generated = await generateOnce(source, options);
+			const generated = await generateOnce(cssMacroSource, options);
 			seedIncrementalGenerateCache({
 				compatibleSource,
 				generated,
@@ -1495,14 +1505,14 @@ function parseConfigRequest$1(params) {
 function isPackageJsonImportRequest$1(request) {
 	return typeof request === "string" && request.startsWith("#");
 }
-function isWeappTailwindcssImportRequest$1(request) {
+function isWeappTailwindcssImportRequest(request) {
 	return request === "weapp-tailwindcss" || request?.startsWith("weapp-tailwindcss/");
 }
 function isTailwindImportRequest$1(request) {
 	return request === "tailwindcss" || request === "tailwindcss4" || request?.startsWith("tailwindcss/") || request?.startsWith("tailwindcss4/");
 }
 function normalizeTailwindImportRequest$1(request, options = {}) {
-	if (options.importFallback && isWeappTailwindcssImportRequest$1(request)) return request.replace(/^weapp-tailwindcss/, "tailwindcss");
+	if (options.importFallback && isWeappTailwindcssImportRequest(request)) return request.replace(/^weapp-tailwindcss/, "tailwindcss");
 	return request;
 }
 function replaceImportRequest$1(params, request, replacement) {
@@ -1514,7 +1524,7 @@ function normalizeTailwindDirectiveLine(line, options = {}) {
 	const trimmed = line.trimStart();
 	if (/^@(?:use|forward)\b/.test(trimmed)) {
 		const request = parseImportRequest$1(trimmed.replace(/^@(?:use|forward)\b/, ""));
-		if (isTailwindImportRequest$1(request) || options.importFallback && isWeappTailwindcssImportRequest$1(request)) {
+		if (isTailwindImportRequest$1(request) || options.importFallback && isWeappTailwindcssImportRequest(request)) {
 			const normalizedRequest = normalizeTailwindImportRequest$1(request, options);
 			return replaceImportRequest$1(line.replace(/^(\s*)@(?:use|forward)\b/, "$1@import"), request, normalizedRequest);
 		}
@@ -1522,7 +1532,7 @@ function normalizeTailwindDirectiveLine(line, options = {}) {
 	}
 	if (!options.importFallback || !trimmed.startsWith("@import")) return line;
 	const request = parseImportRequest$1(trimmed.replace(/^@import\b/, ""));
-	if (!request || !isWeappTailwindcssImportRequest$1(request)) return line;
+	if (!request || !isWeappTailwindcssImportRequest(request)) return line;
 	return replaceImportRequest$1(line, request, request.replace(/^weapp-tailwindcss/, "tailwindcss"));
 }
 function extractTailwindDirectiveLines(rawSource, options = {}) {
@@ -1642,7 +1652,7 @@ function extractConfigRequestFromSource(rawSource) {
 }
 //#endregion
 //#region src/bundlers/shared/generator-css/directives.ts
-const TAILWIND_REMOVABLE_SOURCE_DIRECTIVE_NAMES = new Set([
+const TAILWIND_REMOVABLE_SOURCE_DIRECTIVE_NAMES = /* @__PURE__ */ new Set([
 	"config",
 	"custom-variant",
 	"layer",
@@ -1654,45 +1664,21 @@ const TAILWIND_REMOVABLE_SOURCE_DIRECTIVE_NAMES = new Set([
 	"utility",
 	"variant"
 ]);
-const TAILWIND_ROOT_DIRECTIVE_NAMES = new Set([
-	"config",
-	"custom-variant",
-	"plugin",
-	"source",
-	"tailwind",
-	"theme",
-	"utility",
-	"variant"
-]);
 const TAILWIND_ROOT_DIRECTIVE_RE = /@(?:import\s+(?:url\(\s*)?["']?tailwindcss4?(?:\/[^"')\s]*)?|(?:use|forward)\s+(?:url\(\s*)?["']?tailwindcss4?(?:\/[^"')\s]*)?|tailwind|config|custom-variant|plugin|source|theme|utility|variant)\b/;
 function parseImportRequest(params) {
-	return /^(?:url\(\s*)?(["']?)([^"')\s]+)\1\s*\)?/.exec(params.trim())?.[2];
+	return (0, _weapp_tailwindcss_postcss.parseTailwindCssDirectiveRequest)(params);
 }
 function hasLocalCssImport(rawSource) {
-	let found = false;
-	try {
-		_weapp_tailwindcss_postcss.postcss.parse(rawSource).walkAtRules("import", (rule) => {
-			const request = parseImportRequest(rule.params);
-			if (request?.startsWith(".") === true || request?.startsWith("/") === true) {
-				found = true;
-				return false;
-			}
-		});
-	} catch {}
-	return found;
+	return analyzeParseableTailwindDirectives(rawSource)?.hasLocalCssImport ?? false;
 }
 function parseConfigRequest(params) {
-	return /^(["'])(.+)\1\s*;?$/.exec(params.trim())?.[2];
+	return (0, _weapp_tailwindcss_postcss.parseTailwindCssConfigRequest)(params);
 }
 function isPackageJsonImportRequest(request) {
-	return typeof request === "string" && request.startsWith("#");
-}
-function isWeappTailwindcssImportRequest(request) {
-	return request === "weapp-tailwindcss" || request?.startsWith("weapp-tailwindcss/");
+	return (0, _weapp_tailwindcss_postcss.isTailwindCssPackageJsonImportRequest)(request);
 }
 function normalizeTailwindImportRequest(request, options = {}) {
-	if (options.importFallback && isWeappTailwindcssImportRequest(request)) return request.replace(/^weapp-tailwindcss/, "tailwindcss");
-	return request;
+	return (0, _weapp_tailwindcss_postcss.normalizeTailwindCssImportRequest)(request, options);
 }
 function replaceImportRequest(params, request, replacement) {
 	const index = params.indexOf(request);
@@ -1748,12 +1734,11 @@ function normalizeTailwindSourceDirectives(rawSource, options = {}) {
 	}
 }
 function isTailwindImportRequest(request) {
-	return request === "tailwindcss" || request === "tailwindcss4" || request?.startsWith("tailwindcss/") || request?.startsWith("tailwindcss4/");
+	const normalized = normalizeTailwindImportRequest(request);
+	return normalized === "tailwindcss" || normalized === "tailwindcss4" || normalized?.startsWith("tailwindcss/") === true || normalized?.startsWith("tailwindcss4/") === true;
 }
 function isTailwindImportAtRule(node, options = {}) {
-	if (node.name === "tailwind") return true;
-	if (node.name !== "import" && node.name !== "use" && node.name !== "forward") return false;
-	return isTailwindImportRequest(normalizeTailwindImportRequest(parseImportRequest(node.params), options));
+	return (0, _weapp_tailwindcss_postcss.isTailwindCssImportAtRule)(node, options);
 }
 function isTailwindSourceDirective(node, options = {}) {
 	if (node.type !== "atrule") return false;
@@ -1767,10 +1752,18 @@ function hasGeneratedCssArtifacts(rawSource) {
 	return hasTailwindGeneratedCssMarkers(rawSource) && !GENERATOR_PLACEHOLDER_MARKER_RE.test(rawSource);
 }
 function isTailwindGenerationDirective(node, options = {}) {
-	if (node.type !== "atrule") return false;
-	const atRule = node;
-	const request = atRule.name === "import" ? parseImportRequest(atRule.params) : atRule.name === "config" || atRule.name === "plugin" || atRule.name === "reference" ? parseConfigRequest(atRule.params) : void 0;
-	return isTailwindImportAtRule(atRule, options) || isPackageJsonImportRequest(request) || atRule.name === "apply" || !options.ignoreLayer && atRule.name === "layer" || atRule.name === "config" || atRule.name === "source";
+	return (0, _weapp_tailwindcss_postcss.isTailwindCssGenerationDirective)(node, options);
+}
+function analyzeParseableTailwindDirectives(rawSource, options = {}) {
+	try {
+		const ignoreLayer = options.ignoreLayer ?? hasGeneratedCssArtifacts(rawSource);
+		return (0, _weapp_tailwindcss_postcss.analyzeTailwindCssDirectives)(_weapp_tailwindcss_postcss.postcss.parse(rawSource), {
+			...options,
+			ignoreLayer
+		});
+	} catch {
+		return;
+	}
 }
 function removeTailwindSourceDirectives(rawSource, options = {}) {
 	try {
@@ -1790,76 +1783,23 @@ function removeTailwindSourceDirectives(rawSource, options = {}) {
 	}
 }
 function hasTailwindSourceDirectives(rawSource, options = {}) {
-	try {
-		if (GENERATOR_PLACEHOLDER_MARKER_RE.test(rawSource)) return true;
-		const root = _weapp_tailwindcss_postcss.postcss.parse(rawSource);
-		let found = false;
-		const ignoreLayer = hasGeneratedCssArtifacts(rawSource);
-		root.walk((node) => {
-			if (isTailwindGenerationDirective(node, {
-				...options,
-				ignoreLayer
-			})) {
-				found = true;
-				return false;
-			}
-		});
-		return found;
-	} catch {
-		return extractTailwindDirectiveLines(rawSource, options).length > 0;
-	}
+	if (GENERATOR_PLACEHOLDER_MARKER_RE.test(rawSource)) return true;
+	return analyzeParseableTailwindDirectives(rawSource, options)?.hasTailwindSourceDirectives ?? extractTailwindDirectiveLines(rawSource, options).length > 0;
 }
 function hasTailwindNonRootGenerationDirectives(rawSource, options = {}) {
-	try {
-		if (GENERATOR_PLACEHOLDER_MARKER_RE.test(rawSource)) return true;
-		const root = _weapp_tailwindcss_postcss.postcss.parse(rawSource);
-		let found = false;
-		const ignoreLayer = hasGeneratedCssArtifacts(rawSource);
-		root.walk((node) => {
-			if (isTailwindGenerationDirective(node, {
-				...options,
-				ignoreLayer
-			}) && !(node.type === "atrule" && isTailwindImportAtRule(node, options))) {
-				found = true;
-				return false;
-			}
-		});
-		return found;
-	} catch {
-		return GENERATOR_PLACEHOLDER_MARKER_RE.test(rawSource) || /@(?:apply|config|custom-variant|plugin|source|theme|utility|variant)\b/.test(rawSource);
-	}
+	if (GENERATOR_PLACEHOLDER_MARKER_RE.test(rawSource)) return true;
+	return analyzeParseableTailwindDirectives(rawSource, options)?.hasTailwindNonRootGenerationDirectives ?? /@(?:apply|config|custom-variant|plugin|source|theme|utility|variant)\b/.test(rawSource);
 }
 function hasTailwindRootDirectives(rawSource, options = {}) {
 	if (!TAILWIND_ROOT_DIRECTIVE_RE.test(rawSource) && !(options.importFallback && rawSource.includes("weapp-tailwindcss"))) return false;
-	try {
-		const root = _weapp_tailwindcss_postcss.postcss.parse(rawSource);
-		let found = false;
-		root.walkAtRules((node) => {
-			const request = node.name === "import" ? parseImportRequest(node.params) : node.name === "config" || node.name === "plugin" ? parseConfigRequest(node.params) : void 0;
-			if (isTailwindImportAtRule(node, options) || isPackageJsonImportRequest(request) || TAILWIND_ROOT_DIRECTIVE_NAMES.has(node.name)) {
-				found = true;
-				return false;
-			}
-		});
-		return found;
-	} catch {
-		return extractTailwindDirectiveLines(rawSource, options).length > 0;
-	}
+	return analyzeParseableTailwindDirectives(rawSource, options)?.hasTailwindRootDirectives ?? extractTailwindDirectiveLines(rawSource, options).length > 0;
 }
 function hasTailwindApplyDirective(rawSource) {
 	if (!rawSource.includes("@apply")) return false;
-	try {
-		const root = _weapp_tailwindcss_postcss.postcss.parse(rawSource);
-		let found = false;
-		root.walkAtRules("apply", () => {
-			found = true;
-			return false;
-		});
-		return found;
-	} catch {
-		const fallback = extractTailwindSourceForPostcssFallback(rawSource);
-		return typeof fallback === "string" && /@apply\s[^;{}]+;/.test(fallback);
-	}
+	const analysis = analyzeParseableTailwindDirectives(rawSource);
+	if (analysis) return analysis.hasTailwindApplyDirective;
+	const fallback = extractTailwindSourceForPostcssFallback(rawSource);
+	return typeof fallback === "string" && /@apply\s[^;{}]+;/.test(fallback);
 }
 function resolveCssEntrySource(rawSource, base, options = {}) {
 	try {
@@ -1951,7 +1891,7 @@ function normalizeTailwindcssRuntimeOptions(options) {
 }
 //#endregion
 //#region src/context/workspace.ts
-const IGNORED_WORKSPACE_DIRS = new Set([
+const IGNORED_WORKSPACE_DIRS = /* @__PURE__ */ new Set([
 	"node_modules",
 	".git",
 	".hg",
@@ -2217,7 +2157,7 @@ function quoteCssImportSpecifier(specifier, quote = "\"") {
 	return `${quote}${specifier.replaceAll("\\", "\\\\").replaceAll(quote, `\\${quote}`)}${quote}`;
 }
 function createTailwindV4CssImportSpecifierSet(packageName) {
-	const specifiers = new Set(["tailwindcss"]);
+	const specifiers = /* @__PURE__ */ new Set(["tailwindcss"]);
 	if (packageName && isBarePackageSpecifier(packageName)) specifiers.add(packageName);
 	return specifiers;
 }
@@ -2642,6 +2582,12 @@ Object.defineProperty(exports, "resolveCssEntrySource", {
 		return resolveCssEntrySource;
 	}
 });
+Object.defineProperty(exports, "resolveCssMacroTailwindV4Source", {
+	enumerable: true,
+	get: function() {
+		return resolveCssMacroTailwindV4Source;
+	}
+});
 Object.defineProperty(exports, "resolveCssSourceEntries", {
 	enumerable: true,
 	get: function() {