@weapp-vite/tailwindcss 1.0.0 → 1.0.1

package/dist/index.d.mts

@@ -22,6 +22,10 @@ export declare function createTailwindController(options?: TailwindControllerOpt
 /** 同一份 core 快照用于所有转换；宿主提供最终资产，公共层不推断框架输出归属。 */
 export declare function createTailwindPreparation(compiler: Compiler$1, snapshot: CompilerSnapshot$1, assets?: NonNullable<HmrCompilerPreparation['assets']>): HmrCompilerPreparation;
 //#endregion
+//#region src/generationValue.d.ts
+/** 只复制可比较的生成配置；保留函数身份、属性描述与原型，拒绝不可安全封存的输入。 */
+export declare function copyTailwindGenerationValue<T>(value: T, parents?: Set<object>): T;
+//#endregion
 //#region src/output.d.ts
 export interface TailwindOutputInput {
   id: string;
@@ -45,14 +49,16 @@ export interface TailwindRootState {
   result: CompilerGenerateResult$1;
   rawSources: ReadonlyMap<string, string | null | undefined>;
 }
-export interface TailwindRootHost {
+export interface TailwindRootHost<K = unknown> {
   cwd: string;
   sourceId: (file: string) => string;
   isOutput?: (file: string) => boolean;
   reusePreprocessedCss?: (file: string, previous: string | null | undefined, current: string | null | undefined) => boolean;
+  /** 捕获实际内存请求的独立只读副本；生成和缓存命中均调用，失败保留原始错误。 */
+  captureRequest?: (key: K, request: CompilerGenerateRequest$1) => void | Promise<void>;
 }
 /** 使用封存源码驱动上游完整候选生成；框架预处理与输出排除由宿主提供。 */
-export declare function prepareTailwindRoots<K>(compiler: Compiler$1, request: HmrCompilerRequest, roots: ReadonlyMap<K, TailwindRootState>, options: TailwindRootHost): Promise<Map<K, CompilerGenerateResult$1>>;
+export declare function prepareTailwindRoots<K>(compiler: Compiler$1, request: HmrCompilerRequest, roots: ReadonlyMap<K, TailwindRootState>, options: TailwindRootHost<K>): Promise<Map<K, CompilerGenerateResult$1>>;
 //#endregion
 //#region src/sources.d.ts
 /** 返回上游实际扫描边界中的文件，宿主将它们登记到现有 watcher。 */

package/dist/index.mjs

@@ -1,7 +1,11 @@
 import { CompilerHmrResyncError, normalizeHmrSourceMap } from "@weapp-vite/hmr";
+import { types } from "node:util";
 import { createHash } from "node:crypto";
 import { readFileSync, statSync } from "node:fs";
 import path from "pathe";
+import path$1 from "node:path";
+import { resolveSourceScanPathWithApi, sourcePathApi, toPosixPath } from "@weapp-tailwindcss/source-scan";
+import micromatch from "micromatch";
 //#region src/controller.ts
 /** 编译器按宿主生命周期惰性创建；不创建 Vite、DevEngine、watcher 或输出写入者。 */
 var TailwindController = class {
@@ -62,6 +66,34 @@ function createTailwindPreparation(compiler, snapshot, assets = []) {
 	};
 }
 //#endregion
+//#region src/generationValue.ts
+/** 只复制可比较的生成配置；保留函数身份、属性描述与原型，拒绝不可安全封存的输入。 */
+function copyTailwindGenerationValue(value, parents = /* @__PURE__ */ new Set()) {
+	if (value === null || typeof value !== "object") return value;
+	if (types.isProxy(value)) throw new TypeError("Tailwind generation configuration must not contain proxies");
+	const array = Array.isArray(value);
+	if (parents.has(value) || (array ? Object.getPrototypeOf(value) !== Array.prototype : Object.getPrototypeOf(value) !== Object.prototype && Object.getPrototypeOf(value) !== null)) throw new TypeError("Unsupported Tailwind generation configuration");
+	parents.add(value);
+	try {
+		const keys = Reflect.ownKeys(value);
+		if (array && keys.some((key) => key !== "length" && (typeof key !== "string" || !/^(?:0|[1-9]\d*)$/.test(key) || Number(key) >= value.length))) throw new TypeError("Tailwind generation configuration must not contain custom array properties");
+		const entries = keys.filter((key) => !array || key !== "length").map((key) => {
+			const descriptor = Object.getOwnPropertyDescriptor(value, key);
+			if (!("value" in descriptor)) throw new TypeError("Tailwind generation configuration must not contain accessors");
+			return [key, copyTailwindGenerationValue(descriptor.value, parents)];
+		});
+		const copy = array ? [] : Object.create(Object.getPrototypeOf(value));
+		if (array) copy.length = value.length;
+		for (const [key, item] of entries) Object.defineProperty(copy, key, {
+			value: item,
+			enumerable: Object.getOwnPropertyDescriptor(value, key).enumerable
+		});
+		return Object.freeze(copy);
+	} finally {
+		parents.delete(value);
+	}
+}
+//#endregion
 //#region src/output.ts
 /** 在宿主回调内封存投影，再异步转换；Vite 最终 CSS 和所有补丁共用同一身份集合。 */
 function prepareTailwindOutput(compiler, input) {
@@ -83,6 +115,127 @@ function prepareTailwindOutput(compiler, input) {
 	});
 }
 //#endregion
+//#region src/sources/compact.ts
+const MAX_COMPACTED_PATTERN_LENGTH = 8192;
+function isLiteral(value) {
+	return /^[\w.-]+$/.test(value) && value !== "." && !value.includes("..");
+}
+function classify(entry) {
+	if (entry.negated !== true || typeof entry.base !== "string" || typeof entry.pattern !== "string" || !entry.pattern.startsWith("**/")) return;
+	const rest = entry.pattern.slice(3);
+	if (rest.endsWith("/**")) {
+		const token = rest.slice(0, -3);
+		return isLiteral(token) ? {
+			shape: "directory",
+			token
+		} : void 0;
+	}
+	const extension = /^\*\.([\w-]+)$/.exec(rest)?.[1];
+	if (extension) return {
+		shape: "extension",
+		token: extension
+	};
+	return isLiteral(rest) ? {
+		shape: "file",
+		token: rest
+	} : void 0;
+}
+function combinedPattern(shape, tokens) {
+	const prefix = shape === "extension" ? "**/*." : "**/";
+	const suffix = shape === "directory" ? "/**" : "";
+	return `${prefix}{${[...tokens].join(",")}}${suffix}`;
+}
+/** 仅合并连续的固定否定形态；保留上游 globstar、隐藏文件与异常求值顺序。 */
+function compactTailwindSourceEntries(entries) {
+	const result = [];
+	for (let index = 0; index < entries.length;) {
+		const first = entries[index];
+		const shape = classify(first);
+		if (!shape) {
+			result.push(first);
+			index += 1;
+			continue;
+		}
+		const run = [first];
+		const tokens = /* @__PURE__ */ new Set([shape.token]);
+		let next = index + 1;
+		while (next < entries.length) {
+			const current = entries[next];
+			const member = classify(current);
+			if (current.base !== first.base || member?.shape !== shape.shape) break;
+			run.push(current);
+			tokens.add(member.token);
+			next += 1;
+		}
+		const pattern = combinedPattern(shape.shape, tokens);
+		result.push(...tokens.size > 1 && pattern.length <= MAX_COMPACTED_PATTERN_LENGTH ? [{
+			...first,
+			pattern
+		}] : run);
+		index = next;
+	}
+	return result;
+}
+//#endregion
+//#region src/sources/matcher.ts
+/** 检查不执行访问器；不明对象仍由上游读取并保持原异常顺序。 */
+function hasPlainEntries(entries) {
+	if (types.isProxy(entries) || !Array.isArray(entries) || Object.getPrototypeOf(entries) !== Array.prototype || Reflect.ownKeys(entries).some((key) => typeof key !== "string" || key !== "length" && !/^(?:0|[1-9]\d*)$/.test(key))) return false;
+	for (let index = 0; index < entries.length; index++) {
+		const item = Object.getOwnPropertyDescriptor(entries, String(index));
+		if (!item || !("value" in item)) return false;
+		const entry = item.value;
+		if (!entry || typeof entry !== "object" || types.isProxy(entry)) return false;
+		const prototype = Object.getPrototypeOf(entry);
+		if (prototype !== null && prototype !== Object.prototype) return false;
+		const descriptors = Object.getOwnPropertyDescriptors(entry);
+		if (Reflect.ownKeys(entry).some((key) => !("value" in Object.getOwnPropertyDescriptor(entry, key)))) return false;
+		if (typeof descriptors.base?.value !== "string" || typeof descriptors.pattern?.value !== "string" || typeof descriptors.negated?.value !== "boolean") return false;
+	}
+	return true;
+}
+/** 绝对模式沿上游词法 base 归一化；不能替换成真实路径 base。 */
+function normalizePattern(entry) {
+	const windows = /^[a-z]:[\\/]/i.test(entry.base) || entry.base.includes("\\") || /^[a-z]:[\\/]/i.test(entry.pattern);
+	const pathApi = windows ? path$1.win32 : sourcePathApi(entry.base);
+	return pathApi.isAbsolute(entry.pattern) ? toPosixPath(pathApi.relative(pathApi.resolve(entry.base), entry.pattern)) : windows ? toPosixPath(entry.pattern) : entry.pattern;
+}
+/** 每文件刷新真实路径，仅复用本批次与文件系统无关的延迟 glob 编译。 */
+function createTailwindSourceMatcher(original) {
+	const patterns = /* @__PURE__ */ new Map();
+	return (file, entries) => {
+		if (typeof file !== "string" || !hasPlainEntries(entries) || !entries.length) return original(file, entries);
+		const sources = compactTailwindSourceEntries(entries);
+		const resolvedFile = resolveSourceScanPathWithApi(file, sourcePathApi(file, ...sources.map((entry) => entry.base)));
+		const bases = /* @__PURE__ */ new Map();
+		const matches = (entry) => {
+			const pathApi = sourcePathApi(entry.base, resolvedFile);
+			let paths = bases.get(pathApi);
+			if (!paths) {
+				paths = /* @__PURE__ */ new Map();
+				bases.set(pathApi, paths);
+			}
+			let base = paths.get(entry.base);
+			if (base === void 0) {
+				base = resolveSourceScanPathWithApi(entry.base, pathApi);
+				paths.set(entry.base, base);
+			}
+			const relative = toPosixPath(pathApi.relative(base, resolvedFile));
+			if (!relative || relative.startsWith("../") || pathApi.isAbsolute(relative)) return false;
+			const pattern = normalizePattern(entry);
+			let match = patterns.get(pattern);
+			if (!match) {
+				match = micromatch.matcher(pattern);
+				patterns.set(pattern, match);
+			}
+			return match(relative);
+		};
+		const positive = sources.filter((entry) => !entry.negated);
+		const negative = sources.filter((entry) => entry.negated);
+		return positive.some(matches) && !negative.some(matches);
+	};
+}
+//#endregion
 //#region src/roots.ts
 const caches = /* @__PURE__ */ new WeakMap();
 /** 使用封存源码驱动上游完整候选生成；框架预处理与输出排除由宿主提供。 */
@@ -97,15 +250,15 @@ async function prepareTailwindRoots(compiler, request, roots, options) {
 	};
 	const entries = /* @__PURE__ */ new Map();
 	if (!capturedRoots.size) return entries;
-	const { createTailwindV4CompiledSourceEntries, createTailwindV4SourceEntryMatcher } = await import("@weapp-tailwindcss/engine");
+	const { isFileMatchedByTailwindV4SourceEntries } = await import("@weapp-tailwindcss/engine");
+	const matches = createTailwindSourceMatcher(isFileMatchedByTailwindV4SourceEntries);
 	for (const [index, root] of capturedRoots) {
-		const base = root.request.sourceOptions?.projectRoot ?? root.request.source?.base ?? options.cwd;
-		const matches = createTailwindV4SourceEntryMatcher(createTailwindV4CompiledSourceEntries(root.result.root, [...root.result.sources], base));
-		const sources = [...request.sources].flatMap(([file, content]) => content !== null && matches?.(file) && !options.isOutput?.(file) ? [{
+		const sourceOptions = root.request.sourceOptions;
+		const sourceEntries = [...root.result.sources];
+		const sources = [...request.sources].flatMap(([file, content]) => content !== null && sourceEntries.length > 0 && matches(file, sourceEntries) && !options.isOutput?.(file) ? [{
 			content,
 			extension: path.extname(file).slice(1)
 		}] : []);
-		const sourceOptions = root.request.sourceOptions;
 		if (!sourceOptions) throw new Error("Tailwind HMR requires a captured source entry");
 		const cssSources = sourceOptions.cssSources?.map((source) => {
 			if (!source.file) return source;
@@ -150,7 +303,7 @@ async function prepareTailwindRoots(compiler, request, roots, options) {
 			[...dependencyVersions]
 		])).digest("hex");
 		const cached = cache.get(root);
-		const generated = cached?.signature === signature ? cached.result : await compiler.generate({
+		let effectiveRequest = {
 			...root.request,
 			sourceOptions: {
 				...sourceOptions,
@@ -158,8 +311,14 @@ async function prepareTailwindRoots(compiler, request, roots, options) {
 				cssSources: [...cssSources ?? [], ...entrySources]
 			},
 			sources,
+			scanMode: "compiled",
 			scanSources: false
-		});
+		};
+		if (options.captureRequest) {
+			effectiveRequest = copyTailwindGenerationValue(effectiveRequest);
+			await options.captureRequest(index, effectiveRequest);
+		}
+		const generated = cached?.signature === signature ? cached.result : await compiler.generate(effectiveRequest);
 		entries.set(index, generated);
 		for (const file of generated.dependencies) checkDependency(file);
 		cache.set(root, {
@@ -184,4 +343,4 @@ async function listTailwindSourceFiles(result, cwd) {
 	});
 }
 //#endregion
-export { TailwindController, createTailwindController, createTailwindPreparation, listTailwindSourceFiles, prepareTailwindOutput, prepareTailwindRoots };
+export { TailwindController, copyTailwindGenerationValue, createTailwindController, createTailwindPreparation, listTailwindSourceFiles, prepareTailwindOutput, prepareTailwindRoots };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@weapp-vite/tailwindcss",
   "type": "module",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "基于 weapp-tailwindcss/core 的宿主无关编译控制器",
   "license": "MIT",
   "homepage": "https://github.com/weapp-vite/weapp-vite#readme",
@@ -37,10 +37,15 @@
     "node": "^22.18.0 || ^24.11.0 || >=26.0.0"
   },
   "dependencies": {
-    "@weapp-tailwindcss/engine": "0.1.5",
-    "@weapp-vite/hmr": "0.2.1",
+    "@weapp-tailwindcss/engine": "0.1.6",
+    "@weapp-tailwindcss/source-scan": "0.1.2",
+    "@weapp-vite/hmr": "0.2.2",
+    "micromatch": "4.0.8",
     "pathe": "^2.0.3",
-    "weapp-tailwindcss": "^5.6.0"
+    "weapp-tailwindcss": "^5.6.3"
+  },
+  "devDependencies": {
+    "@types/micromatch": "4.0.10"
   },
   "publishConfig": {
     "access": "public",