refactor files

src/commands/tutorialLoad.ts

@@ -39,15 +39,6 @@ async function newTutorial(tutorial: CR.Tutorial) {
   await openReadme()
 }
 
-function onSaveHook(languageIds: string[]) {
-  // trigger command on save
-  vscode.workspace.onDidSaveTextDocument((document: vscode.TextDocument) => {
-    if (languageIds.includes(document.languageId) && document.uri.scheme === 'file') {
-      // do work
-      vscode.commands.executeCommand('coderoad.test_run')
-    }
-  })
-}
 
 async function validateCanContinue(): Promise<boolean> {
   // validate tutorial & progress found in local storage
@@ -127,7 +118,7 @@ export default async function tutorialLoad(context: vscode.ExtensionContext): Pr
   // }
 
   // // setup hook to run tests on save
-  // onSaveHook(tutorial.meta.languages)
+
 
   // TODO: start
 }

src/utils/fetch.ts → src/services/api/fetch.ts

@@ -1,7 +1,7 @@
 import * as CR from 'typings'
 
 // temporary tutorials
-import basicTutorial from '../state/context/tutorials/basic'
+import basicTutorial from '../../state/context/tutorials/basic'
 
 interface Options {
   resource: string

src/services/api/index.ts

@@ -0,0 +1,32 @@
+import * as CR from 'typings'
+
+// temporary tutorials
+import basicTutorial from '../../state/context/tutorials/basic'
+
+interface Options {
+  resource: string
+  params?: any
+}
+
+const tutorialsData: { [key: string]: CR.Tutorial } = {
+  tutorialId: basicTutorial,
+}
+
+// TODO: replace with fetch resource
+export default async function fetch(options: Options): Promise<any> {
+  console.log('options', options)
+  switch (options.resource) {
+    case 'getTutorialsSummary':
+      // list of ids with summaries
+      let data: { [id: string]: CR.TutorialSummary } = {}
+      for (const tutorial of Object.values(tutorialsData)) {
+        data[tutorial.id] = tutorial.data.summary
+      }
+      return data
+    case 'getTutorial':
+      // specific tutorial by id
+      return tutorialsData[options.params.id]
+    default:
+      throw new Error('Resource not found')
+  }
+}

src/services/git.ts → src/services/git/index.ts

@@ -1,5 +1,5 @@
 import * as CR from 'typings'
-import { exec, exists, openFile } from '../utils/node'
+import { exec, exists, openFile } from '../node'
 
 const gitOrigin = 'coderoad'
 

src/utils/node.ts → src/services/node/index.ts

@@ -37,3 +37,15 @@ export const openFile = async (relativeFilePath: string): Promise<void> => {
     console.log(`Failed to open file ${relativeFilePath}`, error)
   }
 }
+
+
+// export async function clear(): Promise<void> {
+//   // remove all files including ignored
+//   // NOTE: Linux only
+//   const command = 'ls -A1 | xargs rm -rf'
+//   const { stderr } = await exec(command)
+//   if (stderr) {
+//     console.error(stderr)
+//     throw new Error('Error removing all files & folders')
+//   }
+// }

src/services/position.ts

@@ -1,5 +1,5 @@
 import * as CR from 'typings'
-import * as storage from './storage'
+import * as storage from './vscode/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 '../utils/node'
-import { setStorage } from './storage'
+import { setWorkspaceRoot } from '../services/node'
+import { setStorage } from './vscode/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 './storage'
+import * as storage from './vscode/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/storage'
-import { isEmptyWorkspace } from '../utils/workspace'
+import * as storage from '../services/vscode/storage'
+import { isEmptyWorkspace } from '../services/vscode/workspace'
 import { gitLoadCommits, gitInitIfNotExists, gitSetupRemote } from '../services/git'
 
 const testRepo = 'https://github.com/ShMcK/coderoad-tutorial-basic.git'

src/services/vscode/index.ts

@@ -0,0 +1,10 @@
+import * as CR from 'typings'
+import onSaveHook from './save'
+
+const vscodeAction = (action: CR.Action) => {
+    switch (action.type) {
+        case 'ON_FILE_SAVE_RUN_TEST': {
+            onSaveHook(action.payload.languages)
+        }
+    }
+}

src/services/vscode/save.ts

@@ -0,0 +1,13 @@
+import * as vscode from 'vscode'
+
+function onSaveHook(languageIds: string[]) {
+    // trigger command on save
+    vscode.workspace.onDidSaveTextDocument((document: vscode.TextDocument) => {
+        if (languageIds.includes(document.languageId) && document.uri.scheme === 'file') {
+            // do work
+            vscode.commands.executeCommand('coderoad.test_run')
+        }
+    })
+}
+
+export default onSaveHook

src/utils/workspace.ts → src/services/vscode/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 '../node'
 
 export async function isEmptyWorkspace(): Promise<boolean> {
   const { stdout, stderr } = await exec('ls')