Fix Source vs Types.DocumentFile usage for type correctness

Author: eddeee888

packages/graphql-codegen-cli/src/load.ts

@@ -1,5 +1,6 @@
 import { extname, join } from 'path';
 import { GraphQLError, GraphQLSchema } from 'graphql';
+import type { Source } from 'graphql-config';
 import { Types } from '@graphql-codegen/plugin-helpers';
 import { ApolloEngineLoader } from '@graphql-tools/apollo-engine-loader';
 import { CodeFileLoader } from '@graphql-tools/code-file-loader';
@@ -68,8 +69,8 @@ export async function loadSchema(
 
 export async function loadDocuments(
   documentPointers: UnnormalizedTypeDefPointer | UnnormalizedTypeDefPointer[],
-  config: Types.Config,
-): Promise<Types.DocumentFile[]> {
+  config: Types.Config
+): Promise<Source[]> {
   const loaders = [
     new CodeFileLoader({
       pluckConfig: {

packages/plugins/other/visitor-plugin-common/src/optimize-operations.ts

@@ -14,6 +14,7 @@ export function optimizeOperations(
   );
 
   return newDocuments.map((document, index) => ({
+    ...documents[index],
     location: documents[index]?.location || 'optimized by relay',
     document,
   }));

packages/plugins/typescript/gql-tag-operations/src/index.ts

@@ -1,15 +1,15 @@
 import { FragmentDefinitionNode, OperationDefinitionNode } from 'graphql';
 import { normalizeImportExtension, PluginFunction } from '@graphql-codegen/plugin-helpers';
 import { DocumentMode } from '@graphql-codegen/visitor-plugin-common';
-import { Source } from '@graphql-tools/utils';
+import type { Types } from '@graphql-codegen/plugin-helpers';
 
 export type OperationOrFragment = {
   initialName: string;
   definition: OperationDefinitionNode | FragmentDefinitionNode;
 };
 
 export type SourceWithOperations = {
-  source: Source;
+  source: Types.DocumentFile;
   operations: Array<OperationOrFragment>;
 };
 

packages/presets/client/src/process-sources.ts

@@ -1,10 +1,13 @@
 import { FragmentDefinitionNode, OperationDefinitionNode } from 'graphql';
 import { OperationOrFragment, SourceWithOperations } from '@graphql-codegen/gql-tag-operations';
-import { Source } from '@graphql-tools/utils';
+import type { Types } from '@graphql-codegen/plugin-helpers';
 
 export type BuildNameFunction = (type: OperationDefinitionNode | FragmentDefinitionNode) => string;
 
-export function processSources(sources: Array<Source>, buildName: BuildNameFunction) {
+export function processSources(
+  sources: Array<Types.DocumentFile>,
+  buildName: BuildNameFunction
+): Array<SourceWithOperations> {
   const sourcesWithOperations: Array<SourceWithOperations> = [];
 
   for (const originalSource of sources) {
@@ -86,7 +89,7 @@ export function processSources(sources: Array<Source>, buildName: BuildNameFunct
  *
  * @param source
  */
-function fixLinebreaks(source: Source) {
+function fixLinebreaks(source: Types.DocumentFile) {
   const fixedSource = { ...source };
 
   fixedSource.rawSDL = source.rawSDL.replace(/\r\n/g, '\n');