tova 0.9.8 → 0.9.11

package/bin/tova.js

@@ -2,7 +2,7 @@
 
 import { resolve, basename, dirname, join, relative, sep, extname } from 'path';
 import { readFileSync, writeFileSync, existsSync, mkdirSync, readdirSync, statSync, copyFileSync, rmSync, chmodSync, renameSync, watch as fsWatch } from 'fs';
-import { spawn } from 'child_process';
+import { spawn, spawnSync as _spawnSync } from 'child_process';
 import { createHash as _cryptoHash } from 'crypto';
 import { createRequire as _createRequire } from 'module';
 import { Lexer } from '../src/lexer/lexer.js';
@@ -25,6 +25,78 @@ import { addToSection, removeFromSection } from '../src/config/edit-toml.js';
 import { stringifyTOML } from '../src/config/toml.js';
 
 import { VERSION } from '../src/version.js';
+import { createServer as _createHttpServer } from 'http';
+
+const _hasBun = typeof Bun !== 'undefined';
+
+// ─── Compat: Bun.serve() fallback to Node http.createServer ─
+function _compatServe({ port, fetch: fetchHandler }) {
+  if (_hasBun) {
+    return Bun.serve({ port, fetch: fetchHandler });
+  }
+  // Node.js fallback using http.createServer
+  return new Promise((resolve, reject) => {
+    const server = _createHttpServer(async (req, res) => {
+      try {
+        const url = `http://localhost:${port}${req.url}`;
+        const headers = new Headers();
+        for (let i = 0; i < req.rawHeaders.length; i += 2) {
+          headers.append(req.rawHeaders[i], req.rawHeaders[i + 1]);
+        }
+        const request = new Request(url, {
+          method: req.method,
+          headers,
+          ...(req.method !== 'GET' && req.method !== 'HEAD' ? { body: req, duplex: 'half' } : {}),
+        });
+        const response = await fetchHandler(request);
+        res.writeHead(response.status, Object.fromEntries(response.headers.entries()));
+        if (response.body) {
+          const reader = response.body.getReader();
+          const pump = async () => {
+            while (true) {
+              const { done, value } = await reader.read();
+              if (done) { res.end(); return; }
+              res.write(value);
+            }
+          };
+          pump().catch(() => res.end());
+        } else {
+          const buf = Buffer.from(await response.arrayBuffer());
+          res.end(buf);
+        }
+      } catch (err) {
+        res.writeHead(500);
+        res.end('Internal Server Error');
+      }
+    });
+    server.listen(port, () => resolve(server));
+    server.on('error', reject);
+  });
+}
+
+// ─── Compat: Bun.spawnSync fallback to child_process.spawnSync ─
+// Accepts Bun-style opts: { stdout: 'pipe', stderr: 'pipe', cwd, timeout }
+function _compatSpawnSync(cmd, args, opts) {
+  if (_hasBun) return Bun.spawnSync([cmd, ...args], opts);
+  // Translate Bun-style stdout/stderr to Node-style stdio
+  const nodeOpts = { ...opts };
+  if (!nodeOpts.stdio) {
+    nodeOpts.stdio = [
+      'pipe',
+      nodeOpts.stdout === 'pipe' ? 'pipe' : (nodeOpts.stdout || 'pipe'),
+      nodeOpts.stderr === 'pipe' ? 'pipe' : (nodeOpts.stderr || 'pipe'),
+    ];
+  }
+  delete nodeOpts.stdout;
+  delete nodeOpts.stderr;
+  const result = _spawnSync(cmd, args, nodeOpts);
+  return {
+    ...result,
+    exitCode: result.status,
+    stdout: result.stdout ? (typeof result.stdout === 'string' ? result.stdout : result.stdout.toString()) : '',
+    stderr: result.stderr ? (typeof result.stderr === 'string' ? result.stderr : result.stderr.toString()) : '',
+  };
+}
 
 // ─── CLI Color Helpers ──────────────────────────────────────
 const isTTY = process.stdout?.isTTY;
