refactor: effect 3.0 support

sidetracklabs · Apr 18, 2024 · ed1b48c · ed1b48c
1 parent 3c2b7d2
commit ed1b48c
Show file tree

Hide file tree

Showing 6 changed files with 409 additions and 439 deletions.
diff --git a/package.json b/package.json
@@ -27,19 +27,19 @@
     "@commitlint/cli": "19.2.2",
     "@commitlint/config-conventional": "19.2.2",
     "@manypkg/cli": "0.21.4",
-    "@typescript-eslint/eslint-plugin": "7.1.1",
-    "@typescript-eslint/parser": "7.1.1",
+    "@typescript-eslint/eslint-plugin": "7.7.0",
+    "@typescript-eslint/parser": "7.7.0",
     "commitizen": "4.3.0",
     "cz-git": "1.9.1",
-    "eslint": "8.57.0",
+    "eslint": "9.0.0",
     "eslint-config-prettier": "9.1.0",
     "eslint-plugin-import": "2.29.1",
-    "eslint-plugin-simple-import-sort": "12.0.0",
+    "eslint-plugin-simple-import-sort": "12.1.0",
     "eslint-plugin-sort-keys": "2.3.5",
     "eslint-plugin-typescript-sort-keys": "3.2.0",
     "husky": "9.0.11",
     "prettier": "3.2.5",
-    "prettier-plugin-sort-json": "3.1.0",
+    "prettier-plugin-sort-json": "4.0.0",
     "sonicware-tdt": "20.0.0",
     "tsup": "8.0.2",
     "turbo": "1.13.2",

diff --git a/packages/client-prisma/package.json b/packages/client-prisma/package.json
@@ -47,18 +47,18 @@
     "typecheck": "tsc --noEmit"
   },
   "dependencies": {
-    "uuid": "^9.0.0"
+    "uuid": "^9.0.1"
   },
   "devDependencies": {
-    "@prisma/client": "5.11.0",
+    "@prisma/client": "5.12.1",
     "@types/uuid": "9.0.8",
-    "@vitest/coverage-v8": "1.3.1",
+    "@vitest/coverage-v8": "1.5.0",
     "dotenv-cli": "7.4.1",
-    "prisma": "5.11.0",
+    "prisma": "5.12.1",
     "sidetrack": "workspace:*",
     "vite": "5.2.9",
     "vite-tsconfig-paths": "4.3.2",
-    "vitest": "1.3.1"
+    "vitest": "1.5.0"
   },
   "peerDependencies": {
     "@prisma/client": ">= 4"

diff --git a/packages/pg-migrate/package.json b/packages/pg-migrate/package.json
@@ -51,13 +51,13 @@
   "devDependencies": {
     "@types/mkdirp": "2.0.0",
     "@types/pg": "8.11.5",
-    "@vitest/coverage-v8": "1.3.1",
+    "@vitest/coverage-v8": "1.5.0",
     "dotenv-cli": "7.4.1",
     "pg": "8.11.5",
     "type-fest": "4.15.0",
     "vite": "5.2.9",
     "vite-tsconfig-paths": "4.3.2",
-    "vitest": "1.3.1"
+    "vitest": "1.5.0"
   },
   "peerDependencies": {
     "pg": ">=4.3.0 <9.0.0"

diff --git a/packages/sidetrack/package.json b/packages/sidetrack/package.json
@@ -58,17 +58,17 @@
   },
   "dependencies": {
     "@sidetrack/pg-migrate": "workspace:*",
-    "effect": "2.4.19",
-    "pg": "^8.11.2"
+    "effect": "3.0.2",
+    "pg": "^8.11.5"
   },
   "devDependencies": {
     "@types/pg": "8.11.5",
-    "@vitest/coverage-v8": "1.3.1",
+    "@vitest/coverage-v8": "1.5.0",
     "dotenv-cli": "7.4.1",
     "kanel": "3.8.8",
     "type-fest": "4.15.0",
     "vite": "5.2.9",
     "vite-tsconfig-paths": "4.3.2",
-    "vitest": "1.3.1"
+    "vitest": "1.5.0"
   }
 }
diff --git a/packages/sidetrack/src/effect.ts b/packages/sidetrack/src/effect.ts
@@ -3,7 +3,7 @@ import * as Duration from "effect/Duration";
 import * as Effect from "effect/Effect";
 import * as Fiber from "effect/Fiber";
 import * as Layer from "effect/Layer";
-import { fromIterableWith } from "effect/ReadonlyRecord";
+import { fromIterableWith } from "effect/Record";
 import * as Ref from "effect/Ref";
 import * as Schedule from "effect/Schedule";
 import pg from "pg";
@@ -114,7 +114,7 @@ export function makeLayer<Queues extends SidetrackQueuesGenericType>(
           })());
 
     const pollingFiber = Ref.unsafeMake<Fiber.Fiber<unknown, unknown>>(
-      Fiber.unit,
+      Fiber.void,
     );
 
     const startPolling = () =>
@@ -185,20 +185,20 @@ export function makeLayer<Queues extends SidetrackQueuesGenericType>(
           `UPDATE sidetrack_jobs SET status = 'cancelled', cancelled_at = NOW() WHERE id = $1`,
           [jobId],
         ),
-      ).pipe(Effect.asUnit);
+      ).pipe(Effect.asVoid);
 
     const deleteJob = (jobId: string, options?: SidetrackDeleteJobOptions) =>
       Effect.promise(() =>
         (options?.dbClient || dbClient).execute(
           `DELETE FROM sidetrack_jobs WHERE id = $1`,
           [jobId],
         ),
-      ).pipe(Effect.asUnit);
+      ).pipe(Effect.asVoid);
 
     const stop = () =>
       Ref.get(pollingFiber)
         .pipe(Effect.flatMap((fiber) => Fiber.interrupt(fiber)))
-        .pipe(Effect.asUnit);
+        .pipe(Effect.asVoid);
 
     const runHandler = (
       job: SidetrackJobs,
@@ -272,7 +272,7 @@ export function makeLayer<Queues extends SidetrackQueuesGenericType>(
             }),
           ),
         )
-        .pipe(Effect.asUnit);
+        .pipe(Effect.asVoid);
 
     const insertJob = <K extends keyof Queues>(
       queueName: K,
@@ -384,7 +384,7 @@ export function makeLayer<Queues extends SidetrackQueuesGenericType>(
             }),
           ),
         )
-        .pipe(Effect.asUnit);
+        .pipe(Effect.asVoid);
 
     const listJobs = <K extends keyof Queues>(
       options?: SidetrackListJobsOptions<Queues, K>,