.github/PULL_REQUEST_TEMPLATE.md

@@ -14,6 +14,9 @@
 Please include a summary of the change and which issue is fixed. Please also include relevant motivation and context. List any dependencies that are required for this change.
 
 Related # (issue)
+<!--
+  Please do not use "Fixed" or "Resolves". Keep "Related" as-is.
+-->
 
 ## Type of change
 

package.json

@@ -48,7 +48,7 @@
     "@babel/plugin-proposal-class-properties": "7.13.0",
     "@changesets/cli": "2.14.0",
     "@types/jest": "26.0.20",
-    "@types/node": "14.14.32",
+    "@types/node": "14.14.33",
     "@typescript-eslint/eslint-plugin": "4.17.0",
     "@typescript-eslint/parser": "4.17.0",
     "@ardatan/bob-the-bundler": "1.2.2",

packages/batch-delegate/package.json

@@ -29,7 +29,7 @@
   "devDependencies": {
     "@graphql-tools/schema": "7.1.3",
     "@graphql-tools/stitch": "7.4.0",
-    "@graphql-tools/utils": "7.5.1"
+    "@graphql-tools/utils": "7.5.2"
   },
   "publishConfig": {
     "access": "public",

packages/load-files/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @graphql-tools/load-files
 
+## 6.3.1
+
+### Patch Changes
+
+- 61889f28: fix(load-files): respect ignoredExtensions even if there is a specific file glob
+
 ## 6.3.0
 
 ### Minor Changes

packages/load-files/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-tools/load-files",
-  "version": "6.3.0",
+  "version": "6.3.1",
   "description": "A set of utils for faster development of GraphQL tools",
   "repository": {
     "type": "git",

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,6 +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 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');
+    });
   })
 });
 

packages/load-files/tests/test-assets/ignore-extensions/test.resolvers.d.ts

@@ -0,0 +1,5 @@
+export declare const resolvers: {
+    Query: {
+        foo: () => string;
+    };
+};

packages/load-files/tests/test-assets/ignore-extensions/test.resolvers.js

@@ -0,0 +1,5 @@
+module.exports.resolvers = {
+  Query: {
+    foo: () => 'FOO'
+  }
+}

packages/relay-operation-optimizer/package.json

