JSON

Author: pyramation

packages/deparser/scripts/make-fixtures.ts

@@ -2,6 +2,7 @@
 import * as path from 'path';
 import * as fs from 'fs';
 import { sync as globSync } from 'glob';
+import { parse } from 'libpg-query';
 import { splitStatements, generateStatementKey } from '../src/utils/statement-splitter';
 
 const FIXTURE_DIR = path.join(__dirname, '../../../__fixtures__/kitchen-sink');
@@ -30,7 +31,16 @@ async function main() {
 
       for (const stmt of statements) {
         const key = generateStatementKey(relPath, stmt.index);
-        results[key] = stmt.statement;
+        
+        // Validate that the extracted statement parses correctly on its own
+        try {
+          await parse(stmt.statement);
+          results[key] = stmt.statement;
+        } catch (parseErr: any) {
+          console.error(`Failed to parse extracted statement ${key}:`, parseErr.message);
+          console.error(`Statement: ${stmt.statement.substring(0, 200)}${stmt.statement.length > 200 ? '...' : ''}`);
+          // Skip this statement - don't add it to results
+        }
       }
     } catch (err: any) {
       console.error(`Failed to parse ${relPath}:`, err);

packages/deparser/scripts/make-upstream-diff.ts

@@ -62,28 +62,31 @@ async function main() {
         // Get our deparse and its AST
         let ourDeparsedSql: string | undefined;
         let ourAst: any;
+        let ourDeParseError = false;
         try {
           ourDeparsedSql = ourDeparse(rawStmt.stmt);
           const ourParsed = await parse(ourDeparsedSql);
           ourAst = cleanTree(ourParsed.stmts?.[0]?.stmt);
         } catch (err: any) {
           console.error(`Failed to process our deparse for statement ${stmt.index + 1} in ${relPath}:`, err);
-          // Continue with just upstream comparison
+          ourDeParseError = true;
+          // Keep ourDeparsedSql so we can still show it in results even if it doesn't parse
         }
 
         // Compare ASTs to source of truth only
         const upstreamMatches = JSON.stringify(upstreamAst) === JSON.stringify(sourceOfTruthAst);
         const ourMatches = ourAst ? JSON.stringify(ourAst) === JSON.stringify(sourceOfTruthAst) : false;
 
-        // Only include if either deparser differs from original
-        if (!upstreamMatches || !ourMatches) {
+        
+        // Only include if either deparser differs from original OR our deparser failed to parse
+        if (!upstreamMatches || !ourMatches || ourDeParseError) {
           const key = generateStatementKey(relPath, stmt.index);
           results[key] = {
             original: stmt.statement,
             // Show upstream only if it differs from original
             ...(!upstreamMatches && upstreamSql && { upstream: upstreamSql }),
-            // Show our deparser only if it differs from original
-            ...(!ourMatches && ourDeparsedSql && { deparsed: ourDeparsedSql })
+            // Show our deparser if it differs from original OR if it failed to parse (both indicate issues)
+            ...((!ourMatches || ourDeParseError) && ourDeparsedSql && { deparsed: ourDeparsedSql })
           };
         }
       }