@xnoxs/flux-lang 4.0.7 → 4.0.9

package/src/self/config.flux

@@ -2,11 +2,10 @@
 //  Flux Self-Hosted Config Reader
 //  src/self/config.flux — written in Flux, compiled by stage-0
 //
-//  Reads config from package.json ("flux" key) or flux.json fallback.
-//  Config file resolution order:
-//    1. package.json → { "flux": { ... } }   ← primary
-//    2. flux.json                              ← legacy fallback
-//    3. default config                         ← if none found
+//  Reads flux.json project config and merges with CLI flags.
+//  Config file locations (searched in order):
+//    ./flux.json
+//    ./flux.config.js
 // ============================================================
 
 import Fs   from "fs"
@@ -25,7 +24,7 @@ export val DEFAULT_CONFIG = {
   watch:      false,
   ignore:     [],
   selfHosted: false,
-  registry:   "https://registry.npmjs.org",
+  registry:   "https://registry.flux-lang.dev",
   pkg: {
     name:        "",
     version:     "1.0.0",
@@ -37,22 +36,11 @@ export val DEFAULT_CONFIG = {
   }
 }
 
-// ── Load config (package.json "flux" key first, flux.json fallback) ──
+// ── Load flux.json ────────────────────────────────────────────
 export fn loadConfig(cwd_):
   val cwd = cwd_ ?? process.cwd()
 
-  // 1. Try package.json → "flux" key (primary)
-  val pkgJsonPath = Path.join(cwd, "package.json")
-  if Fs.existsSync(pkgJsonPath):
-    try:
-      val raw    = Fs.readFileSync(pkgJsonPath, "utf8")
-      val parsed = JSON.parse(raw)
-      if parsed.flux and typeof parsed.flux == "object":
-        return mergeConfig(DEFAULT_CONFIG, parsed.flux)
-    catch(e):
-      throw new Error("Invalid package.json: " + e.message)
-
-  // 2. Try flux.json (legacy fallback)
+  // Try flux.json first
   val jsonPath = Path.join(cwd, "flux.json")
   if Fs.existsSync(jsonPath):
     try:
@@ -62,7 +50,15 @@ export fn loadConfig(cwd_):
     catch(e):
       throw new Error("Invalid flux.json: " + e.message)
 
-  // 3. Default config
+  // Try flux.config.js
+  val jsPath = Path.join(cwd, "flux.config.js")
+  if Fs.existsSync(jsPath):
+    try:
+      val loaded = require(jsPath)
+      return mergeConfig(DEFAULT_CONFIG, loaded)
+    catch(e2):
+      throw new Error("Invalid flux.config.js: " + e2.message)
+
   return { ...DEFAULT_CONFIG }
 
 // ── Deep merge config objects ─────────────────────────────────
@@ -75,16 +71,12 @@ export fn mergeConfig(base, overrides):
       result[key] = val_
   return result
 
-// ── Write flux key into package.json ─────────────────────────
+// ── Write flux.json ───────────────────────────────────────────
 export fn writeConfig(config, cwd_):
-  val cwd      = cwd_ ?? process.cwd()
-  val pkgPath  = Path.join(cwd, "package.json")
-  var pkg      = {}
-  if Fs.existsSync(pkgPath):
-    try: pkg = JSON.parse(Fs.readFileSync(pkgPath, "utf8"))
-    catch(e): pkg = {}
-  pkg.flux = config
-  Fs.writeFileSync(pkgPath, JSON.stringify(pkg, null, 2) + "\n", "utf8")
+  val cwd = cwd_ ?? process.cwd()
+  val jsonPath = Path.join(cwd, "flux.json")
+  val content = JSON.stringify(config, null, 2) + "\n"
+  Fs.writeFileSync(jsonPath, content, "utf8")
 
 // ── Validate config ───────────────────────────────────────────
 export fn validateConfig(config):
@@ -101,20 +93,20 @@ export fn validateConfig(config):
     errors: errors,
   }
 
-// ── Read package info (package.json first, flux.json fallback) ────
+// ── Read flux.json package info ───────────────────────────────
 export fn readPackage(cwd_):
-  val cwd     = cwd_ ?? process.cwd()
-  val pkgJson = Path.join(cwd, "package.json")
+  val cwd = cwd_ ?? process.cwd()
   val fluxJson = Path.join(cwd, "flux.json")
+  val pkgJson  = Path.join(cwd, "package.json")
 
-  if Fs.existsSync(pkgJson):
+  if Fs.existsSync(fluxJson):
     try:
