@deaquinodev/querky 0.4.4 → 0.4.5

package/dist/index.js

@@ -39,10 +39,11 @@ var PgDbClient = class {
   }
   pg;
   async query(sql) {
-    const result = await this.pg.query(sql);
+    const raw = await this.pg.query(sql);
+    const result = Array.isArray(raw) ? raw[raw.length - 1] : raw;
     return {
-      fields: result.fields.map((f) => f.name),
-      rows: result.rows,
+      fields: (result.fields ?? []).map((f) => f.name),
+      rows: result.rows ?? [],
       rowCount: result.rowCount ?? 0
     };
   }
@@ -625,8 +626,12 @@ var COMMANDS = {
     description: "Save last query as a named alias",
     category: "Aliases",
     usage: "/save <name>",
-    detail: "Saves the last executed SQL query as a named alias scoped to the current database. Run it later with /<name>. Supports positional ($1, $2) and named (:param) substitution.",
-    example: "/save active-orders",
+    detail: "Saves the last executed SQL query as a named alias scoped to the current database. Run it later with /<name>. If the query contains $1, $2 placeholders or :param placeholders, values are substituted at run time.",
+    examples: [
+      "/save active-orders                 (no params \u2014 run with /active-orders)",
+      "/save user-by-id                    (query had WHERE id = $1 \u2014 run with /user-by-id 42)",
+      "/save by-status                     (query had WHERE status = :status \u2014 run with /by-status :status=active)"
+    ],
     run: (ctx) => {
       const name = ctx.args.trim();
       if (!name) return { ok: false, message: "Usage: /save <name>" };
@@ -640,8 +645,14 @@ var COMMANDS = {
     description: "Define an alias inline",
     category: "Aliases",
     usage: "/alias <name> <SQL>",
-    detail: "Defines a named alias without running a query first. Equivalent to /save but lets you specify the SQL directly.",
-    example: "/alias recent SELECT * FROM events ORDER BY created_at DESC LIMIT 20",
+    detail: "Defines a named alias without running a query first. Use $1, $2 for positional args or :param for named args \u2014 values are substituted when the alias is invoked.",
+    examples: [
+      "/alias recent SELECT * FROM events ORDER BY created_at DESC LIMIT 20",
+      "/alias user SELECT * FROM users WHERE id = $1",
+      "/alias by-email SELECT * FROM users WHERE email = :email",
+      "/user 42                             (positional)",
+      "/by-email :email=alice@example.com   (named)"
+    ],
     run: (ctx) => {
       const [name, ...rest] = ctx.args.trim().split(/\s+/);
       if (!name || rest.length === 0) return { ok: false, message: "Usage: /alias <name> <SQL>" };
@@ -706,7 +717,8 @@ var COMMANDS = {
           description: cmd.description,
           psqlAlias: PSQL_REVERSE[name],
           detail: cmd.detail,
-          example: cmd.example
+          example: cmd.example,
+          examples: cmd.examples
         };
         return { ok: true, message: "", helpData: { mode: "detail", entry } };
       }
@@ -1713,7 +1725,7 @@ import { Box as Box2, Text as Text2 } from "ink";
 import { jsx as jsx2, jsxs as jsxs2 } from "react/jsx-runtime";
 var COL_PAD = 1;
 var INDIGO = "#818cf8";
-var BORDER = "white";
+var BORDER2 = "white";
 var NULL_COLOR = "#6366f1";
 var NULL_MARKER = "\u2205";
 function isNull(val) {
@@ -1744,10 +1756,10 @@ function hline(widths, left, mid, right) {
 function ExpandedTable({ columns, rows }) {
   const keyWidth = columns.reduce((max, col) => Math.max(max, col.length), 0);
   return /* @__PURE__ */ jsx2(Box2, { flexDirection: "column", children: rows.map((row, i) => /* @__PURE__ */ jsxs2(Box2, { flexDirection: "column", marginBottom: i < rows.length - 1 ? 1 : 0, children: [
-    /* @__PURE__ */ jsx2(Text2, { color: BORDER, children: `\u2500[ Record ${i + 1} ]${"\u2500".repeat(Math.max(0, keyWidth + 14 - String(i + 1).length))}` }),
+    /* @__PURE__ */ jsx2(Text2, { color: BORDER2, children: `\u2500[ Record ${i + 1} ]${"\u2500".repeat(Math.max(0, keyWidth + 14 - String(i + 1).length))}` }),
     columns.map((col) => /* @__PURE__ */ jsxs2(Box2, { children: [
       /* @__PURE__ */ jsx2(Text2, { color: INDIGO, bold: true, children: col.padEnd(keyWidth) }),
-      /* @__PURE__ */ jsx2(Text2, { color: BORDER, children: " \u2502 " }),
+      /* @__PURE__ */ jsx2(Text2, { color: BORDER2, children: " \u2502 " }),
       isNull(row[col]) ? /* @__PURE__ */ jsx2(Text2, { color: NULL_COLOR, dimColor: true, children: NULL_MARKER }) : /* @__PURE__ */ jsx2(Text2, { children: cellValue(row[col]) })
     ] }, col))
   ] }, i)) });
@@ -1760,31 +1772,31 @@ function Table({ columns, rows, expanded = false }) {
   const botLine = hline(widths, "\u2570", "\u2534", "\u256F");
   function renderHeaderRow(cols) {
     return /* @__PURE__ */ jsxs2(Box2, { children: [
-      /* @__PURE__ */ jsx2(Text2, { color: BORDER, children: "\u2502" }),
+      /* @__PURE__ */ jsx2(Text2, { color: BORDER2, children: "\u2502" }),
       cols.map((v, i) => /* @__PURE__ */ jsxs2(Box2, { children: [
         /* @__PURE__ */ jsx2(Text2, { color: INDIGO, bold: true, children: " ".repeat(COL_PAD) + pad(v, widths[i]) + " ".repeat(COL_PAD) }),
-        /* @__PURE__ */ jsx2(Text2, { color: BORDER, children: "\u2502" })
+        /* @__PURE__ */ jsx2(Text2, { color: BORDER2, children: "\u2502" })
       ] }, i))
     ] });
   }
   function renderDataRow(row) {
     return /* @__PURE__ */ jsxs2(Box2, { children: [
-      /* @__PURE__ */ jsx2(Text2, { color: BORDER, children: "\u2502" }),
+      /* @__PURE__ */ jsx2(Text2, { color: BORDER2, children: "\u2502" }),
       columns.map((col, i) => /* @__PURE__ */ jsxs2(Box2, { children: [
         isNull(row[col]) ? /* @__PURE__ */ jsx2(Text2, { color: NULL_COLOR, dimColor: true, children: " ".repeat(COL_PAD) + pad(NULL_MARKER, widths[i]) + " ".repeat(COL_PAD) }) : /* @__PURE__ */ jsx2(Text2, { children: " ".repeat(COL_PAD) + pad(cellValue(row[col]), widths[i]) + " ".repeat(COL_PAD) }),
-        /* @__PURE__ */ jsx2(Text2, { color: BORDER, children: "\u2502" })
+        /* @__PURE__ */ jsx2(Text2, { color: BORDER2, children: "\u2502" })
       ] }, i))
     ] });
   }
   return /* @__PURE__ */ jsxs2(Box2, { flexDirection: "column", children: [
-    /* @__PURE__ */ jsx2(Text2, { color: BORDER, children: topLine }),
+    /* @__PURE__ */ jsx2(Text2, { color: BORDER2, children: topLine }),
     renderHeaderRow(columns),
-    /* @__PURE__ */ jsx2(Text2, { color: BORDER, children: midLine }),
+    /* @__PURE__ */ jsx2(Text2, { color: BORDER2, children: midLine }),
     rows.map((row, i) => /* @__PURE__ */ jsxs2(Box2, { flexDirection: "column", children: [
       renderDataRow(row),
-      i < rows.length - 1 && /* @__PURE__ */ jsx2(Text2, { color: BORDER, children: midLine })
+      i < rows.length - 1 && /* @__PURE__ */ jsx2(Text2, { color: BORDER2, children: midLine })
     ] }, i)),
-    /* @__PURE__ */ jsx2(Text2, { color: BORDER, children: botLine })
+    /* @__PURE__ */ jsx2(Text2, { color: BORDER2, children: botLine })
   ] });
 }
 
@@ -1944,7 +1956,7 @@ import { jsx as jsx5, jsxs as jsxs5 } from "react/jsx-runtime";
 var USAGE_WIDTH = 28;
 function HelpView({ data }) {
   if (data.mode === "detail" && data.entry) {
-    const { usage, description, psqlAlias, detail, example } = data.entry;
+    const { usage, description, psqlAlias, detail, example, examples } = data.entry;
     return /* @__PURE__ */ jsxs5(Box5, { flexDirection: "column", marginTop: 1, children: [
       /* @__PURE__ */ jsxs5(Text5, { bold: true, color: "white", children: [
         usage,
@@ -1952,10 +1964,13 @@ function HelpView({ data }) {
       ] }),
       /* @__PURE__ */ jsx5(Box5, { marginTop: 1, children: /* @__PURE__ */ jsx5(Text5, { children: description }) }),
       detail && /* @__PURE__ */ jsx5(Box5, { marginTop: 1, children: /* @__PURE__ */ jsx5(Text5, { dimColor: true, children: detail }) }),
-      example && /* @__PURE__ */ jsxs5(Box5, { marginTop: 1, children: [
+      examples && examples.length > 0 ? /* @__PURE__ */ jsxs5(Box5, { flexDirection: "column", marginTop: 1, children: [
+        /* @__PURE__ */ jsx5(Text5, { dimColor: true, children: "Examples:" }),
+        examples.map((ex, i) => /* @__PURE__ */ jsx5(Box5, { marginLeft: 2, children: /* @__PURE__ */ jsx5(Text5, { color: theme.accent, children: ex }) }, i))
+      ] }) : example ? /* @__PURE__ */ jsxs5(Box5, { marginTop: 1, children: [
         /* @__PURE__ */ jsx5(Text5, { dimColor: true, children: "Example: " }),
         /* @__PURE__ */ jsx5(Text5, { color: theme.accent, children: example })
-      ] })
+      ] }) : null
     ] });
   }
   if (data.mode === "list" && data.groups) {
@@ -1994,7 +2009,6 @@ var TABLE_COLORS = [
   "#fbbf24",
   "#2dd4bf"
 ];
-var BORDER2 = "white";
 var PAD = 1;
 var GAP = 2;
 var FK_PREFIX = "FK \u2192 ";
@@ -2042,31 +2056,31 @@ function TableBox({ table, m, color, colorMap }) {
   const bot = "\u2570" + "\u2500".repeat(nameW + PAD * 2) + "\u2534" + "\u2500".repeat(typeW + PAD * 2) + "\u2534" + "\u2500".repeat(keyW + PAD * 2) + "\u256F";
   const headerW = totalW - 4;
   return /* @__PURE__ */ jsxs6(Box6, { flexDirection: "column", children: [
-    /* @__PURE__ */ jsx6(Text6, { color: BORDER2, children: top }),
+    /* @__PURE__ */ jsx6(Text6, { color, children: top }),
     /* @__PURE__ */ jsxs6(Box6, { children: [
-      /* @__PURE__ */ jsx6(Text6, { color: BORDER2, children: "\u2502" }),
+      /* @__PURE__ */ jsx6(Text6, { color, children: "\u2502" }),
       /* @__PURE__ */ jsxs6(Text6, { color, bold: true, children: [
         sp,
         p(table.name, headerW),
         sp
       ] }),
-      /* @__PURE__ */ jsx6(Text6, { color: BORDER2, children: "\u2502" })
+      /* @__PURE__ */ jsx6(Text6, { color, children: "\u2502" })
     ] }),
-    /* @__PURE__ */ jsx6(Text6, { color: BORDER2, children: sep }),
+    /* @__PURE__ */ jsx6(Text6, { color, children: sep }),
     table.columns.map((col, i) => /* @__PURE__ */ jsxs6(Box6, { children: [
-      /* @__PURE__ */ jsx6(Text6, { color: BORDER2, children: "\u2502" }),
+      /* @__PURE__ */ jsx6(Text6, { color, children: "\u2502" }),
       /* @__PURE__ */ jsxs6(Text6, { children: [
         sp,
         p(col.name, nameW),
         sp
       ] }),
-      /* @__PURE__ */ jsx6(Text6, { color: BORDER2, children: "\u2502" }),
+      /* @__PURE__ */ jsx6(Text6, { color, children: "\u2502" }),
       /* @__PURE__ */ jsxs6(Text6, { dimColor: true, children: [
         sp,
         p(col.type, typeW),
         sp
       ] }),
-      /* @__PURE__ */ jsx6(Text6, { color: BORDER2, children: "\u2502" }),
+      /* @__PURE__ */ jsx6(Text6, { color, children: "\u2502" }),
       col.isPk ? /* @__PURE__ */ jsxs6(Text6, { bold: true, children: [
         sp,
         p("PK", keyW),
@@ -2076,7 +2090,7 @@ function TableBox({ table, m, color, colorMap }) {
           sp,
           FK_PREFIX
         ] }),
-        /* @__PURE__ */ jsxs6(Text6, { color: colorMap.get(col.fkTable) ?? BORDER2, children: [
+        /* @__PURE__ */ jsxs6(Text6, { color: colorMap.get(col.fkTable) ?? color, children: [
           p(col.fkTable, keyW - FK_PREFIX.length),
           sp
         ] })
@@ -2085,9 +2099,9 @@ function TableBox({ table, m, color, colorMap }) {
         " ".repeat(keyW),
         sp
       ] }),
-      /* @__PURE__ */ jsx6(Text6, { color: BORDER2, children: "\u2502" })
+      /* @__PURE__ */ jsx6(Text6, { color, children: "\u2502" })
     ] }, i)),
-    /* @__PURE__ */ jsx6(Text6, { color: BORDER2, children: bot })
+    /* @__PURE__ */ jsx6(Text6, { color, children: bot })
   ] });
 }
 function ErdView({ data }) {
@@ -2105,7 +2119,7 @@ function ErdView({ data }) {
     {
       table: data.tables[ti],
       m: metrics[ti],
-      color: colorMap.get(data.tables[ti].name) ?? BORDER2,
+      color: colorMap.get(data.tables[ti].name) ?? BORDER,
       colorMap
     }
   ) }, ti)) }, ri)) });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@deaquinodev/querky",
-  "version": "0.4.4",
+  "version": "0.4.5",
   "description": "A quirky terminal SQL client with vim mode, AI features, and schema-aware autocomplete",
   "main": "dist/index.js",
   "files": [