Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: pub on jsr #5531

Draft
wants to merge 3 commits into
base: next
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
22 changes: 22 additions & 0 deletions packages/server/deno.json
@@ -0,0 +1,22 @@
{
"name": "@trpc/server",
"version": "0.0.4",
"exports": {
".": "./src/@trpc/server/index.ts",
"./adapters/aws-lambda": "./src/adapters/aws-lambda/index.ts",
"./adapters/express": "./src/adapters/express.ts",
"./adapters/fastify": "./src/adapters/fastify/index.ts",
"./adapters/fetch": "./src/adapters/fetch/index.ts",
"./adapters/next": "./src/adapters/next.ts",
"./adapters/node-http/content-type/form-data": "./src/adapters/node-http/content-type/form-data/index.ts",
"./adapters/node-http/content-type/json": "./src/adapters/node-http/content-type/json/index.ts",
"./adapters/node-http": "./src/adapters/node-http/index.ts",
"./adapters/standalone": "./src/adapters/standalone.ts",
"./adapters/ws": "./src/adapters/ws.ts",
"./http": "./src/http.ts",
"./observable": "./src/observable/index.ts",
"./rpc": "./src/rpc.ts",
"./shared": "./src/shared.ts",
"./unstable-core-do-not-import": "./src/unstable-core-do-not-import.ts"
}
}
14 changes: 7 additions & 7 deletions packages/server/src/@trpc/server/http.ts
@@ -1,8 +1,8 @@
export {
getHTTPStatusCode,
getHTTPStatusCodeFromError,
} from '../../unstable-core-do-not-import';
export { resolveHTTPResponse } from '../../unstable-core-do-not-import';
} from '../../unstable-core-do-not-import.ts';
export { resolveHTTPResponse } from '../../unstable-core-do-not-import.ts';
export type {
BaseHandlerOptions,
HTTPBaseHandlerOptions,
Expand All @@ -16,12 +16,12 @@ export type {
ResponseMeta,
ResponseMetaFn,
TRPCRequestInfo,
} from '../../unstable-core-do-not-import';
} from '../../unstable-core-do-not-import.ts';

export { getBatchStreamFormatter } from '../../unstable-core-do-not-import';
export { getBatchStreamFormatter } from '../../unstable-core-do-not-import.ts';
export type {
BaseContentTypeHandler,
BodyResult,
} from '../../unstable-core-do-not-import';
export { getJsonContentTypeInputs } from '../../unstable-core-do-not-import';
export { toURL } from '../../unstable-core-do-not-import';
} from '../../unstable-core-do-not-import.ts';
export { getJsonContentTypeInputs } from '../../unstable-core-do-not-import.ts';
export { toURL } from '../../unstable-core-do-not-import.ts';
6 changes: 3 additions & 3 deletions packages/server/src/@trpc/server/index.ts
Expand Up @@ -32,7 +32,7 @@ export {
type RouterRecord as TRPCRouterRecord,
type AnySubscriptionProcedure as AnyTRPCSubscriptionProcedure,
type ProcedureOptions as TRPCProcedureOptions,
} from '../../unstable-core-do-not-import';
} from '../../unstable-core-do-not-import.ts';

export type {
/**
Expand Down Expand Up @@ -78,7 +78,7 @@ export type {
* @deprecated use `AnyTRPCSubscriptionProcedure` instead
*/
AnySubscriptionProcedure,
} from '../../unstable-core-do-not-import';
} from '../../unstable-core-do-not-import.ts';

export {
/**
Expand All @@ -90,7 +90,7 @@ export {
* @deprecated use `callTRPCProcedure` instead
*/
callProcedure,
} from '../../unstable-core-do-not-import';
} from '../../unstable-core-do-not-import.ts';

