Quiz with GFM checkbox lists

1 files changed, 54 insertions, 10 deletions

diff --git a/lib/parse/page.js b/lib/parse/page.js
index 4e26455..eb118e4 100644
--- a/lib/parse/page.js
+++ b/lib/parse/page.js
@@ -36,8 +36,12 @@ function render(section, _options) {
     return marked.parser(section, options);
 }
 
-function quizNodesTest(node) {
-  return node.type === 'table' || node.type === 'list';
+function quizQuestion(node) {
+    if (node.text) {
+        node.text = node.text.replace(/^([\[(])x([\])])/, "$1 $2");
+    } else {
+        return node.replace(/^([\[(])x([\])])/, "$1 $2");
+    }
 }
 
 function parsePage(src, options) {
@@ -81,18 +85,58 @@ function parsePage(src, options) {
                 }
             };
         } else if (section.type === 'quiz') {
-            var nonQuizNodes = _.reject(section, quizNodesTest);
-            var quizNodes = _.filter(section, quizNodesTest);
-            var feedback = nonQuizNodes.splice(_.findIndex(nonQuizNodes, { type: 'blockquote_start' }), _.findIndex(nonQuizNodes, { type: 'blockquote_end' }));
+            var quiz = [], question, foundFeedback = false;
+            var nonQuizNodes = section[0].type === 'paragraph' && section[1].type !== 'list_start' ? [section[0]] : [];
+            var quizNodes = section.slice(0);
+            quizNodes.splice(0, nonQuizNodes.length);
+
+            for (var i = 0; i < quizNodes.length; i++) {
+                var node = quizNodes[i];
+
+                if (question && (((node.type === 'list_end' || node.type === 'blockquote_end') && i === quizNodes.length - 1)
+                                 || node.type === 'table' || (node.type === 'paragraph' && !foundFeedback))) {
+                    quiz.push({
+                        base: render(question.questionNodes),
+                        solution: render(question.solutionNodes),
+                        feedback: render(question.feedbackNodes)
+                    });
+                }
+
+                if (node.type === 'table' || (node.type === 'paragraph' && !foundFeedback)) {
+                    question = { questionNodes: [], solutionNodes: [], feedbackNodes: [] };
+                }
+
+                if (node.type === 'blockquote_start') {
+                    foundFeedback = true;
+                } else if (node.type === 'blockquote_end') {
+                    foundFeedback = false;
+                }
+
+                if (node.type === 'table') {
+                    question.solutionNodes.push(_.cloneDeep(node));
+                    node.cells = node.cells.map(function(row) {
+                        return row.map(quizQuestion);
+                    });
+                    question.questionNodes.push(node);
+                } else if (!/blockquote/.test(node.type)) {
+                    if (foundFeedback) {
+                        question.feedbackNodes.push(node);
+                    } else if (node.type === 'paragraph' || node.type === 'text'){
+                        question.solutionNodes.push(_.cloneDeep(node));
+                        quizQuestion(node);
+                        question.questionNodes.push(node);
+                    } else {
+                        question.solutionNodes.push(node);
+                        question.questionNodes.push(node);
+                    }
+                }
+            }
+
             return {
                 id: section.id,
                 type: section.type,
                 content: render(nonQuizNodes),
-                quiz: {
-                    base: render([quizNodes[0]]),
-                    solution: render([quizNodes[1]]),
-                    feedback: render(feedback.slice(1, feedback.length - 1))
-                }
+                quiz: quiz
             };
         }