update typings

Author: ShMcK

src/actions/setupActions.ts

@@ -1,5 +1,4 @@
 import * as T from 'typings'
-import * as G from 'typings/graphql'
 import * as vscode from 'vscode'
 import * as git from '../services/git'
 import loadWatchers from './utils/loadWatchers'
@@ -8,7 +7,7 @@ import runCommands from './utils/runCommands'
 
 const setupActions = async (
   workspaceRoot: vscode.WorkspaceFolder,
-  actions: G.StepActions,
+  actions: T.StepActions,
   send: (action: T.Action) => void, // send messages to client
 ): Promise<void> => {
   const { commands, commits, files, watchers } = actions

src/actions/solutionActions.ts

@@ -1,12 +1,11 @@
 import * as T from 'typings'
-import * as G from 'typings/graphql'
 import * as vscode from 'vscode'
 import * as git from '../services/git'
 import setupActions from './setupActions'
 
 const solutionActions = async (
   workspaceRoot: vscode.WorkspaceFolder,
-  stepActions: G.StepActions,
+  stepActions: T.StepActions,
   send: (action: T.Action) => void,
 ): Promise<void> => {
   await git.clear()

src/actions/tutorialConfig.ts

@@ -6,7 +6,7 @@ import languageMap from '../editor/languageMap'
 import * as git from '../services/git'
 
 interface TutorialConfigParams {
-  config: G.TutorialConfig
+  config: T.TutorialConfig
   alreadyConfigured?: boolean
   onComplete?(): void
 }

src/channel/index.ts

@@ -96,7 +96,7 @@ class Channel implements Channel {
         if (!tutorialContinue) {
           throw new Error('Invalid tutorial to continue')
         }
-        const continueConfig: G.TutorialConfig = tutorialContinue.version.data.config
+        const continueConfig: T.TutorialConfig = tutorialContinue.version.data.config
         tutorialConfig(
           {
             config: continueConfig,

src/editor/commands.ts

@@ -1,4 +1,4 @@
-import * as G from 'typings/graphql'
+import * as T from 'typings'
 import * as vscode from 'vscode'
 import createTestRunner, { Payload } from '../services/testRunner'
 import createWebView from '../webview'
@@ -52,7 +52,7 @@ export const createCommands = ({ extensionPath, workspaceState, workspaceRoot }:
       // setup 1x1 horizontal layout
       webview.createOrShow()
     },
-    [COMMANDS.CONFIG_TEST_RUNNER]: (config: G.TutorialTestRunner) => {
+    [COMMANDS.CONFIG_TEST_RUNNER]: (config: T.TutorialTestRunner) => {
       testRunner = createTestRunner(config, {
         onSuccess: (payload: Payload) => {
           // send test pass message back to client

typings/graphql.d.ts

@@ -190,7 +190,7 @@ export type Tutorial = {
   __typename?: 'Tutorial'
   id: Scalars['ID']
   createdBy?: Maybe<User>
-  latestVersion: TutorialVersion
+  version: TutorialVersion
   versions?: Maybe<Array<TutorialVersion>>
   summary: TutorialSummary
 }
@@ -524,7 +524,7 @@ export type TutorialResolvers<
 > = {
   id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>
   createdBy?: Resolver<Maybe<ResolversTypes['User']>, ParentType, ContextType>
-  latestVersion?: Resolver<ResolversTypes['TutorialVersion'], ParentType, ContextType>
+  version?: Resolver<ResolversTypes['TutorialVersion'], ParentType, ContextType>
   versions?: Resolver<Maybe<Array<ResolversTypes['TutorialVersion']>>, ParentType, ContextType>
   summary?: Resolver<ResolversTypes['TutorialSummary'], ParentType, ContextType>
 }
@@ -615,9 +615,3 @@ export interface IntrospectionResultData {
     }[]
   }
 }
-const result: IntrospectionResultData = {
-  __schema: {
-    types: [],
-  },
-}
-export default result

typings/index.d.ts

@@ -115,3 +115,26 @@ export interface ProcessEvent {
   description: string
   status: 'RUNNING' | 'SUCCESS' | 'FAIL' | 'ERROR'
 }
+
+export interface StepActions {
+  id: string
+  commands: string[]
+  commits: string[]
+  files: string[]
+  watchers: string[]
+}
+
+export interface TutorialTestRunner {
+  command: string
+  fileFormats: string[]
+}
+
+export interface TutorialRepo {
+  uri: string
+  branch: string
+}
+
+export interface TutorialConfig {
+  testRunner: TutorialTestRunner
+  repo: TutorialRepo
+}