@fnndsc/chili 3.4.0 → 3.6.0

package/dist/screen/screen.js

@@ -5,6 +5,7 @@
  */
 import { table, getBorderCharacters } from "table";
 import chalk from "chalk";
+import { chiliLog, chiliErrLog } from "./output.js";
 /**
  * Processes raw table input data and headers into a standardized format.
  *
@@ -60,7 +61,7 @@ function tableContent_pack(tableData, selectedFields) {
         body = tableData.map((row) => headers.map((field) => (row[field] !== undefined ? row[field] : "")));
     }
     else {
-        console.error("Invalid table data");
+        chiliErrLog("Invalid table data");
         return null;
     }
     return { headers, body };
@@ -188,10 +189,10 @@ export function table_display(tableData, headers, options = {}) {
         },
     };
     const result = screen.table_output(processedTableData, tableOptions);
-    console.log(result);
+    chiliLog(result);
     if (options.pagination && options.pagination.shown < options.pagination.total) {
         const { shown, total } = options.pagination;
-        console.log(chalk.dim(`  ↓ showing ${shown} of ${total}  ·  --all to fetch all  ·  --limit <n> for page size`));
+        chiliLog(chalk.dim(`  ↓ showing ${shown} of ${total}  ·  --all to fetch all  ·  --limit <n> for page size`));
     }
     return tableObj;
 }
@@ -200,16 +201,16 @@ export function table_display(tableData, headers, options = {}) {
  */
 export class Screen {
     log(...args) {
-        console.log(...args);
+        chiliLog(...args);
     }
     error(...args) {
-        console.error(chalk.red(...args));
+        chiliErrLog(chalk.red(...args));
     }
     warn(...args) {
-        console.warn(chalk.yellow(...args));
+        chiliErrLog(chalk.yellow(...args));
     }
     info(...args) {
-        console.info(chalk.blue(...args));
+        chiliLog(chalk.blue(...args));
     }
     /**
      * Generates a formatted table output string.
@@ -242,7 +243,7 @@ export class Screen {
                 : output;
         }
         catch (error) {
-            console.error("Error in table_output method:", error);
+            chiliErrLog("Error in table_output method:", error);
             return "Error generating table";
         }
     }

package/dist/utils/admin_prompt.js

@@ -9,6 +9,7 @@
  */
 import * as readline from 'readline';
 import { Writable } from 'stream';
+import { chiliLog, chiliWrite } from "../screen/output.js";
 /** Injected by the host (chell) so prompts route through the active readline. */
 let _askFn = null;
 let _askHiddenFn = null;
@@ -35,24 +36,24 @@ export function adminPrompt_register(askFn, askHiddenFn) {
  */
 export async function adminCredentials_prompt(attempt = 1, maxAttempts = 3) {
     if (attempt === 1) {
-        console.log('\nAdmin credentials required to register plugins.');
-        console.log('You can provide these via --adminUser and --adminPassword flags.');
-        console.log('');
+        chiliLog('\nAdmin credentials required to register plugins.');
+        chiliLog('You can provide these via --adminUser and --adminPassword flags.');
+        chiliLog('');
     }
     else {
-        console.log(`\nAuthentication failed. Attempt ${attempt} of ${maxAttempts}.`);
-        console.log('');
+        chiliLog(`\nAuthentication failed. Attempt ${attempt} of ${maxAttempts}.`);
+        chiliLog('');
     }
     const askFn = _askFn ?? ask_fallback;
     const askHiddenFn = _askHiddenFn ?? askHidden_fallback;
     const username = await askFn('Username: ');
     if (!username) {
-        console.log('Username cannot be empty.');
+        chiliLog('Username cannot be empty.');
         return null;
     }
     const password = await askHiddenFn('Password: ');
     if (!password) {
-        console.log('Password cannot be empty.');
+        chiliLog('Password cannot be empty.');
         return null;
     }
     return { username, password };
@@ -82,9 +83,9 @@ function askHidden_fallback(prompt) {
             output: muted,
             terminal: true,
         });
-        process.stdout.write(prompt);
+        chiliWrite(prompt);
         rl.question('', (answer) => {
-            process.stdout.write('\n');
+            chiliWrite('\n');
             rl.close();
             resolve(answer.trim());
         });

package/dist/utils/docker.js

@@ -7,6 +7,7 @@
  * @module
  */
 import { exec } from "child_process";
+import { chiliErrLog, chiliLog } from "../screen/output.js";
 /**
  * Promisified version of child_process.exec.
  * @param command - The command string to execute.
@@ -33,13 +34,13 @@ export async function shellCommand_run(command) {
     try {
         const { stdout, stderr } = await childProcess_exec(command);
         if (stderr) {
-            // console.warn(`Command stderr: ${stderr.trim()}`); // Log stderr as warning, not necessarily an error
+            // chiliErrLog(`Command stderr: ${stderr.trim()}`); // Log stderr as warning, not necessarily an error
         }
         return stdout.trim();
     }
     catch (error) {
-        // console.error(`Command failed: ${command}`);
-        // console.error(`Error: ${error.message}`);
+        // chiliErrLog(`Command failed: ${command}`);
+        // chiliErrLog(`Error: ${error.message}`);
         return null;
     }
 }
@@ -77,8 +78,8 @@ export async function docker_checkAvailability() {
     if (result === "OK") {
         return true;
     }
-    console.error("Error: Docker is not installed or not running.");
-    console.error("Please ensure Docker is properly set up on your system to add plugins.");
+    chiliErrLog("Error: Docker is not installed or not running.");
+    chiliErrLog("Please ensure Docker is properly set up on your system to add plugins.");
     return false;
 }
 /**
@@ -112,17 +113,17 @@ export async function docker_imageExistsLocally(image) {
 export async function docker_pullImage(image, quiet = true) {
     const existsLocally = await docker_imageExistsLocally(image);
     if (existsLocally) {
-        console.log(`Docker image ${image} already exists locally.`);
+        chiliLog(`Docker image ${image} already exists locally.`);
         return true;
     }
-    console.log(`Pulling Docker image: ${image}...`);
+    chiliLog(`Pulling Docker image: ${image}...`);
     const quietFlag = quiet ? '--quiet' : '';
     const result = await shellCommand_run(`docker pull ${quietFlag} ${image}`);
     if (result !== null) {
-        console.log(`Successfully pulled ${image}`);
+        chiliLog(`Successfully pulled ${image}`);
         return true;
     }
-    console.error(`Failed to pull Docker image: ${image}`);
+    chiliErrLog(`Failed to pull Docker image: ${image}`);
     return false;
 }
 /**

package/dist/views/pluginParameters.js

@@ -4,6 +4,7 @@
  * @module
  */
 import chalk from 'chalk';
+import { chiliLog } from "../screen/output.js";
 /**
  * Renders plugin parameters in a "man page" style format.
  *
@@ -15,7 +16,7 @@ import chalk from 'chalk';
  * @param data - The filtered resource data containing plugin parameters.
  */
 export function pluginParameters_renderMan(data) {
-    console.log(pluginParameters_manRender(data));
+    chiliLog(pluginParameters_manRender(data));
 }
 /**
  * Builds the "man page" style rendering of plugin parameters as a string.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fnndsc/chili",
-  "version": "3.4.0",
+  "version": "3.6.0",
   "description": "ChILI handles Intelligent Line Interactions: A CLI and library for ChRIS, acting as the controller layer for business logic and user presentation.",
   "repository": {
     "type": "git",