Different checkouts in different dirs

Author: 404Wolf

src/vt/lib/checkout.ts

@@ -21,18 +21,17 @@ export type BaseCheckoutParams = {
   projectId: string;
   dryRun?: boolean;
   gitignoreRules?: string[];
+  version?: number;
 };
 
 export type BranchCheckoutParams = BaseCheckoutParams & {
   branchId: string;
-  version: number;
   fromBranchId: string;
 };
 
 export type ForkCheckoutParams = BaseCheckoutParams & {
   forkedFromId: string;
   name: string;
-  version: number;
 };
 
 /**
@@ -42,8 +41,8 @@ export type ForkCheckoutParams = BaseCheckoutParams & {
  * @param {string} args.targetDir - The directory where the branch will be checked out.
  * @param {string} args.projectId - The ID of the project.
  * @param {string} args.branchId - The ID of the branch to checkout.
- * @param {number} args.version - The version of the branch to checkout.
- * @param {string[]} args.gitignoreRules - List of gitignore rules.
+ * @param {number} [args.version] - The version of the branch to checkout. Defaults to latest.
+ * @param {string[]} [args.gitignoreRules] - List of gitignore rules. Defaults to [].
  * @param {string} [args.fromBranchId] - The ID of the branch we're switching from.
  * @returns {Promise<CheckoutResult>} A promise that resolves with checkout information.
  */
@@ -57,13 +56,11 @@ export function checkout(args: BranchCheckoutParams): Promise<CheckoutResult>;
  * @param {string} args.projectId - The ID of the project to fork.
  * @param {string} args.forkedFrom - The branch ID from which to create the fork.
  * @param {string} args.name - The name for the new forked branch.
- * @param {number} args.version - The version of the fork to checkout.
- * @param {string[]} args.gitignoreRules - List of gitignore rules.
+ * @param {number} [args.version] - The version of the fork to checkout. Defaults to latest.
+ * @param {string[]} [args.gitignoreRules] - List of gitignore rules. Defaults to [].
  * @returns {Promise<CheckoutResult>} A promise that resolves with checkout information (including the new branch details).
  */
-export function checkout(
-  args: ForkCheckoutParams,
-): Promise<CheckoutResult>;
+export function checkout(args: ForkCheckoutParams): Promise<CheckoutResult>;
 export function checkout(
   args: BranchCheckoutParams | ForkCheckoutParams,
 ): Promise<CheckoutResult> {
@@ -72,7 +69,7 @@ export function checkout(
       const fileStateChanges = FileState.empty();
 
       let checkoutBranchId: string | null = null;
-      let checkoutVersion: number | null = null;
+      let checkoutVersion: number | undefined = undefined;
       let toBranch: ValTown.Projects.BranchCreateResponse | null = null;
       let fromBranch: ValTown.Projects.BranchCreateResponse;
       let createdNew = false;

src/vt/lib/tests/checkout_test.ts

@@ -275,10 +275,11 @@ Deno.test("file not in target branch should be deleted", async (t) => {
       });
     });
 
-    await doWithTempDir(async (tempDir) => {
+    // First temp directory for feature branch checkout
+    await doWithTempDir(async (featureTempDir) => {
       await t.step("checkout feature branch", async () => {
         await checkout({
-          targetDir: tempDir,
+          targetDir: featureTempDir,
           projectId: project.id,
           branchId: featureBranch.id,
           fromBranchId: featureBranch.id,
@@ -287,36 +288,43 @@ Deno.test("file not in target branch should be deleted", async (t) => {
         });
 
         assert(
-          await exists(join(tempDir, "feature.txt")),
+          await exists(join(featureTempDir, "feature.txt")),
           "feature file should exist",
         );
       });
 
       await t.step("create local file", async () => {
-        await Deno.writeTextFile(join(tempDir, "local.txt"), "local content");
+        await Deno.writeTextFile(
+          join(featureTempDir, "local.txt"),
+          "local content",
+        );
       });
 
-      await t.step("checkout main branch", async () => {
-        await checkout({
-          targetDir: tempDir,
-          projectId: project.id,
-          branchId: mainBranch.id,
-          fromBranchId: featureBranch.id,
-          version: mainBranch.version + 1,
-          gitignoreRules: [],
+      // Second temp directory for main branch checkout
+      await doWithTempDir(async (mainTempDir) => {
+        await t.step("checkout main branch", async () => {
+          await checkout({
+            targetDir: mainTempDir,
+            projectId: project.id,
+            branchId: mainBranch.id,
+            fromBranchId: featureBranch.id,
+          });
         });
-      });
 
-      await t.step("verify file states", async () => {
-        assert(
-          !await exists(join(tempDir, "feature.txt")),
-          "feature file should be deleted",
-        );
-        assert(
-          await exists(join(tempDir, "local.txt")),
-          "local file should be preserved",
-        );
-      });
-    }, "vt_checkout_deletion_test_");
+        await t.step("verify file states", async () => {
+          assert(
+            !await exists(join(mainTempDir, "feature.txt")),
+            "feature file should be deleted",
+          );
+
+          // Local file should not exist in the main branch temp dir
+          // since it's a different directory
+          assert(
+            !await exists(join(mainTempDir, "local.txt")),
+            "local file should not exist in main branch directory",
+          );
+        });
+      }, "vt_checkout_main_branch_test_");
+    }, "vt_checkout_feature_branch_test_");
   });
 });