save single onPageComplete

Author: ShMcK

parser/index.pegjs

@@ -1,5 +1,6 @@
 {
-  // final parsed output for coderoad.json file
+  // Initial Data
+
   var output = {
     info: {
       title: 'Tutorial Title',
@@ -8,16 +9,24 @@
     pages: []
   };
 
+  // Types
+
+  const pageTypes = ['onPageComplete'];
+  const taskTypes = ['tests', 'actions', 'hints']
+
+  // Helper Functions
+
   function adjust(item) {
     return item[0].concat(item[1].join(''));
   }
+
   function trim({desc, str, first, last}) {
     if ( str[0].match(first) && str[str.length - 1].match(last || first) ) {
       return str.slice(1, -1);
     }
-    console.log('Error. Could not parse ' + desc + ' in ' + str);
-    return str;
+    throw `Error. Could not parse "${desc}" in "${str}".`;
   }
+
   function trimBrackets(str) {
     return trim({
       desc: 'bracket',
@@ -26,13 +35,15 @@
       last: /\)/,
     });
   }
+
   function trimQuotes(str) {
     return trim({
       desc: 'quote',
       str,
       first: /[\"\'\`]/
     });
   }
+
   function trimBracketsAndQuotes(str) {
     return trimQuotes(trimBrackets(str));
   }
@@ -66,12 +77,22 @@ page
   = title: page_title
     description: description*
     tasks: page_task*
+    actions: page_actions*
+
   {
-    output.pages.push({
-    	title,
+    let page = {
+      title,
       description: description.join('\n'),
-      tasks,
+      tasks
+    }
+    // map over any actions and add them
+    actions.forEach(({type, value}) => {
+      if (page.hasOwnProperty(type)) {
+        throw `${type} already exists on page "${page.title}"`;
+      }
+      page[type] = value;
     });
+    output.pages.push(page);
   }
 
 page_title
@@ -89,14 +110,21 @@ page_task
     break?
 
   { let task = { description, tests: [], hints: [] };
-	  actions.forEach(({type, value}) => task[type].push(value));
+	  actions.forEach(({type, value}) => {
+      if (taskTypes.includes(type)) {
+        task[type].push(value);
+      } else if (pageTypes.includes(type)) {
+        output.pages[pages.length - 1][type] = value;
+      }
+    });
 	  return task;
   }
 
 task_actions
-  = test: task_test
-  / hint: task_hint
-  / action: task_action
+  = task_test
+  / task_hint
+  / task_action
+  / page_actions
 
 task_test
 	= '@test'
@@ -123,20 +151,11 @@ on_page_complete
 	= '@onPageComplete'
     '('
     quote
-    content: .+
-    quote
-    ')'
-  { return { type: 'onPageComplete', value: content.join('') }; }
-
-page_import
-	= '@import'
-    '('
-    quote
-    filePath: file_path
+    content: [a-zA-Z0-9 ]+
     quote
     ')'
     break
-  { return filePath.join(''); }
+  { return { type: 'onPageComplete', value: content.join('') }; }
 
 task_action
 	= '@action'

parser/pegjs/data.js renamed to parser/pegjs/_data.js

@@ -1,4 +1,5 @@
-// final parsed output for coderoad.json file
+// Initial Data
+
 var output = {
   info: {
     title: 'Tutorial Title',

parser/pegjs/functions.js renamed to parser/pegjs/_functions.js

@@ -1,3 +1,5 @@
+// Helper Functions
+
 function adjust(item) {
   return item[0].concat(item[1].join(''));
 }
@@ -6,8 +8,7 @@ function trim({desc, str, first, last}) {
   if ( str[0].match(first) && str[str.length - 1].match(last || first) ) {
     return str.slice(1, -1);
   }
-  console.log('Error. Could not parse ' + desc + ' in ' + str);
-  return str;
+  throw `Error. Could not parse "${desc}" in "${str}".`;
 }
 
 function trimBrackets(str) {

parser/pegjs/_types.js

@@ -0,0 +1,4 @@
+// Types
+
+const pageTypes = ['onPageComplete'];
+const taskTypes = ['tests', 'actions', 'hints']

parser/pegjs/index.pegjs

@@ -1,6 +1,7 @@
 {
-@import('./data.js')
-@import('./functions.js')
+@import('./_data.js')
+@import('./_types.js')
+@import('./_functions.js')
 }
 
 start

parser/pegjs/page-actions.pegjs

@@ -5,17 +5,8 @@ on_page_complete
 	= '@onPageComplete'
     '('
     quote
-    content: .+
-    quote
-    ')'
-  { return { type: 'onPageComplete', value: content.join('') }; }
-
-page_import
-	= '@import'
-    '('
-    quote
-    filePath: file_path
+    content: [a-zA-Z0-9 ]+
     quote
     ')'
     break
-  { return filePath.join(''); }
+  { return { type: 'onPageComplete', value: content.join('') }; }

parser/pegjs/page.pegjs

@@ -2,12 +2,22 @@ page
   = title: page_title
     description: description*
     tasks: page_task*
+    actions: page_actions*
+
   {
-    output.pages.push({
-    	title,
+    let page = {
+      title,
       description: description.join('\n'),
-      tasks,
+      tasks
+    }
+    // map over any actions and add them
+    actions.forEach(({type, value}) => {
+      if (page.hasOwnProperty(type)) {
+        throw `${type} already exists on page "${page.title}"`;
+      }
+      page[type] = value;
     });
+    output.pages.push(page);
   }
 
 page_title
@@ -16,15 +26,3 @@ page_title
     title: content
     break
   { return adjust(title); }
-
-page_task
-	= '+'
-    space?
-  	description: description
-    actions: task_actions*
-    break?
-
-  { let task = { description, tests: [], hints: [] };
-	  actions.forEach(({type, value}) => task[type].push(value));
-	  return task;
-  }

parser/pegjs/task.pegjs

@@ -1,7 +1,26 @@
+page_task
+	= '+'
+    space?
+  	description: description
+    actions: task_actions*
+    break?
+
+  { let task = { description, tests: [], hints: [] };
+	  actions.forEach(({type, value}) => {
+      if (taskTypes.includes(type)) {
+        task[type].push(value);
+      } else if (pageTypes.includes(type)) {
+        output.pages[pages.length - 1][type] = value;
+      }
+    });
+	  return task;
+  }
+
 task_actions
-  = test: task_test
-  / hint: task_hint
-  / action: task_action
+  = task_test
+  / task_hint
+  / task_action
+  / page_actions
 
 task_test
 	= '@test'

test/import.js

@@ -15,4 +15,25 @@ description
   t.is(result.pages[0].onPageComplete, expected);
 });
 
+test('parses a multiple onPageCompletes', t => {
+  const expectedFirst = 'page one complete';
+  const expectedSecond = 'page two complete'
+  const data = `# Title
+description
+
+## Page One
+description
+
+@onPageComplete('${expectedFirst}')
+
+## Page Two
+description
+
+@onPageComplete('${expectedSecond}')
+`;
+  const result = parse(data);
+  t.is(result.pages[0].onPageComplete, expectedFirst);
+  t.is(result.pages[1].onPageComplete, expectedSecond);
+});
+
 test.todo('throws when multiple onPageCompletes');