The desire or more rightly said “vow” for the laver of regeneration effects Justification, not the state of grace. Justification is a translation and not a state. To be effected is not to be finished, as well…but at least begun and in the process of finishing.
Justification consists of the remission of sin and the infusion of sanctifying grace. Those who die in that state are saved. And, as you note, “desire” effects Justification.
Those who receive Baptism by water receive a sacrament; in addition to the remission of sin and infusion of sanctifying grace there is a sacramental character that comes with the sacrament. Baptism of desire and Baptism of blood are not sacraments; they do not confer the special sacramental graces of water Baptism - but they do effect the remission of sin and the life of sanctifying grace.
So…no…the Church has not always held what article #1258 from the CCC says…
**St. Ambrose’s **funeral oration for the Emperor Valentine II, who died without Baptism:
“Should he not acquire the grace for which he longed? Certainly: As he desired it, he has attained it… His pious desire has absolved him.” (De obitu Valent. 51, 53)
**St. Augustine **in “On Baptism…”
newadvent.org/fathers/14084.htm
Chapter 22.
30. That the place of baptism is sometimes supplied by martyrdom is supported by an argument by no means trivial, which the blessed Cyprian adduces from the thief, to whom, though he was not baptized, it was yet said, “Today shall you be with me in Paradise.” Luke 23:43 On considering which, again and again, I find that not only martyrdom for the sake of Christ may supply what was wanting of baptism, but also faith and conversion of heart, if recourse may not be had to the celebration of the mystery of baptism for want of time. For neither was that thief crucified for the name of Christ, but as the reward of his own deeds; nor did he suffer because he believed, but he believed while suffering. It was shown, therefore, in the case of that thief, how great is the power, even without the visible sacrament of baptism, of what the apostle says……
……….
Chapter 25.
33. By all these considerations it is proved that the sacrament of baptism is one thing, the conversion of the heart another; but that man’s salvation is made complete through the two together. Nor are we to suppose that, if one of these be wanting, it necessarily follows that the other is wanting also; because the sacrament may exist in the infant without the conversion of the heart; and this was found to be possible without the sacrament in the case of the thief, God in either case filling up what was involuntarily wanting. But when either of these requisites is wanting intentionally, then the man is responsible for the omission.
Pope Innocent II(Denzinger #388
catecheticsonline.com/?p=196)
Baptism of Desire (an unbaptized priest) *
388 [From the letter “Apostolicam Sedem” to the Bishop
of Cremona, of uncertain time]
To your inquiry we respond thus: We assert without hesitation (on the authority of the holy Fathers Augustine and Ambrose) that the priest whom you indicated (in your letter) had died without the water of baptism, because he persevered in the faith of holy mother the Church and in the confession of the name of Christ, was freed from original sin and attained the joy of the heavenly fatherland. Read (brother) in the eighth book of Augustine’s “City of God” * where among other things it is written, “Baptism is ministered invisibly to one whom not contempt of religion but death excludes.” Read again the book also of the blessed Ambrose concerning the death of Valentinian * where he says the same thing. Therefore, to questions concerning the dead, you should hold the opinions of the learned Fathers’ and in your church you should join in prayers and you should have sacrifices offered to God for the priest mentioned.
Quote:
Council of Trent. Session Six.
On Justification.
Of this Justification…; **the instrumental cause is the Sacrament of Baptism, which is the Sacrament of faith, without which (faith) no man was ever justified; **
lastly, the alone formal cause is the justice of God, not that whereby He Himself is just, but that whereby He maketh us just, that, to wit, with which we being endowed by Him, are renewed in the spirit of our mind, and we are not only reputed, but are truly called, and are, just, receiving justice within us, each one according to his own measure, which the Holy Ghost distributes to everyone as He wills, and according to each one’s proper disposition and co-operation.
Note that it says"without which (faith) no man was ever justified;" It does not say “without which sacrament no man was ever justified”.