@xnoxs/flux-lang 4.0.4 → 4.0.5

package/src/self/cli.js

@@ -1,42 +1,6 @@
-/* compiled from src/self/cli.flux by Flux Lang */
+/* compiled from src/self/cli.flux */
 'use strict';
-// ── Flux stdlib ──
-
-function find(arr, fn) { return arr.find(fn); }
-
-function some(arr, fn) { return arr.some(fn); }
-
-function join(arr, sep) { return arr.join(sep != null ? sep : ','); }
-
-function clamp(val, min, max) {
-  return Math.min(Math.max(val, min), max);
-}
-
-function max(arr) {
-  if (arguments.length > 1) return Math.max.apply(null, arguments);
-  return Math.max.apply(null, arr);
-}
-
-function padStart(s, len, char) {
-  return String(s).padStart(len, char || ' ');
-}
-
-function padEnd(s, len, char) {
-  return String(s).padEnd(len, char || ' ');
-}
-
-function trim(s) { return String(s).trim(); }
-
-function trimEnd(s) { return String(s).trimEnd(); }
-
-function startsWith(s, prefix) { return String(s).startsWith(prefix); }
-
-function endsWith(s, suffix) { return String(s).endsWith(suffix); }
-
-function repeat(s, n) { return String(s).repeat(n); }
-// ── end stdlib ──
-
-// Generated by Flux Transpiler v3.2.0
+// Generated by Flux Transpiler v3.5.3 (self-hosted)
 "use strict";
 
 const Fs = require("fs");
@@ -51,7 +15,7 @@ const { loadConfig } = require("./config");
 const { cmdAdd, cmdRemove, cmdInstall, cmdList, cmdSearch, cmdInfo, cmdPublish } = require("./pkg");
 const VERSION = (FLUX_VERSION ?? "3.0.0");
 const STAGE = (FLUX_STAGE ?? "self-hosted");
