Use joins

Author: 404Wolf

src/vt/lib/tests/clone_test.ts

@@ -42,7 +42,7 @@ Deno.test({
             type: "script",
           },
           {
-            path: "nested/folder/data.json",
+            path: join("nested", "folder", "data.json"),
             content: '{"key": "value"}',
             type: "file",
           },
@@ -111,7 +111,7 @@ Deno.test({
 
             // Verify directory structure was created correctly
             const nestedDirExists = await exists(
-              join(tempDir, "nested/folder"),
+              join(tempDir, "nested", "folder"),
             );
             assertEquals(
               nestedDirExists,
@@ -131,7 +131,7 @@ Deno.test({
   async fn(t) {
     await doWithNewVal(async ({ val, branch }) => {
       await t.step("test cloning empty directories", async (t) => {
-        const emptyDirPath = "empty/directory";
+        const emptyDirPath = join("empty", "directory");
 
         await t.step("create empty directory", async () => {
           // Create an empty directory to test explicit directory creation

src/vt/lib/tests/pull_test.ts

@@ -298,7 +298,7 @@ Deno.test({
     await doWithNewVal(async ({ val, branch }) => {
       await doWithTempDir(async (tempDir) => {
         // Create nested directories on the server
-        const nestedDirPath = "parent/child/grandchild";
+        const nestedDirPath = join("parent", "child", "grandchild");
 
         await t.step("create nested directories on server", async () => {
           await sdk.vals.files.create(

src/vt/lib/tests/push_test.ts

@@ -94,7 +94,7 @@ Deno.test({
             await valItemExists(
               val.id,
               branch.id,
-              "subdir/test.txt",
+              join("subdir", "test.txt"),
               await getLatestVersion(val.id, branch.id),
             ),
             "file should exist in subdir",
@@ -115,7 +115,10 @@ Deno.test({
             branchId: branch.id,
           });
           assertEquals(secondPush.renamed.length, 1);
-          assertEquals(secondPush.renamed[0].oldPath, "subdir/test.txt");
+          assertEquals(
+            secondPush.renamed[0].oldPath,
+            join("subdir", "test.txt"),
+          );
           assertEquals(secondPush.renamed[0].path, "test.txt");
         });
 
@@ -163,10 +166,10 @@ Deno.test({
 
         // Get original file IDs
         const file1 = await sdk.vals.files
-          .retrieve(val.id, { path: "val/file1.ts", recursive: true })
+          .retrieve(val.id, { path: join("val", "file1.ts"), recursive: true })
           .then((resp) => resp.data[0]);
         const file2 = await sdk.vals.files
-          .retrieve(val.id, { path: "val/file2.ts", recursive: true })
+          .retrieve(val.id, { path: join("val", "file2.ts"), recursive: true })
           .then((resp) => resp.data[0]);
 
         // Delete both files and create two new files with the same content
@@ -202,13 +205,13 @@ Deno.test({
         // Verify new files have different IDs than original files
         const newFile1 = await sdk.vals.files
           .retrieve(val.id, {
-            path: "val/newfile1.ts",
+            path: join("val", "newfile1.ts"),
             recursive: true,
           })
           .then((resp) => resp.data[0]);
         const newFile2 = await sdk.vals.files
           .retrieve(val.id, {
-            path: "val/newfile2.ts",
+            path: join("val", "newfile2.ts"),
             recursive: true,
           })
           .then((resp) => resp.data[0]);
@@ -279,7 +282,7 @@ Deno.test({
           const fileExistsAtNewPath = await valItemExists(
             val.id,
             branch.id,
-            "subdir/moved_file.ts",
+            join("subdir", "moved_file.ts"),
             await getLatestVersion(val.id, branch.id),
           );
           assert(fileExistsAtNewPath, "file should exist at new location");
@@ -299,7 +302,7 @@ Deno.test({
           // Verify the file ID is preserved (same file)
           const movedFile = await sdk.vals.files
             .retrieve(val.id, {
-              path: "subdir/moved_file.ts",
+              path: join("subdir", "moved_file.ts"),
               recursive: true,
             })
             .then((resp) => resp.data[0]);
@@ -410,7 +413,7 @@ Deno.test({
         // Get the id of the original file
         const originalFile = await sdk.vals.files
           .retrieve(val.id, {
-            path: "val/original.ts",
+            path: join("val", "original.ts"),
             recursive: true,
           })
           .then((resp) => resp.data[0]);
@@ -431,22 +434,25 @@ Deno.test({
 
         // Verify rename was detected
         assertEquals(statusResult.renamed.length, 1);
-        assertEquals(statusResult.renamed[0].oldPath, "val/original.ts");
-        assertEquals(statusResult.renamed[0].path, "val/renamed.ts");
+        assertEquals(
+          statusResult.renamed[0].oldPath,
+          join("val", "original.ts"),
+        );
+        assertEquals(statusResult.renamed[0].path, join("val", "renamed.ts"));
         assertEquals(statusResult.renamed[0].status, "renamed");
 
         // Verify file ID is preserved (same file)
         const renamedFile = await sdk.vals.files.retrieve(
           val.id,
-          { path: "val/renamed.ts", recursive: true },
+          { path: join("val", "renamed.ts"), recursive: true },
         ).then((resp) => resp.data[0]);
         assertEquals(originalFile.id, renamedFile.id);
 
         // Verify old file is gone
         const oldFileExists = await valItemExists(
           val.id,
           branch.id,
-          "val/original.ts",
+          join("val", "original.ts"),
           await getLatestVersion(val.id, branch.id),
         );
         assert(!oldFileExists, "Old file should not exist after rename");
@@ -481,7 +487,7 @@ Deno.test({
         // Get the id of the original file
         const originalFile = await sdk.vals.files
           .retrieve(val.id, {
-            path: "val/old.http.ts",
+            path: join("val", "old.http.ts"),
             recursive: true,
           })
           .then((resp) => resp.data[0]);
@@ -502,16 +508,19 @@ Deno.test({
           // Verify rename was detected
           assertEquals(statusResult.renamed.length, 1);
           assertEquals(statusResult.renamed[0].type, "http");
-          assertEquals(statusResult.renamed[0].oldPath, "val/old.http.ts");
-          assertEquals(statusResult.renamed[0].path, "val/new.tsx");
+          assertEquals(
+            statusResult.renamed[0].oldPath,
+            join("val", "old.http.ts"),
+          );
+          assertEquals(statusResult.renamed[0].path, join("val", "new.tsx"));
           assertEquals(statusResult.renamed[0].status, "renamed");
         });
 
         await t.step("verify file content, type, and uuid", async () => {
           // Verify file ID is preserved (same file)
           const renamedFile = await sdk.vals.files.retrieve(
             val.id,
-            { path: "val/new.tsx", recursive: true },
+            { path: join("val", "new.tsx"), recursive: true },
           ).then((resp) => resp.data[0]);
           assertEquals(originalFile.id, renamedFile.id);
 
@@ -523,7 +532,7 @@ Deno.test({
             val.id,
             branch.id,
             await getLatestVersion(val.id, branch.id),
-            "val/new.tsx",
+            join("val", "new.tsx"),
           );
 
           assertEquals(content, "contentt");
@@ -534,7 +543,7 @@ Deno.test({
           const oldFileExists = await valItemExists(
             val.id,
             branch.id,
-            "val/old.http.ts",
+            join("val", "old.http.ts"),
             await getLatestVersion(val.id, branch.id),
           );
           assert(!oldFileExists, "Old file should not exist after rename");

src/vt/lib/tests/remix_test.ts

@@ -175,7 +175,7 @@ Deno.test({
       await sdk.vals.files.create(
         val.id,
         {
-          path: "nested/file.txt",
+          path: join("nested", "file.txt"),
           content: "This is a nested text file",
           type: "file",
         },
@@ -202,7 +202,7 @@ Deno.test({
           );
 
           // Verify nested file was remixed and directory structure preserved
-          const nestedFilePath = join(destTmpDir, "nested/file.txt");
+          const nestedFilePath = join(destTmpDir, "nested", "file.txt");
           assert(
             await exists(nestedFilePath),
             "nested file should exist in remixed Val with directory structure preserved",

src/vt/lib/tests/status_test.ts

@@ -207,14 +207,14 @@ Deno.test({
 
           // Push original files to remote
           await sdk.vals.files.create(val.id, {
-            path: "folder/oldA.txt",
+            path: join("folder", "oldA.txt"),
             content: "content",
             branch_id: branch.id,
             type: "file",
           });
 
           await sdk.vals.files.create(val.id, {
-            path: "folder/oldB.txt",
+            path: join("folder", "oldB.txt"),
             content: "differentContent",
             branch_id: branch.id,
             type: "file",
@@ -251,20 +251,32 @@ Deno.test({
           // Check renamed array - should have the file with unchanged content
           assertEquals(statusResult.renamed.length, 1);
           assertEquals(statusResult.renamed[0].type, "file");
-          assertEquals(statusResult.renamed[0].path, "folder/renamedB.txt");
-          assertEquals(statusResult.renamed[0].oldPath, "folder/oldB.txt");
+          assertEquals(
+            statusResult.renamed[0].path,
+            join("folder", "renamedB.txt"),
+          );
+          assertEquals(
+            statusResult.renamed[0].oldPath,
+            join("folder", "oldB.txt"),
+          );
           assertEquals(statusResult.renamed[0].status, "renamed");
 
           // Check created array - should have the file with modified content
           assertEquals(statusResult.created.length, 1);
           assertEquals(statusResult.created[0].type, "file");
-          assertEquals(statusResult.created[0].path, "folder/renamedA.txt");
+          assertEquals(
+            statusResult.created[0].path,
+            join("folder", "renamedA.txt"),
+          );
           assertEquals(statusResult.created[0].status, "created");
 
           // Check deleted array - should have the old file that was "modified"
           assertEquals(statusResult.deleted.length, 1);
           assertEquals(statusResult.deleted[0].type, "file");
-          assertEquals(statusResult.deleted[0].path, "folder/oldA.txt");
+          assertEquals(
+            statusResult.deleted[0].path,
+            join("folder", "oldA.txt"),
+          );
           assertEquals(statusResult.deleted[0].status, "deleted");
         });
       });