dbcat 0.0.10 → 0.0.12

package/README.md

@@ -33,11 +33,11 @@ echo "SELECT * FROM users" | bunx dbcat ./data.db
 
 ### Options
 
-| Flag           | Description                                       |
-|----------------|---------------------------------------------------|
-| `--full`, `-f` | Show all rows when browsing tables (default: 100) |
-| `--json`       | Output as JSON (indented if TTY)                  |
-| `--json=color` | Output as normal object console.log               |
+| Flag           | Description                                                   |
+|----------------|---------------------------------------------------------------|
+| `--full`, `-f` | Show all rows & data when browsing tables (default: 100 rows) |
+| `--json`       | Output as JSON (indented if TTY)                              |
+| `--json=color` | Output as normal object console.log                           |
 
 Piped queries always return all rows.
 

package/package.json

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

package/src/index.ts

@@ -137,7 +137,7 @@ function displayTable(
   totalRows?: number,
   maxRows?: number
 ) {
-  console.log();
+  console.log("");
   printTable(rows, { title: tableName, totalRows, maxRows });
 }
 
@@ -146,7 +146,7 @@ function displayQueryResult(rows: Record<string, unknown>[]) {
 }
 
 async function readStdin(): Promise<string | null> {
-  if (process.stdin.isTTY || Bun.stdin.size === 0) {
+  if (process.stdin.isTTY) {
     return null;
   }
 
@@ -194,6 +194,11 @@ function showUsageAndExit(): never {
   console.error("  dbcat https://example.com/data.db");
   console.error("");
   console.error("Or set DATABASE_URL environment variable.");
+  console.error("");
+  console.error("Flags:");
+  console.error("  --full  : Show the entire table and wrap cell values to fit column widths");
+  console.error("  --json  : Output as JSON instead of a visual table");
+  console.error("  --help  : Show this help message");
   process.exit(1);
 }
 
@@ -246,7 +251,7 @@ async function main() {
 
   let sql: InstanceType<typeof Bun.SQL>;
   try {
-    sql = createConnection(connectionInput, { readonly: Bun.stdin.size == 0 });
+    sql = createConnection(connectionInput, { readonly: process.stdin.isTTY });
   } catch (error) {
     console.error("Failed to connect:");
     console.error(error instanceof Error ? error.message : String(error));

package/src/table.ts

@@ -76,6 +76,48 @@ export interface TableOptions {
   totalRows?: number;
 }
 
+function wrapLines(str: string, maxWidth: number): string[] {
+  // Split input into logical words, wrap to fit maxWidth
+  const raw = str.split(/\n/g).join(" ");
+  if (raw === "") return [""];
+
+  let lines: string[] = [];
+  let current = "";
+
+  const tokens = raw.split(/([ ]+)/);
+  for (const token of tokens) {
+    let fragment = token;
+    while (fragment.length > 0) {
+      const width = Bun.stringWidth(current + fragment);
+      if (width > maxWidth) {
+        if (current.length > 0) {
+          lines.push(current);
+          current = "";
+        } else {
+          let cutPoint = 1;
+          while (cutPoint < fragment.length && Bun.stringWidth(fragment.slice(0, cutPoint)) < maxWidth) {
+            cutPoint++;
+          }
+          lines.push(fragment.slice(0, cutPoint));
+          fragment = fragment.slice(cutPoint);
+        }
+      } else {
+        current += fragment;
+        fragment = "";
+      }
+    }
+    if (Bun.stringWidth(current) >= maxWidth) {
+      lines.push(current);
+      current = "";
+    }
+  }
+  if (current.length > 0) {
+    lines.push(current);
+  }
+
+  return lines;
+}
+
 export function printTable(
   rows: Record<string, unknown>[],
   options: TableOptions = {},
@@ -261,18 +303,44 @@ export function printTable(
     `${dim}${BOX.headerLeft}${BOX.horizontal}${headerSep}${BOX.horizontal}${BOX.headerRight}${reset}`,
   );
 
-  for (const row of visibleFormattedRows) {
-    const line = row
-      .map((val, i) => {
-        const truncated = truncate(val, visibleColWidths[i]!);
-        return visibleIsNumeric[i]
-          ? padLeft(truncated, visibleColWidths[i]!)
-          : padRight(truncated, visibleColWidths[i]!);
-      })
-      .join(` ${dim}${BOX.vertical}${reset} `);
-    console.log(
-      `${dim}${BOX.vertical}${reset} ${line} ${dim}${BOX.vertical}${reset}`,
-    );
+  // If in --full mode, apply smart multiline rendering:
+  if (maxRows === Infinity) {
+    for (let rowIdx = 0; rowIdx < visibleFormattedRows.length; rowIdx++) {
+      const row = visibleFormattedRows[rowIdx] ?? [];
+      const wrapped = row.map((val, i) => wrapLines(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) => {
+          const part: string = typeof cellLines[lineIdx] === "string" ? cellLines[lineIdx]! : "";
+          return visibleIsNumeric[i]
+            ? 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}`);
+      }
+      if (rowIdx < visibleFormattedRows.length - 1) {
+        const rowSep = visibleColWidths
+          .map((w) => BOX.horizontal.repeat(w))
+          .join(`${BOX.horizontal}${BOX.headerCross}${BOX.horizontal}`);
+        console.log(`${dim}${BOX.headerLeft}${BOX.horizontal}${rowSep}${BOX.horizontal}${BOX.headerRight}${reset}`);
+      }
+    }
+  } else {
+    // Legacy single-line row rendering
+    for (const row of visibleFormattedRows) {
+      const line = row
+        .map((val, i) => {
+          const truncated = truncate(val, visibleColWidths[i]!);
+          return visibleIsNumeric[i]
+            ? padLeft(truncated, visibleColWidths[i]!)
+            : padRight(truncated, visibleColWidths[i]!);
+        })
+        .join(` ${dim}${BOX.vertical}${reset} `);
+      console.log(
+        `${dim}${BOX.vertical}${reset} ${line} ${dim}${BOX.vertical}${reset}`,
+      );
+    }
   }
 
   if (infoText) {