fix: Template resolve files fixes (#121)

* fix: Remove hashing of files. Not needed with template tags and aliases

* fix: Show error when file write fails on template creation

Author: christianalfoni

src/bin/commands/build.ts

@@ -18,7 +18,7 @@ import {
   handleResponse,
 } from "../../utils/api";
 import { getInferredApiKey } from "../../utils/constants";
-import { hashDirectory } from "../utils/hash";
+import { hashDirectory as getFilePaths } from "../utils/files";
 import { startVm } from "../../Sandboxes";
 import { mkdir, writeFile } from "fs/promises";
 
@@ -121,8 +121,7 @@ export const buildCommand: yargs.CommandModule<
       alias = createAlias(path.resolve(argv.directory), argv.alias);
     }
 
-    const { hash, files: filePaths } = await hashDirectory(argv.directory);
-    const tag = `sha:${hash.slice(0, 6)}`;
+    const filePaths = await getFilePaths(argv.directory);
 
     try {
       const templateData = handleResponse(
@@ -132,7 +131,7 @@ export const buildCommand: yargs.CommandModule<
             forkOf: argv.fromSandbox || getDefaultTemplateId(apiClient),
             title: argv.name,
             // We filter out sdk-templates on the dashboard
-            tags: ["sdk-template", tag],
+            tags: ["sdk-template"],
           },
         }),
         "Failed to create template"
@@ -209,10 +208,10 @@ export const buildCommand: yargs.CommandModule<
             updateSpinnerMessage(index, "Writing files to sandbox...")
           );
 
-          try {
-            let i = 0;
-            for (const filePath of filePaths) {
-              i++;
+          let i = 0;
+          for (const filePath of filePaths) {
+            i++;
+            try {
               const fullPath = path.join(argv.directory, filePath);
               const content = await fs.readFile(fullPath);
               const dirname = path.dirname(filePath);
@@ -221,9 +220,11 @@ export const buildCommand: yargs.CommandModule<
                 create: true,
                 overwrite: true,
               });
+            } catch (error) {
+              throw new Error(
+                `Failed to write "${filePath}" to sandbox: ${error}`
+              );
             }
-          } catch (error) {
-            throw new Error(`Failed to write files to sandbox: ${error}`);
           }
 
           spinner.start(updateSpinnerMessage(index, "Building sandbox..."));

src/bin/utils/hash.ts renamed to src/bin/utils/files.ts

@@ -1,18 +1,12 @@
-import { createHash } from "crypto";
 import { existsSync, readFileSync } from "fs";
-import { readFile, stat, readdir } from "fs/promises";
+import { stat, readdir } from "fs/promises";
 import { join, relative } from "path";
 
 import ignore from "ignore";
 
-interface HashResult {
-  hash: string;
-  files: string[];
-}
-
 const MAX_FILES = 50_000;
 
-export async function hashDirectory(dirPath: string): Promise<HashResult> {
+export async function hashDirectory(dirPath: string): Promise<string[]> {
   // Initialize ignore rules from .gitignore, .dockerignore and .csbignore
   const ig = ignore();
   const ignoreFiles = [".gitignore", ".dockerignore", ".csbignore"];
@@ -24,11 +18,10 @@ export async function hashDirectory(dirPath: string): Promise<HashResult> {
     }
   });
 
-  // Always ignore .git folder
-  ig.add(".git/**");
+  // Always ignore root .git folder
+  ig.add("/.git/");
 
   const relevantFiles: string[] = [];
-  const fileHashes: string[] = [];
 
   async function processDirectory(currentPath: string) {
     const files = await readdir(currentPath);
@@ -51,11 +44,6 @@ export async function hashDirectory(dirPath: string): Promise<HashResult> {
         if (stats.isDirectory()) {
           await processDirectory(fullPath);
         } else if (stats.isFile()) {
-          const fileContent = await readFile(fullPath);
-          const fileHash = createHash("sha256")
-            .update(fileContent)
-            .digest("hex");
-          fileHashes.push(fileHash);
           relevantFiles.push(relativePath);
         }
       })
@@ -64,17 +52,7 @@ export async function hashDirectory(dirPath: string): Promise<HashResult> {
 
   await processDirectory(dirPath);
 
-  // Sort for consistent hashing
-  fileHashes.sort();
   relevantFiles.sort();
 
-  // Create final hash from all file hashes
-  const finalHash = createHash("sha256")
-    .update(fileHashes.join(""))
-    .digest("hex");
-
-  return {
-    hash: finalHash,
-    files: relevantFiles,
-  };
+  return relevantFiles;
 }