@xnoxs/flux-lang 3.4.0 → 3.4.2

package/src/self/cli.flux

@@ -588,54 +588,153 @@ fn cmdInit(name, opts):
   Fs.mkdirSync(Path.join(dir, "src"), { recursive: true })
   Fs.mkdirSync(Path.join(dir, "tests"), { recursive: true })
 
-  val mainFlux = `// {projectName} — written in Flux Lang v{VERSION}
+  val mainFlux = `// {projectName} — built with Flux Lang v{VERSION}
+// Run: flux run src/main.flux
 
-type Shape =
-  | Circle(radius: Float)
-  | Rect(width: Float, height: Float)
-  | Triangle(base: Float, height: Float)
+// ── Algebraic Data Types + Pattern Matching ───────────────────
+type Shape = Circle(radius) | Rect(width, height) | Triangle(base, height)
 
-fn area(shape: Shape) -> Float:
+fn area(shape):
   match shape:
-    when Circle(r):              return Math.PI * r * r
-    when Rect(w, h):             return w * h
-    when Triangle(b, h):         return 0.5 * b * h
+    when Circle(r):      return Math.PI * r * r
+    when Rect(w, h):     return w * h
+    when Triangle(b, h): return 0.5 * b * h
 
-fn greet(name: String) -> String:
-  return "Hello from Flux, {name}!"
+fn describe(shape):
+  match shape:
+    when Circle(r):      return "Circle(r={r:.2f})"
+    when Rect(w, h):     return "Rect({w:.1f}x{h:.1f})"
+    when Triangle(b, h): return "Triangle(b={b:.1f}, h={h:.1f})"
+
+// ── Result type ───────────────────────────────────────────────
+type Result = Ok(value) | Err(message)
+
+fn safeDivide(a, b):
+  if b == 0: return Err("division by zero")
+  return Ok(a / b)
+
+// ── Utility functions ─────────────────────────────────────────
+fn greet(name): return "Hello from Flux, {name}!"
+
+fn formatList(items):
+  if items.length == 0: return "(empty)"
+  return "[" + items.join(", ") + "]"
 
-val shapes = [
-  Circle(5.0),
-  Rect(10.0, 4.0),
-  Triangle(6.0, 8.0),
-]
+fn clamp(value, lo, hi):
+  if value < lo: return lo
+  if value > hi: return hi
+  return value
 
+// ── Pipe operator + stdlib ────────────────────────────────────
+val numbers = [3, 1, 4, 1, 5, 9, 2, 6, 5, 3, 5]
+val processed = numbers
+  |> filter(n -> n > 3)
+  |> map(n -> n * n)
+  |> sort
+
+// ── Main ──────────────────────────────────────────────────────
+print(greet("{projectName}"))
+print("Squares > 3: {formatList(processed)}")
+print("clamp(12, 0, 10) = {clamp(12, 0, 10)}")
+
+val shapes = [Circle(5.0), Rect(8.0, 3.0), Triangle(6.0, 4.0)]
 for shape in shapes:
   val a = area(shape)
-  print("Area: {a:.2f}")
+  print("{describe(shape)}  area={a:.2f}")
 
-print(greet("{projectName}"))
+match safeDivide(10.0, 3.0):
+  when Ok(v):  print("10 / 3 = {v:.4f}")
+  when Err(e): print("Error: {e}")
 `
 
-  val testFlux = `// {projectName} tests
+  val utilsFlux = `// Utility functions for {projectName}
+// Use with: flux bundle src/main.flux (bundles imports automatically)
+
+export fn greet(name):
+  return "Hello from Flux, {name}!"
 
-fn add(a: Int, b: Int) -> Int: return a + b
-fn mul(a: Int, b: Int) -> Int: return a * b
+export fn formatList(items):
+  if items.length == 0: return "(empty)"
+  return "[" + items.join(", ") + "]"
 
-test "add works":
-  assert add(1, 2) == 3
-  assert add(0, 0) == 0
-  assert add(-1, 1) == 0
+export fn clamp(value, lo, hi):
+  if value < lo: return lo
+  if value > hi: return hi
+  return value
 
-test "mul works":
-  assert mul(3, 4) == 12
-  assert mul(0, 5) == 0
+export fn sum(nums):
+  return nums.reduce((acc, x) -> acc + x, 0)
+
+export fn average(nums):
+  if nums.length == 0: return 0
+  return sum(nums) / nums.length
+`
+
+  val testFlux = `// Tests for {projectName}
+// Run: flux test tests/
+
+// ── Functions under test ──────────────────────────────────────
+fn add(a, b):
+    return a + b
+
+fn mul(a, b):
+    return a * b
+
+fn clamp(value, lo, hi):
+    if value < lo: return lo
+    if value > hi: return hi
+    return value
+
+fn average(nums):
+    if nums.length == 0: return 0
+    return nums.reduce((s, x) -> s + x, 0) / nums.length
+
+type Result = Ok(value) | Err(message)
+
+fn safeDivide(a, b):
+    if b == 0: return Err("div by zero")
+    return Ok(a / b)
+
+// ── Test functions ────────────────────────────────────────────
+fn test_add():
+    assert(add(1, 2) == 3, "1+2=3")
+    assert(add(0, 0) == 0, "0+0=0")
+    assert(add(-1, 1) == 0, "-1+1=0")
+
+fn test_mul():
+    assert(mul(3, 4) == 12, "3*4=12")
+    assert(mul(0, 5) == 0, "0*5=0")
+
+fn test_clamp():
+    assert(clamp(5, 0, 10) == 5, "within range")
+    assert(clamp(-1, 0, 10) == 0, "below min")
+    assert(clamp(15, 0, 10) == 10, "above max")
+
+fn test_average():
+    assert(average([2, 4, 6]) == 4, "average of 2,4,6")
+    assert(average([]) == 0, "empty list")
+
+fn test_safe_divide():
+    val ok = safeDivide(10, 2)
+    match ok:
+        when Ok(v):  assert(v == 5, "10/2=5")
+        when Err(e): assert(false, "unexpected error")
+    val err = safeDivide(10, 0)
+    match err:
+        when Ok(v):  assert(false, "expected error")
+        when Err(e): assert(e == "div by zero", "error message")
+
+fn test_pipe_operator():
+    val result = [1, 2, 3, 4, 5] |> filter(n -> n > 2) |> map(n -> n * 2)
+    assert(result.length == 3, "filter length")
+    assert(result[0] == 6, "first element")
+    assert(result[2] == 10, "last element")
 `
 
   val fluxJson = {
     name:        projectName,
     version:     "1.0.0",
-    description: "A Flux Lang project",
+    description: "A Flux Lang v" + VERSION + " project",
     author:      "",
     license:     "MIT",
     entry:       "src/main.flux",
@@ -652,40 +751,60 @@ test "mul works":
       lint:   "flux lint src/",
     },
     dependencies:    {},
