@weapp-tailwindcss/cli 5.5.11 → 5.6.0

package/dist/bin.cjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-const require_src = require("./src-DME0SpR_.cjs");
+const require_src = require("./src-BRkkGIve.cjs");
 let node_process = require("node:process");
 node_process = require_src.__toESM(node_process, 1);
 //#region src/bin.ts

package/dist/bin.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { t as runCli } from "./src-BKwkkU2f.js";
+import { t as runCli } from "./src-D-LS_mXK.js";
 import process from "node:process";
 //#region src/bin.ts
 process.title = "node (@weapp-tailwindcss/cli)";

package/dist/index.cjs

@@ -1,3 +1,3 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_src = require("./src-DME0SpR_.cjs");
+const require_src = require("./src-BRkkGIve.cjs");
 exports.runCli = require_src.runCli;

package/dist/index.js

@@ -1,2 +1,2 @@
-import { t as runCli } from "./src-BKwkkU2f.js";
+import { t as runCli } from "./src-D-LS_mXK.js";
 export { runCli };

package/dist/{src-DME0SpR_.cjs → src-BRkkGIve.cjs}

@@ -41,6 +41,54 @@ let fast_glob = require("fast-glob");
 fast_glob = __toESM(fast_glob, 1);
 let node_readline = require("node:readline");
 let node_module = require("node:module");
+//#region src/build/paths.ts
+/** 按文件系统路径语义解析，不把 Windows 路径当作 POSIX 路径拼接。 */
+function resolveFilePath(file, cwd, paths = node_path.default) {
+	return paths.resolve(cwd, file);
+}
+function identify(file) {
+	let existing = node_path.default.resolve(file);
+	const missing = [];
+	while (true) try {
+		const canonical = node_fs.default.realpathSync.native(existing);
+		const stat = missing.length ? void 0 : node_fs.default.statSync(existing, { bigint: true });
+		return {
+			path: node_path.default.join(canonical, ...missing),
+			inode: stat?.ino ? `${stat.dev}:${stat.ino}` : void 0
+		};
+	} catch (error) {
+		const code = error.code;
+		if (code !== "ENOENT" && code !== "ENOTDIR") throw error;
+		const parent = node_path.default.dirname(existing);
+		if (parent === existing) throw error;
+		missing.unshift(node_path.default.basename(existing));
+		existing = parent;
+	}
+}
+function identical(left, right) {
+	return left.path === right.path || Boolean(left.inode && left.inode === right.inode);
+}
+function validateBuildPaths(options) {
+	const files = [
+		["input", options.input],
+		["output", options.output],
+		["map", typeof options.map === "string" ? options.map : void 0]
+	].filter((entry) => Boolean(entry[1] && entry[1] !== "-")).map(([name, file]) => ({
+		name,
+		file,
+		identity: identify(file)
+	}));
+	for (let i = 0; i < files.length; i++) for (let j = i + 1; j < files.length; j++) if (identical(files[i].identity, files[j].identity)) throw new Error(`Specified ${files[i].name} and ${files[j].name} files are identical: ${files[j].file}`);
+}
+/** 每次匹配重新解析身份，兼容尚未创建的产物及后续替换的符号链接。 */
+function isBuildOutput(file, outputs) {
+	if (!outputs.length) return false;
+	const absolute = node_path.default.resolve(file);
+	if (outputs.some((output) => node_path.default.resolve(output) === absolute)) return true;
+	const identity = identify(file);
+	return outputs.some((output) => identical(identity, identify(output)));
+}
+//#endregion
 //#region src/build/args.ts
 function value(argv, index, flag) {
 	const item = argv[index];
@@ -102,13 +150,18 @@ function parseBuildArgs(argv) {
 			if (consumesNext) index++;
 		} else throw new Error(`Unknown option: ${arg}`);
 	}
-	const resolvePath = (file) => file && file !== "-" ? node_path.default.resolve(cwd, file) : file;
+	const resolvePath = (file) => file && file !== "-" ? resolveFilePath(file, cwd) : file;
 	input = resolvePath(input);
 	output = resolvePath(output);
 	if (typeof map === "string") map = node_path.default.resolve(cwd, map);
 	if (input && input !== "-" && !node_fs.default.existsSync(input)) throw new Error(`Specified input file ${input} does not exist.`);
 	if (input && input !== "-" && input === output) throw new Error("Specified input and output files are identical.");
 	if (target === "weapp" && map) throw new Error("Option \"--map\" is only supported when \"--target web\" is used.");
+	validateBuildPaths({
+		input,
+		output,
+		map
+	});
 	return {
 		cwd,
 		input,
@@ -124,18 +177,58 @@ function parseBuildArgs(argv) {
 	};
 }
 //#endregion
