@tapestry-mud/cli 0.5.0 → 0.6.0

package/bin/tapestry.js

@@ -27,7 +27,7 @@ const { stopCmd } = require('../src/commands/stop');
 const { changePassword } = require('../src/commands/change-password');
 const { unpublish } = require('../src/commands/unpublish');
 const { distTagSet, distTagList } = require('../src/commands/dist-tag');
-const { presetSet } = require('../src/commands/preset');
+const { presetSet, presetDelete } = require('../src/commands/preset');
 
 const program = new Command();
 
@@ -169,6 +169,18 @@ presetCmd
     }
   });
 
+presetCmd
+  .command('delete <name>')
+  .description('Delete a preset from the registry')
+  .action(async (name) => {
+    try {
+      await presetDelete(name);
+    } catch (e) {
+      console.error(`error: ${e.message}`);
+      process.exit(1);
+    }
+  });
+
 program
   .command('install [package]')
   .description('Install a package or all dependencies from tapestry.yaml')
@@ -342,12 +354,13 @@ program
   .command('link [path]')
   .description('Attach a local pack working copy to this project (use --list to show links)')
   .option('--list', 'List active links instead of creating one')
+  .option('--skip-install', 'Skip dependency resolution; warn about missing deps instead')
   .action(async (linkPath, options) => {
     try {
       if (options.list || !linkPath) {
         await linkList();
       } else {
-        await link(linkPath);
+        await link(linkPath, { noInstall: !!options.skipInstall });
       }
     } catch (e) {
       console.error(`error: ${e.message}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tapestry-mud/cli",
-  "version": "0.5.0",
+  "version": "0.6.0",
   "description": "CLI for the Tapestry MUD engine",
   "repository": {
     "type": "git",

package/src/commands/install.js

@@ -129,4 +129,4 @@ async function install(packageArg, { cwd = process.cwd(), registryUrl = DEFAULT_
   console.log('Done.');
 }
 
-module.exports = { install };
+module.exports = { install, installResolved, packInstallPath };

package/src/commands/link.js

@@ -4,9 +4,14 @@ const fs = require('fs');
 const path = require('path');
 const {
   readLinks, addLink, removeLink, readPackManifest,
-  removeMaterializedLink, checkMissingDeps,
+  removeMaterializedLink, checkMissingDeps, partitionDeps,
 } = require('../lib/links');
 const { addPackageToBoot, removePackageFromBoot } = require('../lib/boot');
+const { resolve } = require('../lib/semver-resolver');
+const { installResolved, packInstallPath } = require('./install');
+const { readLock, writeLock } = require('../lib/lock-file');
+const { loadToken } = require('../lib/auth');
+const { DEFAULT_REGISTRY } = require('../lib/registry-client');
 
 function requireProject(cwd) {
   if (!fs.existsSync(path.join(cwd, 'tapestry.yaml'))) {
@@ -25,7 +30,7 @@ function ensureGitignore(cwd) {
   }
 }
 
-async function link(targetPath, { cwd = process.cwd() } = {}) {
+async function link(targetPath, { cwd = process.cwd(), noInstall = false, registryUrl = DEFAULT_REGISTRY } = {}) {
   requireProject(cwd);
   const absPath = path.resolve(cwd, targetPath);
   if (!fs.existsSync(absPath)) {
@@ -41,14 +46,66 @@ async function link(targetPath, { cwd = process.cwd() } = {}) {
   addPackageToBoot(cwd, name, manifest);
   ensureGitignore(cwd);
 
-  console.log(`linked ${name} -> ${absPath}`);
-
+  // Warn if the pack is marked inactive — fires on all paths
   if (manifest.active === false) {
     console.warn(`  warning: ${name} is marked active: false; it will not load until activated`);
   }
-  for (const dep of checkMissingDeps(cwd, manifest)) {
-    const range = manifest.dependencies[dep];
-    console.warn(`  warning: missing dependency ${dep} (${range}) -- run: tapestry install ${dep}`);
+
+  if (noInstall) {
+    console.log(`linked ${name} -> ${absPath}`);
+    for (const dep of checkMissingDeps(cwd, manifest)) {
+      const range = manifest.dependencies[dep];
+      console.warn(`  warning: missing dependency ${dep} (${range}) -- run: tapestry install ${dep}`);
+    }
+    return;
+  }
+
+  const { needsInstall } = partitionDeps(cwd, manifest);
+
+  if (Object.keys(needsInstall).length === 0) {
+    console.log(`linked ${name} -> ${absPath}`);
+    return;
+  }
+
+  let toRollback = [];
+  try {
+    const token = loadToken();
+    const resolved = await resolve(needsInstall, registryUrl, token);
+
+    // New installs: not on disk yet. Upgrade targets: in needsInstall AND on disk
+    // (installResolved deletes the old dir before downloading; track so rollback removes the boot entry)
+    toRollback = [
+      ...Object.keys(resolved).filter((n) => !fs.existsSync(packInstallPath(cwd, n))),
+      ...Object.keys(needsInstall).filter((n) => fs.existsSync(packInstallPath(cwd, n))),
+    ];
+
+    await installResolved(cwd, resolved, token);
+
+    const existingLock = readLock(cwd);
+    const mergedResolved = Object.assign({}, (existingLock && existingLock.resolved) || {}, resolved);
+    writeLock(cwd, {
+      lockfile_version: 1,
+      ...(existingLock && existingLock.deps_hash ? { deps_hash: existingLock.deps_hash } : {}),
+      resolved: mergedResolved,
+    });
+
+    console.log(`linked ${name} -> ${absPath}`);
+    for (const [pkgName, info] of Object.entries(resolved)) {
+      console.log(`  installed ${pkgName}@${info.version} (dependency of ${name})`);
+    }
+  } catch (err) {
+    removeLink(cwd, name);
+    removePackageFromBoot(cwd, name);
+    for (const pkgName of toRollback) {
+      const installPath = packInstallPath(cwd, pkgName);
+      if (fs.existsSync(installPath)) {
+        fs.rmSync(installPath, { recursive: true });
+      }
+      removePackageFromBoot(cwd, pkgName);
+    }
+    throw new Error(
+      `Cannot resolve dependencies for ${name} — ${err.message}. Use --skip-install to link without dependency resolution.`
+    );
   }
 }
 

package/src/commands/preset.js

@@ -1,7 +1,7 @@
 'use strict';
 
 const { requireToken } = require('../lib/auth');
-const { patchPreset, DEFAULT_REGISTRY } = require('../lib/registry-client');
+const { patchPreset, deletePreset, DEFAULT_REGISTRY } = require('../lib/registry-client');
 
 async function presetSet(name, version, engineChannel, packs, { registryUrl = DEFAULT_REGISTRY } = {}) {
   const token = requireToken();
@@ -10,4 +10,11 @@ async function presetSet(name, version, engineChannel, packs, { registryUrl = DE
   console.log('Done.');
 }
 
-module.exports = { presetSet };
+async function presetDelete(name, { registryUrl = DEFAULT_REGISTRY } = {}) {
+  const token = requireToken();
+  await deletePreset(name, token, registryUrl);
+  console.log(`  Deleted preset '${name}'`);
+  console.log('Done.');
+}
+
+module.exports = { presetSet, presetDelete };

package/src/lib/links.js

@@ -2,6 +2,7 @@
 
 const path = require('path');
 const fs = require('fs');
+const semver = require('semver');
 const { readYaml, writeYaml } = require('../util/yaml');
 const { PACK_MANIFEST } = require('./manifest');
 
@@ -113,8 +114,34 @@ function checkMissingDeps(cwd, manifest) {
   return missing;
 }
 
+function partitionDeps(cwd, manifest) {
+  const deps = (manifest && manifest.dependencies) || {};
+  const needsInstall = {};
+  if (Object.keys(deps).length === 0) {
+    return { needsInstall };
+  }
+  const { links } = readLinks(cwd);
+  for (const [depName, range] of Object.entries(deps)) {
+    if (depName in links) {
+      continue;
+    }
+    const installPath = packLinkPath(cwd, depName);
+    if (fs.existsSync(installPath)) {
+      const manifestPath = path.join(installPath, PACK_MANIFEST);
+      if (fs.existsSync(manifestPath)) {
+        const installed = readYaml(manifestPath) || {};
+        if (installed.version && semver.satisfies(installed.version, range)) {
+          continue;
+        }
+      }
+    }
+    needsInstall[depName] = range;
+  }
+  return { needsInstall };
+}
+
 module.exports = {
   LINKS_FILE, readLinks, writeLinks, addLink, removeLink,
   readPackManifest, packLinkPath, containerPackTarget, dockerLinkMounts,
-  materializeLinks, removeMaterializedLink, checkMissingDeps,
+  materializeLinks, removeMaterializedLink, checkMissingDeps, partitionDeps,
 };

package/src/lib/registry-client.js

@@ -116,7 +116,19 @@ async function patchPreset(name, payload, token, registryUrl = DEFAULT_REGISTRY)
   return res.json();
 }
 
+async function deletePreset(name, token, registryUrl = DEFAULT_REGISTRY) {
+  const url = `${registryUrl.replace(/\/$/, '')}/v1/admin/presets/${name}`;
+  const res = await fetch(url, {
+    method: 'DELETE',
+    headers: {
+      Authorization: `Bearer ${token}`,
+    },
+  });
+  await throwIfError(res, `Failed to delete preset '${name}'`);
+  return res.json();
+}
+
 module.exports = {
   fetchPackageMetadata, fetchTarball, throwIfError, DEFAULT_REGISTRY,
-  fetchPreset, fetchPresetList, patchDistTag, listDistTags, patchPreset,
+  fetchPreset, fetchPresetList, patchDistTag, listDistTags, patchPreset, deletePreset,
 };