+23 −6 src/utils/matcher.js

+4 −3 src/utils/utils.js

+40 −7 test/utils/matcher.test.js

+4 −4 test/utils/utils.test.js