/**
* @deprecated
Expand Down
4 changes: 2 additions & 2 deletions packages/server/src/@trpc/server/rpc.ts
Expand Up @@ -18,9 +18,9 @@ export type {
TRPCSuccessResponse,
TRPC_ERROR_CODE_KEY,
TRPC_ERROR_CODE_NUMBER,
} from '../../unstable-core-do-not-import';
} from '../../unstable-core-do-not-import.ts';
export {
TRPC_ERROR_CODES_BY_KEY,
TRPC_ERROR_CODES_BY_NUMBER,
parseTRPCMessage,
} from '../../unstable-core-do-not-import';
} from '../../unstable-core-do-not-import.ts';
18 changes: 9 additions & 9 deletions packages/server/src/adapters/aws-lambda/index.ts
Expand Up @@ -14,31 +14,31 @@ import type {
APIGatewayProxyStructuredResultV2,
Context as APIGWContext,
} from 'aws-lambda';
// @trpc/server
import type { AnyRouter } from '../../@trpc/server';
// @trpc/server
import { TRPCError } from '../../@trpc/server';
import type {
HTTPRequest,
HTTPResponse,
ResolveHTTPRequestOptionsContextFn,
} from '../../@trpc/server/http';
import { resolveHTTPResponse } from '../../@trpc/server/http';
} from '../../@trpc/server/http.ts';
import { resolveHTTPResponse } from '../../@trpc/server/http.ts';
// @trpc/server
import type { AnyRouter } from '../../@trpc/server/index.ts';
// @trpc/server
import { TRPCError } from '../../@trpc/server/index.ts';
import type {
APIGatewayEvent,
APIGatewayResult,
AWSLambdaOptions,
} from './utils';
} from './utils.ts';
import {
getHTTPMethod,
getPath,
isPayloadV1,
isPayloadV2,
transformHeaders,
UNKNOWN_PAYLOAD_FORMAT_VERSION_ERROR_MESSAGE,
} from './utils';
} from './utils.ts';

export * from './utils';
export * from './utils.ts';

function lambdaEventToHTTPRequest(event: APIGatewayEvent): HTTPRequest {
const query = new URLSearchParams();
Expand Down
14 changes: 9 additions & 5 deletions packages/server/src/adapters/aws-lambda/utils.ts
Expand Up @@ -14,16 +14,20 @@ import type {
APIGatewayProxyStructuredResultV2,
Context as APIGWContext,
} from 'aws-lambda';
import type { AnyRouter, inferRouterContext } from '../../@trpc/server'; // import @trpc/server

// @trpc/server
import { TRPCError } from '../../@trpc/server';
import type {
HTTPHeaders,
OnErrorFunction,
ResponseMetaFn,
TRPCRequestInfo,
} from '../../@trpc/server/http';
} from '../../@trpc/server/http.ts';
import type {
AnyRouter,
inferRouterContext,
} from '../../@trpc/server/index.ts';
// import @trpc/server

// @trpc/server
import { TRPCError } from '../../@trpc/server/index.ts';

export type APIGatewayEvent = APIGatewayProxyEvent | APIGatewayProxyEventV2;
export type APIGatewayResult =
Expand Down
6 changes: 3 additions & 3 deletions packages/server/src/adapters/express.ts
Expand Up @@ -8,12 +8,12 @@
* ```
*/
import type * as express from 'express';
import type { AnyRouter } from '../@trpc/server';
import type { AnyRouter } from '../@trpc/server/index.ts';
import type {
NodeHTTPCreateContextFnOptions,
NodeHTTPHandlerOptions,
} from './node-http';
import { nodeHTTPRequestHandler } from './node-http';
} from './node-http/index.ts';
import { nodeHTTPRequestHandler } from './node-http/index.ts';

export type CreateExpressContextOptions = NodeHTTPCreateContextFnOptions<
express.Request,
Expand Down
10 changes: 5 additions & 5 deletions packages/server/src/adapters/fastify/fastifyRequestHandler.ts
Expand Up @@ -9,20 +9,20 @@
*/
import { Readable } from 'node:stream';
import type { FastifyReply, FastifyRequest } from 'fastify';
// @trpc/server
import type { AnyRouter } from '../../@trpc/server';
import type {
HTTPBaseHandlerOptions,
HTTPRequest,
HTTPResponse,
ResolveHTTPRequestOptionsContextFn,
ResponseChunk,
} from '../../@trpc/server/http';
} from '../../@trpc/server/http.ts';
import {
getBatchStreamFormatter,
resolveHTTPResponse,
} from '../../@trpc/server/http';
import type { NodeHTTPCreateContextOption } from '../node-http';
} from '../../@trpc/server/http.ts';
// @trpc/server
import type { AnyRouter } from '../../@trpc/server/index.ts';
import type { NodeHTTPCreateContextOption } from '../node-http/index.ts';

