fix github, json, apollo and prisma loader (#3189)

* sfix: skip pointers that cannot be loaded

* fix: json file loader

* fix prisma and apollo loaders

Author: n1ru4l

packages/loaders/apollo-engine/src/index.ts

@@ -58,7 +58,10 @@ export class ApolloEngineLoader implements Loader<ApolloEngineOptions> {
     return typeof ptr === 'string' && ptr === 'apollo-engine';
   }
 
-  async load(pointer: 'apollo-engine', options: ApolloEngineOptions): Promise<Source[]> {
+  async load(pointer: string, options: ApolloEngineOptions): Promise<Source[]> {
+    if (!(await this.canLoad(pointer))) {
+      return [];
+    }
     const fetchArgs = this.getFetchArgs(options);
     const response = await fetch(...fetchArgs);
 
@@ -72,7 +75,10 @@ export class ApolloEngineLoader implements Loader<ApolloEngineOptions> {
     return [source];
   }
 
-  loadSync(pointer: 'apollo-engine', options: ApolloEngineOptions): Source[] {
+  loadSync(pointer: string, options: ApolloEngineOptions): Source[] {
+    if (!this.canLoadSync(pointer)) {
+      return [];
+    }
     const fetchArgs = this.getFetchArgs(options);
     const response = syncFetch(...fetchArgs);
 

packages/loaders/github/src/index.ts

@@ -60,6 +60,9 @@ export class GithubLoader implements Loader<GithubLoaderOptions> {
   }
 
   async load(pointer: string, options: GithubLoaderOptions): Promise<Source[]> {
+    if (!(await this.canLoad(pointer))) {
+      return [];
+    }
     const { owner, name, ref, path } = extractData(pointer);
     const request = await fetch('https://api.github.com/graphql', {
       method: 'POST',

packages/loaders/github/tests/schema-from-github.spec.ts

@@ -98,3 +98,12 @@ test('load schema from GitHub', async () => {
   // schema
   expect(print(source.document)).toEqual(printSchema(buildSchema(typeDefs)));
 });
+
+test('simply skips schema for path that cannot be loaded', async () => {
+  const loader = new GithubLoader();
+
+  const result = await loader.load("./test/123", {
+    token,
+  });
+  expect(result).toEqual([])
+})

packages/loaders/json-file/src/index.ts

@@ -60,7 +60,6 @@ export class JsonFileLoader implements Loader {
     if (isValidPath(pointer)) {
       if (FILE_EXTENSIONS.find(extension => pointer.endsWith(extension))) {
         const normalizedFilePath = isAbsolute(pointer) ? pointer : resolve(options.cwd || cwd(), pointer);
-
         return existsSync(normalizedFilePath);
       }
     }
@@ -70,6 +69,9 @@ export class JsonFileLoader implements Loader {
 
   async load(pointer: string, options: JsonFileLoaderOptions): Promise<Source[]> {
     const normalizedFilePath = isAbsolute(pointer) ? pointer : resolve(options.cwd || cwd(), pointer);
+    if (!(await this.canLoad(normalizedFilePath, options))) {
+      return [];
+    }
 
     try {
       const jsonContent: string = await readFile(normalizedFilePath, { encoding: 'utf8' });
@@ -80,13 +82,16 @@ export class JsonFileLoader implements Loader {
   }
 
   loadSync(pointer: string, options: JsonFileLoaderOptions): Source[] {
-    const normalizedFilepath = isAbsolute(pointer) ? pointer : resolve(options.cwd || cwd(), pointer);
+    const normalizedFilePath = isAbsolute(pointer) ? pointer : resolve(options.cwd || cwd(), pointer);
+    if (!this.canLoadSync(normalizedFilePath, options)) {
+      return [];
+    }
 
     try {
-      const jsonContent = readFileSync(normalizedFilepath, 'utf8');
+      const jsonContent = readFileSync(normalizedFilePath, 'utf8');
       return [parseGraphQLJSON(pointer, jsonContent, options)];
     } catch (e) {
-      throw new Error(`Unable to read JSON file: ${normalizedFilepath}: ${e.message || /* istanbul ignore next */ e}`);
+      throw new Error(`Unable to read JSON file: ${normalizedFilePath}: ${e.message || /* istanbul ignore next */ e}`);
     }
   }
 }

packages/loaders/json-file/tests/loader.spec.ts

@@ -65,6 +65,10 @@ describe('JsonFileLoader', () => {
       it('should throw when the file content is malformed', async () => {
         await expect(load(getPointer('malformed.json'), {})).rejects.toThrowError('Unable to read JSON file');
       });
+      it('should skip file it cannot load', async () => {
+        const result = await load(getPointer('id_do_not_exist.json'), {});
+        expect(result).toEqual([])
+      })
     });
   });
 });

packages/loaders/prisma/src/index.ts

@@ -42,6 +42,9 @@ export class PrismaLoader extends UrlLoader {
   }
 
   async load(prismaConfigFilePath: string, options: PrismaLoaderOptions) {
+    if (!(await this.canLoad(prismaConfigFilePath, options))) {
+      return [];
+    }
     const { graceful, envVars } = options;
     const home = homedir();
     const env = new Environment(home);