-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", white: "\u001b[37m", gray: "\u001b[90m", magenta: "\u001b[35m" };
+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", white: "\\u001b[37m", gray: "\\u001b[90m", magenta: "\\u001b[35m" };
 const noColor = (process.env.NO_COLOR || !process.stdout.isTTY);
 function clr(c, s) {
   return (noColor ? s : ((c + s) + C.reset));
@@ -91,31 +55,19 @@ function showHelp() {
   console.log("  flux <command> [options]\n");
   console.log(bold("COMPILER:"));
   const compilerCmds = [["compile <file.flux>", "Compile .flux → .js"], ["bundle  <entry.flux>", "Bundle multi-file project into one .js"], ["run     <file.flux>", "Compile and run a single-file script"], ["watch   <file.flux>", "Watch for changes, auto-compile"], ["check   <file.flux>", "Type-check and static analysis"]];
-  for (const __item__ of compilerCmds) {
-    const [cmd, desc] = __item__;
-    console.log(((("  " + green(("flux " + cmd).padEnd(36))) + " ") + gray(desc)));
-  }
+  compilerCmds.forEach((pair) => console.log(((("  " + green(("flux " + pair[0]).padEnd(36))) + " ") + gray(pair[1]))));
   console.log();
   console.log(bold("TOOLING:"));
   const toolCmds = [["lint    <file.flux>", "Full lint: types + style + immutability"], ["fmt     <file.flux>", "Format source code in-place"], ["test    [dir]", "Run *.test.flux files"], ["repl", "Interactive REPL mode"], ["tokens  <file.flux>", "Show lexer token list"], ["ast     <file.flux>", "Show Abstract Syntax Tree (JSON)"]];
-  for (const __item__ of toolCmds) {
-    const [cmd, desc] = __item__;
-    console.log(((("  " + green(("flux " + cmd).padEnd(36))) + " ") + gray(desc)));
-  }
+  toolCmds.forEach((pair) => console.log(((("  " + green(("flux " + pair[0]).padEnd(36))) + " ") + gray(pair[1]))));
   console.log();
   console.log(bold("PACKAGE MANAGER:"));
   const pkgCmds = [["init    [name] [--template]", "Scaffold a new Flux project"], ["add     <pkg[@version]>", "Add a dependency (npm install --save)"], ["remove  <pkg>", "Remove a dependency (npm uninstall)"], ["install", "Install all dependencies (npm install)"], ["list", "List installed packages"], ["search  <query>", "Search the npm registry"], ["info    <pkg>", "Show package details"], ["publish", "Publish package to npm registry"]];
-  for (const __item__ of pkgCmds) {
-    const [cmd, desc] = __item__;
-    console.log(((("  " + cyan(("flux " + cmd).padEnd(36))) + " ") + gray(desc)));
-  }
+  pkgCmds.forEach((pair) => console.log(((("  " + cyan(("flux " + pair[0]).padEnd(36))) + " ") + gray(pair[1]))));
   console.log();
   console.log(bold("SELF-HOSTED:"));
   const selfCmds = [["self-hosted", "Show self-hosted compiler status"], ["self-hosted build", "Bootstrap: compile compiler with itself"], ["self-hosted verify", "Verify self-hosted output matches stage-0"]];
-  for (const __item__ of selfCmds) {
-    const [cmd, desc] = __item__;
-    console.log(((("  " + yellow(("flux " + cmd).padEnd(36))) + " ") + gray(desc)));
-  }
+  selfCmds.forEach((pair) => console.log(((("  " + yellow(("flux " + pair[0]).padEnd(36))) + " ") + gray(pair[1]))));
   console.log();
   console.log(bold("OPTIONS:"));
   console.log((("  " + yellow("--out, -o <file>  ")) + "  Output file"));
@@ -818,91 +770,94 @@ function main() {
   const { positional, opts } = parseArgs(process.argv);
   const cmd = (positional[0] ?? "help");
   if (cmd === "compile") {
-    return cmdCompile(positional[1], opts);
+    cmdCompile(positional[1], opts);
   }
   else if (cmd === "run") {
-    return cmdRun(positional[1], opts);
+    cmdRun(positional[1], opts);
   }
   else if (cmd === "check") {
-    return cmdCheck(positional.slice(1), opts);
+    cmdCheck(positional.slice(1), opts);
   }
   else if (cmd === "fmt") {
-    return cmdFmt(positional.slice(1), opts);
+    cmdFmt(positional.slice(1), opts);
   }
   else if (cmd === "format") {
-    return cmdFmt(positional.slice(1), opts);
+    cmdFmt(positional.slice(1), opts);
   }
   else if (cmd === "lint") {
-    return cmdLint(positional.slice(1), opts);
+    cmdLint(positional.slice(1), opts);
   }
   else if (cmd === "bundle") {
-    return cmdBundle(positional[1], opts);
+    cmdBundle(positional[1], opts);
   }
   else if (cmd === "watch") {
-    return cmdWatch(positional[1], opts);
+    cmdWatch(positional[1], opts);
   }
   else if (cmd === "tokens") {
-    return cmdTokens(positional[1], opts);
+    cmdTokens(positional[1], opts);
   }
   else if (cmd === "ast") {
-    return cmdAst(positional[1], opts);
+    cmdAst(positional[1], opts);
   }
   else if (cmd === "repl") {
-    return cmdRepl(opts);
+    cmdRepl(opts);
+  }
+  else if (cmd === "test") {
+    runTests(positional.slice(1), opts);
   }
   else if (cmd === "init") {
-    return cmdInit(positional[1], opts);
+    cmdInit(positional[1], opts);
   }
   else if (cmd === "add") {
-    return cmdAdd(positional.slice(1), opts);
+    cmdAdd(positional.slice(1), opts);
   }
   else if (cmd === "remove") {
-    return cmdRemove(positional.slice(1), opts);
+    cmdRemove(positional.slice(1), opts);
   }
   else if (cmd === "rm") {
-    return cmdRemove(positional.slice(1), opts);
+    cmdRemove(positional.slice(1), opts);
   }
   else if (cmd === "install") {
-    return cmdInstall(opts);
+    cmdInstall(opts);
   }
   else if (cmd === "i") {
-    return cmdInstall(opts);
+    cmdInstall(opts);
   }
   else if (cmd === "list") {
-    return cmdList(opts);
+    cmdList(opts);
   }
   else if (cmd === "ls") {
-    return cmdList(opts);
+    cmdList(opts);
   }
   else if (cmd === "search") {
-    return cmdSearch(positional[1], opts);
+    cmdSearch(positional[1], opts);
   }
   else if (cmd === "info") {
-    return cmdInfo(positional[1], opts);
+    cmdInfo(positional[1], opts);
   }
   else if (cmd === "publish") {
-    return cmdPublish(opts);
+    cmdPublish(opts);
   }
   else if (cmd === "self-hosted") {
-    return cmdSelfHosted(positional[1], opts);
+    cmdSelfHosted(positional[1], opts);
   }
   else if (cmd === "version") {
-    return cmdVersion(opts);
+    cmdVersion(opts);
   }
   else if (cmd === "-v") {
-    return cmdVersion(opts);
+    cmdVersion(opts);
   }
   else if (cmd === "--version") {
-    return cmdVersion(opts);
+    cmdVersion(opts);
   }
   else if (cmd === "help") {
-    return showHelp();
+    showHelp();
   }
   else if (cmd === "--help") {
-    return showHelp();
+    showHelp();
   }
   else if (cmd === "-h") {
-    return showHelp();
+    showHelp();
   }
   else {
     console.error(red(("✗ Unknown command: " + cmd)));

package/src/self/config.flux

@@ -2,10 +2,11 @@
 //  Flux Self-Hosted Config Reader
 //  src/self/config.flux — written in Flux, compiled by stage-0
 //
-//  Reads flux.json project config and merges with CLI flags.
-//  Config file locations (searched in order):
-//    ./flux.json
-//    ./flux.config.js
+//  Reads config from package.json ("flux" key) or flux.json fallback.
+//  Config file resolution order:
+//    1. package.json → { "flux": { ... } }   ← primary
+//    2. flux.json                              ← legacy fallback
+//    3. default config                         ← if none found
 // ============================================================
 
 import Fs   from "fs"
@@ -24,7 +25,7 @@ export val DEFAULT_CONFIG = {
   watch:      false,
   ignore:     [],
   selfHosted: false,
-  registry:   "https://registry.flux-lang.dev",
+  registry:   "https://registry.npmjs.org",
   pkg: {
     name:        "",
     version:     "1.0.0",
@@ -36,11 +37,22 @@ export val DEFAULT_CONFIG = {
   }
 }
 
-// ── Load flux.json ────────────────────────────────────────────
+// ── Load config (package.json "flux" key first, flux.json fallback) ──
 export fn loadConfig(cwd_):
   val cwd = cwd_ ?? process.cwd()
 
-  // Try flux.json first
+  // 1. Try package.json → "flux" key (primary)
+  val pkgJsonPath = Path.join(cwd, "package.json")
+  if Fs.existsSync(pkgJsonPath):
+    try:
+      val raw    = Fs.readFileSync(pkgJsonPath, "utf8")
+      val parsed = JSON.parse(raw)
+      if parsed.flux and typeof parsed.flux == "object":
+        return mergeConfig(DEFAULT_CONFIG, parsed.flux)
+    catch(e):
+      throw new Error("Invalid package.json: " + e.message)
+
+  // 2. Try flux.json (legacy fallback)
   val jsonPath = Path.join(cwd, "flux.json")
   if Fs.existsSync(jsonPath):
     try:
@@ -50,15 +62,7 @@ export fn loadConfig(cwd_):
     catch(e):
       throw new Error("Invalid flux.json: " + e.message)
 
-  // Try flux.config.js
-  val jsPath = Path.join(cwd, "flux.config.js")
-  if Fs.existsSync(jsPath):
-    try:
-      val loaded = require(jsPath)
-      return mergeConfig(DEFAULT_CONFIG, loaded)
-    catch(e2):
-      throw new Error("Invalid flux.config.js: " + e2.message)
-
+  // 3. Default config
   return { ...DEFAULT_CONFIG }
 
 // ── Deep merge config objects ─────────────────────────────────
@@ -71,12 +75,16 @@ export fn mergeConfig(base, overrides):
       result[key] = val_
   return result
 
-// ── Write flux.json ───────────────────────────────────────────
+// ── Write flux key into package.json ─────────────────────────
 export fn writeConfig(config, cwd_):
-  val cwd = cwd_ ?? process.cwd()
-  val jsonPath = Path.join(cwd, "flux.json")
-  val content = JSON.stringify(config, null, 2) + "\n"
-  Fs.writeFileSync(jsonPath, content, "utf8")
+  val cwd      = cwd_ ?? process.cwd()
+  val pkgPath  = Path.join(cwd, "package.json")
+  var pkg      = {}
+  if Fs.existsSync(pkgPath):
+    try: pkg = JSON.parse(Fs.readFileSync(pkgPath, "utf8"))
+    catch(e): pkg = {}
+  pkg.flux = config
+  Fs.writeFileSync(pkgPath, JSON.stringify(pkg, null, 2) + "\n", "utf8")
 
 // ── Validate config ───────────────────────────────────────────
 export fn validateConfig(config):
@@ -93,20 +101,20 @@ export fn validateConfig(config):
     errors: errors,
   }
 
-// ── Read flux.json package info ───────────────────────────────
+// ── Read package info (package.json first, flux.json fallback) ────
 export fn readPackage(cwd_):
-  val cwd = cwd_ ?? process.cwd()
+  val cwd     = cwd_ ?? process.cwd()
+  val pkgJson = Path.join(cwd, "package.json")
   val fluxJson = Path.join(cwd, "flux.json")
-  val pkgJson  = Path.join(cwd, "package.json")
 
-  if Fs.existsSync(fluxJson):
+  if Fs.existsSync(pkgJson):
     try:
-      return JSON.parse(Fs.readFileSync(fluxJson, "utf8"))
+      return JSON.parse(Fs.readFileSync(pkgJson, "utf8"))
     catch(e): return null
 
-  if Fs.existsSync(pkgJson):
+  if Fs.existsSync(fluxJson):
     try:
-      return JSON.parse(Fs.readFileSync(pkgJson, "utf8"))
+      return JSON.parse(Fs.readFileSync(fluxJson, "utf8"))
     catch(e2): return null
 
   return null

package/src/self/config.js

@@ -1,17 +1,6 @@
-/* compiled from src/self/config.flux by Flux Lang */
+/* compiled from src/self/config.flux */
 'use strict';
-// ── Flux stdlib ──
-
-function join(arr, sep) { return arr.join(sep != null ? sep : ','); }
-
-function includes(arr, val) { return arr.includes(val); }
-
-function keys(obj) { return Object.keys(obj); }
-
-function endsWith(s, suffix) { return String(s).endsWith(suffix); }
-// ── end stdlib ──
-
-// Generated by Flux Transpiler v3.2.0
+// Generated by Flux Transpiler v3.5.3 (self-hosted)
 "use strict";
 
 const Fs = require("fs");

package/src/self/pkg.flux

@@ -3,11 +3,11 @@
 //  src/self/pkg.flux — written in Flux, compiled by stage-0
 //
 //  Commands:
-//    flux add <pkg[@version]>   install a flux package
-//    flux remove <pkg>          remove a package
-//    flux install               install all from flux.json
+//    flux add <pkg[@version]>   install a package (npm install --save)
+//    flux remove <pkg>          remove a package  (npm uninstall)
+//    flux install               install all from package.json (npm install)
 //    flux list                  list installed packages
-//    flux search <query>        search the registry
+//    flux search <query>        search the npm registry
 //    flux publish               publish to registry
 //    flux info <pkg>            show package info
 // ============================================================
@@ -17,11 +17,9 @@ import Path  from "path"
 import Https from "https"
 import Http  from "http"
 import Os    from "os"
-import { readPackage, writeConfig, loadConfig } from "./config"
+import { readPackage } from "./config"
 
 val REGISTRY_URL = "https://registry.npmjs.org"
-val FLUX_PKG_DIR = "flux_modules"
-val PKG_FILE     = "flux.json"
 
 // ── ANSI colors ───────────────────────────────────────────────
 val ESC = "\u001b"
@@ -77,36 +75,6 @@ async fn fetchJson(url):
     mod.get(url, { headers: { "User-Agent": "flux-pkg/1.0" } }, onRes).on("error", reject)
   return new Promise(doRequest)
 
-// ── Ensure flux.json exists ───────────────────────────────────
-fn ensureFluxJson(cwd_):
-  val cwd  = cwd_ ?? process.cwd()
-  val file = Path.join(cwd, PKG_FILE)
-  if not Fs.existsSync(file):
-    val pkg = {
-      name:        Path.basename(cwd),
-      version:     "1.0.0",
-      description: "",
-      author:      "",
-      license:     "MIT",
-      scripts: {
-        start:  "flux run src/main.flux",
-        build:  "flux bundle src/main.flux -o dist/bundle.js",
-        dev:    "flux watch src/main.flux",
-        check:  "flux check src/main.flux",
-      },
-      dependencies:    {},
-      devDependencies: {},
-    }
-    Fs.writeFileSync(file, JSON.stringify(pkg, null, 2) + "\n", "utf8")
-    ok("Created flux.json")
-  return JSON.parse(Fs.readFileSync(file, "utf8"))
-
-// ── Save flux.json ────────────────────────────────────────────
-fn saveFluxJson(pkg, cwd_):
-  val cwd  = cwd_ ?? process.cwd()
-  val file = Path.join(cwd, PKG_FILE)
-  Fs.writeFileSync(file, JSON.stringify(pkg, null, 2) + "\n", "utf8")
-
 // ── Resolve package name@version ─────────────────────────────
 fn parsePackageSpec(spec):
   val atIdx = spec.lastIndexOf("@")
@@ -115,124 +83,63 @@ fn parsePackageSpec(spec):
   return { name: spec, version: "latest" }
 
 // ── flux add <pkg[@version]> [--dev] ─────────────────────────
+// Equivalent to: npm install <pkg> --save (or --save-dev)
 export async fn cmdAdd(specs, opts):
+  import { execSync } from "child_process"
   val isDev = opts?.dev ?? false
   val cwd   = process.cwd()
-  val pkg   = ensureFluxJson(cwd)
 
   for spec in specs:
     val { name, version } = parsePackageSpec(spec)
-    val spinner = startSpinner("Fetching " + clr(C.bold, name) + clr(C.gray, "@" + version) + " ...")
+    val spinner = startSpinner("Adding " + clr(C.bold, name) + clr(C.gray, "@" + version) + " ...")
 
     try:
-      val info_ = await fetchJson(REGISTRY_URL + "/" + name)
-      val resolvedVersion = version == "latest" ? (info_["dist-tags"]?.latest ?? "1.0.0") : version
-
-      val versionInfo = info_.versions?.[resolvedVersion]
+      val saveFlag = isDev ? "--save-dev" : "--save"
+      val pkgSpec  = version == "latest" ? name : name + "@" + version
       stopSpinner(spinner)
-      if not versionInfo:
-        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 desc = versionInfo.description ? clr(C.gray, " — " + versionInfo.description) : ""
-      ok(name + clr(C.green, "@" + resolvedVersion) + desc)
-      info("Added to " + (isDev ? "devDependencies" : "dependencies"))
-
+      console.log(clr(C.cyan, "  Adding ") + clr(C.bold, pkgSpec) + clr(C.gray, " to node_modules/ and package.json..."))
+      execSync("npm install " + pkgSpec + " " + saveFlag, { cwd, stdio: "inherit" })
+      ok("Added " + clr(C.bold, name) + " to node_modules/ and package.json")
     catch(e):
       stopSpinner(spinner)
-      err("Failed to fetch " + name + ": " + e.message)
+      err("Failed to add " + name + ": " + e.message)
 
   console.log()
-  console.log(clr(C.gray, "  Run ") + clr(C.yellow, "flux install") + clr(C.gray, " to install packages"))
-  console.log()
 
 // ── flux remove <pkg> ─────────────────────────────────────────
+// Equivalent to: npm uninstall <pkg>
 export fn cmdRemove(names, opts):
+  import { execSync } from "child_process"
   val cwd = process.cwd()
-  val pkg = ensureFluxJson(cwd)
-  var removed = 0
 
   for name in names:
-    var found = false
-    if pkg.dependencies and pkg.dependencies[name]:
-      delete pkg.dependencies[name]
-      found = true
-    if pkg.devDependencies and pkg.devDependencies[name]:
-      delete pkg.devDependencies[name]
-      found = true
-
-    if found:
+    try:
+      console.log(clr(C.cyan, "  Removing ") + clr(C.bold, name) + " ...")
+      execSync("npm uninstall " + name, { cwd, stdio: "inherit" })
       ok("Removed " + clr(C.bold, name))
-      removed = removed + 1
-    else:
-      err(name + " not found in flux.json")
-
-  if removed > 0:
-    saveFluxJson(pkg, cwd)
+    catch(e):
+      err("Failed to remove " + name + ": " + e.message)
 
 // ── flux install ──────────────────────────────────────────────
+// Equivalent to: npm install (reads package.json)
 export async fn cmdInstall(opts):
   import { execSync } from "child_process"
+  val cwd = process.cwd()
 
-  val cwd        = process.cwd()
-  val pkg        = ensureFluxJson(cwd)
-  val fluxModDir = Path.join(cwd, "flux_modules")
-
-  val deps    = pkg.dependencies ?? {}
-  val devDeps = pkg.devDependencies ?? {}
-  val all     = { ...deps, ...devDeps }
-  val names   = Object.keys(all)
-
-  if names.length == 0:
-    info("No dependencies found in flux.json")
+  val pkgJsonPath = Path.join(cwd, "package.json")
+  if not Fs.existsSync(pkgJsonPath):
+    err("No package.json found. Run: flux init")
     return
 
-  console.log(clr(C.cyan, "\n  Installing ") + names.length + " package(s) into flux_modules/...\n")
-
-  for name in names:
-    val spec = all[name]
-    console.log(clr(C.gray, "  ○ ") + name + clr(C.gray, "@" + spec))
-
-  console.log()
-
-  // Ensure flux_modules/ exists with a minimal package.json
-  if not Fs.existsSync(fluxModDir):
-    Fs.mkdirSync(fluxModDir, { recursive: true })
-
-  val fluxPkgFile = Path.join(fluxModDir, "package.json")
-  if not Fs.existsSync(fluxPkgFile):
-    val fluxPkg = { name: pkg.name + "-flux-modules", version: "1.0.0", private: true }
-    Fs.writeFileSync(fluxPkgFile, JSON.stringify(fluxPkg, null, 2) + "\n", "utf8")
-
-  val prodNames = Object.keys(deps)
-  val devNames  = Object.keys(devDeps)
-
+  console.log(clr(C.cyan, "\n  Installing dependencies from package.json...\n"))
   try:
-    if prodNames.length > 0:
-      val prodPkgs   = prodNames.map(n -> n + "@" + (deps[n] ?? "latest")).join(" ")
-      val installCmd = "npm install --prefix " + fluxModDir + " " + prodPkgs
-      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
-      info("Running: " + devCmd)
-      execSync(devCmd, { cwd: cwd, stdio: "inherit" })
-
+    execSync("npm install", { cwd, stdio: "inherit" })
     console.log()
-    ok(names.length + " package(s) installed into flux_modules/node_modules/")
-    info("Packages resolve automatically when using: flux run, flux bundle")
+    ok("Dependencies installed into node_modules/")
   catch(e):
     console.log()
     err("Install failed: " + e.message)
-    info("Try manually: npm install --prefix ./flux_modules <package>")
+    info("Try manually: npm install")
 
   console.log()
 
@@ -242,7 +149,7 @@ export fn cmdList(opts):
   val pkg = readPackage(cwd)
 
   if not pkg:
-    err("No flux.json found. Run: flux init")
+    err("No package.json found. Run: flux init")
     return
 
   console.log()
@@ -325,12 +232,13 @@ export async fn cmdInfo(name, opts):
 
 // ── flux upgrade [--check] ────────────────────────────────────
 export async fn cmdUpgrade(opts):
+  import { execSync } from "child_process"
   val isCheck = opts?.check ?? false
   val cwd     = process.cwd()
   val pkg     = readPackage(cwd)
 
   if not pkg:
-    err("No flux.json found. Run: flux init")
+    err("No package.json found. Run: flux init")
     return
 
   val deps    = pkg.dependencies ?? {}
@@ -371,11 +279,9 @@ export async fn cmdUpgrade(opts):
         if isCheck:
           console.log("  " + clr(C.yellow, "↑ ") + clr(C.bold, name) + clr(C.gray, "  " + current + " → ") + clr(C.green, "^" + latest))
         else:
-          val isDev = devDeps[name] != null
-          val depKey = isDev ? "devDependencies" : "dependencies"
-          pkg[depKey][name] = "^" + latest
           updated = updated + 1
           console.log("  " + clr(C.green, "✓ ") + clr(C.bold, name) + clr(C.gray, "  " + current + " → ") + clr(C.green, "^" + latest))
+          execSync("npm install " + name + "@" + latest + " --save", { cwd, stdio: "pipe" })
 
     catch(e):
       stopSpinner(spinner)
@@ -393,9 +299,7 @@ export async fn cmdUpgrade(opts):
     if updated == 0:
       ok("All packages are already up to date")
     else:
-      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 updated versions"))
+      ok(updated + " package(s) updated in node_modules/ and package.json")
 
   console.log()
 
@@ -405,21 +309,20 @@ export fn cmdPublish(opts):
   val pkg = readPackage(cwd)
 
   if not pkg:
-    err("No flux.json found. Run: flux init")
+    err("No package.json found. Run: flux init")
     return
 
   console.log()
   console.log(clr(C.cyan, "  Publishing ") + clr(C.bold, pkg.name + "@" + pkg.version) + " ...")
   console.log()
-  info("Building package...")
-  info("Checking flux.json...")
+  info("Checking package.json...")
 
   if not pkg.name:
-    err("flux.json must have a name field")
+    err("package.json must have a name field")
     return
 
   if not pkg.version:
-    err("flux.json must have a version field")
+    err("package.json must have a version field")
     return
 
   console.log()