@kanso-labs/unplugin-style-dictionary 0.10.14 → 0.10.16

package/dist/index.js

@@ -3,8 +3,9 @@ import { asError, errorMessage } from "./errors.js";
 import { resolveConfigOption } from "./config.js";
 import { expandPatterns, realpathOf, watchOptionPatterns, watchPatternsOf } from "./patterns.js";
 import { runBuilds } from "./compile.js";
+import { checkOptions } from "./options.js";
 import { createScheduler } from "./scheduler.js";
-import { isWatchedSource, registeredSpellingOf } from "./watch-filter.js";
+import { compileWatchPatterns, isWatchedSource, matchesWatchedFile, registeredSpellingOf } from "./watch-filter.js";
 import fs from "node:fs";
 import path from "node:path";
 import { createUnplugin } from "unplugin";
@@ -28,11 +29,14 @@ function discardTemporaryFile(temporary) {
 function isMessageChannel(value) {
 	return typeof value === "function";
 }
-function nodeModulesNegations(paths) {
-	const negations = /* @__PURE__ */ new Set();
+function nodeModulesNegations(patterns, paths) {
+	const reaching = [...patterns.globs, ...patterns.literals].filter((pattern) => pattern.includes("/node_modules/"));
+	const negations = new Set(reaching.map((pattern) => `!${pattern}`));
 	for (const file of paths) {
 		const normalised = file.replace(/\\/g, "/");
-		if (normalised.includes("/node_modules/")) negations.add(`!${normalised}`);
+		if (!normalised.includes("/node_modules/") || isDirectory(file)) continue;
+		if (matchesWatchedFile(normalised, reaching)) continue;
+		negations.add(`!${normalised}`);
 	}
 	return Array.from(negations);
 }
@@ -326,6 +330,7 @@ function isDirectory(file) {
 }
 const unpluginFactory = (options = {}, meta) => {
 	const isWebpack = meta.framework === "webpack" || meta.framework === "rspack";
+	checkOptions(options);
 	const { cache = true, errorOverlay = true, failOnError = "build", logLevel, onBuildEnd, onBuildError, onBuildStart, platforms: platformsOption, report = true, root: rootOption, silent = false } = options;
 	const level = logLevel ?? (silent ? "silent" : void 0);
 	const quiet = level === "silent" || level === "warn";
@@ -346,7 +351,7 @@ const unpluginFactory = (options = {}, meta) => {
 	};
 	let root = rootOption ? path.resolve(process.cwd(), rootOption) : process.cwd();
 	const generatedDestinations = /* @__PURE__ */ new Set();
-	let cachedPatterns;
+	let cachedMatcher;
 	const linkedPaths = /* @__PURE__ */ new Map();
 	const addWatchFiles = (context, paths) => {
 		const contextDependencies = isWebpack ? contextDependenciesOf(context) : void 0;
@@ -411,12 +416,18 @@ const unpluginFactory = (options = {}, meta) => {
 		}
 		for (const line of render(stdoutColour)) console.log(line);
 	};
+	const saidAboutConfig = /* @__PURE__ */ new Set();
+	const logConfig = (message, type) => {
+		if (saidAboutConfig.has(message)) return;
+		saidAboutConfig.add(message);
+		log(message, type);
+	};
 	const resolveConfigs = async () => {
 		const resolved = await resolveConfigOption({
 			config: options.config,
 			configContext,
 			discovery,
-			log,
+			log: logConfig,
 			root
 		});
 		if (!options.watch) return resolved;
@@ -424,14 +435,23 @@ const unpluginFactory = (options = {}, meta) => {
 		for (const item of resolved) if (item.file) item.watched = watched;
 		return resolved;
 	};
-	const getWatchTargets = async (resolvedConfigs) => {
+	const deriveWatchPatterns = async (resolvedConfigs) => {
 		const patterns = await watchPatternsOf({
-			log,
+			log: logConfig,
 			root,
 			watch: options.watch
 		}, resolvedConfigs);
-		cachedPatterns = patterns;
+		const matcher = compileWatchPatterns(patterns);
+		cachedMatcher = matcher;
+		return {
+			matcher,
+			patterns
+		};
+	};
+	const getWatchTargets = async (resolvedConfigs) => {
+		const { matcher, patterns } = await deriveWatchPatterns(resolvedConfigs);
 		return {
+			matcher,
 			paths: await expandPatterns(patterns, log),
 			patterns
 		};
@@ -444,6 +464,7 @@ const unpluginFactory = (options = {}, meta) => {
 		log,
 		logTable,
 		notifyBuildOutcome: (error) => {
+			if (!error) saidAboutConfig.clear();
 			notifyBuildOutcome?.(error);
 		},
 		onBuildEnd,
@@ -552,7 +573,7 @@ const unpluginFactory = (options = {}, meta) => {
 			const changed = [...compiler.modifiedFiles ?? [], ...compiler.removedFiles ?? []];
 			for (const file of changed) {
 				const id = registeredSpellingOf(file, linkedPaths);
-				if (!cachedPatterns || watchedDirectories.has(id.replace(/\\/g, "/")) || isWatchedSource(id, cachedPatterns, generatedDestinations)) return id;
+				if (!cachedMatcher || watchedDirectories.has(id.replace(/\\/g, "/")) || isWatchedSource(id, cachedMatcher, generatedDestinations)) return id;
 			}
 		};
 		const rebuildTokens = async () => {
@@ -618,8 +639,8 @@ const unpluginFactory = (options = {}, meta) => {
 						try {
 							const resolved = await resolveConfigs();
 							if (resolved.length > 0) {
-								const { paths } = await getWatchTargets(resolved);
-								appendChokidarIgnored(config.build.watch, nodeModulesNegations(paths));
+								const { paths, patterns } = await getWatchTargets(resolved);
+								appendChokidarIgnored(config.build.watch, nodeModulesNegations(patterns, paths));
 							}
 						} catch (err) {
 							log(`Could not read the configuration while preparing the watch list: ${errorMessage(err)}`, "error");
@@ -632,8 +653,8 @@ const unpluginFactory = (options = {}, meta) => {
 					startupResolved = await resolveConfigs();
 					if (startupResolved.length === 0) return;
 					if (config.server.watch === null) return;
-					const { paths } = await getWatchTargets(startupResolved);
-					const negations = nodeModulesNegations(paths);
+					const { paths, patterns } = await getWatchTargets(startupResolved);
+					const negations = nodeModulesNegations(patterns, paths);
 					if (negations.length === 0) return;
 					const existing = config.server.watch?.ignored;
 					config.server.watch = {
@@ -668,7 +689,7 @@ const unpluginFactory = (options = {}, meta) => {
 							const watcher = fs.watch(directory, (_event, filename) => {
 								if (filename === null) return;
 								const changed = path.posix.join(directory, filename);
-								if (!isWatchedSource(changed, targets.patterns, generatedDestinations)) return;
+								if (!isWatchedSource(changed, targets.matcher, generatedDestinations)) return;
 								schedule(path.basename(changed)).catch(() => {});
 							});
 							watcher.unref();
@@ -682,8 +703,10 @@ const unpluginFactory = (options = {}, meta) => {
 					ownWatchers.clear();
 				};
 				refreshServerWatchList = async (rebuilt) => {
+					const previous = new Set(targets.paths);
 					targets = await getWatchTargets(rebuilt);
-					server.watcher.add(targets.paths);
+					const adding = targets.paths.filter((file) => !previous.has(file) || !fs.existsSync(file));
+					if (adding.length > 0) server.watcher.add(adding);
 					watchNodeModules(targets.paths);
 				};
 				if (errorOverlay) {
@@ -710,7 +733,7 @@ const unpluginFactory = (options = {}, meta) => {
 					};
 				}
 				server.watcher.on("all", (_event, file) => {
-					if (!isWatchedSource(file, targets.patterns, generatedDestinations)) return;
+					if (!isWatchedSource(file, targets.matcher, generatedDestinations)) return;
 					schedule(path.basename(file)).catch(() => {});
 				});
 			}
@@ -721,12 +744,13 @@ const unpluginFactory = (options = {}, meta) => {
 			if (hostClosed) return;
 			watchRebuild = true;
 			const id = registeredSpellingOf(changed, linkedPaths);
-			if (cachedPatterns && !isWatchedSource(id, cachedPatterns, generatedDestinations)) return;
+			if (cachedMatcher && !isWatchedSource(id, cachedMatcher, generatedDestinations)) return;
 			const resolved = await resolveConfigs();
 			if (resolved.length === 0) return;
-			const { patterns } = await getWatchTargets(resolved);
-			if (!isWatchedSource(id, patterns, generatedDestinations)) return;
+			const { matcher, patterns } = await deriveWatchPatterns(resolved);
+			if (!isWatchedSource(id, matcher, generatedDestinations)) return;
 			if (!isWebpack) await schedule(path.basename(id));
+			if (refreshServerWatchList) return;
 			addWatchFiles(this, await expandPatterns(patterns, log));
 		},
 		webpack: adoptCompiler