weapp-tailwindcss 5.0.0-next.30 → 5.0.0-next.32

package/dist/{incremental-runtime-class-set-BxvZONkv.js → incremental-runtime-class-set-CLP1Qv8F.js}

@@ -1,14 +1,14 @@
 const require_chunk = require("./chunk-C5U5_Hdc.js");
-const require_v3_engine = require("./v3-engine-CHItlVq5.js");
-const require_generator = require("./generator-CrU-Ghc1.js");
-const require_precheck = require("./precheck-D7gJSmJz.js");
+const require_v3_engine = require("./v3-engine-DwY4Fixu.js");
+const require_generator = require("./generator-BEXaaUzP.js");
+const require_precheck = require("./precheck-CQeqnfo5.js");
 let node_fs = require("node:fs");
 let postcss = require("postcss");
 postcss = require_chunk.__toESM(postcss);
-let node_path = require("node:path");
-node_path = require_chunk.__toESM(node_path);
 let node_process = require("node:process");
 node_process = require_chunk.__toESM(node_process);
+let node_path = require("node:path");
+node_path = require_chunk.__toESM(node_path);
 let tailwindcss_patch = require("tailwindcss-patch");
 let _weapp_tailwindcss_postcss = require("@weapp-tailwindcss/postcss");
 //#region src/bundlers/shared/generator-css/markers.ts
