tests passing for multiline code blocks

Author: ShMcK

package.json

@@ -7,7 +7,7 @@
   "author": "Shawn McKay <shawn.j.mckay@gmail.com>",
   "main": "parser/index.pegjs",
   "scripts": {
-    "test": "ava",
+    "test": "npm start && ava",
     "test:watch": "ava --watch",
     "start": "node ./parser/compile/index.js"
   },

parser/index.pegjs

@@ -201,9 +201,7 @@ task_action
 	= '@action'
     '('
     value: action_type
-		')'
-		break
-
+		// must complete with ')' & \n
 	{
 		return {
 			type: 'actions',
@@ -223,28 +221,41 @@ action_open
     '('
     file: file_path
     ')'
+		break?
+		')'
 	{ return `open(${file})`; }
 
 action_insert
   = 'insert'
-    content: ( between_code_block / between_brackets )
+    content:
+	(
+		between_code_block_and_brackets
+	/ between_brackets
+	)
+		break?
+		')'
 	{ return `insert(\"${content}\")`; }
 
 action_set
   = 'set'
-    content: ( between_code_block / between_brackets )
+    content: (
+		between_code_block_and_brackets
+	/ between_brackets
+		)
+		break?
+		')'
 	{ return `set(\"${content}\")`; }
 
 action_write
   = 'write'
     '('
     to: file_path
     ',' space?
-    quote
-    content: [^\'\"]+ // TODO: make this more flexible
-    quote
-    ')'
-	{ return `write(${to}, \"${adjust(content)}\")`}
+    content: ( between_code_block_with_closing_bracket
+			/ until_end_quote_bracket ) // TODO: make this more flexible
+		break?
+
+	{ return `write(${to}, \"${content}\")`}
 
 action_write_from_file
   = 'writeFromFile'
@@ -253,6 +264,8 @@ action_write_from_file
     ',' space?
     from: file_path
     ')'
+		break?
+		')'
 	{ return `writeFromFile(${to}, ${from})`; }
 
 /*** "pegjs/shared.pegjs" ***/
@@ -293,13 +306,33 @@ between_brackets
   { return trimQuotes(adjust(content)); }
 
 between_code_block
-  = '('
-    break?
+  = break?
     code_block
     break?
-    content: ( [^\`]+ / '`' [^\`]+ )+
+    content: ( [^\`]+ / '`' [^\`]+ )+ // not three back ticks
     code_block
     break?
-    ')'
   { return adjust(content); }
 
+between_code_block_and_brackets
+  = '('
+    content: between_code_block
+    ')'
+  { return content; }
+
+between_code_block_with_closing_bracket
+  = content: between_code_block
+  ')'
+  break?
+  ')'
+  { return content; }
+
+until_end_quote_bracket
+  = content: until_end
+  {
+    // trim off final quote & bracket
+    if (content.match(/[\"\'\`][\n\r]?\)[\n\r]?\)$/)) {
+      return content.slice(1, -3);
+    }
+  }
+

parser/pegjs/characters.pegjs

@@ -27,12 +27,32 @@ between_brackets
   { return trimQuotes(adjust(content)); }
 
 between_code_block
-  = '('
-    break?
+  = break?
     code_block
     break?
-    content: ( [^\`]+ / '`' [^\`]+ )+
+    content: ( [^\`]+ / '`' [^\`]+ )+ // not three back ticks
     code_block
     break?
-    ')'
   { return adjust(content); }
+
+between_code_block_and_brackets
+  = '('
+    content: between_code_block
+    ')'
+  { return content; }
+
+between_code_block_with_closing_bracket
+  = content: between_code_block
+  ')'
+  break?
+  ')'
+  { return content; }
+
+until_end_quote_bracket
+  = content: until_end
+  {
+    // trim off final quote & bracket
+    if (content.match(/[\"\'\`][\n\r]?\)[\n\r]?\)$/)) {
+      return content.slice(1, -3);
+    }
+  }

parser/pegjs/task-actions.pegjs

@@ -2,9 +2,7 @@ task_action
 	= '@action'
     '('
     value: action_type
-		')'
-		break
-
+		// must complete with ')' & \n
 	{
 		return {
 			type: 'actions',
@@ -24,28 +22,41 @@ action_open
     '('
     file: file_path
     ')'
+		break?
+		')'
 	{ return `open(${file})`; }
 
 action_insert
   = 'insert'
-    content: ( between_code_block / between_brackets )
+    content:
+	(
+		between_code_block_and_brackets
+	/ between_brackets
+	)
+		break?
+		')'
 	{ return `insert(\"${content}\")`; }
 
 action_set
   = 'set'
-    content: ( between_code_block / between_brackets )
+    content: (
+		between_code_block_and_brackets
+	/ between_brackets
+		)
+		break?
+		')'
 	{ return `set(\"${content}\")`; }
 
 action_write
   = 'write'
     '('
     to: file_path
     ',' space?
-    quote
-    content: [^\'\"]+ // TODO: make this more flexible
-    quote
-    ')'
-	{ return `write(${to}, \"${adjust(content)}\")`}
+    content: ( between_code_block_with_closing_bracket
+			/ until_end_quote_bracket ) // TODO: make this more flexible
+		break?
+
+	{ return `write(${to}, \"${content}\")`}
 
 action_write_from_file
   = 'writeFromFile'
@@ -54,4 +65,6 @@ action_write_from_file
     ',' space?
     from: file_path
     ')'
+		break?
+		')'
 	{ return `writeFromFile(${to}, ${from})`; }

test/actions/write.js

@@ -12,6 +12,18 @@ test('parses an action: write (single-line)', t => {
   t.deepEqual(result.pages[0].tasks[0].actions, expected);
 });
 
+test('parses an action: write (multi-line, ```)', t => {
+  const data = `${start}@action(write(\"to.js\", \`\`\`
+var a = 42;
+var b = 43;
+\`\`\`
+))
+`;
+  const expected = ["write(\"to.js\", \"var a = 42;\nvar b = 43;\")"];
+  const result = parse(data);
+  t.deepEqual(result.pages[0].tasks[0].actions, expected);
+});
+
 // writeFromFile
 
 test('parses an action: writeFromFile', t => {