refactor: use jsr:@david/console-static-text@^0.3.0 (#334)

Author: dsherret

Cargo.lock

@@ -33,9 +33,11 @@
   ],
   "exports": "./mod.ts",
   "imports": {
+    "@david/console-static-text": "jsr:@david/console-static-text@^0.3.0",
     "@deno/dnt": "jsr:@deno/dnt@~0.41.3",
     "@david/path": "jsr:@david/[email protected]",
     "@std/assert": "jsr:@std/assert@1",
+    "@std/async": "jsr:@std/async@^1.0.13",
     "@std/fmt": "jsr:@std/fmt@1",
     "@std/fs": "jsr:@std/fs@1",
     "@std/io": "jsr:@std/[email protected]",

deno.json

@@ -37,7 +37,7 @@ import {
   select,
   type SelectOptions,
 } from "./src/console/mod.ts";
-import { strip_ansi_codes } from "./src/lib/rs_lib.js";
+import { stripAnsiCodes } from "@david/console-static-text";
 
 import { Path } from "@david/path";
 import { RequestBuilder, withProgressBarFactorySymbol } from "./src/request.ts";
@@ -629,7 +629,7 @@ const helperObject = {
   cd,
   escapeArg,
   stripAnsi(text: string) {
-    return strip_ansi_codes(text);
+    return stripAnsiCodes(text);
   },
   dedent: outdent,
   sleep,

deno.lock

@@ -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/interval.ts";
+import { isShowingProgressBars } from "./console/progress.ts";
 import {
   CapturingBufferWriter,
   CapturingBufferWriterSync,

mod.ts

@@ -207,7 +207,7 @@ export class LoggerTreeBox extends TreeBox<(...args: any[]) => void> {
   override getValue(): (...args: any[]) => void {
     const innerValue = super.getValue();
     return (...args: any[]) => {
-      return logger.logAboveStaticText(() => {
+      return logger.withTempClear(() => {
         innerValue(...args);
       });
     };

src/command.ts

@@ -1,5 +1,6 @@
 import * as colors from "@std/fmt/colors";
-import { createSelection, Keys, resultOrExit, type SelectionOptions, type TextItem } from "./utils.ts";
+import { createSelection, Keys, resultOrExit, type SelectionOptions } from "./utils.ts";
+import type { TextItem } from "@david/console-static-text";
 
 /** Options for showing confirming a yes or no question. */
 export interface ConfirmOptions {

src/common.ts

@@ -1,4 +1,8 @@
-import { type ConsoleSize, isOutputTty, safeConsoleSize, staticText, type TextItem } from "./utils.ts";
+import { isOutputTty } from "./utils.ts";
+import { type ConsoleSize, renderInterval, staticText, type TextItem } from "@david/console-static-text";
+
+const staticTextScope = staticText.createScope();
+const _renderScope = renderInterval.start();
 
 export enum LoggerRefreshItemKind {
   ProgressBars,
@@ -20,33 +24,18 @@ function refresh(size?: ConsoleSize) {
     return;
   }
   const items = Object.values(refreshItems).flatMap((items) => items ?? []);
-  staticText.set(items, size);
-}
-
-function logAboveStaticText(inner: () => void, providedSize?: ConsoleSize) {
-  if (!isOutputTty) {
-    inner();
-    return;
-  }
-
-  const size = providedSize ?? safeConsoleSize();
-  if (size != null) {
-    staticText.clear(size);
-  }
-  inner();
-  refresh(size);
-}
-
-function logOnce(items: TextItem[], size?: ConsoleSize) {
-  logAboveStaticText(() => {
-    staticText.outputItems(items, size);
-  }, size);
+  staticTextScope.setText(items);
+  staticText.refresh(size);
 }
 
 const logger = {
   setItems,
-  logOnce,
-  logAboveStaticText,
+  logOnce(items: TextItem[], size?: ConsoleSize) {
+    staticTextScope.logAbove(items, size);
+  },
+  withTempClear(action: () => void) {
+    staticText.withTempClear(action);
+  },
 };
 
 export { logger };

src/console/confirm.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/logger.ts

@@ -1,5 +1,6 @@
 import * as colors from "@std/fmt/colors";
-import { createSelection, Keys, resultOrExit, type SelectionOptions, type TextItem } from "./utils.ts";
+import type { TextItem } from "@david/console-static-text";
+import { createSelection, Keys, resultOrExit, type SelectionOptions } from "./utils.ts";
 
 /** Single options within a multi-select option. */
 export interface MultiSelectOption {