fix(template): allow null as a valid argument in helper functions

garden-io · Jul 12, 2023 · 05d1dac · 05d1dac
1 parent 679ef3a
commit 05d1dac
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/core/src/template-string/functions.ts b/core/src/template-string/functions.ts
@@ -476,11 +476,13 @@ export function callHelperFunction({
   const resolvedArgs: any[] = []
 
   for (const arg of args) {
-    if (arg._error) {
+    // arg can be null here because some helpers allow nulls as valid args
+    if (arg && arg._error) {
       return arg
     }
 
-    if (arg && arg.resolved) {
+    // allow nulls as valid arg values
+    if (arg && arg.resolved !== undefined) {
       resolvedArgs.push(arg.resolved)
     } else {
       resolvedArgs.push(arg)

diff --git a/core/test/unit/src/template-string.ts b/core/test/unit/src/template-string.ts
@@ -1197,6 +1197,20 @@ describe("resolveTemplateString", async () => {
       })
     })
 
+    context("isEmpty", () => {
+      context("allows nulls", () => {
+        it("resolves null as 'true'", () => {
+          const res = resolveTemplateString("${isEmpty(null)}", new TestContext({}))
+          expect(res).to.be.true
+        })
+
+        it("resolves references to null as 'true'", () => {
+          const res = resolveTemplateString("${isEmpty(a)}", new TestContext({ a: null }))
+          expect(res).to.be.true
+        })
+      })
+    })
+
     context("slice", () => {
       it("allows numeric indices", () => {
         const res = resolveTemplateString("${slice(foo, 0, 3)}", new TestContext({ foo: "abcdef" }))