@awsless/clui 0.0.4 → 0.0.6

package/dist/index.cjs

@@ -189,15 +189,15 @@ var import_chalk = __toESM(require("chalk"), 1);
 var color = import_chalk.default;
 
 // src/logs.ts
-var endMargin = 1;
+var endMargin = 3;
 var intro = (title = "") => {
-  (0, import_prompts3.intro)(subString(title, process.stdout.columns - 8 - endMargin));
+  (0, import_prompts3.intro)(subString(title, process.stdout.columns - 6 - endMargin));
 };
 var outro = (title = "") => {
-  (0, import_prompts3.outro)(subString(title, process.stdout.columns - 8 - endMargin));
+  (0, import_prompts3.outro)(subString(title, process.stdout.columns - 6 - endMargin));
 };
 var note = (title, message2) => {
-  const width = process.stdout.columns - 8 - endMargin;
+  const width = process.stdout.columns - 6 - endMargin;
   (0, import_prompts3.note)(
     wrapString(message2, width, {
       hard: true
@@ -207,7 +207,7 @@ var note = (title, message2) => {
 };
 var logMessage = (symbol, message2) => {
   import_prompts3.log.message(
-    wrapString(message2, process.stdout.columns - 8 - endMargin, {
+    wrapString(message2, process.stdout.columns - 6 - endMargin, {
       hard: true,
       trim: false
     }),
@@ -234,11 +234,11 @@ var task = async (opts) => {
   const spin = (0, import_prompts3.spinner)();
   spin.start(opts.initialMessage);
   const stop = (message2, code) => {
-    spin.stop(subString(message2 ?? last ?? opts.initialMessage, process.stdout.columns - 8 - endMargin), code);
+    spin.stop(subString(message2 ?? last ?? opts.initialMessage, process.stdout.columns - 6 - endMargin), code);
   };
   try {
     const result = await opts.task((m) => {
-      spin.message(subString(m, process.stdout.columns - 8 - endMargin));
+      spin.message(subString(m, process.stdout.columns - 6 - endMargin));
       last = m;
     });
     stop(opts.successMessage);
@@ -250,18 +250,37 @@ var task = async (opts) => {
 };
 var table = (props) => {
   import_prompts3.log.message();
-  const padding = 2;
-  const totalPadding = padding * 2;
   const length = Math.max(props.head.length, ...props.body.map((b) => b.length));
-  const gap = totalPadding + 1;
-  const totalGap = (length - 1) * gap;
-  const max = process.stdout.columns - 4 - totalPadding - totalGap - endMargin;
-  const column = Math.floor(max / length);
-  const leftover = Math.floor(max - column * length);
+  const padding = 2;
+  const totalPadding = padding * 2 * length;
+  const border = 1;
+  const totalBorder = (length - 1) * border + 2;
+  const windowSize = process.stdout.columns;
+  const max = windowSize - totalPadding - totalBorder - endMargin;
+  const contentSizes = Array.from({ length }).map((_, i) => {
+    return Math.max((0, import_string_length.default)(props.head[i] ?? ""), ...props.body.map((b) => (0, import_string_length.default)(String(b[i]))));
+  });
+  const columnSizes = Array.from({ length }).map(() => {
+    return 0;
+  });
+  let leftover = Math.min(
+    max,
+    contentSizes.reduce((total, size) => total + size, 0)
+  );
+  while (leftover > 0) {
+    for (const x in columnSizes) {
+      const columnSize = columnSizes[x];
+      const contentSize = contentSizes[x];
+      if (leftover > 0 && columnSize < contentSize) {
+        leftover--;
+        columnSizes[x] = columnSize + 1;
+      }
+    }
+  }
   const table2 = new import_cli_table3.default({
     head: props.head.map(
-      (h, i) => "\n" + color.reset.whiteBright.bold(
-        wrapString(h, column + (i + 1 === length ? leftover : 0), {
+      (value, x) => "\n" + color.reset.whiteBright.bold(
+        wrapString(value, columnSizes[x], {
           hard: true
         })
       )
@@ -286,7 +305,7 @@ var table = (props) => {
         if (typeof value === "number") {
           return color.blue(value);
         }
-        return wrapString(value, column + (x + 1 === length ? leftover : 0), {
+        return wrapString(value, columnSizes[x], {
           hard: true
         });
       });

package/dist/index.js

@@ -160,15 +160,15 @@ import chalk from "chalk";
 var color = chalk;
 
 // src/logs.ts
-var endMargin = 1;
+var endMargin = 3;
 var intro = (title = "") => {
-  p_intro(subString(title, process.stdout.columns - 8 - endMargin));
+  p_intro(subString(title, process.stdout.columns - 6 - endMargin));
 };
 var outro = (title = "") => {
-  p_outro(subString(title, process.stdout.columns - 8 - endMargin));
+  p_outro(subString(title, process.stdout.columns - 6 - endMargin));
 };
 var note = (title, message2) => {
-  const width = process.stdout.columns - 8 - endMargin;
+  const width = process.stdout.columns - 6 - endMargin;
   p_note(
     wrapString(message2, width, {
       hard: true
@@ -178,7 +178,7 @@ var note = (title, message2) => {
 };
 var logMessage = (symbol, message2) => {
   log.message(
-    wrapString(message2, process.stdout.columns - 8 - endMargin, {
+    wrapString(message2, process.stdout.columns - 6 - endMargin, {
       hard: true,
       trim: false
     }),
@@ -205,11 +205,11 @@ var task = async (opts) => {
   const spin = spinner();
   spin.start(opts.initialMessage);
   const stop = (message2, code) => {
-    spin.stop(subString(message2 ?? last ?? opts.initialMessage, process.stdout.columns - 8 - endMargin), code);
+    spin.stop(subString(message2 ?? last ?? opts.initialMessage, process.stdout.columns - 6 - endMargin), code);
   };
   try {
     const result = await opts.task((m) => {
-      spin.message(subString(m, process.stdout.columns - 8 - endMargin));
+      spin.message(subString(m, process.stdout.columns - 6 - endMargin));
       last = m;
     });
     stop(opts.successMessage);
@@ -221,18 +221,37 @@ var task = async (opts) => {
 };
 var table = (props) => {
   log.message();
-  const padding = 2;
-  const totalPadding = padding * 2;
   const length = Math.max(props.head.length, ...props.body.map((b) => b.length));
-  const gap = totalPadding + 1;
-  const totalGap = (length - 1) * gap;
-  const max = process.stdout.columns - 4 - totalPadding - totalGap - endMargin;
-  const column = Math.floor(max / length);
-  const leftover = Math.floor(max - column * length);
+  const padding = 2;
+  const totalPadding = padding * 2 * length;
+  const border = 1;
+  const totalBorder = (length - 1) * border + 2;
+  const windowSize = process.stdout.columns;
+  const max = windowSize - totalPadding - totalBorder - endMargin;
+  const contentSizes = Array.from({ length }).map((_, i) => {
+    return Math.max(stringLength(props.head[i] ?? ""), ...props.body.map((b) => stringLength(String(b[i]))));
+  });
+  const columnSizes = Array.from({ length }).map(() => {
+    return 0;
+  });
+  let leftover = Math.min(
+    max,
+    contentSizes.reduce((total, size) => total + size, 0)
+  );
+  while (leftover > 0) {
+    for (const x in columnSizes) {
+      const columnSize = columnSizes[x];
+      const contentSize = contentSizes[x];
+      if (leftover > 0 && columnSize < contentSize) {
+        leftover--;
+        columnSizes[x] = columnSize + 1;
+      }
+    }
+  }
   const table2 = new Table({
     head: props.head.map(
-      (h, i) => "\n" + color.reset.whiteBright.bold(
-        wrapString(h, column + (i + 1 === length ? leftover : 0), {
+      (value, x) => "\n" + color.reset.whiteBright.bold(
+        wrapString(value, columnSizes[x], {
           hard: true
         })
       )
@@ -257,7 +276,7 @@ var table = (props) => {
         if (typeof value === "number") {
           return color.blue(value);
         }
-        return wrapString(value, column + (x + 1 === length ? leftover : 0), {
+        return wrapString(value, columnSizes[x], {
           hard: true
         });
       });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@awsless/clui",
-  "version": "0.0.4",
+  "version": "0.0.6",
   "license": "MIT",
   "type": "module",
   "repository": {