Replace expectAstMatch with expectParseDeparse helper for direct AST comparison

- Add standalone expectParseDeparse helper function in test-utils/index.ts (not on class)
- Implement round-trip validation: parse(sql1) → deparse(sql2) → parse(sql2) → compare cleanTree(ast1) vs cleanTree(ast2)
- Replace expectAstMatch usage with expectParseDeparse in all pretty formatting tests:
  - SELECT pretty tests
  - CREATE TABLE pretty tests
  - Constraints pretty tests
  - CREATE POLICY pretty tests
- Use direct expect(ast2).toEqual(ast1) comparison for semantic validation
- All tests pass with simplified, more direct AST validation approach

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

Author: devin-ai-integration[bot]

packages/deparser/__tests__/pretty/constraints-pretty.test.ts

@@ -1,6 +1,6 @@
 import { deparseSync } from '../../src';
 import { parse } from 'libpg-query';
-import { TestUtils } from '../../test-utils';
+import { expectParseDeparse } from '../../test-utils';
 
 describe('Pretty constraint formatting', () => {
   const foreignKeyConstraintSql = `ALTER TABLE products ADD CONSTRAINT fk_category FOREIGN KEY (category_id) REFERENCES categories(id) ON UPDATE CASCADE ON DELETE SET NULL DEFERRABLE INITIALLY DEFERRED;`;
@@ -56,17 +56,14 @@ describe('Pretty constraint formatting', () => {
   });
 
   it('should validate AST equivalence between original and pretty-formatted SQL', async () => {
-    const testUtils = new TestUtils();
     const testCases = [
-      { name: 'foreign key constraint', sql: foreignKeyConstraintSql },
-      { name: 'check constraint', sql: checkConstraintSql },
-      { name: 'complex table with constraints', sql: complexTableSql }
+      foreignKeyConstraintSql,
+      checkConstraintSql,
+      complexTableSql
     ];
 
-    for (const testCase of testCases) {
-      const originalParsed = await parse(testCase.sql);
-      const prettyFormatted = deparseSync(originalParsed, { pretty: true });
-      await testUtils.expectAstMatch(`pretty-${testCase.name}`, prettyFormatted);
+    for (const sql of testCases) {
+      await expectParseDeparse(sql, { pretty: true });
     }
   });
 });

packages/deparser/__tests__/pretty/create-policy-pretty.test.ts

@@ -1,6 +1,6 @@
 import { deparseSync } from '../../src';
 import { parse } from 'libpg-query';
-import { TestUtils } from '../../test-utils';
+import { expectParseDeparse } from '../../test-utils';
 
 describe('Pretty CREATE POLICY formatting', () => {
   const basicPolicySql = `CREATE POLICY user_policy ON users FOR ALL TO authenticated_users USING (user_id = current_user_id());`;
@@ -50,17 +50,14 @@ describe('Pretty CREATE POLICY formatting', () => {
   });
 
   it('should validate AST equivalence between original and pretty-formatted SQL', async () => {
-    const testUtils = new TestUtils();
     const testCases = [
-      { name: 'basic CREATE POLICY', sql: basicPolicySql },
-      { name: 'complex CREATE POLICY', sql: complexPolicySql },
-      { name: 'simple CREATE POLICY', sql: simplePolicySql }
+      basicPolicySql,
+      complexPolicySql,
+      simplePolicySql
     ];
 
-    for (const testCase of testCases) {
-      const originalParsed = await parse(testCase.sql);
-      const prettyFormatted = deparseSync(originalParsed, { pretty: true });
-      await testUtils.expectAstMatch(`pretty-${testCase.name}`, prettyFormatted);
+    for (const sql of testCases) {
+      await expectParseDeparse(sql, { pretty: true });
     }
   });
 });

packages/deparser/__tests__/pretty/create-table-pretty.test.ts

@@ -1,6 +1,6 @@
 import { deparseSync } from '../../src';
 import { parse } from 'libpg-query';
-import { TestUtils } from '../../test-utils';
+import { expectParseDeparse } from '../../test-utils';
 
 describe('Pretty CREATE TABLE formatting', () => {
   const basicTableSql = `CREATE TABLE users (id SERIAL PRIMARY KEY, name TEXT NOT NULL, email TEXT UNIQUE);`;
@@ -49,16 +49,13 @@ describe('Pretty CREATE TABLE formatting', () => {
   });
 
   it('should validate AST equivalence between original and pretty-formatted SQL', async () => {
-    const testUtils = new TestUtils();
     const testCases = [
-      { name: 'basic CREATE TABLE', sql: basicTableSql },
-      { name: 'complex CREATE TABLE', sql: complexTableSql }
+      basicTableSql,
+      complexTableSql
     ];
 
-    for (const testCase of testCases) {
-      const originalParsed = await parse(testCase.sql);
-      const prettyFormatted = deparseSync(originalParsed, { pretty: true });
-      await testUtils.expectAstMatch(`pretty-${testCase.name}`, prettyFormatted);
+    for (const sql of testCases) {
+      await expectParseDeparse(sql, { pretty: true });
     }
   });
 });

packages/deparser/__tests__/pretty/select-pretty.test.ts

@@ -1,6 +1,6 @@
 import { deparseSync } from '../../src';
 import { parse } from 'libpg-query';
-import { TestUtils } from '../../test-utils';
+import { expectParseDeparse } from '../../test-utils';
 
 describe('Pretty SELECT formatting', () => {
   const basicSelectSql = `SELECT id, name, email FROM users WHERE active = true;`;
@@ -58,18 +58,15 @@ describe('Pretty SELECT formatting', () => {
   });
 
   it('should validate AST equivalence between original and pretty-formatted SQL', async () => {
-    const testUtils = new TestUtils();
     const testCases = [
-      { name: 'basic SELECT', sql: basicSelectSql },
-      { name: 'complex SELECT', sql: complexSelectSql },
-      { name: 'SELECT with subquery', sql: selectWithSubquerySql },
-      { name: 'SELECT with UNION', sql: selectUnionSql }
+      basicSelectSql,
+      complexSelectSql,
+      selectWithSubquerySql,
+      selectUnionSql
     ];
 
-    for (const testCase of testCases) {
-      const originalParsed = await parse(testCase.sql);
-      const prettyFormatted = deparseSync(originalParsed, { pretty: true });
-      await testUtils.expectAstMatch(`pretty-${testCase.name}`, prettyFormatted);
+    for (const sql of testCases) {
+      await expectParseDeparse(sql, { pretty: true });
     }
   });
 });

packages/deparser/test-utils/index.ts

@@ -6,6 +6,17 @@ import * as path from 'path';
 import { expect } from '@jest/globals';
 import { diff } from 'jest-diff'
 
+export async function expectParseDeparse(sql1: string, options = { pretty: false }) {
+  const parsed = await parse(sql1);
+  
+  const sql2 = deparse(parsed, options);
+  
+  const ast1 = cleanTree(parsed);
+  const ast2 = cleanTree(await parse(sql2));
+  
+  expect(ast2).toEqual(ast1);
+}
+
 type ParseErrorType = 
   | 'PARSE_FAILED'
   | 'INVALID_STATEMENT'