refactor: unify reserved words and move Deparser.needsQuotes to QuoteUtils

- Remove Deparser.RESERVED_WORDS and Deparser.needsQuotes from deparser.ts
- Add QuoteUtils.needsQuotesForString() and QuoteUtils.quoteString() methods
- Update all call sites to use QuoteUtils instead of Deparser methods
- Both QuoteUtils.needsQuotes and QuoteUtils.needsQuotesForString now use
  RESERVED_KEYWORDS from kwlist.ts as the single source of truth
- Add Set<string> type annotations to kwlist.ts exports for TypeScript compatibility

Co-Authored-By: Dan Lynch <[email protected]>

Author: devin-ai-integration[bot]

packages/deparser/src/deparser.ts

@@ -2457,36 +2457,8 @@ export class Deparser implements DeparserVisitor {
     return output.join(' ');
   }
 
-  private static readonly RESERVED_WORDS = new Set([
-    'all', 'analyse', 'analyze', 'and', 'any', 'array', 'as', 'asc', 'asymmetric', 'both',
-    'case', 'cast', 'check', 'collate', 'column', 'constraint', 'create', 'current_catalog',
-    'current_date', 'current_role', 'current_time', 'current_timestamp', 'current_user',
-    'default', 'deferrable', 'desc', 'distinct', 'do', 'else', 'end', 'except', 'false',
-    'fetch', 'for', 'foreign', 'from', 'grant', 'group', 'having', 'in', 'initially',
-    'intersect', 'into', 'lateral', 'leading', 'limit', 'localtime', 'localtimestamp',
-    'not', 'null', 'offset', 'on', 'only', 'or', 'order', 'placing', 'primary',
-    'references', 'returning', 'select', 'session_user', 'some', 'symmetric', 'table',
-    'then', 'to', 'trailing', 'true', 'union', 'unique', 'user', 'using', 'variadic',
-    'when', 'where', 'window', 'with'
-  ]);
-
-  private static needsQuotes(value: string): boolean {
-    if (!value) return false;
-
-    const needsQuotesRegex = /[a-z]+[\W\w]*[A-Z]+|[A-Z]+[\W\w]*[a-z]+|\W/;
-
-    const isAllUppercase = /^[A-Z]+$/.test(value);
-
-    return needsQuotesRegex.test(value) ||
-           Deparser.RESERVED_WORDS.has(value.toLowerCase()) ||
-           isAllUppercase;
-  }
-
   quoteIfNeeded(value: string): string {
-    if (Deparser.needsQuotes(value)) {
-      return `"${value}"`;
-    }
-    return value;
+    return QuoteUtils.quoteString(value);
   }
 
   preserveOperatorDefElemCase(defName: string): string {
@@ -2528,7 +2500,7 @@ export class Deparser implements DeparserVisitor {
       }
     }
 
