wyvrnpm 2.3.2 → 2.8.1

package/src/commands/profile.js

@@ -10,8 +10,10 @@ const {
   listProfiles,
   getProfilesDir,
   mergeProfile,
+  resolveProfileChain,
 } = require('../profile');
 const { readConfig, writeConfig } = require('../config');
+const { parseCliConf, flattenConf, unflattenConf } = require('../conf');
 const log = require('../logger');
 
 // ---------------------------------------------------------------------------
@@ -39,11 +41,13 @@ function list() {
 
   for (const name of names) {
     const marker = name === defName ? ' *' : '';
-    const p = readProfile(name);
+    let p;
+    try { p = resolveProfileChain(name); }
+    catch { p = null; }  // cycle / missing parent — fall through to (unresolved)
     const summary = p
       ? `${p.os}/${p.arch}  ${p.compiler} ${p['compiler.version']}  C++${p['compiler.cppstd']}` +
         (p['compiler.runtime'] ? `  [${p['compiler.runtime']}]` : '')
-      : '(unreadable)';
+      : '(unresolved — check `extends`)';
     console.log(`  ${(name + marker).padEnd(24)} ${summary}`);
   }
 }
@@ -59,12 +63,26 @@ function list() {
 function show(argv) {
   const config  = readConfig();
   const name    = argv.name ?? config.defaultProfile ?? 'default';
-  const stored  = readProfile(name);
 
-  if (stored) {
+  // Raw → displays `extends:` chain for visibility. Resolved → what
+  // loadProfile() actually hands to install / publish / build.
+  const raw = readProfile(name);
+  let resolved;
+  try {
+    resolved = raw ? resolveProfileChain(name) : null;
+  } catch (err) {
+    log.error(`Cannot resolve profile "${name}": ${err.message}`);
+    process.exit(1);
+  }
+
+  if (resolved) {
     log.info(`Profile "${name}":`);
-    console.log(formatProfile(stored));
-    console.log(`\nProfile hash : ${hashProfile(stored)}`);
+    if (raw.extends !== undefined && raw.extends !== null) {
+      const chain = Array.isArray(raw.extends) ? raw.extends.join(', ') : raw.extends;
+      log.info(`  extends: ${chain}`);
+    }
+    console.log(formatProfile(resolved));
+    console.log(`\nProfile hash : ${hashProfile(resolved)}`);
   } else {
     const detected = detectProfile();
     log.info(`Profile "${name}" not found — showing auto-detected environment:`);
@@ -103,9 +121,16 @@ function detect(argv) {
 // ---------------------------------------------------------------------------
 
 /**
- * wyvrnpm configure profile set [--name <name>] [field options]
+ * wyvrnpm configure profile set [--name <name>] [field options] [--conf KEY=VAL]
  * Manually override individual fields in a named profile.
  * Starts from the existing saved profile, or auto-detects if none exists yet.
+ *
+ * --conf <namespace.leaf>=<value>   (repeatable) — set a non-ABI build-time
+ *   knob in the profile's `[conf]` block (PLAN-CONF.md phase 2). Same
+ *   syntax as `install --conf` / `build --conf`; `KEY` alone means
+ *   `KEY=ON`, `KEY=` removes any inherited value from this profile.
+ *   Profile conf never folds into `profileHash`. Allow-listed
+ *   namespaces only — unknown keys fail fast.
  */
 function set(argv) {
   const config = readConfig();
@@ -121,6 +146,44 @@ function set(argv) {
     'compiler.runtime':  argv.runtime         ?? null,
   });
 
+  // Apply --conf edits, if any. Writes at the leaf level, preserving
+  // sibling keys that weren't mentioned. `KEY=` removes the leaf.
+  const cliConf = Array.isArray(argv.conf) ? argv.conf : (argv.conf ? [argv.conf] : []);
+  if (cliConf.length > 0) {
+    let { sets, unsets } = { sets: {}, unsets: new Set() };
+    try { ({ sets, unsets } = parseCliConf(cliConf)); }
+    catch (err) {
+      log.error(`--conf: ${err.message}`);
+      process.exit(1);
+    }
+
+    const existingFlat = (() => {
+      try { return updated.conf ? flattenConf(updated.conf) : {}; }
+      catch (err) {
+        log.error(`existing profile conf is malformed: ${err.message}`);
+        process.exit(1);
+      }
+    })();
+
+    const nextFlat = { ...existingFlat, ...sets };
+    for (const k of unsets) delete nextFlat[k];
+
+    try {
+      // Re-validate as a whole so namespace/leaf checks catch both the
+      // edits AND any previously-saved pre-phase-2 garbage.
+      require('../conf/namespaces').validateFlatConfKeys(nextFlat);
+    } catch (err) {
+      log.error(`--conf: ${err.message}`);
+      process.exit(1);
+    }
+
+    if (Object.keys(nextFlat).length === 0) {
+      delete updated.conf;
+    } else {
+      updated.conf = unflattenConf(nextFlat);
+    }
+  }
+
   writeProfile(name, updated);
 
   log.info(`Profile "${name}" updated:`);

package/src/commands/publish.js

@@ -8,6 +8,13 @@ const AdmZip = require('adm-zip');
 const { readManifest }                                     = require('../manifest');
 const { getProvider }                                      = require('../providers');
 const { readConfig }                                       = require('../config');
+const { resolveSourceAuth }                                = require('../auth');
+const {
+  readRecipeConf,
+  parseCliConf,
+  mergeConfLayers,
+  unflattenConf,
+}                                                          = require('../conf');
 const { loadProfile, hashProfile, sha256Of, getGitSha, getGitRepo, isShaOnRemote } = require('../profile');
 const { defaultCompatBlock }                               = require('../compat');
 const {
@@ -89,8 +96,9 @@ function addInstallTree(zip, installDir) {
 // ---------------------------------------------------------------------------
 
 function resolveSource(argv) {
-  let { source, awsProfile, token } = argv;
+  let { source, awsProfile } = argv;
   const config = readConfig();
+  let sourceEntry = null;
 
   if (source) {
     const named = config.publishSources.find((s) => s.name === source);
@@ -98,7 +106,7 @@ function resolveSource(argv) {
       log.info(`Using publish source "${named.name}" from config`);
       source     = named.url;
       awsProfile = awsProfile ?? named.profile;
-      token      = token      ?? named.token;
+      sourceEntry = named;
     }
   } else {
     if (config.publishSources.length === 0) {
@@ -112,9 +120,15 @@ function resolveSource(argv) {
     log.info(`Using publish source "${first.name}" from config`);
     source     = first.url;
     awsProfile = awsProfile ?? first.profile;
-    token      = token      ?? first.token;
+    sourceEntry = first;
   }
 
+  // Literal --token beats --token-env beats config.token beats config.tokenEnv.
+  const { token } = resolveSourceAuth(
+    { token: argv.token, tokenEnv: argv.tokenEnv },
+    sourceEntry,
+  );
+
   return { source, awsProfile, token };
 }
 
@@ -265,9 +279,32 @@ async function publish(argv) {
     os.tmpdir(),
     `wyvrnpm-manifest-${name}-${version}-${Date.now()}.json`,
   );
+  // ── publishedConf (PLAN-CONF.md §4.6) ────────────────────────────────────
+  // Publish reads ONLY the recipe conf + CLI --conf — wyvrn.local.json is
+  // intentionally ignored (plan §4.5 / §8.4) so dev-local overlays never
+  // leak into shared artefacts. Recorded on the published manifest as
+  // informational metadata: it tells maintainers what the publisher's
+  // CMake cache vars were at build time but does NOT drive resolution on
+  // the consumer side.
+  let publishedConf = {};
+  try {
+    const recipeConfFlat = readRecipeConf(manifest);
+    const cli            = parseCliConf(argv.conf);
+    publishedConf = mergeConfLayers(recipeConfFlat, {}, cli);
+  } catch (err) {
+    log.error(`conf resolution failed: ${err.message}`);
+    process.exit(1);
+  }
+  if (Object.keys(publishedConf).length > 0) {
+    log.info(`Published conf: ${JSON.stringify(publishedConf)}`);
+  }
+
   const manifestForPublish = {
     ...manifest,
     compatibility: manifest.compatibility ?? defaultCompatBlock(),
+    ...(Object.keys(publishedConf).length > 0
+      ? { publishedConf: unflattenConf(publishedConf) }
+      : {}),
   };
   fs.writeFileSync(tmpManifestPath, JSON.stringify(manifestForPublish, null, 2), 'utf8');
   if (!manifest.compatibility) {
@@ -288,7 +325,7 @@ async function publish(argv) {
   let installOverlayPaths = new Set();
   if (hasBuildRecipe(manifest)) {
     try {
-      const recipe = normalizeRecipe(manifest.build, effectiveOptions);
+      const recipe = normalizeRecipe(manifest.build, effectiveOptions, manifest);
       const candidate = path.join(
         srcDir, 'build', `wyvrn-${activeProfileName}`, recipe.installDir,
       );

package/src/commands/show.js

@@ -1,8 +1,9 @@
 'use strict';
 
-const { readConfig }  = require('../config');
-const { getProvider } = require('../providers');
-const log             = require('../logger');
+const { readConfig }       = require('../config');
+const { getProvider }      = require('../providers');
+const { resolveSourceAuth } = require('../auth');
+const log                  = require('../logger');
 
 /**
  * `wyvrnpm show <pkg>` — surface registry metadata for a package.
@@ -145,6 +146,11 @@ async function show(argv) {
             if (meta?.options && Object.keys(meta.options).length > 0) {
               console.log(`      declared: ${formatDeclaredOptions(meta.options)}`);
             }
+            // PLAN-CONF.md §4.6 — surface publisher's publishedConf.
+            // Informational only; absent for pre-2.6.0 author publishes.
+            if (meta?.publishedConf && Object.keys(meta.publishedConf).length > 0) {
+              console.log(`      conf    : ${JSON.stringify(meta.publishedConf)}`);
+            }
           }
         }
 
@@ -157,6 +163,7 @@ async function show(argv) {
           uploadedBy:      meta?.uploadedBy    ?? null,
           compatibility:   meta?.compatibility ?? null,
           declaredOptions: meta?.options       ?? null,
+          publishedConf:   meta?.publishedConf ?? null,
         });
       }
 
@@ -202,7 +209,10 @@ function resolveSources(argv) {
   return {
     sources,
     awsProfile: argv.awsProfile ?? firstConfig?.profile,
-    token:      argv.token      ?? firstConfig?.token,
+    token:      resolveSourceAuth(
+      { token: argv.token, tokenEnv: argv.tokenEnv },
+      firstConfig,
+    ).token,
   };
 }
 

package/src/compat.js

@@ -34,12 +34,15 @@
  *                   | version fields and leaves room for future "same major"
  *                   | semantics without renaming.
  *
- * Missing fields default to `exact`. `os` and `arch` are ALWAYS evaluated
- * as `exact` regardless of what the block says — cross-arch/cross-OS
- * binaries are never ABI-compatible.
+ * Missing fields default to `exact`. `os` and `arch` are normally forced
+ * to `exact` regardless of what the block says — cross-arch/cross-OS
+ * binaries are never ABI-compatible. The one exception is
+ * `kind: "HeaderOnlyLib"`: header-only packages ship no binary, so the
+ * publisher's declared modes for `os`/`arch` are respected. Binary kinds
+ * (`StaticLib`, `DynamicLib`, `ConsoleApp`, …) keep the hard guarantee.
  */
 
-const OS_ARCH_ALWAYS_EXACT = new Set(['os', 'arch']);
+const OS_ARCH_FIELDS = new Set(['os', 'arch']);
 
 const DEFAULT_COMPAT_FIELDS = [
   'os',
@@ -55,19 +58,27 @@ const VALID_MODES = new Set(['exact', 'any', 'lte', 'gte', 'exact-or-newer']);
 /**
  * Normalise a raw compatibility block into `{ field → mode }`.
  * Missing fields fall back to `exact`. Unknown modes fall back to `exact`.
- * `os` and `arch` are forced to `exact`.
+ *
+ * For binary kinds (`StaticLib`, `DynamicLib`, `ConsoleApp`, …) `os` and
+ * `arch` are forced to `exact` — publisher-declared modes are silently
+ * dropped because cross-arch binaries are never ABI-safe. For
+ * `kind: "HeaderOnlyLib"` the publisher's declared modes are respected,
+ * since there is no binary to be ABI-incompatible with.
  *
  * @param {object|null|undefined} rawCompat
+ * @param {string|null|undefined} [packageKind]  Package manifest `kind` field.
  * @returns {Record<string, string>}
  */
-function normalizeCompat(rawCompat) {
+function normalizeCompat(rawCompat, packageKind) {
   const result = {};
   for (const field of DEFAULT_COMPAT_FIELDS) result[field] = 'exact';
 
   if (!rawCompat || typeof rawCompat !== 'object') return result;
 
+  const headerOnly = packageKind === 'HeaderOnlyLib';
+
   for (const [field, spec] of Object.entries(rawCompat)) {
-    if (OS_ARCH_ALWAYS_EXACT.has(field)) continue;
+    if (!headerOnly && OS_ARCH_FIELDS.has(field)) continue;
     const mode = typeof spec === 'string' ? spec : (spec && spec.mode);
     if (mode && VALID_MODES.has(mode)) result[field] = mode;
   }
@@ -147,13 +158,14 @@ function evaluateField(mode, consumerVal, packageVal) {
  * @param {Record<string, any>}         consumerProfile  may include `options: {...}`
  * @param {Record<string, any>}         packageProfile   may include `options: {...}`
  * @param {object|null|undefined}       rawCompat        compatibility block from the package manifest
+ * @param {string|null|undefined}       [packageKind]    package manifest `kind` field — unlocks `os`/`arch` modes for HeaderOnlyLib
  * @returns {{
  *   compatible: boolean,
  *   reasons: Array<{ field: string, mode: string, consumer: any, package: any, outcome: string }>,
  * }}
  */
-function evaluateCompat(consumerProfile, packageProfile, rawCompat) {
-  const compat = normalizeCompat(rawCompat);
+function evaluateCompat(consumerProfile, packageProfile, rawCompat, packageKind) {
+  const compat = normalizeCompat(rawCompat, packageKind);
   const reasons = [];
   let compatible = true;