Improve withSearch type #1593

Job	Run time
Lint	43s
Smoke test - cli (macos-latest, 18.x)	2m 24s
Smoke test - cli (macos-latest, 20.x)	2m 17s
Smoke test - cli (ubuntu-latest, 18.x)	2m 18s
Test - cli (macos-latest, 18.x)	1m 3s
Smoke test - core, schema (18.x)	1m 51s
Test - core, schema, legacy-scripting-runner (18.x)	55s
Smoke test - cli (ubuntu-latest, 20.x)	2m 7s
Test - cli (macos-latest, 20.x)	47s
Smoke test - core, schema (20.x)	1m 39s
Test - core, schema, legacy-scripting-runner (20.x)	1m 7s
Test - cli (ubuntu-latest, 18.x)	1m 7s
Test - cli (ubuntu-latest, 20.x)	58s
Test - schema-to-ts	13s
	19m 29s

Provide feedback