@xnoxs/flux-lang 3.4.8 → 3.4.9

package/src/self/bundler.js

@@ -8,6 +8,8 @@ function includes(arr, val) { return arr.includes(val); }
 
 function trim(s) { return String(s).trim(); }
 
+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); }
@@ -120,10 +122,8 @@ class Bundler {
       lines.push("\"use strict\";");
       lines.push("");
     }
-    // flux_modules resolver: patches Module._resolveFilename so require() looks in
-    // flux_modules/node_modules/ first (packages installed via `flux install`).
     lines.push("// flux_modules resolver");
-    lines.push("(function(){var _p=require('path'),_fs=require('fs'),_M=require('module'),_d=_p.join(process.cwd(),'flux_modules','node_modules');if(_fs.existsSync(_d)){var _o=_M._resolveFilename.bind(_M);_M._resolveFilename=function(r,p,m,op){if(!r.startsWith('.')&&!r.startsWith('/')&&!r.startsWith('node:')){var _fp=_p.join(_d,r.split('/')[0]);if(_fs.existsSync(_fp)){try{return _o(_p.join(_d,r),p,m,op);}catch(_e){}}}return _o(r,p,m,op);};}})();");
+    lines.push(`(function()${var _p=require('path'),_fs=require('fs'),_M=require('module'),_d=_p.join(process.cwd(),'flux_modules','node_modules');if(_fs.existsSync(_d)){var _o=_M._resolveFilename.bind(_M);_M._resolveFilename=function(r,p,m,op){if(!r.startsWith('.')&&!r.startsWith('/')&&!r.startsWith('node:')){var _fp=_p.join(_d,r.split('/')[0]);if(_fs.existsSync(_fp)){try{return _o(_p.join(_d,r),p,m,op);}catch(_e){}}}return _o(r,p,m,op);};}})();`);
     lines.push("");
     lines.push("(function() {");
     lines.push("");

package/src/self/cli.js

@@ -57,7 +57,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: "\x1b[0m", bold: "\x1b[1m", dim: "\x1b[2m", red: "\x1b[31m", green: "\x1b[32m", yellow: "\x1b[33m", blue: "\x1b[34m", cyan: "\x1b[36m", white: "\x1b[37m", gray: "\x1b[90m", magenta: "\x1b[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));

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,7 +21,7 @@ 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" };
 function clr(c, s) {
   return ((c + s) + C.reset);
 }
@@ -142,8 +144,9 @@ 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)) {
@@ -156,38 +159,36 @@ async function cmdInstall(opts) {
     console.log(((clr(C.gray, "  ○ ") + name) + clr(C.gray, ("@" + spec))));
   }
   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);
   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);
+      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;
-      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);
+      info(("Running: " + devCmd));
+      execSync(devCmd, { cwd, stdio: "inherit" });
     }
     console.log();
-    ok(names.length + " package(s) installed into flux_modules/node_modules/");
+    ok((names.length + " package(s) installed into flux_modules/node_modules/"));
     info("Packages resolve automatically when using: flux run, flux bundle");
-  } catch (e) {
+  }
+  catch (e) {
     console.log();
-    err("Install failed: " + e.message);
+    err(("Install failed: " + e.message));
     info("Try manually: npm install --prefix ./flux_modules <package>");
   }
   console.log();
@@ -311,79 +312,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));
 }