repair tutorial.config

Author: ShMcK

lib/components/Tutorials/SelectTutorial/index.js

@@ -33,7 +33,6 @@ var SelectTutorial = (function (_super) {
     };
     SelectTutorial.prototype.render = function () {
         var _a = this.props, tutorial = _a.tutorial, selectTutorial = _a.selectTutorial;
-        console.log('tutorial', tutorial);
         var name = tutorial.name;
         return (React.createElement(FlatButton_1.default, {label: this.displayName(name), primary: true, onTouchTap: selectTutorial.bind(this, name)}));
     };

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

@@ -2,8 +2,8 @@
 var types_1 = require('../types');
 var handle_actions_1 = require('./handle-actions');
 var taskPositionTracker = 0;
-function taskActionsReducer(taskActions, action) {
-    if (taskActions === void 0) { taskActions = []; }
+function taskActionsReducer(t, action) {
+    if (t === void 0) { t = []; }
     var actions = null;
     switch (action.type) {
         case types_1.PAGE_SET:
@@ -21,18 +21,18 @@ function taskActionsReducer(taskActions, action) {
             handle_actions_1.default(actions);
             return actions;
         case 'TEST_RESULT':
-            actions = action.payload.taskActions || [];
-            var nextTaskPosition = action.payload.result.taskPosition;
+            var _b = action.payload, taskActions = _b.taskActions, result = _b.result;
+            var nextTaskPosition = result.taskPosition;
             var times = nextTaskPosition - taskPositionTracker;
             if (times > 0) {
                 for (var i = 0; i < times; i++) {
                     handle_actions_1.default(actions);
                 }
                 taskPositionTracker = nextTaskPosition;
             }
-            return actions;
-        default:
             return taskActions;
+        default:
+            return t;
     }
 }
 Object.defineProperty(exports, "__esModule", { value: true });

lib/modules/tests/test-run/parse-loaders.js

@@ -3,6 +3,7 @@ var path_1 = require('path');
 var fs_1 = require('fs');
 var comments = {
     py: '#',
+    js: '\/{2,3}',
 };
 function loaderRegex(fileType) {
     var comment = '\/{2,3}';
@@ -27,7 +28,7 @@ function parseLoaders(data, fileType, tutorial, dir) {
             }
             var pathToFile = null;
             if (loader[2]) {
-                var tutorialDir = tutorial.config.dir;
+                var tutorialDir = tutorial.packageJson.config.dir || 'tutorial';
                 pathToFile = path_1.normalize(path_1.join(tutorialDir, fileToLoad));
             }
             else {

lib/modules/tutorial/reducer.js

@@ -1,5 +1,6 @@
 "use strict";
 var path_1 = require('path');
+var config_1 = require('./utils/config');
 var types_1 = require('./types');
 var config_paths_1 = require('./utils/config-paths');
 var _tutorial = {
@@ -8,24 +9,26 @@ var _tutorial = {
     pages: [],
     packageJson: null,
 };
-function tutorialReducer(tutorial, action) {
-    if (tutorial === void 0) { tutorial = _tutorial; }
+function tutorialReducer(t, action) {
+    if (t === void 0) { t = _tutorial; }
     switch (action.type) {
         case types_1.TUTORIAL_SET:
             var _a = action.payload, name_1 = _a.name, dir = _a.dir;
             var packagePath = path_1.join(dir, 'node_modules', name_1);
             var packageJson = require(path_1.join(packagePath, 'package.json'));
-            console.log(packageJson);
-            var _b = require(path_1.join(packagePath, packageJson.main)), info = _b.info, pages = _b.pages;
-            pages = config_paths_1.default(dir, name_1, packageJson.config, pages || []);
+            var config = config_1.tutorialConfig(packageJson, dir);
+            var coderoadJsonPath = path_1.join(packagePath, packageJson.main);
+            var _b = require(coderoadJsonPath), info = _b.info, pages = _b.pages;
+            pages = config_paths_1.default(dir, name_1, config, pages || []);
             return {
                 name: packageJson.name,
                 info: info,
                 pages: pages,
                 packageJson: packageJson,
+                config: config,
             };
         default:
-            return tutorial;
+            return t;
     }
 }
 Object.defineProperty(exports, "__esModule", { value: true });

lib/store.js

@@ -7,7 +7,7 @@ var redux_thunk_1 = require('redux-thunk');
 var middlewares = [redux_thunk_1.default];
 var throttleTestRun = redux_throttle_actions_1.default(['TEST_RUN'], 800);
 middlewares.push(throttleTestRun);
-var devMode = false;
+var devMode = true;
 if (devMode) {
     var logger = createLogger();
     middlewares.push(logger);

src/modules/page/page-position/index.ts

@@ -8,8 +8,8 @@ export default function pagePosition(
     case PAGE_SET:
       return action.payload.pagePosition;
 
-    // allow access until before first incomplete tutorial
     case 'PROGRESS_PAGE_POSITION':
+      // allow access until before first incomplete tutorial
       const pages = action.payload.progress.pages;
       const firstFail = pages.indexOf(false);
       return firstFail < 0 ? pages.length - 1 : firstFail;

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

@@ -5,42 +5,50 @@ import handleTaskActions from './handle-actions';
 let taskPositionTracker = 0;
 
 export default function taskActionsReducer(
-  taskActions = [], action: Action
+  t = [], action: Action
 ): string[][] {
   let actions: string[][] = null;
   switch (action.type) {
 
-    // load task actions
     case PAGE_SET:
+      // load task actions
       const {tasks, pagePosition, progress} = action.payload;
+
       const isCompleted = progress.pages[pagePosition];
       if (!isCompleted) {
+        // if page is completed, mark tasks as completed
         actions = tasks.map(task => task.actions || []);
       } else {
         // filter to only 'open' actions
         actions = tasks.map(task => {
           return task.actions.filter(a => !!a.match(/^open/));
         });
       }
+      // page loads - reset tracker
       taskPositionTracker = 0;
-      handleTaskActions(actions); // run first action
+      // run first action
+      handleTaskActions(actions);
       return actions;
 
-    // run task actions
     case 'TEST_RESULT':
-      actions = action.payload.taskActions || [];
-      const nextTaskPosition = action.payload.result.taskPosition;
+      const {taskActions, result} = action.payload;
+      // task position from test result
+      const nextTaskPosition = result.taskPosition;
+      // calculate task position difference
       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
+          // run action
+          handleTaskActions(actions);
         }
+        // set current task position
         taskPositionTracker = nextTaskPosition;
       }
-      return actions;
+      return taskActions;
 
     default:
-      return taskActions;
+      return t;
   }
 }

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

@@ -8,14 +8,18 @@ export default function taskTestsReducer(
 
     case PAGE_SET:
       const {tutorial, tasks} = action.payload;
+      // map over task tests from coderoad.json
       return [].concat.apply([], tasks.map(
-        task => task.tests || [])
+          task => task.tests || []
+        )
+      // concat test files together
       ).reduce((output: string, file: string): string => {
         try {
           output += readFileSync(file, 'utf8') + '\n';
         } catch (e) {
           console.log('Error reading test file', e);
         }
+        // return concatted test files
         return output;
       }, '');
 

src/modules/tests/test-run/parse-loaders.ts

@@ -1,9 +1,11 @@
 import {normalize, join} from 'path';
 import {readFileSync} from 'fs';
 
-// other languages may handle comments differently
+// TODO: load comments from core-coderoad/lib/options
+
 const comments = {
   py: '#',
+  js: '\/{2,3}',
 };
 
 function loaderRegex(fileType: string): RegExp {
@@ -40,9 +42,8 @@ export default function parseLoaders(
 
       let pathToFile: string = null;
       if (loader[2]) {
-        // path to file from tutorial directory
-        const tutorialDir = tutorial.config.dir;
-        pathToFile = normalize(join(tutorialDir, fileToLoad));
+        // path to file from config specified dir
+        pathToFile = normalize(join(tutorial.config.dir, fileToLoad));
       } else {
         // path to file from working directory
         pathToFile = normalize(join(dir, fileToLoad));

src/modules/tutorial/reducer.ts

@@ -11,26 +11,34 @@ const _tutorial: CR.Tutorial = {
 };
 
 export default function tutorialReducer(
-  tutorial = _tutorial, action: Action
+  t = _tutorial, action: Action
 ): CR.Tutorial {
   switch (action.type) {
 
     case TUTORIAL_SET:
       const {name, dir} = action.payload;
+
+      // get tutorial package.json
       const packagePath: string = join(dir, 'node_modules', name);
       const packageJson: PackageJson = require(join(packagePath, 'package.json'));
-      // const config: Tutorial.Config = tutorialConfig(packageJson, dir);
-      let {info, pages} = require(join(packagePath, packageJson.main));
+
+      const config: Tutorial.Config = tutorialConfig(packageJson, dir);
+      const coderoadJsonPath = join(packagePath, packageJson.main);
+      let {info, pages} = require(coderoadJsonPath);
+
       // configure test paths to absolute paths
-      pages = configPaths(dir, name, packageJson.config, pages || []);
+      pages = configPaths(dir, name, config, pages || []);
+
+      // return tutorial (info, pages) & tutorial package.json
       return {
         name: packageJson.name,
         info,
         pages,
         packageJson,
+        config,
       };
 
     default:
-      return tutorial;
+      return t;
   }
 }