feat: format query with prettier

Dockerfile

@@ -90,6 +90,7 @@ RUN deno compile \
   --allow-write \
   --allow-env \
   --allow-net \
+  --allow-sys \
   -o /app/analyzer \
   src/main.ts
 

deno.json

@@ -42,7 +42,8 @@
     "jsondiffpatch": "npm:jsondiffpatch@^0.7.3",
     "nunjucks": "npm:nunjucks@^3.2.4",
     "pgsql-deparser": "npm:pgsql-deparser@^17.11.1",
-    "sql-formatter": "npm:sql-formatter@^15.6.6",
+    "prettier": "npm:prettier@^3",
+    "prettier-plugin-sql": "npm:prettier-plugin-sql@^0.19",
     "sql-highlight": "npm:sql-highlight@^6.1.0",
     "postgresjs": "https://deno.land/x/postgresjs@v3.4.7/mod.js",
     "zod": "npm:zod@^4.1.12"

src/runner.ts

@@ -1,5 +1,6 @@
 import * as core from "@actions/core";
-import { format } from "sql-formatter";
+import * as prettier from "prettier";
+import prettierPluginSql from "prettier-plugin-sql";
 import csv from "fast-csv";
 import { Readable } from "node:stream";
 import { fingerprint } from "@libpg-query/parser";
@@ -190,8 +191,9 @@ export class Runner {
     this.seenQueries.add(fingerprintNum);
 
     const analyzer = new Analyzer(parse);
+    const formattedQuery = await this.formatQuery(query);
     const { indexesToCheck, ansiHighlightedQuery, referencedTables } =
-      await analyzer.analyze(this.formatQuery(query));
+      await analyzer.analyze(formattedQuery);
 
     const selectsCatalog = referencedTables.find((table) =>
       table.startsWith("pg_")
@@ -220,7 +222,7 @@ export class Runner {
           kind: "cost_past_threshold",
           warning: {
             fingerprint: fingerprintNum,
-            formattedQuery: this.formatQuery(query),
+            formattedQuery,
             baseCost: log.plan.cost,
             explainPlan: log.plan.json,
             maxCost: this.maxCost,
@@ -274,7 +276,7 @@ export class Runner {
               kind: "recommendation",
               recommendation: {
                 fingerprint: fingerprintNum,
-                formattedQuery: this.formatQuery(query),
+                formattedQuery,
                 baseCost: out.baseCost,
                 baseExplainPlan: out.baseExplainPlan,
                 optimizedCost: out.finalCost,
@@ -298,7 +300,7 @@ export class Runner {
                 kind: "cost_past_threshold",
                 warning: {
                   fingerprint: fingerprintNum,
-                  formattedQuery: this.formatQuery(query),
+                  formattedQuery,
                   baseCost: out.baseCost,
                   optimization: {
                     newCost: out.finalCost,
@@ -328,12 +330,17 @@ export class Runner {
     );
   }
 
-  private formatQuery(query: string) {
-    return format(query, {
-      language: "postgresql",
-      keywordCase: "lower",
-      linesBetweenQueries: 2,
-    });
+  private async formatQuery(query: string): Promise<string> {
+    try {
+      return await prettier.format(query, {
+        parser: "sql",
+        plugins: [prettierPluginSql],
+        language: "postgresql",
+        keywordCase: "upper",
+      });
+    } catch {
+      return query;
+    }
   }
 
   private printLegend() {

src/sql/recent-query.ts

@@ -1,4 +1,5 @@
-// import { format } from "sql-formatter";
+import * as prettier from "prettier";
+import prettierPluginSql from "prettier-plugin-sql";
 // deno-lint-ignore no-unused-vars
 import type { SegmentedQueryCache } from "../sync/seen-cache.ts";
 import {
@@ -41,7 +42,7 @@ export class RecentQuery {
   ) {
     this.username = data.username;
     this.query = data.query;
-    this.formattedQuery = data.query;
+    this.formattedQuery = data.formattedQuery;
     this.meanTime = data.meanTime;
     this.calls = data.calls;
     this.rows = data.rows;
@@ -68,8 +69,9 @@ export class RecentQuery {
   ) {
     const analyzer = new Analyzer(parse);
     const analysis = await analyzer.analyze(data.query);
+    const formattedQuery = await RecentQuery.formatQuery(analysis.queryWithoutTags);
     return new RecentQuery(
-      { ...data, query: analysis.queryWithoutTags },
+      { ...data, query: analysis.queryWithoutTags, formattedQuery },
       analysis.referencedTables,
       analysis.indexesToCheck,
       analysis.tags,
@@ -79,6 +81,19 @@ export class RecentQuery {
     );
   }
 
+  private static async formatQuery(query: string): Promise<string> {
+    try {
+      return await prettier.format(query, {
+        parser: "sql",
+        plugins: [prettierPluginSql],
+        language: "postgresql",
+        keywordCase: "upper",
+      });
+    } catch {
+      return query;
+    }
+  }
+
   static isSelectQuery(data: RawRecentQuery): boolean {
     return /^select/i.test(data.query);
   }