refactor files

src/commands/loadSolution.ts → src/editor/commands/loadSolution.ts

@@ -1,6 +1,6 @@
 import * as CR from 'typings'
-import * as storage from '../services/storage'
-import { gitLoadCommits, gitClear } from '../services/git'
+import * as storage from '../storage'
+import { gitLoadCommits, gitClear } from '../../services/git'
 
 export default async function loadSolution(): Promise<void> {
   const [position, tutorial]: [CR.Position, CR.Tutorial | undefined] = await Promise.all([

src/commands/runTest.ts → src/editor/commands/runTest.ts

@@ -1,7 +1,7 @@
-import { getOutputChannel } from '../utils/channel'
-import { exec } from '../utils/node'
-import * as storage from '../services/storage'
-import * as testResult from '../services/testResult'
+import { getOutputChannel } from '../channel'
+import { exec } from '../../services/node'
+import * as storage from '../storage'
+import * as testResult from '../../services/testResult'
 
 // ensure only latest run_test action is taken
 let currentId = 0

src/commands/tutorialLoad.ts → src/editor/commands/tutorialLoad.ts

@@ -1,13 +1,13 @@
 import * as vscode from 'vscode'
 import * as CR from 'typings'
 
-import fetch from '../utils/fetch'
-import tutorialSetup from '../services/tutorialSetup'
-import { loadProgressPosition } from '../services/position'
-import * as storage from '../services/storage'
-import rootSetup from '../services/rootSetup'
-import { isEmptyWorkspace, openReadme } from '../utils/workspace'
-import * as git from '../services/git'
+import api from '../../services/api'
+import tutorialSetup from '../../services/tutorialSetup'
+import { loadProgressPosition } from '../../services/position'
+import * as storage from '../storage'
+import rootSetup from '../../services/rootSetup'
+import { isEmptyWorkspace, openReadme } from '../workspace'
+import * as git from '../../services/git'
 
 /*
 new
@@ -78,7 +78,7 @@ export default async function tutorialLoad(context: vscode.ExtensionContext): Pr
   // }
 
   // // load tutorial summaries
-  // const tutorialsData: { [id: string]: CR.TutorialSummary } = await fetch({
+  // const tutorialsData: { [id: string]: CR.TutorialSummary } = await api({
   //   resource: 'getTutorialsSummary',
   // })
   // const selectableTutorials: TutorialQuickPickItem[] = Object.keys(tutorialsData).map(id => {

src/services/vscode/workspace.ts → src/editor/workspace.ts

@@ -1,7 +1,7 @@
 import * as fs from 'fs'
 import * as path from 'path'
 import * as vscode from 'vscode'
-import { exec, exists } from '../node'
+import { exec, exists } from '../services/node'
 
 export async function isEmptyWorkspace(): Promise<boolean> {
   const { stdout, stderr } = await exec('ls')

src/extension.ts

@@ -2,7 +2,7 @@
 // Import the module and reference it with the alias vscode in your code below
 import * as vscode from 'vscode'
 
-import createCommands from './commands'
+import createCommands from './editor/commands'
 import createViews from './views'
 
 // this method is called when your extension is activated

src/services/position.ts

@@ -1,5 +1,5 @@
 import * as CR from 'typings'
-import * as storage from './vscode/storage'
+import * as storage from '../editor/storage'
 
 export async function getInitial(tutorial: CR.Tutorial): Promise<CR.Position> {
   const { data } = tutorial

src/services/rootSetup.ts

@@ -1,6 +1,6 @@
 import * as vscode from 'vscode'
 import { setWorkspaceRoot } from '../services/node'
-import { setStorage } from './vscode/storage'
+import { setStorage } from '../editor/storage'
 
 export default async function setupRoot(context: vscode.ExtensionContext) {
   await setWorkspaceRoot()

src/services/testResult.ts

@@ -1,6 +1,6 @@
 import * as CR from 'typings'
 import * as vscode from 'vscode'
-import * as storage from './vscode/storage'
+import * as storage from '../editor/storage'
 
 
 export async function onSuccess(position: CR.Position) {

src/services/tutorialSetup.ts

@@ -1,7 +1,7 @@
 import * as CR from 'typings'
 import * as position from '../services/position'
-import * as storage from '../services/vscode/storage'
-import { isEmptyWorkspace } from '../services/vscode/workspace'
+import * as storage from '../editor/storage'
+import { isEmptyWorkspace } from '../editor/workspace'
 import { gitLoadCommits, gitInitIfNotExists, gitSetupRemote } from '../services/git'
 
 const testRepo = 'https://github.com/ShMcK/coderoad-tutorial-basic.git'

src/state/actions/index.ts

@@ -1,6 +1,6 @@
 import { assign, send } from 'xstate'
 import * as CR from 'typings'
-import * as storage from '../../services/storage'
+import * as storage from '../../editor/storage'
 import * as git from '../../services/git'
 
 let initialTutorial: CR.Tutorial | undefined