@xnoxs/flux-lang 4.0.4 → 4.0.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xnoxs/flux-lang",
-  "version": "4.0.4",
+  "version": "4.0.5",
   "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",

package/src/self/bundler.flux

@@ -3,6 +3,8 @@
 //  src/self/bundler.flux — written in Flux, compiled by stage-0
 //
 //  Bundles multiple Flux modules into a single JS file.
+//  Resolves all inter-file .flux imports recursively.
+//  npm packages (non-relative imports) remain as require() calls.
 // ============================================================
 
 import Fs   from "fs"
@@ -16,17 +18,25 @@ fn toModuleId(absPath):
   return '_flux_' + base.replace(/[^a-zA-Z0-9]/g, '_')
 
 fn extractModuleInfo(ast, fromFile):
-  val imports = []
-  val exports = []
-  val body    = []
-  val dir     = Path.dirname(fromFile)
+  val imports    = []
+  val npmImports = []
+  val exports    = []
+  val body       = []
+  val dir        = Path.dirname(fromFile)
 
   for node in ast.body:
     if node.type == 'ImportDecl':
-      var src = node.source
-      if not src.endsWith('.flux'): src = src + '.flux'
-      val absPath = Path.resolve(dir, src)
-      imports.push({ names: node.names, source: node.source, absPath })
+      val src = node.source
+      // Relative import → resolve as .flux file
+      if src.startsWith('./') or src.startsWith('../'):
+        var resolved = src
+        if not resolved.endsWith('.flux'): resolved = resolved + '.flux'
+        val absPath = Path.resolve(dir, resolved)
+        imports.push({ names: node.names, source: node.source, absPath })
+      else:
+        // npm package import — keep as-is (require in output)
+        npmImports.push({ names: node.names, source: src })
+        body.push(node)
 
     else if node.type == 'ExportDecl':
       val inner = node.decl
@@ -38,7 +48,7 @@ fn extractModuleInfo(ast, fromFile):
     else:
       body.push(node)
 
-  return { cleanAst: { type: 'Program', body }, imports, exports }
+  return { cleanAst: { type: 'Program', body }, imports, npmImports, exports }
 
 fn codegenModule(ast):
   val cg = makeCodeGen({ indent: '    ' })
@@ -80,6 +90,7 @@ export class Bundler:
     val info = extractModuleInfo(ast, absPath)
     self.modules.set(absPath, { cleanAst: info.cleanAst, imports: info.imports, exports: info.exports, source, absPath })
 
+    // Recursively collect all .flux imports
     for imp in info.imports:
       self.collect(imp.absPath)
 
@@ -98,12 +109,6 @@ export 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('')
-
     lines.push('(function() {')
     lines.push('')
 
@@ -125,7 +130,7 @@ export class Bundler:
       for imp in mod.imports:
         val srcId = toModuleId(imp.absPath)
         for name in imp.names:
-          val localName = name.alias ?? name.name
+          val localName    = name.alias ?? name.name
           val importedName = name.name
           lines.push('    var ' + localName + ' = ' + srcId + '._exports ? ' + srcId + '._exports.' + importedName + ' : ' + srcId + '.' + importedName + ';')
 

package/src/self/bundler.js

@@ -1,23 +1,6 @@
-/* compiled from src/self/bundler.flux by Flux Lang */
+/* compiled from src/self/bundler.flux */
 'use strict';
-// ── 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
+// Generated by Flux Transpiler v3.5.3 (self-hosted)
 "use strict";
 
 const Fs = require("fs");