feat: handle anyarray type case

Author: eEQK

src/app.ts

@@ -16,6 +16,7 @@ import ts, {
 	createPrinter,
 	createSourceFile,
 	factory,
+	addSyntheticLeadingComment,
 } from "typescript";
 
 import {
@@ -187,10 +188,15 @@ ${query.text.trim()}`,
 				nodesToPush.push(argsDecl(argIface, driver, query.params));
 			}
 			if (query.columns.length === 1) {
-				returnIface = driver.parseDatabaseType(
-					query.columns[0].type?.name ?? "",
+				const col = query.columns[0];
+				returnIface = driver.parseDatabaseType(col.type?.name ?? "");
+				addSyntheticLeadingComment(
+					nodesToPush.slice(-1)[0],
+					SyntaxKind.MultiLineCommentTrivia,
+					`${col.type.name}, ${col.arrayDims}: ${returnIface}`,
+					true,
 				);
-				if (query.columns[0].isArray) {
+				if (col.isArray || col.type?.name === "anyarray") {
 					returnIface += "[]";
 				}
 			} else if (query.columns.length > 1) {

src/drivers/postgres.ts

@@ -162,7 +162,11 @@ export class Driver {
 			keyword = factory.createKeywordTypeNode(SyntaxKind.StringKeyword);
 		}
 
-		if (column.isArray || column.arrayDims > 0) {
+		if (
+			column.type?.name === "anyarray" ||
+			column.isArray ||
+			column.arrayDims > 0
+		) {
 			const dims = Math.max(column.arrayDims || 1);
 			for (let i = 0; i < dims; i++) {
 				keyword = factory.createArrayTypeNode(keyword);

test/cases/aggregate.test.ts

@@ -1,15 +1,57 @@
 import { expect, it, describe } from "bun:test";
-import { db, gen, prepare, sql } from "../case";
+import { db, prepare, sql } from "../case";
 await prepare(sql`
-    -- name: AggEmails :one
-    SELECT array_agg(e.id::text)::text[] AS emails FROM emails e;
+    -- name: AggEmailsOne :one
+    SELECT array_agg(e.id)::text[] AS emails FROM emails e;
+
+    -- name: AggEmailsWithoutCastOne :one
+    SELECT array_agg(e.id) AS emails FROM emails e;
+
+    -- name: AggEmailsMany :many
+    SELECT 1 as foo, array_agg(e.id)::text[] AS emails FROM emails e;
+
+    -- name: AggEmailsWithoutCastMany :many
+    SELECT 1 as foo, array_agg(e.id) AS emails FROM emails e;
 `);
 
 describe("aggregation", () => {
-	it("returns an array type", async () => {
-		const result = await gen().aggEmails(db);
+	it("returns an array type in One mode", async () => {
+		const result = await (await import("./aggregate_sql")).aggEmailsOne(db);
+
+		result as string[];
+
+		expect(result).toHaveLength(3);
+		expect(Array.isArray(result)).toBe(true);
+	});
+
+	it("returns an array type in Many mode", async () => {
+		const result = await (await import("./aggregate_sql")).aggEmailsMany(db);
+
+		result[0].emails as string[];
+
+		expect(result[0].emails).toHaveLength(3);
+		expect(Array.isArray(result)).toBe(true);
+	});
+
+	it("returns an array type in a query without type cast in One mode", async () => {
+		const result = await (
+			await import("./aggregate_sql")
+		).aggEmailsWithoutCastOne(db);
+
+		result as string[];
 
 		expect(result).toHaveLength(3);
 		expect(Array.isArray(result)).toBe(true);
 	});
+
+	it("returns an array type in a query without type cast in Many mode", async () => {
+		const result = await (
+			await import("./aggregate_sql")
+		).aggEmailsWithoutCastMany(db);
+
+		result[0].emails as string[];
+
+		expect(result[0].emails).toHaveLength(3);
+		expect(Array.isArray(result)).toBe(true);
+	});
 });