track-cli 4.1.0-rc2 → 4.1.0-rc4

package/esm/src/action/reset.js

@@ -1,20 +1,38 @@
 import * as dntShim from "../../_dnt.shims.js";
 import { load as loadConfig } from "../shared/config.js";
 import { archiveExistingChallengeFiles, downloadChallengeFilesTo, getCommonChallengeContext, trackClientFromConfig, } from "../shared/mod.js";
+import { ChallengeStyle, } from "../shared/types.js";
 export async function reset() {
     const config = await loadConfig();
     const api = trackClientFromConfig(config);
-    const [_codingContext, _challenge] = await getCommonChallengeContext(config, api);
-    console.log("Your existing code will be archived in this directory and the original challenge code will be downloaded");
+    const [codingContext, challenge] = await getCommonChallengeContext(config, api);
+    console.log("A copy of your existing code will be archived in this directory, and the original challenge code will be re-downloaded.");
     const shouldContinue = dntShim.confirm("Are you sure you want to reset this challenge?");
     if (!shouldContinue) {
         return;
     }
+    // Update the remote files without modifying the local copy
+    await resetRemoteFiles(api, codingContext, challenge);
+    // Once the remote update succeeded,
+    // archive the local files before re-downloading the remote files following the reset.
     const currentDir = dntShim.Deno.cwd();
     await archiveExistingChallengeFiles(config.orgName);
-    await api.reset();
     const newCodingContext = await api.context();
     const showFileDiff = false;
     const includeTarball = true;
     await downloadChallengeFilesTo(newCodingContext, currentDir, api, showFileDiff, includeTarball);
 }
+async function resetRemoteFiles(api, codingContext, challenge) {
+    if (challenge.style === ChallengeStyle.Frontend) {
+        const seriesCode = codingContext.selectedFrontendTemplate?.seriesCode ??
+            // In the unlikely event that no template is selected, arbitrarily pick the first available one
+            codingContext.availableFrontendTemplates?.[0]?.seriesCode ??
+            // Extremely unlikely fallback:
+            (await api.frontendTemplates())[0].seriesCode;
+        await api.updateFrontendTemplate(seriesCode);
+    }
+    else {
+        // For non-frontend (Algorithm/Development/Function) use the reset API
+        await api.reset();
+    }
+}

package/esm/src/action/run.js

@@ -1,10 +1,10 @@
 import * as dntShim from "../../_dnt.shims.js";
+import { OrcaClient } from "../orca/client.js";
+import { FileType } from "../orca/types.js";
 import { load as loadConfig } from "../shared/config.js";
 import { CantReadFile } from "../shared/errors.js";
 import { getCommonChallengeContext, listFileNames, printTimeLeft, trackClientFromConfig, } from "../shared/mod.js";
 import { EnvSettings, FileListType, } from "../shared/types.js";
-import { OrcaClient } from "../orca/client.js";
-import { FileType } from "../orca/types.js";
 import * as colors from "../../deps/deno.land/std@0.195.0/fmt/colors.js";
 import { exists } from "../../deps/deno.land/std@0.195.0/fs/mod.js";
 import { FileNotFound } from "../shared/errors.js";
@@ -15,7 +15,7 @@ export async function run(options) {
     const [codingContext, challenge] = await getCommonChallengeContext(config, api);
     // const orcaHost = Deno.env.get("ORCA_HOST") || "track-prod-frontend.orca.run";
     // Temporary code to retrieve the Orca host. Will be able to get from CodingContext in the future.
-    const orcaHost = codingContext.orcaHost || await api.orcaHost();
+    const orcaHost = codingContext.orcaHost || (await api.orcaHost());
     const token = await api.orcaToken(codingContext);
     const orca = new OrcaClient(orcaHost, token);
     await orca.connect();
@@ -32,20 +32,23 @@ export async function run(options) {
     if (codingContext.answers.appCommand) {
         envVars["APP_COMMAND"] = codingContext.answers.appCommand;
     }
+    if (codingContext.answers?.frontendSettings?.target) {
+        // Currently, the `envConfig.variables` from Track Test does not including the frontend template's FRONTEND_TARGET.
+        envVars["FRONTEND_TARGET"] = codingContext.answers?.frontendSettings?.target;
+    }
     await orca.envVars(envVars);
-    const files = Object.entries(await getAllEditableFileContent(codingContext))
-        .map(([name, content]) => ({
+    const updatedFiles = await getAllEditableFileContent(codingContext);
+    const files = Object.entries(updatedFiles).map(([name, content]) => ({
         name,
         content,
         type: FileType.UTF8,
     }));
     let saveFilesRequest;
     if (!options?.noSave) {
-        const updatedFiles = await getAllEditableFileContent(codingContext);
         saveFilesRequest = {
             versionId: codingContext.challengeVersionId,
             addedFiles: codingContext.answers.addedFiles || [],
-            updatedFiles: updatedFiles,
+            updatedFiles,
         };
         console.log("Saving challenge files");
         await api.saveFiles(saveFilesRequest);

package/esm/src/meta.d.ts

@@ -1,3 +1,3 @@
-export declare const VERSION = "4.1.0-rc2";
+export declare const VERSION = "4.1.0-rc4";
 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 = "4.1.0-rc2";
+export const VERSION = "4.1.0-rc4";
 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/shared/types.d.ts

@@ -114,6 +114,10 @@ export interface CodingAnswers {
     addedFiles?: string[];
     fileVersions: object;
     envConfig?: EnvSettings;
+    frontendSettings?: {
+        /** The directory containing compiled frontend assets */
+        target?: string;
+    };
 }
 export interface SaveFilesRequest {
     versionId: number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "track-cli",
-  "version": "4.1.0-rc2",
+  "version": "4.1.0-rc4",
   "description": "A CLI for interacting with tracks.run and running code tests on track's servers",
   "repository": {
     "type": "git",