fix new tutorial process

Author: ShMcK

src/editor/channel.ts

@@ -4,16 +4,18 @@ import { setStorage } from '../storage'
 import ReactWebView from '../ReactWebView'
 import { isEmptyWorkspace } from '../workspace'
 import * as CR from 'typings'
+import runTest from './runTest'
 
 const COMMANDS = {
     START: 'coderoad.start',
     TUTORIAL_LAUNCH: 'coderoad.tutorial_launch',
+    TUTORIAL_SETUP: 'coderoad.tutorial_setup',
     OPEN_WEBVIEW: 'coderoad.open_webview',
     SEND_STATE: 'coderoad.send_state',
     SEND_DATA: 'coderoad.send_data',
     RECEIVE_ACTION: 'coderoad.receive_action',
     OPEN_FILE: 'coderoad.open_file',
-    RUN_TEST: 'coderoad.test_run',
+    RUN_TEST: 'coderoad.run_test',
 }
 
 interface CreateCommandProps {
@@ -62,6 +64,19 @@ export const createCommands = ({ context, machine, storage, git, position }: Cre
         const { setup } = steps[pos.stepId].actions
         await git.gitLoadCommits(setup)
     },
+    [COMMANDS.TUTORIAL_SETUP]: async (tutorial: CR.Tutorial) => {
+        console.log('tutorial setup', tutorial)
+        // setup onSave hook
+        const languageIds = tutorial.meta.languages
+        console.log(`languageIds: ${languageIds.join(', ')}`)
+        vscode.workspace.onDidSaveTextDocument((document: vscode.TextDocument) => {
+            console.log('save document', document)
+            if (languageIds.includes(document.languageId) && document.uri.scheme === 'file') {
+                // do work
+                vscode.commands.executeCommand('coderoad.run_test')
+            }
+        })
+    },
     // open a file
     [COMMANDS.OPEN_FILE]: async (relativeFilePath: string) => {
         console.log(`OPEN_FILE ${JSON.stringify(relativeFilePath)}`)
@@ -85,6 +100,10 @@ export const createCommands = ({ context, machine, storage, git, position }: Cre
         webview.postMessage({ type: 'SET_DATA', payload })
     },
     [COMMANDS.RECEIVE_ACTION]: (action: string | CR.Action) => {
+        // send received actions from web-app into state machine
         machine.send(action)
+    },
+    [COMMANDS.RUN_TEST]: () => {
+        runTest()
     }
 })

src/editor/commands/index.ts

@@ -1,4 +1,4 @@
-import { getOutputChannel } from '../channel'
+import * as vscode from 'vscode'
 import { exec } from '../../services/node'
 import * as storage from '../../services/storage'
 import * as testResult from '../../services/testResult'
@@ -12,6 +12,15 @@ const shouldExitEarly = (processId: number): boolean => {
   return currentId !== processId
 }
 
