@zyacreatives/shared 2.2.78 → 2.2.79

package/dist/schemas/user.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.UserSearchDocumentSchema = exports.SearchUsersOutputSchema = exports.SearchUsersInputSchema = exports.GetUserActivityOutputSchema = exports.GetUserActivityInputSchema = exports.GetAuthenticatedUserWithProjectLikesOutputSchema = exports.GetAuthenticatedUserWithUserFollowersOutputSchema = exports.GetAuthenticatedUserWithUserFollowingOutputSchema = exports.GetAuthenticatedUserWithProjectBookmarksOutputSchema = exports.GetAuthenticatedUserWithProjectsOutputSchema = exports.GetAuthenticatedUserProfileOutputSchema = exports.GetAuthenticatedUserOutputSchema = exports.UserWithPostsEntitySchema = exports.GetUserFollowingOutputSchema = exports.GetUserFollowersOutputSchema = exports.UserWithFollowersEntitySchema = exports.UserWithFollowingEntitySchema = exports.GetUserFollowersInputSchema = exports.GetUserFollowingInputSchema = exports.UserWithProjectBookmarksEntitySchema = exports.UserWithJobBookmarksOutputSchema = exports.UserWithJobBookmarksInputSchema = exports.UserWithJobBookmarksEntitySchema = exports.UserWithPostBookmarksEntitySchema = exports.UserWithPostLikesEntitySchema = exports.UserWithProjectLikesEntitySchema = exports.UserWithProjectsEntitySchema = exports.UserProfileEntitySchema = exports.UserStatsEntitySchema = exports.MinimalUserSchema = exports.UserEntitySchema = void 0;
+exports.UserSearchDocumentSchema = exports.SearchUsersOutputSchema = exports.SearchUsersInputSchema = exports.GetUserActivityOutputSchema = exports.GetUserActivityInputSchema = exports.GetAuthenticatedUserWithUserFollowersOutputSchema = exports.GetAuthenticatedUserWithUserFollowingOutputSchema = exports.GetAuthenticatedUserWithProjectLikesOutputSchema = exports.GetAuthenticatedUserWithProjectBookmarksOutputSchema = exports.GetAuthenticatedUserWithProjectsOutputSchema = exports.GetAuthenticatedUserProfileOutputSchema = exports.GetAuthenticatedUserOutputSchema = exports.GetUserFollowersOutputSchema = exports.GetUserFollowingOutputSchema = exports.GetUserFollowersInputSchema = exports.GetUserFollowingInputSchema = exports.UserWithFollowersEntitySchema = exports.UserWithFollowingEntitySchema = exports.GetUserWithPostBookmarksOutputSchema = exports.GetUserWithProjectBookmarksOutputSchema = exports.GetUserWithPostBookmarksInputSchema = exports.GetUserWithProjectBookmarksInputSchema = exports.UserWithPostBookmarksEntitySchema = exports.UserWithProjectBookmarksEntitySchema = exports.UserWithJobBookmarksOutputSchema = exports.UserWithJobBookmarksInputSchema = exports.UserWithJobBookmarksEntitySchema = exports.UserWithPostLikesEntitySchema = exports.UserWithProjectLikesEntitySchema = exports.UserWithPostsEntitySchema = exports.UserWithProjectsEntitySchema = exports.UserStatsEntitySchema = exports.UserProfileEntitySchema = exports.MinimalUserSchema = exports.UserEntitySchema = void 0;
 const zod_openapi_1 = require("@hono/zod-openapi");
 const constants_1 = require("../constants");
 const project_1 = require("./project");
@@ -11,6 +11,9 @@ const creative_1 = require("./creative");
 const investor_1 = require("./investor");
 const post_1 = require("./post");
 const job_1 = require("./job");
