@xnoxs/flux-lang 3.5.2 → 4.0.0

package/src/self/pkg.flux

@@ -24,16 +24,17 @@ val FLUX_PKG_DIR = "flux_modules"
 val PKG_FILE     = "flux.json"
 
 // ── ANSI colors ───────────────────────────────────────────────
+val ESC = "\u001b"
 val 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",
+  reset:  ESC + "[0m",
+  bold:   ESC + "[1m",
+  dim:    ESC + "[2m",
+  red:    ESC + "[31m",
+  green:  ESC + "[32m",
+  yellow: ESC + "[33m",
+  blue:   ESC + "[34m",
+  cyan:   ESC + "[36m",
+  gray:   ESC + "[90m",
 }
 
 fn clr(c, s): return c + s + C.reset
@@ -41,6 +42,24 @@ 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 ───────────────────────────────────────────────────
+val SPIN_FRAMES = ["⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏"]
+val stdout = process.stdout
+
+fn startSpinner(label):
+  if not stdout.isTTY: return null
+  var frame = 0
+  fn tick():
+    stdout.write("\r" + clr(C.cyan, SPIN_FRAMES[frame % SPIN_FRAMES.length]) + " " + label + "   ")
+    frame = frame + 1
+  val timer = setInterval(tick, 80)
+  return timer
+
+fn stopSpinner(timer):
+  if not timer: return
+  clearInterval(timer)
+  stdout.write("\r" + ESC + "[2K")
+
 // ── HTTP fetch (Node built-in, no dependencies) ───────────────
 async fn fetchJson(url):
   val mod = url.startsWith("https") ? Https : Http
@@ -103,13 +122,14 @@ export async fn cmdAdd(specs, opts):
 
   for spec in specs:
     val { name, version } = parsePackageSpec(spec)
-    console.log(clr(C.cyan, "\n  Adding ") + clr(C.bold, name) + clr(C.gray, "@" + version) + " ...")
+    val spinner = startSpinner("Fetching " + 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]
+      stopSpinner(spinner)
       if not versionInfo:
         err("Version " + resolvedVersion + " not found for " + name)
         continue
@@ -125,6 +145,7 @@ export async fn cmdAdd(specs, opts):
       info("Added to " + (isDev ? "devDependencies" : "dependencies"))
 
     catch(e):
+      stopSpinner(spinner)
       err("Failed to fetch " + name + ": " + e.message)
 
   console.log()
@@ -302,6 +323,82 @@ export async fn cmdInfo(name, opts):
   catch(e):
     err("Could not fetch info for " + name + ": " + e.message)
 
+// ── flux upgrade [--check] ────────────────────────────────────
+export async fn cmdUpgrade(opts):
+  val isCheck = opts?.check ?? false
+  val cwd     = process.cwd()
+  val pkg     = readPackage(cwd)
+
+  if not pkg:
+    err("No flux.json found. Run: flux init")
+    return
+
+  val deps    = pkg.dependencies ?? {}
+  val devDeps = pkg.devDependencies ?? {}
+  val all     = { ...deps, ...devDeps }
+  val names   = Object.keys(all)
+
+  if names.length == 0:
+    info("No dependencies to upgrade")
+    console.log()
+    return
+
+  if isCheck:
+    console.log(clr(C.cyan, "\n  Checking " + names.length + " package(s) for updates...\n"))
+  else:
+    console.log(clr(C.cyan, "\n  Upgrading " + names.length + " package(s) to latest...\n"))
+
+  var outdated = 0
+  var updated  = 0
+
+  for name in names:
+    val current = all[name]
+    val spinner = startSpinner("Checking " + clr(C.bold, name) + " ...")
+    try:
+      val info_ = await fetchJson(REGISTRY_URL + "/" + name)
+      val latest = info_["dist-tags"]?.latest ?? null
+      stopSpinner(spinner)
+
+      if not latest:
+        console.log("  " + clr(C.gray, "? ") + clr(C.bold, name) + clr(C.gray, " — could not resolve latest"))
+        continue
+
+      val currentClean = current.replace("^", "").replace("~", "")
+      if currentClean == latest:
+        console.log("  " + clr(C.green, "✓ ") + clr(C.bold, name) + clr(C.gray, " " + current + " (up to date)"))
+      else:
+        outdated = outdated + 1
+        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))
+
+    catch(e):
+      stopSpinner(spinner)
+      console.log("  " + clr(C.red, "✗ ") + clr(C.bold, name) + clr(C.gray, " — " + e.message))
+
+  console.log()
+
+  if isCheck:
+    if outdated == 0:
+      ok("All packages are up to date")
+    else:
+      console.log(clr(C.yellow, "  " + outdated + " package(s) can be upgraded"))
+      console.log(clr(C.gray, "  Run ") + clr(C.yellow, "flux upgrade") + clr(C.gray, " to apply updates"))
+  else:
+    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"))
+
+  console.log()
+
 // ── flux publish ──────────────────────────────────────────────
 export fn cmdPublish(opts):
   val cwd = process.cwd()

