wyvrnpm 1.2.0 → 1.3.2

package/src/commands/link.js

@@ -0,0 +1,316 @@
+'use strict';
+
+const fs = require('fs');
+const path = require('path');
+const { readConfig, writeConfig } = require('../config');
+const { readManifest } = require('../manifest');
+const { createLink, isLink, removeLink, getLinkTarget } = require('../link-utils');
+const { downloadDependencies } = require('../download');
+const { resolveDependencies } = require('../resolve');
+
+/**
+ * Normalizes a linked package entry to object form.
+ * Supports both legacy string format and new object format.
+ *
+ * @param {string|object} entry - Either a path string or {path, subdir} object.
+ * @returns {{path: string, subdir?: string}}
+ */
+function normalizeLinkedEntry(entry) {
+  if (typeof entry === 'string') {
+    return { path: entry };
+  }
+  return entry;
+}
+
+/**
+ * Gets the effective link target path (combining path + subdir).
+ *
+ * @param {{path: string, subdir?: string}} entry - Linked package entry.
+ * @returns {string} The full path to link to.
+ */
+function getEffectivePath(entry) {
+  if (entry.subdir) {
+    return path.join(entry.path, entry.subdir);
+  }
+  return entry.path;
+}
+
+/**
+ * Register the current directory's package globally for linking.
+ * Reads wyvrn.json to get the package name, stores {name: {path, subdir}} in config.
+ *
+ * @param {string} manifestPath - Path to wyvrn.json
+ * @param {string} [subdir] - Optional subdirectory within the package to link.
+ */
+function registerGlobal(manifestPath, subdir) {
+  const manifest = readManifest(manifestPath);
+  const packageName = manifest.name || manifest.Name;
+
+  if (!packageName) {
+    console.error('[wyvrn] Error: wyvrn.json must have a "name" field');
+    process.exit(1);
+  }
+
+  const packagePath = path.dirname(path.resolve(manifestPath));
+  const config = readConfig();
+  config.linkedPackages = config.linkedPackages || {};
+
+  const entry = { path: packagePath };
+  if (subdir) {
+    entry.subdir = subdir;
+  }
+  config.linkedPackages[packageName] = entry;
+  writeConfig(config);
+
+  const effectivePath = getEffectivePath(entry);
+  console.log(`[wyvrn] Registered "${packageName}" → ${effectivePath}`);
+}
+
+/**
+ * Link a package into the current project's wyvrn_internal directory.
+ *
+ * @param {string} name - Package name to link.
+ * @param {string} sourcePath - Source directory path (absolute or relative).
+ * @param {string} rootDir - Project root directory.
+ */
+function linkToProject(name, sourcePath, rootDir) {
+  const absoluteSource = path.resolve(sourcePath);
+
+  if (!fs.existsSync(absoluteSource)) {
+    console.error(`[wyvrn] Error: source path does not exist: ${absoluteSource}`);
+    process.exit(1);
+  }
+
+  const razerDir = path.join(rootDir, 'wyvrn_internal');
+  const linkPath = path.join(razerDir, name);
+
+  // Create the link
+  createLink(absoluteSource, linkPath);
+
+  // Write a .wyvrn-version file to indicate it's linked
+  const versionFile = path.join(linkPath, '.wyvrn-version');
+  fs.writeFileSync(versionFile, 'linked', 'utf8');
+
+  // Update the lock file to record the link
+  const lockPath = path.join(rootDir, 'wyvrn.lock');
+  let lockData = { packages: {} };
+  if (fs.existsSync(lockPath)) {
+    try {
+      lockData = JSON.parse(fs.readFileSync(lockPath, 'utf8'));
+    } catch {
+      // Use default if parsing fails
+    }
+  }
+  lockData.packages = lockData.packages || {};
+  lockData.packages[name] = `linked:${absoluteSource}`;
+  lockData.generatedAt = new Date().toISOString();
+  fs.writeFileSync(lockPath, JSON.stringify(lockData, null, 2) + '\n', 'utf8');
+
+  console.log(`[wyvrn] Linked: ${name} → ${absoluteSource}`);
+}
+
+/**
+ * Unlink a package from the current project.
+ *
+ * @param {string} name - Package name to unlink.
+ * @param {string} rootDir - Project root directory.
+ * @param {boolean} restore - Whether to re-download from registry.
+ * @param {object} argv - Original argv for re-download options.
+ */
+async function unlinkFromProject(name, rootDir, restore, argv) {
+  const razerDir = path.join(rootDir, 'wyvrn_internal');
+  const linkPath = path.join(razerDir, name);
+
+  if (!fs.existsSync(linkPath)) {
+    console.error(`[wyvrn] Error: package "${name}" is not installed`);
+    process.exit(1);
+  }
+
+  if (!isLink(linkPath)) {
+    console.error(`[wyvrn] Error: package "${name}" is not a linked package`);
+    process.exit(1);
+  }
+
+  // Remove the symlink
+  removeLink(linkPath);
+  console.log(`[wyvrn] Unlinked: ${name}`);
+
+  // Update the lock file
+  const lockPath = path.join(rootDir, 'wyvrn.lock');
+  if (fs.existsSync(lockPath)) {
+    try {
+      const lockData = JSON.parse(fs.readFileSync(lockPath, 'utf8'));
+      if (lockData.packages && lockData.packages[name]) {
+        delete lockData.packages[name];
+        lockData.generatedAt = new Date().toISOString();
+        fs.writeFileSync(lockPath, JSON.stringify(lockData, null, 2) + '\n', 'utf8');
+      }
+    } catch {
+      // Ignore lock file errors
+    }
+  }
+
+  // Re-download from registry if requested
+  if (restore) {
+    const manifestPath = path.resolve(argv.manifest);
+    const manifest = readManifest(manifestPath);
+
+    const rawDeps = manifest.dependencies || manifest.Dependencies || {};
+    const deps = Array.isArray(rawDeps)
+      ? Object.fromEntries(rawDeps.map((d) => [d.Name ?? d.name, d.Version ?? d.version]))
+      : rawDeps;
+
+    if (!deps[name]) {
+      console.warn(`[wyvrn] Warning: "${name}" is not in manifest dependencies, cannot restore`);
+      return;
+    }
+
+    // Get package sources
+    let packageSources;
+    if (argv.source && argv.source.length > 0) {
+      packageSources = argv.source;
+    } else {
+      const config = readConfig();
+      packageSources = config.installSources.map((s) => s.url);
+    }
+
+    if (packageSources.length === 0) {
+      console.warn('[wyvrn] Warning: no sources configured, cannot restore package');
+      return;
+    }
+
+    // Resolve just this one dependency
+    const resolvedDeps = await resolveDependencies(
+      { [name]: deps[name] },
+      packageSources,
+      argv.platform || 'win_x64',
+      fetch,
+      new Map(),
+    );
+
+    // Download it
+    await downloadDependencies(
+      resolvedDeps,
+      packageSources,
+      argv.platform || 'win_x64',
+      razerDir,
+      fetch,
+      argv.timeout || 300,
+    );
+
+    // Update lock file with restored version
+    if (fs.existsSync(lockPath)) {
+      try {
+        const lockData = JSON.parse(fs.readFileSync(lockPath, 'utf8'));
+        for (const [depName, version] of resolvedDeps) {
+          lockData.packages[depName] = version;
+        }
+        lockData.generatedAt = new Date().toISOString();
+        fs.writeFileSync(lockPath, JSON.stringify(lockData, null, 2) + '\n', 'utf8');
+      } catch {
+        // Ignore lock file errors
+      }
+    }
+  }
+}
+
+/**
+ * List all globally registered packages.
+ */
+function listLinked() {
+  const config = readConfig();
+  const linked = config.linkedPackages || {};
+  const entries = Object.entries(linked);
+
+  if (entries.length === 0) {
+    console.log('[wyvrn] No globally registered packages');
+    return;
+  }
+
+  console.log('[wyvrn] Globally registered packages:');
+  for (const [name, rawEntry] of entries) {
+    const entry = normalizeLinkedEntry(rawEntry);
+    const effectivePath = getEffectivePath(entry);
+    const exists = fs.existsSync(effectivePath);
+    const status = exists ? '' : ' (path not found)';
+    const subdirInfo = entry.subdir ? ` [subdir: ${entry.subdir}]` : '';
+    console.log(`  ${name} → ${effectivePath}${subdirInfo}${status}`);
+  }
+}
+
+/**
+ * Main link command handler.
+ *
+ * @param {object} argv - Parsed yargs arguments.
+ */
+async function link(argv) {
+  const rootDir = path.resolve(argv.root);
+  const manifestPath = path.resolve(argv.manifest);
+
+  // wyvrnpm link --list
+  if (argv.list) {
+    listLinked();
+    return;
+  }
+
+  // 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}`);
+      process.exit(1);
+    }
+    registerGlobal(manifestPath, argv.subdir);
+    return;
+  }
+
+  // wyvrnpm link <name> <path> - direct path link
+  if (argv.name && argv.path) {
+    let targetPath = argv.path;
+    if (argv.subdir) {
+      targetPath = path.join(argv.path, argv.subdir);
+    }
+    linkToProject(argv.name, targetPath, rootDir);
+    return;
+  }
+
+  // wyvrnpm link <name> - link from global registry
+  const config = readConfig();
+  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>`);
+    process.exit(1);
+  }
+
+  const entry = normalizeLinkedEntry(linked[argv.name]);
+  // Command-line --subdir overrides the registered subdir
+  let effectivePath;
+  if (argv.subdir) {
+    effectivePath = path.join(entry.path, argv.subdir);
+  } else {
+    effectivePath = getEffectivePath(entry);
+  }
+
+  linkToProject(argv.name, effectivePath, rootDir);
+}
+
+/**
+ * Unlink command handler.
+ *
+ * @param {object} argv - Parsed yargs arguments.
+ */
+async function unlink(argv) {
+  const rootDir = path.resolve(argv.root);
+  await unlinkFromProject(argv.name, rootDir, argv.restore, argv);
+}
+
+module.exports = {
+  link,
+  unlink,
+  listLinked,
+  registerGlobal,
+  linkToProject,
+  unlinkFromProject,
+};

package/src/commands/publish.js

@@ -1,167 +1,180 @@
-'use strict';
-
-const fs = require('fs');
-const path = require('path');
-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.
- */
-function loadIgnorePatterns(ignoreFile) {
-  if (!fs.existsSync(ignoreFile)) return [];
-  return fs
-    .readFileSync(ignoreFile, 'utf8')
-    .split(/\r?\n/)
-    .map((l) => l.trim())
-    .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
-  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, '/');
-
-    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);
-    } else {
-      const zipDir = path.dirname(relPath).replace(/\\/g, '/');
-      zip.addLocalFile(fullPath, zipDir === '.' ? '' : zipDir);
-    }
-  }
-}
-
-async function publish(argv) {
-  let { source, profile, platform, path: publishPath, token, manifest: manifestArg } = argv;
-
-  // 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;
-    }
-  } 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: ' +
-          'wyvrnpm configure add-source --kind publish ...)',
-      );
-      process.exit(1);
-    }
-    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;
-  }
-
-  // Resolve and read the manifest
-  const manifestPath = path.resolve(manifestArg || './wyvrn.json');
-  const manifest = await readManifest(manifestPath);
-  if (!manifest) {
-    console.error(`[wyvrn] Error: Could not read manifest at ${manifestPath}`);
-    process.exit(1);
-  }
-
-  const { name, version } = manifest;
-  if (!name || !version) {
-    console.error('[wyvrn] Error: Manifest must have "name" and "version" fields');
-    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
-  let provider;
-  try {
-    provider = getProvider(source);
-  } catch (err) {
-    console.error(`[wyvrn] Error: ${err.message}`);
-    process.exit(1);
-  }
-
-  console.log(
-    `[wyvrn] Publishing ${name}@${version} (${targetPlatform}) via ${provider.constructor.providerName} provider`,
-  );
-
-  // Load .wyvrnignore patterns from the publish directory
-  const ignoreFile = path.join(srcDir, '.wyvrnignore');
-  const ignorePatterns = loadIgnorePatterns(ignoreFile);
-  const ignoreRe = ignorePatterns.map(patternToRegex);
-  if (ignorePatterns.length > 0) {
-    console.log(`[wyvrn] Loaded ${ignorePatterns.length} pattern(s) from .wyvrnignore`);
-  }
-
-  // Build a temporary zip of the publish directory
-  const tmpZipPath = path.join(os.tmpdir(), `wyvrnpm-${name}-${version}-${Date.now()}.zip`);
-  try {
-    console.log(`[wyvrn] Zipping ${srcDir} ...`);
-    const zip = new AdmZip();
-    addFolderFiltered(zip, srcDir, srcDir, ignoreRe);
-    zip.writeZip(tmpZipPath);
-
-    await provider.publish(
-      { manifest: manifestPath, zip: tmpZipPath },
-      { source, platform: targetPlatform, name, version, profile, token },
-    );
-
-    console.log(`[wyvrn] Successfully published ${name}@${version} to ${source}`);
-  } finally {
-    if (fs.existsSync(tmpZipPath)) fs.unlinkSync(tmpZipPath);
-  }
-}
-
-module.exports = publish;
+'use strict';
+
+const fs = require('fs');
+const path = require('path');
+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.
+ */
+function loadIgnorePatterns(ignoreFile) {
+  if (!fs.existsSync(ignoreFile)) return [];
+  return fs
+    .readFileSync(ignoreFile, 'utf8')
+    .split(/\r?\n/)
+    .map((l) => l.trim())
+    .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
+  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, '/');
+
+    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);
+    } else {
+      const zipDir = path.dirname(relPath).replace(/\\/g, '/');
+      zip.addLocalFile(fullPath, zipDir === '.' ? '' : zipDir);
+    }
+  }
+}
+
+async function publish(argv) {
+  let { source, profile, platform, path: publishPath, token, manifest: manifestArg, force } = argv;
+
+  // 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;
+    }
+  } 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: ' +
+          'wyvrnpm configure add-source --kind publish ...)',
+      );
+      process.exit(1);
+    }
+    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;
+  }
+
+  // Resolve and read the manifest
+  const manifestPath = path.resolve(manifestArg || './wyvrn.json');
+  const manifest = await readManifest(manifestPath);
+  if (!manifest) {
+    console.error(`[wyvrn] Error: Could not read manifest at ${manifestPath}`);
+    process.exit(1);
+  }
+
+  const { name, version } = manifest;
+  if (!name || !version) {
+    console.error('[wyvrn] Error: Manifest must have "name" and "version" fields');
+    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
+  let provider;
+  try {
+    provider = getProvider(source);
+  } catch (err) {
+    console.error(`[wyvrn] Error: ${err.message}`);
+    process.exit(1);
+  }
+
+  console.log(
+    `[wyvrn] Publishing ${name}@${version} (${targetPlatform}) via ${provider.constructor.providerName} provider`,
+  );
+
+  // Prevent overwriting an already-published version unless --force is passed
+  const alreadyExists = await provider.exists({ source, platform: targetPlatform, name, version, profile, token });
+  if (alreadyExists) {
+    if (force) {
+      console.warn(`[wyvrn] Warning: ${name}@${version} already exists — overwriting (--force)`);
+    } else {
+      console.error(
+        `[wyvrn] Error: ${name}@${version} already exists. Bump the version or use --force to overwrite.`,
+      );
+      process.exit(1);
+    }
+  }
+
+  // Load .wyvrnignore patterns from the publish directory
+  const ignoreFile = path.join(srcDir, '.wyvrnignore');
+  const ignorePatterns = loadIgnorePatterns(ignoreFile);
+  const ignoreRe = ignorePatterns.map(patternToRegex);
+  if (ignorePatterns.length > 0) {
+    console.log(`[wyvrn] Loaded ${ignorePatterns.length} pattern(s) from .wyvrnignore`);
+  }
+
+  // Build a temporary zip of the publish directory
+  const tmpZipPath = path.join(os.tmpdir(), `wyvrnpm-${name}-${version}-${Date.now()}.zip`);
+  try {
+    console.log(`[wyvrn] Zipping ${srcDir} ...`);
+    const zip = new AdmZip();
+    addFolderFiltered(zip, srcDir, srcDir, ignoreRe);
+    zip.writeZip(tmpZipPath);
+
+    await provider.publish(
+      { manifest: manifestPath, zip: tmpZipPath },
+      { source, platform: targetPlatform, name, version, profile, token },
+    );
+
+    console.log(`[wyvrn] Successfully published ${name}@${version} to ${source}`);
+  } finally {
+    if (fs.existsSync(tmpZipPath)) fs.unlinkSync(tmpZipPath);
+  }
+}
+
+module.exports = publish;