wyvrnpm 2.0.2 → 2.1.0

package/src/commands/build.js

@@ -0,0 +1,242 @@
+'use strict';
+
+const fs   = require('fs');
+const path = require('path');
+const { spawn } = require('child_process');
+
+const { readConfig } = require('../config');
+const install        = require('./install');
+const log            = require('../logger');
+
+// ---------------------------------------------------------------------------
+// Pure helpers (unit-testable — no process spawning, no filesystem writes)
+// ---------------------------------------------------------------------------
+
+/**
+ * Decide whether `wyvrn install` must run before build.
+ *
+ *   - toolchain-missing : wyvrn_toolchain.cmake does not exist → definitely stale.
+ *   - lock-newer        : wyvrn.lock was modified after the toolchain was written,
+ *                         so the toolchain's package list is out of date.
+ *   - fresh             : no action needed.
+ *
+ * @param {{ rootDir: string, manifestPath: string }} args
+ * @returns {{ stale: boolean, reason: string }}
+ */
+function isToolchainStale({ rootDir, manifestPath }) {
+  const lockPath      = path.join(path.dirname(manifestPath), 'wyvrn.lock');
+  const toolchainPath = path.join(rootDir, 'wyvrn_internal', 'wyvrn_toolchain.cmake');
+
+  if (!fs.existsSync(toolchainPath)) {
+    return { stale: true, reason: 'toolchain-missing' };
+  }
+  if (!fs.existsSync(lockPath)) {
+    return { stale: false, reason: 'no-lock' };
+  }
+
+  const lockMtime      = fs.statSync(lockPath).mtimeMs;
+  const toolchainMtime = fs.statSync(toolchainPath).mtimeMs;
+  if (lockMtime > toolchainMtime) {
+    return { stale: true, reason: 'lock-newer-than-toolchain' };
+  }
+  return { stale: false, reason: 'fresh' };
+}
+
+/**
+ * Resolve the configure preset name from CLI override or profile convention.
+ *
+ * @param {{ presetOverride?: string, profileName: string }} args
+ * @returns {string}
+ */
+function resolvePresetName({ presetOverride, profileName }) {
+  if (presetOverride) return presetOverride;
+  return `wyvrn-${profileName}`;
+}
+
+/**
+ * Compute the build directory for a preset, matching the pattern emitted
+ * by [src/toolchain/presets.js](../toolchain/presets.js) — `${sourceDir}/build/<preset>`.
+ *
+ * @param {{ rootDir: string, presetName: string }} args
+ * @returns {string}
+ */
+function resolveBinaryDir({ rootDir, presetName }) {
+  return path.join(rootDir, 'build', presetName);
+}
+
+/**
+ * Args passed to `cmake` for the configure step.
+ * @param {{ presetName: string }} args
+ * @returns {string[]}
+ */
+function buildConfigureArgs({ presetName }) {
+  return ['--preset', presetName];
+}
+
+/**
+ * Args passed to `cmake` for the build step.
+ *
+ * @param {{
+ *   binaryDir: string,
+ *   config:    string,
+ *   target?:   string,
+ *   verbose?:  boolean,
+ *   passthru?: string[],
+ * }} args
+ * @returns {string[]}
+ */
+function buildBuildArgs({ binaryDir, config, target, verbose, passthru = [] }) {
+  const args = ['--build', binaryDir, '--config', config];
+  if (verbose) args.push('--verbose');
+  if (target)  args.push('--target', target);
+  if (passthru.length > 0) args.push('--', ...passthru);
+  return args;
+}
+
+/**
+ * Args passed to `cmake --install` for the install step.
+ *
+ * @param {{
+ *   binaryDir: string,
+ *   config:    string,
+ *   prefix?:   string,   // override CMAKE_INSTALL_PREFIX at install time
+ * }} args
+ * @returns {string[]}
+ */
+function buildInstallArgs({ binaryDir, config, prefix }) {
+  const args = ['--install', binaryDir, '--config', config];
+  if (prefix) args.push('--prefix', prefix);
+  return args;
+}
+
+// ---------------------------------------------------------------------------
+// Spawn wrapper
+// ---------------------------------------------------------------------------
+
+/**
+ * Run `cmake` with the given args. Inherits stdio for real-time output.
+ * Rejects if the process exits non-zero or fails to spawn.
+ *
+ * @param {string[]} args
+ * @returns {Promise<void>}
+ */
+function runCmake(args) {
+  return new Promise((resolve, reject) => {
+    const proc = spawn('cmake', args, { stdio: 'inherit' });
+    proc.on('error', (err) => {
+      reject(new Error(
+        `Failed to spawn cmake: ${err.message}\n` +
+        '  Is CMake installed and on PATH?',
+      ));
+    });
+    proc.on('close', (code) => {
+      if (code === 0) resolve();
+      else reject(new Error(`cmake ${args.join(' ')} exited with code ${code}`));
+    });
+  });
+}
+
+// ---------------------------------------------------------------------------
+// Command entry
+// ---------------------------------------------------------------------------
+
+/**
+ * `wyvrnpm build` — configure + build via the generated CMake preset.
+ *
+ * Defaults:
+ *   - preset : `wyvrn-<profileName>` (from --profile or config.defaultProfile)
+ *   - config : Release
+ *   - auto-install when toolchain is missing / older than wyvrn.lock
+ *
+ * @param {object} argv
+ */
+async function build(argv) {
+  const rootDir      = path.resolve(argv.root);
+  const manifestPath = path.resolve(argv.manifest);
+
+  const config      = readConfig();
+  const profileName = argv.profile ?? config.defaultProfile ?? 'default';
+  const presetName  = resolvePresetName({ presetOverride: argv.preset, profileName });
+  const buildConfig = argv.config ?? 'Release';
+
+  // ── Stale check / auto-install ────────────────────────────────────────────
+  // `--auto-install` gates the "run `wyvrnpm install` first when the
+  // toolchain is missing or older than wyvrn.lock" behaviour. The separate
+  // `--install` flag below runs `cmake --install` AFTER build; the two are
+  // deliberately distinct concepts.
+  const staleness = isToolchainStale({ rootDir, manifestPath });
+  if (staleness.stale) {
+    if (argv.autoInstall === false) {
+      log.error(
+        `toolchain is stale (${staleness.reason}) and --no-auto-install was passed.\n` +
+        '  Run: wyvrnpm install',
+      );
+      process.exit(1);
+    }
+    log.info(`Toolchain ${staleness.reason} — running install first`);
+    await install({
+      manifest: argv.manifest,
+      root:     argv.root,
+      profile:  argv.profile,
+      source:   argv.source,
+      platform: argv.platform ?? 'win_x64',
+      timeout:  argv.timeout  ?? 300,
+    });
+  }
+
+  const binaryDir = resolveBinaryDir({ rootDir, presetName });
+
+  // ── Clean ─────────────────────────────────────────────────────────────────
+  if (argv.clean && fs.existsSync(binaryDir)) {
+    log.info(`Removing ${binaryDir}`);
+    fs.rmSync(binaryDir, { recursive: true, force: true });
+  }
+
+  // ── Configure ─────────────────────────────────────────────────────────────
+  const configureArgs = buildConfigureArgs({ presetName });
+  log.info(`cmake ${configureArgs.join(' ')}`);
+  await runCmake(configureArgs);
+
+  // ── Build ─────────────────────────────────────────────────────────────────
+  const buildArgs = buildBuildArgs({
+    binaryDir,
+    config:   buildConfig,
+    target:   argv.target,
+    verbose:  argv.verbose,
+    passthru: argv['--'] ?? [],
+  });
+  log.info(`cmake ${buildArgs.join(' ')}`);
+  await runCmake(buildArgs);
+
+  // ── Install (optional) ────────────────────────────────────────────────────
+  // `--install` runs `cmake --install <binaryDir>` after the build. Prefix
+  // defaults to whatever was baked into the cache at configure time; pass
+  // `--install-prefix` to override without reconfiguring.
+  if (argv.install) {
+    const installArgs = buildInstallArgs({
+      binaryDir,
+      config: buildConfig,
+      prefix: argv.installPrefix,
+    });
+    log.info(`cmake ${installArgs.join(' ')}`);
+    await runCmake(installArgs);
+  }
+
+  const suffix = argv.install
+    ? ` + installed${argv.installPrefix ? ` to ${argv.installPrefix}` : ''}`
+    : '';
+  log.success(`Build complete: ${binaryDir} (${buildConfig})${suffix}`);
+}
+
+module.exports = build;
+module.exports.default = build;
+
+// Exported for unit tests
+module.exports._helpers = {
+  isToolchainStale,
+  resolvePresetName,
+  resolveBinaryDir,
+  buildConfigureArgs,
+  buildBuildArgs,
+  buildInstallArgs,
+};

