Merge pull request #2991 from hey-api/refactor/dsl-type-nodes-5

Merge pull request #2991 from hey-api/refactor/dsl-type-nodes-5 #4882