track-cli 3.0.0-rc → 3.0.0-rc3

package/esm/_dnt.shims.d.ts

@@ -1,19 +1,20 @@
 import { Deno } from "@deno/shim-deno";
 export { Deno } from "@deno/shim-deno";
 export { crypto, type Crypto, type SubtleCrypto, type AlgorithmIdentifier, type Algorithm, type RsaOaepParams, type BufferSource, type AesCtrParams, type AesCbcParams, type AesGcmParams, type CryptoKey, type KeyAlgorithm, type KeyType, type KeyUsage, type EcdhKeyDeriveParams, type HkdfParams, type HashAlgorithmIdentifier, type Pbkdf2Params, type AesDerivedKeyParams, type HmacImportParams, type JsonWebKey, type RsaOtherPrimesInfo, type KeyFormat, type RsaHashedKeyGenParams, type RsaKeyGenParams, type BigInteger, type EcKeyGenParams, type NamedCurve, type CryptoKeyPair, type AesKeyGenParams, type HmacKeyGenParams, type RsaHashedImportParams, type EcKeyImportParams, type AesKeyAlgorithm, type RsaPssParams, type EcdsaParams } from "@deno/shim-crypto";
-export { alert, confirm, prompt } from "@deno/shim-prompts";
 import { fetch, File, FormData, Headers, Request, Response } from "undici";
 export { fetch, File, FormData, Headers, Request, Response, type BodyInit, type HeadersInit, type RequestInit, type ResponseInit } from "undici";
