@sylphx/lens-server 1.3.2 → 1.5.0

package/src/e2e/server.test.ts

@@ -11,9 +11,9 @@
  */
 
 import { describe, expect, it } from "bun:test";
-import { type Update, applyUpdate, entity, mutation, query, t } from "@sylphx/lens-core";
+import { applyUpdate, entity, lens, mutation, query, t, type Update } from "@sylphx/lens-core";
 import { z } from "zod";
-import { type WebSocketLike, createServer } from "../server/create";
+import { createServer, type WebSocketLike } from "../server/create";
 
 // =============================================================================
 // Test Fixtures
@@ -40,7 +40,7 @@ const mockUsers = [
 	{ id: "user-2", name: "Bob", email: "bob@example.com", status: "offline" },
 ];
 
-const mockPosts = [
+const _mockPosts = [
 	{ id: "post-1", title: "Hello", content: "World", authorId: "user-1" },
 	{ id: "post-2", title: "Test", content: "Post", authorId: "user-1" },
 ];
@@ -65,10 +65,7 @@ function createMockClient(server: ReturnType<typeof createServer>) {
 			lastData: unknown;
 		}
 	>();
-	const pending = new Map<
-		string,
-		{ resolve: (data: unknown) => void; reject: (error: Error) => void }
-	>();
+	const pending = new Map<string, { resolve: (data: unknown) => void; reject: (error: Error) => void }>();
 
 	let messageIdCounter = 0;
 	const nextId = () => `msg_${++messageIdCounter}`;
@@ -237,7 +234,11 @@ describe("E2E - Basic Operations", () => {
 		const getUser = query()
 			.input(z.object({ id: z.string() }))
 			.returns(User)
-			.resolve(({ input }) => mockUsers.find((u) => u.id === input.id) ?? null);
+			.resolve(({ input }) => {
+				const user = mockUsers.find((u) => u.id === input.id);
+				if (!user) throw new Error("Not found");
+				return user;
+			});
 
 		const server = createServer({
 			entities: { User },
@@ -283,7 +284,11 @@ describe("E2E - Subscriptions", () => {
 		const getUser = query()
 			.input(z.object({ id: z.string() }))
 			.returns(User)
-			.resolve(({ input }) => mockUsers.find((u) => u.id === input.id) ?? null);
+			.resolve(({ input }) => {
+				const user = mockUsers.find((u) => u.id === input.id);
+				if (!user) throw new Error("Not found");
+				return user;
+			});
 
 		const server = createServer({
 			entities: { User },
@@ -314,7 +319,9 @@ describe("E2E - Subscriptions", () => {
 			.returns(User)
 			.resolve(({ input, emit }) => {
 				emitFn = emit;
-				return mockUsers.find((u) => u.id === input.id) ?? null;
+				const user = mockUsers.find((u) => u.id === input.id);
+				if (!user) throw new Error("Not found");
+				return user;
 			});
 
 		const server = createServer({
@@ -357,7 +364,9 @@ describe("E2E - Subscriptions", () => {
 			.returns(User)
 			.resolve(({ input, emit }) => {
 				emitFn = emit;
-				return mockUsers.find((u) => u.id === input.id) ?? null;
+				const user = mockUsers.find((u) => u.id === input.id);
+				if (!user) throw new Error("Not found");
+				return user;
 			});
 
 		const server = createServer({
@@ -407,9 +416,7 @@ describe("E2E - Server API", () => {
 		const searchUsers = query()
 			.input(z.object({ query: z.string() }))
 			.returns([User])
-			.resolve(({ input }) =>
-				mockUsers.filter((u) => u.name.toLowerCase().includes(input.query.toLowerCase())),
-			);
+			.resolve(({ input }) => mockUsers.filter((u) => u.name.toLowerCase().includes(input.query.toLowerCase())));
 
 		const server = createServer({
 			entities: { User },
@@ -461,7 +468,9 @@ describe("E2E - Cleanup", () => {
 				onCleanup(() => {
 					cleanedUp = true;
 				});
-				return mockUsers.find((u) => u.id === input.id) ?? null;
+				const user = mockUsers.find((u) => u.id === input.id);
+				if (!user) throw new Error("Not found");
+				return user;
 			});
 
 		const server = createServer({
@@ -499,7 +508,9 @@ describe("E2E - GraphStateManager", () => {
 			.returns(User)
 			.resolve(({ input, emit }) => {
 				emitFn = emit;
-				return mockUsers.find((u) => u.id === input.id) ?? null;
+				const user = mockUsers.find((u) => u.id === input.id);
+				if (!user) throw new Error("Not found");
+				return user;
 			});
 
 		const updateUser = mutation()
@@ -566,22 +577,25 @@ describe("E2E - Entity Resolvers", () => {
 		const getUser = query()
 			.input(z.object({ id: z.string() }))
 			.returns(User)
-			.resolve(({ input }) => users.find((u) => u.id === input.id) ?? null);
+			.resolve(({ input }) => {
+				const user = users.find((u) => u.id === input.id);
+				if (!user) throw new Error("Not found");
+				return user;
+			});
 
-		// Create entity resolvers for User.posts
-		const resolvers = {
-			getResolver: (entityName: string, fieldName: string) => {
-				if (entityName === "User" && fieldName === "posts") {
-					return (user: { id: string }) => posts.filter((p) => p.authorId === user.id);
-				}
-				return undefined;
-			},
-		};
+		// Create entity resolvers using lens() factory
+		const { resolver } = lens();
+		const userResolver = resolver(User, (f) => ({
+			id: f.expose("id"),
+			name: f.expose("name"),
+			email: f.expose("email"),
+			posts: f.many(Post).resolve(({ parent }) => posts.filter((p) => p.authorId === parent.id)),
+		}));
 
 		const server = createServer({
 			entities: { User, Post },
 			queries: { getUser },
-			resolvers: resolvers as any,
+			resolvers: [userResolver],
 		});
 
 		// Test with $select for nested posts
@@ -625,26 +639,22 @@ describe("E2E - Entity Resolvers", () => {
 			.returns([User])
 			.resolve(() => users);
 
-		// Create batch resolver for User.posts (object with batch property)
-		const resolvers = {
-			getResolver: (entityName: string, fieldName: string) => {
-				if (entityName === "User" && fieldName === "posts") {
-					// Return batch resolver object (not a function with batch attached)
-					return {
-						batch: async (parents: { id: string }[]) => {
-							batchCallCount++;
-							return parents.map((parent) => posts.filter((p) => p.authorId === parent.id));
-						},
-					};
-				}
-				return undefined;
-			},
-		};
+		// Create entity resolvers using lens() factory
+		const { resolver } = lens();
+		const userResolver = resolver(User, (f) => ({
+			id: f.expose("id"),
+			name: f.expose("name"),
+			posts: f.many(Post).resolve(({ parent }) => {
+				// Simple resolve - batching is not part of the new pattern
+				batchCallCount++;
+				return posts.filter((p) => p.authorId === parent.id);
+			}),
+		}));
 
 		const server = createServer({
 			entities: { User, Post },
 			queries: { getUsers },
-			resolvers: resolvers as any,
+			resolvers: [userResolver],
 		});
 
 		// Execute query with nested selection for all users
@@ -659,8 +669,9 @@ describe("E2E - Entity Resolvers", () => {
 			},
 		});
 
-		// Should have batched the posts resolution into a single call
-		expect(batchCallCount).toBe(1);
+		// With the new pattern, each user's posts resolver is called individually
+		// So batch call count will be equal to number of users
+		expect(batchCallCount).toBe(2);
 		expect(result).toHaveLength(2);
 	});
 });

package/src/index.ts

@@ -10,20 +10,18 @@
 // =============================================================================
 
 export {
-	// Operations
-	query,
+	type InferRouterContext,
+	type MutationDef,
 	mutation,
-	router,
 	// Types
-	type QueryBuilder,
-	type MutationBuilder,
 	type QueryDef,
-	type MutationDef,
+	// Operations
+	query,
+	type ResolverContext,
+	type ResolverFn,
 	type RouterDef,
 	type RouterRoutes,
-	type ResolverFn,
-	type ResolverContext,
-	type InferRouterContext,
+	router,
 } from "@sylphx/lens-core";
 
 // =============================================================================
@@ -33,26 +31,25 @@ export {
 export {
 	// Factory
 	createServer,
+	type EntitiesMap,
+	// Type inference utilities (tRPC-style)
+	type InferApi,
+	type InferInput,
+	type InferOutput,
+	// In-process transport types
+	type LensOperation,
+	type LensResult,
 	// Types
 	type LensServer,
 	type LensServerConfig as ServerConfig,
-	type EntitiesMap,
-	type RelationsArray,
-	type QueriesMap,
 	type MutationsMap,
-	type WebSocketLike,
+	type OperationMeta,
+	type OperationsMap,
+	type QueriesMap,
 	type SelectionObject,
 	// Metadata types (for transport handshake)
 	type ServerMetadata,
-	type OperationMeta,
-	type OperationsMap,
-	// In-process transport types
-	type LensOperation,
-	type LensResult,
-	// Type inference utilities (tRPC-style)
-	type InferApi,
-	type InferInput,
-	type InferOutput,
+	type WebSocketLike,
 } from "./server/create";
 
 // =============================================================================
@@ -60,17 +57,17 @@ export {
 // =============================================================================
 
 export {
-	// Class
-	GraphStateManager,
 	// Factory
 	createGraphStateManager,
 	// Types
 	type EntityKey,
+	// Class
+	GraphStateManager,
+	type GraphStateManagerConfig,
 	type StateClient,
-	type StateUpdateMessage,
 	type StateFullMessage,
+	type StateUpdateMessage,
 	type Subscription,
-	type GraphStateManagerConfig,
 } from "./state";
 
 // =============================================================================
@@ -78,11 +75,11 @@ export {
 // =============================================================================
 
 export {
-	// Class
-	SSEHandler,
 	// Factory
 	createSSEHandler,
+	type SSEClientInfo,
+	// Class
+	SSEHandler,
 	// Types
 	type SSEHandlerConfig,
-	type SSEClientInfo,
 } from "./sse/handler";