tova 0.9.10 → 0.9.11

package/bin/tova.js

@@ -1568,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;
@@ -1663,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) => {
@@ -1813,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;
@@ -1890,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++;
@@ -1921,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);
   });
 
@@ -5663,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);
   }
@@ -5768,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;
@@ -5904,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
@@ -6020,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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tova",
-  "version": "0.9.10",
+  "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/version.js

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