cleaner setup

Author: ShMcK

lib/_base.js

@@ -1,7 +1,5 @@
 "use strict";
 var store_1 = require('./store/store');
 exports.store = store_1.store;
-exports.initialState = store_1.initialState;
-exports.dispatch = store_1.dispatch;
 var reducer_1 = require('./reducers/reducer');
 exports.reducer = reducer_1.default;

lib/actions/actionTypes.js

@@ -1,6 +1,7 @@
 "use strict";
 exports.SET_PROJECT = 'SET_PROJECT';
 exports.VERIFY_SETUP = 'VERIFY_SETUP';
+exports.SET_GLOBALS = 'SET_GLOBALS';
 exports.LOAD_TUTORIALS = 'LOAD_TUTORIALS';
 exports.SET_ROUTE = 'SET_ROUTE';
 exports.SET_PAGE = 'SET_PAGE';

lib/actions/actions.js

@@ -6,6 +6,10 @@ function setProject() {
     return { type: Type.SET_PROJECT };
 }
 exports.setProject = setProject;
+function setGlobals(packageJson) {
+    return { type: Type.SET_GLOBALS, payload: { packageJson: packageJson } };
+}
+exports.setGlobals = setGlobals;
 function verifySetup() {
     return { type: Type.VERIFY_SETUP };
 }

lib/atom/editor.js

@@ -1,18 +1,6 @@
 "use strict";
 var fs = require('fs');
 var exists_1 = require('../services/exists');
-function setAtomGlobals() {
-    if (atom.project.rootDirectories.length > 0) {
-        window.coderoad.dir = atom.project.rootDirectories[0].path;
-        if (navigator.appVersion.indexOf('Win') > -1) {
-            window.coderoad.win = true;
-        }
-    }
-    else {
-        window.coderoad.dir = null;
-    }
-}
-exports.setAtomGlobals = setAtomGlobals;
 var getEditorCount = 0;
 function save() {
     var editor = findEditor();

lib/atom/main.js

@@ -2,17 +2,12 @@
 var render_1 = require('../components/render');
 var polyfills_1 = require('../services/polyfills');
 var subscriptions_1 = require('./subscriptions');
-var editor_1 = require('./editor');
-var store_1 = require('../store/store');
-var Action = require('../actions/actions');
 var Main = (function () {
     function Main() {
         window.coderoad = {
             dir: null
         };
         polyfills_1.default();
-        editor_1.setAtomGlobals();
-        store_1.store.dispatch(Action.verifySetup());
         this.root = render_1.initRoot();
     }
     Main.prototype.activate = function () {

lib/reducers/globals/globals.js

@@ -0,0 +1,18 @@
+"use strict";
+var Type = require('../../actions/actionTypes');
+var set_globals_1 = require('./set-globals');
+var defaultGlobals = {
+    dir: set_globals_1.setDir(),
+    win: set_globals_1.setWin()
+};
+function globalReducer(globals, action) {
+    if (globals === void 0) { globals = defaultGlobals; }
+    switch (action.type) {
+        case Type.SET_GLOBALS:
+            return Object.assign({}, set_globals_1.setGlobals(action.payload.packageJson), globals);
+        default:
+            return globals;
+    }
+}
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = globalReducer;

lib/services/set-globals.js renamed to lib/reducers/globals/set-globals.js

@@ -1,21 +1,34 @@
 "use strict";
 var path = require('path');
-var exists_1 = require('./exists');
-function setGlobals(config) {
+var exists_1 = require('../../services/exists');
+function setDir() {
+    if (atom.project.rootDirectories.length > 0) {
+        return atom.project.rootDirectories[0].path;
+    }
+    else {
+        return null;
+    }
+}
+exports.setDir = setDir;
+function setWin() {
+    return navigator.appVersion.indexOf('Win') > -1;
+}
+exports.setWin = setWin;
+function setGlobals(packageJson) {
     window.coderoad = Object.assign(window.coderoad, {
-        tutorial: config.name,
-        suffix: config.config.testSuffix.substring(config.config.testSuffix.lastIndexOf('.') + 1, config.config.testSuffix.length),
-        tutorialDir: path.join(window.coderoad.dir, 'node_modules', config.name, config.config.testDir),
-        testRunner: config.config.testRunner,
-        testRunnerOptions: config.config.testRunnerOptions || {}
+        tutorial: packageJson.name,
+        suffix: packageJson.config.testSuffix.substring(packageJson.config.testSuffix.lastIndexOf('.') + 1, packageJson.config.testSuffix.length),
+        tutorialDir: path.join(window.coderoad.dir, 'node_modules', packageJson.name, packageJson.config.testDir),
+        testRunner: packageJson.config.testRunner,
+        testRunnerOptions: packageJson.config.testRunnerOptions || {}
     });
-    loadRepo(config);
-    loadRunnerDep(config);
+    loadRepo(packageJson);
+    loadRunnerDep(packageJson);
 }
 exports.setGlobals = setGlobals;
-function loadRunnerDep(config) {
-    var flatDep = path.join(window.coderoad.dir, 'node_modules', config.config.testRunner, 'package.json');
-    var treeDep = path.join(window.coderoad.dir, 'node_modules', config.name, 'node_modules', config.config.testRunner, 'package.json');
+function loadRunnerDep(packageJson) {
+    var flatDep = path.join(window.coderoad.dir, 'node_modules', packageJson.config.testRunner, 'package.json');
+    var treeDep = path.join(window.coderoad.dir, 'node_modules', packageJson.name, 'node_modules', packageJson.config.testRunner, 'package.json');
     var runnerMain;
     var runnerRoot;
     if (exists_1.fileExists(flatDep)) {
@@ -42,16 +55,16 @@ function loadRunnerDep(config) {
         window.coderoad.runner = require(pathToMain);
     }
 }
-function loadRepo(config) {
-    if (config.bugs && config.bugs.url) {
-        window.coderoad.issuesPath = config.bugs.url;
+function loadRepo(packageJson) {
+    if (packageJson.bugs && packageJson.bugs.url) {
+        window.coderoad.issuesPath = packageJson.bugs.url;
     }
-    if (config.repo && config.repo.url) {
-        var repo = config.repo.url;
+    if (packageJson.repo && packageJson.repo.url) {
+        var repo = packageJson.repo.url;
         if (!!repo.match(/\.git$/)) {
             repo = repo.slice(0, repo.length - 4);
         }
         window.coderoad.repo = repo;
     }
-    window.coderoad.edit = config.config.edit && !!window.coderoad.repo || false;
+    window.coderoad.edit = packageJson.config.edit && !!window.coderoad.repo || false;
 }

lib/reducers/route/route.js

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

lib/reducers/warning/warning.js

@@ -1,6 +1,5 @@
 "use strict";
 var path = require('path');
-var set_globals_1 = require('./set-globals');
 var Action = require('../actions/actions');
 var _base_1 = require('../_base');
 var _ = require('lodash');
@@ -31,7 +30,7 @@ var PackageService = (function () {
     PackageService.prototype.selectPackage = function (packageName) {
         var packagePath = path.join(window.coderoad.dir, 'node_modules', packageName);
         this.config = require(path.join(packagePath, 'package.json'));
-        set_globals_1.setGlobals(this.config);
+        _base_1.store.dispatch(Action.setGlobals(this.config));
         this.data = require(path.join(packagePath, this.config.main));
         this.packageName = packageName;
     };