Upgrade to TypeBox 1.x

__tests__/__snapshots__/serialize.test.ts.snap

@@ -3199,9 +3199,7 @@ exports[`serialize service to jsonschema > serialize service with binary 1`] = `
       },
       "output": {
         "properties": {
-          "contents": {
-            "type": "Uint8Array",
-          },
+          "contents": {},
         },
         "required": [
           "contents",

__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',
+                path: '',
+                message: 'must have required properties mustSendThings',
               },
-              { path: '/mustSendThings', message: 'Expected string' },
             ]),
           },
         }),
@@ -463,10 +462,14 @@ 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' },
+                {
+                  path: '',
+                  message: 'must match a schema in anyOf',
+                },
               ]),
             },
           }),
@@ -597,14 +600,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',
+              path: '',
+              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,

package.json

@@ -55,15 +55,15 @@
   },
   "peerDependencies": {
     "@opentelemetry/api": "^1.7.0",
-    "@sinclair/typebox": "~0.34.0"
+    "typebox": "^1.1.0"
   },
   "devDependencies": {
     "@bufbuild/buf": "^1.67.0",
     "@opentelemetry/api": "^1.7.0",
     "@opentelemetry/context-async-hooks": "^1.26.0",
     "@opentelemetry/core": "^1.7.0",
     "@opentelemetry/sdk-trace-base": "^1.24.1",
-    "@sinclair/typebox": "~0.34.0",
+    "typebox": "^1.1.38",
     "@stylistic/eslint-plugin": "^2.6.4",
     "@types/ws": "^8.5.5",
     "@typescript-eslint/eslint-plugin": "^7.8.0",

protobuf/client.ts

@@ -6,7 +6,7 @@ import type {
   MessageInitShape,
   MessageShape,
 } from '@bufbuild/protobuf';
-import { Value } from '@sinclair/typebox/value';
+import { Value } from 'typebox/value';
 import { ClientTransport } from '../transport/client';
 import { Connection } from '../transport/connection';
 import { EventMap } from '../transport/events';

protobuf/handshake.ts

@@ -3,7 +3,7 @@ import type {
   MessageInitShape,
   MessageShape,
 } from '@bufbuild/protobuf';
-import { Static, Type } from '@sinclair/typebox';
+import { type Static, Type } from 'typebox';
 import {
   createClientHandshakeOptions as createTransportClientHandshakeOptions,
   createServerHandshakeOptions as createTransportServerHandshakeOptions,
@@ -13,11 +13,17 @@ import {
 import { HandshakeErrorCustomHandlerFatalResponseCodes } from '../transport/message';
 import { decodeMessageBytes, encodeMessageBytes } from './shared';
 
-/**
- * The handshake metadata for protobuf services travels as encoded protobuf bytes
- * over River's existing handshake extension slot.
- */
-const HandshakeBytesSchema = Type.Uint8Array();
+class TUint8Array extends Type.Base<Uint8Array> {
+  public override Check(value: unknown): value is Uint8Array {
+    return value instanceof Uint8Array;
+  }
+
+  public override Clone(): TUint8Array {
+    return new TUint8Array();
+  }
+}
+
+const HandshakeBytesSchema = new TUint8Array();
 
 type ProtobufHandshakeFailureCode = Static<
   typeof HandshakeErrorCustomHandlerFatalResponseCodes

protobuf/server.ts

@@ -4,8 +4,8 @@ import type {
   MessageInitShape,
   MessageShape,
 } from '@bufbuild/protobuf';
-import { TSchema } from '@sinclair/typebox';
-import { Value } from '@sinclair/typebox/value';
+import type { TSchema } from 'typebox';
+import { Value } from 'typebox/value';
 import { context as otelContext, trace, type Span } from '@opentelemetry/api';
 import { Logger } from '../logging';
 import { ServerHandshakeOptions } from '../router/handshake';

router/client.ts

@@ -18,7 +18,7 @@ import {
   closeStreamMessage,
   cancelMessage,
 } from '../transport/message';
-import { Static } from '@sinclair/typebox';
+import type { Static } from 'typebox';
 import { Err, Result, AnyResultSchema } from './result';
 import { EventMap } from '../transport/events';
 import { Connection } from '../transport/connection';
@@ -28,7 +28,7 @@ import { ClientHandshakeOptions } from './handshake';
 import { ClientTransport } from '../transport/client';
 import { generateId } from '../transport/id';
 import { Readable, ReadableImpl, Writable, WritableImpl } from './streams';
-import { Value } from '@sinclair/typebox/value';
+import { Value } from 'typebox/value';
 import { PayloadType, ValidProcType } from './procedures';
 import {
   BaseErrorSchemaType,
@@ -450,9 +450,10 @@ function handleProc(
           {
             clientId: transport.clientId,
             transportMessage: msg,
-            validationErrors: [
-              ...Value.Errors(ReaderErrorResultSchema, msg.payload),
-            ],
+            validationErrors: Value.Errors(
+              ReaderErrorResultSchema,
+              msg.payload,
+            ).map((e) => ({ path: e.instancePath, message: e.message })),
           },
         );
       }
@@ -487,7 +488,9 @@ function handleProc(
           {
             clientId: transport.clientId,
             transportMessage: msg,
-            validationErrors: [...Value.Errors(AnyResultSchema, msg.payload)],
+            validationErrors: Value.Errors(AnyResultSchema, msg.payload).map(
+              (e) => ({ path: e.instancePath, message: e.message }),
+            ),
           },
         );
       }

router/context.ts

@@ -3,7 +3,7 @@ import { TransportClientId } from '../transport/message';
 import { SessionId } from '../transport/sessionStateMachine/common';
 import { ErrResult } from './result';
 import { CancelErrorSchema } from './errors';
-import { Static } from '@sinclair/typebox';
+import type { Static } from 'typebox';
 
 /**
  * This is passed to every procedure handler and contains various context-level