chore: refactor abridgeErrorMessage

Mattlk13 · Jul 23, 2020 · 640679f · 640679f
1 parent f8cd885
commit 640679f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/src/lib/error-format.ts b/src/lib/error-format.ts
@@ -1,12 +1,13 @@
 export function abridgeErrorMessage(
   msg: string,
   maxLen: number,
-  ellipsis?: string,
+  ellipsis = ' ... ',
 ): string {
   if (msg.length <= maxLen) {
     return msg;
   }
-  const e = ellipsis || ' ... ';
-  const toKeep = (maxLen - e.length) / 2;
-  return msg.slice(0, toKeep) + e + msg.slice(msg.length - toKeep, msg.length);
+  const toKeep = Math.floor((maxLen - ellipsis.length) / 2);
+  return (
+    msg.slice(0, toKeep) + ellipsis + msg.slice(msg.length - toKeep, msg.length)
+  );
 }
diff --git a/test/error-format.test.ts b/test/error-format.test.ts
@@ -14,9 +14,14 @@ test('abridge same length as max length', async (t) => {
 });
 
 test('abridge longer than max length', async (t) => {
-  t.equal(abridgeErrorMessage('hello there', 10), 'he ... ere');
+  t.equal(abridgeErrorMessage('hello there', 10), 'he ... re');
 });
 
 test('abridge longer than max length (custom ellipsis)', async (t) => {
   t.equal(abridgeErrorMessage('hello there', 10, '--'), 'hell--here');
 });
+
+test('abridge is not longer than max length', async (t) => {
+  const maxLength = 10;
+  t.true(abridgeErrorMessage('hello there', maxLength).length < maxLength);
+});