@replit/river 0.216.0 → 0.217.1

package/README.md

@@ -47,7 +47,7 @@ Before proceeding, ensure you have TypeScript 5 installed and configured appropr
    To use River, install the required packages using npm:
 
    ```bash
-   npm i @replit/river @sinclair/typebox
+   npm i @replit/river typebox
    ```
 
 ## Writing services
@@ -72,7 +72,7 @@ First, we create a service:
 
 ```ts
 import { createServiceSchema, Procedure, Ok } from '@replit/river';
-import { Type } from '@sinclair/typebox';
+import { Type } from 'typebox';
 
 const ServiceSchema = createServiceSchema();
 export const ExampleService = ServiceSchema.define(

package/dist/{adapter-BXCk-dmy.d.ts → adapter-Dl5Mewp3.d.ts}

@@ -1,4 +1,4 @@
-import { O as OpaqueTransportMessage, E as EncodedTransportMessage } from './message-CpXWqmJw.js';
+import { O as OpaqueTransportMessage, E as EncodedTransportMessage } from './message-DxS8db8A.js';
 import { C as Codec } from './types-BGGvYIJM.js';
 
 type SessionApiResult<T> = {

package/dist/{chunk-ZLMQQI43.js → chunk-JFFRB3SS.js}

@@ -1,11 +1,10 @@
 // router/services.ts
-import { Type as Type2, Kind as Kind2 } from "@sinclair/typebox";
+import { Type as Type2 } from "typebox";
 
 // router/errors.ts
 import {
-  Kind,
   Type
-} from "@sinclair/typebox";
+} from "typebox";
 var UNCAUGHT_ERROR_CODE = "UNCAUGHT_ERROR";
 var UNEXPECTED_DISCONNECT_CODE = "UNEXPECTED_DISCONNECT";
 var INVALID_REQUEST_CODE = "INVALID_REQUEST";
@@ -19,15 +18,32 @@ var ValidationErrorDetails = Type.Object({
   message: Type.String()
 });
 var ValidationErrors = Type.Array(ValidationErrorDetails);
-function castTypeboxValueErrors(errors) {
-  const result = [];
-  for (const error of errors) {
-    result.push({
-      path: error.path,
+function validationErrorToRiverErrors(error) {
+  let propertyNames;
+  switch (error.keyword) {
+    case "required":
+      propertyNames = error.params.requiredProperties;
+      break;
+    case "additionalProperties":
+      propertyNames = error.params.additionalProperties;
+      break;
+    case "propertyNames":
+      propertyNames = error.params.propertyNames;
+      break;
+    case "unevaluatedProperties":
+      propertyNames = error.params.unevaluatedProperties;
+      break;
+  }
+  if (propertyNames) {
+    return propertyNames.map((prop) => ({
+      path: `${error.instancePath}/${prop.replace(/~/g, "~0").replace(/\//g, "~1")}`,
       message: error.message
-    });
+    }));
   }
