@awsless/clui 0.0.3 → 0.0.5

package/dist/index.cjs

@@ -33,13 +33,11 @@ __export(index_exports, {
   Cancelled: () => Cancelled,
   ansi: () => ansi_exports,
   color: () => color,
-  isCancel: () => import_prompts4.isCancel,
   log: () => logs_exports,
   prompt: () => prompts_exports,
   symbol: () => symbols_exports
 });
 module.exports = __toCommonJS(index_exports);
-var import_prompts4 = require("@clack/prompts");
 
 // src/symbols.ts
 var symbols_exports = {};
@@ -76,9 +74,9 @@ var Cancelled = class extends Error {
     super("cancelled");
   }
 };
-async function wrapPrompt(cb, { throwOnCancel = true } = {}) {
+async function wrapPrompt(cb) {
   const result = await cb();
-  if ((0, import_prompts.isCancel)(result) && throwOnCancel) {
+  if ((0, import_prompts.isCancel)(result)) {
     throw new Cancelled();
   }
   return result;
@@ -88,12 +86,12 @@ async function wrapPrompt(cb, { throwOnCancel = true } = {}) {
 var text = async (opts) => {
   return wrapPrompt(() => {
     return (0, import_prompts2.text)(opts);
-  }, opts);
+  });
 };
 var password = async (opts) => {
   return wrapPrompt(() => {
     return (0, import_prompts2.password)({ mask: "*", ...opts });
-  }, opts);
+  });
 };
 var integer = async (opts) => {
   const result = await text({
@@ -107,10 +105,7 @@ var integer = async (opts) => {
       return;
     }
   });
-  if (typeof result === "string") {
-    return parseInt(result, 10);
-  }
-  return result;
+  return parseInt(result, 10);
 };
 var float = async (opts) => {
   const result = await text({
@@ -124,25 +119,22 @@ var float = async (opts) => {
       return;
     }
   });
-  if (typeof result === "string") {
-    return parseFloat(result);
-  }
-  return result;
+  return parseFloat(result);
 };
 var confirm = async (opts) => {
   return wrapPrompt(() => {
     return (0, import_prompts2.confirm)(opts);
-  }, opts);
+  });
 };
 var select = async (opts) => {
   return wrapPrompt(() => {
     return (0, import_prompts2.select)(opts);
-  }, opts);
+  });
 };
 var multiSelect = async (opts) => {
   return wrapPrompt(() => {
     return (0, import_prompts2.multiselect)(opts);
-  }, opts);
+  });
 };
 
 // src/logs.ts
@@ -197,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
@@ -215,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
     }),
@@ -242,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);
@@ -258,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(props.head[i]?.length ?? 0, ...props.body.map((b) => String(b[i])?.length));
+  });
+  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
         })
       )
@@ -294,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
         });
       });
