clean up typings preventing build

Author: ShMcK

src/editor/commands/index.ts

@@ -117,16 +117,16 @@ export const createCommands = ({vscodeExt}: CreateCommandProps) => {
 			// machine.send(action)
 		},
 		[COMMANDS.RUN_TEST]: () => {
-			// runTest({
-			// onSuccess: () => machine.send('TEST_PASS'),
-			// onFail: () => machine.send('TEST_FAIL'),
-			// })
-		},
-		[COMMANDS.TEST_PASS]: () => {
-			vscode.window.showInformationMessage('PASS')
-		},
-		[COMMANDS.TEST_FAIL]: () => {
-			vscode.window.showWarningMessage('FAIL')
+			runTest({
+				onSuccess: () => {
+					console.log('TEST_PASS')
+					vscode.window.showInformationMessage('PASS')
+				},
+				onFail: () => {
+					console.log('TEST_FAIL')
+					vscode.window.showWarningMessage('FAIL')
+				}
+			})
 		},
 	}
 }

src/editor/index.ts

@@ -1,5 +1,5 @@
 import * as vscode from 'vscode'
-import {setWorkspaceRoot} from './services/node'
+import {setWorkspaceRoot} from '../services/node'
 import {createCommands} from './commands'
 
 class Editor {

src/services/tutorial/index.ts

@@ -38,7 +38,7 @@ class Tutorial implements TutorialModel {
 	}
 	public launch = async (tutorial: G.Tutorial) => {
 		console.log('launch tutorial')
-		machine.send('TUTORIAL_START')
+		// machine.send('TUTORIAL_START')
 
 		console.log('tutorial', tutorial)
 

typings/index.d.ts

@@ -1,5 +1,6 @@
 import {send} from 'xstate'
 import TutorialModel from '../src/services/tutorial'
+import * as G from './graphql'
 
 export interface TutorialLevel {
 	stageList: string[]
@@ -116,8 +117,8 @@ export interface Action {
 
 export interface MachineContext {
 	tutorial: G.Tutorial | null,
-	position: CR.Position,
-	progress: CR.Progress,
+	position: Position,
+	progress: Progress,
 }
 
 export interface MachineEvent {

web-app/src/components/Router/index.tsx

@@ -7,36 +7,33 @@ import Route from './Route'
 import debuggerWrapper from '../Debugger/debuggerWrapper'
 import channel from '../../services/channel'
 import messageBusReceiver from '../../services/channel/receiver'
-import actions from '../../services/state/actions'
-
 
 interface Props {
   children: any
 }
 
 interface CloneElementProps {
-	context: CR.MachineContext
-	send(action: CR.Action): void
+  context: CR.MachineContext
+  send(action: CR.Action): void
 }
 
 // router finds first state match of <Route path='' />
-const Router = ({ children }: Props): React.ReactElement<CloneElementProps>|null => {
-	const [state, send] = useMachine(machine, {
-		actions,
-		interpreterOptions: {
-			logger: console.log.bind('XSTATE:')
-		}
-	})
+const Router = ({ children }: Props): React.ReactElement<CloneElementProps> | null => {
+  const [state, send] = useMachine(machine, {
+    interpreterOptions: {
+      logger: console.log.bind('XSTATE:'),
+    },
+  })
 
-	channel.setMachineSend(send)
+  channel.setMachineSend(send)
 
-	// event bus listener
+  // event bus listener
   React.useEffect(messageBusReceiver, [])
 
   const childArray = React.Children.toArray(children)
   for (const child of childArray) {
     if (state.matches(child.props.path)) {
-			const element = React.cloneElement<CloneElementProps>(child.props.children, { send, context: state.context })
+      const element = React.cloneElement<CloneElementProps>(child.props.children, { send, context: state.context })
       return debuggerWrapper(element, state)
     }
   }

web-app/src/containers/Continue/index.tsx

@@ -27,9 +27,12 @@ interface ContainerProps {
 }
 
 const ContinuePageContainer = ({ context, send }: ContainerProps) => {
-  // TODO: load specific tutorialId
   const { tutorial } = context
 
+  if (!tutorial) {
+    throw new Error('Tutorial not found')
+  }
+
   return <ContinuePage tutorial={tutorial} onContinue={() => send('TUTORIAL_START')} />
 }
 

web-app/src/containers/Tutorial/LevelPage/index.tsx

@@ -13,28 +13,36 @@ export const LevelSummaryPage = (props: LevelProps) => {
   const onNext = (): void => {
     props.send('NEXT')
   }
-  return <Level level={props.level} onNext={onNext}  />
+  return <Level level={props.level} onNext={onNext} />
 }
 
 interface ContainerProps {
-	context: CR.MachineContext
-	send(action: string): void
+  context: CR.MachineContext
+  send(action: string): void
 }
 
 const LevelSummaryPageContainer = (props: ContainerProps) => {
-	const { tutorial, position, progress } = props.context
-
-	const level: G.Level = tutorial.version.levels.find((l: G.Level) => l.id === position.levelId)
-	
-	level.stages.forEach((stage: G.Stage) => {
-		if (stage.id === position.stageId) {
-			stage.status = 'ACTIVE'
-		} else if (progress.stages[stage.id]) {
-			stage.status = 'COMPLETE'
-		} else {
-			stage.status = 'INCOMPLETE'
-		}
-	})
+  const { tutorial, position, progress } = props.context
+
+  if (!tutorial) {
+    throw new Error('Tutorial not found in LevelSummaryPageContainer')
+  }
+
+  const level: G.Level | undefined = tutorial.version.levels.find((l: G.Level) => l.id === position.levelId)
+
+  if (!level) {
+    throw new Error('Level not found in LevelSummaryPageContainer')
+  }
+
+  level.stages.forEach((stage: G.Stage) => {
+    if (stage.id === position.stageId) {
+      stage.status = 'ACTIVE'
+    } else if (progress.stages[stage.id]) {
+      stage.status = 'COMPLETE'
+    } else {
+      stage.status = 'INCOMPLETE'
+    }
+  })
 
   return <LevelSummaryPage level={level} send={props.send} />
 }

web-app/src/containers/Tutorial/StagePage/index.tsx

@@ -5,47 +5,59 @@ import * as G from 'typings/graphql'
 import Stage from './Stage'
 
 interface PageProps {
-	context: CR.MachineContext
+  context: CR.MachineContext
   send(action: CR.Action): void
 }
 
 const StageSummaryPageContainer = (props: PageProps) => {
-	const { tutorial, position, progress } = props.context
+  const { tutorial, position, progress } = props.context
+
+  if (!tutorial) {
+    throw new Error('Tutorial not found in StageSummaryPageContainer')
+  }
+
+  const level: G.Level | undefined = tutorial.version.levels.find((l: G.Level) => l.id === position.levelId)
+
+  if (!level) {
+    throw new Error('Level not found in StageSummaryPageContainer')
+  }
+
+  const stage: G.Stage | undefined = level.stages.find((s: G.Stage) => s.id === position.stageId)
+
+  if (!stage) {
+    throw new Error('Stage not found in StageSummaryPageContainer')
+  }
 
-	const stage: G.Stage = tutorial.version
-		.levels.find((l: G.Level) => l.id === position.levelId)
-		.stages.find((s: G.Stage) => s.id === position.stageId)
-	
   const onContinue = (): void => {
     props.send({
-			type: 'STAGE_NEXT',
-			payload: {
-				stageId: position.stageId,
-			}
-		})
-	}
-	
-	const onSave =(): void => {
-		props.send({
-			type: 'TEST_RUN',
-			payload: {
-				stepId: position.stepId,
-			}
-		})
-	}
-
-	stage.steps.forEach((step: G.Step) => {
-		if (progress.steps[step.id]) {
-			step.status = 'COMPLETE'
-		} else if (step.id === position.stepId) {
-			step.status = 'ACTIVE'
-		} else {
-			step.status = 'INCOMPLETE'
-		}
-	})
-	stage.status = progress.stages[position.stageId] ? 'COMPLETE' : 'ACTIVE' 
-
-  return <Stage stage={stage} onContinue={onContinue} onSave={onSave}/>
+      type: 'STAGE_NEXT',
+      payload: {
+        stageId: position.stageId,
+      },
+    })
+  }
+
+  const onSave = (): void => {
+    props.send({
+      type: 'TEST_RUN',
+      payload: {
+        stepId: position.stepId,
+      },
+    })
+  }
+
+  stage.steps.forEach((step: G.Step) => {
+    if (progress.steps[step.id]) {
+      step.status = 'COMPLETE'
+    } else if (step.id === position.stepId) {
+      step.status = 'ACTIVE'
+    } else {
+      step.status = 'INCOMPLETE'
+    }
+  })
+  stage.status = progress.stages[position.stageId] ? 'COMPLETE' : 'ACTIVE'
+
+  return <Stage stage={stage} onContinue={onContinue} onSave={onSave} />
 }
 
 export default StageSummaryPageContainer

web-app/src/containers/Tutorial/SummaryPage/index.tsx

@@ -7,17 +7,21 @@ import Summary from './Summary'
 import ErrorView from '../../../components/Error'
 
 interface PageProps {
-	context: CR.MachineContext
-	send(action: CR.Action): void
+  context: CR.MachineContext
+  send(action: CR.Action): void
 }
 
 const SummaryPage = (props: PageProps) => {
-	const { tutorial } = props.context
+  const { tutorial } = props.context
+
+  if (!tutorial) {
+    throw new Error('Tutorial not found in summary page')
+  }
   const { loading, error, data } = useQuery(queryTutorial, {
-		fetchPolicy: 'network-only', // for debugging purposes
+    fetchPolicy: 'network-only', // for debugging purposes
     variables: {
-			tutorialId: tutorial.id,
-			version: tutorial.version.version,
+      tutorialId: tutorial.id,
+      version: tutorial.version.version,
     },
   })
 
@@ -29,14 +33,15 @@ const SummaryPage = (props: PageProps) => {
     return <ErrorView error={error} />
   }
 
-  const onNext = () => props.send({
-		type: 'LOAD_TUTORIAL',
-		payload: {
-			tutorial: data.tutorial,
-		}
-	})
+  const onNext = () =>
+    props.send({
+      type: 'LOAD_TUTORIAL',
+      payload: {
+        tutorial: data.tutorial,
+      },
+    })
 
-	const { title, text } = data.tutorial
+  const { title, text } = data.tutorial
 
   return <Summary title={title} text={text} onNext={onNext} />
 }

web-app/src/services/channel/index.ts

@@ -41,6 +41,12 @@ class Channel {
 				this.machineSend(action)
 				console.log('test passed')
 				return
+			case 'TEST_FAIL':
+				this.machineSend(action)
+				return
+			case 'ACTIONS_LOADED':
+				console.log('ACTIONS_LOADED')
+				return
 			default:
 				if (action.type) {
 					console.warn(`Unknown received action ${action.type}`, action)