@ztimson/utils 0.28.14 → 0.28.15

package/dist/index.mjs

@@ -939,27 +939,42 @@ function validateEmail(email) {
 function fromCsv(csv, hasHeaders = true) {
   function parseLine(line) {
     const columns = [];
-    let current = "", inQuotes2 = false;
+    let current = "", inQuotes2 = false, quoteChar2 = null;
     for (let i = 0; i < line.length; i++) {
       const char = line[i];
       const nextChar = line[i + 1];
-      if (char === '"') {
-        if (inQuotes2 && nextChar === '"') {
-          current += '"';
+      if ((char === '"' || char === "'") && !inQuotes2) {
+        inQuotes2 = true;
+        quoteChar2 = char;
+      } else if (char === quoteChar2 && inQuotes2) {
+        if (nextChar === quoteChar2) {
+          current += quoteChar2;
           i++;
-        } else inQuotes2 = !inQuotes2;
+        } else {
+          inQuotes2 = false;
+          quoteChar2 = null;
+        }
       } else if (char === "," && !inQuotes2) {
         columns.push(current.trim());
         current = "";
       } else current += char;
     }
     columns.push(current.trim());
-    return columns.map((col) => col.replace(/^"|"$/g, "").replace(/""/g, '"'));
+    return columns.map((col) => {
+      col = col.replace(/^["']|["']$/g, "");
+      return col.replace(/""/g, '"').replace(/''/g, "'");
+    });
   }
   const rows = [];
-  let currentRow = "", inQuotes = false;
+  let currentRow = "", inQuotes = false, quoteChar = null;
   for (const char of csv.replace(/\r\n/g, "\n")) {
-    if (char === '"') inQuotes = !inQuotes;
+    if ((char === '"' || char === "'") && !inQuotes) {
+      inQuotes = true;
+      quoteChar = char;
+    } else if (char === quoteChar && inQuotes) {
+      inQuotes = false;
+      quoteChar = null;
+    }
     if (char === "\n" && !inQuotes) {
       rows.push(currentRow.trim());
       currentRow = "";