@xnoxs/flux-lang 3.4.8 → 3.5.0

package/src/self/pkg.js

@@ -1,5 +1,7 @@
 // ── Flux stdlib ──
 
+function map(arr, fn) { return arr.map(fn); }
+
 function join(arr, sep) { return arr.join(sep != null ? sep : ','); }
 
 function keys(obj) { return Object.keys(obj); }
@@ -19,9 +21,11 @@ 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: "\x1b[0m", bold: "\x1b[1m", dim: "\x1b[2m", red: "\x1b[31m", green: "\x1b[32m", yellow: "\x1b[33m", blue: "\x1b[34m", cyan: "\x1b[36m", gray: "\x1b[90m" };
+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);
 function clr(c, s) {
-  return ((c + s) + C.reset);
+  return (noColor ? s : ((c + s) + C.reset));
 }
 function ok(msg) {
   console.log((clr(C.green, "✓ ") + msg));
@@ -32,6 +36,28 @@ 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) {
@@ -81,15 +107,17 @@ 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);
-    console.log((((clr(C.cyan, "\n  Adding ") + clr(C.bold, name)) + clr(C.gray, ("@" + version))) + " ..."));
+    const spinner = createSpinner((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) {
-        err(((("Version " + resolvedVersion) + " not found for ") + name));
+        spinner.stop(false, ((clr(C.bold, name) + clr(C.gray, ("@" + resolvedVersion))) + " — version not found"));
         continue;
       }
       const depKey = (isDev ? "devDependencies" : "dependencies");
@@ -98,17 +126,19 @@ async function cmdAdd(specs, opts) {
       }
       pkg[depKey][name] = ("^" + resolvedVersion);
       saveFluxJson(pkg, cwd);
-      const desc = (versionInfo.description ? clr(C.gray, (" — " + versionInfo.description)) : "");
-      ok(((name + clr(C.green, ("@" + resolvedVersion))) + desc));
-      info(("Added to " + (isDev ? "devDependencies" : "dependencies")));
+      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);
     }
     catch (e) {
-      err(((("Failed to fetch " + name) + ": ") + e.message));
+      spinner.stop(false, ((clr(C.bold, name) + " — ") + e.message));
     }
   }
   console.log();
