fix: empty lines treated as line breaks

Author: ShMcK

README.md

@@ -29,7 +29,7 @@ Command line interface for [CodeRoad](http://coderoad.github.io).
 * a `package.json` configuration with the following settings:
 
 ```
-  "name": "coderoad-$my-tutorial-name$",
+  "name": "coderoad-$TUTORIAL-NAME$",
   "main": "coderoad.json",
   "keywords": ["coderoad", "tutorial"],
   "coderoad": {

cli.js

@@ -10,7 +10,7 @@ var tutorials_1 = require('./src/tutorials/tutorials');
 var publish_1 = require('./src/publish/publish');
 var docs_1 = require('./src/docs/docs');
 program
-    .version('0.3.8')
+    .version('0.3.9')
     .usage('[options] <keywords>')
     .option('-b, --build [path/to/tutorial.md]', 'tutorial markdown file', /^.+\.md$/i)
     .option('-c, --create [name]', 'tutorial name')

package.json

@@ -1,6 +1,6 @@
 {
   "name": "coderoad-cli",
-  "version": "0.3.8",
+  "version": "0.3.9",
   "description": "Command line interface for CodeRoad. Build project files.",
   "keywords": [
     "coderoad"

src/build/parser/actions.js

@@ -10,28 +10,35 @@ function trimCommandValue(text) {
     return command.action + '(\'' + command.value + '\')';
 }
 exports.trimCommandValue = trimCommandValue;
+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] = [];
+    }
+    if (!!isArray) {
+        var valueList = actionValue.slice(1, -1).split(',');
+        valueList.forEach(function (value) {
+            var value = cleanup_1.trimQuotes(value.trim());
+            result.chapters[index.chapter].pages[index.page].tasks[index.task][type].push(value);
+        });
+    }
+    else {
+        result.chapters[index.chapter].pages[index.page].tasks[index.task][type].push(actionValue);
+    }
+    return result;
+}
 function addToTasks(result, line, index) {
     var match = Match.isAction(line);
     var action = match.action;
     var task = result.chapters[index.chapter].pages[index.page].tasks[index.task];
-    var trimmedAction = line.slice(action.length + 2, line.length - 1);
-    var actionValue = cleanup_1.trimQuotes(trimmedAction);
+    var trimmedContent = line.slice(action.length + 2, line.length - 1);
+    var actionValue = cleanup_1.trimQuotes(trimmedContent);
     var isActionArray = Match.isArray(cleanup_1.trimQuotes(actionValue));
     switch (action) {
         case 'test':
-            if (result.chapters[index.chapter].pages[index.page].tasks[index.task].tests === undefined) {
-                result.chapters[index.chapter].pages[index.page].tasks[index.task].tests = [];
-            }
-            if (!!isActionArray) {
-                var valueList = actionValue.slice(1, -1).split(',');
-                valueList.forEach(function (value) {
-                    var value = cleanup_1.trimQuotes(value.trim());
-                    result.chapters[index.chapter].pages[index.page].tasks[index.task].tests.push(value);
-                });
-            }
-            else {
-                result.chapters[index.chapter].pages[index.page].tasks[index.task].tests.push(actionValue);
-            }
+            result = doAction('tests', isActionArray, actionValue, result, line, index);
+            break;
+        case 'hint':
+            result = doAction('hints', isActionArray, actionValue, result, line, index);
             break;
         case 'action':
             if (task.actions === undefined) {
@@ -50,21 +57,6 @@ function addToTasks(result, line, index) {
             }
             return result;
             break;
-        case 'hint':
-            if (task.hints === undefined) {
-                result.chapters[index.chapter].pages[index.page].tasks[index.task].hints = [];
-            }
-            if (!!isActionArray) {
-                var valueList = actionValue.slice(1, -1).split(',');
-                valueList.forEach(function (value) {
-                    var value = cleanup_1.trimQuotes(value.trim());
-                    result.chapters[index.chapter].pages[index.page].tasks[index.task].hints.push(value);
-                });
-            }
-            else {
-                result.chapters[index.chapter].pages[index.page].tasks[index.task].hints.push(actionValue);
-            }
-            break;
         default:
             console.log('Invalid task action');
     }

src/build/parser/brackets.js

@@ -8,10 +8,13 @@ function trimLineBreaks(text) {
 exports.trimLineBreaks = trimLineBreaks;
 var quotes = ['\'', '"', '`'];
 function trimQuotes(text) {
-    if (!!text.match(/^\s/)) {
+    if (!!text.match(/^[\r\n]/)) {
+        return text;
+    }
+    else if (!!text.match(/^\s/)) {
         return trimQuotes(text.slice(1));
     }
-    else if (!!text.match(/\s$/m)) {
+    else if (!!text.match(/\s$/)) {
         return trimQuotes(text.slice(0, text.length - 1));
     }
     else if (!!text.match(/^`{3}.+`{3}$/m)) {

src/build/parser/cleanup.js

@@ -38,8 +38,7 @@ exports.isArray = function (line) {
 exports.isAction = function (line) {
     var match = line.match(/^@(action|test|hint)/);
     return !!match ? {
-        action: match[1],
-        content: match[2]
+        action: match[1]
     } : false;
 };
 exports.isImport = function (line) {

src/build/parser/match.js

@@ -28,8 +28,10 @@ function task(result, lines, index) {
         }
         else {
             if (!!currentAction) {
-                var finishedAction = (bracketTracker(line) + bracketCount) === 0;
-                if (!finishedAction) {
+                if (line.length === 0) {
+                    currentAction += '\n';
+                }
+                else if ((bracketTracker(line) + bracketCount) !== 0) {
                     currentAction += line + '\n';
                     bracketCount += bracketTracker(line);
                 }