+//#region src/build/watch-lifecycle.ts
+/** 统一管理等待与停止，停止只唤醒循环，由调用方等待在途构建及清理完成。 */
+function createWatchLifecycle() {
+	let stopped = false;
+	let wake;
+	const stop = () => {
+		stopped = true;
+		wake?.();
+	};
+	node_process.default.once("SIGINT", stop);
+	node_process.default.once("SIGTERM", stop);
+	return {
+		get stopped() {
+			return stopped;
+		},
+		wake() {
+			wake?.();
+		},
+		async wait(interval) {
+			if (stopped) return;
+			await new Promise((resolve) => {
+				const timer = interval === void 0 ? void 0 : setTimeout(() => wake?.(), interval);
+				wake = () => {
+					clearTimeout(timer);
+					wake = void 0;
+					resolve();
+				};
+			});
+		},
+		dispose() {
+			node_process.default.removeListener("SIGINT", stop);
+			node_process.default.removeListener("SIGTERM", stop);
+		}
+	};
+}
+//#endregion
 //#region src/build/watch.ts
-async function snapshot(cwd, dependencies, output) {
+var NativeWatcherError = class extends Error {};
+function report(error) {
+	node_process.default.stderr.write(`${error instanceof Error ? error.message : String(error)}\n`);
+}
+async function snapshot(options, dependencies) {
 	const files = /* @__PURE__ */ new Set([...dependencies, ...await (0, fast_glob.default)("**/*", {
-		cwd,
+		cwd: options.cwd,
 		absolute: true,
 		dot: true,
 		onlyFiles: true,
 		ignore: ["node_modules/**", ".git/**"]
 	})]);
-	if (output && output !== "-") files.delete(node_path.default.resolve(output));
 	const state = /* @__PURE__ */ new Map();
 	await Promise.all([...files].map(async (file) => {
+		if (isBuildOutput(file, options.outputs)) return;
 		try {
 			const [stat, content] = await Promise.all([node_fs_promises.default.stat(file), node_fs_promises.default.readFile(file)]);
 			const digest = (0, node_crypto.createHash)("sha256").update(content).digest("hex");
@@ -145,120 +238,108 @@ async function snapshot(cwd, dependencies, output) {
 	return state;
 }
 function changed(previous, next) {
-	if (previous.size !== next.size) return true;
-	for (const [file, value] of next) if (previous.get(file) !== value) return true;
-	return false;
+	return previous.size !== next.size || [...next].some(([file, value]) => previous.get(file) !== value);
 }
 async function watchBuildInputs(options) {
-	if (options.mode === "native") try {
-		return await watchWithNativeWatcher(options);
-	} catch (error) {
-		node_process.default.stderr.write(`Native watcher unavailable, falling back to polling: ${error instanceof Error ? error.message : String(error)}\n`);
-		return watchWithPolling(options);
+	const lifecycle = createWatchLifecycle();
+	try {
+		if (options.mode === "native") try {
+			await watchWithNativeWatcher(options, lifecycle);
+			return;
+		} catch (error) {
+			if (!(error instanceof NativeWatcherError)) throw error;
+			if (lifecycle.stopped) return;
+			report(`Native watcher unavailable, falling back to polling: ${error.message}`);
+		}
+		await watchWithPolling(options, lifecycle);
+	} finally {
+		lifecycle.dispose();
 	}
-	return watchWithPolling(options);
 }
-async function watchWithPolling(options) {
+async function watchWithPolling(options, lifecycle) {
 	let dependencies = /* @__PURE__ */ new Set();
-	const previous = await snapshot(options.cwd, dependencies, options.output);
+	let previous = await snapshot(options, dependencies);
+	if (lifecycle.stopped) return;
 	dependencies = await options.rebuild();
-	const initialized = await snapshot(options.cwd, dependencies, options.output);
-	for (const [file, value] of initialized) if (!previous.has(file)) previous.set(file, value);
-	await new Promise((resolve) => {
-		let running = false;
-		const timer = setInterval(async () => {
-			if (running) return;
-			running = true;
-			try {
-				const next = await snapshot(options.cwd, dependencies, options.output);
-				if (changed(previous, next)) {
-					previous.clear();
-					for (const [file, value] of next) previous.set(file, value);
-					dependencies = await options.rebuild();
-				}
-			} catch (error) {
-				node_process.default.stderr.write(`${error instanceof Error ? error.message : String(error)}\n`);
-			} finally {
-				running = false;
+	const initialized = await snapshot(options, dependencies);
+	for (const [file, value] of initialized) if (!previous.has(file) && isOutsideDirectory(file, options.cwd)) previous.set(file, value);
+	while (!lifecycle.stopped) {
+		await lifecycle.wait(options.interval);
+		if (lifecycle.stopped) break;
+		try {
+			const next = await snapshot(options, dependencies);
+			if (!lifecycle.stopped && changed(previous, next)) {
+				previous = next;
+				dependencies = await options.rebuild();
 			}
-		}, options.interval);
-		const stop = () => {
-			clearInterval(timer);
-			resolve();
-		};
-		node_process.default.once("SIGINT", stop);
-		node_process.default.once("SIGTERM", stop);
-	});
+		} catch (error) {
+			report(error);
+		}
+	}
+}
+function isOutsideDirectory(file, cwd) {
+	const relative = node_path.default.relative(cwd, file);
+	return relative === ".." || relative.startsWith(`..${node_path.default.sep}`) || node_path.default.isAbsolute(relative);
 }
 function parentDirectories(files, cwd) {
 	const directories = /* @__PURE__ */ new Set([node_path.default.resolve(cwd)]);
-	for (const file of files) {
-		const absolute = node_path.default.resolve(file);
-		if (!absolute.startsWith(`${node_path.default.resolve(cwd)}${node_path.default.sep}`)) directories.add(node_path.default.dirname(absolute));
-	}
+	for (const file of files) if (isOutsideDirectory(file, cwd)) directories.add(node_path.default.dirname(node_path.default.resolve(file)));
 	return directories;
 }
-async function watchWithNativeWatcher(options) {
+async function watchWithNativeWatcher(options, lifecycle) {
 	let dependencies = /* @__PURE__ */ new Set();
 	const subscriptions = /* @__PURE__ */ new Map();
-	let running = false;
 	let pending = false;
-	let resolvePending;
-	const output = options.output && options.output !== "-" ? node_path.default.resolve(options.output) : void 0;
-	const requestRebuild = () => {
-		pending = true;
-		resolvePending?.();
-	};
 	const syncSubscriptions = async () => {
 		const directories = parentDirectories(dependencies, options.cwd);
 		for (const directory of directories) {
-			if (subscriptions.has(directory)) continue;
-			const subscription = await _parcel_watcher.subscribe(directory, (error, events) => {
-				if (error) {
-					node_process.default.stderr.write(`${error.message}\n`);
-					return;
-				}
-				if (events.some((event) => !output || node_path.default.resolve(event.path) !== output)) requestRebuild();
-			}, { ignore: ["**/node_modules/**", "**/.git/**"] });
-			subscriptions.set(directory, subscription);
+			if (lifecycle.stopped || subscriptions.has(directory)) continue;
+			try {
+				const subscription = await _parcel_watcher.subscribe(directory, (error, events) => {
+					if (lifecycle.stopped) return;
+					if (error) {
+						report(error);
+						return;
+					}
+					try {
+						if (events.some((event) => !isBuildOutput(event.path, options.outputs))) {
+							pending = true;
+							lifecycle.wake();
+						}
+					} catch (error) {
+						report(error);
+					}
+				}, { ignore: ["**/node_modules/**", "**/.git/**"] });
+				subscriptions.set(directory, subscription);
+			} catch (error) {
+				throw new NativeWatcherError(error instanceof Error ? error.message : String(error));
+			}
 		}
 		for (const [directory, subscription] of subscriptions) if (!directories.has(directory)) {
 			await subscription.unsubscribe();
 			subscriptions.delete(directory);
 		}
 	};
-	await syncSubscriptions();
-	dependencies = await options.rebuild();
-	await syncSubscriptions();
-	await new Promise((resolve) => {
-		const stop = () => {
-			Promise.all([...subscriptions.values()].map((subscription) => subscription.unsubscribe())).finally(resolve);
-		};
-		node_process.default.once("SIGINT", stop);
-		node_process.default.once("SIGTERM", stop);
-		const loop = async () => {
-			while (true) {
-				if (pending) break;
-				await new Promise((wake) => {
-					resolvePending = wake;
-				});
-				resolvePending = void 0;
-			}
-			if (running) return;
-			running = true;
+	try {
+		await syncSubscriptions();
+		if (lifecycle.stopped) return;
+		dependencies = await options.rebuild();
+		await syncSubscriptions();
+		while (!lifecycle.stopped) {
+			if (!pending) await lifecycle.wait();
+			if (lifecycle.stopped) break;
 			pending = false;
 			try {
 				dependencies = await options.rebuild();
-				await syncSubscriptions();
 			} catch (error) {
-				node_process.default.stderr.write(`${error instanceof Error ? error.message : String(error)}\n`);
-			} finally {
-				running = false;
-				if (pending) loop();
+				report(error);
+				continue;
 			}
-		};
-		loop();
-	});
+			await syncSubscriptions();
+		}
+	} finally {
+		await Promise.all([...subscriptions.values()].map((subscription) => subscription.unsubscribe()));
+	}
 }
 //#endregion
 //#region src/canonicalize.ts
@@ -353,7 +434,7 @@ async function runCanonicalize(argv) {
 	}
 	if (inputs.length === 0) throw new Error("No candidate groups provided");
 	const records = inputs.map((input) => record(designSystem, input));
-	const output = format === "json" ? JSON.stringify(records, null, 2) : format === "jsonl" ? records.map(JSON.stringify).join("\n") : records.map((item) => item.output).join("\n");
+	const output = format === "json" ? JSON.stringify(records, null, 2) : format === "jsonl" ? records.map((item) => JSON.stringify(item)).join("\n") : records.map((item) => item.output).join("\n");
 	node_process.default.stdout.write(`${output}\n`);
 	return 0;
 }
@@ -373,6 +454,7 @@ function sourceMapComment(value) {
 	return `/*# sourceMappingURL=${value} */`;
 }
 async function buildOnce(options, stdinCss) {
+	validateBuildPaths(options);
 	const inputCss = options.input === "-" ? stdinCss ?? await drainStdin() : options.input ? await node_fs_promises.default.readFile(options.input, "utf8") : DEFAULT_INPUT;
 	const sourceOptions = {
 		base: options.input && options.input !== "-" ? node_path.default.dirname(options.input) : options.cwd,
@@ -404,18 +486,18 @@ async function buildOnce(options, stdinCss) {
 				sourceMap: Boolean(options.map)
 			});
 			css = node_buffer.Buffer.from(transformed.code).toString();
-			map = transformed.map;
+			map = transformed.map || void 0;
 		}
 		if (options.map && map) {
 			if (options.map === true) css += `\n${sourceMapComment(`data:application/json;base64,${node_buffer.Buffer.from(map).toString("base64")}`)}`;
 			else {
-				await writeFile$1(options.map, map);
 				const mapBase = options.output && options.output !== "-" ? node_path.default.dirname(options.output) : options.cwd;
 				css += `\n${sourceMapComment(node_path.default.relative(mapBase, options.map))}`;
 			}
 		}
 		return {
 			css,
+			map,
 			dependencies: /* @__PURE__ */ new Set([
 				...options.input && options.input !== "-" ? [options.input] : [],
 				...source.dependencies,
@@ -428,11 +510,13 @@ async function buildOnce(options, stdinCss) {
 }
 async function runBuild(argv) {
 	const options = parseBuildArgs(argv);
-	if (!options.silent) node_process.default.stderr.write(`tailwindcss v${node_process.default.env.npm_package_version ?? ""}\n\n`);
+	if (!options.silent) node_process.default.stderr.write(`tailwindcss v${node_process.default.env["npm_package_version"] ?? ""}\n\n`);
 	const stdinCss = options.input === "-" ? await drainStdin() : void 0;
 	let previous = "";
 	const rebuild = async () => {
 		const result = await buildOnce(options, stdinCss);
+		validateBuildPaths(options);
+		if (typeof options.map === "string" && result.map) await writeFile$1(options.map, result.map);
 		if (result.css !== previous) {
 			if (options.output && options.output !== "-") await writeFile$1(options.output, result.css);
 			else node_process.default.stdout.write(`${result.css}\n`);
@@ -448,7 +532,7 @@ async function runBuild(argv) {
 		cwd: options.cwd,
 		interval: options.pollInterval,
 		mode: options.watchMode,
-		output: options.output,
+		outputs: [options.output, typeof options.map === "string" ? options.map : void 0].filter((file) => Boolean(file && file !== "-")),
 		rebuild
 	});
 	return 0;
@@ -459,7 +543,7 @@ async function runTailwindCli(rawArgv) {
 }
 //#endregion
 //#region package.json
-var version = "5.5.11";
+var version = "5.6.0";
 //#endregion
 //#region src/constants.ts
 const WEAPP_TW_REQUIRED_NODE_VERSION_RANGE = "^22.18.0 || >=24.11.0";
@@ -1180,7 +1264,7 @@ async function runStatus(options) {
 		status: "unnecessary",
 		message: PATCH_COMMAND_OBSOLETE_NOTICE
 	};
-	if (toBoolean(options.json, false)) {
+	if (toBoolean(options["json"], false)) {
 		_weapp_tailwindcss_logger.logger.log(JSON.stringify(payload, null, 2));
 		return;
 	}
@@ -1190,21 +1274,21 @@ async function runStatus(options) {
 async function runVscodeEntry(options) {
 	const resolvedCwd = resolveCliCwd(options.cwd);
 	const baseDir = resolvedCwd ?? node_process.default.cwd();
-	const cssEntry = readStringOption("css", options.css);
+	const cssEntry = readStringOption("css", options["css"]);
 	if (!cssEntry) throw new Error("Option \"--css\" is required.");
 	const result = await generateVscodeIntellisenseEntry({
 		baseDir,
 		cssEntry,
-		output: readStringOption("output", options.output),
-		sources: readStringArrayOption("source", options.source),
-		force: toBoolean(options.force, false)
+		output: readStringOption("output", options["output"]),
+		sources: readStringArrayOption("source", options["source"]),
+		force: toBoolean(options["force"], false)
 	});
 	_weapp_tailwindcss_logger.logger.success(`VS Code helper generated -> ${formatOutputPath(result.outputPath, resolvedCwd)}`);
 }
 async function runDoctor(options) {
 	const report = createDoctorReport({ cwd: resolveCliCwd(options.cwd) });
-	_weapp_tailwindcss_logger.logger.log(toBoolean(options.json, false) ? JSON.stringify(report, null, 2) : formatDoctorReport(report));
-	if (hasDoctorFailure(report, toBoolean(options.strict, false))) node_process.default.exitCode = 1;
+	_weapp_tailwindcss_logger.logger.log(toBoolean(options["json"], false) ? JSON.stringify(report, null, 2) : formatDoctorReport(report));
+	if (hasDoctorFailure(report, toBoolean(options["strict"], false))) node_process.default.exitCode = 1;
 }
 async function runCli(argv = node_process.default.argv.slice(2)) {
 	if (!semver.default.satisfies(node_process.default.versions.node, "^22.18.0 || >=24.11.0")) _weapp_tailwindcss_logger.logger.warn(`You are using Node.js ${node_process.default.versions.node}. For @weapp-tailwindcss/cli, Node.js version ${WEAPP_TW_REQUIRED_NODE_VERSION_RANGE} is required.`);

package/dist/{src-BKwkkU2f.js → src-D-LS_mXK.js}

@@ -12,6 +12,54 @@ import { createHash } from "node:crypto";
 import * as parcelWatcher from "@parcel/watcher";
 import fg from "fast-glob";
 import { createInterface } from "node:readline";
+//#region src/build/paths.ts
+/** 按文件系统路径语义解析，不把 Windows 路径当作 POSIX 路径拼接。 */
+function resolveFilePath(file, cwd, paths = path) {
+	return paths.resolve(cwd, file);
+}
+function identify(file) {
+	let existing = path.resolve(file);
+	const missing = [];
+	while (true) try {
+		const canonical = fs$1.realpathSync.native(existing);
+		const stat = missing.length ? void 0 : fs$1.statSync(existing, { bigint: true });
+		return {
+			path: path.join(canonical, ...missing),
+			inode: stat?.ino ? `${stat.dev}:${stat.ino}` : void 0
+		};
+	} catch (error) {
+		const code = error.code;
+		if (code !== "ENOENT" && code !== "ENOTDIR") throw error;
+		const parent = path.dirname(existing);
+		if (parent === existing) throw error;
+		missing.unshift(path.basename(existing));
+		existing = parent;
+	}
+}
+function identical(left, right) {
+	return left.path === right.path || Boolean(left.inode && left.inode === right.inode);
+}
+function validateBuildPaths(options) {
+	const files = [
+		["input", options.input],
+		["output", options.output],
+		["map", typeof options.map === "string" ? options.map : void 0]
+	].filter((entry) => Boolean(entry[1] && entry[1] !== "-")).map(([name, file]) => ({
+		name,
+		file,
+		identity: identify(file)
+	}));
+	for (let i = 0; i < files.length; i++) for (let j = i + 1; j < files.length; j++) if (identical(files[i].identity, files[j].identity)) throw new Error(`Specified ${files[i].name} and ${files[j].name} files are identical: ${files[j].file}`);
+}
+/** 每次匹配重新解析身份，兼容尚未创建的产物及后续替换的符号链接。 */
+function isBuildOutput(file, outputs) {
+	if (!outputs.length) return false;
+	const absolute = path.resolve(file);
+	if (outputs.some((output) => path.resolve(output) === absolute)) return true;
+	const identity = identify(file);
+	return outputs.some((output) => identical(identity, identify(output)));
+}
+//#endregion
 //#region src/build/args.ts
 function value(argv, index, flag) {
 	const item = argv[index];
@@ -73,13 +121,18 @@ function parseBuildArgs(argv) {
 			if (consumesNext) index++;
 		} else throw new Error(`Unknown option: ${arg}`);
 	}
-	const resolvePath = (file) => file && file !== "-" ? path.resolve(cwd, file) : file;
+	const resolvePath = (file) => file && file !== "-" ? resolveFilePath(file, cwd) : file;
 	input = resolvePath(input);
 	output = resolvePath(output);
 	if (typeof map === "string") map = path.resolve(cwd, map);
 	if (input && input !== "-" && !fs$1.existsSync(input)) throw new Error(`Specified input file ${input} does not exist.`);
 	if (input && input !== "-" && input === output) throw new Error("Specified input and output files are identical.");
 	if (target === "weapp" && map) throw new Error("Option \"--map\" is only supported when \"--target web\" is used.");
+	validateBuildPaths({
+		input,
+		output,
+		map
+	});
 	return {
 		cwd,
 		input,
@@ -95,18 +148,58 @@ function parseBuildArgs(argv) {
 	};
 }
 //#endregion
+//#region src/build/watch-lifecycle.ts
+/** 统一管理等待与停止，停止只唤醒循环，由调用方等待在途构建及清理完成。 */
+function createWatchLifecycle() {
+	let stopped = false;
+	let wake;
+	const stop = () => {
+		stopped = true;
+		wake?.();
+	};
+	process.once("SIGINT", stop);
+	process.once("SIGTERM", stop);
+	return {
+		get stopped() {
+			return stopped;
+		},
+		wake() {
+			wake?.();
+		},
+		async wait(interval) {
+			if (stopped) return;
+			await new Promise((resolve) => {
+				const timer = interval === void 0 ? void 0 : setTimeout(() => wake?.(), interval);
+				wake = () => {
+					clearTimeout(timer);
+					wake = void 0;
+					resolve();
+				};
+			});
+		},
+		dispose() {
+			process.removeListener("SIGINT", stop);
+			process.removeListener("SIGTERM", stop);
+		}
+	};
+}
+//#endregion
 //#region src/build/watch.ts
-async function snapshot(cwd, dependencies, output) {
+var NativeWatcherError = class extends Error {};
+function report(error) {
+	process.stderr.write(`${error instanceof Error ? error.message : String(error)}\n`);
+}
+async function snapshot(options, dependencies) {
 	const files = /* @__PURE__ */ new Set([...dependencies, ...await fg("**/*", {
-		cwd,
+		cwd: options.cwd,
 		absolute: true,
 		dot: true,
 		onlyFiles: true,
 		ignore: ["node_modules/**", ".git/**"]
 	})]);
-	if (output && output !== "-") files.delete(path.resolve(output));
 	const state = /* @__PURE__ */ new Map();
 	await Promise.all([...files].map(async (file) => {
+		if (isBuildOutput(file, options.outputs)) return;
 		try {
 			const [stat, content] = await Promise.all([fs.stat(file), fs.readFile(file)]);
 			const digest = createHash("sha256").update(content).digest("hex");
@@ -116,120 +209,108 @@ async function snapshot(cwd, dependencies, output) {
 	return state;
 }
 function changed(previous, next) {
-	if (previous.size !== next.size) return true;
-	for (const [file, value] of next) if (previous.get(file) !== value) return true;
-	return false;
+	return previous.size !== next.size || [...next].some(([file, value]) => previous.get(file) !== value);
 }
 async function watchBuildInputs(options) {
-	if (options.mode === "native") try {
-		return await watchWithNativeWatcher(options);
-	} catch (error) {
-		process.stderr.write(`Native watcher unavailable, falling back to polling: ${error instanceof Error ? error.message : String(error)}\n`);
-		return watchWithPolling(options);
+	const lifecycle = createWatchLifecycle();
+	try {
+		if (options.mode === "native") try {
+			await watchWithNativeWatcher(options, lifecycle);
+			return;
+		} catch (error) {
+			if (!(error instanceof NativeWatcherError)) throw error;
+			if (lifecycle.stopped) return;
+			report(`Native watcher unavailable, falling back to polling: ${error.message}`);
+		}
+		await watchWithPolling(options, lifecycle);
+	} finally {
+		lifecycle.dispose();
 	}
-	return watchWithPolling(options);
 }
-async function watchWithPolling(options) {
+async function watchWithPolling(options, lifecycle) {
 	let dependencies = /* @__PURE__ */ new Set();
-	const previous = await snapshot(options.cwd, dependencies, options.output);
+	let previous = await snapshot(options, dependencies);
+	if (lifecycle.stopped) return;
 	dependencies = await options.rebuild();
-	const initialized = await snapshot(options.cwd, dependencies, options.output);
-	for (const [file, value] of initialized) if (!previous.has(file)) previous.set(file, value);
-	await new Promise((resolve) => {
-		let running = false;
-		const timer = setInterval(async () => {
-			if (running) return;
-			running = true;
-			try {
-				const next = await snapshot(options.cwd, dependencies, options.output);
-				if (changed(previous, next)) {
-					previous.clear();
-					for (const [file, value] of next) previous.set(file, value);
-					dependencies = await options.rebuild();
-				}
-			} catch (error) {
-				process.stderr.write(`${error instanceof Error ? error.message : String(error)}\n`);
-			} finally {
-				running = false;
+	const initialized = await snapshot(options, dependencies);
+	for (const [file, value] of initialized) if (!previous.has(file) && isOutsideDirectory(file, options.cwd)) previous.set(file, value);
+	while (!lifecycle.stopped) {
+		await lifecycle.wait(options.interval);
+		if (lifecycle.stopped) break;
+		try {
+			const next = await snapshot(options, dependencies);
+			if (!lifecycle.stopped && changed(previous, next)) {
+				previous = next;
+				dependencies = await options.rebuild();
 			}
-		}, options.interval);
-		const stop = () => {
-			clearInterval(timer);
-			resolve();
-		};
-		process.once("SIGINT", stop);
-		process.once("SIGTERM", stop);
-	});
+		} catch (error) {
+			report(error);
+		}
+	}
+}
+function isOutsideDirectory(file, cwd) {
+	const relative = path.relative(cwd, file);
+	return relative === ".." || relative.startsWith(`..${path.sep}`) || path.isAbsolute(relative);
 }
 function parentDirectories(files, cwd) {
 	const directories = /* @__PURE__ */ new Set([path.resolve(cwd)]);
-	for (const file of files) {
-		const absolute = path.resolve(file);
-		if (!absolute.startsWith(`${path.resolve(cwd)}${path.sep}`)) directories.add(path.dirname(absolute));
-	}
+	for (const file of files) if (isOutsideDirectory(file, cwd)) directories.add(path.dirname(path.resolve(file)));
 	return directories;
 }
-async function watchWithNativeWatcher(options) {
+async function watchWithNativeWatcher(options, lifecycle) {
 	let dependencies = /* @__PURE__ */ new Set();
 	const subscriptions = /* @__PURE__ */ new Map();
-	let running = false;
 	let pending = false;
-	let resolvePending;
-	const output = options.output && options.output !== "-" ? path.resolve(options.output) : void 0;
-	const requestRebuild = () => {
-		pending = true;
-		resolvePending?.();
-	};
 	const syncSubscriptions = async () => {
 		const directories = parentDirectories(dependencies, options.cwd);
 		for (const directory of directories) {
-			if (subscriptions.has(directory)) continue;
-			const subscription = await parcelWatcher.subscribe(directory, (error, events) => {
-				if (error) {
-					process.stderr.write(`${error.message}\n`);
-					return;
-				}
-				if (events.some((event) => !output || path.resolve(event.path) !== output)) requestRebuild();
-			}, { ignore: ["**/node_modules/**", "**/.git/**"] });
-			subscriptions.set(directory, subscription);
+			if (lifecycle.stopped || subscriptions.has(directory)) continue;
+			try {
+				const subscription = await parcelWatcher.subscribe(directory, (error, events) => {
+					if (lifecycle.stopped) return;
+					if (error) {
+						report(error);
+						return;
+					}
+					try {
+						if (events.some((event) => !isBuildOutput(event.path, options.outputs))) {
+							pending = true;
+							lifecycle.wake();
+						}
+					} catch (error) {
+						report(error);
+					}
+				}, { ignore: ["**/node_modules/**", "**/.git/**"] });
+				subscriptions.set(directory, subscription);
+			} catch (error) {
+				throw new NativeWatcherError(error instanceof Error ? error.message : String(error));
+			}
 		}
 		for (const [directory, subscription] of subscriptions) if (!directories.has(directory)) {
 			await subscription.unsubscribe();
 			subscriptions.delete(directory);
 		}
 	};
-	await syncSubscriptions();
-	dependencies = await options.rebuild();
-	await syncSubscriptions();
-	await new Promise((resolve) => {
-		const stop = () => {
-			Promise.all([...subscriptions.values()].map((subscription) => subscription.unsubscribe())).finally(resolve);
-		};
-		process.once("SIGINT", stop);
-		process.once("SIGTERM", stop);
-		const loop = async () => {
-			while (true) {
-				if (pending) break;
-				await new Promise((wake) => {
-					resolvePending = wake;
-				});
-				resolvePending = void 0;
-			}
-			if (running) return;
-			running = true;
+	try {
+		await syncSubscriptions();
+		if (lifecycle.stopped) return;
+		dependencies = await options.rebuild();
+		await syncSubscriptions();
+		while (!lifecycle.stopped) {
+			if (!pending) await lifecycle.wait();
+			if (lifecycle.stopped) break;
 			pending = false;
 			try {
 				dependencies = await options.rebuild();
-				await syncSubscriptions();
 			} catch (error) {
-				process.stderr.write(`${error instanceof Error ? error.message : String(error)}\n`);
-			} finally {
-				running = false;
-				if (pending) loop();
+				report(error);
+				continue;
 			}
-		};
-		loop();
-	});
+			await syncSubscriptions();
+		}
+	} finally {
+		await Promise.all([...subscriptions.values()].map((subscription) => subscription.unsubscribe()));
+	}
 }
 //#endregion
 //#region src/canonicalize.ts
@@ -324,7 +405,7 @@ async function runCanonicalize(argv) {
 	}
 	if (inputs.length === 0) throw new Error("No candidate groups provided");
 	const records = inputs.map((input) => record(designSystem, input));
-	const output = format === "json" ? JSON.stringify(records, null, 2) : format === "jsonl" ? records.map(JSON.stringify).join("\n") : records.map((item) => item.output).join("\n");
+	const output = format === "json" ? JSON.stringify(records, null, 2) : format === "jsonl" ? records.map((item) => JSON.stringify(item)).join("\n") : records.map((item) => item.output).join("\n");
 	process.stdout.write(`${output}\n`);
 	return 0;
 }
@@ -344,6 +425,7 @@ function sourceMapComment(value) {
 	return `/*# sourceMappingURL=${value} */`;
 }
 async function buildOnce(options, stdinCss) {
+	validateBuildPaths(options);
 	const inputCss = options.input === "-" ? stdinCss ?? await drainStdin() : options.input ? await fs.readFile(options.input, "utf8") : DEFAULT_INPUT;
 	const sourceOptions = {
 		base: options.input && options.input !== "-" ? path.dirname(options.input) : options.cwd,
@@ -375,18 +457,18 @@ async function buildOnce(options, stdinCss) {
 				sourceMap: Boolean(options.map)
 			});
 			css = Buffer.from(transformed.code).toString();
-			map = transformed.map;
+			map = transformed.map || void 0;
 		}
 		if (options.map && map) {
 			if (options.map === true) css += `\n${sourceMapComment(`data:application/json;base64,${Buffer.from(map).toString("base64")}`)}`;
 			else {
-				await writeFile$1(options.map, map);
 				const mapBase = options.output && options.output !== "-" ? path.dirname(options.output) : options.cwd;
 				css += `\n${sourceMapComment(path.relative(mapBase, options.map))}`;
 			}
 		}
 		return {
 			css,
+			map,
 			dependencies: /* @__PURE__ */ new Set([
 				...options.input && options.input !== "-" ? [options.input] : [],
 				...source.dependencies,
@@ -399,11 +481,13 @@ async function buildOnce(options, stdinCss) {
 }
 async function runBuild(argv) {
 	const options = parseBuildArgs(argv);
-	if (!options.silent) process.stderr.write(`tailwindcss v${process.env.npm_package_version ?? ""}\n\n`);
+	if (!options.silent) process.stderr.write(`tailwindcss v${process.env["npm_package_version"] ?? ""}\n\n`);
 	const stdinCss = options.input === "-" ? await drainStdin() : void 0;
 	let previous = "";
 	const rebuild = async () => {
 		const result = await buildOnce(options, stdinCss);
+		validateBuildPaths(options);
+		if (typeof options.map === "string" && result.map) await writeFile$1(options.map, result.map);
 		if (result.css !== previous) {
 			if (options.output && options.output !== "-") await writeFile$1(options.output, result.css);
 			else process.stdout.write(`${result.css}\n`);
@@ -419,7 +503,7 @@ async function runBuild(argv) {
 		cwd: options.cwd,
 		interval: options.pollInterval,
 		mode: options.watchMode,
-		output: options.output,
+		outputs: [options.output, typeof options.map === "string" ? options.map : void 0].filter((file) => Boolean(file && file !== "-")),
 		rebuild
 	});
 	return 0;
@@ -430,7 +514,7 @@ async function runTailwindCli(rawArgv) {
 }
 //#endregion
 //#region package.json
-var version = "5.5.11";
+var version = "5.6.0";
 //#endregion
 //#region src/constants.ts
 const WEAPP_TW_REQUIRED_NODE_VERSION_RANGE = "^22.18.0 || >=24.11.0";
@@ -1151,7 +1235,7 @@ async function runStatus(options) {
 		status: "unnecessary",
 		message: PATCH_COMMAND_OBSOLETE_NOTICE
 	};
-	if (toBoolean(options.json, false)) {
+	if (toBoolean(options["json"], false)) {
 		logger.log(JSON.stringify(payload, null, 2));
 		return;
 	}
@@ -1161,21 +1245,21 @@ async function runStatus(options) {
 async function runVscodeEntry(options) {
 	const resolvedCwd = resolveCliCwd(options.cwd);
 	const baseDir = resolvedCwd ?? process.cwd();
-	const cssEntry = readStringOption("css", options.css);
+	const cssEntry = readStringOption("css", options["css"]);
 	if (!cssEntry) throw new Error("Option \"--css\" is required.");
 	const result = await generateVscodeIntellisenseEntry({
 		baseDir,
 		cssEntry,
-		output: readStringOption("output", options.output),
-		sources: readStringArrayOption("source", options.source),
-		force: toBoolean(options.force, false)
+		output: readStringOption("output", options["output"]),
+		sources: readStringArrayOption("source", options["source"]),
+		force: toBoolean(options["force"], false)
 	});
 	logger.success(`VS Code helper generated -> ${formatOutputPath(result.outputPath, resolvedCwd)}`);
 }
 async function runDoctor(options) {
 	const report = createDoctorReport({ cwd: resolveCliCwd(options.cwd) });
-	logger.log(toBoolean(options.json, false) ? JSON.stringify(report, null, 2) : formatDoctorReport(report));
-	if (hasDoctorFailure(report, toBoolean(options.strict, false))) process.exitCode = 1;
+	logger.log(toBoolean(options["json"], false) ? JSON.stringify(report, null, 2) : formatDoctorReport(report));
+	if (hasDoctorFailure(report, toBoolean(options["strict"], false))) process.exitCode = 1;
 }
 async function runCli(argv = process.argv.slice(2)) {
 	if (!semver.satisfies(process.versions.node, "^22.18.0 || >=24.11.0")) logger.warn(`You are using Node.js ${process.versions.node}. For @weapp-tailwindcss/cli, Node.js version ${WEAPP_TW_REQUIRED_NODE_VERSION_RANGE} is required.`);

package/package.json

@@ -1,18 +1,18 @@
 {
   "name": "@weapp-tailwindcss/cli",
   "type": "module",
-  "version": "5.5.11",
+  "version": "5.6.0",
   "description": "Cross-platform Tailwind CSS CLI for Web and mini-program builds. 面向 Web 与小程序构建的跨端 Tailwind CSS CLI。",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",
   "homepage": "https://tw.weapp.dev/docs/tools/weapp-tw-cli",
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/sonofmagic/weapp-tailwindcss.git",
+    "url": "git+https://github.com/weapp-tailwindcss/weapp-tailwindcss.git",
     "directory": "packages/cli"
   },
   "bugs": {
-    "url": "https://github.com/sonofmagic/weapp-tailwindcss/issues"
+    "url": "https://github.com/weapp-tailwindcss/weapp-tailwindcss/issues"
   },
   "keywords": [
     "tailwindcss",
@@ -50,12 +50,12 @@
   },
   "dependencies": {
     "@parcel/watcher": "^2.6.0",
-    "@weapp-tailwindcss/engine": "0.1.3",
-    "@weapp-tailwindcss/logger": "2.0.3",
+    "@weapp-tailwindcss/engine": "0.1.5",
+    "@weapp-tailwindcss/logger": "2.0.4",
     "fast-glob": "^3.3.3",
     "lightningcss": "^1.33.0",
     "semver": "~7.8.5",
-    "weapp-tailwindcss": "5.5.11"
+    "weapp-tailwindcss": "5.6.0"
   },
   "scripts": {
     "build": "tsdown",