@trpc/server 11.0.0-next-alpha.152 → 11.0.0-next-alpha.154

package/src/adapters/node-http/content-type/form-data/index.ts

@@ -10,10 +10,10 @@
  */
 import * as fs from 'fs/promises';
 import { Readable } from 'node:stream';
+import { CombinedDataTransformer } from '@trpc/core';
 // 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';
-import { CombinedDataTransformer } from '../../../../transformer';
 import { createNodeHTTPContentTypeHandler } from '../../internals/contentType';
 import { NodeHTTPRequest } from '../../types';
 import { NodeOnDiskFile } from './fileUploadHandler';

package/src/adapters/node-http/content-type/json/getPostBody.ts

@@ -1,5 +1,5 @@
-import { TRPCError } from '../../../../error/TRPCError';
-import { BodyResult } from '../../../../http/contentType';
+import { TRPCError } from '@trpc/core';
+import { BodyResult } from '../../../../http';
 import { NodeHTTPRequest } from '../../types';
 
 export async function getPostBody(opts: {

package/src/adapters/node-http/content-type/json/index.ts

@@ -1,4 +1,4 @@
-import { getJsonContentTypeInputs } from '../../../../http/contentType';
+import { getJsonContentTypeInputs } from '../../../../http';
 import { createNodeHTTPContentTypeHandler } from '../../internals/contentType';
 import { getPostBody } from './getPostBody';
 

package/src/adapters/node-http/internals/contentType.ts

@@ -1,5 +1,5 @@
-import { AnyRouter } from '../../../core';
-import { BaseContentTypeHandler } from '../../../http/contentType';
+import { AnyRouter } from '@trpc/core';
+import { BaseContentTypeHandler } from '../../../http';
 import {
   NodeHTTPRequest,
   NodeHTTPRequestHandlerOptions,

package/src/adapters/node-http/nodeHTTPRequestHandler.ts

@@ -1,12 +1,13 @@
 /* eslint-disable @typescript-eslint/no-non-null-assertion */
-import { AnyRouter } from '../../core';
+import { AnyRouter } from '@trpc/core';
 import {
   getBatchStreamFormatter,
   HTTPRequest,
+  HTTPResponse,
   ResolveHTTPRequestOptionsContextFn,
+  resolveHTTPResponse,
+  ResponseChunk,
 } from '../../http';
-import { HTTPResponse, ResponseChunk } from '../../http/internals/types';
-import { resolveHTTPResponse } from '../../http/resolveHTTPResponse';
 import { nodeHTTPJSONContentTypeHandler } from './content-type/json';
 import { NodeHTTPContentTypeHandler } from './internals/contentType';
 import {

package/src/adapters/node-http/types.ts

@@ -1,7 +1,6 @@
 import { IncomingMessage, ServerResponse } from 'http';
-import { AnyRouter, inferRouterContext } from '../../core';
+import { AnyRouter, inferRouterContext, MaybePromise } from '@trpc/core';
 import { HTTPBaseHandlerOptions, TRPCRequestInfo } from '../../http';
-import { MaybePromise } from '../../types';
 import { NodeHTTPContentTypeHandler } from './internals/contentType';
 
 interface ParsedQs {

package/src/adapters/standalone.ts

@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/no-non-null-assertion */
 import http from 'http';
-import { AnyRouter } from '../core';
+import { AnyRouter } from '@trpc/core';
 import {
   NodeHTTPCreateContextFnOptions,
   NodeHTTPHandlerOptions,

package/src/adapters/ws.ts

@@ -1,19 +1,24 @@
 import { IncomingMessage } from 'http';
-import { WebSocket, WebSocketServer } from 'ws';
-import { AnyRouter, callProcedure, inferRouterContext } from '../core';
-import { getTRPCErrorFromUnknown, TRPCError } from '../error/TRPCError';
-import { BaseHandlerOptions } from '../internals/types';
-import { isObservable, Unsubscribable } from '../observable';
+import {
+  AnyRouter,
+  callProcedure,
+  getErrorShape,
+  getTRPCErrorFromUnknown,
+  inferRouterContext,
+  MaybePromise,
+  transformTRPCResponse,
+  TRPCError,
+} from '@trpc/core';
+import { BaseHandlerOptions } from '@trpc/core/http';
+import { isObservable, Unsubscribable } from '@trpc/core/observable';
 import {
   JSONRPC2,
   parseTRPCMessage,
   TRPCClientOutgoingMessage,
   TRPCReconnectNotification,
   TRPCResponseMessage,
-} from '../rpc';
-import { getErrorShape } from '../shared/getErrorShape';
-import { transformTRPCResponse } from '../shared/transformTRPCResponse';
-import { MaybePromise } from '../types';
+} from '@trpc/core/rpc';
+import { WebSocket, WebSocketServer } from 'ws';
 import { NodeHTTPCreateContextFnOptions } from './node-http';
 
 /**

package/src/http.ts

@@ -0,0 +1,2 @@
+// This should be moved to a like `@trpc/plugin`-package
+export * from '@trpc/core/http';

package/src/index.ts

@@ -1,18 +1,34 @@
-// FIXME: this file should only export
-// - `initTRPC`
-// - `TRPCError`
-// - (maybe something else?)
-
-export * from './transformer';
-export * from './error/TRPCError';
-export * from './core';
-export { type DefaultErrorShape } from './error/formatter';
-export type { RootConfig, AnyRootConfig } from './core/internals/config';
+export {
+  TRPCError,
+  /**
+   * @deprecated use `experimental_trpcMiddleware` instead
+   */
+  experimental_standaloneMiddleware,
+  experimental_standaloneMiddleware as experimental_trpcMiddleware,
+  initTRPC,
+  type inferProcedureInput,
+  type inferProcedureOutput,
+  type inferRouterError,
+  type inferRouterInputs,
+  type inferRouterOutputs,
+  type AnyProcedure as AnyTRPCProcedure,
+  type AnyRouter as AnyTRPCRouter,
+} from './unstableDoNotImportThis';
 
 export type {
   /**
-   * @deprecated
-   * Use `Awaited<ReturnType<T>>` instead
+   * @deprecated use `AnyTRPCProcedure` instead
    */
-  inferAsyncReturnType,
-} from './types';
+  AnyProcedure,
+  /**
+   * @deprecated use `AnyTRPCRouter` instead
+   */
+  AnyRouter,
+} from '@trpc/core';
+
+/**
+ * @deprecated
+ * Use `Awaited<ReturnType<typeof myFunction>>` instead
+ */
+export type inferAsyncReturnType<TFunction extends (...args: any[]) => any> =
+  Awaited<ReturnType<TFunction>>;

package/src/observable.ts

@@ -0,0 +1 @@
+export * from '@trpc/core/observable';

package/src/rpc.ts

@@ -0,0 +1,2 @@
+// Note: this should likely be moved to a sort of `@trpc/plugin` package
+export * from '@trpc/core/rpc';

package/src/unstableDoNotImportThis.ts

@@ -0,0 +1,9 @@
+/**
+ * This file is here to make TypeScript happy and prevent _"The inferred type of 'createContext' cannot be named without a reference to [...]"_.
+ *
+ * We're basically just re-exporting everything from @trpc/core here.
+ *
+ * If you need to import anything from here, please open an issue at https://github.com/trpc/trpc/issues
+ */
+
+export * from '@trpc/core';

package/dist/TRPCError-0b220715.js

@@ -1,42 +0,0 @@
-'use strict';
-
-var getCauseFromUnknown = require('./getCauseFromUnknown-d535264a.js');
-
-function getTRPCErrorFromUnknown(cause) {
-    if (cause instanceof TRPCError) {
-        return cause;
-    }
-    if (cause instanceof Error && cause.name === 'TRPCError') {
-        // https://github.com/trpc/trpc/pull/4848
-        return cause;
-    }
-    const trpcError = new TRPCError({
-        code: 'INTERNAL_SERVER_ERROR',
-        cause
-    });
-    // Inherit stack from error
-    if (cause instanceof Error && cause.stack) {
-        trpcError.stack = cause.stack;
-    }
-    return trpcError;
-}
-class TRPCError extends Error {
-    constructor(opts){
-        const cause = getCauseFromUnknown.getCauseFromUnknown(opts.cause);
-        const message = opts.message ?? cause?.message ?? opts.code;
-        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-        // @ts-ignore https://github.com/tc39/proposal-error-cause
-        super(message, {
-            cause
-        });
-        this.code = opts.code;
-        this.name = 'TRPCError';
-        if (!this.cause) {
-            // idk why this is needed, but it is
-            this.cause = cause;
-        }
-    }
-}
-
-exports.TRPCError = TRPCError;
-exports.getTRPCErrorFromUnknown = getTRPCErrorFromUnknown;

package/dist/TRPCError-2bb6a7d0.js

@@ -1,37 +0,0 @@
-import { g as getCauseFromUnknown } from './getCauseFromUnknown-ac5f46a2.js';
-
-function getTRPCErrorFromUnknown(cause) {
-    if (cause instanceof TRPCError) {
-        return cause;
-    }
-    if (cause instanceof Error && cause.name === 'TRPCError') {
-        // https://github.com/trpc/trpc/pull/4848
-        return cause;
-    }
-    const trpcError = new TRPCError({
-        code: 'INTERNAL_SERVER_ERROR',
-        cause,
-    });
-    // Inherit stack from error
-    if (cause instanceof Error && cause.stack) {
-        trpcError.stack = cause.stack;
-    }
-    return trpcError;
-}
-class TRPCError extends Error {
-    constructor(opts) {
-        const cause = getCauseFromUnknown(opts.cause);
-        const message = opts.message ?? cause?.message ?? opts.code;
-        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-        // @ts-ignore https://github.com/tc39/proposal-error-cause
-        super(message, { cause });
-        this.code = opts.code;
-        this.name = 'TRPCError';
-        if (!this.cause) {
-            // idk why this is needed, but it is
-            this.cause = cause;
-        }
-    }
-}
-
-export { TRPCError as T, getTRPCErrorFromUnknown as g };

package/dist/TRPCError-7e8e2a1b.mjs

@@ -1,39 +0,0 @@
-import { g as getCauseFromUnknown } from './getCauseFromUnknown-2d66414a.mjs';
-
-function getTRPCErrorFromUnknown(cause) {
-    if (cause instanceof TRPCError) {
-        return cause;
-    }
-    if (cause instanceof Error && cause.name === 'TRPCError') {
-        // https://github.com/trpc/trpc/pull/4848
-        return cause;
-    }
-    const trpcError = new TRPCError({
-        code: 'INTERNAL_SERVER_ERROR',
-        cause
-    });
-    // Inherit stack from error
-    if (cause instanceof Error && cause.stack) {
-        trpcError.stack = cause.stack;
-    }
-    return trpcError;
-}
-class TRPCError extends Error {
-    constructor(opts){
-        const cause = getCauseFromUnknown(opts.cause);
-        const message = opts.message ?? cause?.message ?? opts.code;
-        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-        // @ts-ignore https://github.com/tc39/proposal-error-cause
-        super(message, {
-            cause
-        });
-        this.code = opts.code;
-        this.name = 'TRPCError';
-        if (!this.cause) {
-            // idk why this is needed, but it is
-            this.cause = cause;
-        }
-    }
-}
-
-export { TRPCError as T, getTRPCErrorFromUnknown as g };

package/dist/batchStreamFormatter-2c1405a1.js

@@ -1,31 +0,0 @@
-/**
- * Format a batch response as a line-delimited JSON stream
- * that the `unstable_httpBatchStreamLink` can parse:
- *
- * @example
- * ```ts
- * const formatter = getBatchStreamFormatter();
- * res.send(formatter(1, 'response #2'));
- * res.send(formatter(0, 'response #1'));
- * res.send(formatter.end());
- * ```
- *
- * Expected format:
- * ```json
- * {"1":"response #2"
- * ,"0":"response #1"
- * }
- * ```
- */
-function getBatchStreamFormatter() {
-    let first = true;
-    function format(index, string) {
-        const prefix = first ? '{' : ',';
-        first = false;
-        return `${prefix}"${index}":${string}\n`;
-    }
-    format.end = () => '}';
-    return format;
-}
-
-export { getBatchStreamFormatter as g };

package/dist/batchStreamFormatter-93cdcdd4.js

@@ -1,32 +0,0 @@
-'use strict';
-
-/**
- * Format a batch response as a line-delimited JSON stream
- * that the `unstable_httpBatchStreamLink` can parse:
- *
- * @example
- * ```ts
- * const formatter = getBatchStreamFormatter();
- * res.send(formatter(1, 'response #2'));
- * res.send(formatter(0, 'response #1'));
- * res.send(formatter.end());
- * ```
- *
- * Expected format:
- * ```json
- * {"1":"response #2"
- * ,"0":"response #1"
- * }
- * ```
- */ function getBatchStreamFormatter() {
-    let first = true;
-    function format(index, string) {
-        const prefix = first ? '{' : ',';
-        first = false;
-        return `${prefix}"${index}":${string}\n`;
-    }
-    format.end = ()=>'}';
-    return format;
-}
-
-exports.getBatchStreamFormatter = getBatchStreamFormatter;

package/dist/batchStreamFormatter-fc1ffb26.mjs

@@ -1,30 +0,0 @@
-/**
- * Format a batch response as a line-delimited JSON stream
- * that the `unstable_httpBatchStreamLink` can parse:
- *
- * @example
- * ```ts
- * const formatter = getBatchStreamFormatter();
- * res.send(formatter(1, 'response #2'));
- * res.send(formatter(0, 'response #1'));
- * res.send(formatter.end());
- * ```
- *
- * Expected format:
- * ```json
- * {"1":"response #2"
- * ,"0":"response #1"
- * }
- * ```
- */ function getBatchStreamFormatter() {
-    let first = true;
-    function format(index, string) {
-        const prefix = first ? '{' : ',';
-        first = false;
-        return `${prefix}"${index}":${string}\n`;
-    }
-    format.end = ()=>'}';
-    return format;
-}
-
-export { getBatchStreamFormatter as g };

package/dist/codes-62b059d2.js

@@ -1,48 +0,0 @@
-/**
- * @internal
- */
-function invert(obj) {
-    const newObj = Object.create(null);
-    for (const key in obj) {
-        const v = obj[key];
-        newObj[v] = key;
-    }
-    return newObj;
-}
-
-// reference: https://www.jsonrpc.org/specification
-/**
- * JSON-RPC 2.0 Error codes
- *
- * `-32000` to `-32099` are reserved for implementation-defined server-errors.
- * For tRPC we're copying the last digits of HTTP 4XX errors.
- */
-const TRPC_ERROR_CODES_BY_KEY = {
-    /**
-     * Invalid JSON was received by the server.
-     * An error occurred on the server while parsing the JSON text.
-     */
-    PARSE_ERROR: -32700,
-    /**
-     * The JSON sent is not a valid Request object.
-     */
-    BAD_REQUEST: -32600, // 400
-    // Internal JSON-RPC error
-    INTERNAL_SERVER_ERROR: -32603,
-    NOT_IMPLEMENTED: -32603,
-    // Implementation specific errors
-    UNAUTHORIZED: -32001, // 401
-    FORBIDDEN: -32003, // 403
-    NOT_FOUND: -32004, // 404
-    METHOD_NOT_SUPPORTED: -32005, // 405
-    TIMEOUT: -32008, // 408
-    CONFLICT: -32009, // 409
-    PRECONDITION_FAILED: -32012, // 412
-    PAYLOAD_TOO_LARGE: -32013, // 413
-    UNPROCESSABLE_CONTENT: -32022, // 422
-    TOO_MANY_REQUESTS: -32029, // 429
-    CLIENT_CLOSED_REQUEST: -32099, // 499
-};
-const TRPC_ERROR_CODES_BY_NUMBER = invert(TRPC_ERROR_CODES_BY_KEY);
-
-export { TRPC_ERROR_CODES_BY_KEY as T, TRPC_ERROR_CODES_BY_NUMBER as a, invert as i };

package/dist/codes-87f6824b.js

@@ -1,48 +0,0 @@
-'use strict';
-
-/**
- * @internal
- */ function invert(obj) {
-    const newObj = Object.create(null);
-    for(const key in obj){
-        const v = obj[key];
-        newObj[v] = key;
-    }
-    return newObj;
-}
-
-// reference: https://www.jsonrpc.org/specification
-/**
- * JSON-RPC 2.0 Error codes
- *
- * `-32000` to `-32099` are reserved for implementation-defined server-errors.
- * For tRPC we're copying the last digits of HTTP 4XX errors.
- */ const TRPC_ERROR_CODES_BY_KEY = {
-    /**
-   * Invalid JSON was received by the server.
-   * An error occurred on the server while parsing the JSON text.
-   */ PARSE_ERROR: -32700,
-    /**
-   * The JSON sent is not a valid Request object.
-   */ BAD_REQUEST: -32600,
-    // Internal JSON-RPC error
-    INTERNAL_SERVER_ERROR: -32603,
-    NOT_IMPLEMENTED: -32603,
-    // Implementation specific errors
-    UNAUTHORIZED: -32001,
-    FORBIDDEN: -32003,
-    NOT_FOUND: -32004,
-    METHOD_NOT_SUPPORTED: -32005,
-    TIMEOUT: -32008,
-    CONFLICT: -32009,
-    PRECONDITION_FAILED: -32012,
-    PAYLOAD_TOO_LARGE: -32013,
-    UNPROCESSABLE_CONTENT: -32022,
-    TOO_MANY_REQUESTS: -32029,
-    CLIENT_CLOSED_REQUEST: -32099
-};
-const TRPC_ERROR_CODES_BY_NUMBER = invert(TRPC_ERROR_CODES_BY_KEY);
-
-exports.TRPC_ERROR_CODES_BY_KEY = TRPC_ERROR_CODES_BY_KEY;
-exports.TRPC_ERROR_CODES_BY_NUMBER = TRPC_ERROR_CODES_BY_NUMBER;
-exports.invert = invert;

package/dist/codes-c924c3db.mjs

@@ -1,44 +0,0 @@
-/**
- * @internal
- */ function invert(obj) {
-    const newObj = Object.create(null);
-    for(const key in obj){
-        const v = obj[key];
-        newObj[v] = key;
-    }
-    return newObj;
-}
-
-// reference: https://www.jsonrpc.org/specification
-/**
- * JSON-RPC 2.0 Error codes
- *
- * `-32000` to `-32099` are reserved for implementation-defined server-errors.
- * For tRPC we're copying the last digits of HTTP 4XX errors.
- */ const TRPC_ERROR_CODES_BY_KEY = {
-    /**
-   * Invalid JSON was received by the server.
-   * An error occurred on the server while parsing the JSON text.
-   */ PARSE_ERROR: -32700,
-    /**
-   * The JSON sent is not a valid Request object.
-   */ BAD_REQUEST: -32600,
-    // Internal JSON-RPC error
-    INTERNAL_SERVER_ERROR: -32603,
-    NOT_IMPLEMENTED: -32603,
-    // Implementation specific errors
-    UNAUTHORIZED: -32001,
-    FORBIDDEN: -32003,
-    NOT_FOUND: -32004,
-    METHOD_NOT_SUPPORTED: -32005,
-    TIMEOUT: -32008,
-    CONFLICT: -32009,
-    PRECONDITION_FAILED: -32012,
-    PAYLOAD_TOO_LARGE: -32013,
-    UNPROCESSABLE_CONTENT: -32022,
-    TOO_MANY_REQUESTS: -32029,
-    CLIENT_CLOSED_REQUEST: -32099
-};
-const TRPC_ERROR_CODES_BY_NUMBER = invert(TRPC_ERROR_CODES_BY_KEY);
-
-export { TRPC_ERROR_CODES_BY_KEY as T, TRPC_ERROR_CODES_BY_NUMBER as a, invert as i };

package/dist/config-50853f49.mjs

@@ -1,6 +0,0 @@
-/**
- * The default check to see if we're in a server
- */ const isServerDefault = typeof window === 'undefined' || 'Deno' in window || // eslint-disable-next-line @typescript-eslint/dot-notation
-globalThis.process?.env?.['NODE_ENV'] === 'test' || !!globalThis.process?.env?.['JEST_WORKER_ID'] || !!globalThis.process?.env?.['VITEST_WORKER_ID'];
-
-export { isServerDefault as i };

package/dist/config-774dae36.js

@@ -1,8 +0,0 @@
-'use strict';
-
-/**
- * The default check to see if we're in a server
- */ const isServerDefault = typeof window === 'undefined' || 'Deno' in window || // eslint-disable-next-line @typescript-eslint/dot-notation
-globalThis.process?.env?.['NODE_ENV'] === 'test' || !!globalThis.process?.env?.['JEST_WORKER_ID'] || !!globalThis.process?.env?.['VITEST_WORKER_ID'];
-
-exports.isServerDefault = isServerDefault;

package/dist/config-e3dd843b.js

@@ -1,11 +0,0 @@
-/**
- * The default check to see if we're in a server
- */
-const isServerDefault = typeof window === 'undefined' ||
-    'Deno' in window ||
-    // eslint-disable-next-line @typescript-eslint/dot-notation
-    globalThis.process?.env?.['NODE_ENV'] === 'test' ||
-    !!globalThis.process?.env?.['JEST_WORKER_ID'] ||
-    !!globalThis.process?.env?.['VITEST_WORKER_ID'];
-
-export { isServerDefault as i };

package/dist/contentType-0447b256.js

@@ -1,58 +0,0 @@
-import { T as TRPCError } from './TRPCError-2bb6a7d0.js';
-
-function getRawProcedureInputOrThrow(opts) {
-    const { req } = opts;
-    try {
-        if (req.method === 'GET') {
-            if (!req.query.has('input')) {
-                return undefined;
-            }
-            const raw = req.query.get('input');
-            return JSON.parse(raw);
-        }
-        if (!opts.preprocessedBody && typeof req.body === 'string') {
-            // A mutation with no inputs will have req.body === ''
-            return req.body.length === 0 ? undefined : JSON.parse(req.body);
-        }
-        return req.body;
-    }
-    catch (cause) {
-        throw new TRPCError({
-            code: 'PARSE_ERROR',
-            cause,
-        });
-    }
-}
-const deserializeInputValue = (rawValue, transformer) => {
-    return typeof rawValue !== 'undefined'
-        ? transformer.input.deserialize(rawValue)
-        : rawValue;
-};
-const getJsonContentTypeInputs = (opts) => {
-    const rawInput = getRawProcedureInputOrThrow(opts);
-    const transformer = opts.router._def._config.transformer;
-    if (!opts.isBatchCall) {
-        return {
-            0: deserializeInputValue(rawInput, transformer),
-        };
-    }
-    /* istanbul ignore if  */
-    if (rawInput == null ||
-        typeof rawInput !== 'object' ||
-        Array.isArray(rawInput)) {
-        throw new TRPCError({
-            code: 'BAD_REQUEST',
-            message: '"input" needs to be an object when doing a batch call',
-        });
-    }
-    const input = {};
-    for (const key in rawInput) {
-        const k = key;
-        const rawValue = rawInput[k];
-        const value = deserializeInputValue(rawValue, transformer);
-        input[k] = value;
-    }
-    return input;
-};
-
-export { getJsonContentTypeInputs as g };