Merge pull request #421 from coderoad/reset-commands

support multiple reset commands

Author: ShMcK

src/actions/onRunReset.ts

@@ -3,6 +3,7 @@ import * as TT from 'typings/tutorial'
 import Context from '../services/context/context'
 import { exec } from '../services/node'
 import reset from '../services/reset'
+import * as hooks from '../services/hooks'
 import getCommitHashByPosition from '../services/reset/lastHash'
 
 type ResetAction = {
@@ -30,8 +31,9 @@ const onRunReset = async (action: ResetAction, context: Context): Promise<void>
   reset({ branch, hash })
 
   // if tutorial.config.reset.command, run it
-  if (tutorial?.config?.reset?.command) {
-    await exec({ command: tutorial.config.reset.command })
+  const resetActions = tutorial?.config?.reset
+  if (resetActions) {
+    hooks.onReset({ commands: resetActions?.commands, vscodeCommands: resetActions?.vscodeCommands })
   }
 }
 

src/commands.ts

@@ -3,8 +3,8 @@ import * as TT from 'typings/tutorial'
 import * as vscode from 'vscode'
 import createTestRunner from './services/testRunner'
 import createWebView from './services/webview'
-import logger from './services/logger'
 import * as hooks from './services/hooks'
+import logger from './services/logger'
 
 export const COMMANDS = {
   START: 'coderoad.start',

src/services/hooks/index.ts

@@ -38,6 +38,11 @@ export const onSolutionEnter = async (actions: TT.StepActions): Promise<void> =>
   await onRunTest()
 }
 
+export const onReset = async (actions: TT.StepActions): Promise<void> => {
+  await runCommands(actions?.commands)
+  await runVSCodeCommands(actions?.vscodeCommands)
+}
+
 export const onError = async (error: Error): Promise<void> => {
   telemetryOnError(error)
 }

src/services/hooks/utils/loadCommits.ts

@@ -1,7 +1,7 @@
 import * as git from '../../git'
 
-const loadCommits = async (commits: string[]): Promise<void> => {
-  if (commits) {
+const loadCommits = async (commits: string[] = []): Promise<void> => {
+  if (commits && commits.length) {
     // load the current list of commits for validation
     for (const commit of commits) {
       await git.loadCommit(commit)

src/services/reset/lastHash.ts

@@ -41,7 +41,7 @@ const getLastCommitHash = (position: T.Position, tutorial: TT.Tutorial | null):
   if (!step) {
     throw new Error(`No step found matching ${stepId}`)
   }
-  const commits = step.setup.commits
+  const commits = step.setup?.commits || []
   if (!commits.length) {
     throw new Error(`No commits found on step ${stepId}`)
   }

typings/tutorial.d.ts

@@ -3,7 +3,8 @@ import { ProgressStatus } from './index'
 export type Maybe<T> = T | null
 
 export type ConfigReset = {
-  command?: string
+  commands?: string[]
+  vscodeCommands?: VSCodeCommand[]
 }
 
 export type TutorialConfig = {
@@ -57,7 +58,7 @@ export type TutorialSummary = {
 
 export type StepActions = {
   commands?: string[]
-  commits: string[]
+  commits?: string[]
   files?: string[]
   watchers?: string[]
   filter?: string