@xnoxs/flux-lang 3.2.1 → 3.3.0

package/index.js

@@ -13,6 +13,7 @@ const { buildStdlib, detectUsedSymbols, STDLIB_SYMBOLS } = require('./src/stdlib
 const { Lexer }                            = require('./src/lexer');
 const { Parser }                           = require('./src/parser');
 const { bundle }                           = require('./src/bundler');
+const { loadConfig, mergeConfig, defineConfig } = require('./src/config');
 
 module.exports = {
   transpile,
@@ -23,4 +24,7 @@ module.exports = {
   Lexer,
   Parser,
   bundle,
+  loadConfig,
+  mergeConfig,
+  defineConfig,
 };

package/package.json

@@ -1,34 +1,44 @@
 {
   "name": "@xnoxs/flux-lang",
-  "version": "3.2.1",
+  "version": "3.3.0",
   "description": "Flux — A modern language that transpiles to JavaScript. Python-clean syntax, TypeScript-level safety, Rust-inspired pattern matching.",
-  "main": "index.js",
+  "main": "dist/flux.cjs.js",
+  "module": "dist/flux.esm.js",
   "types": "index.d.ts",
   "bin": {
     "flux": "./bin/flux.js"
   },
   "scripts": {
-    "build":     "node scripts/build.js",
+    "build": "node scripts/build.js",
     "prepublishOnly": "npm test && npm run build",
-    "test":      "node bin/flux.js test tests/",
-    "test:file": "node bin/flux.js test",
-    "check":     "node bin/flux.js check tests/01_basics.test.flux",
-    "bench":     "node benchmarks/bench.js",
-    "start":     "node bin/flux.js run app/server.flux",
-    "repl":      "node bin/flux.js repl",
-    "version":   "node bin/flux.js version"
+    "test": "node src/cli.js test tests/",
+    "test:file": "node src/cli.js test",
+    "check": "node src/cli.js check tests/01_basics.test.flux",
+    "bench": "node benchmarks/bench.js",
+    "start": "node src/cli.js run app/server.flux",
+    "repl": "node src/cli.js repl",
+    "version": "node src/cli.js version"
   },
   "exports": {
-    ".":          "./index.js",
-    "./stdlib":   "./src/stdlib.js",
-    "./formatter":"./src/formatter.js",
+    ".": {
+      "import": "./dist/flux.esm.js",
+      "require": "./dist/flux.cjs.js",
+      "default": "./dist/flux.cjs.js"
+    },
+    "./config": "./src/config.js",
     "./dist/cjs": "./dist/flux.cjs.js",
-    "./dist/esm": "./dist/flux.esm.js"
+    "./dist/esm": "./dist/flux.esm.js",
+    "./dist/min": "./dist/flux.min.js",
+    "./stdlib": "./src/stdlib.js",
+    "./formatter": "./src/formatter.js"
   },
   "files": [
     "bin/",
-    "src/",
     "dist/",
+    "src/stdlib.js",
+    "src/formatter.js",
+    "src/config.js",
+    "src/self/",
     "scripts/build.js",
     "index.js",
     "index.d.ts",

package/scripts/build.js

@@ -5,9 +5,10 @@
  * Flux Lang — esbuild bundle script
  *
  * Produces:
- *   dist/flux.cjs.js   — CommonJS bundle (Node, require())
- *   dist/flux.esm.js   — ESM bundle (import / bundlers)
- *   dist/flux.min.js   — Minified CJS bundle (browser / CDN)
+ *   dist/flux.cjs.js   — Library CJS bundle  (Node, require('@xnoxs/flux-lang'))
+ *   dist/flux.esm.js   — Library ESM bundle  (import from '@xnoxs/flux-lang')
+ *   dist/flux.min.js   — Library minified    (browser / CDN)
+ *   dist/flux-cli.js   — CLI bundle          (used by bin/flux.js shim)
  *
  * Usage:
  *   node scripts/build.js
@@ -28,12 +29,21 @@ const banner = `/*!
 const outDir = path.resolve(__dirname, '../dist');
 if (!fs.existsSync(outDir)) fs.mkdirSync(outDir, { recursive: true });
 
-const shared = {
+const sharedLib = {
   entryPoints: ['index.js'],
   bundle:      true,
   platform:    'node',
   target:      ['node16'],
-  external:    ['esbuild'],    // esbuild stays dev-only
+  external:    ['esbuild'],
+  banner:      { js: banner },
+};
+
+const sharedCli = {
+  entryPoints: ['src/cli.js'],
+  bundle:      true,
+  platform:    'node',
+  target:      ['node16'],
+  external:    ['esbuild'],
   banner:      { js: banner },
 };
 
@@ -41,32 +51,21 @@ async function build() {
   const start = Date.now();
 
   await Promise.all([
-    // CJS bundle (for Node require())
-    esbuild.build({
-      ...shared,
-      format:  'cjs',
-      outfile: 'dist/flux.cjs.js',
-    }),
-
-    // ESM bundle (for modern bundlers / type:"module" projects)
-    esbuild.build({
-      ...shared,
-      format:  'esm',
-      outfile: 'dist/flux.esm.js',
-    }),
-
-    // Minified CJS (CDN / browser via require shim)
-    esbuild.build({
-      ...shared,
-      format:   'cjs',
-      minify:   true,
-      outfile:  'dist/flux.min.js',
-    }),
+    esbuild.build({ ...sharedLib, format: 'cjs', outfile: 'dist/flux.cjs.js' }),
+    esbuild.build({ ...sharedLib, format: 'esm', outfile: 'dist/flux.esm.js' }),
+    esbuild.build({ ...sharedLib, format: 'cjs', minify: true, outfile: 'dist/flux.min.js' }),
+    esbuild.build({ ...sharedCli, format: 'cjs', outfile: 'dist/flux-cli.js' }),
   ]);
 
-  const sizes = ['dist/flux.cjs.js', 'dist/flux.esm.js', 'dist/flux.min.js'].map(f => {
-    const bytes = fs.statSync(f).size;
-    const kb    = (bytes / 1024).toFixed(1);
+  const files = [
+    'dist/flux.cjs.js',
+    'dist/flux.esm.js',
+    'dist/flux.min.js',
+    'dist/flux-cli.js',
+  ];
+
+  const sizes = files.map(f => {
+    const kb = (fs.statSync(f).size / 1024).toFixed(1);
     return `  ${f.padEnd(22)} ${kb} kB`;
   });
 

package/src/config.js

@@ -0,0 +1,99 @@
+'use strict';
+
+/**
+ * Flux Lang — Project Config Loader
+ *
+ * Looks for flux.config.js (or .fluxrc.js) in the current working directory.
+ * Returns a plain object with config values; returns {} if no config found.
+ *
+ * Config schema:
+ *   module.exports = {
+ *     jsxTarget : 'browser' | 'server' | 'react',  // default: 'browser'
+ *     outDir    : './dist',      // output dir for compiled files
+ *     sourcemap : false,         // generate .js.map files
+ *     mangle    : true,          // obfuscate variable/function names
+ *     ignore    : [],            // glob patterns to skip in `flux test`
+ *     entry     : 'src/main.flux', // default bundle entry
+ *   }
+ *
+ * CLI flags always take precedence over config values.
+ */
+
+const fs   = require('fs');
+const path = require('path');
+
+const CONFIG_NAMES = [
+  'flux.config.js',
+  'flux.config.cjs',
+  '.fluxrc.js',
+];
+
+/**
+ * Load project config from CWD (or a given directory).
+ * @param {string} [cwd] - directory to search (default: process.cwd())
+ * @returns {object} raw config object (or {} if none found)
+ */
+function loadConfig(cwd) {
+  const dir = cwd || process.cwd();
+
+  for (const name of CONFIG_NAMES) {
+    const configPath = path.join(dir, name);
+    if (!fs.existsSync(configPath)) continue;
+
+    // Bust require cache so tests can reload different configs
+    delete require.cache[require.resolve(configPath)];
+
+    try {
+      const raw = require(configPath);
+      const cfg = raw && raw.default ? raw.default : raw;
+
+      if (typeof cfg !== 'object' || cfg === null) {
+        process.stderr.write(
+          `[flux] warning: ${name} must export a plain object — ignoring\n`
+        );
+        return {};
+      }
+
+      return cfg;
+    } catch (e) {
+      process.stderr.write(
+        `[flux] error loading ${name}: ${e.message}\n`
+      );
+      return {};
+    }
+  }
+
+  return {};
+}
+
+/**
+ * Merge file config with CLI opts (CLI flags win).
+ * @param {object} fileConfig  - from loadConfig()
+ * @param {object} cliOpts     - parsed CLI flags
+ * @returns {object} merged options safe to pass to transpile()
+ */
+function mergeConfig(fileConfig, cliOpts) {
+  const cfg = fileConfig || {};
+  const cli = cliOpts   || {};
+
+  return {
+    jsxTarget : cli.jsxTarget  !== undefined ? cli.jsxTarget  : (cfg.jsxTarget  || 'browser'),
+    outDir    : cli.outDir     !== undefined ? cli.outDir     : (cfg.outDir     || null),
+    sourcemap : cli.sourcemap  !== undefined ? cli.sourcemap  : (cfg.sourcemap  || false),
+    mangle    : cli.mangle     !== undefined ? cli.mangle     : (cfg.mangle     !== undefined ? cfg.mangle : true),
+    ignore    : cli.ignore     !== undefined ? cli.ignore     : (cfg.ignore     || []),
+    entry     : cli.entry      !== undefined ? cli.entry      : (cfg.entry      || null),
+  };
+}
+
+/**
+ * Identity helper for IDE type-checking / autocompletion.
+ * Usage in flux.config.js:  const { defineConfig } = require('@xnoxs/flux-lang/config');
+ * @param {object} config
+ * @returns {object}
+ */
+function defineConfig(config) {
+  return config;
+}
+
+module.exports = { loadConfig, mergeConfig, defineConfig };

package/src/bundler.js

@@ -1,216 +0,0 @@
-'use strict';
-
-const fs   = require('fs');
-const path = require('path');
-const { Lexer }         = require('./lexer');
-const { Parser }        = require('./parser');
-const { CodeGenerator } = require('./codegen');
-
-class BundleError extends Error {
-  constructor(msg, file) {
-    super(file ? `[${path.basename(file)}] ${msg}` : msg);
-    this.name     = 'BundleError';
-    this.file     = file;
-  }
-}
-
-// ── AST transformation helpers ────────────────────────────────────────────────
-
-// Hapus node ImportDeclaration dan ExportDeclaration dari body AST
-// Kembalikan: { cleanAst, imports, exports }
-function extractModuleInfo(ast, fromFile) {
-  const imports = []; // { names: [], source, absPath }
-  const exports = []; // nama yang diekspor
-  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 += '.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 };
-}
-
-// Hasilkan kode JS dari clean AST
-function codegenModule(ast) {
-  const { code } = new CodeGenerator({ indent: '    ' }).generate(ast);
-  // Hapus header boilerplate dari tiap modul (dua baris pertama)
-  const lines = code.split('\n');
-  // Hapus "// Dihasilkan oleh Flux Transpiler", '"use strict";', dan baris kosong pertama
-  const start = lines.findIndex(l => l.trim() !== '' && !l.includes('Dihasilkan') && !l.includes('"use strict"'));
-  return lines.slice(start).join('\n');
-}
-
-// Konversi nama modul (path) ke identifier JS yang aman
-function toModuleId(absPath) {
-  const base = path.basename(absPath, '.flux');
-  return '_flux_' + base.replace(/[^a-zA-Z0-9]/g, '_');
-}
-
-// ── Bundler class ─────────────────────────────────────────────────────────────
-
-class Bundler {
-  constructor(entryFile, options = {}) {
-    this.entryFile  = path.resolve(entryFile);
-    this.options    = options;
-    this.modules    = new Map();  // absPath → { ast, imports, exports, source }
-    this.order      = [];         // topological order (dependencies first)
-    this.visited    = new Set();
-    this.inStack    = new Set();  // cycle detection
-  }
-
-  bundle() {
-    this.collect(this.entryFile);
-    return this.link();
-  }
-
-  // ── Fase 1: Kumpulkan semua modul secara rekursif ─────────────────
-  collect(absPath) {
-    if (this.visited.has(absPath)) return;
-    if (this.inStack.has(absPath)) {
-      throw new BundleError(`Dependensi sirkular terdeteksi: ${absPath}`, absPath);
-    }
-    if (!fs.existsSync(absPath)) {
-      throw new BundleError(`File tidak ditemukan: ${absPath}`, absPath);
-    }
-
-    this.inStack.add(absPath);
-
-    const source = fs.readFileSync(absPath, 'utf8');
-
-    // Lex + Parse
-    let ast;
-    try {
-      const tokens = new Lexer(source).tokenize();
-      ast          = new Parser(tokens).parse();
-    } catch (e) {
-      throw new BundleError(`Error saat parsing: ${e.message}`, absPath);
-    }
-
-    const { cleanAst, imports, exports } = extractModuleInfo(ast, absPath);
-    this.modules.set(absPath, { cleanAst, imports, exports, source, absPath });
-
-    // Proses dependensi dulu (DFS)
-    for (const imp of imports) {
-      this.collect(imp.absPath);
-    }
-
-    this.inStack.delete(absPath);
-    this.visited.add(absPath);
-    this.order.push(absPath); // entry ditambahkan terakhir
-  }
-
-  // ── Fase 2: Link semua modul menjadi satu file JS ─────────────────
-  link() {
-    const lines  = [];
-    const banner = this.options.banner !== false;
-
-    if (banner) {
-      lines.push('// Dihasilkan oleh Flux Bundler');
-      lines.push(`// Entry: ${path.basename(this.entryFile)}`);
-      lines.push(`// Modul: ${this.order.length}`);
-      lines.push('"use strict";');
-      lines.push('');
-    }
-
-    lines.push('(function() {');
-    lines.push('');
-
-    for (const absPath of this.order) {
-      const { cleanAst, imports, exports } = 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(`  // Modul: ${relName}`);
-      lines.push(`  // ${'─'.repeat(60)}`);
-
-      if (!isEntry) {
-        // Bungkus modul non-entry dalam object exports
-        lines.push(`  var ${modId} = (function() {`);
-        lines.push(`    var _exports = {};`);
-        lines.push('');
-      }
-
-      // Inject import bindings dari modul lain
-      for (const imp of imports) {
-        const srcId = toModuleId(imp.absPath);
-        if (imp.names.length === 1) {
-          // import defaultExport from "./mod"
-          lines.push(`    var ${imp.names[0]} = ${srcId};`);
-        } else {
-          // import { a, b } from "./mod"
-          for (const name of imp.names) {
-            lines.push(`    var ${name} = ${srcId}._exports ? ${srcId}._exports.${name} : ${srcId}.${name};`);
-          }
-        }
-      }
-
-      if (imports.length > 0) lines.push('');
-
-      // Kode modul yang sudah dibersihkan
-      const moduleCode = codegenModule(cleanAst);
-      lines.push(moduleCode);
-
-      if (!isEntry) {
-        // Registrasikan semua export ke object _exports
-        if (exports.length > 0) {
-          lines.push('');
-          for (const expName of 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 };
-  }
-}
-
-/**
- * Bundle beberapa file Flux menjadi satu JS.
- * @param {string} entryFile - path ke file .flux utama
- * @param {object} options
- * @returns {{ success, code, modules, errors }}
- */
-function bundle(entryFile, options = {}) {
-  const result = { success: false, code: '', modules: 0, errors: [] };
-
-  try {
-    const bundler      = new Bundler(entryFile, options);
-    const { code, modules } = bundler.bundle();
-    result.code        = code;
-    result.modules     = modules;
-    result.success     = true;
-  } catch (e) {
-    result.errors.push({ message: e.message, name: e.name, file: e.file || null });
-  }
-
-  return result;
-}
-
-module.exports = { bundle, Bundler, BundleError };