Aug 3, 2020 · Aug 2, 2020 · Aug 2, 2020
diff --git a/src/actions/onRunReset.ts b/src/actions/onRunReset.ts
 import Context from '../services/context/context'
 import { exec } from '../services/node'
 import reset from '../services/reset'
 import * as hooks from '../services/hooks'
 import getCommitHashByPosition from '../services/reset/lastHash'

 type ResetAction = {
  reset({ branch, hash })

  // if tutorial.config.reset.command, run it
  if (tutorial?.config?.reset?.command) {
    await exec({ command: tutorial.config.reset.command })
  const resetActions = tutorial?.config?.reset
  if (resetActions) {
    hooks.onReset({ commands: resetActions?.commands, vscodeCommands: resetActions?.vscodeCommands })
  }
 }

diff --git a/src/commands.ts b/src/commands.ts
 import * as vscode from 'vscode'
 import createTestRunner from './services/testRunner'
 import createWebView from './services/webview'
 import logger from './services/logger'
 import * as hooks from './services/hooks'
 import logger from './services/logger'

 export const COMMANDS = {
  START: 'coderoad.start',
diff --git a/src/services/hooks/index.ts b/src/services/hooks/index.ts
  await onRunTest()
 }

 export const onReset = async (actions: TT.StepActions): Promise<void> => {
  await runCommands(actions?.commands)
  await runVSCodeCommands(actions?.vscodeCommands)
 }

 export const onError = async (error: Error): Promise<void> => {
  telemetryOnError(error)
 }
diff --git a/src/services/hooks/utils/loadCommits.ts b/src/services/hooks/utils/loadCommits.ts
 import * as git from '../../git'

 const loadCommits = async (commits: string[]): Promise<void> => {
  if (commits) {
 const loadCommits = async (commits: string[] = []): Promise<void> => {
  if (commits && commits.length) {
    // load the current list of commits for validation
    for (const commit of commits) {
      await git.loadCommit(commit)
diff --git a/src/services/reset/lastHash.ts b/src/services/reset/lastHash.ts
  if (!step) {
    throw new Error(`No step found matching ${stepId}`)
  }
  const commits = step.setup.commits
  const commits = step.setup?.commits || []
  if (!commits.length) {
    throw new Error(`No commits found on step ${stepId}`)
  }
diff --git a/typings/tutorial.d.ts b/typings/tutorial.d.ts
 export type Maybe<T> = T | null

 export type ConfigReset = {
  command?: string
  commands?: string[]
  vscodeCommands?: VSCodeCommand[]
 }

 export type TutorialConfig = {

 export type StepActions = {
  commands?: string[]
  commits: string[]
  commits?: string[]
  files?: string[]
  watchers?: string[]
  filter?: string
Original file line number	Diff line number	Diff line change
Expand Up		@@ -3,6 +3,7 @@ import * as TT from 'typings/tutorial'
		import Context from '../services/context/context'
		import { exec } from '../services/node'
		import reset from '../services/reset'
		import * as hooks from '../services/hooks'
		import getCommitHashByPosition from '../services/reset/lastHash'

		type ResetAction = {
Expand DownExpand Up		@@ -30,8 +31,9 @@ const onRunReset = async (action: ResetAction, context: Context): Promise<void>
		reset({ branch, hash })

		// if tutorial.config.reset.command, run it
		if (tutorial?.config?.reset?.command) {
		await exec({ command: tutorial.config.reset.command })
		const resetActions = tutorial?.config?.reset
		if (resetActions) {
		hooks.onReset({ commands: resetActions?.commands, vscodeCommands: resetActions?.vscodeCommands })
		}
		}

Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -3,8 +3,8 @@ import * as TT from 'typings/tutorial'
		import * as vscode from 'vscode'
		import createTestRunner from './services/testRunner'
		import createWebView from './services/webview'
		import logger from './services/logger'
		import * as hooks from './services/hooks'
		import logger from './services/logger'

		export const COMMANDS = {
		START: 'coderoad.start',
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -38,6 +38,11 @@ export const onSolutionEnter = async (actions: TT.StepActions): Promise<void> =>
		await onRunTest()
		}

		export const onReset = async (actions: TT.StepActions): Promise<void> => {
		await runCommands(actions?.commands)
		await runVSCodeCommands(actions?.vscodeCommands)
		}

		export const onError = async (error: Error): Promise<void> => {
		telemetryOnError(error)
		}
Expand Down
Original file line number	Diff line number	Diff line change
		@@ -1,7 +1,7 @@
		import * as git from '../../git'

		const loadCommits = async (commits: string[]): Promise<void> => {
		if (commits) {
		const loadCommits = async (commits: string[] = []): Promise<void> => {
		if (commits && commits.length) {
		// load the current list of commits for validation
		for (const commit of commits) {
		await git.loadCommit(commit)
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -41,7 +41,7 @@ const getLastCommitHash = (position: T.Position, tutorial: TT.Tutorial \| null):
		if (!step) {
		throw new Error(`No step found matching ${stepId}`)
		}
		const commits = step.setup.commits
		const commits = step.setup?.commits \|\| []
		if (!commits.length) {
		throw new Error(`No commits found on step ${stepId}`)
		}
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -3,7 +3,8 @@ import { ProgressStatus } from './index'
		export type Maybe<T> = T \| null

		export type ConfigReset = {
		command?: string
		commands?: string[]
		vscodeCommands?: VSCodeCommand[]
		}

		export type TutorialConfig = {
Expand DownExpand Up		@@ -57,7 +58,7 @@ export type TutorialSummary = {

		export type StepActions = {
		commands?: string[]
		commits: string[]
		commits?: string[]
		files?: string[]
		watchers?: string[]
		filter?: string
Expand Down