-  return result;
+  return [{ path: error.instancePath, message: error.message }];
+}
+function castTypeboxValueErrors(errors) {
+  return errors.flatMap(validationErrorToRiverErrors);
 }
 var CancelErrorSchema = Type.Object({
   code: Type.Literal(CANCEL_CODE),
@@ -57,7 +73,7 @@ var ReaderErrorSchema = Type.Union([
 ]);
 var ReaderErrorResultSchema = ErrResultSchema(ReaderErrorSchema);
 function isUnion(schema) {
-  return schema[Kind] === "Union";
+  return Type.IsUnion(schema);
 }
 function flattenErrorType(errType) {
   if (!isUnion(errType)) {
@@ -286,7 +302,7 @@ function createServiceSchema() {
   };
 }
 function getSerializedProcErrors(procDef) {
-  if (!("responseError" in procDef) || procDef.responseError[Kind2] === "Never") {
+  if (!("responseError" in procDef) || Type2.IsNever(procDef.responseError)) {
     return Strict(ReaderErrorSchema);
   }
   const withProtocolErrors = flattenErrorType(
@@ -355,7 +371,7 @@ var ServiceScaffold = class {
 };
 
 // router/result.ts
-import { Type as Type3 } from "@sinclair/typebox";
+import { Type as Type3 } from "typebox";
 var AnyResultSchema = Type3.Union([
   Type3.Object({
     ok: Type3.Literal(false),
@@ -604,7 +620,7 @@ var WritableImpl = class {
 };
 
 // router/procedures.ts
-import { Type as Type4 } from "@sinclair/typebox";
+import { Type as Type4 } from "typebox";
 function rpc({
   requestInit,
   responseData,
@@ -681,7 +697,7 @@ var Procedure = {
 };
 
 // transport/message.ts
-import { Type as Type5 } from "@sinclair/typebox";
+import { Type as Type5 } from "typebox";
 
 // transport/id.ts
 import { customAlphabet } from "nanoid";
@@ -982,7 +998,7 @@ function getTracer() {
 }
 
 // router/client.ts
-import { Value } from "@sinclair/typebox/value";
+import { Value } from "typebox/value";
 var noop = () => {
 };
 function _createRecursiveProxy(callback, path) {
@@ -1031,6 +1047,10 @@ function createClient(transport, serverId, providedClientOptions = {}) {
         `invalid river call, unknown procedure type ${procMethod}`
       );
     }
+    const merged = mergeCallOptions(
+      clientOptions.defaultCallOptions,
+      callOptions
+    );
     return handleProc(
       procMethod === "subscribe" ? "subscription" : procMethod,
       transport,
@@ -1038,10 +1058,14 @@ function createClient(transport, serverId, providedClientOptions = {}) {
       init,
       serviceName,
       procName,
-      callOptions ? callOptions.signal : void 0
+      merged.signal
     );
   }, []);
 }
+function mergeCallOptions(defaults, caller) {
+  const resolved = typeof defaults === "function" ? defaults() : defaults ?? {};
+  return { ...resolved, ...caller };
+}
 function handleProc(procType, transport, serverId, init, serviceName, procedureName, abortSignal) {
   if (transport.getStatus() === "closed") {
     return getPreClosedReturnForProc(procType);
@@ -1146,9 +1170,10 @@ function handleProc(procType, transport, serverId, init, serviceName, procedureN
           {
             clientId: transport.clientId,
             transportMessage: msg,
-            validationErrors: [
-              ...Value.Errors(ReaderErrorResultSchema, msg.payload)
-            ]
+            validationErrors: Value.Errors(
+              ReaderErrorResultSchema,
+              msg.payload
+            ).flatMap(validationErrorToRiverErrors)
           }
         );
       }
@@ -1176,7 +1201,10 @@ function handleProc(procType, transport, serverId, init, serviceName, procedureN
           {
             clientId: transport.clientId,
             transportMessage: msg,
-            validationErrors: [...Value.Errors(AnyResultSchema, msg.payload)]
+            validationErrors: Value.Errors(
+              AnyResultSchema,
+              msg.payload
+            ).flatMap(validationErrorToRiverErrors)
           }
         );
       }
@@ -1285,7 +1313,7 @@ async function getSingleMessage(resReadable, log) {
 }
 
 // router/server.ts
-import { Value as Value2 } from "@sinclair/typebox/value";
+import { Value as Value2 } from "typebox/value";
 
 // transport/stringifyError.ts
 function coerceErrorString(err) {
@@ -1450,9 +1478,10 @@ var RiverServer = class {
           this.log?.warn("got stream cancel without a valid protocol error", {
             ...loggingMetadata,
             transportMessage: msg,
-            validationErrors: [
-              ...Value2.Errors(CancelResultSchema, msg.payload)
-            ],
+            validationErrors: Value2.Errors(
+              CancelResultSchema,
+              msg.payload
+            ).flatMap(validationErrorToRiverErrors),
             tags: ["invalid-request"]
           });
         }
@@ -2059,7 +2088,7 @@ function createServerHandshakeOptions(schema, validate) {
 }
 
 // package.json
-var version = "0.216.0";
+var version = "0.217.1";
 
 export {
   generateId,
@@ -2085,6 +2114,7 @@ export {
   UNEXPECTED_DISCONNECT_CODE,
   INVALID_REQUEST_CODE,
   CANCEL_CODE,
+  validationErrorToRiverErrors,
   ReaderErrorSchema,
   flattenErrorType,
   serializeSchemaV1Compat,
@@ -2110,4 +2140,4 @@ export {
   recordRiverError,
   getTracer
 };
-//# sourceMappingURL=chunk-ZLMQQI43.js.map
+//# sourceMappingURL=chunk-JFFRB3SS.js.map