fix(file-loader): location path must be normalized (ardatan#3121)

alinsimoc · Jul 1, 2021 · 63e048f · 63e048f
1 parent 4f3e2f5
commit 63e048f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/.changeset/eighty-books-develop.md b/.changeset/eighty-books-develop.md
@@ -0,0 +1,5 @@
+---
+'@graphql-tools/graphql-file-loader': patch
+---
+
+fix(file-loader): location path must be normalized
diff --git a/packages/load/tests/loaders/schema/schema-from-typedefs.spec.ts b/packages/load/tests/loaders/schema/schema-from-typedefs.spec.ts
@@ -152,7 +152,7 @@ describe('schema from typedefs', () => {
       expect(schemaWithSources.extensions['sources']).toBeDefined();
       expect(schemaWithSources.extensions['sources']).toHaveLength(1);
       expect(schemaWithSources.extensions['sources'][0]).toMatchObject(expect.objectContaining({
-        name: glob
+        name: glob.replace('.', process.cwd())
       }))
 
       const schemaWithoutSources = await load(glob, {

diff --git a/packages/loaders/graphql-file/src/index.ts b/packages/loaders/graphql-file/src/index.ts
@@ -127,13 +127,13 @@ export class GraphQLFileLoader implements UniversalLoader<GraphQLFileLoaderOptio
     const normalizedFilePath = isAbsolute(pointer) ? pointer : resolve(options.cwd || processCwd(), pointer);
     const rawSDL: string = await readFile(normalizedFilePath, { encoding: 'utf8' });
 
-    return this.handleFileContent(rawSDL, pointer, options);
+    return this.handleFileContent(rawSDL, normalizedFilePath, options);
   }
 
   loadSync(pointer: SchemaPointerSingle | DocumentPointerSingle, options: GraphQLFileLoaderOptions): Source {
     const normalizedFilePath = isAbsolute(pointer) ? pointer : resolve(options.cwd || processCwd(), pointer);
     const rawSDL = readFileSync(normalizedFilePath, { encoding: 'utf8' });
-    return this.handleFileContent(rawSDL, pointer, options);
+    return this.handleFileContent(rawSDL, normalizedFilePath, options);
   }
 
   handleFileContent(rawSDL: string, pointer: string, options: GraphQLFileLoaderOptions) {