-    return Deparser.needsQuotes(value) ? `"${value}"` : value;
+    return QuoteUtils.quoteString(value);
   }
 
   Integer(node: t.Integer, context: DeparserContext): string {
@@ -5715,7 +5687,7 @@ export class Deparser implements DeparserVisitor {
     }
 
     if (node.role) {
-      const roleName = Deparser.needsQuotes(node.role) ? `"${node.role}"` : node.role;
+      const roleName = QuoteUtils.quoteString(node.role);
       output.push(roleName);
     }
 
@@ -5788,7 +5760,7 @@ export class Deparser implements DeparserVisitor {
             ? `'${argValue}'`
             : argValue;
 
-          const quotedDefname = node.defname.includes(' ') || node.defname.includes('-') || Deparser.needsQuotes(node.defname)
+          const quotedDefname = node.defname.includes(' ') || node.defname.includes('-') || QuoteUtils.needsQuotesForString(node.defname)
             ? `"${node.defname}"`
             : node.defname;
 
@@ -5968,7 +5940,7 @@ export class Deparser implements DeparserVisitor {
               if (this.getNodeType(item) === 'String') {
                 // Check if this identifier needs quotes to preserve case
                 const value = itemData.sval;
-                if (Deparser.needsQuotes(value)) {
+                if (QuoteUtils.needsQuotesForString(value)) {
                   return `"${value}"`;
                 }
                 return value;
@@ -6245,7 +6217,7 @@ export class Deparser implements DeparserVisitor {
         }
 
         // Handle CREATE AGGREGATE quoted identifiers - preserve quotes when needed
-        if (Deparser.needsQuotes(node.defname)) {
+        if (QuoteUtils.needsQuotesForString(node.defname)) {
           const quotedDefname = `"${node.defname}"`;
           if (node.arg) {
             if (this.getNodeType(node.arg) === 'String') {
@@ -9848,7 +9820,7 @@ export class Deparser implements DeparserVisitor {
 
               if (defName && defValue) {
                 let preservedDefName;
-                if (Deparser.needsQuotes(defName)) {
+                if (QuoteUtils.needsQuotesForString(defName)) {
                   preservedDefName = `"${defName}"`;
                 } else {
                   preservedDefName = this.preserveOperatorDefElemCase(defName);
@@ -10012,7 +9984,7 @@ export class Deparser implements DeparserVisitor {
 
               if (defName && defValue) {
                 let preservedDefName;
-                if (Deparser.needsQuotes(defName)) {
+                if (QuoteUtils.needsQuotesForString(defName)) {
                   preservedDefName = `"${defName}"`;
                 } else {
                   preservedDefName = defName;

packages/deparser/src/kwlist.ts

@@ -522,10 +522,10 @@ export const kwlist = {
   ]
 } as const;
 
-export const RESERVED_KEYWORDS = new Set(kwlist.RESERVED_KEYWORD ?? []);
-export const UNRESERVED_KEYWORDS = new Set(kwlist.UNRESERVED_KEYWORD ?? []);
-export const COL_NAME_KEYWORDS = new Set(kwlist.COL_NAME_KEYWORD ?? []);
-export const TYPE_FUNC_NAME_KEYWORDS = new Set(kwlist.TYPE_FUNC_NAME_KEYWORD ?? []);
+export const RESERVED_KEYWORDS: Set<string> = new Set(kwlist.RESERVED_KEYWORD ?? []);
+export const UNRESERVED_KEYWORDS: Set<string> = new Set(kwlist.UNRESERVED_KEYWORD ?? []);
+export const COL_NAME_KEYWORDS: Set<string> = new Set(kwlist.COL_NAME_KEYWORD ?? []);
+export const TYPE_FUNC_NAME_KEYWORDS: Set<string> = new Set(kwlist.TYPE_FUNC_NAME_KEYWORD ?? []);
 
 export function keywordKindOf(word: string): KeywordKind {
   const w = word.toLowerCase();

packages/deparser/src/utils/quote-utils.ts

@@ -1,28 +1,41 @@
-const RESERVED_WORDS = new Set([
-  'all', 'analyse', 'analyze', 'and', 'any', 'array', 'as', 'asc', 'asymmetric',
-  'authorization', 'binary', 'both', 'case', 'cast', 'check', 'collate', 'collation',
-  'column', 'concurrently', 'constraint', 'create', 'cross', 'current_catalog',
-  'current_date', 'current_role', 'current_schema', 'current_time', 'current_timestamp',
-  'current_user', 'default', 'deferrable', 'desc', 'distinct', 'do', 'else', 'end',
-  'except', 'false', 'fetch', 'for', 'foreign', 'freeze', 'from', 'full', 'grant',
-  'group', 'having', 'ilike', 'in', 'initially', 'inner', 'intersect', 'into', 'is',
-  'isnull', 'join', 'lateral', 'leading', 'left', 'like', 'limit', 'localtime',
-  'localtimestamp', 'natural', 'not', 'notnull', 'null', 'offset', 'on', 'only',
-  'or', 'order', 'outer', 'overlaps', 'placing', 'primary', 'references', 'returning',
-  'right', 'select', 'session_user', 'similar', 'some', 'symmetric', 'table', 'tablesample',
-  'then', 'to', 'trailing', 'true', 'union', 'unique', 'user', 'using', 'variadic',
-  'verbose', 'when', 'where', 'window', 'with'
-]);
+import { RESERVED_KEYWORDS, TYPE_FUNC_NAME_KEYWORDS } from '../kwlist';
 
 export class QuoteUtils {
+  /**
+   * Checks if a value needs quoting for use in String nodes, DefElem, role names, etc.
+   * Uses a different algorithm than needsQuotes - checks for mixed case and special characters.
+   * This was previously Deparser.needsQuotes.
+   */
+  static needsQuotesForString(value: string): boolean {
+    if (!value) return false;
+
+    const needsQuotesRegex = /[a-z]+[\W\w]*[A-Z]+|[A-Z]+[\W\w]*[a-z]+|\W/;
+    const isAllUppercase = /^[A-Z]+$/.test(value);
+
+    return needsQuotesRegex.test(value) ||
+           RESERVED_KEYWORDS.has(value.toLowerCase()) ||
+           isAllUppercase;
+  }
+
+  /**
+   * Quotes a string value if it needs quoting for String nodes.
+   * Uses needsQuotesForString logic.
+   */
+  static quoteString(value: string): string {
+    if (QuoteUtils.needsQuotesForString(value)) {
+      return `"${value}"`;
+    }
+    return value;
+  }
+
   static needsQuotes(value: string): boolean {
     if (!value || typeof value !== 'string') {
       return false;
     }
 
     const lowerValue = value.toLowerCase();
 
-    if (RESERVED_WORDS.has(lowerValue)) {
+    if (RESERVED_KEYWORDS.has(lowerValue) || TYPE_FUNC_NAME_KEYWORDS.has(lowerValue)) {
       return true;
     }
 
@@ -93,4 +106,4 @@ export class QuoteUtils {
     return !/^\\x[0-9a-fA-F]+$/i.test(value) && value.includes('\\');
   }
 
-}
+}