refactor: organized v1 and v2 versions inside bru-lang

packages/bruno-lang/src/index.js

@@ -1,250 +1,17 @@
 const {
-  many,
-  choice,
-  anyChar
-} = require("arcsecond");
-const _ = require('lodash');
-const {
-  indentString,
-  outdentString,
-  get
-} = require('./utils');
+  bruToJson,
+  jsonToBru,
+  bruToEnvJson,
+  envJsonToBru
+} = require('./v1/src');
 
-const inlineTag  = require('./inline-tag');
-const paramsTag  = require('./params-tag');
-const headersTag = require('./headers-tag');
-const {
-  bodyJsonTag,
-  bodyGraphqlTag,
-  bodyGraphqlVarsTag,
-  bodyTextTag,
-  bodyXmlTag,
-  bodyFormUrlEncodedTagDeprecated,
-  bodyFormUrlEncodedTag,
-  bodyMultipartFormTag
-} = require('./body-tag');
-const scriptTag  = require('./script-tag');
-const testsTag   = require('./tests-tag');
-
-const bruToJson = (fileContents) => {
-  const parser = many(choice([
-    inlineTag,
-    paramsTag,
-    headersTag,
-    bodyJsonTag,
-    bodyGraphqlTag,
-    bodyGraphqlVarsTag,
-    bodyTextTag,
-    bodyXmlTag,
-    bodyFormUrlEncodedTagDeprecated,
-    bodyFormUrlEncodedTag,
-    bodyMultipartFormTag,
-    scriptTag,
-    testsTag,
-    anyChar
-  ]));
-
-  const parsed = parser
-    .run(fileContents)
-    .result
-    .reduce((acc, item) => _.merge(acc, item), {});
-
-  const json = {
-    type: parsed.type || '',
-    name: parsed.name || '',
-    seq: parsed.seq ? Number(parsed.seq) : 1,
-    request: {
-      method: parsed.method || '',
-      url: parsed.url || '',
-      params: parsed.params || [],
-      headers: parsed.headers || [],
-      body: parsed.body || {mode: 'none'},
-      script: parsed.script ? outdentString(parsed.script) : '',
-      tests: parsed.tests ? outdentString(parsed.tests) : ''
-    }
-  };
-
-  const body = get(json, 'request.body');
-
-  if(body && body.text) {
-    body.text = outdentString(body.text);
-  }
-
-  if(body && body.json) {
-    body.json = outdentString(body.json);
-  }
-
-  if(body && body.xml) {
-    body.xml = outdentString(body.xml);
-  }
-
-  if(body && body.graphql && body.graphql.query) {
-    body.graphql.query = outdentString(body.graphql.query);
-  }
-
-  if(body && body.graphql && body.graphql.variables) {
-    body.graphql.variables = outdentString(body.graphql.variables);
-  }
-
-  return json;
-};
-
-const jsonToBru = (json) => {
-  const {
-    type,
-    name,
-    seq,
-    request: {
-      method,
-      url,
-      params,
-      headers,
-      body,
-      script,
-      tests
-    }
-  } = json;
-
-  let bru = `name ${name}
-method ${method}
-url ${url}
-type ${type}
-body-mode ${body ? body.mode : 'none'}
-seq ${seq ? seq : 1}
-`;
-
-  if(params && params.length) {
-    bru += `
-params
-${params.map(param => `  ${param.enabled ? 1 : 0} ${param.name} ${param.value}`).join('\n')}
-/params
-`;
-  }
-
-  if(headers && headers.length) {
-    bru += `
-headers
-${headers.map(header => `  ${header.enabled ? 1 : 0} ${header.name} ${header.value}`).join('\n')}
-/headers
-`;
-  }
-
-  if(body && body.json && body.json.length) {
-    bru += `
-body(type=json)
-${indentString(body.json)}
-/body
-`;
-  }
-
-  if(body && body.graphql && body.graphql.query) {
-    bru += `
-body(type=graphql)
-${indentString(body.graphql.query)}
-/body
-`;
-  }
-
-  if(body && body.graphql && body.graphql.variables) {
-    bru += `
-body(type=graphql-vars)
-${indentString(body.graphql.variables)}
-/body
-`;
-  }
-
-  if(body && body.text && body.text.length) {
-    bru += `
-body(type=text)
-${indentString(body.text)}
-/body
-`;
-  }
-
-  if(body && body.xml && body.xml.length) {
-    bru += `
-body(type=xml)
-${indentString(body.xml)}
-/body
-`;
-  }
-
-  if(body && body.formUrlEncoded && body.formUrlEncoded.length) {
-    bru += `
-body(type=form-urlencoded)
-${body.formUrlEncoded.map(item => `  ${item.enabled ? 1 : 0} ${item.name} ${item.value}`).join('\n')}
-/body
-`;
-  }
-
-  if(body && body.multipartForm && body.multipartForm.length) {
-    bru += `
-body(type=multipart-form)
-${body.multipartForm.map(item => `  ${item.enabled ? 1 : 0} ${item.name} ${item.value}`).join('\n')}
-/body
-`;
-  }
-
-  if(script && script.length) {
-    bru += `
-script
-${indentString(script)}
-/script
-`;
-  }
-
-  if(tests && tests.length) {
-    bru += `
-tests
-${indentString(tests)}
-/tests
-`;
-  }
-
-  return bru;
-};
-
-// env
-const envVarsTag = require('./env-vars-tag');
-
-const bruToEnvJson = (fileContents) => {
-  const parser = many(choice([
-    envVarsTag,
-    anyChar
-  ]));
-
-  const parsed = parser
-    .run(fileContents)
-    .result
-    .reduce((acc, item) => _.merge(acc, item), {});
-
-  const json = {
-    variables: parsed.variables || []
-  };
-
-  return json;
-};
-
-const envJsonToBru = (json) => {
-  const {
-    variables
-  } = json;
-
-  let bru = '';
-
-  if(variables && variables.length) {
-    bru += `vars
-${variables.map(item => `  ${item.enabled ? 1 : 0} ${item.name} ${item.value}`).join('\n')}
-/vars
-`;
-  }
-
-  return bru;
-};
+const bruToJsonV2 = require('./v2/src/bruToJson');
 
 module.exports = {
   bruToJson,
   jsonToBru,
   bruToEnvJson,
-  envJsonToBru
+  envJsonToBru,
+
+  bruToJsonV2
 };

