fix: incorrect condition in function call expression (#24)

Condition check is applicable when function is called on object.
rudderlabs · Dec 19, 2022 · 03d503b · 03d503b
1 parent 13a8d32
commit 03d503b
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git a/src/translator.ts b/src/translator.ts
@@ -407,11 +407,13 @@ export class JsonTemplateTranslator {
     code.push(JsonTemplateTranslator.generateAssignmentCode(result, ctx));
     if (expr.object) {
       code.push(this.translateExpr(expr.object, result, ctx));
+      code.push(`if(${JsonTemplateTranslator.returnIsNotEmpty(result)}){`);
     }
-    code.push(`if(${JsonTemplateTranslator.returnIsNotEmpty(result)}){`);
     const functionArgsStr = this.translateSpreadableExpressions(expr.args, result, code);
     code.push(result, '=', this.getFunctionName(expr, result), '(', functionArgsStr, ');');
-    code.push('}');
+    if (expr.object) {
+      code.push('}');
+    }
     code.push(JsonTemplateTranslator.generateAssignmentCode(dest, result));
     this.releaseVars(result);
     return code.join('');

diff --git a/test/scenarios/functions/data.ts b/test/scenarios/functions/data.ts
@@ -26,6 +26,16 @@ export const data: Scenario[] = [
     templatePath: 'parent_scope_vars.jt',
     output: 90,
   },
+  {
+    templatePath: 'promise.jt',
+    input: [1, 2],
+    output: [1, 2],
+  },
+  {
+    templatePath: 'promise.jt',
+    input: { a: 1 },
+    output: { a: 1 },
+  },
   {
     output: 80,
   },

diff --git a/test/scenarios/functions/promise.jt b/test/scenarios/functions/promise.jt
@@ -0,0 +1,3 @@
+await new Promise(function(resolve) {
+    setTimeout(lambda resolve(^), 100)
+});