@ibm-cloud/cd-tools 1.15.21 → 1.15.22

package/cmd/utils/utils.js

@@ -10,6 +10,16 @@
 import * as readline from 'node:readline/promises';
 import { randomInt } from 'node:crypto';
 
+// Drain stdout before opening a readline prompt. When ora or console.log have
+// queued writes to a TTY, readline's cursor-management sequences can overwrite
+// the last printed lines if we don't wait for the stream to flush first.
+function drainStdout() {
+    return new Promise(resolve => {
+        if (!process.stdout.writableNeedDrain) return resolve();
+        process.stdout.once('drain', resolve);
+    });
+}
+
 import { logger } from './logger.js';
 import { VAULT_REGEX } from '../../config.js';
 
@@ -22,6 +32,7 @@ export function parseEnvVar(name) {
 };
 
 export async function promptUserYesNo(question) {
+    await drainStdout();
     const rl = readline.createInterface({
         input: process.stdin,
         output: process.stdout
@@ -48,6 +59,7 @@ export async function promptUserYesNo(question) {
 }
 
 export async function promptUserConfirmation(question, expectedAns, exitMsg) {
+    await drainStdout();
     const rl = readline.createInterface({
         input: process.stdin,
         output: process.stdout
@@ -70,6 +82,7 @@ export async function promptUserConfirmation(question, expectedAns, exitMsg) {
 }
 
 export async function promptUserInput(question, initialInput, validationFn) {
+    await drainStdout();
     const rl = readline.createInterface({
         input: process.stdin,
         output: process.stdout,

package/cmd/utils/validate.js

@@ -279,9 +279,9 @@ async function validateTools(token, tcId, region, skipPrompt) {
         logger.table(toolsWithHashedParams);
     }
 
-    if (!skipPrompt && (classicPipelines.length > 0 || hasInvalidConfig))
+    if (!skipPrompt && (classicPipelines.length > 0 || hasInvalidConfig)) {
         await promptUserConfirmation('Caution: The above tool(s) will not be properly configured post migration. Do you want to proceed?', 'yes', 'Toolchain migration cancelled.');
-
+    }
     return allTools.tools;
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibm-cloud/cd-tools",
-  "version": "1.15.21",
+  "version": "1.15.22",
   "description": "Tools and utilities for the IBM Cloud Continuous Delivery service and resources",
   "repository": {
     "type": "git",