@travetto/terminal 3.0.0-rc.7 → 3.0.0-rc.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/terminal",
-  "version": "3.0.0-rc.7",
+  "version": "3.0.0-rc.9",
   "description": "General terminal support",
   "keywords": [
     "terminal",

package/src/operation.ts

@@ -96,19 +96,20 @@ export class TerminalOperation {
   /**
    * Stream lines with a waiting indicator
    */
-  static async streamLinesWithWaiting(term: TermState, lines: AsyncIterable<string>, cfg: TerminalWaitingConfig = {}): Promise<void> {
+  static async streamLinesWithWaiting(term: TermState, lines: AsyncIterable<string | undefined>, cfg: TerminalWaitingConfig = {}): Promise<void> {
     let writer: (() => Promise<unknown>) | undefined;
     let line: string | undefined;
 
     const commitLine = async (): Promise<void> => {
       await writer?.();
       if (line) {
-        const msg = `${String.fromCharCode(171)} ${line}`;
+        const msg = cfg.committedPrefix ? `${cfg.committedPrefix} ${line}` : line;
         if (cfg.position === 'inline') {
           await TerminalWriter.for(term).setPosition({ x: 0 }).changePosition({ y: -1 }).writeLine(msg).commit();
         } else {
           await TerminalWriter.for(term).writeLine(msg).commit();
         }
+        line = undefined;
       }
     };
 
@@ -116,9 +117,11 @@ export class TerminalOperation {
 
     for await (let msg of lines) {
       await commitLine();
-      msg = msg.replace(/\n$/, '');
-      writer = this.streamWaiting(term, msg, cfg, pos);
-      line = msg;
+      if (msg !== undefined) {
+        msg = msg.replace(/\n$/, '');
+        writer = this.streamWaiting(term, msg, cfg, pos);
+        line = msg;
+      }
     }
     await commitLine();
   }

package/src/query.ts

@@ -50,7 +50,16 @@ export class TerminalQuerier {
   }
 
   async #readInput(query: string): Promise<Buffer> {
+    const isRaw = this.#input.isRaw;
+    const isPaused = this.#input.isPaused();
+    const data = this.#input.listeners('data');
     try {
+      this.#input.removeAllListeners('data');
+
+      if (isPaused) {
+        this.#input.resume();
+      }
+
       this.#input.setRawMode(true);
       // Send data, but do not wait on it
       this.#output.write(query);
@@ -58,7 +67,14 @@ export class TerminalQuerier {
       const val: Buffer | string = this.#input.read();
       return typeof val === 'string' ? Buffer.from(val, 'utf8') : val;
     } finally {
-      this.#input.setRawMode(false);
+      if (isPaused) {
+        this.#input.pause();
+      }
+      this.#input.setRawMode(isRaw);
+      for (const fn of data) {
+        // @ts-ignore
+        this.#input.on('data', fn);
+      }
     }
   }
 

package/src/terminal.ts

@@ -128,10 +128,13 @@ export class Terminal implements TermState {
    * @param config
    * @returns
    */
-  async streamLinesWithWaiting(lines: AsyncIterable<string>, config: TerminalWaitingConfig): Promise<void> {
+  async streamLinesWithWaiting(lines: AsyncIterable<string | undefined>, config: TerminalWaitingConfig): Promise<void> {
     if (!this.interactive) {
       for await (const line of lines) {
-        await this.writeLines(line);
+        if (line !== undefined) {
+          const out = config.committedPrefix ? `${config.committedPrefix} ${line}` : line;
+          await this.writeLines(out);
+        }
       }
     } else {
       return TerminalOperation.streamLinesWithWaiting(this, lines, { position: 'bottom', ...config });

package/src/types.ts

@@ -13,7 +13,7 @@ export type TerminalTableEvent = { idx: number, text: string, done?: boolean };
 export type TerminalTableConfig = { header?: string[], forceNonInteractiveOrder?: boolean };
 export type TerminalProgressEvent = { idx: number, total?: number, text?: string };
 export type TerminalProgressRender = (ev: TerminalProgressEvent) => string;
-export type TerminalWaitingConfig = { position?: TermLinePosition, end?: boolean } & DelayedConfig;
+export type TerminalWaitingConfig = { position?: TermLinePosition, end?: boolean, committedPrefix?: string } & DelayedConfig;
 
 export type TermColorLevel = 0 | 1 | 2 | 3;
 export type TermColorScheme = 'dark' | 'light';