fix: only render the first 'else' template in the case of multiples

harttle · Feb 16, 2024 · d4490c4 · d4490c4
1 parent 1937aa1
commit d4490c4
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 5 deletions.
diff --git a/src/tags/case.ts b/src/tags/case.ts
@@ -31,7 +31,11 @@ export default class extends Tag {
       })
       .on('tag:else', () => (p = this.elseTemplates))
       .on('tag:endcase', () => stream.stop())
-      .on('template', (tpl: Template) => p.push(tpl))
+      .on('template', (tpl: Template) => {
+        if (p !== this.elseTemplates || (p === this.elseTemplates && p.length === 0)) {
+          p.push(tpl)
+        }
+      })
       .on('end', () => {
         throw new Error(`tag ${tagToken.getText()} not closed`)
       })

diff --git a/src/tags/if.ts b/src/tags/if.ts
@@ -6,7 +6,7 @@ export default class extends Tag {
 
   constructor (tagToken: TagToken, remainTokens: TopLevelToken[], liquid: Liquid) {
     super(tagToken, remainTokens, liquid)
-    let p
+    let p: Template[] = []
     liquid.parser.parseStream(remainTokens)
       .on('start', () => this.branches.push({
         value: new Value(tagToken.args, this.liquid),
@@ -18,7 +18,11 @@ export default class extends Tag {
       }))
       .on('tag:else', () => (p = this.elseTemplates))
       .on('tag:endif', function () { this.stop() })
-      .on('template', (tpl: Template) => p.push(tpl))
+      .on('template', (tpl: Template) => {
+        if (p !== this.elseTemplates || (p === this.elseTemplates && p.length === 0)) {
+          p.push(tpl)
+        }
+      })
       .on('end', () => { throw new Error(`tag ${tagToken.getText()} not closed`) })
       .start()
   }

diff --git a/src/tags/unless.ts b/src/tags/unless.ts
@@ -5,7 +5,7 @@ export default class extends Tag {
   elseTemplates: Template[] = []
   constructor (tagToken: TagToken, remainTokens: TopLevelToken[], liquid: Liquid) {
     super(tagToken, remainTokens, liquid)
-    let p
+    let p: Template[] = []
     this.liquid.parser.parseStream(remainTokens)
       .on('start', () => this.branches.push({
         value: new Value(tagToken.args, this.liquid),
@@ -19,7 +19,11 @@ export default class extends Tag {
       }))
       .on('tag:else', () => (p = this.elseTemplates))
       .on('tag:endunless', function () { this.stop() })
-      .on('template', (tpl: Template) => p.push(tpl))
+      .on('template', (tpl: Template) => {
+        if (p !== this.elseTemplates || (p === this.elseTemplates && p.length === 0)) {
+          p.push(tpl)
+        }
+      })
       .on('end', () => { throw new Error(`tag ${tagToken.getText()} not closed`) })
       .start()
   }

diff --git a/test/e2e/issues.spec.ts b/test/e2e/issues.spec.ts
@@ -469,4 +469,19 @@ describe('Issues', function () {
     const result = engine.parseAndRenderSync('{{ÜLKE}}', { ÜLKE: 'Türkiye' })
     expect(result).toEqual('Türkiye')
   })
+  it('#670 Does not render multiple `else` branches in the same if conditional', () => {
+    const engine = new Liquid()
+    const result = engine.parseAndRenderSync(`{% if false %}don't show{% else %}show{% else %}don't show{% endif %}`, {})
+    expect(result).toEqual('show')
+  })
+  it('#670 Does not render multiple `else` branches in the same unless conditional', () => {
+    const engine = new Liquid()
+    const result = engine.parseAndRenderSync(`{% unless true %}don't show{% else %}show{% else %}don't show{% endunless %}`, {})
+    expect(result).toEqual('show')
+  })
+  it('#670 Does not render multiple `else` branches in the same case conditional', () => {
+    const engine = new Liquid()
+    const result = engine.parseAndRenderSync(`{% case true %}{% when false %}don't show{% else %}show{% else %}don't show{% endcase %}`, {})
+    expect(result).toEqual('show')
+  })
 })