fix: improve client-side regex statement parser (#1328)

fix: improve client-side regex statement parser (#1328) #15413