singer-songwriter

n. Person who sings and writes songs.