minor refactoring

Author: ShMcK

lib/build/parser/actions.js

@@ -1,24 +1,26 @@
 "use strict";
 var cleanup_1 = require('./cleanup');
 var Match = require('./match');
-function doAction(type, isArray, actionValue, result, line, index) {
-    if (result.chapters[index.chapter].pages[index.page].tasks[index.task][type] === undefined) {
-        result.chapters[index.chapter].pages[index.page].tasks[index.task][type] = [];
+function doAction(type, isArray, actionValue, result, line, _a) {
+    var chapter = _a.chapter, page = _a.page, task = _a.task;
+    if (result.chapters[chapter].pages[page].tasks[task][type] === undefined) {
+        result.chapters[chapter].pages[page].tasks[task][type] = [];
     }
     if (!!isArray) {
         var values = cleanup_1.trimArray(actionValue);
         values.forEach(function (value) {
-            result.chapters[index.chapter].pages[index.page].tasks[index.task][type].push(value);
+            result.chapters[chapter].pages[page].tasks[task][type].push(value);
         });
     }
     else {
-        result.chapters[index.chapter].pages[index.page].tasks[index.task][type].push(actionValue);
+        result.chapters[chapter].pages[page].tasks[task][type].push(actionValue);
     }
     return result;
 }
 function addToTasks(result, line, index) {
     var action = Match.isAction(line);
-    var task = result.chapters[index.chapter].pages[index.page].tasks[index.task];
+    var chapter = index.chapter, page = index.page, task = index.task;
+    var currentTask = result.chapters[chapter].pages[page].tasks[task];
     var trimmedContent = line.slice(action.length + 2, line.length - 1);
     var actionValue = cleanup_1.trimQuotes(trimmedContent);
     var isActionArray = Match.isArray(cleanup_1.trimQuotes(actionValue));
@@ -32,19 +34,19 @@ function addToTasks(result, line, index) {
         case 'continue':
             break;
         case 'action':
-            if (task.actions === undefined) {
-                result.chapters[index.chapter].pages[index.page].tasks[index.task].actions = [];
+            if (currentTask.actions === undefined) {
+                result.chapters[chapter].pages[page].tasks[task].actions = [];
             }
             if (!!isActionArray) {
                 var arrayOfActions = JSON.parse(isActionArray);
                 arrayOfActions.forEach(function (value) {
                     value = cleanup_1.trimCommandValue(cleanup_1.trimQuotes(value.trim()));
-                    result.chapters[index.chapter].pages[index.page].tasks[index.task].actions.push(value);
+                    result.chapters[chapter].pages[page].tasks[task].actions.push(value);
                 });
             }
             else {
                 var value = cleanup_1.trimCommandValue(actionValue);
-                result.chapters[index.chapter].pages[index.page].tasks[index.task].actions.push(value);
+                result.chapters[chapter].pages[page].tasks[task].actions.push(value);
             }
             return result;
         default:

package.json

@@ -25,7 +25,7 @@
   "dependencies": {
     "chalk": "1.1.1",
     "commander": "2.9.0",
-    "lodash": "4.5.1",
+    "lodash": "4.6.1",
     "prompt": "1.0.0",
     "validate-npm-package-name": "2.2.2"
   },

setup/tutorial/1/01/01.spec.js

@@ -6,7 +6,7 @@ loadJS('page-01.js')
 describe('01 addOne', function() {
 
   it('doesn\'t exist', function() {
-    expect(addOne).to.not.be.undefined;
+    expect(addOne).to.be.defined;
   });
 
   it('should take a parameter', function() {

setup/tutorial/1/01/02.spec.js

@@ -1,7 +1,7 @@
 describe('02 subtractOne', function() {
 
   it('doesn\'t exist', function () {
-    expect(subtractOne).to.not.be.undefined;
+    expect(subtractOne).to.be.defined;
   });
 
   it('should take a parameter', function() {

setup/tutorial/1/02/01.spec.js

@@ -7,7 +7,7 @@ loadJS('page-02.js')
 describe('01 divideOne', function() {
 
   it('doesn\'t exist', function () {
-    expect(divideOne).to.not.be.undefined;
+    expect(divideOne).to.be.defined;
   });
 
   it('should take a parameter', function() {

setup/tutorial/1/02/02.spec.js

@@ -1,7 +1,7 @@
 describe('02 multiplyOne', function() {
 
   it('doesn\'t exist', function () {
-    expect(multiplyOne).to.not.be.undefined;
+    expect(multiplyOne).to.be.defined;
   });
 
   it('should take a parameter', function() {

src/build/parser/actions.ts

@@ -1,27 +1,30 @@
 import {trimQuotes, trimCommandValue, trimArray} from './cleanup';
 import * as Match from './match';
 
-function doAction(type: CR.OutputAction, isArray, actionValue, result, line, index): CR.Output {
+// TODO: change to use new Set ()
+
+function doAction(type: CR.OutputAction, isArray, actionValue, result, line, {chapter, page, task}): CR.Output {
   // set to array
-  if (result.chapters[index.chapter].pages[index.page].tasks[index.task][type] === undefined) {
-    result.chapters[index.chapter].pages[index.page].tasks[index.task][type] = [];
+  if (result.chapters[chapter].pages[page].tasks[task][type] === undefined) {
+    result.chapters[chapter].pages[page].tasks[task][type] = [];
   }
   if (!!isArray) {
     // array
     let values = trimArray(actionValue);
     values.forEach((value) => {
-      result.chapters[index.chapter].pages[index.page].tasks[index.task][type].push(value);
+      result.chapters[chapter].pages[page].tasks[task][type].push(value);
     });
   } else {
     // string
-    result.chapters[index.chapter].pages[index.page].tasks[index.task][type].push(actionValue);
+    result.chapters[chapter].pages[page].tasks[task][type].push(actionValue);
   }
   return result;
 }
 
 export function addToTasks(result, line, index) {
   let action: CR.TaskAction|string = Match.isAction(line);  // 'action'|'test'|'hint'|'continue'
-  let task: CR.Task = result.chapters[index.chapter].pages[index.page].tasks[index.task];
+  const {chapter, page, task} = index;
+  let currentTask: CR.Task = result.chapters[chapter].pages[page].tasks[task];
   let trimmedContent: string = line.slice(action.length + 2, line.length - 1); // content between brackets
   let actionValue: string = trimQuotes(trimmedContent);
   let isActionArray = Match.isArray(trimQuotes(actionValue));
@@ -35,18 +38,18 @@ export function addToTasks(result, line, index) {
     case 'continue':
       break;
     case 'action':
-      if (task.actions === undefined) {
-        result.chapters[index.chapter].pages[index.page].tasks[index.task].actions = [];
+      if (currentTask.actions === undefined) {
+        result.chapters[chapter].pages[page].tasks[task].actions = [];
       }
       if (!!isActionArray) {
         var arrayOfActions: string[] = JSON.parse(isActionArray);
         arrayOfActions.forEach(function(value) {
           value = trimCommandValue(trimQuotes(value.trim()));
-          result.chapters[index.chapter].pages[index.page].tasks[index.task].actions.push(value);
+          result.chapters[chapter].pages[page].tasks[task].actions.push(value);
         });
       } else {
         let value: string = trimCommandValue(actionValue);
-        result.chapters[index.chapter].pages[index.page].tasks[index.task].actions.push(value);
+        result.chapters[chapter].pages[page].tasks[task].actions.push(value);
       }
       return result;