npm - csv-sort - Versions diffs - 6.0.2 → 6.0.6 - Mend

csv-sort 6.0.2 → 6.0.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (5) hide show

package/CHANGELOG.md CHANGED Viewed

@@ -3,12 +3,6 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
-## 6.0.1 (2021-09-13)
-### Bug Fixes
-- bump TS and separate ESLint plugins away from this monorepo ([2e07d42](https://github.com/codsen/codsen/commit/2e07d424222b6ffedf5fb45c83ad453627ec2904))
 ## 6.0.0 (2021-09-09)
 ### Features

package/LICENSE CHANGED Viewed

@@ -1,6 +1,6 @@
 MIT License
-Copyright (c) 2010-%YEAR% Roy Revelt and other contributors
+Copyright (c) 2010-2021 Roy Revelt and other contributors
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

package/dist/csv-sort.esm.js CHANGED Viewed

@@ -1,7 +1,7 @@
 /**
  * @name csv-sort
  * @fileoverview Sorts double-entry bookkeeping CSV coming from internet banking
- * @version 6.0.2
+ * @version 6.0.6
  * @author Roy Revelt, Codsen Ltd
  * @license MIT
  * {@link https://codsen.com/os/csv-sort/}
@@ -12,268 +12,435 @@ import { splitEasy } from 'csv-split-easy';
 import currency from 'currency.js';
 function isNumeric(str) {
-  if (!str.trim()) {
-    return false;
-  }
-  return Number(str) === Number(str);
+    if (!str.trim()) {
+        return false;
+    }
+    return Number(str) === Number(str);
 }
-const currencySigns = ["د.إ", "؋", "L", "֏", "ƒ", "Kz", "$", "ƒ", "₼", "KM", "৳", "лв", ".د.ب", "FBu", "$b", "R$", "฿", "Nu.", "P", "p.", "BZ$", "FC", "CHF", "¥", "₡", "₱", "Kč", "Fdj", "kr", "RD$", "دج", "kr", "Nfk", "Br", "Ξ", "€", "₾", "₵", "GH₵", "D", "FG", "Q", "L", "kn", "G", "Ft", "Rp", "₪", "₹", "ع.د", "﷼", "kr", "J$", "JD", "¥", "KSh", "лв", "៛", "CF", "₩", "₩", "KD", "лв", "₭", "₨", "M", "Ł", "Lt", "Ls", "LD", "MAD", "lei", "Ar", "ден", "K", "₮", "MOP$", "UM", "₨", "Rf", "MK", "RM", "MT", "₦", "C$", "kr", "₨", "﷼", "B/.", "S/.", "K", "₱", "₨", "zł", "Gs", "﷼", "￥", "lei", "Дин.", "₽", "R₣", "﷼", "₨", "ج.س.", "kr", "£", "Le", "S", "Db", "E", "฿", "SM", "T", "د.ت", "T$", "₤", "₺", "TT$", "NT$", "TSh", "₴", "USh", "$U", "лв", "Bs", "₫", "VT", "WS$", "FCFA", "Ƀ", "CFA", "₣", "﷼", "R", "Z$"];
+const currencySigns = [
+    "د.إ",
+    "؋",
+    "L",
+    "֏",
+    "ƒ",
+    "Kz",
+    "$",
+    "ƒ",
+    "₼",
+    "KM",
+    "৳",
+    "лв",
+    ".د.ب",
+    "FBu",
+    "$b",
+    "R$",
+    "฿",
+    "Nu.",
+    "P",
+    "p.",
+    "BZ$",
+    "FC",
+    "CHF",
+    "¥",
+    "₡",
+    "₱",
+    "Kč",
+    "Fdj",
+    "kr",
+    "RD$",
+    "دج",
+    "kr",
+    "Nfk",
+    "Br",
+    "Ξ",
+    "€",
+    "₾",
+    "₵",
+    "GH₵",
+    "D",
+    "FG",
+    "Q",
+    "L",
+    "kn",
+    "G",
+    "Ft",
+    "Rp",
+    "₪",
+    "₹",
+    "ع.د",
+    "﷼",
+    "kr",
+    "J$",
+    "JD",
+    "¥",
+    "KSh",
+    "лв",
+    "៛",
+    "CF",
+    "₩",
+    "₩",
+    "KD",
+    "лв",
+    "₭",
+    "₨",
+    "M",
+    "Ł",
+    "Lt",
+    "Ls",
+    "LD",
+    "MAD",
+    "lei",
+    "Ar",
+    "ден",
+    "K",
+    "₮",
+    "MOP$",
+    "UM",
+    "₨",
+    "Rf",
+    "MK",
+    "RM",
+    "MT",
+    "₦",
+    "C$",
+    "kr",
+    "₨",
+    "﷼",
+    "B/.",
+    "S/.",
+    "K",
+    "₱",
+    "₨",
+    "zł",
+    "Gs",
+    "﷼",
+    "￥",
+    "lei",
+    "Дин.",
+    "₽",
+    "R₣",
+    "﷼",
+    "₨",
+    "ج.س.",
+    "kr",
+    "£",
+    "Le",
+    "S",
+    "Db",
+    "E",
+    "฿",
+    "SM",
+    "T",
+    "د.ت",
+    "T$",
+    "₤",
+    "₺",
+    "TT$",
+    "NT$",
+    "TSh",
+    "₴",
+    "USh",
+    "$U",
+    "лв",
+    "Bs",
+    "₫",
+    "VT",
+    "WS$",
+    "FCFA",
+    "Ƀ",
+    "CFA",
+    "₣",
+    "﷼",
+    "R",
+    "Z$",
+];
 function findType(something) {
-  /* istanbul ignore next */
-  if (typeof something !== "string") {
-    throw new Error(`csv-sort/util/findType(): input must be string! Currently it's: ${typeof something}`);
-  }
-  if (isNumeric(something)) {
-    return "numeric";
-  }
-  /* istanbul ignore next */
-  if (currencySigns.some(singleSign =>
-  isNumeric(something.replace(singleSign, "").replace(/[,.]/g, "")))) {
-    return "numeric";
-  }
-  if (!something.trim()) {
-    return "empty";
-  }
-  return "text";
+    /* istanbul ignore next */
+    if (typeof something !== "string") {
+        throw new Error(`csv-sort/util/findType(): input must be string! Currently it's: ${typeof something}`);
+    }
+    if (isNumeric(something)) {
+        return "numeric";
+    }
+    /* istanbul ignore next */
+    if (currencySigns.some((singleSign) =>
+    isNumeric(something.replace(singleSign, "").replace(/[,.]/g, "")))) {
+        return "numeric";
+    }
+    if (!something.trim()) {
+        return "empty";
+    }
+    return "text";
 }
 function sort(input) {
-  let msgContent = null;
-  let msgType = null;
-  if (typeof input !== "string") {
-    throw new TypeError(`csv-sort/csvSort(): [THROW_ID_01] The input is of a wrong type! We accept either string of array of arrays. We got instead: ${typeof input}, equal to:\n${JSON.stringify(input, null, 4)}`);
-  } else if (!input.trim()) {
-    return {
-      res: [[""]],
-      msgContent,
-      msgType
-    };
-  }
-  let content = splitEasy(input);
-  let schema = [];
-  let stateHeaderRowPresent = false;
-  let stateDataColumnRowLengthIsConsistent = true;
-  const stateColumnsContainingSameValueEverywhere = [];
-  let indexAtWhichEmptyCellsStart = null;
-  for (let i = content.length - 1; i >= 0; i--) {
-    if (!schema.length) {
-      /* istanbul ignore next */
-      if (content[i].length !== 1 || content[i][0] !== "") {
-        for (let y = 0, len = content[i].length; y < len; y++) {
-          schema.push(findType(content[i][y].trim()));
-          if (indexAtWhichEmptyCellsStart === null && findType(content[i][y].trim()) === "empty") {
-            indexAtWhichEmptyCellsStart = y;
-          }
-          if (indexAtWhichEmptyCellsStart !== null && findType(content[i][y].trim()) !== "empty") {
-            indexAtWhichEmptyCellsStart = null;
-          }
+    let msgContent = null;
+    let msgType = null;
+    if (typeof input !== "string") {
+        throw new TypeError(`csv-sort/csvSort(): [THROW_ID_01] The input is of a wrong type! We accept either string of array of arrays. We got instead: ${typeof input}, equal to:\n${JSON.stringify(input, null, 4)}`);
+    }
+    else if (!input.trim()) {
+        return { res: [[""]], msgContent, msgType };
+    }
+    let content = splitEasy(input);
+    let schema = [];
+    let stateHeaderRowPresent = false;
+    let stateDataColumnRowLengthIsConsistent = true;
+    const stateColumnsContainingSameValueEverywhere = [];
+    let indexAtWhichEmptyCellsStart = null;
+    for (let i = content.length - 1; i >= 0; i--) {
+        if (!schema.length) {
+            /* istanbul ignore next */
+            if (content[i].length !== 1 || content[i][0] !== "") {
+                for (let y = 0, len = content[i].length; y < len; y++) {
+                    schema.push(findType(content[i][y].trim()));
+                    if (indexAtWhichEmptyCellsStart === null &&
+                        findType(content[i][y].trim()) === "empty") {
+                        indexAtWhichEmptyCellsStart = y;
+                    }
+                    if (indexAtWhichEmptyCellsStart !== null &&
+                        findType(content[i][y].trim()) !== "empty") {
+                        indexAtWhichEmptyCellsStart = null;
+                    }
+                }
+            }
         }
-      }
-    } else {
-      if (i === 0) {
-        stateHeaderRowPresent = content[i].every(el => findType(el) === "text" || findType(el) === "empty");
-      }
-      /* istanbul ignore else */
-      if (!stateHeaderRowPresent && schema.length !== content[i].length) {
-        stateDataColumnRowLengthIsConsistent = false;
-      }
-      let perRowIndexAtWhichEmptyCellsStart = null;
-      for (let y = 0, len = content[i].length; y < len; y++) {
-        /* istanbul ignore else */
-        if (perRowIndexAtWhichEmptyCellsStart === null && findType(content[i][y].trim()) === "empty") {
-          perRowIndexAtWhichEmptyCellsStart = y;
+        else {
+            if (i === 0) {
+                stateHeaderRowPresent = content[i].every((el) => findType(el) === "text" || findType(el) === "empty");
+            }
+            /* istanbul ignore else */
+            if (!stateHeaderRowPresent && schema.length !== content[i].length) {
+                stateDataColumnRowLengthIsConsistent = false;
+            }
+            let perRowIndexAtWhichEmptyCellsStart = null;
+            for (let y = 0, len = content[i].length; y < len; y++) {
+                /* istanbul ignore else */
+                if (perRowIndexAtWhichEmptyCellsStart === null &&
+                    findType(content[i][y].trim()) === "empty") {
+                    perRowIndexAtWhichEmptyCellsStart = y;
+                }
+                /* istanbul ignore else */
+                if (perRowIndexAtWhichEmptyCellsStart !== null &&
+                    findType(content[i][y].trim()) !== "empty") {
+                    perRowIndexAtWhichEmptyCellsStart = null;
+                }
+                /* istanbul ignore else */
+                if (findType(content[i][y].trim()) !== schema[y] &&
+                    !stateHeaderRowPresent) {
+                    const toAdd = findType(content[i][y].trim());
+                    /* istanbul ignore else */
+                    if (Array.isArray(schema[y])) {
+                        if (!schema[y].includes(toAdd)) {
+                            schema[y].push(findType(content[i][y].trim()));
+                        }
+                    }
+                    else if (schema[y] !== toAdd) {
+                        const temp = schema[y];
+                        schema[y] = [];
+                        schema[y].push(temp);
+                        schema[y].push(toAdd);
+                    }
+                }
+            }
+            /* istanbul ignore next */
+            if (indexAtWhichEmptyCellsStart !== null &&
+                perRowIndexAtWhichEmptyCellsStart !== null &&
+                perRowIndexAtWhichEmptyCellsStart > indexAtWhichEmptyCellsStart &&
+                (!stateHeaderRowPresent || (stateHeaderRowPresent && i !== 0))) {
+                indexAtWhichEmptyCellsStart = perRowIndexAtWhichEmptyCellsStart;
+            }
         }
-        /* istanbul ignore else */
-        if (perRowIndexAtWhichEmptyCellsStart !== null && findType(content[i][y].trim()) !== "empty") {
-          perRowIndexAtWhichEmptyCellsStart = null;
+    }
+    /* istanbul ignore else */
+    if (!indexAtWhichEmptyCellsStart) {
+        indexAtWhichEmptyCellsStart = schema.length;
+    }
+    let nonEmptyColsStartAt = 0;
+    for (let i = 0, len = schema.length; i < len; i++) {
+        if (schema[i] === "empty") {
+            nonEmptyColsStartAt = i;
         }
-        /* istanbul ignore else */
-        if (findType(content[i][y].trim()) !== schema[y] && !stateHeaderRowPresent) {
-          const toAdd = findType(content[i][y].trim());
-          /* istanbul ignore else */
-          if (Array.isArray(schema[y])) {
-            if (!schema[y].includes(toAdd)) {
-              schema[y].push(findType(content[i][y].trim()));
-            }
-          } else if (schema[y] !== toAdd) {
-            const temp = schema[y];
-            schema[y] = [];
-            schema[y].push(temp);
-            schema[y].push(toAdd);
-          }
+        else {
+            break;
         }
-      }
-      /* istanbul ignore next */
-      if (indexAtWhichEmptyCellsStart !== null && perRowIndexAtWhichEmptyCellsStart !== null && perRowIndexAtWhichEmptyCellsStart > indexAtWhichEmptyCellsStart && (!stateHeaderRowPresent || stateHeaderRowPresent && i !== 0)) {
-        indexAtWhichEmptyCellsStart = perRowIndexAtWhichEmptyCellsStart;
-      }
     }
-  }
-  /* istanbul ignore else */
-  if (!indexAtWhichEmptyCellsStart) {
-    indexAtWhichEmptyCellsStart = schema.length;
-  }
-  let nonEmptyColsStartAt = 0;
-  for (let i = 0, len = schema.length; i < len; i++) {
-    if (schema[i] === "empty") {
-      nonEmptyColsStartAt = i;
-    } else {
-      break;
+    /* istanbul ignore else */
+    if (nonEmptyColsStartAt !== 0) {
+        content = content.map((arr) => arr.slice(nonEmptyColsStartAt + 1, indexAtWhichEmptyCellsStart));
+        schema = schema.slice(nonEmptyColsStartAt + 1, indexAtWhichEmptyCellsStart);
     }
-  }
-  /* istanbul ignore else */
-  if (nonEmptyColsStartAt !== 0) {
-    content = content.map(arr => arr.slice(nonEmptyColsStartAt + 1, indexAtWhichEmptyCellsStart));
-    schema = schema.slice(nonEmptyColsStartAt + 1, indexAtWhichEmptyCellsStart);
-  }
-  const numericSchemaColumns = [];
-  let balanceColumnIndex;
-  schema.forEach((colType, i) => {
-    if (colType === "numeric") {
-      numericSchemaColumns.push(i);
+    const numericSchemaColumns = [];
+    let balanceColumnIndex;
+    schema.forEach((colType, i) => {
+        if (colType === "numeric") {
+            numericSchemaColumns.push(i);
+        }
+    });
+    const traverseUpToThisIndexAtTheTop = stateHeaderRowPresent ? 1 : 0;
+    if (numericSchemaColumns.length === 1) {
+        balanceColumnIndex = numericSchemaColumns[0];
     }
-  });
-  const traverseUpToThisIndexAtTheTop = stateHeaderRowPresent ? 1 : 0;
-  if (numericSchemaColumns.length === 1) {
-    balanceColumnIndex = numericSchemaColumns[0];
-  } else if (numericSchemaColumns.length === 0) {
-    throw new Error('csv-sort/csvSort(): [THROW_ID_03] Your CSV file does not contain numeric-only columns and computer was not able to detect the "Balance" column!');
-  } else {
-    let potentialBalanceColumnIndexesList = Array.from(numericSchemaColumns);
-    const deleteFromPotentialBalanceColumnIndexesList = [];
-    for (let i = 0, len = potentialBalanceColumnIndexesList.length; i < len; i++) {
-      const suspectedBalanceColumnsIndexNumber = potentialBalanceColumnIndexesList[i];
-      let previousValue;
-      let lookForTwoEqualAndConsecutive = true;
-      let firstValue;
-      let lookForAllTheSame = true;
-      for (let rowNum = traverseUpToThisIndexAtTheTop, len2 = content.length; rowNum < len2; rowNum++) {
-        /* istanbul ignore else */
-        if (lookForTwoEqualAndConsecutive) {
-          if (previousValue == null) {
-            previousValue = content[rowNum][suspectedBalanceColumnsIndexNumber];
-          } else if (previousValue === content[rowNum][suspectedBalanceColumnsIndexNumber]) {
-            deleteFromPotentialBalanceColumnIndexesList.push(suspectedBalanceColumnsIndexNumber);
-            lookForTwoEqualAndConsecutive = false;
-          } else {
-            previousValue = content[rowNum][suspectedBalanceColumnsIndexNumber];
-          }
+    else if (numericSchemaColumns.length === 0) {
+        throw new Error('csv-sort/csvSort(): [THROW_ID_03] Your CSV file does not contain numeric-only columns and computer was not able to detect the "Balance" column!');
+    }
+    else {
+        let potentialBalanceColumnIndexesList = Array.from(numericSchemaColumns);
+        const deleteFromPotentialBalanceColumnIndexesList = [];
+        for (let i = 0, len = potentialBalanceColumnIndexesList.length; i < len; i++) {
+            const suspectedBalanceColumnsIndexNumber = potentialBalanceColumnIndexesList[i];
+            let previousValue;
+            let lookForTwoEqualAndConsecutive = true;
+            let firstValue;
+            let lookForAllTheSame = true;
+            for (let rowNum = traverseUpToThisIndexAtTheTop, len2 = content.length; rowNum < len2; rowNum++) {
+                /* istanbul ignore else */
+                if (lookForTwoEqualAndConsecutive) {
+                    if (previousValue == null) {
+                        previousValue = content[rowNum][suspectedBalanceColumnsIndexNumber];
+                    }
+                    else if (previousValue ===
+                        content[rowNum][suspectedBalanceColumnsIndexNumber]) {
+                        deleteFromPotentialBalanceColumnIndexesList.push(suspectedBalanceColumnsIndexNumber);
+                        lookForTwoEqualAndConsecutive = false;
+                    }
+                    else {
+                        previousValue = content[rowNum][suspectedBalanceColumnsIndexNumber];
+                    }
+                }
+                /* istanbul ignore else */
+                if (lookForAllTheSame) {
+                    if (firstValue == null) {
+                        firstValue = content[rowNum][suspectedBalanceColumnsIndexNumber];
+                    }
+                    else if (content[rowNum][suspectedBalanceColumnsIndexNumber] !== firstValue) {
+                        lookForAllTheSame = false;
+                    }
+                }
+                if (!lookForTwoEqualAndConsecutive) {
+                    break;
+                }
+            }
+            /* istanbul ignore else */
+            if (lookForAllTheSame) {
+                stateColumnsContainingSameValueEverywhere.push(suspectedBalanceColumnsIndexNumber);
+            }
         }
+        potentialBalanceColumnIndexesList = pull(potentialBalanceColumnIndexesList, ...deleteFromPotentialBalanceColumnIndexesList);
         /* istanbul ignore else */
-        if (lookForAllTheSame) {
-          if (firstValue == null) {
-            firstValue = content[rowNum][suspectedBalanceColumnsIndexNumber];
-          } else if (content[rowNum][suspectedBalanceColumnsIndexNumber] !== firstValue) {
-            lookForAllTheSame = false;
-          }
+        if (potentialBalanceColumnIndexesList.length === 1) {
+            balanceColumnIndex = potentialBalanceColumnIndexesList[0];
         }
-        if (!lookForTwoEqualAndConsecutive) {
-          break;
+        else if (potentialBalanceColumnIndexesList.length === 0) {
+            throw new Error('csv-sort/csvSort(): [THROW_ID_04] The computer can\'t find the "Balance" column! It saw some numeric-only columns, but they all seem to have certain rows with the same values as rows right below/above them!');
         }
-      }
-      /* istanbul ignore else */
-      if (lookForAllTheSame) {
-        stateColumnsContainingSameValueEverywhere.push(suspectedBalanceColumnsIndexNumber);
-      }
+        else ;
     }
-    potentialBalanceColumnIndexesList = pull(potentialBalanceColumnIndexesList, ...deleteFromPotentialBalanceColumnIndexesList);
-    /* istanbul ignore else */
-    if (potentialBalanceColumnIndexesList.length === 1) {
-      balanceColumnIndex = potentialBalanceColumnIndexesList[0];
-    } else if (potentialBalanceColumnIndexesList.length === 0) {
-      throw new Error('csv-sort/csvSort(): [THROW_ID_04] The computer can\'t find the "Balance" column! It saw some numeric-only columns, but they all seem to have certain rows with the same values as rows right below/above them!');
-    } else ;
-  }
-  if (!balanceColumnIndex) {
-    throw new Error("csv-sort/csvSort(): [THROW_ID_05] Sadly computer couldn't find its way in this CSV and had to stop working on it.");
-  }
-  const potentialCreditDebitColumns = pull(Array.from(schema.reduce((result, el, index) => {
-    if (typeof el === "string" && el === "numeric" || Array.isArray(el) && el.includes("numeric")) {
-      result.push(index);
+    if (!balanceColumnIndex) {
+        throw new Error("csv-sort/csvSort(): [THROW_ID_05] Sadly computer couldn't find its way in this CSV and had to stop working on it.");
     }
-    return result;
-  }, [])), balanceColumnIndex, ...stateColumnsContainingSameValueEverywhere);
-  const resContent = [];
-  resContent.push(content[content.length - 1].slice(0, indexAtWhichEmptyCellsStart));
-  const usedUpRows = [];
-  const bottom = stateHeaderRowPresent ? 1 : 0;
-  for (let y = content.length - 2; y >= bottom; y--) {
-    for (let suspectedRowsIndex = content.length - 2; suspectedRowsIndex >= bottom; suspectedRowsIndex--) {
-      if (!usedUpRows.includes(suspectedRowsIndex)) {
-        let thisRowIsDone = false;
-        for (let suspectedColIndex = 0, len = potentialCreditDebitColumns.length; suspectedColIndex < len; suspectedColIndex++) {
-          let diffVal = null;
-          if (content[suspectedRowsIndex][potentialCreditDebitColumns[suspectedColIndex]] !== "") {
-            diffVal = currency(content[suspectedRowsIndex][potentialCreditDebitColumns[suspectedColIndex]]);
-          }
-          let totalVal = null;
-          /* istanbul ignore else */
-          if (content[suspectedRowsIndex][balanceColumnIndex] !== "") {
-            totalVal = currency(content[suspectedRowsIndex][balanceColumnIndex]);
-          }
-          let topmostResContentBalance = null;
-          /* istanbul ignore else */
-          if (resContent[0][balanceColumnIndex] !== "") {
-            topmostResContentBalance = currency(resContent[0][balanceColumnIndex]).format();
-          }
-          let currentRowsDiffVal = null;
-          /* istanbul ignore else */
-          if (resContent[resContent.length - 1][potentialCreditDebitColumns[suspectedColIndex]] !== "") {
-            currentRowsDiffVal = currency(resContent[resContent.length - 1][potentialCreditDebitColumns[suspectedColIndex]]).format();
-          }
-          let lastResContentRowsBalance = null;
-          /* istanbul ignore else */
-          if (resContent[resContent.length - 1][balanceColumnIndex] !== "") {
-            lastResContentRowsBalance = currency(resContent[resContent.length - 1][balanceColumnIndex]);
-          }
-          /* istanbul ignore else */
-          if (diffVal && totalVal.add(diffVal).format() === topmostResContentBalance) {
-            resContent.unshift(content[suspectedRowsIndex].slice(0, indexAtWhichEmptyCellsStart));
-            usedUpRows.push(suspectedRowsIndex);
-            thisRowIsDone = true;
-            break;
-          } else if (diffVal && totalVal.subtract(diffVal).format() === topmostResContentBalance) {
-            resContent.unshift(content[suspectedRowsIndex].slice(0, indexAtWhichEmptyCellsStart));
-            usedUpRows.push(suspectedRowsIndex);
-            thisRowIsDone = true;
-            break;
-          } else if (currentRowsDiffVal && lastResContentRowsBalance.add(currentRowsDiffVal).format() === totalVal.format()) {
-            resContent.push(content[suspectedRowsIndex].slice(0, indexAtWhichEmptyCellsStart));
-            usedUpRows.push(suspectedRowsIndex);
-            thisRowIsDone = true;
-            break;
-          } else if (currentRowsDiffVal && lastResContentRowsBalance.subtract(currentRowsDiffVal).format() === totalVal.format()) {
-            resContent.push(content[suspectedRowsIndex].slice(0, indexAtWhichEmptyCellsStart));
-            usedUpRows.push(suspectedRowsIndex);
-            thisRowIsDone = true;
-            break;
-          }
+    const potentialCreditDebitColumns = pull(Array.from(schema.reduce((result, el, index) => {
+        if ((typeof el === "string" && el === "numeric") ||
+            (Array.isArray(el) && el.includes("numeric"))) {
+            result.push(index);
         }
-        /* istanbul ignore else */
-        if (thisRowIsDone) {
-          thisRowIsDone = false;
-          break;
+        return result;
+    }, [])), balanceColumnIndex, ...stateColumnsContainingSameValueEverywhere);
+    const resContent = [];
+    resContent.push(content[content.length - 1].slice(0, indexAtWhichEmptyCellsStart));
+    const usedUpRows = [];
+    const bottom = stateHeaderRowPresent ? 1 : 0;
+    for (let y = content.length - 2; y >= bottom; y--) {
+        for (let suspectedRowsIndex = content.length - 2; suspectedRowsIndex >= bottom; suspectedRowsIndex--) {
+            if (!usedUpRows.includes(suspectedRowsIndex)) {
+                let thisRowIsDone = false;
+                for (let suspectedColIndex = 0, len = potentialCreditDebitColumns.length; suspectedColIndex < len; suspectedColIndex++) {
+                    let diffVal = null;
+                    if (content[suspectedRowsIndex][potentialCreditDebitColumns[suspectedColIndex]] !== "") {
+                        diffVal = currency(content[suspectedRowsIndex][potentialCreditDebitColumns[suspectedColIndex]]);
+                    }
+                    let totalVal = null;
+                    /* istanbul ignore else */
+                    if (content[suspectedRowsIndex][balanceColumnIndex] !== "") {
+                        totalVal = currency(content[suspectedRowsIndex][balanceColumnIndex]);
+                    }
+                    let topmostResContentBalance = null;
+                    /* istanbul ignore else */
+                    if (resContent[0][balanceColumnIndex] !== "") {
+                        topmostResContentBalance = currency(resContent[0][balanceColumnIndex]).format();
+                    }
+                    let currentRowsDiffVal = null;
+                    /* istanbul ignore else */
+                    if (resContent[resContent.length - 1][potentialCreditDebitColumns[suspectedColIndex]] !== "") {
+                        currentRowsDiffVal = currency(resContent[resContent.length - 1][potentialCreditDebitColumns[suspectedColIndex]]).format();
+                    }
+                    let lastResContentRowsBalance = null;
+                    /* istanbul ignore else */
+                    if (resContent[resContent.length - 1][balanceColumnIndex] !== "") {
+                        lastResContentRowsBalance = currency(resContent[resContent.length - 1][balanceColumnIndex]);
+                    }
+                    /* istanbul ignore else */
+                    if (diffVal &&
+                        totalVal.add(diffVal).format() ===
+                            topmostResContentBalance) {
+                        resContent.unshift(content[suspectedRowsIndex].slice(0, indexAtWhichEmptyCellsStart));
+                        usedUpRows.push(suspectedRowsIndex);
+                        thisRowIsDone = true;
+                        break;
+                    }
+                    else if (diffVal &&
+                        totalVal.subtract(diffVal).format() ===
+                            topmostResContentBalance) {
+                        resContent.unshift(content[suspectedRowsIndex].slice(0, indexAtWhichEmptyCellsStart));
+                        usedUpRows.push(suspectedRowsIndex);
+                        thisRowIsDone = true;
+                        break;
+                    }
+                    else if (currentRowsDiffVal &&
+                        lastResContentRowsBalance
+                            .add(currentRowsDiffVal)
+                            .format() === totalVal.format()) {
+                        resContent.push(content[suspectedRowsIndex].slice(0, indexAtWhichEmptyCellsStart));
+                        usedUpRows.push(suspectedRowsIndex);
+                        thisRowIsDone = true;
+                        break;
+                    }
+                    else if (currentRowsDiffVal &&
+                        lastResContentRowsBalance
+                            .subtract(currentRowsDiffVal)
+                            .format() === totalVal.format()) {
+                        resContent.push(content[suspectedRowsIndex].slice(0, indexAtWhichEmptyCellsStart));
+                        usedUpRows.push(suspectedRowsIndex);
+                        thisRowIsDone = true;
+                        break;
+                    }
+                }
+                /* istanbul ignore else */
+                if (thisRowIsDone) {
+                    thisRowIsDone = false;
+                    break;
+                }
+            }
+        }
+    }
+    /* istanbul ignore else */
+    if (stateHeaderRowPresent) {
+        if (stateDataColumnRowLengthIsConsistent &&
+            content[0].length > schema.length) {
+            content[0].length = schema.length;
         }
-      }
+        resContent.unshift(content[0].slice(0, indexAtWhichEmptyCellsStart));
     }
-  }
-  /* istanbul ignore else */
-  if (stateHeaderRowPresent) {
-    if (stateDataColumnRowLengthIsConsistent && content[0].length > schema.length) {
-      content[0].length = schema.length;
+    /* istanbul ignore else */
+    if (content.length - (stateHeaderRowPresent ? 2 : 1) !== usedUpRows.length) {
+        msgContent = "Not all rows were recognised!";
+        msgType = "alert";
     }
-    resContent.unshift(content[0].slice(0, indexAtWhichEmptyCellsStart));
-  }
-  /* istanbul ignore else */
-  if (content.length - (stateHeaderRowPresent ? 2 : 1) !== usedUpRows.length) {
-    msgContent = "Not all rows were recognised!";
-    msgType = "alert";
-  }
-  return {
-    res: resContent,
-    msgContent,
-    msgType
-  };
+    return {
+        res: resContent,
+        msgContent,
+        msgType,
+    };
 }
 export { sort };

package/dist/csv-sort.umd.js CHANGED Viewed

@@ -1,7 +1,7 @@
 /**
  * @name csv-sort
  * @fileoverview Sorts double-entry bookkeeping CSV coming from internet banking
- * @version 6.0.2
+ * @version 6.0.6
  * @author Roy Revelt, Codsen Ltd
  * @license MIT
  * {@link https://codsen.com/os/csv-sort/}
@@ -11,7 +11,7 @@
 /**
  * @name ranges-sort
  * @fileoverview Sort string index ranges
- * @version 5.0.2
+ * @version 5.0.6
  * @author Roy Revelt, Codsen Ltd
  * @license MIT
  * {@link https://codsen.com/os/ranges-sort/}
@@ -19,7 +19,7 @@
 /**
  * @name ranges-merge
  * @fileoverview Merge and sort string index ranges
- * @version 8.0.2
+ * @version 8.0.6
  * @author Roy Revelt, Codsen Ltd
  * @license MIT
  * {@link https://codsen.com/os/ranges-merge/}
@@ -27,7 +27,7 @@
 /**
  * @name ranges-apply
  * @fileoverview Take an array of string index ranges, delete/replace the string according to them
- * @version 6.0.2
+ * @version 6.0.6
  * @author Roy Revelt, Codsen Ltd
  * @license MIT
  * {@link https://codsen.com/os/ranges-apply/}
@@ -35,7 +35,7 @@
 /**
  * @name string-collapse-leading-whitespace
  * @fileoverview Collapse the leading and trailing whitespace of a string
- * @version 6.0.2
+ * @version 6.0.6
  * @author Roy Revelt, Codsen Ltd
  * @license MIT
  * {@link https://codsen.com/os/string-collapse-leading-whitespace/}
@@ -44,7 +44,7 @@ function d(e,r=1){function t(e){return Array.from(e).reverse().join("")}function
 /**
  * @name ranges-push
  * @fileoverview Gather string index ranges
- * @version 6.0.2
+ * @version 6.0.6
  * @author Roy Revelt, Codsen Ltd
  * @license MIT
  * {@link https://codsen.com/os/ranges-push/}
@@ -52,7 +52,7 @@ function d(e,r=1){function t(e){return Array.from(e).reverse().join("")}function
 /**
  * @name string-remove-thousand-separators
  * @fileoverview Detects and removes thousand separators (dot/comma/quote/space) from string-type digits
- * @version 6.0.2
+ * @version 6.0.6
  * @author Roy Revelt, Codsen Ltd
  * @license MIT
  * {@link https://codsen.com/os/string-remove-thousand-separators/}
@@ -60,7 +60,7 @@ function d(e,r=1){function t(e){return Array.from(e).reverse().join("")}function
 /**
  * @name csv-split-easy
  * @fileoverview Splits the CSV string into array of arrays, each representing a row of columns
- * @version 6.0.2
+ * @version 6.0.6
  * @author Roy Revelt, Codsen Ltd
  * @license MIT
  * {@link https://codsen.com/os/csv-split-easy/}

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "csv-sort",
-  "version": "6.0.2",
+  "version": "6.0.6",
   "description": "Sorts double-entry bookkeeping CSV coming from internet banking",
   "keywords": [
     "accountancy",
@@ -39,9 +39,10 @@
   "types": "types/index.d.ts",
   "scripts": {
     "build": "rollup -c",
-    "esbuild": "node '../../scripts/esbuild.js'",
-    "esbuild_dev": "cross-env MODE=dev node '../../scripts/esbuild.js'",
-    "ci_test": "npm run build && npm run format && tap --no-only --reporter=silent --output-file=testStats.md && npm run clean_cov",
+    "build:esbuild": "node '../../scripts/esbuild.js'",
+    "build:esbuild:dev": "cross-env MODE=dev node '../../scripts/esbuild.js'",
+    "ci_test": "npm run build && npm run format && tap --no-only --reporter=silent",
+    "clean_types": "../../scripts/cleanTypes.js",
     "dev": "rollup -c --dev",
     "devunittest": "npm run dev && tap --only -R 'base'",
     "format": "npm run lect && npm run prettier && npm run lint",
@@ -51,20 +52,15 @@
     "prettier": "../../node_modules/prettier/bin-prettier.js '*.{js,css,scss,vue,md,ts}' --write --loglevel silent",
     "republish": "npm publish || :",
     "tap": "tap",
-    "tsc": "tsc",
     "pretest": "npm run build",
-    "test": "npm run lint && npm run unittest && npm run test:examples && npm run clean_cov && npm run format",
+    "test": "npm run test:ci && npm run perf",
+    "test:ci": "npm run unittest && npm run test:examples && npm run format",
     "test:examples": "../../scripts/test-examples.js && npm run lect && npm run prettier",
-    "unittest": "tap --no-only --output-file=testStats.md --reporter=terse && tsc -p tsconfig.json --noEmit && npm run clean_cov && npm run perf",
-    "clean_cov": "../../scripts/leaveCoverageTotalOnly.js",
-    "clean_types": "../../scripts/cleanTypes.js"
+    "tsc": "tsc",
+    "unittest": "tap --no-only --reporter=terse && tsc -p tsconfig.json --noEmit"
   },
   "tap": {
     "check-coverage": false,
-    "coverage-report": [
-      "json-summary",
-      "text"
-    ],
     "node-arg": [
       "--no-warnings",
       "--experimental-loader",
@@ -87,51 +83,51 @@
     }
   },
   "dependencies": {
-    "@babel/runtime": "^7.15.4",
-    "csv-split-easy": "^6.0.2",
+    "@babel/runtime": "^7.16.3",
+    "csv-split-easy": "^6.0.6",
     "currency.js": "^2.0.4",
     "lodash.pull": "^4.1.0"
   },
   "devDependencies": {
-    "@babel/cli": "^7.15.4",
-    "@babel/core": "^7.15.5",
-    "@babel/node": "^7.15.4",
-    "@babel/plugin-external-helpers": "^7.14.5",
-    "@babel/plugin-proposal-class-properties": "^7.14.5",
-    "@babel/plugin-proposal-nullish-coalescing-operator": "^7.14.5",
-    "@babel/plugin-proposal-object-rest-spread": "^7.15.6",
-    "@babel/plugin-proposal-optional-chaining": "^7.14.5",
-    "@babel/plugin-transform-runtime": "^7.15.0",
-    "@babel/preset-env": "^7.15.6",
-    "@babel/preset-typescript": "^7.15.0",
-    "@babel/register": "^7.15.3",
+    "@babel/cli": "^7.16.0",
+    "@babel/core": "^7.16.0",
+    "@babel/node": "^7.16.0",
+    "@babel/plugin-external-helpers": "^7.16.0",
+    "@babel/plugin-proposal-class-properties": "^7.16.0",
+    "@babel/plugin-proposal-nullish-coalescing-operator": "^7.16.0",
+    "@babel/plugin-proposal-object-rest-spread": "^7.16.0",
+    "@babel/plugin-proposal-optional-chaining": "^7.16.0",
+    "@babel/plugin-transform-runtime": "^7.16.4",
+    "@babel/preset-env": "^7.16.4",
+    "@babel/preset-typescript": "^7.16.0",
+    "@babel/register": "^7.16.0",
     "@istanbuljs/esm-loader-hook": "^0.1.2",
     "@rollup/plugin-babel": "^5.3.0",
-    "@rollup/plugin-commonjs": "^20.0.0",
+    "@rollup/plugin-commonjs": "^21.0.1",
     "@rollup/plugin-json": "^4.1.0",
-    "@rollup/plugin-node-resolve": "^13.0.4",
+    "@rollup/plugin-node-resolve": "^13.0.6",
     "@rollup/plugin-strip": "^2.1.0",
-    "@rollup/plugin-typescript": "^8.2.5",
+    "@rollup/plugin-typescript": "^8.3.0",
     "@types/lodash.pull": "^4.1.6",
-    "@types/node": "^16.9.1",
+    "@types/node": "^16.11.9",
     "@types/tap": "^15.0.5",
-    "@typescript-eslint/eslint-plugin": "^4.31.0",
-    "@typescript-eslint/parser": "^4.31.0",
-    "core-js": "^3.17.3",
+    "@typescript-eslint/eslint-plugin": "^5.4.0",
+    "@typescript-eslint/parser": "^5.4.0",
+    "core-js": "^3.19.1",
     "cross-env": "^7.0.3",
-    "eslint": "^7.32.0",
-    "lect": "^0.18.2",
-    "rollup": "^2.56.3",
+    "eslint": "^8.3.0",
+    "lect": "^0.18.6",
+    "rollup": "^2.60.0",
     "rollup-plugin-ascii": "^0.0.3",
     "rollup-plugin-banner": "^0.2.1",
     "rollup-plugin-cleanup": "^3.2.1",
-    "rollup-plugin-dts": "^4.0.0",
+    "rollup-plugin-dts": "^4.0.1",
     "rollup-plugin-terser": "^7.0.2",
-    "tap": "^15.0.9",
+    "tap": "^15.1.2",
     "tslib": "^2.3.1",
-    "typescript": "^4.4.3"
+    "typescript": "^4.5.2"
   },
   "engines": {
-    "node": ">=12"
+    "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
   }
 }