chore: remove redundant else and add check in loop

Author: trivikr

packages/util-endpoints/src/utils/evaluateTemplate.spec.ts

@@ -13,11 +13,6 @@ describe(evaluateTemplate.name, () => {
     jest.clearAllMocks();
   });
 
-  it("should not escape template with empty parameter", () => {
-    const templateWithEmptyParam = "foo {} bar";
-    expect(evaluateTemplate(templateWithEmptyParam, mockOptions)).toEqual(templateWithEmptyParam);
-  });
-
   it("should not escape template without braces", () => {
     const templateWithoutBraces = "foo bar baz";
     expect(evaluateTemplate(templateWithoutBraces, mockOptions)).toEqual(templateWithoutBraces);

packages/util-endpoints/src/utils/evaluateTemplate.ts

@@ -10,47 +10,40 @@ export const evaluateTemplate = (template: string, options: EvaluateOptions) =>
   } as Record<string, string>;
 
   let currentIndex = 0;
-  while (true) {
+  while (currentIndex < template.length) {
     const openingBraceIndex = template.indexOf("{", currentIndex);
 
     if (openingBraceIndex === -1) {
-      // No more opening braces, add the rest of the template and break
+      // No more opening braces, add the rest of the template and break.
       evaluatedTemplateArr.push(template.slice(currentIndex));
       break;
+    }
+
+    evaluatedTemplateArr.push(template.slice(currentIndex, openingBraceIndex));
+    const closingBraceIndex = template.indexOf("}", openingBraceIndex);
+
+    if (closingBraceIndex === -1) {
+      // No more closing braces, add the rest of the template and break.
+      evaluatedTemplateArr.push(template.slice(openingBraceIndex));
+      break;
+    }
+
+    if (template[openingBraceIndex + 1] === "{" && template[closingBraceIndex + 1] === "}") {
+      // Escaped expression. Do not evaluate.
+      evaluatedTemplateArr.push(template.slice(openingBraceIndex + 1, closingBraceIndex));
+      currentIndex = closingBraceIndex + 2;
+    }
+
+    const parameterName = template.substring(openingBraceIndex + 1, closingBraceIndex);
+
+    if (parameterName.includes("#")) {
+      const [refName, attrName] = parameterName.split("#");
+      evaluatedTemplateArr.push(getAttr(templateContext[refName], attrName) as string);
     } else {
-      evaluatedTemplateArr.push(template.slice(currentIndex, openingBraceIndex));
-      const closingBraceIndex = template.indexOf("}", openingBraceIndex);
-
-      if (closingBraceIndex === -1) {
-        // Invalid template, but pass as it is.
-        evaluatedTemplateArr.push(template.slice(openingBraceIndex));
-        break;
-      }
-
-      if (closingBraceIndex === openingBraceIndex + 1) {
-        // Empty parameter, pass as it is.
-        evaluatedTemplateArr.push(template.slice(openingBraceIndex, closingBraceIndex + 1));
-        currentIndex = closingBraceIndex + 1;
-        continue;
-      }
-
-      if (template[openingBraceIndex + 1] === "{" && template[closingBraceIndex + 1] === "}") {
-        // Escaped expression. Do not evaluate.
-        evaluatedTemplateArr.push(template.slice(openingBraceIndex + 1, closingBraceIndex));
-        currentIndex = closingBraceIndex + 2;
-      }
-
-      const parameterName = template.substring(openingBraceIndex + 1, closingBraceIndex);
-
-      if (parameterName.includes("#")) {
-        const [refName, attrName] = parameterName.split("#");
-        evaluatedTemplateArr.push(getAttr(templateContext[refName], attrName) as string);
-      } else {
-        evaluatedTemplateArr.push(templateContext[parameterName]);
-      }
-
-      currentIndex = closingBraceIndex + 1;
+      evaluatedTemplateArr.push(templateContext[parameterName]);
     }
+
+    currentIndex = closingBraceIndex + 1;
   }
 
   return evaluatedTemplateArr.join("");