@ztimson/utils 0.23.15 → 0.23.16

package/dist/index.mjs

@@ -684,24 +684,29 @@ function validateEmail(email) {
   return /^[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)*$/.test(email);
 }
 function fromCsv(csv, hasHeaders = true) {
-  const row = csv.split("\n");
+  function parseLine(line) {
+    const columns = [];
+    let current = "", inQuotes = false;
+    for (let i = 0; i < line.length; i++) {
+      const char = line[i];
+      const nextChar = line[i + 1];
+      if (char === '"') {
+        if (inQuotes && nextChar === '"') {
+          current += '"';
+          i++;
+        } else inQuotes = !inQuotes;
+      } else if (char === "," && !inQuotes) {
+        columns.push(current);
+        current = "";
+      } else current += char;
+    }
+    columns.push(current);
+    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);
+  if (headers) headers = headers.match(/(?:[^,"']+|"(?:[^"]|"")*"|'(?:[^']|'')*')+/g);
   return row.map((r2) => {
-    function parseLine(line) {
-      const parts = line.split(","), columns = [];
-      let quoted = false;
-      for (const p2 of parts) {
-        if (quoted) columns[columns.length - 1] = columns.at(-1) + "," + p2;
-        else columns.push(p2);
-        if (/[^"]"$/g.test(p2)) {
-          quoted = false;
-        } else if (/^"[^"]/g.test(p2)) {
-          quoted = true;
-        }
-      }
-      return columns;
-    }
     const props = parseLine(r2);
     const h = headers || Array(props.length).fill(null).map((r22, i) => {
       let letter = "";
@@ -717,12 +722,16 @@ function fromCsv(csv, hasHeaders = true) {
   });
 }
 function toCsv(target, flatten = true) {
-  const headers = new ASet(target.reduce((acc, row) => [...acc, ...Object.keys(flatten ? flattenObj(row) : row)], []));
+  const t = makeArray(target);
+  const headers = new ASet(t.reduce((acc, row) => [...acc, ...Object.keys(flatten ? flattenObj(row) : row)], []));
   return [
     headers.join(","),
-    ...target.map((row) => headers.map((h) => {
+    ...t.map((row) => headers.map((h) => {
       const value2 = dotNotation(row, h);
-      return typeof value2 == "object" && value2 != null ? '"' + JSONSanitize(value2).replaceAll('"', '""') + '"' : value2;
+      if (value2 == null) return "";
+      if (typeof value2 == "object") return `"${JSONSanitize(value2).replaceAll("`", '""')}"`;
+      if (typeof value2 == "string" && /[\n"]/g.test(value2)) return `"${value2.replaceAll('"', '""')}"`;
+      return value2;
     }).join(","))
   ].join("\n");
 }