refactor editor actions

Author: ShMcK

lib/main.js

@@ -1,7 +1,7 @@
 "use strict";
 var render_1 = require('./components/render');
 var root_1 = require('./components/root');
-var polyfills_1 = require('./services/polyfills');
+var polyfills_1 = require('./polyfills');
 var subscriptions_1 = require('./subscriptions');
 var store_1 = require('./store');
 var actions_1 = require('./modules/setup/actions');

lib/modules/page/task-actions/handle-action-string.js

@@ -19,15 +19,15 @@ function handleActionString(actionString) {
                 var options = obj.options;
                 if (params.length === 1) {
                     store_1.default.dispatch(actions_1.editorOpen(file, options));
-                    setTimeout(function () { return resolve(); }, 100);
+                    resolve();
                 }
                 break;
             case Type.SET:
                 if (params.length === 1) {
                     var content_1 = params[0];
                     setTimeout(function () {
                         store_1.default.dispatch(actions_1.editorSet(content_1));
-                        resolve(true);
+                        resolve();
                     });
                 }
                 break;
@@ -36,7 +36,7 @@ function handleActionString(actionString) {
                     var content_2 = params[0];
                     setTimeout(function () {
                         store_1.default.dispatch(actions_1.editorInsert(content_2));
-                        resolve(true);
+                        resolve();
                     });
                 }
                 break;

lib/modules/page/task-actions/handle-actions.js

@@ -0,0 +1,12 @@
+"use strict";
+var handle_action_string_1 = require('./handle-action-string');
+function handleTaskActions(actions) {
+    var next = actions.shift();
+    if (next && next.length) {
+        next.reduce(function (total, curr) {
+            return total.then(function () { return handle_action_string_1.default(curr); });
+        }, Promise.resolve());
+    }
+}
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = handleTaskActions;

lib/modules/page/task-actions/index.js

@@ -1,15 +1,7 @@
 "use strict";
 var types_1 = require('../types');
-var handle_action_string_1 = require('./handle-action-string');
-function handleTaskActions(actions) {
-    var next = actions.shift();
-    if (next && next.length) {
-        next.reduce(function (total, curr) {
-            return total.then(function () { return handle_action_string_1.default(curr); });
-        }, Promise.resolve());
-    }
-}
-var taskTracker = 0;
+var handle_actions_1 = require('./handle-actions');
+var taskPositionTracker = 0;
 function taskActionsReducer(taskActions, action) {
     if (taskActions === void 0) { taskActions = []; }
     var actions = null;
@@ -25,18 +17,18 @@ function taskActionsReducer(taskActions, action) {
                     return task.actions.filter(function (a) { return !!a.match(/^open/); });
                 });
             }
-            taskTracker = 0;
-            handleTaskActions(actions);
+            taskPositionTracker = 0;
+            handle_actions_1.default(actions);
             return actions;
         case 'TEST_RESULT':
             actions = action.payload.taskActions || [];
             var nextTaskPosition = action.payload.result.taskPosition;
-            var times = nextTaskPosition - taskTracker;
+            var times = nextTaskPosition - taskPositionTracker;
             if (times > 0) {
                 for (var i = 0; i < times; i++) {
-                    handleTaskActions(actions);
+                    handle_actions_1.default(actions);
                 }
-                taskTracker = nextTaskPosition;
+                taskPositionTracker = nextTaskPosition;
             }
             return actions;
         default:

lib/modules/setup/utils/action-setup.js

@@ -1,6 +1,6 @@
 "use strict";
 var path_1 = require('path');
-var editor_1 = require('../../../modules/editor');
+var editor_1 = require('../../editor');
 var packageData = "{\n  \"name\": \"demo\",\n  \"dependencies\": {\n    \"coderoad-functional-school\": \"^0.2.2\"\n  }\n}";
 function createPackageJson(dir) {
     var packagePath = path_1.join(dir, 'package.json');

lib/services/polyfills.js renamed to lib/polyfills.js

@@ -42,7 +42,7 @@
     "highlights": "1.3.1",
     "marked": "0.3.5",
     "material-ui": "0.15.0",
-    "node-file-exists": "^1.0.0",
+    "node-file-exists": "1.1.0",
     "process-console-log": "^0.1.0",
     "react": "15.1.0",
     "react-dom": "15.1.0",

package.json

@@ -1,7 +1,7 @@
 import * as React from 'react';
 import render from './components/render';
 import Root from './components/root';
-import loadPolyfills from './services/polyfills';
+import loadPolyfills from './polyfills';
 import {onActivate, onDeactivate, addToStatusBar} from './subscriptions';
 // activate Redux
 import store from './store';
@@ -11,7 +11,7 @@ class Main {
   root: HTMLElement;
   statusBarTile: StatusBar.IStatusBarView;
   constructor() {
-    loadPolyfills(); // remove with Chrome 50
+    loadPolyfills();
     // run startup checks
     store.dispatch(setupVerify());
     this.root = Root.init();

src/main.ts

@@ -16,6 +16,7 @@ export default function handleActionString(
   return new Promise((resolve, reject) => {
     const command: string = getCommand(actionString);
     const params: string[] = getParams(actionString);
+
     switch (command) {
 
       case Type.OPEN:
@@ -24,7 +25,7 @@ export default function handleActionString(
         const options = obj.options;
         if (params.length === 1) {
           store.dispatch(editorOpen(file, options));
-          setTimeout(() => resolve(), 100);
+          resolve();
         }
         break;
 
@@ -33,7 +34,7 @@ export default function handleActionString(
           const content = params[0];
           setTimeout(() => {
             store.dispatch(editorSet(content));
-            resolve(true);
+            resolve();
           });
         }
         break;
@@ -43,7 +44,7 @@ export default function handleActionString(
           const content: string = params[0];
           setTimeout(() => {
             store.dispatch(editorInsert(content));
-            resolve(true);
+            resolve();
           });
         }
         break;

src/modules/page/task-actions/handle-action-string.ts

@@ -0,0 +1,11 @@
+import handleActionString from './handle-action-string';
+
+export default function handleTaskActions(actions: string[][]): void {
+  const next = actions.shift();
+  if (next && next.length) {
+    // resolve promises in order
+    next.reduce((total: Promise<any>, curr: string) => {
+      return total.then(() => handleActionString(curr));
+    }, Promise.resolve());
+  }
+}

src/modules/page/task-actions/handle-actions.ts

@@ -1,18 +1,8 @@
 import {PAGE_SET} from '../types';
-import handleActionString from './handle-action-string';
-
-function handleTaskActions(actions: string[][]): void {
-  const next = actions.shift();
-  if (next && next.length) {
-    // resolve promises in order
-    next.reduce((total: Promise<any>, curr: string) => {
-      return total.then(() => handleActionString(curr));
-    }, Promise.resolve());
-  }
-}
+import handleTaskActions from './handle-actions';
 
 // trigger actions only once, moving fowards
-let taskTracker = 0;
+let taskPositionTracker = 0;
 
 export default function taskActionsReducer(
   taskActions = [], action: Action
@@ -32,22 +22,21 @@ export default function taskActionsReducer(
           return task.actions.filter(a => !!a.match(/^open/));
         });
       }
-      taskTracker = 0;
+      taskPositionTracker = 0;
       handleTaskActions(actions); // run first action
       return actions;
 
     // run task actions
     case 'TEST_RESULT':
       actions = action.payload.taskActions || [];
       const nextTaskPosition = action.payload.result.taskPosition;
-      const times: number = nextTaskPosition - taskTracker;
-
+      const times: number = nextTaskPosition - taskPositionTracker;
       if (times > 0) {
         // run actions for each task position passed
         for (let i = 0; i < times; i++) {
           handleTaskActions(actions); // run first action
         }
-        taskTracker = nextTaskPosition;
+        taskPositionTracker = nextTaskPosition;
       }
       return actions;
 

src/modules/page/task-actions/index.ts

@@ -1,5 +1,5 @@
 import {join} from 'path';
-import {open, set, openFolder, openTerminal} from '../../../modules/editor';
+import {open, set, openFolder, openTerminal} from '../../editor';
 import {setupVerify} from '../actions';
 
 const packageData = `{

src/modules/setup/utils/action-setup.ts

@@ -12,7 +12,6 @@ export function searchForTutorials(dir: string, deps: Object): Tutorial.Info[] {
         const pathToTutorialPackageJson = join(
           dir, 'node_modules', name, 'package.json'
         );
-
         // no package.json
         if (!fileExists(pathToTutorialPackageJson)) {
           console.log(

src/modules/tutorials/utils/check.ts

@@ -83,6 +83,7 @@
         "src/modules/page/page-position/index.ts",
         "src/modules/page/page/index.ts",
         "src/modules/page/task-actions/handle-action-string.ts",
+        "src/modules/page/task-actions/handle-actions.ts",
         "src/modules/page/task-actions/index.ts",
         "src/modules/page/task-actions/parse-params.ts",
         "src/modules/page/task-actions/parser.ts",
@@ -135,8 +136,8 @@
         "src/modules/window/index.ts",
         "src/modules/window/reducer.ts",
         "src/modules/window/types.ts",
+        "src/polyfills.ts",
         "src/reducers.ts",
-        "src/services/polyfills.ts",
         "src/store.ts",
         "src/subscriptions.ts",
         "src/typings/atom-plugin-command-line/index.ts",