+let _channel: vscode.OutputChannel
+
+const getOutputChannel = (name: string): vscode.OutputChannel => {
+  if (!_channel) {
+    _channel = vscode.window.createOutputChannel(name)
+  }
+  return _channel
+}
+
 export default async function runTest(): Promise<void> {
   // increment process id
   let processId = ++currentId

src/editor/commands/runTest.ts

@@ -11,33 +11,33 @@ export async function isEmptyWorkspace(): Promise<boolean> {
   return !stdout.length
 }
 
-// TODO: workspace change listener
-export async function openReadme(): Promise<void> {
-  const { stderr } = await exec('ls')
-  if (stderr) {
-    throw new Error('Error looking for initial file')
-  }
+// // TODO: workspace change listener
+// export async function openReadme(): Promise<void> {
+//   const { stderr } = await exec('ls')
+//   if (stderr) {
+//     throw new Error('Error looking for initial file')
+//   }
 
-  const file = 'README.md'
-  const filePath = path.join(vscode.workspace.rootPath || '', file)
-  console.log('filePath', filePath)
-  const hasReadme = await exists(file)
+//   const file = 'README.md'
+//   const filePath = path.join(vscode.workspace.rootPath || '', file)
+//   console.log('filePath', filePath)
+//   const hasReadme = await exists(file)
 
-  if (!hasReadme) {
-    // add readme if none exists
-    try {
-      const content = '# Welcome to CodeRoad!'
-      fs.writeFileSync(filePath, content, 'utf8')
-    } catch (error) {
-      throw new Error('Error writing READM.md')
-    }
-  }
+//   if (!hasReadme) {
+//     // add readme if none exists
+//     try {
+//       const content = '# Welcome to CodeRoad!'
+//       fs.writeFileSync(filePath, content, 'utf8')
+//     } catch (error) {
+//       throw new Error('Error writing READM.md')
+//     }
+//   }
 
-  try {
-    const openPath = vscode.Uri.parse(filePath)
-    const doc = await vscode.workspace.openTextDocument(openPath)
-    await vscode.window.showTextDocument(doc)
-  } catch (error) {
-    throw new Error('Error opening README doc')
-  }
-}
+//   try {
+//     const openPath = vscode.Uri.parse(filePath)
+//     const doc = await vscode.workspace.openTextDocument(openPath)
+//     await vscode.window.showTextDocument(doc)
+//   } catch (error) {
+//     throw new Error('Error opening README doc')
+//   }
+// }

src/editor/save.ts

@@ -9,7 +9,7 @@ interface Options {
 }
 
 const tutorialsData: { [key: string]: CR.Tutorial } = {
-  tutorialId: basicTutorial,
+  [basicTutorial.id]: basicTutorial,
 }
 
 // TODO: replace with fetch resource

src/editor/workspace.ts

@@ -7,8 +7,8 @@ import * as vscode from 'vscode'
 import * as storage from '../../services/storage'
 import * as git from '../../services/git'
 
-let initialTutorial: CR.Tutorial | undefined
-let initialProgress: CR.Progress = {
+let currentTutorial: CR.Tutorial | undefined
+let currentProgress: CR.Progress = {
     levels: {},
     stages: {},
     steps: {},
@@ -32,37 +32,42 @@ export default {
         const canContinue = !!(tutorial && progress && hasGit && hasGitRemote)
 
         if (canContinue) {
-            initialTutorial = tutorial
-            initialProgress = progress
+            currentTutorial = tutorial
+            currentProgress = progress
         }
 
         machine.send(canContinue ? 'CONTINUE' : 'NEW')
     },
     async tutorialLaunch() {
         // TODO: add selection of tutorial id
         const tutorial: CR.Tutorial = await api({ resource: 'getTutorial', params: { id: '1' } })
+        console.log('api')
+        console.log(tutorial)
         vscode.commands.executeCommand('coderoad.tutorial_launch', tutorial)
     },
+    tutorialSetup() {
+        vscode.commands.executeCommand('coderoad.tutorial_setup', currentTutorial)
+    },
     tutorialContinue: assign({
         // load initial data, progress & position
         data(): CR.TutorialData {
             console.log('ACTION: tutorialLoad.data')
-            if (!initialTutorial) {
+            if (!currentTutorial) {
                 throw new Error('No Tutorial loaded')
             }
-            return initialTutorial.data
+            return currentTutorial.data
 
         },
         progress(): CR.Progress {
             console.log('ACTION: tutorialLoad.progress')
-            return initialProgress
+            return currentProgress
         },
         position() {
             console.log('ACTION: tutorialLoad.position')
-            if (!initialTutorial) {
+            if (!currentTutorial) {
                 throw new Error('No Tutorial loaded')
             }
-            const { data } = initialTutorial
+            const { data } = currentTutorial
 
             const levelId = data.summary.levelList[0]
             const stageId = data.levels[levelId].stageList[0]

src/services/api/index.ts

@@ -58,6 +58,7 @@ export const machine = Machine<
             Tutorial: {
                 id: 'tutorial',
                 initial: 'Summary',
+                onEntry: ['tutorialSetup'],
                 states: {
                     LoadNext: {
                         id: 'tutorial-load-next',

src/state/actions/index.ts

@@ -1,7 +1,7 @@
 import * as CR from 'typings'
 
 const basic: CR.Tutorial = {
-  id: 'tutorialId',
+  id: '1',
   meta: {
     version: '0.1.0',
     repo: 'https://github.com/ShMcK/coderoad-tutorial-basic.git',