@ztimson/utils 0.23.16 → 0.23.18

package/dist/index.mjs

@@ -684,31 +684,41 @@ function validateEmail(email) {
   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 = "", inQuotes = false;
+    let current = "", inQuotes2 = false;
     for (let i = 0; i < line.length; i++) {
       const char = line[i];
       const nextChar = line[i + 1];
       if (char === '"') {
-        if (inQuotes && nextChar === '"') {
+        if (inQuotes2 && nextChar === '"') {
           current += '"';
           i++;
-        } else inQuotes = !inQuotes;
-      } else if (char === "," && !inQuotes) {
-        columns.push(current);
+        } else inQuotes2 = !inQuotes2;
+      } else if (char === "," && !inQuotes2) {
+        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 row = csv.split(/\r?\n/);
-  let headers = hasHeaders ? row.splice(0, 1)[0] : null;
-  if (headers) headers = headers.match(/(?:[^,"']+|"(?:[^"]|"")*"|'(?:[^']|'')*')+/g);
-  return row.map((r2) => {
+  const rows2 = [];
+  let currentRow = "", inQuotes = false;
+  for (const char of csv.replace(/\r\n/g, "\n")) {
+    if (char === '"') inQuotes = !inQuotes;
+    if (char === "\n" && !inQuotes) {
+      rows2.push(currentRow.trim());
+      currentRow = "";
+    } else currentRow += char;
+  }
+  if (currentRow) rows2.push(currentRow.trim());
+  let headers = hasHeaders ? rows2.splice(0, 1)[0] : null;
+  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((r22, i) => {
+    const h = headers || Array(props.length).fill(null).map((_, i) => {
       let letter = "";
       const first = i / 26;
       if (first > 1) letter += LETTER_LIST[Math.floor(first - 1)];
@@ -729,7 +739,7 @@ function toCsv(target, flatten = true) {
     ...t.map((row) => headers.map((h) => {
       const value2 = dotNotation(row, h);
       if (value2 == null) return "";
-      if (typeof value2 == "object") return `"${JSONSanitize(value2).replaceAll("`", '""')}"`;
+      if (typeof value2 == "object") return `"${JSONSanitize(value2).replaceAll('"', '""')}"`;
       if (typeof value2 == "string" && /[\n"]/g.test(value2)) return `"${value2.replaceAll('"', '""')}"`;
       return value2;
     }).join(","))