Effect Rewrite

.zed/settings.json

@@ -0,0 +1,134 @@
+// Folder-specific settings
+//
+// For a full list of overridable settings, and general information on folder-specific settings,
+// see the documentation: https://zed.dev/docs/configuring-zed#settings-files
+{
+  "lsp": {
+    "oxfmt": {
+      "initialization_options": {
+        "settings": {
+          "fmt.configPath": null
+        }
+      }
+    }
+  },
+  "languages": {
+    "CSS": {
+      "format_on_save": "on",
+      "prettier": {
+        "allowed": false
+      },
+      "formatter": [
+        {
+          "language_server": {
+            "name": "oxfmt"
+          }
+        }
+      ]
+    },
+    "HTML": {
+      "format_on_save": "on",
+      "prettier": {
+        "allowed": false
+      },
+      "formatter": [
+        {
+          "language_server": {
+            "name": "oxfmt"
+          }
+        }
+      ]
+    },
+    "JavaScript": {
+      "format_on_save": "on",
+      "prettier": {
+        "allowed": false
+      },
+      "formatter": [
+        {
+          "language_server": {
+            "name": "oxfmt"
+          }
+        }
+      ]
+    },
+    "JSON": {
+      "format_on_save": "on",
+      "prettier": {
+        "allowed": false
+      },
+      "formatter": [
+        {
+          "language_server": {
+            "name": "oxfmt"
+          }
+        }
+      ]
+    },
+    "JSONC": {
+      "format_on_save": "on",
+      "prettier": {
+        "allowed": false
+      },
+      "formatter": [
+        {
+          "language_server": {
+            "name": "oxfmt"
+          }
+        }
+      ]
+    },
+    "Markdown": {
+      "format_on_save": "on",
+      "prettier": {
+        "allowed": false
+      },
+      "formatter": [
+        {
+          "language_server": {
+            "name": "oxfmt"
+          }
+        }
+      ]
+    },
+    "TypeScript": {
+      "format_on_save": "on",
+      "prettier": {
+        "allowed": false
+      },
+      "formatter": [
+        {
+          "language_server": {
+            "name": "oxfmt"
+          }
+        }
+      ]
+    },
+    "TSX": {
+      "format_on_save": "on",
+      "prettier": {
+        "allowed": false
+      },
+      "formatter": [
+        {
+          "language_server": {
+            "name": "oxfmt"
+          }
+        }
+      ]
+    },
+    "YAML": {
+      "format_on_save": "on",
+      "prettier": {
+        "allowed": false
+      },
+      "formatter": [
+        {
+          "language_server": {
+            "name": "oxfmt"
+          }
+        }
+      ]
+    }
+  }
+}

package.json

