@barekey/cli 0.5.3 → 0.5.5

package/dist/output/avatar.js

@@ -1,5 +1,5 @@
 import { Jimp } from "jimp";
-const DEFAULT_AVATAR_COLUMNS = 10;
+const DEFAULT_AVATAR_COLUMNS = 8;
 const DEFAULT_AVATAR_ROWS = 8;
 function supportsAnsiAvatar() {
     if (!process.stdout.isTTY) {
@@ -66,7 +66,6 @@ async function renderAvatarLines(imageUrl) {
         w: DEFAULT_AVATAR_COLUMNS,
         h: bitmapRows,
     });
-    image.circle();
     const { data, width, height } = image.bitmap;
     const lines = [];
     for (let y = 0; y < height; y += 2) {
@@ -78,23 +77,18 @@ async function renderAvatarLines(imageUrl) {
         }
         lines.push(`${line}\u001b[0m`);
     }
-    while (lines.length > 0 && isBlankAvatarLine(lines[0] ?? "")) {
-        lines.shift();
-    }
-    while (lines.length > 0 && isBlankAvatarLine(lines[lines.length - 1] ?? "")) {
-        lines.pop();
-    }
     return lines;
 }
-function isBlankAvatarLine(line) {
-    return line.replace(/\u001b\[[0-9;]*m/g, "").trim().length === 0;
-}
 function joinAvatarAndText(avatarLines, textLines) {
     const totalRows = Math.max(avatarLines.length, textLines.length);
+    const textOffset = avatarLines.length > textLines.length
+        ? Math.floor((avatarLines.length - textLines.length) / 2)
+        : 0;
     const renderedRows = [];
     for (let index = 0; index < totalRows; index += 1) {
         const avatarLine = avatarLines[index] ?? " ".repeat(DEFAULT_AVATAR_COLUMNS);
-        const textLine = textLines[index] ?? "";
+        const textIndex = index - textOffset;
+        const textLine = textIndex >= 0 && textIndex < textLines.length ? (textLines[textIndex] ?? "") : "";
         renderedRows.push(textLine.length > 0 ? `${avatarLine}  ${textLine}` : avatarLine);
     }
     return renderedRows.join("\n");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@barekey/cli",
-  "version": "0.5.3",
+  "version": "0.5.5",
   "description": "Barekey command line interface",
   "type": "module",
   "bin": {

package/src/output/avatar.ts

@@ -1,6 +1,6 @@
 import { Jimp } from "jimp";
 
-const DEFAULT_AVATAR_COLUMNS = 10;
+const DEFAULT_AVATAR_COLUMNS = 8;
 const DEFAULT_AVATAR_ROWS = 8;
 
 type Rgba = {
@@ -92,7 +92,6 @@ async function renderAvatarLines(imageUrl: string): Promise<Array<string>> {
     w: DEFAULT_AVATAR_COLUMNS,
     h: bitmapRows,
   });
-  image.circle();
 
   const { data, width, height } = image.bitmap;
   const lines: Array<string> = [];
@@ -107,30 +106,25 @@ async function renderAvatarLines(imageUrl: string): Promise<Array<string>> {
     lines.push(`${line}\u001b[0m`);
   }
 
-  while (lines.length > 0 && isBlankAvatarLine(lines[0] ?? "")) {
-    lines.shift();
-  }
-  while (lines.length > 0 && isBlankAvatarLine(lines[lines.length - 1] ?? "")) {
-    lines.pop();
-  }
-
   return lines;
 }
 
-function isBlankAvatarLine(line: string): boolean {
-  return line.replace(/\u001b\[[0-9;]*m/g, "").trim().length === 0;
-}
-
 function joinAvatarAndText(
   avatarLines: Array<string>,
   textLines: Array<string>,
 ): string {
   const totalRows = Math.max(avatarLines.length, textLines.length);
+  const textOffset =
+    avatarLines.length > textLines.length
+      ? Math.floor((avatarLines.length - textLines.length) / 2)
+      : 0;
   const renderedRows: Array<string> = [];
 
   for (let index = 0; index < totalRows; index += 1) {
     const avatarLine = avatarLines[index] ?? " ".repeat(DEFAULT_AVATAR_COLUMNS);
-    const textLine = textLines[index] ?? "";
+    const textIndex = index - textOffset;
+    const textLine =
+      textIndex >= 0 && textIndex < textLines.length ? (textLines[textIndex] ?? "") : "";
     renderedRows.push(textLine.length > 0 ? `${avatarLine}  ${textLine}` : avatarLine);
   }