weapp-tailwindcss 5.0.0-next.9 → 5.0.1

package/dist/{postcss-QIXwT40c.js → postcss-DE0TOtV9.js}

@@ -1,17 +1,15 @@
-const require_chunk = require("./chunk-8l464Juk.js");
-const require_cache = require("./cache-BVAiJV3J.js");
-const require_generator = require("./generator-DKkhJbOg.js");
+const require_chunk = require("./chunk-C5U5_Hdc.js");
+const require_v3_engine = require("./v3-engine-M6Aqru5T.js");
+const require_generator = require("./generator-CvmsIQFI.js");
 let postcss = require("postcss");
 postcss = require_chunk.__toESM(postcss);
-let node_path = require("node:path");
-node_path = require_chunk.__toESM(node_path);
+let tailwindcss_patch = require("tailwindcss-patch");
 let node_process = require("node:process");
 node_process = require_chunk.__toESM(node_process);
-let tailwindcss_patch = require("tailwindcss-patch");
-let tailwindcss_config = require("tailwindcss-config");
+let node_path = require("node:path");
+node_path = require_chunk.__toESM(node_path);
 let node_fs_promises = require("node:fs/promises");
-let fast_glob = require("fast-glob");
-fast_glob = require_chunk.__toESM(fast_glob);
+let tailwindcss_config = require("tailwindcss-config");
 //#region src/postcss/config-directive.ts
 function quoteCssString(value) {
 	return value.replaceAll("\\", "\\\\").replaceAll("\"", "\\\"");
@@ -66,152 +64,93 @@ function addSourceDependencyMessages(result, files) {
 }
 //#endregion
 //#region src/postcss/source-files.ts
-const POSTCSS_SOURCE_PATTERN = `**/*.{${[
-	"html",
-	"wxml",
-	"axml",
-	"jxml",
-	"ksml",
-	"ttml",
-	"qml",
-	"tyml",
-	"xhsml",
-	"swan",
-	"vue",
-	"mpx",
-	"js",
-	"jsx",
-	"ts",
-	"tsx"
-].join(",")}}`;
-function parseLocalSourceParam(params) {
-	const value = params.trim();
-	if (!value || value === "none" || value.startsWith("not ") || value.startsWith("inline(")) return;
-	return /^(['"])(.+)\1$/.exec(value)?.[2];
-}
-function parseConfigParam(params) {
-	const value = params.trim();
-	return /^(['"])(.+)\1$/.exec(value)?.[2];
-}
-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;
-	const match = /^(['"])(.+)\1$/.exec(sourceValue);
-	return match?.[2] ? {
-		negated,
-		sourcePath: match[2]
-	} : void 0;
-}
+const POSTCSS_SOURCE_PATTERN = require_v3_engine.createSourceScanPattern(require_v3_engine.DEFAULT_SOURCE_SCAN_EXTENSIONS);
 function getSourceExtension(file) {
 	return node_path.default.extname(file).slice(1) || void 0;
 }
-async function pathExistsAsDirectory(file) {
-	try {
-		return (await (0, node_fs_promises.stat)(file)).isDirectory();
-	} catch {
-		return false;
-	}
-}
-async function expandLocalSourceFiles(sourcePath, base) {
-	const absoluteSource = node_path.default.isAbsolute(sourcePath) ? sourcePath : node_path.default.resolve(base, sourcePath);
-	if (await pathExistsAsDirectory(absoluteSource)) return (0, fast_glob.default)(POSTCSS_SOURCE_PATTERN, {
-		absolute: true,
-		cwd: absoluteSource,
-		onlyFiles: true
-	});
-	return (0, fast_glob.default)(sourcePath, {
-		absolute: true,
-		cwd: base,
-		onlyFiles: true
-	});
-}
-async function resolveTailwindSourceEntry(sourcePath, base, negated) {
-	const absoluteSource = node_path.default.isAbsolute(sourcePath) ? node_path.default.resolve(sourcePath) : node_path.default.resolve(base, sourcePath);
-	if (await pathExistsAsDirectory(absoluteSource)) return {
-		base: absoluteSource,
-		negated,
-		pattern: POSTCSS_SOURCE_PATTERN
-	};
-	if (node_path.default.isAbsolute(sourcePath)) return {
-		base: node_path.default.dirname(absoluteSource),
-		negated,
-		pattern: node_path.default.basename(absoluteSource)
-	};
-	return {
-		base,
-		negated,
-		pattern: sourcePath
-	};
-}
 function collectConfigPaths(root, base) {
 	const configPaths = [];
 	root.walkAtRules("config", (rule) => {
-		const configPath = parseConfigParam(rule.params);
+		const configPath = require_v3_engine.parseConfigParam(rule.params);
 		if (configPath) configPaths.push(node_path.default.isAbsolute(configPath) ? configPath : node_path.default.resolve(base, configPath));
 	});
 	return [...new Set(configPaths)];
 }
-function normalizeContentFiles(content) {
-	if (typeof content === "string") return [content];
-	if (Array.isArray(content)) return content.flatMap((item) => normalizeContentFiles(item));
-	if (typeof content === "object" && content !== null && "files" in content) return normalizeContentFiles(content.files);
-	return [];
+function resolveOptionConfigPath(config, base) {
+	if (!config) return;
+	return node_path.default.isAbsolute(config) ? config : node_path.default.resolve(base, config);
 }
-async function collectConfigContentFiles(root, base) {
-	const configPaths = collectConfigPaths(root, base);
+async function collectConfigContentFiles(root, base, options) {
+	const configPaths = [...new Set([...resolveOptionConfigPath(options.config, base) ? [resolveOptionConfigPath(options.config, base)] : [], ...collectConfigPaths(root, base)])];
 	const files = [];
 	for (const configPath of configPaths) {
-		const contentFiles = normalizeContentFiles((await (0, tailwindcss_config.loadConfig)({
+		const contentEntries = require_v3_engine.normalizeLegacyContentEntries((await (0, tailwindcss_config.loadConfig)({
 			config: configPath,
 			cwd: node_path.default.dirname(configPath)
-		}))?.config.content);
-		for (const contentFile of contentFiles) files.push(...await expandLocalSourceFiles(contentFile, node_path.default.dirname(configPath)));
+		}))?.config.content, node_path.default.dirname(configPath));
+		files.push(...await require_v3_engine.expandTailwindSourceEntries(contentEntries));
 	}
 	return {
 		configPaths,
 		files: [...new Set(files)]
 	};
 }
+async function collectConfiguredContentEntries(root, base, options) {
+	const configPath = resolveOptionConfigPath(options.generator?.config ?? options.config, base) ?? collectConfigPaths(root, base)[0];
+	if (!configPath) return [];
+	const resolvedConfigPath = node_path.default.isAbsolute(configPath) ? configPath : node_path.default.resolve(base, configPath);
+	return require_v3_engine.normalizeLegacyContentEntries((await (0, tailwindcss_config.loadConfig)({
+		config: resolvedConfigPath,
+		cwd: node_path.default.dirname(resolvedConfigPath)
+	}))?.config.content, node_path.default.dirname(resolvedConfigPath));
+}
+async function collectRawCandidatesFromSourceEntries(sourceEntries) {
+	const candidates = /* @__PURE__ */ new Set();
+	const files = await require_v3_engine.expandTailwindSourceEntries(sourceEntries);
+	await Promise.all(files.map(async (file) => {
+		const matches = await (0, tailwindcss_patch.extractRawCandidatesWithPositions)(await (0, node_fs_promises.readFile)(file, "utf8"), getSourceExtension(file));
+		for (const match of matches) {
+			const candidate = match?.rawCandidate;
+			if (typeof candidate === "string" && candidate.length > 0) candidates.add(candidate);
+		}
+	}));
+	return candidates;
+}
 async function collectAutoTailwindCandidates(root, result, options) {
 	if (options.scanSources === false) return /* @__PURE__ */ new Set();
 	const base = resolvePostcssBase(result, options);
 	const projectRoot = resolvePostcssProjectRoot(result, options);
-	const sourceEntryTasks = [];
-	if (!root.toString().includes("source(none)")) sourceEntryTasks.push(Promise.resolve({
+	const sourceEntries = [];
+	const hasSourceNone = root.toString().includes("source(none)");
+	const inlineCandidates = require_v3_engine.collectCssInlineSourceCandidates(root);
+	const configuredContentEntries = options.version === 3 ? await collectConfiguredContentEntries(root, base, options) : [];
+	if (configuredContentEntries.length > 0) sourceEntries.push(...configuredContentEntries);
+	else if (!hasSourceNone) sourceEntries.push({
 		base,
 		negated: false,
 		pattern: POSTCSS_SOURCE_PATTERN
-	}));
-	root.walkAtRules("source", (rule) => {
-		const parsed = parseSourceFileParam(rule.params);
-		if (!parsed) return;
-		sourceEntryTasks.push(resolveTailwindSourceEntry(parsed.sourcePath, base, parsed.negated));
 	});
-	const sourceEntries = await Promise.all(sourceEntryTasks);
-	if (sourceEntries.length === 0) return /* @__PURE__ */ new Set();
-	const candidates = await (0, tailwindcss_patch.extractValidCandidates)({
+	sourceEntries.push(...await require_v3_engine.resolveCssSourceEntries(root, base, POSTCSS_SOURCE_PATTERN));
+	const candidates = sourceEntries.length === 0 ? [] : options.version === 3 ? await collectRawCandidatesFromSourceEntries(sourceEntries) : await (0, tailwindcss_patch.extractValidCandidates)({
 		base,
 		css: root.toString(),
 		cwd: projectRoot,
 		sources: sourceEntries
 	});
-	return new Set(candidates);
+	return new Set([...[...candidates].filter((candidate) => !inlineCandidates.excluded.has(candidate)), ...inlineCandidates.included]);
 }
 async function collectPostcssLocalSources(root, result, options) {
 	const base = resolvePostcssBase(result, options);
-	const sourcePaths = [];
-	root.walkAtRules("source", (rule) => {
-		const sourcePath = parseLocalSourceParam(rule.params);
-		if (sourcePath) sourcePaths.push(sourcePath);
-	});
-	const configContentFiles = await collectConfigContentFiles(root, base);
-	const files = [...new Set((await Promise.all(sourcePaths.map((sourcePath) => expandLocalSourceFiles(sourcePath, base)))).flat().concat(configContentFiles.files))];
-	const sources = await Promise.all(files.map(async (file) => ({
-		content: await (0, node_fs_promises.readFile)(file, "utf8"),
-		extension: getSourceExtension(file)
-	})));
+	const sourceEntries = await require_v3_engine.resolveCssSourceEntries(root, base, POSTCSS_SOURCE_PATTERN);
+	const configContentFiles = await collectConfigContentFiles(root, base, options);
+	const files = [...new Set([...await require_v3_engine.expandTailwindSourceEntries(sourceEntries), ...configContentFiles.files])];
+	const sources = await Promise.all(files.map(async (file) => {
+		const extension = getSourceExtension(file);
+		return {
+			content: await (0, node_fs_promises.readFile)(file, "utf8"),
+			...extension === void 0 ? {} : { extension }
+		};
+	}));
 	return {
 		files: [...files, ...configContentFiles.configPaths],
 		sources
@@ -229,7 +168,7 @@ function hasTailwindV4CssSyntax(root) {
 }
 function resolvePostcssTailwindVersion(root, result, options) {
 	const packageName = options.packageName ?? "tailwindcss";
-	const installedVersion = require_cache.readInstalledPackageMajorVersion(packageName, resolvePostcssProjectRoot(result, options));
+	const installedVersion = require_v3_engine.readInstalledPackageMajorVersion(packageName, resolvePostcssProjectRoot(result, options));
 	if (installedVersion) return installedVersion;
 	if (options.version) return options.version;
 	if (packageName === "@tailwindcss/postcss" || packageName.includes("tailwindcss4")) return 4;
@@ -249,7 +188,7 @@ const weappTailwindcssPostcssPlugin = (options = {}) => {
 			const tailwindVersion = resolvePostcssTailwindVersion(root, result, options);
 			const [collectedSources, autoCandidates] = await Promise.all([collectPostcssLocalSources(root, result, options), collectAutoTailwindCandidates(root, result, options)]);
 			const generatorConfig = generatorOptions.config ?? options.config;
-			const generator = require_generator.createWeappTailwindcssGenerator(tailwindVersion === 3 ? await require_generator.resolveTailwindV3Source({
+			const generator = require_generator.createWeappTailwindcssGenerator(tailwindVersion === 3 ? await require_v3_engine.resolveTailwindV3Source({
 				config: generatorConfig,
 				css: sourceOptions.css ?? root.toString(),
 				base: resolvePostcssBase(result, options),
@@ -257,7 +196,7 @@ const weappTailwindcssPostcssPlugin = (options = {}) => {
 				projectRoot: resolvePostcssProjectRoot(result, options),
 				packageName: options.packageName,
 				postcssPlugin: options.postcssPlugin
-			}) : await require_generator.resolveTailwindV4Source({
+			}) : await require_v3_engine.resolveTailwindV4Source({
 				...sourceOptions,
 				css: prependConfigDirective(sourceOptions.css ?? root.toString(), generatorConfig),
 				base: resolvePostcssBase(result, options),

package/dist/postcss-html-transform.js

@@ -1,4 +1,4 @@
-const require_chunk = require("./chunk-8l464Juk.js");
+const require_chunk = require("./chunk-C5U5_Hdc.js");
 let _weapp_tailwindcss_postcss_html_transform = require("@weapp-tailwindcss/postcss/html-transform");
 _weapp_tailwindcss_postcss_html_transform = require_chunk.__toESM(_weapp_tailwindcss_postcss_html_transform);
 //#region src/postcss-html-transform.ts

package/dist/postcss.js

@@ -2,6 +2,6 @@ Object.defineProperties(exports, {
 	__esModule: { value: true },
 	[Symbol.toStringTag]: { value: "Module" }
 });
-const require_postcss = require("./postcss-QIXwT40c.js");
+const require_postcss = require("./postcss-DE0TOtV9.js");
 exports.default = require_postcss.weappTailwindcssPostcssPlugin;
 exports.weappTailwindcssPostcssPlugin = require_postcss.weappTailwindcssPostcssPlugin;

package/dist/postcss.mjs

@@ -1,2 +1,2 @@
-import { t as weappTailwindcssPostcssPlugin } from "./postcss-w48mGIhe.mjs";
+import { t as weappTailwindcssPostcssPlugin } from "./postcss-BzNYQUOH.mjs";
 export { weappTailwindcssPostcssPlugin as default, weappTailwindcssPostcssPlugin };