Properly escape already escaped double quotes in curl body

Author: webholik

.eslintrc

@@ -8,6 +8,9 @@
     "node": true,
     "es6": true
   },
+  "parserOptions": {
+    "ecmaVersion": 2018
+  },
   "rules": {
     // Possible Errors
     "for-direction": "error",

codegens/curl/lib/index.js

@@ -76,7 +76,7 @@ self = module.exports = {
         // If the header value is an empty string then add a semicolon after key
         // otherwise the header would be ignored by curl
         if (header.value) {
-          snippet += `: ${sanitize(header.value, false, quoteType)}${quoteType}`;
+          snippet += `: ${sanitize(header.value, false, quoteType, true)}${quoteType}`;
         }
         else {
           snippet += ';' + quoteType;

codegens/curl/lib/util.js

@@ -5,7 +5,7 @@ var self = module.exports = {
      *
      * @param {String} inputString
      * @param {Boolean} [trim] - indicates whether to trim string or not
-     * @param {Boolean} [quoteType] - indicates which quoteType has to be escaped
+     * @param {String} [quoteType] - indicates which quoteType has to be escaped
      * @param {Boolean} [backSlash] - indicates whether to escape backslash(\\)
      * @returns {String}
      */
@@ -20,6 +20,8 @@ var self = module.exports = {
 
     if (quoteType === '"') {
       inputString = inputString.replace(/"/g, '\\"');
+      // Escape backslash if double quote was already escaped before call to sanitize
+      inputString = inputString.replace(/(?<!\\)\\\\"/g, '\\\\\\"');
     }
     else if (quoteType === '\'') {
       // for curl escaping of single quotes inside single quotes involves changing of ' to '\''

test/codegen/newman/fixtures/basicCollection.json

@@ -288,7 +288,7 @@
 				"body": {
 					"mode": "graphql",
 					"graphql": {
-						"query": "{\n    body{\n        graphql\n    }\n}",
+						"query": "{\n  findScenes(\n    filter: {per_page: 0}\n    scene_filter: {is_missing: \"performers\"}){\n    count\n    scenes {\n      id\n      title\n      path\n    }\n  }\n}",
 						"variables": "{\n\t\"variable_key\": \"variable_value\"\n}"
 					}
 				},