@zpress/cli 0.3.0 → 0.3.2

package/dist/index.mjs

@@ -436,9 +436,9 @@ const devCommand = command({
         const [configErr, config] = await loadConfig(paths.repoRoot);
         if (configErr) {
             ctx.logger.error(configErr.message);
-            if (configErr.errors && configErr.errors.length > 0) configErr.errors.map((err)=>{
+            if (configErr.errors && configErr.errors.length > 0) configErr.errors.forEach((err)=>{
                 const path = err.path.join('.');
-                return ctx.logger.error(`  ${path}: ${err.message}`);
+                ctx.logger.error(`  ${path}: ${err.message}`);
             });
             process.exit(1);
         }
@@ -453,7 +453,7 @@ const devCommand = command({
         const { createWatcher } = await import("./watcher.mjs");
         const watcher = createWatcher(config, paths, onConfigReload);
         function cleanup() {
-            if (watcher) watcher.close();
+            watcher.close();
         }
         process.on('SIGINT', cleanup);
         process.on('SIGTERM', cleanup);
@@ -710,7 +710,7 @@ const syncCommand = command({
 });
 await cli({
     name: 'zpress',
-    version: "0.3.0",
+    version: "0.3.2",
     description: 'CLI for building and serving documentation',
     commands: {
         sync: syncCommand,

package/dist/watcher.mjs

@@ -1,10 +1,8 @@
-import { existsSync } from "node:fs";
+import { watch } from "node:fs";
 import node_path from "node:path";
 import { cliLogger } from "@kidd-cli/core/logger";
-import { hasGlobChars, loadConfig, sync } from "@zpress/core";
-import { watch } from "chokidar";
+import { loadConfig, sync } from "@zpress/core";
 import { debounce } from "es-toolkit";
-import { match } from "ts-pattern";
 const CONFIG_EXTENSIONS = [
     '.ts',
     '.mts',
@@ -18,86 +16,29 @@ const MARKDOWN_EXTENSIONS = [
     '.md',
     '.mdx'
 ];
-const MAX_DISPLAY_PATHS = 3;
+const IGNORED_DIRS = new Set([
+    'node_modules',
+    '.git',
+    '.zpress',
+    'bundle',
+    'dist',
+    '.turbo'
+]);
 function isMarkdownFile(filePath) {
     return MARKDOWN_EXTENSIONS.some((ext)=>filePath.endsWith(ext));
 }
-function nearestExistingAncestor(targetPath, fallbackRoot) {
-    let current = targetPath;
-    if (existsSync(current)) return current;
-    while(current !== node_path.dirname(current)){
-        current = node_path.dirname(current);
-        if (existsSync(current)) return current;
-    }
-    return fallbackRoot;
+function isIgnored(filePath) {
+    return filePath.split(node_path.sep).some((segment)=>IGNORED_DIRS.has(segment));
 }
 function createWatcher(initialConfig, paths, onConfigReload) {
     const { repoRoot } = paths;
-    const configFiles = CONFIG_EXTENSIONS.map((ext)=>node_path.resolve(repoRoot, `zpress.config${ext}`));
+    const configFileNames = new Set(CONFIG_EXTENSIONS.map((ext)=>`zpress.config${ext}`));
     let config = initialConfig;
-    const planningDir = node_path.resolve(repoRoot, '.planning');
-    const contentPaths = extractWatchPaths(config.sections, repoRoot).map((p)=>nearestExistingAncestor(p, repoRoot));
-    const initialWatchPaths = [
-        ...contentPaths,
-        nearestExistingAncestor(planningDir, repoRoot),
-        ...configFiles
-    ];
-    const uniqueInitialPaths = [
-        ...new Set(initialWatchPaths)
-    ];
-    if (0 === uniqueInitialPaths.length) return void cliLogger.warn('No source paths to watch');
-    const relativePaths = uniqueInitialPaths.map((p)=>node_path.relative(repoRoot, p));
-    const pathsMessage = match(relativePaths.length <= MAX_DISPLAY_PATHS).with(true, ()=>relativePaths.join(', ')).otherwise(()=>`${relativePaths.slice(0, MAX_DISPLAY_PATHS).join(', ')} and ${relativePaths.length - MAX_DISPLAY_PATHS} more`);
-    cliLogger.info(`Watching ${uniqueInitialPaths.length} paths: ${pathsMessage}`);
+    cliLogger.info(`Watching ${repoRoot}`);
     let syncing = false;
     let pendingReloadConfig = null;
     let consecutiveFailures = 0;
     const MAX_CONSECUTIVE_FAILURES = 5;
-    let currentWatchPaths = new Set(uniqueInitialPaths);
-    const watcher = watch(uniqueInitialPaths, {
-        ignoreInitial: true,
-        ignored: [
-            '**/node_modules/**',
-            '**/.git/**',
-            '**/.zpress/**',
-            '**/bundle/**'
-        ],
-        awaitWriteFinish: {
-            stabilityThreshold: 100,
-            pollInterval: 50
-        },
-        depth: 99
-    });
-    function updateWatchPaths(newConfig) {
-        const newContentPaths = extractWatchPaths(newConfig.sections, repoRoot);
-        const normalizedContentPaths = newContentPaths.map((p)=>nearestExistingAncestor(p, repoRoot));
-        const newWatchPaths = [
-            ...normalizedContentPaths,
-            nearestExistingAncestor(planningDir, repoRoot),
-            ...configFiles
-        ];
-        const newSet = new Set(newWatchPaths);
-        const toAdd = [
-            ...newSet
-        ].filter((p)=>!currentWatchPaths.has(p));
-        if (toAdd.length > 0) {
-            watcher.add(toAdd);
-            const relativeAdded = toAdd.map((p)=>node_path.relative(repoRoot, p));
-            const addedMessage = match(relativeAdded.length <= MAX_DISPLAY_PATHS).with(true, ()=>relativeAdded.join(', ')).otherwise(()=>`${relativeAdded.slice(0, MAX_DISPLAY_PATHS).join(', ')} and ${relativeAdded.length - MAX_DISPLAY_PATHS} more`);
-            cliLogger.info(`Added ${toAdd.length} watch paths: ${addedMessage}`);
-        }
-        const configFileSet = new Set(configFiles);
-        const toRemove = [
-            ...currentWatchPaths
-        ].filter((p)=>!newSet.has(p) && !configFileSet.has(p));
-        if (toRemove.length > 0) {
-            watcher.unwatch(toRemove);
-            const relativeRemoved = toRemove.map((p)=>node_path.relative(repoRoot, p));
-            const removedMessage = match(relativeRemoved.length <= MAX_DISPLAY_PATHS).with(true, ()=>relativeRemoved.join(', ')).otherwise(()=>`${relativeRemoved.slice(0, MAX_DISPLAY_PATHS).join(', ')} and ${relativeRemoved.length - MAX_DISPLAY_PATHS} more`);
-            cliLogger.info(`Removed ${toRemove.length} watch paths: ${removedMessage}`);
-        }
-        currentWatchPaths = newSet;
-    }
     async function triggerSync(reloadConfig) {
         if (syncing) {
             pendingReloadConfig = true === pendingReloadConfig || reloadConfig;
@@ -110,15 +51,14 @@ function createWatcher(initialConfig, paths, onConfigReload) {
                 const [configErr, newConfig] = await loadConfig(paths.repoRoot);
                 if (configErr) {
                     cliLogger.error(`Config reload failed: ${configErr.message}`);
-                    if (configErr.errors && configErr.errors.length > 0) configErr.errors.map((err)=>{
+                    if (configErr.errors && configErr.errors.length > 0) configErr.errors.forEach((err)=>{
                         const pathStr = err.path.join('.');
-                        return cliLogger.error(`  ${pathStr}: ${err.message}`);
+                        cliLogger.error(`  ${pathStr}: ${err.message}`);
                     });
                     return;
                 }
                 config = newConfig;
                 cliLogger.info('Config reloaded');
-                updateWatchPaths(newConfig);
                 didReloadConfig = true;
             }
             await sync(config, {
@@ -148,60 +88,30 @@ function createWatcher(initialConfig, paths, onConfigReload) {
     }
     const debouncedSync = debounce(()=>triggerSync(false), 150);
     const debouncedConfigSync = debounce(()=>triggerSync(true), 150);
-    const configFileSet = new Set(configFiles);
-    function isConfigFile(filePath) {
-        return configFileSet.has(node_path.resolve(filePath));
+    function isConfigFile(filename, filePath) {
+        if (!configFileNames.has(filename)) return false;
+        const dir = node_path.dirname(filePath);
+        return '.' === dir;
     }
-    watcher.on('change', (filePath)=>{
-        if (isConfigFile(filePath)) {
-            cliLogger.info(`Config changed: ${node_path.basename(filePath)}`);
+    const watcher = watch(repoRoot, {
+        recursive: true
+    }, (_event, filename)=>{
+        if (!filename) return;
+        if (isIgnored(filename)) return;
+        const basename = node_path.basename(filename);
+        if (isConfigFile(basename, filename)) {
+            cliLogger.info(`Config changed: ${basename}`);
             debouncedConfigSync();
             return;
         }
-        if (!isMarkdownFile(filePath)) return;
-        cliLogger.step(`Changed: ${node_path.relative(repoRoot, filePath)}`);
-        debouncedSync();
-    });
-    watcher.on('add', (filePath)=>{
-        if (!isMarkdownFile(filePath)) return;
-        cliLogger.step(`Added: ${node_path.relative(repoRoot, filePath)}`);
+        if (!isMarkdownFile(filename)) return;
+        cliLogger.step(`Changed: ${filename}`);
         debouncedSync();
     });
-    watcher.on('unlink', (filePath)=>{
-        if (!isMarkdownFile(filePath)) return;
-        cliLogger.step(`Removed: ${node_path.relative(repoRoot, filePath)}`);
-        debouncedSync();
-    });
-    return watcher;
-}
-function extractWatchPaths(entries, repoRoot) {
-    const dirs = new Set();
-    const files = new Set();
-    function walk(items) {
-        items.map((entry)=>{
-            if (entry.from) if (hasGlobChars(entry.from)) {
-                const [beforeGlob] = entry.from.split('*');
-                const dir = match(beforeGlob.endsWith('/')).with(true, ()=>beforeGlob.slice(0, -1)).otherwise(()=>node_path.dirname(beforeGlob));
-                dirs.add(node_path.resolve(repoRoot, dir));
-            } else files.add(node_path.resolve(repoRoot, entry.from));
-            if (entry.items) walk(entry.items);
-            return null;
-        });
-    }
-    walk(entries);
-    const sortedDirs = [
-        ...dirs
-    ].toSorted();
-    const dedupedDirs = sortedDirs.filter((dir, index)=>{
-        const previousDirs = sortedDirs.slice(0, index);
-        return !previousDirs.some((parent)=>dir.startsWith(`${parent}${node_path.sep}`));
-    });
-    const extraFiles = [
-        ...files
-    ].filter((file)=>!dedupedDirs.some((dir)=>file.startsWith(dir + node_path.sep)));
-    return [
-        ...dedupedDirs,
-        ...extraFiles
-    ];
+    return {
+        close () {
+            watcher.close();
+        }
+    };
 }
 export { createWatcher };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zpress/cli",
-  "version": "0.3.0",
+  "version": "0.3.2",
   "description": "CLI for building and serving zpress documentation sites",
   "keywords": [
     "cli",
@@ -36,12 +36,11 @@
   "dependencies": {
     "@kidd-cli/core": "^0.4.0",
     "@rspress/core": "^2.0.5",
-    "chokidar": "^5.0.0",
     "es-toolkit": "^1.45.1",
     "ts-pattern": "^5.9.0",
     "zod": "^4.3.6",
-    "@zpress/core": "0.6.0",
-    "@zpress/ui": "0.5.0"
+    "@zpress/core": "0.6.2",
+    "@zpress/ui": "0.6.0"
   },
   "devDependencies": {
     "@rslib/core": "^0.20.0",
@@ -53,6 +52,7 @@
   "scripts": {
     "build": "rslib build",
     "dev": "node ./dist/index.mjs dev --cwd ../..",
+    "test": "vitest run",
     "typecheck": "tsc --noEmit"
   }
 }