tova 0.3.3 → 0.3.5

package/bin/tova.js

@@ -345,10 +345,8 @@ async function runTests(args) {
         const outDir = dirname(outPath);
         if (!existsSync(outDir)) mkdirSync(outDir, { recursive: true });
 
-        // Include stdlib + shared code + test code
-        const stdlib = getFullStdlib();
-        const fullTest = result.test;
-        writeFileSync(outPath, fullTest);
+        // Shared code (top-level definitions) is now included by generateTests()
+        writeFileSync(outPath, result.test);
         compiledFiles.push(outPath);
         console.log(`  Compiled: ${relative('.', file)}`);
       }
@@ -883,9 +881,16 @@ async function checkProject(args) {
   }
 
   const explicitSrc = args.filter(a => !a.startsWith('--'))[0];
-  const srcDir = resolve(explicitSrc || '.');
+  const srcPath = resolve(explicitSrc || '.');
 
-  const tovaFiles = findFiles(srcDir, '.tova');
+  // Support both single file and directory arguments
+  let tovaFiles;
+  if (existsSync(srcPath) && statSync(srcPath).isFile()) {
+    tovaFiles = srcPath.endsWith('.tova') ? [srcPath] : [];
+  } else {
+    tovaFiles = findFiles(srcPath, '.tova');
+  }
+  const srcDir = existsSync(srcPath) && statSync(srcPath).isFile() ? dirname(srcPath) : srcPath;
   if (tovaFiles.length === 0) {
     console.error('No .tova files found');
     process.exit(1);
@@ -2780,6 +2785,16 @@ async function productionBuild(srcDir, outDir) {
     console.log(`  server.${hash}.js`);
   }
 
+  // Write script bundle for plain scripts (no server/client blocks)
+  if (!allServerCode.trim() && !allClientCode.trim() && allSharedCode.trim()) {
+    const stdlib = getRunStdlib();
+    const scriptBundle = stdlib + '\n' + allSharedCode;
+    const hash = hashCode(scriptBundle);
+    const scriptPath = join(outDir, `script.${hash}.js`);
+    writeFileSync(scriptPath, scriptBundle);
+    console.log(`  script.${hash}.js`);
+  }
+
   // Write client bundle
   if (allClientCode.trim()) {
     const fullClientModule = allSharedCode + '\n' + allClientCode;

package/package.json

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

package/src/analyzer/analyzer.js

@@ -1,6 +1,8 @@
 import { Scope, Symbol } from './scope.js';
 import { PIPE_TARGET } from '../parser/ast.js';
 import { BUILTIN_NAMES } from '../stdlib/inline.js';
+import { collectServerBlockFunctions, installServerAnalyzer } from './server-analyzer.js';
+import { installClientAnalyzer } from './client-analyzer.js';
 import {
   Type, PrimitiveType, NilType, AnyType, UnknownType,
   ArrayType, TupleType, FunctionType, RecordType, ADTType,
@@ -267,7 +269,6 @@ export class Analyzer {
     // Pre-pass: collect named server block functions for inter-server RPC validation
     const hasServerBlocks = this.ast.body.some(n => n.type === 'ServerBlock');
     if (hasServerBlocks) {
-      const { collectServerBlockFunctions, installServerAnalyzer } = import.meta.require('./server-analyzer.js');
       installServerAnalyzer(Analyzer);
       this.serverBlockFunctions = collectServerBlockFunctions(this.ast);
     } else {
@@ -734,7 +735,6 @@ export class Analyzer {
 
   _visitServerNode(node) {
     if (!Analyzer.prototype._serverAnalyzerInstalled) {
-      const { installServerAnalyzer } = import.meta.require('./server-analyzer.js');
       installServerAnalyzer(Analyzer);
     }
     const methodName = 'visit' + node.type;
@@ -743,7 +743,6 @@ export class Analyzer {
 
   _visitClientNode(node) {
     if (!Analyzer.prototype._clientAnalyzerInstalled) {
-      const { installClientAnalyzer } = import.meta.require('./client-analyzer.js');
       installClientAnalyzer(Analyzer);
     }
     const methodName = 'visit' + node.type;

package/src/codegen/codegen.js

@@ -4,25 +4,15 @@
 
 import { SharedCodegen } from './shared-codegen.js';
 import { BUILTIN_NAMES } from '../stdlib/inline.js';
-
-// Lazy-loaded codegen modules — only imported when server/client blocks exist
-let _ServerCodegen = null;
-let _ClientCodegen = null;
+import { ServerCodegen } from './server-codegen.js';
+import { ClientCodegen } from './client-codegen.js';
 
 function getServerCodegen() {
-  if (!_ServerCodegen) {
-    // Dynamic require avoids loading server-codegen.js for client-only builds
-    _ServerCodegen = import.meta.require('./server-codegen.js').ServerCodegen;
-  }
-  return _ServerCodegen;
+  return ServerCodegen;
 }
 
 function getClientCodegen() {
-  if (!_ClientCodegen) {
-    // Dynamic require avoids loading client-codegen.js for server-only builds
-    _ClientCodegen = import.meta.require('./client-codegen.js').ClientCodegen;
-  }
-  return _ClientCodegen;
+  return ClientCodegen;
 }
 
 export class CodeGenerator {
@@ -160,7 +150,7 @@ export class CodeGenerator {
     let testCode = '';
     if (testBlocks.length > 0) {
       const testGen = new (getServerCodegen())();
-      testCode = testGen.generateTests(testBlocks);
+      testCode = testGen.generateTests(testBlocks, combinedShared);
 
       // Add __handleRequest export to server code
       const defaultServer = servers['default'] || '';
@@ -173,7 +163,7 @@ export class CodeGenerator {
     let benchCode = '';
     if (benchBlocks.length > 0) {
       const benchGen = new (getServerCodegen())();
-      benchCode = benchGen.generateBench(benchBlocks);
+      benchCode = benchGen.generateBench(benchBlocks, combinedShared);
     }
 
     // Backward-compatible: if only unnamed blocks, return flat structure

package/src/codegen/server-codegen.js

@@ -2677,7 +2677,7 @@ export class ServerCodegen extends BaseCodegen {
     this._emitHandlerCall(lines, `__grpChain(req)`, timeoutMs);
   }
 
-  generateTests(testBlocks) {
+  generateTests(testBlocks, sharedCode) {
     const lines = [];
     lines.push('import { describe, test, expect } from "bun:test";');
     lines.push('');
@@ -2701,6 +2701,12 @@ export class ServerCodegen extends BaseCodegen {
     lines.push('  if (!condition) throw new Error(message || "Assertion failed");');
     lines.push('}');
     lines.push('');
+    // Include top-level definitions (functions, variables) so tests can reference them
+    if (sharedCode && sharedCode.trim()) {
+      lines.push('// ── Module Code ──');
+      lines.push(sharedCode);
+      lines.push('');
+    }
 
     for (const block of testBlocks) {
       const name = block.name || 'Tests';
@@ -2729,24 +2735,37 @@ export class ServerCodegen extends BaseCodegen {
         lines.push('  });');
       }
 
-      for (const stmt of block.body) {
-        if (stmt.type === 'FunctionDeclaration') {
-          const fnName = stmt.name;
-          const displayName = fnName.replace(/_/g, ' ');
-          this.pushScope();
-          for (const p of (stmt.params || [])) {
-            const pName = typeof p === 'string' ? p : (p.name || p.identifier);
-            if (pName) this.declareVar(pName);
+      const hasFnTests = block.body.some(s => s.type === 'FunctionDeclaration');
+
+      if (hasFnTests) {
+        // Function declarations become individual test cases
+        for (const stmt of block.body) {
+          if (stmt.type === 'FunctionDeclaration') {
+            const fnName = stmt.name;
+            const displayName = fnName.replace(/_/g, ' ');
+            this.pushScope();
+            for (const p of (stmt.params || [])) {
+              const pName = typeof p === 'string' ? p : (p.name || p.identifier);
+              if (pName) this.declareVar(pName);
+            }
+            const body = this.genBlockBody(stmt.body);
+            this.popScope();
+            const timeoutArg = blockTimeout ? `, ${blockTimeout}` : '';
+            lines.push(`  test(${JSON.stringify(displayName)}, async () => {`);
+            lines.push(body);
+            lines.push(`  }${timeoutArg});`);
+          } else {
+            lines.push('  ' + this.generateStatement(stmt));
           }
-          const body = this.genBlockBody(stmt.body);
-          this.popScope();
-          const timeoutArg = blockTimeout ? `, ${blockTimeout}` : '';
-          lines.push(`  test(${JSON.stringify(displayName)}, async () => {`);
-          lines.push(body);
-          lines.push(`  }${timeoutArg});`);
-        } else {
-          lines.push('  ' + this.generateStatement(stmt));
         }
+      } else {
+        // No function declarations — wrap all statements in a single test case
+        const timeoutArg = blockTimeout ? `, ${blockTimeout}` : '';
+        lines.push(`  test(${JSON.stringify(name)}, async () => {`);
+        for (const stmt of block.body) {
+          lines.push('    ' + this.generateStatement(stmt));
+        }
+        lines.push(`  }${timeoutArg});`);
       }
       lines.push('});');
       lines.push('');
@@ -2755,10 +2774,16 @@ export class ServerCodegen extends BaseCodegen {
     return lines.join('\n');
   }
 
-  generateBench(benchBlocks) {
+  generateBench(benchBlocks, sharedCode) {
     const lines = [];
     lines.push('// ── Tova Benchmark Runner ──');
     lines.push('');
+    // Include top-level definitions (functions, variables) so benchmarks can reference them
+    if (sharedCode && sharedCode.trim()) {
+      lines.push('// ── Module Code ──');
+      lines.push(sharedCode);
+      lines.push('');
+    }
     lines.push('async function __runBench(name, fn, runs) {');
     lines.push('  runs = runs || 100;');
     lines.push('  // Warmup');

package/src/parser/parser.js

@@ -1,5 +1,7 @@
 import { TokenType } from '../lexer/tokens.js';
 import * as AST from './ast.js';
+import { installServerParser } from './server-parser.js';
+import { installClientParser } from './client-parser.js';
 
 export class Parser {
   static MAX_EXPRESSION_DEPTH = 200;
@@ -295,14 +297,12 @@ export class Parser {
   parseTopLevel() {
     if (this.check(TokenType.SERVER)) {
       if (!Parser.prototype._serverParserInstalled) {
-        const { installServerParser } = import.meta.require('./server-parser.js');
         installServerParser(Parser);
       }
       return this.parseServerBlock();
     }
     if (this.check(TokenType.CLIENT)) {
       if (!Parser.prototype._clientParserInstalled) {
-        const { installClientParser } = import.meta.require('./client-parser.js');
         installClientParser(Parser);
       }
       return this.parseClientBlock();

package/src/version.js

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