All elves who had ever lived in Valinor would be considered Calaquendi.
Tolkien's most in depth description of the term can be found in his work "Quendi and Eldar", published in The War of the Jewels.
Here Tolkien explains that the original primitive elvish word kala-kwendī referred to the elves who had made the decision to leave Middle-earth and seek the Light of Valinor, but that once in Valinor this word evolved into the Quenya word Kalaquendi, which was now used to refer to all elves who were currently living in Valinor or who had lived there in the past.
(J.R.R. Tolkien in his writings always uses "Kalaquendi", but Christopher Tolkien in The Silmarillion switched it to "Calaquendi" to better match the spelling conventions used in The Lord of the Rings.)
There also existed two old compounds containing *kwendī: *kala-kwendī and *mori-kwendī, the Light-folk and the Dark-folk. These terms appear to go back to the period before the Separation, or rather to the time of the debate among the Quendi concerning the invitation of the Valar. They were evidently made by the party favourable to Oromë, and referred originally to those who desired the Light of Valinor (where the ambassadors of the Elves reported that there was no darkness), and those who did not wish for a place in which there was no night. But already before the final separation *mori-kwendī may have referred to the glooms and the clouds dimming the sun and the stars during the War of the Valar and Melkor, so that the term from the beginning had a tinge of scorn, implying that such folk were not averse to the shadows of Melkor upon Middle-earth.
The lineal descendants of these terms survived only in the languages of Aman. The Quenya forms were Kalaquendi and Moriquendi. The Kalaquendi in Quenya applied only to the Elves who actually lived or had lived in Aman; and the Moriquendi was applied to all others, whether they had come on the March or not. The latter were regarded as greatly inferior to the Kalaquendi, who had experienced the Light of Valinor, and had also acquired far greater knowledge and powers by their association with the Valar and Maiar.
In the period of Exile the Ñoldor modified their use of these terms, which was offensive to the Sindar. Kalaquendi went out of use, except in written Ñoldorin lore. Moriquendi was now applied to all other Elves, except the Ñoldor and Sindar, that is to Avari or to any kind of Elves that at the time of the coming of the Noldor had not long dwelt in Beleriand and were not subjects of Elwe. It was never applied, however, to any but Elvish peoples. The old distinction, when made, was represented by the new terms Amanyar 'those of Aman', and Úamanyar or Úmanyar 'those not of Aman', beside the longer forms
Amaneldi and Úmaneldi.
The War of the Jewels - "Quendi and Eldar"
Note also that Tolkien's usage of Calaquendi often implies that it's a regional descriptor, just meaning the elves who were living in Valinor.
But that evil lay as yet in the days to come, and the first meeting of the Sindar and the Noldor was eager and glad, though parley was at first not easy between them, for in their long severance the tongue of the Kalaquendi in Valinor and the Moriquendi in Beleriand had drawn far apart.
The War of the Jewels - The Grey Annals - 1497 - §48