dbcat 0.0.12 → 0.0.14

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dbcat",
-  "version": "0.0.12",
+  "version": "0.0.14",
   "description": "A simple CLI to view database tables. Supports PostgreSQL, MySQL, and SQLite.",
   "author": "RiskyMH",
   "license": "MIT",

package/src/index.ts

@@ -121,7 +121,7 @@ export function getTableData(
   tableName: string,
   limit?: number
 ): Promise<Record<string, unknown>[]> {
-  if (limit === undefined) {
+  if (limit === undefined || limit === Infinity) {
     return sql`SELECT * FROM ${sql(tableName)}`;
   }
   return sql`SELECT * FROM ${sql(tableName)} LIMIT ${limit}`;
@@ -135,14 +135,15 @@ function displayTable(
   tableName: string,
   rows: Record<string, unknown>[],
   totalRows?: number,
-  maxRows?: number
+  maxRows?: number,
+  fullContent?: boolean
 ) {
   console.log("");
-  printTable(rows, { title: tableName, totalRows, maxRows });
+  printTable(rows, { title: tableName, totalRows, maxRows, fullContent });
 }
 
 function displayQueryResult(rows: Record<string, unknown>[]) {
-  printTable(rows, { title: "Result", maxRows: Infinity });
+  printTable(rows, { title: "Result", maxRows: Infinity, fullContent: true });
 }
 
 async function readStdin(): Promise<string | null> {
@@ -162,12 +163,18 @@ function parseArgs() {
   const args = process.argv.slice(2);
   let input: string | undefined;
   let full = false;
-  let help = false
+  let help = false;
   let json: false | "plain" | "color" = false;
+  let fullRows = false;
+  let fullContent = false;
 
   for (const arg of args) {
     if (arg === "--full" || arg === "-f") {
       full = true;
+    } else if (arg === "--full-rows") {
+      fullRows = true;
+    } else if (arg === "--full-content") {
+      fullContent = true;
     } else if (arg === "--help" || arg === "-h") {
       help = true;
     } else if (arg === "--json") {
@@ -179,7 +186,7 @@ function parseArgs() {
     }
   }
 
-  return { input, full, json, help };
+  return { input, full, json, help, fullRows, fullContent };
 }
 
 const DEFAULT_LIMIT = 100;
@@ -212,7 +219,7 @@ function outputJson(data: unknown, color: boolean) {
 }
 
 async function main() {
-  const { input, full, json, help } = parseArgs();
+  const { input, full, json, help, fullRows, fullContent } = parseArgs();
 
   if ((!input && !process.env.DATABASE_URL) || help) {
     showUsageAndExit();
@@ -300,15 +307,18 @@ async function main() {
           console.log(`${dim}No tables found.${reset}`);
         } else {
           for (const table of tables) {
-            if (full) {
+            const maxRows = (full || fullRows) ? Infinity : DEFAULT_LIMIT;
+            const fullContentFlag = full || fullContent;
+
+            if (maxRows === Infinity) {
               const data = await getTableData(sql, table.name);
-              displayTable(table.name, data, undefined, Infinity);
+              displayTable(table.name, data, undefined, Infinity, fullContentFlag);
             } else {
               const [count, data] = await Promise.all([
                 getTableCount(sql, table.name),
-                getTableData(sql, table.name, DEFAULT_LIMIT),
+                getTableData(sql, table.name, maxRows),
               ]);
-              displayTable(table.name, data, count, DEFAULT_LIMIT);
+              displayTable(table.name, data, count, maxRows, fullContentFlag);
             }
           }
         }

package/src/table.ts

@@ -74,6 +74,7 @@ export interface TableOptions {
   maxRows?: number;
   title?: string;
   totalRows?: number;
+  fullContent?: boolean;
 }
 
 function wrapLines(str: string, maxWidth: number): string[] {
@@ -118,6 +119,10 @@ function wrapLines(str: string, maxWidth: number): string[] {
   return lines;
 }
 
+function wrapMultilineCell(str: string, maxWidth: number): string[] {
+  return String(str).split('\n').flatMap(line => wrapLines(line, maxWidth));
+}
+
 export function printTable(
   rows: Record<string, unknown>[],
   options: TableOptions = {},
@@ -150,8 +155,7 @@ export function printTable(
         )} ${dim}${BOX.vertical}${reset}`,
       );
       console.log(
-        `${dim}${BOX.bottomLeft}${BOX.horizontal.repeat(innerWidth)}${
-          BOX.bottomRight
+        `${dim}${BOX.bottomLeft}${BOX.horizontal.repeat(innerWidth)}${BOX.bottomRight
         }${reset}`,
       );
     } else {
@@ -180,7 +184,7 @@ export function printTable(
   const colWidths: number[] = allColumns.map((col) => Bun.stringWidth(col));
   const formattedRows: string[][] = displayRows.map((row) =>
     allColumns.map((col, i) => {
-      const formatted = formatValue(row[col]).replace(/\n/g, " ");
+      const formatted = options.fullContent ? formatValue(row[col]) : formatValue(row[col]).replace(/\n/g, `${dim}\\n${reset}`);
       colWidths[i] = Math.max(colWidths[i]!, Bun.stringWidth(formatted));
       return formatted;
     }),
@@ -303,11 +307,11 @@ export function printTable(
     `${dim}${BOX.headerLeft}${BOX.horizontal}${headerSep}${BOX.horizontal}${BOX.headerRight}${reset}`,
   );
 
-  // If in --full mode, apply smart multiline rendering:
-  if (maxRows === Infinity) {
+  if (options.fullContent) {
     for (let rowIdx = 0; rowIdx < visibleFormattedRows.length; rowIdx++) {
       const row = visibleFormattedRows[rowIdx] ?? [];
-      const wrapped = row.map((val, i) => wrapLines(val, visibleColWidths[i]!));
+      const wrapped = row.map((val, i) => wrapMultilineCell(val, visibleColWidths[i]!));
+
       const rowHeight = Math.max(...wrapped.map(x => x.length));
       for (let lineIdx = 0; lineIdx < rowHeight; lineIdx++) {
         const pieces = wrapped.map((cellLines, i) => {
@@ -316,10 +320,10 @@ export function printTable(
             ? padLeft(truncate(part, visibleColWidths[i]!), visibleColWidths[i]!)
             : padRight(truncate(part, visibleColWidths[i]!), visibleColWidths[i]!);
         });
-        const line = pieces.join(` ${dim}${BOX.vertical}${reset} `);
-        console.log(`${dim}${BOX.vertical}${reset} ${line} ${dim}${BOX.vertical}${reset}`);
+        const line = pieces.join(` ${reset}${dim}${BOX.vertical}${reset} `);
+        console.log(`${reset}${dim}${BOX.vertical}${reset} ${line} ${reset}${dim}${BOX.vertical}${reset}`);
       }
-      if (rowIdx < visibleFormattedRows.length - 1) {
+      if (rowIdx < visibleFormattedRows.length - 1 || (rowIdx === visibleFormattedRows.length - 1 && infoText)) {
         const rowSep = visibleColWidths
           .map((w) => BOX.horizontal.repeat(w))
           .join(`${BOX.horizontal}${BOX.headerCross}${BOX.horizontal}`);
@@ -327,7 +331,6 @@ export function printTable(
       }
     }
   } else {
-    // Legacy single-line row rendering
     for (const row of visibleFormattedRows) {
       const line = row
         .map((val, i) => {
@@ -349,8 +352,7 @@ export function printTable(
     console.log(`${dim}${BOX.vertical} ${infoLine} ${BOX.vertical}${reset}`);
 
     console.log(
-      `${dim}${BOX.bottomLeft}${BOX.horizontal.repeat(totalInnerWidth)}${
-        BOX.bottomRight
+      `${dim}${BOX.bottomLeft}${BOX.horizontal.repeat(totalInnerWidth)}${BOX.bottomRight
       }${reset}`,
     );
   } else {