Gracefully skip unsupported AST analysis

Author: zth

CHANGELOG.md

@@ -1,5 +1,7 @@
 # main
 
+- Gracefully skip optional AST-based query analysis when `pgsql-ast-parser` cannot parse valid PostgreSQL syntax, so generation can continue with database-derived types.
+
 # 3.0.0
 
 - BREAKING: Require ReScript `>=12.0.0`.

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "pgtyped-rescript-query",
-  "version": "3.0.0",
+  "version": "3.0.1",
   "type": "module",
   "exports": {
     ".": {

packages/query/package.json

@@ -1,4 +1,8 @@
-import { generateHash, reduceTypeRows } from './actions.js';
+import {
+  generateHash,
+  parseQueryForAnalysis,
+  reduceTypeRows,
+} from './actions.js';
 
 test('test postgres md5 hash generation', () => {
   const salt = [0x81, 0xcc, 0x95, 0x8b];
@@ -195,3 +199,10 @@ test('reduce type rows to MappableTypes', () => {
     ]),
   ).toMatchSnapshot();
 });
+
+test('query analysis gracefully degrades for unsupported PostgreSQL syntax', () => {
+  expect(
+    parseQueryForAnalysis('with a as materialized (select 1) select * from a'),
+  ).toBeNull();
+  expect(parseQueryForAnalysis('select from')).toBeNull();
+});

packages/query/src/actions.test.ts

@@ -723,6 +723,18 @@ export function getAliasedLiterals(
   return map;
 }
 
+export function parseQueryForAnalysis(query: string): Statement[] | null {
+  try {
+    return parse(query);
+  } catch (err) {
+    debugQuery(
+      'Skipping AST-based query analysis because pgsql-ast-parser failed: %o',
+      err,
+    );
+    return null;
+  }
+}
+
 async function extraParameterInfo(query: Statement[]) {
   const paramsInfo = new Map<
     number,
@@ -789,9 +801,13 @@ export async function getTypes(
   const commentRows = await getComments(fields, queue);
   const checkRows = await getCheckConstraints(fields, queue);
   const typeMap = reduceTypeRows(typeRows);
-  const parsedQuery = parse(queryData.query);
-  const aliasedLiterals = getAliasedLiterals(parsedQuery);
-  const paramsInfo = await extraParameterInfo(parsedQuery);
+  const parsedQuery = parseQueryForAnalysis(queryData.query);
+  const aliasedLiterals =
+    parsedQuery == null
+      ? new Map<string, ConstraintValue[]>()
+      : getAliasedLiterals(parsedQuery);
+  const paramsInfo =
+    parsedQuery == null ? new Map() : await extraParameterInfo(parsedQuery);
 
   const attrMatcher = ({
     tableOID,