Remove gql module's dependency on query. Make it the other way round. GraphQL query string, now gets converted into query.SubGraph as an additional step run via query.ToSubGraph.