pgsql-deparser 13.18.0 → 13.19.1

package/{src/deparser/deparser.ts → esm/deparser/deparser.js}

@@ -2,8 +2,7 @@
  * Auto-generated file with types stripped for better tree-shaking
  * DO NOT EDIT - Generated by strip-deparser-types.ts
  */
-
-import { DeparserContext, DeparserVisitor } from './visitors/base';
+import { DeparserContext } from './visitors/base';
 import { SqlFormatter } from './utils/sql-formatter';
 import { QuoteUtils } from './utils/quote-utils';
 import { ListUtils } from './utils/list-utils';
@@ -56,27 +55,15 @@ const pgCatalogTypes = [
  * but not present in pg_catalog.pg_type. These are resolved to
  * real types during parsing and never appear in introspection.
  */
-const pgCatalogTypeAliases: [
-    string,
-    string[]
-][] = [
+const pgCatalogTypeAliases = [
     ['numeric', ['decimal', 'dec']],
     ['int4', ['int', 'integer']],
     ['float8', ['float']],
     ['bpchar', ['character']],
     ['varchar', ['character varying']]
 ];
-export interface DeparserOptions {
-    newline?: string;
-    tab?: string;
-    // Function body delimiter options
-    functionDelimiter?: string; // Default: '$$'
-    // Alternative delimiter when the default is found in the body
-    functionDelimiterFallback?: string; // Default: '$EOFCODE$'
-    pretty?: boolean; // Default: true
-}
 // Type guards for better type safety
-function isParseResult(obj: any): obj is any {
+function isParseResult(obj) {
     // A ParseResult is an object that could have stmts (but not required)
     // and is not already wrapped as a Node
     // IMPORTANT: ParseResult.stmts is "repeated RawStmt" in protobuf, meaning
@@ -89,9 +76,7 @@ function isParseResult(obj: any): obj is any {
         // Check if it looks like a ParseResult (has stmts or version)
         ('stmts' in obj || 'version' in obj);
 }
-function isWrappedParseResult(obj: any): obj is {
-    ParseResult: any;
-} {
+function isWrappedParseResult(obj) {
     return obj && typeof obj === 'object' && 'ParseResult' in obj;
 }
 /**
@@ -119,10 +104,10 @@ function isWrappedParseResult(obj: any): obj is {
  * The deparser automatically detects bare ParseResult objects for backward
  * compatibility and wraps them internally for consistent processing.
  */
-export class Deparser implements DeparserVisitor {
-    private tree: any[];
-    private options: DeparserOptions;
-    constructor(tree: any | any[] | any, opts: DeparserOptions = {}) {
+export class Deparser {
+    tree;
+    options;
+    constructor(tree, opts = {}) {
         // Set default options
         this.options = {
             functionDelimiter: '$$',
@@ -155,10 +140,10 @@ export class Deparser implements DeparserVisitor {
      * @param opts - Deparser options for formatting
      * @returns The deparsed SQL string
      */
-    static deparse(query: any | any[] | any, opts: DeparserOptions = {}): string {
+    static deparse(query, opts = {}) {
         return new Deparser(query, opts).deparseQuery();
     }
-    deparseQuery(): string {
+    deparseQuery() {
         const formatter = new SqlFormatter(this.options.newline, this.options.tab, this.options.pretty);
         const context = new DeparserContext({ formatter, prettyMode: this.options.pretty });
         return this.tree
@@ -176,14 +161,128 @@ export class Deparser implements DeparserVisitor {
      * @param body The function body to check
      * @returns The delimiter to use
      */
-    private getFunctionDelimiter(body: string): string {
+    getFunctionDelimiter(body) {
         const delimiter = this.options.functionDelimiter || '$$';
         if (body.includes(delimiter)) {
             return this.options.functionDelimiterFallback || '$EOFCODE$';
         }
         return delimiter;
     }
-    deparse(node: any, context?: DeparserContext): string | null {
+    /**
+     * Maps ObjectType enum values to their corresponding SQL keywords
+     * Used by AlterOwnerStmt, AlterObjectSchemaStmt, and other statements that need object type keywords
+     */
+    getObjectTypeKeyword(objectType) {
+        switch (objectType) {
+            case 'OBJECT_TABLE':
+                return 'TABLE';
+            case 'OBJECT_VIEW':
+                return 'VIEW';
+            case 'OBJECT_INDEX':
+                return 'INDEX';
+            case 'OBJECT_SEQUENCE':
+                return 'SEQUENCE';
+            case 'OBJECT_FUNCTION':
+                return 'FUNCTION';
+            case 'OBJECT_PROCEDURE':
+                return 'PROCEDURE';
+            case 'OBJECT_SCHEMA':
+                return 'SCHEMA';
+            case 'OBJECT_DATABASE':
+                return 'DATABASE';
+            case 'OBJECT_DOMAIN':
+                return 'DOMAIN';
+            case 'OBJECT_AGGREGATE':
+                return 'AGGREGATE';
+            case 'OBJECT_CONVERSION':
+                return 'CONVERSION';
+            case 'OBJECT_LANGUAGE':
+                return 'LANGUAGE';
+            case 'OBJECT_OPERATOR':
+                return 'OPERATOR';
+            case 'OBJECT_OPFAMILY':
+                return 'OPERATOR FAMILY';
+            case 'OBJECT_OPCLASS':
+                return 'OPERATOR CLASS';
+            case 'OBJECT_TSDICTIONARY':
+                return 'TEXT SEARCH DICTIONARY';
+            case 'OBJECT_TSCONFIGURATION':
+                return 'TEXT SEARCH CONFIGURATION';
+            case 'OBJECT_EVENT_TRIGGER':
+                return 'EVENT TRIGGER';
+            case 'OBJECT_FDW':
+                return 'FOREIGN DATA WRAPPER';
+            case 'OBJECT_FOREIGN_SERVER':
+                return 'SERVER';
+            case 'OBJECT_TYPE':
+                return 'TYPE';
+            case 'OBJECT_COLLATION':
+                return 'COLLATION';
+            case 'OBJECT_PUBLICATION':
+                return 'PUBLICATION';
+            case 'OBJECT_ACCESS_METHOD':
+                return 'ACCESS METHOD';
+            case 'OBJECT_AMOP':
+                return 'OPERATOR CLASS';
+            case 'OBJECT_AMPROC':
+                return 'OPERATOR CLASS';
+            case 'OBJECT_ATTRIBUTE':
+                return 'ATTRIBUTE';
+            case 'OBJECT_CAST':
+                return 'CAST';
+            case 'OBJECT_COLUMN':
+                return 'COLUMN';
+            case 'OBJECT_DEFAULT':
+                return 'DEFAULT';
+            case 'OBJECT_DEFACL':
+                return 'DEFAULT PRIVILEGES';
+            case 'OBJECT_DOMCONSTRAINT':
+                return 'DOMAIN';
+            case 'OBJECT_EXTENSION':
+                return 'EXTENSION';
+            case 'OBJECT_FOREIGN_TABLE':
+                return 'FOREIGN TABLE';
+            case 'OBJECT_LARGEOBJECT':
+                return 'LARGE OBJECT';
+            case 'OBJECT_MATVIEW':
+                return 'MATERIALIZED VIEW';
+            case 'OBJECT_PARAMETER_ACL':
+                return 'PARAMETER';
+            case 'OBJECT_POLICY':
+                return 'POLICY';
+            case 'OBJECT_PUBLICATION_NAMESPACE':
+                return 'PUBLICATION';
+            case 'OBJECT_PUBLICATION_REL':
+                return 'PUBLICATION';
+            case 'OBJECT_ROLE':
+                return 'ROLE';
+            case 'OBJECT_ROUTINE':
+                return 'ROUTINE';
+            case 'OBJECT_RULE':
+                return 'RULE';
+            case 'OBJECT_STATISTIC_EXT':
+                return 'STATISTICS';
+            case 'OBJECT_SUBSCRIPTION':
+                return 'SUBSCRIPTION';
+            case 'OBJECT_TABCONSTRAINT':
+                return 'CONSTRAINT';
+            case 'OBJECT_TABLESPACE':
+                return 'TABLESPACE';
+            case 'OBJECT_TRANSFORM':
+                return 'TRANSFORM';
+            case 'OBJECT_TRIGGER':
+                return 'TRIGGER';
+            case 'OBJECT_TSPARSER':
+                return 'TEXT SEARCH PARSER';
+            case 'OBJECT_TSTEMPLATE':
+                return 'TEXT SEARCH TEMPLATE';
+            case 'OBJECT_USER_MAPPING':
+                return 'USER MAPPING';
+            default:
+                throw new Error(`Unsupported objectType: ${objectType}`);
+        }
+    }
+    deparse(node, context) {
         if (node == null) {
             return null;
         }
@@ -199,10 +298,10 @@ export class Deparser implements DeparserVisitor {
         }
         catch (error) {
             const nodeType = Object.keys(node)[0];
-            throw new Error(`Error deparsing ${nodeType}: ${(error as Error).message}`);
+            throw new Error(`Error deparsing ${nodeType}: ${error.message}`);
         }
     }
-    visit(node: any, context?: DeparserContext): string {
+    visit(node, context) {
         if (!context) {
             const formatter = new SqlFormatter(this.options.newline, this.options.tab, this.options.pretty);
             context = new DeparserContext({ formatter, prettyMode: this.options.pretty });
@@ -213,24 +312,24 @@ export class Deparser implements DeparserVisitor {
             return '';
         }
         const nodeData = this.getNodeData(node);
-        const methodName = nodeType as keyof this;
+        const methodName = nodeType;
         if (typeof this[methodName] === 'function') {
-            const result = (this[methodName] as any)(nodeData, context);
+            const result = this[methodName](nodeData, context);
             return result;
         }
         throw new Error(`Deparser does not handle node type: ${nodeType}`);
     }
-    getNodeType(node: any): string {
+    getNodeType(node) {
         return Object.keys(node)[0];
     }
-    getNodeData(node: any): any {
+    getNodeData(node) {
         const keys = Object.keys(node);
-        if (keys.length === 1 && typeof (node as any)[keys[0]] === 'object') {
-            return (node as any)[keys[0]];
+        if (keys.length === 1 && typeof node[keys[0]] === 'object') {
+            return node[keys[0]];
         }
         return node;
     }
-    ParseResult(node: any, context: DeparserContext): string {
+    ParseResult(node, context) {
         if (!node.stmts || node.stmts.length === 0) {
             return '';
         }
@@ -238,12 +337,12 @@ export class Deparser implements DeparserVisitor {
         // Note: node.stmts is "repeated RawStmt" so contains RawStmt objects inline
         // Each element has structure: { stmt: Node, stmt_len?: number, stmt_location?: number }
         return node.stmts
-            .filter((rawStmt: any) => rawStmt != null)
-            .map((rawStmt: any) => this.RawStmt(rawStmt, context))
-            .filter((result: string) => result !== '')
+            .filter((rawStmt) => rawStmt != null)
+            .map((rawStmt) => this.RawStmt(rawStmt, context))
+            .filter((result) => result !== '')
             .join(context.newline() + context.newline());
     }
-    RawStmt(node: any, context: DeparserContext): string {
+    RawStmt(node, context) {
         if (!node.stmt) {
             return '';
         }
@@ -254,8 +353,8 @@ export class Deparser implements DeparserVisitor {
         }
         return deparsedStmt;
     }
-    SelectStmt(node: any, context: DeparserContext): string {
-        const output: string[] = [];
+    SelectStmt(node, context) {
+        const output = [];
         if (node.withClause) {
             output.push(this.WithClause(node.withClause, context));
         }
@@ -518,8 +617,8 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join(' ');
     }
-    A_Expr(node: any, context: DeparserContext): string {
-        const kind = node.kind as string;
+    A_Expr(node, context) {
+        const kind = node.kind;
         const name = ListUtils.unwrapList(node.name);
         const lexpr = node.lexpr;
         const rexpr = node.rexpr;
@@ -670,11 +769,11 @@ export class Deparser implements DeparserVisitor {
                 }
             case 'AEXPR_SIMILAR':
                 const similarOp = this.deparseOperatorName(name, context);
-                let rightExpr: string;
+                let rightExpr;
                 if (rexpr && 'FuncCall' in rexpr &&
                     rexpr.FuncCall?.funcname?.length === 2 &&
-                    (rexpr.FuncCall.funcname[0] as any)?.String?.sval === 'pg_catalog' &&
-                    (rexpr.FuncCall.funcname[1] as any)?.String?.sval === 'similar_to_escape') {
+                    rexpr.FuncCall.funcname[0]?.String?.sval === 'pg_catalog' &&
+                    rexpr.FuncCall.funcname[1]?.String?.sval === 'similar_to_escape') {
                     const args = rexpr.FuncCall.args || [];
                     rightExpr = this.visit(args[0], context);
                     if (args.length > 1) {
@@ -725,11 +824,11 @@ export class Deparser implements DeparserVisitor {
         }
         throw new Error(`Unhandled A_Expr kind: ${kind}`);
     }
-    deparseOperatorName(name: any, context: DeparserContext): string {
+    deparseOperatorName(name, context) {
         if (!name || name.length === 0) {
             return '';
         }
-        const parts = name.map((n: any) => {
+        const parts = name.map((n) => {
             if (n.String) {
                 return n.String.sval || n.String.str;
             }
@@ -740,10 +839,8 @@ export class Deparser implements DeparserVisitor {
         }
         return parts.join('.');
     }
-    private getOperatorPrecedence(operator: string): number {
-        const precedence: {
-            [key: string]: number;
-        } = {
+    getOperatorPrecedence(operator) {
+        const precedence = {
             '||': 1, // string concatenation
             'OR': 2, // logical OR
             'AND': 3, // logical AND
@@ -776,7 +873,7 @@ export class Deparser implements DeparserVisitor {
         };
         return precedence[operator] || 0;
     }
-    private needsParentheses(childOp: string, parentOp: string, position: 'left' | 'right'): boolean {
+    needsParentheses(childOp, parentOp, position) {
         const childPrec = this.getOperatorPrecedence(childOp);
         const parentPrec = this.getOperatorPrecedence(parentOp);
         if (childPrec < parentPrec) {
@@ -789,7 +886,7 @@ export class Deparser implements DeparserVisitor {
         }
         return false;
     }
-    private isComplexExpression(node: any): boolean {
+    isComplexExpression(node) {
         return !!(node.NullTest ||
             node.BooleanTest ||
             node.BoolExpr ||
@@ -798,7 +895,7 @@ export class Deparser implements DeparserVisitor {
             node.SubLink ||
             node.A_Expr);
     }
-    private isComplexSelectTarget(node: any): boolean {
+    isComplexSelectTarget(node) {
         if (!node)
             return false;
         if (node.ResTarget?.val) {
@@ -856,15 +953,15 @@ export class Deparser implements DeparserVisitor {
         }
         return false;
     }
-    visitBetweenRange(rexpr: any, context: DeparserContext): string {
+    visitBetweenRange(rexpr, context) {
         if (rexpr && 'List' in rexpr && rexpr.List?.items) {
-            const items = rexpr.List.items.map((item: any) => this.visit(item, context));
+            const items = rexpr.List.items.map((item) => this.visit(item, context));
             return items.join(' AND ');
         }
         return this.visit(rexpr, context);
     }
-    InsertStmt(node: any, context: DeparserContext): string {
-        const output: string[] = [];
+    InsertStmt(node, context) {
+        const output = [];
         if (node.withClause) {
             output.push(this.WithClause(node.withClause, context));
         }
@@ -945,8 +1042,8 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join(' ');
     }
-    UpdateStmt(node: any, context: DeparserContext): string {
-        const output: string[] = [];
+    UpdateStmt(node, context) {
+        const output = [];
         if (node.withClause) {
             output.push(this.WithClause(node.withClause, context));
         }
@@ -1004,9 +1101,9 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join(' ');
     }
-    DeleteStmt(node: any, context: DeparserContext): string {
+    DeleteStmt(node, context) {
         try {
-            const output: string[] = [];
+            const output = [];
             if (node.withClause) {
                 try {
                     output.push(this.WithClause(node.withClause, context));
@@ -1067,8 +1164,8 @@ export class Deparser implements DeparserVisitor {
             throw new Error(`Error deparsing DeleteStmt: ${error instanceof Error ? error.message : String(error)}`);
         }
     }
-    WithClause(node: any, context: DeparserContext): string {
-        const output: string[] = ['WITH'];
+    WithClause(node, context) {
+        const output = ['WITH'];
         if (node.recursive) {
             output.push('RECURSIVE');
         }
@@ -1092,8 +1189,8 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join(' ');
     }
-    ResTarget(node: any, context: DeparserContext): string {
-        const output: string[] = [];
+    ResTarget(node, context) {
+        const output = [];
         if (context.update && node.name) {
             output.push(QuoteUtils.quote(node.name));
             // Handle indirection (array indexing, field access, etc.)
@@ -1135,14 +1232,14 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join(' ');
     }
-    deparseReturningList(list: any, context: DeparserContext): string {
+    deparseReturningList(list, context) {
         return ListUtils.unwrapList(list)
             .filter(item => item != null && this.getNodeType(item) !== 'undefined')
             .map(item => {
             try {
                 // Handle ResTarget wrapper
                 if (this.getNodeType(item) === 'ResTarget') {
-                    const resTarget = this.getNodeData(item) as any;
+                    const resTarget = this.getNodeData(item);
                     const val = resTarget.val ? this.visit(resTarget.val, context) : '';
                     const alias = resTarget.name ? ` AS ${QuoteUtils.quote(resTarget.name)}` : '';
                     return val + alias;
@@ -1160,8 +1257,8 @@ export class Deparser implements DeparserVisitor {
             .filter(item => item && item.trim())
             .join(', ');
     }
-    BoolExpr(node: any, context: DeparserContext): string {
-        const boolop = node.boolop as string;
+    BoolExpr(node, context) {
+        const boolop = node.boolop;
         const args = ListUtils.unwrapList(node.args);
         let formatStr = '%s';
         if (context.bool) {
@@ -1196,7 +1293,7 @@ export class Deparser implements DeparserVisitor {
                 throw new Error(`Unhandled BoolExpr boolop: ${boolop}`);
         }
     }
-    FuncCall(node: any, context: DeparserContext): string {
+    FuncCall(node, context) {
         const funcname = ListUtils.unwrapList(node.funcname);
         const args = ListUtils.unwrapList(node.args);
         const name = funcname.map(n => this.visit(n, context)).join('.');
@@ -1321,7 +1418,7 @@ export class Deparser implements DeparserVisitor {
             }
             return `${timestamp} AT TIME ZONE ${timezone}`;
         }
-        const params: string[] = [];
+        const params = [];
         if (node.agg_star) {
             if (node.agg_distinct) {
                 params.push('DISTINCT *');
@@ -1374,7 +1471,7 @@ export class Deparser implements DeparserVisitor {
                 result += ` OVER ${node.over.name}`;
             }
             else {
-                const windowParts: string[] = [];
+                const windowParts = [];
                 if (node.over.partitionClause) {
                     const partitions = ListUtils.unwrapList(node.over.partitionClause);
                     const partitionStrs = partitions.map(p => this.visit(p, context));
@@ -1406,13 +1503,13 @@ export class Deparser implements DeparserVisitor {
         }
         return result;
     }
-    FuncExpr(node: any, context: DeparserContext): string {
+    FuncExpr(node, context) {
         const funcName = `func_${node.funcid}`;
         const args = node.args ? ListUtils.unwrapList(node.args).map(arg => this.visit(arg, context)).join(', ') : '';
         return `${funcName}(${args})`;
     }
-    A_Const(node: any, context: DeparserContext): string {
-        const nodeAny = node as any;
+    A_Const(node, context) {
+        const nodeAny = node;
         if (nodeAny.ival !== undefined) {
             if (typeof nodeAny.ival === 'object' && nodeAny.ival !== null) {
                 if (nodeAny.ival.ival !== undefined) {
@@ -1577,7 +1674,7 @@ export class Deparser implements DeparserVisitor {
         }
         return 'NULL';
     }
-    ColumnRef(node: any, context: DeparserContext): string {
+    ColumnRef(node, context) {
         const fields = ListUtils.unwrapList(node.fields);
         return fields.map(field => {
             if (field.String) {
@@ -1589,16 +1686,16 @@ export class Deparser implements DeparserVisitor {
             return this.visit(field, context);
         }).join('.');
     }
-    TypeName(node: any, context: DeparserContext): string {
+    TypeName(node, context) {
         if (!node.names) {
             return '';
         }
-        const output: string[] = [];
+        const output = [];
         // Handle SETOF keyword
         if (node.setof) {
             output.push('SETOF');
         }
-        const names = node.names.map((name: any) => {
+        const names = node.names.map((name) => {
             if (name.String) {
                 return name.String.sval || name.String.str;
             }
@@ -1607,9 +1704,9 @@ export class Deparser implements DeparserVisitor {
         if (names.length === 0) {
             return '';
         }
-        let args: string | null = null;
+        let args = null;
         if (node.typmods) {
-            const isInterval = names.some((name: any) => {
+            const isInterval = names.some((name) => {
                 const nameStr = typeof name === 'string' ? name : (name.String?.sval || name.String?.str);
                 return nameStr === 'interval';
             });
@@ -1624,7 +1721,7 @@ export class Deparser implements DeparserVisitor {
         else if (node.typemod && node.typemod !== -1) {
             args = this.formatSingleTypeMod(node.typemod, names[0]);
         }
-        const mods = (name: string, size: string | null) => {
+        const mods = (name, size) => {
             if (size != null) {
                 // For interval types, use space separation for fields in all contexts
                 if (name === 'interval') {
@@ -1639,7 +1736,7 @@ export class Deparser implements DeparserVisitor {
             }
             return name;
         };
-        const formatArrayBounds = (arrayBounds: any[]): string => {
+        const formatArrayBounds = (arrayBounds) => {
             return arrayBounds.map(bound => {
                 if (bound.Integer && bound.Integer.ival !== undefined && bound.Integer.ival !== -1) {
                     return `[${bound.Integer.ival}]`;
@@ -1755,7 +1852,7 @@ export class Deparser implements DeparserVisitor {
                 return output.join(' ');
             }
         }
-        const quotedNames = names.map((name: string) => QuoteUtils.quote(name));
+        const quotedNames = names.map((name) => QuoteUtils.quote(name));
         let result = mods(quotedNames.join('.'), args);
         if (node.arrayBounds && node.arrayBounds.length > 0) {
             result += formatArrayBounds(node.arrayBounds);
@@ -1763,9 +1860,9 @@ export class Deparser implements DeparserVisitor {
         output.push(result);
         return output.join(' ');
     }
-    Alias(node: any, context: DeparserContext): string {
+    Alias(node, context) {
         const name = node.aliasname;
-        const output: string[] = [];
+        const output = [];
         if (node.colnames) {
             const colnames = ListUtils.unwrapList(node.colnames);
             const quotedColnames = colnames.map(col => {
@@ -1783,8 +1880,8 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join(' ');
     }
-    RangeVar(node: any, context: DeparserContext): string {
-        const output: string[] = [];
+    RangeVar(node, context) {
+        const output = [];
         // Handle ONLY keyword for inheritance control (but not for type definitions, ALTER TYPE, or CREATE FOREIGN TABLE)
         if (node && (!('inh' in node) || node.inh === undefined) &&
             !context.parentNodeTypes.includes('CompositeTypeStmt') &&
@@ -1814,14 +1911,12 @@ export class Deparser implements DeparserVisitor {
         const result = output.join(' ');
         return result;
     }
-    formatIntervalTypeMods(typmods: any, context: DeparserContext): string | null {
+    formatIntervalTypeMods(typmods, context) {
         if (!typmods || typmods.length === 0) {
             return null;
         }
         const mods = ListUtils.unwrapList(typmods);
-        const intervalFields: {
-            [key: number]: string;
-        } = {
+        const intervalFields = {
             4: 'year',
             2: 'month',
             8: 'day',
@@ -1840,7 +1935,7 @@ export class Deparser implements DeparserVisitor {
         if (mods.length === 1) {
             const mod = mods[0];
             if (mod && typeof mod === 'object') {
-                const aConst = (mod as any).A_Const;
+                const aConst = mod.A_Const;
                 if (aConst && aConst.ival !== undefined) {
                     const ivalValue = typeof aConst.ival === 'object' ? aConst.ival.ival : aConst.ival;
                     if (ivalValue !== undefined) {
@@ -1858,12 +1953,12 @@ export class Deparser implements DeparserVisitor {
             const firstMod = mods[0];
             const secondMod = mods[1];
             if (firstMod && typeof firstMod === 'object') {
-                const firstConst = (firstMod as any).A_Const;
+                const firstConst = firstMod.A_Const;
                 if (firstConst && firstConst.ival !== undefined) {
                     const firstValue = typeof firstConst.ival === 'object' ? firstConst.ival.ival : firstConst.ival;
                     // Check if second mod is precision (empty ival object or specific precision value)
                     if (secondMod && typeof secondMod === 'object') {
-                        const secondConst = (secondMod as any).A_Const;
+                        const secondConst = secondMod.A_Const;
                         if (secondConst && secondConst.ival !== undefined) {
                             const secondValue = typeof secondConst.ival === 'object' ?
                                 (secondConst.ival.ival !== undefined ? secondConst.ival.ival : 0) :
@@ -1881,7 +1976,7 @@ export class Deparser implements DeparserVisitor {
         }
         const fieldSpecs = mods.map(mod => {
             if (mod && typeof mod === 'object') {
-                const aConst = (mod as any).A_Const;
+                const aConst = mod.A_Const;
                 if (aConst && aConst.ival !== undefined) {
                     const ivalValue = typeof aConst.ival === 'object' ? aConst.ival.ival : aConst.ival;
                     if (ivalValue !== undefined) {
@@ -1894,14 +1989,14 @@ export class Deparser implements DeparserVisitor {
         }).filter(Boolean);
         return fieldSpecs.length > 0 ? fieldSpecs.join(' ') : null;
     }
-    formatTypeMods(typmods: any, context: DeparserContext): string | null {
+    formatTypeMods(typmods, context) {
         if (!typmods || typmods.length === 0) {
             return null;
         }
         const mods = ListUtils.unwrapList(typmods);
         const filteredMods = mods.filter(mod => {
             if (mod && typeof mod === 'object') {
-                const aConst = (mod as any).A_Const;
+                const aConst = mod.A_Const;
                 if (aConst && aConst.ival) {
                     // Handle both direct number and nested object structures
                     const ivalValue = typeof aConst.ival === 'object' ? aConst.ival.ival : aConst.ival;
@@ -1919,7 +2014,7 @@ export class Deparser implements DeparserVisitor {
             return this.deparse(mod, context);
         }).join(', ');
     }
-    formatSingleTypeMod(typemod: number, typeName: string): string | null {
+    formatSingleTypeMod(typemod, typeName) {
         switch (typeName) {
             case 'varchar':
             case 'bpchar':
@@ -1954,7 +2049,7 @@ export class Deparser implements DeparserVisitor {
         }
         return null;
     }
-    getPgCatalogTypeName(typeName: string, size: string | null): string {
+    getPgCatalogTypeName(typeName, size) {
         switch (typeName) {
             case 'bpchar':
                 if (size != null) {
@@ -1987,7 +2082,7 @@ export class Deparser implements DeparserVisitor {
                 return `pg_catalog.${typeName}`;
         }
     }
-    isPgCatalogType(typeName: string): boolean {
+    isPgCatalogType(typeName) {
         const cleanTypeName = typeName.replace(/^pg_catalog\./, '');
         if (pgCatalogTypes.includes(cleanTypeName)) {
             return true;
@@ -1999,13 +2094,13 @@ export class Deparser implements DeparserVisitor {
         }
         return false;
     }
-    A_ArrayExpr(node: any, context: DeparserContext): string {
+    A_ArrayExpr(node, context) {
         const elements = ListUtils.unwrapList(node.elements);
         const elementStrs = elements.map(el => this.visit(el, context));
         return `ARRAY[${elementStrs.join(', ')}]`;
     }
-    A_Indices(node: any, context: DeparserContext): string {
-        const output: string[] = [];
+    A_Indices(node, context) {
+        const output = [];
         if (node.is_slice) {
             if (node.lidx) {
                 output.push(this.visit(node.lidx, context));
@@ -2022,7 +2117,7 @@ export class Deparser implements DeparserVisitor {
         }
         return `[${output.join('')}]`;
     }
-    A_Indirection(node: any, context: DeparserContext): string {
+    A_Indirection(node, context) {
         let argStr = this.visit(node.arg, context);
         const argType = this.getNodeType(node.arg);
         if (argType === 'TypeCast' || argType === 'SubLink' || argType === 'A_Expr' || argType === 'FuncCall' || argType === 'A_Indirection' || argType === 'ColumnRef' || argType === 'RowExpr') {
@@ -2041,11 +2136,11 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join('');
     }
-    A_Star(node: any, context: DeparserContext): string {
+    A_Star(node, context) {
         return '*';
     }
-    CaseExpr(node: any, context: DeparserContext): string {
-        const output: string[] = ['CASE'];
+    CaseExpr(node, context) {
+        const output = ['CASE'];
         if (node.arg) {
             output.push(this.visit(node.arg, context));
         }
@@ -2084,20 +2179,20 @@ export class Deparser implements DeparserVisitor {
             return output.join(' ');
         }
     }
-    CoalesceExpr(node: any, context: DeparserContext): string {
+    CoalesceExpr(node, context) {
         const args = ListUtils.unwrapList(node.args);
         const argStrs = args.map(arg => this.visit(arg, context));
         return `COALESCE(${argStrs.join(', ')})`;
     }
-    TypeCast(node: any, context: DeparserContext): string {
+    TypeCast(node, context) {
         const arg = this.visit(node.arg, context);
         const typeName = this.TypeName(node.typeName, context);
         // Check if this is a bpchar typecast that should preserve original syntax for AST consistency
         if (typeName === 'bpchar' || typeName === 'pg_catalog.bpchar') {
             const names = node.typeName?.names;
             const isQualifiedBpchar = names && names.length === 2 &&
-                (names[0] as any)?.String?.sval === 'pg_catalog' &&
-                (names[1] as any)?.String?.sval === 'bpchar';
+                names[0]?.String?.sval === 'pg_catalog' &&
+                names[1]?.String?.sval === 'bpchar';
             if (isQualifiedBpchar) {
                 return `CAST(${arg} AS ${typeName})`;
             }
@@ -2108,18 +2203,21 @@ export class Deparser implements DeparserVisitor {
             const isFunctionCall = argType === 'FuncCall';
             if (isSimpleArgument || isFunctionCall) {
                 // For simple arguments, avoid :: syntax if they have complex structure
-                if (isSimpleArgument && (arg.includes('(') || arg.startsWith('-'))) {
-                }
-                else {
+                const shouldUseCastSyntax = isSimpleArgument && (arg.includes('(') || arg.startsWith('-'));
+                if (!shouldUseCastSyntax) {
                     const cleanTypeName = typeName.replace('pg_catalog.', '');
+                    // Wrap FuncCall arguments in parentheses to prevent operator precedence issues
+                    if (isFunctionCall) {
+                        return `${context.parens(arg)}::${cleanTypeName}`;
+                    }
                     return `${arg}::${cleanTypeName}`;
                 }
             }
         }
         return `CAST(${arg} AS ${typeName})`;
     }
-    CollateClause(node: any, context: DeparserContext): string {
-        const output: string[] = [];
+    CollateClause(node, context) {
+        const output = [];
         if (node.arg) {
             let argStr = this.visit(node.arg, context);
             const argType = this.getNodeType(node.arg);
@@ -2135,11 +2233,11 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join(' ');
     }
-    BooleanTest(node: any, context: DeparserContext): string {
-        const output: string[] = [];
+    BooleanTest(node, context) {
+        const output = [];
         const boolContext = context.spawn('BooleanTest', { bool: true });
         output.push(this.visit(node.arg, boolContext));
-        switch (node.booltesttype as string) {
+        switch (node.booltesttype) {
             case 'IS_TRUE':
                 output.push('IS TRUE');
                 break;
@@ -2161,10 +2259,10 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join(' ');
     }
-    NullTest(node: any, context: DeparserContext): string {
-        const output: string[] = [];
+    NullTest(node, context) {
+        const output = [];
         output.push(this.visit(node.arg, context));
-        switch (node.nulltesttype as string) {
+        switch (node.nulltesttype) {
             case 'IS_NULL':
                 output.push('IS NULL');
                 break;
@@ -2174,7 +2272,7 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join(' ');
     }
-    private static readonly RESERVED_WORDS = new Set([
+    static 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',
@@ -2186,7 +2284,7 @@ export class Deparser implements DeparserVisitor {
         'then', 'to', 'trailing', 'true', 'union', 'unique', 'user', 'using', 'variadic',
         'when', 'where', 'window', 'with'
     ]);
-    private static needsQuotes(value: string): boolean {
+    static needsQuotes(value) {
         if (!value)
             return false;
         const needsQuotesRegex = /[a-z]+[\W\w]*[A-Z]+|[A-Z]+[\W\w]*[a-z]+|\W/;
@@ -2195,16 +2293,14 @@ export class Deparser implements DeparserVisitor {
             Deparser.RESERVED_WORDS.has(value.toLowerCase()) ||
             isAllUppercase;
     }
-    quoteIfNeeded(value: string): string {
+    quoteIfNeeded(value) {
         if (Deparser.needsQuotes(value)) {
             return `"${value}"`;
         }
         return value;
     }
-    preserveOperatorDefElemCase(defName: string): string {
-        const caseMap: {
-            [key: string]: string;
-        } = {
+    preserveOperatorDefElemCase(defName) {
+        const caseMap = {
             'leftarg': 'Leftarg',
             'rightarg': 'Rightarg',
             'procedure': 'Procedure',
@@ -2218,7 +2314,7 @@ export class Deparser implements DeparserVisitor {
         };
         return caseMap[defName.toLowerCase()] || defName;
     }
-    String(node: any, context: DeparserContext): string {
+    String(node, context) {
         if (context.isStringLiteral || context.isEnumValue) {
             return QuoteUtils.formatEString(node.sval || '');
         }
@@ -2236,16 +2332,16 @@ export class Deparser implements DeparserVisitor {
         }
         return Deparser.needsQuotes(value) ? `"${value}"` : value;
     }
-    Integer(node: any, context: DeparserContext): string {
+    Integer(node, context) {
         return node.ival?.toString() || '0';
     }
-    Float(node: any, context: DeparserContext): string {
+    Float(node, context) {
         return node.fval || '0.0';
     }
-    Boolean(node: any, context: DeparserContext): string {
+    Boolean(node, context) {
         return node.boolval ? 'true' : 'false';
     }
-    BitString(node: any, context: DeparserContext): string {
+    BitString(node, context) {
         // Check if this is a hexadecimal bit string (starts with x)
         if (node.bsval.startsWith('x')) {
             return `x'${node.bsval.substring(1)}'`;
@@ -2256,17 +2352,17 @@ export class Deparser implements DeparserVisitor {
         // Fallback for raw values without prefix
         return `b'${node.bsval}'`;
     }
-    Null(node: any, context: DeparserContext): string {
+    Null(node, context) {
         return 'NULL';
     }
-    List(node: any, context: DeparserContext): string {
+    List(node, context) {
         if (!node.items || node.items.length === 0) {
             return '';
         }
-        return node.items.map((item: any) => this.visit(item, context)).join(', ');
+        return node.items.map((item) => this.visit(item, context)).join(', ');
     }
-    CreateStmt(node: any, context: DeparserContext): string {
-        const output: string[] = ['CREATE'];
+    CreateStmt(node, context) {
+        const output = ['CREATE'];
         if (node.relation && node.relation.relpersistence === 't') {
             output.push('TEMPORARY');
         }
@@ -2396,7 +2492,7 @@ export class Deparser implements DeparserVisitor {
         // Handle table options like WITH (fillfactor=10)
         if (node.options && node.options.length > 0) {
             const createStmtContext = context.spawn('CreateStmt');
-            const optionStrs = node.options.map((option: any) => {
+            const optionStrs = node.options.map((option) => {
                 return this.deparse(option, createStmtContext);
             });
             output.push('WITH', `(${optionStrs.join(', ')})`);
@@ -2408,8 +2504,8 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join(' ');
     }
-    ColumnDef(node: any, context: DeparserContext): string {
-        const output: string[] = [];
+    ColumnDef(node, context) {
+        const output = [];
         if (node.colname) {
             output.push(QuoteUtils.quote(node.colname));
         }
@@ -2447,8 +2543,8 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join(' ');
     }
-    Constraint(node: any, context: DeparserContext): string {
-        const output: string[] = [];
+    Constraint(node, context) {
+        const output = [];
         // Handle constraint name if present
         if (node.conname && (node.contype === 'CONSTR_CHECK' || node.contype === 'CONSTR_UNIQUE' || node.contype === 'CONSTR_PRIMARY' || node.contype === 'CONSTR_FOREIGN')) {
             output.push('CONSTRAINT');
@@ -2845,7 +2941,7 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join(' ');
     }
-    SubLink(node: any, context: DeparserContext): string {
+    SubLink(node, context) {
         const subselect = context.parens(this.visit(node.subselect, context));
         switch (node.subLinkType) {
             case 'ANY_SUBLINK':
@@ -2875,8 +2971,8 @@ export class Deparser implements DeparserVisitor {
                 return subselect;
         }
     }
-    CaseWhen(node: any, context: DeparserContext): string {
-        const output: string[] = ['WHEN'];
+    CaseWhen(node, context) {
+        const output = ['WHEN'];
         if (node.expr) {
             output.push(this.visit(node.expr, context));
         }
@@ -2886,12 +2982,12 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join(' ');
     }
-    WindowDef(node: any, context: DeparserContext): string {
-        const output: string[] = [];
+    WindowDef(node, context) {
+        const output = [];
         if (node.name) {
             output.push(node.name);
         }
-        const windowParts: string[] = [];
+        const windowParts = [];
         if (node.partitionClause) {
             const partitions = ListUtils.unwrapList(node.partitionClause);
             const partitionStrs = partitions.map(p => this.visit(p, context));
@@ -2924,11 +3020,11 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join(' ');
     }
-    formatWindowFrame(node: any, context: DeparserContext): string | null {
+    formatWindowFrame(node, context) {
         if (!node.frameOptions)
             return null;
         const frameOptions = node.frameOptions;
-        const frameParts: string[] = [];
+        const frameParts = [];
         if (frameOptions & 0x01) { // FRAMEOPTION_NONDEFAULT
             if (frameOptions & 0x02) { // FRAMEOPTION_RANGE
                 frameParts.push('RANGE');
@@ -2942,7 +3038,7 @@ export class Deparser implements DeparserVisitor {
         }
         if (frameParts.length === 0)
             return null;
-        const boundsParts: string[] = [];
+        const boundsParts = [];
         // Handle specific frameOptions values that have known mappings
         if (frameOptions === 789) {
             boundsParts.push('CURRENT ROW');
@@ -3024,8 +3120,8 @@ export class Deparser implements DeparserVisitor {
         }
         return frameParts.join(' ');
     }
-    SortBy(node: any, context: DeparserContext): string {
-        const output: string[] = [];
+    SortBy(node, context) {
+        const output = [];
         if (node.node) {
             output.push(this.visit(node.node, context));
         }
@@ -3053,7 +3149,7 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join(' ');
     }
-    GroupingSet(node: any, context: DeparserContext): string {
+    GroupingSet(node, context) {
         switch (node.kind) {
             case 'GROUPING_SET_EMPTY':
                 return '()';
@@ -3076,8 +3172,8 @@ export class Deparser implements DeparserVisitor {
                 return '';
         }
     }
-    CommonTableExpr(node: any, context: DeparserContext): string {
-        const output: string[] = [];
+    CommonTableExpr(node, context) {
+        const output = [];
         if (node.ctename) {
             output.push(node.ctename);
         }
@@ -3100,11 +3196,11 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join(' ');
     }
-    ParamRef(node: any, context: DeparserContext): string {
+    ParamRef(node, context) {
         return `$${node.number}`;
     }
-    LockingClause(node: any, context: DeparserContext): string {
-        const output: string[] = [];
+    LockingClause(node, context) {
+        const output = [];
         switch (node.strength) {
             case 'LCS_FORUPDATE':
                 output.push('FOR UPDATE');
@@ -3136,7 +3232,7 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join(' ');
     }
-    MinMaxExpr(node: any, context: DeparserContext): string {
+    MinMaxExpr(node, context) {
         const args = ListUtils.unwrapList(node.args);
         const argStrs = args.map(arg => this.visit(arg, context));
         if (node.op === 'IS_GREATEST') {
@@ -3146,7 +3242,7 @@ export class Deparser implements DeparserVisitor {
             return `LEAST(${argStrs.join(', ')})`;
         }
     }
-    RowExpr(node: any, context: DeparserContext): string {
+    RowExpr(node, context) {
         const args = ListUtils.unwrapList(node.args);
         const argStrs = args.map(arg => this.visit(arg, context));
         if (node.row_format === 'COERCE_IMPLICIT_CAST') {
@@ -3154,7 +3250,7 @@ export class Deparser implements DeparserVisitor {
         }
         return `ROW(${argStrs.join(', ')})`;
     }
-    OpExpr(node: any, context: DeparserContext): string {
+    OpExpr(node, context) {
         const args = ListUtils.unwrapList(node.args);
         if (args.length === 2) {
             const left = this.visit(args[0], context);
@@ -3169,7 +3265,7 @@ export class Deparser implements DeparserVisitor {
         }
         throw new Error(`Unsupported OpExpr with ${args.length} arguments`);
     }
-    DistinctExpr(node: any, context: DeparserContext): string {
+    DistinctExpr(node, context) {
         const args = ListUtils.unwrapList(node.args);
         if (args.length === 2) {
             const literalContext = context.spawn('DistinctExpr', { isStringLiteral: true });
@@ -3179,7 +3275,7 @@ export class Deparser implements DeparserVisitor {
         }
         throw new Error(`DistinctExpr requires exactly 2 arguments, got ${args.length}`);
     }
-    NullIfExpr(node: any, context: DeparserContext): string {
+    NullIfExpr(node, context) {
         const args = ListUtils.unwrapList(node.args);
         if (args.length === 2) {
             const literalContext = context.spawn('NullIfExpr', { isStringLiteral: true });
@@ -3189,7 +3285,7 @@ export class Deparser implements DeparserVisitor {
         }
         throw new Error(`NullIfExpr requires exactly 2 arguments, got ${args.length}`);
     }
-    ScalarArrayOpExpr(node: any, context: DeparserContext): string {
+    ScalarArrayOpExpr(node, context) {
         const args = ListUtils.unwrapList(node.args);
         if (args.length === 2) {
             const left = this.visit(args[0], context);
@@ -3200,7 +3296,7 @@ export class Deparser implements DeparserVisitor {
         }
         throw new Error(`ScalarArrayOpExpr requires exactly 2 arguments, got ${args.length}`);
     }
-    Aggref(node: any, context: DeparserContext): string {
+    Aggref(node, context) {
         const funcName = this.getAggFunctionName(node.aggfnoid);
         let result = funcName + '(';
         const hasDistinct = node.aggdistinct && node.aggdistinct.length > 0;
@@ -3231,7 +3327,7 @@ export class Deparser implements DeparserVisitor {
         }
         return result;
     }
-    WindowFunc(node: any, context: DeparserContext): string {
+    WindowFunc(node, context) {
         const funcName = this.getWindowFunctionName(node.winfnoid);
         let result = funcName + '(';
         if (node.args && node.args.length > 0) {
@@ -3241,7 +3337,7 @@ export class Deparser implements DeparserVisitor {
         }
         result += ') OVER (';
         if (node.winref && typeof node.winref === 'object') {
-            result += this.visit(node.winref as any, context);
+            result += this.visit(node.winref, context);
         }
         else if (node.winref) {
             result += 'ORDER BY created_at ASC';
@@ -3249,8 +3345,8 @@ export class Deparser implements DeparserVisitor {
         result += ')';
         return result;
     }
-    FieldSelect(node: any, context: DeparserContext): string {
-        const output: string[] = [];
+    FieldSelect(node, context) {
+        const output = [];
         if (node.arg) {
             output.push(this.visit(node.arg, context));
         }
@@ -3259,34 +3355,34 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join('');
     }
-    RelabelType(node: any, context: DeparserContext): string {
+    RelabelType(node, context) {
         if (node.arg) {
             const literalContext = context.spawn('RelabelType', { isStringLiteral: true });
             return this.visit(node.arg, literalContext);
         }
         return '';
     }
-    CoerceViaIO(node: any, context: DeparserContext): string {
+    CoerceViaIO(node, context) {
         if (node.arg) {
             return this.visit(node.arg, context);
         }
         return '';
     }
-    ArrayCoerceExpr(node: any, context: DeparserContext): string {
+    ArrayCoerceExpr(node, context) {
         if (node.arg) {
             return this.visit(node.arg, context);
         }
         return '';
     }
-    ConvertRowtypeExpr(node: any, context: DeparserContext): string {
+    ConvertRowtypeExpr(node, context) {
         if (node.arg) {
             const literalContext = context.spawn('ConvertRowtypeExpr', { isStringLiteral: true });
             return this.visit(node.arg, literalContext);
         }
         return '';
     }
-    NamedArgExpr(node: any, context: DeparserContext): string {
-        const output: string[] = [];
+    NamedArgExpr(node, context) {
+        const output = [];
         if (node.name) {
             output.push(node.name);
             output.push('=>');
@@ -3296,8 +3392,8 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join(' ');
     }
-    ViewStmt(node: any, context: DeparserContext): string {
-        const output: string[] = [];
+    ViewStmt(node, context) {
+        const output = [];
         output.push('CREATE');
         if (node.replace) {
             output.push('OR REPLACE');
@@ -3335,8 +3431,8 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join(' ');
     }
-    IndexStmt(node: any, context: DeparserContext): string {
-        const output: string[] = [];
+    IndexStmt(node, context) {
+        const output = [];
         output.push('CREATE');
         if (node.unique) {
             output.push('UNIQUE');
@@ -3387,8 +3483,8 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join(' ');
     }
-    IndexElem(node: any, context: DeparserContext): string {
-        const output: string[] = [];
+    IndexElem(node, context) {
+        const output = [];
         if (node.name) {
             output.push(QuoteUtils.quote(node.name));
         }
@@ -3438,8 +3534,8 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join(' ');
     }
-    PartitionElem(node: any, context: DeparserContext): string {
-        const output: string[] = [];
+    PartitionElem(node, context) {
+        const output = [];
         if (node.name) {
             output.push(QuoteUtils.quote(node.name));
         }
@@ -3457,13 +3553,13 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join(' ');
     }
-    PartitionCmd(node: any, context: DeparserContext): string {
-        const output: string[] = [];
+    PartitionCmd(node, context) {
+        const output = [];
         if (node.concurrent) {
             output.push('CONCURRENTLY');
         }
         if (node.name) {
-            output.push(this.visit(node.name as any, context));
+            output.push(this.visit(node.name, context));
         }
         if (node.bound) {
             if (node.bound.strategy === 'l' && node.bound.listdatums) {
@@ -3499,10 +3595,8 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join(' ');
     }
-    private getAggFunctionName(aggfnoid?: number): string {
-        const commonAggFunctions: {
-            [key: number]: string;
-        } = {
+    getAggFunctionName(aggfnoid) {
+        const commonAggFunctions = {
             2100: 'avg',
             2101: 'count',
             2102: 'max',
@@ -3515,10 +3609,8 @@ export class Deparser implements DeparserVisitor {
         };
         return commonAggFunctions[aggfnoid || 0] || 'unknown_agg';
     }
-    private getWindowFunctionName(winfnoid?: number): string {
-        const commonWindowFunctions: {
-            [key: number]: string;
-        } = {
+    getWindowFunctionName(winfnoid) {
+        const commonWindowFunctions = {
             3100: 'row_number',
             3101: 'rank',
             3102: 'dense_rank',
@@ -3532,10 +3624,8 @@ export class Deparser implements DeparserVisitor {
         };
         return commonWindowFunctions[winfnoid || 0] || 'unknown_window_func';
     }
-    private getOperatorName(opno?: number): string {
-        const commonOperators: {
-            [key: number]: string;
-        } = {
+    getOperatorName(opno) {
+        const commonOperators = {
             96: '=',
             518: '<>',
             97: '<',
@@ -3560,8 +3650,8 @@ export class Deparser implements DeparserVisitor {
         };
         return commonOperators[opno || 0] || '=';
     }
-    JoinExpr(node: any, context: DeparserContext): string {
-        const output: string[] = [];
+    JoinExpr(node, context) {
+        const output = [];
         if (node.larg) {
             output.push(this.visit(node.larg, context));
         }
@@ -3670,7 +3760,7 @@ export class Deparser implements DeparserVisitor {
         }
         return result;
     }
-    FromExpr(node: any, context: DeparserContext): string {
+    FromExpr(node, context) {
         const fromlist = ListUtils.unwrapList(node.fromlist);
         const fromStrs = fromlist.map(item => this.visit(item, context));
         let result = fromStrs.join(', ');
@@ -3679,8 +3769,8 @@ export class Deparser implements DeparserVisitor {
         }
         return result;
     }
-    TransactionStmt(node: any, context: DeparserContext): string {
-        const output: string[] = [];
+    TransactionStmt(node, context) {
+        const output = [];
         switch (node.kind) {
             case 'TRANS_STMT_BEGIN':
                 output.push('BEGIN');
@@ -3790,7 +3880,7 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join(' ');
     }
-    VariableSetStmt(node: any, context: DeparserContext): string {
+    VariableSetStmt(node, context) {
         switch (node.kind) {
             case 'VAR_SET_VALUE':
                 const localPrefix = node.is_local ? 'LOCAL ' : '';
@@ -3820,7 +3910,7 @@ export class Deparser implements DeparserVisitor {
             case 'VAR_SET_MULTI':
                 if (node.name === 'TRANSACTION' || node.name === 'SESSION CHARACTERISTICS') {
                     // Handle SET TRANSACTION statements specially
-                    const transactionOptions: string[] = [];
+                    const transactionOptions = [];
                     if (node.args) {
                         const args = ListUtils.unwrapList(node.args);
                         for (const arg of args) {
@@ -3897,14 +3987,14 @@ export class Deparser implements DeparserVisitor {
                 throw new Error(`Unsupported VariableSetStmt kind: ${node.kind}`);
         }
     }
-    VariableShowStmt(node: any, context: DeparserContext): string {
+    VariableShowStmt(node, context) {
         if (node.name === 'ALL') {
             return 'SHOW ALL';
         }
         return `SHOW ${node.name}`;
     }
-    CreateSchemaStmt(node: any, context: DeparserContext): string {
-        const output: string[] = ['CREATE SCHEMA'];
+    CreateSchemaStmt(node, context) {
+        const output = ['CREATE SCHEMA'];
         if (node.if_not_exists) {
             output.push('IF NOT EXISTS');
         }
@@ -3923,7 +4013,7 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join(' ');
     }
-    RoleSpec(node: any, context: DeparserContext): string {
+    RoleSpec(node, context) {
         if (node.rolename) {
             return this.quoteIfNeeded(node.rolename);
         }
@@ -3940,14 +4030,14 @@ export class Deparser implements DeparserVisitor {
                 return 'PUBLIC';
         }
     }
-    roletype(node: any, context: DeparserContext): string {
+    roletype(node, context) {
         if (node.rolename) {
             return node.rolename;
         }
         return '';
     }
-    DropStmt(node: any, context: DeparserContext): string {
-        const output: string[] = ['DROP'];
+    DropStmt(node, context) {
+        const output = ['DROP'];
         if (node.removeType) {
             switch (node.removeType) {
                 case 'OBJECT_TABLE':
@@ -4113,8 +4203,8 @@ export class Deparser implements DeparserVisitor {
         if (node.objects && node.objects.length > 0) {
             if (node.removeType === 'OBJECT_POLICY') {
                 const objList = node.objects[0];
-                if (objList && (objList as any).List && (objList as any).List.items) {
-                    const items = (objList as any).List.items.map((item: any) => {
+                if (objList && objList.List && objList.List.items) {
+                    const items = objList.List.items.map((item) => {
                         if (item.String && item.String.sval) {
                             return item.String.sval;
                         }
@@ -4135,11 +4225,11 @@ export class Deparser implements DeparserVisitor {
                 }
             }
             else if (node.removeType === 'OBJECT_CAST') {
-                const objects = node.objects.map((objList: any) => {
+                const objects = node.objects.map((objList) => {
                     if (objList && objList.List && objList.List.items) {
-                        const items = objList.List.items.map((item: any) => {
+                        const items = objList.List.items.map((item) => {
                             return this.visit(item, context);
-                        }).filter((name: string) => name && name.trim());
+                        }).filter((name) => name && name.trim());
                         if (items.length === 2) {
                             const [sourceType, targetType] = items;
                             return `(${sourceType} AS ${targetType})`;
@@ -4148,20 +4238,20 @@ export class Deparser implements DeparserVisitor {
                     }
                     const objName = this.visit(objList, context);
                     return objName;
-                }).filter((name: string) => name && name.trim()).join(', ');
+                }).filter((name) => name && name.trim()).join(', ');
                 if (objects) {
                     output.push(objects);
                 }
             }
             else if (node.removeType === 'OBJECT_TRIGGER' || node.removeType === 'OBJECT_RULE') {
-                const objects = node.objects.map((objList: any) => {
+                const objects = node.objects.map((objList) => {
                     if (objList && objList.List && objList.List.items) {
-                        const items = objList.List.items.map((item: any) => {
+                        const items = objList.List.items.map((item) => {
                             if (item.String && item.String.sval) {
                                 return QuoteUtils.quote(item.String.sval);
                             }
                             return this.visit(item, context);
-                        }).filter((name: string) => name && name.trim());
+                        }).filter((name) => name && name.trim());
                         if (items.length === 2) {
                             const [tableName, triggerName] = items;
                             return `${triggerName} ON ${tableName}`;
@@ -4174,21 +4264,21 @@ export class Deparser implements DeparserVisitor {
                     }
                     const objName = this.visit(objList, context);
                     return objName;
-                }).filter((name: string) => name && name.trim()).join(', ');
+                }).filter((name) => name && name.trim()).join(', ');
                 if (objects) {
                     output.push(objects);
                 }
             }
             else if (node.removeType === 'OBJECT_OPFAMILY' || node.removeType === 'OBJECT_OPCLASS') {
                 // Handle operator family and operator class objects specially to format name USING access_method correctly
-                const objects = node.objects.map((objList: any) => {
+                const objects = node.objects.map((objList) => {
                     if (objList && objList.List && objList.List.items) {
-                        const items = objList.List.items.map((item: any) => {
+                        const items = objList.List.items.map((item) => {
                             if (item.String && item.String.sval) {
                                 return item.String.sval;
                             }
                             return this.visit(item, context);
-                        }).filter((name: string) => name && name.trim());
+                        }).filter((name) => name && name.trim());
                         if (items.length === 2) {
                             const accessMethod = items[0];
                             const objectName = items[1];
@@ -4204,21 +4294,21 @@ export class Deparser implements DeparserVisitor {
                     }
                     const objName = this.visit(objList, context);
                     return objName;
-                }).filter((name: string) => name && name.trim()).join(', ');
+                }).filter((name) => name && name.trim()).join(', ');
                 if (objects) {
                     output.push(objects);
                 }
             }
             else if (node.removeType === 'OBJECT_TRANSFORM') {
                 // Handle TRANSFORM objects specially to format FOR type_name LANGUAGE language_name correctly
-                const objects = node.objects.map((objList: any) => {
+                const objects = node.objects.map((objList) => {
                     if (objList && objList.List && objList.List.items) {
-                        const items = objList.List.items.map((item: any) => {
+                        const items = objList.List.items.map((item) => {
                             if (item.String && item.String.sval) {
                                 return item.String.sval;
                             }
                             return this.visit(item, context);
-                        }).filter((name: string) => name && name.trim());
+                        }).filter((name) => name && name.trim());
                         if (items.length === 2) {
                             const [typeName, languageName] = items;
                             return `FOR ${typeName} LANGUAGE ${languageName}`;
@@ -4227,30 +4317,30 @@ export class Deparser implements DeparserVisitor {
                     }
                     const objName = this.visit(objList, context);
                     return objName;
-                }).filter((name: string) => name && name.trim()).join(', ');
+                }).filter((name) => name && name.trim()).join(', ');
                 if (objects) {
                     output.push(objects);
                 }
             }
             else {
-                const objects = node.objects.map((objList: any) => {
+                const objects = node.objects.map((objList) => {
                     if (Array.isArray(objList)) {
                         const objName = objList.map(obj => this.visit(obj, context)).filter(name => name && name.trim()).join('.');
                         return objName;
                     }
                     if (objList && objList.List && objList.List.items) {
-                        const items = objList.List.items.map((item: any) => {
+                        const items = objList.List.items.map((item) => {
                             if (item.String && item.String.sval) {
                                 return QuoteUtils.quote(item.String.sval);
                             }
                             return this.visit(item, context);
-                        }).filter((name: string) => name && name.trim());
+                        }).filter((name) => name && name.trim());
                         return items.join('.');
                     }
                     const objContext = context.spawn('DropStmt', { objtype: node.removeType });
                     const objName = this.visit(objList, objContext);
                     return objName;
-                }).filter((name: string) => name && name.trim()).join(', ');
+                }).filter((name) => name && name.trim()).join(', ');
                 if (objects) {
                     output.push(objects);
                 }
@@ -4262,11 +4352,11 @@ export class Deparser implements DeparserVisitor {
         // Only add RESTRICT if it was explicitly specified in the original SQL
         return output.join(' ');
     }
-    TruncateStmt(node: any, context: DeparserContext): string {
-        const output: string[] = ['TRUNCATE'];
+    TruncateStmt(node, context) {
+        const output = ['TRUNCATE'];
         if (node.relations && node.relations.length > 0) {
             const relations = node.relations
-                .map((relation: any) => this.visit(relation, context))
+                .map((relation) => this.visit(relation, context))
                 .join(', ');
             output.push(relations);
         }
@@ -4278,21 +4368,21 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join(' ');
     }
-    ReturnStmt(node: any, context: DeparserContext): string {
-        const output: string[] = ['RETURN'];
+    ReturnStmt(node, context) {
+        const output = ['RETURN'];
         if (node.returnval) {
             const returnValue = this.visit(node.returnval, context);
             output.push(returnValue);
         }
         return output.join(' ');
     }
-    PLAssignStmt(node: any, context: DeparserContext): string {
-        const output: string[] = [];
+    PLAssignStmt(node, context) {
+        const output = [];
         if (node.name) {
             let nameWithIndirection = QuoteUtils.quote(node.name);
             if (node.indirection && node.indirection.length > 0) {
                 const indirectionStr = node.indirection
-                    .map((ind: any) => this.visit(ind, context))
+                    .map((ind) => this.visit(ind, context))
                     .join('');
                 nameWithIndirection += indirectionStr;
             }
@@ -4300,21 +4390,21 @@ export class Deparser implements DeparserVisitor {
         }
         output.push(':=');
         if (node.val) {
-            const valAny = node.val as any;
+            const valAny = node.val;
             if (valAny.targetList) {
                 output.push('SELECT');
                 const targets = this.targetList(valAny.targetList, context);
                 output.push(targets);
             }
             else {
-                const valueStr = this.visit(node.val as any, context);
+                const valueStr = this.visit(node.val, context);
                 output.push(valueStr);
             }
         }
         return output.join(' ');
     }
-    CopyStmt(node: any, context: DeparserContext): string {
-        const output: string[] = ['COPY'];
+    CopyStmt(node, context) {
+        const output = ['COPY'];
         if (node.relation) {
             const relationStr = this.RangeVar(node.relation, context);
             output.push(relationStr);
@@ -4358,8 +4448,8 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join(' ');
     }
-    AlterTableStmt(node: any, context: DeparserContext): string {
-        const output: string[] = ['ALTER'];
+    AlterTableStmt(node, context) {
+        const output = ['ALTER'];
         if (node.objtype) {
             switch (node.objtype) {
                 case 'OBJECT_TABLE':
@@ -4418,8 +4508,8 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join(' ');
     }
-    AlterTableCmd(node: any, context: DeparserContext): string {
-        const output: string[] = [];
+    AlterTableCmd(node, context) {
+        const output = [];
         if (node.subtype) {
             switch (node.subtype) {
                 case 'AT_AddColumn':
@@ -4435,8 +4525,8 @@ export class Deparser implements DeparserVisitor {
                     if (node.def) {
                         const colDefData = this.getNodeData(node.def);
                         if (context.isPretty()) {
-                            const parts: string[] = [];
-                            const indentedParts: string[] = [];
+                            const parts = [];
+                            const indentedParts = [];
                             if (colDefData.colname) {
                                 parts.push(QuoteUtils.quote(colDefData.colname));
                             }
@@ -4473,7 +4563,7 @@ export class Deparser implements DeparserVisitor {
                                     }
                                 });
                             }
-                            if (colDefData.raw_default && !colDefData.constraints?.some((c: any) => {
+                            if (colDefData.raw_default && !colDefData.constraints?.some((c) => {
                                 const constraintStr = this.visit(c, context.spawn('ColumnDef', { isColumnConstraint: true }));
                                 return constraintStr === 'UNIQUE';
                             })) {
@@ -4494,7 +4584,7 @@ export class Deparser implements DeparserVisitor {
                             output.push(result);
                         }
                         else {
-                            const parts: string[] = [];
+                            const parts = [];
                             if (colDefData.colname) {
                                 parts.push(QuoteUtils.quote(colDefData.colname));
                             }
@@ -4953,7 +5043,7 @@ export class Deparser implements DeparserVisitor {
                 case 'AT_AlterConstraint':
                     output.push('ALTER CONSTRAINT');
                     if (node.def && this.getNodeType(node.def) === 'Constraint') {
-                        const constraintData = this.getNodeData(node.def) as any;
+                        const constraintData = this.getNodeData(node.def);
                         if (constraintData.conname) {
                             output.push(QuoteUtils.quote(constraintData.conname));
                             if (constraintData.deferrable !== undefined) {
@@ -5082,8 +5172,8 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join(' ');
     }
-    CreateFunctionStmt(node: any, context: DeparserContext): string {
-        const output: string[] = ['CREATE'];
+    CreateFunctionStmt(node, context) {
+        const output = ['CREATE'];
         if (node.replace) {
             output.push('OR REPLACE');
         }
@@ -5094,14 +5184,14 @@ export class Deparser implements DeparserVisitor {
             output.push('FUNCTION');
         }
         if (node.funcname && node.funcname.length > 0) {
-            const funcName = node.funcname.map((name: any) => this.visit(name, context)).join('.');
+            const funcName = node.funcname.map((name) => this.visit(name, context)).join('.');
             if (node.parameters && node.parameters.length > 0) {
                 const params = node.parameters
-                    .filter((param: any) => {
+                    .filter((param) => {
                     const paramData = this.getNodeData(param);
                     return paramData.mode !== 'FUNC_PARAM_TABLE';
                 })
-                    .map((param: any) => this.visit(param, context));
+                    .map((param) => this.visit(param, context));
                 if (params.length > 0) {
                     output.push(funcName + '(' + params.join(', ') + ')');
                 }
@@ -5113,28 +5203,28 @@ export class Deparser implements DeparserVisitor {
                 output.push(funcName + '()');
             }
         }
-        const hasTableParams = node.parameters && node.parameters.some((param: any) => {
+        const hasTableParams = node.parameters && node.parameters.some((param) => {
             const paramData = this.getNodeData(param);
             return paramData.mode === 'FUNC_PARAM_TABLE';
         });
         if (hasTableParams) {
             output.push('RETURNS TABLE (');
             const tableParams = node.parameters
-                .filter((param: any) => {
+                .filter((param) => {
                 const paramData = this.getNodeData(param);
                 return paramData.mode === 'FUNC_PARAM_TABLE';
             })
-                .map((param: any) => this.visit(param, context));
+                .map((param) => this.visit(param, context));
             output.push(tableParams.join(', '));
             output.push(')');
         }
         else if (node.returnType) {
             output.push('RETURNS');
-            output.push(this.TypeName(node.returnType as any, context));
+            output.push(this.TypeName(node.returnType, context));
         }
         if (node.options && node.options.length > 0) {
             const funcContext = context.spawn('CreateFunctionStmt');
-            const options = node.options.map((opt: any) => this.visit(opt, funcContext));
+            const options = node.options.map((opt) => this.visit(opt, funcContext));
             output.push(...options);
         }
         if (node.sql_body) {
@@ -5180,8 +5270,8 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join(' ');
     }
-    FunctionParameter(node: any, context: DeparserContext): string {
-        const output: string[] = [];
+    FunctionParameter(node, context) {
+        const output = [];
         if (node.mode) {
             switch (node.mode) {
                 case 'FUNC_PARAM_IN':
@@ -5202,7 +5292,7 @@ export class Deparser implements DeparserVisitor {
             output.push(QuoteUtils.quote(node.name));
         }
         if (node.argType) {
-            output.push(this.TypeName(node.argType as any, context));
+            output.push(this.TypeName(node.argType, context));
         }
         if (node.defexpr) {
             output.push('DEFAULT');
@@ -5210,8 +5300,8 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join(' ');
     }
-    CreateEnumStmt(node: any, context: DeparserContext): string {
-        const output: string[] = ['CREATE', 'TYPE'];
+    CreateEnumStmt(node, context) {
+        const output = ['CREATE', 'TYPE'];
         if (node.typeName) {
             const typeName = ListUtils.unwrapList(node.typeName)
                 .map(name => this.visit(name, context))
@@ -5231,8 +5321,8 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join(' ');
     }
-    CreateDomainStmt(node: any, context: DeparserContext): string {
-        const output: string[] = ['CREATE', 'DOMAIN'];
+    CreateDomainStmt(node, context) {
+        const output = ['CREATE', 'DOMAIN'];
         if (node.domainname) {
             const domainName = ListUtils.unwrapList(node.domainname)
                 .map(name => this.visit(name, context))
@@ -5256,8 +5346,8 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join(' ');
     }
-    CreateRoleStmt(node: any, context: DeparserContext): string {
-        const output: string[] = ['CREATE'];
+    CreateRoleStmt(node, context) {
+        const output = ['CREATE'];
         if (node.stmt_type === 'ROLESTMT_ROLE') {
             output.push('ROLE');
         }
@@ -5285,7 +5375,7 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join(' ');
     }
-    DefElem(node: any, context: DeparserContext): string {
+    DefElem(node, context) {
         if (!node.defname) {
             return '';
         }
@@ -5560,10 +5650,10 @@ export class Deparser implements DeparserVisitor {
             if (context.parentNodeTypes.includes('CreateFunctionStmt') || context.parentNodeTypes.includes('AlterFunctionStmt')) {
                 if (node.defname === 'as') {
                     // Handle List type (multiple function body strings)
-                    if (node.arg && (node.arg as any).List) {
-                        const listNode = (node.arg as any).List;
+                    if (node.arg && node.arg.List) {
+                        const listNode = node.arg.List;
                         const listItems = listNode.items || [];
-                        const bodyParts = listItems.map((item: any) => {
+                        const bodyParts = listItems.map((item) => {
                             if (item.String) {
                                 return item.String.sval;
                             }
@@ -5575,7 +5665,7 @@ export class Deparser implements DeparserVisitor {
                             return `AS ${delimiter}${body}${delimiter}`;
                         }
                         else {
-                            return `AS ${bodyParts.map((part: string) => {
+                            return `AS ${bodyParts.map((part) => {
                                 const delimiter = this.getFunctionDelimiter(part);
                                 return `${delimiter}${part}${delimiter}`;
                             }).join(', ')}`;
@@ -5634,11 +5724,15 @@ export class Deparser implements DeparserVisitor {
             if (context.parentNodeTypes.includes('CreateExtensionStmt') || context.parentNodeTypes.includes('AlterExtensionStmt') || context.parentNodeTypes.includes('CreateFdwStmt') || context.parentNodeTypes.includes('AlterFdwStmt')) {
                 // AlterExtensionStmt specific cases
                 if (context.parentNodeTypes.includes('AlterExtensionStmt')) {
-                    if (node.defname === 'to') {
-                        return `TO ${argValue}`;
+                    if (node.defname === 'new_version') {
+                        // argValue is unquoted due to DefElem context, so we need to quote it
+                        const quotedValue = typeof argValue === 'string' && !argValue.startsWith("'")
+                            ? `'${argValue}'`
+                            : argValue;
+                        return `UPDATE TO ${quotedValue}`;
                     }
                     if (node.defname === 'schema') {
-                        return `SCHEMA ${argValue}`;
+                        return `SET SCHEMA ${argValue}`;
                     }
                 }
                 // CreateFdwStmt specific cases
@@ -5818,8 +5912,8 @@ export class Deparser implements DeparserVisitor {
         }
         return node.defname.toUpperCase();
     }
-    CreateTableSpaceStmt(node: any, context: DeparserContext): string {
-        const output: string[] = ['CREATE', 'TABLESPACE'];
+    CreateTableSpaceStmt(node, context) {
+        const output = ['CREATE', 'TABLESPACE'];
         if (node.tablespacename) {
             output.push(node.tablespacename);
         }
@@ -5841,8 +5935,8 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join(' ');
     }
-    DropTableSpaceStmt(node: any, context: DeparserContext): string {
-        const output: string[] = ['DROP', 'TABLESPACE'];
+    DropTableSpaceStmt(node, context) {
+        const output = ['DROP', 'TABLESPACE'];
         if (node.missing_ok) {
             output.push('IF', 'EXISTS');
         }
@@ -5851,8 +5945,8 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join(' ');
     }
-    AlterTableSpaceOptionsStmt(node: any, context: DeparserContext): string {
-        const output: string[] = ['ALTER', 'TABLESPACE'];
+    AlterTableSpaceOptionsStmt(node, context) {
+        const output = ['ALTER', 'TABLESPACE'];
         if (node.tablespacename) {
             output.push(node.tablespacename);
         }
@@ -5871,8 +5965,8 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join(' ');
     }
-    CreateExtensionStmt(node: any, context: DeparserContext): string {
-        const output: string[] = ['CREATE', 'EXTENSION'];
+    CreateExtensionStmt(node, context) {
+        const output = ['CREATE', 'EXTENSION'];
         if (node.if_not_exists) {
             output.push('IF', 'NOT', 'EXISTS');
         }
@@ -5888,8 +5982,8 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join(' ');
     }
-    AlterExtensionStmt(node: any, context: DeparserContext): string {
-        const output: string[] = ['ALTER', 'EXTENSION'];
+    AlterExtensionStmt(node, context) {
+        const output = ['ALTER', 'EXTENSION'];
         if (node.extname) {
             output.push(this.quoteIfNeeded(node.extname));
         }
@@ -5902,8 +5996,36 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join(' ');
     }
-    CreateFdwStmt(node: any, context: DeparserContext): string {
-        const output: string[] = ['CREATE', 'FOREIGN', 'DATA', 'WRAPPER'];
+    AlterExtensionContentsStmt(node, context) {
+        const output = ['ALTER', 'EXTENSION'];
+        if (node.extname) {
+            output.push(this.quoteIfNeeded(node.extname));
+        }
+        // Handle action: 1 = ADD, -1 = DROP
+        if (node.action === 1) {
+            output.push('ADD');
+        }
+        else if (node.action === -1) {
+            output.push('DROP');
+        }
+        // Add object type keyword
+        if (node.objtype) {
+            try {
+                output.push(this.getObjectTypeKeyword(node.objtype));
+            }
+            catch {
+                // Fallback to the raw objtype if not supported
+                output.push(node.objtype.toString());
+            }
+        }
+        // Add the object itself
+        if (node.object) {
+            output.push(this.visit(node.object, context));
+        }
+        return output.join(' ');
+    }
+    CreateFdwStmt(node, context) {
+        const output = ['CREATE', 'FOREIGN', 'DATA', 'WRAPPER'];
         if (node.fdwname) {
             output.push(node.fdwname);
         }
@@ -5924,8 +6046,8 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join(' ');
     }
-    SetOperationStmt(node: any, context: DeparserContext): string {
-        const output: string[] = [];
+    SetOperationStmt(node, context) {
+        const output = [];
         if (node.larg) {
             output.push(this.visit(node.larg, context));
         }
@@ -5949,8 +6071,8 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join(' ');
     }
-    ReplicaIdentityStmt(node: any, context: DeparserContext): string {
-        const output: string[] = [];
+    ReplicaIdentityStmt(node, context) {
+        const output = [];
         if (node.identity_type) {
             switch (node.identity_type) {
                 case 'd':
@@ -5978,8 +6100,8 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join(' ');
     }
-    AlterCollationStmt(node: any, context: DeparserContext): string {
-        const output: string[] = ['ALTER', 'COLLATION'];
+    AlterCollationStmt(node, context) {
+        const output = ['ALTER', 'COLLATION'];
         if (node.collname && node.collname.length > 0) {
             const collationName = ListUtils.unwrapList(node.collname)
                 .map(name => this.visit(name, context))
@@ -5989,8 +6111,8 @@ export class Deparser implements DeparserVisitor {
         output.push('REFRESH', 'VERSION');
         return output.join(' ');
     }
-    AlterDomainStmt(node: any, context: DeparserContext): string {
-        const output: string[] = ['ALTER', 'DOMAIN'];
+    AlterDomainStmt(node, context) {
+        const output = ['ALTER', 'DOMAIN'];
         if (node.typeName && node.typeName.length > 0) {
             const domainName = ListUtils.unwrapList(node.typeName)
                 .map(name => this.visit(name, context))
@@ -6087,8 +6209,8 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join(' ');
     }
-    PrepareStmt(node: any, context: DeparserContext): string {
-        const output: string[] = ['PREPARE'];
+    PrepareStmt(node, context) {
+        const output = ['PREPARE'];
         if (node.name) {
             output.push(node.name);
         }
@@ -6104,8 +6226,8 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join(' ');
     }
-    ExecuteStmt(node: any, context: DeparserContext): string {
-        const output: string[] = ['EXECUTE'];
+    ExecuteStmt(node, context) {
+        const output = ['EXECUTE'];
         if (node.name) {
             output.push(node.name);
         }
@@ -6117,8 +6239,8 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join(' ');
     }
-    DeallocateStmt(node: any, context: DeparserContext): string {
-        const output: string[] = ['DEALLOCATE'];
+    DeallocateStmt(node, context) {
+        const output = ['DEALLOCATE'];
         if (node.isall) {
             output.push('ALL');
         }
@@ -6127,8 +6249,8 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join(' ');
     }
-    NotifyStmt(node: any, context: DeparserContext): string {
-        const output: string[] = ['NOTIFY'];
+    NotifyStmt(node, context) {
+        const output = ['NOTIFY'];
         if (node.conditionname) {
             output.push(node.conditionname);
         }
@@ -6138,15 +6260,15 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join(' ');
     }
-    ListenStmt(node: any, context: DeparserContext): string {
-        const output: string[] = ['LISTEN'];
+    ListenStmt(node, context) {
+        const output = ['LISTEN'];
         if (node.conditionname) {
             output.push(node.conditionname);
         }
         return output.join(' ');
     }
-    UnlistenStmt(node: any, context: DeparserContext): string {
-        const output: string[] = ['UNLISTEN'];
+    UnlistenStmt(node, context) {
+        const output = ['UNLISTEN'];
         if (node.conditionname) {
             output.push(node.conditionname);
         }
@@ -6155,16 +6277,16 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join(' ');
     }
-    CheckPointStmt(node: any, context: DeparserContext): string {
+    CheckPointStmt(node, context) {
         return 'CHECKPOINT';
     }
-    LoadStmt(node: any, context: DeparserContext): string {
+    LoadStmt(node, context) {
         if (!node.filename) {
             throw new Error('LoadStmt requires filename');
         }
         return `LOAD '${node.filename}'`;
     }
-    DiscardStmt(node: any, context: DeparserContext): string {
+    DiscardStmt(node, context) {
         switch (node.target) {
             case 'DISCARD_ALL':
                 return 'DISCARD ALL';
@@ -6178,8 +6300,8 @@ export class Deparser implements DeparserVisitor {
                 throw new Error(`Unsupported DiscardStmt target: ${node.target}`);
         }
     }
-    CommentStmt(node: any, context: DeparserContext): string {
-        const output: string[] = ['COMMENT ON'];
+    CommentStmt(node, context) {
+        const output = ['COMMENT ON'];
         if (node.objtype) {
             switch (node.objtype) {
                 case 'OBJECT_TABLE':
@@ -6310,16 +6432,16 @@ export class Deparser implements DeparserVisitor {
                     else if (node.objtype === 'OBJECT_OPERATOR') {
                         // Handle OPERATOR syntax: COMMENT ON OPERATOR -(NONE, integer) IS 'comment'
                         // For operators, we need to handle ObjectWithArgs structure
-                        if (node.object && (node.object as any).ObjectWithArgs) {
-                            const objWithArgs = (node.object as any).ObjectWithArgs;
+                        if (node.object && node.object.ObjectWithArgs) {
+                            const objWithArgs = node.object.ObjectWithArgs;
                             let operatorName = objWithArgs.objname && objWithArgs.objname[0] && objWithArgs.objname[0].String
                                 ? objWithArgs.objname[0].String.sval : 'unknown';
                             if (operatorName.startsWith('"') && operatorName.endsWith('"')) {
                                 operatorName = operatorName.slice(1, -1);
                             }
-                            const args: string[] = [];
+                            const args = [];
                             if (objWithArgs.objargs) {
-                                objWithArgs.objargs.forEach((arg: any) => {
+                                objWithArgs.objargs.forEach((arg) => {
                                     if (!arg || Object.keys(arg).length === 0) {
                                         args.push('NONE');
                                     }
@@ -6379,18 +6501,18 @@ export class Deparser implements DeparserVisitor {
                     }
                 }
             }
-            else if (node.objtype === 'OBJECT_OPERATOR' && node.object && (node.object as any).ObjectWithArgs) {
+            else if (node.objtype === 'OBJECT_OPERATOR' && node.object && node.object.ObjectWithArgs) {
                 // Handle direct ObjectWithArgs for OPERATOR syntax: COMMENT ON OPERATOR -(NONE, integer) IS 'comment'
-                const objWithArgs = (node.object as any).ObjectWithArgs;
+                const objWithArgs = node.object.ObjectWithArgs;
                 let operatorName = objWithArgs.objname && objWithArgs.objname[0] && objWithArgs.objname[0].String
                     ? objWithArgs.objname[0].String.sval : 'unknown';
                 // Remove quotes from operator name if present
                 if (operatorName.startsWith('"') && operatorName.endsWith('"')) {
                     operatorName = operatorName.slice(1, -1);
                 }
-                const args: string[] = [];
+                const args = [];
                 if (objWithArgs.objargs) {
-                    objWithArgs.objargs.forEach((arg: any) => {
+                    objWithArgs.objargs.forEach((arg) => {
                         if (!arg || Object.keys(arg).length === 0) {
                             args.push('NONE');
                         }
@@ -6419,8 +6541,8 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join(' ');
     }
-    LockStmt(node: any, context: DeparserContext): string {
-        const output: string[] = ['LOCK', 'TABLE'];
+    LockStmt(node, context) {
+        const output = ['LOCK', 'TABLE'];
         if (node.relations && node.relations.length > 0) {
             const relations = ListUtils.unwrapList(node.relations)
                 .map(rel => this.visit(rel, context))
@@ -6448,8 +6570,8 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join(' ');
     }
-    CreatePolicyStmt(node: any, context: DeparserContext): string {
-        const output: string[] = [];
+    CreatePolicyStmt(node, context) {
+        const output = [];
         const initialParts = ['CREATE', 'POLICY'];
         if (node.policy_name) {
             initialParts.push(QuoteUtils.quote(node.policy_name));
@@ -6526,8 +6648,8 @@ export class Deparser implements DeparserVisitor {
         }
         return context.isPretty() ? output.join('') : output.join(' ');
     }
-    AlterPolicyStmt(node: any, context: DeparserContext): string {
-        const output: string[] = ['ALTER', 'POLICY'];
+    AlterPolicyStmt(node, context) {
+        const output = ['ALTER', 'POLICY'];
         if (node.policy_name) {
             output.push(QuoteUtils.quote(node.policy_name));
         }
@@ -6550,8 +6672,8 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join(' ');
     }
-    CreateUserMappingStmt(node: any, context: DeparserContext): string {
-        const output: string[] = ['CREATE'];
+    CreateUserMappingStmt(node, context) {
+        const output = ['CREATE'];
         if (node.if_not_exists) {
             output.push('IF', 'NOT', 'EXISTS');
         }
@@ -6575,8 +6697,8 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join(' ');
     }
-    CreateStatsStmt(node: any, context: DeparserContext): string {
-        const output: string[] = ['CREATE'];
+    CreateStatsStmt(node, context) {
+        const output = ['CREATE'];
         if (node.if_not_exists) {
             output.push('IF', 'NOT', 'EXISTS');
         }
@@ -6601,7 +6723,7 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join(' ');
     }
-    StatsElem(node: any, context: DeparserContext): string {
+    StatsElem(node, context) {
         if (node.name) {
             return this.quoteIfNeeded(node.name);
         }
@@ -6610,8 +6732,8 @@ export class Deparser implements DeparserVisitor {
         }
         return '';
     }
-    CreatePublicationStmt(node: any, context: DeparserContext): string {
-        const output: string[] = ['CREATE', 'PUBLICATION'];
+    CreatePublicationStmt(node, context) {
+        const output = ['CREATE', 'PUBLICATION'];
         if (node.pubname) {
             output.push(`"${node.pubname}"`);
         }
@@ -6630,8 +6752,8 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join(' ');
     }
-    CreateSubscriptionStmt(node: any, context: DeparserContext): string {
-        const output: string[] = ['CREATE', 'SUBSCRIPTION'];
+    CreateSubscriptionStmt(node, context) {
+        const output = ['CREATE', 'SUBSCRIPTION'];
         if (node.subname) {
             output.push(`"${node.subname}"`);
         }
@@ -6651,8 +6773,8 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join(' ');
     }
-    AlterPublicationStmt(node: any, context: DeparserContext): string {
-        const output: string[] = ['ALTER', 'PUBLICATION'];
+    AlterPublicationStmt(node, context) {
+        const output = ['ALTER', 'PUBLICATION'];
         if (node.pubname) {
             output.push(`"${node.pubname}"`);
         }
@@ -6686,8 +6808,8 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join(' ');
     }
-    AlterSubscriptionStmt(node: any, context: DeparserContext): string {
-        const output: string[] = ['ALTER', 'SUBSCRIPTION'];
+    AlterSubscriptionStmt(node, context) {
+        const output = ['ALTER', 'SUBSCRIPTION'];
         if (node.subname) {
             output.push(`"${node.subname}"`);
         }
@@ -6729,8 +6851,8 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join(' ');
     }
-    DropSubscriptionStmt(node: any, context: DeparserContext): string {
-        const output: string[] = ['DROP', 'SUBSCRIPTION'];
+    DropSubscriptionStmt(node, context) {
+        const output = ['DROP', 'SUBSCRIPTION'];
         if (node.missing_ok) {
             output.push('IF EXISTS');
         }
@@ -6749,16 +6871,16 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join(' ');
     }
-    DoStmt(node: any, context: DeparserContext): string {
-        const output: string[] = ['DO'];
+    DoStmt(node, context) {
+        const output = ['DO'];
         if (node.args && node.args.length > 0) {
             const doContext = context.spawn('DoStmt');
             const args = ListUtils.unwrapList(node.args);
-            const processedArgs: string[] = [];
+            const processedArgs = [];
             for (const arg of args) {
                 const nodeType = this.getNodeType(arg);
                 if (nodeType === 'DefElem') {
-                    const defElem = this.getNodeData(arg) as any;
+                    const defElem = this.getNodeData(arg);
                     if (defElem.defname === 'language') {
                         const langValue = this.visit(defElem.arg, doContext);
                         processedArgs.push(`LANGUAGE ${langValue}`);
@@ -6767,7 +6889,7 @@ export class Deparser implements DeparserVisitor {
                         // Handle code block with configurable delimiter
                         const argNodeType = this.getNodeType(defElem.arg);
                         if (argNodeType === 'String') {
-                            const stringNode = this.getNodeData(defElem.arg) as any;
+                            const stringNode = this.getNodeData(defElem.arg);
                             const delimiter = this.getFunctionDelimiter(stringNode.sval);
                             processedArgs.push(`${delimiter}${stringNode.sval}${delimiter}`);
                         }
@@ -6781,7 +6903,7 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join(' ');
     }
-    private generateUniqueDollarTag(content: string): string {
+    generateUniqueDollarTag(content) {
         // Check if content contains nested dollar quotes
         const dollarQuotePattern = /\$[a-zA-Z0-9_]*\$/g;
         const matches = content.match(dollarQuotePattern) || [];
@@ -6801,7 +6923,7 @@ export class Deparser implements DeparserVisitor {
         }
         return '$$';
     }
-    InlineCodeBlock(node: any, context: DeparserContext): string {
+    InlineCodeBlock(node, context) {
         if (node.source_text) {
             const delimiter = this.getFunctionDelimiter(node.source_text);
             return `${delimiter}${node.source_text}${delimiter}`;
@@ -6809,14 +6931,14 @@ export class Deparser implements DeparserVisitor {
         const delimiter = this.options.functionDelimiter || '$$';
         return `${delimiter}${delimiter}`;
     }
-    CallContext(node: any, context: DeparserContext): string {
+    CallContext(node, context) {
         if (node.atomic !== undefined) {
             return node.atomic ? 'ATOMIC' : 'NOT ATOMIC';
         }
         return '';
     }
-    ConstraintsSetStmt(node: any, context: DeparserContext): string {
-        const output: string[] = ['SET', 'CONSTRAINTS'];
+    ConstraintsSetStmt(node, context) {
+        const output = ['SET', 'CONSTRAINTS'];
         if (node.constraints && node.constraints.length > 0) {
             const constraints = ListUtils.unwrapList(node.constraints).map(constraint => this.visit(constraint, context));
             output.push(constraints.join(', '));
@@ -6827,8 +6949,8 @@ export class Deparser implements DeparserVisitor {
         output.push(node.deferred ? 'DEFERRED' : 'IMMEDIATE');
         return output.join(' ');
     }
-    AlterSystemStmt(node: any, context: DeparserContext): string {
-        const output: string[] = ['ALTER', 'SYSTEM'];
+    AlterSystemStmt(node, context) {
+        const output = ['ALTER', 'SYSTEM'];
         if (node.setstmt) {
             const setStmt = this.VariableSetStmt(node.setstmt, context);
             const setStmtWithoutPrefix = setStmt.replace(/^SET\s+/, '');
@@ -6836,8 +6958,8 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join(' ');
     }
-    VacuumRelation(node: any, context: DeparserContext): string {
-        const output: string[] = [];
+    VacuumRelation(node, context) {
+        const output = [];
         if (node.relation) {
             output.push(this.RangeVar(node.relation, context));
         }
@@ -6849,8 +6971,8 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join(' ');
     }
-    DropOwnedStmt(node: any, context: DeparserContext): string {
-        const output: string[] = ['DROP', 'OWNED', 'BY'];
+    DropOwnedStmt(node, context) {
+        const output = ['DROP', 'OWNED', 'BY'];
         if (node.roles && node.roles.length > 0) {
             const roles = ListUtils.unwrapList(node.roles).map(role => this.visit(role, context));
             output.push(roles.join(', '));
@@ -6867,8 +6989,8 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join(' ');
     }
-    ReassignOwnedStmt(node: any, context: DeparserContext): string {
-        const output: string[] = ['REASSIGN', 'OWNED', 'BY'];
+    ReassignOwnedStmt(node, context) {
+        const output = ['REASSIGN', 'OWNED', 'BY'];
         if (node.roles && node.roles.length > 0) {
             const roles = ListUtils.unwrapList(node.roles).map(role => this.visit(role, context));
             output.push(roles.join(', '));
@@ -6879,8 +7001,8 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join(' ');
     }
-    AlterTSDictionaryStmt(node: any, context: DeparserContext): string {
-        const output: string[] = ['ALTER', 'TEXT', 'SEARCH', 'DICTIONARY'];
+    AlterTSDictionaryStmt(node, context) {
+        const output = ['ALTER', 'TEXT', 'SEARCH', 'DICTIONARY'];
         if (node.dictname && node.dictname.length > 0) {
             const dictName = ListUtils.unwrapList(node.dictname).map(name => this.visit(name, context));
             output.push(dictName.join('.'));
@@ -6893,8 +7015,8 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join(' ');
     }
-    AlterTSConfigurationStmt(node: any, context: DeparserContext): string {
-        const output: string[] = ['ALTER', 'TEXT', 'SEARCH', 'CONFIGURATION'];
+    AlterTSConfigurationStmt(node, context) {
+        const output = ['ALTER', 'TEXT', 'SEARCH', 'CONFIGURATION'];
         if (node.cfgname && node.cfgname.length > 0) {
             const cfgName = ListUtils.unwrapList(node.cfgname).map(name => this.visit(name, context));
             output.push(cfgName.join('.'));
@@ -6977,8 +7099,8 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join(' ');
     }
-    ClosePortalStmt(node: any, context: DeparserContext): string {
-        const output: string[] = ['CLOSE'];
+    ClosePortalStmt(node, context) {
+        const output = ['CLOSE'];
         if (node.portalname) {
             output.push(QuoteUtils.quote(node.portalname));
         }
@@ -6987,10 +7109,10 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join(' ');
     }
-    FetchStmt(node: any, context: DeparserContext): string {
-        const output: string[] = [node.ismove ? 'MOVE' : 'FETCH'];
+    FetchStmt(node, context) {
+        const output = [node.ismove ? 'MOVE' : 'FETCH'];
         // Check if howMany represents "ALL" (PostgreSQL uses LONG_MAX as sentinel)
-        const isAll = (node.howMany as any) === 9223372036854776000;
+        const isAll = node.howMany === 9223372036854776000;
         // Handle direction first, then check for ALL within each direction
         if (node.direction) {
             switch (node.direction) {
@@ -7042,8 +7164,8 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join(' ');
     }
-    AlterStatsStmt(node: any, context: DeparserContext): string {
-        const output: string[] = ['ALTER', 'STATISTICS'];
+    AlterStatsStmt(node, context) {
+        const output = ['ALTER', 'STATISTICS'];
         if (node.defnames && node.defnames.length > 0) {
             const names = ListUtils.unwrapList(node.defnames).map(name => this.visit(name, context));
             output.push(names.join('.'));
@@ -7054,7 +7176,7 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join(' ');
     }
-    ObjectWithArgs(node: any, context: DeparserContext): string {
+    ObjectWithArgs(node, context) {
         let result = '';
         if (node.objname && node.objname.length > 0) {
             const objContext = context.spawn('ObjectWithArgs');
@@ -7092,8 +7214,8 @@ export class Deparser implements DeparserVisitor {
         }
         return result;
     }
-    AlterOperatorStmt(node: any, context: DeparserContext): string {
-        const output: string[] = ['ALTER', 'OPERATOR'];
+    AlterOperatorStmt(node, context) {
+        const output = ['ALTER', 'OPERATOR'];
         if (node.opername) {
             output.push(this.ObjectWithArgs(node.opername, context));
         }
@@ -7105,8 +7227,8 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join(' ');
     }
-    AlterFdwStmt(node: any, context: DeparserContext): string {
-        const output: string[] = ['ALTER', 'FOREIGN', 'DATA', 'WRAPPER'];
+    AlterFdwStmt(node, context) {
+        const output = ['ALTER', 'FOREIGN', 'DATA', 'WRAPPER'];
         if (node.fdwname) {
             output.push(QuoteUtils.quote(node.fdwname));
         }
@@ -7123,8 +7245,8 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join(' ');
     }
-    CreateForeignServerStmt(node: any, context: DeparserContext): string {
-        const output: string[] = ['CREATE', 'SERVER'];
+    CreateForeignServerStmt(node, context) {
+        const output = ['CREATE', 'SERVER'];
         if (node.if_not_exists) {
             output.push('IF', 'NOT', 'EXISTS');
         }
@@ -7150,8 +7272,8 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join(' ');
     }
-    AlterForeignServerStmt(node: any, context: DeparserContext): string {
-        const output: string[] = ['ALTER', 'SERVER'];
+    AlterForeignServerStmt(node, context) {
+        const output = ['ALTER', 'SERVER'];
         if (node.servername) {
             output.push(QuoteUtils.quote(node.servername));
         }
@@ -7168,8 +7290,8 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join(' ');
     }
-    AlterUserMappingStmt(node: any, context: DeparserContext): string {
-        const output: string[] = ['ALTER', 'USER', 'MAPPING', 'FOR'];
+    AlterUserMappingStmt(node, context) {
+        const output = ['ALTER', 'USER', 'MAPPING', 'FOR'];
         if (node.user) {
             output.push(this.RoleSpec(node.user, context));
         }
@@ -7188,8 +7310,8 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join(' ');
     }
-    DropUserMappingStmt(node: any, context: DeparserContext): string {
-        const output: string[] = ['DROP', 'USER', 'MAPPING'];
+    DropUserMappingStmt(node, context) {
+        const output = ['DROP', 'USER', 'MAPPING'];
         if (node.missing_ok) {
             output.push('IF', 'EXISTS');
         }
@@ -7206,8 +7328,8 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join(' ');
     }
-    ImportForeignSchemaStmt(node: any, context: DeparserContext): string {
-        const output: string[] = ['IMPORT', 'FOREIGN', 'SCHEMA'];
+    ImportForeignSchemaStmt(node, context) {
+        const output = ['IMPORT', 'FOREIGN', 'SCHEMA'];
         if (node.remote_schema) {
             output.push(QuoteUtils.quote(node.remote_schema));
         }
@@ -7248,8 +7370,8 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join(' ');
     }
-    ClusterStmt(node: any, context: DeparserContext): string {
-        const output: string[] = ['CLUSTER'];
+    ClusterStmt(node, context) {
+        const output = ['CLUSTER'];
         if (node.relation) {
             output.push(this.RangeVar(node.relation, context));
             if (node.indexname) {
@@ -7262,8 +7384,8 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join(' ');
     }
-    VacuumStmt(node: any, context: DeparserContext): string {
-        const output: string[] = [node.is_vacuumcmd ? 'VACUUM' : 'ANALYZE'];
+    VacuumStmt(node, context) {
+        const output = [node.is_vacuumcmd ? 'VACUUM' : 'ANALYZE'];
         if (node.options && node.options.length > 0) {
             const options = ListUtils.unwrapList(node.options).map(option => this.visit(option, context));
             output.push(`(${options.join(', ')})`);
@@ -7274,8 +7396,8 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join(' ');
     }
-    ExplainStmt(node: any, context: DeparserContext): string {
-        const output: string[] = ['EXPLAIN'];
+    ExplainStmt(node, context) {
+        const output = ['EXPLAIN'];
         if (node.options && node.options.length > 0) {
             const explainContext = context.spawn('ExplainStmt');
             const options = ListUtils.unwrapList(node.options).map(option => this.visit(option, explainContext));
@@ -7286,8 +7408,8 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join(' ');
     }
-    ReindexStmt(node: any, context: DeparserContext): string {
-        const output: string[] = ['REINDEX'];
+    ReindexStmt(node, context) {
+        const output = ['REINDEX'];
         if (node.params && node.params.length > 0) {
             const params = ListUtils.unwrapList(node.params).map(param => this.visit(param, context));
             output.push(`(${params.join(', ')})`);
@@ -7321,12 +7443,12 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join(' ');
     }
-    CallStmt(node: any, context: DeparserContext): string {
-        const output: string[] = ['CALL'];
+    CallStmt(node, context) {
+        const output = ['CALL'];
         if (node.funccall) {
-            const funcCall = node.funccall as any;
+            const funcCall = node.funccall;
             if (funcCall.funcname && funcCall.funcname.length > 0) {
-                const funcNameParts = funcCall.funcname.map((nameNode: any) => {
+                const funcNameParts = funcCall.funcname.map((nameNode) => {
                     if (nameNode.String) {
                         return nameNode.String.sval;
                     }
@@ -7335,7 +7457,7 @@ export class Deparser implements DeparserVisitor {
                 const funcName = funcNameParts.join('.');
                 let argsStr = '';
                 if (funcCall.args && funcCall.args.length > 0) {
-                    const argStrs = funcCall.args.map((arg: any) => this.visit(arg, context));
+                    const argStrs = funcCall.args.map((arg) => this.visit(arg, context));
                     argsStr = `(${argStrs.join(', ')})`;
                 }
                 else {
@@ -7352,8 +7474,8 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join(' ');
     }
-    CreatedbStmt(node: any, context: DeparserContext): string {
-        const output: string[] = ['CREATE DATABASE'];
+    CreatedbStmt(node, context) {
+        const output = ['CREATE DATABASE'];
         if (!node.dbname) {
             throw new Error('CreatedbStmt requires dbname');
         }
@@ -7366,8 +7488,8 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join(' ');
     }
-    DropdbStmt(node: any, context: DeparserContext): string {
-        const output: string[] = ['DROP DATABASE'];
+    DropdbStmt(node, context) {
+        const output = ['DROP DATABASE'];
         if (node.missing_ok) {
             output.push('IF EXISTS');
         }
@@ -7383,8 +7505,8 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join(' ');
     }
-    RenameStmt(node: any, context: DeparserContext): string {
-        const output: string[] = ['ALTER'];
+    RenameStmt(node, context) {
+        const output = ['ALTER'];
         if (!node.renameType) {
             throw new Error('RenameStmt requires renameType');
         }
@@ -7544,8 +7666,8 @@ export class Deparser implements DeparserVisitor {
         }
         else if (node.object) {
             // Handle operator family and operator class objects specially to format name USING access_method correctly
-            if ((node.renameType === 'OBJECT_OPFAMILY' || node.renameType === 'OBJECT_OPCLASS') && (node.object as any).List) {
-                const items = ListUtils.unwrapList(node.object as any);
+            if ((node.renameType === 'OBJECT_OPFAMILY' || node.renameType === 'OBJECT_OPCLASS') && node.object.List) {
+                const items = ListUtils.unwrapList(node.object);
                 if (items.length === 2) {
                     const accessMethod = items[0].String?.sval || '';
                     const objectName = items[1].String?.sval || '';
@@ -7555,9 +7677,9 @@ export class Deparser implements DeparserVisitor {
                     output.push(this.visit(node.object, context));
                 }
             }
-            else if (node.renameType === 'OBJECT_SCHEMA' && (node.object as any).List) {
+            else if (node.renameType === 'OBJECT_SCHEMA' && node.object.List) {
                 // Handle schema names - extract from List structure
-                const items = ListUtils.unwrapList(node.object as any);
+                const items = ListUtils.unwrapList(node.object);
                 if (items.length > 0 && items[0].String) {
                     output.push(this.quoteIfNeeded(items[0].String.sval));
                 }
@@ -7603,88 +7725,19 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join(' ');
     }
-    AlterOwnerStmt(node: any, context: DeparserContext): string {
-        const output: string[] = ['ALTER'];
+    AlterOwnerStmt(node, context) {
+        const output = ['ALTER'];
         if (!node.objectType) {
             throw new Error('AlterOwnerStmt requires objectType');
         }
-        switch (node.objectType) {
-            case 'OBJECT_TABLE':
-                output.push('TABLE');
-                break;
-            case 'OBJECT_VIEW':
-                output.push('VIEW');
-                break;
-            case 'OBJECT_INDEX':
-                output.push('INDEX');
-                break;
-            case 'OBJECT_SEQUENCE':
-                output.push('SEQUENCE');
-                break;
-            case 'OBJECT_FUNCTION':
-                output.push('FUNCTION');
-                break;
-            case 'OBJECT_PROCEDURE':
-                output.push('PROCEDURE');
-                break;
-            case 'OBJECT_SCHEMA':
-                output.push('SCHEMA');
-                break;
-            case 'OBJECT_DATABASE':
-                output.push('DATABASE');
-                break;
-            case 'OBJECT_DOMAIN':
-                output.push('DOMAIN');
-                break;
-            case 'OBJECT_AGGREGATE':
-                output.push('AGGREGATE');
-                break;
-            case 'OBJECT_CONVERSION':
-                output.push('CONVERSION');
-                break;
-            case 'OBJECT_LANGUAGE':
-                output.push('LANGUAGE');
-                break;
-            case 'OBJECT_OPERATOR':
-                output.push('OPERATOR');
-                break;
-            case 'OBJECT_OPFAMILY':
-                output.push('OPERATOR FAMILY');
-                break;
-            case 'OBJECT_OPCLASS':
-                output.push('OPERATOR CLASS');
-                break;
-            case 'OBJECT_TSDICTIONARY':
-                output.push('TEXT SEARCH DICTIONARY');
-                break;
-            case 'OBJECT_TSCONFIGURATION':
-                output.push('TEXT SEARCH CONFIGURATION');
-                break;
-            case 'OBJECT_EVENT_TRIGGER':
-                output.push('EVENT TRIGGER');
-                break;
-            case 'OBJECT_FDW':
-                output.push('FOREIGN DATA WRAPPER');
-                break;
-            case 'OBJECT_FOREIGN_SERVER':
-                output.push('SERVER');
-                break;
-            case 'OBJECT_TYPE':
-                output.push('TYPE');
-                break;
-            case 'OBJECT_COLLATION':
-                output.push('COLLATION');
-                break;
-            default:
-                throw new Error(`Unsupported AlterOwnerStmt objectType: ${node.objectType}`);
-        }
+        output.push(this.getObjectTypeKeyword(node.objectType));
         if (node.relation) {
             output.push(this.RangeVar(node.relation, context));
         }
         else if (node.object) {
             // Handle operator family and operator class objects specially to format name USING access_method correctly
-            if ((node.objectType === 'OBJECT_OPFAMILY' || node.objectType === 'OBJECT_OPCLASS') && (node.object as any).List) {
-                const items = ListUtils.unwrapList(node.object as any);
+            if ((node.objectType === 'OBJECT_OPFAMILY' || node.objectType === 'OBJECT_OPCLASS') && node.object.List) {
+                const items = ListUtils.unwrapList(node.object);
                 if (items.length === 2) {
                     const accessMethod = items[0].String?.sval || '';
                     const objectName = items[1].String?.sval || '';
@@ -7705,8 +7758,8 @@ export class Deparser implements DeparserVisitor {
         output.push(this.RoleSpec(node.newowner, context));
         return output.join(' ');
     }
-    GrantStmt(node: any, context: DeparserContext): string {
-        const output: string[] = [];
+    GrantStmt(node, context) {
+        const output = [];
         if (node.is_grant) {
             output.push('GRANT');
         }
@@ -7860,15 +7913,15 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join(' ');
     }
-    GrantRoleStmt(node: any, context: DeparserContext): string {
-        const output: string[] = [];
+    GrantRoleStmt(node, context) {
+        const output = [];
         // Check for inherit, admin, and set options first to place them correctly
         let hasInheritOption = false;
         let hasAdminOption = false;
         let hasSetOption = false;
-        let inheritValue: boolean | undefined;
-        let adminValue: boolean | undefined;
-        let setValue: boolean | undefined;
+        let inheritValue;
+        let adminValue;
+        let setValue;
         if (node.opt && node.opt.length > 0) {
             const options = ListUtils.unwrapList(node.opt);
             const inheritOption = options.find(opt => opt.DefElem && opt.DefElem.defname === 'inherit');
@@ -7921,7 +7974,7 @@ export class Deparser implements DeparserVisitor {
             output.push(grantees);
         }
         if (node.is_grant) {
-            const withOptions: string[] = [];
+            const withOptions = [];
             if (hasAdminOption) {
                 if (adminValue === true) {
                     withOptions.push('ADMIN OPTION');
@@ -7955,8 +8008,8 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join(' ');
     }
-    SecLabelStmt(node: any, context: DeparserContext): string {
-        const output: string[] = ['SECURITY LABEL'];
+    SecLabelStmt(node, context) {
+        const output = ['SECURITY LABEL'];
         if (node.provider) {
             output.push('FOR', `"${node.provider}"`);
         }
@@ -7997,8 +8050,8 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join(' ');
     }
-    AlterDefaultPrivilegesStmt(node: any, context: DeparserContext): string {
-        const output: string[] = ['ALTER DEFAULT PRIVILEGES'];
+    AlterDefaultPrivilegesStmt(node, context) {
+        const output = ['ALTER DEFAULT PRIVILEGES'];
         if (node.options && node.options.length > 0) {
             const options = ListUtils.unwrapList(node.options);
             for (const option of options) {
@@ -8034,8 +8087,8 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join(' ');
     }
-    CreateConversionStmt(node: any, context: DeparserContext): string {
-        const output: string[] = ['CREATE'];
+    CreateConversionStmt(node, context) {
+        const output = ['CREATE'];
         if (node.def) {
             output.push('DEFAULT');
         }
@@ -8061,8 +8114,8 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join(' ');
     }
-    CreateCastStmt(node: any, context: DeparserContext): string {
-        const output: string[] = ['CREATE CAST'];
+    CreateCastStmt(node, context) {
+        const output = ['CREATE CAST'];
         output.push('(');
         if (node.sourcetype) {
             output.push(this.TypeName(node.sourcetype, context));
@@ -8101,8 +8154,8 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join(' ');
     }
-    CreatePLangStmt(node: any, context: DeparserContext): string {
-        const output: string[] = ['CREATE'];
+    CreatePLangStmt(node, context) {
+        const output = ['CREATE'];
         if (node.replace) {
             output.push('OR REPLACE');
         }
@@ -8136,8 +8189,8 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join(' ');
     }
-    CreateTransformStmt(node: any, context: DeparserContext): string {
-        const output: string[] = ['CREATE'];
+    CreateTransformStmt(node, context) {
+        const output = ['CREATE'];
         if (node.replace) {
             output.push('OR REPLACE');
         }
@@ -8150,23 +8203,23 @@ export class Deparser implements DeparserVisitor {
             output.push(QuoteUtils.quote(node.lang));
         }
         output.push('(');
-        const transforms: string[] = [];
+        const transforms = [];
         if (node.fromsql) {
             // Handle ObjectWithArgs directly to avoid visitor routing issues
-            const fromSqlName = this.ObjectWithArgs(node.fromsql as any, context);
+            const fromSqlName = this.ObjectWithArgs(node.fromsql, context);
             transforms.push(`FROM SQL WITH FUNCTION ${fromSqlName}`);
         }
         if (node.tosql) {
             // Handle ObjectWithArgs directly to avoid visitor routing issues
-            const toSqlName = this.ObjectWithArgs(node.tosql as any, context);
+            const toSqlName = this.ObjectWithArgs(node.tosql, context);
             transforms.push(`TO SQL WITH FUNCTION ${toSqlName}`);
         }
         output.push(transforms.join(', '));
         output.push(')');
         return output.join(' ');
     }
-    CreateTrigStmt(node: any, context: DeparserContext): string {
-        const output: string[] = ['CREATE'];
+    CreateTrigStmt(node, context) {
+        const output = ['CREATE'];
         if (node.replace) {
             output.push('OR REPLACE');
         }
@@ -8178,15 +8231,15 @@ export class Deparser implements DeparserVisitor {
             output.push(QuoteUtils.quote(node.trigname));
         }
         if (context.isPretty()) {
-            const components: string[] = [];
-            const timing: string[] = [];
+            const components = [];
+            const timing = [];
             if (node.timing & 2)
                 timing.push('BEFORE');
             else if (node.timing & 64)
                 timing.push('INSTEAD OF');
             else
                 timing.push('AFTER');
-            const events: string[] = [];
+            const events = [];
             if (node.events & 4)
                 events.push('INSERT');
             if (node.events & 8)
@@ -8250,7 +8303,7 @@ export class Deparser implements DeparserVisitor {
             return output.join(' ') + context.newline() + components.join(context.newline());
         }
         else {
-            const timing: string[] = [];
+            const timing = [];
             if (node.timing & 2)
                 timing.push('BEFORE');
             else if (node.timing & 64)
@@ -8258,7 +8311,7 @@ export class Deparser implements DeparserVisitor {
             else
                 timing.push('AFTER');
             output.push(timing.join(' '));
-            const events: string[] = [];
+            const events = [];
             if (node.events & 4)
                 events.push('INSERT');
             if (node.events & 8)
@@ -8330,8 +8383,8 @@ export class Deparser implements DeparserVisitor {
             return output.join(' ');
         }
     }
-    TriggerTransition(node: any, context: DeparserContext): string {
-        const output: string[] = [];
+    TriggerTransition(node, context) {
+        const output = [];
         if (node.isNew) {
             output.push('NEW TABLE AS');
         }
@@ -8343,8 +8396,8 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join(' ');
     }
-    CreateEventTrigStmt(node: any, context: DeparserContext): string {
-        const output: string[] = ['CREATE EVENT TRIGGER'];
+    CreateEventTrigStmt(node, context) {
+        const output = ['CREATE EVENT TRIGGER'];
         if (node.trigname) {
             output.push(QuoteUtils.quote(node.trigname));
         }
@@ -8369,8 +8422,8 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join(' ');
     }
-    AlterEventTrigStmt(node: any, context: DeparserContext): string {
-        const output: string[] = ['ALTER EVENT TRIGGER'];
+    AlterEventTrigStmt(node, context) {
+        const output = ['ALTER EVENT TRIGGER'];
         if (node.trigname) {
             output.push(QuoteUtils.quote(node.trigname));
         }
@@ -8394,8 +8447,8 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join(' ');
     }
-    CreateOpClassStmt(node: any, context: DeparserContext): string {
-        const output: string[] = ['CREATE OPERATOR CLASS'];
+    CreateOpClassStmt(node, context) {
+        const output = ['CREATE OPERATOR CLASS'];
         if (node.opclassname && node.opclassname.length > 0) {
             const className = ListUtils.unwrapList(node.opclassname)
                 .map(name => this.visit(name, context))
@@ -8429,8 +8482,8 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join(' ');
     }
-    CreateOpFamilyStmt(node: any, context: DeparserContext): string {
-        const output: string[] = ['CREATE OPERATOR FAMILY'];
+    CreateOpFamilyStmt(node, context) {
+        const output = ['CREATE OPERATOR FAMILY'];
         if (node.opfamilyname && node.opfamilyname.length > 0) {
             const familyName = ListUtils.unwrapList(node.opfamilyname)
                 .map(name => this.visit(name, context))
@@ -8443,8 +8496,8 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join(' ');
     }
-    AlterOpFamilyStmt(node: any, context: DeparserContext): string {
-        const output: string[] = ['ALTER OPERATOR FAMILY'];
+    AlterOpFamilyStmt(node, context) {
+        const output = ['ALTER OPERATOR FAMILY'];
         if (node.opfamilyname && node.opfamilyname.length > 0) {
             const familyName = ListUtils.unwrapList(node.opfamilyname)
                 .map(name => this.visit(name, context))
@@ -8469,8 +8522,8 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join(' ');
     }
-    MergeStmt(node: any, context: DeparserContext): string {
-        const output: string[] = [];
+    MergeStmt(node, context) {
+        const output = [];
         if (node.withClause) {
             output.push(this.WithClause(node.withClause, context));
         }
@@ -8494,8 +8547,8 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join(' ');
     }
-    AlterTableMoveAllStmt(node: any, context: DeparserContext): string {
-        const output: string[] = ['ALTER'];
+    AlterTableMoveAllStmt(node, context) {
+        const output = ['ALTER'];
         if (node.objtype === 'OBJECT_TABLE') {
             output.push('TABLE');
         }
@@ -8518,11 +8571,11 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join(' ');
     }
-    CreateSeqStmt(node: any, context: DeparserContext): string {
-        const output: string[] = ['CREATE'];
+    CreateSeqStmt(node, context) {
+        const output = ['CREATE'];
         // Check if this is a temporary sequence
         if (node.sequence) {
-            const seq = node.sequence as any;
+            const seq = node.sequence;
             if (seq.relpersistence === 't') {
                 output.push('TEMPORARY');
             }
@@ -8532,8 +8585,8 @@ export class Deparser implements DeparserVisitor {
             output.push('IF NOT EXISTS');
         }
         if (node.sequence) {
-            const sequenceName: string[] = [];
-            const seq = node.sequence as any;
+            const sequenceName = [];
+            const seq = node.sequence;
             if (seq.schemaname) {
                 sequenceName.push(QuoteUtils.quote(seq.schemaname));
             }
@@ -8563,14 +8616,14 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join(' ');
     }
-    AlterSeqStmt(node: any, context: DeparserContext): string {
-        const output: string[] = ['ALTER', 'SEQUENCE'];
+    AlterSeqStmt(node, context) {
+        const output = ['ALTER', 'SEQUENCE'];
         if (node.missing_ok) {
             output.push('IF EXISTS');
         }
         if (node.sequence) {
-            const sequenceName: string[] = [];
-            const seq = node.sequence as any;
+            const sequenceName = [];
+            const seq = node.sequence;
             if (seq.schemaname) {
                 sequenceName.push(QuoteUtils.quote(seq.schemaname));
             }
@@ -8606,8 +8659,8 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join(' ');
     }
-    CompositeTypeStmt(node: any, context: DeparserContext): string {
-        const output: string[] = ['CREATE', 'TYPE'];
+    CompositeTypeStmt(node, context) {
+        const output = ['CREATE', 'TYPE'];
         if (node.typevar) {
             const typeContext = context.spawn('CompositeTypeStmt');
             output.push(this.RangeVar(node.typevar, typeContext));
@@ -8625,8 +8678,8 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join(' ');
     }
-    CreateRangeStmt(node: any, context: DeparserContext): string {
-        const output: string[] = ['CREATE', 'TYPE'];
+    CreateRangeStmt(node, context) {
+        const output = ['CREATE', 'TYPE'];
         if (node.typeName && node.typeName.length > 0) {
             const typeNameStr = ListUtils.unwrapList(node.typeName)
                 .map(name => this.visit(name, context))
@@ -8647,8 +8700,8 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join(' ');
     }
-    AlterEnumStmt(node: any, context: DeparserContext): string {
-        const output: string[] = ['ALTER', 'TYPE'];
+    AlterEnumStmt(node, context) {
+        const output = ['ALTER', 'TYPE'];
         if (node.typeName && node.typeName.length > 0) {
             const typeNameStr = ListUtils.unwrapList(node.typeName)
                 .map(name => this.visit(name, context))
@@ -8679,8 +8732,8 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join(' ');
     }
-    AlterTypeStmt(node: any, context: DeparserContext): string {
-        const output: string[] = ['ALTER', 'TYPE'];
+    AlterTypeStmt(node, context) {
+        const output = ['ALTER', 'TYPE'];
         if (node.typeName && node.typeName.length > 0) {
             const typeNameStr = ListUtils.unwrapList(node.typeName)
                 .map(name => this.visit(name, context))
@@ -8701,11 +8754,11 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join(' ');
     }
-    AlterRoleStmt(node: any, context: DeparserContext): string {
+    AlterRoleStmt(node, context) {
         // Check if this is an ALTER GROUP statement by looking for rolemembers DefElem
         const isGroupStatement = node.options &&
             ListUtils.unwrapList(node.options).some(option => option.DefElem && option.DefElem.defname === 'rolemembers');
-        const output: string[] = ['ALTER', isGroupStatement ? 'GROUP' : 'ROLE'];
+        const output = ['ALTER', isGroupStatement ? 'GROUP' : 'ROLE'];
         if (node.role) {
             output.push(this.RoleSpec(node.role, context));
         }
@@ -8736,8 +8789,8 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join(' ');
     }
-    DropRoleStmt(node: any, context: DeparserContext): string {
-        const output: string[] = ['DROP', 'ROLE'];
+    DropRoleStmt(node, context) {
+        const output = ['DROP', 'ROLE'];
         if (node.missing_ok) {
             output.push('IF EXISTS');
         }
@@ -8749,14 +8802,14 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join(' ');
     }
-    targetList(node: any, context: DeparserContext): string {
+    targetList(node, context) {
         if (!node || !Array.isArray(node)) {
             return '';
         }
-        return node.map((target: any) => this.visit(target, context)).join(', ');
+        return node.map((target) => this.visit(target, context)).join(', ');
     }
-    CreateAggregateStmt(node: any, context: DeparserContext): string {
-        const output: string[] = ['CREATE'];
+    CreateAggregateStmt(node, context) {
+        const output = ['CREATE'];
         if (node.replace) {
             output.push('OR REPLACE');
         }
@@ -8780,7 +8833,7 @@ export class Deparser implements DeparserVisitor {
         }
         output.push(')');
         output.push('(');
-        const options: string[] = [];
+        const options = [];
         if (node.definition && node.definition.length > 0) {
             const optionStrs = ListUtils.unwrapList(node.definition)
                 .map(option => {
@@ -8829,8 +8882,8 @@ export class Deparser implements DeparserVisitor {
         output.push(')');
         return output.join(' ');
     }
-    CreateTableAsStmt(node: any, context: DeparserContext): string {
-        const output: string[] = ['CREATE'];
+    CreateTableAsStmt(node, context) {
+        const output = ['CREATE'];
         if (node.objtype === 'OBJECT_MATVIEW') {
             output.push('MATERIALIZED VIEW');
         }
@@ -8876,7 +8929,7 @@ export class Deparser implements DeparserVisitor {
         }
         output.push('AS');
         if (node.query) {
-            output.push(this.visit(node.query as any, context));
+            output.push(this.visit(node.query, context));
         }
         if (node.into && node.into.options && node.into.options.length > 0) {
             output.push('WITH');
@@ -8890,21 +8943,21 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join(' ');
     }
-    RefreshMatViewStmt(node: any, context: DeparserContext): string {
-        const output: string[] = ['REFRESH', 'MATERIALIZED', 'VIEW'];
+    RefreshMatViewStmt(node, context) {
+        const output = ['REFRESH', 'MATERIALIZED', 'VIEW'];
         if (node.concurrent) {
             output.push('CONCURRENTLY');
         }
         if (node.relation) {
-            output.push(this.visit(node.relation as any, context));
+            output.push(this.visit(node.relation, context));
         }
         if (node.skipData) {
             output.push('WITH NO DATA');
         }
         return output.join(' ');
     }
-    AccessPriv(node: any, context: DeparserContext): string {
-        const output: string[] = [];
+    AccessPriv(node, context) {
+        const output = [];
         if (node.priv_name) {
             output.push(node.priv_name.toUpperCase());
         }
@@ -8920,14 +8973,14 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join(' ');
     }
-    aliasname(node: any, context: DeparserContext): string {
+    aliasname(node, context) {
         if (typeof node === 'string') {
             return QuoteUtils.quote(node);
         }
         return this.visit(node, context);
     }
-    DefineStmt(node: any, context: DeparserContext): string {
-        const output: string[] = [];
+    DefineStmt(node, context) {
+        const output = [];
         if (!node.kind) {
             throw new Error('DefineStmt requires kind property');
         }
@@ -9273,8 +9326,8 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join(' ');
     }
-    AlterDatabaseStmt(node: any, context: DeparserContext): string {
-        const output: string[] = ['ALTER', 'DATABASE'];
+    AlterDatabaseStmt(node, context) {
+        const output = ['ALTER', 'DATABASE'];
         if (node.dbname) {
             output.push(QuoteUtils.quote(node.dbname));
         }
@@ -9284,16 +9337,16 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join(' ');
     }
-    AlterDatabaseRefreshCollStmt(node: any, context: DeparserContext): string {
-        const output: string[] = ['ALTER', 'DATABASE'];
+    AlterDatabaseRefreshCollStmt(node, context) {
+        const output = ['ALTER', 'DATABASE'];
         if (node.dbname) {
             output.push(QuoteUtils.quote(node.dbname));
         }
         output.push('REFRESH', 'COLLATION', 'VERSION');
         return output.join(' ');
     }
-    AlterDatabaseSetStmt(node: any, context: DeparserContext): string {
-        const output: string[] = ['ALTER', 'DATABASE'];
+    AlterDatabaseSetStmt(node, context) {
+        const output = ['ALTER', 'DATABASE'];
         if (node.dbname) {
             output.push(QuoteUtils.quote(node.dbname));
         }
@@ -9303,13 +9356,13 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join(' ');
     }
-    DeclareCursorStmt(node: any, context: DeparserContext): string {
-        const output: string[] = ['DECLARE'];
+    DeclareCursorStmt(node, context) {
+        const output = ['DECLARE'];
         if (node.portalname) {
             output.push(QuoteUtils.quote(node.portalname));
         }
         // Handle cursor options before CURSOR keyword
-        const cursorOptions: string[] = [];
+        const cursorOptions = [];
         if (node.options) {
             if (node.options & 2) {
                 cursorOptions.push('SCROLL');
@@ -9337,8 +9390,8 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join(' ');
     }
-    PublicationObjSpec(node: any, context: DeparserContext): string {
-        const output: string[] = [];
+    PublicationObjSpec(node, context) {
+        const output = [];
         if (node.pubobjtype === 'PUBLICATIONOBJ_TABLE') {
             output.push('TABLE');
             if (node.pubtable) {
@@ -9356,8 +9409,8 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join(' ');
     }
-    PublicationTable(node: any, context: DeparserContext): string {
-        const output: string[] = [];
+    PublicationTable(node, context) {
+        const output = [];
         if (node.relation) {
             output.push(this.RangeVar(node.relation, context));
         }
@@ -9371,8 +9424,8 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join(' ');
     }
-    CreateAmStmt(node: any, context: DeparserContext): string {
-        const output: string[] = ['CREATE', 'ACCESS', 'METHOD'];
+    CreateAmStmt(node, context) {
+        const output = ['CREATE', 'ACCESS', 'METHOD'];
         if (node.amname) {
             output.push(QuoteUtils.quote(node.amname));
         }
@@ -9398,8 +9451,8 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join(' ');
     }
-    IntoClause(node: any, context: DeparserContext): string {
-        const output: string[] = [];
+    IntoClause(node, context) {
+        const output = [];
         if (node.rel) {
             output.push(this.RangeVar(node.rel, context));
         }
@@ -9438,8 +9491,8 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join(' ');
     }
-    OnConflictExpr(node: any, context: DeparserContext): string {
-        const output: string[] = ['ON CONFLICT'];
+    OnConflictExpr(node, context) {
+        const output = ['ON CONFLICT'];
         if (node.arbiterElems && node.arbiterElems.length > 0) {
             const arbiters = ListUtils.unwrapList(node.arbiterElems)
                 .map(elem => this.visit(elem, context))
@@ -9468,11 +9521,11 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join(' ');
     }
-    ScanToken(node: any, context: DeparserContext): string {
+    ScanToken(node, context) {
         return '';
     }
-    CreateOpClassItem(node: any, context: DeparserContext): string {
-        const output: string[] = [];
+    CreateOpClassItem(node, context) {
+        const output = [];
         if (node.itemtype === 1) {
             output.push('OPERATOR');
             // For operators, always include the number (default to 0 if undefined)
@@ -9514,14 +9567,14 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join(' ');
     }
-    Var(node: any, context: DeparserContext): string {
+    Var(node, context) {
         if (node.varno && node.varattno) {
             return `$${node.varno}.${node.varattno}`;
         }
         return '$var';
     }
-    TableFunc(node: any, context: DeparserContext): string {
-        const output: string[] = [];
+    TableFunc(node, context) {
+        const output = [];
         if (node.functype === 'TFT_XMLTABLE') {
             output.push('XMLTABLE');
             if (node.ns_names && node.ns_names.length > 0) {
@@ -9565,8 +9618,8 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join(' ');
     }
-    RangeTableFunc(node: any, context: DeparserContext): string {
-        const output: string[] = [];
+    RangeTableFunc(node, context) {
+        const output = [];
         if (node.lateral) {
             output.push('LATERAL');
         }
@@ -9589,8 +9642,8 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join(' ');
     }
-    RangeTableFuncCol(node: any, context: DeparserContext): string {
-        const output: string[] = [];
+    RangeTableFuncCol(node, context) {
+        const output = [];
         if (node.colname) {
             output.push(QuoteUtils.quote(node.colname));
         }
@@ -9610,8 +9663,8 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join(' ');
     }
-    JsonArrayQueryConstructor(node: any, context: DeparserContext): string {
-        const output: string[] = ['JSON_ARRAYAGG'];
+    JsonArrayQueryConstructor(node, context) {
+        const output = ['JSON_ARRAYAGG'];
         if (node.query) {
             output.push(`(${this.visit(node.query, context)})`);
         }
@@ -9629,8 +9682,8 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join(' ');
     }
-    RangeFunction(node: any, context: DeparserContext): string {
-        const output: string[] = [];
+    RangeFunction(node, context) {
+        const output = [];
         if (node.lateral) {
             output.push('LATERAL');
         }
@@ -9644,16 +9697,16 @@ export class Deparser implements DeparserVisitor {
                         const nodeType = this.getNodeType(func);
                         if (nodeType === 'List') {
                             // Handle List containing [FuncCall, List of ColumnDefs]
-                            const listData = this.getNodeData(func) as any;
+                            const listData = this.getNodeData(func);
                             if (listData && listData.items && Array.isArray(listData.items)) {
                                 const items = listData.items;
                                 if (items.length >= 2) {
                                     const funcCall = this.visit(items[0], context);
-                                    const coldefList = this.getNodeData(items[1]) as any;
+                                    const coldefList = this.getNodeData(items[1]);
                                     if (coldefList && coldefList.items && Array.isArray(coldefList.items)) {
                                         const coldefs = coldefList.items
-                                            .map((coldef: any) => this.visit(coldef, context))
-                                            .filter((str: string) => str && str.trim());
+                                            .map((coldef) => this.visit(coldef, context))
+                                            .filter((str) => str && str.trim());
                                         if (coldefs.length > 0) {
                                             return `${funcCall} AS (${coldefs.join(', ')})`;
                                         }
@@ -9687,7 +9740,7 @@ export class Deparser implements DeparserVisitor {
                         const nodeType = this.getNodeType(func);
                         if (nodeType === 'List') {
                             // Handle List containing [FuncCall, potentially empty second item]
-                            const listData = this.getNodeData(func) as any;
+                            const listData = this.getNodeData(func);
                             if (listData && listData.items && Array.isArray(listData.items)) {
                                 const items = listData.items;
                                 if (items.length >= 1) {
@@ -9733,7 +9786,7 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join(' ');
     }
-    XmlExpr(node: any, context: DeparserContext): string {
+    XmlExpr(node, context) {
         // Handle XMLPI with special syntax: xmlpi(name target, content)
         if (node.op === 'IS_XMLPI') {
             if (node.name && node.args && node.args.length > 0) {
@@ -9747,14 +9800,14 @@ export class Deparser implements DeparserVisitor {
                 return 'XMLPI()';
             }
         }
-        const output: string[] = [];
+        const output = [];
         switch (node.op) {
             case 'IS_XMLCONCAT':
                 output.push('XMLCONCAT');
                 break;
             case 'IS_XMLELEMENT':
                 output.push('XMLELEMENT');
-                const elementParts: string[] = [];
+                const elementParts = [];
                 if (node.name) {
                     elementParts.push(`NAME ${QuoteUtils.quote(node.name)}`);
                 }
@@ -9775,7 +9828,7 @@ export class Deparser implements DeparserVisitor {
                 break;
             case 'IS_XMLPARSE':
                 output.push('XMLPARSE');
-                const parseParts: string[] = [];
+                const parseParts = [];
                 if (node.xmloption) {
                     if (node.xmloption === 'XMLOPTION_DOCUMENT') {
                         parseParts.push('DOCUMENT');
@@ -9798,7 +9851,7 @@ export class Deparser implements DeparserVisitor {
                 output.push('XMLROOT');
                 if (node.args && node.args.length > 0) {
                     const args = ListUtils.unwrapList(node.args);
-                    const rootParts: string[] = [];
+                    const rootParts = [];
                     if (args[0]) {
                         rootParts.push(this.visit(args[0], context));
                     }
@@ -9875,7 +9928,7 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join(' ');
     }
-    schemaname(node: any, context: DeparserContext): string {
+    schemaname(node, context) {
         if (typeof node === 'string') {
             return QuoteUtils.quote(node);
         }
@@ -9902,28 +9955,28 @@ export class Deparser implements DeparserVisitor {
         }
         return '';
     }
-    RangeTableSample(node: any, context: DeparserContext): string {
-        const output: string[] = [];
+    RangeTableSample(node, context) {
+        const output = [];
         if (node.relation) {
-            output.push(this.visit(node.relation as any, context));
+            output.push(this.visit(node.relation, context));
         }
         output.push('TABLESAMPLE');
         if (node.method && node.method.length > 0) {
-            const methodParts = node.method.map((m: any) => this.visit(m, context));
+            const methodParts = node.method.map((m) => this.visit(m, context));
             output.push(methodParts.join('.'));
         }
         if (node.args && node.args.length > 0) {
-            const argStrs = node.args.map((arg: any) => this.visit(arg, context));
+            const argStrs = node.args.map((arg) => this.visit(arg, context));
             output.push(`(${argStrs.join(', ')})`);
         }
         if (node.repeatable) {
             output.push('REPEATABLE');
-            output.push(`(${this.visit(node.repeatable as any, context)})`);
+            output.push(`(${this.visit(node.repeatable, context)})`);
         }
         return output.join(' ');
     }
-    XmlSerialize(node: any, context: DeparserContext): string {
-        const output: string[] = ['XMLSERIALIZE'];
+    XmlSerialize(node, context) {
+        const output = ['XMLSERIALIZE'];
         output.push('(');
         if (node.typeName) {
             if (node.xmloption === 'XMLOPTION_DOCUMENT') {
@@ -9932,18 +9985,18 @@ export class Deparser implements DeparserVisitor {
             else {
                 output.push('CONTENT');
             }
-            output.push(this.visit(node.expr as any, context));
+            output.push(this.visit(node.expr, context));
             output.push('AS');
             output.push(this.TypeName(node.typeName, context));
         }
         output.push(')');
         return output.join(' ');
     }
-    ctes(node: any, context: DeparserContext): string {
+    ctes(node, context) {
         if (!node || !Array.isArray(node)) {
             return '';
         }
-        const output: string[] = ['WITH'];
+        const output = ['WITH'];
         // Check if any CTE is recursive by examining the first CTE's structure
         if (node.length > 0 && node[0] && node[0].CommonTableExpr && node[0].CommonTableExpr.recursive) {
             output.push('RECURSIVE');
@@ -9952,8 +10005,8 @@ export class Deparser implements DeparserVisitor {
         output.push(cteStrs.join(', '));
         return output.join(' ');
     }
-    RuleStmt(node: any, context: DeparserContext): string {
-        const output: string[] = ['CREATE'];
+    RuleStmt(node, context) {
+        const output = ['CREATE'];
         if (node.replace) {
             output.push('OR REPLACE');
         }
@@ -9983,7 +10036,7 @@ export class Deparser implements DeparserVisitor {
         output.push('TO');
         if (node.relation) {
             // Handle relation node directly as RangeVar since it contains the RangeVar properties
-            output.push(this.RangeVar(node.relation as any, context));
+            output.push(this.RangeVar(node.relation, context));
         }
         if (node.whereClause) {
             output.push('WHERE');
@@ -10009,8 +10062,8 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join(' ');
     }
-    RangeSubselect(node: any, context: DeparserContext): string {
-        const output: string[] = [];
+    RangeSubselect(node, context) {
+        const output = [];
         if (node.lateral) {
             output.push('LATERAL');
         }
@@ -10024,7 +10077,7 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join(' ');
     }
-    relname(node: any, context: DeparserContext): string {
+    relname(node, context) {
         if (typeof node === 'string') {
             return QuoteUtils.quote(node);
         }
@@ -10036,7 +10089,7 @@ export class Deparser implements DeparserVisitor {
         }
         return this.visit(node, context);
     }
-    rel(node: any, context: DeparserContext): string {
+    rel(node, context) {
         if (typeof node === 'string') {
             return QuoteUtils.quote(node);
         }
@@ -10051,7 +10104,7 @@ export class Deparser implements DeparserVisitor {
         }
         return this.visit(node, context);
     }
-    objname(node: any, context: DeparserContext): string {
+    objname(node, context) {
         if (typeof node === 'string') {
             return QuoteUtils.quote(node);
         }
@@ -10069,7 +10122,7 @@ export class Deparser implements DeparserVisitor {
         }
         return this.visit(node, context);
     }
-    SQLValueFunction(node: any, context: DeparserContext): string {
+    SQLValueFunction(node, context) {
         switch (node.op) {
             case 'SVFOP_CURRENT_DATE':
                 return 'CURRENT_DATE';
@@ -10105,8 +10158,8 @@ export class Deparser implements DeparserVisitor {
                 throw new Error(`Unsupported SQLValueFunction op: ${node.op}`);
         }
     }
-    GroupingFunc(node: any, context: DeparserContext): string {
-        const output: string[] = ['GROUPING'];
+    GroupingFunc(node, context) {
+        const output = ['GROUPING'];
         if (node.args && node.args.length > 0) {
             const argStrs = ListUtils.unwrapList(node.args).map(arg => this.visit(arg, context));
             output.push(`(${argStrs.join(', ')})`);
@@ -10116,8 +10169,8 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join('');
     }
-    MultiAssignRef(node: any, context: DeparserContext): string {
-        const output: string[] = [];
+    MultiAssignRef(node, context) {
+        const output = [];
         if (node.source) {
             output.push(this.visit(node.source, context));
         }
@@ -10126,11 +10179,11 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join('');
     }
-    SetToDefault(node: any, context: DeparserContext): string {
+    SetToDefault(node, context) {
         return 'DEFAULT';
     }
-    CurrentOfExpr(node: any, context: DeparserContext): string {
-        const output: string[] = ['CURRENT OF'];
+    CurrentOfExpr(node, context) {
+        const output = ['CURRENT OF'];
         if (node.cursor_name) {
             output.push(QuoteUtils.quote(node.cursor_name));
         }
@@ -10139,10 +10192,10 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join(' ');
     }
-    TableLikeClause(node: any, context: DeparserContext): string {
-        const output: string[] = ['LIKE'];
+    TableLikeClause(node, context) {
+        const output = ['LIKE'];
         if (node.relation) {
-            output.push(this.visit(node.relation as any, context));
+            output.push(this.visit(node.relation, context));
         }
         if (node.options && typeof node.options === 'number') {
             // Handle special case for INCLUDING ALL (all bits set)
@@ -10150,7 +10203,7 @@ export class Deparser implements DeparserVisitor {
                 output.push('INCLUDING ALL');
             }
             else {
-                const optionStrs: string[] = [];
+                const optionStrs = [];
                 // Handle bitfield options for CREATE TABLE LIKE
                 if (node.options & 0x01)
                     optionStrs.push('INCLUDING COMMENTS');
@@ -10175,8 +10228,8 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join(' ');
     }
-    AlterFunctionStmt(node: any, context: DeparserContext): string {
-        const output: string[] = ['ALTER'];
+    AlterFunctionStmt(node, context) {
+        const output = ['ALTER'];
         if (node.objtype === 'OBJECT_PROCEDURE') {
             output.push('PROCEDURE');
         }
@@ -10193,68 +10246,14 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join(' ');
     }
-    AlterObjectSchemaStmt(node: any, context: DeparserContext): string {
-        const output: string[] = ['ALTER'];
-        switch (node.objectType) {
-            case 'OBJECT_TABLE':
-                output.push('TABLE');
-                break;
-            case 'OBJECT_VIEW':
-                output.push('VIEW');
-                break;
-            case 'OBJECT_FUNCTION':
-                output.push('FUNCTION');
-                break;
-            case 'OBJECT_TYPE':
-                output.push('TYPE');
-                break;
-            case 'OBJECT_DOMAIN':
-                output.push('DOMAIN');
-                break;
-            case 'OBJECT_SEQUENCE':
-                output.push('SEQUENCE');
-                break;
-            case 'OBJECT_OPCLASS':
-                output.push('OPERATOR CLASS');
-                break;
-            case 'OBJECT_OPFAMILY':
-                output.push('OPERATOR FAMILY');
-                break;
-            case 'OBJECT_OPERATOR':
-                output.push('OPERATOR');
-                break;
-            case 'OBJECT_TYPE':
-                output.push('TYPE');
-                break;
-            case 'OBJECT_COLLATION':
-                output.push('COLLATION');
-                break;
-            case 'OBJECT_CONVERSION':
-                output.push('CONVERSION');
-                break;
-            case 'OBJECT_TSPARSER':
-                output.push('TEXT SEARCH PARSER');
-                break;
-            case 'OBJECT_TSCONFIGURATION':
-                output.push('TEXT SEARCH CONFIGURATION');
-                break;
-            case 'OBJECT_TSTEMPLATE':
-                output.push('TEXT SEARCH TEMPLATE');
-                break;
-            case 'OBJECT_TSDICTIONARY':
-                output.push('TEXT SEARCH DICTIONARY');
-                break;
-            case 'OBJECT_AGGREGATE':
-                output.push('AGGREGATE');
-                break;
-            case 'OBJECT_FOREIGN_TABLE':
-                output.push('FOREIGN TABLE');
-                break;
-            case 'OBJECT_MATVIEW':
-                output.push('MATERIALIZED VIEW');
-                break;
-            default:
-                output.push(node.objectType.toString());
+    AlterObjectSchemaStmt(node, context) {
+        const output = ['ALTER'];
+        try {
+            output.push(this.getObjectTypeKeyword(node.objectType));
+        }
+        catch {
+            // Fallback to objectType string if not supported
+            output.push(node.objectType.toString());
         }
         if (node.missing_ok) {
             output.push('IF EXISTS');
@@ -10264,92 +10263,92 @@ export class Deparser implements DeparserVisitor {
         }
         else if (node.object) {
             // Handle domain objects specially to format schema.domain correctly
-            if (node.objectType === 'OBJECT_DOMAIN' && (node.object as any).List) {
-                const items = ListUtils.unwrapList(node.object as any);
+            if (node.objectType === 'OBJECT_DOMAIN' && node.object.List) {
+                const items = ListUtils.unwrapList(node.object);
                 if (items.length === 2) {
                     const schemaName = items[0].String?.sval || '';
                     const domainName = items[1].String?.sval || '';
                     output.push(`${QuoteUtils.quote(schemaName)}.${QuoteUtils.quote(domainName)}`);
                 }
                 else {
-                    output.push(this.visit(node.object as any, context));
+                    output.push(this.visit(node.object, context));
                 }
             }
-            else if (node.objectType === 'OBJECT_TYPE' && (node.object as any).List) {
+            else if (node.objectType === 'OBJECT_TYPE' && node.object.List) {
                 // Handle type objects specially to format schema.type correctly
-                const items = ListUtils.unwrapList(node.object as any);
+                const items = ListUtils.unwrapList(node.object);
                 if (items.length === 2) {
                     const schemaName = items[0].String?.sval || '';
                     const typeName = items[1].String?.sval || '';
                     output.push(`${QuoteUtils.quote(schemaName)}.${QuoteUtils.quote(typeName)}`);
                 }
                 else {
-                    output.push(this.visit(node.object as any, context));
+                    output.push(this.visit(node.object, context));
                 }
             }
-            else if (node.objectType === 'OBJECT_CONVERSION' && (node.object as any).List) {
+            else if (node.objectType === 'OBJECT_CONVERSION' && node.object.List) {
                 // Handle conversion objects specially to format schema.conversion correctly
-                const items = ListUtils.unwrapList(node.object as any);
+                const items = ListUtils.unwrapList(node.object);
                 if (items.length === 2) {
                     const schemaName = items[0].String?.sval || '';
                     const conversionName = items[1].String?.sval || '';
                     output.push(`${QuoteUtils.quote(schemaName)}.${QuoteUtils.quote(conversionName)}`);
                 }
                 else {
-                    output.push(this.visit(node.object as any, context));
+                    output.push(this.visit(node.object, context));
                 }
             }
-            else if (node.objectType === 'OBJECT_TSPARSER' && (node.object as any).List) {
+            else if (node.objectType === 'OBJECT_TSPARSER' && node.object.List) {
                 // Handle text search parser objects specially to format schema.parser correctly
-                const items = ListUtils.unwrapList(node.object as any);
+                const items = ListUtils.unwrapList(node.object);
                 if (items.length === 2) {
                     const schemaName = items[0].String?.sval || '';
                     const parserName = items[1].String?.sval || '';
                     output.push(`${QuoteUtils.quote(schemaName)}.${QuoteUtils.quote(parserName)}`);
                 }
                 else {
-                    output.push(this.visit(node.object as any, context));
+                    output.push(this.visit(node.object, context));
                 }
             }
-            else if (node.objectType === 'OBJECT_TSCONFIGURATION' && (node.object as any).List) {
+            else if (node.objectType === 'OBJECT_TSCONFIGURATION' && node.object.List) {
                 // Handle text search configuration objects specially to format schema.config correctly
-                const items = ListUtils.unwrapList(node.object as any);
+                const items = ListUtils.unwrapList(node.object);
                 if (items.length === 2) {
                     const schemaName = items[0].String?.sval || '';
                     const configName = items[1].String?.sval || '';
                     output.push(`${QuoteUtils.quote(schemaName)}.${QuoteUtils.quote(configName)}`);
                 }
                 else {
-                    output.push(this.visit(node.object as any, context));
+                    output.push(this.visit(node.object, context));
                 }
             }
-            else if (node.objectType === 'OBJECT_TSTEMPLATE' && (node.object as any).List) {
+            else if (node.objectType === 'OBJECT_TSTEMPLATE' && node.object.List) {
                 // Handle text search template objects specially to format schema.template correctly
-                const items = ListUtils.unwrapList(node.object as any);
+                const items = ListUtils.unwrapList(node.object);
                 if (items.length === 2) {
                     const schemaName = items[0].String?.sval || '';
                     const templateName = items[1].String?.sval || '';
                     output.push(`${QuoteUtils.quote(schemaName)}.${QuoteUtils.quote(templateName)}`);
                 }
                 else {
-                    output.push(this.visit(node.object as any, context));
+                    output.push(this.visit(node.object, context));
                 }
             }
-            else if (node.objectType === 'OBJECT_TSDICTIONARY' && (node.object as any).List) {
+            else if (node.objectType === 'OBJECT_TSDICTIONARY' && node.object.List) {
                 // Handle text search dictionary objects specially to format schema.dictionary correctly
-                const items = ListUtils.unwrapList(node.object as any);
+                const items = ListUtils.unwrapList(node.object);
                 if (items.length === 2) {
                     const schemaName = items[0].String?.sval || '';
                     const dictionaryName = items[1].String?.sval || '';
                     output.push(`${QuoteUtils.quote(schemaName)}.${QuoteUtils.quote(dictionaryName)}`);
                 }
                 else {
-                    output.push(this.visit(node.object as any, context));
+                    output.push(this.visit(node.object, context));
                 }
             }
-            else if (node.objectType === 'OBJECT_OPCLASS' && (node.object as any).List) {
+            else if (node.objectType === 'OBJECT_OPCLASS' && node.object.List) {
                 // Handle operator class objects: ALTER OPERATOR CLASS name USING access_method
-                const items = ListUtils.unwrapList(node.object as any);
+                const items = ListUtils.unwrapList(node.object);
                 if (items.length === 2) {
                     const accessMethod = items[0].String?.sval || '';
                     const opClassName = items[1].String?.sval || '';
@@ -10362,12 +10361,12 @@ export class Deparser implements DeparserVisitor {
                     output.push(`${QuoteUtils.quote(schemaName)}.${QuoteUtils.quote(opClassName)} USING ${accessMethod}`);
                 }
                 else {
-                    output.push(this.visit(node.object as any, context));
+                    output.push(this.visit(node.object, context));
                 }
             }
-            else if (node.objectType === 'OBJECT_OPFAMILY' && (node.object as any).List) {
+            else if (node.objectType === 'OBJECT_OPFAMILY' && node.object.List) {
                 // Handle operator family objects: ALTER OPERATOR FAMILY name USING access_method
-                const items = ListUtils.unwrapList(node.object as any);
+                const items = ListUtils.unwrapList(node.object);
                 if (items.length === 2) {
                     const accessMethod = items[0].String?.sval || '';
                     const opFamilyName = items[1].String?.sval || '';
@@ -10380,11 +10379,11 @@ export class Deparser implements DeparserVisitor {
                     output.push(`${QuoteUtils.quote(schemaName)}.${QuoteUtils.quote(opFamilyName)} USING ${accessMethod}`);
                 }
                 else {
-                    output.push(this.visit(node.object as any, context));
+                    output.push(this.visit(node.object, context));
                 }
             }
             else {
-                output.push(this.visit(node.object as any, context));
+                output.push(this.visit(node.object, context));
             }
         }
         output.push('SET SCHEMA');
@@ -10393,8 +10392,8 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join(' ');
     }
-    AlterRoleSetStmt(node: any, context: DeparserContext): string {
-        const output: string[] = ['ALTER', 'ROLE'];
+    AlterRoleSetStmt(node, context) {
+        const output = ['ALTER', 'ROLE'];
         if (node.role) {
             output.push(this.RoleSpec(node.role, context));
         }
@@ -10428,12 +10427,12 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join(' ');
     }
-    CreateForeignTableStmt(node: any, context: DeparserContext): string {
-        const output: string[] = ['CREATE FOREIGN TABLE'];
+    CreateForeignTableStmt(node, context) {
+        const output = ['CREATE FOREIGN TABLE'];
         if (node.base && node.base.relation) {
             const relationContext = context.spawn('CreateForeignTableStmt');
             // Handle relation node directly as RangeVar since it contains the RangeVar properties
-            output.push(this.RangeVar(node.base.relation as any, relationContext));
+            output.push(this.RangeVar(node.base.relation, relationContext));
         }
         if (node.base && node.base.tableElts) {
             const elementStrs = ListUtils.unwrapList(node.base.tableElts).map(el => this.visit(el, context));
@@ -10467,7 +10466,7 @@ export class Deparser implements DeparserVisitor {
         }
         return output.join(' ');
     }
-    private containsMultilineStringLiteral(content: string): boolean {
+    containsMultilineStringLiteral(content) {
         const stringLiteralRegex = /'[^']*\n[^']*'/g;
         return stringLiteralRegex.test(content);
     }