update to pegjs@0.10, restructure pegjs file compiler

Author: ShMcK

package.json

@@ -8,11 +8,11 @@
   "main": "parser/index.pegjs",
   "scripts": {
     "test": "ava",
-    "test:watch": "ava --watch"
+    "test:watch": "ava --watch",
+    "start": "node ./parser/compile/index.js"
   },
   "dependencies": {
-    "pegjs": "^0.9.0",
-    "pegjs-import": "^0.2.6"
+    "pegjs": "^0.10.0"
   },
   "devDependencies": {
     "ava": "^0.16.0"

parser/compile/index.js

@@ -0,0 +1,12 @@
+const { readFileSync, writeFileSync } = require('fs');
+const { join } = require('path');
+const pegjs = require('pegjs');
+const loadImports = require('./loadImports');
+
+let compiled = '';
+const start = readFileSync(join(__dirname, '../pegjs/start.pegjs'), 'utf8');
+
+compiled += loadImports(start);
+
+// output parser file
+writeFileSync(join(__dirname, '../index.pegjs'), compiled, 'utf8');

parser/compile/loadImports.js

@@ -0,0 +1,16 @@
+const { readFileSync } = require('fs');
+const { join } = require('path');
+
+const importPath = /^@import\((.+)\)$/gm;
+
+function loadImports(str) {
+  const imports = str.match(importPath);
+  imports.forEach(i => {
+    const fileName = i.slice(9, -2) + '.pegjs';
+    const file = readFileSync(join(__dirname, '../pegjs/', fileName), 'utf8');
+    str = str.replace(i, file);
+  });
+  return str;
+}
+
+module.exports = loadImports;

parser/index.pegjs

@@ -12,30 +12,32 @@
     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);
+    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;
+    return str;
   }
   function trimBrackets(str) {
-  	return trim({
-    	desc: 'bracket',
+    return trim({
+      desc: 'bracket',
       str: str,
       first: /\(/,
       last: /\)/,
     });
   }
   function trimQuotes(str) {
-  	return trim({
-    	desc: 'quote',
+    return trim({
+      desc: 'quote',
       str,
       first: /[\"\'\`]/
     });
   }
   function trimBracketsAndQuotes(str) {
     return trimQuotes(trimBrackets(str));
   }
+
+
 }
 
 start
@@ -81,13 +83,11 @@ page_task
 
 page_actions
   = on_page_complete
-  / page_import
 
 task_actions
   = test: task_test
   / hint: task_hint
   / action: task_action
-  / onPageComplete: on_page_complete
 
 info_title
   = '#'
@@ -125,6 +125,26 @@ task_hint
   	return { type: 'hints', value: h };
   }
 
+
+on_page_complete
+	= '@onPageComplete'
+    '('
+    quote
+    content: .+
+    quote
+    ')'
+  { return { type: 'onPageComplete', value: content.join('') }; }
+
+page_import
+	= '@import'
+    '('
+    quote
+    filePath: file_path
+    quote
+    ')'
+    break
+  { return filePath.join(''); }
+
 task_action
 	= '@action'
     '('
@@ -183,30 +203,9 @@ action_write_from_file
     quote
     ')'
 
-on_page_complete
-	= '@onPageComplete'
-    '('
-    quote
-    content: .+
-    quote
-    ')'
-  { return { type: 'onPageComplete', value: content.join('') }; }
-
-page_import
-	= '@import'
-    '('
-    quote
-    filePath: file_path
-    quote
-    ')'
-    break
-  { return filePath.join(''); }
-
-
-// characters
-
 content = [^#^@^+] [^\n^\r]+ [\n\r]
 space = [ \s]
 break = [\n\r]?
 file_path = [a-z_\-\s0-9\.]+
 quote = [\"\'\`]
+

parser/action.pegjs renamed to parser/pegjs/action.pegjs

@@ -0,0 +1,5 @@
+content = [^#^@^+] [^\n^\r]+ [\n\r]
+space = [ \s]
+break = [\n\r]?
+file_path = [a-z_\-\s0-9\.]+
+quote = [\"\'\`]

parser/pegjs/common.pegjs

@@ -0,0 +1,28 @@
+  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;
+  }
+  function trimBrackets(str) {
+    return trim({
+      desc: 'bracket',
+      str: str,
+      first: /\(/,
+      last: /\)/,
+    });
+  }
+  function trimQuotes(str) {
+    return trim({
+      desc: 'quote',
+      str,
+      first: /[\"\'\`]/
+    });
+  }
+  function trimBracketsAndQuotes(str) {
+    return trimQuotes(trimBrackets(str));
+  }

parser/pegjs/functions.pegjs

@@ -0,0 +1,121 @@
+{
+  // final parsed output for coderoad.json file
+  var output = {
+    info: {
+      title: 'Tutorial Title',
+      description: '',
+    },
+    pages: []
+  };
+
+@import('./functions')
+
+}
+
+start
+  = doc
+  { return output; }
+
+doc
+  = info
+  	break?
+	  page*
+
+info
+  = title: info_title
+  	description: description*
+  {
+    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,
+    });
+  }
+
+page_task
+	= '+'
+    space?
+  	description: description
+    actions: task_actions*
+    break?
+
+  { let task = { description, tests: [], hints: [] };
+	  actions.forEach(({type, value}) => task[type].push(value));
+	  return task;
+  }
+
+page_actions
+  = on_page_complete
+
+task_actions
+  = test: task_test
+  / hint: task_hint
+  / action: task_action
+
+info_title
+  = '#'
+    space?
+    title: content
+  { return adjust(title); }
+
+page_title
+  = '##'
+    space?
+    title: content
+    break
+  { return adjust(title); }
+
+description
+  = description: content
+    break
+  { return adjust(description); }
+
+task_test
+	= '@test'
+    '('
+    quote
+    testPath: [^\n^\r^\'\"\`)]+
+	  quote
+    ')'
+    break
+  { return { type: 'tests', value: testPath.join('') }; }
+
+task_hint
+	= '@hint'
+    hint: [^\n^\r]+
+    break
+  { let h = trimBracketsAndQuotes(hint.join(''));
+  	return { type: 'hints', value: h };
+  }
+
+
+on_page_complete
+	= '@onPageComplete'
+    '('
+    quote
+    content: .+
+    quote
+    ')'
+  { return { type: 'onPageComplete', value: content.join('') }; }
+
+page_import
+	= '@import'
+    '('
+    quote
+    filePath: file_path
+    quote
+    ')'
+    break
+  { return filePath.join(''); }
+
+@import('./action')
+@import('./common')

parser/pegjs/start.pegjs

@@ -1,13 +1,7 @@
-const { readFileSync } = require('fs');
+const { readFileSync, writeFileSync } = 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;
+const parser = readFileSync('../parser/index.pegjs', 'utf8');
+const parse = pegjs.generate(parser).parse;
 
 module.exports = parse;