@orpc/server 0.0.0-next.568a5ad → 0.0.0-next.57a6344

package/dist/{chunk-3JMSDC5L.js → chunk-VARUID7X.js}

@@ -114,20 +114,20 @@ function createProcedureCaller(options) {
     const procedure = await loadProcedure(options.procedure);
     const context = await value(options.context);
     const execute = async () => {
-      const validInput = (() => {
-        const schema = procedure.zz$p.contract.zz$cp.InputSchema;
+      const validInput = await (async () => {
+        const schema = procedure.zz$p.contract["~orpc"].InputSchema;
         if (!schema) {
           return input;
         }
-        try {
-          return schema.parse(input);
-        } catch (e) {
+        const result = await schema["~standard"].validate(input);
+        if (result.issues) {
           throw new ORPCError({
             message: "Validation input failed",
             code: "BAD_REQUEST",
-            cause: e
+            issues: result.issues
           });
         }
+        return result.value;
       })();
       const meta = {
         path,
@@ -156,19 +156,18 @@ function createProcedureCaller(options) {
       };
       const output2 = (await next({})).output;
       const validOutput = await (async () => {
-        const schema = procedure.zz$p.contract.zz$cp.OutputSchema;
+        const schema = procedure.zz$p.contract["~orpc"].OutputSchema;
         if (!schema) {
           return output2;
         }
-        const result = await schema.safeParseAsync(output2);
-        if (result.error) {
+        const result = await schema["~standard"].validate(output2);
+        if (result.issues) {
           throw new ORPCError({
             message: "Validation output failed",
-            code: "INTERNAL_SERVER_ERROR",
-            cause: result.error
+            code: "INTERNAL_SERVER_ERROR"
           });
         }
-        return result.data;
+        return result.value;
       })();
       return validOutput;
     };
@@ -271,4 +270,4 @@ export {
   decorateProcedure,
   isProcedure
 };
-//# sourceMappingURL=chunk-3JMSDC5L.js.map
+//# sourceMappingURL=chunk-VARUID7X.js.map

package/dist/fetch.js

@@ -2,7 +2,7 @@ import {
   createProcedureCaller,
   isLazy,
   isProcedure
-} from "./chunk-3JMSDC5L.js";
+} from "./chunk-VARUID7X.js";
 
 // src/fetch/handle.ts
 import { ORPCError } from "@orpc/shared/error";
@@ -23,15 +23,14 @@ async function handleFetchRequest(options) {
 }
 
 // src/fetch/handler.ts
-import { ORPC_HEADER, ORPC_HEADER_VALUE } from "@orpc/contract";
-import { executeWithHooks, trim, value } from "@orpc/shared";
+import { executeWithHooks, ORPC_PROTOCOL_HEADER, ORPC_PROTOCOL_VALUE, trim, value } from "@orpc/shared";
 import { ORPCError as ORPCError2 } from "@orpc/shared/error";
 import { ORPCDeserializer, ORPCSerializer } from "@orpc/transformer";
 var serializer = new ORPCSerializer();
 var deserializer = new ORPCDeserializer();
 function createORPCHandler() {
   return async (options) => {
-    if (options.request.headers.get(ORPC_HEADER) !== ORPC_HEADER_VALUE) {
+    if (!options.request.headers.get(ORPC_PROTOCOL_HEADER)?.includes(ORPC_PROTOCOL_VALUE)) {
       return void 0;
     }
     const context = await value(options.context);

package/dist/index.js

@@ -12,7 +12,7 @@ import {
   loadLazy,
   loadProcedure,
   mergeContext
-} from "./chunk-3JMSDC5L.js";
+} from "./chunk-VARUID7X.js";
 
 // src/builder.ts
 import {
@@ -26,7 +26,7 @@ import {
 } from "@orpc/contract";
 
 // src/router-builder.ts
-import { DecoratedContractProcedure, prefixHTTPPath } from "@orpc/contract";
+import { DecoratedContractProcedure } from "@orpc/contract";
 var LAZY_ROUTER_PREFIX_SYMBOL = Symbol("ORPC_LAZY_ROUTER_PREFIX");
 var RouterBuilder = class _RouterBuilder {
   constructor(zz$rb) {
@@ -109,7 +109,7 @@ function adaptLazyRouter(options) {
   };
   let lazyRouterPrefix = options.prefix;
   if (LAZY_ROUTER_PREFIX_SYMBOL in options.current && typeof options.current[LAZY_ROUTER_PREFIX_SYMBOL] === "string") {
-    lazyRouterPrefix = lazyRouterPrefix ? prefixHTTPPath(options.current[LAZY_ROUTER_PREFIX_SYMBOL], lazyRouterPrefix) : options.current[LAZY_ROUTER_PREFIX_SYMBOL];
+    lazyRouterPrefix = `${options.current[LAZY_ROUTER_PREFIX_SYMBOL]}${lazyRouterPrefix ?? ""}`;
   }
   const decoratedLazy = Object.assign(decorateLazy(createLazy(loader)), {
     [LAZY_ROUTER_PREFIX_SYMBOL]: lazyRouterPrefix
@@ -141,7 +141,7 @@ function adaptProcedure(options) {
   ];
   let contract = DecoratedContractProcedure.decorate(
     options.procedure.zz$p.contract
-  ).addTags(...options.tags ?? []);
+  ).pushTag(...options.tags ?? []);
   if (options.prefix) {
     contract = contract.prefix(options.prefix);
   }
@@ -298,11 +298,11 @@ var Builder = class _Builder {
   /**
    * Convert to ContractProcedureBuilder
    */
-  route(opts) {
+  route(route) {
     return new ProcedureBuilder({
       middlewares: this.zz$b.middlewares,
       contract: new ContractProcedure({
-        ...opts,
+        route,
         InputSchema: void 0,
         OutputSchema: void 0
       })
@@ -389,25 +389,6 @@ var Builder = class _Builder {
   }
 };
 
-// src/router.ts
-import {
-  isContractProcedure as isContractProcedure3
-} from "@orpc/contract";
-function toContractRouter(router) {
-  const contract = {};
-  for (const key in router) {
-    const item = router[key];
-    if (isContractProcedure3(item)) {
-      contract[key] = item;
-    } else if (isProcedure(item)) {
-      contract[key] = item.zz$p.contract;
-    } else {
-      contract[key] = toContractRouter(item);
-    }
-  }
-  return contract;
-}
-
 // src/router-caller.ts
 function createRouterCaller(options) {
   return createRouterCallerInternal(options);
@@ -461,7 +442,6 @@ export {
   loadLazy,
   loadProcedure,
   mergeContext,
-  os,
-  toContractRouter
+  os
 };
 //# sourceMappingURL=index.js.map

package/dist/src/builder.d.ts

@@ -1,9 +1,10 @@
+import type { ANY_CONTRACT_PROCEDURE, ContractRouter, HTTPPath, RouteOptions, Schema, SchemaInput, SchemaOutput } from '@orpc/contract';
 import type { IsEqual } from '@orpc/shared';
 import type { DecoratedLazy } from './lazy';
 import type { DecoratedProcedure, Procedure, ProcedureFunc } from './procedure';
 import type { HandledRouter, Router } from './router';
 import type { Context, MergeContext } from './types';
-import { ContractProcedure, type ContractRouter, type HTTPPath, type RouteOptions, type Schema, type SchemaInput, type SchemaOutput } from '@orpc/contract';
+import { ContractProcedure } from '@orpc/contract';
 import { type DecoratedMiddleware, type MapInputMiddleware, type Middleware } from './middleware';
 import { ProcedureBuilder } from './procedure-builder';
 import { ProcedureImplementer } from './procedure-implementer';
@@ -25,7 +26,7 @@ export declare class Builder<TContext extends Context, TExtraContext extends Con
     /**
      * Convert to ContractProcedureBuilder
      */
-    route(opts: RouteOptions): ProcedureBuilder<TContext, TExtraContext, undefined, undefined>;
+    route(route: RouteOptions): ProcedureBuilder<TContext, TExtraContext, undefined, undefined>;
     input<USchema extends Schema = undefined>(schema: USchema, example?: SchemaInput<USchema>): ProcedureBuilder<TContext, TExtraContext, USchema, undefined>;
     output<USchema extends Schema = undefined>(schema: USchema, example?: SchemaOutput<USchema>): ProcedureBuilder<TContext, TExtraContext, undefined, USchema>;
     /**
@@ -35,7 +36,7 @@ export declare class Builder<TContext extends Context, TExtraContext extends Con
     /**
      * Convert to ProcedureImplementer | RouterBuilder
      */
-    contract<UContract extends ContractProcedure<any, any> | ContractRouter>(contract: UContract): UContract extends ContractProcedure<infer UInputSchema, infer UOutputSchema> ? ProcedureImplementer<TContext, TExtraContext, UInputSchema, UOutputSchema> : UContract extends ContractRouter ? ChainedRouterImplementer<TContext, UContract, TExtraContext> : never;
+    contract<UContract extends ANY_CONTRACT_PROCEDURE | ContractRouter>(contract: UContract): UContract extends ContractProcedure<infer UInputSchema, infer UOutputSchema> ? ProcedureImplementer<TContext, TExtraContext, UInputSchema, UOutputSchema> : UContract extends ContractRouter ? ChainedRouterImplementer<TContext, UContract, TExtraContext> : never;
     /**
      * Create ExtendedMiddleware
      */

package/dist/src/router-implementer.d.ts

@@ -12,10 +12,10 @@ export declare class RouterImplementer<TContext extends Context, TContract exten
     constructor(zz$ri: {
         contract: TContract;
     });
-    router(router: RouterWithContract<TContext, TContract>): HandledRouter<RouterWithContract<TContext, TContract>>;
-    lazy(loader: () => Promise<{
-        default: RouterWithContract<TContext, TContract>;
-    }>): DecoratedLazy<RouterWithContract<TContext, TContract>>;
+    router<U extends RouterWithContract<TContext, TContract>>(router: U): HandledRouter<U>;
+    lazy<U extends RouterWithContract<TContext, TContract>>(loader: () => Promise<{
+        default: U;
+    }>): DecoratedLazy<U>;
 }
 export type ChainedRouterImplementer<TContext extends Context, TContract extends ContractRouter, TExtraContext extends Context> = {
     [K in keyof TContract]: TContract[K] extends ContractProcedure<infer UInputSchema, infer UOutputSchema> ? ProcedureImplementer<TContext, TExtraContext, UInputSchema, UOutputSchema> : TContract[K] extends ContractRouter ? ChainedRouterImplementer<TContext, TContract[K], TExtraContext> : never;

package/dist/src/router.d.ts

@@ -1,7 +1,7 @@
 import type { ContractProcedure, ContractRouter, SchemaInput, SchemaOutput } from '@orpc/contract';
 import type { ANY_LAZY, DecoratedLazy, Lazy } from './lazy';
+import type { DecoratedProcedure, Procedure } from './procedure';
 import type { Context } from './types';
-import { type DecoratedProcedure, type Procedure } from './procedure';
 export interface Router<TContext extends Context> {
     [k: string]: Procedure<TContext, any, any, any, any> | Lazy<Procedure<TContext, any, any, any, any>> | Router<TContext> | Lazy<Router<TContext>>;
 }
@@ -11,7 +11,6 @@ export type HandledRouter<TRouter extends Router<any>> = {
 export type RouterWithContract<TContext extends Context, TContract extends ContractRouter> = {
     [K in keyof TContract]: TContract[K] extends ContractProcedure<infer UInputSchema, infer UOutputSchema> ? Procedure<TContext, any, UInputSchema, UOutputSchema, any> | Lazy<Procedure<TContext, any, UInputSchema, UOutputSchema, any>> : TContract[K] extends ContractRouter ? RouterWithContract<TContext, TContract[K]> : never;
 };
-export declare function toContractRouter(router: ContractRouter | Router<any>): ContractRouter;
 export type InferRouterInputs<T extends Router<any>> = {
     [K in keyof T]: T[K] extends Procedure<any, any, infer UInputSchema, any, any> | Lazy<Procedure<any, any, infer UInputSchema, any, any>> ? SchemaInput<UInputSchema> : T[K] extends Router<any> ? InferRouterInputs<T[K]> : never;
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@orpc/server",
   "type": "module",
-  "version": "0.0.0-next.568a5ad",
+  "version": "0.0.0-next.57a6344",
   "license": "MIT",
   "homepage": "https://orpc.unnoq.com",
   "repository": {
@@ -34,16 +34,15 @@
     "dist"
   ],
   "peerDependencies": {
-    "zod": ">=3.23.0",
-    "@orpc/zod": "0.0.0-next.568a5ad"
+    "@orpc/zod": "0.0.0-next.57a6344"
   },
   "dependencies": {
-    "@orpc/contract": "0.0.0-next.568a5ad",
-    "@orpc/shared": "0.0.0-next.568a5ad",
-    "@orpc/transformer": "0.0.0-next.568a5ad"
+    "@orpc/contract": "0.0.0-next.57a6344",
+    "@orpc/transformer": "0.0.0-next.57a6344",
+    "@orpc/shared": "0.0.0-next.57a6344"
   },
   "devDependencies": {
-    "@orpc/openapi": "0.0.0-next.568a5ad"
+    "@orpc/openapi": "0.0.0-next.57a6344"
   },
   "scripts": {
     "build": "tsup --clean --sourcemap --entry.index=src/index.ts --entry.fetch=src/fetch/index.ts --format=esm --onSuccess='tsc -b --noCheck'",