table 6.9.4 → 6.9.5

package/dist/src/truncateTableData.d.ts

@@ -1,6 +1,3 @@
 import type { Row } from './types/internal';
 export declare const truncateString: (input: string, length: number) => string;
-/**
- * @todo Make it work with ASCII content.
- */
 export declare const truncateTableData: (rows: Row[], truncates: number[]) => Row[];

package/dist/src/truncateTableData.js

@@ -5,14 +5,28 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.truncateTableData = exports.truncateString = void 0;
 const lodash_truncate_1 = __importDefault(require("lodash.truncate"));
+const slice_ansi_1 = __importDefault(require("slice-ansi"));
+const strip_ansi_1 = __importDefault(require("strip-ansi"));
+const utils_1 = require("./utils");
+const omission = '…';
 const truncateString = (input, length) => {
-    return (0, lodash_truncate_1.default)(input, { length,
-        omission: '…' });
+    // Not even the escape codes and the text together exceed the length.
+    if (input.length <= length) {
+        return input;
+    }
+    // Truncate the visible text, so that ANSI escape codes do not count towards the length.
+    const visible = (0, strip_ansi_1.default)(input);
+    const truncated = (0, lodash_truncate_1.default)(visible, { length,
+        omission });
+    if (truncated === visible) {
+        return input;
+    }
+    // Cut the input after the same characters, which keeps its ANSI escape codes and closes any that
+    // are still open, so that styles do not leak past the cell.
+    const kept = truncated.slice(0, -omission.length);
+    return (0, slice_ansi_1.default)(input, 0, (0, utils_1.calculateSliceLength)(kept, Number.POSITIVE_INFINITY)) + omission;
 };
 exports.truncateString = truncateString;
-/**
- * @todo Make it work with ASCII content.
- */
 const truncateTableData = (rows, truncates) => {
     return rows.map((cells) => {
         return cells.map((cell, cellIndex) => {

package/dist/src/truncateTableData.js.map

@@ -1 +1 @@
-{"version":3,"file":"truncateTableData.js","sourceRoot":"","sources":["../../src/truncateTableData.ts"],"names":[],"mappings":";;;;;;AAAA,sEAAuC;AAKhC,MAAM,cAAc,GAAG,CAAC,KAAa,EAAE,MAAc,EAAU,EAAE;IACtE,OAAO,IAAA,yBAAQ,EAAC,KAAK,EAAE,EAAC,MAAM;QAC5B,QAAQ,EAAE,GAAG,EAAC,CAAC,CAAC;AACpB,CAAC,CAAC;AAHW,QAAA,cAAc,kBAGzB;AAEF;;GAEG;AACI,MAAM,iBAAiB,GAAG,CAAC,IAAW,EAAE,SAAmB,EAAS,EAAE;IAC3E,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;QACxB,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,SAAS,EAAE,EAAE;YACnC,OAAO,IAAA,sBAAc,EAAC,IAAI,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC;QACpD,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AANW,QAAA,iBAAiB,qBAM5B"}
+{"version":3,"file":"truncateTableData.js","sourceRoot":"","sources":["../../src/truncateTableData.ts"],"names":[],"mappings":";;;;;;AAAA,sEAAuC;AACvC,4DAA+B;AAC/B,4DAAmC;AAInC,mCAEiB;AAEjB,MAAM,QAAQ,GAAG,GAAG,CAAC;AAEd,MAAM,cAAc,GAAG,CAAC,KAAa,EAAE,MAAc,EAAU,EAAE;IACtE,qEAAqE;IACrE,IAAI,KAAK,CAAC,MAAM,IAAI,MAAM,EAAE;QAC1B,OAAO,KAAK,CAAC;KACd;IAED,wFAAwF;IACxF,MAAM,OAAO,GAAG,IAAA,oBAAS,EAAC,KAAK,CAAC,CAAC;IACjC,MAAM,SAAS,GAAG,IAAA,yBAAQ,EAAC,OAAO,EAAE,EAAC,MAAM;QACzC,QAAQ,EAAC,CAAC,CAAC;IAEb,IAAI,SAAS,KAAK,OAAO,EAAE;QACzB,OAAO,KAAK,CAAC;KACd;IAED,iGAAiG;IACjG,4DAA4D;IAC5D,MAAM,IAAI,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;IAElD,OAAO,IAAA,oBAAK,EAAC,KAAK,EAAE,CAAC,EAAE,IAAA,4BAAoB,EAAC,IAAI,EAAE,MAAM,CAAC,iBAAiB,CAAC,CAAC,GAAG,QAAQ,CAAC;AAC1F,CAAC,CAAC;AApBW,QAAA,cAAc,kBAoBzB;AAEK,MAAM,iBAAiB,GAAG,CAAC,IAAW,EAAE,SAAmB,EAAS,EAAE;IAC3E,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;QACxB,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,SAAS,EAAE,EAAE;YACnC,OAAO,IAAA,sBAAc,EAAC,IAAI,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC;QACpD,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AANW,QAAA,iBAAiB,qBAM5B"}

package/package.json

@@ -75,5 +75,5 @@
     "test": "nyc mocha && nyc check-coverage --lines 95"
   },
   "sideEffects": false,
-  "version": "6.9.4"
+  "version": "6.9.5"
 }