@xnoxs/flux-lang 3.5.0 → 3.5.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xnoxs/flux-lang",
-  "version": "3.5.0",
+  "version": "3.5.1",
   "description": "Flux — A modern language that transpiles to JavaScript. Python-clean syntax, TypeScript-level safety, Rust-inspired pattern matching.",
   "main": "dist/flux.cjs.js",
   "module": "dist/flux.esm.js",

package/src/self/pkg.flux

@@ -36,33 +36,11 @@ val C = {
   gray:   "\u001b[90m",
 }
 
-val hasColor = process.env.COLORTERM or process.env.FORCE_COLOR or (process.stdout.isTTY and process.env.TERM != "dumb")
-val noColor  = process.env.NO_COLOR or not hasColor
-
-fn clr(c, s): return noColor ? s : c + s + C.reset
+fn clr(c, s): return c + s + C.reset
 fn ok(msg):   console.log(clr(C.green, "✓ ") + msg)
 fn err(msg):  console.error(clr(C.red, "✗ ") + msg)
 fn info(msg): console.log(clr(C.cyan, "  ") + msg)
 
-// ── Spinner animation ─────────────────────────────────────────
-fn createSpinner(msg):
-  if noColor:
-    process.stdout.write("  " + msg + " ...\n")
-    fn _stop(ok_, done):
-      process.stdout.write("  " + (ok_ ? "✓" : "✗") + " " + done + "\n")
-    return { stop: _stop }
-  val frames = ["⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏"]
-  var fi = 0
-  fn tick():
-    process.stdout.write("\r  " + clr(C.cyan, frames[fi % frames.length]) + " " + msg + "   ")
-    fi = fi + 1
-  val timer = setInterval(tick, 80)
-  fn stop(ok_, done):
-    clearInterval(timer)
-    val icon = ok_ ? clr(C.green, "✓") : clr(C.red, "✗")
-    process.stdout.write("\r  " + icon + " " + done + "                              \n")
-  return { stop: stop }
-
 // ── HTTP fetch (Node built-in, no dependencies) ───────────────
 async fn fetchJson(url):
   val mod = url.startsWith("https") ? Https : Http
@@ -122,12 +100,10 @@ export async fn cmdAdd(specs, opts):
   val isDev = opts?.dev ?? false
   val cwd   = process.cwd()
   val pkg   = ensureFluxJson(cwd)
-  var addedCount = 0
 
-  console.log()
   for spec in specs:
     val { name, version } = parsePackageSpec(spec)
-    val spinner = createSpinner(clr(C.bold, name) + clr(C.gray, "@" + version))
+    console.log(clr(C.cyan, "\n  Adding ") + clr(C.bold, name) + clr(C.gray, "@" + version) + " ...")
 
     try:
       val info_ = await fetchJson(REGISTRY_URL + "/" + name)
@@ -135,25 +111,25 @@ export async fn cmdAdd(specs, opts):
 
       val versionInfo = info_.versions?.[resolvedVersion]
       if not versionInfo:
-        spinner.stop(false, clr(C.bold, name) + clr(C.gray, "@" + resolvedVersion) + " — version not found")
+        err("Version " + resolvedVersion + " not found for " + name)
         continue
 
       val depKey = isDev ? "devDependencies" : "dependencies"
       if not pkg[depKey]: pkg[depKey] = {}
       pkg[depKey][name] = "^" + resolvedVersion
+
       saveFluxJson(pkg, cwd)
 
-      val shortDesc = versionInfo.description ? clr(C.gray, " — " + versionInfo.description.slice(0, 55)) : ""
-      spinner.stop(true, clr(C.bold, name) + clr(C.green, "@" + resolvedVersion) + shortDesc)
-      addedCount = addedCount + 1
+      val desc = versionInfo.description ? clr(C.gray, " — " + versionInfo.description) : ""
+      ok(name + clr(C.green, "@" + resolvedVersion) + desc)
+      info("Added to " + (isDev ? "devDependencies" : "dependencies"))
 
     catch(e):
