Feat/await async calls (coderoad#564)

* prepare v0.19.1 release with improved logging

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

* make calls async

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

Author: ShMcK

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",

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,
     )

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,
       )

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}`)

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, {

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

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'",