export type FastifyHandlerOptions<
TRouter extends AnyRouter,
Expand Down
12 changes: 6 additions & 6 deletions packages/server/src/adapters/fastify/fastifyTRPCPlugin.ts
Expand Up @@ -9,13 +9,13 @@
*/
/// <reference types="@fastify/websocket" />
import type { FastifyInstance, FastifyReply, FastifyRequest } from 'fastify';
import type { FastifyHandlerOptions } from '.';
// @trpc/server
import type { AnyRouter } from '../../@trpc/server';
import type { NodeHTTPCreateContextFnOptions } from '../node-http';
import type { WSSHandlerOptions } from '../ws';
import { applyWSSHandler } from '../ws';
import { fastifyRequestHandler } from './fastifyRequestHandler';
import type { AnyRouter } from '../../@trpc/server/index.ts';
import type { NodeHTTPCreateContextFnOptions } from '../node-http/index.ts';
import type { WSSHandlerOptions } from '../ws.ts';
import { applyWSSHandler } from '../ws.ts';
import { fastifyRequestHandler } from './fastifyRequestHandler.ts';
import type { FastifyHandlerOptions } from './index.ts';

export interface FastifyTRPCPluginOptions<TRouter extends AnyRouter> {
prefix?: string;
Expand Down
4 changes: 2 additions & 2 deletions packages/server/src/adapters/fastify/index.ts
@@ -1,2 +1,2 @@
export * from './fastifyRequestHandler';
export * from './fastifyTRPCPlugin';
export * from './fastifyRequestHandler.ts';
export * from './fastifyTRPCPlugin.ts';
8 changes: 4 additions & 4 deletions packages/server/src/adapters/fetch/fetchRequestHandler.ts
Expand Up @@ -9,19 +9,19 @@
*/
// @trpc/server

import type { AnyRouter } from '../../@trpc/server';
import type {
HTTPRequest,
HTTPResponse,
ResolveHTTPRequestOptionsContextFn,
ResponseChunk,
} from '../../@trpc/server/http';
} from '../../@trpc/server/http.ts';
import {
getBatchStreamFormatter,
resolveHTTPResponse,
toURL,
} from '../../@trpc/server/http';
import type { FetchHandlerOptions } from './types';
} from '../../@trpc/server/http.ts';
import type { AnyRouter } from '../../@trpc/server/index.ts';
import type { FetchHandlerOptions } from './types.ts';

