Add windows test

Author: 404Wolf

.github/workflows/test.yaml

@@ -28,6 +28,24 @@ jobs:
         env:
           VAL_TOWN_API_KEY: ${{ secrets.VAL_TOWN_API_KEY }}
 
+  test-windows:
+    runs-on: windows-latest
+
+    steps:
+      - uses: actions/checkout@v3
+      - uses: denoland/setup-deno@v2
+        with:
+          deno-version: v2.x
+
+      - name: Run deno tests
+        uses: nick-fields/retry@v3
+        with:
+          command: deno task test:lib
+          max_attempts: 2
+          timeout_seconds: 2000
+        env:
+          VAL_TOWN_API_KEY: ${{ secrets.VAL_TOWN_API_KEY }}
+
   test-mac:
     runs-on: ubuntu-latest
 

src/sdk.ts

@@ -2,6 +2,7 @@ import ValTown from "@valtown/sdk";
 import { memoize } from "@std/cache";
 import manifest from "../deno.json" with { type: "json" };
 import { API_KEY_KEY, DEFAULT_BRANCH_NAME } from "~/consts.ts";
+import { normalize } from "@std/path";
 
 const sdk = new ValTown({
   // Must get set in vt.ts entrypoint if not set as an env var!
@@ -63,7 +64,7 @@ export async function branchExists(
   branchName: string,
 ): Promise<boolean> {
   for await (const branch of sdk.vals.branches.list(valId, {})) {
-    if (branch.name == branchName) return true;
+    if (branch.name === branchName) return true;
   }
   return false;
 }
@@ -81,7 +82,7 @@ export async function branchNameToBranch(
   branchName: string,
 ): Promise<ValTown.Vals.Branches.BranchListResponse> {
   for await (const branch of sdk.vals.branches.list(valId, {})) {
-    if (branch.name == branchName) return branch;
+    if (branch.name === branchName) return branch;
   }
 
   throw new Deno.errors.NotFound(`Branch "${branchName}" not found in Val`);
@@ -118,7 +119,7 @@ export async function valItemExists(
  * @param valId - The ID of the Val containing the file
  * @param options - The options object
  * @param options.branchId - The ID of the Val branch to reference
- * @param [options.version] - The version of the Val for the file being found (optional)
+ * @param options.version - The version of the Val for the file being found (optional)
  * @param options.filePath - The file path to locate
  * @returns Promise resolving to the file data or undefined if not found
  */
@@ -140,11 +141,11 @@ export const getValItem = memoize(async (
 /**
  * Get the content of a Val item.
  *
- * @param {string} valId The ID of the Val
- * @param {string} branchId The ID of the Val branch to reference
- * @param {number} version The version of the Val
- * @param {string} filePath The path to the file
- * @returns {Promise<string>} Promise resolving to the file content
+ * @param valId The ID of the Val
+ * @param branchId The ID of the Val branch to reference
+ * @param version The version of the Val
+ * @param filePath The path to the file
+ * @returns Promise resolving to the file content
  */
 export const getValItemContent = memoize(
   async (
@@ -179,14 +180,15 @@ export const listValItems = memoize(async (
     (await branchNameToBranch(valId, DEFAULT_BRANCH_NAME)
       .then((resp) => resp.id));
 
-  const files = await Array.fromAsync(
+  const files = (await Array.fromAsync(
     sdk.vals.files.retrieve(valId, {
       path: "",
       branch_id: branchId,
       version,
       recursive: true,
     }),
-  );
+  ))
+    .map((f) => ({ ...f, path: normalize(f.path) }));
 
   return files;
 });

src/vt/lib/status.ts

@@ -1,7 +1,5 @@
 import { getValItemContent, listValItems } from "~/sdk.ts";
 import { getValItemType, shouldIgnore } from "~/vt/lib/paths.ts";
-import * as fs from "@std/fs";
-import * as path from "@std/path";
 import {
   type CreatedItemStatus,
   type DeletedItemStatus,
@@ -11,9 +9,9 @@ import {
   type ModifiedItemStatus,
   type NotModifiedItemStatus,
 } from "~/vt/lib/utils/ItemStatusManager.ts";
-import { join } from "@std/path";
+import { join, relative } from "@std/path";
 import { isFileModified } from "~/vt/lib/utils/misc.ts";
-import { exists } from "@std/fs";
+import { exists, walk } from "@std/fs";
 
 /** Result of status operation  */
 export interface StatusResult {
@@ -88,7 +86,7 @@ export async function status(params: StatusParams): Promise<StatusResult> {
       result.insert(createdFileState);
     } else {
       if (localFile.type !== "directory") {
-        const localStat = await Deno.stat(path.join(targetDir, localFile.path));
+        const localStat = await Deno.stat(join(targetDir, localFile.path));
 
         // File exists in both places, check if modified
         const isModified = isFileModified({
@@ -218,10 +216,10 @@ async function getLocalFiles({
 }): Promise<ItemInfo[]> {
   const filePromises: Promise<ItemInfo | null>[] = [];
 
-  for await (const entry of fs.walk(targetDir)) {
+  for await (const entry of walk(targetDir)) {
     filePromises.push((async () => {
       // Check if this is on the ignore list
-      const relativePath = path.relative(targetDir, entry.path);
+      const relativePath = relative(targetDir, entry.path);
       if (shouldIgnore(relativePath, gitignoreRules)) return null;
       if (entry.path === targetDir) return null;