feat: bruno lang - parse graphql body

packages/bruno-lang/example/request.bru

@@ -19,13 +19,13 @@ headers
 
 body(type=json)
   {
-    apikey: "secret",
+    "apikey": "secret",
-    numbers: "+91998877665",
+    "numbers": "+91998877665",
-    data: {
+    "data": {
-      sender: "TXTLCL",
+      "sender": "TXTLCL",
-      messages: [{
+      "messages": [{
-        numbers: "+91998877665",
+        "numbers": "+91998877665",
-        message: "Hello World"
+        "message": "Hello World"
       }]
     }
   }

packages/bruno-lang/src/body-tag.js

@@ -1,37 +1,18 @@
 const {
-  str,
-  sequenceOf,
-  optionalWhitespace,
-  choice,
-  endOfInput,
   between,
   regex,
-  everyCharUntil
+  everyCharUntil,
 } = require("arcsecond");
 const { safeParseJson } = require('./utils');
 
-const newline = regex(/^\r?\n/);
-const newLineOrEndOfInput = choice([newline, endOfInput]);
 
 // body(type=json)
-const bodyJsonBegin = sequenceOf([
+const bodyJsonBegin = regex(/^body\s*\(\s*type\s*=\s*json\s*\)\s*\r?\n/);
-  str('body'),
-  optionalWhitespace,
-  str('('),
-  optionalWhitespace,
-  str('type'),
-  optionalWhitespace,
-  str('='),
-  optionalWhitespace,
-  str('json'),
-  optionalWhitespace,
-  regex(/^\)\s*\r?\n/),
-]);
 
-const bodyEnd = sequenceOf([
+// body(type=graphql)
-  regex(/^\/body\s*/),
+const bodyGraphqlBegin = regex(/^body\s*\(\s*type\s*=\s*graphql\s*\)\s*\r?\n/);
-  newLineOrEndOfInput
+
-]);
+const bodyEnd = regex(/^\/body\s*[\r?\n]*/);
 
 const bodyJsonTag = between(bodyJsonBegin)(bodyEnd)(everyCharUntil(bodyEnd)).map((bodyJson) => {
   if(bodyJson && bodyJson.length) {
@@ -40,20 +21,37 @@ const bodyJsonTag = between(bodyJsonBegin)(bodyEnd)(everyCharUntil(bodyEnd)).map
 
     if(!safelyParsed) {
       return {
-        bodyJson
+        body: {
+          json: bodyJson
+        }
       }
     }
 
     return {
-      bodyJson: JSON.stringify(safelyParsed)
+      body: {
+        json: JSON.stringify(safelyParsed)
+      }
     };
   }
 
   return {
-    bodyJson
+    body: {
+      json: bodyJson
+    }
   };
 });
 
+const bodyGraphqlTag = between(bodyGraphqlBegin)(bodyEnd)(everyCharUntil(bodyEnd)).map((bodyGraphql) => {
+  return {
+    body: {
+      graphql: {
+        query: bodyGraphql
+      }
+    }
+  }
+});
+
 module.exports = {
-  bodyJsonTag
+  bodyJsonTag,
+  bodyGraphqlTag
 };

packages/bruno-lang/src/index.js

@@ -3,12 +3,14 @@ const {
   choice,
   anyChar
 } = require("arcsecond");
+const _ = require('lodash');
 
 const inlineTag  = require('./inline-tag');
 const paramsTag  = require('./params-tag');
 const headersTag = require('./headers-tag');
 const {
-  bodyJsonTag
+  bodyJsonTag,
+  bodyGraphqlTag
 } = require('./body-tag');
 
 const bruToJson = (fileContents) => {
@@ -17,18 +19,14 @@ const bruToJson = (fileContents) => {
     paramsTag,
     headersTag,
     bodyJsonTag,
+    bodyGraphqlTag,
     anyChar
   ]));
 
   const parsed = parser
     .run(fileContents)
     .result
-    .reduce((acc, item) => {
+    .reduce((acc, item) => _.merge(acc, item), {});
-      return {
-        ...acc,
-        ...item
-      };
-    }, {});
 
   return {
     ver: parsed.ver,
@@ -38,7 +36,7 @@ const bruToJson = (fileContents) => {
     url: parsed.url,
     params: parsed.params,
     headers: parsed.headers,
-    bodyJson: parsed.bodyJson
+    body: parsed.body
   }
 };
 

packages/bruno-lang/tests/body-tag.spec.js

@@ -5,7 +5,7 @@ describe('bodyJsonTag', () => {
   const testbodyJson = (input, expected) => {
     const result = bodyJsonTag.run(input);
     expect(result.isError).toBe(false);
-    expect(result.result.bodyJson).toEqual('{"foo":"bar"}');
+    expect(result.result.body.json).toEqual('{"foo":"bar"}');
   };
 
   // simple case

packages/bruno-lang/tests/fixtures/request.bru

@@ -24,3 +24,11 @@ body(type=json)
   }
 /body
 
+body(type=graphql)
+  {
+    launchesPast {
+      launch_success
+    }
+  }
+/body
+

packages/bruno-lang/tests/parser.spec.js

@@ -50,7 +50,12 @@ describe('bruToJson', () => {
           "value": "{{transactionId}}"
         }
       ],
-      "bodyJson": '{"apikey":"secret","numbers":"+91998877665"}'
+      "body": {
+        "json": '{"apikey":"secret","numbers":"+91998877665"}',
+        "graphql": {
+          "query": "  {\n    launchesPast {\n      launch_success\n    }\n  }\n"
+        }
+      }
     });
   });
 });