-      spinner.stop(false, clr(C.bold, name) + " — " + e.message)
+      err("Failed to fetch " + name + ": " + e.message)
 
   console.log()
-  if addedCount > 0:
-    console.log("  " + clr(C.gray, "Run ") + clr(C.yellow, "flux install") + clr(C.gray, " to install packages"))
-    console.log()
+  console.log(clr(C.gray, "  Run ") + clr(C.yellow, "flux install") + clr(C.gray, " to install packages"))
+  console.log()
 
 // ── flux remove <pkg> ─────────────────────────────────────────
 export fn cmdRemove(names, opts):
@@ -193,19 +169,15 @@ export async fn cmdInstall(opts):
   val names   = Object.keys(all)
 
   if names.length == 0:
-    console.log()
     info("No dependencies found in flux.json")
-    console.log()
     return
 
-  console.log()
-  console.log("  " + clr(C.bold, pkg.name ?? "project") + clr(C.gray, " — " + names.length + " package(s)"))
-  console.log()
+  console.log(clr(C.cyan, "\n  Installing ") + names.length + " package(s) into flux_modules/...\n")
+
   for name in names:
     val spec = all[name]
-    val isDev_ = Object.prototype.hasOwnProperty.call(devDeps, name)
-    val tag = isDev_ ? clr(C.gray, " dev") : ""
-    console.log("  " + clr(C.gray, "○") + " " + clr(isDev_ ? C.blue : C.green, name) + clr(C.gray, "@" + spec) + tag)
+    console.log(clr(C.gray, "  ○ ") + name + clr(C.gray, "@" + spec))
+
   console.log()
 
   // Ensure flux_modules/ exists with a minimal package.json
@@ -219,26 +191,27 @@ export async fn cmdInstall(opts):
 
   val prodNames = Object.keys(deps)
   val devNames  = Object.keys(devDeps)
-  val spinner   = createSpinner("Installing packages into flux_modules/")
 
   try:
     if prodNames.length > 0:
       val prodPkgs   = prodNames.map(n -> n + "@" + (deps[n] ?? "latest")).join(" ")
       val installCmd = "npm install --prefix " + fluxModDir + " " + prodPkgs
-      execSync(installCmd, { cwd: cwd, stdio: "pipe" })
+      info("Running: " + installCmd)
+      execSync(installCmd, { cwd: cwd, stdio: "inherit" })
 
     if devNames.length > 0:
       val devPkgs = devNames.map(n -> n + "@" + (devDeps[n] ?? "latest")).join(" ")
       val devCmd  = "npm install --prefix " + fluxModDir + " --save-dev " + devPkgs
-      execSync(devCmd, { cwd: cwd, stdio: "pipe" })
+      info("Running: " + devCmd)
+      execSync(devCmd, { cwd: cwd, stdio: "inherit" })
 
-    spinner.stop(true, names.length + " package(s) installed into " + clr(C.gray, "flux_modules/"))
     console.log()
-    console.log("  " + clr(C.gray, "Packages resolve automatically when using: ") + clr(C.yellow, "flux run") + clr(C.gray, ", ") + clr(C.yellow, "flux bundle"))
+    ok(names.length + " package(s) installed into flux_modules/node_modules/")
+    info("Packages resolve automatically when using: flux run, flux bundle")
   catch(e):
-    spinner.stop(false, "Install failed: " + e.message)
     console.log()
-    console.log("  " + clr(C.gray, "Try: ") + clr(C.yellow, "npm install --prefix ./flux_modules <package>"))
+    err("Install failed: " + e.message)
+    info("Try manually: npm install --prefix ./flux_modules <package>")
 
   console.log()
 
@@ -276,138 +249,58 @@ export fn cmdList(opts):
 
 // ── flux search <query> ───────────────────────────────────────
 export async fn cmdSearch(query, opts):
