refactor setup/solution actions

Signed-off-by: shmck <[email protected]>

src/actions/index.ts

@@ -5,3 +5,4 @@ export { default as onValidateSetup } from './onValidateSetup'
 export { default as onRunReset } from './onRunReset'
 export { default as onErrorPage } from './onErrorPage'
 export { default as onTestPass } from './onTestPass'
+export { onSetupActions, onSolutionActions } from './onActions'

src/actions/setupActions.ts → src/actions/onActions.ts

@@ -13,7 +13,7 @@ interface SetupActions {
   dir?: string
 }
 
-export const setupActions = async ({ actions, send, dir }: SetupActions): Promise<void> => {
+export const onSetupActions = async ({ actions, send, dir }: SetupActions): Promise<void> => {
   if (!actions) {
     return
   }
@@ -49,7 +49,7 @@ export const setupActions = async ({ actions, send, dir }: SetupActions): Promis
   }
 }
 
-export const solutionActions = async (params: SetupActions): Promise<void> => {
+export const onSolutionActions = async (params: SetupActions): Promise<void> => {
   await git.clear()
-  return setupActions(params).catch(onError)
+  return onSetupActions(params).catch(onError)
 }

src/channel.ts

@@ -1,6 +1,6 @@
 import * as T from 'typings'
 import * as vscode from 'vscode'
-import { setupActions, solutionActions } from './actions/setupActions'
+import { setupActions, solutionActions } from './actions/onActions'
 import { COMMANDS } from './commands'
 import Context from './services/context/context'
 import logger from './services/logger'
@@ -62,12 +62,12 @@ class Channel implements Channel {
       // load step actions (git commits, commands, open files)
       case 'SETUP_ACTIONS':
         await vscode.commands.executeCommand(COMMANDS.SET_CURRENT_POSITION, action.payload.position)
-        setupActions({ actions: action.payload.actions, send: this.send })
+        actions.onSetupActions({ actions: action.payload.actions, send: this.send })
         return
       // load solution step actions (git commits, commands, open files)
       case 'SOLUTION_ACTIONS':
         await vscode.commands.executeCommand(COMMANDS.SET_CURRENT_POSITION, action.payload.position)
-        await solutionActions({ actions: action.payload.actions, send: this.send })
+        await actions.onSolutionActions({ actions: action.payload.actions, send: this.send })
         // run test following solution to update position
         vscode.commands.executeCommand(COMMANDS.RUN_TEST)
         return

src/commands.ts

@@ -2,7 +2,7 @@ import * as T from 'typings'
 import * as TT from 'typings/tutorial'
 import * as vscode from 'vscode'
 import createTestRunner from './services/testRunner'
-import { setupActions } from './actions/setupActions'
+import { onSetupActions } from './actions/onActions'
 import createWebView from './services/webview'
 import logger from './services/logger'
 
@@ -57,7 +57,7 @@ export const createCommands = ({ extensionPath, workspaceState }: CreateCommandP
       if (setup) {
         // setup tutorial test runner commits
         // assumes git already exists
-        await setupActions({
+        await onSetupActions({
           actions: setup,
           send: webview.send,
           dir: testRunnerConfig.directory || testRunnerConfig.path,