wyvrnpm 2.15.0 → 2.16.0

package/bin/wyvrnpm.js

@@ -506,9 +506,34 @@ yargs
   // ── clean ─────────────────────────────────────────────────────────────────
   .command(
     'clean',
-    'Remove downloaded packages and lock file. --build-cache also wipes the machine-wide source-build cache.',
+    'Remove downloaded packages and lock file. --build-dir adds the active profile\'s CMake build dir; --all wipes the entire wyvrnpm workspace footprint.',
     (y) => {
       y
+        .option('profile', {
+          alias: 'p',
+          type: 'string',
+          description: 'Active profile name — determines which wyvrn-<profile>/ build dir --build-dir targets',
+        })
+        .option('build-dir', {
+          type: 'boolean',
+          default: false,
+          description:
+            'Also remove the active profile\'s CMake build directory ' +
+            '(<binaryDirRoot>/wyvrn-<profile>/). Pairs well with CI cleanup. ' +
+            'binaryDirRoot resolves from wyvrn.local.json; non-default roots ' +
+            'set only via the install-time --build-dir <path> flag will not ' +
+            'be found here.',
+        })
+        .option('all', {
+          type: 'boolean',
+          default: false,
+          description:
+            'Wipe every wyvrnpm-managed file in the workspace: wyvrn_internal/, ' +
+            'wyvrn.lock, every <binaryDirRoot>/wyvrn-*/ build dir, and wyvrn-* ' +
+            'entries from CMakePresets.json / CMakeUserPresets.json. Does NOT ' +
+            'touch the machine-wide build cache — combine with --build-cache ' +
+            'for that.',
+        })
         .option('build-cache', {
           type: 'boolean',
           default: false,
@@ -521,12 +546,19 @@ yargs
             'Wipe only the local record of artefacts uploaded via --upload-built ' +
             '(the .uploaded-to.json sidecars in the build cache). Does not touch ' +
             'the registry, the artefact zips, or wyvrn_internal/.',
+        })
+        .option('dry-run', {
+          type: 'boolean',
+          default: false,
+          description: 'Print what would be removed without modifying anything.',
         });
     },
     (argv) => clean({
       ...argv,
+      buildDir:       argv['build-dir'],
       buildCache:     argv['build-cache'],
       uploadedBuilt:  argv['uploaded-built'],
+      dryRun:         argv['dry-run'],
     }),
   )
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wyvrnpm",
-  "version": "2.15.0",
+  "version": "2.16.0",
   "description": "A simple, static-hosting-compatible C++ package manager",
   "keywords": [
     "c++",

package/src/commands/clean.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const fs = require('fs');
+const fs   = require('fs');
 const path = require('path');
 
 const {
@@ -8,72 +8,230 @@ const {
   getBuildCacheRoot,
   clearUploadSidecars,
 } = require('../build/cache');
+const { readConfig }                = require('../config');
+const { readLocalOverlay }          = require('../conf');
+const { resolveBinaryDirRoot }      = require('../binary-dir');
+const { stripWyvrnPresets, safeReadJson } = require('../toolchain/presets');
 const log = require('../logger');
 
+/**
+ * Resolve the active profile name using the same precedence install/build
+ * use, but without pulling the full buildContext (which would require a
+ * manifest, parse --conf, etc. — overkill for a cleanup command).
+ *
+ * Precedence: --profile > config.defaultProfile > "default".
+ */
+function resolveProfileName(argv) {
+  if (typeof argv.profile === 'string' && argv.profile.length > 0) {
+    return argv.profile;
+  }
+  const config = readConfig();
+  if (typeof config.defaultProfile === 'string' && config.defaultProfile.length > 0) {
+    return config.defaultProfile;
+  }
+  return 'default';
+}
+
+/**
+ * Resolve binaryDirRoot the same way install/build do — overlay-only on
+ * clean (no `--build-dir <path>` setter; clean's `--build-dir` is a
+ * boolean selector). If the user installed against a non-default root
+ * via the install-time CLI flag, they need the overlay set for cleanup
+ * to find the same tree.
+ */
+function resolveBinaryRoot(rootDir) {
+  const overlay = readLocalOverlay(rootDir);
+  return resolveBinaryDirRoot({
+    localOverlayBinaryDirRoot: overlay.binaryDirRoot,
+  });
+}
+
+/**
+ * List every `wyvrn-*` subdirectory directly under `<rootDir>/<binaryRoot>/`.
+ * Returns absolute paths. Empty list if the parent dir doesn't exist.
+ */
+function listWyvrnBuildDirs(rootDir, binaryRoot) {
+  const parent = path.join(rootDir, binaryRoot);
+  if (!fs.existsSync(parent)) return [];
+  let entries;
+  try {
+    entries = fs.readdirSync(parent, { withFileTypes: true });
+  } catch {
+    return [];
+  }
+  return entries
+    .filter((e) => e.isDirectory() && e.name.startsWith('wyvrn-'))
+    .map((e) => path.join(parent, e.name));
+}
+
+/**
+ * Remove a path (file or dir). Honours dry-run by logging instead. Returns
+ * true if the path existed and we either removed it or would have.
+ */
+function removePath(p, { dryRun, label }) {
+  if (!fs.existsSync(p)) return false;
+  if (dryRun) {
+    log.info(`Would remove ${label ?? p}`);
+  } else {
+    fs.rmSync(p, { recursive: true, force: true });
+    log.info(`Removed ${label ?? p}`);
+  }
+  return true;
+}
+
+/**
+ * Strip wyvrn-generated entries from `CMakePresets.json` /
+ * `CMakeUserPresets.json`. User-owned files (no wyvrnpm vendor marker)
+ * are left untouched. Files whose only meaningful content was wyvrnpm's
+ * are deleted; files with surviving foreign content are rewritten.
+ *
+ * Returns the number of files touched (incl. dry-run "would touch").
+ */
+function stripPresetsFromWorkspace(rootDir, { dryRun }) {
+  const candidates = [
+    path.join(rootDir, 'CMakePresets.json'),
+    path.join(rootDir, 'CMakeUserPresets.json'),
+  ];
+  let touched = 0;
+  for (const filePath of candidates) {
+    if (!fs.existsSync(filePath)) continue;
+    const existing = safeReadJson(filePath);
+    if (!existing) continue;
+    // Only act on files we generated. A user-owned file (no wyvrnpm
+    // vendor marker AND no wyvrn-* presets) is left alone — defence in
+    // depth so we never strip presets from a hand-authored file even
+    // if a stray `wyvrn-x` name slipped in.
+    const hasOurVendor = !!(existing.vendor && existing.vendor['wyvrnpm/generated']);
+    const hasOurPresets =
+      (existing.configurePresets ?? []).some((p) => p && typeof p.name === 'string' && p.name.startsWith('wyvrn-')) ||
+      (existing.buildPresets     ?? []).some((p) => p && typeof p.name === 'string' && p.name.startsWith('wyvrn-'));
+    if (!hasOurVendor && !hasOurPresets) continue;
+
+    const { result, removed } = stripWyvrnPresets(existing);
+    if (removed.length === 0 && hasOurVendor && !result) continue;
+
+    if (result === null) {
+      if (dryRun) {
+        log.info(`Would remove ${filePath} (only wyvrnpm content remained)`);
+      } else {
+        fs.unlinkSync(filePath);
+        log.info(`Removed ${filePath} (only wyvrnpm content remained)`);
+      }
+    } else {
+      if (dryRun) {
+        log.info(`Would strip ${removed.length} wyvrn-* preset(s) from ${filePath}`);
+      } else {
+        fs.writeFileSync(filePath, JSON.stringify(result, null, 2) + '\n', 'utf8');
+        log.info(`Stripped ${removed.length} wyvrn-* preset(s) from ${filePath}`);
+      }
+    }
+    touched += 1;
+  }
+  return touched;
+}
+
 /**
  * Removes the project's `wyvrn_internal/` package cache and `wyvrn.lock` file.
- * With `--build-cache`, also clears the machine-wide source-build cache
- * under `%LOCALAPPDATA%\wyvrnpm\bc\` (shared across projects).
  *
- * `--uploaded-built` wipes just the consumer's local RECORD of what they
- * have uploaded via `wyvrnpm install --build=missing --upload-built` (the
- * `.uploaded-to.json` sidecars under the build cache). It does NOT touch
- * the registry, the artefact zips, or the source clones. Privacy / local
- * audit cleanup only.
+ * Flag matrix:
+ *   - (default)        wyvrn_internal/ + wyvrn.lock
+ *   - --build-dir      also the active profile's wyvrn-<profile> build dir
+ *   - --all            default set + every wyvrn-prefixed build dir + wyvrn-prefixed preset entries
+ *   - --build-cache    also the machine-wide source-build cache
+ *   - --uploaded-built wipe just the upload sidecars (targeted-only when used
+ *                      alone — does not also do the default scrub)
+ *   - --dry-run        print what would be removed; write nothing
  *
  * @param {object}  argv
  * @param {string}  argv.root             Project root directory.
  * @param {string}  argv.manifest         Path to the manifest file (used to locate wyvrn.lock).
+ * @param {string}  [argv.profile]        Active profile name (overrides config.defaultProfile).
+ * @param {boolean} [argv.buildDir]       When true, also wipes <binaryDirRoot>/wyvrn-<profile>/.
+ * @param {boolean} [argv.all]            When true, scorched-earth workspace cleanup.
  * @param {boolean} [argv.buildCache]     When true, also nukes the source-build cache.
  * @param {boolean} [argv.uploadedBuilt]  When true, wipes upload sidecars only.
+ * @param {boolean} [argv.dryRun]         When true, log intentions but write nothing.
  * @returns {Promise<void>}
  */
 async function clean(argv) {
   const rootDir  = path.resolve(argv.root);
   const razerDir = path.join(rootDir, 'wyvrn_internal');
   const lockPath = path.join(path.dirname(path.resolve(argv.manifest)), 'wyvrn.lock');
+  const dryRun   = !!argv.dryRun;
 
   // --uploaded-built is a targeted cleanup mode. When passed on its own,
   // skip the default wyvrn_internal/ + wyvrn.lock scrub so a user can
   // "forget uploads" without also wiping their project-local install.
-  const targetedOnly = argv.uploadedBuilt && !argv.buildCache;
+  // --all forces the default scrub regardless (scorched-earth wins).
+  const targetedOnly = argv.uploadedBuilt && !argv.buildCache && !argv.buildDir && !argv.all;
 
   let removedAnything = false;
 
   if (!targetedOnly) {
-    if (fs.existsSync(razerDir)) {
-      fs.rmSync(razerDir, { recursive: true, force: true });
-      log.info(`Removed ${razerDir}`);
-      removedAnything = true;
+    if (removePath(razerDir, { dryRun, label: razerDir })) removedAnything = true;
+    else log.info(`Nothing to clean at ${razerDir}`);
+
+    if (removePath(lockPath, { dryRun, label: lockPath })) removedAnything = true;
+  }
+
+  // --build-dir / --all: wipe CMake build trees.
+  if (argv.buildDir || argv.all) {
+    const binaryRoot = resolveBinaryRoot(rootDir);
+
+    if (argv.all) {
+      // Every wyvrn-* subdir under binaryDirRoot — covers all profiles
+      // any past install/build wrote to.
+      const dirs = listWyvrnBuildDirs(rootDir, binaryRoot);
+      if (dirs.length === 0) {
+        log.info(`No wyvrn-* build directories under ${path.join(rootDir, binaryRoot)}`);
+      }
+      for (const d of dirs) {
+        if (removePath(d, { dryRun, label: d })) removedAnything = true;
+      }
     } else {
-      log.info(`Nothing to clean at ${razerDir}`);
+      // Active profile only — symmetric with `wyvrnpm build --clean`.
+      const profileName = resolveProfileName(argv);
+      const buildDir    = path.join(rootDir, binaryRoot, `wyvrn-${profileName}`);
+      if (removePath(buildDir, { dryRun, label: buildDir })) removedAnything = true;
+      else log.info(`Nothing to clean at ${buildDir}`);
     }
+  }
 
-    if (fs.existsSync(lockPath)) {
-      fs.unlinkSync(lockPath);
-      log.info(`Removed ${lockPath}`);
-      removedAnything = true;
-    }
+  // --all: also strip wyvrn-* entries from CMakePresets.json / CMakeUserPresets.json.
+  if (argv.all) {
+    const touched = stripPresetsFromWorkspace(rootDir, { dryRun });
+    if (touched > 0) removedAnything = true;
   }
 
   if (argv.buildCache) {
-    const removed = clearBuildCache();
-    if (removed) {
-      log.info(`Removed source-build cache ${removed}`);
+    if (dryRun) {
+      log.info(`Would remove source-build cache ${getBuildCacheRoot()}`);
       removedAnything = true;
     } else {
-      log.info(`No source-build cache at ${getBuildCacheRoot()}`);
+      const removed = clearBuildCache();
+      if (removed) {
+        log.info(`Removed source-build cache ${removed}`);
+        removedAnything = true;
+      } else {
+        log.info(`No source-build cache at ${getBuildCacheRoot()}`);
+      }
     }
   } else if (argv.uploadedBuilt) {
     // clearBuildCache() would have nuked the sidecars as a side-effect, so
     // only bother with the sidecar sweep when the cache itself is surviving.
-    const removed = clearUploadSidecars();
-    log.info(`Removed ${removed} upload record${removed === 1 ? '' : 's'} from the build cache`);
-    if (removed > 0) removedAnything = true;
+    if (dryRun) {
+      log.info('Would remove upload sidecars from the build cache');
+    } else {
+      const removed = clearUploadSidecars();
+      log.info(`Removed ${removed} upload record${removed === 1 ? '' : 's'} from the build cache`);
+      if (removed > 0) removedAnything = true;
+    }
   }
 
   if (!removedAnything) {
     log.info('Nothing to clean.');
+  } else if (dryRun) {
+    log.info('Dry run — no files were modified.');
   }
 }
 

package/src/toolchain/presets.js

@@ -343,8 +343,86 @@ function generateCMakePresets({
   return { path: null, action: 'skipped', isUser: false };
 }
 
+/**
+ * Strip every wyvrnpm-generated entry from a parsed presets object.
+ * Mirror of `mergeIntoExisting` — used by `wyvrnpm clean --all` to
+ * leave no trace of our injections in the consumer's CMakePresets.json.
+ *
+ * Both `configurePresets` and `buildPresets` are filtered for names
+ * matching `/^wyvrn-/`. The wyvrnpm `vendor` entry is always removed.
+ *
+ * Returns:
+ *   - `result: null`  → the file is now empty of meaningful content
+ *                       (no presets of either kind, no other vendor
+ *                       entries, no other top-level keys beyond the
+ *                       schema `version`). Caller should delete the
+ *                       file rather than write a husk.
+ *   - `result: object` → the trimmed object the caller should write
+ *                        back. Foreign vendor blocks, user-named
+ *                        presets, and any other top-level keys are
+ *                        preserved.
+ *   - `removed: string[]` → names of every preset (configure + build)
+ *                           that was stripped. Useful for dry-run
+ *                           reporting.
+ *
+ * @param {object|null} existing
+ * @returns {{ result: object|null, removed: string[] }}
+ */
+function stripWyvrnPresets(existing) {
+  if (!existing || typeof existing !== 'object') {
+    return { result: null, removed: [] };
+  }
+
+  const isWyvrnName = (n) => typeof n === 'string' && n.startsWith('wyvrn-');
+
+  const removed = [];
+  const configurePresets = (existing.configurePresets ?? []).filter((p) => {
+    if (p && isWyvrnName(p.name)) { removed.push(p.name); return false; }
+    return true;
+  });
+  const buildPresets = (existing.buildPresets ?? []).filter((p) => {
+    if (p && (isWyvrnName(p.name) || isWyvrnName(p.configurePreset))) {
+      removed.push(p.name);
+      return false;
+    }
+    return true;
+  });
+
+  // Drop our vendor marker; preserve any foreign vendor entries.
+  let vendor = existing.vendor;
+  if (vendor && typeof vendor === 'object') {
+    const { [VENDOR_KEY]: _ours, ...rest } = vendor;
+    vendor = Object.keys(rest).length > 0 ? rest : undefined;
+  }
+
+  // Decide if anything meaningful survives. The schema `version` field
+  // is metadata, not content — a file with only `{ version: 3 }` is a
+  // husk we should delete.
+  const hasSurvivingPresets = configurePresets.length > 0 || buildPresets.length > 0;
+  const hasForeignVendor = vendor !== undefined;
+  const otherTopLevelKeys = Object.keys(existing).filter(
+    (k) => k !== 'version' && k !== 'vendor' && k !== 'configurePresets' && k !== 'buildPresets',
+  );
+
+  if (!hasSurvivingPresets && !hasForeignVendor && otherTopLevelKeys.length === 0) {
+    return { result: null, removed };
+  }
+
+  const result = { ...existing };
+  if (configurePresets.length > 0) result.configurePresets = configurePresets;
+  else delete result.configurePresets;
+  if (buildPresets.length > 0) result.buildPresets = buildPresets;
+  else delete result.buildPresets;
+  if (vendor !== undefined) result.vendor = vendor;
+  else delete result.vendor;
+
+  return { result, removed };
+}
+
 module.exports = {
   generateCMakePresets,
+  stripWyvrnPresets,
+  safeReadJson,
   // Exported for tests
   isWyvrnGenerated,
   buildConfigurePreset,