@orpc/server 0.31.0 → 0.32.0

package/dist/index.js

@@ -444,7 +444,10 @@ var BuilderWithErrorsMiddlewares = class _BuilderWithErrorsMiddlewares {
     return new ProcedureBuilder({
       ...this["~orpc"],
       contract: new ContractProcedure({
-        route,
+        route: {
+          ...this["~orpc"].config.initialRoute,
+          ...route
+        },
         InputSchema: void 0,
         OutputSchema: void 0,
         errorMap: this["~orpc"].errorMap
@@ -455,6 +458,7 @@ var BuilderWithErrorsMiddlewares = class _BuilderWithErrorsMiddlewares {
     return new ProcedureBuilderWithInput({
       ...this["~orpc"],
       contract: new ContractProcedure({
+        route: this["~orpc"].config.initialRoute,
         OutputSchema: void 0,
         InputSchema: schema,
         inputExample: example,
@@ -466,6 +470,7 @@ var BuilderWithErrorsMiddlewares = class _BuilderWithErrorsMiddlewares {
     return new ProcedureBuilderWithOutput({
       ...this["~orpc"],
       contract: new ContractProcedure({
+        route: this["~orpc"].config.initialRoute,
         InputSchema: void 0,
         OutputSchema: schema,
         outputExample: example,
@@ -477,6 +482,7 @@ var BuilderWithErrorsMiddlewares = class _BuilderWithErrorsMiddlewares {
     return new DecoratedProcedure({
       ...this["~orpc"],
       contract: new ContractProcedure({
+        route: this["~orpc"].config.initialRoute,
         InputSchema: void 0,
         OutputSchema: void 0,
         errorMap: this["~orpc"].errorMap
@@ -504,6 +510,18 @@ var BuilderWithErrorsMiddlewares = class _BuilderWithErrorsMiddlewares {
   }
 };
 
+// src/config.ts
+var DEFAULT_CONFIG = {
+  initialInputValidationIndex: 0,
+  initialOutputValidationIndex: 0
+};
+function fallbackConfig(key, value) {
+  if (value === void 0) {
+    return DEFAULT_CONFIG[key];
+  }
+  return value;
+}
+
 // src/builder-with-errors.ts
 var BuilderWithErrors = class _BuilderWithErrors {
   "~type" = "BuilderWithErrors";
@@ -511,6 +529,15 @@ var BuilderWithErrors = class _BuilderWithErrors {
   constructor(def) {
     this["~orpc"] = def;
   }
+  config(config) {
+    return new _BuilderWithErrors({
+      ...this["~orpc"],
+      config: {
+        ...this["~orpc"].config,
+        ...config
+      }
+    });
+  }
   context() {
     return this;
   }
@@ -529,8 +556,8 @@ var BuilderWithErrors = class _BuilderWithErrors {
   use(middleware) {
     return new BuilderWithErrorsMiddlewares({
       ...this["~orpc"],
-      inputValidationIndex: 1,
-      outputValidationIndex: 1,
+      inputValidationIndex: fallbackConfig("initialInputValidationIndex", this["~orpc"].config.initialInputValidationIndex) + 1,
+      outputValidationIndex: fallbackConfig("initialOutputValidationIndex", this["~orpc"].config.initialOutputValidationIndex) + 1,
       middlewares: [middleware]
       // FIXME: I believe we can remove `as any` here
     });
@@ -538,10 +565,13 @@ var BuilderWithErrors = class _BuilderWithErrors {
   route(route) {
     return new ProcedureBuilder({
       middlewares: [],
-      inputValidationIndex: 0,
-      outputValidationIndex: 0,
+      inputValidationIndex: fallbackConfig("initialInputValidationIndex", this["~orpc"].config.initialInputValidationIndex),
+      outputValidationIndex: fallbackConfig("initialOutputValidationIndex", this["~orpc"].config.initialOutputValidationIndex),
       contract: new ContractProcedure2({
-        route,
+        route: {
+          ...this["~orpc"].config.initialRoute,
+          ...route
+        },
         InputSchema: void 0,
         OutputSchema: void 0,
         errorMap: this["~orpc"].errorMap
@@ -551,9 +581,10 @@ var BuilderWithErrors = class _BuilderWithErrors {
   input(schema, example) {
     return new ProcedureBuilderWithInput({
       middlewares: [],
-      inputValidationIndex: 0,
-      outputValidationIndex: 0,
+      inputValidationIndex: fallbackConfig("initialInputValidationIndex", this["~orpc"].config.initialInputValidationIndex),
+      outputValidationIndex: fallbackConfig("initialOutputValidationIndex", this["~orpc"].config.initialOutputValidationIndex),
       contract: new ContractProcedure2({
+        route: this["~orpc"].config.initialRoute,
         OutputSchema: void 0,
         InputSchema: schema,
         inputExample: example,
@@ -564,9 +595,10 @@ var BuilderWithErrors = class _BuilderWithErrors {
   output(schema, example) {
     return new ProcedureBuilderWithOutput({
       middlewares: [],
-      inputValidationIndex: 0,
-      outputValidationIndex: 0,
+      inputValidationIndex: fallbackConfig("initialInputValidationIndex", this["~orpc"].config.initialInputValidationIndex),
+      outputValidationIndex: fallbackConfig("initialOutputValidationIndex", this["~orpc"].config.initialOutputValidationIndex),
       contract: new ContractProcedure2({
+        route: this["~orpc"].config.initialRoute,
         InputSchema: void 0,
         OutputSchema: schema,
         outputExample: example,
@@ -577,9 +609,10 @@ var BuilderWithErrors = class _BuilderWithErrors {
   handler(handler) {
     return new DecoratedProcedure({
       middlewares: [],
-      inputValidationIndex: 0,
-      outputValidationIndex: 0,
+      inputValidationIndex: fallbackConfig("initialInputValidationIndex", this["~orpc"].config.initialInputValidationIndex),
+      outputValidationIndex: fallbackConfig("initialOutputValidationIndex", this["~orpc"].config.initialOutputValidationIndex),
       contract: new ContractProcedure2({
+        route: this["~orpc"].config.initialRoute,
         InputSchema: void 0,
         OutputSchema: void 0,
         errorMap: this["~orpc"].errorMap
@@ -713,7 +746,10 @@ var BuilderWithMiddlewares = class _BuilderWithMiddlewares {
     return new ProcedureBuilder({
       ...this["~orpc"],
       contract: new ContractProcedure3({
-        route,
+        route: {
+          ...this["~orpc"].config.initialRoute,
+          ...route
+        },
         InputSchema: void 0,
         OutputSchema: void 0,
         errorMap: {}
@@ -724,6 +760,7 @@ var BuilderWithMiddlewares = class _BuilderWithMiddlewares {
     return new ProcedureBuilderWithInput({
       ...this["~orpc"],
       contract: new ContractProcedure3({
+        route: this["~orpc"].config.initialRoute,
         OutputSchema: void 0,
         InputSchema: schema,
         inputExample: example,
@@ -735,6 +772,7 @@ var BuilderWithMiddlewares = class _BuilderWithMiddlewares {
     return new ProcedureBuilderWithOutput({
       ...this["~orpc"],
       contract: new ContractProcedure3({
+        route: this["~orpc"].config.initialRoute,
         InputSchema: void 0,
         OutputSchema: schema,
         outputExample: example,
@@ -746,6 +784,7 @@ var BuilderWithMiddlewares = class _BuilderWithMiddlewares {
     return new DecoratedProcedure({
       ...this["~orpc"],
       contract: new ContractProcedure3({
+        route: this["~orpc"].config.initialRoute,
         InputSchema: void 0,
         OutputSchema: void 0,
         errorMap: {}
@@ -785,12 +824,21 @@ var BuilderWithMiddlewares = class _BuilderWithMiddlewares {
 };
 
 // src/builder.ts
-var Builder = class {
+var Builder = class _Builder {
   "~type" = "Builder";
   "~orpc";
   constructor(def) {
     this["~orpc"] = def;
   }
+  config(config) {
+    return new _Builder({
+      ...this["~orpc"],
+      config: {
+        ...this["~orpc"].config,
+        ...config
+      }
+    });
+  }
   context() {
     return this;
   }
@@ -799,14 +847,15 @@ var Builder = class {
   }
   errors(errors) {
     return new BuilderWithErrors({
+      ...this["~orpc"],
       errorMap: errors
     });
   }
   use(middleware) {
     return new BuilderWithMiddlewares({
       ...this["~orpc"],
-      inputValidationIndex: 1,
-      outputValidationIndex: 1,
+      inputValidationIndex: fallbackConfig("initialInputValidationIndex", this["~orpc"].config.initialInputValidationIndex) + 1,
+      outputValidationIndex: fallbackConfig("initialOutputValidationIndex", this["~orpc"].config.initialOutputValidationIndex) + 1,
       middlewares: [middleware]
       // FIXME: I believe we can remove `as any` here
     });
@@ -814,10 +863,13 @@ var Builder = class {
   route(route) {
     return new ProcedureBuilder({
       middlewares: [],
-      inputValidationIndex: 0,
-      outputValidationIndex: 0,
+      inputValidationIndex: fallbackConfig("initialInputValidationIndex", this["~orpc"].config.initialInputValidationIndex),
+      outputValidationIndex: fallbackConfig("initialOutputValidationIndex", this["~orpc"].config.initialOutputValidationIndex),
       contract: new ContractProcedure4({
-        route,
+        route: {
+          ...this["~orpc"].config.initialRoute,
+          ...route
+        },
         InputSchema: void 0,
         OutputSchema: void 0,
         errorMap: {}
@@ -827,9 +879,10 @@ var Builder = class {
   input(schema, example) {
     return new ProcedureBuilderWithInput({
       middlewares: [],
-      inputValidationIndex: 0,
-      outputValidationIndex: 0,
+      inputValidationIndex: fallbackConfig("initialInputValidationIndex", this["~orpc"].config.initialInputValidationIndex),
+      outputValidationIndex: fallbackConfig("initialOutputValidationIndex", this["~orpc"].config.initialOutputValidationIndex),
       contract: new ContractProcedure4({
+        route: this["~orpc"].config.initialRoute,
         OutputSchema: void 0,
         InputSchema: schema,
         inputExample: example,
@@ -840,9 +893,10 @@ var Builder = class {
   output(schema, example) {
     return new ProcedureBuilderWithOutput({
       middlewares: [],
-      inputValidationIndex: 0,
-      outputValidationIndex: 0,
+      inputValidationIndex: fallbackConfig("initialInputValidationIndex", this["~orpc"].config.initialInputValidationIndex),
+      outputValidationIndex: fallbackConfig("initialOutputValidationIndex", this["~orpc"].config.initialOutputValidationIndex),
       contract: new ContractProcedure4({
+        route: this["~orpc"].config.initialRoute,
         InputSchema: void 0,
         OutputSchema: schema,
         outputExample: example,
@@ -853,9 +907,10 @@ var Builder = class {
   handler(handler) {
     return new DecoratedProcedure({
       middlewares: [],
-      inputValidationIndex: 0,
-      outputValidationIndex: 0,
+      inputValidationIndex: fallbackConfig("initialInputValidationIndex", this["~orpc"].config.initialInputValidationIndex),
+      outputValidationIndex: fallbackConfig("initialOutputValidationIndex", this["~orpc"].config.initialOutputValidationIndex),
       contract: new ContractProcedure4({
+        route: this["~orpc"].config.initialRoute,
         InputSchema: void 0,
         OutputSchema: void 0,
         errorMap: {}
@@ -946,8 +1001,10 @@ function createRouterClient(router, ...rest) {
 }
 
 // src/index.ts
-import { configGlobal, fallbackToGlobalConfig, isDefinedError, ORPCError, safe, type } from "@orpc/contract";
-var os = new Builder({});
+import { isDefinedError, ORPCError, safe, type } from "@orpc/contract";
+var os = new Builder({
+  config: {}
+});
 export {
   Builder,
   DecoratedProcedure,
@@ -959,7 +1016,6 @@ export {
   RouterBuilder,
   RouterImplementer,
   call,
-  configGlobal,
   createChainableImplementer,
   createORPCErrorConstructorMap,
   createProcedureClient,
@@ -967,7 +1023,7 @@ export {
   decorateLazy,
   decorateMiddleware,
   deepSetLazyRouterPrefix,
-  fallbackToGlobalConfig,
+  fallbackConfig,
   flatLazy,
   getLazyRouterPrefix,
   getRouterChild,

package/dist/src/builder-with-errors-middlewares.d.ts

@@ -1,4 +1,4 @@
-import type { ContractRouter, ErrorMap, ErrorMapGuard, ErrorMapSuggestions, HTTPPath, RouteOptions, Schema, SchemaInput, SchemaOutput, StrictErrorMap } from '@orpc/contract';
+import type { ContractBuilderConfig, ContractRouter, ErrorMap, ErrorMapGuard, ErrorMapSuggestions, HTTPPath, RouteOptions, Schema, SchemaInput, SchemaOutput, StrictErrorMap } from '@orpc/contract';
 import type { ContextGuard } from './context';
 import type { ORPCErrorConstructorMap } from './error';
 import type { FlattenLazy } from './lazy';
@@ -20,6 +20,7 @@ export interface BuilderWithErrorsMiddlewaresDef<TContext extends Context, TExtr
     middlewares: Middleware<MergeContext<TContext, TExtraContext>, Partial<TExtraContext> | undefined, unknown, any, ORPCErrorConstructorMap<TErrorMap>>[];
     inputValidationIndex: number;
     outputValidationIndex: number;
+    config: ContractBuilderConfig;
 }
 /**
  * `BuilderWithErrorsMiddlewares` is a combination of `BuilderWithErrorsMiddlewares` and `BuilderWithErrors`.

package/dist/src/builder-with-errors.d.ts

@@ -1,4 +1,5 @@
-import type { ContractRouter, ErrorMap, ErrorMapGuard, ErrorMapSuggestions, HTTPPath, RouteOptions, Schema, SchemaInput, SchemaOutput, StrictErrorMap } from '@orpc/contract';
+import type { ContractBuilderConfig, ContractRouter, ErrorMap, ErrorMapGuard, ErrorMapSuggestions, HTTPPath, RouteOptions, Schema, SchemaInput, SchemaOutput, StrictErrorMap } from '@orpc/contract';
+import type { BuilderConfig } from './builder';
 import type { ContextGuard } from './context';
 import type { ORPCErrorConstructorMap } from './error';
 import type { FlattenLazy } from './lazy';
@@ -19,6 +20,7 @@ export interface BuilderWithErrorsDef<TContext extends Context, TErrorMap extend
         context: TContext;
     };
     errorMap: TErrorMap;
+    config: BuilderConfig;
 }
 /**
  * `BuilderWithErrors` is a branch of `Builder` which it has error map.
@@ -31,6 +33,7 @@ export declare class BuilderWithErrors<TContext extends Context, TErrorMap exten
     '~type': "BuilderWithErrors";
     '~orpc': BuilderWithErrorsDef<TContext, TErrorMap>;
     constructor(def: BuilderWithErrorsDef<TContext, TErrorMap>);
+    config(config: ContractBuilderConfig): BuilderWithErrors<TContext, TErrorMap>;
     context<UContext extends Context = TContext>(): BuilderWithErrors<UContext, TErrorMap>;
     errors<U extends ErrorMap & ErrorMapGuard<TErrorMap> & ErrorMapSuggestions>(errors: U): BuilderWithErrors<TContext, TErrorMap & U>;
     middleware<UExtraContext extends Context & ContextGuard<TContext>, TInput, TOutput = any>(middleware: Middleware<TContext, UExtraContext, TInput, TOutput, ORPCErrorConstructorMap<TErrorMap>>): DecoratedMiddleware<TContext, UExtraContext, TInput, TOutput, ORPCErrorConstructorMap<TErrorMap>>;

package/dist/src/builder-with-middlewares.d.ts

@@ -1,4 +1,4 @@
-import type { ContractRouter, ErrorMap, ErrorMapSuggestions, HTTPPath, RouteOptions, Schema, SchemaInput, SchemaOutput } from '@orpc/contract';
+import type { ContractBuilderConfig, ContractRouter, ErrorMap, ErrorMapSuggestions, HTTPPath, RouteOptions, Schema, SchemaInput, SchemaOutput } from '@orpc/contract';
 import type { ContextGuard } from './context';
 import type { FlattenLazy } from './lazy';
 import type { Middleware } from './middleware';
@@ -22,6 +22,7 @@ import { RouterBuilder } from './router-builder';
  *
  */
 export interface BuilderWithMiddlewaresDef<TContext extends Context, TExtraContext extends Context> {
+    config: ContractBuilderConfig;
     middlewares: Middleware<MergeContext<TContext, TExtraContext>, Partial<TExtraContext> | undefined, unknown, any, Record<never, never>>[];
     inputValidationIndex: number;
     outputValidationIndex: number;

package/dist/src/builder.d.ts

@@ -1,4 +1,4 @@
-import type { ContractRouter, ErrorMap, ErrorMapSuggestions, HTTPPath, RouteOptions, Schema, SchemaInput, SchemaOutput } from '@orpc/contract';
+import type { ContractBuilderConfig, ContractRouter, ErrorMap, ErrorMapSuggestions, HTTPPath, RouteOptions, Schema, SchemaInput, SchemaOutput } from '@orpc/contract';
 import type { ContextGuard } from './context';
 import type { FlattenLazy } from './lazy';
 import type { Middleware } from './middleware';
@@ -15,15 +15,21 @@ import { ProcedureBuilderWithInput } from './procedure-builder-with-input';
 import { ProcedureBuilderWithOutput } from './procedure-builder-with-output';
 import { DecoratedProcedure } from './procedure-decorated';
 import { RouterBuilder } from './router-builder';
+export interface BuilderConfig extends ContractBuilderConfig {
+    initialInputValidationIndex?: number;
+    initialOutputValidationIndex?: number;
+}
 export interface BuilderDef<TContext extends Context> {
     types?: {
         context: TContext;
     };
+    config: BuilderConfig;
 }
 export declare class Builder<TContext extends Context> {
     '~type': "Builder";
     '~orpc': BuilderDef<TContext>;
     constructor(def: BuilderDef<TContext>);
+    config(config: ContractBuilderConfig): Builder<TContext>;
     context<UContext extends Context = TContext>(): Builder<UContext>;
     middleware<UExtraContext extends Context & ContextGuard<TContext>, TInput, TOutput = any>(middleware: Middleware<TContext, UExtraContext, TInput, TOutput, Record<never, never>>): DecoratedMiddleware<TContext, UExtraContext, TInput, TOutput, Record<never, never>>;
     errors<U extends ErrorMap & ErrorMapSuggestions>(errors: U): BuilderWithErrors<TContext, U>;

package/dist/src/config.d.ts

@@ -0,0 +1,6 @@
+export interface Config {
+    initialInputValidationIndex: number;
+    initialOutputValidationIndex: number;
+}
+export declare function fallbackConfig<T extends keyof Config>(key: T, value?: Config[T]): Config[T];
+//# sourceMappingURL=config.d.ts.map

package/dist/src/index.d.ts

@@ -1,6 +1,7 @@
 import type { WELL_CONTEXT } from './types';
 import { Builder } from './builder';
 export * from './builder';
+export * from './config';
 export * from './error';
 export * from './hidden';
 export * from './implementer-chainable';
@@ -20,6 +21,6 @@ export * from './router-client';
 export * from './router-implementer';
 export * from './types';
 export * from './utils';
-export { configGlobal, fallbackToGlobalConfig, isDefinedError, ORPCError, safe, type } from '@orpc/contract';
+export { isDefinedError, ORPCError, safe, type } from '@orpc/contract';
 export declare const os: Builder<WELL_CONTEXT>;
 //# sourceMappingURL=index.d.ts.map

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@orpc/server",
   "type": "module",
-  "version": "0.31.0",
+  "version": "0.32.0",
   "license": "MIT",
   "homepage": "https://orpc.unnoq.com",
   "repository": {
@@ -53,8 +53,8 @@
     "next": ">=14.0.0"
   },
   "dependencies": {
-    "@orpc/contract": "0.31.0",
-    "@orpc/shared": "0.31.0"
+    "@orpc/contract": "0.32.0",
+    "@orpc/shared": "0.32.0"
   },
   "scripts": {
     "build": "tsup --onSuccess='tsc -b --noCheck'",