From 5bbf019a3a4e7b98dea3f326ce3988f26d582751 Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Mon, 5 May 2025 16:09:23 -0700
Subject: [PATCH 1/2] bump typebox

---
 package-lock.json  | 15 ++++++++-------
 package.json       |  2 +-
 router/services.ts | 21 +++++++++++++++------
 3 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 01388520..2a163856 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -35,7 +35,7 @@
       },
       "peerDependencies": {
         "@opentelemetry/api": "^1.7.0",
-        "@sinclair/typebox": "~0.32.8"
+        "@sinclair/typebox": "~0.34.0"
       }
     },
     "node_modules/@aashutoshrathi/word-wrap": {
@@ -982,9 +982,10 @@
       ]
     },
     "node_modules/@sinclair/typebox": {
-      "version": "0.32.8",
-      "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.32.8.tgz",
-      "integrity": "sha512-ifqNG6GBr0QRao2Vy+2P2WzxkOnpGmHfZCFXWwuR/0elH4h79mGXN8mEYwnJ2qGEr7MGgfqvf8Njwj4dBGFMBA==",
+      "version": "0.34.33",
+      "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.34.33.tgz",
+      "integrity": "sha512-5HAV9exOMcXRUxo+9iYB5n09XxzCXnfy4VTNW4xnDv+FgjzAGY989C28BIdljKqmF+ZltUwujE3aossvcVtq6g==",
+      "license": "MIT",
       "peer": true
     },
     "node_modules/@types/estree": {
@@ -4881,9 +4882,9 @@
       "optional": true
     },
     "@sinclair/typebox": {
-      "version": "0.32.8",
-      "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.32.8.tgz",
-      "integrity": "sha512-ifqNG6GBr0QRao2Vy+2P2WzxkOnpGmHfZCFXWwuR/0elH4h79mGXN8mEYwnJ2qGEr7MGgfqvf8Njwj4dBGFMBA==",
+      "version": "0.34.33",
+      "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.34.33.tgz",
+      "integrity": "sha512-5HAV9exOMcXRUxo+9iYB5n09XxzCXnfy4VTNW4xnDv+FgjzAGY989C28BIdljKqmF+ZltUwujE3aossvcVtq6g==",
       "peer": true
     },
     "@types/estree": {
diff --git a/package.json b/package.json
index 209f250d..3b66c2dd 100644
--- a/package.json
+++ b/package.json
@@ -55,7 +55,7 @@
   },
   "peerDependencies": {
     "@opentelemetry/api": "^1.7.0",
-    "@sinclair/typebox": "~0.32.8"
+    "@sinclair/typebox": "~0.34.0"
   },
   "devDependencies": {
     "@opentelemetry/sdk-trace-base": "^1.24.1",
diff --git a/router/services.ts b/router/services.ts
index 30a43a1b..4c54043f 100644
--- a/router/services.ts
+++ b/router/services.ts
@@ -1,4 +1,4 @@
-import { Type, TUnion, TSchema } from '@sinclair/typebox';
+import { TUnion, TSchema } from '@sinclair/typebox';
 import { RiverError, RiverUncaughtSchema } from './result';
 import {
   Branded,
@@ -155,6 +155,15 @@ export interface SerializedServerSchema {
   services: Record<string, SerializedServiceSchema>;
 }
 
+/**
+ * Omits compositing symbols from this schema.
+ * The same approach that was previously used in the deprecated Type.Strict function.
+ * https://github.com/sinclairzx81/typebox/blob/master/changelog/0.34.0.md#strict
+ */
+export function Strict<T extends TSchema>(schema: T): T {
+  return JSON.parse(JSON.stringify(schema)) as T;
+}
+
 export function serializeSchema(
   services: AnyServiceSchemaMap,
   handshakeSchema?: TSchema,
@@ -171,7 +180,7 @@ export function serializeSchema(
   };
 
   if (handshakeSchema) {
-    schema.handshakeSchema = Type.Strict(handshakeSchema);
+    schema.handshakeSchema = Strict(handshakeSchema);
   }
 
   return schema;
@@ -384,8 +393,8 @@ export class ServiceSchema<
         Object.entries(this.procedures).map(([procName, procDef]) => [
           procName,
           {
-            input: Type.Strict(procDef.input),
-            output: Type.Strict(procDef.output),
+            input: Strict(procDef.input),
+            output: Strict(procDef.output),
             // Only add `description` field if the type declares it.
             ...('description' in procDef
               ? { description: procDef.description }
@@ -393,14 +402,14 @@ export class ServiceSchema<
             // Only add the `errors` field if the type declares it.
             ...('errors' in procDef
               ? {
-                  errors: Type.Strict(procDef.errors),
+                  errors: Strict(procDef.errors),
                 }
               : {}),
             type: procDef.type,
             // Only add the `init` field if the type declares it.
             ...('init' in procDef
               ? {
-                  init: Type.Strict(procDef.init),
+                  init: Strict(procDef.init),
                 }
               : {}),
           },

From a859bf34a802ff8ff083f29700a7edf8ccf9dc15 Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Mon, 5 May 2025 16:09:34 -0700
Subject: [PATCH 2/2] 0.26.11

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 2a163856..e36683c7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@replit/river",
-  "version": "0.26.10",
+  "version": "0.26.11",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@replit/river",
-      "version": "0.26.10",
+      "version": "0.26.11",
       "license": "MIT",
       "dependencies": {
         "@msgpack/msgpack": "^3.0.0-beta2",
diff --git a/package.json b/package.json
index 3b66c2dd..4735f1c9 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@replit/river",
   "description": "It's like tRPC but... with JSON Schema Support, duplex streaming and support for service multiplexing. Transport agnostic!",
-  "version": "0.26.10",
+  "version": "0.26.11",
   "type": "module",
   "exports": {
     ".": {