trpc-to-openapi - npm Package Compare versions

Comparing version 1.0.1 to 2.0.0-rc.0

dist/cjs/adapters/fastify.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.fastifyTRPCOpenApiPlugin = void 0;
+exports.fastifyTRPCOpenApiPlugin = fastifyTRPCOpenApiPlugin;
 const core_1 = require("./node-http/core");
@@ -15,4 +15,7 @@ function fastifyTRPCOpenApiPlugin(fastify, opts, done) {
         const prefixRemovedFromUrl = request.url.replace(fastify.prefix, '').replace(prefix, '');
-        request.raw.url = prefixRemovedFromUrl;
-        return await openApiHttpHandler(request, Object.assign(reply, {
+        const rawRequest = Object.assign(request.raw, {
+            body: request.body,
+            url: prefixRemovedFromUrl,
+        });
+        return await openApiHttpHandler(rawRequest, Object.assign(reply, {
             setHeader: (key, value) => {
@@ -25,3 +28,3 @@ if (Array.isArray(value)) {
             },
-            end: (body) => reply.send(body), // eslint-disable-line @typescript-eslint/no-explicit-any
+            end: (body) => reply.send(body),
         }));
@@ -31,3 +34,2 @@ });
 }
-exports.fastifyTRPCOpenApiPlugin = fastifyTRPCOpenApiPlugin;
 //# sourceMappingURL=fastify.js.map

dist/cjs/adapters/fetch.js

@@ -5,2 +5,4 @@ "use strict";
 const server_1 = require("@trpc/server");
+const unstable_core_do_not_import_1 = require("@trpc/server/unstable-core-do-not-import");
+const path_1 = require("../utils/path");
 const core_1 = require("./node-http/core");
@@ -51,9 +53,2 @@ const getUrlEncodedBody = async (req) => {
             }
-            if (prop === 'headers') {
-                return new Proxy(target.headers, {
-                    get: (target, prop) => {
-                        return target.get(prop.toString());
-                    },
-                });
-            }
             if (prop === 'body') {
@@ -78,4 +73,15 @@ if (!body.isValid) {
     const createContext = () => {
+        var _a;
         if (opts.createContext) {
-            return opts.createContext({ req: opts.req, resHeaders });
+            return ((_a = opts.createContext({
+                req: opts.req,
+                resHeaders,
+                info: (0, unstable_core_do_not_import_1.getRequestInfo)({
+                    req: req,
+                    path: decodeURIComponent((0, path_1.normalizePath)(url.pathname)),
+                    router: opts.router,
+                    searchParams: url.searchParams,
+                    headers: req.headers,
+                }),
+            })) !== null && _a !== void 0 ? _a : {});
         }
@@ -87,5 +93,7 @@ return () => ({});
         createContext,
+        // @ts-expect-error FIXME
         onError: opts.onError,
+        // @ts-expect-error FIXME
         responseMeta: opts.responseMeta,
-    });
+    }); // as CreateOpenApiNodeHttpHandlerOptions<TRouter, any, any>);
     return new Promise((resolve) => {
@@ -92,0 +100,0 @@ let statusCode;

dist/cjs/adapters/index.d.ts

@@ -1,2 +0,1 @@
-export * from './aws-lambda';
 export * from './standalone';
@@ -3,0 +2,0 @@ export * from './express';

dist/cjs/adapters/index.js

@@ -17,3 +17,2 @@ "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./aws-lambda"), exports);
 __exportStar(require("./standalone"), exports);
@@ -20,0 +19,0 @@ __exportStar(require("./express"), exports);

dist/cjs/adapters/next.d.ts

 import { NextApiRequest, NextApiResponse } from 'next';
 import { OpenApiRouter } from '../types';
 import { CreateOpenApiNodeHttpHandlerOptions } from './node-http/core';
-export type CreateOpenApiNextHandlerOptions<TRouter extends OpenApiRouter> = Omit<CreateOpenApiNodeHttpHandlerOptions<TRouter, NextApiRequest, NextApiResponse>, 'maxBodySize'>;
+export type CreateOpenApiNextHandlerOptions<TRouter extends OpenApiRouter> = CreateOpenApiNodeHttpHandlerOptions<TRouter, NextApiRequest, NextApiResponse>;
 export declare const createOpenApiNextHandler: <TRouter extends OpenApiRouter>(opts: CreateOpenApiNextHandlerOptions<TRouter>) => (req: NextApiRequest, res: NextApiResponse) => Promise<void>;
 //# sourceMappingURL=next.d.ts.map

dist/cjs/adapters/next.js

@@ -5,2 +5,3 @@ "use strict";
 const server_1 = require("@trpc/server");
+const node_http_1 = require("@trpc/server/adapters/node-http");
 const path_1 = require("../utils/path");
@@ -11,3 +12,3 @@ const core_1 = require("./node-http/core");
     return async (req, res) => {
-        var _a;
+        var _a, _b;
         let pathname = null;
@@ -42,2 +43,7 @@ if (typeof req.query.trpc === 'string') {
         }
+        (0, node_http_1.incomingMessageToRequest)(Object.assign(req, {
+            once: () => undefined,
+        }), {
+            maxBodySize: (_b = opts.maxBodySize) !== null && _b !== void 0 ? _b : null,
+        });
         req.url = (0, path_1.normalizePath)(pathname);
@@ -44,0 +50,0 @@ await openApiHttpHandler(req, res);

dist/cjs/adapters/node-http/core.d.ts

@@ -1,2 +0,2 @@
-import { NodeHTTPHandlerOptions, NodeHTTPRequest, NodeHTTPResponse } from '@trpc/server/dist/adapters/node-http';
+import { type NodeHTTPHandlerOptions, type NodeHTTPRequest, type NodeHTTPResponse } from '@trpc/server/adapters/node-http';
 import { OpenApiRouter } from '../../types';
@@ -3,0 +3,0 @@ export type CreateOpenApiNodeHttpHandlerOptions<TRouter extends OpenApiRouter, TRequest extends NodeHTTPRequest, TResponse extends NodeHTTPResponse> = Pick<NodeHTTPHandlerOptions<TRouter, TRequest, TResponse>, 'router' | 'createContext' | 'responseMeta' | 'onError' | 'maxBodySize'>;

dist/cjs/adapters/node-http/core.js

@@ -8,2 +8,4 @@ "use strict";
 const server_1 = require("@trpc/server");
+const node_http_1 = require("@trpc/server/adapters/node-http");
+const unstable_core_do_not_import_1 = require("@trpc/server/unstable-core-do-not-import");
 const lodash_clonedeep_1 = __importDefault(require("lodash.clonedeep"));
@@ -42,6 +44,7 @@ const generator_1 = require("../../generator");
         const path = (0, path_1.normalizePath)(url.pathname);
-        const { procedure, pathInput } = (_a = getProcedure(method, path)) !== null && _a !== void 0 ? _a : {};
         let input = undefined;
         let ctx = undefined;
         let data = undefined;
+        let info = undefined;
+        const { procedure, pathInput } = (_a = getProcedure(method, path)) !== null && _a !== void 0 ? _a : {};
         try {
@@ -62,2 +65,13 @@ if (!procedure) {
             }
+            info = (0, unstable_core_do_not_import_1.getRequestInfo)({
+                req: req instanceof Request
+                    ? req
+                    : (0, node_http_1.incomingMessageToRequest)(req, {
+                        maxBodySize: maxBodySize !== null && maxBodySize !== void 0 ? maxBodySize : null,
+                    }),
+                path: decodeURIComponent(path),
+                router,
+                searchParams: url.searchParams,
+                headers: req.headers,
+            });
             const useBody = (0, method_1.acceptsRequestBody)(method);
@@ -71,5 +85,6 @@ const inputParser = (0, procedure_1.getInputOutputParsers)(procedure.procedure).inputParser;
             // if supported, coerce all string values to correct types
-            if (zod_1.zodSupportsCoerce && (0, zod_1.instanceofZodTypeObject)(unwrappedSchema))
+            if (zod_1.zodSupportsCoerce && (0, zod_1.instanceofZodTypeObject)(unwrappedSchema)) {
                 (0, zod_1.coerceSchema)(unwrappedSchema);
-            ctx = await (createContext === null || createContext === void 0 ? void 0 : createContext({ req, res }));
+            }
+            ctx = await (createContext === null || createContext === void 0 ? void 0 : createContext({ req, res, info }));
             const caller = router.createCaller(ctx);
@@ -85,2 +100,4 @@ const segments = procedure.path.split('.');
                 errors: [],
+                info,
+                eagerGeneration: true,
             });
@@ -108,4 +125,7 @@ const statusCode = (_b = meta === null || meta === void 0 ? void 0 : meta.status) !== null && _b !== void 0 ? _b : 200;
                 errors: [error],
+                info,
+                eagerGeneration: true,
             });
