@ztimson/utils 0.28.0 → 0.28.1

package/dist/index.cjs

@@ -2297,12 +2297,45 @@ ${opts.message || this.desc}`;
   }
   function findTemplateVars(html) {
     const variables = /* @__PURE__ */ new Set();
+    const excluded = /* @__PURE__ */ new Set(["true", "false", "null", "undefined"]);
+    for (const loop of matchAll(html, /\{\{\s*?\*\s*?(.+?)\s+in\s+(.+?)\s*?}}/g)) {
+      const [element, index = "index"] = loop[1].replaceAll(/[()\s]/g, "").split(",");
+      excluded.add(element);
+      excluded.add(index);
+      const arrayRef = loop[2].trim();
+      const arrayVar = arrayRef.split(".")[0].match(/^[a-zA-Z_$][a-zA-Z0-9_$]*/)?.[0];
+      if (arrayVar && !excluded.has(arrayVar)) variables.add(arrayVar);
+    }
+    for (const ifStmt of matchAll(html, /\{\{\s*?[!]?\?\s*?([^}]+?)\s*?}}/g)) {
+      const code = ifStmt[1].replace(/["'`][^"'`]*["'`]/g, "");
+      const vars = code.match(/[a-zA-Z_$][a-zA-Z0-9_$.]+/g) || [];
+      for (const v of vars) {
+        const root = v.split(".")[0];
+        if (!excluded.has(root)) variables.add(root);
+      }
+    }
+    for (const ifBlock of matchAll(html, /\{\{\s*?\?\s*?.+?\s*?}}([\s\S]*?)\{\{\s*?\/\?\s*?}}/g)) {
+      const content = ifBlock[1];
+      const regex2 = /\{\{\s*([^<>\*\?!/}\s][^}]*?)\s*}}/g;
+      let match2;
+      while ((match2 = regex2.exec(content)) !== null) {
+        const code = match2[1].trim().replace(/["'`][^"'`]*["'`]/g, "");
+        const vars = code.match(/[a-zA-Z_$][a-zA-Z0-9_$.]+/g) || [];
+        for (const v of vars) {
+          const root = v.split(".")[0];
+          if (!excluded.has(root)) variables.add(v);
+        }
+      }
+    }
     const regex = /\{\{\s*([^<>\*\?!/}\s][^}]*?)\s*}}/g;
     let match;
     while ((match = regex.exec(html)) !== null) {
-      const code = match[1].trim();
-      const varMatch = code.match(/^([a-zA-Z_$][a-zA-Z0-9_$.]*)/);
-      if (varMatch) variables.add(varMatch[1]);
+      const code = match[1].trim().replace(/["'`][^"'`]*["'`]/g, "");
+      const vars = code.match(/[a-zA-Z_$][a-zA-Z0-9_$.]+/g) || [];
+      for (const v of vars) {
+        const root = v.split(".")[0];
+        if (!excluded.has(root)) variables.add(v);
+      }
     }
     const result = {};
     for (const path of variables) {