That can narrow beam

I have a flashlight I got in Shenzhen about 6 years back that is finally starting to die. The best feature it had was that you could adjust the lens on it such that you could focus the light into a square (the shape of the LED) or you could spread it out like a normal flashlight. I use that feature constantly. A built in laser pointer would probably also be OK, I suppose.

It also uses a single 18650, which I think I'd like to stick with.

Any suggestions for a flashlight like this? Focusable light and 18650? I mostly will be using it inside my house for home maintenance stuff, but also the occasional camping trip.

The term for it is "zoomable" if you'd like to try it on your favorite shopping website. However the results tend towards off-brand lights rather than the name-brands (at least not on the first page). I actually ordered one of the generic *fire brands but the shipping to my country (Philippines) is crazy long so I don't have it yet and can't comment just yet.