wyvrnpm 1.3.2 → 2.0.2

package/src/commands/init.js

@@ -1,33 +1,33 @@
-'use strict';
-
-const fs = require('fs');
-const path = require('path');
-const { defaultManifest, writeManifest } = require('../manifest');
-
-/**
- * Initialises a new wyvrn.json manifest in the project root.
- * If a manifest already exists the command exits early without overwriting it.
- *
- * @param {object} argv - Parsed yargs arguments.
- * @param {string} argv.manifest - Path to the manifest file.
- * @param {string} argv.root - Project root directory.
- * @returns {Promise<void>}
- */
-async function init(argv) {
-  const manifestPath = path.resolve(argv.manifest);
-  const rootDir = path.resolve(argv.root);
-
-  if (fs.existsSync(manifestPath)) {
-    console.log(`[wyvrn] Manifest already exists at ${manifestPath}`);
-    return;
-  }
-
-  const projectName = path.basename(rootDir);
-  const manifest = defaultManifest(projectName);
-
-  writeManifest(manifestPath, manifest);
-
-  console.log(`[wyvrn] Created manifest at ${manifestPath}`);
-}
-
-module.exports = init;
+'use strict';
+
+const fs = require('fs');
+const path = require('path');
+const { defaultManifest, writeManifest } = require('../manifest');
+
+/**
+ * Initialises a new wyvrn.json manifest in the project root.
+ * If a manifest already exists the command exits early without overwriting it.
+ *
+ * @param {object} argv - Parsed yargs arguments.
+ * @param {string} argv.manifest - Path to the manifest file.
+ * @param {string} argv.root - Project root directory.
+ * @returns {Promise<void>}
+ */
+async function init(argv) {
+  const manifestPath = path.resolve(argv.manifest);
+  const rootDir = path.resolve(argv.root);
+
+  if (fs.existsSync(manifestPath)) {
+    console.log(`[wyvrn] Manifest already exists at ${manifestPath}`);
+    return;
+  }
+
+  const projectName = path.basename(rootDir);
+  const manifest = defaultManifest(projectName);
+
+  writeManifest(manifestPath, manifest);
+
+  console.log(`[wyvrn] Created manifest at ${manifestPath}`);
+}
+
+module.exports = init;

package/src/commands/install.js

@@ -1,34 +1,35 @@
 'use strict';
 
-const fs = require('fs');
+const fs   = require('fs');
 const path = require('path');
