@ztimson/utils 0.23.17 → 0.23.19

package/dist/index.cjs

@@ -688,6 +688,7 @@ ${opts.message || this.desc}`;
     return /^[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)*$/.test(email);
   }
   function fromCsv(csv, hasHeaders = true) {
+    var _a;
     function parseLine(line) {
       const columns = [];
       let current = "", inQuotes2 = false;
@@ -700,25 +701,25 @@ ${opts.message || this.desc}`;
             i++;
           } else inQuotes2 = !inQuotes2;
         } else if (char === "," && !inQuotes2) {
-          columns.push(current);
+          columns.push(current.trim());
           current = "";
         } else current += char;
       }
-      columns.push(current);
+      columns.push(current.trim());
       return columns.map((col) => col.replace(/^"|"$/g, "").replace(/""/g, '"'));
     }
     const rows2 = [];
     let currentRow = "", inQuotes = false;
-    for (const char of csv) {
+    for (const char of csv.replace(/\r\n/g, "\n")) {
       if (char === '"') inQuotes = !inQuotes;
       if (char === "\n" && !inQuotes) {
-        rows2.push(currentRow);
+        rows2.push(currentRow.trim());
         currentRow = "";
       } else currentRow += char;
     }
-    if (currentRow) rows2.push(currentRow);
+    if (currentRow) rows2.push(currentRow.trim());
     let headers = hasHeaders ? rows2.splice(0, 1)[0] : null;
-    if (headers) headers = headers.match(/(?:[^,"']+|"(?:[^"]|"")*"|'(?:[^']|'')*')+/g);
+    if (headers) headers = (_a = headers.match(/(?:[^,"']+|"(?:[^"]|"")*"|'(?:[^']|'')*')+/g)) == null ? void 0 : _a.map((h) => h.trim());
     return rows2.map((r2) => {
       const props = parseLine(r2);
       const h = headers || Array(props.length).fill(null).map((_, i) => {
@@ -743,7 +744,7 @@ ${opts.message || this.desc}`;
         const value2 = dotNotation(row, h);
         if (value2 == null) return "";
         if (typeof value2 == "object") return `"${JSONSanitize(value2).replaceAll('"', '""')}"`;
-        if (typeof value2 == "string" && /[\n"]/g.test(value2)) return `"${value2.replaceAll('"', '""')}"`;
+        if (typeof value2 == "string" && /[\n",]/g.test(value2)) return `"${value2.replaceAll('"', '""')}"`;
         return value2;
       }).join(","))
     ].join("\n");