@replit/river 0.17.4 → 0.18.1

package/dist/router/index.d.cts

@@ -1,8 +1,9 @@
 import { TUnion, Static } from '@sinclair/typebox';
-import { e as ProcedureMap, P as PayloadType, c as RiverUncaughtSchema, U as Unbranded, B as Branded, A as AnyProcedure, R as RiverError, b as Result, S as ServiceContext } from '../procedures-1c0d2eee.js';
-export { E as Err, O as Ok, a as Procedure, d as ProcedureResult, f as RPCProcedure, m as RiverErrorSchema, j as ServiceContextWithState, k as ServiceContextWithTransportInfo, i as StreamProcedure, h as SubscriptionProcedure, l as UNCAUGHT_ERROR, g as UploadProcedure, V as ValidProcType } from '../procedures-1c0d2eee.js';
-import { e as ServerTransport, C as Connection, b as ClientTransport, c as TransportClientId } from '../index-9e300e8a.js';
+import { e as ProcedureMap, P as PayloadType, c as RiverUncaughtSchema, U as Unbranded, B as Branded, A as AnyProcedure, R as RiverError, b as Result, S as ServiceContext } from '../procedures-85e52b9c.js';
+export { E as Err, O as Ok, a as Procedure, d as ProcedureResult, f as RPCProcedure, m as RiverErrorSchema, j as ServiceContextWithState, k as ServiceContextWithTransportInfo, i as StreamProcedure, h as SubscriptionProcedure, l as UNCAUGHT_ERROR, g as UploadProcedure, V as ValidProcType } from '../procedures-85e52b9c.js';
+import { b as ClientTransport, C as Connection, c as ServerTransport } from '../index-d412ca83.js';
 import { Pushable } from 'it-pushable';
+import { T as TransportClientId } from '../index-46ed19d8.js';
 import '../types-3e5768ec.js';
 
 /**
@@ -25,12 +26,12 @@ type AnyServiceSchema = ServiceSchema<object, ProcedureMap>;
 /**
  * A dictionary of {@link ServiceSchema}s, where the key is the service name.
  */
-type ServiceSchemaMap = Record<string, AnyServiceSchema>;
+type AnyServiceSchemaMap = Record<string, AnyServiceSchema>;
 /**
- * Takes a {@link ServiceSchemaMap} and returns a dictionary of instantiated
+ * Takes a {@link AnyServiceSchemaMap} and returns a dictionary of instantiated
  * services.
  */
