songwriter
person who writes the words or music to songs
chansonnier
type of poet songwriter, in France and Quebec, Canada
singer-songwriter
musician who writes, composes and sings own songs
trouvere
medieval profession; poet-composers in the High Middle Ages who composed their works in the northern dialects of France