Merge remote-tracking branch 'origin/master' into improve-compilation-time

Author: katainaka0503

lerna.json

@@ -2,7 +2,7 @@
   "packages": [
     "packages/*"
   ],
-  "version": "10.0.6",
+  "version": "10.0.8",
   "npmClient": "yarn",
   "useWorkspaces": true,
   "changelog": {

package.json

@@ -26,16 +26,16 @@
     "graphql": "15.8.0"
   },
   "devDependencies": {
-    "@commitlint/cli": "16.2.1",
-    "@commitlint/config-angular": "16.2.1",
+    "@commitlint/cli": "16.2.3",
+    "@commitlint/config-angular": "16.2.3",
     "@types/graphql": "14.5.0",
     "@types/jest": "27.4.1",
     "@types/node": "17.0.0",
     "@types/node-fetch": "3.0.3",
     "@types/normalize-path": "3.0.0",
     "@types/ws": "8.5.3",
-    "@typescript-eslint/eslint-plugin": "5.14.0",
-    "@typescript-eslint/parser": "5.14.0",
+    "@typescript-eslint/eslint-plugin": "5.16.0",
+    "@typescript-eslint/parser": "5.16.0",
     "class-transformer": "0.5.1",
     "class-validator": "0.13.2",
     "eslint": "8.11.0",
@@ -48,10 +48,10 @@
     "jest": "27.5.1",
     "lerna": "4.0.0",
     "lerna-changelog": "2.2.0",
-    "lint-staged": "12.3.5",
-    "prettier": "2.5.1",
+    "lint-staged": "12.3.7",
+    "prettier": "2.6.0",
     "reflect-metadata": "0.1.13",
-    "release-it": "14.12.5",
+    "release-it": "14.13.1",
     "rimraf": "3.0.2",
     "rxjs": "7.5.5",
     "supertest": "6.2.2",

packages/apollo/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nestjs/apollo",
-  "version": "10.0.6",
+  "version": "10.0.8",
   "description": "Nest - modern, fast, powerful node.js web framework (@apollo)",
   "author": "Kamil Mysliwiec",
   "license": "MIT",
@@ -23,11 +23,11 @@
   },
   "devDependencies": {
     "@apollo/gateway": "0.48.3",
-    "@nestjs/common": "8.4.0",
-    "@nestjs/core": "8.4.0",
-    "@nestjs/platform-express": "8.4.0",
-    "@nestjs/platform-fastify": "8.4.0",
-    "@nestjs/testing": "8.4.0",
+    "@nestjs/common": "8.4.2",
+    "@nestjs/core": "8.4.2",
+    "@nestjs/platform-express": "8.4.2",
+    "@nestjs/platform-fastify": "8.4.2",
+    "@nestjs/testing": "8.4.2",
     "apollo-cache-inmemory": "1.6.6",
     "apollo-client": "2.6.10",
     "apollo-link-ws": "1.0.20",
@@ -37,7 +37,8 @@
   },
   "dependencies": {
     "iterall": "1.3.0",
-    "lodash.omit": "4.5.0"
+    "lodash.omit": "4.5.0",
+    "tslib": "2.3.1"
   },
   "peerDependencies": {
     "@apollo/gateway": "^0.44.1 || ^0.46.0 || ^0.48.0",

packages/apollo/tests/generated-definitions/array-property.fixture.ts

@@ -13,6 +13,9 @@ export interface Foo {
     b?: Nullable<string[]>;
     c: Nullable<string>[];
     d?: Nullable<Nullable<string>[]>;
+    e: string[][];
+    f: string[][][];
+    g?: Nullable<Nullable<Nullable<Nullable<string>[]>[]>[]>;
 }
 
 type Nullable<T> = T | null;

packages/apollo/tests/generated-definitions/array-property.graphql

@@ -3,4 +3,7 @@ type Foo {
   b: [String!]
   c: [String]!
   d: [String]
+  e: [[String!]!]!
+  f: [[[String!]!]!]!
+  g: [[[String]]]
 }

packages/graphql/lib/graphql-ast.explorer.ts

@@ -354,42 +354,37 @@ export class GraphQLAstExplorer {
     name: string;
     required: boolean;
   } {
-    const { required, type } = this.getNestedType(typeNode);
-
-    const isArray = type.kind === 'ListType';
-    if (isArray) {
-      const { type: arrayType, required: arrayTypeRequired } =
-        this.getNestedType(get(type, 'type'));
-
-      const typeName = this.addSymbolIfRoot(get(arrayType, 'name.value'));
-      const name = arrayTypeRequired
+    const stringifyType = (typeNode: TypeNode) => {
+      const { type, required } = this.unwrapTypeIfNonNull(typeNode);
+      const isArray = type.kind === 'ListType';
+
+      if (isArray) {
+        const arrayType = get(type, 'type');
+        return required
+          ? `${stringifyType(arrayType)}[]`
+          : `Nullable<${stringifyType(arrayType)}[]>`;
+      }
+      const typeName = this.addSymbolIfRoot(get(type, 'name.value'));
+      return required
         ? this.getType(typeName, options)
         : `Nullable<${this.getType(typeName, options)}>`;
+    };
 
-      return {
-        name: required ? name + '[]' : `Nullable<${name}[]>`,
-        required,
-      };
-    }
-
-    const typeName = this.addSymbolIfRoot(get(type, 'name.value'));
-
+    const { required } = this.unwrapTypeIfNonNull(typeNode);
     return {
-      name: required
-        ? this.getType(typeName, options)
-        : `Nullable<${this.getType(typeName, options)}>`,
+      name: stringifyType(typeNode),
       required,
     };
   }
 
-  getNestedType(type: TypeNode): {
+  unwrapTypeIfNonNull(type: TypeNode): {
     type: TypeNode;
     required: boolean;
   } {
     const isNonNullType = type.kind === 'NonNullType';
     if (isNonNullType) {
       return {
-        type: this.getNestedType(get(type, 'type')).type,
+        type: this.unwrapTypeIfNonNull(get(type, 'type')).type,
         required: isNonNullType,
       };
     }

packages/graphql/lib/schema-builder/factories/resolve-type.factory.ts

@@ -13,14 +13,20 @@ export class ResolveTypeFactory {
   public getResolveTypeFunction<TSource = any, TContext = any>(
     resolveType: ResolveTypeFn<TSource, TContext>,
   ): GraphQLTypeResolver<TSource, TContext> {
-    return async (...args) => {
-      const resolvedType = await resolveType(...args);
-      if (isString(resolvedType)) {
-        return resolvedType;
-      }
-      const typeDef =
-        this.typeDefinitionsStorage.getObjectTypeByTarget(resolvedType);
-      return typeDef?.type?.name;
+    return (...args) => {
+      const typeToString = (resolvedType: Function | string) => {
+        if (isString(resolvedType)) {
+          return resolvedType;
+        }
+        const typeDef =
+          this.typeDefinitionsStorage.getObjectTypeByTarget(resolvedType);
+        return typeDef?.type?.name;
+      };
+
+      const resolvedTypeOrPromise = resolveType(...args);
+      return resolvedTypeOrPromise && resolvedTypeOrPromise instanceof Promise
+        ? resolvedTypeOrPromise.then(typeToString)
+        : typeToString(resolvedTypeOrPromise);
     };
   }
 }

packages/graphql/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nestjs/graphql",
-  "version": "10.0.6",
+  "version": "10.0.8",
   "description": "Nest - modern, fast, powerful node.js web framework (@graphql)",
   "author": "Kamil Mysliwiec",
   "license": "MIT",
@@ -35,9 +35,9 @@
   },
   "devDependencies": {
     "@apollo/subgraph": "0.3.3",
-    "@nestjs/common": "8.4.0",
-    "@nestjs/core": "8.4.0",
-    "@nestjs/testing": "8.4.0",
+    "@nestjs/common": "8.4.2",
+    "@nestjs/core": "8.4.2",
+    "@nestjs/testing": "8.4.2",
     "graphql": "15.8.0",
     "reflect-metadata": "0.1.13",
     "ts-morph": "12.0.0"

packages/graphql/plugin.js

@@ -1,4 +1,8 @@
 'use strict';
 Object.defineProperty(exports, '__esModule', { value: true });
 const tslib_1 = require('tslib');
-(0, tslib_1.__exportStar)(require('./dist/plugin'), exports);
+const plugin = require('./dist/plugin');
+(0, tslib_1.__exportStar)(plugin, exports);
+
+/** Compatibility with ts-patch/ttypescript */
+exports.default = (program, options) => plugin.before(options, program);

packages/mercurius/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nestjs/mercurius",
-  "version": "10.0.6",
+  "version": "10.0.8",
   "description": "Nest - modern, fast, powerful node.js web framework (@graphql)",
   "author": "Kamil Mysliwiec",
   "license": "MIT",
@@ -23,10 +23,13 @@
   "bugs": {
     "url": "https://github.com/nestjs/graphql/issues"
   },
+  "dependencies": {
+    "tslib": "2.3.1"
+  },
   "devDependencies": {
-    "@nestjs/common": "8.4.0",
-    "@nestjs/platform-fastify": "8.4.0",
-    "@nestjs/testing": "8.4.0",
+    "@nestjs/common": "8.4.2",
+    "@nestjs/platform-fastify": "8.4.2",
+    "@nestjs/testing": "8.4.2",
     "fastify": "3.27.4",
     "mercurius": "8.12.1",
     "mercurius-integration-testing": "4.0.0"