@fnndsc/chili 3.2.5 → 3.4.0

package/dist/screen/screen.js

@@ -118,6 +118,50 @@ function firstColumnSettings_apply(columns) {
  * @param options - Optional table display options.
  * @returns The `TableContent` object or null on error.
  */
+/**
+ * Renders a table to a string, the string form of {@link table_display}.
+ *
+ * Envelope-returning callers use this to return their output rather than
+ * printing it; table_display remains the printing form for callers not yet
+ * converted. Returns an empty string when there is no table to render.
+ *
+ * @param tableData - The rows to render.
+ * @param headers - Column headers.
+ * @param options - Table formatting options.
+ * @returns The rendered table (with a trailing newline), or an empty string.
+ */
+export function table_render(tableData, headers, options = {}) {
+    const { processedTableData, processedHeaders } = tableInput_process(tableData, headers);
+    const tableObj = tableContent_pack(processedTableData, processedHeaders);
+    if (!tableObj) {
+        return "";
+    }
+    const columns = tableObj.headers.map((_, index) => {
+        const existingCol = options.columns?.[index] || {};
+        return {
+            justification: "left",
+            ...existingCol,
+        };
+    });
+    const updatedColumns = firstColumnSettings_apply(columns);
+    const tableOptions = {
+        ...options,
+        head: processedHeaders,
+        columns: updatedColumns,
+        typeColors: {
+            string: "green",
+            number: "yellow",
+            boolean: "cyan",
+            object: "magenta",
+        },
+    };
+    let out = `${screen.table_output(processedTableData, tableOptions)}\n`;
+    if (options.pagination && options.pagination.shown < options.pagination.total) {
+        const { shown, total } = options.pagination;
+        out += `${chalk.dim(`  ↓ showing ${shown} of ${total}  ·  --all to fetch all  ·  --limit <n> for page size`)}\n`;
+    }
+    return out;
+}
 export function table_display(tableData, headers, options = {}) {
     const { processedTableData, processedHeaders } = tableInput_process(tableData, headers);
     const tableObj = tableContent_pack(processedTableData, processedHeaders);

package/dist/utils/resourceData.d.ts

@@ -0,0 +1,16 @@
+/**
+ * @file Shared shaping helpers for FilteredResourceData prior to display.
+ *
+ * @module
+ */
+import { FilteredResourceData } from "@fnndsc/cumin";
+/**
+ * Removes duplicate column headers from a FilteredResourceData result.
+ *
+ * Keeps each selected field once (preserving first-seen order) and projects
+ * every table row onto that unique header set.
+ *
+ * @param results - The resource data to de-duplicate.
+ * @returns A new FilteredResourceData with unique selectedFields and matching rows.
+ */
+export declare function resourceColumns_removeDuplicates(results: FilteredResourceData): FilteredResourceData;

package/dist/utils/resourceData.js

@@ -0,0 +1,23 @@
+/**
+ * Removes duplicate column headers from a FilteredResourceData result.
+ *
+ * Keeps each selected field once (preserving first-seen order) and projects
+ * every table row onto that unique header set.
+ *
+ * @param results - The resource data to de-duplicate.
+ * @returns A new FilteredResourceData with unique selectedFields and matching rows.
+ */
+export function resourceColumns_removeDuplicates(results) {
+    const uniqueHeaders = Array.from(new Set(results.selectedFields));
+    const uniqueTableData = results.tableData.map((row) => uniqueHeaders.reduce((acc, header) => {
+        if (typeof header === "string" && header in row) {
+            acc[header] = row[header];
+        }
+        return acc;
+    }, {}));
+    return {
+        ...results,
+        selectedFields: uniqueHeaders,
+        tableData: uniqueTableData,
+    };
+}

package/dist/views/pluginParameters.d.ts

@@ -15,3 +15,13 @@ import { FilteredResourceData } from '@fnndsc/cumin';
  * @param data - The filtered resource data containing plugin parameters.
  */
 export declare function pluginParameters_renderMan(data: FilteredResourceData): void;
+/**
+ * Builds the "man page" style rendering of plugin parameters as a string.
+ *
+ * Same format as {@link pluginParameters_renderMan} but returns the text
+ * instead of printing it, so hosted surfaces can carry it in an envelope.
+ *
+ * @param data - The filtered resource data containing plugin parameters.
+ * @returns The rendered parameter listing.
+ */
+export declare function pluginParameters_manRender(data: FilteredResourceData): string;

package/dist/views/pluginParameters.js

@@ -15,10 +15,22 @@ import chalk from 'chalk';
  * @param data - The filtered resource data containing plugin parameters.
  */
 export function pluginParameters_renderMan(data) {
+    console.log(pluginParameters_manRender(data));
+}
+/**
+ * Builds the "man page" style rendering of plugin parameters as a string.
+ *
+ * Same format as {@link pluginParameters_renderMan} but returns the text
+ * instead of printing it, so hosted surfaces can carry it in an envelope.
+ *
+ * @param data - The filtered resource data containing plugin parameters.
+ * @returns The rendered parameter listing.
+ */
+export function pluginParameters_manRender(data) {
     if (!data.tableData || data.tableData.length === 0) {
-        console.log("No parameters found.");
-        return;
+        return "No parameters found.";
     }
+    const lines = [];
     data.tableData.forEach((param) => {
         // 1. Construct the first line: Flags and Value
         let line1Parts = [];
@@ -52,28 +64,23 @@ export function pluginParameters_renderMan(data) {
             line1Parts.push(chalk.gray(`(default: ${param.default})`));
         }
         if (line1Parts.length > 0) {
-            console.log(line1Parts.join(' '));
+            lines.push(line1Parts.join(' '));
         }
-        else {
-            // Fallback if both are suppressed (e.g. name 'v', no flag)?
-            // In strict adherence, we show nothing on line 1, which is weird.
-            // But assuming a valid plugin definition, one of them should appear.
-            // If name is 'v', it implies it should probably have a flag '-v'.
-            // If not, we might want to show '--v' anyway despite the rule, or '-v'.
-            // For safety, if line1 is empty but we have a name, show it as long flag to avoid invisible params.
-            if (param.name) {
-                console.log(chalk.bold(`--${param.name}`) + ' ' + chalk.gray('(implicit)'));
-            }
+        else if (param.name) {
+            // Fallback: if line1 is empty but we have a name, show it as a long flag
+            // to avoid invisible params.
+            lines.push(chalk.bold(`--${param.name}`) + ' ' + chalk.gray('(implicit)'));
         }
         // 2. Type line
         if (param.type) {
-            console.log(`Type: ${chalk.yellow(param.type)}`);
+            lines.push(`Type: ${chalk.yellow(param.type)}`);
         }
         // 3. Help description
         if (param.help) {
-            console.log(chalk.white(param.help));
+            lines.push(chalk.white(param.help));
         }
-        // Separator (newline)
-        console.log('');
+        // Separator (blank line)
+        lines.push('');
     });
+    return lines.join('\n');
 }

package/docs/pacs.adoc

@@ -21,7 +21,7 @@
 == PACS Queries
 
 - **Create**: `chili pacsqueries create "<query>" [--title <title>] [--description <desc>] [--pacsserver <pacs>]`
-  - `<query>` can be JSON (`{"PatientID":"12345"}`) or comma-separated `key:value` pairs (`PatientID:12345,StudyDate:20251003`).
+  - `<query>` can be JSON (`{"PatientID":"12345"}`) or comma-separated `key:value` pairs (`PatientID:12345,StudyDate:20240101`).
   - On success prints: `Created PACS query id=<ID> status=<status> pacs=<pacs> title="<title>"`.
 - **List**: `chili pacsqueries list [--pacsserver <pacs>] [--fields ...] [--table|--csv]`
   - Filters to current/override PACS server. Use `fieldslist` to discover columns.
@@ -64,7 +64,7 @@
 ```bash
 chili context set --pacsserver PACSDCM
 chili pacsservers list --table
-chili pacsqueries create "PatientID:4456554" --title "PID 4456554"
+chili pacsqueries create "PatientID:7654321" --title "PID 7654321"
 chili pacsqueries list --fields id,title,status,pacs_id,query
 chili pacsqueries decode <id>
 ```
@@ -76,7 +76,7 @@ chili pacsqueries decode <id>
 chili context set --pacsserver PACSDCM
 
 # 2. Create query
-chili pacsqueries create "PatientID:4456554" --title "Patient scan"
+chili pacsqueries create "PatientID:7654321" --title "Patient scan"
 # Returns: Created PACS query id=123
 
 # 3. See what's available on PACS

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fnndsc/chili",
-  "version": "3.2.5",
+  "version": "3.4.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",
@@ -25,7 +25,7 @@
   "scripts": {
     "build": "tsc && chmod +x ./dist/index.js",
     "start": "node dist/index.js",
-    "test": "jest",
+    "test": "jest --coverage",
     "test:coverage": "jest --coverage --coverageProvider=v8",
     "clean": "rm -rf dist types fnndsc-chili*tgz",
     "build:cumin": "cd ../cumin && npm run build",
@@ -47,14 +47,13 @@
   "author": "FNNDSC <dev@babyMRI.org>",
   "license": "MIT",
   "dependencies": {
-    "@fnndsc/cumin": "^3.2.4",
-    "@fnndsc/salsa": "^3.2.4",
+    "@fnndsc/cumin": "^3.4.0",
+    "@fnndsc/salsa": "^3.2.5",
     "@fortawesome/fontawesome-free": "^6.6.0",
     "@fortawesome/fontawesome-svg-core": "^6.6.0",
     "@fortawesome/free-solid-svg-icons": "^6.6.0",
-    "@mermaid-js/mermaid-cli": "^11.12.0",
     "archy": "^1.0.0",
-    "asciidoctor": "^3.0.4",
+    "asciidoctor": "^4.0.1",
     "axios": "^1.6.0",
     "chalk": "^4.1.2",
     "cli-highlight": "^2.1.11",
@@ -65,7 +64,6 @@
     "js-yaml": "^4.1.0",
     "marked": "^9.1.0",
     "marked-terminal": "^6.1.0",
-    "node-fetch": "^3.3.2",
     "omelette": "^0.4.17",
     "open": "^10.1.0",
     "table": "^6.8.1"
@@ -77,7 +75,7 @@
     "@types/jest": "^30.0.0",
     "@types/js-yaml": "^4.0.5",
     "@types/marked-terminal": "^6.1.1",
-    "@types/node": "^24.10.1",
+    "@types/node": "^22.0.0",
     "@types/node-fetch": "^2.6.11",
     "@types/omelette": "^0.4.4",
     "jest": "^30.2.0",