fix setup and config

src/actions/setupActions.ts

@@ -40,8 +40,10 @@ const runCommands = async (commands: string[], language: string = 'JAVASCRIPT')
 
 const setupActions = async (workspaceRoot: vscode.WorkspaceFolder, {commands, commits, files}: G.StepActions): Promise<void> => {
 	// run commits
-	for (const commit of commits) {
-		await git.loadCommit(commit)
+	if (commits) {
+		for (const commit of commits) {
+			await git.loadCommit(commit)
+		}
 	}
 
 	// run command

src/actions/tutorialConfig.ts

@@ -3,24 +3,22 @@ import * as vscode from 'vscode'
 import * as git from '../services/git'
 
 interface TutorialConfigParams {
-	tutorial: G.Tutorial,
+	config: G.TutorialConfig,
 	alreadyConfigured?: boolean
 	onComplete?(): void
 }
 
-const tutorialConfig = async ({tutorial, alreadyConfigured, onComplete}: TutorialConfigParams) => {
-	console.log('---------- tutorialConfig -----------')
+const tutorialConfig = async ({config, alreadyConfigured, }: TutorialConfigParams) => {
 	if (!alreadyConfigured) {
 		// setup git, add remote
 		await git.initIfNotExists()
 
 		// TODO: if remote not already set
-		await git.setupRemote(tutorial.version.data.config.repo.uri)
-		if (onComplete) {onComplete()}
+		await git.setupRemote(config.repo.uri)
 	}
 
 	// allow multiple coding languages in a tutorial
-	const languages: string[] = tutorial.version.data.config.codingLanguages.map(lang => lang.toLowerCase())
+	const languages: string[] = config.codingLanguages.map((lang: G.CodingLanguage) => lang.toLowerCase())
 
 	// setup onSave hook
 	vscode.workspace.onDidSaveTextDocument((document: vscode.TextDocument) => {

src/channel/index.ts

@@ -83,20 +83,32 @@ class Channel implements Channel {
 			// configure test runner, language, git
 			case 'EDITOR_TUTORIAL_CONFIG':
 				const tutorialData: G.Tutorial = action.payload.tutorial
+				// setup tutorial config (save listener, test runner, etc)
 				this.context.setTutorial(this.workspaceState, tutorialData)
-				tutorialConfig({
-					tutorial: tutorialData,
-					// must await async git setup or commit loading fails
-					onComplete: () => this.send({type: 'TUTORIAL_CONFIGURED'})
-				})
+
+				const data: G.TutorialData = tutorialData.version.data
+
+				await tutorialConfig({config: data.config})
+
+				// run init setup actions
+				if (data.init) {
+					const setup: G.StepActions | null | undefined = data.init.setup
+					if (setup) {
+						setupActions(this.workspaceRoot, setup)
+					}
+				}
+
+				// report back to the webview that setup is complete
+				this.send({type: 'TUTORIAL_CONFIGURED'})
 				return
 			case 'EDITOR_TUTORIAL_CONTINUE_CONFIG':
 				const tutorialContinue: G.Tutorial | null = this.context.tutorial.get()
 				if (!tutorialContinue) {
 					throw new Error('Invalid tutorial to continue')
 				}
+				const continueConfig: G.TutorialConfig = tutorialContinue.version.data.config
 				tutorialConfig({
-					tutorial: tutorialContinue,
+					config: continueConfig,
 					alreadyConfigured: true
 				})
 				return