packages/bruno-lang/v1/src/index.js

@@ -0,0 +1,250 @@
+const {
+  many,
+  choice,
+  anyChar
+} = require("arcsecond");
+const _ = require('lodash');
+const {
+  indentString,
+  outdentString,
+  get
+} = require('./utils');
+
+const inlineTag  = require('./inline-tag');
+const paramsTag  = require('./params-tag');
+const headersTag = require('./headers-tag');
+const {
+  bodyJsonTag,
+  bodyGraphqlTag,
+  bodyGraphqlVarsTag,
+  bodyTextTag,
+  bodyXmlTag,
+  bodyFormUrlEncodedTagDeprecated,
+  bodyFormUrlEncodedTag,
+  bodyMultipartFormTag
+} = require('./body-tag');
+const scriptTag  = require('./script-tag');
+const testsTag   = require('./tests-tag');
+
+const bruToJson = (fileContents) => {
+  const parser = many(choice([
+    inlineTag,
+    paramsTag,
+    headersTag,
+    bodyJsonTag,
+    bodyGraphqlTag,
+    bodyGraphqlVarsTag,
+    bodyTextTag,
+    bodyXmlTag,
+    bodyFormUrlEncodedTagDeprecated,
+    bodyFormUrlEncodedTag,
+    bodyMultipartFormTag,
+    scriptTag,
+    testsTag,
+    anyChar
+  ]));
+
+  const parsed = parser
+    .run(fileContents)
+    .result
+    .reduce((acc, item) => _.merge(acc, item), {});
+
+  const json = {
+    type: parsed.type || '',
+    name: parsed.name || '',
+    seq: parsed.seq ? Number(parsed.seq) : 1,
+    request: {
+      method: parsed.method || '',
+      url: parsed.url || '',
+      params: parsed.params || [],
+      headers: parsed.headers || [],
+      body: parsed.body || {mode: 'none'},
+      script: parsed.script ? outdentString(parsed.script) : '',
+      tests: parsed.tests ? outdentString(parsed.tests) : ''
+    }
+  };
+
+  const body = get(json, 'request.body');
+
+  if(body && body.text) {
+    body.text = outdentString(body.text);
+  }
+
+  if(body && body.json) {
+    body.json = outdentString(body.json);
+  }
+
+  if(body && body.xml) {
+    body.xml = outdentString(body.xml);
+  }
+
+  if(body && body.graphql && body.graphql.query) {
+    body.graphql.query = outdentString(body.graphql.query);
+  }
+
+  if(body && body.graphql && body.graphql.variables) {
+    body.graphql.variables = outdentString(body.graphql.variables);
+  }
+
+  return json;
+};
+
+const jsonToBru = (json) => {
+  const {
+    type,
+    name,
+    seq,
+    request: {
+      method,
+      url,
+      params,
+      headers,
+      body,
+      script,
+      tests
+    }
+  } = json;
+
+  let bru = `name ${name}
+method ${method}
+url ${url}
+type ${type}
+body-mode ${body ? body.mode : 'none'}
+seq ${seq ? seq : 1}
+`;
+
+  if(params && params.length) {
+    bru += `
+params
+${params.map(param => `  ${param.enabled ? 1 : 0} ${param.name} ${param.value}`).join('\n')}
+/params
+`;
+  }
+
+  if(headers && headers.length) {
+    bru += `
+headers
+${headers.map(header => `  ${header.enabled ? 1 : 0} ${header.name} ${header.value}`).join('\n')}
+/headers
+`;
+  }
+
+  if(body && body.json && body.json.length) {
+    bru += `
+body(type=json)
+${indentString(body.json)}
+/body
+`;
+  }
+
+  if(body && body.graphql && body.graphql.query) {
+    bru += `
+body(type=graphql)
+${indentString(body.graphql.query)}
+/body
+`;
+  }
+
+  if(body && body.graphql && body.graphql.variables) {
+    bru += `
+body(type=graphql-vars)
+${indentString(body.graphql.variables)}
+/body
+`;
+  }
+
+  if(body && body.text && body.text.length) {
+    bru += `
+body(type=text)
+${indentString(body.text)}
+/body
+`;
+  }
+
+  if(body && body.xml && body.xml.length) {
+    bru += `
+body(type=xml)
+${indentString(body.xml)}
+/body
+`;
+  }
+
+  if(body && body.formUrlEncoded && body.formUrlEncoded.length) {
+    bru += `
+body(type=form-urlencoded)
+${body.formUrlEncoded.map(item => `  ${item.enabled ? 1 : 0} ${item.name} ${item.value}`).join('\n')}
+/body
+`;
+  }
+
+  if(body && body.multipartForm && body.multipartForm.length) {
+    bru += `
+body(type=multipart-form)
+${body.multipartForm.map(item => `  ${item.enabled ? 1 : 0} ${item.name} ${item.value}`).join('\n')}
+/body
+`;
+  }
+
+  if(script && script.length) {
+    bru += `
+script
+${indentString(script)}
+/script
+`;
+  }
+
+  if(tests && tests.length) {
+    bru += `
+tests
+${indentString(tests)}
+/tests
+`;
+  }
+
+  return bru;
+};
+
+// env
+const envVarsTag = require('./env-vars-tag');
+
+const bruToEnvJson = (fileContents) => {
+  const parser = many(choice([
+    envVarsTag,
+    anyChar
+  ]));
+
+  const parsed = parser
+    .run(fileContents)
+    .result
+    .reduce((acc, item) => _.merge(acc, item), {});
+
+  const json = {
+    variables: parsed.variables || []
+  };
+
+  return json;
+};
+
+const envJsonToBru = (json) => {
+  const {
+    variables
+  } = json;
+
+  let bru = '';
+
+  if(variables && variables.length) {
+    bru += `vars
+${variables.map(item => `  ${item.enabled ? 1 : 0} ${item.name} ${item.value}`).join('\n')}
+/vars
+`;
+  }
+
+  return bru;
+};
+
+module.exports = {
+  bruToJson,
+  jsonToBru,
+  bruToEnvJson,
+  envJsonToBru
+};

packages/bruno-lang/v2/tests/dictionary.spec.js

@@ -2,7 +2,7 @@
  * This test file is used to test the text parser.
  */
 
-const parser = require("../src/index");
+const parser = require("../src/bruToJson");
 
 const assertSingleHeader = (input) => {
   const output = parser(input);

packages/bruno-lang/v2/tests/index.spec.js

@@ -1,6 +1,6 @@
 const fs = require("fs");
 const path = require("path");
-const parser = require("../src/index");
+const parser = require("../src/bruToJson");
 
 describe("parser", () => {
   it("should parse the bru file", () => {

packages/bruno-lang/v2/tests/text.spec.js

@@ -1,7 +1,7 @@
 /**
  * This test file is used to test the text parser.
  */
-const parser = require("../src/index");
+const parser = require("../src/bruToJson");
 
 describe("script parser", () => {
   it("should parse script body", () => {