-const { readManifest } = require('../manifest');
-const { resolveDependencies } = require('../resolve');
-const { downloadDependencies } = require('../download');
-const { readConfig } = require('../config');
+
+const { readManifest, normalizeDependencies }               = require('../manifest');
+const { resolveDependencies }                               = require('../resolve');
+const { downloadDependencies }                              = require('../download');
+const { readConfig }                                        = require('../config');
+const { loadProfile, hashProfile, formatProfile, mergeProfile } = require('../profile');
 
 /**
  * Resolves and downloads all dependencies declared in the manifest, then writes
  * a wyvrn.lock file recording exactly what was installed.
  *
- * @param {object} argv - Parsed yargs arguments.
- * @param {string} argv.manifest - Path to wyvrn.json.
- * @param {string} argv.root - Project root directory.
- * @param {string[]} [argv.source] - One or more base URLs for package sources.
- * @param {string} argv.platform - Target platform string.
- * @param {number} argv.timeout - HTTP timeout in seconds.
- * @returns {Promise<void>}
+ * v2 behaviour:
+ *  - Loads the named build profile (--profile flag → config.defaultProfile → "default")
+ *  - Each dependency can override individual profile settings via its `settings` field
+ *  - Lock file records the full profile + per-package SHA256, profileHash, and git metadata
+ *
+ * @param {object} argv
  */
 async function install(argv) {
   const manifestPath = path.resolve(argv.manifest);
-  const rootDir = path.resolve(argv.root);
+  const rootDir      = path.resolve(argv.root);
 
-  // CLI --source takes priority; fall back to config installSources.
+  // ── Auth / sources ────────────────────────────────────────────────────────
   let packageSources;
   if (argv.source && argv.source.length > 0) {
     packageSources = argv.source;
   } else {
-    const config = readConfig();
+    const config   = readConfig();
     packageSources = config.installSources.map((s) => s.url);
     if (packageSources.length > 0) {
       console.log(`[wyvrn] Using ${packageSources.length} source(s) from config`);
@@ -42,13 +43,25 @@ async function install(argv) {
     );
   }
 
-  const lockPath = path.join(path.dirname(manifestPath), 'wyvrn.lock');
+  // ── Active build profile ──────────────────────────────────────────────────
+  const config          = readConfig();
+  const profileName     = argv.profile ?? config.defaultProfile ?? 'default';
+  const { profile: baseProfile, fromFile } = loadProfile(profileName);
+
+  console.log(`[wyvrn] Profile: "${profileName}"${fromFile ? '' : ' (auto-detected)'}`);
+  console.log(formatProfile(baseProfile).split('\n').map((l) => `  ${l}`).join('\n'));
+  console.log(`  Profile hash : ${hashProfile(baseProfile)}`);
+
+  // ── Lock file ─────────────────────────────────────────────────────────────
+  const lockPath       = path.join(path.dirname(manifestPath), 'wyvrn.lock');
   const lockedVersions = new Map();
+
   if (fs.existsSync(lockPath)) {
     try {
       const lock = JSON.parse(fs.readFileSync(lockPath, 'utf8'));
-      for (const [name, version] of Object.entries(lock.packages || {})) {
-        lockedVersions.set(name, version);
+      for (const [name, entry] of Object.entries(lock.packages ?? {})) {
+        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)`);
     } catch {
@@ -56,47 +69,81 @@ async function install(argv) {
     }
   }
 
+  // ── Read manifest ─────────────────────────────────────────────────────────
   const manifest = readManifest(manifestPath);
 
-  // Normalize dependencies: support both array [{ Name, Version }] and object { name: version }.
-  const rawDeps = manifest.dependencies || manifest.Dependencies || {};
-  const rootDeps = Array.isArray(rawDeps)
-    ? Object.fromEntries(rawDeps.map((d) => [d.Name ?? d.name, d.Version ?? d.version]))
-    : rawDeps;
+  // Normalize to { name: { version, settings } }
+  const normalizedDeps = normalizeDependencies(manifest.dependencies ?? manifest.Dependencies);
+
+  // For resolution, only pass name → version (settings don't affect resolution)
+  const depsForResolution = Object.fromEntries(
+    Object.entries(normalizedDeps).map(([name, d]) => [name, d.version]),
+  );
 
   console.log(
     `[wyvrn] Installing dependencies for "${manifest.name}" (platform: ${argv.platform})`,
   );
 
   const resolvedDeps = await resolveDependencies(
-    rootDeps,
+    depsForResolution,
     packageSources,
     argv.platform,
     fetch,
     lockedVersions,
   );
 
+  // ── 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.
+  const enrichedDeps = new Map();
+  for (const [name, version] of resolvedDeps) {
+    const depOverrides    = normalizedDeps[name]?.settings ?? {};
+    const effectiveProfile = mergeProfile(baseProfile, depOverrides);
+    const profileHash      = hashProfile(effectiveProfile);
+
+    if (Object.keys(depOverrides).length > 0) {
+      console.log(
+        `[wyvrn] ${name}: settings override → profileHash ${profileHash}` +
+        ` (${JSON.stringify(depOverrides)})`,
+      );
+    }
+
+    enrichedDeps.set(name, { version, profileHash, profile: effectiveProfile });
+  }
+
   const razerDir = path.join(rootDir, 'wyvrn_internal');
 
-  await downloadDependencies(
-    resolvedDeps,
+  // Extract auth from the first install source (if any)
+  const firstInstallSrc = config.installSources?.[0];
+  const authOptions = {
+    awsProfile: firstInstallSrc?.profile ?? undefined,
+    token:      firstInstallSrc?.token   ?? undefined,
+  };
+
+  const lockEntries = await downloadDependencies(
+    enrichedDeps,
     packageSources,
     argv.platform,
     razerDir,
     fetch,
     argv.timeout,
+    authOptions,
   );
 
-  // Build lock file — packages sorted alphabetically for deterministic diffs.
+  // ── Write v2 lock file ────────────────────────────────────────────────────
   const sortedPackages = {};
   for (const key of [...resolvedDeps.keys()].sort()) {
-    sortedPackages[key] = resolvedDeps.get(key);
+    sortedPackages[key] = lockEntries?.get(key) ?? { version: resolvedDeps.get(key) };
   }
 
   const lockData = {
-    generatedAt: new Date().toISOString(),
-    platform: argv.platform,
-    packages: sortedPackages,
+    wyvrnVersion: 2,
+    generatedAt:  new Date().toISOString(),
+    platform:     argv.platform,
+    profileName,
+    profile:      baseProfile,
+    profileHash:  hashProfile(baseProfile),
+    packages:     sortedPackages,
   };
 
   fs.writeFileSync(lockPath, JSON.stringify(lockData, null, 2) + '\n', 'utf8');