@orpc/openapi 0.0.0-next.c0088c7 → 0.0.0-next.c0afbea

package/README.md

@@ -32,7 +32,7 @@
 - **Contract-First Development 📜**: (Optional) Define your API contract upfront and implement it with confidence.
 - **Exceptional Developer Experience ✨**: Enjoy a streamlined workflow with robust typing and clear, in-code documentation.
 - **Multi-Runtime Support 🌍**: Run your code seamlessly on Cloudflare, Deno, Bun, Node.js, and more.
-- **Framework Integrations 🧩**: Supports Tanstack Query (React, Vue), Pinia Colada, and more.
+- **Framework Integrations 🧩**: Supports Tanstack Query (React, Vue, Solid, Svelte), Pinia Colada, and more.
 - **Server Actions ⚡️**: Fully compatible with React Server Actions on Next.js, TanStack Start, and more.
 - **Standard Schema Support 🗂️**: Effortlessly work with Zod, Valibot, ArkType, and others right out of the box.
 - **Fast & Lightweight 💨**: Built on native APIs across all runtimes – optimized for speed and efficiency.
@@ -55,6 +55,8 @@ You can find the full documentation [here](https://orpc.unnoq.com).
 - [@orpc/client](https://www.npmjs.com/package/@orpc/client): Consume your API on the client with type-safety.
 - [@orpc/react-query](https://www.npmjs.com/package/@orpc/react-query): Integration with [React Query](https://tanstack.com/query/latest/docs/framework/react/overview).
 - [@orpc/vue-query](https://www.npmjs.com/package/@orpc/vue-query): Integration with [Vue Query](https://tanstack.com/query/latest/docs/framework/vue/overview).
+- [@orpc/solid-query](https://www.npmjs.com/package/@orpc/solid-query): Integration with [Solid Query](https://tanstack.com/query/latest/docs/framework/solid/overview).
+- [@orpc/svelte-query](https://www.npmjs.com/package/@orpc/svelte-query): Integration with [Svelte Query](https://tanstack.com/query/latest/docs/framework/svelte/overview).
 - [@orpc/vue-colada](https://www.npmjs.com/package/@orpc/vue-colada): Integration with [Pinia Colada](https://pinia-colada.esm.dev/).
 - [@orpc/openapi](https://www.npmjs.com/package/@orpc/openapi): Generate OpenAPI specs and handle OpenAPI requests.
 - [@orpc/zod](https://www.npmjs.com/package/@orpc/zod): More schemas that [Zod](https://zod.dev/) doesn't support yet.

package/dist/adapters/fetch/index.d.mts

@@ -6,7 +6,7 @@ import { ToFetchResponseOptions } from '@orpc/standard-server-fetch';
 
 declare class OpenAPIHandler<T extends Context> implements FetchHandler<T> {
     private readonly standardHandler;
-    constructor(router: Router<T, any>, options?: NoInfer<StandardHandlerOptions<T>>);
+    constructor(router: Router<any, T>, options?: NoInfer<StandardHandlerOptions<T>>);
     handle(request: Request, ...[options,]: MaybeOptionalOptions<StandardHandleOptions<T> & ToFetchResponseOptions>): Promise<FetchHandleResult>;
 }
 

package/dist/adapters/fetch/index.d.ts

@@ -6,7 +6,7 @@ import { ToFetchResponseOptions } from '@orpc/standard-server-fetch';
 
 declare class OpenAPIHandler<T extends Context> implements FetchHandler<T> {
     private readonly standardHandler;
-    constructor(router: Router<T, any>, options?: NoInfer<StandardHandlerOptions<T>>);
+    constructor(router: Router<any, T>, options?: NoInfer<StandardHandlerOptions<T>>);
     handle(request: Request, ...[options,]: MaybeOptionalOptions<StandardHandleOptions<T> & ToFetchResponseOptions>): Promise<FetchHandleResult>;
 }
 

package/dist/adapters/fetch/index.mjs

@@ -1,8 +1,8 @@
-export { O as OpenAPIHandler } from '../../shared/openapi.C015V43J.mjs';
+export { O as OpenAPIHandler } from '../../shared/openapi.CbzTVvGL.mjs';
 import '@orpc/openapi-client/standard';
 import '@orpc/server/standard';
 import '@orpc/standard-server-fetch';
-import '../../shared/openapi.DFXD6scT.mjs';
+import '../../shared/openapi.CJTe38Ya.mjs';
 import '@orpc/contract';
 import '@orpc/shared';
 import '@orpc/server';

package/dist/adapters/hono/index.mjs

@@ -1,8 +1,8 @@
-export { O as OpenAPIHandler } from '../../shared/openapi.C015V43J.mjs';
+export { O as OpenAPIHandler } from '../../shared/openapi.CbzTVvGL.mjs';
 import '@orpc/openapi-client/standard';
 import '@orpc/server/standard';
 import '@orpc/standard-server-fetch';
-import '../../shared/openapi.DFXD6scT.mjs';
+import '../../shared/openapi.CJTe38Ya.mjs';
 import '@orpc/contract';
 import '@orpc/shared';
 import '@orpc/server';

package/dist/adapters/next/index.mjs

@@ -1,8 +1,8 @@
-export { O as OpenAPIHandler } from '../../shared/openapi.C015V43J.mjs';
+export { O as OpenAPIHandler } from '../../shared/openapi.CbzTVvGL.mjs';
 import '@orpc/openapi-client/standard';
 import '@orpc/server/standard';
 import '@orpc/standard-server-fetch';
-import '../../shared/openapi.DFXD6scT.mjs';
+import '../../shared/openapi.CJTe38Ya.mjs';
 import '@orpc/contract';
 import '@orpc/shared';
 import '@orpc/server';

package/dist/adapters/node/index.d.mts

@@ -6,7 +6,7 @@ import { SendStandardResponseOptions } from '@orpc/standard-server-node';
 
 declare class OpenAPIHandler<T extends Context> implements NodeHttpHandler<T> {
     private readonly standardHandler;
-    constructor(router: Router<T, any>, options?: NoInfer<StandardHandlerOptions<T>>);
+    constructor(router: Router<any, T>, options?: NoInfer<StandardHandlerOptions<T>>);
     handle(req: NodeHttpRequest, res: NodeHttpResponse, ...[options,]: MaybeOptionalOptions<StandardHandleOptions<T> & SendStandardResponseOptions>): Promise<NodeHttpHandleResult>;
 }
 

package/dist/adapters/node/index.d.ts

@@ -6,7 +6,7 @@ import { SendStandardResponseOptions } from '@orpc/standard-server-node';
 
 declare class OpenAPIHandler<T extends Context> implements NodeHttpHandler<T> {
     private readonly standardHandler;
-    constructor(router: Router<T, any>, options?: NoInfer<StandardHandlerOptions<T>>);
+    constructor(router: Router<any, T>, options?: NoInfer<StandardHandlerOptions<T>>);
     handle(req: NodeHttpRequest, res: NodeHttpResponse, ...[options,]: MaybeOptionalOptions<StandardHandleOptions<T> & SendStandardResponseOptions>): Promise<NodeHttpHandleResult>;
 }
 

package/dist/adapters/node/index.mjs

@@ -1,7 +1,7 @@
 import { OpenAPISerializer } from '@orpc/openapi-client/standard';
 import { StandardHandler } from '@orpc/server/standard';
 import { toStandardLazyRequest, sendStandardResponse } from '@orpc/standard-server-node';
-import { a as OpenAPIMatcher, O as OpenAPICodec } from '../../shared/openapi.DFXD6scT.mjs';
+import { a as OpenAPIMatcher, O as OpenAPICodec } from '../../shared/openapi.CJTe38Ya.mjs';
 import '@orpc/shared';
 import 'json-schema-typed/draft-2020-12';
 import '@orpc/contract';

package/dist/adapters/standard/index.d.mts

@@ -16,7 +16,7 @@ declare class OpenAPICodec implements StandardCodec {
 declare class OpenAPIMatcher implements StandardMatcher {
     private readonly tree;
     private pendingRouters;
-    init(router: AnyRouter, path?: string[]): void;
+    init(router: AnyRouter, path?: readonly string[]): void;
     match(method: string, pathname: HTTPPath): Promise<StandardMatchResult>;
 }
 

package/dist/adapters/standard/index.d.ts

@@ -16,7 +16,7 @@ declare class OpenAPICodec implements StandardCodec {
 declare class OpenAPIMatcher implements StandardMatcher {
     private readonly tree;
     private pendingRouters;
-    init(router: AnyRouter, path?: string[]): void;
+    init(router: AnyRouter, path?: readonly string[]): void;
     match(method: string, pathname: HTTPPath): Promise<StandardMatchResult>;
 }
 

package/dist/adapters/standard/index.mjs

@@ -1,4 +1,4 @@
-export { O as OpenAPICodec, a as OpenAPIMatcher, d as decodeParams, t as toRou3Pattern } from '../../shared/openapi.DFXD6scT.mjs';
+export { O as OpenAPICodec, a as OpenAPIMatcher, d as decodeParams, t as toRou3Pattern } from '../../shared/openapi.CJTe38Ya.mjs';
 import '@orpc/contract';
 import '@orpc/shared';
 import '@orpc/server';

package/dist/index.d.mts

@@ -1,4 +1,4 @@
-import { AnyContractProcedure, Schema, AnyContractRouter, HTTPPath, HTTPMethod } from '@orpc/contract';
+import { AnyContractProcedure, AnySchema, AnyContractRouter, HTTPPath, HTTPMethod } from '@orpc/contract';
 import { OpenAPIV3_1 } from 'openapi-types';
 export { OpenAPIV3_1 as OpenAPI } from 'openapi-types';
 import { AnyRouter } from '@orpc/server';
@@ -32,15 +32,15 @@ interface SchemaConvertOptions {
     strategy: 'input' | 'output';
 }
 interface SchemaConverter {
-    convert(schema: Schema, options: SchemaConvertOptions): [required: boolean, jsonSchema: JSONSchema];
+    convert(schema: AnySchema | undefined, options: SchemaConvertOptions): [required: boolean, jsonSchema: JSONSchema];
 }
 interface ConditionalSchemaConverter extends SchemaConverter {
-    condition(schema: Schema, options: SchemaConvertOptions): boolean;
+    condition(schema: AnySchema | undefined, options: SchemaConvertOptions): boolean;
 }
 declare class CompositeSchemaConverter implements SchemaConverter {
     private readonly converters;
     constructor(converters: ConditionalSchemaConverter[]);
-    convert(schema: Schema, options: SchemaConvertOptions): [required: boolean, jsonSchema: JSONSchema];
+    convert(schema: AnySchema | undefined, options: SchemaConvertOptions): [required: boolean, jsonSchema: JSONSchema];
 }
 
 interface OpenAPIGeneratorOptions {

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { AnyContractProcedure, Schema, AnyContractRouter, HTTPPath, HTTPMethod } from '@orpc/contract';
+import { AnyContractProcedure, AnySchema, AnyContractRouter, HTTPPath, HTTPMethod } from '@orpc/contract';
 import { OpenAPIV3_1 } from 'openapi-types';
 export { OpenAPIV3_1 as OpenAPI } from 'openapi-types';
 import { AnyRouter } from '@orpc/server';
@@ -32,15 +32,15 @@ interface SchemaConvertOptions {
     strategy: 'input' | 'output';
 }
 interface SchemaConverter {
-    convert(schema: Schema, options: SchemaConvertOptions): [required: boolean, jsonSchema: JSONSchema];
+    convert(schema: AnySchema | undefined, options: SchemaConvertOptions): [required: boolean, jsonSchema: JSONSchema];
 }
 interface ConditionalSchemaConverter extends SchemaConverter {
-    condition(schema: Schema, options: SchemaConvertOptions): boolean;
+    condition(schema: AnySchema | undefined, options: SchemaConvertOptions): boolean;
 }
 declare class CompositeSchemaConverter implements SchemaConverter {
     private readonly converters;
     constructor(converters: ConditionalSchemaConverter[]);
-    convert(schema: Schema, options: SchemaConvertOptions): [required: boolean, jsonSchema: JSONSchema];
+    convert(schema: AnySchema | undefined, options: SchemaConvertOptions): [required: boolean, jsonSchema: JSONSchema];
 }
 
 interface OpenAPIGeneratorOptions {

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { isProcedure, eachAllContractProcedure, convertPathToHttpPath } from '@orpc/server';
+import { isProcedure, resolveContractProcedures, toHttpPath } from '@orpc/server';
 import { fallbackORPCErrorStatus, fallbackORPCErrorMessage } from '@orpc/client';
 import { fallbackContractConfig, getEventIteratorSchemaDetails } from '@orpc/contract';
 import { OpenAPISerializer } from '@orpc/openapi-client/standard';
@@ -79,12 +79,12 @@ class OpenAPIGenerator {
     const doc = clone(base);
     doc.openapi = "3.1.1";
     const errors = [];
-    await eachAllContractProcedure({ path: [], router }, ({ contract, path }) => {
+    await resolveContractProcedures({ path: [], router }, ({ contract, path }) => {
       const operationId = path.join(".");
       try {
         const def = contract["~orpc"];
         const method = toOpenAPIMethod(fallbackContractConfig("defaultMethod", def.route.method));
-        const httpPath = toOpenAPIPath(def.route.path ?? convertPathToHttpPath(path));
+        const httpPath = toOpenAPIPath(def.route.path ?? toHttpPath(path));
         const operationObjectRef = {
           operationId,
           summary: def.route.summary,

package/dist/shared/{openapi.DFXD6scT.mjs → openapi.CJTe38Ya.mjs}

@@ -1,6 +1,6 @@
 import { fallbackContractConfig } from '@orpc/contract';
 import { isObject } from '@orpc/shared';
-import { eachContractProcedure, convertPathToHttpPath, isProcedure, getLazyRouterPrefix, unlazy, getRouterChild, createContractedProcedure } from '@orpc/server';
+import { traverseContractProcedures, toHttpPath, isProcedure, getLazyMeta, unlazy, getRouter, createContractedProcedure } from '@orpc/server';
 import { createRouter, addRoute, findRoute } from 'rou3';
 import { s as standardizeHTTPPath } from './openapi.DZzpQAb-.mjs';
 
@@ -81,12 +81,9 @@ class OpenAPIMatcher {
   tree = createRouter();
   pendingRouters = [];
   init(router, path = []) {
-    const laziedOptions = eachContractProcedure({
-      router,
-      path
-    }, ({ path: path2, contract }) => {
+    const laziedOptions = traverseContractProcedures({ router, path }, ({ path: path2, contract }) => {
       const method = fallbackContractConfig("defaultMethod", contract["~orpc"].route.method);
-      const httpPath = contract["~orpc"].route.path ? toRou3Pattern(contract["~orpc"].route.path) : convertPathToHttpPath(path2);
+      const httpPath = toRou3Pattern(contract["~orpc"].route.path ?? toHttpPath(path2));
       if (isProcedure(contract)) {
         addRoute(this.tree, method, httpPath, {
           path: path2,
@@ -106,8 +103,8 @@ class OpenAPIMatcher {
     });
     this.pendingRouters.push(...laziedOptions.map((option) => ({
       ...option,
-      httpPathPrefix: convertPathToHttpPath(option.path),
-      laziedPrefix: getLazyRouterPrefix(option.lazied)
+      httpPathPrefix: toHttpPath(option.path),
+      laziedPrefix: getLazyMeta(option.router).prefix
     })));
   }
   async match(method, pathname) {
@@ -115,7 +112,7 @@ class OpenAPIMatcher {
       const newPendingRouters = [];
       for (const pendingRouter of this.pendingRouters) {
         if (!pendingRouter.laziedPrefix || pathname.startsWith(pendingRouter.laziedPrefix) || pathname.startsWith(pendingRouter.httpPathPrefix)) {
-          const { default: router } = await unlazy(pendingRouter.lazied);
+          const { default: router } = await unlazy(pendingRouter.router);
           this.init(router, pendingRouter.path);
         } else {
           newPendingRouters.push(pendingRouter);
@@ -128,14 +125,14 @@ class OpenAPIMatcher {
       return void 0;
     }
     if (!match.data.procedure) {
-      const { default: maybeProcedure } = await unlazy(getRouterChild(match.data.router, ...match.data.path));
+      const { default: maybeProcedure } = await unlazy(getRouter(match.data.router, match.data.path));
       if (!isProcedure(maybeProcedure)) {
         throw new Error(`
-          [Contract-First] Missing or invalid implementation for procedure at path: ${convertPathToHttpPath(match.data.path)}.
+          [Contract-First] Missing or invalid implementation for procedure at path: ${toHttpPath(match.data.path)}.
           Ensure that the procedure is correctly defined and matches the expected contract.
         `);
       }
-      match.data.procedure = createContractedProcedure(match.data.contract, maybeProcedure);
+      match.data.procedure = createContractedProcedure(maybeProcedure, match.data.contract);
     }
     return {
       path: match.data.path,

package/dist/shared/{openapi.C015V43J.mjs → openapi.CbzTVvGL.mjs}

@@ -1,7 +1,7 @@
 import { OpenAPISerializer } from '@orpc/openapi-client/standard';
 import { StandardHandler } from '@orpc/server/standard';
 import { toStandardLazyRequest, toFetchResponse } from '@orpc/standard-server-fetch';
-import { a as OpenAPIMatcher, O as OpenAPICodec } from './openapi.DFXD6scT.mjs';
+import { a as OpenAPIMatcher, O as OpenAPICodec } from './openapi.CJTe38Ya.mjs';
 import '@orpc/shared';
 import 'json-schema-typed/draft-2020-12';
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@orpc/openapi",
   "type": "module",
-  "version": "0.0.0-next.c0088c7",
+  "version": "0.0.0-next.c0afbea",
   "license": "MIT",
   "homepage": "https://orpc.unnoq.com",
   "repository": {
@@ -52,14 +52,14 @@
     "json-schema-typed": "^8.0.1",
     "openapi-types": "^12.1.3",
     "rou3": "^0.5.1",
-    "@orpc/client": "0.0.0-next.c0088c7",
-    "@orpc/contract": "0.0.0-next.c0088c7",
-    "@orpc/server": "0.0.0-next.c0088c7",
-    "@orpc/shared": "0.0.0-next.c0088c7",
-    "@orpc/openapi-client": "0.0.0-next.c0088c7",
-    "@orpc/standard-server": "0.0.0-next.c0088c7",
-    "@orpc/standard-server-fetch": "0.0.0-next.c0088c7",
-    "@orpc/standard-server-node": "0.0.0-next.c0088c7"
+    "@orpc/client": "0.0.0-next.c0afbea",
+    "@orpc/contract": "0.0.0-next.c0afbea",
+    "@orpc/openapi-client": "0.0.0-next.c0afbea",
+    "@orpc/server": "0.0.0-next.c0afbea",
+    "@orpc/standard-server": "0.0.0-next.c0afbea",
+    "@orpc/shared": "0.0.0-next.c0afbea",
+    "@orpc/standard-server-fetch": "0.0.0-next.c0afbea",
+    "@orpc/standard-server-node": "0.0.0-next.c0afbea"
   },
   "devDependencies": {
     "zod": "^3.24.2"