@@ -32,7 +32,7 @@
   },
   "dependencies": {
     "@graphql-tools/utils": "^7.1.0",
-    "relay-compiler": "10.1.3",
+    "relay-compiler": "11.0.0",
     "tslib": "~2.1.0"
   },
   "devDependencies": {

packages/utils/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @graphql-tools/utils
 
+## 7.5.2
+
+### Patch Changes
+
+- de16fff4: Fix pruneSchema with unimplemented interfaces
+
 ## 7.5.1
 
 ### Patch Changes

packages/utils/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-tools/utils",
-  "version": "7.5.1",
+  "version": "7.5.2",
   "description": "Common package containing utils and types for GraphQL tools",
   "repository": {
     "type": "git",

packages/utils/src/prune.ts

@@ -49,7 +49,8 @@ export function pruneSchema(schema: GraphQLSchema, options: PruneSchemaOptions =
     const type = schema.getType(typeName);
     if ('getInterfaces' in type) {
       type.getInterfaces().forEach(iface => {
-        if (pruningContext.implementations[iface.name] == null) {
+        const implementations = getImplementations(pruningContext, iface);
+        if (implementations == null) {
           pruningContext.implementations[iface.name] = Object.create(null);
         }
         pruningContext.implementations[iface.name][type.name] = true;
@@ -76,11 +77,11 @@ export function pruneSchema(schema: GraphQLSchema, options: PruneSchemaOptions =
           return null;
         }
       } else if (isInterfaceType(type)) {
-        const implementations = pruningContext.implementations[type.name] || {};
+        const implementations = getImplementations(pruningContext, type);
 
         if (
           (!Object.keys(type.getFields()).length && !options.skipEmptyCompositeTypePruning) ||
-          (!Object.keys(implementations).length && !options.skipUnimplementedInterfacesPruning) ||
+          (implementations && !Object.keys(implementations).length && !options.skipUnimplementedInterfacesPruning) ||
           (pruningContext.unusedTypes[type.name] && !options.skipUnusedTypesPruning)
         ) {
           return null;
@@ -121,9 +122,12 @@ function visitOutputType(
     });
 
     if (isInterfaceType(type)) {
-      Object.keys(pruningContext.implementations[type.name]).forEach(typeName => {
-        visitOutputType(visitedTypes, pruningContext, pruningContext.schema.getType(typeName) as NamedOutputType);
-      });
+      const implementations = getImplementations(pruningContext, type);
+      if (implementations) {
+        Object.keys(implementations).forEach(typeName => {
+          visitOutputType(visitedTypes, pruningContext, pruningContext.schema.getType(typeName) as NamedOutputType);
+        });
+      }
     }
 
     if ('getInterfaces' in type) {
@@ -137,6 +141,16 @@ function visitOutputType(
   }
 }
 
+/**
+ * Get the implementations of an interface. May return undefined.
+ */
+function getImplementations(
+  pruningContext: PruningContext,
+  type: GraphQLNamedType
+): Record<string, boolean> | undefined {
+  return pruningContext.implementations[type.name];
+}
+
 function visitInputType(
   visitedTypes: Record<string, boolean>,
   pruningContext: PruningContext,

packages/utils/tests/prune.test.ts

@@ -1,7 +1,7 @@
 import { buildSchema } from 'graphql';
 import { pruneSchema } from '../src/prune';
 
-describe('prune', () => {
+describe('pruneSchema', () => {
   test('can handle recursive input types', () => {
     const schema = buildSchema(`
       input Input {
@@ -130,4 +130,18 @@ describe('prune', () => {
     expect(result.getType('UnusedType')).toBeUndefined();
     expect(result.getType('UnusedUnion')).toBeUndefined();
   });
+
+  test('does not throw on pruning unimplemented interfaces', () => {
+    const schema = buildSchema(`
+      interface UnimplementedInterface {
+        value: String
+      }
+
+      type Query {
+        foo: UnimplementedInterface
+      }
+    `);
+    const result = pruneSchema(schema);
+    expect(result.getType('UnimplementedInterface')).toBeDefined();
+  });
 });

yarn.lock

@@ -3977,10 +3977,10 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.9.tgz#04afc9a25c6ff93da14deabd65dc44485b53c8d6"
   integrity sha512-JsoLXFppG62tWTklIoO4knA+oDTYsmqWxHRvd4lpmfQRNhX6osheUOWETP2jMoV/2bEHuMra8Pp3Dmo/stBFcw==
 
-"@types/node@14.14.32":
-  version "14.14.32"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.32.tgz#90c5c4a8d72bbbfe53033f122341343249183448"
-  integrity sha512-/Ctrftx/zp4m8JOujM5ZhwzlWLx22nbQJiVqz8/zE15gOeEW+uly3FSX4fGFpcfEvFzXcMCJwq9lGVWgyARXhg==
+"@types/node@14.14.33":
+  version "14.14.33"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.33.tgz#9e4f8c64345522e4e8ce77b334a8aaa64e2b6c78"
+  integrity sha512-oJqcTrgPUF29oUP8AsUqbXGJNuPutsetaa9kTQAQce5Lx5dTYWV02ScBiT/k1BX/Z7pKeqedmvp39Wu4zR7N7g==
 
 "@types/node@^12.7.1":
   version "12.12.62"
@@ -13787,10 +13787,10 @@ relateurl@^0.2.7:
   resolved "https://registry.yarnpkg.com/relateurl/-/relateurl-0.2.7.tgz#54dbf377e51440aca90a4cd274600d3ff2d888a9"
   integrity sha1-VNvzd+UUQKypCkzSdGANP/LYiKk=
 
-relay-compiler@10.1.3:
-  version "10.1.3"
-  resolved "https://registry.yarnpkg.com/relay-compiler/-/relay-compiler-10.1.3.tgz#76ec4fd5d16f5b6aae61183f64b5caaef27f2525"
-  integrity sha512-AJoET3U8PrLXiA1/jmcr5beR/928+8c8qf46nOuumaNXhTfJC2RvN2fpD0APF0Fti+oKBxwKcQJ93R5BK6A2xw==
+relay-compiler@11.0.0:
+  version "11.0.0"
+  resolved "https://registry.yarnpkg.com/relay-compiler/-/relay-compiler-11.0.0.tgz#265bded552b0938ad597ea14b9488e3d818b99cf"
+  integrity sha512-xAVcnWBNtkIJqRwae2agY+riDhh00bV/HqwbcBYijK/S9jKPEFLx9FguGG1V8EWgS/barBsBMtE7CG916GtSrA==
   dependencies:
     "@babel/core" "^7.0.0"
     "@babel/generator" "^7.5.0"
@@ -13805,14 +13805,14 @@ relay-compiler@10.1.3:
     glob "^7.1.1"
     immutable "~3.7.6"
     nullthrows "^1.1.1"
-    relay-runtime "10.1.3"
+    relay-runtime "11.0.0"
     signedsource "^1.0.0"
     yargs "^15.3.1"
 
-relay-runtime@10.1.3:
-  version "10.1.3"
-  resolved "https://registry.yarnpkg.com/relay-runtime/-/relay-runtime-10.1.3.tgz#1d7bfe590b50cd7f18f6d1c0f20df71fe5bb451a"
-  integrity sha512-NSh4CaRRpUaziK72h4T5uKw6rvHovmS/xD9+czqUYg6yKv22ajwBE6SWmjwTSKnt2NBzIfDjh2C3heo9pLbvtg==
+relay-runtime@11.0.0:
+  version "11.0.0"
+  resolved "https://registry.yarnpkg.com/relay-runtime/-/relay-runtime-11.0.0.tgz#cb3244dc4e2919a51fdcbedddd5d13a20cf393e8"
+  integrity sha512-7oeyW4hulyK3p4eB63Rsllo/es83xflCAt2HMWCpH2q0fi21iJBR02kK3wCPM/yFwi3i0K83W+UksLFQdE0CaQ==
   dependencies:
     "@babel/runtime" "^7.0.0"
     fbjs "^3.0.0"