-  console.log()
-  val spinner = createSpinner("Searching for " + clr(C.bold, '"' + query + '"'))
+  console.log(clr(C.cyan, "\n  Searching for ") + clr(C.bold, '"' + query + '"') + " ...\n")
   try:
-    val url     = REGISTRY_URL + "/-/v1/search?text=" + encodeURIComponent(query) + "&size=10"
+    val url     = REGISTRY_URL + "/-/v1/search?text=" + encodeURIComponent(query + " keywords:flux") + "&size=10"
     val results = await fetchJson(url)
     val objects = results.objects ?? []
 
     if objects.length == 0:
-      spinner.stop(false, "No packages found for: " + query)
+      info("No packages found for: " + query)
       console.log()
       return
 
-    spinner.stop(true, "Found " + objects.length + " result(s) for " + clr(C.bold, '"' + query + '"'))
-    console.log()
-
     for obj in objects:
       val p = obj.package
       console.log("  " + clr(C.bold, p.name) + clr(C.gray, " v" + p.version))
       if p.description:
         console.log("  " + clr(C.gray, p.description))
-      if p.links?.npm:
-        console.log("  " + clr(C.blue, p.links.npm))
+      console.log("  " + clr(C.blue, p.links?.npm ?? ""))
       console.log()
 
   catch(e):
-    spinner.stop(false, "Search failed: " + e.message)
-    console.log()
+    err("Search failed: " + e.message)
 
 // ── flux info <pkg> ───────────────────────────────────────────
 export async fn cmdInfo(name, opts):
-  console.log()
-  val spinner = createSpinner("Fetching info for " + clr(C.bold, name))
+  console.log(clr(C.cyan, "\n  Fetching info for ") + clr(C.bold, name) + " ...\n")
   try:
     val info_ = await fetchJson(REGISTRY_URL + "/" + name)
     val latest = info_["dist-tags"]?.latest ?? "unknown"
     val ver    = info_.versions?.[latest] ?? {}
 
-    spinner.stop(true, clr(C.bold, name) + clr(C.green, "@" + latest))
+    console.log(clr(C.bold, "  " + name) + clr(C.gray, " v" + latest))
+    if ver.description: console.log("  " + ver.description)
     console.log()
-    if ver.description: console.log("  " + clr(C.gray, ver.description))
-    console.log()
-    console.log("  " + clr(C.gray, "license:") + " " + (ver.license ?? "unknown"))
-    console.log("  " + clr(C.gray, "author: ") + " " + (ver.author?.name ?? ver.author ?? "unknown"))
+    console.log(clr(C.gray, "  license: ") + (ver.license ?? "unknown"))
+    console.log(clr(C.gray, "  author:  ") + (ver.author?.name ?? ver.author ?? "unknown"))
 
     val homepage = ver.homepage ?? info_.homepage
-    if homepage: console.log("  " + clr(C.gray, "home:   ") + " " + clr(C.blue, homepage))
+    if homepage: console.log(clr(C.gray, "  home:    ") + clr(C.blue, homepage))
 
     val repo = ver.repository?.url ?? info_.repository?.url
-    if repo: console.log("  " + clr(C.gray, "repo:   ") + " " + clr(C.blue, repo.replace("git+", "").replace(".git", "")))
+    if repo: console.log(clr(C.gray, "  repo:    ") + clr(C.blue, repo.replace("git+", "").replace(".git", "")))
 
     val keywords = ver.keywords ?? []
     if keywords.length > 0:
-      console.log("  " + clr(C.gray, "tags:   ") + " " + keywords.slice(0, 8).join(", "))
+      console.log(clr(C.gray, "  tags:    ") + keywords.slice(0, 8).join(", "))
 
     console.log()
-    console.log("  " + clr(C.gray, "Install: ") + clr(C.yellow, "flux add " + name))
+    console.log(clr(C.gray, "  Install: ") + clr(C.yellow, "flux add " + name))
     console.log()
 
   catch(e):
