tova 0.5.1 → 0.8.2

package/src/codegen/codegen.js

@@ -1,21 +1,45 @@
-// Main code generator — orchestrates shared/server/client codegen
+// Main code generator — orchestrates shared/server/browser codegen
 // Supports named multi-blocks: server "api" { }, server "ws" { }
 // Blocks with the same name are merged; different names produce separate output files.
 
+import { createRequire } from 'module';
 import { SharedCodegen } from './shared-codegen.js';
 import { BUILTIN_NAMES } from '../stdlib/inline.js';
-import { ServerCodegen } from './server-codegen.js';
-import { ClientCodegen } from './client-codegen.js';
-import { SecurityCodegen } from './security-codegen.js';
-import { CliCodegen } from './cli-codegen.js';
 import { BlockRegistry } from '../registry/register-all.js';
 
+// Lazy-load domain-specific codegens so pure scripts don't pay for them
+const _require = createRequire(import.meta.url);
+let _ServerCodegen, _BrowserCodegen, _SecurityCodegen, _CliCodegen, _EdgeCodegen;
+
 function getServerCodegen() {
-  return ServerCodegen;
+  if (!_ServerCodegen) _ServerCodegen = _require('./server-codegen.js').ServerCodegen;
+  return _ServerCodegen;
+}
+
+function getBrowserCodegen() {
+  if (!_BrowserCodegen) _BrowserCodegen = _require('./browser-codegen.js').BrowserCodegen;
+  return _BrowserCodegen;
+}
+
+function getSecurityCodegen() {
+  if (!_SecurityCodegen) _SecurityCodegen = _require('./security-codegen.js').SecurityCodegen;
+  return _SecurityCodegen;
+}
+
+function getCliCodegen() {
+  if (!_CliCodegen) _CliCodegen = _require('./cli-codegen.js').CliCodegen;
+  return _CliCodegen;
+}
+
+function getEdgeCodegen() {
+  if (!_EdgeCodegen) _EdgeCodegen = _require('./edge-codegen.js').EdgeCodegen;
+  return _EdgeCodegen;
 }
 
