package.json

@@ -48,7 +48,7 @@
     "@babel/preset-typescript": "7.13.0",
     "@changesets/cli": "2.16.0",
     "@types/jest": "26.0.22",
-    "@types/node": "14.14.37",
+    "@types/node": "14.14.41",
     "@typescript-eslint/eslint-plugin": "4.22.0",
     "@typescript-eslint/parser": "4.22.0",
     "babel-jest": "26.6.3",
@@ -61,15 +61,15 @@
     "eslint-plugin-promise": "5.1.0",
     "eslint-plugin-standard": "5.0.0",
     "graphql": "15.5.0",
-    "graphql-helix": "1.2.3",
+    "graphql-helix": "1.3.0",
     "graphql-subscriptions": "1.2.1",
     "husky": "6.0.0",
     "jest": "26.6.3",
     "lint-staged": "10.5.4",
     "nock": "13.0.11",
     "patch-package": "6.4.7",
     "prettier": "2.2.1",
-    "ts-jest": "26.5.4",
+    "ts-jest": "26.5.5",
     "typedoc": "0.20.35",
     "typedoc-plugin-markdown": "3.6.1",
     "typescript": "4.2.4"

packages/batch-delegate/package.json

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

packages/merge/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @graphql-tools/merge
 
+## 6.2.13
+
+### Patch Changes
+
+- 60a9c9a5: fix(merge): handle arrays correctly
+
 ## 6.2.12
 
 ### Patch Changes