-    spinner.stop(false, "Could not fetch info for " + name + ": " + e.message)
-    console.log()
-
-// ── flux upgrade [--check] ────────────────────────────────────
-export async fn cmdUpgrade(opts):
-  val isCheck = opts?.check ?? false
-  val cwd     = process.cwd()
-  val pkg     = ensureFluxJson(cwd)
-
-  val deps    = pkg.dependencies ?? {}
-  val devDeps = pkg.devDependencies ?? {}
-  val allKeys = [...Object.keys(deps), ...Object.keys(devDeps)]
-
-  if allKeys.length == 0:
-    console.log()
-    info("No dependencies to upgrade")
-    console.log()
-    return
-
-  console.log()
-  var updated = 0
-
-  for name in Object.keys(deps):
-    val spinner = createSpinner(clr(C.green, name))
-    try:
-      val info_   = await fetchJson(REGISTRY_URL + "/" + name)
-      val latest  = info_["dist-tags"]?.latest ?? null
-      if not latest:
-        spinner.stop(false, clr(C.green, name) + " — could not resolve latest version")
-        continue
-      val current = deps[name].replace("^", "").replace("~", "")
-      if latest == current:
-        spinner.stop(true, clr(C.green, name) + clr(C.gray, "@" + current + " — up to date"))
-      else:
-        spinner.stop(true, clr(C.green, name) + clr(C.gray, "@" + current) + " → " + clr(C.yellow, latest))
-        if not isCheck:
-          pkg.dependencies[name] = "^" + latest
-          updated = updated + 1
-    catch(e):
-      spinner.stop(false, clr(C.green, name) + " — " + e.message)
-
-  for name in Object.keys(devDeps):
-    val spinner = createSpinner(clr(C.blue, name) + clr(C.gray, " (dev)"))
-    try:
-      val info_   = await fetchJson(REGISTRY_URL + "/" + name)
-      val latest  = info_["dist-tags"]?.latest ?? null
-      if not latest:
-        spinner.stop(false, clr(C.blue, name) + " — could not resolve latest version")
-        continue
-      val current = devDeps[name].replace("^", "").replace("~", "")
-      if latest == current:
-        spinner.stop(true, clr(C.blue, name) + clr(C.gray, "@" + current + " — up to date"))
-      else:
-        spinner.stop(true, clr(C.blue, name) + clr(C.gray, "@" + current) + " → " + clr(C.yellow, latest) + clr(C.gray, " (dev)"))
-        if not isCheck:
-          pkg.devDependencies[name] = "^" + latest
-          updated = updated + 1
-    catch(e):
-      spinner.stop(false, clr(C.blue, name) + " — " + e.message)
-
-  console.log()
-
-  if isCheck:
-    ok("Check complete — run " + clr(C.yellow, "flux upgrade") + " to apply upgrades")
-  else:
-    if updated > 0:
-      saveFluxJson(pkg, cwd)
-      ok(updated + " package(s) updated in flux.json")
-      console.log("  " + clr(C.gray, "Run ") + clr(C.yellow, "flux install") + clr(C.gray, " to install upgraded packages"))
-    else:
-      ok("All packages are already up to date")
-
-  console.log()
+    err("Could not fetch info for " + name + ": " + e.message)
 
 // ── flux publish ──────────────────────────────────────────────
 export fn cmdPublish(opts):

package/src/self/pkg.js

@@ -21,11 +21,9 @@ const { readPackage, writeConfig, loadConfig } = require("./config");
 const REGISTRY_URL = "https://registry.npmjs.org";
 const FLUX_PKG_DIR = "flux_modules";
 const PKG_FILE = "flux.json";
