Feat/await async calls (#564)

ShMcK · web-flow · commit 16396eca9024 · 2022-01-11T19:28:27.000-08:00
* prepare v0.19.1 release with improved logging

Signed-off-by: shmck &lt;shawn.j.mckay@gmail.com&gt;

* make calls async

Signed-off-by: shmck &lt;shawn.j.mckay@gmail.com&gt;
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "coderoad",
-  "version": "0.19.0",
+  "version": "0.19.1",
   "description": "Play interactive coding tutorials in your editor",
   "keywords": [
     "tutorial",
diff --git a/src/actions/onRunReset.ts b/src/actions/onRunReset.ts
@@ -28,12 +28,12 @@ const onRunReset = async (action: ResetAction, context: Context): Promise<void>
   }
 
   // load timeline until last pass commit
-  reset({ branch, hash })
+  await reset({ branch, hash })
 
   // if tutorial.config.reset.command, run it
   const resetActions = tutorial?.config?.reset
   if (resetActions) {
-    hooks.onReset(
+    await hooks.onReset(
       { commands: resetActions?.commands, vscodeCommands: resetActions?.vscodeCommands },
       tutorial?.id as string,
     )
diff --git a/src/actions/onTutorialConfigContinue.ts b/src/actions/onTutorialConfigContinue.ts
@@ -30,7 +30,7 @@ const onTutorialConfigContinue = async (action: T.Action, context: Context): Pro
     // if tutorial.config.reset.command, run it
     const continueActions = tutorialToContinue?.config?.continue
     if (continueActions) {
-      hooks.onContinue(
+      await hooks.onContinue(
         { commands: continueActions?.commands, vscodeCommands: continueActions?.vscodeCommands },
         tutorialToContinue?.id as string,
       )
diff --git a/src/channel.ts b/src/channel.ts
@@ -59,12 +59,12 @@ class Channel implements Channel {
       case 'EDITOR_LEVEL_ENTER':
       case 'EDITOR_STEP_ENTER':
         await vscode.commands.executeCommand(COMMANDS.SET_CURRENT_POSITION, action.payload.position)
-        hooks.onSetupEnter(action.payload.actions)
+        await hooks.onSetupEnter(action.payload.actions)
         return
       // load solution step actions (git commits, commands, open files)
       case 'EDITOR_SOLUTION_ENTER':
         await vscode.commands.executeCommand(COMMANDS.SET_CURRENT_POSITION, action.payload.position)
-        hooks.onSolutionEnter(action.payload.actions)
+        await hooks.onSolutionEnter(action.payload.actions)
         return
       case 'EDITOR_SYNC_POSITION':
         // update progress when a level is deemed complete in the client
@@ -83,13 +83,13 @@ class Channel implements Channel {
         actions.onRunReset({ type: 'POSITION', position: action.payload.position }, this.context)
         return
       case 'EDITOR_STEP_COMPLETE':
-        hooks.onStepComplete(action.payload)
+        await hooks.onStepComplete(action.payload)
         return
       case 'EDITOR_LEVEL_COMPLETE':
-        hooks.onLevelComplete(action.payload)
+        await hooks.onLevelComplete(action.payload)
         return
       case 'EDITOR_TUTORIAL_COMPLETE':
-        hooks.onTutorialComplete(action.payload)
+        await hooks.onTutorialComplete(action.payload)
         return
       default:
         logger(`No match for action type: ${actionType}`)
diff --git a/src/commands.ts b/src/commands.ts
@@ -70,7 +70,7 @@ export const createCommands = (commandProps: CreateCommandProps): { [key: string
       if (!alreadyConfigured) {
         const setupActions = data.config.setup
         if (setupActions) {
-          hooks.onInit(setupActions, data.id)
+          await hooks.onInit(setupActions, data.id)
         }
       }
       testRunner = createTestRunner(data, {
diff --git a/src/services/reset/index.ts b/src/services/reset/index.ts
@@ -36,7 +36,7 @@ const reset = async ({ branch, hash }: Input): Promise<void> => {
     })
     // stash any current work
     await exec({
-      command: 'git stash',
+      command: 'git stash --include-untracked',
     }).catch(ignoreError)
 
     // remove any other files
diff --git a/web-app/package.json b/web-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "coderoad-app",
-  "version": "0.19.0",
+  "version": "0.19.1",
   "private": true,
   "scripts": {
     "analyze": "source-map-explorer 'build/static/js/*.js'",

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "coderoad",`
`3`		`- "version": "0.19.0",`
	`3`	`+ "version": "0.19.1",`
`4`	`4`	`"description": "Play interactive coding tutorials in your editor",`
`5`	`5`	`"keywords": [`
`6`	`6`	`"tutorial",`
Original file line number	Diff line number	Diff line change
`@@ -28,12 +28,12 @@ const onRunReset = async (action: ResetAction, context: Context): Promise<void>`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`// load timeline until last pass commit`
`31`		`- reset({ branch, hash })`
	`31`	`+ await reset({ branch, hash })`
`32`	`32`
`33`	`33`	`// if tutorial.config.reset.command, run it`
`34`	`34`	`const resetActions = tutorial?.config?.reset`
`35`	`35`	`if (resetActions) {`
`36`		`- hooks.onReset(`
	`36`	`+ await hooks.onReset(`
`37`	`37`	`{ commands: resetActions?.commands, vscodeCommands: resetActions?.vscodeCommands },`
`38`	`38`	`tutorial?.id as string,`
`39`	`39`	`)`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ const onTutorialConfigContinue = async (action: T.Action, context: Context): Pro`
`30`	`30`	`// if tutorial.config.reset.command, run it`
`31`	`31`	`const continueActions = tutorialToContinue?.config?.continue`
`32`	`32`	`if (continueActions) {`
`33`		`- hooks.onContinue(`
	`33`	`+ await hooks.onContinue(`
`34`	`34`	`{ commands: continueActions?.commands, vscodeCommands: continueActions?.vscodeCommands },`
`35`	`35`	`tutorialToContinue?.id as string,`
`36`	`36`	`)`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ export const createCommands = (commandProps: CreateCommandProps): { [key: string`
`70`	`70`	`if (!alreadyConfigured) {`
`71`	`71`	`const setupActions = data.config.setup`
`72`	`72`	`if (setupActions) {`
`73`		`- hooks.onInit(setupActions, data.id)`
	`73`	`+ await hooks.onInit(setupActions, data.id)`
`74`	`74`	`}`
`75`	`75`	`}`
`76`	`76`	`testRunner = createTestRunner(data, {`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "coderoad-app",`
`3`		`- "version": "0.19.0",`
	`3`	`+ "version": "0.19.1",`
`4`	`4`	`"private": true,`
`5`	`5`	`"scripts": {`
`6`	`6`	`"analyze": "source-map-explorer 'build/static/js/*.js'",`