How do I make Drizzle infer the correct return type when dynamically adding a custom select field

[juniorforlife]

I'm building a query using a helper like this:

export function createBaseVideoQuery<T extends Record<string, any> = {}>(
  customFields?: T
) {
  const baseFields = getTableColumns(videosTable);

  const query = db
    .select({ ...baseFields, ...customFields })
    .from(videosTable)
    .$dynamic();

  return query;
}

export function withQuestionCount() {
  return {
    question_count: sql`COALESCE((
      SELECT COUNT(*) 
      FROM questions q
      WHERE ...
    ), 0)`.as("question_count"),
  };
}

Then I pass it into my base query builder:

const query = createBaseVideoQuery({ ...withQuestionCount() })
  .$dynamic();

When execute the query, the response does have the question_count field BUT TypeScript says question_count doesn't exist.
What am I doing wrong here?