npm - @pgplex/pgconsole - Versions diffs - 1.0.0 → 1.0.2 - Mend

@pgplex/pgconsole 1.0.0 → 1.0.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (9) hide show

package/README.md +6 -0
package/dist/client/assets/index-C8bwjbrl.css +2 -0
package/dist/client/assets/{index-Cb7lRHeB.js → index-CRV3ELJ0.js} +19 -14
package/dist/client/assets/{sql-Bxu3bp1z.js → sql-D-v1Z_dU.js} +1 -1
package/dist/client/index.html +2 -2
package/dist/server.mjs +255 -20
package/dist/server.mjs.map +3 -3
package/package.json +1 -1
package/dist/client/assets/index-DUHQjBL7.css +0 -2

package/dist/client/assets/{sql-Bxu3bp1z.js → sql-D-v1Z_dU.js} RENAMED Viewed

	@@ -1 +1 @@
1	- import{_ as e,a as t,c as n,d as r,f as i,g as a,h as o,i as s,l as c,m as l,n as u,o as d,p as f,r as p,s as m,t as h,u as g}from"./index-~~Cb7lRHeB~~.js";export{o as ensureModuleLoaded};
1	+ import{_ as e,a as t,c as n,d as r,f as i,g as a,h as o,i as s,l as c,m as l,n as u,o as d,p as f,r as p,s as m,t as h,u as g}from"./index-CRV3ELJ0.js";export{o as ensureModuleLoaded};

package/dist/client/index.html CHANGED Viewed

@@ -9,8 +9,8 @@
     <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
     <link href="https://fonts.googleapis.com/css2?family=Geist+Mono:wght@100..900&display=swap" rel="stylesheet" />
     <title>pgconsole</title>
-    <script type="module" crossorigin src="/assets/index-Cb7lRHeB.js"></script>
-    <link rel="stylesheet" crossorigin href="/assets/index-DUHQjBL7.css">
+    <script type="module" crossorigin src="/assets/index-CRV3ELJ0.js"></script>
+    <link rel="stylesheet" crossorigin href="/assets/index-C8bwjbrl.css">
   </head>
   <body>
     <div id="root"></div>

package/dist/server.mjs CHANGED Viewed

@@ -57892,6 +57892,7 @@ function transformSelect(raw) {
     return {
       kind: "select",
       distinct: false,
+      distinctOn: null,
       columns: [],
       from: null,
       where: null,
@@ -57900,28 +57901,35 @@ function transformSelect(raw) {
       orderBy: null,
       limit: null,
       offset: null,
+      windowClause: null,
       withClause: null,
       setOp: {
         op: opType,
         all: !!raw.all,
         left: transformSelect(raw.larg),
         right: transformSelect(raw.rarg)
-      }
+      },
+      lockingClause: null
     };
   }
+  const distinctClause = raw.distinctClause;
+  const hasDistinctOn = distinctClause && distinctClause.length > 0 && Object.keys(distinctClause[0]).length > 0;
   return {
     kind: "select",
-    distinct: !!raw.distinctClause,
+    distinct: !!distinctClause,
+    distinctOn: hasDistinctOn ? distinctClause.map(transformExpr) : null,
     columns: transformTargetList(raw.targetList),
     from: transformFromClause(raw.fromClause),
     where: raw.whereClause ? transformExpr(raw.whereClause) : null,
-    groupBy: raw.groupClause ? raw.groupClause.map(transformExpr) : null,
+    groupBy: raw.groupClause ? raw.groupClause.map(transformGroupByItem) : null,
     having: raw.havingClause ? transformExpr(raw.havingClause) : null,
     orderBy: transformSortClause(raw.sortClause),
     limit: raw.limitCount ? transformExpr(raw.limitCount) : null,
     offset: raw.limitOffset ? transformExpr(raw.limitOffset) : null,
+    windowClause: transformWindowClause(raw.windowClause),
     withClause: transformWithClause(raw.withClause),
-    setOp: null
+    setOp: null,
+    lockingClause: transformLockingClause(raw.lockingClause)
   };
 }
 function transformTargetList(list) {
@@ -57961,11 +57969,73 @@ function transformSortClause(list) {
     };
   });
 }
