@sylphx/lens-server 1.2.0 → 1.3.1

package/dist/index.d.ts

@@ -1,5 +1,6 @@
-import { ContextValue, EntityDef, EntityDefinition, EntityResolvers, EntityResolversDefinition, MutationDef, QueryDef, RelationDef, RelationTypeWithForeignKey, RouterDef } from "@sylphx/lens-core";
-import { EntityKey, Update, EmitCommand, InternalFieldUpdate, ArrayOperation } from "@sylphx/lens-core";
+import { query, mutation, router, QueryBuilder, MutationBuilder, QueryDef as QueryDef2, MutationDef as MutationDef2, RouterDef as RouterDef2, RouterRoutes, ResolverFn, ResolverContext, InferRouterContext as InferRouterContext2 } from "@sylphx/lens-core";
+import { ContextValue, EntityDef, EntityDefinition, EntityResolvers, EntityResolversDefinition, InferRouterContext, MutationDef, QueryDef, RelationDef, RelationTypeWithForeignKey, RouterDef } from "@sylphx/lens-core";
+import { ArrayOperation, EmitCommand, EntityKey, InternalFieldUpdate, Update } from "@sylphx/lens-core";
 /** Client connection interface */
 interface StateClient {
 	id: string;
@@ -228,20 +229,23 @@ type OperationsMap = {
 	[key: string]: OperationMeta | OperationsMap;
 };
 /** Server configuration */
-interface LensServerConfig<TContext extends ContextValue = ContextValue> {
+interface LensServerConfig<
+	TContext extends ContextValue = ContextValue,
+	TRouter extends RouterDef = RouterDef
+> {
 	/** Entity definitions */
 	entities?: EntitiesMap;
 	/** Relation definitions */
 	relations?: RelationsArray;
-	/** Router definition (namespaced operations) */
-	router?: RouterDef;
+	/** Router definition (namespaced operations) - context type is inferred */
+	router?: TRouter;
 	/** Query definitions (flat, legacy) */
 	queries?: QueriesMap;
 	/** Mutation definitions (flat, legacy) */
 	mutations?: MutationsMap;
 	/** Entity resolvers */
 	resolvers?: EntityResolvers<EntityResolversDefinition>;
-	/** Context factory */
+	/** Context factory - must return the context type expected by the router */
 	context?: (req?: unknown) => TContext | Promise<TContext>;
 	/** Server version */
 	version?: string;
@@ -422,19 +426,78 @@ type InferApi<T extends LensServer> = T extends LensServerImpl<infer Q, infer M>
 	mutations: M;
 } : never;
 /**
-* Create Lens server with Operations API + Optimization Layer
+* Config helper type that infers context from router
 */
-declare function createServer<
+type ServerConfigWithInferredContext<
+	TRouter extends RouterDef,
+	Q extends QueriesMap = QueriesMap,
+	M extends MutationsMap = MutationsMap
+> = {
+	entities?: EntitiesMap;
+	relations?: RelationsArray;
+	router: TRouter;
+	queries?: Q;
+	mutations?: M;
+	resolvers?: EntityResolvers<EntityResolversDefinition>;
+	/** Context factory - type is inferred from router's procedures */
+	context?: (req?: unknown) => InferRouterContext<TRouter> | Promise<InferRouterContext<TRouter>>;
+	version?: string;
+};
+/**
+* Config without router (legacy flat queries/mutations)
+*/
+type ServerConfigLegacy<
 	TContext extends ContextValue = ContextValue,
 	Q extends QueriesMap = QueriesMap,
 	M extends MutationsMap = MutationsMap
->(config: LensServerConfig<TContext> & {
+> = {
+	entities?: EntitiesMap;
+	relations?: RelationsArray;
+	router?: undefined;
 	queries?: Q;
 	mutations?: M;
-}): LensServer & {
+	resolvers?: EntityResolvers<EntityResolversDefinition>;
+	context?: (req?: unknown) => TContext | Promise<TContext>;
+	version?: string;
+};
+/**
+* Create Lens server with Operations API + Optimization Layer
+*
+* When using a router with typed context (from initLens), the context
+* function's return type is automatically enforced to match.
+*
+* @example
+* ```typescript
+* // Context type is inferred from router's procedures
+* const server = createServer({
+*   router: appRouter,  // RouterDef with MyContext
+*   context: () => ({
+*     db: prisma,
+*     user: null,
+*   }),  // Must match MyContext!
+* })
+* ```
+*/
+declare function createServer<
+	TRouter extends RouterDef,
+	Q extends QueriesMap = QueriesMap,
+	M extends MutationsMap = MutationsMap
+>(config: ServerConfigWithInferredContext<TRouter, Q, M>): LensServer & {
+	_types: {
+		queries: Q;
+		mutations: M;
+		context: InferRouterContext<TRouter>;
+	};
+};
+declare function createServer<
+	TContext extends ContextValue = ContextValue,
+	Q extends QueriesMap = QueriesMap,
+	M extends MutationsMap = MutationsMap
+>(config: ServerConfigLegacy<TContext, Q, M>): LensServer & {
 	_types: {
 		queries: Q;
 		mutations: M;
+		context: TContext;
 	};
 };
 /** SSE handler configuration */
@@ -507,4 +570,4 @@ declare class SSEHandler {
 * Create SSE handler (transport adapter)
 */
 declare function createSSEHandler(config: SSEHandlerConfig): SSEHandler;
-export { createServer, createSSEHandler, createGraphStateManager, WebSocketLike, Subscription, StateUpdateMessage, StateFullMessage, StateClient, ServerMetadata, LensServerConfig as ServerConfig, SelectionObject, SSEHandlerConfig, SSEHandler, SSEClientInfo, RelationsArray, QueriesMap, OperationsMap, OperationMeta, MutationsMap, LensServer, LensResult, LensOperation, InferOutput, InferInput, InferApi, GraphStateManagerConfig, GraphStateManager, EntityKey, EntitiesMap };
+export { router, query, mutation, createServer, createSSEHandler, createGraphStateManager, WebSocketLike, Subscription, StateUpdateMessage, StateFullMessage, StateClient, ServerMetadata, LensServerConfig as ServerConfig, SelectionObject, SSEHandlerConfig, SSEHandler, SSEClientInfo, RouterRoutes, RouterDef2 as RouterDef, ResolverFn, ResolverContext, RelationsArray, QueryDef2 as QueryDef, QueryBuilder, QueriesMap, OperationsMap, OperationMeta, MutationsMap, MutationDef2 as MutationDef, MutationBuilder, LensServer, LensResult, LensOperation, InferRouterContext2 as InferRouterContext, InferOutput, InferInput, InferApi, GraphStateManagerConfig, GraphStateManager, EntityKey, EntitiesMap };

package/dist/index.js

@@ -1,3 +1,10 @@
+// src/index.ts
+import {
+  query,
+  mutation,
+  router
+} from "@sylphx/lens-core";
+
 // src/server/create.ts
 import {
   createContext,
@@ -12,8 +19,8 @@ import {
 
 // src/state/graph-state-manager.ts
 import {
-  createUpdate,
   applyUpdate,
+  createUpdate,
   makeEntityKey
 } from "@sylphx/lens-core";
 
@@ -1403,6 +1410,9 @@ function createSSEHandler(config) {
   return new SSEHandler(config);
 }
 export {
+  router,
+  query,
+  mutation,
   createServer,
   createSSEHandler,
   createGraphStateManager,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sylphx/lens-server",
-  "version": "1.2.0",
+  "version": "1.3.1",
   "description": "Server runtime for Lens API framework",
   "type": "module",
   "main": "./dist/index.js",
@@ -29,7 +29,7 @@
   "author": "SylphxAI",
   "license": "MIT",
   "dependencies": {
-    "@sylphx/lens-core": "^1.2.0"
+    "@sylphx/lens-core": "^1.3.1"
   },
   "devDependencies": {
     "typescript": "^5.9.3",

package/src/index.ts

@@ -5,6 +5,27 @@
  * Operations-based server with GraphStateManager for reactive updates.
  */
 
+// =============================================================================
+// Re-exports from Core (commonly used with server)
+// =============================================================================
+
+export {
+	// Operations
+	query,
+	mutation,
+	router,
+	// Types
+	type QueryBuilder,
+	type MutationBuilder,
+	type QueryDef,
+	type MutationDef,
+	type RouterDef,
+	type RouterRoutes,
+	type ResolverFn,
+	type ResolverContext,
+	type InferRouterContext,
+} from "@sylphx/lens-core";
+
 // =============================================================================
 // Server
 // =============================================================================

package/src/server/create.ts

@@ -10,13 +10,13 @@
 
 import {
 	type ContextValue,
-	type Emit,
 	type EmitCommand,
 	type EntityDef,
 	type EntityDefinition,
 	type EntityResolvers,
 	type EntityResolversDefinition,
 	type FieldType,
+	type InferRouterContext,
 	type MutationDef,
 	type QueryDef,
 	type RelationDef,
@@ -72,20 +72,23 @@ export type OperationsMap = {
 };
 
 /** Server configuration */
-export interface LensServerConfig<TContext extends ContextValue = ContextValue> {
+export interface LensServerConfig<
+	TContext extends ContextValue = ContextValue,
+	TRouter extends RouterDef = RouterDef,
+> {
 	/** Entity definitions */
 	entities?: EntitiesMap;
 	/** Relation definitions */
 	relations?: RelationsArray;
-	/** Router definition (namespaced operations) */
-	router?: RouterDef;
+	/** Router definition (namespaced operations) - context type is inferred */
+	router?: TRouter;
 	/** Query definitions (flat, legacy) */
 	queries?: QueriesMap;
 	/** Mutation definitions (flat, legacy) */
 	mutations?: MutationsMap;
 	/** Entity resolvers */
 	resolvers?: EntityResolvers<EntityResolversDefinition>;
-	/** Context factory */
+	/** Context factory - must return the context type expected by the router */
 	context?: (req?: unknown) => TContext | Promise<TContext>;
 	/** Server version */
 	version?: string;
@@ -675,7 +678,10 @@ class LensServerImpl<
 				const entityName = this.getEntityNameFromOutput(queryDef._output);
 				if (entityName) {
 					// For entity-typed outputs, use GraphStateManager
-					const entities = this.extractEntities(entityName, command.type === "full" ? command.data : {});
+					const entities = this.extractEntities(
+						entityName,
+						command.type === "full" ? command.data : {},
+					);
 					for (const { entity, id } of entities) {
 						this.stateManager.processCommand(entity, id, command);
 					}
@@ -1546,17 +1552,87 @@ export type InferApi<T extends LensServer> = T extends LensServerImpl<infer Q, i
 // Factory
 // =============================================================================
 
+/**
+ * Config helper type that infers context from router
+ */
+export type ServerConfigWithInferredContext<
+	TRouter extends RouterDef,
+	Q extends QueriesMap = QueriesMap,
+	M extends MutationsMap = MutationsMap,
+> = {
+	entities?: EntitiesMap;
+	relations?: RelationsArray;
+	router: TRouter;
+	queries?: Q;
+	mutations?: M;
+	resolvers?: EntityResolvers<EntityResolversDefinition>;
+	/** Context factory - type is inferred from router's procedures */
+	context?: (req?: unknown) => InferRouterContext<TRouter> | Promise<InferRouterContext<TRouter>>;
+	version?: string;
+};
+
+/**
+ * Config without router (legacy flat queries/mutations)
+ */
+export type ServerConfigLegacy<
+	TContext extends ContextValue = ContextValue,
+	Q extends QueriesMap = QueriesMap,
+	M extends MutationsMap = MutationsMap,
+> = {
+	entities?: EntitiesMap;
+	relations?: RelationsArray;
+	router?: undefined;
+	queries?: Q;
+	mutations?: M;
+	resolvers?: EntityResolvers<EntityResolversDefinition>;
+	context?: (req?: unknown) => TContext | Promise<TContext>;
+	version?: string;
+};
+
 /**
  * Create Lens server with Operations API + Optimization Layer
+ *
+ * When using a router with typed context (from initLens), the context
+ * function's return type is automatically enforced to match.
+ *
+ * @example
+ * ```typescript
+ * // Context type is inferred from router's procedures
+ * const server = createServer({
+ *   router: appRouter,  // RouterDef with MyContext
+ *   context: () => ({
+ *     db: prisma,
+ *     user: null,
+ *   }),  // Must match MyContext!
+ * })
+ * ```
  */
+export function createServer<
+	TRouter extends RouterDef,
+	Q extends QueriesMap = QueriesMap,
+	M extends MutationsMap = MutationsMap,
+>(
+	config: ServerConfigWithInferredContext<TRouter, Q, M>,
+): LensServer & { _types: { queries: Q; mutations: M; context: InferRouterContext<TRouter> } };
+
+export function createServer<
+	TContext extends ContextValue = ContextValue,
+	Q extends QueriesMap = QueriesMap,
+	M extends MutationsMap = MutationsMap,
+>(
+	config: ServerConfigLegacy<TContext, Q, M>,
+): LensServer & { _types: { queries: Q; mutations: M; context: TContext } };
+
 export function createServer<
 	TContext extends ContextValue = ContextValue,
 	Q extends QueriesMap = QueriesMap,
 	M extends MutationsMap = MutationsMap,
 >(
 	config: LensServerConfig<TContext> & { queries?: Q; mutations?: M },
-): LensServer & { _types: { queries: Q; mutations: M } } {
-	const server = new LensServerImpl(config) as LensServerImpl<Q, M>;
+): LensServer & { _types: { queries: Q; mutations: M; context: TContext } } {
+	const server = new LensServerImpl(config) as LensServerImpl<Q, M, TContext>;
 	// Attach type marker for inference (stripped at runtime)
-	return server as unknown as LensServer & { _types: { queries: Q; mutations: M } };
+	return server as unknown as LensServer & {
+		_types: { queries: Q; mutations: M; context: TContext };
+	};
 }

package/src/state/graph-state-manager.ts

@@ -10,13 +10,13 @@
  */
 
 import {
-	type EntityKey,
-	type Update,
+	type ArrayOperation,
 	type EmitCommand,
+	type EntityKey,
 	type InternalFieldUpdate,
-	type ArrayOperation,
-	createUpdate,
+	type Update,
 	applyUpdate,
+	createUpdate,
 	makeEntityKey,
 } from "@sylphx/lens-core";