-  console.log(((clr(C.gray, "  Run ") + clr(C.yellow, "flux install")) + clr(C.gray, " to install packages")));
-  console.log();
+  if ((addedCount > 0)) {
+    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) {
@@ -142,53 +172,57 @@ async function cmdInstall(opts) {
   const { execSync } = require("child_process");
   const cwd = process.cwd();
   const pkg = ensureFluxJson(cwd);
-  const deps = (pkg.dependencies ?? {});
-  const devDeps = (pkg.devDependencies ?? {});
+  const fluxModDir = Path.join(cwd, "flux_modules");
+  const deps = (pkg.dependencies ?? {  });
+  const devDeps = (pkg.devDependencies ?? {  });
   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(((clr(C.cyan, "\n  Installing ") + names.length) + " package(s) into flux_modules/...\n"));
+  console.log();
+  console.log((("  " + clr(C.bold, (pkg.name ?? "project"))) + clr(C.gray, ((" — " + names.length) + " package(s)"))));
+  console.log();
   for (const name of names) {
     const spec = all[name];
-    console.log(((clr(C.gray, "  ○ ") + name) + clr(C.gray, ("@" + spec))));
+    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();
-
-  // Ensure flux_modules/ exists with a minimal package.json
-  const fluxModDir  = Path.join(cwd, "flux_modules");
-  if (!Fs.existsSync(fluxModDir)) Fs.mkdirSync(fluxModDir, { recursive: true });
+  if (!Fs.existsSync(fluxModDir)) {
+    Fs.mkdirSync(fluxModDir, { recursive: true });
+  }
   const fluxPkgFile = Path.join(fluxModDir, "package.json");
   if (!Fs.existsSync(fluxPkgFile)) {
-    const fluxPkg = { name: (pkg.name || "flux-project") + "-flux-modules", version: "1.0.0", private: true };
-    Fs.writeFileSync(fluxPkgFile, JSON.stringify(fluxPkg, null, 2) + "\n", "utf8");
+    const fluxPkg = { name: (pkg.name + "-flux-modules"), version: "1.0.0", private: true };
+    Fs.writeFileSync(fluxPkgFile, (JSON.stringify(fluxPkg, null, 2) + "\n"), "utf8");
   }
-
   const prodNames = Object.keys(deps);
-  const devNames  = Object.keys(devDeps);
-
+  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;
-      info("Running: " + installCmd);
-      execSync(installCmd, { cwd: cwd, stdio: "inherit" });
+    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" });
     }
-    if (devNames.length > 0) {
-      const devPkgs = devNames.map(n => n + "@" + (devDeps[n] ?? "latest")).join(" ");
-      const devCmd  = "npm install --prefix " + fluxModDir + " --save-dev " + devPkgs;
-      info("Running: " + devCmd);
-      execSync(devCmd, { cwd: 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" });
     }
+    spinner.stop(true, ((names.length + " package(s) installed into ") + clr(C.gray, "flux_modules/")));
     console.log();
-    ok(names.length + " package(s) installed into flux_modules/node_modules/");
-    info("Packages resolve automatically when using: flux run, flux bundle");
-  } catch (e) {
+    console.log((((("  " + clr(C.gray, "Packages resolve automatically when using: ")) + clr(C.yellow, "flux run")) + clr(C.gray, ", ")) + clr(C.yellow, "flux bundle")));
+  }
+  catch (e) {
+    spinner.stop(false, ("Install failed: " + e.message));
     console.log();
-    err("Install failed: " + e.message);
-    info("Try manually: npm install --prefix ./flux_modules <package>");
+    console.log((("  " + clr(C.gray, "Try: ")) + clr(C.yellow, "npm install --prefix ./flux_modules <package>")));
   }
   console.log();
 }
@@ -226,65 +260,156 @@ function cmdList(opts) {
 }
 module.exports.cmdList = cmdList;
 async function cmdSearch(query, opts) {
-  console.log(((clr(C.cyan, "\n  Searching for ") + clr(C.bold, (("\"" + query) + "\""))) + " ...\n"));
+  console.log();
+  const spinner = createSpinner(("Searching for " + clr(C.bold, (("\"" + query) + "\""))));
   try {
-    const url = (((REGISTRY_URL + "/-/v1/search?text=") + encodeURIComponent((query + " keywords:flux"))) + "&size=10");
+    const url = (((REGISTRY_URL + "/-/v1/search?text=") + encodeURIComponent(query)) + "&size=10");
     const results = await fetchJson(url);
     const objects = (results.objects ?? []);
     if ((objects.length == 0)) {
-      info(("No packages found for: " + query));
+      spinner.stop(false, ("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)));
       }
-      console.log(("  " + clr(C.blue, (p.links?.npm ?? ""))));
+      if (p.links?.npm) {
+        console.log(("  " + clr(C.blue, p.links.npm)));
+      }
       console.log();
     }
   }
   catch (e) {
-    err(("Search failed: " + e.message));
+    spinner.stop(false, ("Search failed: " + e.message));
+    console.log();
   }
 }
 module.exports.cmdSearch = cmdSearch;
 async function cmdInfo(name, opts) {
-  console.log(((clr(C.cyan, "\n  Fetching info for ") + clr(C.bold, name)) + " ...\n"));
+  console.log();
+  const spinner = createSpinner(("Fetching info for " + clr(C.bold, name)));
   try {
     const info_ = await fetchJson(((REGISTRY_URL + "/") + name));
     const latest = (info_["dist-tags"]?.latest ?? "unknown");
     const ver = (info_.versions?.[latest] ?? {  });
-    console.log((clr(C.bold, ("  " + name)) + clr(C.gray, (" v" + latest))));
+    spinner.stop(true, (clr(C.bold, name) + clr(C.green, ("@" + latest))));
+    console.log();
     if (ver.description) {
-      console.log(("  " + 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")));
     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) {
-    err(((("Could not fetch info for " + name) + ": ") + e.message));
+    spinner.stop(false, ((("Could not fetch info for " + name) + ": ") + e.message));
+    console.log();
   }
 }
 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);
@@ -311,79 +436,4 @@ function cmdPublish(opts) {
   info("Run: flux publish --registry <url>  for a custom registry");
   console.log();
 }
-module.exports.cmdPublish = cmdPublish;
-
-// ── flux upgrade [--check] ─────────────────────────────────────────────────
-// Checks all dependencies in flux.json for newer versions and updates them.
-// --check : dry-run, only show what would change without writing
-async function cmdUpgrade(opts) {
-  const check = (opts && opts.check) || false;
-  const cwd   = process.cwd();
-  const pkg   = readPackage(cwd);
-  if (!pkg) { err('No flux.json found. Run: flux init'); return; }
-
-  const allDeps = Object.assign({}, pkg.dependencies || {}, pkg.devDependencies || {});
-  const names   = Object.keys(allDeps);
-  if (names.length === 0) { info('No dependencies in flux.json'); return; }
-
-  console.log();
-  console.log(clr(C.cyan, '  Checking ' + names.length + ' package(s) for updates...\n'));
-
-  let updated = 0;
-  let upToDate = 0;
-  let failed = 0;
-
-  for (const name of names) {
-    const current = allDeps[name].replace(/^[\^~>=<\s]+/, '');
-    try {
-      const data   = await fetchJson(REGISTRY_URL + '/' + name);
-      const latest = data['dist-tags'] && data['dist-tags'].latest;
-      if (!latest) { err(name + ' — could not resolve latest'); failed++; continue; }
-
-      const isDev  = !!(pkg.devDependencies && pkg.devDependencies[name]);
-      const tag    = isDev ? clr(C.blue, ' (dev)') : '';
-
-      if (current === latest) {
-        console.log('  ' + clr(C.gray, '✓') + ' ' + clr(C.bold, name) + clr(C.gray, '@' + current + ' — up to date') + tag);
-        upToDate++;
-      } else {
-        console.log('  ' + clr(C.yellow, '↑') + ' ' + clr(C.bold, name) + clr(C.gray, '@' + current) + ' → ' + clr(C.green, latest) + tag);
-        if (!check) {
-          if (isDev) {
-            if (!pkg.devDependencies) pkg.devDependencies = {};
-            pkg.devDependencies[name] = '^' + latest;
-          } else {
-            if (!pkg.dependencies) pkg.dependencies = {};
-            pkg.dependencies[name] = '^' + latest;
-          }
-        }
-        updated++;
-      }
-    } catch (e) {
-      err(name + ' — ' + e.message);
-      failed++;
-    }
-  }
-
-  console.log();
-  if (check) {
-    console.log(clr(C.cyan, '  Check mode: no changes written.'));
-    if (updated > 0) {
-      console.log(clr(C.yellow, '  ' + updated + ' update(s) available. Run: flux upgrade'));
-    } else {
-      console.log(clr(C.green, '  All packages are up to date.'));
-    }
-  } else {
-    if (updated > 0) {
-      const pkgPath = Path.join(cwd, 'flux.json');
-      Fs.writeFileSync(pkgPath, JSON.stringify(pkg, null, 2) + '\n', 'utf8');
-      ok(updated + ' package(s) updated in flux.json');
-      info('Run: flux install  to apply changes');
-    } else {
-      console.log(clr(C.green, '  ✓ All packages are already up to date.'));
-    }
-    if (failed > 0) info(failed + ' package(s) could not be checked');
-  }
-  console.log();
-}
-module.exports.cmdUpgrade = cmdUpgrade;
+module.exports.cmdPublish = cmdPublish;

package/src/self/test-runner.js

@@ -21,7 +21,7 @@ function repeat(s, n) { return String(s).repeat(n); }
 const Fs = require("fs");
 const Path = require("path");
 const Os = require("os");
-const C = { reset: "\x1b[0m", bold: "\x1b[1m", red: "\x1b[31m", green: "\x1b[32m", yellow: "\x1b[33m", cyan: "\x1b[36m", gray: "\x1b[90m", dim: "\x1b[2m" };
+const C = { reset: "\\u001b[0m", bold: "\\u001b[1m", red: "\\u001b[31m", green: "\\u001b[32m", yellow: "\\u001b[33m", cyan: "\\u001b[36m", gray: "\\u001b[90m", dim: "\\u001b[2m" };
 function clr(c, s) {
   return (process.env.NO_COLOR ? s : ((c + s) + C.reset));
 }