wyvrnpm 2.0.4 → 2.3.2

package/src/commands/install.js

@@ -8,6 +8,19 @@ 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 { normalizeRecipe, hasBuildRecipe }                   = require('../build/recipe');
+const {
+  normalizeOptionsDeclaration,
+  resolveEffectiveOptions,
+  parseCliOptions,
+}                                                            = require('../options');
+const {
+  resolveUploadDestination,
+  createUploadStats,
+  formatUploadSummary,
+}                                                            = require('../upload-built');
+const log                                                    = require('../logger');
 
 /**
  * Resolves and downloads all dependencies declared in the manifest, then writes
@@ -23,6 +36,32 @@ 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';
+  const uploadBuilt  = argv.uploadBuilt === true;
+  const jsonOut      = argv.format === 'json';
+
+  // Under --format=json, stdout is reserved for the final JSON payload.
+  // All info/success lines route to stderr via the logger.
+  if (jsonOut) log.setJsonMode(true);
+
+  // --upload-built implies a build step happened. `--build=never` +
+  // `--upload-built` is a usage error — fail fast rather than silently
+  // accept something that cannot upload anything.
+  if (uploadBuilt && buildMode === 'never') {
+    log.error(
+      '--upload-built requires --build=missing (or --build=always).\n' +
+      '  Nothing will be built, so there is nothing to upload.',
+    );
+    process.exit(1);
+  }
+
+  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 +71,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 +87,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 +102,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,46 +119,112 @@ 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})`,
   );
 
+  // Manifests collected during resolution — reused below to read each dep's
+  // recipe-declared `options` block without a second HTTP round trip.
+  const depManifests = new Map();
+
   const resolvedDeps = await resolveDependencies(
     depsForResolution,
     packageSources,
     argv.platform,
     fetch,
     lockedVersions,
+    depManifests,
   );
 
+  // CLI `-o <pkg>:<name>=<value>` overrides, parsed into { pkg → {name: value} }.
+  const cliOptionsByPkg = parseCliOptions(argv.option);
+
   // ── Build per-dependency enriched map ─────────────────────────────────────
-  // Each dep gets a profileHash based on base profile + any settings overrides
-  // declared in wyvrn.json under that dependency's "settings" key.
+  // Each dep gets:
+  //   - an effective profile (base + per-dep settings overrides)
+  //   - effective options (recipe defaults + consumer overrides + CLI overrides)
+  //   - profileHash computed from both (options only hashed in when declared)
   const enrichedDeps = new Map();
   for (const [name, version] of resolvedDeps) {
-    const depOverrides    = normalizedDeps[name]?.settings ?? {};
+    const depOverrides     = normalizedDeps[name]?.settings ?? {};
     const effectiveProfile = mergeProfile(baseProfile, depOverrides);
-    const profileHash      = hashProfile(effectiveProfile);
+
+    const depManifest    = depManifests.get(name);
+    const declaration    = depManifest?.options
+      ? normalizeOptionsDeclaration(depManifest.options, `${name}@${version}`)
+      : null;
+    const effectiveOptions = resolveEffectiveOptions(
+      declaration,
+      normalizedDeps[name]?.options ?? {},
+      cliOptionsByPkg[name]         ?? {},
+      `${name}@${version}`,
+    );
+
+    const profileHash = hashProfile(effectiveProfile, effectiveOptions);
 
     if (Object.keys(depOverrides).length > 0) {
-      console.log(
-        `[wyvrn] ${name}: settings override → profileHash ${profileHash}` +
+      log.info(
+        `${name}: settings override → profileHash ${profileHash}` +
         ` (${JSON.stringify(depOverrides)})`,
       );
     }
+    if (effectiveOptions) {
+      log.info(`${name}: options → ${JSON.stringify(effectiveOptions)}`);
+    }
 
-    enrichedDeps.set(name, { version, profileHash, profile: effectiveProfile });
+    enrichedDeps.set(name, {
+      version,
+      profileHash,
+      profile: effectiveProfile,
+      options: effectiveOptions,
+    });
   }
 
   const razerDir = path.join(rootDir, 'wyvrn_internal');
 
   // 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,
   };
 
+  // ── Resolve upload destination up-front when --upload-built is set ──────
+  // Failing here (no publish source configured) avoids spending minutes on
+  // a source-build whose output we can't deliver.
+  if (uploadBuilt) {
+    const resolved = resolveUploadDestination(
+      {
+        uploadSource: argv.uploadSource,
+        awsProfile:   argv.awsProfile ?? firstInstallSrc?.profile,
+        token:        argv.token      ?? firstInstallSrc?.token,
+      },
+      config,
+    );
+    if (!resolved) {
+      log.error(
+        '--upload-built was passed but no upload destination could be resolved.\n' +
+        '  Pass --upload-source <url-or-name> or configure a publish source:\n' +
+        '    wyvrnpm configure add-source --kind publish --name ... --url ...',
+      );
+      process.exit(1);
+    }
+    downloadOptions.uploadBuilt  = true;
+    downloadOptions.uploadSource = resolved.uploadSource;
+    downloadOptions.uploadAuth   = resolved.uploadAuth;
+    downloadOptions.uploadStats  = createUploadStats();
+
+    if (resolved.uploadSource !== (packageSources[0] ?? '')) {
+      log.info(
+        `upload-built: install source(s) and upload source differ —\n` +
+        `  install: ${packageSources.join(', ') || '(none)'}\n` +
+        `  upload : ${resolved.uploadSource}`,
+      );
+    }
+  }
+
   const lockEntries = await downloadDependencies(
     enrichedDeps,
     packageSources,
@@ -127,7 +232,7 @@ async function install(argv) {
     razerDir,
     fetch,
     argv.timeout,
-    authOptions,
+    downloadOptions,
   );
 
   // ── Write v2 lock file ────────────────────────────────────────────────────
@@ -147,10 +252,148 @@ 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, '/');
+
+  // Derive generator + cacheVariables from the project's own `build` recipe
+  // so `wyvrnpm build` locally honours the same knobs the source-build /
+  // publish paths use. Without this, `build.configure` is advisory metadata
+  // and CMake falls back to its default generator (VS on Windows) — which
+  // breaks publishers whose recipe disables example/test subprojects (F15).
+  let presetGenerator = null;
+  let presetCacheVariables = null;
+  let presetInstallDir = null;
+  if (hasBuildRecipe(manifest)) {
+    try {
+      // Resolve the project's own options to expand ${options.*} in its
+      // configure args. When the project declares no options, this is null
+      // and the recipe's configure / buildArgs must not contain templates
+      // (normalizeRecipe enforces that).
+      const projectDeclaration = manifest.options
+        ? normalizeOptionsDeclaration(manifest.options, manifest.name)
+        : null;
+      const projectCliOverrides = cliOptionsByPkg[manifest.name] ?? {};
+      const projectEffectiveOptions = resolveEffectiveOptions(
+        projectDeclaration, {}, projectCliOverrides, manifest.name,
+      );
+      const recipe = normalizeRecipe(manifest.build, projectEffectiveOptions);
+
+      if (recipe.generators.length > 0) {
+        // First entry in the generator fallback chain. Users whose system
+        // lacks the first pick can override via CMakeUserPresets.json
+        // (which CMake merges in automatically).
+        [presetGenerator] = recipe.generators;
+      }
+
+      // Fold -DKEY=VALUE from recipe.configure into cacheVariables. Other
+      // configure args (anything not matching `-DKEY=VALUE`) can't be
+      // expressed in a CMake preset and are silently skipped here — the
+      // source-build path still sees them verbatim.
+      const cacheVars = {};
+      for (const arg of recipe.configure) {
+        const match = arg.match(/^-D([^=]+)=(.*)$/);
+        if (match) cacheVars[match[1]] = match[2];
+      }
+      if (Object.keys(cacheVars).length > 0) presetCacheVariables = cacheVars;
+
+      // Propagate `build.installDir` so that `wyvrnpm build --install` lands
+      // under the project's build tree instead of CMake's system default
+      // (C:/Program Files on Windows, /usr/local on Unix). Same semantics as
+      // the source-build path which passes -DCMAKE_INSTALL_PREFIX explicitly.
+      presetInstallDir = recipe.installDir;
+    } catch (err) {
+      log.warn(
+        `could not derive CMake preset config from the project's build recipe: ${err.message}\n` +
+        `  the preset will be emitted without a generator or recipe cacheVariables. ` +
+        `Fix the recipe or override via CMakeUserPresets.json.`,
+      );
+    }
+  }
+
+  const presetResult = generateCMakePresets({
+    projectRoot:  rootDir,
+    profileName,
+    profileHash:  hashProfile(baseProfile),
+    toolchainRelPath,
+    generator:           presetGenerator,
+    extraCacheVariables: presetCacheVariables,
+    installDir:          presetInstallDir,
+  });
+  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.`);
+
+  // ── upload-built summary ────────────────────────────────────────────────
+  const uploadSummary = formatUploadSummary(downloadOptions.uploadStats);
+  if (uploadSummary) log.info(uploadSummary);
+
+  // ── JSON payload (--format=json) ────────────────────────────────────────
+  // All log.info/success above have gone to stderr thanks to setJsonMode.
+  // stdout gets exactly one JSON object, no trailing text.
+  if (jsonOut) {
+    const packages = [...resolvedDeps.keys()].sort().map((name) => {
+      const entry       = lockEntries?.get(name) ?? {};
+      const consumerSpec = normalizedDeps[name]?.version ?? null;
+      const resolvedVer  = entry.version ?? resolvedDeps.get(name);
+      const versionRange = (consumerSpec && consumerSpec !== resolvedVer) ? consumerSpec : null;
+      return {
+        name,
+        version:       resolvedVer,
+        versionRange,
+        profileHash:   entry.profileHash   ?? null,
+        options:       entry.options       ?? null,
+        contentSha256: entry.contentSha256 ?? null,
+        gitSha:        entry.gitSha        ?? null,
+        resolvedFrom:  entry.resolvedFrom  ?? null,
+      };
+    });
+
+    const stats = downloadOptions.uploadStats;
+    const uploadSummaryJson = stats ? {
+      uploaded: stats.uploaded.length,
+      skipped:  stats.skipped.length,
+      failed:   stats.failed.length,
+    } : null;
+
+    const payload = {
+      command:        'install',
+      wyvrnpmVersion: require('../../package.json').version,
+      profile:        baseProfile,
+      profileName,
+      profileHash:    hashProfile(baseProfile),
+      packages,
+      lockFile:       lockPath,
+      uploadSummary:  uploadSummaryJson,
+    };
+    process.stdout.write(JSON.stringify(payload, null, 2) + '\n');
+  }
 }
 
 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);
   }
 

package/src/commands/profile.js

@@ -12,6 +12,7 @@ const {
   mergeProfile,
 } = require('../profile');
 const { readConfig, writeConfig } = require('../config');
+const log = require('../logger');
 
 // ---------------------------------------------------------------------------
 // list
@@ -27,8 +28,9 @@ function list() {
   const dir      = getProfilesDir();
   const defName  = config.defaultProfile ?? 'default';
 
-  console.log(`[wyvrn] Profiles directory: ${dir}`);
-  console.log(`[wyvrn] Default profile   : ${defName}\n`);
+  log.info(`Profiles directory: ${dir}`);
+  log.info(`Default profile   : ${defName}`);
+  console.log('');
 
   if (names.length === 0) {
     console.log('  (no profiles saved — run `wyvrnpm configure profile detect` to create one)');
@@ -60,12 +62,12 @@ function show(argv) {
   const stored  = readProfile(name);
 
   if (stored) {
-    console.log(`[wyvrn] Profile "${name}":`);
+    log.info(`Profile "${name}":`);
     console.log(formatProfile(stored));
     console.log(`\nProfile hash : ${hashProfile(stored)}`);
   } else {
     const detected = detectProfile();
-    console.log(`[wyvrn] Profile "${name}" not found — showing auto-detected environment:`);
+    log.info(`Profile "${name}" not found — showing auto-detected environment:`);
     console.log(formatProfile(detected));
     console.log(`\nProfile hash : ${hashProfile(detected)}`);
     console.log(`\nRun \`wyvrnpm configure profile detect --name ${name}\` to save this.`);
@@ -85,13 +87,14 @@ function detect(argv) {
   const name   = argv.name ?? config.defaultProfile ?? 'default';
   const p      = detectProfile();
 
-  console.log('[wyvrn] Detected profile:');
+  log.info('Detected profile:');
   console.log(formatProfile(p));
   console.log(`\nProfile hash : ${hashProfile(p)}`);
 
   if (!argv.dryRun) {
     writeProfile(name, p);
-    console.log(`\n[wyvrn] Saved as profile "${name}".`);
+    console.log('');
+    log.success(`Saved as profile "${name}".`);
   }
 }
 
@@ -120,7 +123,7 @@ function set(argv) {
 
   writeProfile(name, updated);
 
-  console.log(`[wyvrn] Profile "${name}" updated:`);
+  log.info(`Profile "${name}" updated:`);
   console.log(formatProfile(updated));
   console.log(`\nProfile hash : ${hashProfile(updated)}`);
 }
@@ -136,13 +139,13 @@ function set(argv) {
 function setDefault(argv) {
   const name = argv.name;
   if (!readProfile(name)) {
-    console.error(`[wyvrn] Error: profile "${name}" does not exist. Create it first.`);
+    log.error(`profile "${name}" does not exist. Create it first.`);
     process.exit(1);
   }
   const config = readConfig();
   config.defaultProfile = name;
   writeConfig(config);
-  console.log(`[wyvrn] Default profile set to "${name}".`);
+  log.info(`Default profile set to "${name}".`);
 }
 
 // ---------------------------------------------------------------------------
@@ -156,14 +159,14 @@ function setDefault(argv) {
 function del(argv) {
   const name = argv.name;
   if (name === 'default') {
-    console.error('[wyvrn] Error: cannot delete the "default" profile.');
+    log.error('cannot delete the "default" profile.');
     process.exit(1);
   }
   const removed = deleteProfile(name);
   if (removed) {
-    console.log(`[wyvrn] Profile "${name}" deleted.`);
+    log.info(`Profile "${name}" deleted.`);
   } else {
-    console.error(`[wyvrn] Error: profile "${name}" not found.`);
+    log.error(`profile "${name}" not found.`);
     process.exit(1);
   }
 }