allow vscode commands with reset

ShMcK · ShMcK · commit fc384778abd2 · 2020-08-02T16:54:23.000-07:00
Signed-off-by: shmck &lt;shawn.j.mckay@gmail.com&gt;
diff --git a/src/actions/onRunReset.ts b/src/actions/onRunReset.ts
@@ -30,12 +30,10 @@ const onRunReset = async (action: ResetAction, context: Context): Promise<void>
   // load timeline until last pass commit
   reset({ branch, hash })
 
-  // TODO: @deprecate command in favor of commands
   // if tutorial.config.reset.command, run it
-  if (tutorial?.config?.reset?.command) {
-    hooks.onReset([tutorial?.config?.reset?.command])
-  } else if (tutorial?.config?.reset?.commands) {
-    hooks.onReset(tutorial?.config?.reset?.commands)
+  const resetActions = tutorial?.config?.reset
+  if (resetActions) {
+    hooks.onReset({ commands: resetActions?.commands, vscodeCommands: resetActions?.vscodeCommands })
   }
 }
 
diff --git a/src/services/hooks/index.ts b/src/services/hooks/index.ts
@@ -38,8 +38,9 @@ export const onSolutionEnter = async (actions: TT.StepActions): Promise<void> =>
   await onRunTest()
 }
 
-export const onReset = async (commands: string[]): Promise<void> => {
-  await runCommands(commands)
+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> => {
diff --git a/src/services/hooks/utils/loadCommits.ts b/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)
diff --git a/src/services/reset/lastHash.ts b/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}`)
   }
diff --git a/typings/tutorial.d.ts b/typings/tutorial.d.ts
@@ -3,8 +3,8 @@ import { ProgressStatus } from './index'
 export type Maybe<T> = T | null
 
 export type ConfigReset = {
-  command?: string
   commands?: string[]
+  vscodeCommands?: VSCodeCommand[]
 }
 
 export type TutorialConfig = {
@@ -58,7 +58,7 @@ export type TutorialSummary = {
 
 export type StepActions = {
   commands?: string[]
-  commits: string[]
+  commits?: string[]
   files?: string[]
   watchers?: string[]
   filter?: string
