build array of actions

Author: ShMcK

src/build/actions.js

@@ -1,32 +1,33 @@
 "use strict";
 var cleanup_1 = require('./cleanup');
-function addAction(result, line, index) {
+function addToTasks(result, line, index) {
     var action = line.slice(1).split('(')[0];
-    var target = cleanup_1.trimQuotes(/\((.*?)\)$/.exec(line)[1]);
+    var value = cleanup_1.trimQuotes(/\((.*?)\)$/.exec(line)[1]);
     var task = result.chapters[index.chapter].pages[index.page].tasks[index.task];
     switch (action) {
         case 'test':
-            if (task.tests === undefined) {
+            if (result.chapters[index.chapter].pages[index.page].tasks[index.task].tests === undefined) {
                 result.chapters[index.chapter].pages[index.page].tasks[index.task].tests = [];
             }
-            result.chapters[index.chapter].pages[index.page].tasks[index.task].tests.push(target);
+            result.chapters[index.chapter].pages[index.page].tasks[index.task].tests.push(value);
             break;
         case 'action':
-            if (task.actions === undefined) {
+            var task_1 = result.chapters[index.chapter].pages[index.page].tasks[index.task];
+            if (task_1.actions === undefined) {
                 result.chapters[index.chapter].pages[index.page].tasks[index.task].actions = [];
             }
-            result.chapters[index.chapter].pages[index.page].tasks[index.task].actions.push(target);
+            result.chapters[index.chapter].pages[index.page].tasks[index.task].actions.push(value);
+            return result;
             break;
         case 'hint':
-            if (task.hints === undefined) {
+            if (task_1.hints === undefined) {
                 result.chapters[index.chapter].pages[index.page].tasks[index.task].hints = [];
             }
-            result.chapters[index.chapter].pages[index.page].tasks[index.task].hints.push(target);
+            result.chapters[index.chapter].pages[index.page].tasks[index.task].hints.push(value);
             break;
         default:
             console.log('Invalid task action');
     }
     return result;
 }
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = addAction;
+exports.addToTasks = addToTasks;

src/build/build.js

@@ -1,9 +1,7 @@
 "use strict";
 var fs = require('fs');
-var process = require('process');
-var chalk = require('chalk');
 var Match = require('./matchers');
-var validators_1 = require('./validators');
+var validate = require('./validators');
 var actions_1 = require('./actions');
 var cleanup_1 = require('./cleanup');
 function build(lines) {
@@ -123,16 +121,17 @@ function task(result, lines, index) {
             inCodeBlock = !inCodeBlock;
         }
         if (!inCodeBlock) {
-            if (!!Match.isAction(line)) {
-                var isActionArray = Match.isArray(cleanup_1.trimQuotes(line));
+            var isAction = Match.isAction(line);
+            if (!!isAction) {
+                var isActionArray = Match.isArray(cleanup_1.trimQuotes(isAction[2]));
                 if (!!isActionArray) {
-                    arrayOfActions = JSON.parse(isActionArray);
-                    arrayOfActions.forEach(function (line) {
-                        result = actions_1.default(result, line, index);
+                    var arrayOfActions = JSON.parse(isActionArray);
+                    arrayOfActions.forEach(function (action) {
+                        result = actions_1.addToTasks(result, "@action(" + action + ")", index);
                     });
                 }
                 else {
-                    result = actions_1.default(result, line, index);
+                    result = actions_1.addToTasks(result, line, index);
                 }
             }
             else if (!!Match.task(line)) {
@@ -156,13 +155,10 @@ function task(result, lines, index) {
 }
 module.exports = function (filePath, output) {
     if (output === void 0) { output = './coderoad.json'; }
-    if (!filePath) {
-        console.log(chalk.red("\n    Pass in a path to your .md file\n    For example: coderoad build ./src/tutorial.md\n    "));
-        process.exit(1);
-    }
+    validate.filePath(filePath);
     var lines = fs.readFileSync(filePath, 'utf8').split('\n');
     var result = cleanup_1.cleanup(build(lines));
-    if (validators_1.default(result)) {
+    if (validate.result(result)) {
         fs.writeFileSync(output, result, 'utf8');
     }
 };

src/build/import.js

@@ -0,0 +1,5 @@
+"use strict";
+function loadImport(pathToFile) {
+}
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = loadImport;

src/build/matchers.js

@@ -32,13 +32,17 @@ exports.page = parseWithCode('###');
 exports.task = parseWithCode('+');
 exports.codeBlock = parseWithCode('```');
 exports.isArray = function (line) {
-    var isMatch = line.match(/^\[(.+)\]$/);
-    return isMatch ? isMatch[1] : false;
+    var isMatch = line.match(/^\[.+\]$/);
+    if (isMatch) {
+        return isMatch[0];
+    }
+    else {
+        return false;
+    }
 };
 exports.isAction = function (line) {
-    var isMatch = line.match(/^@(action|test|hint)?/);
-    return isMatch ? isMatch[1] : false;
+    return line.match(/^@(action|test|hint)\((.+)\)$/);
 };
 exports.isImport = function (line) {
-    return line.match(/^@import/);
+    return line.match(/^@import\((.+)\)$/);
 };

src/build/validators.js

@@ -1,14 +1,20 @@
 "use strict";
 var chalk = require('chalk');
-function validate(text) {
+function filePath(filePath) {
+    if (!filePath) {
+        console.log(chalk.red("\n    Pass in a path to your .md file\n    For example: coderoad build ./src/tutorial.md\n    "));
+        process.exit(1);
+    }
+}
+exports.filePath = filePath;
+function result(text) {
     isValidJSON(text);
     var jsonObject = JSON.parse(text);
     hasProjectInfo(jsonObject);
     hasPage(jsonObject);
     return true;
 }
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = validate;
+exports.result = result;
 function isValidJSON(text) {
     if (!/^[\],:{}\s]*$/.test(text.replace(/\\["\\\/bfnrtu]/g, '@').
         replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g, ']').