@timeax/scaffold 0.0.10 → 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,