fix(type): add scope in setter code to prevent `variable already declared #603

fix(type): add scope in setter code to prevent `variable already declared #603 #1470