@pothos/plugin-prisma 3.40.2 → 3.41.0

package/src/util/map-query.ts

@@ -14,6 +14,7 @@ import {
   Kind,
   SelectionSetNode,
 } from 'graphql';
+import { PothosValidationError } from '@pothos/core';
 import {
   FieldSelection,
   IncludeMap,
@@ -55,7 +56,7 @@ function addTypeSelectionsForField(
     pothosPrismaIndirectInclude?: IndirectInclude;
   };
 
-  if (pothosPrismaIndirectInclude) {
+  if (pothosPrismaIndirectInclude && pothosPrismaIndirectInclude.path.length > 0) {
     resolveIndirectInclude(
       type,
       info,
@@ -66,6 +67,16 @@ function addTypeSelectionsForField(
         addTypeSelectionsForField(resolvedType, context, info, state, field, path);
       },
     );
+  } else if (pothosPrismaIndirectInclude) {
+    addTypeSelectionsForField(
+      info.schema.getType(pothosPrismaIndirectInclude.getType())!,
+      context,
+      info,
+      state,
+      selection,
+      indirectPath,
+    );
+    return;
   }
 
   if (!isObjectType(type)) {
@@ -151,7 +162,9 @@ function resolveIndirectInclude(
         continue;
 
       default:
-        throw new Error(`Unsupported selection kind ${(selection as { kind: string }).kind}`);
+        throw new PothosValidationError(
+          `Unsupported selection kind ${(selection as { kind: string }).kind}`,
+        );
     }
   }
 }
@@ -196,7 +209,9 @@ function addNestedSelections(
         continue;
 
       default:
-        throw new Error(`Unsupported selection kind ${(selection as { kind: string }).kind}`);
+        throw new PothosValidationError(
+          `Unsupported selection kind ${(selection as { kind: string }).kind}`,
+        );
     }
   }
 }
@@ -216,7 +231,7 @@ function addFieldSelection(
   const field = type.getFields()[selection.name.value];
 
   if (!field) {
-    throw new Error(`Unknown field ${selection.name.value} on ${type.name}`);
+    throw new PothosValidationError(`Unknown field ${selection.name.value} on ${type.name}`);
   }
 
   const fieldSelect = field.extensions?.pothosPrismaSelect as FieldSelection | undefined;
@@ -393,7 +408,7 @@ export function selectionStateFromInfo(
   const state = createStateForType(type, info);
 
   if (!isObjectType(type)) {
-    throw new Error('Prisma plugin can only resolve includes for object types');
+    throw new PothosValidationError('Prisma plugin can only resolve includes for object types');
   }
 
   addFieldSelection(type, context, info, state, info.fieldNodes[0], []);
@@ -435,20 +450,20 @@ function normalizeInclude(path: string[], type: GraphQLNamedType) {
   const normalized: { name: string; type: string }[] = [];
 
   if (!isObjectType(currentType)) {
-    throw new Error(`Expected ${currentType} to be an Object type`);
+    throw new PothosValidationError(`Expected ${currentType} to be an Object type`);
   }
 
   for (const fieldName of path) {
     const field: GraphQLField<unknown, unknown> = currentType.getFields()[fieldName];
 
     if (!field) {
-      throw new Error(`Expected ${currentType} to have a field ${fieldName}`);
+      throw new PothosValidationError(`Expected ${currentType} to have a field ${fieldName}`);
     }
 
     currentType = getNamedType(field.type);
 
     if (!isObjectType(currentType)) {
-      throw new Error(`Expected ${currentType} to be an Object type`);
+      throw new PothosValidationError(`Expected ${currentType} to be an Object type`);
     }
 
     normalized.push({ name: fieldName, type: currentType.name });