multiple pegjs files, consolidate parser

Author: ShMcK

parser/action.pegjs

@@ -1,17 +1,57 @@
-action
-  = action_insert
+task_action
+	= '@action'
+    '('
+    type: action_type
+    ')'
+
+action_type
+  = action_open
   / action_set
+  / action_insert
   / action_write
   / action_write_from_file
-  / action_open
+  break
+
+action_open
+  = 'open'
+    '('
+    quote
+    file: file_path
+    quote
+    ')'
 
 action_insert
-  = 'insert(' + content + ')'
+  = 'insert'
+    '('
+    content: .+
+    ')'
+
 action_set
-  = 'set(' + content + ')'
+  = 'set'
+    '('
+    content: .+
+    ')'
+
 action_write
-  = 'write(' + content + ')'
+  = 'write'
+    '('
+    quote
+    to: file_path
+    quote
+    ',' space?
+    quote
+    content: .+
+    quote
+    ')'
+
 action_write_from_file
-  = 'writeFromFile(' + content + ')'
-action_open
-  = 'open(' + quote? + file_path + quote? ')'
+  = 'writeFromFile'
+    '('
+    quote
+    to: file_path
+    quote
+    ',' space?
+    quote
+    from: file_path
+    quote
+    ')'

parser/index.pegjs

@@ -80,13 +80,14 @@ page_task
   }
 
 page_actions
-  = page_onComplete
+  = on_page_complete
   / page_import
 
 task_actions
   = test: task_test
   / hint: task_hint
   / action: task_action
+  / onPageComplete: on_page_complete
 
 info_title
   = '#'
@@ -126,9 +127,70 @@ task_hint
 
 task_action
 	= '@action'
+    '('
+    type: action_type
+    ')'
+
+action_type
+  = action_open
+  / action_set
+  / action_insert
+  / action_write
+  / action_write_from_file
+  break
+
+action_open
+  = 'open'
+    '('
+    quote
+    file: file_path
+    quote
+    ')'
+
+action_insert
+  = 'insert'
+    '('
+    content: .+
+    ')'
+
+action_set
+  = 'set'
+    '('
+    content: .+
+    ')'
+
+action_write
+  = 'write'
+    '('
+    quote
+    to: file_path
+    quote
+    ',' space?
+    quote
+    content: .+
+    quote
+    ')'
+
+action_write_from_file
+  = 'writeFromFile'
+    '('
+    quote
+    to: file_path
+    quote
+    ',' space?
+    quote
+    from: file_path
+    quote
+    ')'
 
-page_onComplete
+on_page_complete
 	= '@onPageComplete'
+    '('
+    quote
+    content: .+
+    quote
+    ')'
+  { return { type: 'onPageComplete', value: content.join('') }; }
 
 page_import
 	= '@import'

test/_parser.js

@@ -0,0 +1,13 @@
+const { readFileSync } = require('fs');
+const pegjs = require('pegjs');
+
+const files = [
+  'index', 'action'
+];
+
+let parser = '';
+files.forEach(f => parser += readFileSync(`../parser/${f}.pegjs`, 'utf8'));
+
+const parse = pegjs.buildParser(parser).parse;
+
+module.exports = parse;

test/action.js

@@ -1,9 +1,5 @@
 import test from 'ava';
-import pegjs from 'pegjs';
-import { readFileSync } from 'fs';
-
-const parser = readFileSync('../parser/index.pegjs', 'utf8');
-const parse = pegjs.buildParser(parser).parse;
+import parse from './_parser';
 
 test.todo('parses an action: open');
 

test/import.js

@@ -1,9 +1,5 @@
 import test from 'ava';
-import pegjs from 'pegjs';
-import { readFileSync } from 'fs';
-
-const parser = readFileSync('../parser/index.pegjs', 'utf8');
-const parse = pegjs.buildParser(parser).parse;
+import parse from './_parser';
 
 test.todo('parses an import');
 test.todo('parses multiple imports');

test/info.js

@@ -1,9 +1,5 @@
 import test from 'ava';
-import pegjs from 'pegjs';
-import { readFileSync } from 'fs';
-
-const parser = readFileSync('../parser/index.pegjs', 'utf8');
-const parse = pegjs.buildParser(parser).parse;
+import parse from './_parser';
 
 test('parses an info title', t => {
   const data = `# Title\n`;
@@ -61,7 +57,7 @@ the next line`
   t.deepEqual(result.info, expected.info);
 });
 
-test('parses an info description seperated by breaks', t => {
+test.skip('parses an info description seperated by breaks', t => {
   const data = `# Title
 some description
 

test/page-complete.js

@@ -0,0 +1,18 @@
+import test from 'ava';
+import parse from './_parser';
+
+test('parses an onPageComplete', t => {
+  const expected = 'when page ends';
+  const data = `# Title
+description
+
+## Page One
+description
+
+@onPageComplete('${expected}')
+`;
+  const result = parse(data);
+  t.is(result.pages[0].onPageComplete, expected);
+});
+
+test.todo('throws when multiple onPageCompletes');

test/page.js

@@ -1,9 +1,5 @@
 import test from 'ava';
-import pegjs from 'pegjs';
-import { readFileSync } from 'fs';
-
-const parser = readFileSync('../parser/index.pegjs', 'utf8');
-const parse = pegjs.buildParser(parser).parse;
+import parse from './_parser';
 
 test('parses a page title', t => {
   const data = `# Title
@@ -49,6 +45,3 @@ page two description
   t.is(result.pages[0].description, expected[0].description);
   t.is(result.pages[1].description, expected[1].description);
 });
-
-test.todo('parses an onPageComplete');
-test.todo('throws when multiple onPageCompletes');

test/task-hint.js

@@ -1,9 +1,5 @@
 import test from 'ava';
-import pegjs from 'pegjs';
-import { readFileSync } from 'fs';
-
-const parser = readFileSync('../parser/index.pegjs', 'utf8');
-const parse = pegjs.buildParser(parser).parse;
+import parse from './_parser';
 
 test('parses a task hint', t => {
   const data = `# Title
@@ -78,3 +74,5 @@ description
     const result = parse(data);
     t.deepEqual(result.pages[0].tasks, expected);
 });
+
+test.todo('parses multiline task hints');

test/task-test.js

@@ -1,9 +1,5 @@
 import test from 'ava';
-import pegjs from 'pegjs';
-import { readFileSync } from 'fs';
-
-const parser = readFileSync('../parser/index.pegjs', 'utf8');
-const parse = pegjs.buildParser(parser).parse;
+import parse from './_parser';
 
 test('parses a task test', t => {
   const data = `# Title