prettify-bru 1.9.1 → 1.9.2

package/lib/format.mjs

@@ -25,6 +25,9 @@ const formattableBlocks = [
     'tests',
 ]
 
+const maskPattern = /("(?:\\.|[^"\\])*")|(\{\{.*?\}\})/g
+const unmaskPattern = /"__⇎⇎START__(\{\{.*?\}\})__END⇎⇎__"/g
+
 /**
  * @typedef {Object} FileOutcome
  * @property {string} newContents
@@ -140,8 +143,12 @@ async function formatBlock(fileContents, blockName, config) {
             if (blockName === 'body:graphql') {
                 opts.parser = 'graphql'
                 opts.bracketSpacing = true
+                unindented = wrapNonStringPlaceholdersInDelimiters(unindented)
             }
             reformatted = await prettier.format(unindented, opts)
+            if (blockName === 'body:graphql') {
+                reformatted = unwrapDelimitedPlaceholders(reformatted)
+            }
         } catch (e) {
             outcome.errorMessage = `Prettier could not format ${blockName} because...\n${e.message}`
             return outcome
@@ -189,23 +196,33 @@ function shortenGetters(blockContents) {
 }
 
 /**
- * Turns Bruno variable placeholders into strings with special delimiters, effectively making it valid JSON
+ * Turns Bruno variable placeholders into strings with special delimiters, effectively making it valid JSON,
+ * and for standard cases also valid GraphQL.
  *
- * @param {string} jsonBlock
+ * @param {string} block
  * @returns {string}
  */
-function wrapNonStringPlaceholdersInDelimiters(jsonBlock) {
-    return jsonBlock.replace(/(:[^"]*)([{]{2}[^}]+}})([^"⇎])/g, '$1"⇎$2⇎"$3')
+function wrapNonStringPlaceholdersInDelimiters(block) {
+    return block.replace(maskPattern, (match, group1, group2) => {
+        // If group1 exists, we found a standard JSON string. Return it untouched.
+        if (group1) {
+            return group1
+        }
+
+        // If group2 exists, we found a placeholder outside a string.
+        // Wrap it in a unique dummy string.
+        return `"__⇎⇎START__${group2}__END⇎⇎__"`
+    })
 }
 
 /**
  * Reverts delimited Bruno variable placeholders back to their original form within a JSON block.
  *
- * @param {string} jsonBlock
+ * @param {string} block
  * @returns {string}
  */
-function unwrapDelimitedPlaceholders(jsonBlock) {
-    return jsonBlock.replace(/"⇎({{[^}]+}})⇎"/g, '$1')
+function unwrapDelimitedPlaceholders(block) {
+    return block.replace(unmaskPattern, '$1')
 }
 
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prettify-bru",
-  "version": "1.9.1",
+  "version": "1.9.2",
   "description": "Prettifies JSON, JavaScript and GraphQL blocks in Bruno .bru files",
   "keywords": [
     "bruno",