refactor into package-json reducer

Author: ShMcK

lib/actions.js

@@ -3,7 +3,6 @@ var actions_1 = require('./modules/page/actions');
 exports.pageSet = actions_1.pageSet;
 exports.pageNext = actions_1.pageNext;
 var package_json_1 = require('./modules/package-json');
-exports.tutorialInfoSave = package_json_1.tutorialInfoSave;
 exports.tutorialConfigSave = package_json_1.tutorialConfigSave;
 var setup_1 = require('./modules/setup');
 exports.setupVerify = setup_1.setupVerify;

lib/components/TutorialConfig/index.js

@@ -15,6 +15,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 var React = require('react');
 var react_redux_1 = require('react-redux');
+var path_1 = require('path');
 var TextField_1 = require('material-ui/TextField');
 var SelectField_1 = require('material-ui/SelectField');
 var Card_1 = require('material-ui/Card');
@@ -23,18 +24,22 @@ var actions_1 = require('../../actions');
 var languageItems_1 = require('./languageItems');
 var runnerItems_1 = require('./runnerItems');
 var styles = {
-    margin: '10px',
-    padding: '30px 20px',
-    textAlign: 'center',
-};
-var buttonStyles = {
-    margin: '30px 10px 20px 10px',
+    card: {
+        margin: '10px',
+        padding: '30px 20px',
+        textAlign: 'center',
+    },
+    button: {
+        margin: '30px 10px 20px 10px',
+    },
 };
 var TutorialConfig = (function (_super) {
     __extends(TutorialConfig, _super);
     function TutorialConfig(props) {
         _super.call(this, props);
-        this.state = this.props.packageJson;
+        this.state = {
+            pj: this.props.packageJson
+        };
     }
     TutorialConfig.prototype.handleText = function (prop, event) {
         this.handleChange(prop, event.target.value);
@@ -48,12 +53,13 @@ var TutorialConfig = (function (_super) {
         var target = null;
         switch (prop) {
             case 'name':
-                this.setState(Object.assign({}, this.state, obj));
+                this.setState({ pj: Object.assign({}, this.state.pj, obj) });
                 break;
             case 'language':
             case 'runner':
-                var config = Object.assign({}, this.state.config, obj);
-                this.setState(Object.assign({}, this.state, { config: config }));
+                var config = Object.assign({}, this.state.pj.config, obj);
+                var pj = Object.assign({}, this.state.pj, { config: config });
+                this.setState({ pj: pj });
                 return;
             case 'repo':
                 var repo = {
@@ -62,24 +68,25 @@ var TutorialConfig = (function (_super) {
                         url: prop
                     },
                     bugs: {
-                        url: prop + '/issues'
+                        url: path_1.resolve(prop, 'issues')
                     }
                 };
-                this.setState(Object.assign({}, this.state, repo));
+                this.setState({ pj: Object.assign({}, this.state.pj, repo) });
                 return;
         }
     };
     TutorialConfig.prototype.save = function () {
-        this.props.save(this.state);
+        this.props.save(this.state.pj);
     };
     TutorialConfig.prototype.render = function () {
-        return (React.createElement(Card_1.Card, {style: styles}, React.createElement(Card_1.CardHeader, {title: 'Tutorial Configuration'}), React.createElement(TextField_1.default, {floatingLabelText: 'Tutorial Package Name', defaultValue: this.state.name, onChange: this.handleText.bind(this, 'name')}), React.createElement("br", null), React.createElement(SelectField_1.default, {floatingLabelText: 'Language', value: this.state.config.language, onChange: this.handleSelect.bind(this, 'language')}, languageItems_1.default()), React.createElement("br", null), React.createElement(SelectField_1.default, {floatingLabelText: 'Test Runner', value: this.state.config.runner, onChange: this.handleSelect.bind(this, 'runner')}, runnerItems_1.default(this.state.config.language)), React.createElement("br", null), React.createElement(RaisedButton_1.default, {style: buttonStyles, label: 'Save', primary: true, onTouchTap: this.save.bind(this)}), React.createElement(RaisedButton_1.default, {style: buttonStyles, label: 'Continue', secondary: true, onTouchTap: this.props.routeToInfo.bind(this)})));
+        var pj = this.state.pj;
+        return (React.createElement(Card_1.Card, {style: styles.card}, React.createElement(Card_1.CardHeader, {title: 'Tutorial Configuration'}), React.createElement(TextField_1.default, {floatingLabelText: 'Tutorial Package Name', defaultValue: pj.name, onChange: this.handleText.bind(this, 'name')}), React.createElement("br", null), React.createElement(SelectField_1.default, {floatingLabelText: 'Language', value: pj.config.language, onChange: this.handleSelect.bind(this, 'language')}, languageItems_1.default()), React.createElement("br", null), React.createElement(SelectField_1.default, {floatingLabelText: 'Test Runner', value: pj.config.runner, onChange: this.handleSelect.bind(this, 'runner')}, runnerItems_1.default(pj.config.language)), React.createElement("br", null), React.createElement(RaisedButton_1.default, {style: styles.button, label: 'Save', primary: true, onTouchTap: this.save.bind(this)}), React.createElement(RaisedButton_1.default, {style: styles.button, label: 'Continue', secondary: true, onTouchTap: this.props.routeToInfo.bind(this)})));
     };
     TutorialConfig = __decorate([
         react_redux_1.connect(null, function (dispatch) {
             return {
-                save: function (config) { return dispatch(actions_1.tutorialConfigSave(config)); },
-                routeToInfo: function () { return dispatch(actions_1.routeSet('tutorialInfo')); }
+                save: function (pj) { return dispatch(actions_1.tutorialConfigSave(pj)); },
+                routeToPage: function () { return dispatch(actions_1.routeSet('page')); }
             };
         }), 
         __metadata('design:paramtypes', [Object])

lib/modules/package-json/actions.js

@@ -1,13 +1,9 @@
 "use strict";
 var types_1 = require('./types');
-function tutorialConfigSave(config) {
+function tutorialConfigSave(pj) {
     return function (dispatch, getState) {
         var dir = getState().dir;
-        dispatch({ type: types_1.TUTORIAL_CONFIG_SAVE, payload: { config: config, dir: dir } });
+        dispatch({ type: types_1.PJ_SAVE, payload: { pj: pj, dir: dir } });
     };
 }
 exports.tutorialConfigSave = tutorialConfigSave;
-function tutorialInfoSave(info) {
-    return { type: types_1.TUTORIAL_INFO_SAVE, payload: { info: info } };
-}
-exports.tutorialInfoSave = tutorialInfoSave;

lib/modules/package-json/index.js

@@ -1,6 +1,5 @@
 "use strict";
 var actions_1 = require('./actions');
 exports.tutorialConfigSave = actions_1.tutorialConfigSave;
-exports.tutorialInfoSave = actions_1.tutorialInfoSave;
 var reducer_1 = require('./reducer');
 exports.reducer = reducer_1.default;

lib/modules/package-json/reducer.js

@@ -1,33 +1,39 @@
 "use strict";
 var types_1 = require('./types');
 var packageJson_1 = require('./utils/packageJson');
-var _config = {
+var sort_package_json_1 = require('sort-package-json');
+var _pj = {
     name: 'coderoad-',
     version: '0.1.0',
+    author: '',
     description: '',
+    main: 'coderoad.json',
+    files: ['coderoad.json', 'tutorial'],
     keywords: ['coderoad', 'tutorial'],
     config: {
         language: 'JS',
         runner: 'mocha-coderoad',
         runnerOptions: {}
+    },
+    engines: {
+        node: '>=0.10.3'
     }
 };
 var defaultPJ = {};
-function tutorialConfig(c, action) {
-    if (c === void 0) { c = _config; }
+function tutorialConfig(p, action) {
+    if (p === void 0) { p = _pj; }
     switch (action.type) {
-        case types_1.TUTORIAL_CONFIG_SAVE:
-            var _a = action.payload, config = _a.config, dir = _a.dir;
-            var pj = packageJson_1.readPackageJson(dir);
-            var content = !!pj
-                ? Object.assign({}, pj, config)
-                : config;
+        case types_1.PJ_SAVE:
+            var _a = action.payload, pj = _a.pj, dir = _a.dir;
+            var pjExists = packageJson_1.readPackageJson(dir);
+            var nextPj = !!pjExists
+                ? Object.assign({}, pjExists, pj)
+                : pj;
+            var content = sort_package_json_1.sortPackageJson(JSON.stringify(nextPj, null, 2));
             packageJson_1.writePackageJson(dir, content);
-            return action.payload.config;
-        case types_1.TUTORIAL_INFO_SAVE:
-            return action.payload.info;
+            return nextPj;
         default:
-            return c;
+            return p;
     }
 }
 Object.defineProperty(exports, "__esModule", { value: true });

lib/modules/package-json/types.js

@@ -1,3 +1,2 @@
 "use strict";
-exports.TUTORIAL_CONFIG_SAVE = 'TUTORIAL_CONFIG_SAVE';
-exports.TUTORIAL_INFO_SAVE = 'TUTORIAL_INFO_SAVE';
+exports.PJ_SAVE = 'PJ_SAVE';

lib/modules/package-json/utils/packageJson.js

@@ -2,7 +2,6 @@
 var path_1 = require('path');
 var fs_1 = require('fs');
 var node_file_exists_1 = require('node-file-exists');
-var sort_package_json_1 = require('sort-package-json');
 function readPackageJson(dir) {
     var pathToPJ = path_1.join(dir, './package.json');
     if (!node_file_exists_1.default(pathToPJ)) {
@@ -17,6 +16,6 @@ function readPackageJson(dir) {
 }
 exports.readPackageJson = readPackageJson;
 function writePackageJson(dir, content) {
-    fs_1.writeFileSync(path_1.join(dir, './package.json'), sort_package_json_1.sortPackageJson(JSON.stringify(content, null, 2)));
+    fs_1.writeFileSync(path_1.join(dir, './package.json'), content);
 }
 exports.writePackageJson = writePackageJson;