further refactoring

Author: ShMcK

parser/index.pegjs

@@ -45,73 +45,78 @@ start
 doc
   = info
   	break?
-	page*
+	  page*
 
 info
   = title: info_title
   	description: description*
-   {
-   output.info.title = title;
-   output.info.description = description.join('\n');
-   }
+  {
+    output.info.title = title;
+    output.info.description = description.join('\n');
+  }
 
 page
   = title: page_title
     description: description*
     tasks: page_task*
-    {
-	 output.pages.push({
-      	title,
-        description: description.join('\n'),
-        tasks,
-      });
+  {
+    output.pages.push({
+    	title,
+      description: description.join('\n'),
+      tasks,
+    });
+  }
 
-    }
+page_task
+	= '+'
+    space?
+  	description: description
+    tests: task_test*
+    hints: task_hint*
+    break?
+
+  { return { description, tests, hints }; }
+
+info_title
+  = '#'
+    space?
+    title: content
+  { return adjust(title); }
 
 page_title
   = '##'
     space?
     title: content
     break
-   	{ return adjust(title); }
+  { return adjust(title); }
 
-page_task
-	= '+'
-    space?
-  	description: content
+description
+  = description: content
     break
-    tests: task_test*
-    hints: task_hint*
-    break?
-
-  {
-   	return {
-	  description: adjust(description),
-      tests,
-      hints,
-    };
-  }
+  { return adjust(description); }
 
 page_actions
 	= page_onComplete
-    / page_import
+  / page_import
 
 task_actions
 	= task_test
-    / task_hint
-    / task_action
+  / task_hint
+  / task_action
 
 task_test
 	= '@test'
-    '(' quote
+    '('
+    quote
     testPath: [^\n^\r^\'\"\`)]+
-	  quote ')'
+	  quote
+    ')'
     break
   { return testPath.join(''); }
 
 task_hint
 	= '@hint'
-      hint: [^\n^\r]+
+    hint: [^\n^\r]+
     break
   { return trimBracketsAndQuotes(hint.join('')); }
 
@@ -123,17 +128,16 @@ page_onComplete
 
 page_import
 	= '@import'
-
-info_title
-  = '#'
-    space?
-    title: content
-    { return adjust(title); }
-
-description
-  = description: content
+    '('
+    quote
+    filePath: file_path
+    quote
+    ')'
     break
-    { return adjust(description); }
+  { return filePath.join(''); }
+
+  
+// characters
 
 content = [^#^@^+] [^\n^\r]+ [\n\r]
 space = [ \s]

test/page.js

@@ -11,12 +11,9 @@ description
 
 ## Page One
 `;
-  const expected = [{
-    title: 'Page One',
-    description: ''
-  }];
+  const expected = 'Page One';
   const result = parse(data);
-  t.deepEqual(result.pages, expected);
+  t.is(result.pages[0].title, expected);
 });
 
 test('parses a page with empty description', t => {
@@ -26,12 +23,9 @@ description
 ## Page One
 page one description
 `;
-  const expected = [{
-    title: 'Page One',
-    description: 'page one description'
-  }];
+  const expected = 'page one description';
   const result = parse(data);
-  t.deepEqual(result.pages, expected);
+  t.is(result.pages[0].description, expected);
 });
 
 test('parses two pages', t => {
@@ -52,7 +46,8 @@ page two description
     description: 'page two description'
   }];
   const result = parse(data);
-  t.deepEqual(result.pages, expected);
+  t.is(result.pages[0].description, expected[0].description);
+  t.is(result.pages[1].description, expected[1].description);
 });
 
 test.todo('parses an onPageComplete');