fix: handle ANY as a combination of the other types

Author: merceyz

src/inferQueryResult.ts

@@ -6,7 +6,6 @@ export enum ColumnType {
 	String = 1 << 2,
 	Buffer = 1 << 3,
 	Null = 1 << 4,
-	Any = 1 << 5,
 }
 
 export interface ColumnInfo {
@@ -28,7 +27,7 @@ SELECT
     WHEN (TYPE LIKE '%REAL%')
     OR (TYPE LIKE '%FLOA%')
     OR (TYPE LIKE '%DOUB%') THEN ${ColumnType.Number.toString()}
-    WHEN (TYPE == 'ANY' AND (SELECT strict FROM pragma_table_list(:tableName)) == 1) THEN ${ColumnType.Any.toString()}
+    WHEN (TYPE == 'ANY' AND (SELECT strict FROM pragma_table_list(:tableName)) == 1) THEN ${(ColumnType.String | ColumnType.Number | ColumnType.Buffer).toString()}
     ELSE ${ColumnType.Number.toString()}
   END type
 FROM

src/rules/typed-result.ts

@@ -225,13 +225,13 @@ function columnTypeToJSType(type: ColumnType): string {
 	if (type & ColumnType.Unknown) {
 		typeParts.push("unknown");
 	}
-	if (type & ColumnType.Any || type & ColumnType.Number) {
+	if (type & ColumnType.Number) {
 		typeParts.push("number");
 	}
-	if (type & ColumnType.Any || type & ColumnType.String) {
+	if (type & ColumnType.String) {
 		typeParts.push("string");
 	}
-	if (type & ColumnType.Any || type & ColumnType.Buffer) {
+	if (type & ColumnType.Buffer) {
 		typeParts.push("Buffer");
 	}
 	if (type & ColumnType.Null) {

tests/inferQueryResult.test.ts

@@ -66,7 +66,14 @@ it("should support column with strict ANY type", () => {
 	);
 
 	expect(result).toStrictEqual<typeof result>([
-		{ name: "id", type: ColumnType.Any | ColumnType.Null },
+		{
+			name: "id",
+			type:
+				ColumnType.String |
+				ColumnType.Number |
+				ColumnType.Buffer |
+				ColumnType.Null,
+		},
 	]);
 });
 

tests/rules/typed-result.test.ts

@@ -58,6 +58,15 @@ ruleTester.run("typed-result", rule, {
 		"db.prepare<[]>('DELETE FROM foo')",
 		// Should allow the user to set another type for unknown
 		`db.prepare<[], {"random()": (number | null)}>("SELECT random();")`,
+		// Test that no errors are reported for the outputs from the invalid cases
+		`db.prepare<[], {"id": number}>("SELECT id FROM users")`,
+		'db.prepare<[], {"id": number}>(`SELECT id FROM users`)',
+		`const query = 'SELECT id FROM users';db.prepare<[], {"id": number}>(query);`,
+		`db.prepare<[], {"id": number | null}>("SELECT * FROM foo")`,
+		`db.prepare<[], {"id": number | string | Buffer}>("SELECT id FROM test")`,
+		`db.prepare<[], {"name": number | string | Buffer | null}>("SELECT name FROM test")`,
+		`db.prepare<[]>("DELETE FROM foo")`,
+		`db.prepare<[], {"random()": (foo | number), "id": number}>("SELECT random(), id FROM users")`,
 	],
 	invalid: [
 		// Query as string Literal