move more imports

__tests__/bandwidth.bench.ts

@@ -1,5 +1,5 @@
 import { afterAll, assert, bench, describe } from 'vitest';
-import { getClientSendFn, waitForMessage } from '../util/testHelpers';
+import { getClientSendFn, waitForMessage } from '../testUtil';
 import { TestServiceSchema } from './fixtures/services';
 import { createServer } from '../router/server';
 import { createClient } from '../router/client';

__tests__/cleanup.test.ts

@@ -5,7 +5,7 @@ import {
   isReadableDone,
   numberOfConnections,
   getClientSendFn,
-} from '../util/testHelpers';
+} from '../testUtil';
 import {
   SubscribableServiceSchema,
   TestServiceSchema,

__tests__/disconnects.test.ts

@@ -4,7 +4,7 @@ import {
   isReadableDone,
   numberOfConnections,
   readNextResult,
-} from '../util/testHelpers';
+} from '../testUtil';
 import {
   SubscribableServiceSchema,
   TestServiceSchema,

__tests__/e2e.test.ts

@@ -4,7 +4,7 @@ import {
   isReadableDone,
   numberOfConnections,
   readNextResult,
-} from '../util/testHelpers';
+} from '../testUtil';
 import { createServer } from '../router/server';
 import { createClient } from '../router/client';
 import {

__tests__/fixtures/cleanup.ts

@@ -11,7 +11,7 @@ import { AnyServiceSchemaMap } from '../../router/services';
 import {
   numberOfConnections,
   testingSessionOptions,
-} from '../../util/testHelpers';
+} from '../../testUtil';
 import { Value } from '@sinclair/typebox/value';
 import { ControlMessageAckSchema } from '../../transport/message';
 

__tests__/fixtures/transports.ts

@@ -10,7 +10,7 @@ import {
   createWebSocketServer,
   getTransportConnections,
   onWsServerReady,
-} from '../../util/testHelpers';
+} from '../../testUtil';
 import {
   ClientTransportOptions,
   ServerTransportOptions,

__tests__/handler.test.ts

@@ -1,4 +1,4 @@
-import { isReadableDone, readNextResult } from '../util/testHelpers';
+import { isReadableDone, readNextResult } from '../testUtil';
 import { afterEach, beforeEach, describe, expect, test } from 'vitest';
 import {
   DIV_BY_ZERO,

__tests__/invalid-request.test.ts

@@ -20,7 +20,7 @@ import { INVALID_REQUEST_CODE } from '../router/errors';
 import { ControlFlags } from '../transport/message';
 import { TestSetupHelpers } from './fixtures/transports';
 import { nanoid } from 'nanoid';
-import { getClientSendFn } from '../util/testHelpers';
+import { getClientSendFn } from '../testUtil';
 
 describe('cancels invalid request', () => {
   const { transport, codec } = testMatrix()[0];

__tests__/negative.test.ts

@@ -10,7 +10,7 @@ import {
   createWebSocketServer,
   numberOfConnections,
   onWsServerReady,
-} from '../util/testHelpers';
+} from '../testUtil';
 import { WebSocketServerTransport } from '../transport/impls/ws/server';
 import {
   ControlFlags,

__tests__/streams.test.ts

@@ -9,7 +9,7 @@ import {
   getReadableIterator,
   isReadableDone,
   readNextResult,
-} from '../util/testHelpers';
+} from '../testUtil';
 
 interface SomeError {
   code: 'SOME_ERROR';

__tests__/typescript-stress.test.ts

@@ -13,7 +13,7 @@ import {
   unwrapOrThrow,
 } from '../router/result';
 import { TestServiceSchema } from './fixtures/services';
-import { readNextResult } from '../util/testHelpers';
+import { readNextResult } from '../testUtil';
 import {
   createClientHandshakeOptions,
   createServerHandshakeOptions,

package.json

@@ -37,8 +37,8 @@
       "require": "./dist/transport/impls/uds/server.cjs"
     },
     "./test-util": {
-      "import": "./dist/util/testHelpers.js",
-      "require": "./dist/util/testHelpers.cjs"
+      "import": "./dist/testUtil/index.js",
+      "require": "./dist/testUtil/index.cjs"
     }
   },
   "sideEffects": [

router/server.ts

@@ -35,7 +35,7 @@ import { Logger } from '../logging/log';
 import { Value, ValueError } from '@sinclair/typebox/value';
 import { Err, Result, Ok, ErrResult } from './result';
 import { EventMap } from '../transport/events';
-import { coerceErrorString } from '../util/stringify';
+import { coerceErrorString } from '../transport/stringifyError';
 import { Span, SpanStatusCode } from '@opentelemetry/api';
 import { createHandlerSpan, PropagationContext } from '../tracing';
 import { ServerHandshakeOptions } from './handshake';

tracing/tracing.test.ts

@@ -1,6 +1,6 @@
 import { trace, context, propagation, Span } from '@opentelemetry/api';
 import { describe, test, expect, vi, assert, beforeEach } from 'vitest';
-import { dummySession } from '../util/testHelpers';
+import { dummySession } from '../testUtil';
 
 import {
   BasicTracerProvider,

transport/client.ts

@@ -15,7 +15,7 @@ import {
 } from './options';
 import { LeakyBucketRateLimit } from './rateLimit';
 import { Transport } from './transport';
-import { coerceErrorString } from '../util/stringify';
+import { coerceErrorString } from './stringifyError';
 import { ProtocolError } from './events';
 import { Value } from '@sinclair/typebox/value';
 import tracer, { getPropagationContext } from '../tracing';

transport/impls/ws/ws.test.ts

@@ -11,7 +11,7 @@ import {
   getTransportConnections,
   getClientSendFn,
   getServerSendFn,
-} from '../../../util/testHelpers';
+} from '../../../testUtil';
 import { WebSocketServerTransport } from './server';
 import { WebSocketClientTransport } from './client';
 import {

transport/server.ts

@@ -18,7 +18,7 @@ import {
   defaultServerTransportOptions,
 } from './options';
 import { DeleteSessionOptions, Transport } from './transport';
-import { coerceErrorString } from '../util/stringify';
+import { coerceErrorString } from './stringifyError';
 import { Static } from '@sinclair/typebox';
 import { Value } from '@sinclair/typebox/value';
 import { ProtocolError } from './events';

transport/sessionStateMachine/stateMachine.test.ts

@@ -2,7 +2,7 @@ import { describe, expect, test, vi } from 'vitest';
 import {
   payloadToTransportMessage,
   testingSessionOptions,
-} from '../../util/testHelpers';
+} from '../../testUtil';
 import { waitFor } from '../../__tests__/fixtures/cleanup';
 import {
   ControlFlags,

transport/transport.test.ts

@@ -9,7 +9,7 @@ import {
   testingClientSessionOptions,
   getClientSendFn,
   getServerSendFn,
-} from '../util/testHelpers';
+} from '../testUtil';
 import { EventMap, ProtocolError } from '../transport/events';
 import {
   advanceFakeTimersByConnectionBackoff,

tsup.config.ts

@@ -5,7 +5,7 @@ export default defineConfig({
     'router/index.ts',
     'logging/index.ts',
     'codec/index.ts',
-    'util/testHelpers.ts',
+    'testUtil/index.ts',
     'transport/index.ts',
     'transport/impls/ws/client.ts',
     'transport/impls/ws/server.ts',