@ztimson/utils 0.27.18 → 0.27.20

package/dist/index.cjs

@@ -2312,44 +2312,56 @@ ${opts.message || this.desc}`;
     };
     const evaluate = (code, data2, fatal = true) => {
       try {
-        return Function("data", `Object.assign(this, data); return ${code};`)(data2);
+        return Function("data", `with(data) { return ${code}; }`)(data2);
       } catch {
         if (fatal) throw new TemplateError(`Failed to evaluate: ${code}`);
         else return false;
       }
     };
-    while (!!(found = /\{\{\s*?\?\s*?(.+?)\s*?}}([\s\S]*?)(?:\{\{\s*?!\?\s*?}}([\s\S]*?))?\{\{\s*?\/\?\s*?}}/g.exec(content))) {
+    while (!!(found = /\{\{\s*?\?\s*?(.+?)\s*?}}([\s\S]*?)\{\{\s*?\/\?\s*?}}/g.exec(content))) {
       const nested = matchAll(found[0], /\{\{\s*?\?.+?}}/g).slice(-1)?.[0]?.index;
-      if (nested != 0)
-        found = /\{\{\s*?\?\s*?(.+?)\s*?}}([\s\S]*?)(?:\{\{\s*?!\?\s*?}}([\s\S]*?))?\{\{\s*?\/\?\s*?}}/g.exec(content.slice(found.index + nested));
-      content = content.replace(found[0], (evaluate(found[1], d, false) ? found[2] : found[3]) || "");
+      if (nested != 0) found = /\{\{\s*?\?\s*?(.+?)\s*?}}([\s\S]*?)\{\{\s*?\/\?\s*?}}/g.exec(content.slice(found.index + nested));
+      const parts = found[2].split(/\{\{\s*?!\?\s*?/);
+      let result = evaluate(found[1], d, false) ? parts[0] : "";
+      if (!result) {
+        for (let i = 1; i < parts.length; i++) {
+          const [cond, body] = parts[i].split(/}}/);
+          if (!cond.trim()) {
+            result = body || "";
+            break;
+          }
+          if (evaluate(cond, d, false)) {
+            result = body || "";
+            break;
+          }
+        }
+      }
+      content = content.replace(found[0], result);
     }
     while (!!(found = /\{\{\s*?<\s*?(.+?)\s*?}}/g.exec(content))) {
-      content = content.replace(found[0], await renderTemplate(await fetch2(found[1].trim()), data, fetch2));
+      const t = await fetch2(found[1].trim());
+      if (!t) throw new TemplateError(`Unknown imported template: ${found[1].trim()}`);
+      content = content.replace(found[0], await renderTemplate(t, d, fetch2));
     }
     while (!!(found = /\{\{\s*?\*\s*?(.+?)\s+in\s+(.+?)\s*?}}([\s\S]*?)\{\{\s*?\/\*\s*?}}/g.exec(content))) {
       const split = found[1].replaceAll(/[()\s]/g, "").split(",");
       const element = split[0];
       const index = split[1] || "index";
-      const array = dotNotation(data, found[2]);
-      if (!array || typeof array != "object")
-        throw new TemplateError(`Cannot iterate: ${found[2]}`);
+      const array = dotNotation(d, found[2]);
+      if (!array || typeof array != "object") throw new TemplateError(`Cannot iterate: ${found[2]}`);
       let compiled = [];
-      for (let i = 0; i < array.length; i++) {
-        compiled.push(renderTemplate(found[3], {
-          ...d,
-          [element]: array[i],
-          [index]: i
-        }, fetch2));
-      }
+      for (let i = 0; i < array.length; i++)
+        compiled.push(await renderTemplate(found[3], { ...d, [element]: array[i], [index]: i }, fetch2));
       content = content.replace(found[0], compiled.join("\n"));
     }
     while (!!(found = /\{\{\s*([^<>\*\?!/}\s][^}]*?)\s*}}/g.exec(content))) {
-      content = content.replace(found[0], evaluate(found[1].trim(), d) || "");
+      content = content.replace(found[0], evaluate(found[1].trim(), d) ?? "");
     }
     while (!!(found = /\{\{\s*?>\s*?(.+?):(.+?)\s*?}}([\s\S]*?)\{\{\s*?\/>\s*?}}/g.exec(content))) {
-      content = content.replace(found[0], await renderTemplate(await fetch2(found[1].trim()), {
-        ...data,
+      const t = await fetch2(found[1].trim());
+      if (!t) throw new TemplateError(`Unknown extended templated: ${found[1].trim()}`);
+      content = content.replace(found[0], await renderTemplate(t, {
+        ...d,
         [found[2].trim()]: found[3]
       }, fetch2));
     }