Factory Functions for Tables

[TimKochDev]

I'd love to build something like the code below.

const baseFields = {
  someField: text("some_field"),
} satisfies Record<string, PgColumnBuilderBase>;

function createTable<
  TTableName extends string,
  TExtraFields extends Record<string, PgColumnBuilderBase>,
>(tableName: TTableName, fieldsToAdd: TExtraFields) {
  const columns = {
    ...baseFields,
    ...fieldsToAdd,
  } satisfies Record<string, PgColumnBuilderBase>;
  const table = pgTable<TTableName, typeof columns>(tableName, columns);

  const upsert = async (db: UserDbContext, data: typeof table.$inferInsert) => {
    return await db.query(async (dbq) => {
      return await dbq.insert(table).values(data); // data doesn't match expected type. Expected type too large to copy here
    });
  };

  return { table, upsert };
}

Unfortunately, something is off with the types. No matter what way I try to have reusable table factories (or just service classes accepting tables with specific fields) the types just don't add up.

I have tried with both "drizzle-orm": "^0.39.1" and "drizzle-orm": "^0.44.2",