-    devDependencies: {},
+    devDependencies: { "@xnoxs/flux-lang": "^" + VERSION },
   }
 
-  val gitignore = `node_modules/
-dist/
-flux_modules/
-*.js.map
-.DS_Store
-`
+  val gitignore = "node_modules/\ndist/\nflux_modules/\n*.js.map\n.DS_Store\n"
 
   val readme = `# {projectName}
 
-A project built with [Flux Lang](https://flux-lang.dev) v{VERSION}.
+A project built with [Flux Lang](https://flux-lang.dev) v{VERSION} — the self-hosted compiler.
 
-## Getting Started
+## Quick Start
 
 \`\`\`bash
 flux run src/main.flux
 \`\`\`
 
+## Project Structure
+
+\`\`\`
+{projectName}/
+├── src/
+│   ├── main.flux        # Entry point
+│   └── utils.flux       # Utility functions
+├── tests/
+│   └── main.test.flux   # Test suite
+├── flux.json            # Project config
+└── README.md
+\`\`\`
+
 ## Commands
 
 | Command | Description |
 |---|---|
-| \`flux run src/main.flux\` | Run main file |
-| \`flux build\` | Bundle to dist/ |
+| \`flux run src/main.flux\` | Run the project |
+| \`flux bundle src/main.flux -o dist/bundle.js\` | Bundle to single file |
 | \`flux watch src/main.flux\` | Watch mode |
-| \`flux check src/main.flux\` | Type check |
-| \`flux test tests/\` | Run tests |
-| \`flux fmt src/\` | Format code |
+| \`flux check src/main.flux\` | Type check + static analysis |
+| \`flux test tests/\` | Run all tests |
+| \`flux fmt src/\` | Format source code |
+| \`flux lint src/\` | Lint for issues |
+| \`flux add <package>\` | Add a dependency |
 `
 
-  Fs.writeFileSync(Path.join(dir, "src", "main.flux"),    mainFlux, "utf8")
-  Fs.writeFileSync(Path.join(dir, "tests", "main.test.flux"), testFlux, "utf8")
+  val allFiles = [
+    projectName + "/src/main.flux",
+    projectName + "/src/utils.flux",
+    projectName + "/tests/main.test.flux",
+    projectName + "/flux.json",
+    projectName + "/.gitignore",
+    projectName + "/README.md",
+  ]
+
+  Fs.writeFileSync(Path.join(dir, "src", "main.flux"),        mainFlux,  "utf8")
+  Fs.writeFileSync(Path.join(dir, "src", "utils.flux"),       utilsFlux, "utf8")
+  Fs.writeFileSync(Path.join(dir, "tests", "main.test.flux"), testFlux,  "utf8")
   Fs.writeFileSync(Path.join(dir, "flux.json"),   JSON.stringify(fluxJson, null, 2) + "\n", "utf8")
   Fs.writeFileSync(Path.join(dir, ".gitignore"),  gitignore, "utf8")
   Fs.writeFileSync(Path.join(dir, "README.md"),   readme, "utf8")
@@ -694,16 +813,16 @@ flux run src/main.flux
   console.log(green("✓ Created: ") + bold(projectName + "/"))
   console.log()
   console.log(gray("  Files:"))
-  console.log("  " + cyan(projectName + "/src/main.flux"))
-  console.log("  " + cyan(projectName + "/tests/main.test.flux"))
-  console.log("  " + cyan(projectName + "/flux.json"))
-  console.log("  " + cyan(projectName + "/.gitignore"))
-  console.log("  " + cyan(projectName + "/README.md"))
+  for f in allFiles:
+    console.log("  " + cyan(f))
   console.log()
   console.log(bold("  Next steps:"))
   console.log("    " + yellow("cd " + projectName))
   console.log("    " + yellow("flux run src/main.flux"))
   console.log()
+  console.log(gray("  Or run the test suite:"))
+  console.log("    " + yellow("flux test tests/"))
+  console.log()
 
 // ── flux self-hosted ──────────────────────────────────────────
 fn cmdSelfHosted(sub, opts):