@@ -1417,10 +1489,17 @@ function cleanBuild(args) {
 
 async function devServer(args) {
   const config = resolveConfig(process.cwd());
-  const explicitSrc = args.filter(a => !a.startsWith('--'))[0];
-  const srcDir = resolve(explicitSrc || config.project.entry || '.');
+  // Parse --port value first, then filter positional args (skip flag values)
   const explicitPort = args.find((_, i, a) => a[i - 1] === '--port');
-  const basePort = parseInt(explicitPort || config.dev.port || '3000');
+  const basePort = parseInt(explicitPort || config.dev?.port || '3000');
+  const flagsWithValues = new Set(['--port']);
+  const positional = [];
+  for (let i = 0; i < args.length; i++) {
+    if (args[i].startsWith('--')) { if (flagsWithValues.has(args[i])) i++; continue; }
+    positional.push(args[i]);
+  }
+  const explicitSrc = positional[0];
+  const srcDir = resolve(explicitSrc || config.project?.entry || '.');
   const buildStrict = args.includes('--strict');
   const buildStrictSecurity = args.includes('--strict-security');
 
@@ -1438,7 +1517,7 @@ async function devServer(args) {
   let actualReloadPort = reloadPort;
   for (let attempt = 0; attempt < 10; attempt++) {
     try {
-      reloadServer = Bun.serve({
+      reloadServer = await _compatServe({
         port: actualReloadPort,
         fetch(req) {
           return handleReloadFetch(req);
@@ -1489,7 +1568,7 @@ async function devServer(args) {
   for (const [dir, files] of dirGroups) {
     const dirName = basename(dir) === '.' ? 'app' : basename(dir);
     try {
-      const result = mergeDirectory(dir, srcDir, { strict: buildStrict, strictSecurity: buildStrictSecurity });
+      const result = mergeDirectory(dir, srcDir, { strict: buildStrict, strictSecurity: buildStrictSecurity, isDev: true });
       if (!result) continue;
 
       const { output, single } = result;
@@ -1584,7 +1663,7 @@ async function devServer(args) {
 
     const child = spawn('bun', ['run', sf.path], {
       stdio: 'inherit',
-      env: { ...process.env, [envKey]: String(port), PORT: String(port) },
+      env: { ...process.env, [envKey]: String(port), PORT: String(port), __TOVA_HMR_STATE_PATH: join(outDir, '.hmr-state.json') },
     });
 
     child.on('error', (err) => {
@@ -1624,7 +1703,7 @@ async function devServer(args) {
       '.map': 'application/json',
     };
 
-    const staticServer = Bun.serve({
+    const staticServer = await _compatServe({
       port: basePort,
       async fetch(req) {
         const url = new URL(req.url);
@@ -1734,7 +1813,7 @@ async function devServer(args) {
 
       for (const [dir, files] of rebuildDirGroups) {
         const dirName = basename(dir) === '.' ? 'app' : basename(dir);
-        const result = mergeDirectory(dir, srcDir, { strict: buildStrict, strictSecurity: buildStrictSecurity });
+        const result = mergeDirectory(dir, srcDir, { strict: buildStrict, strictSecurity: buildStrictSecurity, isDev: true });
         if (!result) continue;
 
         const { output, single } = result;
@@ -1811,7 +1890,7 @@ async function devServer(args) {
       const port = basePort + rebuildPortOffset;
       const child = spawn('bun', ['run', serverPath], {
         stdio: 'inherit',
-        env: { ...process.env, PORT: String(port) },
+        env: { ...process.env, PORT: String(port), __TOVA_HMR_STATE_PATH: join(outDir, '.hmr-state.json') },
       });
       processes.push({ child, label: 'server', port });
       rebuildPortOffset++;
@@ -1842,6 +1921,9 @@ async function devServer(args) {
     for (const p of processes) {
       try { p.child.kill('SIGKILL'); } catch {}
     }
+    // Clean up HMR state file for fresh start next time
+    const hmrPath = join(outDir, '.hmr-state.json');
+    try { if (existsSync(hmrPath)) rmSync(hmrPath); } catch {}
     process.exit(0);
   });
 
@@ -3373,8 +3455,8 @@ tova add github.com/yourname/${projectName}
 
   // git init (silent, only if git is available)
   try {
-    const gitProc = Bun.spawnSync(['git', 'init'], { cwd: projectDir, stdout: 'pipe', stderr: 'pipe' });
-    if (gitProc.exitCode === 0) {
+    const gitProc = _compatSpawnSync('git', ['init'], { cwd: projectDir, stdout: 'pipe', stderr: 'pipe' });
+    if ((gitProc.exitCode ?? gitProc.status) === 0) {
       console.log(`  ${color.green('✓')} Initialized git repository`);
     }
   } catch {}
@@ -4162,6 +4244,9 @@ function hasNpmImports(code) {
 }
 
 async function bundleClientCode(clientCode, srcDir) {
+  if (!_hasBun) {
+    throw new Error('Client bundling with npm imports requires Bun. Install from https://bun.sh and run with: bun tova build --production');
+  }
   const tmpDir = join(srcDir, '.tova-out', '.tmp-bundle');
   try {
     mkdirSync(tmpDir, { recursive: true });
@@ -4897,7 +4982,10 @@ async function productionBuild(srcDir, outDir, isStatic = false) {
   const allSharedCode = sharedParts.join('\n');
 
   // Generate content hash for cache busting
-  const hashCode = (s) => Bun.hash(s).toString(16).slice(0, 12);
+  const hashCode = (s) => {
+    if (_hasBun) return Bun.hash(s).toString(16).slice(0, 12);
+    return _cryptoHash('md5').update(s).digest('hex').slice(0, 12);
+  };
 
   // Write server bundle
   if (allServerCode.trim()) {
@@ -5578,7 +5666,7 @@ function collectExports(ast, filename) {
   return { publicExports, allNames };
 }
 
-function compileWithImports(source, filename, srcDir) {
+function compileWithImports(source, filename, srcDir, options = {}) {
   if (compilationCache.has(filename)) {
     return compilationCache.get(filename);
   }
@@ -5683,7 +5771,7 @@ function compileWithImports(source, filename, srcDir) {
       }
     }
 
-    const codegen = new CodeGenerator(ast, filename);
+    const codegen = new CodeGenerator(ast, filename, { isDev: options.isDev });
     const output = codegen.generate();
     compilationCache.set(filename, output);
     return output;
@@ -5819,7 +5907,7 @@ function mergeDirectory(dir, srcDir, options = {}) {
     // Single file — use existing per-file compilation
     const file = tovaFiles[0];
     const source = readFileSync(file, 'utf-8');
-    return { output: compileWithImports(source, file, srcDir), files: [file], single: true };
+    return { output: compileWithImports(source, file, srcDir, { isDev: options.isDev }), files: [file], single: true };
   }
 
   // Parse all files in the directory
@@ -5935,7 +6023,7 @@ function mergeDirectory(dir, srcDir, options = {}) {
   }
 
   // Run codegen on merged AST
-  const codegen = new CodeGenerator(mergedAST, dir);
+  const codegen = new CodeGenerator(mergedAST, dir, { isDev: options.isDev });
   const output = codegen.generate();
 
   // Collect source content from all files for source maps
@@ -6024,12 +6112,13 @@ async function doctorCommand() {
 
   // 2. Bun availability
   try {
-    const bunProc = Bun.spawnSync(['bun', '--version']);
-    const bunVer = bunProc.stdout.toString().trim();
-    if (bunProc.exitCode === 0 && bunVer) {
+    const bunProc = _compatSpawnSync('bun', ['--version'], { stdout: 'pipe', stderr: 'pipe' });
+    const bunVer = (bunProc.stdout || '').toString().trim();
+    if ((bunProc.exitCode ?? bunProc.status) === 0 && bunVer) {
       const major = parseInt(bunVer.split('.')[0], 10);
       if (major >= 1) {
-        pass(`Bun v${bunVer}`, Bun.spawnSync(['which', 'bun']).stdout.toString().trim());
+        const whichProc = _compatSpawnSync('which', ['bun'], { stdout: 'pipe', stderr: 'pipe' });
+        pass(`Bun v${bunVer}`, (whichProc.stdout || '').toString().trim());
       } else {
         warn(`Bun v${bunVer}`, 'Bun >= 1.0 recommended');
       }
@@ -6077,9 +6166,9 @@ async function doctorCommand() {
 
   // 5. git
   try {
-    const gitProc = Bun.spawnSync(['git', '--version']);
-    if (gitProc.exitCode === 0) {
-      const gitVer = gitProc.stdout.toString().trim();
+    const gitProc = _compatSpawnSync('git', ['--version'], { stdout: 'pipe', stderr: 'pipe' });
+    if ((gitProc.exitCode ?? gitProc.status) === 0) {
+      const gitVer = (gitProc.stdout || '').toString().trim();
       pass('git available', gitVer);
     } else {
       warn('git', 'not found');
@@ -6323,6 +6412,10 @@ function detectInstallMethod() {
   const execPath = process.execPath || process.argv[0];
   const scriptPath = process.argv[1] || '';
   if (execPath.includes('.tova/bin') || scriptPath.includes('.tova/')) return 'binary';
+  // Check if ~/.tova/bin/tova exists — indicates binary/wrapper install even if
+  // the wrapper points to a local repo checkout
+  const wrapperPath = join(process.env.HOME || '', '.tova', 'bin', 'tova');
+  if (existsSync(wrapperPath)) return 'binary';
   return 'npm';
 }
 
@@ -6584,8 +6677,8 @@ async function infoCommand() {
   // Bun version
   let bunVersion = 'not found';
   try {
-    const proc = Bun.spawnSync(['bun', '--version']);
-    bunVersion = proc.stdout.toString().trim();
+    const proc = _compatSpawnSync('bun', ['--version'], { stdout: 'pipe', stderr: 'pipe' });
+    bunVersion = (proc.stdout || '').toString().trim();
   } catch {}
   console.log(`  Runtime:     Bun v${bunVersion}`);
   console.log(`  Platform:    ${process.platform} ${process.arch}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tova",
-  "version": "0.9.8",
+  "version": "0.9.11",
   "description": "Tova — a modern programming language that transpiles to JavaScript, unifying frontend and backend",
   "type": "module",
   "main": "src/index.js",

package/src/codegen/codegen.js

@@ -59,6 +59,7 @@ export class CodeGenerator {
     this.ast = ast;
     this.filename = filename;
     this._sourceMaps = options.sourceMaps !== false; // default true; pass false for REPL/check
+    this._isDev = options.isDev || false;
   }
 
   // Group blocks by name (null name = "default")
@@ -250,6 +251,7 @@ export class CodeGenerator {
     for (const [name, blocks] of serverGroups) {
       const gen = new (getServerCodegen())();
       gen._sourceMapsEnabled = this._sourceMaps;
+      gen._isDev = this._isDev;
       const key = name || 'default';
       // Build peer blocks map (all named blocks except self)
       let peerBlocks = null;

package/src/codegen/server-codegen.js

@@ -240,6 +240,7 @@ export class ServerCodegen extends BaseCodegen {
     const functions = [];
     const middlewares = [];
     const otherStatements = [];
+    const hmrVarNames = [];
     let healthPath = null;
     let healthChecks = null;
     let corsConfig = null;
@@ -2142,8 +2143,29 @@ export class ServerCodegen extends BaseCodegen {
     // ════════════════════════════════════════════════════════════
     // 13. Other statements + Server Functions
     // ════════════════════════════════════════════════════════════
+    if (this._isDev) {
+      lines.push('// ── HMR State ──');
+      lines.push('const __hmrStatePath = process.env.__TOVA_HMR_STATE_PATH || "";');
+      lines.push('let __hmrState = {};');
+      lines.push('if (__hmrStatePath) { try { __hmrState = JSON.parse(require("fs").readFileSync(__hmrStatePath, "utf-8")); } catch {} }');
+      lines.push('');
+    }
     for (const stmt of otherStatements) {
-      lines.push(this.generateStatement(stmt));
+      // HMR wrapping: new variable declarations get restored from __hmrState
+      const isHmrEligible = this._isDev && stmt.targets && stmt.targets.length === 1 &&
+        stmt.values && stmt.values.length === 1 && typeof stmt.targets[0] === 'string' &&
+        (stmt.type === 'Assignment' ? !this.isDeclared(stmt.targets[0]) : stmt.type === 'VarDeclaration');
+      if (isHmrEligible) {
+        const name = stmt.targets[0];
+        hmrVarNames.push(name);
+        this.declareVar(name);
+        if (stmt.isPublic) this._userDefinedNames.add(name);
+        const initExpr = this.genExpression(stmt.values[0]);
+        const keyword = stmt.type === 'VarDeclaration' ? 'let' : 'const';
+        lines.push(`${keyword} ${name} = (${JSON.stringify(name)} in __hmrState) ? __hmrState[${JSON.stringify(name)}] : ${initExpr};`);
+      } else {
+        lines.push(this.generateStatement(stmt));
+      }
     }
 
     if (functions.length > 0) {
@@ -3688,10 +3710,24 @@ export class ServerCodegen extends BaseCodegen {
     // 24. Graceful Shutdown — on_stop hooks (F3) + clearInterval (F8)
     // ════════════════════════════════════════════════════════════
     lines.push('// ── Graceful Shutdown ──');
+    // HMR state-save helper (emitted as first action in __shutdown)
+    const hmrSaveLines = [];
+    if (this._isDev && hmrVarNames.length > 0) {
+      const entries = hmrVarNames.map(n => `${JSON.stringify(n)}: ${n}`).join(', ');
+      hmrSaveLines.push(`  try { require("fs").writeFileSync(__hmrStatePath, JSON.stringify({ ${entries} })); } catch {}`);
+    }
     if (isFastMode) {
-      lines.push('function __shutdown() { __server.stop(); process.exit(0); }');
+      if (hmrSaveLines.length > 0) {
+        lines.push('function __shutdown() {');
+        for (const l of hmrSaveLines) lines.push(l);
+        lines.push('  __server.stop(); process.exit(0);');
+        lines.push('}');
+      } else {
+        lines.push('function __shutdown() { __server.stop(); process.exit(0); }');
+      }
     } else {
     lines.push('async function __shutdown() {');
+    for (const l of hmrSaveLines) lines.push(l);
     lines.push(`  console.log(\`Tova server${label} shutting down...\`);`);
     lines.push('  __shuttingDown = true;');
     lines.push('  __server.stop();');

package/src/parser/auth-parser.js

@@ -5,7 +5,7 @@ import { TokenType } from '../lexer/tokens.js';
 import * as AST from './ast.js';
 import { AuthConfigField, AuthProviderDeclaration, AuthHookDeclaration, AuthProtectedRoute } from './auth-ast.js';
 
-const CONFIG_KEY_TOKENS = new Set([
+const AUTH_CONFIG_KEY_TOKENS = new Set([
   TokenType.IDENTIFIER, TokenType.TYPE, TokenType.STORE,
   TokenType.FN, TokenType.MATCH, TokenType.IF,
 ]);
@@ -15,7 +15,7 @@ export function installAuthParser(ParserClass) {
   ParserClass.prototype._authParserInstalled = true;
 
   ParserClass.prototype._expectAuthConfigKey = function(context) {
-    if (CONFIG_KEY_TOKENS.has(this.current().type)) {
+    if (AUTH_CONFIG_KEY_TOKENS.has(this.current().type)) {
       return this.advance().value;
     }
     this.error(`Expected ${context} config key`);

package/src/version.js

@@ -1,2 +1,2 @@
 // Auto-generated by scripts/embed-runtime.js — do not edit
-export const VERSION = "0.9.8";
+export const VERSION = "0.9.11";