Merge pull request #7 from port-labs/jq-template-fix

Add support for quotes outside template and scaped quotes inside template
port-labs · Dec 27, 2023 · c31e127 · c31e127
2 parents 4dcf294 + 384aa6b
commit c31e127
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 2 deletions.
diff --git a/lib/template.js b/lib/template.js
@@ -8,8 +8,12 @@ const findInsideDoubleBracesIndices = (input) => {
   for (let i = 0; i < input.length; i += 1) {
     const char = input[i];
 
-    if (char === '"' || char === "'") {
-      // If inside quotes, ignore braces
+    if (insideDoubleBracesStart && char === '\\') {
+      // If next character is escaped, skip it
+      i += 1;
+    }
+    if (insideDoubleBracesStart && (char === '"' || char === "'")) {
+      // If inside double braces and inside quotes, ignore braces
       if (!wrappingQuote) {
         wrappingQuote = char;
       } else if (wrappingQuote === char) {

diff --git a/test/template.test.js b/test/template.test.js
@@ -136,5 +136,18 @@ describe('template', () => {
         expect(render([{'{{.bar}}': [false, '/foo/{{.foo + .bar}}']}])).toEqual([{foo: [false, '/foo/barfoo']}]);
         expect(render({foo: [{bar: '{{1}}'}, '{{empty}}']})).toEqual({foo: [{bar: 1}, undefined]});
     });
+    it('should accept quotes outside of template', () => {
+        const json = { foo: 'bar', bar: 'foo' };
+        const render = (input) => jq.renderRecursively(json, input);
+
+        expect(render('"{{.foo}}"')).toEqual('"bar"');
+        expect(render('\'{{.foo}}\'')).toEqual('\'bar\'');
+    });
+    it('should accept escaped quotes inside jq template', () => {
+        const json = { foo: 'bar', bar: 'foo' };
+        const render = (input) => jq.renderRecursively(json, input);
+
+        expect(render('{{"\\"foo\\""}}')).toEqual('"foo"');
+    });
 })