wyvrnpm 1.3.2 → 2.0.2

package/bin/wyvrn.js

@@ -2,12 +2,13 @@
 
 'use strict';
 
-const yargs = require('yargs');
-const init = require('../src/commands/init');
-const install = require('../src/commands/install');
-const clean = require('../src/commands/clean');
-const publish = require('../src/commands/publish');
+const yargs     = require('yargs');
+const init      = require('../src/commands/init');
+const install   = require('../src/commands/install');
+const clean     = require('../src/commands/clean');
+const publish   = require('../src/commands/publish');
 const configure = require('../src/commands/configure');
+const profile   = require('../src/commands/profile');
 const { link, unlink } = require('../src/commands/link');
 
 yargs
@@ -21,26 +22,35 @@ yargs
     description: 'Root directory',
     default: './',
   })
+
+  // ── init ──────────────────────────────────────────────────────────────────
   .command(
     'init',
     'Initialise a new wyvrn.json manifest in the current project',
     () => {},
     (argv) => init(argv),
   )
+
+  // ── install ───────────────────────────────────────────────────────────────
   .command(
     'install',
     'Resolve and download all dependencies listed in the manifest',
-    (yargs) => {
-      yargs
+    (y) => {
+      y
         .option('source', {
           alias: 's',
           type: 'string',
           description: 'Base URL of a package source (can be repeated)',
           array: true,
         })
+        .option('profile', {
+          alias: 'p',
+          type: 'string',
+          description: 'Build profile name to use (default: config.defaultProfile → "default")',
+        })
         .option('platform', {
           type: 'string',
-          description: 'Target platform',
+          description: 'v1 legacy platform path (used as fallback if v2 not found)',
           choices: ['win_x64', 'win_x86', 'linux_x64', 'linux_x86', 'osx_x64', 'osx_arm64'],
           default: 'win_x64',
         })
@@ -52,32 +62,35 @@ yargs
     },
     (argv) => install(argv),
   )
+
+  // ── clean ─────────────────────────────────────────────────────────────────
   .command(
     'clean',
     'Remove downloaded packages and lock file',
     () => {},
     (argv) => clean(argv),
   )
+
+  // ── publish ───────────────────────────────────────────────────────────────
   .command(
     'publish',
-    'Package and publish the project to a source (S3 or HTTP server)',
-    (yargs) => {
-      yargs
+    'Package and publish the project. The active build profile is loaded from the ' +
+    'profiles directory (--profile selects which one).',
+    (y) => {
+      y
         .option('source', {
           alias: 's',
           type: 'string',
-          description: 'Publish destination URL/URI or a configured source name (falls back to config)',
+          description: 'Publish destination URL/URI or a configured source name',
         })
         .option('profile', {
           alias: 'p',
           type: 'string',
-          description: 'AWS SSO profile to use for authentication (S3 only)',
+          description: 'Build profile name to publish as (default: config.defaultProfile → "default")',
         })
-        .option('platform', {
+        .option('aws-profile', {
           type: 'string',
-          description: 'Target platform sub-path (e.g. win_x64). Defaults to "common"',
-          choices: ['win_x64', 'win_x86', 'linux_x64', 'linux_x86', 'osx_x64', 'osx_arm64', 'common'],
-          default: 'common',
+          description: 'AWS SSO profile for S3 authentication (S3 only)',
         })
         .option('path', {
           type: 'string',
@@ -86,139 +99,179 @@ yargs
         })
         .option('token', {
           type: 'string',
-          description: 'Bearer token for HTTP server authentication (HTTP only)',
+          description: 'Bearer token for HTTP server authentication',
         })
         .option('force', {
           alias: 'f',
           type: 'boolean',
           description: 'Overwrite an existing published version',
           default: false,
-        });
+        })
+        ;
     },
-    (argv) => publish(argv),
+    (argv) => publish({ ...argv, awsProfile: argv['aws-profile'] }),
   )
+
+  // ── configure ─────────────────────────────────────────────────────────────
   .command(
     'configure',
-    'Manage wyvrnpm configuration (sources, authentication)',
-    (yargs) => {
-      yargs
+    'Manage wyvrnpm configuration (sources, authentication, build profiles)',
+    (y) => {
+      y
+        // --- list ---
         .command('list', 'List all configured sources', () => {}, () => configure.list())
+
+        // --- add-source ---
         .command(
           'add-source',
           'Add or update an install/publish source',
-          (yargs) => {
-            yargs
-              .option('kind', {
-                type: 'string',
-                description: 'Source kind',
-                choices: ['install', 'publish'],
-                demandOption: true,
-              })
-              .option('name', {
-                type: 'string',
-                description: 'Unique name for this source',
-                demandOption: true,
-              })
-              .option('url', {
-                type: 'string',
-                description: 'Source URL or URI (s3://, https://, UNC path, etc.)',
-                demandOption: true,
-              })
-              .option('profile', {
-                type: 'string',
-                description: 'AWS SSO profile for this source (S3 only)',
-              })
-              .option('token', {
-                type: 'string',
-                description: 'Bearer token for this source (HTTP only)',
-              });
+          (y2) => {
+            y2
+              .option('kind',    { type: 'string', choices: ['install', 'publish'], demandOption: true })
+              .option('name',    { type: 'string', demandOption: true })
+              .option('url',     { type: 'string', demandOption: true })
+              .option('profile', { type: 'string', description: 'AWS SSO profile (S3 only)' })
+              .option('token',   { type: 'string', description: 'Bearer token (HTTP only)' });
           },
           (argv) => configure.addSource(argv),
         )
+
+        // --- remove-source ---
         .command(
           'remove-source',
           'Remove a configured source by name',
-          (yargs) => {
-            yargs
-              .option('kind', {
-                type: 'string',
-                description: 'Source kind',
-                choices: ['install', 'publish'],
-                demandOption: true,
-              })
-              .option('name', {
-                type: 'string',
-                description: 'Name of the source to remove',
-                demandOption: true,
-              });
+          (y2) => {
+            y2
+              .option('kind', { type: 'string', choices: ['install', 'publish'], demandOption: true })
+              .option('name', { type: 'string', demandOption: true });
           },
           (argv) => configure.removeSource(argv),
         )
+
+        // --- profile ---
+        .command(
+          'profile',
+          'Manage named build profiles stored in the wyvrnpm profiles directory',
+          (y2) => {
+            y2
+              // list
+              .command(
+                'list',
+                'List all saved build profiles',
+                () => {},
+                () => profile.list(),
+              )
+              // show
+              .command(
+                'show',
+                'Display a named profile',
+                (y3) => {
+                  y3.option('name', {
+                    alias: 'n',
+                    type: 'string',
+                    description: 'Profile name (default: configured default)',
+                  });
+                },
+                (argv) => profile.show(argv),
+              )
+              // detect
+              .command(
+                'detect',
+                'Auto-detect the build environment and save as a named profile',
+                (y3) => {
+                  y3
+                    .option('name', {
+                      alias: 'n',
+                      type: 'string',
+                      description: 'Profile name to save to (default: "default")',
+                    })
+                    .option('dry-run', {
+                      type: 'boolean',
+                      description: 'Print detected values without saving',
+                      default: false,
+                    });
+                },
+                (argv) => profile.detect(argv),
+              )
+              // set
+              .command(
+                'set',
+                'Manually override fields in a named profile',
+                (y3) => {
+                  y3
+                    .option('name',             { alias: 'n', type: 'string', description: 'Profile name (default: "default")' })
+                    .option('os',               { type: 'string', description: 'OS (Windows | Linux | Macos)' })
+                    .option('arch',             { type: 'string', description: 'Architecture (x86_64 | x86 | armv8 | ...)' })
+                    .option('compiler',         { type: 'string', description: 'Compiler (msvc | gcc | clang | apple-clang)' })
+                    .option('compiler-version', { type: 'string', description: 'Compiler version (193 | 11 | 14 | ...)' })
+                    .option('cppstd',           { type: 'string', description: 'C++ standard (14 | 17 | 20 | 23)' })
+                    .option('runtime',          { type: 'string', description: 'Runtime linkage (static | dynamic)' });
+                },
+                (argv) => profile.set({ ...argv, compilerVersion: argv['compiler-version'] }),
+              )
+              // set-default
+              .command(
+                'set-default <name>',
+                'Change which profile is used by default',
+                (y3) => {
+                  y3.positional('name', { type: 'string', demandOption: true });
+                },
+                (argv) => profile.setDefault(argv),
+              )
+              // delete
+              .command(
+                'delete <name>',
+                'Delete a saved profile',
+                (y3) => {
+                  y3.positional('name', { type: 'string', demandOption: true });
+                },
+                (argv) => profile.del(argv),
+              )
+              .demandCommand(1)
+              .help();
+          },
+          () => {},
+        )
+
         .demandCommand(1)
         .help();
     },
     () => {},
   )
+
+  // ── link ──────────────────────────────────────────────────────────────────
   .command(
     'link [name] [path]',
     'Link a local package for development',
-    (yargs) => {
-      yargs
-        .positional('name', {
-          type: 'string',
-          description: 'Package name to link (omit to register current directory)',
-        })
-        .positional('path', {
-          type: 'string',
-          description: 'Local path to package (optional, uses global registry if omitted)',
-        })
-        .option('list', {
-          type: 'boolean',
-          description: 'List all globally registered packages',
-          default: false,
-        })
-        .option('subdir', {
-          type: 'string',
-          description: 'Subdirectory within the package to link (e.g., "output/install" for CMake packages)',
-        });
+    (y) => {
+      y
+        .positional('name', { type: 'string', description: 'Package name to link' })
+        .positional('path', { type: 'string', description: 'Local path to package' })
+        .option('list',   { type: 'boolean', description: 'List all globally registered packages', default: false })
+        .option('subdir', { type: 'string',  description: 'Subdirectory within the package to link' });
     },
     (argv) => link(argv),
   )
+
+  // ── unlink ────────────────────────────────────────────────────────────────
   .command(
     'unlink <name>',
     'Remove a linked package',
-    (yargs) => {
-      yargs
-        .positional('name', {
-          type: 'string',
-          description: 'Package name to unlink',
-          demandOption: true,
-        })
-        .option('restore', {
-          type: 'boolean',
-          description: 'Re-download the package from registry after unlinking',
-          default: false,
-        })
-        .option('source', {
-          alias: 's',
-          type: 'string',
-          description: 'Base URL of a package source (for --restore)',
-          array: true,
-        })
+    (y) => {
+      y
+        .positional('name', { type: 'string', demandOption: true })
+        .option('restore',  { type: 'boolean', description: 'Re-download after unlinking', default: false })
+        .option('source',   { alias: 's', type: 'string', array: true, description: 'Package source URL (for --restore)' })
         .option('platform', {
           type: 'string',
-          description: 'Target platform (for --restore)',
           choices: ['win_x64', 'win_x86', 'linux_x64', 'linux_x86', 'osx_x64', 'osx_arm64'],
           default: 'win_x64',
         })
-        .option('timeout', {
-          type: 'number',
-          description: 'HTTP timeout in seconds (for --restore)',
-          default: 300,
-        });
+        .option('timeout', { type: 'number', default: 300 });
     },
     (argv) => unlink(argv),
   )
+
   .demandCommand(1)
   .strict()
   .help()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wyvrnpm",
-  "version": "1.3.2",
+  "version": "2.0.2",
   "description": "A simple, static-hosting-compatible C++ package manager",
   "keywords": [
     "c++",

package/src/commands/clean.js

@@ -1,40 +1,40 @@
-'use strict';
-
-const fs = require('fs');
-const path = require('path');
-
-/**
- * Removes the wyvrn_internal/ package cache directory and the wyvrn.lock file.
- *
- * @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).
- * @returns {Promise<void>}
- */
-async function clean(argv) {
-  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');
-
-  let removedAnything = false;
-
-  if (fs.existsSync(razerDir)) {
-    fs.rmSync(razerDir, { recursive: true, force: true });
-    console.log(`[wyvrn] Removed ${razerDir}`);
-    removedAnything = true;
-  } else {
-    console.log(`[wyvrn] Nothing to clean at ${razerDir}`);
-  }
-
-  if (fs.existsSync(lockPath)) {
-    fs.unlinkSync(lockPath);
-    console.log(`[wyvrn] Removed ${lockPath}`);
-    removedAnything = true;
-  }
-
-  if (!removedAnything) {
-    console.log('[wyvrn] Nothing to clean.');
-  }
-}
-
-module.exports = clean;
+'use strict';
+
+const fs = require('fs');
+const path = require('path');
+
+/**
+ * Removes the wyvrn_internal/ package cache directory and the wyvrn.lock file.
+ *
+ * @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).
+ * @returns {Promise<void>}
+ */
+async function clean(argv) {
+  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');
+
+  let removedAnything = false;
+
+  if (fs.existsSync(razerDir)) {
+    fs.rmSync(razerDir, { recursive: true, force: true });
+    console.log(`[wyvrn] Removed ${razerDir}`);
+    removedAnything = true;
+  } else {
+    console.log(`[wyvrn] Nothing to clean at ${razerDir}`);
+  }
+
+  if (fs.existsSync(lockPath)) {
+    fs.unlinkSync(lockPath);
+    console.log(`[wyvrn] Removed ${lockPath}`);
+    removedAnything = true;
+  }
+
+  if (!removedAnything) {
+    console.log('[wyvrn] Nothing to clean.');
+  }
+}
+
+module.exports = clean;

package/src/commands/configure.js

@@ -1,80 +1,80 @@
-'use strict';
-
-const { readConfig, writeConfig, getConfigPath } = require('../config');
-
-/** wyvrnpm configure list */
-function list() {
-  const config = readConfig();
-
-  console.log(`Config: ${getConfigPath()}\n`);
-
-  printSection('Install Sources', config.installSources);
-  console.log('');
-  printSection('Publish Sources', config.publishSources);
-}
-
-function printSection(title, sources) {
-  console.log(`${title}:`);
-  if (sources.length === 0) {
-    console.log('  (none)');
-    return;
-  }
-  for (const src of sources) {
-    const auth = authLabel(src);
-    console.log(`  ${src.name.padEnd(20)} ${src.url}${auth ? '  ' + auth : ''}`);
-  }
-}
-
-function authLabel(src) {
-  if (src.profile) return `[profile: ${src.profile}]`;
-  if (src.token)   return '[token: ***]';
-  return '';
-}
-
-/**
- * wyvrnpm configure add-source --kind install|publish --name <name> --url <url>
- *                               [--profile <profile>] [--token <token>]
- */
-function addSource(argv) {
-  const { kind, name, url, profile, token } = argv;
-  const config = readConfig();
-  const key = kind === 'install' ? 'installSources' : 'publishSources';
-
-  const entry = { name, url };
-  if (profile) entry.profile = profile;
-  if (token)   entry.token   = token;
-
-  const idx = config[key].findIndex((s) => s.name === name);
-  if (idx !== -1) {
-    config[key][idx] = entry;
-    console.log(`[wyvrn] Updated ${kind} source "${name}"`);
-  } else {
-    config[key].push(entry);
-    console.log(`[wyvrn] Added ${kind} source "${name}"`);
-  }
-
-  writeConfig(config);
-  console.log(`[wyvrn] Saved to ${getConfigPath()}`);
-}
-
-/**
- * wyvrnpm configure remove-source --kind install|publish --name <name>
- */
-function removeSource(argv) {
-  const { kind, name } = argv;
-  const config = readConfig();
-  const key = kind === 'install' ? 'installSources' : 'publishSources';
-
-  const before = config[key].length;
-  config[key] = config[key].filter((s) => s.name !== name);
-
-  if (config[key].length === before) {
-    console.error(`[wyvrn] Error: No ${kind} source named "${name}"`);
-    process.exit(1);
-  }
-
-  writeConfig(config);
-  console.log(`[wyvrn] Removed ${kind} source "${name}"`);
-}
-
-module.exports = { list, addSource, removeSource };
+'use strict';
+
+const { readConfig, writeConfig, getConfigPath } = require('../config');
+
+/** wyvrnpm configure list */
+function list() {
+  const config = readConfig();
+
+  console.log(`Config: ${getConfigPath()}\n`);
+
+  printSection('Install Sources', config.installSources);
+  console.log('');
+  printSection('Publish Sources', config.publishSources);
+}
+
+function printSection(title, sources) {
+  console.log(`${title}:`);
+  if (sources.length === 0) {
+    console.log('  (none)');
+    return;
+  }
+  for (const src of sources) {
+    const auth = authLabel(src);
+    console.log(`  ${src.name.padEnd(20)} ${src.url}${auth ? '  ' + auth : ''}`);
+  }
+}
+
+function authLabel(src) {
+  if (src.profile) return `[profile: ${src.profile}]`;
+  if (src.token)   return '[token: ***]';
+  return '';
+}
+
+/**
+ * wyvrnpm configure add-source --kind install|publish --name <name> --url <url>
+ *                               [--profile <profile>] [--token <token>]
+ */
+function addSource(argv) {
+  const { kind, name, url, profile, token } = argv;
+  const config = readConfig();
+  const key = kind === 'install' ? 'installSources' : 'publishSources';
+
+  const entry = { name, url };
+  if (profile) entry.profile = profile;
+  if (token)   entry.token   = token;
+
+  const idx = config[key].findIndex((s) => s.name === name);
+  if (idx !== -1) {
+    config[key][idx] = entry;
+    console.log(`[wyvrn] Updated ${kind} source "${name}"`);
+  } else {
+    config[key].push(entry);
+    console.log(`[wyvrn] Added ${kind} source "${name}"`);
+  }
+
+  writeConfig(config);
+  console.log(`[wyvrn] Saved to ${getConfigPath()}`);
+}
+
+/**
+ * wyvrnpm configure remove-source --kind install|publish --name <name>
+ */
+function removeSource(argv) {
+  const { kind, name } = argv;
+  const config = readConfig();
+  const key = kind === 'install' ? 'installSources' : 'publishSources';
+
+  const before = config[key].length;
+  config[key] = config[key].filter((s) => s.name !== name);
+
+  if (config[key].length === before) {
+    console.error(`[wyvrn] Error: No ${kind} source named "${name}"`);
+    process.exit(1);
+  }
+
+  writeConfig(config);
+  console.log(`[wyvrn] Removed ${kind} source "${name}"`);
+}
+
+module.exports = { list, addSource, removeSource };