fix(load-files): respect ignoredExtensions even if there is a specific file glob

Author: ardatan

.changeset/slow-cherries-wonder.md

@@ -0,0 +1,5 @@
+---
+'@graphql-tools/load-files': patch
+---
+
+fix(load-files): respect ignoredExtensions even if there is a specific file glob

packages/load-files/src/index.ts

@@ -182,7 +182,16 @@ const checkExtension = (
   }
 
   for (const extension of extensions) {
-    if (path.endsWith(formatExtension(extension))) {
+    const formattedExtension = formatExtension(extension);
+    if (path.endsWith(formattedExtension)) {
+      if (ignoredExtensions) {
+        for (const ignoredExtension of ignoredExtensions) {
+          const formattedIgnoredExtension = formatExtension(ignoredExtension);
+          if (path.endsWith(formattedIgnoredExtension + formattedExtension)) {
+            return false;
+          }
+        }
+      }
       return true;
     }
   }

packages/load-files/tests/file-scanner.spec.ts

@@ -235,15 +235,24 @@ describe('file scanner', function() {
       expect(typeof loadedFiles[0][customQueryTypeName]['foo']).toBe('function');
       expect(loadedFiles[0][customQueryTypeName]['foo']()).toBe('FOO');
     });
-    it(`${type}: ignore .d.ts files by default`, async () => {
+    it(`${type}: ignore .d.ts files by default without file glob`, async () => {
       const loadedFiles = await loadFiles(join(__dirname, './test-assets/ignore-extensions'));
       expect(loadedFiles).toHaveLength(1);
       const resolvers = loadedFiles[0];
       expect(typeof resolvers).toBe('object');
       expect(typeof resolvers.Query).toBe('object');
       expect(typeof resolvers.Query.foo).toBe('function');
       expect(resolvers.Query.foo()).toBe('FOO');
-    })
+    });
+    it(`${type}: ignore .d.ts files by default without file glob`, async () => {
+      const loadedFiles = await loadFiles(join(__dirname, './test-assets/ignore-extensions/*.*'));
+      expect(loadedFiles).toHaveLength(1);
+      const resolvers = loadedFiles[0];
+      expect(typeof resolvers).toBe('object');
+      expect(typeof resolvers.Query).toBe('object');
+      expect(typeof resolvers.Query.foo).toBe('function');
+      expect(resolvers.Query.foo()).toBe('FOO');
+    });
   })
 });