feat(courses-list): add trpc

package.json

@@ -1,7 +1,9 @@
 {
   "name": "core",
   "version": "1.0.0",
-  "workspaces": ["./packages/*"],
+  "workspaces": [
+    "./packages/*"
+  ],
   "private": true,
   "scripts": {
     "postinstall": "patch-package",
@@ -13,7 +15,7 @@
     "test": "jest",
     "prettier": "prettier -w .",
     "test:e2e": "npx prisma migrate reset --force && playwright test",
-    "upload-content-schema": "ts-node --project tsconfig.script.json ./scripts/upload-content-schema packages/content-schema/schemas/ ./src/shared/api/content/schemas",
+    "upload-content-schema": "ts-node --project tsconfig.script.json ./scripts/upload-content-schema packages/content-schema/schemas/ ./src/shared/api/content/_schemas",
     "dev:content-schema": "npm run dev --workspace=@core/content-schema"
   },
   "prisma": {
@@ -32,7 +34,11 @@
     "@radix-ui/react-separator": "^1.0.3",
     "@radix-ui/react-slot": "^1.0.2",
     "@sentry/nextjs": "^7.84.0",
-    "@tanstack/react-query": "^5.17.9",
+    "@tanstack/react-query": "^5.28.4",
+    "@trpc/client": "^11.0.0-next-beta.318",
+    "@trpc/next": "^11.0.0-next-beta.318",
+    "@trpc/react-query": "^11.0.0-next-beta.318",
+    "@trpc/server": "^11.0.0-next-beta.318",
     "ajv": "^8.12.0",
     "class-variance-authority": "^0.7.0",
     "clsx": "^2.0.0",

packages/content-schema/scripts/generate-schema-types.ts

@@ -8,7 +8,7 @@ async function convertSchemaToType(file: string): Promise<void> {
     const ts: string = await compileFromFile(file);
     fs.writeFileSync(
       path.join(path.dirname(file), path.basename(file, ".json") + ".d.ts"),
-      ts
+      ts,
     );
     console.log(`Converted: ${file}`);
   } catch (error) {

packages/content-schema/scripts/validate.ts

@@ -34,14 +34,14 @@ const checkIds = (obj: any, context: string, path = "") => {
     if (obj.id) {
       if (ids.has(obj.id)) {
         console.error(
-          `Duplicate ID found: ${obj.id} in ${context} path: ${path}`
+          `Duplicate ID found: ${obj.id} in ${context} path: ${path}`,
         );
       } else {
         ids.add(obj.id);
       }
     }
     Object.entries(obj).forEach(([key, value]) =>
-      checkIds(value, `${path}.${key}`, context)
+      checkIds(value, `${path}.${key}`, context),
     );
   }
 };
@@ -51,23 +51,23 @@ const checkIds = (obj: any, context: string, path = "") => {
 const lessonSchema = JSON.parse(
   fs.readFileSync(path.resolve(__dirname, "../schemas/lesson.schema.json"), {
     encoding: "utf8",
-  })
+  }),
 );
 const courseSchema = JSON.parse(
   fs.readFileSync(path.resolve(__dirname, "../schemas/course.schema.json"), {
     encoding: "utf8",
-  })
+  }),
 );
 const manifestSchema = JSON.parse(
   fs.readFileSync(path.resolve(__dirname, "../schemas/manifest.schema.json"), {
     encoding: "utf8",
-  })
+  }),
 );
 
 async function validateLesson(file: string) {
   const lesson = await contentParser.parse<Lesson>(
     fs.readFileSync(file, "utf8"),
-    lessonSchema
+    lessonSchema,
   );
 
   checkIds(lesson, file);
@@ -77,7 +77,7 @@ async function validateLesson(file: string) {
 async function validateCourse(file: string) {
   const course = await contentParser.parse<Course>(
     fs.readFileSync(file, "utf8"),
-    courseSchema
+    courseSchema,
   );
   checkIds(course, file);
   return course;
@@ -86,7 +86,7 @@ async function validateCourse(file: string) {
 async function validateManifest(file: string) {
   const manifest = await contentParser.parse<Manifest>(
     fs.readFileSync(file, "utf8"),
-    manifestSchema
+    manifestSchema,
   );
   return manifest;
 }
@@ -98,12 +98,12 @@ async function scanDirectory(directoryPath: string) {
 
   for (const coursePath of manifest.courses) {
     const course = await validateCourse(
-      `${directoryPath}/courses/${coursePath}/course.yaml`
+      `${directoryPath}/courses/${coursePath}/course.yaml`,
     );
 
     for (const lessonPath of course.lessons) {
       await validateLesson(
-        `${directoryPath}/courses/${coursePath}/lessons/${lessonPath}/lesson.yaml`
+        `${directoryPath}/courses/${coursePath}/lessons/${lessonPath}/lesson.yaml`,
       );
     }
   }

packages/content-schema/tsconfig.json

@@ -3,19 +3,19 @@
     /* Visit https://aka.ms/tsconfig to read more about this file */
 
     /* Language and Environment */
-    "target": "es2016",                                  /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */
+    "target": "es2016" /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */,
 
     /* Modules */
-    "module": "commonjs",                                /* Specify what module code is generated. */
+    "module": "commonjs" /* Specify what module code is generated. */,
 
     /* Interop Constraints */
-    "esModuleInterop": true,                             /* Emit additional JavaScript to ease support for importing CommonJS modules. This enables 'allowSyntheticDefaultImports' for type compatibility. */
-    "forceConsistentCasingInFileNames": true,            /* Ensure that casing is correct in imports. */
+    "esModuleInterop": true /* Emit additional JavaScript to ease support for importing CommonJS modules. This enables 'allowSyntheticDefaultImports' for type compatibility. */,
+    "forceConsistentCasingInFileNames": true /* Ensure that casing is correct in imports. */,
 
     /* Type Checking */
-    "strict": true,                                      /* Enable all strict type-checking options. */
+    "strict": true /* Enable all strict type-checking options. */,
 
     /* Completeness */
-    "skipLibCheck": true                                 /* Skip type checking all .d.ts files. */
+    "skipLibCheck": true /* Skip type checking all .d.ts files. */
   }
 }

src/app/(auth)/auth/new-user/page.tsx

@@ -1,4 +1,4 @@
-import { getAppSessionServer } from "@/entities/user/session.server";
+import { getAppSessionServer } from "@/kernel/lib/next-auth/server";
 import { UpdateProfileForm } from "@/features/update-profile/update-profile-form";
 import { Separator } from "@/shared/ui/separator";
 import { redirect } from "next/navigation";

src/app/(auth)/layout.tsx

@@ -1,4 +1,4 @@
-import { AppHeader } from "@/widgets/app-header/app-header";
+import { AppHeader } from "../_widgets/app-header/app-header";
 
 export default async function Layout({
   children,

src/app/(private)/layout.tsx

@@ -1,5 +1,5 @@
 import AuthorizedGuard from "@/features/auth/authorized-guard";
-import { AppHeader } from "@/widgets/app-header/app-header";
+import { AppHeader } from "../_widgets/app-header/app-header";
 
 export default async function Layout({
   children,

src/app/(public)/layout.tsx

@@ -1,4 +1,4 @@
-import { AppHeader } from "@/widgets/app-header/app-header";
+import { AppHeader } from "../_widgets/app-header/app-header";
 
 export default async function Layout({
   children,

src/app/_providers/app-provider.tsx

@@ -1,18 +1,35 @@
 "use client";
 
-import { AppSessionProvider } from "@/entities/user/session";
+import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
+import React, { useState } from "react";
 import { ThemeProvider } from "@/features/theme/theme-provider";
-import { queryClient } from "@/shared/api/query-client";
+import { AppSessionProvider } from "@/kernel/lib/next-auth/client";
 import { ComposeChildren } from "@/shared/lib/react";
-import { QueryClientProvider } from "@tanstack/react-query";
-import React from "react";
+import { sharedApi } from "@/kernel/lib/trpc/client";
+import { TRPCUntypedClient, httpBatchLink } from "@trpc/client";
+import { publicConfig } from "@/shared/config/public";
+import { AnyRouter } from "@trpc/server";
 
 export function AppProvider({ children }: { children: React.ReactNode }) {
+  const [queryClient] = useState(() => new QueryClient());
+  const [trpcClient] = useState<TRPCUntypedClient<AnyRouter>>(() =>
+    sharedApi.createClient({
+      links: [
+        httpBatchLink({
+          url: `${publicConfig.PUBLIC_URL}/api/trpc`,
+        }),
+      ],
+    }),
+  );
+
   return (
     <ComposeChildren>
+      <sharedApi.Provider client={trpcClient} queryClient={queryClient}>
+        <></>
+      </sharedApi.Provider>
+      <QueryClientProvider client={queryClient} />
       <ThemeProvider />
       <AppSessionProvider />
-      <QueryClientProvider client={queryClient} />
       {children}
     </ComposeChildren>
   );

src/widgets/app-header/_ui/profile.tsx → src/app/_widgets/app-header/_ui/profile.tsx

@@ -11,11 +11,11 @@ import {
 import { LogOut, User } from "lucide-react";
 import { Button } from "@/shared/ui/button";
 import Link from "next/link";
-import { useAppSession } from "@/entities/user/session";
 import { Skeleton } from "@/shared/ui/skeleton";
 import { useSignOut } from "@/features/auth/use-sign-out";
 import { SignInButton } from "@/features/auth/sign-in-button";
 import { ProfileAvatar, getProfileDisplayName } from "@/entities/user/profile";
+import { useAppSession } from "@/kernel/lib/next-auth/client";
 
 export function Profile() {
   const session = useAppSession();

src/app/api/auth/[...nextauth]/route.ts

@@ -1,4 +1,4 @@
-import { nextAuthConfig } from "@/entities/user/next-auth-config";
+import { nextAuthConfig } from "@/kernel/lib/next-auth/next-auth-config";
 import NextAuth from "next-auth/next";
 
 const authHandler = NextAuth(nextAuthConfig);

src/app/api/trpc/[trpc]/route.ts

@@ -0,0 +1,13 @@
+import { coursesListController } from "@/features/courses-list/controller";
+import { createContext, sharedRouter, t } from "@/kernel/lib/trpc/server";
+import { fetchRequestHandler } from "@trpc/server/adapters/fetch";
+
+const handler = (req: Request) =>
+  fetchRequestHandler({
+    endpoint: "/api/trpc",
+    req,
+    router: t.mergeRouters(sharedRouter, coursesListController),
+    createContext: createContext,
+  });
+
+export { handler as GET, handler as POST };

src/entities/course/_use-cases/get-courses-list.ts → src/entities/course/_services/get-courses-list.ts

@@ -2,10 +2,10 @@ import { coursesRepository } from "../_repositories/course";
 
 type GetCoursesList = {};
 
-export class GetCoursesListUseCase {
+export class GetCoursesListService {
   async exec(data?: GetCoursesList) {
     return coursesRepository.getCoursesList();
   }
 }
 
-export const getCoursesListUseCase = new GetCoursesListUseCase();
+export const getCoursesListService = new GetCoursesListService();

src/entities/course/course.server.ts

@@ -1 +1 @@
-export { getCoursesListUseCase } from "./_use-cases/get-courses-list";
+export { getCoursesListService } from "./_services/get-courses-list";

src/entities/user/_actions/get-user-profile.ts

@@ -1,7 +1,7 @@
 "use server";
 import { z } from "zod";
-import { getUserUseCase } from "../_use-cases/get-user";
-import { getAppSessionStrictServer } from "../session.server";
+import { getUserService } from "../_services/get-user";
+import { getAppSessionStrictServer } from "../../../kernel/lib/next-auth/server";
 import { profileSchema } from "../_domain/schema";
 
 const propsSchema = z.object({
@@ -19,7 +19,7 @@ export const getUserProfileAction = async (
 
   const session = await getAppSessionStrictServer();
 
-  const user = await getUserUseCase.exec({
+  const user = await getUserService.exec({
     session,
     userId,
   });

src/entities/user/_domain/ability.ts

@@ -1,11 +1,11 @@
-import { ROLES, SessionEntity, UserId } from "./types";
+import { SharedSession, UserId, ROLES } from "@/kernel/domain/user";
 
-export const createUserAbility = (session: SessionEntity) => ({
+export const createUserAbility = (session: SharedSession) => ({
   canGetUser: (userId: UserId) =>
     session.user.id === userId || session.user.role === ROLES.ADMIN,
 });
 
-export const createProfileAbility = (session: SessionEntity) => ({
+export const createProfileAbility = (session: SharedSession) => ({
   canUpdateProfile: (userId: UserId) =>
     session.user.id === userId || session.user.role === ROLES.ADMIN,
 });

src/entities/user/_domain/types.ts

@@ -1,33 +1,3 @@
-export type UserId = string;
-export type Role = "ADMIN" | "USER";
-
-export const ROLES: Record<Role, Role> = {
-  ADMIN: "ADMIN",
-  USER: "USER",
-};
-
-export type UserEntity = {
-  id: UserId;
-  email: string;
-  role: Role;
-  emailVerified?: Date | null;
-  name?: string | null;
-  image?: string | null;
-};
-
-export type SessionEntity = {
-  user: {
-    id: UserId;
-    email: string;
-    role: Role;
-    name?: string | null;
-    image?: string | null;
-  };
-  expires: string;
-};
-
-// Projections
-
 export type Profile = {
   email: string;
   name?: string | null;

src/entities/user/_queries/index.ts

@@ -1,4 +1,4 @@
-import { UserId } from "../_domain/types";
+import { UserId } from "@/kernel/domain/user";
 import { getUserProfileAction } from "../_actions/get-user-profile";
 import { useQueryClient } from "@tanstack/react-query";
 

src/entities/user/_repositories/profile.ts

@@ -1,5 +1,6 @@
 import { dbClient } from "@/shared/lib/db";
-import { Profile, UserId } from "../_domain/types";
+import { Profile } from "../_domain/types";
+import { UserId } from "@/kernel/domain/user";
 
 export class ProfileRepository {
   async update(userId: UserId, data: Partial<Profile>): Promise<Profile> {

src/entities/user/_repositories/user.ts

@@ -1,20 +1,14 @@
+import { UserId, SharedUser } from "@/kernel/domain/user";
 import { dbClient } from "@/shared/lib/db";
-import { UserEntity, UserId } from "../_domain/types";
 
 export class UserRepository {
-  async getUserById(userId: UserId): Promise<UserEntity> {
+  async getUserById(userId: UserId): Promise<SharedUser> {
     return dbClient.user.findUniqueOrThrow({
       where: {
         id: userId,
       },
     });
   }
-
-  async createUser(user: UserEntity): Promise<UserEntity> {
-    return await dbClient.user.create({
-      data: user,
-    });
-  }
 }
 
 export const userRepository = new UserRepository();