@@ -108,6 +108,11 @@ const TAILWIND_ROOT_DIRECTIVE_RE = /@(?:import\s+(?:url\(\s*)?["']?tailwindcss4?
 const TAILWIND_EXTRACTABLE_DIRECTIVE_RE = /^\s*@(?:import|use|forward|tailwind|config|source|reference|plugin)\b[\s\S]*?(?:;|$)/;
 const TAILWIND_EXTRACTABLE_LAYER_STATEMENT_RE = /^\s*@layer\s[^;{]+;\s*$/;
 const TAILWIND_EXTRACTABLE_BLOCK_START_RE = /^\s*@(?:layer|theme|utility|variant|custom-variant)\b[\s\S]*\{/;
+const TAILWIND_V3_SUBPATH_IMPORT_LAYERS = new Map([
+	["tailwindcss/base", "base"],
+	["tailwindcss/components", "components"],
+	["tailwindcss/utilities", "utilities"]
+]);
 function parseImportRequest(params) {
 	return /^(?:url\(\s*)?(["']?)([^"')\s]+)\1\s*\)?/.exec(params.trim())?.[2];
 }
@@ -287,6 +292,24 @@ function hasPreprocessorOnlySyntax(rawSource) {
 function normalizeTailwindSourceForGenerator(rawSource, options = {}) {
 	return hasPreprocessorOnlySyntax(rawSource) ? extractTailwindSourceForPostcssFallback(rawSource, options) ?? rawSource : rawSource;
 }
+function normalizeTailwindV3CssEntrySource(rawSource) {
+	try {
+		const root = postcss.default.parse(rawSource);
+		let changed = false;
+		root.walkAtRules("import", (node) => {
+			const layer = TAILWIND_V3_SUBPATH_IMPORT_LAYERS.get(parseImportRequest(node.params) ?? "");
+			if (!layer) return;
+			node.replaceWith(postcss.default.atRule({
+				name: "tailwind",
+				params: layer
+			}));
+			changed = true;
+		});
+		return changed ? root.toString() : rawSource;
+	} catch {
+		return rawSource;
+	}
+}
 function normalizeTailwindSourceDirectives(rawSource, options = {}) {
 	if (!options.importFallback) return rawSource;
 	try {
@@ -1022,14 +1045,14 @@ async function resolveGeneratorSource(majorVersion, runtimeState, rawSource, fil
 			css: rawSource
 		} : void 0;
 		const sourceSideEntrySource = canResolveSourceSideCssEntry(file, cssHandlerOptions) ? resolveSourceSideCssEntrySource(file, mergedSourceOptions, { removeConfig: true }) : void 0;
-		const resolvedEntrySource = shouldResolveSourceSideCssEntry(rawSource) ? applyEntrySource ?? cssEntrySource ?? sourceSideEntrySource : shouldPreferTailwindV3SourceSideEntry(rawSource, sourceSideEntrySource) ? sourceSideEntrySource ?? cssEntrySource : cssEntrySource ?? applyEntrySource ?? sourceSideEntrySource;
+		const resolvedEntrySource = shouldResolveSourceSideCssEntry(rawSource) ? cssEntrySource ?? applyEntrySource ?? sourceSideEntrySource : shouldPreferTailwindV3SourceSideEntry(rawSource, sourceSideEntrySource) ? sourceSideEntrySource ?? cssEntrySource : cssEntrySource ?? applyEntrySource ?? sourceSideEntrySource;
 		if (!resolvedEntrySource) return generatorOptions?.config ? require_v3_engine.resolveTailwindV3Source(mergedSourceOptions) : require_v3_engine.resolveTailwindV3SourceFromPatcher(runtimeState.twPatcher);
 		if (cssEntrySource && !sourceSideEntrySource && !applyEntrySource && !hasTailwindRootDirectives(rawSource, { importFallback: true })) return generatorOptions?.config ? require_v3_engine.resolveTailwindV3Source(mergedSourceOptions) : require_v3_engine.resolveTailwindV3SourceFromPatcher(runtimeState.twPatcher);
 		const config = resolveExistingConfigPath(resolvedEntrySource.config, resolvedEntrySource.configRequest, file, require_v3_engine.omitUndefined(mergedSourceOptions));
 		return require_v3_engine.resolveTailwindV3Source({
 			...mergedSourceOptions,
 			base: resolvedEntrySource.base,
-			css: resolvedEntrySource.css,
+			css: normalizeTailwindV3CssEntrySource(resolvedEntrySource.css),
 			...config ? { config } : {}
 		});
 	}
@@ -1376,6 +1399,125 @@ function inheritLegacyUnitConvertedDeclarations(css, legacyCss) {
 	}
 }
 //#endregion
+//#region src/bundlers/shared/generator-css/user-layer-order.ts
+const USER_LAYER_COMPONENTS_START = "/*! weapp-tailwindcss layer components start */";
+const USER_LAYER_COMPONENTS_END = "/*! weapp-tailwindcss layer components end */";
+const UTILITY_LAYER_INSERTION_RES = [
+	/(^|\n)\.(?:fixed|absolute|relative|sticky|static)\s*\{/,
+	/(^|\n)\.(?:block|inline-block|inline|flex|inline-flex|grid|hidden)\s*\{/,
+	/(^|\n)\.(?:m|mx|my|mt|mr|mb|ml|p|px|py|pt|pr|pb|pl)-/,
+	/(^|\n)\.(?:w|h|min-w|min-h|max-w|max-h)-/,
+	/(^|\n)\.(?:bg|text|border|rounded|shadow|opacity|transition|transform|translate|scale|rotate|gap|items|justify|content)-/
+];
+function appendCss(base, extra) {
+	if (!base) return extra;
+	if (!extra) return base;
+	if (/\s$/.test(base) || /^\s/.test(extra)) return `${base}${extra}`;
+	return `${base}\n${extra}`;
+}
+function removeFirstCssOccurrence(css, chunk) {
+	const trimmed = chunk.trim();
+	if (!trimmed) return css;
+	const index = css.indexOf(trimmed);
+	if (index === -1) return css;
+	return appendCss(css.slice(0, index).trimEnd(), css.slice(index + trimmed.length).trimStart());
+}
+function collectSelectorsFromCss(css) {
+	const selectors = /* @__PURE__ */ new Set();
+	try {
+		postcss.default.parse(css).walkRules((rule) => {
+			for (const selector of rule.selectors ?? [rule.selector]) {
+				const normalized = selector.trim();
+				if (normalized) selectors.add(normalized);
+			}
+		});
+	} catch {}
+	return selectors;
+}
+function matchesLayerSelector(selector, layerSelector) {
+	if (selector === layerSelector) return true;
+	if (!selector.startsWith(layerSelector)) return false;
+	const next = selector[layerSelector.length];
+	return next === ":" || next === "[";
+}
+function removeCssRulesForSelectors(css, layerCss) {
+	const selectors = [...collectSelectorsFromCss(layerCss)];
+	if (selectors.length === 0) return css;
+	try {
+		const root = postcss.default.parse(css);
+		root.walkRules((rule) => {
+			if ((rule.selectors ?? [rule.selector]).some((selector) => selectors.some((layerSelector) => matchesLayerSelector(selector.trim(), layerSelector)))) rule.remove();
+		});
+		return root.toString();
+	} catch {
+		return removeFirstCssOccurrence(css, layerCss);
+	}
+}
+function wrapUserLayerComponentsCss(css) {
+	return css.trim().length > 0 ? `${USER_LAYER_COMPONENTS_START}\n${css}\n${USER_LAYER_COMPONENTS_END}` : css;
+}
+function extractMarkedUserLayerComponentsCss(css) {
+	const layers = [];
+	let rest = "";
+	let cursor = 0;
+	while (cursor < css.length) {
+		const startIndex = css.indexOf(USER_LAYER_COMPONENTS_START, cursor);
+		if (startIndex === -1) {
+			rest += css.slice(cursor);
+			break;
+		}
+		rest += css.slice(cursor, startIndex);
+		const contentStart = startIndex + 47;
+		const endIndex = css.indexOf(USER_LAYER_COMPONENTS_END, contentStart);
+		if (endIndex === -1) {
+			rest += css.slice(startIndex);
+			break;
+		}
+		const layerCss = css.slice(contentStart, endIndex).trim();
+		if (layerCss) layers.push(layerCss);
+		cursor = endIndex + 45;
+	}
+	return {
+		layers,
+		rest
+	};
+}
+function findUtilityLayerInsertionIndex(css) {
+	let index = -1;
+	for (const pattern of UTILITY_LAYER_INSERTION_RES) {
+		const match = pattern.exec(css);
+		if (!match) continue;
+		const nextIndex = match.index + (match[1]?.length ?? 0);
+		index = index === -1 ? nextIndex : Math.min(index, nextIndex);
+	}
+	return index;
+}
+function reorderMarkedUserLayerComponentsCss(css) {
+	if (!css.includes(USER_LAYER_COMPONENTS_START)) return css;
+	const { layers, rest } = extractMarkedUserLayerComponentsCss(css);
+	if (layers.length === 0) return rest;
+	const layerCss = layers.join("\n");
+	const insertionIndex = findUtilityLayerInsertionIndex(rest);
+	if (insertionIndex === -1) return appendCss(rest, layerCss);
+	return appendCss(appendCss(rest.slice(0, insertionIndex), layerCss), rest.slice(insertionIndex));
+}
+function mergeMarkedUserLayerComponentsCss(baseCss, markedCss) {
+	if (!markedCss.includes(USER_LAYER_COMPONENTS_START)) return {
+		css: baseCss,
+		merged: false
+	};
+	const { layers } = extractMarkedUserLayerComponentsCss(markedCss);
+	if (layers.length === 0) return {
+		css: baseCss,
+		merged: false
+	};
+	const layerCss = layers.join("\n");
+	return {
+		css: reorderMarkedUserLayerComponentsCss(appendCss(removeCssRulesForSelectors(baseCss, layerCss), wrapUserLayerComponentsCss(layerCss))),
+		merged: true
+	};
+}
+//#endregion
 //#region src/bundlers/shared/generator-css.ts
 const SUPPORTED_GENERATOR_MAJOR_VERSIONS = new Set([3, 4]);
 const REMOTE_IMPORT_RE = /^(?:https?:)?\/\//i;
@@ -1449,6 +1591,9 @@ function createCssSourceOrderAppend(base, extra) {
 	if (/\s$/.test(base) || /^\s/.test(extra)) return `${base}${extra}`;
 	return `${base}\n${extra}`;
 }
+function shouldFinalizeMarkedUserLayerComponentsCss(file) {
+	return !/\.(?:vue|svelte|astro|scss|sass|less|styl)(?:[?#].*)?$/i.test(file);
+}
 function splitRawSourceByGeneratedCssOrder(rawSource, rawTailwindCss) {
 	const placeholderParts = splitGeneratorPlaceholderCssBySourceOrder(rawSource, rawTailwindCss);
 	if (placeholderParts) return placeholderParts;
@@ -1456,6 +1601,84 @@ function splitRawSourceByGeneratedCssOrder(rawSource, rawTailwindCss) {
 	if (exactParts) return exactParts;
 	return splitTailwindGeneratedCssByBanner(rawSource);
 }
+function splitUserCssLayerBlocks(source) {
+	if (!source.includes("@layer")) return {
+		layer: "",
+		rest: source
+	};
+	try {
+		const root = postcss.default.parse(source);
+		const layerRoot = postcss.default.root();
+		const restRoot = postcss.default.root();
+		for (const node of root.nodes) (node.type === "atrule" && node.name === "layer" && node.nodes?.length ? layerRoot : restRoot).append(node.clone());
+		return {
+			layer: layerRoot.toString(),
+			rest: restRoot.toString()
+		};
+	} catch {
+		return {
+			layer: source,
+			rest: ""
+		};
+	}
+}
+function hasUserCssLayerBlocks(source) {
+	if (!source.includes("@layer")) return false;
+	try {
+		let hasLayerBlock = false;
+		postcss.default.parse(source).walkAtRules("layer", (node) => {
+			if (node.nodes?.length) hasLayerBlock = true;
+		});
+		return hasLayerBlock;
+	} catch {
+		return true;
+	}
+}
+function collectUserLayerSelectors(source) {
+	const selectors = /* @__PURE__ */ new Set();
+	try {
+		postcss.default.parse(source).walkRules((rule) => {
+			for (const selector of rule.selectors ?? [rule.selector]) {
+				const normalized = selector.trim();
+				if (normalized) selectors.add(normalized);
+			}
+		});
+	} catch {}
+	return selectors;
+}
+function matchesUserLayerSelector(selector, userLayerSelector) {
+	if (selector === userLayerSelector) return true;
+	if (!selector.startsWith(userLayerSelector)) return false;
+	const next = selector[userLayerSelector.length];
+	return next === ":" || next === "[";
+}
+function extractGeneratedCssForUserLayerSelectors(css, userLayerSource) {
+	const selectors = collectUserLayerSelectors(userLayerSource);
+	if (selectors.size === 0) return {
+		layer: "",
+		rest: css
+	};
+	try {
+		const root = postcss.default.parse(css);
+		const layerRoot = postcss.default.root();
+		const selectorList = [...selectors];
+		root.walkRules((rule) => {
+			if ((rule.selectors ?? [rule.selector]).some((selector) => selectorList.some((userSelector) => matchesUserLayerSelector(selector.trim(), userSelector)))) {
+				layerRoot.append(rule.clone());
+				rule.remove();
+			}
+		});
+		return {
+			layer: layerRoot.toString(),
+			rest: root.toString()
+		};
+	} catch {
+		return {
+			layer: "",
+			rest: css
+		};
+	}
+}
 async function transformGeneratorUserCss(source, options) {
 	if (source.trim().length === 0) return "";
 	const cleanedSource = removeTailwindSourceDirectives(stripUnmatchedTailwindSourceMediaCloseFragments(stripTailwindSourceMediaFragments(source)), { importFallback: options.importFallback });
@@ -1584,7 +1807,7 @@ async function generateCssByGenerator(options) {
 			sources: generatedResults.flatMap((item) => item.sources)
 		};
 		debug("tailwind generator result: %s rawBytes=%d cssBytes=%d candidates=%d", file, generated.rawCss.length, generated.css.length, generated.classSet.size);
-		if (typeof options.previousCss === "string" && typeof generated.incrementalCss === "string") {
+		if ((generated.target !== "weapp" || !hasUserCssLayerBlocks(effectiveRawSource)) && typeof options.previousCss === "string" && typeof generated.incrementalCss === "string") {
 			const incrementalCss = stripTailwindBanner(generated.incrementalCss);
 			return {
 				css: incrementalCss.trim().length > 0 ? createCssAppend(options.previousCss, finalizeMiniProgramGeneratorCss(incrementalCss, generated.target, majorVersion, opts.cssPreflight, { injectPreflight: false })) : options.previousCss,
@@ -1606,9 +1829,14 @@ async function generateCssByGenerator(options) {
 				styleHandler,
 				importFallback: generatorOptions.importFallback
 			};
+			const afterLayerParts = generated.target === "weapp" ? splitUserCssLayerBlocks(orderedExtraCss.after) : {
+				layer: "",
+				rest: orderedExtraCss.after
+			};
 			const beforeUserCss = await transformGeneratorUserCss(orderedExtraCss.before, userCssOptions);
-			const afterUserCss = await transformGeneratorUserCss(orderedExtraCss.after, userCssOptions);
-			css = createCssSourceOrderAppend(createCssSourceOrderAppend(beforeUserCss, css), afterUserCss);
+			const afterLayerUserCss = await transformGeneratorUserCss(afterLayerParts.layer, userCssOptions);
+			const afterUserCss = await transformGeneratorUserCss(afterLayerParts.rest, userCssOptions);
+			css = createCssSourceOrderAppend(createCssSourceOrderAppend(createCssSourceOrderAppend(beforeUserCss, generated.target === "weapp" ? wrapUserLayerComponentsCss(afterLayerUserCss) : afterLayerUserCss), css), afterUserCss);
 			if (isEmptyCssSourceOrderParts(orderedExtraCss) && shouldAppendWebBundleCssFallback(generated.target, {
 				hasSourceDirectives,
 				hasMatchedCssSourceFile
@@ -1617,6 +1845,7 @@ async function generateCssByGenerator(options) {
 				css = createCssSourceOrderAppend(css, userCss);
 			}
 			if (generated.target === "weapp") {
+				if (shouldFinalizeMarkedUserLayerComponentsCss(file)) css = reorderMarkedUserLayerComponentsCss(css);
 				css = await appendLegacyCompatCss(css, effectiveRawSource, generated.target, styleHandler, cssHandlerOptions, generatorStyleOptions);
 				css = await appendLegacyContainerCompatCss(css, effectiveRawSource, file, runtime, configuredContainerCompat, generated.target, styleHandler, cssHandlerOptions, generatorStyleOptions);
 			}
@@ -1629,7 +1858,27 @@ async function generateCssByGenerator(options) {
 		}
 		debug("tailwind direct css generation prefix mismatch, append transformed bundle css %s", file);
 		let css = stripTailwindBanner(generated.css);
-		if (generated.target === "weapp") css = inheritLegacyUnitConvertedDeclarations(css, effectiveRawSource);
+		if (generated.target === "weapp") {
+			css = inheritLegacyUnitConvertedDeclarations(css, effectiveRawSource);
+			if (hasUserCssLayerBlocks(effectiveRawSource)) {
+				const layerParts = splitUserCssLayerBlocks(effectiveRawSource);
+				const layerUserCss = await transformGeneratorUserCss(layerParts.layer, {
+					generatorTarget: generated.target,
+					generatorStyleOptions,
+					cssUserHandlerOptions,
+					styleHandler,
+					importFallback: generatorOptions.importFallback
+				});
+				const layerCss = layerUserCss.trim().length > 0 && !hasTailwindApplyDirective(layerUserCss) ? {
+					layer: layerUserCss,
+					rest: css
+				} : extractGeneratedCssForUserLayerSelectors(css, layerParts.layer);
+				if (layerCss.layer.trim().length > 0) {
+					css = createCssSourceOrderAppend(wrapUserLayerComponentsCss(layerCss.layer), layerCss.rest);
+					if (shouldFinalizeMarkedUserLayerComponentsCss(file)) css = reorderMarkedUserLayerComponentsCss(css);
+				}
+			}
+		}
 		if (hasMatchedCssSourceFile || generated.target === "web") {
 			if (shouldAppendWebBundleCssFallback(generated.target, {
 				hasSourceDirectives,
@@ -2018,6 +2267,12 @@ Object.defineProperty(exports, "hasTailwindSourceDirectives", {
 		return hasTailwindSourceDirectives;
 	}
 });
+Object.defineProperty(exports, "mergeMarkedUserLayerComponentsCss", {
+	enumerable: true,
+	get: function() {
+		return mergeMarkedUserLayerComponentsCss;
+	}
+});
 Object.defineProperty(exports, "normalizeTailwindSourceForGenerator", {
 	enumerable: true,
 	get: function() {