-type InstantiatedServiceSchemaMap<T extends ServiceSchemaMap> = {
+type InstantiatedServiceSchemaMap<T extends AnyServiceSchemaMap> = {
     [K in keyof T]: T[K] extends ServiceSchema<infer S, infer P> ? Service<S, P> : never;
 };
 /**
@@ -315,38 +316,6 @@ declare class ServiceScaffold<State extends object> {
     }>;
 }
 
-/**
- * Represents a server with a set of services. Use {@link createServer} to create it.
- * @template Services - The type of services provided by the server.
- */
-interface Server<Services extends ServiceSchemaMap> {
-    services: InstantiatedServiceSchemaMap<Services>;
-    streams: Map<string, ProcStream>;
-    serialize(): SerializedServerSchema;
-    close(): Promise<void>;
-}
-interface ProcStream {
-    id: string;
-    serviceName: string;
-    procedureName: string;
-    incoming: Pushable<PayloadType>;
-    outgoing: Pushable<Result<Static<PayloadType>, Static<RiverError>>>;
-    promises: {
-        outputHandler: Promise<unknown>;
-        inputHandler: Promise<unknown>;
-    };
-}
-type SerializedServerSchema = Record<string, SerializedServiceSchema>;
-/**
- * Creates a server instance that listens for incoming messages from a transport and routes them to the appropriate service and procedure.
- * The server tracks the state of each service along with open streams and the extended context object.
- * @param transport - The transport to listen to.
- * @param services - An object containing all the services to be registered on the server.
- * @param extendedContext - An optional object containing additional context to be passed to all services.
- * @returns A promise that resolves to a server instance with the registered services.
- */
-declare function createServer<Services extends ServiceSchemaMap>(transport: ServerTransport<Connection>, services: Services, extendedContext?: Omit<ServiceContext, 'state'>): Server<Services>;
-
 type AsyncIter<T> = AsyncGenerator<T, T>;
 /**
  * A helper type to transform an actual service type into a type
@@ -389,8 +358,8 @@ type ServiceClient<Router extends AnyService> = {
  * Defines a type that represents a client for a server with a set of services.
  * @template Srv - The type of the server.
  */
-type ServerClient<Srv extends Server<ServiceSchemaMap>> = {
-    [SvcName in keyof Srv['services']]: ServiceClient<Srv['services'][SvcName]>;
+type Client<Services extends AnyServiceSchemaMap, IS extends InstantiatedServiceSchemaMap<Services> = InstantiatedServiceSchemaMap<Services>> = {
+    [SvcName in keyof IS]: ServiceClient<IS[SvcName]>;
 };
 interface ClientOptions {
     connectOnInvoke: boolean;
@@ -409,6 +378,38 @@ interface ClientOptions {
  * @param {Transport} transport - The transport to use for communication.
  * @returns The client for the server.
  */
-declare const createClient: <Srv extends Server<ServiceSchemaMap>>(transport: ClientTransport<Connection>, serverId: TransportClientId, providedClientOptions?: Partial<ClientOptions>) => ServerClient<Srv>;
+declare const createClient: <ServiceSchemaMap extends AnyServiceSchemaMap>(transport: ClientTransport<Connection>, serverId: TransportClientId, providedClientOptions?: Partial<ClientOptions>) => Client<ServiceSchemaMap, InstantiatedServiceSchemaMap<ServiceSchemaMap>>;
+
+/**
+ * Represents a server with a set of services. Use {@link createServer} to create it.
+ * @template Services - The type of services provided by the server.
+ */
+interface Server<Services extends AnyServiceSchemaMap> {
+    services: InstantiatedServiceSchemaMap<Services>;
+    streams: Map<string, ProcStream>;
+    serialize(): SerializedServerSchema;
+    close(): Promise<void>;
+}
+interface ProcStream {
+    id: string;
+    serviceName: string;
+    procedureName: string;
+    incoming: Pushable<PayloadType>;
+    outgoing: Pushable<Result<Static<PayloadType>, Static<RiverError>>>;
+    promises: {
+        outputHandler: Promise<unknown>;
+        inputHandler: Promise<unknown>;
+    };
+}
+type SerializedServerSchema = Record<string, SerializedServiceSchema>;
+/**
+ * Creates a server instance that listens for incoming messages from a transport and routes them to the appropriate service and procedure.
+ * The server tracks the state of each service along with open streams and the extended context object.
+ * @param transport - The transport to listen to.
+ * @param services - An object containing all the services to be registered on the server.
+ * @param extendedContext - An optional object containing additional context to be passed to all services.
+ * @returns A promise that resolves to a server instance with the registered services.
+ */
+declare function createServer<Services extends AnyServiceSchemaMap>(transport: ServerTransport<Connection>, services: Services, extendedContext?: Omit<ServiceContext, 'state'>): Server<Services>;
 
-export { PayloadType, ProcErrors, ProcHandler, ProcInit, ProcInput, ProcOutput, ProcType, ProcedureMap, Result, RiverError, RiverUncaughtSchema, Server, ServerClient, Service, ServiceConfiguration, ServiceContext, ServiceSchema, createClient, createServer };
+export { Client, PayloadType, ProcErrors, ProcHandler, ProcInit, ProcInput, ProcOutput, ProcType, ProcedureMap, Result, RiverError, RiverUncaughtSchema, Server, Service, ServiceConfiguration, ServiceContext, ServiceSchema, createClient, createServer };

package/dist/router/index.d.ts

@@ -1,8 +1,9 @@
 import { TUnion, Static } from '@sinclair/typebox';
-import { e as ProcedureMap, P as PayloadType, c as RiverUncaughtSchema, U as Unbranded, B as Branded, A as AnyProcedure, R as RiverError, b as Result, S as ServiceContext } from '../procedures-1c0d2eee.js';
-export { E as Err, O as Ok, a as Procedure, d as ProcedureResult, f as RPCProcedure, m as RiverErrorSchema, j as ServiceContextWithState, k as ServiceContextWithTransportInfo, i as StreamProcedure, h as SubscriptionProcedure, l as UNCAUGHT_ERROR, g as UploadProcedure, V as ValidProcType } from '../procedures-1c0d2eee.js';
-import { e as ServerTransport, C as Connection, b as ClientTransport, c as TransportClientId } from '../index-9e300e8a.js';
+import { e as ProcedureMap, P as PayloadType, c as RiverUncaughtSchema, U as Unbranded, B as Branded, A as AnyProcedure, R as RiverError, b as Result, S as ServiceContext } from '../procedures-85e52b9c.js';
+export { E as Err, O as Ok, a as Procedure, d as ProcedureResult, f as RPCProcedure, m as RiverErrorSchema, j as ServiceContextWithState, k as ServiceContextWithTransportInfo, i as StreamProcedure, h as SubscriptionProcedure, l as UNCAUGHT_ERROR, g as UploadProcedure, V as ValidProcType } from '../procedures-85e52b9c.js';
+import { b as ClientTransport, C as Connection, c as ServerTransport } from '../index-d412ca83.js';
 import { Pushable } from 'it-pushable';
+import { T as TransportClientId } from '../index-46ed19d8.js';
 import '../types-3e5768ec.js';
 
 /**
@@ -25,12 +26,12 @@ type AnyServiceSchema = ServiceSchema<object, ProcedureMap>;
 /**
  * A dictionary of {@link ServiceSchema}s, where the key is the service name.
  */
-type ServiceSchemaMap = Record<string, AnyServiceSchema>;
+type AnyServiceSchemaMap = Record<string, AnyServiceSchema>;
 /**
- * Takes a {@link ServiceSchemaMap} and returns a dictionary of instantiated
+ * Takes a {@link AnyServiceSchemaMap} and returns a dictionary of instantiated
  * services.
  */
-type InstantiatedServiceSchemaMap<T extends ServiceSchemaMap> = {
+type InstantiatedServiceSchemaMap<T extends AnyServiceSchemaMap> = {
     [K in keyof T]: T[K] extends ServiceSchema<infer S, infer P> ? Service<S, P> : never;
 };
 /**
@@ -315,38 +316,6 @@ declare class ServiceScaffold<State extends object> {
     }>;
 }
 
-/**
- * Represents a server with a set of services. Use {@link createServer} to create it.
- * @template Services - The type of services provided by the server.
- */
-interface Server<Services extends ServiceSchemaMap> {
-    services: InstantiatedServiceSchemaMap<Services>;
-    streams: Map<string, ProcStream>;
-    serialize(): SerializedServerSchema;
-    close(): Promise<void>;
-}
-interface ProcStream {
-    id: string;
-    serviceName: string;
-    procedureName: string;
-    incoming: Pushable<PayloadType>;
-    outgoing: Pushable<Result<Static<PayloadType>, Static<RiverError>>>;
-    promises: {
-        outputHandler: Promise<unknown>;
-        inputHandler: Promise<unknown>;
-    };
-}
-type SerializedServerSchema = Record<string, SerializedServiceSchema>;
-/**
- * Creates a server instance that listens for incoming messages from a transport and routes them to the appropriate service and procedure.
- * The server tracks the state of each service along with open streams and the extended context object.
- * @param transport - The transport to listen to.
- * @param services - An object containing all the services to be registered on the server.
- * @param extendedContext - An optional object containing additional context to be passed to all services.
- * @returns A promise that resolves to a server instance with the registered services.
- */
-declare function createServer<Services extends ServiceSchemaMap>(transport: ServerTransport<Connection>, services: Services, extendedContext?: Omit<ServiceContext, 'state'>): Server<Services>;
-
 type AsyncIter<T> = AsyncGenerator<T, T>;
 /**
  * A helper type to transform an actual service type into a type
@@ -389,8 +358,8 @@ type ServiceClient<Router extends AnyService> = {
  * Defines a type that represents a client for a server with a set of services.
  * @template Srv - The type of the server.
  */
-type ServerClient<Srv extends Server<ServiceSchemaMap>> = {
-    [SvcName in keyof Srv['services']]: ServiceClient<Srv['services'][SvcName]>;
+type Client<Services extends AnyServiceSchemaMap, IS extends InstantiatedServiceSchemaMap<Services> = InstantiatedServiceSchemaMap<Services>> = {
+    [SvcName in keyof IS]: ServiceClient<IS[SvcName]>;
 };
 interface ClientOptions {
     connectOnInvoke: boolean;
@@ -409,6 +378,38 @@ interface ClientOptions {
  * @param {Transport} transport - The transport to use for communication.
  * @returns The client for the server.
  */
-declare const createClient: <Srv extends Server<ServiceSchemaMap>>(transport: ClientTransport<Connection>, serverId: TransportClientId, providedClientOptions?: Partial<ClientOptions>) => ServerClient<Srv>;
+declare const createClient: <ServiceSchemaMap extends AnyServiceSchemaMap>(transport: ClientTransport<Connection>, serverId: TransportClientId, providedClientOptions?: Partial<ClientOptions>) => Client<ServiceSchemaMap, InstantiatedServiceSchemaMap<ServiceSchemaMap>>;
+
+/**
+ * Represents a server with a set of services. Use {@link createServer} to create it.
+ * @template Services - The type of services provided by the server.
+ */
+interface Server<Services extends AnyServiceSchemaMap> {
+    services: InstantiatedServiceSchemaMap<Services>;
+    streams: Map<string, ProcStream>;
+    serialize(): SerializedServerSchema;
+    close(): Promise<void>;
+}
+interface ProcStream {
+    id: string;
+    serviceName: string;
+    procedureName: string;
+    incoming: Pushable<PayloadType>;
+    outgoing: Pushable<Result<Static<PayloadType>, Static<RiverError>>>;
+    promises: {
+        outputHandler: Promise<unknown>;
+        inputHandler: Promise<unknown>;
+    };
+}
+type SerializedServerSchema = Record<string, SerializedServiceSchema>;
+/**
+ * Creates a server instance that listens for incoming messages from a transport and routes them to the appropriate service and procedure.
+ * The server tracks the state of each service along with open streams and the extended context object.
+ * @param transport - The transport to listen to.
+ * @param services - An object containing all the services to be registered on the server.
+ * @param extendedContext - An optional object containing additional context to be passed to all services.
+ * @returns A promise that resolves to a server instance with the registered services.
+ */
+declare function createServer<Services extends AnyServiceSchemaMap>(transport: ServerTransport<Connection>, services: Services, extendedContext?: Omit<ServiceContext, 'state'>): Server<Services>;
 
-export { PayloadType, ProcErrors, ProcHandler, ProcInit, ProcInput, ProcOutput, ProcType, ProcedureMap, Result, RiverError, RiverUncaughtSchema, Server, ServerClient, Service, ServiceConfiguration, ServiceContext, ServiceSchema, createClient, createServer };
+export { Client, PayloadType, ProcErrors, ProcHandler, ProcInit, ProcInput, ProcOutput, ProcType, ProcedureMap, Result, RiverError, RiverUncaughtSchema, Server, Service, ServiceConfiguration, ServiceContext, ServiceSchema, createClient, createServer };

package/dist/router/index.js

@@ -7,9 +7,9 @@ import {
   UNCAUGHT_ERROR,
   createClient,
   createServer
-} from "../chunk-4C2OXQJB.js";
+} from "../chunk-QBGGJSQM.js";
 import "../chunk-VH3NGOXQ.js";
-import "../chunk-H4BYJELI.js";
+import "../chunk-XCQF55SQ.js";
 export {
   Err,
   Ok,