Optimize

ghostdogpr · Jun 1, 2024 · 94f5e15 · 94f5e15
1 parent 76e4e9a
commit 94f5e15
Showing 1 changed file with 12 additions and 12 deletions.
diff --git a/core/src/main/scala/caliban/execution/Executor.scala b/core/src/main/scala/caliban/execution/Executor.scala
@@ -386,20 +386,20 @@ object Executor {
             case wrapper :: tail =>
               val q =
                 if (isPure && !wrapper.wrapPureValues) query
-                else
-                  wrapper
-                    .wrap(query, fieldInfo)
-                    .mapErrorCause(e =>
-                      effectfulExecutionError(
-                        PathValue.Key(fieldInfo.name) :: fieldInfo.path,
-                        Some(fieldInfo.details.locationInfo),
-                        e
-                      )
-                    )
-
+                else wrapper.wrap(query, fieldInfo)
               loop(q, tail)
           }
-        loop(query, fieldWrappers)
+
+        if ((isPure && !wrapPureValues) || (fieldWrappers eq Nil)) query
+        else {
+          loop(query, fieldWrappers).mapErrorCause(e =>
+            effectfulExecutionError(
+              PathValue.Key(fieldInfo.name) :: fieldInfo.path,
+              Some(fieldInfo.details.locationInfo),
+              e
+            )
+          )
+        }
       }
 
       def objectFieldQuery(step: ReducedStep[R], info: FieldInfo, isPure: Boolean = false) = {