@xnoxs/flux-lang 4.0.1 → 4.0.3

package/CHANGELOG.md

@@ -7,6 +7,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ---
 
+## [4.0.2] — 2026-06-28
+
+### Fixed
+- **CLI test runner — `dist/transpiler.js` shim**: The `flux test` command
+  failed with `Cannot find module 'dist/transpiler.js'` when installed from npm.
+  The CLI resolves its own module directory at runtime (`__dirname` inside
+  `dist/flux-cli.js`), expecting a sibling `transpiler.js`. Added a permanent
+  compatibility shim (`dist/transpiler.js`) that re-exports the main CJS bundle,
+  so `flux test` works correctly out of the box after `npm install`.
+
+---
+
 ## [4.0.1] — 2026-06-28
 
 ### Fixed

package/dist/flux-cli.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 /*!
- * flux-lang v4.0.1
+ * flux-lang v4.0.3
  * Flux — A modern language that transpiles to JavaScript. Python-clean syntax, TypeScript-level safety, Rust-inspired pattern matching.
  * (c) 2026 Flux Lang Contributors
  * Released under the MIT License
@@ -349,7 +349,7 @@ var require_lexer = __commonJS({
           if (this.ch() === "\\") {
             this.adv();
             const e = this.adv();
-            s += { n: "\n", t: "	", "`": "`", "\\": "\\" }[e] || "\\" + e;
+            s += { n: "\n", t: "        ", "`": "`", "\\": "\\" }[e] || "\\" + e;
           } else {
             s += this.adv();
           }
@@ -385,7 +385,7 @@ var require_lexer = __commonJS({
               this.pos += 2;
               text += String.fromCharCode(parseInt(hex, 16));
             } else {
-              text += { n: "\n", t: "	", r: "\r", '"': '"', "'": "'", "\\": "\\", "{": "{", "}": "}" }[e] || "\\" + e;
+              text += { n: "\n", t: "   ", r: "\r", '"': '"', "'": "'", "\\": "\\", "{": "{", "}": "}" }[e] || "\\" + e;
             }
           } else if (this.ch() === "{") {
             parts.push({ type: "text", value: text });
@@ -473,8 +473,8 @@ var require_lexer = __commonJS({
           if (bol) {
             bol = false;
             let indent = 0;
-            while (this.ch() === " " || this.ch() === "	") {
-              indent += this.ch() === "	" ? 4 : 1;
+            while (this.ch() === " " || this.ch() === " ") {
+              indent += this.ch() === " " ? 4 : 1;
               this.adv();
             }
             if (this.ch() === "\n" || !this.ch()) {
@@ -515,7 +515,7 @@ var require_lexer = __commonJS({
             }
             continue;
           }
-          if (cur === " " || cur === "	") {
+          if (cur === " " || cur === "  ") {
             this.adv();
             continue;
           }
@@ -590,7 +590,7 @@ var require_lexer = __commonJS({
                   this.pos += 2;
                   s += String.fromCharCode(parseInt(hex, 16));
                 } else {
-                  s += { n: "\n", t: "	", r: "\r", "'": "'", "\\": "\\" }[e] || "\\" + e;
+                  s += { n: "\n", t: "  ", r: "\r", "'": "'", "\\": "\\" }[e] || "\\" + e;
                 }
               } else {
                 s += this.adv();
@@ -2652,6 +2652,7 @@ function _fmt(v, s) {
         this.smBuilder = opts.smBuilder || null;
         this._needsFmt = false;
         this._loopDepth = 0;
+        this._fnDepth = 0;
       }
       i() {
         return this.ind.repeat(this.level);
@@ -2789,7 +2790,9 @@ function _fmt(v, s) {
         } else {
           this.emit(`${prefix}${asyncKw}function ${name}(${params}) {`);
           this.in();
+          this._fnDepth++;
           for (const s of node.body) this.genStmt(s);
+          this._fnDepth--;
           this.out();
           this.emit("}");
         }
@@ -2981,8 +2984,10 @@ function _fmt(v, s) {
             const exprSrc = this.genExpr(arm.body[0].expr);
             if (this._loopDepth > 0) {
               this.emit(`${exprSrc};`);
-            } else {
+            } else if (this._fnDepth > 0) {
               this.emit(`return ${exprSrc};`);
+            } else {
+              this.emit(`${exprSrc};`);
             }
           } else {
             arm.body.forEach((s) => this.genStmt(s));
@@ -3231,11 +3236,13 @@ function _fmt(v, s) {
             const savedLevel = this.level;
             const savedLoopDepth = this._loopDepth;
             this._loopDepth = 0;
+            this._fnDepth++;
             this.emit("(() => {");
             this.in();
             this.genMatch(node);
             this.out();
             this.emit("})()");
+            this._fnDepth--;
             this._loopDepth = savedLoopDepth;
             const block = this.lines.splice(saved).map((l) => l.trimStart()).join(" ");
             this.level = savedLevel;
@@ -3569,7 +3576,7 @@ var require_jsx = __commonJS({
         const next = this.src[this.pos + 1] || "";
         if (!(next === ">" || next >= "a" && next <= "z" || next >= "A" && next <= "Z")) return false;
         let i = this.pos - 1;
-        while (i >= 0 && (this.src[i] === " " || this.src[i] === "	")) i--;
+        while (i >= 0 && (this.src[i] === " " || this.src[i] === "      ")) i--;
         if (i < 0) return true;
         const prev = this.src[i];
         if ("=([{,:>\n?".includes(prev)) return true;
@@ -3798,7 +3805,7 @@ var require_jsx = __commonJS({
       }
       // ── Skip whitespace (not newlines) ────────────────────────────
       skipWs() {
-        while (this.pos < this.src.length && (this.src[this.pos] === " " || this.src[this.pos] === "	")) this.pos++;
+        while (this.pos < this.src.length && (this.src[this.pos] === " " || this.src[this.pos] === "    ")) this.pos++;
       }
     };
     var FLUX_H_BROWSER = `
@@ -4622,7 +4629,7 @@ ${innerCss}${ind}}
           const charAfter = this.src[this.pos + 3] || "";
           if (!/[a-zA-Z0-9_]/.test(charBefore) && !/[a-zA-Z0-9_]/.test(charAfter)) {
             let j = this.pos + 3;
-            while (j < this.src.length && (this.src[j] === " " || this.src[j] === "	" || this.src[j] === "\n" || this.src[j] === "\r")) j++;
+            while (j < this.src.length && (this.src[j] === " " || this.src[j] === "     " || this.src[j] === "\n" || this.src[j] === "\r")) j++;
             if (this.src[j] === "{") {
               j++;
               let depth = 1;
@@ -7255,12 +7262,10 @@ var require_bundler = __commonJS({
           }
           for (const imp of imports) {
             const srcId = toModuleId(imp.absPath);
-            if (imp.names.length === 1) {
-              lines.push(`    var ${imp.names[0]} = ${srcId};`);
-            } else {
-              for (const name of imp.names) {
-                lines.push(`    var ${name} = ${srcId}._exports ? ${srcId}._exports.${name} : ${srcId}.${name};`);
-              }
+            for (const name of imp.names) {
+              const localName = name.alias ?? name.name;
+              const importedName = name.name;
+              lines.push(`    var ${localName} = ${srcId}._exports ? ${srcId}._exports.${importedName} : ${srcId}.${importedName};`);
             }
           }
           if (imports.length > 0) lines.push("");

package/dist/flux.cjs.js

@@ -1,5 +1,5 @@
 /*!
- * flux-lang v4.0.1
+ * flux-lang v4.0.3
  * Flux — A modern language that transpiles to JavaScript. Python-clean syntax, TypeScript-level safety, Rust-inspired pattern matching.
  * (c) 2026 Flux Lang Contributors
  * Released under the MIT License
@@ -278,7 +278,7 @@ var require_lexer = __commonJS({
           if (this.ch() === "\\") {
             this.adv();
             const e = this.adv();
-            s += { n: "\n", t: "	", "`": "`", "\\": "\\" }[e] || "\\" + e;
+            s += { n: "\n", t: "        ", "`": "`", "\\": "\\" }[e] || "\\" + e;
           } else {
             s += this.adv();
           }
@@ -314,7 +314,7 @@ var require_lexer = __commonJS({
               this.pos += 2;
               text += String.fromCharCode(parseInt(hex, 16));
             } else {
-              text += { n: "\n", t: "	", r: "\r", '"': '"', "'": "'", "\\": "\\", "{": "{", "}": "}" }[e] || "\\" + e;
+              text += { n: "\n", t: "   ", r: "\r", '"': '"', "'": "'", "\\": "\\", "{": "{", "}": "}" }[e] || "\\" + e;
             }
           } else if (this.ch() === "{") {
             parts.push({ type: "text", value: text });
@@ -402,8 +402,8 @@ var require_lexer = __commonJS({
           if (bol) {
             bol = false;
             let indent = 0;
-            while (this.ch() === " " || this.ch() === "	") {
-              indent += this.ch() === "	" ? 4 : 1;
+            while (this.ch() === " " || this.ch() === " ") {
+              indent += this.ch() === " " ? 4 : 1;
               this.adv();
             }
             if (this.ch() === "\n" || !this.ch()) {
@@ -444,7 +444,7 @@ var require_lexer = __commonJS({
             }
             continue;
           }
-          if (cur === " " || cur === "	") {
+          if (cur === " " || cur === "  ") {
             this.adv();
             continue;
           }
@@ -519,7 +519,7 @@ var require_lexer = __commonJS({
                   this.pos += 2;
                   s += String.fromCharCode(parseInt(hex, 16));
                 } else {
-                  s += { n: "\n", t: "	", r: "\r", "'": "'", "\\": "\\" }[e] || "\\" + e;
+                  s += { n: "\n", t: "  ", r: "\r", "'": "'", "\\": "\\" }[e] || "\\" + e;
                 }
               } else {
                 s += this.adv();
@@ -2581,6 +2581,7 @@ function _fmt(v, s) {
         this.smBuilder = opts.smBuilder || null;
         this._needsFmt = false;
         this._loopDepth = 0;
+        this._fnDepth = 0;
       }
       i() {
         return this.ind.repeat(this.level);
@@ -2718,7 +2719,9 @@ function _fmt(v, s) {
         } else {
           this.emit(`${prefix}${asyncKw}function ${name}(${params}) {`);
           this.in();
+          this._fnDepth++;
           for (const s of node.body) this.genStmt(s);
+          this._fnDepth--;
           this.out();
           this.emit("}");
         }
@@ -2910,8 +2913,10 @@ function _fmt(v, s) {
             const exprSrc = this.genExpr(arm.body[0].expr);
             if (this._loopDepth > 0) {
               this.emit(`${exprSrc};`);
-            } else {
+            } else if (this._fnDepth > 0) {
               this.emit(`return ${exprSrc};`);
+            } else {
+              this.emit(`${exprSrc};`);
             }
           } else {
             arm.body.forEach((s) => this.genStmt(s));
@@ -3160,11 +3165,13 @@ function _fmt(v, s) {
             const savedLevel = this.level;
             const savedLoopDepth = this._loopDepth;
             this._loopDepth = 0;
+            this._fnDepth++;
             this.emit("(() => {");
             this.in();
             this.genMatch(node);
             this.out();
             this.emit("})()");
+            this._fnDepth--;
             this._loopDepth = savedLoopDepth;
             const block = this.lines.splice(saved).map((l) => l.trimStart()).join(" ");
             this.level = savedLevel;
@@ -3498,7 +3505,7 @@ var require_jsx = __commonJS({
         const next = this.src[this.pos + 1] || "";
         if (!(next === ">" || next >= "a" && next <= "z" || next >= "A" && next <= "Z")) return false;
         let i = this.pos - 1;
-        while (i >= 0 && (this.src[i] === " " || this.src[i] === "	")) i--;
+        while (i >= 0 && (this.src[i] === " " || this.src[i] === "      ")) i--;
         if (i < 0) return true;
         const prev = this.src[i];
         if ("=([{,:>\n?".includes(prev)) return true;
@@ -3727,7 +3734,7 @@ var require_jsx = __commonJS({
       }
       // ── Skip whitespace (not newlines) ────────────────────────────
       skipWs() {
-        while (this.pos < this.src.length && (this.src[this.pos] === " " || this.src[this.pos] === "	")) this.pos++;
+        while (this.pos < this.src.length && (this.src[this.pos] === " " || this.src[this.pos] === "    ")) this.pos++;
       }
     };
     var FLUX_H_BROWSER = `
@@ -4551,7 +4558,7 @@ ${innerCss}${ind}}
           const charAfter = this.src[this.pos + 3] || "";
           if (!/[a-zA-Z0-9_]/.test(charBefore) && !/[a-zA-Z0-9_]/.test(charAfter)) {
             let j = this.pos + 3;
-            while (j < this.src.length && (this.src[j] === " " || this.src[j] === "	" || this.src[j] === "\n" || this.src[j] === "\r")) j++;
+            while (j < this.src.length && (this.src[j] === " " || this.src[j] === "     " || this.src[j] === "\n" || this.src[j] === "\r")) j++;
             if (this.src[j] === "{") {
               j++;
               let depth = 1;
@@ -7276,12 +7283,10 @@ var require_bundler = __commonJS({
           }
           for (const imp of imports) {
             const srcId = toModuleId(imp.absPath);
-            if (imp.names.length === 1) {
-              lines.push(`    var ${imp.names[0]} = ${srcId};`);
-            } else {
-              for (const name of imp.names) {
-                lines.push(`    var ${name} = ${srcId}._exports ? ${srcId}._exports.${name} : ${srcId}.${name};`);
-              }
+            for (const name of imp.names) {
+              const localName = name.alias ?? name.name;
+              const importedName = name.name;
+              lines.push(`    var ${localName} = ${srcId}._exports ? ${srcId}._exports.${importedName} : ${srcId}.${importedName};`);
             }
           }
           if (imports.length > 0) lines.push("");

package/dist/transpiler.js

@@ -0,0 +1,4 @@
+'use strict';
+// Compatibility shim — redirects require('./transpiler') to the main CJS bundle.
+// Required by the CLI test-runner which resolves module paths from __dirname.
+module.exports = require('./flux.cjs.js');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xnoxs/flux-lang",
-  "version": "4.0.1",
+  "version": "4.0.3",
   "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",
@@ -84,4 +84,4 @@
   "devDependencies": {
     "esbuild": "^0.28.1"
   }
-}
+}

package/src/self/bundler.flux

@@ -124,11 +124,10 @@ export class Bundler:
 
       for imp in mod.imports:
         val srcId = toModuleId(imp.absPath)
-        if imp.names.length == 1:
-          lines.push('    var ' + imp.names[0] + ' = ' + srcId + ';')
-        else:
-          for name in imp.names:
-            lines.push('    var ' + name + ' = ' + srcId + '._exports ? ' + srcId + '._exports.' + name + ' : ' + srcId + '.' + name + ';')
+        for name in imp.names:
+          val localName = name.alias ?? name.name
+          val importedName = name.name
+          lines.push('    var ' + localName + ' = ' + srcId + '._exports ? ' + srcId + '._exports.' + importedName + ' : ' + srcId + '.' + importedName + ';')
 
       if mod.imports.length > 0: lines.push('')
 

package/src/self/bundler.js

@@ -1,198 +1 @@
-// ── Flux stdlib ──
-
-function findIndex(arr, fn) { return arr.findIndex(fn); }
-
-function join(arr, sep) { return arr.join(sep != null ? sep : ','); }
-
-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); }
-// ── end stdlib ──
-
-// Generated by Flux Transpiler v3.2.0
-"use strict";
-
-const Fs = require("fs");
-const Path = require("path");
-const { lexerize } = require("./lexer");
-const { makeParser } = require("./parser");
-const { makeCodeGen } = require("./codegen");
-function toModuleId(absPath) {
-  const base = Path.basename(absPath, ".flux");
-  return ("_flux_" + base.replace(/[^a-zA-Z0-9]/g, "_"));
-}
-function extractModuleInfo(ast, fromFile) {
-  const imports = [];
-  const exports = [];
-  const body = [];
-  const dir = Path.dirname(fromFile);
-  for (const node of ast.body) {
-    if ((node.type == "ImportDecl")) {
-      let src = node.source;
-      if (!src.endsWith(".flux")) {
-        src = (src + ".flux");
-      }
-      const absPath = Path.resolve(dir, src);
-      imports.push({ names: node.names, source: node.source, absPath });
-    }
-    else if ((node.type == "ExportDecl")) {
-      const inner = node.decl;
-      if ((inner.type == "FnDecl")) {
-        exports.push(inner.name);
-      }
-      if ((inner.type == "ClassDecl")) {
-        exports.push(inner.name);
-      }
-      if ((inner.type == "VarDecl")) {
-        exports.push(inner.name);
-      }
-      body.push(inner);
-    }
-    else {
-      body.push(node);
-    }
-  }
-  return { cleanAst: { type: "Program", body }, imports, exports };
-}
-function codegenModule(ast) {
-  const cg = makeCodeGen({ indent: "    " });
-  const result = cg.generate(ast);
-  const lines = result.code.split("\n");
-  const start = lines.findIndex((l) => (((l.trim() != "") && !l.includes("Generated by Flux")) && !l.includes("\"use strict\"")));
-  return lines.slice(start).join("\n");
-}
-class Bundler {
-  constructor(entryFile, options, modules, order, visited, inStack) {
-    this.entryFile = entryFile;
-    this.options = options;
-    this.modules = modules;
-    this.order = order;
-    this.visited = visited;
-    this.inStack = inStack;
-  }
-
-  bundle() {
-    this.collect(this.entryFile);
-    return this.link();
-  }
-
-  collect(absPath) {
-    if (this.visited.has(absPath)) {
-      return;
-    }
-    if (this.inStack.has(absPath)) {
-      throw new Error(((("[" + Path.basename(absPath)) + "] Circular dependency detected: ") + absPath));
-    }
-    if (!Fs.existsSync(absPath)) {
-      throw new Error(((("[" + Path.basename(absPath)) + "] File not found: ") + absPath));
-    }
-    this.inStack.add(absPath);
-    const source = Fs.readFileSync(absPath, "utf8");
-    let ast = null;
-    try {
-      const tokens = lexerize(source).tokenize();
-      ast = makeParser(tokens).parse();
-    }
-    catch (e) {
-      throw new Error(((("[" + Path.basename(absPath)) + "] Parse error: ") + e.message));
-    }
-    const info = extractModuleInfo(ast, absPath);
-    this.modules.set(absPath, { cleanAst: info.cleanAst, imports: info.imports, exports: info.exports, source, absPath });
-    for (const imp of info.imports) {
-      this.collect(imp.absPath);
-    }
-    this.inStack.delete(absPath);
-    this.visited.add(absPath);
-    this.order.push(absPath);
-  }
-
-  link() {
-    const lines = [];
-    const banner = (this.options.banner != false);
-    if (banner) {
-      lines.push("// Generated by Flux Bundler (self-hosted)");
-      lines.push(("// Entry: " + Path.basename(this.entryFile)));
-      lines.push(("// Modules: " + this.order.length));
-      lines.push("\"use strict\";");
-      lines.push("");
-    }
-    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("");
-    lines.push("(function() {");
-    lines.push("");
-    for (const absPath of this.order) {
-      const mod = this.modules.get(absPath);
-      const isEntry = (absPath == this.entryFile);
-      const modId = toModuleId(absPath);
-      const relName = Path.relative(process.cwd(), absPath);
-      lines.push(("  // " + "─".repeat(60)));
-      lines.push(("  // Module: " + relName));
-      lines.push(("  // " + "─".repeat(60)));
-      if (!isEntry) {
-        lines.push((("  var " + modId) + " = (function() {"));
-        lines.push("    var _exports = {};");
-        lines.push("");
-      }
-      for (const imp of mod.imports) {
-        const srcId = toModuleId(imp.absPath);
-        if ((imp.names.length == 1)) {
-          lines.push((((("    var " + imp.names[0]) + " = ") + srcId) + ";"));
-        }
-        else {
-          for (const name of imp.names) {
-            lines.push((((((((((((("    var " + name) + " = ") + srcId) + "._exports ? ") + srcId) + "._exports.") + name) + " : ") + srcId) + ".") + name) + ";"));
-          }
-        }
-      }
-      if ((mod.imports.length > 0)) {
-        lines.push("");
-      }
-      const moduleCode = codegenModule(mod.cleanAst);
-      lines.push(moduleCode);
-      if (!isEntry) {
-        if ((mod.exports.length > 0)) {
-          lines.push("");
-          for (const expName of mod.exports) {
-            lines.push((((("    _exports." + expName) + " = ") + expName) + ";"));
-          }
-        }
-        lines.push("");
-        lines.push("    return _exports;");
-        lines.push("  })()");
-        lines.push((((("  " + modId) + "._exports = ") + modId) + ";"));
-      }
-      lines.push("");
-    }
-    lines.push("})();");
-    return { code: lines.join("\n"), modules: this.order.length };
-  }
-
-}
-
-module.exports.Bundler = Bundler;
-function makeBundler(entryFile, options) {
-  return new Bundler(Path.resolve(entryFile), (options ?? {  }), new Map(), [], new Set(), new Set());
-}
-module.exports.makeBundler = makeBundler;
-function bundle(entryFile, options) {
-  const result = { success: false, code: "", modules: 0, errors: [] };
-  try {
-    const b = makeBundler(entryFile, options);
-    const out = b.bundle();
-    result.code = out.code;
-    result.modules = out.modules;
-    result.success = true;
-  }
-  catch (e) {
-    result.errors.push({ message: e.message, name: e.name, file: null });
-  }
-  return result;
-}
-module.exports.bundle = bundle;
+function findIndex(arr, fn) { return arr.findIndex(fn); } function join(arr, sep) { return arr.join(sep != null ? sep : ','); } 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); } "use strict"; const Fs = require("fs"); const Path = require("path"); const { lexerize } = require("./lexer"); const { makeParser } = require("./parser"); const { makeCodeGen } = require("./codegen"); function _a(_d) { const base = Path.basename(_d, ".flux"); return ("_flux_" + base.replace(/[^a-zA-Z0-9]/g, "_")); } function _b(_e, _f) { const imports = []; const exports = []; const body = []; const dir = Path.dirname(_f); for (const _g of _e.body) { if ((_g.type == "ImportDecl")) { let src = _g.source; if (!src.endsWith(".flux")) { src = (src + ".flux"); } const _d = Path.resolve(dir, src); imports.push({ names: _g.names, source: _g.source, absPath: _d }); } else if ((_g.type == "ExportDecl")) { const inner = _g.decl; if ((inner.type == "FnDecl")) { exports.push(inner.name); } if ((inner.type == "ClassDecl")) { exports.push(inner.name); } if ((inner.type == "VarDecl")) { exports.push(inner.name); } body.push(inner); } else { body.push(_g); } } return { cleanAst: { type: "Program", body }, imports, exports }; } function _c(_e) { const cg = makeCodeGen({ indent: "    " }); const result = cg.generate(_e); const lines = result.code.split("\n"); const start = lines.findIndex((_h) => (((_h.trim() != "") && !_h.includes("Generated by Flux")) && !_h.includes("\"use strict\""))); return lines.slice(start).join("\n"); } class Bundler { constructor(entryFile, options, modules, order, visited, inStack) { this.entryFile = entryFile; this.options = options; this.modules = modules; this.order = order; this.visited = visited; this.inStack = inStack; } bundle() { this.collect(this.entryFile); return this.link(); } collect(_d) { if (this.visited.has(_d)) { return; } if (this.inStack.has(_d)) { throw new Error(((("[" + Path.basename(_d)) + "] Circular dependency detected: ") + _d)); } if (!Fs.existsSync(_d)) { throw new Error(((("[" + Path.basename(_d)) + "] File not found: ") + _d)); } this.inStack.add(_d); const source = Fs.readFileSync(_d, "utf8"); let _e = null; try { const tokens = lexerize(source).tokenize(); _e = makeParser(tokens).parse(); } catch (_i) { throw new Error(((("[" + Path.basename(_d)) + "] Parse error: ") + _i.message)); } const info = _b(_e, _d); this.modules.set(_d, { cleanAst: info.cleanAst, imports: info.imports, exports: info.exports, source, absPath: _d }); for (const _j of info.imports) { this.collect(_j.absPath); } this.inStack.delete(_d); this.visited.add(_d); this.order.push(_d); } link() { const lines = []; const banner = (this.options.banner != false); if (banner) { lines.push("// Generated by Flux Bundler (self-hosted)"); lines.push(("// Entry: " + Path.basename(this.entryFile))); lines.push(("// Modules: " + this.order.length)); lines.push("\"use strict\";"); lines.push(""); } 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('_g:')){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(""); for (const _d of this.order) { const mod = this.modules.get(_d); const isEntry = (_d == this.entryFile); const modId = _a(_d); const relName = Path.relative(process.cwd(), _d); lines.push(("  // " + "─".repeat(60))); lines.push(("  // Module: " + relName)); lines.push(("  // " + "─".repeat(60))); if (!isEntry) { lines.push((("  var " + modId) + " = (function() {")); lines.push("    var _exports = {};"); lines.push(""); } for (const _j of mod.imports) { const srcId = _a(_j.absPath); for (const _k of _j.names) { const localName = (_k.alias ?? _k.name); const importedName = _k.name; lines.push((((((((((((("    var " + localName) + " = ") + srcId) + "._exports ? ") + srcId) + "._exports.") + importedName) + " : ") + srcId) + ".") + importedName) + ";")); } } if ((mod.imports.length > 0)) { lines.push(""); } const moduleCode = _c(mod.cleanAst); lines.push(moduleCode); if (!isEntry) { if ((mod.exports.length > 0)) { lines.push(""); for (const _l of mod.exports) { lines.push((((("    _exports." + _l) + " = ") + _l) + ";")); } } lines.push(""); lines.push("    return _exports;"); lines.push("  })()"); lines.push((((("  " + modId) + "._exports = ") + modId) + ";")); } lines.push(""); } lines.push("})();"); return { code: lines.join("\n"), modules: this.order.length }; } } module.exports.Bundler = Bundler; function makeBundler(_m, _n) { return new Bundler(Path.resolve(_m), (_n ?? {  }), new Map(), [], new Set(), new Set()); } module.exports.makeBundler = makeBundler; function bundle(_m, _n) { const result = { success: false, code: "", modules: 0, errors: [] }; try { const b = makeBundler(_m, _n); const out = b.bundle(); result.code = out.code; result.modules = out.modules; result.success = true; } catch (_i) { result.errors.push({ message: _i.message, name: _i.name, file: null }); } return result; } module.exports.bundle = bundle;

package/src/self/codegen.flux

@@ -54,6 +54,7 @@ export class CodeGenerator:
   smBuilder: any
   _needsFmt: bool
   _loopDepth: int
+  _fnDepth: int
   _version: string
 
   fn i():
@@ -166,7 +167,9 @@ export class CodeGenerator:
     else:
       self.emit(prefix + asyncKw + 'function ' + name + '(' + params + ') {')
       self.indIn()
+      self._fnDepth = self._fnDepth + 1
       for s in node.body: self.genStmt(s)
+      self._fnDepth = self._fnDepth - 1
       self.indOut()
       self.emit('}')
 
@@ -200,7 +203,9 @@ export class CodeGenerator:
       else:
         self.emit(staticKw + asyncKw + m.name + '(' + params + ') {')
         self.indIn()
+        self._fnDepth = self._fnDepth + 1
         for s in m.body: self.genStmt(s)
+        self._fnDepth = self._fnDepth - 1
         self.indOut()
         self.emit('}')
       self.blank()
@@ -304,8 +309,10 @@ export class CodeGenerator:
         val exprSrc = self.genExpr(arm.body[0].expr)
         if self._loopDepth > 0:
           self.emit(exprSrc + ';')
-        else:
+        else if self._fnDepth > 0:
           self.emit('return ' + exprSrc + ';')
+        else:
+          self.emit(exprSrc + ';')
       else:
         for s in arm.body: self.genStmt(s)
       self.indOut()
@@ -492,11 +499,13 @@ export class CodeGenerator:
       val savedLevel = self.level
       val savedLoop = self._loopDepth
       self._loopDepth = 0
+      self._fnDepth = self._fnDepth + 1
       self.emit('(() => {')
       self.indIn()
       self.genMatch(node)
       self.indOut()
       self.emit('})()')
+      self._fnDepth = self._fnDepth - 1
       self._loopDepth = savedLoop
       val block = self.lines.splice(saved).map(l -> l.trimStart()).join(' ')
       self.level = savedLevel