package/src/commands/clean.js

@@ -3,16 +3,22 @@
 const fs = require('fs');
 const path = require('path');
 
+const { clearBuildCache, getBuildCacheRoot } = require('../build/cache');
+const log = require('../logger');
+
 /**
- * Removes the wyvrn_internal/ package cache directory and the wyvrn.lock file.
+ * 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).
  *
- * @param {object} argv - Parsed yargs arguments.
- * @param {string} argv.root - Project root directory.
- * @param {string} argv.manifest - Path to the manifest file (used to locate wyvrn.lock).
+ * @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 {boolean} [argv.buildCache] When true, also nukes the source-build cache.
  * @returns {Promise<void>}
  */
 async function clean(argv) {
-  const rootDir = path.resolve(argv.root);
+  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');
 
@@ -20,20 +26,30 @@ async function clean(argv) {
 
   if (fs.existsSync(razerDir)) {
     fs.rmSync(razerDir, { recursive: true, force: true });
-    console.log(`[wyvrn] Removed ${razerDir}`);
+    log.info(`Removed ${razerDir}`);
     removedAnything = true;
   } else {
-    console.log(`[wyvrn] Nothing to clean at ${razerDir}`);
+    log.info(`Nothing to clean at ${razerDir}`);
   }
 
   if (fs.existsSync(lockPath)) {
     fs.unlinkSync(lockPath);
-    console.log(`[wyvrn] Removed ${lockPath}`);
+    log.info(`Removed ${lockPath}`);
     removedAnything = true;
   }
 
+  if (argv.buildCache) {
+    const removed = clearBuildCache();
+    if (removed) {
+      log.info(`Removed source-build cache ${removed}`);
+      removedAnything = true;
+    } else {
+      log.info(`No source-build cache at ${getBuildCacheRoot()}`);
+    }
+  }
+
   if (!removedAnything) {
-    console.log('[wyvrn] Nothing to clean.');
+    log.info('Nothing to clean.');
   }
 }
 

package/src/commands/configure.js

@@ -1,6 +1,7 @@
 'use strict';
 
 const { readConfig, writeConfig, getConfigPath } = require('../config');
+const log = require('../logger');
 
 /** wyvrnpm configure list */
 function list() {
@@ -47,14 +48,14 @@ function addSource(argv) {
   const idx = config[key].findIndex((s) => s.name === name);
   if (idx !== -1) {
     config[key][idx] = entry;
-    console.log(`[wyvrn] Updated ${kind} source "${name}"`);
+    log.info(`Updated ${kind} source "${name}"`);
   } else {
     config[key].push(entry);
-    console.log(`[wyvrn] Added ${kind} source "${name}"`);
+    log.info(`Added ${kind} source "${name}"`);
   }
 
   writeConfig(config);
-  console.log(`[wyvrn] Saved to ${getConfigPath()}`);
+  log.info(`Saved to ${getConfigPath()}`);
 }
 
 /**
@@ -69,12 +70,12 @@ function removeSource(argv) {
   config[key] = config[key].filter((s) => s.name !== name);
 
   if (config[key].length === before) {
-    console.error(`[wyvrn] Error: No ${kind} source named "${name}"`);
+    log.error(`No ${kind} source named "${name}"`);
     process.exit(1);
   }
 
   writeConfig(config);
-  console.log(`[wyvrn] Removed ${kind} source "${name}"`);
+  log.info(`Removed ${kind} source "${name}"`);
 }
 
 module.exports = { list, addSource, removeSource };

package/src/commands/init.js

@@ -3,6 +3,7 @@
 const fs = require('fs');
 const path = require('path');
 const { defaultManifest, writeManifest } = require('../manifest');
+const log = require('../logger');
 
 /**
  * Initialises a new wyvrn.json manifest in the project root.
@@ -18,7 +19,7 @@ async function init(argv) {
   const rootDir = path.resolve(argv.root);
 
   if (fs.existsSync(manifestPath)) {
-    console.log(`[wyvrn] Manifest already exists at ${manifestPath}`);
+    log.info(`Manifest already exists at ${manifestPath}`);
     return;
   }
 
@@ -27,7 +28,7 @@ async function init(argv) {
 
   writeManifest(manifestPath, manifest);
 
-  console.log(`[wyvrn] Created manifest at ${manifestPath}`);
+  log.success(`Created manifest at ${manifestPath}`);
 }
 
 module.exports = init;

package/src/commands/install.js

@@ -8,6 +8,8 @@ const { resolveDependencies }                               = require('../resolv
 const { downloadDependencies }                              = require('../download');
 const { readConfig }                                        = require('../config');
 const { loadProfile, hashProfile, formatProfile, mergeProfile } = require('../profile');
+const { generateToolchain, generateCMakePresets }           = require('../toolchain');
+const log                                                    = require('../logger');
 
 /**
  * Resolves and downloads all dependencies declared in the manifest, then writes
@@ -23,6 +25,15 @@ const { loadProfile, hashProfile, formatProfile, mergeProfile } = require('../pr
 async function install(argv) {
   const manifestPath = path.resolve(argv.manifest);
   const rootDir      = path.resolve(argv.root);
+  const buildMode    = argv.build ?? 'never';
+
+  if (buildMode === 'always') {
+    log.error(
+      '--build=always is not implemented (requires PLAN-BUILD-MISSING phase 3).\n' +
+      '  Use --build=never (default) or --build=missing.',
+    );
+    process.exit(1);
+  }
 
   // ── Auth / sources ────────────────────────────────────────────────────────
   let packageSources;
@@ -32,13 +43,13 @@ async function install(argv) {
     const config   = readConfig();
     packageSources = config.installSources.map((s) => s.url);
     if (packageSources.length > 0) {
-      console.log(`[wyvrn] Using ${packageSources.length} source(s) from config`);
+      log.info(`Using ${packageSources.length} source(s) from config`);
     }
   }
 
   if (packageSources.length === 0) {
-    console.warn(
-      '[wyvrn] Warning: no sources configured. ' +
+    log.warn(
+      'no sources configured. ' +
         'Pass --source <url> or run: wyvrnpm configure add-source --kind install ...',
     );
   }
@@ -48,7 +59,7 @@ async function install(argv) {
   const profileName     = argv.profile ?? config.defaultProfile ?? 'default';
   const { profile: baseProfile, fromFile } = loadProfile(profileName);
 
-  console.log(`[wyvrn] Profile: "${profileName}"${fromFile ? '' : ' (auto-detected)'}`);
+  log.info(`Profile: "${profileName}"${fromFile ? '' : ' (auto-detected)'}`);
   console.log(formatProfile(baseProfile).split('\n').map((l) => `  ${l}`).join('\n'));
   console.log(`  Profile hash : ${hashProfile(baseProfile)}`);
 
@@ -63,9 +74,9 @@ async function install(argv) {
         const ver = typeof entry === 'string' ? entry : entry.version;
         if (ver) lockedVersions.set(name, ver);
       }
-      console.log(`[wyvrn] Lock file found — ${lockedVersions.size} pinned package(s)`);
+      log.info(`Lock file found — ${lockedVersions.size} pinned package(s)`);
     } catch {
-      console.warn('[wyvrn] Warning: could not read wyvrn.lock, resolving from scratch');
+      log.warn('could not read wyvrn.lock, resolving from scratch');
     }
   }
 
@@ -80,8 +91,8 @@ async function install(argv) {
     Object.entries(normalizedDeps).map(([name, d]) => [name, d.version]),
   );
 
-  console.log(
-    `[wyvrn] Installing dependencies for "${manifest.name}" (platform: ${argv.platform})`,
+  log.info(
+    `Installing dependencies for "${manifest.name}" (platform: ${argv.platform})`,
   );
 
   const resolvedDeps = await resolveDependencies(
@@ -102,8 +113,8 @@ async function install(argv) {
     const profileHash      = hashProfile(effectiveProfile);
 
     if (Object.keys(depOverrides).length > 0) {
-      console.log(
-        `[wyvrn] ${name}: settings override → profileHash ${profileHash}` +
+      log.info(
+        `${name}: settings override → profileHash ${profileHash}` +
         ` (${JSON.stringify(depOverrides)})`,
       );
     }
@@ -115,9 +126,11 @@ async function install(argv) {
 
   // Extract auth from the first install source (if any)
   const firstInstallSrc = config.installSources?.[0];
-  const authOptions = {
+  const downloadOptions = {
     awsProfile: firstInstallSrc?.profile ?? undefined,
     token:      firstInstallSrc?.token   ?? undefined,
+    buildMode,
+    profileName,
   };
 
   const lockEntries = await downloadDependencies(
@@ -127,7 +140,7 @@ async function install(argv) {
     razerDir,
     fetch,
     argv.timeout,
-    authOptions,
+    downloadOptions,
   );
 
   // ── Write v2 lock file ────────────────────────────────────────────────────
@@ -147,10 +160,44 @@ async function install(argv) {
   };
 
   fs.writeFileSync(lockPath, JSON.stringify(lockData, null, 2) + '\n', 'utf8');
-  console.log(`[wyvrn] Lock file written to ${lockPath}`);
+  log.info(`Lock file written to ${lockPath}`);
+
+  // ── CMake toolchain generation ────────────────────────────────────────────
+  const packageNames = [...resolvedDeps.keys()].sort();
+  const { toolchain } = generateToolchain({
+    destDir:     razerDir,
+    profile:     baseProfile,
+    profileName,
+    profileHash: hashProfile(baseProfile),
+    packageNames,
+  });
+  log.info(`CMake toolchain written to ${toolchain}`);
+
+  // ── CMakePresets.json emission ────────────────────────────────────────────
+  const toolchainRelPath = path
+    .relative(rootDir, toolchain)
+    .replace(/\\/g, '/');
+  const presetResult = generateCMakePresets({
+    projectRoot:  rootDir,
+    profileName,
+    profileHash:  hashProfile(baseProfile),
+    toolchainRelPath,
+  });
+  if (presetResult.action === 'skipped') {
+    log.warn(
+      'could not write presets — both CMakePresets.json and ' +
+      'CMakeUserPresets.json exist and are user-owned. Add this to your presets:\n' +
+      `  { "name": "wyvrn-${profileName}", "cacheVariables": { "CMAKE_TOOLCHAIN_FILE": "\${sourceDir}/${toolchainRelPath}" } }`,
+    );
+  } else {
+    log.info(
+      `CMake presets ${presetResult.action}: ${presetResult.path}` +
+      (presetResult.isUser ? ' (user presets — CMakePresets.json is user-owned)' : ''),
+    );
+  }
 
   const count = resolvedDeps.size;
-  console.log(`[wyvrn] Done — ${count} package${count !== 1 ? 's' : ''} installed.`);
+  log.success(`Done — ${count} package${count !== 1 ? 's' : ''} installed.`);
 }
 
 module.exports = install;

package/src/commands/link.js

@@ -7,6 +7,7 @@ const { readManifest } = require('../manifest');
 const { createLink, isLink, removeLink, getLinkTarget } = require('../link-utils');
 const { downloadDependencies } = require('../download');
 const { resolveDependencies } = require('../resolve');
+const log = require('../logger');
 
 /**
  * Normalizes a linked package entry to object form.
@@ -47,7 +48,7 @@ function registerGlobal(manifestPath, subdir) {
   const packageName = manifest.name || manifest.Name;
 
   if (!packageName) {
-    console.error('[wyvrn] Error: wyvrn.json must have a "name" field');
+    log.error('wyvrn.json must have a "name" field');
     process.exit(1);
   }
 
@@ -63,7 +64,7 @@ function registerGlobal(manifestPath, subdir) {
   writeConfig(config);
 
   const effectivePath = getEffectivePath(entry);
-  console.log(`[wyvrn] Registered "${packageName}" → ${effectivePath}`);
+  log.info(`Registered "${packageName}" → ${effectivePath}`);
 }
 
 /**
@@ -77,7 +78,7 @@ function linkToProject(name, sourcePath, rootDir) {
   const absoluteSource = path.resolve(sourcePath);
 
   if (!fs.existsSync(absoluteSource)) {
-    console.error(`[wyvrn] Error: source path does not exist: ${absoluteSource}`);
+    log.error(`source path does not exist: ${absoluteSource}`);
     process.exit(1);
   }
 
@@ -106,7 +107,7 @@ function linkToProject(name, sourcePath, rootDir) {
   lockData.generatedAt = new Date().toISOString();
   fs.writeFileSync(lockPath, JSON.stringify(lockData, null, 2) + '\n', 'utf8');
 
-  console.log(`[wyvrn] Linked: ${name} → ${absoluteSource}`);
+  log.info(`Linked: ${name} → ${absoluteSource}`);
 }
 
 /**
@@ -122,18 +123,18 @@ async function unlinkFromProject(name, rootDir, restore, argv) {
   const linkPath = path.join(razerDir, name);
 
   if (!fs.existsSync(linkPath)) {
-    console.error(`[wyvrn] Error: package "${name}" is not installed`);
+    log.error(`package "${name}" is not installed`);
     process.exit(1);
   }
 
   if (!isLink(linkPath)) {
-    console.error(`[wyvrn] Error: package "${name}" is not a linked package`);
+    log.error(`package "${name}" is not a linked package`);
     process.exit(1);
   }
 
   // Remove the symlink
   removeLink(linkPath);
-  console.log(`[wyvrn] Unlinked: ${name}`);
+  log.info(`Unlinked: ${name}`);
 
   // Update the lock file
   const lockPath = path.join(rootDir, 'wyvrn.lock');
@@ -161,7 +162,7 @@ async function unlinkFromProject(name, rootDir, restore, argv) {
       : rawDeps;
 
     if (!deps[name]) {
-      console.warn(`[wyvrn] Warning: "${name}" is not in manifest dependencies, cannot restore`);
+      log.warn(`"${name}" is not in manifest dependencies, cannot restore`);
       return;
     }
 
@@ -175,7 +176,7 @@ async function unlinkFromProject(name, rootDir, restore, argv) {
     }
 
     if (packageSources.length === 0) {
-      console.warn('[wyvrn] Warning: no sources configured, cannot restore package');
+      log.warn('no sources configured, cannot restore package');
       return;
     }
 
@@ -223,11 +224,11 @@ function listLinked() {
   const entries = Object.entries(linked);
 
   if (entries.length === 0) {
-    console.log('[wyvrn] No globally registered packages');
+    log.info('No globally registered packages');
     return;
   }
 
-  console.log('[wyvrn] Globally registered packages:');
+  log.info('Globally registered packages:');
   for (const [name, rawEntry] of entries) {
     const entry = normalizeLinkedEntry(rawEntry);
     const effectivePath = getEffectivePath(entry);
@@ -256,7 +257,7 @@ async function link(argv) {
   // wyvrnpm link (no args) - register current package globally
   if (!argv.name) {
     if (!fs.existsSync(manifestPath)) {
-      console.error(`[wyvrn] Error: no wyvrn.json found at ${manifestPath}`);
+      log.error(`no wyvrn.json found at ${manifestPath}`);
       process.exit(1);
     }
     registerGlobal(manifestPath, argv.subdir);
@@ -278,9 +279,11 @@ async function link(argv) {
   const linked = config.linkedPackages || {};
 
   if (!linked[argv.name]) {
-    console.error(`[wyvrn] Error: "${argv.name}" is not registered globally`);
-    console.error('[wyvrn] Run "wyvrnpm link" in the package directory first, or use:');
-    console.error(`[wyvrn]   wyvrnpm link ${argv.name} <path>`);
+    log.error(
+      `"${argv.name}" is not registered globally\n` +
+      `Run "wyvrnpm link" in the package directory first, or use:\n` +
+      `  wyvrnpm link ${argv.name} <path>`,
+    );
     process.exit(1);
   }