packages/merge/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-tools/merge",
-  "version": "6.2.12",
+  "version": "6.2.13",
   "description": "A set of utils for faster development of GraphQL tools",
   "repository": {
     "type": "git",

packages/merge/src/typedefs-mergers/merge-typedefs.ts

@@ -122,7 +122,7 @@ function visitTypeSources(
   for (const type of types) {
     if (type) {
       if (Array.isArray(type)) {
-        visitTypeSources(types, allNodes);
+        visitTypeSources(type, allNodes);
       } else if (isSchema(type)) {
         const documentNode = getDocumentNodeFromSchema(type);
         visitTypeSources(documentNode.definitions as DefinitionNode[], allNodes);

packages/relay-operation-optimizer/package.json

@@ -32,7 +32,7 @@
   },
   "dependencies": {
     "@graphql-tools/utils": "^7.1.0",
-    "relay-compiler": "11.0.1",
+    "relay-compiler": "11.0.2",
     "tslib": "~2.2.0"
   },
   "devDependencies": {

packages/utils/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @graphql-tools/utils
 
+## 7.7.3
+
+### Patch Changes
+
+- d2a17c70: enhance(printSchemaWithDirectives): show directives before other definitions #2752
+
 ## 7.7.2
 
 ### Patch Changes

packages/utils/package.json

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

packages/utils/src/print-schema-with-directives.ts

@@ -65,6 +65,15 @@ export function getDocumentNodeFromSchema(
   const schemaNode = astFromSchema(schema, pathToDirectivesInExtensions);
   const definitions: Array<DefinitionNode> = schemaNode != null ? [schemaNode] : [];
 
+  const directives = schema.getDirectives();
+  for (const directive of directives) {
+    if (isSpecifiedDirective(directive)) {
+      continue;
+    }
+
+    definitions.push(astFromDirective(directive, schema, pathToDirectivesInExtensions));
+  }
+
   for (const typeName in typesMap) {
     const type = typesMap[typeName];
     const isPredefinedScalar = isSpecifiedScalarType(type);
@@ -91,15 +100,6 @@ export function getDocumentNodeFromSchema(
     }
   }
 
-  const directives = schema.getDirectives();
-  for (const directive of directives) {
-    if (isSpecifiedDirective(directive)) {
-      continue;
-    }
-
-    definitions.push(astFromDirective(directive, schema, pathToDirectivesInExtensions));
-  }
-
   return {
     kind: Kind.DOCUMENT,
     definitions,

yarn.lock

@@ -2840,10 +2840,10 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.35.tgz#42c953a4e2b18ab931f72477e7012172f4ffa313"
   integrity sha512-Lt+wj8NVPx0zUmUwumiVXapmaLUcAk3yPuHCFVXras9k5VT9TdhJqKqGVUQCD60OTMCl0qxJ57OiTL0Mic3Iag==
 
-"@types/node@14.14.37":
-  version "14.14.37"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.37.tgz#a3dd8da4eb84a996c36e331df98d82abd76b516e"
-  integrity sha512-XYmBiy+ohOR4Lh5jE379fV2IU+6Jn4g5qASinhitfyO71b/sCo6MKsMLF5tc7Zf2CE8hViVQyYSobJNke8OvUw==
+"@types/node@14.14.41":
+  version "14.14.41"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.41.tgz#d0b939d94c1d7bd53d04824af45f1139b8c45615"
+  integrity sha512-dueRKfaJL4RTtSa7bWeTK1M+VH+Gns73oCgzvYfHZywRCoPSd8EkXBL0mZ9unPTveBn+D9phZBaxuzpwjWkW0g==
 
 "@types/node@^12.7.1":
   version "12.20.6"
@@ -7292,10 +7292,10 @@ grapheme-splitter@^1.0.4:
   resolved "https://registry.yarnpkg.com/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz#9cf3a665c6247479896834af35cf1dbb4400767e"
   integrity sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==
 
-graphql-helix@1.2.3:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/graphql-helix/-/graphql-helix-1.2.3.tgz#eaad4db338e2cdf6f5799478d1b05125ff19cd04"
-  integrity sha512-psBs23Md/Nt0qsNOv5K+MqqsJ09lTyYtoujGAlFuE1+twUBQiKyanOYk3cqs9BtnJ7JsS+JlsS2/0ceE+20RCA==
+graphql-helix@1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/graphql-helix/-/graphql-helix-1.3.0.tgz#5ce23b0f041a90bfc98477916459849a4605f43a"
+  integrity sha512-hBfCOoW7KRU7mbHS1lgpCiq/yWotz1ctT2a/9XUv3T9gC3yr3biiPNKUjmtFwR8SfhjXDeK3C139a9Jx5TDIWQ==
 
 graphql-request@^3.3.0:
   version "3.4.0"
@@ -8027,6 +8027,13 @@ interpret@^1.0.0:
   resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.4.0.tgz#665ab8bc4da27a774a40584e812e3e0fa45b1a1e"
   integrity sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==
 
+invariant@^2.2.4:
+  version "2.2.4"
+  resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6"
+  integrity sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==
+  dependencies:
+    loose-envify "^1.0.0"
+
 ip-regex@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-2.1.0.tgz#fa78bf5d2e6913c911ce9f819ee5146bb6d844e9"
@@ -12370,10 +12377,10 @@ relateurl@^0.2.7:
   resolved "https://registry.yarnpkg.com/relateurl/-/relateurl-0.2.7.tgz#54dbf377e51440aca90a4cd274600d3ff2d888a9"
   integrity sha1-VNvzd+UUQKypCkzSdGANP/LYiKk=
 
-relay-compiler@11.0.1:
-  version "11.0.1"
-  resolved "https://registry.yarnpkg.com/relay-compiler/-/relay-compiler-11.0.1.tgz#157849f2ee0f54447acfe718a629301d5f44124e"
-  integrity sha512-oFtnkbF2pzRISlfnNE87sy+vv+nqwLTZO/coF3SotOPFqPVgMJFT/lR9pIDeGzMuNrLn33eVbOBP//LDV31DFQ==
+relay-compiler@11.0.2:
+  version "11.0.2"
+  resolved "https://registry.yarnpkg.com/relay-compiler/-/relay-compiler-11.0.2.tgz#e1e09a1c881d169a7a524ead728ad6a89c7bd4af"
+  integrity sha512-nDVAURT1YncxSiDOKa39OiERkAr0DUcPmlHlg+C8zD+EiDo2Sgczf2R6cDsN4UcDvucYtkLlDLFErPwgLs8WzA==
   dependencies:
     "@babel/core" "^7.0.0"
     "@babel/generator" "^7.5.0"
@@ -12387,18 +12394,20 @@ relay-compiler@11.0.1:
     fbjs "^3.0.0"
     glob "^7.1.1"
     immutable "~3.7.6"
+    invariant "^2.2.4"
     nullthrows "^1.1.1"
-    relay-runtime "11.0.1"
+    relay-runtime "11.0.2"
     signedsource "^1.0.0"
     yargs "^15.3.1"
 
-relay-runtime@11.0.1:
-  version "11.0.1"
-  resolved "https://registry.yarnpkg.com/relay-runtime/-/relay-runtime-11.0.1.tgz#0816b7a102dc5cea1c778a4c21a4f26bacdffa3e"
-  integrity sha512-ljlFQfs4Q1g5FrjgyXb2TbLbKbsgIuWrFJ9a70kmVDNQdroMzwS+7HqYdI7bGaIW3EpjE8besSkPHPUY6woI3w==
+relay-runtime@11.0.2:
+  version "11.0.2"
+  resolved "https://registry.yarnpkg.com/relay-runtime/-/relay-runtime-11.0.2.tgz#c3650477d45665b9628b852b35f203e361ad55e8"
+  integrity sha512-xxZkIRnL8kNE1cxmwDXX8P+wSeWLR+0ACFyAiAhvfWWAyjXb+bhjJ2FSsRGlNYfkqaTNEuDqpnodQV1/fF7Idw==
   dependencies:
     "@babel/runtime" "^7.0.0"
     fbjs "^3.0.0"
+    invariant "^2.2.4"
 
 remark-admonitions@^1.2.1:
   version "1.2.1"
@@ -14025,10 +14034,10 @@ ts-is-defined@^1.0.0:
   dependencies:
     ts-tiny-invariant "0.0.3"
 
-ts-jest@26.5.4:
-  version "26.5.4"
-  resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-26.5.4.tgz#207f4c114812a9c6d5746dd4d1cdf899eafc9686"
-  integrity sha512-I5Qsddo+VTm94SukBJ4cPimOoFZsYTeElR2xy6H2TOVs+NsvgYglW8KuQgKoApOKuaU/Ix/vrF9ebFZlb5D2Pg==
+ts-jest@26.5.5:
+  version "26.5.5"
+  resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-26.5.5.tgz#e40481b6ee4dd162626ba481a2be05fa57160ea5"
+  integrity sha512-7tP4m+silwt1NHqzNRAPjW1BswnAhopTdc2K3HEkRZjF0ZG2F/e/ypVH0xiZIMfItFtD3CX0XFbwPzp9fIEUVg==
   dependencies:
     bs-logger "0.x"
     buffer-from "1.x"