-      return JSON.parse(Fs.readFileSync(pkgJson, "utf8"))
+      return JSON.parse(Fs.readFileSync(fluxJson, "utf8"))
     catch(e): return null
 
-  if Fs.existsSync(fluxJson):
+  if Fs.existsSync(pkgJson):
     try:
-      return JSON.parse(Fs.readFileSync(fluxJson, "utf8"))
+      return JSON.parse(Fs.readFileSync(pkgJson, "utf8"))
     catch(e2): return null
 
   return null

package/src/self/config.js

@@ -1,27 +1,25 @@
-/* compiled from src/self/config.flux */
+/* compiled from src/self/config.flux by Flux Lang */
 'use strict';
-// Generated by Flux Transpiler v3.5.3 (self-hosted)
+// ── Flux stdlib ──
+
+function join(arr, sep) { return arr.join(sep != null ? sep : ','); }
+
+function includes(arr, val) { return arr.includes(val); }
+
+function keys(obj) { return Object.keys(obj); }
+
+function endsWith(s, suffix) { return String(s).endsWith(suffix); }
+// ── end stdlib ──
+
+// Generated by Flux Transpiler v3.2.0
 "use strict";
 
 const Fs = require("fs");
 const Path = require("path");
-const DEFAULT_CONFIG = { entry: "src/main.flux", outDir: "dist", sourcemap: false, mangle: false, jsx: false, jsxTarget: "browser", typecheck: true, strict: false, watch: false, ignore: [], selfHosted: false, registry: "https://registry.npmjs.org", pkg: { name: "", version: "1.0.0", description: "", author: "", license: "MIT", deps: {  }, devDeps: {  } } };
+const DEFAULT_CONFIG = { entry: "src/main.flux", outDir: "dist", sourcemap: false, mangle: false, jsx: false, jsxTarget: "browser", typecheck: true, strict: false, watch: false, ignore: [], selfHosted: false, registry: "https://registry.flux-lang.dev", pkg: { name: "", version: "1.0.0", description: "", author: "", license: "MIT", deps: {  }, devDeps: {  } } };
 module.exports.DEFAULT_CONFIG = DEFAULT_CONFIG;
 function loadConfig(cwd_) {
   const cwd = (cwd_ ?? process.cwd());
-  const pkgJsonPath = Path.join(cwd, "package.json");
-  if (Fs.existsSync(pkgJsonPath)) {
-    try {
-      const raw = Fs.readFileSync(pkgJsonPath, "utf8");
-      const parsed = JSON.parse(raw);
-      if ((parsed.flux && (typeof parsed.flux == "object"))) {
-        return mergeConfig(DEFAULT_CONFIG, parsed.flux);
-      }
-    }
-    catch (e) {
-      throw new Error(("Invalid package.json: " + e.message));
-    }
-  }
   const jsonPath = Path.join(cwd, "flux.json");
   if (Fs.existsSync(jsonPath)) {
     try {
@@ -33,6 +31,16 @@ function loadConfig(cwd_) {
       throw new Error(("Invalid flux.json: " + e.message));
     }
   }
+  const jsPath = Path.join(cwd, "flux.config.js");
+  if (Fs.existsSync(jsPath)) {
+    try {
+      const loaded = require(jsPath);
+      return mergeConfig(DEFAULT_CONFIG, loaded);
+    }
+    catch (e2) {
+      throw new Error(("Invalid flux.config.js: " + e2.message));
+    }
+  }
   return { ...DEFAULT_CONFIG };
 }
 module.exports.loadConfig = loadConfig;
@@ -52,18 +60,9 @@ function mergeConfig(base, overrides) {
 module.exports.mergeConfig = mergeConfig;
 function writeConfig(config, cwd_) {
   const cwd = (cwd_ ?? process.cwd());
-  const pkgPath = Path.join(cwd, "package.json");
-  let pkg = {  };
-  if (Fs.existsSync(pkgPath)) {
-    try {
-      pkg = JSON.parse(Fs.readFileSync(pkgPath, "utf8"));
-    }
-    catch (e) {
-      pkg = {  };
-    }
-  }
-  pkg.flux = config;
-  Fs.writeFileSync(pkgPath, (JSON.stringify(pkg, null, 2) + "\n"), "utf8");
+  const jsonPath = Path.join(cwd, "flux.json");
+  const content = (JSON.stringify(config, null, 2) + "\n");
+  Fs.writeFileSync(jsonPath, content, "utf8");
 }
 module.exports.writeConfig = writeConfig;
 function validateConfig(config) {
@@ -79,19 +78,19 @@ function validateConfig(config) {
 module.exports.validateConfig = validateConfig;
 function readPackage(cwd_) {
   const cwd = (cwd_ ?? process.cwd());
-  const pkgJson = Path.join(cwd, "package.json");
   const fluxJson = Path.join(cwd, "flux.json");
-  if (Fs.existsSync(pkgJson)) {
+  const pkgJson = Path.join(cwd, "package.json");
+  if (Fs.existsSync(fluxJson)) {
     try {
-      return JSON.parse(Fs.readFileSync(pkgJson, "utf8"));
+      return JSON.parse(Fs.readFileSync(fluxJson, "utf8"));
     }
     catch (e) {
       return null;
     }
   }
-  if (Fs.existsSync(fluxJson)) {
+  if (Fs.existsSync(pkgJson)) {
     try {
-      return JSON.parse(Fs.readFileSync(fluxJson, "utf8"));
+      return JSON.parse(Fs.readFileSync(pkgJson, "utf8"));
     }
     catch (e2) {
       return null;

package/src/self/css-preprocessor.js

@@ -1,3 +1,5 @@
+/* compiled from src/self/css-preprocessor.flux by Flux Lang */
+'use strict';
 // ── Flux stdlib ──
 
 function includes(arr, val) { return arr.includes(val); }
@@ -298,7 +300,7 @@ class CssPreprocessor {
       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] == "\t")) || (this.src[j] == "\n")) || (this.src[j] == "\r")))) {
+        while (((j < this.src.length) && ((((this.src[j] == " ") || (this.src[j] == "   ")) || (this.src[j] == "\n")) || (this.src[j] == "\r")))) {
           j = (j + 1);
         }
         if ((this.src[j] == "{")) {

package/src/self/formatter.js

@@ -1,3 +1,5 @@
+/* compiled from src/self/formatter.flux by Flux Lang */
+'use strict';
 // ── Flux stdlib ──
 
 function map(arr, fn) { return arr.map(fn); }

package/src/self/index.flux

@@ -0,0 +1,87 @@
+// ============================================================
+//  Flux Lang — Compiler Entry Point v4.0.3
+//  src/self/index.flux
+//
+//  Di-kompilasi menjadi src/self/index.js, lalu di-bundle
+//  oleh esbuild → dist/flux-compiler.js (satu file).
+//
+//  Catatan: bundler.flux dan mangler.flux mengandung template
+//  literal yang menghasilkan kode JS yang tidak bisa di-parse
+//  oleh esbuild, sehingga tidak di-bundle di sini.
+//  Gunakan @xnoxs/flux-lang untuk akses ke bundler dan mangler.
+// ============================================================
+
+// ── Core pipeline (koordinator utama) ────────────────────────
+import { transpile as _transpile, transpileFile as _transpileFile, FLUX_VERSION as _VERSION, FLUX_STAGE as _STAGE } from './transpiler'
+
+export val transpile     = _transpile
+export val transpileFile = _transpileFile
+export val FLUX_VERSION  = _VERSION
+export val FLUX_STAGE    = _STAGE
+
+// ── Lexer ─────────────────────────────────────────────────────
+import { Lexer as _Lexer, lexerize as _lexerize, T as _T, TokenType as _TT } from './lexer'
+
+export val Lexer     = _Lexer
+export val lexerize  = _lexerize
+export val T         = _T
+export val TokenType = _TT
+
+// ── Parser ────────────────────────────────────────────────────
+import { Parser as _Parser, makeParser as _makeParser } from './parser'
+
+export val Parser     = _Parser
+export val makeParser = _makeParser
+
+// ── Code Generator ────────────────────────────────────────────
+import { CodeGenerator as _CG, makeCodeGen as _makeCG } from './codegen'
+
+export val CodeGenerator = _CG
+export val makeCodeGen   = _makeCG
+
+// ── Type System ───────────────────────────────────────────────
+import { FluxTypeChecker as _FTC } from './type-checker'
+import { Checker as _Checker }     from './checker'
+
+export val FluxTypeChecker = _FTC
+export val Checker         = _Checker
+
+// ── Preprocessors ─────────────────────────────────────────────
+import { transformCss as _transformCss } from './css-preprocessor'
+import { transformJsx as _transformJsx, FLUX_H_BROWSER as _FHB, FLUX_H_SERVER as _FHS } from './jsx'
+
+export val transformCss   = _transformCss
+export val transformJsx   = _transformJsx
+export val FLUX_H_BROWSER = _FHB
+export val FLUX_H_SERVER  = _FHS
+
+// ── Toolchain ─────────────────────────────────────────────────
+import { format as _format, diff as _diff } from './formatter'
+import { lint as _lint, Linter as _Linter } from './linter'
+import { SourceMapBuilder as _SMB }         from './sourcemap'
+
+export val format          = _format
+export val diff            = _diff
+export val lint            = _lint
+export val Linter          = _Linter
+export val SourceMapBuilder = _SMB
+
+// ── Standard Library ──────────────────────────────────────────
+import { buildStdlib as _bStdlib, detectUsedSymbols as _det, STDLIB_SYMBOLS as _SS } from './stdlib'
+
+export val buildStdlib       = _bStdlib
+export val detectUsedSymbols = _det
+export val STDLIB_SYMBOLS    = _SS
+
+// ── Project Config & Test Runner ──────────────────────────────
+import { loadConfig as _lc, mergeConfig as _mc, writeConfig as _wc, validateConfig as _vc, DEFAULT_CONFIG as _DC } from './config'
+import { discoverTestFiles as _dtf, runTestFile as _rtf, runTests as _rt } from './test-runner'
+
+export val loadConfig        = _lc
+export val mergeConfig       = _mc
+export val writeConfig       = _wc
+export val validateConfig    = _vc
+export val DEFAULT_CONFIG    = _DC
+export val discoverTestFiles = _dtf
+export val runTestFile       = _rtf
+export val runTests          = _rt

package/src/self/jsx.js

@@ -1,3 +1,5 @@
+/* compiled from src/self/jsx.flux by Flux Lang */
+'use strict';
 // Flux JSX Runtime
 "use strict";
 
@@ -108,7 +110,7 @@ class JsxPreprocessor {
       return false;
     }
     let i = (this.pos - 1);
-    while (((i >= 0) && ((this.src[i] == " ") || (this.src[i] == "\t")))) {
+    while (((i >= 0) && ((this.src[i] == " ") || (this.src[i] == "   ")))) {
       i = (i - 1);
     }
     if ((i < 0)) {
@@ -382,7 +384,7 @@ class JsxPreprocessor {
   }
 
   skipWs() {
-    while (((this.pos < this.src.length) && ((this.src[this.pos] == " ") || (this.src[this.pos] == "\t")))) {
+    while (((this.pos < this.src.length) && ((this.src[this.pos] == " ") || (this.src[this.pos] == "   ")))) {
       this.pos = (this.pos + 1);
     }
   }

package/src/self/lexer.js

@@ -1,3 +1,5 @@
+/* compiled from src/self/lexer.flux by Flux Lang */
+'use strict';
 // ── Flux stdlib ──
 
 function map(arr, fn) { return arr.map(fn); }
@@ -89,7 +91,7 @@ class Lexer {
           s += "\n";
         }
         else if ((e == "t")) {
-          s += "\t";
+          s += "  ";
         }
         else if ((e == "`")) {
           s += "`";
@@ -146,7 +148,7 @@ class Lexer {
           text += "\n";
         }
         else if ((e == "t")) {
-          text += "\t";
+          text += "  ";
         }
         else if ((e == "\"")) {
           text += "\"";
@@ -276,8 +278,8 @@ class Lexer {
       if (bol) {
         bol = false;
         let indent = 0;
-        while (((this.ch() == " ") || (this.ch() == "\t"))) {
-          if ((this.ch() == "\t")) {
+        while (((this.ch() == " ") || (this.ch() == "  "))) {
+          if ((this.ch() == "  ")) {
             indent = (indent + 4);
           }
           else {
@@ -331,7 +333,7 @@ class Lexer {
         }
         continue;
       }
-      if (((cur == " ") || (cur == "\t"))) {
+      if (((cur == " ") || (cur == "  "))) {
         this.adv();
         continue;
       }
@@ -419,7 +421,7 @@ class Lexer {
               sq += "\n";
             }
             else if ((e == "t")) {
-              sq += "\t";
+              sq += "  ";
             }
             else if ((e == "r")) {
               sq += "\r";

package/src/self/linter.js

@@ -1,3 +1,5 @@
+/* compiled from src/self/linter.flux by Flux Lang */
+'use strict';
 // ── Flux stdlib ──
 
 function sort(arr, fn) { return arr.slice().sort(fn); }

package/src/self/mangler.js

@@ -1,3 +1,5 @@
+/* compiled from src/self/mangler.flux by Flux Lang */
+'use strict';
 // Flux JSX Runtime
 "use strict";
 

package/src/self/parser.js

@@ -1,3 +1,5 @@
+/* compiled from src/self/parser.flux by Flux Lang */
+'use strict';
 // ── Flux stdlib ──
 
 function map(arr, fn) { return arr.map(fn); }