refactor: replace .map().flat() with .flatMap()

refactor: replace .map().flat() with .flatMap() #8883