-export declare const dntGlobalThis: Omit<typeof globalThis, "alert" | "confirm" | "prompt" | "Deno" | "crypto" | "fetch" | "File" | "FormData" | "Headers" | "Request" | "Response"> & {
+import { alert, confirm, prompt } from "./shim/prompts.js";
+export { alert, confirm, prompt } from "./shim/prompts.js";
+export declare const dntGlobalThis: Omit<typeof globalThis, "Deno" | "crypto" | "fetch" | "File" | "FormData" | "Headers" | "Request" | "Response" | "alert" | "confirm" | "prompt"> & {
     Deno: typeof Deno;
     crypto: import("@deno/shim-crypto").Crypto;
-    alert: (message?: any) => void;
-    confirm: (message?: string | undefined) => boolean;
-    prompt: (message?: string | undefined, _default?: string | undefined) => string | null;
     fetch: typeof fetch;
     File: typeof File;
     FormData: typeof FormData;
     Headers: typeof Headers;
     Request: typeof Request;
     Response: typeof Response;
+    alert: typeof alert;
+    confirm: typeof confirm;
+    prompt: typeof prompt;
 };

package/esm/_dnt.shims.js

@@ -2,22 +2,22 @@ import { Deno } from "@deno/shim-deno";
 export { Deno } from "@deno/shim-deno";
 import { crypto } from "@deno/shim-crypto";
 export { crypto } from "@deno/shim-crypto";
-import { alert, confirm, prompt } from "@deno/shim-prompts";
-export { alert, confirm, prompt } from "@deno/shim-prompts";
 import { fetch, File, FormData, Headers, Request, Response } from "undici";
 export { fetch, File, FormData, Headers, Request, Response } from "undici";
+import { alert, confirm, prompt } from "./shim/prompts.js";
+export { alert, confirm, prompt } from "./shim/prompts.js";
 const dntGlobals = {
     Deno,
     crypto,
-    alert,
-    confirm,
-    prompt,
     fetch,
     File,
     FormData,
     Headers,
     Request,
     Response,
+    alert,
+    confirm,
+    prompt,
 };
 export const dntGlobalThis = createMergeProxy(globalThis, dntGlobals);
 // deno-lint-ignore ban-types

package/esm/deps/deno.land/x/cliffy@v0.25.7/table/layout.d.ts

@@ -35,7 +35,7 @@ export declare class TableLayout {
      * original cell.
      */
     protected spanRows(rows: Array<IRow>): Row<Cell>[];
-    protected getDeleteCount(rows: Array<Array<unknown>>, rowIndex: number, colIndex: number): 0 | 1;
+    protected getDeleteCount(rows: Array<Array<unknown>>, rowIndex: number, colIndex: number): 1 | 0;
     /**
      * Create a new row from existing row or cell array.
      * @param row Original row.

package/esm/shim/prompts.d.ts

@@ -0,0 +1,3 @@
+export function alert(message: any): void;
+export function confirm(message: any): boolean;
+export function prompt(message: any, defaultValue?: undefined): string | null;

package/esm/shim/prompts.js

@@ -0,0 +1,44 @@
+// Temporary fixed version of shims for prompts
+// See original version: https://github.com/denoland/node_shims/blob/main/packages/shim-prompts
+import * as dntShim from "../_dnt.shims.js";
+import { readSync, writeSync } from "fs";
+export function alert(message) {
+    dntShim.dntGlobalThis.alert(message);
+    writeSync(process.stdout.fd, new TextEncoder().encode(`${message} [Enter] `));
+    readlineSync();
+}
+export function confirm(message) {
+    writeSync(process.stdout.fd, new TextEncoder().encode(`${message} [y/N] `));
+    const result = readlineSync();
+    return ["y", "Y"].includes(result);
+}
+export function prompt(message, defaultValue = undefined) {
+    writeSync(process.stdout.fd, new TextEncoder().encode(`${message} ${defaultValue == null ? "" : `[${defaultValue}]`} `));
+    const result = readlineSync();
+    return result.length > 0 ? result : defaultValue ?? null;
+}
+function readlineSync() {
+    let line = "";
+    let char = "";
+    const buf = Buffer.alloc(1);
+    while (char !== "\r" && char !== "\n") {
+        line += char;
+        try {
+            const bytesRead = readSync(process.stdin.fd, buf, 0, 1, null);
+            if (bytesRead === 0) {
+                return line;
+            }
+        }
+        catch (err) {
+            if (err.code === "EOF") {
+                return line;
+            }
+            continue;
+        }
+        char = String(buf);
+    }
+    if (char === "\r") {
+        readSync(process.stdin.fd, buf, 0, 1, null);
+    }
+    return line;
+}

package/esm/src/action/lang.js

@@ -16,7 +16,7 @@ export async function lang() {
     const availableLanguages = (await api.getProgrammingLanguages())
         .filter((pl) => codingContext.programmingLanguages.find((n) => n === pl.value));
     console.log("Your existing code will be archived in this directory and the original challenge code for the new language will be downloaded");
-    const shouldContinue = dntShim.confirm("Are you sure you want to continue? (y/n):");
+    const shouldContinue = dntShim.confirm("Are you sure you want to continue?");
     if (!shouldContinue) {
         return;
     }

package/esm/src/main.js

@@ -27,8 +27,8 @@ import { Command } from "../deps/deno.land/x/cliffy@v0.25.7/command/mod.js";
         });
     });
     const runCommand = new Command()
-        .description("Save and run the challenge on the remote code execution server")
-        .option("--no-save", "If this flag is specified, your files will not be uploaded to track after running the challenge tests")
+        .description("Save and run the challenge on the remote code execution server.")
+        .option("--no-save", "If this flag is specified, your files will not be uploaded to track after running the challenge tests.")
         .action(async ({ save }) => {
         await runAction({ noSave: !save });
     });
@@ -38,30 +38,30 @@ import { Command } from "../deps/deno.land/x/cliffy@v0.25.7/command/mod.js";
         await langAction();
     });
     const resetCommand = new Command()
-        .description("Reset the challenge files back to their starting point and archive your current challenge files")
+        .description("Reset the challenge files back to their starting point and archive your current challenge files.")
         .action(async () => {
         await resetAction();
     });
     const pullCommand = new Command()
-        .description("Pull your most recent changes into this directory (caution: overwrites existing files)")
+        .description("Pull your most recent changes into this directory (caution: overwrites existing files).")
         .action(async () => {
         await pullAction();
     });
     const addCommand = new Command()
-        .description("Add a file to be included in your challenge submission")
+        .description("Add a file to be included in your challenge submission.")
         .arguments("<file_paths...:string>")
         .action(async (_, ...filePaths) => {
         await addAction(filePaths);
     });
     const removeCommand = new Command()
-        .description("Remove files from your challenge submission")
+        .description("Remove files from your challenge submission.")
         .arguments("<file_paths...:string>")
         .option("-r --recursive", "Allow recursive removal when a directory is given")
         .action(async ({ recursive }, ...filePaths) => {
         await removeAction(filePaths, { recursive });
     });
     const statusCommand = new Command()
-        .description("Display the current status for this challenge")
+        .description("Display the current status for this challenge.")
         .action(async () => {
         await statusAction();
     });

package/esm/src/meta.d.ts

@@ -1,3 +1,3 @@
-export declare const VERSION = "3.0.0-rc1";
+export declare const VERSION = "3.0.0-rc3";
 export declare const DESCRIPTION = "A CLI for interacting with tracks.run and running code tests on track's servers";
 export declare function checkUpdates(): Promise<boolean>;

package/esm/src/meta.js

@@ -1,7 +1,7 @@
 import * as colors from "../deps/deno.land/std@0.195.0/fmt/colors.js";
 // @ts-ignore: has no exported member
 import { CookieJar, fetch } from "node-fetch-cookies";
-export const VERSION = "3.0.0-rc1";
+export const VERSION = "3.0.0-rc3";
 export const DESCRIPTION = "A CLI for interacting with tracks.run and running code tests on track's servers";
 const VERSION_RE = /^(\d+)\.(\d+)\.(\d+)(?:-?(.*))$/;
 function parseSemver(s) {

package/esm/src/orca/client.js

@@ -3,7 +3,7 @@ import { OtherError } from "../shared/errors.js";
 import { SnakeCase } from "../shared/mod.js";
 import { green, red } from "../../deps/deno.land/std@0.195.0/fmt/colors.js";
 import { EventEmitter } from "eventemitter3";
-import ProxyAgent from "proxy-agent";
+import { ProxyAgent } from "proxy-agent";
 import WebSocket from "ws";
 const RE_TAP_OK = new RegExp("^ok \\d+ ");
 const RE_TAP_NG = new RegExp("^not ok \\d+ ");

package/esm/src/shared/mod.d.ts

@@ -4,7 +4,8 @@ import { TrackClient } from "../track/client.js";
 import { ApplicantExamForNoAuth, ChallengeResult, ChallengeSettings, CodingContext, ExamSession, ExamSessionChallenge, FileListType, ProgrammingLanguageInfo } from "../track/types.js";
 import { CodingAnswers } from "../track/types.js";
 export declare const _internals: {
-    prompt: (message?: string | undefined, _default?: string | undefined) => string | null;
+    prompt: typeof dntShim.prompt;
+    scoreRatio: typeof scoreRatio;
 };
 export declare const HttpStatus: {
     readonly OK: 200;
@@ -30,6 +31,7 @@ export declare const SnakeCase: {
     from<T_1>(obj: T_1): T_1;
 };
 export declare function getCommonChallengeContext(): Promise<TrackCLIContext>;
+declare function scoreRatio(editorScore: number | undefined, openTestcases: number | undefined): string;
 export declare function printChallengeInfo(trackContext: TrackCLIContext): Promise<void>;
 export declare function printWorkingFileSet(codingContext: CodingContext): void;
 export declare function downloadChallengeFilesTo(codingContext: CodingContext, dest: string, api: TrackClient, applicantExamId: number, challengeResultId: number, showFileDiff: boolean, includeTarball: boolean): Promise<void>;
@@ -38,3 +40,4 @@ export type ArchiveExistingChallengeFilesOptions = {
     selectedLanguage?: ProgrammingLanguageInfo;
 };
 export declare function archiveExistingChallengeFiles(orgName: string, challengePosition: number, options?: ArchiveExistingChallengeFilesOptions): Promise<void>;
+export {};

package/esm/src/shared/mod.js

@@ -10,6 +10,7 @@ import { format as duration } from "../../deps/deno.land/std@0.195.0/fmt/duratio
 import * as fs from "../../deps/deno.land/std@0.195.0/fs/mod.js";
 export const _internals = {
     prompt: dntShim.prompt,
+    scoreRatio: scoreRatio,
 };
 export const HttpStatus = {
     OK: 200,
@@ -103,7 +104,7 @@ export async function tryStartingChallenge(challenge, api, applicantExam, result
                         ? `The challenge will start after this point.\n${timeMsg}`
                         : `The challenge will start after you select a programming language in the next step.\n${timeMsg}`;
                     console.log(wariningMsg);
-                    const shouldContinue = dntShim.confirm("Do you want to continue? (y/n): ");
+                    const shouldContinue = dntShim.confirm("Do you want to continue?");
                     if (!shouldContinue) {
                         throw new OtherError("Aborted. Challenge was not started.");
                     }
@@ -295,6 +296,15 @@ function getResultFromExamSession(examSession, challengeId) {
         .results
         .find((cr) => cr.challengeId === challengeId);
 }
+function scoreRatio(editorScore, openTestcases) {
+    // @ts-expect-error: isFinite(undefined) === false, isFinite(0) === true. See MDN
+    if (isFinite(editorScore) && openTestcases) {
+        return `\t${editorScore}/${openTestcases}`;
+    }
+    else {
+        return "\tN/A - Use 'track run' to save and run your submission";
+    }
+}
 export async function printChallengeInfo(trackContext) {
     const { config, api, challengeResult: result } = trackContext;
     const timeLeft = await api.timeLeft(config.applicantExamId, config.challengeResultId);
@@ -303,11 +313,8 @@ export async function printChallengeInfo(trackContext) {
     const lastScoredAt = result.lastScoredAt
         ? ` (Ran at ${datetime.format(new Date(result.lastScoredAt), "yyyy-MM-dd HH:mm:ss")})`
         : "";
-    const scoreRatio = (result.editorScore && trackContext.challenge.openTestcases)
-        ? `\t${result.editorScore}/${trackContext.challenge.openTestcases}`
-        : "\tN/A - Use 'track run' to save and run your submission";
     console.log(`Latest score${lastScoredAt}`);
-    console.log(colors.green(scoreRatio));
+    console.log(colors.green(scoreRatio(result.editorScore, trackContext.challenge.openTestcases)));
     console.log();
     printTimeLeft(timeLeft);
 }

package/esm/src/track/client.js

@@ -3,7 +3,7 @@ import { HttpStatus } from "../shared/mod.js";
 import { APIError, OtherError } from "../shared/errors.js";
 // @ts-ignore: has no exported member
 import { CookieJar, fetch } from "node-fetch-cookies";
-import ProxyAgent from "proxy-agent";
+import { ProxyAgent } from "proxy-agent";
 export const FormType = {
     URLEncoded: "urlencoded",
     JSON: "json",

package/package.json

@@ -3,7 +3,7 @@
     "track": "./esm/src/main.js"
   },
   "name": "track-cli",
-  "version": "3.0.0-rc",
+  "version": "3.0.0-rc3",
   "description": "A CLI for interacting with tracks.run and running code tests on track's servers",
   "license": "MIT",
   "repository": {
@@ -20,16 +20,15 @@
     "@hazae41/foras": "*",
     "eventemitter3": "5.0.1",
     "node-fetch-cookies": "2.0.4",
-    "proxy-agent": "5.0.0",
+    "proxy-agent": "6.3.0",
     "tar": "*",
     "ws": "7.4.6",
     "@deno/shim-deno": "~0.16.1",
     "@deno/shim-crypto": "~0.3.1",
-    "@deno/shim-prompts": "~0.1.0",
     "undici": "^5.21.0"
   },
   "devDependencies": {
     "@types/node": "^18.11.9",
     "picocolors": "^1.0.0"
   }
-}
+}