Change effect type parameters (#35)

* Change effect type parameters

* Update effect requirements in readme

Author: iamchanii

.changeset/olive-carrots-return.md

@@ -0,0 +1,5 @@
+---
+"pothos-plugin-effect": minor
+---
+
+Change type parameters

packages/pothos-plugin-effect/README.md

@@ -8,7 +8,7 @@ Seamless integration between the [Pothos GraphQL](https://pothos-graphql.dev/) a
 
 ## Getting Started
 
-You can use `Effect.Effect<R, E, A>` within resolver functions using `t.effect`. and that's it.
+You can use `Effect.Effect<A, E, R>` within resolver functions using `t.effect`. and that's it.
 
 ```ts
 import EffectPlugin from "pothos-plugin-effect";
@@ -37,7 +37,7 @@ yarn add pothos-plugin-effect effect
 ## Requirements
 
 - `@pothos/core^3`
-- `effect>=2.2.0`
+- `effect>=2.3.0`
 
 ## Key Features
 

packages/pothos-plugin-effect/package.json

@@ -50,15 +50,15 @@
     "better-sqlite3": "^9.4.0",
     "drizzle-kit": "^0.20.14",
     "drizzle-orm": "^0.29.3",
-    "effect": "2.2.2",
+    "effect": "^2.3.3",
     "nanobundle": "2.0.0",
     "prisma": "^5.9.1",
     "typescript": "5.4.0-beta",
     "vitest": "1.2.2"
   },
   "peerDependencies": {
     "@pothos/core": "^3",
-    "effect": ">=2.2.0 <3",
+    "effect": ">=2.3.0 <3",
     "graphql": "^16 || ^17"
   },
   "dependencies": {

packages/pothos-plugin-effect/src/e2e.test.ts

@@ -24,10 +24,10 @@ const db = drizzle(sqlite, { schema: drizzleSchema });
 const prisma = new PrismaClient();
 
 interface EntityService {
-  getEntity(): Effect.Effect<never, Error, { id: number }>;
+  getEntity(): Effect.Effect<{ id: number }, Error>;
 }
 
-const EntityService = Context.Tag<EntityService>('EntityService');
+const EntityService = Context.GenericTag<EntityService>('EntityService');
 
 const EntityServiceLive = Layer.succeed(EntityService, {
   getEntity: () => Effect.succeed({ id: 1 }),

packages/pothos-plugin-effect/src/handleExit.ts

@@ -1,6 +1,6 @@
 import { Cause, Exit } from 'effect';
 
-export function handleExit<E, A>(exit: Exit.Exit<E, A>): A {
+export function handleExit<A, E>(exit: Exit.Exit<A, E>): A {
   if (Exit.isFailure(exit)) {
     const defect = Cause.squash(exit.cause);
 

packages/pothos-plugin-effect/src/runEffectFieldResult.test.ts

@@ -2,15 +2,14 @@ import { Context, Effect, Layer, Option, Runtime, Scope, pipe } from 'effect';
 import { expect, test } from 'vitest';
 import { runEffectFieldResult } from './runEffectFieldResult.js';
 
-interface UserService {
-  getUser(): Effect.Effect<never, Error, { id: number }>;
-  findUser(
-    id: number,
-  ): Effect.Effect<never, Error, Option.Option<{ id: number }>>;
-  queryUsers(): Effect.Effect<never, Error, Option.Option<{ id: number }>[]>;
-}
-
-const UserService = Context.Tag<UserService>('UserService');
+class UserService extends Context.Tag('UserService')<
+  UserService,
+  {
+    getUser(): Effect.Effect<{ id: number }, Error>;
+    findUser(id: number): Effect.Effect<Option.Option<{ id: number }>, Error>;
+    queryUsers(): Effect.Effect<Option.Option<{ id: number }>[], Error>;
+  }
+>() {}
 
 const UserServiceLive = Layer.succeed(UserService, {
   getUser: () => Effect.succeed({ id: 1 }),

packages/pothos-plugin-effect/src/runEffectFieldResult.ts

@@ -2,8 +2,8 @@ import { Effect, Runtime } from 'effect';
 import { handleNullableValue } from './handleNullableValue.js';
 import { handleExit } from './handleExit.js';
 
-export async function runEffectFieldResult<R, E, A>(
-  effectFieldResult: Effect.Effect<R, E, A>,
+export async function runEffectFieldResult<A, E, R>(
+  effectFieldResult: Effect.Effect<A, E, R>,
   runtime: Runtime.Runtime<R>,
 ) {
   const result = await Runtime.runPromiseExit(runtime)(effectFieldResult);

packages/pothos-plugin-effect/src/types.ts

@@ -47,6 +47,6 @@ export interface FieldOptions<
     E,
     A,
   >(
-    effect: Effect.Effect<R, E, A>,
+    effect: Effect.Effect<A, E, R>,
   ): Promise<Awaited<InferEffectValueType<A>>>;
 }

yarn.lock

@@ -2146,10 +2146,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"effect@npm:2.2.2":
-  version: 2.2.2
-  resolution: "effect@npm:2.2.2"
-  checksum: 10c0/438fcffcc8b7ff2a86dbb3df7e6ffb113c86581d36a137e21849749d1d6e84a099f37a83d2102358d45ebcf37314d7d38aef6c032ea4f4fd6f7a03954898f112
+"effect@npm:^2.3.3":
+  version: 2.3.3
+  resolution: "effect@npm:2.3.3"
+  checksum: 10c0/bc25d9f723d4fab3234c3448e9b2c785101012949a7934f69ad39b6856abe70654d07a5cadeec84a8e7f2edea968cd2b671405c6a075a6734b49cdf3f63ca39b
   languageName: node
   linkType: hard
 
@@ -4421,7 +4421,7 @@ __metadata:
     better-sqlite3: "npm:^9.4.0"
     drizzle-kit: "npm:^0.20.14"
     drizzle-orm: "npm:^0.29.3"
-    effect: "npm:2.2.2"
+    effect: "npm:^2.3.3"
     nanobundle: "npm:2.0.0"
     prisma: "npm:^5.9.1"
     tiny-invariant: "npm:^1.3.1"
@@ -4430,7 +4430,7 @@ __metadata:
     vitest: "npm:1.2.2"
   peerDependencies:
     "@pothos/core": ^3
-    effect: ">=2.2.0 <3"
+    effect: ">=2.3.0 <3"
     graphql: ^16 || ^17
   languageName: unknown
   linkType: soft