@timeax/scaffold 0.0.9 → 0.0.11

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,
@@ -1530,8 +1544,9 @@ async function handleRunCommand(cwd, baseOpts) {
   const logger6 = createCliLogger(baseOpts);
   const configPath = baseOpts.config ? path2.resolve(cwd, baseOpts.config) : void 0;
   const scaffoldDir = baseOpts.dir ? path2.resolve(cwd, baseOpts.dir) : void 0;
+  const resolvedScaffoldDir = scaffoldDir ?? path2.resolve(cwd, SCAFFOLD_ROOT_DIR);
   logger6.debug(
-    `Starting scaffold (cwd=${cwd}, config=${configPath ?? "auto"}, dir=${scaffoldDir ?? "scaffold/"}, watch=${baseOpts.watch ? "yes" : "no"})`
+    `Starting scaffold (cwd=${cwd}, config=${configPath ?? "auto"}, dir=${resolvedScaffoldDir}, watch=${baseOpts.watch ? "yes" : "no"})`
   );
   const runnerOptions = {
     configPath,
@@ -1563,7 +1578,9 @@ async function handleScanCommand(cwd, scanOpts, baseOpts) {
     logger6.info("Scanning project using scaffold config/groups...");
     await writeScannedStructuresFromConfig(cwd, {
       ignore: scanOpts.ignore,
-      groups: scanOpts.groups
+      groups: scanOpts.groups,
+      scaffoldDir: baseOpts.dir,
+      maxDepth: scanOpts.maxDepth
     });
     return;
   }
@@ -1613,19 +1630,16 @@ async function handleStructuresCommand(cwd, baseOpts) {
 async function main() {
   const cwd = process.cwd();
   const program = new Command();
-  program.name("scaffold").description("@timeax/scaffold \u2013 structure-based project scaffolding").option("-c, --config <path>", "Path to scaffold config file").option("-d, --dir <path>", "Path to scaffold directory (default: ./scaffold)").option("-w, --watch", "Watch scaffold directory for changes").option("--quiet", "Silence logs").option("--debug", "Enable debug logging");
+  program.name("scaffold").description("@timeax/scaffold \u2013 structure-based project scaffolding").option("-c, --config <path>", "Path to scaffold config file").option(
+    "-d, --dir <path>",
+    `Path to scaffold directory (default: ./${SCAFFOLD_ROOT_DIR})`
+  ).option("-w, --watch", "Watch scaffold directory for changes").option("--quiet", "Silence logs").option("--debug", "Enable debug logging");
   program.command("scan").description(
     "Generate structure.txt-style output (config-aware by default, or manual root/out)"
   ).option(
     "--from-config",
-    "Scan based on scaffold config/groups and write structure files into scaffold/ (default if no root/out specified)"
-  ).option(
-    "-r, --root <path>",
-    "Root directory to scan (manual mode)"
-  ).option(
-    "-o, --out <path>",
-    "Output file path (manual mode)"
-  ).option(
+    `Scan based on scaffold config/groups and write structure files into ${SCAFFOLD_ROOT_DIR}/ (default if no root/out specified)`
+  ).option("-r, --root <path>", "Root directory to scan (manual mode)").option("-o, --out <path>", "Output file path (manual mode)").option("-d, --depth <number>", "Max directory depth to scan (default: infinity, 0 = only scan root dir").option(
     "--ignore <patterns...>",
     "Additional glob patterns to ignore (relative to root)"
   ).option(
@@ -1635,22 +1649,24 @@ async function main() {
     const baseOpts = cmd.parent?.opts() ?? {};
     await handleScanCommand(cwd, scanOpts, baseOpts);
   });
-  program.command("init").description("Initialize scaffold folder and config/structure files").option(
+  program.command("init").description(
+    `Initialize ${SCAFFOLD_ROOT_DIR} folder and config/structure files`
+  ).option(
     "--force",
     "Overwrite existing config/structure files if they already exist"
   ).action(async (initOpts, cmd) => {
     const baseOpts = cmd.parent?.opts() ?? {};
     await handleInitCommand(cwd, initOpts, baseOpts);
   });
-  program.action(async (opts) => {
-    await handleRunCommand(cwd, opts);
-  });
   program.command("structures").description(
     "Create missing structure files specified in the config (does not overwrite existing files)"
   ).action(async (_opts, cmd) => {
     const baseOpts = cmd.parent?.opts() ?? {};
     await handleStructuresCommand(cwd, baseOpts);
   });
+  program.action(async (opts) => {
+    await handleRunCommand(cwd, opts);
+  });
   await program.parseAsync(process.argv);
 }
 main().catch((err) => {