add variables replacement before macros replacement

[lunaticusgreen]

fix #815

[github-actions]

Pull Request Test Coverage Report for Build 17143055568

Details

• 1 of 1 (100.0%) changed or added relevant line in 1 file are covered.
• 726 unchanged lines in 8 files lost coverage.
• Overall coverage decreased (-23.5%) to 42.296%

---

Files with Coverage Reduction	New Missed Lines	%
pkg/main.go	5	0.0%
pkg/query.go	54	0.0%
pkg/client.go	83	0.0%
pkg/datasource.go	85	0.0%
pkg/parser.go	87	0.0%
pkg/eval/eval_query.go	116	78.0%
pkg/response.go	133	0.0%
pkg/resource_handlers.go	163	0.0%

Totals
Change from base Build 16992543564:	-23.5%
Covered Lines:	1433
Relevant Lines:	3388

---

💛 - Coveralls

[Slach]

don't forget add yellow warning about intersection template variable names and macros names