@thi.ng/csv 2.3.46 → 2.3.48

package/CHANGELOG.md

@@ -1,6 +1,6 @@
 # Change Log
 
-- **Last updated**: 2023-12-03T12:13:31Z
+- **Last updated**: 2023-12-11T10:07:09Z
 - **Generator**: [thi.ng/monopub](https://thi.ng/monopub)
 
 All notable changes to this project will be documented in this file.

package/api.js

@@ -1 +0,0 @@
-export {};

package/format.js

@@ -6,62 +6,55 @@ import { iterator } from "@thi.ng/transducers/iterator";
 import { isReduced } from "@thi.ng/transducers/reduced";
 import { str } from "@thi.ng/transducers/str";
 import { transduce } from "@thi.ng/transducers/transduce";
-export function formatCSV(opts, src) {
-    return isIterable(src)
-        ? iterator(formatCSV(opts), src)
-        : (rfn) => {
-            let { header, cols, delim, quote } = {
-                delim: ",",
-                quote: `"`,
-                cols: [],
-                ...opts,
-            };
-            let colTx;
-            const reQuote = new RegExp(quote, "g");
-            const reduce = rfn[2];
-            let headerDone = false;
-            return compR(rfn, (acc, row) => {
-                if (!headerDone) {
-                    if (!header && !isArray(row)) {
-                        header = Object.keys(row);
-                    }
-                    colTx = isArray(cols)
-                        ? cols
-                        : header
-                            ? header.map((id) => cols[id])
-                            : [];
-                }
-                const $row = isArray(row)
-                    ? row
-                    : header.map((k) => row[k]);
-                const line = (header || $row)
-                    .map((_, i) => {
-                    const val = $row[i];
-                    const cell = val != null
-                        ? colTx[i]
-                            ? colTx[i](val)
-                            : String(val)
-                        : "";
-                    return cell.indexOf(quote) !== -1
-                        ? wrap(quote)(cell.replace(reQuote, `${quote}${quote}`))
-                        : cell;
-                })
-                    .join(delim);
-                if (!headerDone) {
-                    if (header) {
-                        acc = reduce(acc, header.join(delim));
-                    }
-                    else {
-                        header = $row;
-                    }
-                    headerDone = true;
-                    !isReduced(acc) && (acc = reduce(acc, line));
-                    return acc;
-                }
-                else {
-                    return reduce(acc, line);
-                }
-            });
-        };
+function formatCSV(opts, src) {
+  return isIterable(src) ? iterator(formatCSV(opts), src) : (rfn) => {
+    let { header, cols, delim, quote } = {
+      delim: ",",
+      quote: `"`,
+      cols: [],
+      ...opts
+    };
+    let colTx;
+    const reQuote = new RegExp(quote, "g");
+    const reduce = rfn[2];
+    let headerDone = false;
+    return compR(rfn, (acc, row) => {
+      if (!headerDone) {
+        if (!header && !isArray(row)) {
+          header = Object.keys(row);
+        }
+        colTx = isArray(cols) ? cols : header ? header.map(
+          (id) => cols[id]
+        ) : [];
+      }
+      const $row = isArray(row) ? row : header.map((k) => row[k]);
+      const line = (header || $row).map((_, i) => {
+        const val = $row[i];
+        const cell = val != null ? colTx[i] ? colTx[i](val) : String(val) : "";
+        return cell.indexOf(quote) !== -1 ? wrap(quote)(
+          cell.replace(
+            reQuote,
+            `${quote}${quote}`
+          )
+        ) : cell;
+      }).join(delim);
+      if (!headerDone) {
+        if (header) {
+          acc = reduce(acc, header.join(delim));
+        } else {
+          header = $row;
+        }
+        headerDone = true;
+        !isReduced(acc) && (acc = reduce(acc, line));
+        return acc;
+      } else {
+        return reduce(acc, line);
+      }
+    });
+  };
 }
-export const formatCSVString = (opts = {}, src) => transduce(formatCSV(opts), str(opts.rowDelim || "\n"), src);
+const formatCSVString = (opts = {}, src) => transduce(formatCSV(opts), str(opts.rowDelim || "\n"), src);
+export {
+  formatCSV,
+  formatCSVString
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thi.ng/csv",
-  "version": "2.3.46",
+  "version": "2.3.48",
   "description": "Customizable, transducer-based CSV parser/object mapper and transformer",
   "type": "module",
   "module": "./index.js",
@@ -24,7 +24,9 @@
   "author": "Karsten Schmidt (https://thi.ng)",
   "license": "Apache-2.0",
   "scripts": {
-    "build": "yarn clean && tsc --declaration",
+    "build": "yarn build:esbuild && yarn build:decl",
+    "build:decl": "tsc --declaration --emitDeclarationOnly",
+    "build:esbuild": "esbuild --format=esm --platform=neutral --target=es2022 --tsconfig=tsconfig.json --outdir=. src/**/*.ts",
     "clean": "rimraf --glob '*.js' '*.d.ts' '*.map' doc",
     "doc": "typedoc --excludePrivate --excludeInternal --out doc src/index.ts",
     "doc:ae": "mkdir -p .ae/doc .ae/temp && api-extractor run --local --verbose",
@@ -33,14 +35,14 @@
     "test": "bun test"
   },
   "dependencies": {
-    "@thi.ng/api": "^8.9.10",
-    "@thi.ng/checks": "^3.4.10",
-    "@thi.ng/strings": "^3.7.1",
-    "@thi.ng/transducers": "^8.8.13"
+    "@thi.ng/api": "^8.9.12",
+    "@thi.ng/checks": "^3.4.12",
+    "@thi.ng/strings": "^3.7.3",
+    "@thi.ng/transducers": "^8.8.15"
   },
   "devDependencies": {
     "@microsoft/api-extractor": "^7.38.3",
-    "@thi.ng/testament": "^0.4.3",
+    "esbuild": "^0.19.8",
     "rimraf": "^5.0.5",
     "tools": "^0.0.1",
     "typedoc": "^0.25.4",
@@ -84,5 +86,5 @@
   "thi.ng": {
     "year": 2014
   },
-  "gitHead": "04d1de79f256d7a53c6b5fd157b37f49bc88e11d\n"
+  "gitHead": "5e7bafedfc3d53bc131469a28de31dd8e5b4a3ff\n"
 }

package/parse.js

@@ -5,204 +5,179 @@ import { ESCAPES } from "@thi.ng/strings/escape";
 import { split } from "@thi.ng/strings/split";
 import { compR } from "@thi.ng/transducers/compr";
 import { iterator1 } from "@thi.ng/transducers/iterator";
-/**
- * Default parser options.
- *
- * @internal
- */
 const DEFAULT_OPTS = {
-    delim: ",",
-    quote: '"',
-    comment: "#",
-    trim: false,
+  delim: ",",
+  quote: '"',
+  comment: "#",
+  trim: false
 };
-export function parseCSV(opts, src) {
-    return isIterable(src)
-        ? iterator1(parseCSV(opts), src)
-        : (rfn) => {
-            const { all, cols, delim, quote, comment, trim, header } = {
-                all: true,
-                ...DEFAULT_OPTS,
-                ...opts,
-            };
-            const reduce = rfn[2];
-            let index;
-            let revIndex;
-            let first = true;
-            let isQuoted = false;
-            let record = [];
-            const init = (header) => {
-                cols && (index = initIndex(header, cols));
-                all && (revIndex = initRevIndex(header));
-                first = false;
-            };
-            const collectAll = (row) => record.reduce((acc, x, i) => ((acc[revIndex[i]] = trim ? x.trim() : x), acc), row);
-            const collectIndexed = (row) => Object.entries(index).reduce((acc, [id, { i, spec }]) => {
-                let val = record[i];
-                if (val !== undefined) {
-                    trim && (val = val.trim());
-                    all && spec.alias && delete acc[id];
-                    acc[spec.alias || id] = spec.tx
-                        ? spec.tx(val, acc)
-                        : val;
-                }
-                return acc;
-            }, row);
-            header && init(header);
-            return compR(rfn, (acc, line) => {
-                if ((!line.length || line.startsWith(comment)) &&
-                    !isQuoted)
-                    return acc;
-                if (!first) {
-                    isQuoted = parseLine(line, record, isQuoted, delim, quote);
-                    if (isQuoted)
-                        return acc;
-                    const row = {};
-                    all && collectAll(row);
-                    index && collectIndexed(row);
-                    record = [];
-                    return reduce(acc, row);
-                }
-                else {
-                    isQuoted = parseLine(line, record, isQuoted, delim, quote);
-                    if (!isQuoted) {
-                        init(record);
-                        record = [];
-                    }
-                    return acc;
-                }
-            });
-        };
+function parseCSV(opts, src) {
+  return isIterable(src) ? iterator1(parseCSV(opts), src) : (rfn) => {
+    const { all, cols, delim, quote, comment, trim, header } = {
+      all: true,
+      ...DEFAULT_OPTS,
+      ...opts
+    };
+    const reduce = rfn[2];
+    let index;
+    let revIndex;
+    let first = true;
+    let isQuoted = false;
+    let record = [];
+    const init = (header2) => {
+      cols && (index = initIndex(header2, cols));
+      all && (revIndex = initRevIndex(header2));
+      first = false;
+    };
+    const collectAll = (row) => record.reduce(
+      (acc, x, i) => (acc[revIndex[i]] = trim ? x.trim() : x, acc),
+      row
+    );
+    const collectIndexed = (row) => Object.entries(index).reduce((acc, [id, { i, spec }]) => {
+      let val = record[i];
+      if (val !== void 0) {
+        trim && (val = val.trim());
+        all && spec.alias && delete acc[id];
+        acc[spec.alias || id] = spec.tx ? spec.tx(val, acc) : val;
+      }
+      return acc;
+    }, row);
+    header && init(header);
+    return compR(rfn, (acc, line) => {
+      if ((!line.length || line.startsWith(comment)) && !isQuoted)
+        return acc;
+      if (!first) {
+        isQuoted = parseLine(
+          line,
+          record,
+          isQuoted,
+          delim,
+          quote
+        );
+        if (isQuoted)
+          return acc;
+        const row = {};
+        all && collectAll(row);
+        index && collectIndexed(row);
+        record = [];
+        return reduce(acc, row);
+      } else {
+        isQuoted = parseLine(
+          line,
+          record,
+          isQuoted,
+          delim,
+          quote
+        );
+        if (!isQuoted) {
+          init(record);
+          record = [];
+        }
+        return acc;
+      }
+    });
+  };
 }
-export function parseCSVSimple(opts, src) {
-    return isIterable(src)
-        ? iterator1(parseCSVSimple(opts), src)
-        : (rfn) => {
-            const { cols, delim, quote, comment, trim, header } = {
-                header: true,
-                ...DEFAULT_OPTS,
-                ...opts,
-            };
-            const reduce = rfn[2];
-            let first = header;
-            let isQuoted = false;
-            let record = [];
-            const collect = () => cols.reduce((acc, col, i) => {
-                if (col) {
-                    let val = record[i];
-                    if (val !== undefined) {
-                        trim && (val = val.trim());
-                        acc.push(isFunction(col) ? col(val, acc) : val);
-                    }
-                }
-                return acc;
-            }, []);
-            return compR(rfn, (acc, line) => {
-                if ((!line.length || line.startsWith(comment)) &&
-                    !isQuoted)
-                    return acc;
-                if (!first) {
-                    isQuoted = parseLine(line, record, isQuoted, delim, quote);
-                    if (isQuoted)
-                        return acc;
-                    const row = cols ? collect() : record;
-                    record = [];
-                    return reduce(acc, row);
-                }
-                else {
-                    isQuoted = parseLine(line, record, isQuoted, delim, quote);
-                    first = false;
-                    record = [];
-                    return acc;
-                }
-            });
-        };
+function parseCSVSimple(opts, src) {
+  return isIterable(src) ? iterator1(parseCSVSimple(opts), src) : (rfn) => {
+    const { cols, delim, quote, comment, trim, header } = {
+      header: true,
+      ...DEFAULT_OPTS,
+      ...opts
+    };
+    const reduce = rfn[2];
+    let first = header;
+    let isQuoted = false;
+    let record = [];
+    const collect = () => cols.reduce((acc, col, i) => {
+      if (col) {
+        let val = record[i];
+        if (val !== void 0) {
+          trim && (val = val.trim());
+          acc.push(isFunction(col) ? col(val, acc) : val);
+        }
+      }
+      return acc;
+    }, []);
+    return compR(rfn, (acc, line) => {
+      if ((!line.length || line.startsWith(comment)) && !isQuoted)
+        return acc;
+      if (!first) {
+        isQuoted = parseLine(
+          line,
+          record,
+          isQuoted,
+          delim,
+          quote
+        );
+        if (isQuoted)
+          return acc;
+        const row = cols ? collect() : record;
+        record = [];
+        return reduce(acc, row);
+      } else {
+        isQuoted = parseLine(
+          line,
+          record,
+          isQuoted,
+          delim,
+          quote
+        );
+        first = false;
+        record = [];
+        return acc;
+      }
+    });
+  };
 }
-/**
- * Syntax sugar for iterator version of {@link parseCSV}, efficiently splitting
- * given source string into a line based input using
- * [`split()`](https://docs.thi.ng/umbrella/strings/functions/split.html).
- *
- * @param opts -
- * @param src -
- */
-export const parseCSVFromString = (opts, src) => parseCSV(opts, split(src));
-/**
- * Syntax sugar for iterator version of {@link parseCSVSimple}, efficiently
- * splitting given source string into a line based input using
- * [`split()`](https://docs.thi.ng/umbrella/strings/functions/split.html).
- *
- * @param opts -
- * @param src -
- */
-export const parseCSVSimpleFromString = (opts, src) => parseCSVSimple(opts, split(src));
-/**
- * Parses line into `acc`, taking quoted cell values and linebreaks into
- * account.
- *
- * @remarks
- * If `isQuoted` is true, the previous line ended with a quoted cell value,
- * which might only end in the new or a future line. If that's the case, then
- * the current line's contents will be added to the current last value of `acc`
- * until the quoted cell is complete.
- *
- * Function returns current state of `isQuoted` (i.e. if line terminated in a
- * quoted cell) and should be (re)called with new lines until it returns false.
- *
- * @param line -
- * @param acc -
- * @param isQuoted -
- * @param delim -
- * @param quote -
- */
+const parseCSVFromString = (opts, src) => parseCSV(opts, split(src));
+const parseCSVSimpleFromString = (opts, src) => parseCSVSimple(opts, split(src));
 const parseLine = (line, acc, isQuoted, delim, quote) => {
-    let curr = "";
-    let p = "";
-    let openQuote = isQuoted;
-    for (let i = 0, n = line.length; i < n; i++) {
-        const c = line[i];
-        // escaped char
-        if (p === "\\") {
-            curr += ESCAPES[c] || c;
-        }
-        // quote open/close & CSV escape pair (aka `""`)
-        else if (c === quote) {
-            if (!isQuoted) {
-                p = "";
-                isQuoted = true;
-                continue;
-            }
-            else if (p === quote) {
-                curr += quote;
-                p = "";
-                continue;
-            }
-            else if (line[i + 1] !== quote)
-                isQuoted = false;
-        }
-        // field delimiter
-        else if (!isQuoted && c === delim) {
-            collectCell(acc, curr, openQuote);
-            openQuote = false;
-            curr = "";
-        }
-        // record unless escape seq start
-        else if (c !== "\\") {
-            curr += c;
-        }
-        p = c;
+  let curr = "";
+  let p = "";
+  let openQuote = isQuoted;
+  for (let i = 0, n = line.length; i < n; i++) {
+    const c = line[i];
+    if (p === "\\") {
+      curr += ESCAPES[c] || c;
+    } else if (c === quote) {
+      if (!isQuoted) {
+        p = "";
+        isQuoted = true;
+        continue;
+      } else if (p === quote) {
+        curr += quote;
+        p = "";
+        continue;
+      } else if (line[i + 1] !== quote)
+        isQuoted = false;
+    } else if (!isQuoted && c === delim) {
+      collectCell(acc, curr, openQuote);
+      openQuote = false;
+      curr = "";
+    } else if (c !== "\\") {
+      curr += c;
     }
-    curr !== "" && collectCell(acc, curr, openQuote);
-    return isQuoted;
+    p = c;
+  }
+  curr !== "" && collectCell(acc, curr, openQuote);
+  return isQuoted;
+};
+const collectCell = (acc, curr, openQuote) => openQuote ? acc[acc.length - 1] += "\n" + curr : acc.push(curr);
+const initIndex = (line, cols) => isArray(cols) ? cols.reduce((acc, spec, i) => {
+  if (spec) {
+    const alias = spec.alias || line[i] || String(i);
+    acc[alias] = { i, spec: { alias, ...spec } };
+  }
+  return acc;
+}, {}) : line.reduce(
+  (acc, id, i) => cols[id] ? (acc[id] = { i, spec: cols[id] }, acc) : acc,
+  {}
+);
+const initRevIndex = (line) => line.reduce((acc, x, i) => (acc[i] = x, acc), {});
+export {
+  parseCSV,
+  parseCSVFromString,
+  parseCSVSimple,
+  parseCSVSimpleFromString
 };
-const collectCell = (acc, curr, openQuote) => openQuote ? (acc[acc.length - 1] += "\n" + curr) : acc.push(curr);
-const initIndex = (line, cols) => isArray(cols)
-    ? cols.reduce((acc, spec, i) => {
-        if (spec) {
-            const alias = spec.alias || line[i] || String(i);
-            acc[alias] = { i, spec: { alias, ...spec } };
-        }
-        return acc;
-    }, {})
-    : line.reduce((acc, id, i) => cols[id] ? ((acc[id] = { i, spec: cols[id] }), acc) : acc, {});
-const initRevIndex = (line) => line.reduce((acc, x, i) => ((acc[i] = x), acc), {});

package/transforms.js

@@ -1,85 +1,41 @@
 import { padLeft } from "@thi.ng/strings/pad-left";
 import { maybeParseFloat, maybeParseInt } from "@thi.ng/strings/parse";
 import { percent as $percent } from "@thi.ng/strings/percent";
-/**
- * Cell parse value transform. Returns uppercased version of given input.
- *
- * @param x -
- */
-export const upper = (x) => x.toUpperCase();
-/**
- * Cell parse value transform. Returns lowercased version of given input.
- *
- * @param x -
- */
-export const lower = (x) => x.toLowerCase();
-/**
- * Higher-order cell parse value transform. Attempts to parse cell values as
- * floating point number or returns `defaultVal` if not possible.
- *
- * @param defaultVal -
- */
-export const float = (defaultVal = 0) => (x) => maybeParseFloat(x, defaultVal);
-/**
- * Higher-order cell parse value transform. Attempts to parse cell values as
- * integer or returns `defaultVal` if not possible.
- *
- * @param defaultVal -
- */
-export const int = (defaultVal = 0) => (x) => maybeParseInt(x, defaultVal, 10);
-/**
- * Higher-order cell parse value transform. Attempts to parse cell values as
- * hexadecimal integer or returns `defaultVal` if not possible.
- *
- * @param defaultVal -
- */
-export const hex = (defaultVal = 0) => (x) => maybeParseInt(x, defaultVal, 16);
-export const percent = (x) => maybeParseFloat(x) * 0.01;
-/**
- * Higher-order cell parse value transform. Attempts to parse cell values as
- * Unix epoch/timestamp or returns `defaultVal` if not possible.
- *
- * @param defaultVal -
- */
-export const epoch = (defaultVal = 0) => (x) => {
-    const res = Date.parse(x);
-    return isNaN(res) ? defaultVal : res;
+const upper = (x) => x.toUpperCase();
+const lower = (x) => x.toLowerCase();
+const float = (defaultVal = 0) => (x) => maybeParseFloat(x, defaultVal);
+const int = (defaultVal = 0) => (x) => maybeParseInt(x, defaultVal, 10);
+const hex = (defaultVal = 0) => (x) => maybeParseInt(x, defaultVal, 16);
+const percent = (x) => maybeParseFloat(x) * 0.01;
+const epoch = (defaultVal = 0) => (x) => {
+  const res = Date.parse(x);
+  return isNaN(res) ? defaultVal : res;
 };
-/**
- * Higher-order cell parse value transform. Attempts to parse cell values as JS
- * `Date` instance or returns `defaultVal` if not possible.
- *
- * @param defaultVal -
- */
-export const date = (defaultVal) => (x) => {
-    const epoch = Date.parse(x);
-    if (isNaN(epoch))
-        return defaultVal;
-    const res = new Date();
-    res.setTime(epoch);
-    return res;
+const date = (defaultVal) => (x) => {
+  const epoch2 = Date.parse(x);
+  if (isNaN(epoch2))
+    return defaultVal;
+  const res = /* @__PURE__ */ new Date();
+  res.setTime(epoch2);
+  return res;
+};
+const url = (x) => new URL(x);
+const oneOf = (mappings, defaultVal) => (x) => mappings[x] ?? defaultVal;
+const zeroPad = (digits) => padLeft(digits, "0");
+const formatFloat = (prec = 2) => (x) => x.toFixed(prec);
+const formatPercent = $percent;
+export {
+  date,
+  epoch,
+  float,
+  formatFloat,
+  formatPercent,
+  hex,
+  int,
+  lower,
+  oneOf,
+  percent,
+  upper,
+  url,
+  zeroPad
 };
-/**
- * Cell parse value transform. Attempts to parse cell values as JS `URL`
- * instances.
- *
- * @param x -
- */
-export const url = (x) => new URL(x);
-/**
- * Cell parse value transform. Accepts an object of mappings with original cell
- * values as keys which are then mapped to arbitrary new values in an enum like
- * fashion.
- *
- * @param mappings
- * @param defaultVal
- */
-export const oneOf = (mappings, defaultVal) => (x) => mappings[x] ?? defaultVal;
-// formatters
-export const zeroPad = (digits) => padLeft(digits, "0");
-export const formatFloat = (prec = 2) => (x) => x.toFixed(prec);
-/**
- * Higher order cell value formatter. Takes normalized values and formats them
- * as percentage with given `precision` (number of fractional digits).
- */
-export const formatPercent = $percent;