-            const errorShape = router.getErrorShape({
+            const errorShape = (0, unstable_core_do_not_import_1.getErrorShape)({
+                config: router._def._config,
                 error,
@@ -112,0 +132,0 @@ type: (_f = procedure === null || procedure === void 0 ? void 0 : procedure.type) !== null && _f !== void 0 ? _f : 'unknown',

dist/cjs/adapters/node-http/errors.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getErrorFromUnknown = exports.TRPC_ERROR_CODE_MESSAGE = exports.HTTP_STATUS_TRPC_ERROR_CODE = exports.TRPC_ERROR_CODE_HTTP_STATUS = void 0;
+exports.TRPC_ERROR_CODE_MESSAGE = exports.HTTP_STATUS_TRPC_ERROR_CODE = exports.TRPC_ERROR_CODE_HTTP_STATUS = void 0;
+exports.getErrorFromUnknown = getErrorFromUnknown;
 const server_1 = require("@trpc/server");
@@ -18,5 +19,9 @@ exports.TRPC_ERROR_CODE_HTTP_STATUS = {
     METHOD_NOT_SUPPORTED: 405,
+    UNSUPPORTED_MEDIA_TYPE: 415,
     TOO_MANY_REQUESTS: 429,
     UNPROCESSABLE_CONTENT: 422,
     NOT_IMPLEMENTED: 501,
+    BAD_GATEWAY: 502,
+    SERVICE_UNAVAILABLE: 503,
+    GATEWAY_TIMEOUT: 504,
 };
@@ -35,5 +40,9 @@ exports.HTTP_STATUS_TRPC_ERROR_CODE = {
     405: 'METHOD_NOT_SUPPORTED',
+    415: 'UNSUPPORTED_MEDIA_TYPE',
     429: 'TOO_MANY_REQUESTS',
     422: 'UNPROCESSABLE_CONTENT',
     501: 'NOT_IMPLEMENTED',
+    502: 'BAD_GATEWAY',
+    503: 'SERVICE_UNAVAILABLE',
+    504: 'GATEWAY_TIMEOUT',
 };
@@ -56,2 +65,6 @@ exports.TRPC_ERROR_CODE_MESSAGE = {
     NOT_IMPLEMENTED: 'Not implemented',
+    BAD_GATEWAY: 'Bad gateway',
+    SERVICE_UNAVAILABLE: 'Service unavailable',
+    GATEWAY_TIMEOUT: 'Gateway timeout',
+    UNSUPPORTED_MEDIA_TYPE: 'Unsupported media type',
 };
@@ -78,3 +91,2 @@ function getErrorFromUnknown(cause) {
 }
-exports.getErrorFromUnknown = getErrorFromUnknown;
 //# sourceMappingURL=errors.js.map

dist/cjs/adapters/node-http/input.js

@@ -21,5 +21,6 @@ "use strict";
     }
+    const reqQuery = req.query;
     // normalize first value in array
-    Object.keys(req.query).forEach((key) => {
-        const value = req.query[key];
+    Object.keys(reqQuery).forEach((key) => {
+        const value = reqQuery[key];
         if (value) {
@@ -42,2 +43,5 @@ if (typeof value === 'string') {
     if ('body' in req) {
+        if (req.body instanceof ReadableStream) {
+            return new Response(req.body).json();
+        }
         return req.body;
@@ -44,0 +48,0 @@ }

dist/cjs/adapters/node-http/procedures.d.ts

 import { OpenApiMethod, OpenApiProcedure, OpenApiRouter } from '../../types';
-export declare const createProcedureCache: (router: OpenApiRouter) => (method: OpenApiMethod, path: string) => {
+export declare const createProcedureCache: (router: OpenApiRouter) => (method: OpenApiMethod | "HEAD", path: string) => {
     procedure: {
-        type: 'query' | 'mutation';
+        type: "query" | "mutation";
         path: string;
         procedure: OpenApiProcedure;
-    };
+    } | undefined;
     pathInput: {
@@ -9,0 +9,0 @@ [key: string]: string;

dist/cjs/adapters/node-http/procedures.js

@@ -8,4 +8,7 @@ "use strict";
     const procedureCache = new Map();
-    const { queries, mutations } = router._def;
-    (0, procedure_1.forEachOpenApiProcedure)(queries, ({ path: queryPath, procedure, openapi }) => {
+    (0, procedure_1.forEachOpenApiProcedure)(router._def.procedures, ({ path: queryPath, procedure, openapi }) => {
+        var _a;
+        if (procedure._def.type === 'subscription') {
+            return;
+        }
         const { method } = openapi;
@@ -17,4 +20,4 @@ if (!procedureCache.has(method)) {
         const pathRegExp = (0, path_1.getPathRegExp)(path);
-        procedureCache.get(method).set(pathRegExp, {
-            type: 'query',
+        (_a = procedureCache.get(method)) === null || _a === void 0 ? void 0 : _a.set(pathRegExp, {
+            type: procedure._def.type,
             path: queryPath,
@@ -24,15 +27,2 @@ procedure,
     });
-    (0, procedure_1.forEachOpenApiProcedure)(mutations, ({ path: mutationPath, procedure, openapi }) => {
-        const { method } = openapi;
-        if (!procedureCache.has(method)) {
-            procedureCache.set(method, new Map());
-        }
-        const path = (0, path_1.normalizePath)(openapi.path);
-        const pathRegExp = (0, path_1.getPathRegExp)(path);
-        procedureCache.get(method).set(pathRegExp, {
-            type: 'mutation',
-            path: mutationPath,
-            procedure,
-        });
-    });
     return (method, path) => {
@@ -39,0 +29,0 @@ var _a, _b;

dist/cjs/adapters/nuxt.d.ts

@@ -1,2 +0,1 @@
-/// <reference types="node" />
 import type { NodeIncomingMessage, NodeServerResponse } from 'h3';
@@ -3,0 +2,0 @@ import { OpenApiRouter } from '../types';

dist/cjs/adapters/standalone.d.ts

@@ -1,2 +0,1 @@
-/// <reference types="node" />
 import { IncomingMessage, ServerResponse } from 'http';
@@ -3,0 +2,0 @@ import { OpenApiRouter } from '../types';

dist/cjs/adapters/standalone.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createOpenApiHttpHandler = void 0;
+const node_http_1 = require("@trpc/server/adapters/node-http");
 const core_1 = require("./node-http/core");
@@ -8,3 +9,6 @@ const createOpenApiHttpHandler = (opts) => {
     return async (req, res) => {
-        await openApiHttpHandler(req, res);
+        var _a;
+        await openApiHttpHandler((0, node_http_1.incomingMessageToRequest)(req, {
+            maxBodySize: (_a = opts.maxBodySize) !== null && _a !== void 0 ? _a : null,
+        }), res);
     };
@@ -11,0 +15,0 @@ };

dist/cjs/generator/paths.js

@@ -103,4 +103,5 @@ "use strict";
         catch (error) {
-            // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
-            error.message = `[${procedureName}] - ${error.message}`;
+            if (error instanceof server_1.TRPCError) {
+                error.message = `[${procedureName}] - ${error.message}`;
+            }
             throw error;
@@ -107,0 +108,0 @@ }

dist/cjs/generator/schema.d.ts

@@ -5,3 +5,3 @@ import { AnyZodObject, ZodTypeAny, z } from 'zod';
 import { HttpMethods } from './paths';
-export declare const getParameterObjects: (schema: z.ZodObject<z.ZodRawShape>, required: boolean, pathParameters: string[], headersSchema: AnyZodObject | undefined, inType: 'all' | 'path' | 'query') => ZodOpenApiParameters | undefined;
+export declare const getParameterObjects: (schema: z.ZodObject<z.ZodRawShape>, required: boolean, pathParameters: string[], headersSchema: AnyZodObject | undefined, inType: "all" | "path" | "query") => ZodOpenApiParameters | undefined;
 export declare const getRequestBodyObject: (schema: z.ZodObject<z.ZodRawShape>, required: boolean, pathParameters: string[], contentTypes: OpenApiContentType[]) => ZodOpenApiRequestBodyObject | undefined;
@@ -11,3 +11,3 @@ export declare const hasInputs: (schema: unknown) => boolean;
     message: string;
-}[] | undefined) => ZodOpenApiResponseObject;
+}[]) => ZodOpenApiResponseObject;
 export declare const errorResponseFromStatusCode: (status: number) => ZodOpenApiResponseObject;
@@ -17,3 +17,3 @@ export declare const errorResponseFromMessage: (status: number, message: string) => ZodOpenApiResponseObject;
     [key: number]: string;
-} | undefined) => ZodOpenApiResponsesObject;
+}) => ZodOpenApiResponsesObject;
 //# sourceMappingURL=schema.d.ts.map

dist/cjs/index.d.ts

 import { OpenApiBuilder } from 'openapi3-ts/oas31';
-import { CreateOpenApiAwsLambdaHandlerOptions, CreateOpenApiExpressMiddlewareOptions, CreateOpenApiFastifyPluginOptions, CreateOpenApiFetchHandlerOptions, CreateOpenApiHttpHandlerOptions, CreateOpenApiNextHandlerOptions, CreateOpenApiNuxtHandlerOptions, createOpenApiAwsLambdaHandler, createOpenApiExpressMiddleware, createOpenApiFetchHandler, createOpenApiHttpHandler, createOpenApiNextHandler, createOpenApiNuxtHandler, fastifyTRPCOpenApiPlugin } from './adapters';
+import { CreateOpenApiExpressMiddlewareOptions, CreateOpenApiFastifyPluginOptions, CreateOpenApiFetchHandlerOptions, CreateOpenApiHttpHandlerOptions, CreateOpenApiNextHandlerOptions, CreateOpenApiNuxtHandlerOptions, createOpenApiExpressMiddleware, createOpenApiFetchHandler, createOpenApiHttpHandler, createOpenApiNextHandler, createOpenApiNuxtHandler, fastifyTRPCOpenApiPlugin } from './adapters';
 import { GenerateOpenApiDocumentOptions, generateOpenApiDocument } from './generator';
@@ -7,3 +7,3 @@ import { errorResponseFromMessage, errorResponseFromStatusCode, errorResponseObject } from './generator/schema';
 import { ZodTypeLikeString, ZodTypeLikeVoid } from './utils/zod';
-export { CreateOpenApiAwsLambdaHandlerOptions, CreateOpenApiExpressMiddlewareOptions, CreateOpenApiHttpHandlerOptions, CreateOpenApiNextHandlerOptions, CreateOpenApiFastifyPluginOptions, CreateOpenApiFetchHandlerOptions, CreateOpenApiNuxtHandlerOptions, createOpenApiExpressMiddleware, createOpenApiFetchHandler, createOpenApiHttpHandler, createOpenApiNextHandler, createOpenApiNuxtHandler, createOpenApiAwsLambdaHandler, fastifyTRPCOpenApiPlugin, generateOpenApiDocument, errorResponseObject, errorResponseFromStatusCode, errorResponseFromMessage, GenerateOpenApiDocumentOptions, OpenApiBuilder, OpenApiRouter, OpenApiMeta, OpenApiMethod, OpenApiResponse, OpenApiSuccessResponse, OpenApiErrorResponse, ZodTypeLikeString, ZodTypeLikeVoid, };
+export { CreateOpenApiExpressMiddlewareOptions, CreateOpenApiHttpHandlerOptions, CreateOpenApiNextHandlerOptions, CreateOpenApiFastifyPluginOptions, CreateOpenApiFetchHandlerOptions, CreateOpenApiNuxtHandlerOptions, createOpenApiExpressMiddleware, createOpenApiFetchHandler, createOpenApiHttpHandler, createOpenApiNextHandler, createOpenApiNuxtHandler, fastifyTRPCOpenApiPlugin, generateOpenApiDocument, errorResponseObject, errorResponseFromStatusCode, errorResponseFromMessage, GenerateOpenApiDocumentOptions, OpenApiBuilder, OpenApiRouter, OpenApiMeta, OpenApiMethod, OpenApiResponse, OpenApiSuccessResponse, OpenApiErrorResponse, ZodTypeLikeString, ZodTypeLikeVoid, };
 //# sourceMappingURL=index.d.ts.map

dist/cjs/index.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.OpenApiBuilder = exports.errorResponseFromMessage = exports.errorResponseFromStatusCode = exports.errorResponseObject = exports.generateOpenApiDocument = exports.fastifyTRPCOpenApiPlugin = exports.createOpenApiAwsLambdaHandler = exports.createOpenApiNuxtHandler = exports.createOpenApiNextHandler = exports.createOpenApiHttpHandler = exports.createOpenApiFetchHandler = exports.createOpenApiExpressMiddleware = void 0;
+exports.OpenApiBuilder = exports.errorResponseFromMessage = exports.errorResponseFromStatusCode = exports.errorResponseObject = exports.generateOpenApiDocument = exports.fastifyTRPCOpenApiPlugin = exports.createOpenApiNuxtHandler = exports.createOpenApiNextHandler = exports.createOpenApiHttpHandler = exports.createOpenApiFetchHandler = exports.createOpenApiExpressMiddleware = void 0;
 const oas31_1 = require("openapi3-ts/oas31");
 Object.defineProperty(exports, "OpenApiBuilder", { enumerable: true, get: function () { return oas31_1.OpenApiBuilder; } });
 const adapters_1 = require("./adapters");
-Object.defineProperty(exports, "createOpenApiAwsLambdaHandler", { enumerable: true, get: function () { return adapters_1.createOpenApiAwsLambdaHandler; } });
 Object.defineProperty(exports, "createOpenApiExpressMiddleware", { enumerable: true, get: function () { return adapters_1.createOpenApiExpressMiddleware; } });
@@ -9,0 +8,0 @@ Object.defineProperty(exports, "createOpenApiFetchHandler", { enumerable: true, get: function () { return adapters_1.createOpenApiFetchHandler; } });

dist/cjs/types.d.ts

@@ -1,7 +0,5 @@
-import { Procedure, ProcedureParams, Router } from '@trpc/server';
-import type { RootConfig } from '@trpc/server/dist/core/internals/config';
-import type { RouterDef } from '@trpc/server/dist/core/router';
 import { TRPC_ERROR_CODE_KEY } from '@trpc/server/dist/rpc';
-import { AnyZodObject, ZodIssue } from 'zod';
-export { type OpenAPIObject, type SecuritySchemeObject } from 'openapi3-ts/oas31';
+import type { CreateRootTypes, Procedure, ProcedureType, Router } from '@trpc/server/unstable-core-do-not-import';
+import type { AnyZodObject, ZodIssue } from 'zod';
+export { type OpenAPIObject, type SecuritySchemeObject } from 'openapi3-ts/dist/oas31';
 export type OpenApiMethod = 'GET' | 'POST' | 'PATCH' | 'PUT' | 'DELETE';
@@ -29,15 +27,15 @@ type TRPCMeta = Record<string, unknown>;
 };
-export type OpenApiProcedure<TMeta = TRPCMeta> = Procedure<'query' | 'mutation', ProcedureParams<RootConfig<{
-    transformer: any;
+export type OpenApiProcedure = Procedure<ProcedureType, {
+    input: any;
+    output: any;
+}>;
+export interface OpenApiProcedureRecord {
+    [key: string]: OpenApiProcedure | OpenApiProcedureRecord;
+}
+export type OpenApiRouter = Router<CreateRootTypes<{
+    ctx: any;
+    meta: TRPCMeta;
     errorShape: any;
-    ctx: any;
-    meta: OpenApiMeta<TMeta>;
-}>, any, any, any, any, any, OpenApiMeta<TMeta>>>;
-export type OpenApiProcedureRecord<TMeta = TRPCMeta> = Record<string, OpenApiProcedure<TMeta>>;
-export type OpenApiRouter<TMeta = TRPCMeta> = Router<RouterDef<RootConfig<{
     transformer: any;
-    errorShape: any;
-    ctx: any;
-    meta: OpenApiMeta<TMeta>;
-}>, any, any>>;
+}>, OpenApiProcedureRecord>;
 export type OpenApiSuccessResponse<D = any> = D;
@@ -44,0 +42,0 @@ export type OpenApiErrorResponse = {

dist/cjs/utils/method.d.ts

 import { OpenApiMethod } from '../types';
-export declare const acceptsRequestBody: (method: OpenApiMethod) => boolean;
+export declare const acceptsRequestBody: (method: OpenApiMethod | "HEAD") => boolean;
 //# sourceMappingURL=method.d.ts.map

dist/cjs/utils/procedure.d.ts

@@ -1,15 +0,14 @@
-import { ProcedureType } from '@trpc/server';
-import { Parser } from '@trpc/server/dist/core/parser';
+import { TRPCProcedureType } from '@trpc/server';
 import { AnyZodObject } from 'zod';
 import { OpenApiMeta, OpenApiProcedure, OpenApiProcedureRecord } from '../types';
 export declare const getInputOutputParsers: (procedure: OpenApiProcedure) => {
-    inputParser: AnyZodObject | Parser | undefined;
-    outputParser: Parser | undefined;
+    inputParser: AnyZodObject | undefined;
+    outputParser: AnyZodObject | undefined;
 };
 export declare const forEachOpenApiProcedure: (procedureRecord: OpenApiProcedureRecord, callback: (values: {
     path: string;
-    type: ProcedureType;
+    type: TRPCProcedureType;
     procedure: OpenApiProcedure;
-    openapi: NonNullable<OpenApiMeta['openapi']>;
+    openapi: NonNullable<OpenApiMeta["openapi"]>;
 }) => void) => void;
 //# sourceMappingURL=procedure.d.ts.map

dist/cjs/utils/procedure.js

@@ -12,3 +12,6 @@ "use strict";
 const getInputOutputParsers = (procedure) => {
-    const { inputs, output } = procedure._def;
+    // @ts-expect-error The types seems to be incorrect
+    const inputs = procedure._def.inputs;
+    // @ts-expect-error The types seems to be incorrect
+    const output = procedure._def.output;
     return {
@@ -21,17 +24,15 @@ inputParser: inputs.length >= 2 ? mergeInputs(inputs) : inputs[0],
 const getProcedureType = (procedure) => {
-    if (procedure._def.query)
-        return 'query';
-    if (procedure._def.mutation)
-        return 'mutation';
-    if (procedure._def.subscription)
-        return 'subscription';
-    throw new Error('Unknown procedure type');
+    if (!procedure._def.type) {
+        throw new Error('Unknown procedure type');
+    }
+    return procedure._def.type;
 };
 const forEachOpenApiProcedure = (procedureRecord, callback) => {
-    var _a;
     for (const [path, procedure] of Object.entries(procedureRecord)) {
-        const { openapi } = (_a = procedure._def.meta) !== null && _a !== void 0 ? _a : {};
+        // @ts-expect-error FIXME
+        const meta = procedure._def.meta;
+        const { openapi } = meta;
         if (openapi && openapi.enabled !== false) {
             const type = getProcedureType(procedure);
-            callback({ path, type, procedure, openapi });
+            callback({ path, type, procedure: procedure, openapi });
         }
@@ -38,0 +39,0 @@ }

dist/cjs/utils/zod.d.ts

@@ -1,10 +0,6 @@
-import { ZodObject, ZodRawShape, ZodTypeAny, z } from 'zod';
-export declare const instanceofZodType: (type: any) => type is ZodTypeAny;
+import { ZodObject, ZodRawShape, z } from 'zod';
+export declare const instanceofZodType: (type: any) => type is z.ZodTypeAny;
 export declare const instanceofZodTypeKind: <Z extends z.ZodFirstPartyTypeKind>(type: z.ZodTypeAny, zodTypeKind: Z) => type is InstanceType<(typeof z)[Z]>;
-export declare const instanceofZodTypeOptional: (type: z.ZodTypeAny) => type is z.ZodOptional<ZodTypeAny>;
-export declare const instanceofZodTypeObject: (type: z.ZodTypeAny) => type is ZodObject<ZodRawShape, z.UnknownKeysParam, ZodTypeAny, {
-    [x: string]: any;
-}, {
-    [x: string]: any;
-}>;
+export declare const instanceofZodTypeOptional: (type: z.ZodTypeAny) => type is z.ZodOptional<z.ZodTypeAny>;
+export declare const instanceofZodTypeObject: (type: z.ZodTypeAny) => type is z.ZodObject<z.ZodRawShape>;
 export type ZodTypeLikeVoid = z.ZodVoid | z.ZodUndefined | z.ZodNever;
@@ -11,0 +7,0 @@ export declare const instanceofZodTypeLikeVoid: (type: z.ZodTypeAny) => type is ZodTypeLikeVoid;

dist/esm/adapters/index.d.ts

@@ -1,2 +0,1 @@
-export * from './aws-lambda';
 export * from './standalone';
@@ -3,0 +2,0 @@ export * from './express';

dist/esm/adapters/next.d.ts

 import { NextApiRequest, NextApiResponse } from 'next';
 import { OpenApiRouter } from '../types';
 import { CreateOpenApiNodeHttpHandlerOptions } from './node-http/core';
-export type CreateOpenApiNextHandlerOptions<TRouter extends OpenApiRouter> = Omit<CreateOpenApiNodeHttpHandlerOptions<TRouter, NextApiRequest, NextApiResponse>, 'maxBodySize'>;
+export type CreateOpenApiNextHandlerOptions<TRouter extends OpenApiRouter> = CreateOpenApiNodeHttpHandlerOptions<TRouter, NextApiRequest, NextApiResponse>;
 export declare const createOpenApiNextHandler: <TRouter extends OpenApiRouter>(opts: CreateOpenApiNextHandlerOptions<TRouter>) => (req: NextApiRequest, res: NextApiResponse) => Promise<void>;
 //# sourceMappingURL=next.d.ts.map

dist/esm/adapters/node-http/core.d.ts

@@ -1,2 +0,2 @@
-import { NodeHTTPHandlerOptions, NodeHTTPRequest, NodeHTTPResponse } from '@trpc/server/dist/adapters/node-http';
+import { type NodeHTTPHandlerOptions, type NodeHTTPRequest, type NodeHTTPResponse } from '@trpc/server/adapters/node-http';
 import { OpenApiRouter } from '../../types';
@@ -3,0 +3,0 @@ export type CreateOpenApiNodeHttpHandlerOptions<TRouter extends OpenApiRouter, TRequest extends NodeHTTPRequest, TResponse extends NodeHTTPResponse> = Pick<NodeHTTPHandlerOptions<TRouter, TRequest, TResponse>, 'router' | 'createContext' | 'responseMeta' | 'onError' | 'maxBodySize'>;

dist/esm/adapters/node-http/procedures.d.ts

 import { OpenApiMethod, OpenApiProcedure, OpenApiRouter } from '../../types';
-export declare const createProcedureCache: (router: OpenApiRouter) => (method: OpenApiMethod, path: string) => {
+export declare const createProcedureCache: (router: OpenApiRouter) => (method: OpenApiMethod | "HEAD", path: string) => {
     procedure: {
-        type: 'query' | 'mutation';
+        type: "query" | "mutation";
         path: string;
         procedure: OpenApiProcedure;
-    };
+    } | undefined;
     pathInput: {
@@ -9,0 +9,0 @@ [key: string]: string;

dist/esm/adapters/nuxt.d.ts

@@ -1,2 +0,1 @@
-/// <reference types="node" />
 import type { NodeIncomingMessage, NodeServerResponse } from 'h3';
@@ -3,0 +2,0 @@ import { OpenApiRouter } from '../types';

dist/esm/adapters/standalone.d.ts

@@ -1,2 +0,1 @@
-/// <reference types="node" />
 import { IncomingMessage, ServerResponse } from 'http';
@@ -3,0 +2,0 @@ import { OpenApiRouter } from '../types';

dist/esm/generator/schema.d.ts

@@ -5,3 +5,3 @@ import { AnyZodObject, ZodTypeAny, z } from 'zod';
 import { HttpMethods } from './paths';
-export declare const getParameterObjects: (schema: z.ZodObject<z.ZodRawShape>, required: boolean, pathParameters: string[], headersSchema: AnyZodObject | undefined, inType: 'all' | 'path' | 'query') => ZodOpenApiParameters | undefined;
+export declare const getParameterObjects: (schema: z.ZodObject<z.ZodRawShape>, required: boolean, pathParameters: string[], headersSchema: AnyZodObject | undefined, inType: "all" | "path" | "query") => ZodOpenApiParameters | undefined;
 export declare const getRequestBodyObject: (schema: z.ZodObject<z.ZodRawShape>, required: boolean, pathParameters: string[], contentTypes: OpenApiContentType[]) => ZodOpenApiRequestBodyObject | undefined;
@@ -11,3 +11,3 @@ export declare const hasInputs: (schema: unknown) => boolean;
     message: string;
-}[] | undefined) => ZodOpenApiResponseObject;
+}[]) => ZodOpenApiResponseObject;
 export declare const errorResponseFromStatusCode: (status: number) => ZodOpenApiResponseObject;
@@ -17,3 +17,3 @@ export declare const errorResponseFromMessage: (status: number, message: string) => ZodOpenApiResponseObject;
     [key: number]: string;
-} | undefined) => ZodOpenApiResponsesObject;
+}) => ZodOpenApiResponsesObject;
 //# sourceMappingURL=schema.d.ts.map

dist/esm/index.d.ts

 import { OpenApiBuilder } from 'openapi3-ts/oas31';
-import { CreateOpenApiAwsLambdaHandlerOptions, CreateOpenApiExpressMiddlewareOptions, CreateOpenApiFastifyPluginOptions, CreateOpenApiFetchHandlerOptions, CreateOpenApiHttpHandlerOptions, CreateOpenApiNextHandlerOptions, CreateOpenApiNuxtHandlerOptions, createOpenApiAwsLambdaHandler, createOpenApiExpressMiddleware, createOpenApiFetchHandler, createOpenApiHttpHandler, createOpenApiNextHandler, createOpenApiNuxtHandler, fastifyTRPCOpenApiPlugin } from './adapters';
+import { CreateOpenApiExpressMiddlewareOptions, CreateOpenApiFastifyPluginOptions, CreateOpenApiFetchHandlerOptions, CreateOpenApiHttpHandlerOptions, CreateOpenApiNextHandlerOptions, CreateOpenApiNuxtHandlerOptions, createOpenApiExpressMiddleware, createOpenApiFetchHandler, createOpenApiHttpHandler, createOpenApiNextHandler, createOpenApiNuxtHandler, fastifyTRPCOpenApiPlugin } from './adapters';
 import { GenerateOpenApiDocumentOptions, generateOpenApiDocument } from './generator';
@@ -7,3 +7,3 @@ import { errorResponseFromMessage, errorResponseFromStatusCode, errorResponseObject } from './generator/schema';
 import { ZodTypeLikeString, ZodTypeLikeVoid } from './utils/zod';
-export { CreateOpenApiAwsLambdaHandlerOptions, CreateOpenApiExpressMiddlewareOptions, CreateOpenApiHttpHandlerOptions, CreateOpenApiNextHandlerOptions, CreateOpenApiFastifyPluginOptions, CreateOpenApiFetchHandlerOptions, CreateOpenApiNuxtHandlerOptions, createOpenApiExpressMiddleware, createOpenApiFetchHandler, createOpenApiHttpHandler, createOpenApiNextHandler, createOpenApiNuxtHandler, createOpenApiAwsLambdaHandler, fastifyTRPCOpenApiPlugin, generateOpenApiDocument, errorResponseObject, errorResponseFromStatusCode, errorResponseFromMessage, GenerateOpenApiDocumentOptions, OpenApiBuilder, OpenApiRouter, OpenApiMeta, OpenApiMethod, OpenApiResponse, OpenApiSuccessResponse, OpenApiErrorResponse, ZodTypeLikeString, ZodTypeLikeVoid, };
+export { CreateOpenApiExpressMiddlewareOptions, CreateOpenApiHttpHandlerOptions, CreateOpenApiNextHandlerOptions, CreateOpenApiFastifyPluginOptions, CreateOpenApiFetchHandlerOptions, CreateOpenApiNuxtHandlerOptions, createOpenApiExpressMiddleware, createOpenApiFetchHandler, createOpenApiHttpHandler, createOpenApiNextHandler, createOpenApiNuxtHandler, fastifyTRPCOpenApiPlugin, generateOpenApiDocument, errorResponseObject, errorResponseFromStatusCode, errorResponseFromMessage, GenerateOpenApiDocumentOptions, OpenApiBuilder, OpenApiRouter, OpenApiMeta, OpenApiMethod, OpenApiResponse, OpenApiSuccessResponse, OpenApiErrorResponse, ZodTypeLikeString, ZodTypeLikeVoid, };
 //# sourceMappingURL=index.d.ts.map

dist/esm/types.d.ts

@@ -1,7 +0,5 @@
-import { Procedure, ProcedureParams, Router } from '@trpc/server';
-import type { RootConfig } from '@trpc/server/dist/core/internals/config';
-import type { RouterDef } from '@trpc/server/dist/core/router';
 import { TRPC_ERROR_CODE_KEY } from '@trpc/server/dist/rpc';
-import { AnyZodObject, ZodIssue } from 'zod';
-export { type OpenAPIObject, type SecuritySchemeObject } from 'openapi3-ts/oas31';
+import type { CreateRootTypes, Procedure, ProcedureType, Router } from '@trpc/server/unstable-core-do-not-import';
+import type { AnyZodObject, ZodIssue } from 'zod';
+export { type OpenAPIObject, type SecuritySchemeObject } from 'openapi3-ts/dist/oas31';
 export type OpenApiMethod = 'GET' | 'POST' | 'PATCH' | 'PUT' | 'DELETE';
@@ -29,15 +27,15 @@ type TRPCMeta = Record<string, unknown>;
 };
-export type OpenApiProcedure<TMeta = TRPCMeta> = Procedure<'query' | 'mutation', ProcedureParams<RootConfig<{
-    transformer: any;
+export type OpenApiProcedure = Procedure<ProcedureType, {
+    input: any;
+    output: any;
+}>;
+export interface OpenApiProcedureRecord {
+    [key: string]: OpenApiProcedure | OpenApiProcedureRecord;
+}
+export type OpenApiRouter = Router<CreateRootTypes<{
+    ctx: any;
+    meta: TRPCMeta;
     errorShape: any;
-    ctx: any;
-    meta: OpenApiMeta<TMeta>;
-}>, any, any, any, any, any, OpenApiMeta<TMeta>>>;
-export type OpenApiProcedureRecord<TMeta = TRPCMeta> = Record<string, OpenApiProcedure<TMeta>>;
-export type OpenApiRouter<TMeta = TRPCMeta> = Router<RouterDef<RootConfig<{
     transformer: any;
-    errorShape: any;
-    ctx: any;
-    meta: OpenApiMeta<TMeta>;
-}>, any, any>>;
+}>, OpenApiProcedureRecord>;
 export type OpenApiSuccessResponse<D = any> = D;
@@ -44,0 +42,0 @@ export type OpenApiErrorResponse = {

dist/esm/utils/method.d.ts

 import { OpenApiMethod } from '../types';
-export declare const acceptsRequestBody: (method: OpenApiMethod) => boolean;
+export declare const acceptsRequestBody: (method: OpenApiMethod | "HEAD") => boolean;
 //# sourceMappingURL=method.d.ts.map

dist/esm/utils/procedure.d.ts

@@ -1,15 +0,14 @@
-import { ProcedureType } from '@trpc/server';
-import { Parser } from '@trpc/server/dist/core/parser';
+import { TRPCProcedureType } from '@trpc/server';
 import { AnyZodObject } from 'zod';
 import { OpenApiMeta, OpenApiProcedure, OpenApiProcedureRecord } from '../types';
 export declare const getInputOutputParsers: (procedure: OpenApiProcedure) => {
-    inputParser: AnyZodObject | Parser | undefined;
-    outputParser: Parser | undefined;
+    inputParser: AnyZodObject | undefined;
+    outputParser: AnyZodObject | undefined;
 };
 export declare const forEachOpenApiProcedure: (procedureRecord: OpenApiProcedureRecord, callback: (values: {
     path: string;
-    type: ProcedureType;
+    type: TRPCProcedureType;
     procedure: OpenApiProcedure;
-    openapi: NonNullable<OpenApiMeta['openapi']>;
+    openapi: NonNullable<OpenApiMeta["openapi"]>;
 }) => void) => void;
 //# sourceMappingURL=procedure.d.ts.map

dist/esm/utils/zod.d.ts

@@ -1,10 +0,6 @@
-import { ZodObject, ZodRawShape, ZodTypeAny, z } from 'zod';
-export declare const instanceofZodType: (type: any) => type is ZodTypeAny;
+import { ZodObject, ZodRawShape, z } from 'zod';
+export declare const instanceofZodType: (type: any) => type is z.ZodTypeAny;
 export declare const instanceofZodTypeKind: <Z extends z.ZodFirstPartyTypeKind>(type: z.ZodTypeAny, zodTypeKind: Z) => type is InstanceType<(typeof z)[Z]>;
-export declare const instanceofZodTypeOptional: (type: z.ZodTypeAny) => type is z.ZodOptional<ZodTypeAny>;
-export declare const instanceofZodTypeObject: (type: z.ZodTypeAny) => type is ZodObject<ZodRawShape, z.UnknownKeysParam, ZodTypeAny, {
-    [x: string]: any;
-}, {
-    [x: string]: any;
-}>;
+export declare const instanceofZodTypeOptional: (type: z.ZodTypeAny) => type is z.ZodOptional<z.ZodTypeAny>;
+export declare const instanceofZodTypeObject: (type: z.ZodTypeAny) => type is z.ZodObject<z.ZodRawShape>;
 export type ZodTypeLikeVoid = z.ZodVoid | z.ZodUndefined | z.ZodNever;
@@ -11,0 +7,0 @@ export declare const instanceofZodTypeLikeVoid: (type: z.ZodTypeAny) => type is ZodTypeLikeVoid;

package.json

 {
   "name": "trpc-to-openapi",
-  "version": "1.0.1",
+  "version": "2.0.0-rc.0",
   "description": "tRPC OpenAPI",
-  "author": "mcampa <[e-mail]>",
+  "author": "mcampa",
   "private": false,
@@ -41,2 +41,3 @@ "license": "MIT",
   "scripts": {
+    "t": "jest",
     "test": "tsc --noEmit && jest --verbose",
@@ -51,4 +52,4 @@ "lint": "eslint . --ext .ts",
   "peerDependencies": {
-    "@trpc/server": "^10.0.0",
-    "zod": "^3.21.4"
+    "@trpc/server": "^11.0.0-rc.490",
+    "zod": "^3.23.8"
   },
@@ -65,3 +66,3 @@ "dependencies": {
     "@trivago/prettier-plugin-sort-imports": "^4.1.1",
-    "@trpc/client": "^10.27.1",
+    "@trpc/client": "^11.0.0-rc.490",
     "@types/aws-lambda": "^8.10.115",
@@ -74,10 +75,10 @@ "@types/co-body": "^6.1.0",
     "@types/node-fetch": "^2.6.4",
-    "@typescript-eslint/eslint-plugin": "^5.59.7",
-    "@typescript-eslint/parser": "^5.59.7",
+    "@typescript-eslint/eslint-plugin": "5.59.7",
+    "@typescript-eslint/parser": "5.59.7",
     "aws-lambda": "^1.0.7",
-    "eslint": "^8.41.0",
-    "eslint-config-prettier": "^8.8.0",
-    "eslint-plugin-import": "^2.27.5",
-    "eslint-plugin-prettier": "^4.2.1",
-    "eslint-plugin-promise": "^6.1.1",
+    "eslint": "8.41.0",
+    "eslint-config-prettier": "8.8.0",
+    "eslint-plugin-import": "2.27.5",
+    "eslint-plugin-prettier": "4.2.1",
+    "eslint-plugin-promise": "6.1.1",
     "express": "^4.18.2",
@@ -94,5 +95,4 @@ "fastify": "^4.17.0",
     "ts-node": "^10.9.1",
-    "typescript": "^5.0.4"
-  },
-  "packageManager": "yarn@1.22.19+sha1.4ba7fc5c6e704fce2066ecbfb0b0d8976fe62447"
+    "typescript": "5.5.4"
+  }
 }

README.md

@@ -14,2 +14,3 @@ <p align="center">
 
+- tRPC 11 only 👈
 - Easy REST endpoints for your tRPC procedures.
@@ -16,0 +17,0 @@ - Perfect for incremental adoption.

New alerts

No v1

Quality

Package is not semver >=1. This means it is not stable and does not support ^ ranges.

Found 1 instance in 1 package

Improved metrics

Number of lines in readme file

367

0.27%

Worsened metrics

Total package byte prevSize

254056

-5.38%

Number of package files

163

-4.68%

Lines of code

2675

-7.85%

Number of low quality alerts

1

Infinity%

No dependency changes