add typescript generic type to functions to ensure type check

add typescript generic type to functions to ensure type check #2498