package/src/self/pkg.js

@@ -21,7 +21,8 @@ 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 ESC = "\u001b";
+const C = { reset: (ESC + "[0m"), bold: (ESC + "[1m"), dim: (ESC + "[2m"), red: (ESC + "[31m"), green: (ESC + "[32m"), yellow: (ESC + "[33m"), blue: (ESC + "[34m"), cyan: (ESC + "[36m"), gray: (ESC + "[90m") };
 function clr(c, s) {
   return ((c + s) + C.reset);
 }
@@ -34,6 +35,27 @@ function err(msg) {
 function info(msg) {
   console.log((clr(C.cyan, "  ") + msg));
 }
+const SPIN_FRAMES = ["⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏"];
+const stdout = process.stdout;
+function startSpinner(label) {
+  if (!stdout.isTTY) {
+    return null;
+  }
+  let frame = 0;
+  function tick() {
+    stdout.write((((("\r" + clr(C.cyan, SPIN_FRAMES[(frame % SPIN_FRAMES.length)])) + " ") + label) + "   "));
+    frame = (frame + 1);
+  }
+  const timer = setInterval(tick, 80);
+  return timer;
+}
+function stopSpinner(timer) {
+  if (!timer) {
+    return;
+  }
+  clearInterval(timer);
+  stdout.write((("\r" + ESC) + "[2K"));
+}
 async function fetchJson(url) {
   const mod = (url.startsWith("https") ? Https : Http);
   function doRequest(resolve, reject) {
@@ -85,11 +107,12 @@ async function cmdAdd(specs, opts) {
   const pkg = ensureFluxJson(cwd);
   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 = startSpinner(((("Fetching " + 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];
+      stopSpinner(spinner);
       if (!versionInfo) {
         err(((("Version " + resolvedVersion) + " not found for ") + name));
         continue;
@@ -105,6 +128,7 @@ async function cmdAdd(specs, opts) {
       info(("Added to " + (isDev ? "devDependencies" : "dependencies")));
     }
     catch (e) {
+      stopSpinner(spinner);
       err(((("Failed to fetch " + name) + ": ") + e.message));
     }
   }
@@ -286,6 +310,88 @@ async function cmdInfo(name, opts) {
   }
 }
 module.exports.cmdInfo = cmdInfo;
+async function cmdUpgrade(opts) {
+  const isCheck = (opts?.check ?? false);
+  const cwd = process.cwd();
+  const pkg = readPackage(cwd);
+  if (!pkg) {
+    err("No flux.json found. Run: flux init");
+    return;
+  }
+  const deps = (pkg.dependencies ?? {  });
+  const devDeps = (pkg.devDependencies ?? {  });
+  const all = { ...deps, ...devDeps };
+  const names = Object.keys(all);
+  if ((names.length == 0)) {
+    info("No dependencies to upgrade");
+    console.log();
+    return;
+  }
+  if (isCheck) {
+    console.log(clr(C.cyan, (("\n  Checking " + names.length) + " package(s) for updates...\n")));
+  }
+  else {
+    console.log(clr(C.cyan, (("\n  Upgrading " + names.length) + " package(s) to latest...\n")));
+  }
+  let outdated = 0;
+  let updated = 0;
+  for (const name of names) {
+    const current = all[name];
+    const spinner = startSpinner((("Checking " + clr(C.bold, name)) + " ..."));
+    try {
+      const info_ = await fetchJson(((REGISTRY_URL + "/") + name));
+      const latest = (info_["dist-tags"]?.latest ?? null);
+      stopSpinner(spinner);
+      if (!latest) {
+        console.log(((("  " + clr(C.gray, "? ")) + clr(C.bold, name)) + clr(C.gray, " — could not resolve latest")));
+        continue;
+      }
+      const currentClean = current.replace("^", "").replace("~", "");
+      if ((currentClean == latest)) {
+        console.log(((("  " + clr(C.green, "✓ ")) + clr(C.bold, name)) + clr(C.gray, ((" " + current) + " (up to date)"))));
+      }
+      else {
+        outdated = (outdated + 1);
+        if (isCheck) {
+          console.log((((("  " + clr(C.yellow, "↑ ")) + clr(C.bold, name)) + clr(C.gray, (("  " + current) + " → "))) + clr(C.green, ("^" + latest))));
+        }
+        else {
+          const isDev = (devDeps[name] != null);
+          const 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))));
+        }
+      }
+    }
+    catch (e) {
+      stopSpinner(spinner);
+      console.log(((("  " + clr(C.red, "✗ ")) + clr(C.bold, name)) + clr(C.gray, (" — " + e.message))));
+    }
+  }
+  console.log();
+  if (isCheck) {
+    if ((outdated == 0)) {
+      ok("All packages are up to date");
+    }
+    else {
+      console.log(clr(C.yellow, (("  " + outdated) + " package(s) can be upgraded")));
+      console.log(((clr(C.gray, "  Run ") + clr(C.yellow, "flux upgrade")) + clr(C.gray, " to apply updates")));
+    }
+  }
+  else {
+    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")));
+    }
+  }
+  console.log();
+}
+module.exports.cmdUpgrade = cmdUpgrade;
 function cmdPublish(opts) {
   const cwd = process.cwd();
   const pkg = readPackage(cwd);

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: "\\u001b[0m", bold: "\\u001b[1m", red: "\\u001b[31m", green: "\\u001b[32m", yellow: "\\u001b[33m", cyan: "\\u001b[36m", gray: "\\u001b[90m", dim: "\\u001b[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));
 }

package/src/self/transpiler.flux

@@ -1,5 +1,5 @@
 // ============================================================
-//  Flux Self-Hosted Transpiler — v3.0 (100% Self-Hosting)
+//  Flux Self-Hosted Transpiler — v3.5 (100% Self-Hosting)
 //  src/self/transpiler.flux — written in Flux, compiled by stage-0
 //
 //  Full pipeline:
@@ -15,8 +15,18 @@ import { transformJsx, FLUX_H_BROWSER, FLUX_H_SERVER, FLUX_CSS_BROWSER, FLUX_CSS
 import { Checker }                               from './checker'
 import { FluxTypeChecker }                       from './type-checker'
 
-// ── Version info ─────────────────────────────────────────────
-export val FLUX_VERSION = "3.0.0"
+// ── Version info — always in sync with package.json ──────────
+import Fs   from "fs"
+import Path from "path"
+
+fn _readFluxVersion():
+  try:
+    val pkgPath = Path.resolve(__dirname, "../../package.json")
+    return JSON.parse(Fs.readFileSync(pkgPath, "utf8")).version
+  catch(e):
+    return "4.0.0"
+
+export val FLUX_VERSION = _readFluxVersion()
 export val FLUX_STAGE   = "self-hosted"
 
 // ── Public API ────────────────────────────────────────────────
@@ -89,7 +99,7 @@ export fn transpile(source, options):
     // ── Stage 5: Code generation ────────────────────────────────
     result.stage = "codegen"
     val indent    = opts.mangle ? "" : "  "
-    val cg        = makeCodeGen({ indent })
+    val cg        = makeCodeGen({ indent, version: FLUX_VERSION })
     val genResult = cg.generate(ast)
     var code      = genResult.code
 

package/src/self/transpiler.js

@@ -1,83 +1 @@
-// Generated by Flux Transpiler v3.2.0
-"use strict";
-
-const { Lexer, lexerize, T } = require("./lexer");
-const { Parser, makeParser } = require("./parser");
-const { CodeGenerator, makeCodeGen } = require("./codegen");
-const { transformCss } = require("./css-preprocessor");
-const { transformJsx, FLUX_H_BROWSER, FLUX_H_SERVER, FLUX_CSS_BROWSER, FLUX_CSS_SERVER } = require("./jsx");
-const { Checker } = require("./checker");
-const { FluxTypeChecker } = require("./type-checker");
-const FLUX_VERSION = "3.0.0";
-module.exports.FLUX_VERSION = FLUX_VERSION;
-const FLUX_STAGE = "self-hosted";
-module.exports.FLUX_STAGE = FLUX_STAGE;
-function transpile(source, options) {
-  const opts = (options ?? {  });
-  const result = { success: false, output: "", ast: null, tokens: null, errors: [], typeErrors: [], typeWarnings: [], stage: "" };
-  try {
-    let src = source;
-    result.stage = "css";
-    if ((opts.css != false)) {
-      src = transformCss(src);
-    }
-    result.stage = "jsx";
-    if (opts.jsx) {
-      const jsxTarget = (opts.jsxTarget ?? "browser");
-      const jsxResult = transformJsx(src, { target: jsxTarget });
-      src = jsxResult.source;
-      if (jsxResult.hasJsx) {
-        opts._jsxHelpers = jsxResult.runtimeHelpers;
-      }
-    }
-    result.stage = "lexer";
-    const lexer = lexerize(src);
-    const tokens = lexer.tokenize();
-    result.tokens = tokens;
-    result.stage = "parser";
-    const ast = makeParser(tokens).parse();
-    result.ast = ast;
-    if ((opts.check != false)) {
-      result.stage = "checker";
-      const checker = new Checker([], []);
-      const checkResult = checker.check(ast);
-      if ((checkResult.errors.length > 0)) {
-        result.errors = checkResult.errors;
-        result.stage = null;
-        return result;
-      }
-    }
-    if (opts.typecheck) {
-      result.stage = "type-checker";
-      const tc = new FluxTypeChecker([], [], new Map(), new Map(), new Map(), new Map());
-      const tcResult = tc.check(ast);
-      result.typeErrors = tcResult.errors;
-      result.typeWarnings = tcResult.warnings;
-      if ((opts.strict && (tcResult.errors.length > 0))) {
-        result.errors = tcResult.errors;
-        result.stage = null;
-        return result;
-      }
-    }
-    result.stage = "codegen";
-    const indent = (opts.mangle ? "" : "  ");
-    const cg = makeCodeGen({ indent });
-    const genResult = cg.generate(ast);
-    let code = genResult.code;
-    if (opts._jsxHelpers) {
-      code = ((opts._jsxHelpers + "\n") + code);
-    }
-    result.output = code;
-    result.success = true;
-    result.stage = null;
-  }
-  catch (e) {
-    result.errors.push({ message: e.message, name: e.name, stage: result.stage });
-  }
-  return result;
-}
-module.exports.transpile = transpile;
-function transpileFile(source, opts) {
-  return transpile(source, { check: true, typecheck: (opts?.typecheck ?? false), jsx: (opts?.jsx ?? false), jsxTarget: (opts?.jsxTarget ?? "browser"), mangle: (opts?.mangle ?? false), strict: (opts?.strict ?? false), ...(opts ?? {  }) });
-}
-module.exports.transpileFile = transpileFile;
+"use strict"; const { Lexer, lexerize, T } = require("./lexer"); const { Parser, makeParser } = require("./parser"); const { CodeGenerator, makeCodeGen } = require("./codegen"); const { transformCss } = require("./css-preprocessor"); const { transformJsx, FLUX_H_BROWSER, FLUX_H_SERVER, FLUX_CSS_BROWSER, FLUX_CSS_SERVER } = require("./jsx"); const { Checker } = require("./checker"); const { FluxTypeChecker } = require("./type-checker"); const Fs = require("fs"); const Path = require("path"); function _a() { try { const pkgPath = Path.resolve(__dirname, "../../package.json"); return JSON.parse(Fs.readFileSync(pkgPath, "utf8")).version; } catch (_b) { return "4.0.0"; } } const FLUX_VERSION = _a(); module.exports.FLUX_VERSION = FLUX_VERSION; const FLUX_STAGE = "self-hosted"; module.exports.FLUX_STAGE = FLUX_STAGE; function transpile(_c, _d) { const opts = (_d ?? {  }); const result = { success: false, output: "", ast: null, tokens: null, errors: [], typeErrors: [], typeWarnings: [], stage: "" }; try { let src = _c; result.stage = "css"; if ((opts.css != false)) { src = transformCss(src); } result.stage = "jsx"; if (opts.jsx) { const jsxTarget = (opts.jsxTarget ?? "browser"); const jsxResult = transformJsx(src, { target: jsxTarget }); src = jsxResult.source; if (jsxResult.hasJsx) { opts._jsxHelpers = jsxResult.runtimeHelpers; } } result.stage = "lexer"; const lexer = lexerize(src); const tokens = lexer.tokenize(); result.tokens = tokens; result.stage = "parser"; const ast = makeParser(tokens).parse(); result.ast = ast; if ((opts.check != false)) { result.stage = "checker"; const checker = new Checker([], []); const checkResult = checker.check(ast); if ((checkResult.errors.length > 0)) { result.errors = checkResult.errors; result.stage = null; return result; } } if (opts.typecheck) { result.stage = "type-checker"; const tc = new FluxTypeChecker([], [], new Map(), new Map(), new Map(), new Map()); const tcResult = tc.check(ast); result.typeErrors = tcResult.errors; result.typeWarnings = tcResult.warnings; if ((opts.strict && (tcResult.errors.length > 0))) { result.errors = tcResult.errors; result.stage = null; return result; } } result.stage = "codegen"; const indent = (opts.mangle ? "" : "  "); const cg = makeCodeGen({ indent, version: FLUX_VERSION }); const genResult = cg.generate(ast); let code = genResult.code; if (opts._jsxHelpers) { code = ((opts._jsxHelpers + "\n") + code); } result.output = code; result.success = true; result.stage = null; } catch (_b) { result.errors.push({ message: _b.message, name: _b.name, stage: result.stage }); } return result; } module.exports.transpile = transpile; function transpileFile(_c, _e) { return transpile(_c, { check: true, typecheck: (_e?.typecheck ?? false), jsx: (_e?.jsx ?? false), jsxTarget: (_e?.jsxTarget ?? "browser"), mangle: (_e?.mangle ?? false), strict: (_e?.strict ?? false), ...(_e ?? {  }) }); } module.exports.transpileFile = transpileFile;

package/src/self/type-checker.flux

@@ -734,6 +734,18 @@ export class FluxTypeChecker:
       clsEnv.set("self", T_OBJECT(shape))
       for m in node.methods: self._checkStmt(m, clsEnv)
 
+    else if node.type == "DeclareDecl":
+      val d = node.decl
+      if d.type == "FnDecl":
+        val retType    = d.retType ? parseAnnotation(d.retType) : null
+        val paramTypes = d.params.map(p -> p.typeAnn ? parseAnnotation(p.typeAnn) : T_UNKNOWN)
+        if d.name: env.set(d.name, T_FN(paramTypes, retType ?? T_UNKNOWN))
+      else if d.type == "VarDecl":
+        val t = d.typeAnn ? parseAnnotation(d.typeAnn) : T_UNKNOWN
+        env.set(d.name, t)
+      else if d.type == "ClassDecl":
+        env.set(d.name, T_NAMED(d.name))
+
     else if node.type == "TypeDecl":
       for v in node.variants:
         if v.fields.length == 0: