various fixes, minor

Author: ShMcK

lib/reducers/checks/action-setup.js

@@ -1,12 +1,12 @@
 "use strict";
-var path = require('path');
+var path_1 = require('path');
 var editor_1 = require('../../atom/editor');
 var actions_1 = require('../../atom/actions');
 var store_1 = require('../../store/store');
 var actions_2 = require('../../actions/actions');
 var packageData = "{\n  \"name\": \"demo\",\n  \"dependencies\": {\n    \"coderoad-functional-school\": \"^0.2.1\"\n  }\n}";
 function createPackageJson() {
-    var packagePath = path.join(window.coderoad.dir, 'package.json');
+    var packagePath = path_1.join(window.coderoad.dir, 'package.json');
     return new Promise(function (resolve, reject) {
         editor_1.open(packagePath);
         setTimeout(function () {

lib/reducers/editor-actions/action-helpers.js

@@ -11,13 +11,14 @@ function getCommand(actionString) {
 }
 exports.getCommand = getCommand;
 function getParams(actionString) {
+    var parser = new parser_1.ParseParams;
     var command = getCommand(actionString);
     var params = actionString.substring(command.length + 1, actionString.length - 1);
     if (!params.length) {
         console.error('Error loading editor action params ', actionString);
         return null;
     }
-    var paramsList = parser_1.parseParams.getParams(params);
+    var paramsList = parser.getParams(params);
     return paramsList;
 }
 exports.getParams = getParams;

lib/reducers/editor-actions/actions.js

@@ -1,5 +1,5 @@
 "use strict";
-var Editor = require('../../atom/editor');
+var editor_1 = require('../../atom/editor');
 var actions_1 = require('../../atom/actions');
 var action_helpers_1 = require('./action-helpers');
 var Type = {
@@ -18,7 +18,7 @@ function editorActions(actionString) {
                 var file = obj.param;
                 var options = obj.options;
                 if (params.length === 1) {
-                    Editor.open(file, options);
+                    editor_1.open(file, options);
                     setTimeout(function () {
                         resolve();
                     }, 100);
@@ -28,7 +28,7 @@ function editorActions(actionString) {
                 if (params.length === 1) {
                     var content_1 = params[0];
                     setTimeout(function () {
-                        Editor.set(content_1);
+                        editor_1.set(content_1);
                         resolve(true);
                     });
                 }
@@ -37,7 +37,7 @@ function editorActions(actionString) {
                 if (params.length === 1) {
                     var content_2 = params[0];
                     setTimeout(function () {
-                        Editor.insert(content_2, {});
+                        editor_1.insert(content_2, {});
                         resolve(true);
                     });
                 }

lib/reducers/editor-actions/editor-actions.js

@@ -1,5 +1,5 @@
 "use strict";
-var Type = require('../../actions/actionTypes');
+var actionTypes_1 = require('../../actions/actionTypes');
 var times = require('lodash').times;
 var actions_1 = require('./actions');
 function handleEditorActions(actionArray) {
@@ -12,12 +12,12 @@ var actions;
 function editorActionsReducer(editorActions, action) {
     if (editorActions === void 0) { editorActions = []; }
     switch (action.type) {
-        case Type.SET_PAGE:
+        case actionTypes_1.SET_PAGE:
             actions = action.payload.actions;
             currentTaskPosition = 0;
             handleEditorActions(actions.shift());
             return actions;
-        case Type.TEST_RESULT:
+        case actionTypes_1.TEST_RESULT:
             actions = action.payload.actions;
             var nextTaskPosition = action.payload.result.taskPosition;
             if (nextTaskPosition > currentTaskPosition) {

lib/reducers/editor-actions/parser.js

@@ -1,14 +1,17 @@
 "use strict";
-exports.parseParams = {
-    trim: function (text) {
+var ParseParams = (function () {
+    function ParseParams() {
+        this.reset();
+    }
+    ParseParams.prototype.trim = function (text) {
         text = text.trim();
         var firstBracket = text.charAt(0).match(/["']/);
         if (firstBracket && !!text.charAt(text.length - 1).match(firstBracket[0])) {
             text = text.substring(1, text.length - 1);
         }
         return text;
-    },
-    addBreak: function (char, index) {
+    };
+    ParseParams.prototype.addBreak = function (char, index) {
         switch (char) {
             case '(':
                 this.round += 1;
@@ -39,19 +42,22 @@ exports.parseParams = {
         else {
             this.current += char;
         }
-    },
-    getParams: function (text) {
+    };
+    ParseParams.prototype.getParams = function (text) {
         this.reset();
         for (var i = 0; i < text.length; i++) {
             this.addBreak(text[i], i);
         }
         return this.params.concat(this.trim(this.current));
-    },
-    reset: function () {
+    };
+    ParseParams.prototype.reset = function () {
         this.round = 0;
         this.square = 0;
         this.curly = 0;
         this.current = '';
         this.params = [];
-    }
-};
+    };
+    return ParseParams;
+}());
+exports.ParseParams = ParseParams;
+;

lib/reducers/route/route.js

@@ -1,6 +1,6 @@
 "use strict";
 var actionTypes_1 = require('../../actions/actionTypes');
-var defaultRoute = 'tutorials';
+var defaultRoute = 'start';
 function routeReducer(route, action) {
     if (route === void 0) { route = defaultRoute; }
     switch (action.type) {

lib/reducers/tutorials/update-tutorial.js

@@ -2,19 +2,6 @@
 var command_line_1 = require('../../services/command-line');
 var store_1 = require('../../store/store');
 var actions_1 = require('../../actions/actions');
-function canUpdateTutorial(name, currentVersion) {
-    return (command_line_1.default('npm', "outdated " + name)
-        .then(function (res) {
-        if (res.length > 0) {
-            var match = res.match(/[0-9\.]+\s+[0-9\.]+\s+([0-9\.]+)/);
-            if (match.length >= 2) {
-                return match[1];
-            }
-        }
-        return null;
-    }));
-}
-exports.canUpdateTutorial = canUpdateTutorial;
 function updateTutorial(name) {
     command_line_1.default('npm', "install --save-dev " + name)
         .then(function () {

lib/services/exists.js

@@ -1,8 +1,8 @@
 "use strict";
-var fs = require('fs');
+var fs_1 = require('fs');
 function fileExists(pathToFile) {
     try {
-        fs.accessSync(pathToFile, fs.F_OK);
+        fs_1.accessSync(pathToFile, fs_1.F_OK);
     }
     catch (e) {
         if (e) {

lib/services/package.js

@@ -25,25 +25,25 @@ var PackageService = (function () {
             project: {},
             chapters: []
         };
-        this.config = {};
+        this.packageJson = null;
     }
     PackageService.prototype.selectPackage = function (packageName) {
         var packagePath = path_1.join(window.coderoad.dir, 'node_modules', packageName);
-        this.config = require(path_1.join(packagePath, 'package.json'));
-        store_1.store.dispatch(actions_1.setGlobals(this.config));
-        this.data = require(path_1.join(packagePath, this.config.main));
+        this.packageJson = require(path_1.join(packagePath, 'package.json'));
+        store_1.store.dispatch(actions_1.setGlobals(this.packageJson));
+        this.data = require(path_1.join(packagePath, this.packageJson.main));
         this.packageName = packageName;
     };
     PackageService.prototype.page = function (_a) {
         var chapter = _a.chapter, page = _a.page;
         return cloneDeep(this.data.chapters[chapter].pages[page]);
     };
-    PackageService.prototype.getConfig = function () {
-        return this.config;
+    PackageService.prototype.getPackage = function () {
+        return this.packageJson;
     };
     PackageService.prototype.configTaskTests = function (tasks) {
         var _this = this;
-        var config = this.config.config;
+        var config = this.packageJson.config;
         return !tasks ? [] : tasks.map(function (task) {
             if (task.tests) {
                 task.tests = task.tests.map(function (test) {

src/reducers/checks/action-setup.ts

@@ -1,4 +1,4 @@
-import * as path from 'path';
+import {join} from 'path';
 import {open, set} from '../../atom/editor';
 import {openFolder, openTerminal} from '../../atom/actions';
 import commandLine from '../../services/command-line';
@@ -13,7 +13,7 @@ const packageData = `{
 }`;
 
 export function createPackageJson(): Promise<void> {
-  const packagePath = path.join(window.coderoad.dir, 'package.json');
+  const packagePath = join(window.coderoad.dir, 'package.json');
   return new Promise((resolve, reject) => {
     open(packagePath);
     setTimeout(function() {