fix(typegen): improve ts typegen consistency between generation (#964)

fix(typegen): improve ts typegen consistency between generation (#964) #397