@ztimson/utils 0.28.1 → 0.28.3

package/dist/index.cjs

@@ -428,6 +428,8 @@ ${opts.message || this.desc}`;
     return function(a, b) {
       const aVal = dotNotation(a, prop);
       const bVal = dotNotation(b, prop);
+      if (aVal === void 0) return 1;
+      if (bVal === void 0) return -1;
       if (typeof aVal == "number" && typeof bVal == "number")
         return (reverse ? -1 : 1) * (aVal - bVal);
       if (aVal > bVal) return reverse ? -1 : 1;
@@ -2297,41 +2299,40 @@ ${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 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);
+      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 vars = code.match(/[a-zA-Z_$][a-zA-Z0-9_$.]+/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(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);
-        }
+        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().replace(/["'`][^"'`]*["'`]/g, "");
-      const vars = code.match(/[a-zA-Z_$][a-zA-Z0-9_$.]+/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);
@@ -2344,7 +2345,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];