Nov 25, 2019 · Nov 24, 2019 · Nov 24, 2019 · Nov 24, 2019 · Nov 24, 2019 · Nov 25, 2019
diff --git a/src/actions/tutorialConfig.ts b/src/actions/tutorialConfig.ts
 import * as T from 'typings'
 import * as G from 'typings/graphql'
 import * as vscode from 'vscode'
 import * as git from '../services/git'
  onComplete?(): void
 }

 const tutorialConfig = async ({ config, alreadyConfigured }: TutorialConfigParams) => {
 const tutorialConfig = async (
  { config, alreadyConfigured }: TutorialConfigParams,
  onError: (msg: T.ErrorMessage) => void,
 ) => {
  if (!alreadyConfigured) {
    // setup git, add remote
    await git.initIfNotExists()
    await git.initIfNotExists().catch(error => {
      // failed to setup git
      onError({
        title: error.message,
        description:
          'Be sure you install Git. See the docs for help https://git-scm.com/book/en/v2/Getting-Started-Installing-Git',
      })
    })

    // TODO: if remote not already set
    await git.setupRemote(config.repo.uri)
    await git.setupRemote(config.repo.uri).catch(error => {
      onError({ title: error.message, description: 'Remove your current Git project and restarting' })
    })
  }

  vscode.commands.executeCommand(COMMANDS.CONFIG_TEST_RUNNER, config.testRunner)
diff --git a/src/actions/utils/runCommands.ts b/src/actions/utils/runCommands.ts
      send({ type: 'COMMAND_FAIL', payload: { process: { ...process, status: 'FAIL' } } })
      return
    }
    console.log(result.stdout)
    send({ type: 'COMMAND_SUCCESS', payload: { process: { ...process, status: 'SUCCESS' } } })
  }
 }
