hook up type of template with the generation command

Author: Anmol1696

scripts/docker-build.ts

@@ -1,7 +1,7 @@
-// docker-build: builds per-function Docker images using Dockerfile templates.
+// docker-build: builds per-function Docker images from generated Dockerfiles.
 //
-// Reads each function's handler.json to determine template type, processes
-// the template Dockerfile with placeholder replacement, and runs docker build.
+// Expects `pnpm generate` to have been run first, which produces
+// generated/<name>/Dockerfile from the template with placeholders resolved.
 //
 // Usage:
 //   node --experimental-strip-types scripts/docker-build.ts --all
@@ -14,9 +14,8 @@ const { execSync } = require('child_process') as typeof import('child_process');
 
 const ROOT: string = process.cwd();
 const FUNCTIONS_DIR: string = path.resolve(ROOT, 'functions');
-const TEMPLATES_DIR: string = path.resolve(ROOT, 'templates');
+const GENERATED_DIR: string = path.resolve(ROOT, 'generated');
 
-const DEFAULT_TEMPLATE = 'node-graphql';
 const DEFAULT_REGISTRY = 'ghcr.io/constructive-io';
 
 interface FunctionManifest {
@@ -72,34 +71,21 @@ function readManifest(fnDir: string): FunctionManifest {
 // --- Docker build ---
 
 function buildDockerImage(fnName: string, manifest: FunctionManifest): void {
-  const templateType = manifest.type || DEFAULT_TEMPLATE;
-  const dockerfilePath = path.join(TEMPLATES_DIR, templateType, 'Dockerfile');
+  const dockerfilePath = path.join(GENERATED_DIR, fnName, 'Dockerfile');
 
   if (!fs.existsSync(dockerfilePath)) {
-    console.error(`No Dockerfile found for template "${templateType}" at ${dockerfilePath}`);
+    console.error(`No Dockerfile found at ${dockerfilePath}. Run "pnpm generate" first.`);
     process.exit(1);
   }
 
-  // Read and process Dockerfile template
-  const dockerfile = fs.readFileSync(dockerfilePath, 'utf-8')
-    .replace(/\{\{name\}\}/g, manifest.name);
-
   const imageName = `${registry}/${manifest.name}-fn`;
-  const tmpDockerfile = path.join(ROOT, `.Dockerfile.${manifest.name}`);
-
-  fs.writeFileSync(tmpDockerfile, dockerfile, 'utf-8');
-
-  try {
-    console.log(`\nBuilding ${imageName}:${tag}...`);
-    execSync(
-      `docker build -t ${imageName}:${tag} -f ${tmpDockerfile} .`,
-      { cwd: ROOT, stdio: 'inherit' }
-    );
-    console.log(`Built ${imageName}:${tag}`);
-  } finally {
-    // Clean up temp Dockerfile
-    try { fs.unlinkSync(tmpDockerfile); } catch { /* ignore */ }
-  }
+
+  console.log(`\nBuilding ${imageName}:${tag}...`);
+  execSync(
+    `docker build -t ${imageName}:${tag} -f ${dockerfilePath} .`,
+    { cwd: ROOT, stdio: 'inherit' }
+  );
+  console.log(`Built ${imageName}:${tag}`);
 }
 
 // --- Main ---

scripts/generate.ts

@@ -15,9 +15,6 @@ const TEMPLATES_DIR: string = path.resolve(ROOT, 'templates');
 
 const DEFAULT_TEMPLATE = 'node-graphql';
 
-// Files from the template that get copied into generated/<name>/
-const WORKSPACE_FILES = ['package.json', 'tsconfig.json', 'index.ts'];
-
 interface FunctionManifest {
   name: string;
   version: string;
@@ -70,6 +67,24 @@ function resolveTemplateDir(manifest: FunctionManifest): string {
   return templateDir;
 }
 
+// --- Template file discovery ---
+
+function walkTemplateFiles(dir: string, base: string = ''): string[] {
+  const results: string[] = [];
+  const entries = fs.readdirSync(dir) as string[];
+  for (const entry of entries) {
+    const fullPath = path.join(dir, entry);
+    const relPath = base ? path.join(base, entry) : entry;
+    const stat = fs.statSync(fullPath);
+    if (stat.isDirectory()) {
+      results.push(...walkTemplateFiles(fullPath, relPath));
+    } else {
+      results.push(relPath);
+    }
+  }
+  return results;
+}
+
 // --- Placeholder replacement ---
 
 function replacePlaceholders(content: string, manifest: FunctionManifest): string {
@@ -183,18 +198,23 @@ function main(): void {
 
     console.log(`  Generating ${fnName} (template: ${manifest.type || DEFAULT_TEMPLATE})...`);
 
-    // Copy and process template files
-    for (const fileName of WORKSPACE_FILES) {
-      const templateFile = path.join(templateDir, fileName);
-      if (!fs.existsSync(templateFile)) {
-        console.warn(`    ! Template file missing: ${fileName}`);
-        continue;
+    // Walk all template files and copy/process them
+    const templateFiles = walkTemplateFiles(templateDir);
+    for (const relPath of templateFiles) {
+      const templateFile = path.join(templateDir, relPath);
+      const outputFile = path.join(genDir, relPath);
+
+      // Ensure subdirectories exist (e.g., k8s/)
+      const outputDir = path.dirname(outputFile);
+      if (!fs.existsSync(outputDir)) {
+        fs.mkdirSync(outputDir, { recursive: true });
       }
 
       const templateContent = fs.readFileSync(templateFile, 'utf-8');
-      const processed = processTemplateFile(fileName, templateContent, manifest, fnDir);
-      const changed = writeIfChanged(path.join(genDir, fileName), processed);
-      if (changed) console.log(`    - ${fileName}`);
+      const baseName = path.basename(relPath);
+      const processed = processTemplateFile(baseName, templateContent, manifest, fnDir);
+      const changed = writeIfChanged(outputFile, processed);
+      if (changed) console.log(`    - ${relPath}`);
     }
 
     // Symlink handler.ts