@ztimson/utils 0.23.15 → 0.23.17

package/dist/csv.d.ts

@@ -1,9 +1,16 @@
+/**
+ * Parse a CSV string into an array of objects
+ *
+ * @param csv String with CSV
+ * @param hasHeaders First line of CSV contains headers
+ * @return {T[]} Array of parsed objects
+ */
 export declare function fromCsv<T = any>(csv: string, hasHeaders?: boolean): T[];
 /**
- * Convert an object to a CSV string
+ * Convert an array of objects to a CSV string
  *
  * @param {any[]} target Array of objects to create CSV from
  * @param {boolean} flatten Should nested object be flattened or treated as values
  * @return {string} CSV string
  */
-export declare function toCsv(target: any[], flatten?: boolean): string;
+export declare function toCsv(target: any, flatten?: boolean): string;

package/dist/index.cjs

@@ -688,26 +688,40 @@ ${opts.message || this.desc}`;
     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");
-    let headers = hasHeaders ? row.splice(0, 1)[0] : null;
-    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;
+    function parseLine(line) {
+      const columns = [];
+      let current = "", inQuotes2 = false;
+      for (let i = 0; i < line.length; i++) {
+        const char = line[i];
+        const nextChar = line[i + 1];
+        if (char === '"') {
+          if (inQuotes2 && nextChar === '"') {
+            current += '"';
+            i++;
+          } else inQuotes2 = !inQuotes2;
+        } else if (char === "," && !inQuotes2) {
+          columns.push(current);
+          current = "";
+        } else current += char;
       }
+      columns.push(current);
+      return columns.map((col) => col.replace(/^"|"$/g, "").replace(/""/g, '"'));
+    }
+    const rows2 = [];
+    let currentRow = "", inQuotes = false;
+    for (const char of csv) {
+      if (char === '"') inQuotes = !inQuotes;
+      if (char === "\n" && !inQuotes) {
+        rows2.push(currentRow);
+        currentRow = "";
+      } else currentRow += char;
+    }
+    if (currentRow) rows2.push(currentRow);
+    let headers = hasHeaders ? rows2.splice(0, 1)[0] : null;
+    if (headers) headers = headers.match(/(?:[^,"']+|"(?:[^"]|"")*"|'(?:[^']|'')*')+/g);
+    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)];
@@ -721,12 +735,16 @@ ${opts.message || this.desc}`;
     });
   }
   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");
   }