diff --git a/src/channel/index.ts b/src/channel/index.ts
 import * asCR from 'typings'
 import * asT from 'typings'
 import * as G from 'typings/graphql'
 import * as vscode from 'vscode'

 import { COMMANDS } from '../editor/commands'

 interface Channel {
  receive(action:CR.Action): Promise<void>
  send(action:CR.Action): Promise<void>
  receive(action:T.Action): Promise<void>
  send(action:T.Action): Promise<void>
 }

 interface ChannelProps {
  postMessage: (action:CR.Action) => Thenable<boolean>
  postMessage: (action:T.Action) => Thenable<boolean>
  workspaceState: vscode.Memento
  workspaceRoot: vscode.WorkspaceFolder
 }

 class Channel implements Channel {
  private postMessage: (action:CR.Action) => Thenable<boolean>
  private postMessage: (action:T.Action) => Thenable<boolean>
  private workspaceState: vscode.Memento
  private workspaceRoot: vscode.WorkspaceFolder
  private context: Context
  }

  // receive from webview
  public receive = async (action:CR.Action) => {
  public receive = async (action:T.Action) => {
    // action may be an object.type or plain string
    const actionType: string = typeof action === 'string' ? action : action.type
    const onError = (error: T.ErrorMessage) => this.send({ type: 'ERROR', payload: { error } })

    // console.log('EDITOR RECEIVED:', actionType)
    switch (actionType) {
      case 'ENV_GET':
        this.send({

        const data: G.TutorialData = tutorialData.version.data

        await tutorialConfig({ config: data.config })
        await tutorialConfig({ config: data.config }, onError)

        // run init setup actions
        if (data.init) {
          throw new Error('Invalid tutorial to continue')
        }
        const continueConfig: G.TutorialConfig = tutorialContinue.version.data.config
        tutorialConfig({
          config: continueConfig,
          alreadyConfigured: true,
        })
        tutorialConfig(
          {
            config: continueConfig,
            alreadyConfigured: true,
          },
          onError,
        )
        return
      case 'EDITOR_SYNC_PROGRESS':
        // sync client progress on server
    }
  }
  // send to webview
  public send = async (action: CR.Action) => {
    console.log(`EDITOR SEND ${action.type}`)
  public send = async (action: T.Action) => {
    // action may be an object.type or plain string
    const actionType: string = typeof action === 'string' ? action : action.type
    switch (actionType) {
diff --git a/src/editor/ReactWebView.ts b/src/editor/ReactWebView.ts
diff --git a/src/editor/commands.ts b/src/editor/commands.ts
 import * as G from 'typings/graphql'
 import * as vscode from 'vscode'
 importReactWebView from './ReactWebView'
 importcreateWebView from '../webview'
 import createTestRunner, { Payload } from '../services/testRunner'

 export const COMMANDS = {
      }

      // activate machine
      webview =new ReactWebView({
      webview =createWebView({
        extensionPath,
        workspaceState,
        workspaceRoot,
diff --git a/src/services/git/index.ts b/src/services/git/index.ts
 async function init(): Promise<void> {
  const { stderr } = await node.exec('git init')
  if (stderr) {
    throw new Error('Error initializingGits')
    throw new Error('Error initializingGit')
  }
 }

  // git fetch coderoad
  if (!hasRemote) {
    await addRemote(repo)
  } else {
    throw new Error('A Remote is already configured')
  }
 }
Original file line number	Diff line number	Diff line change
		@@ -1,3 +1,4 @@
		import * as T from 'typings'
		import * as G from 'typings/graphql'
		import * as vscode from 'vscode'
		import * as git from '../services/git'
Expand All		@@ -10,13 +11,25 @@ interface TutorialConfigParams {
		onComplete?(): void
		}

		const tutorialConfig = async ({ config, alreadyConfigured }: TutorialConfigParams) => {
		const tutorialConfig = async (
		{ config, alreadyConfigured }: TutorialConfigParams,
		onError: (msg: T.ErrorMessage) => void,
		) => {
		if (!alreadyConfigured) {
		// setup git, add remote
		await git.initIfNotExists()
		await git.initIfNotExists().catch(error => {
		// failed to setup git
		onError({
		title: error.message,
		description:
		'Be sure you install Git. See the docs for help https://git-scm.com/book/en/v2/Getting-Started-Installing-Git',
		})
		})

		// TODO: if remote not already set
		await git.setupRemote(config.repo.uri)
		await git.setupRemote(config.repo.uri).catch(error => {
		onError({ title: error.message, description: 'Remove your current Git project and restarting' })
		})
		}

		vscode.commands.executeCommand(COMMANDS.CONFIG_TEST_RUNNER, config.testRunner)
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -19,7 +19,6 @@ const runCommands = async (commands: string[], send: (action: T.Action) => void)
		send({ type: 'COMMAND_FAIL', payload: { process: { ...process, status: 'FAIL' } } })
		return
		}
		console.log(result.stdout)
		send({ type: 'COMMAND_SUCCESS', payload: { process: { ...process, status: 'SUCCESS' } } })
		}
		}
Expand Down
Original file line number	Diff line number	Diff line change
		@@ -1,4 +1,4 @@
		import * asCR from 'typings'
		import * asT from 'typings'
		import * as G from 'typings/graphql'
		import * as vscode from 'vscode'

Expand All		@@ -10,18 +10,18 @@ import saveCommit from '../actions/saveCommit'
		import { COMMANDS } from '../editor/commands'

		interface Channel {
		receive(action:CR.Action): Promise<void>
		send(action:CR.Action): Promise<void>
		receive(action:T.Action): Promise<void>
		send(action:T.Action): Promise<void>
		}

		interface ChannelProps {
		postMessage: (action:CR.Action) => Thenable<boolean>
		postMessage: (action:T.Action) => Thenable<boolean>
		workspaceState: vscode.Memento
		workspaceRoot: vscode.WorkspaceFolder
		}

		class Channel implements Channel {
		private postMessage: (action:CR.Action) => Thenable<boolean>
		private postMessage: (action:T.Action) => Thenable<boolean>
		private workspaceState: vscode.Memento
		private workspaceRoot: vscode.WorkspaceFolder
		private context: Context
Expand All		@@ -34,11 +34,11 @@ class Channel implements Channel {
		}

		// receive from webview
		public receive = async (action:CR.Action) => {
		public receive = async (action:T.Action) => {
		// action may be an object.type or plain string
		const actionType: string = typeof action === 'string' ? action : action.type
		const onError = (error: T.ErrorMessage) => this.send({ type: 'ERROR', payload: { error } })

		// console.log('EDITOR RECEIVED:', actionType)
		switch (actionType) {
		case 'ENV_GET':
		this.send({
Expand DownExpand Up		@@ -87,7 +87,7 @@ class Channel implements Channel {

		const data: G.TutorialData = tutorialData.version.data

		await tutorialConfig({ config: data.config })
		await tutorialConfig({ config: data.config }, onError)

		// run init setup actions
		if (data.init) {
Expand All		@@ -106,10 +106,13 @@ class Channel implements Channel {
		throw new Error('Invalid tutorial to continue')
		}
		const continueConfig: G.TutorialConfig = tutorialContinue.version.data.config
		tutorialConfig({
		config: continueConfig,
		alreadyConfigured: true,
		})
		tutorialConfig(
		{
		config: continueConfig,
		alreadyConfigured: true,
		},
		onError,
		)
		return
		case 'EDITOR_SYNC_PROGRESS':
		// sync client progress on server
Expand All		@@ -134,8 +137,7 @@ class Channel implements Channel {
		}
		}
		// send to webview
		public send = async (action: CR.Action) => {
		console.log(`EDITOR SEND ${action.type}`)
		public send = async (action: T.Action) => {
		// action may be an object.type or plain string
		const actionType: string = typeof action === 'string' ? action : action.type
		switch (actionType) {
Expand Down
Original file line number	Diff line number	Diff line change
		@@ -1,6 +1,6 @@
		import * as G from 'typings/graphql'
		import * as vscode from 'vscode'
		importReactWebView from './ReactWebView'
		importcreateWebView from '../webview'
		import createTestRunner, { Payload } from '../services/testRunner'

		export const COMMANDS = {
Expand DownExpand Up		@@ -41,7 +41,7 @@ export const createCommands = ({ extensionPath, workspaceState, workspaceRoot }:
		}

		// activate machine
		webview =new ReactWebView({
		webview =createWebView({
		extensionPath,
		workspaceState,
		workspaceRoot,
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -81,7 +81,7 @@ export async function version(): Promise<string \| boolean> {
		async function init(): Promise<void> {
		const { stderr } = await node.exec('git init')
		if (stderr) {
		throw new Error('Error initializingGits')
		throw new Error('Error initializingGit')
		}
		}

Expand DownExpand Up		@@ -133,5 +133,7 @@ export async function setupRemote(repo: string): Promise<void> {
		// git fetch coderoad
		if (!hasRemote) {
		await addRemote(repo)
		} else {
		throw new Error('A Remote is already configured')
		}
		}