@timeax/scaffold 0.0.10 → 0.0.12

package/dist/cli.mjs

@@ -930,6 +930,9 @@ async function applyStructure(opts) {
     interactiveDelete
   } = opts;
   const logger6 = opts.logger ?? defaultLogger.child(groupName ? `[apply:${groupName}]` : "[apply]");
+  const projectRootAbs = path2.resolve(projectRoot);
+  const baseDirAbs = path2.resolve(baseDir);
+  baseDirAbs.endsWith(path2.sep) ? baseDirAbs : baseDirAbs + path2.sep;
   const desiredPaths = /* @__PURE__ */ new Set();
   const threshold = sizePromptThreshold ?? config.sizePromptThreshold ?? 128 * 1024;
   async function walk(entry, inheritedStub) {
@@ -942,9 +945,9 @@ async function applyStructure(opts) {
   }
   async function handleDir(entry, inheritedStub) {
     const relFromBase = entry.path.replace(/^[./]+/, "");
-    const absDir = path2.resolve(baseDir, relFromBase);
+    const absDir = path2.resolve(baseDirAbs, relFromBase);
     const relFromRoot = toPosixPath(
-      toProjectRelativePath(projectRoot, absDir)
+      toProjectRelativePath(projectRootAbs, absDir)
     );
     desiredPaths.add(relFromRoot);
     ensureDirSync(absDir);
@@ -957,14 +960,14 @@ async function applyStructure(opts) {
   }
   async function handleFile(entry, inheritedStub) {
     const relFromBase = entry.path.replace(/^[./]+/, "");
-    const absFile = path2.resolve(baseDir, relFromBase);
+    const absFile = path2.resolve(baseDirAbs, relFromBase);
     const relFromRoot = toPosixPath(
-      toProjectRelativePath(projectRoot, absFile)
+      toProjectRelativePath(projectRootAbs, absFile)
     );
     desiredPaths.add(relFromRoot);
     const stubName = entry.stub ?? inheritedStub;
     const ctx = {
-      projectRoot,
+      projectRoot: projectRootAbs,
       targetPath: relFromRoot,
       absolutePath: absFile,
       isDirectory: false,
@@ -1004,7 +1007,19 @@ async function applyStructure(opts) {
     await walk(entry);
   }
   for (const cachedPath of cache.allPaths()) {
-    if (desiredPaths.has(cachedPath)) continue;
+    const entry = cache.get(cachedPath);
+    if (groupName) {
+      if (!entry || entry.groupName !== groupName) {
+        continue;
+      }
+    } else {
+      if (entry && entry.groupName) {
+        continue;
+      }
+    }
+    if (desiredPaths.has(cachedPath)) {
+      continue;
+    }
     const abs = path2.resolve(projectRoot, cachedPath);
     const stats = statSafeSync(abs);
     if (!stats) {
@@ -1015,7 +1030,6 @@ async function applyStructure(opts) {
       cache.delete(cachedPath);
       continue;
     }
-    const entry = cache.get(cachedPath);
     const ctx = {
       projectRoot,
       targetPath: cachedPath,
@@ -1316,7 +1330,7 @@ function watchScaffold(cwd, options = {}) {
         // we already resolved scaffoldDir for watcher; pass it down
         scaffoldDir
       });
-      logger6.info("Scaffold run completed.");
+      logger6.info("Scaffold run completed");
     } catch (err) {
       logger6.error("Scaffold run failed:", err);
     } finally {
@@ -1331,27 +1345,21 @@ function watchScaffold(cwd, options = {}) {
     if (timer) clearTimeout(timer);
     timer = setTimeout(run, debounceMs);
   }
-  const watcher = chokidar.watch(
-    [
-      // config files (ts/js/etc.)
-      path2.join(scaffoldDir, "config.*"),
-      // structure files: plain txt + our custom extensions
-      path2.join(scaffoldDir, "*.txt"),
-      path2.join(scaffoldDir, "*.tss"),
-      path2.join(scaffoldDir, "*.stx")
-    ],
-    {
-      ignoreInitial: false
-    }
-  );
-  watcher.on("add", (filePath) => {
-    logger6.debug(`File added: ${filePath}`);
-    scheduleRun();
-  }).on("change", (filePath) => {
-    logger6.debug(`File changed: ${filePath}`);
-    scheduleRun();
-  }).on("unlink", (filePath) => {
-    logger6.debug(`File removed: ${filePath}`);
+  function isInteresting(filePath) {
+    const rel = path2.relative(scaffoldDir, filePath);
+    if (rel.startsWith("..")) return false;
+    const base = path2.basename(filePath).toLowerCase();
+    if (base.startsWith("config.")) return true;
+    const ext = path2.extname(base);
+    return ext === ".txt" || ext === ".tss" || ext === ".stx";
+  }
+  const watcher = chokidar.watch(scaffoldDir, {
+    ignoreInitial: false,
+    persistent: true
+  });
+  watcher.on("all", (event, filePath) => {
+    if (!isInteresting(filePath)) return;
+    logger6.debug(`Event ${event} on ${filePath}`);
     scheduleRun();
   }).on("error", (error) => {
     logger6.error("Watcher error:", error);