fix(load): load from all loaders at once even if one returns some result (#3184)

* Try to load afrom all loaders

* TypeScript :)

* add test

Co-authored-by: Laurin Quast <[email protected]>

Author: ardatan

packages/load/src/load-typedefs/load-file.ts

@@ -1,47 +1,47 @@
-import { Source, Maybe, isSome } from '@graphql-tools/utils';
+import { Source } from '@graphql-tools/utils';
 import { env } from 'process';
 import { LoadTypedefsOptions } from '../load-typedefs';
 
-export async function loadFile(pointer: string, options: LoadTypedefsOptions): Promise<Maybe<Source[]>> {
+export async function loadFile(pointer: string, options: LoadTypedefsOptions): Promise<Source[]> {
   const cached = useCache({ pointer, options });
 
   if (cached) {
     return cached;
   }
 
-  for await (const loader of options.loaders) {
-    try {
-      const loadedValue = await loader.load(pointer, options);
-      if (!isSome(loadedValue) || loadedValue.length === 0) {
-        continue;
-      }
-      return loadedValue;
-    } catch (error) {
-      if (env['DEBUG']) {
-        console.error(`Failed to find any GraphQL type definitions in: ${pointer} - ${error.message}`);
+  const results: Source[] = [];
+
+  await Promise.all(
+    options.loaders.map(async loader => {
+      try {
+        const loaderResults = await loader.load(pointer, options);
+        loaderResults?.forEach(result => results.push(result));
+      } catch (error) {
+        if (env['DEBUG']) {
+          console.error(`Failed to find any GraphQL type definitions in: ${pointer} - ${error.message}`);
+        }
+        throw error;
       }
-      throw error;
-    }
-  }
+    })
+  );
 
-  return undefined;
+  return results;
 }
 
-export function loadFileSync(pointer: string, options: LoadTypedefsOptions): Maybe<Source[]> {
+export function loadFileSync(pointer: string, options: LoadTypedefsOptions): Source[] {
   const cached = useCache({ pointer, options });
 
   if (cached) {
     return cached;
   }
 
+  const results: Source[] = [];
+
   for (const loader of options.loaders) {
     try {
       // We check for the existence so it is okay to force non null
-      const loadedValue = loader.loadSync!(pointer, options);
-      if (!isSome(loadedValue) || loadedValue.length === 0) {
-        continue;
-      }
-      return loadedValue;
+      const loaderResults = loader.loadSync!(pointer, options);
+      loaderResults?.forEach(result => results.push(result));
     } catch (error) {
       if (env['DEBUG']) {
         console.error(`Failed to find any GraphQL type definitions in: ${pointer} - ${error.message}`);
@@ -50,7 +50,7 @@ export function loadFileSync(pointer: string, options: LoadTypedefsOptions): May
     }
   }
 
-  return undefined;
+  return results;
 }
 
 function useCache<T extends any>({ pointer, options }: { pointer: string; options: T }) {

packages/load/tests/loaders/documents/documents-from-glob.spec.ts

@@ -140,5 +140,14 @@ describe('documentsFromGlob', () => {
       });
       expect(result.length).toBe(1);
     })
+    test(`should try loading using all loaders`, async () => {
+      const glob = join(__dirname, './test-files/', '(tags.js|2.graphql)');
+      const result = await load(glob, {
+        loaders: [new GraphQLFileLoader(), new CodeFileLoader()],
+      });
+      // 1 from 2.graphql
+      // 2 from tags.js
+      expect(result.length).toEqual(3);
+    })
   })
 });