Fix type error

iamchanii · Jul 19, 2024 · dd00bf5 · dd00bf5
1 parent 51022de
commit dd00bf5
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 22 deletions.
diff --git a/.changeset/real-colts-doubt.md b/.changeset/real-colts-doubt.md
@@ -0,0 +1,5 @@
+---
+"pothos-plugin-effect": patch
+---
+
+Fix type
diff --git a/packages/pothos-plugin-effect/src/global-types.ts b/packages/pothos-plugin-effect/src/global-types.ts
@@ -45,7 +45,7 @@ declare global {
         Nullable extends FieldNullability<Type>,
         Args extends InputFieldMap,
         ResolveShape,
-        ResolveReturnShape extends Effect.Effect<any>,
+        ResolveReturnShape extends Effect.Effect<unknown, unknown, unknown>,
       >(
         options: PluginTypes.EffectFieldOptions<
           Types,
@@ -65,7 +65,7 @@ declare global {
             Nullable extends FieldNullability<Type>,
             Args extends InputFieldMap,
             ResolveShape,
-            ResolveReturnShape extends Effect.Effect<any>,
+            ResolveReturnShape extends Effect.Effect<unknown, unknown, unknown>,
             Fields extends InputFieldMap,
             InputName extends string,
             ArgRequired extends boolean,

diff --git a/packages/pothos-plugin-effect/src/types.ts b/packages/pothos-plugin-effect/src/types.ts
@@ -31,37 +31,35 @@ type Resolver<
   Args,
   Context,
   Type,
-  Return extends Effect.Effect<any>,
+  Return extends Effect.Effect<unknown, unknown, unknown>,
 > = (
   parent: Parent,
   args: Args,
   context: Context,
   info: GraphQLResolveInfo,
-) => [Effect.Effect.Success<Return>] extends [Type]
-  ? [Type] extends [readonly (infer Item)[] | null | undefined]
-    ? ListResolveValue<R, Type, Item, Return>
-    : Effect.Effect<
-        MaybePromise<MaybeOption<Type>>,
-        unknown,
-        InferRequirements<R>
-      >
-  : `Error: The resolved Effect is an invalid type.`;
+) => [Type] extends [readonly (infer Item)[] | null | undefined]
+  ? ListResolveValue<R, Type, Item, Return>
+  : Effect.Effect<
+      MaybePromise<MaybeOption<Type>>,
+      unknown,
+      InferRequirements<R>
+    >;
 
 type ListResolveValue<
   R extends Runtime.Runtime<never>,
   Type,
   Item,
-  Return extends Effect.Effect<any>,
+  Return extends Effect.Effect<unknown, unknown, unknown>,
 > = [Return] extends [Stream.Stream<unknown>]
   ? GeneratorResolver<Type, Item> | Return
   : null extends Type
     ? Effect.Effect<
-        MaybeOption<readonly MaybeOption<Item>[]>,
+        MaybePromise<MaybeOption<readonly MaybeOption<Item>[]>>,
         unknown,
         InferRequirements<R>
       >
     : Effect.Effect<
-        readonly MaybeOption<Item>[],
+        MaybePromise<readonly MaybeOption<Item>[]>,
         unknown,
         InferRequirements<R>
       >;
@@ -90,7 +88,7 @@ interface FieldOptionsByKind<
   Nullable extends FieldNullability<Type>,
   Args extends InputFieldMap,
   ResolveShape,
-  ResolveReturnShape extends Effect.Effect<any>,
+  ResolveReturnShape extends Effect.Effect<unknown, unknown, unknown>,
 > {
   Query: Omit<
     PothosSchemaTypes.QueryFieldOptions<
@@ -213,7 +211,7 @@ export type EffectFieldOptions<
   Args extends InputFieldMap,
   Kind extends FieldKind,
   ResolveShape,
-  ResolveReturnShape extends Effect.Effect<any>,
+  ResolveReturnShape extends Effect.Effect<unknown, unknown, unknown>,
 > = FieldOptionsByKind<
   Types,
   ParentShape,
@@ -232,7 +230,7 @@ export type EffectFieldWithInputOptions<
   Args extends InputFieldMap,
   Kind extends FieldKind,
   ResolveShape,
-  ResolveReturnShape extends Effect.Effect<any>,
+  ResolveReturnShape extends Effect.Effect<unknown, unknown, unknown>,
   Fields extends InputFieldMap,
   InputName extends string,
   ArgRequired extends boolean,

diff --git a/packages/pothos-plugin-effect/tests/schema/base.ts b/packages/pothos-plugin-effect/tests/schema/base.ts
@@ -8,7 +8,8 @@ builder.queryFields((t) => ({
   }),
   intList: t.effect({
     type: ['Int'],
-    resolve: () => Effect.succeed([1, 2, 3]),
+    nullable: false,
+    resolve: () => Effect.succeed([1, 2, '3']),
   }),
   string: t.effect({
     type: 'String',

diff --git a/packages/pothos-plugin-effect/tests/schema/drizzle.ts b/packages/pothos-plugin-effect/tests/schema/drizzle.ts
@@ -15,12 +15,12 @@ export const PostSchema = builder
 
 builder.queryFields((t) => ({
   posts: t.effect({
-    type: PostSchema,
+    type: [PostSchema],
     nullable: true,
     resolve: () =>
       Effect.gen(function* () {
         const postService = yield* PostService;
-        return postService.getPost();
+        return postService.getPosts();
       }),
   }),
 }));
diff --git a/packages/pothos-plugin-effect/tests/setupTest.ts b/packages/pothos-plugin-effect/tests/setupTest.ts
@@ -46,7 +46,7 @@ const makePostService = Effect.gen(function* () {
   const drizzle = yield* Drizzle;
 
   return {
-    getPost: () => drizzle.query.posts.findFirst(),
+    getPosts: () => drizzle.query.posts.findMany(),
   };
 });