export type FetchHandlerRequestOptions<TRouter extends AnyRouter> =
FetchHandlerOptions<TRouter> & {
Expand Down
4 changes: 2 additions & 2 deletions packages/server/src/adapters/fetch/index.ts
@@ -1,2 +1,2 @@
export * from './fetchRequestHandler';
export * from './types';
export * from './fetchRequestHandler.ts';
export * from './types.ts';
8 changes: 6 additions & 2 deletions packages/server/src/adapters/fetch/types.ts
Expand Up @@ -8,12 +8,16 @@
* ```
*/
// @trpc/server
import type { AnyRouter, inferRouterContext } from '../../@trpc/server';

// @trpc/server/http
import type {
HTTPBaseHandlerOptions,
TRPCRequestInfo,
} from '../../@trpc/server/http';
} from '../../@trpc/server/http.ts';
import type {
AnyRouter,
inferRouterContext,
} from '../../@trpc/server/index.ts';

export type FetchCreateContextFnOptions = {
req: Request;
Expand Down
8 changes: 4 additions & 4 deletions packages/server/src/adapters/next.ts
Expand Up @@ -9,14 +9,14 @@
*/
import type { NextApiHandler, NextApiRequest, NextApiResponse } from 'next';
// @trpc/server
import type { AnyRouter } from '../@trpc/server';
import type { AnyRouter } from '../@trpc/server/index.ts';
// @trpc/server
import { getErrorShape, TRPCError } from '../@trpc/server';
import { getErrorShape, TRPCError } from '../@trpc/server/index.ts';
import type {
NodeHTTPCreateContextFnOptions,
NodeHTTPHandlerOptions,
} from './node-http';
import { nodeHTTPRequestHandler } from './node-http';
} from './node-http/index.ts';
import { nodeHTTPRequestHandler } from './node-http/index.ts';

export type CreateNextContextOptions = NodeHTTPCreateContextFnOptions<
NextApiRequest,
Expand Down
Expand Up @@ -17,9 +17,9 @@ import { tmpdir } from 'node:os';
import { basename, dirname, extname, resolve as resolvePath } from 'node:path';
import { finished, Readable } from 'node:stream';
import { promisify } from 'node:util';
import { streamSlice } from './streamSlice';
import type { UploadHandler } from './uploadHandler';
import { MaxPartSizeExceededError } from './uploadHandler';
import { streamSlice } from './streamSlice.ts';
import type { UploadHandler } from './uploadHandler.ts';
import { MaxPartSizeExceededError } from './uploadHandler.ts';

export async function readableStreamToString(
stream: ReadableStream<Uint8Array>,
Expand Down
Expand Up @@ -8,17 +8,17 @@
/**
* @link https://github.com/remix-run/remix/blob/0bcb4a304dd2f08f6032c3bf0c3aa7eb5b976901/packages/remix-server-runtime/formData.ts
*/
import * as fs from 'fs/promises';
import * as fs from 'node:fs/promises';
import { Readable } from 'node:stream';
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore the type definitions for this package are borked
import { streamMultipart } from '@web3-storage/multipart-parser';
// @trpc/server
import { createNodeHTTPContentTypeHandler } from '../../internals/contentType';
import type { NodeHTTPRequest } from '../../types';
import { NodeOnDiskFile } from './fileUploadHandler';
import type { UploadHandler, UploadHandlerPart } from './uploadHandler';
import { MaxBodySizeExceededError } from './uploadHandler';
import { createNodeHTTPContentTypeHandler } from '../../internals/contentType.ts';
import type { NodeHTTPRequest } from '../../types.ts';
import { NodeOnDiskFile } from './fileUploadHandler.ts';
import type { UploadHandler, UploadHandlerPart } from './uploadHandler.ts';
import { MaxBodySizeExceededError } from './uploadHandler.ts';

const utfTextDecoder = new TextDecoder('utf-8');

Expand Down Expand Up @@ -149,14 +149,14 @@ export const nodeHTTPFormDataContentTypeHandler =
export {
NodeOnDiskFile as experimental_NodeOnDiskFile,
createFileUploadHandler as experimental_createFileUploadHandler,
} from './fileUploadHandler';
export { createMemoryUploadHandler as experimental_createMemoryUploadHandler } from './memoryUploadHandler';
} from './fileUploadHandler.ts';
export { createMemoryUploadHandler as experimental_createMemoryUploadHandler } from './memoryUploadHandler.ts';
export {
MaxBodySizeExceededError,
MaxPartSizeExceededError,
composeUploadHandlers as experimental_composeUploadHandlers,
type UploadHandler,
} from './uploadHandler';
} from './uploadHandler.ts';
export {
isMultipartFormDataRequest as experimental_isMultipartFormDataRequest,
parseMultipartFormData as experimental_parseMultipartFormData,
Expand Down
Expand Up @@ -8,8 +8,8 @@
/**
* @link https://github.com/remix-run/remix/blob/0bcb4a304dd2f08f6032c3bf0c3aa7eb5b976901/packages/remix-server-runtime/upload/memoryUploadHandler.ts
*/
import type { UploadHandler } from './uploadHandler';
import { MaxPartSizeExceededError } from './uploadHandler';
import type { UploadHandler } from './uploadHandler.ts';
import { MaxPartSizeExceededError } from './uploadHandler.ts';

export type MemoryUploadHandlerFilterArgs = {
filename?: string;
Expand Down
@@ -1,4 +1,4 @@
import type { NodeOnDiskFile } from './fileUploadHandler';
import type { NodeOnDiskFile } from './fileUploadHandler.ts';

/**
* @link https://github.com/remix-run/remix/blob/0bcb4a304dd2f08f6032c3bf0c3aa7eb5b976901/packages/remix-server-runtime/formData.ts
Expand Down
@@ -1,7 +1,7 @@
// @trpc/server
import { TRPCError } from '../../../../@trpc/server';
import type { BodyResult } from '../../../../@trpc/server/http';
import type { NodeHTTPRequest } from '../../types';
import type { BodyResult } from '../../../../@trpc/server/http.ts';
import { TRPCError } from '../../../../@trpc/server/index.ts';
import type { NodeHTTPRequest } from '../../types.ts';

export async function getPostBody(opts: {
req: NodeHTTPRequest;
Expand Down
@@ -1,6 +1,6 @@
import { getJsonContentTypeInputs } from '../../../../@trpc/server/http';
import { createNodeHTTPContentTypeHandler } from '../../internals/contentType';
import { getPostBody } from './getPostBody';
import { getJsonContentTypeInputs } from '../../../../@trpc/server/http.ts';
import { createNodeHTTPContentTypeHandler } from '../../internals/contentType.ts';
import { getPostBody } from './getPostBody.ts';

export const nodeHTTPJSONContentTypeHandler = createNodeHTTPContentTypeHandler({
isMatch(opts) {
Expand Down
4 changes: 2 additions & 2 deletions packages/server/src/adapters/node-http/index.ts
@@ -1,2 +1,2 @@
export * from './nodeHTTPRequestHandler';
export * from './types';
export * from './nodeHTTPRequestHandler.ts';
export * from './types.ts';