Upgrade to TypeBox 1.x

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(

__tests__/cancellation.test.ts

@@ -1,4 +1,4 @@
-import { TNever, TObject, Type } from '@sinclair/typebox';
+import { TNever, TObject, Type } from 'typebox';
 import { beforeEach, describe, expect, test, vi } from 'vitest';
 import {
   Err,

__tests__/cleanup.test.ts

@@ -30,7 +30,7 @@ import {
 import { testMatrix } from '../testUtil/fixtures/matrix';
 import { TestSetupHelpers } from '../testUtil/fixtures/transports';
 import { ControlFlags } from '../transport/message';
-import { Type } from '@sinclair/typebox';
+import { Type } from 'typebox';
 import { nanoid } from 'nanoid';
 
 describe.each(testMatrix())(

__tests__/context.test.ts

@@ -6,7 +6,7 @@ import {
 import { testMatrix } from '../testUtil/fixtures/matrix';
 import { TestSetupHelpers } from '../testUtil/fixtures/transports';
 import { Ok, Procedure, createClient, createServer } from '../router';
-import { Type } from '@sinclair/typebox';
+import { Type } from 'typebox';
 import { createServiceSchema } from '../router/services';
 
 describe('should handle incompatabilities', async () => {

__tests__/deferCleanup.test.ts

@@ -7,7 +7,7 @@ import {
   test,
   vi,
 } from 'vitest';
-import { Type } from '@sinclair/typebox';
+import { Type } from 'typebox';
 import {
   createClient,
   createServer,

__tests__/e2e.test.ts

@@ -29,7 +29,7 @@ import {
   waitFor,
 } from '../testUtil/fixtures/cleanup';
 import { testMatrix } from '../testUtil/fixtures/matrix';
-import { Type } from '@sinclair/typebox';
+import { Type } from 'typebox';
 import {
   Procedure,
   createServiceSchema,

__tests__/invalid-request.test.ts

@@ -1,4 +1,4 @@
-import { Type } from '@sinclair/typebox';
+import { Type } from 'typebox';
 import { beforeEach, describe, expect, test, vi } from 'vitest';
 import {
   Err,
@@ -395,14 +395,13 @@ describe('cancels invalid request', () => {
           code: INVALID_REQUEST_CODE,
           message: 'message in requestData position did not match schema',
           extras: {
-            totalErrors: 2,
+            totalErrors: 1,
             // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
             firstValidationErrors: expect.arrayContaining([
               {
                 path: '/mustSendThings',
-                message: 'Expected required property',
+                message: 'must have required properties mustSendThings',
               },
-              { path: '/mustSendThings', message: 'Expected string' },
             ]),
           },
         }),
@@ -463,10 +462,16 @@ describe('cancels invalid request', () => {
             code: INVALID_REQUEST_CODE,
             message: 'message in control payload position did not match schema',
             extras: {
-              totalErrors: 1,
+              // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+              totalErrors: expect.any(Number),
               // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
               firstValidationErrors: expect.arrayContaining([
-                { path: '', message: 'Expected union value' },
+                expect.objectContaining({
+                  // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+                  path: expect.any(String),
+                  // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+                  message: expect.any(String),
+                }),
               ]),
             },
           }),
@@ -597,14 +602,13 @@ describe('cancels invalid request', () => {
           'message in requestData position did not match schema',
         ),
         extras: {
-          totalErrors: 2,
+          totalErrors: 1,
           // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
           firstValidationErrors: expect.arrayContaining([
             {
               path: '/newRequiredField',
-              message: 'Expected required property',
+              message: 'must have required properties newRequiredField',
             },
-            { path: '/newRequiredField', message: 'Expected string' },
           ]),
         },
       }),

__tests__/middleware.test.ts

@@ -16,7 +16,7 @@ import {
   Middleware,
 } from '../router';
 import { createMockTransportNetwork } from '../testUtil/fixtures/mockTransport';
-import { Type } from '@sinclair/typebox';
+import { Type } from 'typebox';
 
 describe('middleware test', () => {
   let mockTransportNetwork: ReturnType<typeof createMockTransportNetwork>;

__tests__/negative.test.ts

@@ -20,7 +20,7 @@ import {
   handshakeRequestMessage,
 } from '../transport/message';
 import { NaiveJsonCodec } from '../codec';
-import { Static } from '@sinclair/typebox';
+import { Static } from 'typebox';
 import { WebSocketClientTransport } from '../transport/impls/ws/client';
 import { ProtocolError } from '../transport/events';
 import NodeWs from 'ws';

__tests__/serialize.test.ts

@@ -5,7 +5,7 @@ import {
   TestServiceSchema,
 } from '../testUtil/fixtures/services';
 import { serializeSchema } from '../router';
-import { Type } from '@sinclair/typebox';
+import { Type } from 'typebox';
 
 describe('serialize server to jsonschema', () => {
   test('serialize entire service schema', () => {

__tests__/typescript-stress.test.ts

@@ -1,7 +1,7 @@
 import { assert, describe, expect, test } from 'vitest';
 import { Procedure } from '../router/procedures';
 import { createServiceSchema } from '../router/services';
-import { Type } from '@sinclair/typebox';
+import { Type } from 'typebox';
 import { createServer } from '../router/server';
 import { createClient } from '../router/client';
 import {

__tests__/unserializable.test.ts

@@ -1,5 +1,5 @@
 import { beforeEach, describe, expect, test } from 'vitest';
-import { Type } from '@sinclair/typebox';
+import { Type } from 'typebox';
 import {
   Procedure,
   createServiceSchema,

codec/adapter.ts

@@ -1,4 +1,4 @@
-import { Value } from '@sinclair/typebox/value';
+import { Value } from 'typebox/value';
 import {
   OpaqueTransportMessage,
   OpaqueTransportMessageSchema,

customSchemas/index.ts

@@ -0,0 +1,94 @@
+import { Type } from 'typebox';
+
+export type TUint8Array = Type.TUnsafe<Uint8Array>;
+const uint8ArrayCache = new Map<string, TUint8Array>();
+
+/**
+ * Creates a TypeBox schema for `Uint8Array` values with optional byte length constraints.
+ * This replaces the removed `Type.Uint8Array()` from TypeBox 0.34.x.
+ *
+ * The schema serializes with `{ type: 'Uint8Array' }` for backwards compatibility
+ * with older River clients/servers that used the built-in `Type.Uint8Array()`.
+ *
+ * @param options - Optional constraints for minimum and maximum byte length.
+ * @returns A TypeBox schema that validates `Uint8Array` instances.
+ */
+export function Uint8ArrayType(
+  options: {
+    minByteLength?: number;
+    maxByteLength?: number;
+  } = {},
+) {
+  const min = options.minByteLength;
+  const max = options.maxByteLength;
+
+  const key = `${min ?? ''}:${max ?? ''}`;
+  const existing = uint8ArrayCache.get(key);
+  if (existing) return existing;
+
+  const schema = Type.Refine(
+    Type.Unsafe<Uint8Array>({
+      type: 'Uint8Array',
+      ...(min !== undefined ? { minByteLength: min } : {}),
+      ...(max !== undefined ? { maxByteLength: max } : {}),
+    }),
+    (value): value is Uint8Array => {
+      if (!(value instanceof Uint8Array)) return false;
+      if (min !== undefined && value.byteLength < min) return false;
+      if (max !== undefined && value.byteLength > max) return false;
+
+      return true;
+    },
+  );
+
+  uint8ArrayCache.set(key, schema);
+
+  return schema;
+}
+
+export type TDate = Type.TUnsafe<Date>;
+const dateCache = new Map<string, TDate>();
+
+/**
+ * Creates a TypeBox schema for `Date` values.
+ * This replaces the removed `Type.Date()` from TypeBox 0.34.x.
+ *
+ * The schema serializes with `{ type: 'Date' }` for backwards compatibility
+ * with older River clients/servers that used the built-in `Type.Date()`.
+ *
+ * @param options - Optional constraints for minimum and maximum date values.
+ * @returns A TypeBox schema that validates `Date` instances (rejects invalid dates).
+ */
+export function DateType(
+  options: {
+    minimumTimestamp?: number;
+    maximumTimestamp?: number;
+  } = {},
+): TDate {
+  const min = options.minimumTimestamp;
+  const max = options.maximumTimestamp;
+
+  const key = `${min ?? ''}:${max ?? ''}`;
+  const existing = dateCache.get(key);
+  if (existing) return existing;
+
+  const schema = Type.Refine(
+    Type.Unsafe<Date>({
+      type: 'Date',
+      ...(min !== undefined ? { minimumTimestamp: min } : {}),
+      ...(max !== undefined ? { maximumTimestamp: max } : {}),
+    }),
+    (value): value is Date => {
+      if (!(value instanceof Date)) return false;
+      if (isNaN(value.getTime())) return false;
+      if (typeof min === 'number' && value.getTime() < min) return false;
+      if (typeof max === 'number' && value.getTime() > max) return false;
+
+      return true;
+    },
+  );
+
+  dateCache.set(key, schema);
+
+  return schema;
+}