setup xstate machine as core

coderoad · ShMcK · Jun 2, 2019 · May 27, 2019 · Jun 2, 2019 · Jun 2, 2019
commit 32edbcf7e6f6bc62c14b76fc465f6b24451154d6
diff --git a/TODO.md b/TODO.md
@@ -0,0 +1,6 @@
+# Todos
+- add to scripts when url fixed
+
+```
+"postinstall": "node ./node_modules/vscode/bin/install",
+```
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -16,56 +16,12 @@
 	"main": "./out/extension.js",
 	"contributes": {
 		"commands": [
-			{
-				"command": "coderoad.tutorial_setup",
-				"title": "Tutorial Setup",
-				"category": "CodeRoad"
-			},
 			{
 				"command": "coderoad.tutorial_load",
 				"title": "Load Tutorial",
 				"category": "CodeRoad"
-			},
-			{
-				"command": "coderoad.test_run",
-				"title": "Run Test",
-				"category": "CodeRoad"
-			},
-			{
-				"command": "coderoad.solution_load",
-				"title": "Load Solution",
-				"category": "CodeRoad"
 			}
-		],
-		"viewsContainers": {
-			"activitybar": [
-				{
-					"id": "coderoad-tutorial",
-					"title": "CodeRoad Tutorial",
-					"icon": "resources/icons/icon.svg"
-				}
-			]
-		},
-		"views": {
-			"coderoad-tutorial": [
-				{
-					"id": "progress",
-					"name": "Progress"
-				},
-				{
-					"id": "explanation",
-					"name": "Explanation"
-				},
-				{
-					"id": "instructions",
-					"name": "Instructions"
-				},
-				{
-					"id": "hints",
-					"name": "Hints"
-				}
-			]
-		}
+		]
 	},
 	"scripts": {
 		"vscode:prepublish": "npm run compile",
@@ -82,5 +38,8 @@
 		"tslint-config-prettier": "^1.18.0",
 		"typescript": "^3.3.1",
 		"vscode": "^1.1.28"
+	},
+	"dependencies": {
+		"xstate": "^4.6.0"
 	}
 }
diff --git a/src/commands/index.ts b/src/commands/index.ts
@@ -1,15 +1,15 @@
 import * as vscode from 'vscode'
 
-import runTest from './runTest'
+// import runTest from './runTest'
 import tutorialLoad from './tutorialLoad'
-import loadSolution from './loadSolution'
+// import loadSolution from './loadSolution'
 // import quit from './quit'
 
 const COMMANDS = {
-  TUTORIAL_SETUP: 'coderoad.tutorial_setup',
+  // TUTORIAL_SETUP: 'coderoad.tutorial_setup',
   TUTORIAL_LOAD: 'coderoad.tutorial_load',
-  RUN_TEST: 'coderoad.test_run',
-  LOAD_SOLUTION: 'coderoad.solution_load',
+  // RUN_TEST: 'coderoad.test_run',
+  // LOAD_SOLUTION: 'coderoad.solution_load',
   // QUIT: 'coderoad.quit',
 }
 
@@ -18,8 +18,8 @@ export default (context: vscode.ExtensionContext): void => {
     [COMMANDS.TUTORIAL_LOAD](): void {
       tutorialLoad(context)
     },
-    [COMMANDS.RUN_TEST]: runTest,
-    [COMMANDS.LOAD_SOLUTION]: loadSolution,
+    // [COMMANDS.RUN_TEST]: runTest,
+    // [COMMANDS.LOAD_SOLUTION]: loadSolution,
     // [COMMANDS.QUIT]: () => quit(context.subscriptions),
   }
 

diff --git a/src/commands/tutorialLoad.ts b/src/commands/tutorialLoad.ts
@@ -62,69 +62,72 @@ async function validateCanContinue(): Promise<boolean> {
 }
 
 export default async function tutorialLoad(context: vscode.ExtensionContext): Promise<void> {
+  console.log(`tutorialLoad ${JSON.stringify(context)}`)
+
   // setup connection to workspace
   await rootSetup(context)
-
-  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 fetch({
-    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
-  onSaveHook(tutorial.meta.languages)
+  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 fetch({
+  //   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
+  // onSaveHook(tutorial.meta.languages)
 
   // TODO: start
 }
diff --git a/src/state/actions/index.ts b/src/state/actions/index.ts
@@ -0,0 +1 @@
+export default {}
diff --git a/src/state/context/index.ts b/src/state/context/index.ts
@@ -0,0 +1,20 @@
+import basicTutorialData from './tutorials/basic'
+import * as CR from 'typings'
+
+const tutorialContext: CR.MachineContext = {
+    position: {
+        levelId: '',
+        stageId: '',
+        stepId: '',
+    },
+    progress: {
+        levels: {},
+        stages: {},
+        steps: {},
+        complete: false,
+    },
+    // TODO: load tutorial instead of preloading demo
+    data: basicTutorialData.data,
+}
+
+export default tutorialContext
diff --git a/src/tutorials/basic.ts → src/state/context/tutorials/basic.ts b/src/tutorials/basic.ts → src/state/context/tutorials/basic.ts
diff --git a/src/state/guards/index.ts b/src/state/guards/index.ts
@@ -0,0 +1 @@
+export default {}