-const C = { reset: "\u001b[0m", bold: "\u001b[1m", dim: "\u001b[2m", red: "\u001b[31m", green: "\u001b[32m", yellow: "\u001b[33m", blue: "\u001b[34m", cyan: "\u001b[36m", gray: "\u001b[90m" };
-const hasColor = ((process.env.COLORTERM || process.env.FORCE_COLOR) || (process.stdout.isTTY && (process.env.TERM != "dumb")));
-const noColor = (process.env.NO_COLOR || !hasColor);
+const C = { reset: "\\u001b[0m", bold: "\\u001b[1m", dim: "\\u001b[2m", red: "\\u001b[31m", green: "\\u001b[32m", yellow: "\\u001b[33m", blue: "\\u001b[34m", cyan: "\\u001b[36m", gray: "\\u001b[90m" };
 function clr(c, s) {
-  return (noColor ? s : ((c + s) + C.reset));
+  return ((c + s) + C.reset);
 }
 function ok(msg) {
   console.log((clr(C.green, "✓ ") + msg));
@@ -36,28 +34,6 @@ function err(msg) {
 function info(msg) {
   console.log((clr(C.cyan, "  ") + msg));
 }
-function createSpinner(msg) {
-  if (noColor) {
-    process.stdout.write((("  " + msg) + " ...\n"));
-    function _stop(ok_, done) {
-      process.stdout.write((((("  " + (ok_ ? "✓" : "✗")) + " ") + done) + "\n"));
-    }
-    return { stop: _stop };
-  }
-  const frames = ["⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏"];
-  let fi = 0;
-  function tick() {
-    process.stdout.write((((("\r  " + clr(C.cyan, frames[(fi % frames.length)])) + " ") + msg) + "   "));
-    fi = (fi + 1);
-  }
-  const timer = setInterval(tick, 80);
-  function stop(ok_, done) {
-    clearInterval(timer);
-    const icon = (ok_ ? clr(C.green, "✓") : clr(C.red, "✗"));
-    process.stdout.write((((("\r  " + icon) + " ") + done) + "                              \n"));
-  }
-  return { stop };
-}
 async function fetchJson(url) {
   const mod = (url.startsWith("https") ? Https : Http);
   function doRequest(resolve, reject) {
@@ -107,17 +83,15 @@ async function cmdAdd(specs, opts) {
   const isDev = (opts?.dev ?? false);
   const cwd = process.cwd();
   const pkg = ensureFluxJson(cwd);
-  let addedCount = 0;
-  console.log();
   for (const spec of specs) {
     const { name, version } = parsePackageSpec(spec);
-    const spinner = createSpinner((clr(C.bold, name) + clr(C.gray, ("@" + version))));
+    console.log((((clr(C.cyan, "\n  Adding ") + clr(C.bold, name)) + clr(C.gray, ("@" + version))) + " ..."));
     try {
       const info_ = await fetchJson(((REGISTRY_URL + "/") + name));
       const resolvedVersion = ((version == "latest") ? (info_["dist-tags"]?.latest ?? "1.0.0") : version);
       const versionInfo = info_.versions?.[resolvedVersion];
       if (!versionInfo) {
-        spinner.stop(false, ((clr(C.bold, name) + clr(C.gray, ("@" + resolvedVersion))) + " — version not found"));
+        err(((("Version " + resolvedVersion) + " not found for ") + name));
         continue;
       }
       const depKey = (isDev ? "devDependencies" : "dependencies");
@@ -126,19 +100,17 @@ async function cmdAdd(specs, opts) {
       }
       pkg[depKey][name] = ("^" + resolvedVersion);
       saveFluxJson(pkg, cwd);
-      const shortDesc = (versionInfo.description ? clr(C.gray, (" — " + versionInfo.description.slice(0, 55))) : "");
-      spinner.stop(true, ((clr(C.bold, name) + clr(C.green, ("@" + resolvedVersion))) + shortDesc));
-      addedCount = (addedCount + 1);
+      const desc = (versionInfo.description ? clr(C.gray, (" — " + versionInfo.description)) : "");
+      ok(((name + clr(C.green, ("@" + resolvedVersion))) + desc));
+      info(("Added to " + (isDev ? "devDependencies" : "dependencies")));
     }
     catch (e) {
-      spinner.stop(false, ((clr(C.bold, name) + " — ") + e.message));
+      err(((("Failed to fetch " + name) + ": ") + e.message));
     }
   }
   console.log();
-  if ((addedCount > 0)) {
-    console.log(((("  " + clr(C.gray, "Run ")) + clr(C.yellow, "flux install")) + clr(C.gray, " to install packages")));
-    console.log();
-  }
+  console.log(((clr(C.gray, "  Run ") + clr(C.yellow, "flux install")) + clr(C.gray, " to install packages")));
+  console.log();
 }
 module.exports.cmdAdd = cmdAdd;
 function cmdRemove(names, opts) {
@@ -178,19 +150,13 @@ async function cmdInstall(opts) {
   const all = { ...deps, ...devDeps };
   const names = Object.keys(all);
   if ((names.length == 0)) {
-    console.log();
     info("No dependencies found in flux.json");
-    console.log();
     return;
   }
-  console.log();
-  console.log((("  " + clr(C.bold, (pkg.name ?? "project"))) + clr(C.gray, ((" — " + names.length) + " package(s)"))));
-  console.log();
+  console.log(((clr(C.cyan, "\n  Installing ") + names.length) + " package(s) into flux_modules/...\n"));
   for (const name of names) {
     const spec = all[name];
-    const isDev_ = Object.prototype.hasOwnProperty.call(devDeps, name);
-    const tag = (isDev_ ? clr(C.gray, " dev") : "");
-    console.log(((((("  " + clr(C.gray, "○")) + " ") + clr((isDev_ ? C.blue : C.green), name)) + clr(C.gray, ("@" + spec))) + tag));
+    console.log(((clr(C.gray, "  ○ ") + name) + clr(C.gray, ("@" + spec))));
   }
   console.log();
   if (!Fs.existsSync(fluxModDir)) {
@@ -203,26 +169,27 @@ async function cmdInstall(opts) {
   }
   const prodNames = Object.keys(deps);
   const devNames = Object.keys(devDeps);
-  const spinner = createSpinner("Installing packages into flux_modules/");
   try {
     if ((prodNames.length > 0)) {
       const prodPkgs = prodNames.map((n) => ((n + "@") + (deps[n] ?? "latest"))).join(" ");
       const installCmd = ((("npm install --prefix " + fluxModDir) + " ") + prodPkgs);
-      execSync(installCmd, { cwd, stdio: "pipe" });
+      info(("Running: " + installCmd));
+      execSync(installCmd, { cwd, stdio: "inherit" });
     }
     if ((devNames.length > 0)) {
       const devPkgs = devNames.map((n) => ((n + "@") + (devDeps[n] ?? "latest"))).join(" ");
       const devCmd = ((("npm install --prefix " + fluxModDir) + " --save-dev ") + devPkgs);
-      execSync(devCmd, { cwd, stdio: "pipe" });
+      info(("Running: " + devCmd));
+      execSync(devCmd, { cwd, stdio: "inherit" });
     }
-    spinner.stop(true, ((names.length + " package(s) installed into ") + clr(C.gray, "flux_modules/")));
     console.log();
-    console.log((((("  " + clr(C.gray, "Packages resolve automatically when using: ")) + clr(C.yellow, "flux run")) + clr(C.gray, ", ")) + clr(C.yellow, "flux bundle")));
+    ok((names.length + " package(s) installed into flux_modules/node_modules/"));
+    info("Packages resolve automatically when using: flux run, flux bundle");
   }
   catch (e) {
-    spinner.stop(false, ("Install failed: " + e.message));
     console.log();
-    console.log((("  " + clr(C.gray, "Try: ")) + clr(C.yellow, "npm install --prefix ./flux_modules <package>")));
+    err(("Install failed: " + e.message));
+    info("Try manually: npm install --prefix ./flux_modules <package>");
   }
   console.log();
 }
@@ -260,156 +227,65 @@ function cmdList(opts) {
 }
 module.exports.cmdList = cmdList;
 async function cmdSearch(query, opts) {
-  console.log();
-  const spinner = createSpinner(("Searching for " + clr(C.bold, (("\"" + query) + "\""))));
+  console.log(((clr(C.cyan, "\n  Searching for ") + clr(C.bold, (("\"" + query) + "\""))) + " ...\n"));
   try {
-    const url = (((REGISTRY_URL + "/-/v1/search?text=") + encodeURIComponent(query)) + "&size=10");
+    const url = (((REGISTRY_URL + "/-/v1/search?text=") + encodeURIComponent((query + " keywords:flux"))) + "&size=10");
     const results = await fetchJson(url);
     const objects = (results.objects ?? []);
     if ((objects.length == 0)) {
-      spinner.stop(false, ("No packages found for: " + query));
+      info(("No packages found for: " + query));
       console.log();
       return;
     }
-    spinner.stop(true, ((("Found " + objects.length) + " result(s) for ") + clr(C.bold, (("\"" + query) + "\""))));
-    console.log();
     for (const obj of objects) {
       const p = obj.package;
       console.log((("  " + clr(C.bold, p.name)) + clr(C.gray, (" v" + p.version))));
       if (p.description) {
         console.log(("  " + clr(C.gray, p.description)));
       }
-      if (p.links?.npm) {
-        console.log(("  " + clr(C.blue, p.links.npm)));
-      }
+      console.log(("  " + clr(C.blue, (p.links?.npm ?? ""))));
       console.log();
     }
   }
   catch (e) {
-    spinner.stop(false, ("Search failed: " + e.message));
-    console.log();
+    err(("Search failed: " + e.message));
   }
 }
 module.exports.cmdSearch = cmdSearch;
 async function cmdInfo(name, opts) {
-  console.log();
-  const spinner = createSpinner(("Fetching info for " + clr(C.bold, name)));
+  console.log(((clr(C.cyan, "\n  Fetching info for ") + clr(C.bold, name)) + " ...\n"));
   try {
     const info_ = await fetchJson(((REGISTRY_URL + "/") + name));
     const latest = (info_["dist-tags"]?.latest ?? "unknown");
     const ver = (info_.versions?.[latest] ?? {  });
-    spinner.stop(true, (clr(C.bold, name) + clr(C.green, ("@" + latest))));
-    console.log();
+    console.log((clr(C.bold, ("  " + name)) + clr(C.gray, (" v" + latest))));
     if (ver.description) {
-      console.log(("  " + clr(C.gray, ver.description)));
+      console.log(("  " + ver.description));
     }
     console.log();
-    console.log(((("  " + clr(C.gray, "license:")) + " ") + (ver.license ?? "unknown")));
-    console.log(((("  " + clr(C.gray, "author: ")) + " ") + ((ver.author?.name ?? ver.author) ?? "unknown")));
+    console.log((clr(C.gray, "  license: ") + (ver.license ?? "unknown")));
+    console.log((clr(C.gray, "  author:  ") + ((ver.author?.name ?? ver.author) ?? "unknown")));
     const homepage = (ver.homepage ?? info_.homepage);
     if (homepage) {
-      console.log(((("  " + clr(C.gray, "home:   ")) + " ") + clr(C.blue, homepage)));
+      console.log((clr(C.gray, "  home:    ") + clr(C.blue, homepage)));
     }
     const repo = (ver.repository?.url ?? info_.repository?.url);
     if (repo) {
-      console.log(((("  " + clr(C.gray, "repo:   ")) + " ") + clr(C.blue, repo.replace("git+", "").replace(".git", ""))));
+      console.log((clr(C.gray, "  repo:    ") + clr(C.blue, repo.replace("git+", "").replace(".git", ""))));
     }
     const keywords = (ver.keywords ?? []);
     if ((keywords.length > 0)) {
-      console.log(((("  " + clr(C.gray, "tags:   ")) + " ") + keywords.slice(0, 8).join(", ")));
+      console.log((clr(C.gray, "  tags:    ") + keywords.slice(0, 8).join(", ")));
     }
     console.log();
-    console.log((("  " + clr(C.gray, "Install: ")) + clr(C.yellow, ("flux add " + name))));
+    console.log((clr(C.gray, "  Install: ") + clr(C.yellow, ("flux add " + name))));
     console.log();
   }
   catch (e) {
-    spinner.stop(false, ((("Could not fetch info for " + name) + ": ") + e.message));
-    console.log();
+    err(((("Could not fetch info for " + name) + ": ") + e.message));
   }
 }
 module.exports.cmdInfo = cmdInfo;
-async function cmdUpgrade(opts) {
-  const isCheck = (opts?.check ?? false);
-  const cwd = process.cwd();
-  const pkg = ensureFluxJson(cwd);
-  const deps = (pkg.dependencies ?? {  });
-  const devDeps = (pkg.devDependencies ?? {  });
-  const allKeys = [...Object.keys(deps), ...Object.keys(devDeps)];
-  if ((allKeys.length == 0)) {
-    console.log();
-    info("No dependencies to upgrade");
-    console.log();
-    return;
-  }
-  console.log();
-  let updated = 0;
-  for (const name of Object.keys(deps)) {
-    const spinner = createSpinner(clr(C.green, name));
-    try {
-      const info_ = await fetchJson(((REGISTRY_URL + "/") + name));
-      const latest = (info_["dist-tags"]?.latest ?? null);
-      if (!latest) {
-        spinner.stop(false, (clr(C.green, name) + " — could not resolve latest version"));
-        continue;
-      }
-      const current = deps[name].replace("^", "").replace("~", "");
-      if ((latest == current)) {
-        spinner.stop(true, (clr(C.green, name) + clr(C.gray, (("@" + current) + " — up to date"))));
-      }
-      else {
-        spinner.stop(true, (((clr(C.green, name) + clr(C.gray, ("@" + current))) + " → ") + clr(C.yellow, latest)));
-        if (!isCheck) {
-          pkg.dependencies[name] = ("^" + latest);
-          updated = (updated + 1);
-        }
-      }
-    }
-    catch (e) {
-      spinner.stop(false, ((clr(C.green, name) + " — ") + e.message));
-    }
-  }
-  for (const name of Object.keys(devDeps)) {
-    const spinner = createSpinner((clr(C.blue, name) + clr(C.gray, " (dev)")));
-    try {
-      const info_ = await fetchJson(((REGISTRY_URL + "/") + name));
-      const latest = (info_["dist-tags"]?.latest ?? null);
-      if (!latest) {
-        spinner.stop(false, (clr(C.blue, name) + " — could not resolve latest version"));
-        continue;
-      }
-      const current = devDeps[name].replace("^", "").replace("~", "");
-      if ((latest == current)) {
-        spinner.stop(true, (clr(C.blue, name) + clr(C.gray, (("@" + current) + " — up to date"))));
-      }
-      else {
-        spinner.stop(true, ((((clr(C.blue, name) + clr(C.gray, ("@" + current))) + " → ") + clr(C.yellow, latest)) + clr(C.gray, " (dev)")));
-        if (!isCheck) {
-          pkg.devDependencies[name] = ("^" + latest);
-          updated = (updated + 1);
-        }
-      }
-    }
-    catch (e) {
-      spinner.stop(false, ((clr(C.blue, name) + " — ") + e.message));
-    }
-  }
-  console.log();
-  if (isCheck) {
-    ok((("Check complete — run " + clr(C.yellow, "flux upgrade")) + " to apply upgrades"));
-  }
-  else {
-    if ((updated > 0)) {
-      saveFluxJson(pkg, cwd);
-      ok((updated + " package(s) updated in flux.json"));
-      console.log(((("  " + clr(C.gray, "Run ")) + clr(C.yellow, "flux install")) + clr(C.gray, " to install upgraded packages")));
-    }
-    else {
-      ok("All packages are already up to date");
-    }
-  }
-  console.log();
-}
-module.exports.cmdUpgrade = cmdUpgrade;
 function cmdPublish(opts) {
   const cwd = process.cwd();
   const pkg = readPackage(cwd);