feat(performance): optimize resolvers execution paths (MichalLytek#488)

croquiscom · Mar 26, 2020 · 23dd294 · 23dd294
1 parent 23e9b25
commit 23dd294
Show file tree

Hide file tree

Showing 3 changed files with 70 additions and 56 deletions.
diff --git a/src/resolvers/create.ts b/src/resolvers/create.ts
@@ -9,6 +9,7 @@ import { getParams, applyMiddlewares, applyAuthChecker } from "./helpers";
 import { convertToType } from "../helpers/types";
 import { BuildContext } from "../schema/build-context";
 import { ResolverData } from "../interfaces";
+import isPromiseLike from "../utils/isPromiseLike";
 
 export function createHandlerResolver(
   resolverMetadata: BaseResolverMetadata,
@@ -24,17 +25,23 @@ export function createHandlerResolver(
   const middlewares = globalMiddlewares.concat(resolverMetadata.middlewares!);
   applyAuthChecker(middlewares, authMode, authChecker, resolverMetadata.roles);
 
-  return async (root, args, context, info) => {
+  return (root, args, context, info) => {
     const resolverData: ResolverData<any> = { root, args, context, info };
     const targetInstance = container.getInstance(resolverMetadata.target, resolverData);
-    return applyMiddlewares(container, resolverData, middlewares, async () => {
-      const params: any[] = await getParams(
+    return applyMiddlewares(container, resolverData, middlewares, () => {
+      const params: Promise<any[]> | any[] = getParams(
         resolverMetadata.params!,
         resolverData,
         globalValidate,
         pubSub,
       );
-      return targetInstance[resolverMetadata.methodName].apply(targetInstance, params);
+      if (isPromiseLike(params)) {
+        return params.then(resolvedParams =>
+          targetInstance[resolverMetadata.methodName].apply(targetInstance, resolvedParams),
+        );
+      } else {
+        return targetInstance[resolverMetadata.methodName].apply(targetInstance, params);
+      }
     });
   };
 }
@@ -86,13 +93,8 @@ export function createSimpleFieldResolver(
   const middlewares = globalMiddlewares.concat(fieldMetadata.middlewares!);
   applyAuthChecker(middlewares, authMode, authChecker, fieldMetadata.roles);
 
-  return async (root, args, context, info) => {
+  return (root, args, context, info) => {
     const resolverData: ResolverData<any> = { root, args, context, info };
-    return await applyMiddlewares(
-      container,
-      resolverData,
-      middlewares,
-      () => root[fieldMetadata.name],
-    );
+    return applyMiddlewares(container, resolverData, middlewares, () => root[fieldMetadata.name]);
   };
 }
diff --git a/src/resolvers/helpers.ts b/src/resolvers/helpers.ts
@@ -8,55 +8,59 @@ import { ResolverData, AuthChecker, AuthMode } from "../interfaces";
 import { Middleware, MiddlewareFn, MiddlewareClass } from "../interfaces/Middleware";
 import { IOCContainer } from "../utils/container";
 import { AuthMiddleware } from "../helpers/auth-middleware";
+import isPromiseLike from "../utils/isPromiseLike";
 
-export async function getParams(
+export function getParams(
   params: ParamMetadata[],
   resolverData: ResolverData<any>,
   globalValidate: boolean | ValidatorOptions,
   pubSub: PubSubEngine,
-): Promise<any[]> {
-  return Promise.all(
-    params
-      .sort((a, b) => a.index - b.index)
-      .map(async paramInfo => {
-        switch (paramInfo.kind) {
-          case "args":
-            return await validateArg(
-              convertToType(paramInfo.getType(), resolverData.args),
-              globalValidate,
-              paramInfo.validate,
-            );
-          case "arg":
-            return await validateArg(
-              convertToType(paramInfo.getType(), resolverData.args[paramInfo.name]),
-              globalValidate,
-              paramInfo.validate,
-            );
-          case "context":
-            if (paramInfo.propertyName) {
-              return resolverData.context[paramInfo.propertyName];
-            }
-            return resolverData.context;
-          case "root":
-            const rootValue = paramInfo.propertyName
-              ? resolverData.root[paramInfo.propertyName]
-              : resolverData.root;
-            if (!paramInfo.getType) {
-              return rootValue;
-            }
-            return convertToType(paramInfo.getType(), rootValue);
-          case "info":
-            return resolverData.info;
-          case "pubSub":
-            if (paramInfo.triggerKey) {
-              return (payload: any) => pubSub.publish(paramInfo.triggerKey!, payload);
-            }
-            return pubSub;
-          case "custom":
-            return await paramInfo.resolver(resolverData);
-        }
-      }),
-  );
+): Promise<any[]> | any[] {
+  const paramValues = params
+    .sort((a, b) => a.index - b.index)
+    .map(paramInfo => {
+      switch (paramInfo.kind) {
+        case "args":
+          return validateArg(
+            convertToType(paramInfo.getType(), resolverData.args),
+            globalValidate,
+            paramInfo.validate,
+          );
+        case "arg":
+          return validateArg(
+            convertToType(paramInfo.getType(), resolverData.args[paramInfo.name]),
+            globalValidate,
+            paramInfo.validate,
+          );
+        case "context":
+          if (paramInfo.propertyName) {
+            return resolverData.context[paramInfo.propertyName];
+          }
+          return resolverData.context;
+        case "root":
+          const rootValue = paramInfo.propertyName
+            ? resolverData.root[paramInfo.propertyName]
+            : resolverData.root;
+          if (!paramInfo.getType) {
+            return rootValue;
+          }
+          return convertToType(paramInfo.getType(), rootValue);
+        case "info":
+          return resolverData.info;
+        case "pubSub":
+          if (paramInfo.triggerKey) {
+            return (payload: any) => pubSub.publish(paramInfo.triggerKey!, payload);
+          }
+          return pubSub;
+        case "custom":
+          return paramInfo.resolver(resolverData);
+      }
+    });
+  if (paramValues.some(isPromiseLike)) {
+    return Promise.all(paramValues);
+  } else {
+    return paramValues;
+  }
 }
 
 export function applyAuthChecker(
@@ -70,12 +74,15 @@ export function applyAuthChecker(
   }
 }
 
-export async function applyMiddlewares(
+export function applyMiddlewares(
   container: IOCContainer,
   resolverData: ResolverData<any>,
   middlewares: Array<Middleware<any>>,
   resolverHandlerFunction: () => any,
 ): Promise<any> {
+  if (middlewares.length === 0) {
+    return resolverHandlerFunction();
+  }
   let middlewaresIndex = -1;
   async function dispatchHandler(currentIndex: number): Promise<void> {
     if (currentIndex <= middlewaresIndex) {

diff --git a/src/utils/isPromiseLike.ts b/src/utils/isPromiseLike.ts
@@ -0,0 +1,5 @@
+export default function isPromiseLike<TValue>(
+  value: PromiseLike<TValue> | TValue,
+): value is PromiseLike<TValue> {
+  return value != null && typeof (value as PromiseLike<TValue>).then === "function";
+}