Swaddle for naps?

Do you all swaddle for naps or just lie them down? What if baby falls asleep on you and you want to transition them to their bassinet? I think swaddling at that point would wake them up and start all over?