@ztimson/utils 0.28.0 → 0.28.2

package/dist/index.cjs

@@ -2297,12 +2297,44 @@ ${opts.message || this.desc}`;
   }
   function findTemplateVars(html) {
     const variables = /* @__PURE__ */ new Set();
+    const arrays = /* @__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 arrayVar = loop[2].trim();
+      const root = arrayVar.split(".")[0];
+      if (!excluded.has(root)) {
+        variables.add(arrayVar);
+        arrays.add(arrayVar);
+      }
+    }
+    for (const ifStmt of matchAll(html, /\{\{\s*?[!]?\?\s*?([^}]+?)\s*?}}/g)) {
+      const code = ifStmt[1].replace(/["'`][^"'`]*["'`]/g, "");
+      const cleaned = code.replace(/([a-zA-Z_$][a-zA-Z0-9_$.]*)\s*\(/g, (_, v) => {
+        const parts = v.split(".");
+        return parts.length > 1 ? parts.slice(0, -1).join(".") + " " : "";
+      });
+      const vars = cleaned.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 cleaned = code.replace(/([a-zA-Z_$][a-zA-Z0-9_$.]*)\s*\(/g, (_, v) => {
+        const parts = v.split(".");
+        return parts.length > 1 ? parts.slice(0, -1).join(".") + " " : "";
+      });
+      const vars = cleaned.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) {
@@ -2311,7 +2343,8 @@ ${opts.message || this.desc}`;
       for (let i = 0; i < parts.length; i++) {
         const part = parts[i];
         if (i === parts.length - 1) {
-          current[part] = "";
+          const fullPath = parts.slice(0, i + 1).join(".");
+          current[part] = arrays.has(fullPath) ? [] : "";
         } else {
           current[part] = current[part] || {};
           current = current[part];