@@ -307,7 +318,6 @@ var table = (props) => {
   Cancelled,
   ansi,
   color,
-  isCancel,
   log,
   prompt,
   symbol

package/dist/index.d.cts

@@ -1,5 +1,4 @@
 import { TextOptions, PasswordOptions, ConfirmOptions, SelectOptions, MultiSelectOptions } from '@clack/prompts';
-export { isCancel } from '@clack/prompts';
 import stringLength from 'string-length';
 import { Options } from 'wrap-ansi';
 import * as chalk from 'chalk';
@@ -14,26 +13,19 @@ declare namespace symbols {
   export { error$1 as error, info$1 as info, step$1 as step, success$1 as success, warning$1 as warning };
 }
 
-declare class Cancelled extends Error {
-    constructor();
-}
-type WrapPromptOptions<T extends boolean | undefined = boolean> = {
-    throwOnCancel?: T;
-};
-
-declare const text: <T extends boolean | undefined = undefined>(opts: TextOptions & WrapPromptOptions<T>) => Promise<T extends false ? string | symbol : string>;
-declare const password: <T extends boolean | undefined = undefined>(opts: PasswordOptions & WrapPromptOptions<T>) => Promise<T extends false ? string | symbol : string>;
+declare const text: (opts: TextOptions) => Promise<string>;
+declare const password: (opts: PasswordOptions) => Promise<string>;
 type NumberOptions = {
     message: string;
     placeholder?: string;
     defaultValue?: number;
     initialValue?: number;
 };
-declare const integer: <T extends boolean | undefined = undefined>(opts: NumberOptions & WrapPromptOptions<T>) => Promise<number | (T extends false ? string | symbol : string)>;
-declare const float: <T extends boolean | undefined = undefined>(opts: NumberOptions & WrapPromptOptions<T>) => Promise<number | (T extends false ? string | symbol : string)>;
-declare const confirm: <T extends boolean | undefined = undefined>(opts: ConfirmOptions & WrapPromptOptions<T>) => Promise<T extends false ? boolean | symbol : boolean>;
-declare const select: <Value, T extends boolean | undefined = undefined>(opts: SelectOptions<Value> & WrapPromptOptions<T>) => Promise<T extends false ? symbol | Value : Exclude<Value, symbol>>;
-declare const multiSelect: <Value, T extends boolean | undefined = undefined>(opts: MultiSelectOptions<Value> & WrapPromptOptions<T>) => Promise<T extends false ? symbol | Value[] : Value[]>;
+declare const integer: (opts: NumberOptions) => Promise<number>;
+declare const float: (opts: NumberOptions) => Promise<number>;
+declare const confirm: (opts: ConfirmOptions) => Promise<boolean>;
+declare const select: <Value>(opts: SelectOptions<Value>) => Promise<Exclude<Value, symbol>>;
+declare const multiSelect: <Value>(opts: MultiSelectOptions<Value>) => Promise<Value[]>;
 
 declare const prompts_confirm: typeof confirm;
 declare const prompts_float: typeof float;
@@ -98,4 +90,8 @@ declare namespace ansi {
 
 declare const color: chalk.ChalkInstance;
 
+declare class Cancelled extends Error {
+    constructor();
+}
+
 export { Cancelled, ansi, color, logs as log, prompts as prompt, symbols as symbol };

package/dist/index.d.ts

@@ -1,5 +1,4 @@
 import { TextOptions, PasswordOptions, ConfirmOptions, SelectOptions, MultiSelectOptions } from '@clack/prompts';
-export { isCancel } from '@clack/prompts';
 import stringLength from 'string-length';
 import { Options } from 'wrap-ansi';
 import * as chalk from 'chalk';
@@ -14,26 +13,19 @@ declare namespace symbols {
   export { error$1 as error, info$1 as info, step$1 as step, success$1 as success, warning$1 as warning };
 }
 
-declare class Cancelled extends Error {
-    constructor();
-}
-type WrapPromptOptions<T extends boolean | undefined = boolean> = {
-    throwOnCancel?: T;
-};
-
-declare const text: <T extends boolean | undefined = undefined>(opts: TextOptions & WrapPromptOptions<T>) => Promise<T extends false ? string | symbol : string>;
-declare const password: <T extends boolean | undefined = undefined>(opts: PasswordOptions & WrapPromptOptions<T>) => Promise<T extends false ? string | symbol : string>;
+declare const text: (opts: TextOptions) => Promise<string>;
+declare const password: (opts: PasswordOptions) => Promise<string>;
 type NumberOptions = {
     message: string;
     placeholder?: string;
     defaultValue?: number;
     initialValue?: number;
 };
-declare const integer: <T extends boolean | undefined = undefined>(opts: NumberOptions & WrapPromptOptions<T>) => Promise<number | (T extends false ? string | symbol : string)>;
-declare const float: <T extends boolean | undefined = undefined>(opts: NumberOptions & WrapPromptOptions<T>) => Promise<number | (T extends false ? string | symbol : string)>;
-declare const confirm: <T extends boolean | undefined = undefined>(opts: ConfirmOptions & WrapPromptOptions<T>) => Promise<T extends false ? boolean | symbol : boolean>;
-declare const select: <Value, T extends boolean | undefined = undefined>(opts: SelectOptions<Value> & WrapPromptOptions<T>) => Promise<T extends false ? symbol | Value : Exclude<Value, symbol>>;
-declare const multiSelect: <Value, T extends boolean | undefined = undefined>(opts: MultiSelectOptions<Value> & WrapPromptOptions<T>) => Promise<T extends false ? symbol | Value[] : Value[]>;
+declare const integer: (opts: NumberOptions) => Promise<number>;
+declare const float: (opts: NumberOptions) => Promise<number>;
+declare const confirm: (opts: ConfirmOptions) => Promise<boolean>;
+declare const select: <Value>(opts: SelectOptions<Value>) => Promise<Exclude<Value, symbol>>;
+declare const multiSelect: <Value>(opts: MultiSelectOptions<Value>) => Promise<Value[]>;
 
 declare const prompts_confirm: typeof confirm;
 declare const prompts_float: typeof float;
@@ -98,4 +90,8 @@ declare namespace ansi {
 
 declare const color: chalk.ChalkInstance;
 
+declare class Cancelled extends Error {
+    constructor();
+}
+
 export { Cancelled, ansi, color, logs as log, prompts as prompt, symbols as symbol };

package/dist/index.js

@@ -4,9 +4,6 @@ var __export = (target, all) => {
     __defProp(target, name, { get: all[name], enumerable: true });
 };
 
-// src/index.ts
-import { isCancel as isCancel2 } from "@clack/prompts";
-
 // src/symbols.ts
 var symbols_exports = {};
 __export(symbols_exports, {
@@ -48,9 +45,9 @@ var Cancelled = class extends Error {
     super("cancelled");
   }
 };
-async function wrapPrompt(cb, { throwOnCancel = true } = {}) {
+async function wrapPrompt(cb) {
   const result = await cb();
-  if (isCancel(result) && throwOnCancel) {
+  if (isCancel(result)) {
     throw new Cancelled();
   }
   return result;
@@ -60,12 +57,12 @@ async function wrapPrompt(cb, { throwOnCancel = true } = {}) {
 var text = async (opts) => {
   return wrapPrompt(() => {
     return p_text(opts);
-  }, opts);
+  });
 };
 var password = async (opts) => {
   return wrapPrompt(() => {
     return p_password({ mask: "*", ...opts });
-  }, opts);
+  });
 };
 var integer = async (opts) => {
   const result = await text({
@@ -79,10 +76,7 @@ var integer = async (opts) => {
       return;
     }
   });
-  if (typeof result === "string") {
-    return parseInt(result, 10);
-  }
-  return result;
+  return parseInt(result, 10);
 };
 var float = async (opts) => {
   const result = await text({
@@ -96,25 +90,22 @@ var float = async (opts) => {
       return;
     }
   });
-  if (typeof result === "string") {
-    return parseFloat(result);
-  }
-  return result;
+  return parseFloat(result);
 };
 var confirm = async (opts) => {
   return wrapPrompt(() => {
     return p_confirm(opts);
-  }, opts);
+  });
 };
 var select = async (opts) => {
   return wrapPrompt(() => {
     return p_select(opts);
-  }, opts);
+  });
 };
 var multiSelect = async (opts) => {
   return wrapPrompt(() => {
     return p_multiselect(opts);
-  }, opts);
+  });
 };
 
 // src/logs.ts
@@ -169,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
@@ -187,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
     }),
@@ -214,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);
@@ -230,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(props.head[i]?.length ?? 0, ...props.body.map((b) => String(b[i])?.length));
+  });
+  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
         })
       )
@@ -266,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
         });
       });
@@ -278,7 +288,6 @@ export {
   Cancelled,
   ansi_exports as ansi,
   color,
-  isCancel2 as isCancel,
   logs_exports as log,
   prompts_exports as prompt,
   symbols_exports as symbol

package/package.json

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