+function transformLockingClause(nodes) {
+  if (!nodes || nodes.length === 0) return null;
+  return nodes.map((node) => {
+    const lc = node.LockingClause;
+    const strength = lc.strength;
+    const strengthMap = {
+      "LCS_FORUPDATE": "update",
+      "LCS_FORNOKEYUPDATE": "no_key_update",
+      "LCS_FORSHARE": "share",
+      "LCS_FORKEYSHARE": "key_share"
+    };
+    const waitPolicy = lc.waitPolicy;
+    const waitPolicyMap = {
+      "LockWaitBlock": "block",
+      "LockWaitSkip": "skip_locked",
+      "LockWaitError": "nowait"
+    };
+    const lockedRels = lc.lockedRels;
+    return {
+      strength: strengthMap[strength] || "update",
+      waitPolicy: waitPolicyMap[waitPolicy] || "block",
+      lockedRels: lockedRels ? lockedRels.map((r2) => {
+        const rangeVar = r2.RangeVar;
+        return rangeVar.relname;
+      }) : null
+    };
+  });
+}
 function transformFromClause(list) {
   if (!list || list.length === 0) return null;
-  return transformFromItem(list[0]);
+  if (list.length === 1) {
+    return transformFromItem(list[0]);
+  }
+  let result = transformFromItem(list[0]);
+  for (let i2 = 1; i2 < list.length; i2++) {
+    result = {
+      kind: "join",
+      type: "cross",
+      left: result,
+      right: transformFromItem(list[i2]),
+      on: null,
+      using: null
+    };
+  }
+  return result;
 }
 function transformFromItem(node) {
+  if ("RangeTableSample" in node) {
+    const rts = node.RangeTableSample;
+    const relation = rts.relation;
+    const rv = relation.RangeVar;
+    const alias = rts.alias;
+    const method = rts.method;
+    const methodName = method.length > 0 ? method[0].String.sval : "BERNOULLI";
+    const args = rts.args;
+    return {
+      kind: "table",
+      schema: rv.schemaname || null,
+      table: rv.relname,
+      alias: alias?.aliasname || null,
+      tablesample: {
+        method: methodName,
+        args: args ? args.map(transformExpr) : [],
+        repeatable: rts.repeatable ? transformExpr(rts.repeatable) : null
+      }
+    };
+  }
   if ("RangeVar" in node) {
     const rv = node.RangeVar;
     const alias = rv.alias;
@@ -57973,7 +58043,8 @@ function transformFromItem(node) {
       kind: "table",
       schema: rv.schemaname || null,
       table: rv.relname,
-      alias: alias?.aliasname || null
+      alias: alias?.aliasname || null,
+      tablesample: null
     };
   }
   if ("RangeSubselect" in node) {
@@ -57982,6 +58053,7 @@ function transformFromItem(node) {
     const subquery = rs.subquery;
     return {
       kind: "subquery",
+      lateral: !!rs.lateral,
       query: transformSelect(subquery.SelectStmt),
       alias: alias?.aliasname || ""
     };
@@ -58005,7 +58077,27 @@ function transformFromItem(node) {
       using: using ? using.map((u) => u.String.sval) : null
     };
   }
-  return { kind: "table", schema: null, table: "", alias: null };
+  return { kind: "table", schema: null, table: "", alias: null, tablesample: null };
+}
+function transformGroupByItem(node) {
+  if (!node || typeof node !== "object") return transformExpr(node);
+  const obj = node;
+  if ("GroupingSet" in obj) {
+    const gs = obj.GroupingSet;
+    const kindMap = {
+      "GROUPING_SET_ROLLUP": "rollup",
+      "GROUPING_SET_CUBE": "cube",
+      "GROUPING_SET_SETS": "sets",
+      "GROUPING_SET_EMPTY": "empty"
+    };
+    const kind = kindMap[gs.kind] || "sets";
+    const content = gs.content;
+    return {
+      kind,
+      content: content ? content.map(transformGroupByItem) : []
+    };
+  }
+  return transformExpr(node);
 }
 function transformExpr(node) {
   if (!node || typeof node !== "object") return { kind: "unknown", raw: node };
@@ -58022,8 +58114,74 @@ function transformExpr(node) {
   if ("CoalesceExpr" in obj) return transformCoalesce(obj.CoalesceExpr);
   if ("CaseExpr" in obj) return transformCase(obj.CaseExpr);
   if ("ParamRef" in obj) return transformParamRef(obj.ParamRef);
+  if ("RowExpr" in obj) return transformRowExpr(obj.RowExpr);
   return { kind: "unknown", raw: node };
 }
+function transformWindowClause(list) {
+  if (!list || list.length === 0) return null;
+  return list.map((item) => {
+    const w = item.WindowDef;
+    return {
+      name: w.name || null,
+      partitionBy: w.partitionClause ? w.partitionClause.map(transformExpr) : null,
+      orderBy: transformSortClause(w.orderClause),
+      frameClause: transformWindowFrame(w)
+    };
+  });
+}
+function transformWindowFrame(overNode) {
+  const frameOptions = overNode.frameOptions;
+  if (!frameOptions || frameOptions === 0) return null;
+  const FRAMEOPTION_ROWS = 4;
+  const FRAMEOPTION_RANGE = 2;
+  const FRAMEOPTION_GROUPS = 8;
+  const FRAMEOPTION_BETWEEN = 16;
+  const FRAMEOPTION_START_UNBOUNDED_PRECEDING = 32;
+  const FRAMEOPTION_START_CURRENT_ROW = 512;
+  const FRAMEOPTION_START_OFFSET_PRECEDING = 2048;
+  const FRAMEOPTION_START_OFFSET_FOLLOWING = 4096;
+  const FRAMEOPTION_END_UNBOUNDED_PRECEDING = 64;
+  const FRAMEOPTION_END_UNBOUNDED_FOLLOWING = 256;
+  const FRAMEOPTION_END_CURRENT_ROW = 1024;
+  const FRAMEOPTION_END_OFFSET_PRECEDING = 8192;
+  const FRAMEOPTION_END_OFFSET_FOLLOWING = 16384;
+  let frameType;
+  if (frameOptions & FRAMEOPTION_ROWS) frameType = "rows";
+  else if (frameOptions & FRAMEOPTION_RANGE) frameType = "range";
+  else if (frameOptions & FRAMEOPTION_GROUPS) frameType = "groups";
+  else return null;
+  let startBound;
+  if (frameOptions & FRAMEOPTION_START_UNBOUNDED_PRECEDING) {
+    startBound = { type: "unbounded_preceding", offset: null };
+  } else if (frameOptions & FRAMEOPTION_START_CURRENT_ROW) {
+    startBound = { type: "current_row", offset: null };
+  } else if (frameOptions & FRAMEOPTION_START_OFFSET_PRECEDING) {
+    startBound = { type: "preceding", offset: overNode.startOffset ? transformExpr(overNode.startOffset) : null };
+  } else if (frameOptions & FRAMEOPTION_START_OFFSET_FOLLOWING) {
+    startBound = { type: "following", offset: overNode.startOffset ? transformExpr(overNode.startOffset) : null };
+  } else {
+    return null;
+  }
+  let endBound = null;
+  if (frameOptions & FRAMEOPTION_BETWEEN) {
+    if (frameOptions & FRAMEOPTION_END_UNBOUNDED_FOLLOWING) {
+      endBound = { type: "unbounded_following", offset: null };
+    } else if (frameOptions & FRAMEOPTION_END_CURRENT_ROW) {
+      endBound = { type: "current_row", offset: null };
+    } else if (frameOptions & FRAMEOPTION_END_OFFSET_PRECEDING) {
+      endBound = { type: "preceding", offset: overNode.endOffset ? transformExpr(overNode.endOffset) : null };
+    } else if (frameOptions & FRAMEOPTION_END_OFFSET_FOLLOWING) {
+      endBound = { type: "following", offset: overNode.endOffset ? transformExpr(overNode.endOffset) : null };
+    } else if (frameOptions & FRAMEOPTION_END_UNBOUNDED_PRECEDING) {
+      endBound = { type: "unbounded_preceding", offset: null };
+    }
+  }
+  return {
+    type: frameType,
+    start: startBound,
+    end: endBound
+  };
+}
 function transformColumnRef(node) {
   const fields = node.fields;
   const parts = fields.map((f3) => {
@@ -58090,8 +58248,10 @@ function transformFuncCall(node) {
   if (node.over) {
     const overNode = node.over;
     over = {
+      name: overNode.name || null,
       partitionBy: overNode.partitionClause ? overNode.partitionClause.map(transformExpr) : null,
-      orderBy: transformSortClause(overNode.orderClause)
+      orderBy: transformSortClause(overNode.orderClause),
+      frameClause: transformWindowFrame(overNode)
     };
   }
   return {
@@ -58171,6 +58331,13 @@ function transformParamRef(node) {
     number: node.number
   };
 }
+function transformRowExpr(node) {
+  const args = node.args || [];
+  return {
+    kind: "row",
+    args: args.map(transformExpr)
+  };
+}
 function transformInsert(raw) {
   const relation = raw.relation;
   const alias = relation.alias;
@@ -58190,20 +58357,48 @@ function transformInsert(raw) {
     select = transformSelect(innerSelect);
   }
   const returningList = raw.returningList;
+  const onConflictClause = raw.onConflictClause;
   return {
     kind: "insert",
     table: {
       kind: "table",
       schema: relation.schemaname || null,
       table: relation.relname,
-      alias: alias?.aliasname || null
+      alias: alias?.aliasname || null,
+      tablesample: null
     },
     columns,
     values,
     select,
+    onConflict: onConflictClause ? transformOnConflict(onConflictClause) : null,
     returning: returningList ? transformTargetList(returningList) : null
   };
 }
+function transformOnConflict(raw) {
+  const action = raw.action;
+  const actionType = action === "ONCONFLICT_UPDATE" ? "update" : "nothing";
+  const infer = raw.infer;
+  const indexElems = infer?.indexElems;
+  const target = indexElems ? indexElems.map((elem) => {
+    const indexElem = elem.IndexElem;
+    return indexElem.name;
+  }) : null;
+  const targetList = raw.targetList;
+  const assignments = targetList ? targetList.map((item) => {
+    const resTarget = item.ResTarget;
+    return {
+      column: resTarget.name,
+      value: transformExpr(resTarget.val)
+    };
+  }) : null;
+  const whereClause = raw.whereClause ? transformExpr(raw.whereClause) : null;
+  return {
+    action: actionType,
+    target,
+    assignments,
+    where: whereClause
+  };
+}
 function transformUpdate(raw) {
   const relation = raw.relation;
   const alias = relation.alias;
@@ -58222,7 +58417,8 @@ function transformUpdate(raw) {
       kind: "table",
       schema: relation.schemaname || null,
       table: relation.relname,
-      alias: alias?.aliasname || null
+      alias: alias?.aliasname || null,
+      tablesample: null
     },
     assignments,
     from: transformFromClause(raw.fromClause),
@@ -58240,7 +58436,8 @@ function transformDelete(raw) {
       kind: "table",
       schema: relation.schemaname || null,
       table: relation.relname,
-      alias: alias?.aliasname || null
+      alias: alias?.aliasname || null,
+      tablesample: null
     },
     using: transformFromClause(raw.usingClause),
     where: raw.whereClause ? transformExpr(raw.whereClause) : null,
@@ -58269,7 +58466,8 @@ function transformCreateTable(raw) {
       kind: "table",
       schema: relation.schemaname || null,
       table: relation.relname,
-      alias: null
+      alias: null,
+      tablesample: null
     },
     columns,
     constraints,
@@ -58459,7 +58657,8 @@ function transformAlterTable(raw) {
       kind: "table",
       schema: relation.schemaname || null,
       table: relation.relname,
-      alias: null
+      alias: null,
+      tablesample: null
     },
     commands
   };
@@ -58533,7 +58732,8 @@ function transformCreateView(raw, source) {
       kind: "table",
       schema: view.schemaname || null,
       table: view.relname,
-      alias: null
+      alias: null,
+      tablesample: null
     },
     query: transformSelect(query.SelectStmt),
     replace: !!raw.replace,
@@ -58552,7 +58752,8 @@ function transformCreateTableAs(raw, source) {
       kind: "table",
       schema: rel.schemaname || null,
       table: rel.relname,
-      alias: null
+      alias: null,
+      tablesample: null
     },
     query: transformSelect(query.SelectStmt),
     replace: false,
@@ -58587,7 +58788,8 @@ function transformCreateIndex(raw, source) {
       kind: "table",
       schema: relation.schemaname || null,
       table: relation.relname,
-      alias: null
+      alias: null,
+      tablesample: null
     },
     columns,
     unique: !!raw.unique,
@@ -58811,7 +59013,8 @@ function transformTruncate(raw, source) {
           kind: "table",
           schema: rangeVar.schemaname || null,
           table: rangeVar.relname,
-          alias: null
+          alias: null,
+          tablesample: null
         });
       }
     }
@@ -62588,13 +62791,37 @@ COMMIT;` : req.sql;
     } catch (err) {
       const errorMessage = err instanceof Error ? err.message : "Query execution failed";
       const executionTimeMs = Date.now() - start2;
+      let fullError = errorMessage;
+      const pgErr = err;
+      const pos = pgErr?.position;
+      if (typeof pos === "string" && pos) {
+        const charPos = parseInt(pos, 10);
+        if (charPos > 0) {
+          const before = req.sql.slice(0, charPos - 1);
+          const lineNumber = before.split("\n").length;
+          const lines = req.sql.split("\n");
+          const offendingLine = lines[lineNumber - 1];
+          if (offendingLine !== void 0) {
+            fullError = `ERROR at Line ${lineNumber}: ${errorMessage}
+LINE ${lineNumber}: ${offendingLine}`;
+          }
+        }
+      }
+      if (typeof pgErr?.detail === "string" && pgErr.detail) {
+        fullError += `
+DETAIL: ${pgErr.detail}`;
+      }
+      if (typeof pgErr?.hint === "string" && pgErr.hint) {
+        fullError += `
+HINT: ${pgErr.hint}`;
+      }
       auditSQL(user.email, req.connectionId, details.database, req.sql, false, executionTimeMs, void 0, errorMessage);
       yield {
         columns: [],
         rows: [],
         rowCount: 0,
         executionTimeMs,
-        error: errorMessage,
+        error: fullError,
         backendPid
       };
     } finally {
@@ -92195,7 +92422,15 @@ var TEXT_TO_SQL = {
 2. Use the exact table and column names from the schema
 3. Prefer explicit column names over SELECT *
 4. Include appropriate WHERE clauses when the request implies filtering
-5. Use proper PostgreSQL {{version}} syntax`,
+5. Use proper PostgreSQL {{version}} syntax
+## Formatting
+Format the SQL with proper indentation and line breaks for readability:
+- Keywords (SELECT, FROM, WHERE, etc.) on separate lines
+- Column lists with one column per line (when multiple columns)
+- Indent clauses with 2 spaces
+- Use uppercase for SQL keywords`,
   user: ({ prompt }) => prompt
 };
 var EXPLAIN_SQL = {
@@ -92948,7 +93183,7 @@ async function start() {
    \\ \\_\\    /\\____/
     \\/_/    \\_/__/
-    Version ${"1.0.0"}
+    Version ${"1.0.2"}
 `);
     console.log(`Server running on http://localhost:${port}`);
     const browserUrl = false ? `http://localhost:5173` : getExternalUrl() || `http://localhost:${port}`;