collapse to single file

Author: dsherret

src/command.ts

@@ -22,7 +22,7 @@ import { whichCommand } from "./commands/which.ts";
 import { Box, delayToMs, errorToString, LoggerTreeBox } from "./common.ts";
 import type { Delay } from "./common.ts";
 import { symbols } from "./common.ts";
-import { isShowingProgressBars } from "./console/progress/mod.ts";
+import { isShowingProgressBars } from "./console/progress.ts";
 import {
   CapturingBufferWriter,
   CapturingBufferWriterSync,

src/console/mod.ts

@@ -3,8 +3,8 @@ export type { ConfirmOptions } from "./confirm.ts";
 export { logger } from "./logger.ts";
 export { maybeMultiSelect, multiSelect } from "./multiSelect.ts";
 export type { MultiSelectOption, MultiSelectOptions } from "./multiSelect.ts";
-export type { ProgressOptions } from "./progress/mod.ts";
-export { isShowingProgressBars, ProgressBar } from "./progress/mod.ts";
+export type { ProgressOptions } from "./progress.ts";
+export { isShowingProgressBars, ProgressBar } from "./progress.ts";
 export { maybePrompt, prompt } from "./prompt.ts";
 export type { PromptInputMask, PromptOptions } from "./prompt.ts";
 export { maybeSelect, select } from "./select.ts";

src/console/progress/mod.test.ts renamed to src/console/progress.test.ts

@@ -1,6 +1,6 @@
 import { assertEquals } from "@std/assert";
 import { renderTextItems, stripAnsiCodes } from "@david/console-static-text";
-import { renderProgressBar } from "./mod.ts";
+import { humanDownloadSize, renderProgressBar } from "./progress.ts";
 
 Deno.test("should render when no length", () => {
   assertEquals(
@@ -155,3 +155,27 @@ function getOutput(state: Partial<Parameters<typeof renderProgressBar>[0]>) {
   }, { columns: 80, rows: 10 });
   return stripAnsiCodes(renderTextItems(items, { columns: 80, rows: 10 }) ?? "");
 }
+
+Deno.test("should format bytes", () => {
+  assertEquals(
+    humanDownloadSize(1023, 1023),
+    "1023 B",
+  );
+  assertEquals(
+    humanDownloadSize(1023, 1024),
+    "0.99 KiB",
+  );
+  assertEquals(
+    humanDownloadSize(10486, Math.pow(1024, 2)),
+    "0.01 MiB",
+  );
+
+  assertEquals(
+    humanDownloadSize(10737418, Math.pow(1024, 3)),
+    "0.00 GiB",
+  );
+  assertEquals(
+    humanDownloadSize(10737419, Math.pow(1024, 3)),
+    "0.01 GiB",
+  );
+});

src/console/progress/mod.ts renamed to src/console/progress.ts

@@ -7,11 +7,8 @@ import {
   staticText,
   type TextItem,
 } from "@david/console-static-text";
-import { isOutputTty } from "../utils.ts";
-import { humanDownloadSize } from "./format.ts";
-import { logger, LoggerRefreshItemKind } from "../logger.ts";
-
-const progressBars: RenderIntervalProgressBar[] = [];
+import { isOutputTty } from "./utils.ts";
+import { logger, LoggerRefreshItemKind } from "./logger.ts";
 
 /** Options for showing progress. */
 export interface ProgressOptions {
@@ -32,7 +29,7 @@ export interface ProgressOptions {
 /** A progress bar instance created via `$.progress(...)`. */
 export class ProgressBar {
   #state: RenderState;
-  #pb: RenderIntervalProgressBar;
+  #pb: DeferredItem;
   #withCount = 0;
   #onLog: (...data: any[]) => void;
   #noClear: boolean;
@@ -252,20 +249,15 @@ export function renderProgressBar(state: RenderState, size: ConsoleSize | undefi
   }
 }
 
-export interface RenderIntervalProgressBar {
-  render(size: ConsoleSize | undefined): TextItem[];
-}
+const progressBars: DeferredItem[] = [];
 
-function addProgressBar(render: (size: ConsoleSize) => TextItem[]): RenderIntervalProgressBar {
-  const pb = {
-    render,
-  };
-  progressBars.push(pb);
+function addProgressBar(render: DeferredItem): DeferredItem {
+  progressBars.push(render);
   refresh();
-  return pb;
+  return render;
 }
 
-function removeProgressBar(pb: RenderIntervalProgressBar) {
+function removeProgressBar(pb: DeferredItem) {
   const index = progressBars.indexOf(pb);
   if (index === -1) {
     return false;
@@ -278,15 +270,20 @@ function removeProgressBar(pb: RenderIntervalProgressBar) {
 function refresh() {
   logger.setItems(
     LoggerRefreshItemKind.ProgressBars,
-    progressBars.map((p) => {
-      const item: DeferredItem = (consoleSize) => {
-        return p.render(consoleSize);
-      };
-      return item;
-    }),
+    progressBars,
   );
 }
 
 export function isShowingProgressBars() {
   return isOutputTty && progressBars.length > 0;
 }
+
+const units = ["B", "KiB", "MiB", "GiB", "TiB", "PiB", "EiB", "ZiB", "YiB"];
+
+export function humanDownloadSize(byteCount: number, totalBytes?: number) {
+  const exponentBasis = totalBytes ?? byteCount;
+  const exponent = Math.min(units.length - 1, Math.floor(Math.log(exponentBasis) / Math.log(1024)));
+  const unit = units[exponent];
+  const prettyBytes = (Math.floor(byteCount / Math.pow(1024, exponent) * 100) / 100).toFixed(exponent === 0 ? 0 : 2);
+  return `${prettyBytes} ${unit}`;
+}