@usebruno/js 0.9.2 → 0.9.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@usebruno/js",
-  "version": "0.9.2",
+  "version": "0.9.4",
   "license": "MIT",
   "main": "src/index.js",
   "files": [

package/src/bru.js

@@ -1,7 +1,7 @@
 const Handlebars = require('handlebars');
 const { cloneDeep } = require('lodash');
 
-const envVariableNameRegex = /^(?!\d)[\w-]*$/;
+const variableNameRegex = /^[\w-.]*$/;
 
 class Bru {
   constructor(envVariables, collectionVariables, processEnvVars, collectionPath) {
@@ -45,12 +45,7 @@ class Bru {
 
   setEnvVar(key, value) {
     if (!key) {
-      throw new Error('Key is required');
-    }
-
-    // gracefully ignore if key is not present in environment
-    if (!this.envVariables.hasOwnProperty(key)) {
-      return;
+      throw new Error('Creating a env variable without specifying a name is not allowed.');
     }
 
     this.envVariables[key] = value;
@@ -58,13 +53,13 @@ class Bru {
 
   setVar(key, value) {
     if (!key) {
-      throw new Error('Key is required');
+      throw new Error('Creating a variable without specifying a name is not allowed.');
     }
 
-    if (envVariableNameRegex.test(key) === false) {
+    if (variableNameRegex.test(key) === false) {
       throw new Error(
         `Variable name: "${key}" contains invalid characters!` +
-          ' Names must only contain alpha-numeric characters, "-", "_" and cannot start with a digit.'
+          ' Names must only contain alpha-numeric characters, "-", "_", "."'
       );
     }
 
@@ -72,15 +67,19 @@ class Bru {
   }
 
   getVar(key) {
-    if (envVariableNameRegex.test(key) === false) {
+    if (variableNameRegex.test(key) === false) {
       throw new Error(
         `Variable name: "${key}" contains invalid characters!` +
-          ' Names must only contain alpha-numeric characters and cannot start with a digit.'
+          ' Names must only contain alpha-numeric characters, "-", "_", "."'
       );
     }
 
     return this.collectionVariables[key];
   }
+
+  setNextRequest(nextRequest) {
+    this.nextRequest = nextRequest;
+  }
 }
 
 module.exports = Bru;

package/src/bruno-response.js

@@ -5,6 +5,7 @@ class BrunoResponse {
     this.statusText = res ? res.statusText : null;
     this.headers = res ? res.headers : null;
     this.body = res ? res.data : null;
+    this.responseTime = res ? res.responseTime : null;
   }
 
   getStatus() {
@@ -22,6 +23,10 @@ class BrunoResponse {
   getBody() {
     return this.res ? this.res.data : null;
   }
+
+  getResponseTime() {
+    return this.res ? this.res.responseTime : null;
+  }
 }
 
 module.exports = BrunoResponse;

package/src/runtime/script-runtime.js

@@ -123,7 +123,8 @@ class ScriptRuntime {
     return {
       request,
       envVariables: cleanJson(envVariables),
-      collectionVariables: cleanJson(collectionVariables)
+      collectionVariables: cleanJson(collectionVariables),
+      nextRequestName: bru.nextRequest
     };
   }
 
@@ -215,7 +216,8 @@ class ScriptRuntime {
     return {
       response,
       envVariables: cleanJson(envVariables),
-      collectionVariables: cleanJson(collectionVariables)
+      collectionVariables: cleanJson(collectionVariables),
+      nextRequestName: bru.nextRequest
     };
   }
 }

package/src/utils.js

@@ -109,6 +109,7 @@ const createResponseParser = (response = {}) => {
   res.statusText = response.statusText;
   res.headers = response.headers;
   res.body = response.data;
+  res.responseTime = response.responseTime;
 
   res.jq = (expr) => {
     const output = jsonQuery(expr, { data: response.data });