Add Windows Support

.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
 

deno.json

@@ -2,7 +2,7 @@
   "$schema": "https://raw.githubusercontent.com/denoland/deno/348900b8b79f4a434cab4c74b3bc8d4d2fa8ee74/cli/schemas/config-file.v1.json",
   "name": "@valtown/vt",
   "description": "The Val Town CLI",
-  "version": "0.1.36",
+  "version": "0.1.37",
   "exports": "./vt.ts",
   "license": "MIT",
   "tasks": {
@@ -32,7 +32,7 @@
     "@std/encoding": "jsr:@std/encoding@^1.0.7",
     "@std/fs": "jsr:@std/fs@^1.0.13",
     "@std/path": "jsr:@std/path@^1.0.8",
-    "@valtown/sdk": "jsr:@valtown/sdk@^1.0.0",
+    "@valtown/sdk": "jsr:@valtown/sdk@^1.5.0",
     "xdg-portable": "jsr:@404wolf/xdg-portable@^0.1.0",
     "highlight.js": "npm:highlight.js@^11.11.1",
     "strip-ansi": "npm:strip-ansi@^7.1.0",

src/cmd/lib/branch.ts

@@ -1,5 +1,9 @@
 import { Command } from "@cliffy/command";
-import sdk, { branchNameToBranch } from "~/sdk.ts";
+import {
+  branchNameToBranch,
+  deleteBranch as deleteValbranch,
+  listBranches as listValBranches,
+} from "~/sdk.ts";
 import { colors } from "@cliffy/ansi/colors";
 import { Table } from "@cliffy/table";
 import { doWithSpinner } from "~/cmd/utils.ts";
@@ -10,9 +14,7 @@ async function listBranches(vt: VTClient) {
   return await doWithSpinner("Loading branches...", async (spinner) => {
     const vtState = await vt.getMeta().loadVtState();
 
-    const branches = await Array.fromAsync(
-      sdk.vals.branches.list(vtState.val.id, {}),
-    );
+    const branches = await listValBranches(vtState.val.id);
 
     const formatter = new Intl.DateTimeFormat("en-US", {
       year: "numeric",
@@ -88,7 +90,7 @@ async function deleteBranch(vt: VTClient, toDeleteName: string) {
       );
     }
 
-    await sdk.vals.branches.delete(meta.val.id, toDeleteBranch.id);
+    await deleteValbranch(meta.val.id, toDeleteBranch.id);
     spinner.succeed(`Branch '${toDeleteName}' has been deleted.`);
   });
 }

src/cmd/lib/browse.ts

@@ -1,10 +1,10 @@
 import { Command } from "@cliffy/command";
 import open from "open";
-import sdk from "~/sdk.ts";
 import { doWithSpinner } from "~/cmd/utils.ts";
 import VTClient from "~/vt/vt/VTClient.ts";
 import { findVtRoot } from "~/vt/vt/utils.ts";
 import { delay } from "@std/async";
+import { getBranch } from "~/sdk.ts";
 
 export const browseCmd = new Command()
   .name("browse")
@@ -14,7 +14,7 @@ export const browseCmd = new Command()
     const vt = VTClient.from(await findVtRoot(Deno.cwd()));
 
     const vtState = await vt.getMeta().loadVtState();
-    const branch = await sdk.vals.branches.retrieve(
+    const branch = await getBranch(
       vtState.val.id,
       vtState.branch.id,
     );

src/cmd/lib/checkout.ts

@@ -5,10 +5,12 @@ import { findVtRoot } from "~/vt/vt/utils.ts";
 import { colors } from "@cliffy/ansi/colors";
 import { Confirm } from "@cliffy/prompt";
 import { tty } from "@cliffy/ansi/tty";
-import sdk, {
+import {
   branchNameToBranch,
+  getBranch,
   getCurrentUser,
   getLatestVersion,
+  getVal,
 } from "~/sdk.ts";
 import { displayFileStateChanges } from "~/cmd/lib/utils/displayFileStatus.ts";
 import {
@@ -78,9 +80,10 @@ export const checkoutCmd = new Command()
           const user = await getCurrentUser();
 
           // Get the current branch data
-          const currentBranchData = await sdk.vals.branches
-            .retrieve(vtState.val.id, vtState.branch.id)
-            .catch(() => null);
+          const currentBranchData = await getBranch(
+            vtState.val.id,
+            vtState.branch.id,
+          ).catch(() => null);
 
           // Handle the case where the current branch no longer exists as a
           // special case
@@ -129,7 +132,7 @@ export const checkoutCmd = new Command()
             // If they are creating a new branch, ensure that they are the owner of this Val
             if (
               isNewBranch &&
-              (await sdk.vals.retrieve(vtState.val.id)).author.id !== user.id
+              (await getVal(vtState.val.id)).author.id !== user.id
             ) {
               throw new Error(
                 "You are not the owner of this Val, you cannot make a new branch.",
@@ -173,8 +176,8 @@ export const checkoutCmd = new Command()
             const dangerousLocalChanges = dryCheckoutResult
               .fileStateChanges
               .filter(
-                (fileStatus) => (fileStatus.status == "deleted" ||
-                  fileStatus.status == "modified"),
+                (fileStatus) => (fileStatus.status === "deleted" ||
+                  fileStatus.status === "modified"),
               )
               .merge(
                 priorVtStatus

src/cmd/lib/clone.ts

@@ -1,7 +1,7 @@
 import { Command } from "@cliffy/command";
 import { Input } from "@cliffy/prompt/input";
 import { colors } from "@cliffy/ansi/colors";
-import sdk, { getCurrentUser } from "~/sdk.ts";
+import { getCurrentUser, listMyVals } from "~/sdk.ts";
 import VTClient from "~/vt/vt/VTClient.ts";
 import { relative } from "@std/path";
 import { doWithSpinner, getClonePath } from "~/cmd/utils.ts";
@@ -10,7 +10,6 @@ import { Confirm } from "@cliffy/prompt";
 import { ensureAddEditorFiles } from "~/cmd/lib/utils/messages.ts";
 import { parseValUrl } from "~/cmd/parsing.ts";
 import { DEFAULT_BRANCH_NAME, DEFAULT_EDITOR_TEMPLATE } from "~/consts.ts";
-import { arrayFromAsyncN } from "~/utils.ts";
 
 export const cloneCmd = new Command()
   .name("clone")
@@ -55,13 +54,10 @@ export const cloneCmd = new Command()
 
       // If no Val URI is provided, show interactive Val selection
       if (!valUri) {
-        const vals = await doWithSpinner(
+        const [vals, _] = await doWithSpinner(
           "Loading vals...",
           async (spinner) => {
-            const [allVals, _] = await arrayFromAsyncN(
-              sdk.me.vals.list({}),
-              500,
-            );
+            const allVals = await listMyVals(100);
             spinner.stop();
             return allVals;
           },

src/cmd/lib/delete.ts

@@ -2,9 +2,9 @@ import { Command } from "@cliffy/command";
 import VTClient from "~/vt/vt/VTClient.ts";
 import { doWithSpinner } from "~/cmd/utils.ts";
 import { Confirm } from "@cliffy/prompt";
-import sdk from "~/sdk.ts";
 import { findVtRoot } from "~/vt/vt/utils.ts";
 import { colors } from "@cliffy/ansi/colors";
+import { getVal } from "~/sdk.ts";
 
 export const deleteCmd = new Command()
   .name("delete")
@@ -19,7 +19,7 @@ export const deleteCmd = new Command()
       const vtState = await meta.loadVtState();
 
       // Get Val name for display
-      const val = await sdk.vals.retrieve(vtState.val.id);
+      const val = await getVal(vtState.val.id);
       const valName = val.name;
 
       // Confirm deletion unless --force is used

src/cmd/lib/list.ts

@@ -1,9 +1,8 @@
 import { Command } from "@cliffy/command";
 import { colors } from "@cliffy/ansi/colors";
 import { Table } from "@cliffy/table";
-import sdk from "~/sdk.ts";
 import { doWithSpinner } from "~/cmd/utils.ts";
-import { arrayFromAsyncN } from "~/utils.ts";
+import { listMyVals } from "~/sdk.ts";
 
 const VAL_LIST_BATCH_SIZE = 20;
 
@@ -20,10 +19,7 @@ export const listCmd = new Command()
       "Loading Val list...",
       async (spinner) => {
         const batchSize = allVals ? Infinity : VAL_LIST_BATCH_SIZE;
-        const result = await arrayFromAsyncN(
-          sdk.me.vals.list({ offset }),
-          batchSize,
-        );
+        const result = await listMyVals(batchSize, offset);
         spinner.stop();
         return result;
       },

src/cmd/lib/push.ts

@@ -2,7 +2,7 @@ import { Command } from "@cliffy/command";
 import { doWithSpinner } from "~/cmd/utils.ts";
 import VTClient from "~/vt/vt/VTClient.ts";
 import { findVtRoot } from "~/vt/vt/utils.ts";
-import sdk, { getCurrentUser } from "~/sdk.ts";
+import { getCurrentUser, getVal } from "~/sdk.ts";
 import { displayFileStateChanges } from "~/cmd/lib/utils/displayFileStatus.ts";
 import { noChangesDryRunMsg } from "~/cmd/lib/utils/messages.ts";
 
@@ -27,7 +27,7 @@ export const pushCmd = new Command()
         const user = await getCurrentUser();
 
         const vtState = await vt.getMeta().loadVtState();
-        const valToPush = await sdk.vals.retrieve(vtState.val.id);
+        const valToPush = await getVal(vtState.val.id);
         if (valToPush.author.id !== user.id) {
           throw new Error(
             "You are not the owner of this Val, you cannot push." +

src/cmd/lib/status.ts

@@ -1,12 +1,12 @@
 import { Command } from "@cliffy/command";
 import { colors } from "@cliffy/ansi/colors";
-import sdk from "~/sdk.ts";
 import { FIRST_VERSION_NUMBER } from "~/consts.ts";
 import { doWithSpinner } from "~/cmd/utils.ts";
 import VTClient from "~/vt/vt/VTClient.ts";
 import { findVtRoot } from "~/vt/vt/utils.ts";
 import { displayFileStateChanges } from "~/cmd/lib/utils/displayFileStatus.ts";
 import { displayVersionRange } from "~/cmd/lib/utils/displayVersionRange.ts";
+import { getBranch } from "~/sdk.ts";
 
 export const statusCmd = new Command()
   .name("status")
@@ -17,7 +17,7 @@ export const statusCmd = new Command()
 
       const vtState = await vt.getMeta().loadVtState();
 
-      const currentBranch = await sdk.vals.branches.retrieve(
+      const currentBranch = await getBranch(
         vtState.val.id,
         vtState.branch.id,
       );

src/cmd/lib/watch.ts

@@ -1,7 +1,13 @@
 import { Command } from "@cliffy/command";
 import VTClient from "~/vt/vt/VTClient.ts";
 import { colors } from "@cliffy/ansi/colors";
-import sdk, { getCurrentUser, getLatestVersion, listValItems } from "~/sdk.ts";
+import {
+  getBranch,
+  getCurrentUser,
+  getLatestVersion,
+  getVal,
+  listValItems,
+} from "~/sdk.ts";
 import { FIRST_VERSION_NUMBER } from "~/consts.ts";
 import { doWithSpinner } from "~/cmd/utils.ts";
 import { findVtRoot } from "~/vt/vt/utils.ts";
@@ -28,12 +34,12 @@ export const watchCmd = new Command()
 
       // Get initial branch information for display
       const vtState = await vt.getMeta().loadVtState();
-      const currentBranch = await sdk.vals.branches.retrieve(
+      const currentBranch = await getBranch(
         vtState.val.id,
         vtState.branch.id,
       );
 
-      const valToWatch = await sdk.vals.retrieve(vtState.val.id);
+      const valToWatch = await getVal(vtState.val.id);
       if (valToWatch.author.id !== user.id) {
         console.log(valToWatch.author.id, user.id);
         throw new Error(