parse first action: open

Author: ShMcK

parser/index.pegjs

@@ -12,7 +12,7 @@
   /*** "pegjs/_types.js" ***/
 
   const pageTypes = ['onPageComplete'];
-  const taskTypes = ['tests', 'actions', 'hints']
+  const taskTypes = ['tests', 'hints', 'actions']
 
   /*** "pegjs/_functions.js" ***/
 
@@ -132,10 +132,13 @@ page_task
     actions: task_actions*
     break?
 
-  { let task = { description, tests: [], hints: [] };
+  { let task = { description };
 	  actions.forEach(({type, value}) => {
 			// task actions
       if (taskTypes.includes(type)) {
+				if (!task.hasOwnProperty(type)) {
+					task[type] = [];
+				}
         task[type].push(value);
 			// page actions
       } else if (pageTypes.includes(type)) {
@@ -199,16 +202,24 @@ on_page_complete
 task_action
 	= '@action'
     '('
-    type: action_type
-    ')'
+    action: action_type
+		')'
+		break
+
+	{
+		return {
+			type: 'actions',
+			value: action,
+		};
+	}
 
 action_type
-  = action_open
-  / action_set
+  = action: action_open
+  /*/ action_set
   / action_insert
   / action_write
-  / action_write_from_file
-  break
+  / action_write_from_file*/
+
 
 action_open
   = 'open'
@@ -217,6 +228,7 @@ action_open
     file: file_path
     quote
     ')'
+	{ return `open("${file.join('')}")`; }
 
 action_insert
   = 'insert'

parser/pegjs/_types.js

@@ -1,2 +1,2 @@
 const pageTypes = ['onPageComplete'];
-const taskTypes = ['tests', 'actions', 'hints']
+const taskTypes = ['tests', 'hints', 'actions']

parser/pegjs/task-actions.pegjs

@@ -1,16 +1,24 @@
 task_action
 	= '@action'
     '('
-    type: action_type
-    ')'
+    action: action_type
+		')'
+		break
+
+	{
+		return {
+			type: 'actions',
+			value: action,
+		};
+	}
 
 action_type
-  = action_open
-  / action_set
+  = action: action_open
+  /*/ action_set
   / action_insert
   / action_write
-  / action_write_from_file
-  break
+  / action_write_from_file*/
+
 
 action_open
   = 'open'
@@ -19,6 +27,7 @@ action_open
     file: file_path
     quote
     ')'
+	{ return `open("${file.join('')}")`; }
 
 action_insert
   = 'insert'

parser/pegjs/task.pegjs

@@ -5,10 +5,13 @@ page_task
     actions: task_actions*
     break?
 
-  { let task = { description, tests: [], hints: [] };
+  { let task = { description };
 	  actions.forEach(({type, value}) => {
 			// task actions
       if (taskTypes.includes(type)) {
+				if (!task.hasOwnProperty(type)) {
+					task[type] = [];
+				}
         task[type].push(value);
 			// page actions
       } else if (pageTypes.includes(type)) {

test/action.js

@@ -1,12 +1,43 @@
 import test from 'ava';
 import parse from './_parser';
 
-test.todo('parses an action: open');
+const start = `# Title
+description
 
+## Page One
+description
 
-test.todo('parses multiple actions: open');
++ Task One
+@test('01, 02')
+`;
+
+test('parses an action: open', t => {
+  const data = `${start}@action(open('file.js'))
+`;
+  const expected = ["open(\"file.js\")"];
+  const result = parse(data);
+  t.deepEqual(result.pages[0].tasks[0].actions, expected);
+});
+
+test.skip('parses an action: set', t => {
+  const data = `${start}
+@action(set('var a = 42;'))
+`;
+  const expected = ["set('var a = 42;')"];
+  const result = parse(data);
+  t.deepEqual(result.pages[0].tasks[0].actions, expected);
+});
+
+test.skip('parses an action: insert', t => {
+  const data = `${start}
+@action(insert('var a = 42;'))
+`;
+  const expected = ["insert('var a = 42;')"];
+  const result = parse(data);
+  t.deepEqual(result.pages[0].tasks[0].actions, expected);
+});
 
-test.todo('parses an action: set');
-test.todo('parses an action: insert');
 test.todo('parses an action: write');
 test.todo('parses an action: writeFileFromFile');
+
+test.todo('parses multiple actions: open & set');

test/task-test.js

@@ -16,7 +16,6 @@ description
     tests: [
       '01, 02'
     ],
-    hints: []
   }];
   const result = parse(data);
   t.deepEqual(result.pages[0].tasks, expected);
@@ -39,7 +38,6 @@ description
       '01, 02',
       '03, 04'
     ],
-    hints: []
   }];
   const result = parse(data);
   t.deepEqual(result.pages[0].tasks, expected);
@@ -63,13 +61,11 @@ description
     tests: [
       '01, 02'
     ],
-    hints: []
   }, {
     description: 'Task Two',
     tests: [
       '02, 01'
     ],
-    hints: []
   }];
   const result = parse(data);
   t.deepEqual(result.pages[0].tasks, expected);

test/task.js

@@ -12,8 +12,6 @@ description
 `;
   const expected = [{
     description: 'Task One',
-    tests: [],
-    hints: []
   }];
   const result = parse(data);
   t.deepEqual(result.pages[0].tasks, expected);
@@ -32,12 +30,8 @@ description
 `;
   const expected = [{
     description: 'Task One',
-    tests: [],
-    hints: []
   }, {
     description: 'Task Two',
-    tests: [],
-    hints: []
   }];
   const result = parse(data);
   t.deepEqual(result.pages[0].tasks, expected);