fix(gitlab): add proper client-side alias handling

packages/client/components/GitLabScopingSearchResults.tsx

@@ -59,15 +59,15 @@ const GitLabScopingSearchResults = (props: Props) => {
   >(
     graphql`
       fragment GitLabScopingSearchResults_query on Query
-        @argumentDefinitions(
-          projectsFirst: {type: "Int", defaultValue: 20}
-          issuesFirst: {type: "Int", defaultValue: 25}
-          projectsAfter: {type: "String"}
-          issuesAfter: {type: "String"}
-          search: {type: "String"}
-          projectIds: {type: "[ID!]", defaultValue: null}
-        )
-        @refetchable(queryName: "GitLabScopingSearchResultsPaginationQuery") {
+      @argumentDefinitions(
+        projectsFirst: {type: "Int", defaultValue: 20}
+        issuesFirst: {type: "Int", defaultValue: 25}
+        projectsAfter: {type: "String"}
+        issuesAfter: {type: "String"}
+        search: {type: "String"}
+        projectIds: {type: "[ID!]", defaultValue: null}
+      )
+      @refetchable(queryName: "GitLabScopingSearchResultsPaginationQuery") {
         viewer {
           ...NewGitLabIssueInput_viewer
           teamMember(teamId: $teamId) {
@@ -98,7 +98,6 @@ const GitLabScopingSearchResults = (props: Props) => {
                       edges {
                         node {
                           ... on _xGitLabProject {
-                            fullPath
                             issues(
                               includeSubepics: true
                               state: opened

packages/server/graphql/public/rootSchema.ts

@@ -1,4 +1,4 @@
-import {mergeSchemas} from '@graphql-tools/schema'
+import {addResolversToSchema, mergeSchemas} from '@graphql-tools/schema'
 import {GraphQLSchema} from 'graphql'
 import nestGitHubEndpoint from 'nest-graphql-endpoint/lib/nestGitHubEndpoint'
 import {IntegrationProviderGitLabOAuth2} from '../../postgres/queries/getIntegrationProvidersByIds'
@@ -66,11 +66,16 @@ const typeDefs = importAllStrings(require.context('./typeDefs', false, /.graphql
 
 const withNestedSchema = mergeSchemas({
   schemas: [withGitHubSchema, withGitLabSchema],
-  typeDefs,
-  // TODO apply this resolver to every type in the GitHub schema
-  // It is necessary any time client code uses an alias inside a wrapper
+  typeDefs
+})
+
+// IMPORTANT! mergeSchemas has a bug where resolvers will be overwritten by the default resolvers
+// See https://github.com/ardatan/graphql-tools/issues/4367
+const withNestedResolversSchema = addResolversToSchema({
+  schema: withNestedSchema,
   resolvers: composeResolvers(resolvers, permissions)
 })
+
 const addRequestors = (schema: GraphQLSchema) => {
   const finalSchema = schema as any
   finalSchema.githubRequest = githubRequest
@@ -81,7 +86,7 @@ const addRequestors = (schema: GraphQLSchema) => {
   }
 }
 
-const rootSchema = addRequestors(withNestedSchema)
+const rootSchema = addRequestors(withNestedResolversSchema)
 
 export type RootSchema = typeof rootSchema
 export default rootSchema

packages/server/graphql/public/types/_xGitLabProject.ts

@@ -1,7 +1,7 @@
 import {_XGitLabProjectResolvers} from '../resolverTypes'
 
 const _xGitLabProject: _XGitLabProjectResolvers = {
-  __isTypeOf: ({__typename}) => __typename === '_xGitLabProject',
+  __isTypeOf: ({id}) => id.startsWith('gid://'),
   service: () => 'gitlab'
 }
 

packages/server/graphql/public/types/_xGitLabQuery.ts

@@ -0,0 +1,19 @@
+import {GraphQLResolveInfo} from 'graphql'
+import {_XGitLabQueryResolvers} from '../resolverTypes'
+
+const resolveToFieldNameOrAlias = (
+  source: any,
+  _args: unknown,
+  _context: unknown,
+  info: GraphQLResolveInfo
+) => {
+  // fieldNodes will always have 1+ node
+  const key = info.fieldNodes[0]!.alias?.value ?? info.fieldName
+  return source[key]
+}
+
+const _xGitLabQuery: _XGitLabQueryResolvers = {
+  projects: resolveToFieldNameOrAlias
+}
+
+export default _xGitLabQuery