From 1110a4edda71db09ac4ec24bb705a2daa37053d0 Mon Sep 17 00:00:00 2001
From: Anoop M D <anoop.md1421@gmail.com>
Date: Tue, 7 Feb 2023 02:12:23 +0530
Subject: [PATCH] fix: fixed gql related issues

---
 packages/bruno-electron/src/bru/index.js |  2 +-
 packages/bruno-js/src/bruno-request.js   | 28 ++++++++++++++----------
 packages/bruno-js/src/bruno-response.js  | 20 ++++++++---------
 packages/bruno-js/src/script-runtime.js  | 16 +++++++-------
 packages/bruno-js/src/test-runtime.js    | 12 +++++-----
 packages/bruno-lang/v2/src/jsonToBru.js  |  4 ++--
 6 files changed, 43 insertions(+), 39 deletions(-)

diff --git a/packages/bruno-electron/src/bru/index.js b/packages/bruno-electron/src/bru/index.js
index bb28aa74c..bee248e22 100644
--- a/packages/bruno-electron/src/bru/index.js
+++ b/packages/bruno-electron/src/bru/index.js
@@ -72,7 +72,7 @@ const bruToJson = (bru) => {
       }
     };
 
-    transformedJson.request.body.mode = _.get(json, "http.mode", "none");
+    transformedJson.request.body.mode = _.get(json, "http.body", "none");
 
     return transformedJson;
   } catch (e) {
diff --git a/packages/bruno-js/src/bruno-request.js b/packages/bruno-js/src/bruno-request.js
index 215f9d6a6..9d6029463 100644
--- a/packages/bruno-js/src/bruno-request.js
+++ b/packages/bruno-js/src/bruno-request.js
@@ -1,46 +1,50 @@
 class BrunoRequest {
-  constructor(request) {
-    this._request = request;
+  constructor(req) {
+    this.req = req;
+    this.url = req.url;
+    this.method = req.method;
+    this.headers = req.headers;
+    this.body = req.data;
   }
 
   getUrl() {
-    return this._request.url;
+    return this.req.url;
   }
 
   setUrl(url) {
-    this._request.url = url;
+    this.req.url = url;
   }
 
   getMethod() {
-    return this._request.method;
+    return this.req.method;
   }
 
   setMethod(method) {
-    this._request.method = method;
+    this.req.method = method;
   }
 
   getHeaders() {
-    return this._request.headers;
+    return this.req.headers;
   }
 
   setHeaders(headers) {
-    this._request.headers = headers;
+    this.req.headers = headers;
   }
 
   getHeader(name) {
-    return this._request.headers[name];
+    return this.req.headers[name];
   }
 
   setHeader(name, value) {
-    this._request.headers[name] = value;
+    this.req.headers[name] = value;
   }
 
   getBody() {
-    return this._request.data;
+    return this.req.data;
   }
 
   setBody(data) {
-    this._request.data = data;
+    this.req.data = data;
   }
 }
 
diff --git a/packages/bruno-js/src/bruno-response.js b/packages/bruno-js/src/bruno-response.js
index 713f97c97..4f6407256 100644
--- a/packages/bruno-js/src/bruno-response.js
+++ b/packages/bruno-js/src/bruno-response.js
@@ -1,26 +1,26 @@
 class BrunoResponse {
-  constructor(response) {
-    this._response = response;
-    this.status = response.status;
-    this.statusText = response.statusText;
-    this.headers = response.headers;
-    this.body = response.data;
+  constructor(res) {
+    this.res = res;
+    this.status = res.status;
+    this.statusText = res.statusText;
+    this.headers = res.headers;
+    this.body = res.data;
   }
 
   getStatus() {
-    return this._response.status;
+    return this.res.status;
   }
 
   getHeader(name) {
-    return this._response.header[name];
+    return this.res.header[name];
   }
 
   getHeaders() {
-    return this._response.headers;
+    return this.res.headers;
   }
 
   getBody() {
-    return this._response.data;
+    return this.res.data;
   }
 }
 
diff --git a/packages/bruno-js/src/script-runtime.js b/packages/bruno-js/src/script-runtime.js
index da084e680..b8ef04cd0 100644
--- a/packages/bruno-js/src/script-runtime.js
+++ b/packages/bruno-js/src/script-runtime.js
@@ -18,12 +18,12 @@ class ScriptRuntime {
   }
 
   runRequestScript(script, request, environment, collectionVariables, collectionPath) {
-    const $bru = new Bru(environment, collectionVariables);
-    const $req = new BrunoRequest(request);
+    const bru = new Bru(environment, collectionVariables);
+    const req = new BrunoRequest(request);
 
     const context = {
-      $bru,
-      $req
+      bru,
+      req
     };
     const vm = new NodeVM({
       sandbox: context,
@@ -53,12 +53,12 @@ class ScriptRuntime {
   }
 
   runResponseScript(script, response, environment, collectionVariables, collectionPath) {
-    const $bru = new Bru(environment, collectionVariables);
-    const $res = new BrunoResponse(response);
+    const bru = new Bru(environment, collectionVariables);
+    const res = new BrunoResponse(response);
 
     const context = {
-      $bru,
-      $res
+      bru,
+      res
     };
     const vm = new NodeVM({
       sandbox: context,
diff --git a/packages/bruno-js/src/test-runtime.js b/packages/bruno-js/src/test-runtime.js
index 347b988d7..f1940d181 100644
--- a/packages/bruno-js/src/test-runtime.js
+++ b/packages/bruno-js/src/test-runtime.js
@@ -21,18 +21,18 @@ class TestRuntime {
   }
 
   runTests(testsFile, request, response, environment, collectionVariables, collectionPath) {
-    const $bru = new Bru(environment, collectionVariables);
-    const $req = new BrunoRequest(request);
-    const $res = new BrunoResponse(response);
+    const bru = new Bru(environment, collectionVariables);
+    const req = new BrunoRequest(request);
+    const res = new BrunoResponse(response);
 
     const __brunoTestResults = new TestResults();
     const test = Test(__brunoTestResults, chai);
 
     const context = {
       test,
-      $bru,
-      $req,
-      $res,
+      bru,
+      req,
+      res,
       expect: chai.expect,
       assert: chai.assert,
       __brunoTestResults: __brunoTestResults
diff --git a/packages/bruno-lang/v2/src/jsonToBru.js b/packages/bruno-lang/v2/src/jsonToBru.js
index 9d56fa7e2..fec91d175 100644
--- a/packages/bruno-lang/v2/src/jsonToBru.js
+++ b/packages/bruno-lang/v2/src/jsonToBru.js
@@ -42,9 +42,9 @@ const jsonToBru = (json) => {
     bru += `${http.method} {
   url: ${http.url}`;
 
-    if(http.body && http.body.length) {
+    if(http.mode && http.mode.length) {
       bru += `
-  body: ${http.body}`;
+  body: ${http.mode}`;
     }
 
     bru += `