wyvrnpm 1.3.2 → 2.0.2

package/src/commands/profile.js

@@ -0,0 +1,171 @@
+'use strict';
+
+const {
+  detectProfile,
+  hashProfile,
+  formatProfile,
+  readProfile,
+  writeProfile,
+  deleteProfile,
+  listProfiles,
+  getProfilesDir,
+  mergeProfile,
+} = require('../profile');
+const { readConfig, writeConfig } = require('../config');
+
+// ---------------------------------------------------------------------------
+// list
+// ---------------------------------------------------------------------------
+
+/**
+ * wyvrnpm configure profile list
+ * Show all saved profiles and which one is the default.
+ */
+function list() {
+  const config   = readConfig();
+  const names    = listProfiles();
+  const dir      = getProfilesDir();
+  const defName  = config.defaultProfile ?? 'default';
+
+  console.log(`[wyvrn] Profiles directory: ${dir}`);
+  console.log(`[wyvrn] Default profile   : ${defName}\n`);
+
+  if (names.length === 0) {
+    console.log('  (no profiles saved — run `wyvrnpm configure profile detect` to create one)');
+    return;
+  }
+
+  for (const name of names) {
+    const marker = name === defName ? ' *' : '';
+    const p = readProfile(name);
+    const summary = p
+      ? `${p.os}/${p.arch}  ${p.compiler} ${p['compiler.version']}  C++${p['compiler.cppstd']}` +
+        (p['compiler.runtime'] ? `  [${p['compiler.runtime']}]` : '')
+      : '(unreadable)';
+    console.log(`  ${(name + marker).padEnd(24)} ${summary}`);
+  }
+}
+
+// ---------------------------------------------------------------------------
+// show
+// ---------------------------------------------------------------------------
+
+/**
+ * wyvrnpm configure profile show [--name <name>]
+ * Display a specific profile (defaults to the configured default).
+ */
+function show(argv) {
+  const config  = readConfig();
+  const name    = argv.name ?? config.defaultProfile ?? 'default';
+  const stored  = readProfile(name);
+
+  if (stored) {
+    console.log(`[wyvrn] 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:`);
+    console.log(formatProfile(detected));
+    console.log(`\nProfile hash : ${hashProfile(detected)}`);
+    console.log(`\nRun \`wyvrnpm configure profile detect --name ${name}\` to save this.`);
+  }
+}
+
+// ---------------------------------------------------------------------------
+// detect
+// ---------------------------------------------------------------------------
+
+/**
+ * wyvrnpm configure profile detect [--name <name>] [--dry-run]
+ * Auto-detect the current build environment and save it as a named profile.
+ */
+function detect(argv) {
+  const config = readConfig();
+  const name   = argv.name ?? config.defaultProfile ?? 'default';
+  const p      = detectProfile();
+
+  console.log('[wyvrn] 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}".`);
+  }
+}
+
+// ---------------------------------------------------------------------------
+// set
+// ---------------------------------------------------------------------------
+
+/**
+ * wyvrnpm configure profile set [--name <name>] [field options]
+ * Manually override individual fields in a named profile.
+ * Starts from the existing saved profile, or auto-detects if none exists yet.
+ */
+function set(argv) {
+  const config = readConfig();
+  const name   = argv.name ?? config.defaultProfile ?? 'default';
+  const base   = readProfile(name) ?? detectProfile();
+
+  const updated = mergeProfile(base, {
+    os:                  argv.os              ?? null,
+    arch:                argv.arch            ?? null,
+    compiler:            argv.compiler        ?? null,
+    'compiler.version':  argv.compilerVersion ?? null,
+    'compiler.cppstd':   argv.cppstd          ?? null,
+    'compiler.runtime':  argv.runtime         ?? null,
+  });
+
+  writeProfile(name, updated);
+
+  console.log(`[wyvrn] Profile "${name}" updated:`);
+  console.log(formatProfile(updated));
+  console.log(`\nProfile hash : ${hashProfile(updated)}`);
+}
+
+// ---------------------------------------------------------------------------
+// setDefault
+// ---------------------------------------------------------------------------
+
+/**
+ * wyvrnpm configure profile set-default <name>
+ * Change which named profile is used by default.
+ */
+function setDefault(argv) {
+  const name = argv.name;
+  if (!readProfile(name)) {
+    console.error(`[wyvrn] 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}".`);
+}
+
+// ---------------------------------------------------------------------------
+// del
+// ---------------------------------------------------------------------------
+
+/**
+ * wyvrnpm configure profile delete <name>
+ * Remove a saved profile file.
+ */
+function del(argv) {
+  const name = argv.name;
+  if (name === 'default') {
+    console.error('[wyvrn] Error: cannot delete the "default" profile.');
+    process.exit(1);
+  }
+  const removed = deleteProfile(name);
+  if (removed) {
+    console.log(`[wyvrn] Profile "${name}" deleted.`);
+  } else {
+    console.error(`[wyvrn] Error: profile "${name}" not found.`);
+    process.exit(1);
+  }
+}
+
+module.exports = { list, show, detect, set, setDefault, del };

package/src/commands/publish.js

@@ -1,17 +1,19 @@
 'use strict';
 
-const fs = require('fs');
+const fs   = require('fs');
 const path = require('path');
-const os = require('os');
+const os   = require('os');
 const AdmZip = require('adm-zip');
-const { readManifest } = require('../manifest');
-const { getProvider } = require('../providers');
-const { readConfig } = require('../config');
-
-/**
- * Parse a .wyvrnignore file and return an array of pattern strings.
- * Lines starting with '#' and blank lines are ignored.
- */
+
+const { readManifest }                                     = require('../manifest');
+const { getProvider }                                      = require('../providers');
+const { readConfig }                                       = require('../config');
+const { loadProfile, hashProfile, sha256Of, getGitSha, getGitRepo } = require('../profile');
+
+// ---------------------------------------------------------------------------
+// .wyvrnignore helpers (unchanged from v1)
+// ---------------------------------------------------------------------------
+
 function loadIgnorePatterns(ignoreFile) {
   if (!fs.existsSync(ignoreFile)) return [];
   return fs
@@ -21,46 +23,26 @@ function loadIgnorePatterns(ignoreFile) {
     .filter((l) => l.length > 0 && !l.startsWith('#'));
 }
 
-/**
- * Convert a glob-style ignore pattern to a RegExp.
- * Supports '*', '**', '?' wildcards and leading '/' to anchor to root.
- */
 function patternToRegex(pattern) {
-  // A leading slash means "anchored to root"; strip it and keep the rest
   const anchored = pattern.startsWith('/');
   const p = anchored ? pattern.slice(1) : pattern;
-
   let re = p
-    .replace(/[.+^${}()|[\]\\]/g, '\\$&') // escape regex special chars
-    .replace(/\*\*/g, '\x00')              // placeholder for **
-    .replace(/\*/g, '[^/]*')              // * → match within segment
-    .replace(/\?/g, '[^/]')              // ? → single non-slash char
-    .replace(/\x00/g, '.*');             // ** → match across segments
-
-  // If anchored, match from the start; otherwise match any path segment
+    .replace(/[.+^${}()|[\]\\]/g, '\\$&')
+    .replace(/\*\*/g, '\x00')
+    .replace(/\*/g, '[^/]*')
+    .replace(/\?/g, '[^/]')
+    .replace(/\x00/g, '.*');
   return anchored ? new RegExp(`^${re}(/|$)`) : new RegExp(`(^|/)${re}(/|$)`);
 }
 
-/**
- * Recursively add files from `dir` into `zip`, skipping any path that
- * matches one of the compiled ignore regexes.
- *
- * @param {AdmZip} zip
- * @param {string} dir        Absolute path of the directory being zipped
- * @param {string} base       Absolute path of the root publish directory
- * @param {RegExp[]} ignoreRe Compiled ignore patterns
- */
 function addFolderFiltered(zip, dir, base, ignoreRe) {
   for (const entry of fs.readdirSync(dir)) {
     const fullPath = path.join(dir, entry);
-    // Relative path from publish root, always using forward slashes
-    const relPath = path.relative(base, fullPath).replace(/\\/g, '/');
-
+    const relPath  = path.relative(base, fullPath).replace(/\\/g, '/');
     if (ignoreRe.some((re) => re.test(relPath))) {
       console.log(`[wyvrn]   Ignoring: ${relPath}`);
       continue;
     }
-
     const stat = fs.statSync(fullPath);
     if (stat.isDirectory()) {
       addFolderFiltered(zip, fullPath, base, ignoreRe);
@@ -71,23 +53,23 @@ function addFolderFiltered(zip, dir, base, ignoreRe) {
   }
 }
 
-async function publish(argv) {
-  let { source, profile, platform, path: publishPath, token, manifest: manifestArg, force } = argv;
+// ---------------------------------------------------------------------------
+// Source resolution
+// ---------------------------------------------------------------------------
+
+function resolveSource(argv) {
+  let { source, awsProfile, token } = argv;
+  const config = readConfig();
 
-  // Resolve source + auth: CLI > config entry by name > first config entry > raw URL
   if (source) {
-    // Check if --source matches a named config entry rather than a raw URL/URI
-    const config = readConfig();
     const named = config.publishSources.find((s) => s.name === source);
     if (named) {
       console.log(`[wyvrn] Using publish source "${named.name}" from config`);
-      source  = named.url;
-      profile = profile ?? named.profile;
-      token   = token   ?? named.token;
+      source     = named.url;
+      awsProfile = awsProfile ?? named.profile;
+      token      = token      ?? named.token;
     }
   } else {
-    // No --source given — fall back to first configured publish source
-    const config = readConfig();
     if (config.publishSources.length === 0) {
       console.error(
         '[wyvrn] Error: --source is required (or configure one with: ' +
@@ -97,12 +79,28 @@ async function publish(argv) {
     }
     const first = config.publishSources[0];
     console.log(`[wyvrn] Using publish source "${first.name}" from config`);
-    source  = first.url;
-    profile = profile ?? first.profile;
-    token   = token   ?? first.token;
+    source     = first.url;
+    awsProfile = awsProfile ?? first.profile;
+    token      = token      ?? first.token;
   }
 
-  // Resolve and read the manifest
+  return { source, awsProfile, token };
+}
+
+// ---------------------------------------------------------------------------
+// Main publish command
+// ---------------------------------------------------------------------------
+
+async function publish(argv) {
+  const { source, awsProfile, token } = resolveSource(argv);
+  const {
+    profile: profileName,
+    path: publishPath,
+    force,
+    manifest: manifestArg,
+  } = argv;
+
+  // ── Load manifest ─────────────────────────────────────────────────────────
   const manifestPath = path.resolve(manifestArg || './wyvrn.json');
   const manifest = await readManifest(manifestPath);
   if (!manifest) {
@@ -116,15 +114,13 @@ async function publish(argv) {
     process.exit(1);
   }
 
-  const targetPlatform = platform || 'common';
   const srcDir = path.resolve(publishPath || '.');
-
   if (!fs.existsSync(srcDir)) {
     console.error(`[wyvrn] Error: Publish path does not exist: ${srcDir}`);
     process.exit(1);
   }
 
-  // Resolve provider from source URL/URI
+  // ── Resolve provider ──────────────────────────────────────────────────────
   let provider;
   try {
     provider = getProvider(source);
@@ -133,24 +129,62 @@ async function publish(argv) {
     process.exit(1);
   }
 
+  // ── Load build profile ────────────────────────────────────────────────────
+  const config = readConfig();
+  const activeProfileName = profileName ?? config.defaultProfile ?? 'default';
+  const { profile: buildProfile, fromFile } = loadProfile(activeProfileName);
+  const profileHash = hashProfile(buildProfile);
+
   console.log(
-    `[wyvrn] Publishing ${name}@${version} (${targetPlatform}) via ${provider.constructor.providerName} provider`,
+    `[wyvrn] Publishing ${name}@${version}\n` +
+    `[wyvrn] Profile     : "${activeProfileName}"${fromFile ? '' : ' (auto-detected — save with `wyvrnpm configure profile detect`)'}\n` +
+    `[wyvrn]   ${buildProfile.os}/${buildProfile.arch}  ` +
+    `${buildProfile.compiler} ${buildProfile['compiler.version']}  ` +
+    `C++${buildProfile['compiler.cppstd']}` +
+    (buildProfile['compiler.runtime'] ? `  [${buildProfile['compiler.runtime']}]` : '') + '\n' +
+    `[wyvrn] Profile hash: ${profileHash}\n` +
+    `[wyvrn] Provider    : ${provider.constructor.providerName}`,
   );
 
-  // Prevent overwriting an already-published version unless --force is passed
-  const alreadyExists = await provider.exists({ source, platform: targetPlatform, name, version, profile, token });
-  if (alreadyExists) {
+  // ── Check v2 existence ────────────────────────────────────────────────────
+  const v2AlreadyExists = await provider.v2Exists({ source, name, version, profileHash, awsProfile, token });
+  if (v2AlreadyExists) {
     if (force) {
-      console.warn(`[wyvrn] Warning: ${name}@${version} already exists — overwriting (--force)`);
+      console.warn(`[wyvrn] Warning: ${name}@${version} [${profileHash}] already exists — overwriting (--force)`);
     } else {
       console.error(
-        `[wyvrn] Error: ${name}@${version} already exists. Bump the version or use --force to overwrite.`,
+        `[wyvrn] Error: ${name}@${version} [${profileHash}] already exists.\n` +
+          '  Bump the version, use a different profile, or pass --force to overwrite.',
       );
       process.exit(1);
     }
   }
 
-  // Load .wyvrnignore patterns from the publish directory
+  // ── Read locked dependency versions from wyvrn.lock ──────────────────────
+  const lockPath = path.join(path.dirname(manifestPath), 'wyvrn.lock');
+  const lockedDependencies = {};
+  if (fs.existsSync(lockPath)) {
+    try {
+      const lock = JSON.parse(fs.readFileSync(lockPath, 'utf8'));
+      for (const [pkgName, entry] of Object.entries(lock.packages ?? {})) {
+        const ver = typeof entry === 'string' ? entry : entry.version;
+        if (ver) lockedDependencies[pkgName] = ver;
+      }
+      console.log(`[wyvrn] Lock file  : ${Object.keys(lockedDependencies).length} pinned package(s)`);
+    } catch {
+      console.warn('[wyvrn] Warning: could not read wyvrn.lock — dependency versions will be published as-is from wyvrn.json');
+    }
+  } else {
+    console.warn('[wyvrn] Warning: no wyvrn.lock found — run `wyvrnpm install` before publishing to pin dependency versions');
+  }
+
+  // ── Git metadata ──────────────────────────────────────────────────────────
+  const gitSha  = getGitSha(srcDir);
+  const gitRepo = getGitRepo(srcDir);
+  if (gitSha)  console.log(`[wyvrn] Git commit : ${gitSha}`);
+  if (gitRepo) console.log(`[wyvrn] Git remote : ${gitRepo}`);
+
+  // ── .wyvrnignore ──────────────────────────────────────────────────────────
   const ignoreFile = path.join(srcDir, '.wyvrnignore');
   const ignorePatterns = loadIgnorePatterns(ignoreFile);
   const ignoreRe = ignorePatterns.map(patternToRegex);
@@ -158,7 +192,7 @@ async function publish(argv) {
     console.log(`[wyvrn] Loaded ${ignorePatterns.length} pattern(s) from .wyvrnignore`);
   }
 
-  // Build a temporary zip of the publish directory
+  // ── Build zip ─────────────────────────────────────────────────────────────
   const tmpZipPath = path.join(os.tmpdir(), `wyvrnpm-${name}-${version}-${Date.now()}.zip`);
   try {
     console.log(`[wyvrn] Zipping ${srcDir} ...`);
@@ -166,12 +200,30 @@ async function publish(argv) {
     addFolderFiltered(zip, srcDir, srcDir, ignoreRe);
     zip.writeZip(tmpZipPath);
 
-    await provider.publish(
+    const contentSha256 = sha256Of(tmpZipPath);
+    console.log(`[wyvrn] Content SHA256 : ${contentSha256}`);
+
+    // ── v2 publish ────────────────────────────────────────────────────────
+    console.log('[wyvrn] Publishing (v2) ...');
+    await provider.v2Publish(
       { manifest: manifestPath, zip: tmpZipPath },
-      { source, platform: targetPlatform, name, version, profile, token },
+      {
+        source,
+        name,
+        version,
+        profileHash,
+        // buildSettings stored in metadata for debugging — NOT wyvrn.json
+        buildSettings: buildProfile,
+        contentSha256,
+        gitSha,
+        gitRepo,
+        lockedDependencies,
+        awsProfile,
+        token,
+      },
     );
 
-    console.log(`[wyvrn] Successfully published ${name}@${version} to ${source}`);
+    console.log(`[wyvrn] Successfully published ${name}@${version} [${profileHash}] to ${source}`);
   } finally {
     if (fs.existsSync(tmpZipPath)) fs.unlinkSync(tmpZipPath);
   }

package/src/config.js

@@ -24,23 +24,25 @@ function getConfigPath() {
 /**
  * Read and parse config.json.
  * Returns a default empty config if the file doesn't exist yet.
- * @returns {{ installSources: SourceEntry[], publishSources: SourceEntry[], linkedPackages: Object<string, string> }}
+ * @returns {{ installSources: SourceEntry[], publishSources: SourceEntry[], linkedPackages: Object<string, string>, defaultProfile: string }}
  */
 function readConfig() {
   const configPath = getConfigPath();
   if (!fs.existsSync(configPath)) {
-    return { installSources: [], publishSources: [], linkedPackages: {} };
+    return { installSources: [], publishSources: [], linkedPackages: {}, defaultProfile: 'default' };
   }
   try {
     const raw = JSON.parse(fs.readFileSync(configPath, 'utf8'));
     return {
-      installSources: raw.installSources ?? [],
-      publishSources: raw.publishSources ?? [],
-      linkedPackages: raw.linkedPackages ?? {},
+      installSources: raw.installSources  ?? [],
+      publishSources: raw.publishSources  ?? [],
+      linkedPackages: raw.linkedPackages  ?? {},
+      // Migrate: if old config had an inline `profile` object, drop it; use file-based profiles.
+      defaultProfile: raw.defaultProfile  ?? 'default',
     };
   } catch {
     console.warn('[wyvrn] Warning: could not parse config.json — using defaults');
-    return { installSources: [], publishSources: [], linkedPackages: {} };
+    return { installSources: [], publishSources: [], linkedPackages: {}, defaultProfile: 'default' };
   }
 }