-function getClientCodegen() {
-  return ClientCodegen;
+let _DeployCodegen;
+function getDeployCodegen() {
+  if (!_DeployCodegen) _DeployCodegen = _require('./deploy-codegen.js').DeployCodegen;
+  return _DeployCodegen;
 }
 
 export class CodeGenerator {
@@ -63,11 +87,13 @@ export class CodeGenerator {
     // Convenience aliases
     const sharedBlocks = getBlocks('shared');
     const serverBlocks = getBlocks('server');
-    const clientBlocks = getBlocks('client');
+    const browserBlocks = getBlocks('browser');
     const testBlocks = getBlocks('test');
     const benchBlocks = getBlocks('bench');
     const dataBlocks = getBlocks('data');
     const securityBlocks = getBlocks('security');
+    const edgeBlocks = getBlocks('edge');
+    const deployBlocks = getBlocks('deploy');
 
     // Detect module mode: no blocks, only top-level statements
     const hasAnyBlocks = BlockRegistry.all().some(p => getBlocks(p.name).length > 0);
@@ -85,7 +111,8 @@ export class CodeGenerator {
       return {
         shared: combined,
         server: '',
-        client: '',
+        browser: '',
+        client: '',  // deprecated alias
         isModule: true,
         sourceMappings: moduleGen.getSourceMappings(),
         _sourceFile: this.filename,
@@ -102,8 +129,8 @@ export class CodeGenerator {
       ? sharedGen.genBlockStatements({ type: 'BlockStatement', body: topLevel })
       : '';
 
-    // Pre-scan server/client blocks for builtin usage so shared stdlib includes them
-    this._scanBlocksForBuiltins([...serverBlocks, ...clientBlocks], sharedGen._usedBuiltins);
+    // Pre-scan server/browser blocks for builtin usage so shared stdlib includes them
+    this._scanBlocksForBuiltins([...serverBlocks, ...browserBlocks, ...edgeBlocks], sharedGen._usedBuiltins);
 
     const helpers = sharedGen.generateHelpers();
 
@@ -112,9 +139,9 @@ export class CodeGenerator {
 
     const combinedShared = [helpers, sharedCode, topLevelCode, dataCode].filter(s => s.trim()).join('\n').trim();
 
-    // Group server and client blocks by name
+    // Group server and browser blocks by name
     const serverGroups = this._groupByName(serverBlocks);
-    const clientGroups = this._groupByName(clientBlocks);
+    const browserGroups = this._groupByName(browserBlocks);
 
     // Collect function names per named server block for inter-server RPC
     const serverFunctionMap = new Map(); // blockName -> [fnName, ...]
@@ -141,7 +168,7 @@ export class CodeGenerator {
 
     // Merge security blocks into a single config
     const securityConfig = securityBlocks.length > 0
-      ? SecurityCodegen.mergeSecurityBlocks(securityBlocks)
+      ? getSecurityCodegen().mergeSecurityBlocks(securityBlocks)
       : null;
 
     // Generate server outputs (one per named group)
@@ -160,16 +187,67 @@ export class CodeGenerator {
           }
         }
       }
-      servers[key] = gen.generate(blocks, combinedShared, name, peerBlocks, sharedBlocks, securityConfig);
+      // Include top-level statements so _collectTypes finds top-level type declarations
+      const allSharedBlocks = topLevel.length > 0
+        ? [...sharedBlocks, { type: 'BlockStatement', body: topLevel }]
+        : sharedBlocks;
+      servers[key] = gen.generate(blocks, combinedShared, name, peerBlocks, allSharedBlocks, securityConfig);
+    }
+
+    // Collect type validators from shared blocks and top-level for form type inheritance
+    const typeValidatorsMap = {};
+    const _collectTypeValidators = (stmts) => {
+      for (const stmt of stmts) {
+        if (stmt.type === 'TypeDeclaration' && stmt.variants) {
+          const fields = [];
+          for (const v of stmt.variants) {
+            if (v.type === 'TypeField' && v.validators && v.validators.length > 0) {
+              fields.push({ name: v.name, validators: v.validators });
+            }
+          }
+          if (fields.length > 0) {
+            typeValidatorsMap[stmt.name] = { fields };
+          }
+        }
+      }
+    };
+    for (const sb of sharedBlocks) {
+      _collectTypeValidators(sb.body);
     }
+    _collectTypeValidators(topLevel);
 
-    // Generate client outputs (one per named group)
-    const clients = {};
-    for (const [name, blocks] of clientGroups) {
-      const gen = new (getClientCodegen())();
+    // Generate browser outputs (one per named group)
+    const browsers = {};
+    for (const [name, blocks] of browserGroups) {
+      const gen = new (getBrowserCodegen())();
       gen._sourceMapsEnabled = this._sourceMaps;
       const key = name || 'default';
-      clients[key] = gen.generate(blocks, combinedShared, sharedGen._usedBuiltins, securityConfig);
+      browsers[key] = gen.generate(blocks, combinedShared, sharedGen._usedBuiltins, securityConfig, typeValidatorsMap);
+    }
+
+    // Generate edge outputs (one per named group)
+    const edges = {};
+    if (edgeBlocks.length > 0) {
+      const edgeGroups = this._groupByName(edgeBlocks);
+      for (const [name, blocks] of edgeGroups) {
+        const Edge = getEdgeCodegen();
+        const gen = new Edge();
+        gen._sourceMapsEnabled = this._sourceMaps;
+        const key = name || 'default';
+        const edgeConfig = Edge.mergeEdgeBlocks(blocks);
+        edges[key] = gen.generate(edgeConfig, combinedShared, securityConfig);
+      }
+    }
+
+    // Generate deploy configs (one per named block)
+    const deploys = {};
+    if (deployBlocks.length > 0) {
+      const Deploy = getDeployCodegen();
+      const deployGroups = this._groupByName(deployBlocks);
+      for (const [name, blocks] of deployGroups) {
+        const key = name || 'default';
+        deploys[key] = Deploy.mergeDeployBlocks(blocks);
+      }
     }
 
     // Generate tests if test blocks exist
@@ -193,16 +271,21 @@ export class CodeGenerator {
     }
 
     // Backward-compatible: if only unnamed blocks, return flat structure
-    const hasNamedBlocks = [...serverGroups.keys(), ...clientGroups.keys()].some(k => k !== null);
+    const edgeGroupKeys = edgeBlocks.length > 0 ? [...this._groupByName(edgeBlocks).keys()] : [];
+    const hasNamedBlocks = [...serverGroups.keys(), ...browserGroups.keys(), ...edgeGroupKeys].some(k => k !== null);
 
     // Collect source mappings from all codegens
     const sourceMappings = sharedGen.getSourceMappings();
 
     if (!hasNamedBlocks) {
+      const browserCode = browsers['default'] || '';
       const result = {
         shared: combinedShared,
         server: servers['default'] || '',
-        client: clients['default'] || '',
+        browser: browserCode,
+        client: browserCode,  // deprecated alias for backward compat
+        edge: edges['default'] || '',
+        deploy: Object.keys(deploys).length > 0 ? deploys : undefined,
         sourceMappings,
         _sourceFile: this.filename,
       };
@@ -212,12 +295,18 @@ export class CodeGenerator {
     }
 
     // Multi-block output: separate files per named block
+    const browserDefault = browsers['default'] || '';
     const result = {
       shared: combinedShared,
       server: servers['default'] || '',
-      client: clients['default'] || '',
+      browser: browserDefault,
+      client: browserDefault,  // deprecated alias for backward compat
+      edge: edges['default'] || '',
       servers,   // { "api": code, "ws": code, ... }
-      clients,   // { "admin": code, "dashboard": code, ... }
+      browsers,  // { "admin": code, "dashboard": code, ... }
+      clients: browsers,   // deprecated alias for backward compat
+      edges,     // { "api": code, "assets": code, ... }
+      deploy: Object.keys(deploys).length > 0 ? deploys : undefined,
       multiBlock: true,
       sourceMappings,
       _sourceFile: this.filename,
@@ -250,8 +339,9 @@ export class CodeGenerator {
     const helpers = sharedGen.generateHelpers();
     const combinedShared = [helpers, topLevelCode].filter(s => s.trim()).join('\n').trim();
 
-    const cliConfig = CliCodegen.mergeCliBlocks(cliBlocks);
-    const cliGen = new CliCodegen();
+    const Cli = getCliCodegen();
+    const cliConfig = Cli.mergeCliBlocks(cliBlocks);
+    const cliGen = new Cli();
     cliGen._sourceMapsEnabled = this._sourceMaps;
     const cliCode = cliGen.generate(cliConfig, combinedShared);
 
@@ -260,7 +350,8 @@ export class CodeGenerator {
       isCli: true,
       shared: '',
       server: '',
-      client: '',
+      browser: '',
+      client: '',  // deprecated alias
       sourceMappings: sharedGen.getSourceMappings(),
       _sourceFile: this.filename,
     };

package/src/codegen/deploy-codegen.js

@@ -0,0 +1,49 @@
+// Deploy-specific codegen for the Tova language
+// Produces a configuration manifest (plain JS object) from deploy block AST nodes.
+
+const DEFAULTS = {
+  instances: 1,
+  memory: '512mb',
+  branch: 'main',
+  health: '/healthz',
+  health_interval: 30,
+  health_timeout: 5,
+  restart_on_failure: true,
+  keep_releases: 5,
+};
+
+export class DeployCodegen {
+  static mergeDeployBlocks(blocks) {
+    const config = { ...DEFAULTS, env: {}, databases: [] };
+    for (const block of blocks) {
+      config.name = block.name;
+      for (const stmt of block.body) {
+        switch (stmt.type) {
+          case 'DeployConfigField': {
+            // Extract literal value from AST expression
+            const val = stmt.value;
+            config[stmt.key] = val.value !== undefined ? val.value : val;
+            break;
+          }
+          case 'DeployEnvBlock': {
+            for (const entry of stmt.entries) {
+              config.env[entry.key] = entry.value.value !== undefined ? entry.value.value : entry.value;
+            }
+            break;
+          }
+          case 'DeployDbBlock': {
+            const dbConfig = {};
+            if (stmt.config && typeof stmt.config === 'object') {
+              for (const [k, v] of Object.entries(stmt.config)) {
+                dbConfig[k] = v.value !== undefined ? v.value : v;
+              }
+            }
+            config.databases.push({ engine: stmt.engine, config: dbConfig });
+            break;
+          }
+        }
+      }
+    }
+    return config;
+  }
+}