+// ==========================================
+// 1. CORE USER ENTITIES
+// ==========================================
 exports.UserEntitySchema = zod_openapi_1.z
     .object({
     id: zod_openapi_1.z.cuid2().openapi({ example: "cksd0v6q0000s9a5y8z7p3x9" }),
@@ -49,13 +52,6 @@ exports.MinimalUserSchema = exports.UserEntitySchema.pick({
     username: true,
     role: true,
 }).openapi("MinimalUser");
-exports.UserStatsEntitySchema = zod_openapi_1.z.object({
-    followerCount: zod_openapi_1.z.int().openapi({ example: 1540 }),
-    followingCount: zod_openapi_1.z.int().openapi({ example: 234 }),
-    followingIds: zod_openapi_1.z
-        .array(zod_openapi_1.z.cuid2())
-        .openapi({ example: ["cksd0v6q0000s9a5y8z7p3x9", "clm1a2b3c0000abc"] }),
-});
 exports.UserProfileEntitySchema = exports.UserEntitySchema.extend({
     profileType: zod_openapi_1.z
         .enum(["creative", "brand", "investor"])
@@ -65,6 +61,16 @@ exports.UserProfileEntitySchema = exports.UserEntitySchema.extend({
     creative: creative_1.CreativeEntitySchema,
     investor: investor_1.InvestorEntitySchema,
 }).openapi("UserProfileEntity");
+exports.UserStatsEntitySchema = zod_openapi_1.z.object({
+    followerCount: zod_openapi_1.z.int().openapi({ example: 1540 }),
+    followingCount: zod_openapi_1.z.int().openapi({ example: 234 }),
+    followingIds: zod_openapi_1.z
+        .array(zod_openapi_1.z.cuid2())
+        .openapi({ example: ["cksd0v6q0000s9a5y8z7p3x9", "clm1a2b3c0000abc"] }),
+});
+// ==========================================
+// 2. CONTENT ASSOCIATIONS (Projects, Posts)
+// ==========================================
 exports.UserWithProjectsEntitySchema = zod_openapi_1.z
     .object({
     userId: zod_openapi_1.z.cuid2().openapi({ example: "cksd0v6q0000s9a5y8z7p3x9" }),
@@ -73,6 +79,15 @@ exports.UserWithProjectsEntitySchema = zod_openapi_1.z
         .openapi({ example: [] }),
 })
     .openapi("UserWithProjectsEntity");
+exports.UserWithPostsEntitySchema = zod_openapi_1.z
+    .object({
+    userId: zod_openapi_1.z.cuid2().openapi({ example: "cksd0v6q0000s9a5y8z7p3x9" }),
+    posts: zod_openapi_1.z.array(post_1.PostWithFilesEntitySchema).openapi({ example: [] }),
+})
+    .openapi("UserWithPostsEntity");
+// ==========================================
+// 3. LIKES
+// ==========================================
 exports.UserWithProjectLikesEntitySchema = zod_openapi_1.z.object({
     userId: zod_openapi_1.z.cuid2().openapi({ example: "cksd0v6q0000s9a5y8z7p3x9" }),
     projectLikes: zod_openapi_1.z
@@ -93,22 +108,6 @@ exports.UserWithPostLikesEntitySchema = zod_openapi_1.z.object({
     userId: zod_openapi_1.z.cuid2().openapi({ example: "cksd0v6q0000s9a5y8z7p3x9" }),
     postLikes: zod_openapi_1.z
         .array(like_1.LikeEntitySchema.extend({
-        post: post_1.PostEntitySchema.pick({
-            id: true,
-            parentId: true,
-            title: true, // Note: Make sure 'title' exists on PostEntitySchema in your post.ts!
-            content: true,
-            tags: true,
-            createdAt: true,
-            updatedAt: true, // Note: Make sure 'updatedAt' exists on PostEntitySchema as well!
-        }),
-    }))
-        .openapi({ example: [] }),
-});
-exports.UserWithPostBookmarksEntitySchema = zod_openapi_1.z.object({
-    userId: zod_openapi_1.z.cuid2().openapi({ example: "cksd0v6q0000s9a5y8z7p3x9" }),
-    postBookmarks: zod_openapi_1.z
-        .array(bookmark_1.BookmarkEntitySchema.extend({
         post: post_1.PostEntitySchema.pick({
             id: true,
             parentId: true,
@@ -121,6 +120,9 @@ exports.UserWithPostBookmarksEntitySchema = zod_openapi_1.z.object({
     }))
         .openapi({ example: [] }),
 });
+// ==========================================
+// 4. BOOKMARKS
+// ==========================================
 exports.UserWithJobBookmarksEntitySchema = zod_openapi_1.z.object({
     userId: zod_openapi_1.z.cuid2().openapi({ example: "afoaifaofi" }),
     jobBookmarks: zod_openapi_1.z
@@ -144,27 +146,30 @@ exports.UserWithProjectBookmarksEntitySchema = zod_openapi_1.z
     userId: zod_openapi_1.z.cuid2().openapi({ example: "cksd0v6q0000s9a5y8z7p3x9" }),
     projectBookmarks: zod_openapi_1.z
         .array(bookmark_1.BookmarkEntitySchema.extend({
-        project: project_1.ProjectEntitySchema.pick({
-            id: true,
-            title: true,
-            description: true,
-            tags: true,
-            startDate: true,
-            endDate: true,
-            imagePlaceholderUrl: true,
-        }),
+        project: project_1.ProjectSearchDocumentSchema,
     }))
         .openapi({ example: [] }),
 })
     .openapi("UserWithProjectBookmarksEntity");
-exports.GetUserFollowingInputSchema = zod_openapi_1.z.object({
-    searchQuery: zod_openapi_1.z.string().optional().openapi({ example: "design systems" }),
-    offset: zod_openapi_1.z.number().int().nonnegative().optional().openapi({ example: 20 }),
+exports.UserWithPostBookmarksEntitySchema = zod_openapi_1.z.object({
+    userId: zod_openapi_1.z.cuid2().openapi({ example: "cksd0v6q0000s9a5y8z7p3x9" }),
+    postBookmarks: zod_openapi_1.z.array(bookmark_1.BookmarkEntitySchema.extend({
+        post: post_1.FeedPostEntitySchema,
+    })),
 });
-exports.GetUserFollowersInputSchema = zod_openapi_1.z.object({
-    searchQuery: zod_openapi_1.z.string().optional().openapi({ example: "design systems" }),
-    offset: zod_openapi_1.z.number().int().nonnegative().optional().openapi({ example: 20 }),
+exports.GetUserWithProjectBookmarksInputSchema = exports.UserWithJobBookmarksInputSchema;
+exports.GetUserWithPostBookmarksInputSchema = exports.UserWithJobBookmarksInputSchema;
+exports.GetUserWithProjectBookmarksOutputSchema = zod_openapi_1.z.object({
+    bookmarks: exports.UserWithProjectBookmarksEntitySchema,
+    nextCursor: zod_openapi_1.z.string().nullable(),
 });
+exports.GetUserWithPostBookmarksOutputSchema = zod_openapi_1.z.object({
+    bookmarks: exports.UserWithPostBookmarksEntitySchema,
+    nextCursor: zod_openapi_1.z.string().nullable(),
+});
+// ==========================================
+// 5. FOLLOWERS & FOLLOWING
+// ==========================================
 exports.UserWithFollowingEntitySchema = exports.MinimalUserSchema.extend({
     following: zod_openapi_1.z
         .array(exports.MinimalUserSchema.extend({
@@ -187,14 +192,13 @@ exports.UserWithFollowersEntitySchema = exports.MinimalUserSchema.extend({
         example: [],
     }),
 }).openapi("UserWithFollowersEntity");
-exports.GetUserFollowersOutputSchema = zod_openapi_1.z.object({
-    nextCursor: zod_openapi_1.z.string().openapi({ example: "cksd0v6q0000nxtcur" }),
-    followers: zod_openapi_1.z
-        .array(exports.MinimalUserSchema.extend({
-        isFollowing: zod_openapi_1.z.boolean().optional().openapi({ example: false }),
-        followsYou: zod_openapi_1.z.boolean().optional().openapi({ example: true }),
-    }))
-        .openapi({ example: [] }),
+exports.GetUserFollowingInputSchema = zod_openapi_1.z.object({
+    searchQuery: zod_openapi_1.z.string().optional().openapi({ example: "design systems" }),
+    offset: zod_openapi_1.z.number().int().nonnegative().optional().openapi({ example: 20 }),
+});
+exports.GetUserFollowersInputSchema = zod_openapi_1.z.object({
+    searchQuery: zod_openapi_1.z.string().optional().openapi({ example: "design systems" }),
+    offset: zod_openapi_1.z.number().int().nonnegative().optional().openapi({ example: 20 }),
 });
 exports.GetUserFollowingOutputSchema = zod_openapi_1.z.object({
     nextCursor: zod_openapi_1.z.string().openapi({ example: "cksd0v6q0000nxtcur" }),
@@ -205,19 +209,28 @@ exports.GetUserFollowingOutputSchema = zod_openapi_1.z.object({
     }))
         .openapi({ example: [] }),
 });
-exports.UserWithPostsEntitySchema = zod_openapi_1.z
-    .object({
-    userId: zod_openapi_1.z.cuid2().openapi({ example: "cksd0v6q0000s9a5y8z7p3x9" }),
-    posts: zod_openapi_1.z.array(post_1.PostWithFilesEntitySchema).openapi({ example: [] }),
-})
-    .openapi("UserWithPostsEntity");
+exports.GetUserFollowersOutputSchema = zod_openapi_1.z.object({
+    nextCursor: zod_openapi_1.z.string().openapi({ example: "cksd0v6q0000nxtcur" }),
+    followers: zod_openapi_1.z
+        .array(exports.MinimalUserSchema.extend({
+        isFollowing: zod_openapi_1.z.boolean().optional().openapi({ example: false }),
+        followsYou: zod_openapi_1.z.boolean().optional().openapi({ example: true }),
+    }))
+        .openapi({ example: [] }),
+});
+// ==========================================
+// 6. AUTHENTICATED USER OUTPUTS
+// ==========================================
 exports.GetAuthenticatedUserOutputSchema = exports.UserEntitySchema;
 exports.GetAuthenticatedUserProfileOutputSchema = exports.UserProfileEntitySchema;
 exports.GetAuthenticatedUserWithProjectsOutputSchema = exports.UserWithProjectsEntitySchema;
 exports.GetAuthenticatedUserWithProjectBookmarksOutputSchema = exports.UserWithProjectBookmarksEntitySchema;
+exports.GetAuthenticatedUserWithProjectLikesOutputSchema = exports.UserWithProjectLikesEntitySchema;
 exports.GetAuthenticatedUserWithUserFollowingOutputSchema = exports.UserWithFollowingEntitySchema;
 exports.GetAuthenticatedUserWithUserFollowersOutputSchema = exports.UserWithFollowersEntitySchema;
-exports.GetAuthenticatedUserWithProjectLikesOutputSchema = exports.UserWithProjectLikesEntitySchema;
+// ==========================================
+// 7. ACTIVITY
+// ==========================================
 exports.GetUserActivityInputSchema = zod_openapi_1.z.object({
     activityType: zod_openapi_1.z
         .enum(Object.values(constants_1.ACTIVITY_TYPES))
@@ -231,6 +244,9 @@ exports.GetUserActivityOutputSchema = zod_openapi_1.z
         .openapi({ example: "POST" }),
 }))
     .openapi({ example: [] });
+// ==========================================
+// 8. SEARCH
+// ==========================================
 exports.SearchUsersInputSchema = zod_openapi_1.z.object({
     query: zod_openapi_1.z.string().default("").openapi({
         example: "john",

package/dist/types/user.d.ts

@@ -1,19 +1,27 @@
-import { MinimalUserSchema, UserEntitySchema, UserProfileEntitySchema, UserWithProjectsEntitySchema, UserWithProjectBookmarksEntitySchema, GetUserFollowingInputSchema, GetUserFollowersInputSchema, UserWithFollowingEntitySchema, UserWithFollowersEntitySchema, GetUserFollowingOutputSchema, GetUserFollowersOutputSchema, GetAuthenticatedUserOutputSchema, GetAuthenticatedUserProfileOutputSchema, GetAuthenticatedUserWithProjectsOutputSchema, GetAuthenticatedUserWithProjectBookmarksOutputSchema, GetAuthenticatedUserWithUserFollowingOutputSchema, GetAuthenticatedUserWithUserFollowersOutputSchema, SearchUsersInputSchema, UserWithProjectLikesEntitySchema, GetAuthenticatedUserWithProjectLikesOutputSchema, GetUserActivityInputSchema, GetUserActivityOutputSchema, UserStatsEntitySchema, UserWithPostsEntitySchema, SearchUsersOutputSchema, UserWithPostBookmarksEntitySchema, UserWithPostLikesEntitySchema, UserSearchDocumentSchema, UserWithJobBookmarksEntitySchema, UserWithJobBookmarksInputSchema, UserWithJobBookmarksOutputSchema } from "../schemas/user";
 import { z } from "@hono/zod-openapi";
+import { UserEntitySchema, MinimalUserSchema, UserProfileEntitySchema, UserStatsEntitySchema, UserWithProjectsEntitySchema, UserWithPostsEntitySchema, UserWithProjectLikesEntitySchema, UserWithPostLikesEntitySchema, UserWithJobBookmarksEntitySchema, UserWithJobBookmarksInputSchema, UserWithJobBookmarksOutputSchema, UserWithProjectBookmarksEntitySchema, UserWithPostBookmarksEntitySchema, GetUserWithProjectBookmarksInputSchema, GetUserWithPostBookmarksInputSchema, GetUserWithProjectBookmarksOutputSchema, GetUserWithPostBookmarksOutputSchema, UserWithFollowingEntitySchema, UserWithFollowersEntitySchema, GetUserFollowingInputSchema, GetUserFollowersInputSchema, GetUserFollowingOutputSchema, GetUserFollowersOutputSchema, GetAuthenticatedUserOutputSchema, GetAuthenticatedUserProfileOutputSchema, GetAuthenticatedUserWithProjectsOutputSchema, GetAuthenticatedUserWithProjectBookmarksOutputSchema, GetAuthenticatedUserWithProjectLikesOutputSchema, GetAuthenticatedUserWithUserFollowingOutputSchema, GetAuthenticatedUserWithUserFollowersOutputSchema, GetUserActivityInputSchema, GetUserActivityOutputSchema, SearchUsersInputSchema, SearchUsersOutputSchema, UserSearchDocumentSchema } from "../schemas/user";
 export type BaseUserEntity = z.infer<typeof UserEntitySchema>;
-export type MinimalUser = z.infer<typeof MinimalUserSchema>;
 export type UserEntity = z.infer<typeof UserEntitySchema>;
+export type MinimalUser = z.infer<typeof MinimalUserSchema>;
 export type UserProfileEntity = z.infer<typeof UserProfileEntitySchema>;
+export type UserStatsEntity = z.infer<typeof UserStatsEntitySchema>;
 export type UserWithProjectsEntity = z.infer<typeof UserWithProjectsEntitySchema>;
-export type UserWithProjectBookmarksEntity = z.infer<typeof UserWithProjectBookmarksEntitySchema>;
+export type UserWithUserPostsEntity = z.infer<typeof UserWithPostsEntitySchema>;
 export type UserWithProjectLikesEntity = z.infer<typeof UserWithProjectLikesEntitySchema>;
-export type UserWithPostBookmarksEntity = z.infer<typeof UserWithPostBookmarksEntitySchema>;
 export type UserWithPostLikesEntity = z.infer<typeof UserWithPostLikesEntitySchema>;
-export type UserWithUserPostsEntity = z.infer<typeof UserWithPostsEntitySchema>;
-export type GetUserFollowingInput = z.infer<typeof GetUserFollowingInputSchema>;
-export type GetUserFollowersInput = z.infer<typeof GetUserFollowersInputSchema>;
+export type UserWithJobBookmarksEntity = z.infer<typeof UserWithJobBookmarksEntitySchema>;
+export type UserWithJobBookmarksInput = z.infer<typeof UserWithJobBookmarksInputSchema>;
+export type UserWithJobBookmarksOutput = z.infer<typeof UserWithJobBookmarksOutputSchema>;
+export type UserWithProjectBookmarksEntity = z.infer<typeof UserWithProjectBookmarksEntitySchema>;
+export type UserWithPostBookmarksEntity = z.infer<typeof UserWithPostBookmarksEntitySchema>;
+export type GetUserWithProjectBookmarksInput = z.infer<typeof GetUserWithProjectBookmarksInputSchema>;
+export type GetUserWithPostBookmarksInput = z.infer<typeof GetUserWithPostBookmarksInputSchema>;
+export type GetUserWithProjectBookmarksOutput = z.infer<typeof GetUserWithProjectBookmarksOutputSchema>;
+export type GetUserWithPostBookmarksOutput = z.infer<typeof GetUserWithPostBookmarksOutputSchema>;
 export type UserWithFollowingEntity = z.infer<typeof UserWithFollowingEntitySchema>;
 export type UserWithFollowersEntity = z.infer<typeof UserWithFollowersEntitySchema>;
+export type GetUserFollowingInput = z.infer<typeof GetUserFollowingInputSchema>;
+export type GetUserFollowersInput = z.infer<typeof GetUserFollowersInputSchema>;
 export type GetUserFollowingOutput = z.infer<typeof GetUserFollowingOutputSchema>;
 export type GetUserFollowersOutput = z.infer<typeof GetUserFollowersOutputSchema>;
 export type GetAuthenticatedUserOutput = z.infer<typeof GetAuthenticatedUserOutputSchema>;
@@ -25,10 +33,6 @@ export type GetAuthenticatedUserWithUserFollowingOutput = z.infer<typeof GetAuth
 export type GetAuthenticatedUserWithUserFollowersOutput = z.infer<typeof GetAuthenticatedUserWithUserFollowersOutputSchema>;
 export type GetUserActivityInput = z.infer<typeof GetUserActivityInputSchema>;
 export type GetUserActivityOutput = z.infer<typeof GetUserActivityOutputSchema>;
-export type UserStatsEntity = z.infer<typeof UserStatsEntitySchema>;
 export type SearchUsersInput = z.infer<typeof SearchUsersInputSchema>;
 export type SearchUsersOutput = z.infer<typeof SearchUsersOutputSchema>;
 export type UserSearchDocument = z.infer<typeof UserSearchDocumentSchema>;
-export type UserWithJobBookmarksEntity = z.infer<typeof UserWithJobBookmarksEntitySchema>;
-export type UserWithJobBookmarksInput = z.infer<typeof UserWithJobBookmarksInputSchema>;
-export type UserWithJobBookmarksOutput = z.infer<typeof UserWithJobBookmarksOutputSchema>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zyacreatives/shared",
-  "version": "2.2.78",
+  "version": "2.2.79",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/schemas/user.ts

@@ -14,15 +14,23 @@ import type {
   ActivityType,
   ActivityParentType,
 } from "../constants";
-import { ProjectEntitySchema } from "./project";
+import { ProjectEntitySchema, ProjectSearchDocumentSchema } from "./project";
 import { BookmarkEntitySchema } from "./bookmark";
 import { LikeEntitySchema } from "./like";
 import { BrandEntitySchema } from "./brand";
 import { CreativeEntitySchema } from "./creative";
 import { InvestorEntitySchema } from "./investor";
-import { PostEntitySchema, PostWithFilesEntitySchema } from "./post";
+import {
+  FeedPostEntitySchema,
+  PostEntitySchema,
+  PostWithFilesEntitySchema,
+} from "./post";
 import { JobEntitySchema, JobSearchDocumentSchema } from "./job";
 
+// ==========================================
+// 1. CORE USER ENTITIES
+// ==========================================
+
 export const UserEntitySchema = z
   .object({
     id: z.cuid2().openapi({ example: "cksd0v6q0000s9a5y8z7p3x9" }),
@@ -68,14 +76,6 @@ export const MinimalUserSchema = UserEntitySchema.pick({
   role: true,
 }).openapi("MinimalUser");
 
-export const UserStatsEntitySchema = z.object({
-  followerCount: z.int().openapi({ example: 1540 }),
-  followingCount: z.int().openapi({ example: 234 }),
-  followingIds: z
-    .array(z.cuid2())
-    .openapi({ example: ["cksd0v6q0000s9a5y8z7p3x9", "clm1a2b3c0000abc"] }),
-});
-
 export const UserProfileEntitySchema = UserEntitySchema.extend({
   profileType: z
     .enum(["creative", "brand", "investor"])
@@ -86,6 +86,18 @@ export const UserProfileEntitySchema = UserEntitySchema.extend({
   investor: InvestorEntitySchema,
 }).openapi("UserProfileEntity");
 
+export const UserStatsEntitySchema = z.object({
+  followerCount: z.int().openapi({ example: 1540 }),
+  followingCount: z.int().openapi({ example: 234 }),
+  followingIds: z
+    .array(z.cuid2())
+    .openapi({ example: ["cksd0v6q0000s9a5y8z7p3x9", "clm1a2b3c0000abc"] }),
+});
+
+// ==========================================
+// 2. CONTENT ASSOCIATIONS (Projects, Posts)
+// ==========================================
+
 export const UserWithProjectsEntitySchema = z
   .object({
     userId: z.cuid2().openapi({ example: "cksd0v6q0000s9a5y8z7p3x9" }),
@@ -95,6 +107,17 @@ export const UserWithProjectsEntitySchema = z
   })
   .openapi("UserWithProjectsEntity");
 
+export const UserWithPostsEntitySchema = z
+  .object({
+    userId: z.cuid2().openapi({ example: "cksd0v6q0000s9a5y8z7p3x9" }),
+    posts: z.array(PostWithFilesEntitySchema).openapi({ example: [] }),
+  })
+  .openapi("UserWithPostsEntity");
+
+// ==========================================
+// 3. LIKES
+// ==========================================
+
 export const UserWithProjectLikesEntitySchema = z.object({
   userId: z.cuid2().openapi({ example: "cksd0v6q0000s9a5y8z7p3x9" }),
   projectLikes: z
@@ -119,25 +142,6 @@ export const UserWithPostLikesEntitySchema = z.object({
   postLikes: z
     .array(
       LikeEntitySchema.extend({
-        post: PostEntitySchema.pick({
-          id: true,
-          parentId: true,
-          title: true, // Note: Make sure 'title' exists on PostEntitySchema in your post.ts!
-          content: true,
-          tags: true,
-          createdAt: true,
-          updatedAt: true, // Note: Make sure 'updatedAt' exists on PostEntitySchema as well!
-        }),
-      }),
-    )
-    .openapi({ example: [] }),
-});
-
-export const UserWithPostBookmarksEntitySchema = z.object({
-  userId: z.cuid2().openapi({ example: "cksd0v6q0000s9a5y8z7p3x9" }),
-  postBookmarks: z
-    .array(
-      BookmarkEntitySchema.extend({
         post: PostEntitySchema.pick({
           id: true,
           parentId: true,
@@ -152,6 +156,10 @@ export const UserWithPostBookmarksEntitySchema = z.object({
     .openapi({ example: [] }),
 });
 
+// ==========================================
+// 4. BOOKMARKS
+// ==========================================
+
 export const UserWithJobBookmarksEntitySchema = z.object({
   userId: z.cuid2().openapi({ example: "afoaifaofi" }),
   jobBookmarks: z
@@ -181,31 +189,41 @@ export const UserWithProjectBookmarksEntitySchema = z
     projectBookmarks: z
       .array(
         BookmarkEntitySchema.extend({
-          project: ProjectEntitySchema.pick({
-            id: true,
-            title: true,
-            description: true,
-            tags: true,
-            startDate: true,
-            endDate: true,
-            imagePlaceholderUrl: true,
-          }),
+          project: ProjectSearchDocumentSchema,
         }),
       )
       .openapi({ example: [] }),
   })
   .openapi("UserWithProjectBookmarksEntity");
 
-export const GetUserFollowingInputSchema = z.object({
-  searchQuery: z.string().optional().openapi({ example: "design systems" }),
-  offset: z.number().int().nonnegative().optional().openapi({ example: 20 }),
+export const UserWithPostBookmarksEntitySchema = z.object({
+  userId: z.cuid2().openapi({ example: "cksd0v6q0000s9a5y8z7p3x9" }),
+  postBookmarks: z.array(
+    BookmarkEntitySchema.extend({
+      post: FeedPostEntitySchema,
+    }),
+  ),
 });
 
-export const GetUserFollowersInputSchema = z.object({
-  searchQuery: z.string().optional().openapi({ example: "design systems" }),
-  offset: z.number().int().nonnegative().optional().openapi({ example: 20 }),
+export const GetUserWithProjectBookmarksInputSchema =
+  UserWithJobBookmarksInputSchema;
+export const GetUserWithPostBookmarksInputSchema =
+  UserWithJobBookmarksInputSchema;
+
+export const GetUserWithProjectBookmarksOutputSchema = z.object({
+  bookmarks: UserWithProjectBookmarksEntitySchema,
+  nextCursor: z.string().nullable(),
 });
 
+export const GetUserWithPostBookmarksOutputSchema = z.object({
+  bookmarks: UserWithPostBookmarksEntitySchema,
+  nextCursor: z.string().nullable(),
+});
+
+// ==========================================
+// 5. FOLLOWERS & FOLLOWING
+// ==========================================
+
 export const UserWithFollowingEntitySchema = MinimalUserSchema.extend({
   following: z
     .array(
@@ -234,36 +252,43 @@ export const UserWithFollowersEntitySchema = MinimalUserSchema.extend({
     }),
 }).openapi("UserWithFollowersEntity");
 
-export const GetUserFollowersOutputSchema = z.object({
+export const GetUserFollowingInputSchema = z.object({
+  searchQuery: z.string().optional().openapi({ example: "design systems" }),
+  offset: z.number().int().nonnegative().optional().openapi({ example: 20 }),
+});
+
+export const GetUserFollowersInputSchema = z.object({
+  searchQuery: z.string().optional().openapi({ example: "design systems" }),
+  offset: z.number().int().nonnegative().optional().openapi({ example: 20 }),
+});
+
+export const GetUserFollowingOutputSchema = z.object({
   nextCursor: z.string().openapi({ example: "cksd0v6q0000nxtcur" }),
-  followers: z
+  following: z
     .array(
       MinimalUserSchema.extend({
-        isFollowing: z.boolean().optional().openapi({ example: false }),
-        followsYou: z.boolean().optional().openapi({ example: true }),
+        isFollowing: z.boolean().optional().openapi({ example: true }),
+        followsYou: z.boolean().optional().openapi({ example: false }),
       }),
     )
     .openapi({ example: [] }),
 });
 
-export const GetUserFollowingOutputSchema = z.object({
+export const GetUserFollowersOutputSchema = z.object({
   nextCursor: z.string().openapi({ example: "cksd0v6q0000nxtcur" }),
-  following: z
+  followers: z
     .array(
       MinimalUserSchema.extend({
-        isFollowing: z.boolean().optional().openapi({ example: true }),
-        followsYou: z.boolean().optional().openapi({ example: false }),
+        isFollowing: z.boolean().optional().openapi({ example: false }),
+        followsYou: z.boolean().optional().openapi({ example: true }),
       }),
     )
     .openapi({ example: [] }),
 });
 
-export const UserWithPostsEntitySchema = z
-  .object({
-    userId: z.cuid2().openapi({ example: "cksd0v6q0000s9a5y8z7p3x9" }),
-    posts: z.array(PostWithFilesEntitySchema).openapi({ example: [] }),
-  })
-  .openapi("UserWithPostsEntity");
+// ==========================================
+// 6. AUTHENTICATED USER OUTPUTS
+// ==========================================
 
 export const GetAuthenticatedUserOutputSchema = UserEntitySchema;
 export const GetAuthenticatedUserProfileOutputSchema = UserProfileEntitySchema;
@@ -271,12 +296,16 @@ export const GetAuthenticatedUserWithProjectsOutputSchema =
   UserWithProjectsEntitySchema;
 export const GetAuthenticatedUserWithProjectBookmarksOutputSchema =
   UserWithProjectBookmarksEntitySchema;
+export const GetAuthenticatedUserWithProjectLikesOutputSchema =
+  UserWithProjectLikesEntitySchema;
 export const GetAuthenticatedUserWithUserFollowingOutputSchema =
   UserWithFollowingEntitySchema;
 export const GetAuthenticatedUserWithUserFollowersOutputSchema =
   UserWithFollowersEntitySchema;
-export const GetAuthenticatedUserWithProjectLikesOutputSchema =
-  UserWithProjectLikesEntitySchema;
+
+// ==========================================
+// 7. ACTIVITY
+// ==========================================
 
 export const GetUserActivityInputSchema = z.object({
   activityType: z
@@ -300,6 +329,10 @@ export const GetUserActivityOutputSchema = z
   )
   .openapi({ example: [] });
 
+// ==========================================
+// 8. SEARCH
+// ==========================================
+
 export const SearchUsersInputSchema = z.object({
   query: z.string().default("").openapi({
     example: "john",