fix typins and matcher instance in callbacks

combine typings file to avoid configuration changes
pass readonly instance of matcher to the call backs to avoid accidental push/pop call