cleanup start

src/editor/commands/index.ts

@@ -1,7 +1,7 @@
 import * as vscode from 'vscode'
+import start from './start'
 
 // import runTest from './runTest'
-import start from './start'
 // import loadSolution from './loadSolution'
 // import quit from './quit'
 
@@ -13,11 +13,11 @@ const COMMANDS = {
   // QUIT: 'coderoad.quit',
 }
 
+
 export default (context: vscode.ExtensionContext): void => {
   const commands = {
-    [COMMANDS.START](): void {
-      console.log('TUTORIAL_START')
-      start(context)
+    [COMMANDS.START]: async function startCommand(): Promise<void> {
+      return start(context)
     },
     // [COMMANDS.RUN_TEST]: runTest,
     // [COMMANDS.LOAD_SOLUTION]: loadSolution,

src/editor/commands/start-old.ts

@@ -0,0 +1,108 @@
+import * as vscode from 'vscode'
+import * as CR from 'typings'
+
+import tutorialSetup from '../../services/tutorialSetup'
+import { isEmptyWorkspace, openReadme } from '../workspace'
+import { setWorkspaceRoot } from '../../services/node'
+import { setStorage } from '../../editor/storage'
+
+/*
+new
+if current workspace is empty, use it
+if not, open a new folder then start
+*/
+
+// async function continueTutorial() {
+//   // TODO: verify that tutorial is loaded in workspace
+//   // TODO: verify progress
+//   // TODO: verify setup
+//   await loadProgressPosition()
+//   await openReadme()
+// }
+
+async function newTutorial(tutorial: CR.Tutorial) {
+  // if workspace isn't empty, clear it out if given permission
+  const isEmpty: boolean = await isEmptyWorkspace()
+  if (!isEmpty) {
+    // eslint-disable-next-line
+    const options = ['Open a new folder', 'I\'ll clear the files and folders myself']
+    const shouldOpenFolder = await vscode.window.showQuickPick(options)
+    if (shouldOpenFolder === options[0]) {
+      await vscode.commands.executeCommand('vscode.openFolder')
+    }
+  }
+
+  await tutorialSetup(tutorial)
+  await openReadme()
+}
+
+
+export default async function start(context: vscode.ExtensionContext): Promise<void> {
+  console.log('start', context)
+
+
+  return;
+
+  // const modes = ['New']
+
+  // const canContinue = await validateCanContinue()
+  // if (canContinue) {
+  //   modes.push('Continue')
+  // }
+
+  // const selectedMode: string | undefined = await vscode.window.showQuickPick(modes)
+
+  // if (!selectedMode) {
+  //   throw new Error('No mode selected')
+  //   return
+  // }
+
+  // interface TutorialQuickPickItem extends vscode.QuickPickItem {
+  //   id: string
+  // }
+
+  // // load tutorial summaries
+  // const tutorialsData: { [id: string]: CR.TutorialSummary } = await api({
+  //   resource: 'getTutorialsSummary',
+  // })
+  // const selectableTutorials: TutorialQuickPickItem[] = Object.keys(tutorialsData).map(id => {
+  //   const tutorial = tutorialsData[id]
+  //   return {
+  //     label: tutorial.title,
+  //     description: tutorial.description,
+  //     // detail: '', // optional additional info
+  //     id,
+  //   }
+  // })
+  // const selectedTutorial: TutorialQuickPickItem | undefined = await vscode.window.showQuickPick(selectableTutorials)
+
+  // if (!selectedTutorial) {
+  //   throw new Error('No tutorial selected')
+  // }
+
+  // // load specific tutorial
+  // const tutorial: CR.Tutorial | undefined = await fetch({
+  //   resource: 'getTutorial',
+  //   params: { id: selectedTutorial.id },
+  // })
+
+  // if (!tutorial) {
+  //   throw new Error('No tutorial found')
+  // }
+
+  // switch (selectedMode) {
+  //   // new tutorial
+  //   case modes[0]:
+  //     await newTutorial(tutorial)
+  //     break
+  //   // continue
+  //   case modes[1]:
+  //     await continueTutorial()
+  //     break
+  // }
+
+  // // setup hook to run tests on save
+
+
+  // TODO: start
+}

src/editor/commands/start.ts

@@ -1,114 +1,45 @@
 import * as vscode from 'vscode'
-import * as CR from 'typings'
-
-import tutorialSetup from '../../services/tutorialSetup'
-import { isEmptyWorkspace, openReadme } from '../workspace'
 import { setWorkspaceRoot } from '../../services/node'
 import { setStorage } from '../../editor/storage'
-import createStateMachine from '../../state'
-
-/*
-new
-if current workspace is empty, use it
-if not, open a new folder then start
-*/
-
-// async function continueTutorial() {
-//   // TODO: verify that tutorial is loaded in workspace
-//   // TODO: verify progress
-//   // TODO: verify setup
-//   await loadProgressPosition()
-//   await openReadme()
-// }
-
-async function newTutorial(tutorial: CR.Tutorial) {
-  // if workspace isn't empty, clear it out if given permission
-  const isEmpty: boolean = await isEmptyWorkspace()
-  if (!isEmpty) {
-    // eslint-disable-next-line
-    const options = ['Open a new folder', 'I\'ll clear the files and folders myself']
-    const shouldOpenFolder = await vscode.window.showQuickPick(options)
-    if (shouldOpenFolder === options[0]) {
-      await vscode.commands.executeCommand('vscode.openFolder')
-    }
-  }
+import { activate as activateMachine, default as machine } from '../../state'
+import * as storage from '../../services/storage'
+import * as git from '../../services/git'
+import * as CR from 'typings'
 
-  await tutorialSetup(tutorial)
-  await openReadme()
+let initialTutorial: CR.Tutorial | undefined
+let initialProgress: CR.Progress = {
+    levels: {},
+    stages: {},
+    steps: {},
+    complete: false,
 }
 
-
 export default async function start(context: vscode.ExtensionContext): Promise<void> {
-  console.log('start', context)
-
-  // setup connection to workspace
-  await setWorkspaceRoot()
-  // set workspace context path
-  await setStorage(context.workspaceState)
-  // initiate the state machine
-  createStateMachine()
-  return;
-
-  // const modes = ['New']
-
-  // const canContinue = await validateCanContinue()
-  // if (canContinue) {
-  //   modes.push('Continue')
-  // }
-
-  // const selectedMode: string | undefined = await vscode.window.showQuickPick(modes)
-
-  // if (!selectedMode) {
-  //   throw new Error('No mode selected')
-  //   return
-  // }
-
-  // interface TutorialQuickPickItem extends vscode.QuickPickItem {
-  //   id: string
-  // }
-
-  // // load tutorial summaries
-  // const tutorialsData: { [id: string]: CR.TutorialSummary } = await api({
-  //   resource: 'getTutorialsSummary',
-  // })
-  // const selectableTutorials: TutorialQuickPickItem[] = Object.keys(tutorialsData).map(id => {
-  //   const tutorial = tutorialsData[id]
-  //   return {
-  //     label: tutorial.title,
-  //     description: tutorial.description,
-  //     // detail: '', // optional additional info
-  //     id,
-  //   }
-  // })
-  // const selectedTutorial: TutorialQuickPickItem | undefined = await vscode.window.showQuickPick(selectableTutorials)
-
-  // if (!selectedTutorial) {
-  //   throw new Error('No tutorial selected')
-  // }
-
-  // // load specific tutorial
-  // const tutorial: CR.Tutorial | undefined = await fetch({
-  //   resource: 'getTutorial',
-  //   params: { id: selectedTutorial.id },
-  // })
-
-  // if (!tutorial) {
-  //   throw new Error('No tutorial found')
-  // }
-
-  // switch (selectedMode) {
-  //   // new tutorial
-  //   case modes[0]:
-  //     await newTutorial(tutorial)
-  //     break
-  //   // continue
-  //   case modes[1]:
-  //     await continueTutorial()
-  //     break
-  // }
-
-  // // setup hook to run tests on save
-
-
-  // TODO: start
-}
+    console.log('TUTORIAL_START')
+
+    // setup connection to workspace
+    await setWorkspaceRoot()
+    // set workspace context path
+    await setStorage(context.workspaceState)
+
+    // initialize state machine
+    activateMachine()
+
+    console.log('ACTION: start')
+
+    // verify that the user has a tutorial & progress
+    // verify git is setup with a coderoad remote
+    const [tutorial, progress, hasGit, hasGitRemote] = await Promise.all([
+        storage.getTutorial(),
+        storage.getProgress(),
+        git.gitVersion(),
+        git.gitCheckRemoteExists(),
+    ])
+    initialTutorial = tutorial
+    initialProgress = progress
+    const canContinue = !!(tutorial && progress && hasGit && hasGitRemote)
+    console.log('canContinue', canContinue)
+    // if a tutorial exists, "CONTINUE"
+    // otherwise start from "NEW"
+    machine.send(canContinue ? 'CONTINUE' : 'NEW')
+}

src/editor/init.ts

@@ -2,9 +2,9 @@
 // Import the module and reference it with the alias vscode in your code below
 import * as vscode from 'vscode'
 
+import { deactivate as deactivateMachine } from '../state'
 import createCommands from './commands'
 import createViews from './views'
-import createStateMachine from '../state'
 
 // this method is called when your extension is activated
 // your extension is activated the very first time the command is executed
@@ -14,13 +14,11 @@ export function activate(context: vscode.ExtensionContext) {
     // commands
     createCommands(context)
 
-    // tasks
-    // add tasks here
-
     // views
     createViews(context)
 
-
+    // tasks
+    // add tasks here
 }
 
 // this method is called when your extension is deactivated
@@ -30,4 +28,6 @@ export function deactivate(context: vscode.ExtensionContext): void {
     for (const disposable of context.subscriptions) {
         disposable.dispose()
     }
+    // shut down state machine
+    deactivateMachine()
 }

src/state/actions/index.ts

@@ -1,4 +1,4 @@
-import { assign, send } from 'xstate'
+import { assign } from 'xstate'
 import * as CR from 'typings'
 import * as storage from '../../services/storage'
 import * as git from '../../services/git'
@@ -12,23 +12,6 @@ let initialProgress: CR.Progress = {
 }
 
 export default {
-    start: async () => {
-        console.log('ACTION: start')
-        // verify that the user has a tutorial & progress
-        // verify git is setup with a coderoad remote
-        const [tutorial, progress, hasGit, hasGitRemote] = await Promise.all([
-            storage.getTutorial(),
-            storage.getProgress(),
-            git.gitVersion(),
-            git.gitCheckRemoteExists(),
-        ])
-        initialTutorial = tutorial
-        initialProgress = progress
-        const canContinue = !!(tutorial && progress && hasGit && hasGitRemote)
-        // if a tutorial exists, "CONTINUE"
-        // otherwise start from "NEW"
-        send(canContinue ? 'CONTINUE' : 'NEW')
-    },
     tutorialLoad: assign({
         // load initial data, progress & position
         data(): CR.TutorialData {