@@ -1,10 +1,11 @@
 {
   "name": "parsertime",
-  "version": "2.1.0",
+  "version": "3.0.0",
   "private": true,
   "scripts": {
     "dev": "next dev --turbopack",
     "build": "next build",
+    "prepare": "effect-language-service patch",
     "postinstall": "prisma generate",
     "start": "next start",
     "lint": "next typegen && oxlint",

src/app/[team]/compare/page.tsx

@@ -1,6 +1,8 @@
 import { ComparisonContent } from "@/components/compare/comparison-content";
 import { DashboardLayout } from "@/components/dashboard-layout";
-import { getUser } from "@/data/user-dto";
+import { Effect } from "effect";
+import { AppRuntime } from "@/data/runtime";
+import { UserService } from "@/data/user";
 import { auth } from "@/lib/auth";
 import prisma from "@/lib/prisma";
 import type { PagePropsWithLocale } from "@/types/next";
@@ -34,7 +36,9 @@ export default async function ComparePage(
     notFound();
   }
 
-  const user = await getUser(session.user.email);
+  const user = await AppRuntime.runPromise(
+    UserService.pipe(Effect.flatMap((svc) => svc.getUser(session.user.email)))
+  );
   if (!user) {
     notFound();
   }

src/app/[team]/map-groups/page.tsx

@@ -1,6 +1,8 @@
 import { MapGroupManager } from "@/components/compare/map-group-manager";
 import { DashboardLayout } from "@/components/dashboard-layout";
-import { getUser } from "@/data/user-dto";
+import { Effect } from "effect";
+import { AppRuntime } from "@/data/runtime";
+import { UserService } from "@/data/user";
 import { auth } from "@/lib/auth";
 import prisma from "@/lib/prisma";
 import type { PagePropsWithLocale } from "@/types/next";
@@ -34,7 +36,9 @@ export default async function MapGroupsPage(
     notFound();
   }
 
-  const user = await getUser(session.user.email);
+  const user = await AppRuntime.runPromise(
+    UserService.pipe(Effect.flatMap((svc) => svc.getUser(session.user.email)))
+  );
   if (!user) {
     notFound();
   }

src/app/[team]/scrim/[scrimId]/edit/page.tsx

@@ -2,9 +2,11 @@ import { DashboardLayout } from "@/components/dashboard-layout";
 import { DangerZone } from "@/components/scrim/danger-zone";
 import { EditScrimForm } from "@/components/scrim/edit-scrim-form";
 import { Link } from "@/components/ui/link";
-import { getScoutingTeams } from "@/data/scouting-dto";
-import { getScrim } from "@/data/scrim-dto";
-import { getTeamsWithPerms } from "@/data/user-dto";
+import { ScrimService } from "@/data/scrim";
+import { Effect } from "effect";
+import { AppRuntime } from "@/data/runtime";
+import { ScoutingService } from "@/data/scouting";
+import { UserService } from "@/data/user";
 import { auth } from "@/lib/auth";
 import { scoutingTool } from "@/lib/flags";
 import { resolveMapDataId } from "@/lib/map-data-resolver";
@@ -16,7 +18,11 @@ export default async function EditScrimPage(
   props: PageProps<"/[team]/scrim/[scrimId]/edit">
 ) {
   const params = await props.params;
-  const scrim = await getScrim(parseInt(params.scrimId));
+  const scrim = await AppRuntime.runPromise(
+    ScrimService.pipe(
+      Effect.flatMap((svc) => svc.getScrim(parseInt(params.scrimId)))
+    )
+  );
   const session = await auth();
   const t = await getTranslations("scrimPage.editScrim");
 
@@ -26,8 +32,14 @@ export default async function EditScrimPage(
 
   const [teamsWithPerms, scoutingTeamList, scoutingEnabled] = await Promise.all(
     [
-      getTeamsWithPerms(session?.user?.email),
-      getScoutingTeams(),
+      AppRuntime.runPromise(
+        UserService.pipe(
+          Effect.flatMap((svc) => svc.getTeamsWithPerms(session?.user?.email))
+        )
+      ),
+      AppRuntime.runPromise(
+        ScoutingService.pipe(Effect.flatMap((svc) => svc.getScoutingTeams()))
+      ),
       scoutingTool(),
     ]
   );

src/app/[team]/scrim/[scrimId]/map/[mapId]/page.tsx

@@ -22,8 +22,10 @@ import { MapTabsSkeleton } from "@/components/map/map-tabs-skeleton";
 import { Suspense, ViewTransition } from "react";
 import { UserNav } from "@/components/user-nav";
 import { VodOverview } from "@/components/vods/vod-overview";
-import { getMostPlayedHeroes } from "@/data/player-dto";
-import { getUser } from "@/data/user-dto";
+import { PlayerService } from "@/data/player";
+import { Effect } from "effect";
+import { AppRuntime } from "@/data/runtime";
+import { UserService } from "@/data/user";
 import { auth } from "@/lib/auth";
 import {
   aiChat,
@@ -95,7 +97,9 @@ export default async function MapDashboardPage(
   const id = parseInt(params.mapId);
   const mapDataId = await resolveMapDataId(id);
   const session = await auth();
-  const user = await getUser(session?.user?.email);
+  const user = await AppRuntime.runPromise(
+    UserService.pipe(Effect.flatMap((svc) => svc.getUser(session?.user?.email)))
+  );
   const t = await getTranslations("mapPage");
 
   // Tournament context for back navigation
@@ -120,7 +124,9 @@ export default async function MapDashboardPage(
     tournamentEnabled,
     coachingCanvasEnabled,
   ] = await Promise.all([
-    getMostPlayedHeroes(id),
+    AppRuntime.runPromise(
+      PlayerService.pipe(Effect.flatMap((svc) => svc.getMostPlayedHeroes(id)))
+    ),
     prisma.matchStart.findFirst({
       where: { MapDataId: mapDataId },
       select: { map_name: true, team_1_name: true },
@@ -282,12 +288,12 @@ export default async function MapDashboardPage(
                         {
                           value: "heatmap",
                           label: t("tabs.heatmap"),
-                          content: <HeatmapTab id={id} />,
+                          content: <HeatmapTab id={mapDataId} />,
                         },
                         {
                           value: "replay",
                           label: t("tabs.replay"),
-                          content: <ReplayTab id={id} />,
+                          content: <ReplayTab id={mapDataId} />,
                         },
                       ]
                     : []),

src/app/[team]/scrim/[scrimId]/map/[mapId]/player/[playerId]/page.tsx

@@ -12,8 +12,10 @@ import { DefaultOverview } from "@/components/player/default-overview";
 import { ModeToggle } from "@/components/theme-switcher";
 import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";
 import { UserNav } from "@/components/user-nav";
-import { getMostPlayedHeroes } from "@/data/player-dto";
-import { getUser } from "@/data/user-dto";
+import { PlayerService } from "@/data/player";
+import { Effect } from "effect";
+import { AppRuntime } from "@/data/runtime";
+import { UserService } from "@/data/user";
 import { auth } from "@/lib/auth";
 import { aiChat, dataLabeling, scoutingTool } from "@/lib/flags";
 import { resolveMapDataId } from "@/lib/map-data-resolver";
@@ -66,7 +68,9 @@ export default async function PlayerDashboardPage(
   const mapDataId = await resolveMapDataId(id);
   const playerName = decodeURIComponent(params.playerId);
 
-  const mostPlayedHeroes = await getMostPlayedHeroes(id);
+  const mostPlayedHeroes = await AppRuntime.runPromise(
+    PlayerService.pipe(Effect.flatMap((svc) => svc.getMostPlayedHeroes(id)))
+  );
 
   const mapName = await prisma.matchStart.findFirst({
     where: {
@@ -78,7 +82,9 @@ export default async function PlayerDashboardPage(
   });
 
   const session = await auth();
-  const user = await getUser(session?.user?.email);
+  const user = await AppRuntime.runPromise(
+    UserService.pipe(Effect.flatMap((svc) => svc.getUser(session?.user?.email)))
+  );
 
   const visibility = (await prisma.scrim.findFirst({
     where: {

src/app/[team]/scrim/[scrimId]/page.tsx

@@ -13,8 +13,10 @@ import {
   TooltipContent,
   TooltipTrigger,
 } from "@/components/ui/tooltip";
-import { getScrim } from "@/data/scrim-dto";
-import { getUser } from "@/data/user-dto";
+import { ScrimService } from "@/data/scrim";
+import { Effect } from "effect";
+import { AppRuntime } from "@/data/runtime";
+import { UserService } from "@/data/user";
 import { auth } from "@/lib/auth";
 import { mapComparison, overviewCard } from "@/lib/flags";
 import prisma from "@/lib/prisma";
@@ -76,7 +78,9 @@ export default async function ScrimDashboardPage(
   const session = await auth();
   const t = await getTranslations("scrimPage");
 
-  const scrim = await getScrim(id);
+  const scrim = await AppRuntime.runPromise(
+    ScrimService.pipe(Effect.flatMap((svc) => svc.getScrim(id)))
+  );
   if (!scrim) notFound();
 
   const teamId = scrim.teamId;
@@ -89,7 +93,9 @@ export default async function ScrimDashboardPage(
     })
   ).sort((a, b) => a.id - b.id);
 
-  const user = await getUser(session?.user?.email);
+  const user = await AppRuntime.runPromise(
+    UserService.pipe(Effect.flatMap((svc) => svc.getUser(session?.user?.email)))
+  );
 
   const isManager = teamId
     ? (await prisma.teamManager.findFirst({

src/app/api/(email)/send-team-invite/route.ts

@@ -1,5 +1,7 @@
+import { Effect } from "effect";
+import { AppRuntime } from "@/data/runtime";
+import { UserService } from "@/data/user";
 import TeamInviteUserEmail from "@/components/email/team-invite";
-import { getUser } from "@/data/user-dto";
 import { auditLog } from "@/lib/audit-logs";
 import { email } from "@/lib/email";
 import { createShortLink } from "@/lib/link-service";
@@ -35,15 +37,21 @@ export async function POST(req: NextRequest) {
   });
   if (!teamInviteToken) return new Response("Token not found", { status: 404 });
 
-  const inviter = await getUser(teamInviteToken?.email);
+  const inviter = await AppRuntime.runPromise(
+    UserService.pipe(
+      Effect.flatMap((svc) => svc.getUser(teamInviteToken?.email))
+    )
+  );
   if (!inviter) return new Response("Inviter not found", { status: 404 });
 
   const team = await prisma.team.findFirst({
     where: { id: teamInviteToken.teamId },
   });
   if (!team) return new Response("Team not found", { status: 404 });
 
-  const user = await getUser(inviteeEmail);
+  const user = await AppRuntime.runPromise(
+    UserService.pipe(Effect.flatMap((svc) => svc.getUser(inviteeEmail)))
+  );
   if (!user) return new Response("User not found", { status: 404 });
 
   const shortLink = await createShortLink(