From c8de57aa51f775899a36d4fcd5f4fd1ac6651625 Mon Sep 17 00:00:00 2001
From: Anoop M D <anoop.md1421@gmail.com>
Date: Mon, 6 Feb 2023 15:24:34 +0530
Subject: [PATCH] chore: restructure bru js package

---
 packages/bruno-cli/src/runner/bru/index.js            | 2 ++
 packages/bruno-cli/src/runner/run-single-request.js   | 4 +++-
 packages/bruno-js/package.json                        | 3 +++
 packages/bruno-js/src/{scripts => }/bru.js            | 0
 packages/bruno-js/src/{scripts => }/bruno-request.js  | 0
 packages/bruno-js/src/{scripts => }/bruno-response.js | 0
 packages/bruno-js/src/index.js                        | 4 ++--
 packages/bruno-js/src/{scripts => }/script-runtime.js | 0
 packages/bruno-js/src/{scripts => }/test-results.js   | 0
 packages/bruno-js/src/{scripts => }/test-runtime.js   | 0
 packages/bruno-js/src/{scripts => }/test.js           | 0
 11 files changed, 10 insertions(+), 3 deletions(-)
 rename packages/bruno-js/src/{scripts => }/bru.js (100%)
 rename packages/bruno-js/src/{scripts => }/bruno-request.js (100%)
 rename packages/bruno-js/src/{scripts => }/bruno-response.js (100%)
 rename packages/bruno-js/src/{scripts => }/script-runtime.js (100%)
 rename packages/bruno-js/src/{scripts => }/test-results.js (100%)
 rename packages/bruno-js/src/{scripts => }/test-runtime.js (100%)
 rename packages/bruno-js/src/{scripts => }/test.js (100%)

diff --git a/packages/bruno-cli/src/runner/bru/index.js b/packages/bruno-cli/src/runner/bru/index.js
index 4ad46ad31..d8a6e76fc 100644
--- a/packages/bruno-cli/src/runner/bru/index.js
+++ b/packages/bruno-cli/src/runner/bru/index.js
@@ -37,6 +37,8 @@ const bruToJson = (bru) => {
         "params": _.get(json, "query", []),
         "headers":  _.get(json, "headers", []),
         "body":  _.get(json, "body", {}),
+        "vars": _.get(json, "vars", []),
+        "assert": _.get(json, "assert", []),
         "script": _.get(json, "script", ""),
         "tests": _.get(json, "tests", "")
       }
diff --git a/packages/bruno-cli/src/runner/run-single-request.js b/packages/bruno-cli/src/runner/run-single-request.js
index f8a00f3d4..8a70c4237 100644
--- a/packages/bruno-cli/src/runner/run-single-request.js
+++ b/packages/bruno-cli/src/runner/run-single-request.js
@@ -78,7 +78,9 @@ const runSingleRequest = async function (filename, collectionPath, collectionVar
       testResults = get(result, 'results', []);
     }
 
-    console.log(chalk.blue(stripExtension(filename)) + chalk.dim(` (${response.status} ${response.statusText})`));
+    console.log(JSON.stringify(bruJson, null, 2));
+
+    console.log(chalk.green(stripExtension(filename)) + chalk.dim(` (${response.status} ${response.statusText})`));
     if(testResults && testResults.length) {
       each(testResults, (testResult) => {
         if(testResult.status === 'pass') {
diff --git a/packages/bruno-js/package.json b/packages/bruno-js/package.json
index 3094265b7..6c902174e 100644
--- a/packages/bruno-js/package.json
+++ b/packages/bruno-js/package.json
@@ -8,5 +8,8 @@
   ],
   "peerDependencies": {
     "vm2": "^3.9.13"
+  },
+  "dependencies": {
+    "json-query": "^2.2.2"
   }
 }
diff --git a/packages/bruno-js/src/scripts/bru.js b/packages/bruno-js/src/bru.js
similarity index 100%
rename from packages/bruno-js/src/scripts/bru.js
rename to packages/bruno-js/src/bru.js
diff --git a/packages/bruno-js/src/scripts/bruno-request.js b/packages/bruno-js/src/bruno-request.js
similarity index 100%
rename from packages/bruno-js/src/scripts/bruno-request.js
rename to packages/bruno-js/src/bruno-request.js
diff --git a/packages/bruno-js/src/scripts/bruno-response.js b/packages/bruno-js/src/bruno-response.js
similarity index 100%
rename from packages/bruno-js/src/scripts/bruno-response.js
rename to packages/bruno-js/src/bruno-response.js
diff --git a/packages/bruno-js/src/index.js b/packages/bruno-js/src/index.js
index 31ea7bde4..704317def 100644
--- a/packages/bruno-js/src/index.js
+++ b/packages/bruno-js/src/index.js
@@ -1,10 +1,10 @@
 const {
   ScriptRuntime
-} = require('./scripts/script-runtime');
+} = require('./script-runtime');
 
 const {
   TestRuntime
-} = require('./scripts/test-runtime');
+} = require('./test-runtime');
 
 module.exports = {
   ScriptRuntime,
diff --git a/packages/bruno-js/src/scripts/script-runtime.js b/packages/bruno-js/src/script-runtime.js
similarity index 100%
rename from packages/bruno-js/src/scripts/script-runtime.js
rename to packages/bruno-js/src/script-runtime.js
diff --git a/packages/bruno-js/src/scripts/test-results.js b/packages/bruno-js/src/test-results.js
similarity index 100%
rename from packages/bruno-js/src/scripts/test-results.js
rename to packages/bruno-js/src/test-results.js
diff --git a/packages/bruno-js/src/scripts/test-runtime.js b/packages/bruno-js/src/test-runtime.js
similarity index 100%
rename from packages/bruno-js/src/scripts/test-runtime.js
rename to packages/bruno-js/src/test-runtime.js
diff --git a/packages/bruno-js/src/scripts/test.js b/packages/bruno-js/src/test.js
similarity index 100%
rename from packages/bruno-js/src/scripts/test.js
rename to packages/bruno-js/src/test.js