fix: [ENG-1319] allow user to set explicit end time, round up end and duration to the nearest hour

.cursor/rules/cli.mdc

@@ -0,0 +1,8 @@
+---
+description: Describes the CLI project
+globs: *.(ts|tsx)
+---
+- This is a CLI program written in Deno using the `commander` library and `@commander-js/extra-typings`.
+
+- When using node globals like `console.log`, `setTimeout`, `process`, etc, import them from the corresponding explicit `node:console`, `node:timers`, and `node:process`, etc.
+- Where possible, use the `openapi-typescript`/`openapi-fetch` client instead of writing raw fetch calls.

.github/workflows/ci.yml

@@ -13,4 +13,4 @@ jobs:
       - run: deno install
       - run: deno fmt --check
       - run: deno lint
-      - run: deno check ./src/index.ts
+      - run: deno check --config deno.json ./src/index.ts

deno.json

@@ -10,5 +10,8 @@
   },
   "fmt": {
     "exclude": ["src/schema.ts"]
+  },
+  "compilerOptions": {
+    "lib": ["deno.ns", "deno.fetch", "deno.web"]
   }
 }

src/checkVersion.ts

@@ -1,6 +1,7 @@
 import boxen from "boxen";
 import chalk from "chalk";
 import { execSync } from "node:child_process";
+import * as console from "node:console";
 import { mkdir, readFile, stat, writeFile } from "node:fs/promises";
 import { homedir } from "node:os";
 import { join } from "node:path";
@@ -69,12 +70,13 @@ async function checkProductionCLIVersion() {
   // Fetch from network
   try {
     const response = await fetch(
-      "https://raw.githubusercontent.com/sfcompute/cli/refs/heads/main/package.json"
+      "https://raw.githubusercontent.com/sfcompute/cli/refs/heads/main/package.json",
     );
     if (!response.ok) {
       throw new Error(`HTTP error! status: ${response.status}`);
     }
-    const data = await response.json();
+    // deno-lint-ignore no-explicit-any -- Deno has narrower types for fetch responses, but we know this code works atm.
+    const data = await response.json() as any;
     await writeCache(data.version);
     return data.version;
   } catch (error) {
@@ -103,7 +105,7 @@ export async function checkVersion() {
 
   if (isPatchUpdate) {
     console.log(
-      chalk.cyan(`Automatically upgrading ${version} → ${latestVersion}`)
+      chalk.cyan(`Automatically upgrading ${version} → ${latestVersion}`),
     );
     try {
       execSync("sf upgrade", { stdio: "inherit" });
@@ -131,7 +133,7 @@ Run 'sf upgrade' to update to the latest version
         padding: 1,
         borderColor: "yellow",
         borderStyle: "round",
-      })
+      }),
     );
   }
 }

src/helpers/config.ts

@@ -1,4 +1,5 @@
 import { unlinkSync } from "node:fs";
+import * as console from "node:console";
 import { homedir } from "node:os";
 import { join } from "node:path";
 import process from "node:process";

src/helpers/errors.ts

@@ -1,4 +1,5 @@
 import process from "node:process";
+import * as console from "node:console";
 import { getCommandBase } from "./command.ts";
 import { clearAuthFromConfig } from "./config.ts";
 

src/helpers/feature-flags.ts

@@ -42,7 +42,7 @@ export async function loadFeatureFlags(): Promise<FeatureFlagCache> {
 
 export async function getCachedFeatureFlag(
   feature: string,
-  accountId: string
+  accountId: string,
 ): Promise<CachedFeatureFlag | null> {
   const cache = await loadFeatureFlags();
   const key = `${accountId}:${feature}`;
@@ -65,7 +65,7 @@ export async function getCachedFeatureFlag(
 export async function cacheFeatureFlag(
   feature: string,
   accountId: string,
-  value: boolean
+  value: boolean,
 ): Promise<void> {
   const cache = await loadFeatureFlags();
   const key = `${accountId}:${feature}`;

src/helpers/units.ts

@@ -101,17 +101,16 @@ export function centsToDollars(cents: Cents): number {
 export function dollarsToCents(dollars: number): Cents {
   return Math.ceil(dollars * 100);
 }
-
-export function parseStartDate(startDate: string): Date | "NOW" | null {
+export function parseStartDateOrNow(startDate?: string): Date | "NOW" {
+  if (!startDate) return "NOW";
   const nowRe = /\b(?:"|')?[nN][oO][wW](?:"|')?\b/;
-  if (nowRe.test(startDate)) {
-    return "NOW";
-  }
-
+  if (nowRe.test(startDate)) return "NOW";
   const chronoDate = chrono.parseDate(startDate);
-  if (!chronoDate) {
-    return null;
-  }
+  return chronoDate ?? "NOW";
+}
 
-  return chronoDate;
+export function parseStartDate(startDate?: string | Date): Date {
+  if (startDate instanceof Date) return startDate;
+  const result = parseStartDateOrNow(startDate);
+  return result === "NOW" ? new Date() : result;
 }

src/helpers/urls.ts

@@ -22,7 +22,6 @@ const apiPaths: Record<string, Path<IdParams | never>> = {
   me: "/v0/me",
   ping: "/v0/ping",
 
-  orders_create: "/v0/orders",
   orders_list: "/v0/orders",
   orders_get: ({ id }: IdParams): string => `/v0/orders/${id}`,
   orders_cancel: ({ id }: IdParams): string => `/v0/orders/${id}`,

src/helpers/waitingForOrder.ts

@@ -1,4 +1,5 @@
 import ora from "ora";
+import { setTimeout } from "node:timers";
 import { logAndQuit } from "./errors.ts";
 import { getOrder } from "./fetchers.ts";
 

src/index.ts

@@ -1,6 +1,7 @@
 #!/usr/bin/env bun
 
 import { Command } from "@commander-js/extra-typings";
+import * as console from "node:console";
 import os from "node:os";
 import process from "node:process";
 import pkg from "../package.json" with { type: "json" };
@@ -64,7 +65,8 @@ const main = async () => {
         },
       });
 
-      const data = await response.json();
+      // deno-lint-ignore no-explicit-any -- Deno has narrower types for fetch responses, but we know this code works atm.
+      const data = await response.json() as any;
       if (data.id) {
         exchangeAccountId = data.id;
         saveConfig({ ...config, account_id: data.id });

src/lib/balance.ts

@@ -1,5 +1,6 @@
 import chalk from "chalk";
 import Table from "cli-table3";
+import * as console from "node:console";
 import type { Command } from "@commander-js/extra-typings";
 import { apiClient } from "../apiClient.ts";
 import { isLoggedIn } from "../helpers/config.ts";