@temporary-name/server 1.9.3-alpha.6a70825f6d8c3dc99b87e4e5b778aea0fa007417 → 1.9.3-alpha.6a735c9469d995338b7d51335ea70485e18a4dca

package/dist/index.mjs

@@ -1,12 +1,79 @@
-import { mergePrefix, mergeTags, ContractProcedure, mergeErrorMap, mergeMeta, mergeRoute, prefixRoute, initialSchemas, isContractProcedure, getContractRouter } from '@temporary-name/contract';
-export { ValidationError, eventIterator, validateORPCError } from '@temporary-name/contract';
-import { onError, resolveMaybeOptionalOptions } from '@temporary-name/shared';
-export { AsyncIteratorClass, EventPublisher, ORPCError, asyncIteratorToStream as eventIteratorToStream, isDefinedError, onError, onFinish, onStart, onSuccess, safe, streamToAsyncIteratorClass as streamToEventIterator } from '@temporary-name/shared';
-import { SchemaClass, core, object, gatingContext } from '@temporary-name/zod';
+import { assertNever, splitFirst, ORPCError, onError, isObject, toArray, guard, resolveMaybeOptionalOptions, isTypescriptObject, isPropertyKey } from '@temporary-name/shared';
+export { AsyncIteratorClass, EventPublisher, ORPCError, asyncIteratorToStream as eventIteratorToStream, isDefinedError, onError, onFinish, onStart, onSuccess, streamToAsyncIteratorClass as streamToEventIterator } from '@temporary-name/shared';
+import * as z from '@temporary-name/zod';
+import { SchemaClass, object, core, gatingContext } from '@temporary-name/zod';
+import { g as getCookie } from './shared/server.C1RJffw4.mjs';
+import { P as Procedure, m as mergePrefix, a as mergeTags, e as enhanceRouter, C as Contract, p as parseEndpointDefinition, b as mergeRoute, c as prefixRoute, d as addMiddleware, l as lazyInternal, f as getLazyMeta, u as unlazy, i as isProcedure } from './shared/server.BETu17rq.mjs';
+export { L as LAZY_SYMBOL, V as ValidationError, q as createAccessibleLazyRouter, w as endpointRegex, g as getDynamicParams, o as getRouter, j as isLazy, k as isStartWithMiddlewares, h as lazy, n as mergeMiddlewares, r as resolveContractProcedures, s as standardizeHTTPPath, t as traverseContractProcedures, v as unlazyRouter } from './shared/server.BETu17rq.mjs';
+import { c as createProcedureClient } from './shared/server.BCY45g2x.mjs';
+export { m as mergeCurrentContext, a as middlewareOutputFn } from './shared/server.BCY45g2x.mjs';
+import { J as JsonSchemaXNativeType } from './shared/server.B_oW_rPl.mjs';
+export { b as JSON_SCHEMA_INPUT_REGISTRY, c as JSON_SCHEMA_OUTPUT_REGISTRY, a as JSON_SCHEMA_REGISTRY, Z as ZodToJsonSchemaConverter, e as eventIterator, g as getEventIteratorSchemaDetails } from './shared/server.B_oW_rPl.mjs';
 export { getEventMeta, withEventMeta } from '@temporary-name/standard-server';
-import { g as getDynamicParams } from './shared/server.DN9mVGfv.mjs';
-import { P as Procedure, c as createProcedureClient, e as enhanceRouter, a as addMiddleware, s as setHiddenRouterContract, l as lazyInternal, g as getLazyMeta, u as unlazy, i as isProcedure, b as isLazy, d as getRouter } from './shared/server.CHV9AQHl.mjs';
-export { L as LAZY_SYMBOL, p as createAccessibleLazyRouter, f as createORPCErrorConstructorMap, o as getHiddenRouterContract, k as isStartWithMiddlewares, h as lazy, m as mergeCurrentContext, n as mergeMiddlewares, j as middlewareOutputFn, r as resolveContractProcedures, t as traverseContractProcedures, q as unlazyRouter } from './shared/server.CHV9AQHl.mjs';
+import 'cookie';
+import '@temporary-name/server/openapi';
+import 'zod/v4/core';
+
+function validateTokenPrefix(prefix, token) {
+  if (prefix && !token.startsWith(prefix)) {
+    throw new ORPCError("UNAUTHORIZED", { message: `Invalid auth token. It must start with "${prefix}"` });
+  }
+}
+function validateTokenAuth(config, token, options) {
+  const { tokenPrefix, validate } = config;
+  validateTokenPrefix(tokenPrefix, token);
+  return validate(token, options);
+}
+function runAuth(config, options) {
+  switch (config.type) {
+    case "header": {
+      const authHeader = options.request.headers.get(config.name);
+      return authHeader ? validateTokenAuth(config, authHeader, options) : void 0;
+    }
+    case "query": {
+      const { name, tokenPrefix, validate } = config;
+      const query = options.request.url.searchParams;
+      const token = query.get(name);
+      if (!token) return void 0;
+      validateTokenPrefix(tokenPrefix, token);
+      return validate(token, options);
+    }
+    case "cookie": {
+      const cookie = getCookie(options.request.headers, config.name);
+      return cookie ? validateTokenAuth(config, cookie, options) : void 0;
+    }
+    case "bearer": {
+      const authHeader = options.request.headers.get("Authorization");
+      if (!authHeader) return void 0;
+      const [authType, bearer] = splitFirst(authHeader, " ");
+      return authType === "Bearer" ? validateTokenAuth(config, bearer, options) : void 0;
+    }
+    case "basic": {
+      const authHeader = options.request.headers.get("Authorization");
+      if (!authHeader) return void 0;
+      const [authType, encoded] = splitFirst(authHeader, " ");
+      if (authType !== "Basic") return void 0;
+      const decoded = Buffer.from(encoded, "base64").toString("utf-8");
+      const [username, password] = splitFirst(decoded, ":");
+      validateTokenPrefix(config.tokenPrefix, password);
+      return config.validate(username, password, options);
+    }
+    case "none": {
+      return false;
+    }
+    default: {
+      assertNever(config);
+    }
+  }
+}
+function authDescription(config) {
+  const { type } = config;
+  return type === "basic" ? "a Basic Authentication header" : type === "bearer" ? "a Bearer Authentication header" : type === "header" ? `a header named "${config.name}"` : type === "query" ? `a query parameter named "${config.name}"` : type === "cookie" ? `a cookie named "${config.name}"` : type === "none" ? "no authentication" : assertNever(type);
+}
+
+function mergeMeta(meta1, meta2) {
+  return { ...meta1, ...meta2 };
+}
 
 class DecoratedProcedure extends Procedure {
   /**
@@ -27,24 +94,19 @@ class DecoratedProcedure extends Procedure {
   }
 }
 
-class ProcedureBuilder extends ContractProcedure {
+const initialSchemas = {
+  pathSchema: z.strictObject({}),
+  querySchema: z.strictObject({}),
+  bodySchema: z.strictObject({}),
+  outputSchema: z.unknown()
+};
+
+class ProcedureBuilder extends Contract {
   z;
   constructor(def) {
     super(def);
     this.z = new SchemaClass();
   }
-  /**
-   * Adds type-safe custom errors to the contract.
-   * The provided errors are spared-merged with any existing errors in the contract.
-   *
-   * @see {@link https://orpc.unnoq.com/docs/error-handling#type%E2%80%90safe-error-handling Type-Safe Error Handling Docs}
-   */
-  errors(errors) {
-    return new ProcedureBuilder({
-      ...this["~orpc"],
-      errorMap: mergeErrorMap(this["~orpc"].errorMap, errors)
-    });
-  }
   /**
    * Sets or updates the metadata for the contract.
    * The provided metadata is spared-merged with any existing metadata in the contract.
@@ -57,16 +119,8 @@ class ProcedureBuilder extends ContractProcedure {
       meta: mergeMeta(this["~orpc"].meta, meta)
     });
   }
-  endpoint(endpoint, schema) {
-    const [method, path] = endpoint.split(" ", 2);
-    const pathParamNames = getDynamicParams(path)?.map((p) => p.name) ?? [];
-    if (schema && !(schema instanceof core.$ZodObject)) {
-      throw new Error(`Path schema for endpoint "${endpoint}" must be a ZodObject schema.`);
-    }
-    const schemaKeys = schema ? Object.keys(schema._zod.def.shape) : [];
-    if (pathParamNames.length !== schemaKeys.length || !pathParamNames.every((name) => schemaKeys.includes(name))) {
-      throw new Error(`Path schema keys do not match dynamic parameters in endpoint "${endpoint}".`);
-    }
+  endpoint(stringsOrEndpoint, ...values) {
+    const { method, path, pathSchema } = parseEndpointDefinition(stringsOrEndpoint, values);
     const { prefix } = this["~orpc"];
     const route = { method, path };
     return new ProcedureBuilder({
@@ -74,7 +128,7 @@ class ProcedureBuilder extends ContractProcedure {
       route: mergeRoute(this["~orpc"].route, prefix ? prefixRoute(route, prefix) : route),
       schemas: {
         ...this["~orpc"].schemas,
-        pathSchema: schema instanceof core.$ZodType ? schema : object(schema ?? {})
+        pathSchema
       }
     });
   }
@@ -128,19 +182,40 @@ class ProcedureBuilder extends ContractProcedure {
       outputValidationIndex: this["~orpc"].middlewares.length
     });
   }
-  /**
-   * Uses a middleware to modify the context or improve the pipeline.
-   *
-   * @info Supports both normal middleware and inline middleware implementations.
-   * @note The current context must be satisfy middleware dependent-context
-   * @see {@link https://orpc.unnoq.com/docs/middleware Middleware Docs}
-   */
   use(middleware) {
     return new this.constructor({
       ...this["~orpc"],
       middlewares: addMiddleware(this["~orpc"].middlewares, middleware)
     });
   }
+  // The default of false for ValidatedAuthContext is used when you pass in the type 'none'. We use false
+  // because we can't use null or undefined (see ValidatedAuthContext) but we still want it to be falsy.
+  useAuth(config) {
+    const middleware = baseApi.$context().middleware(async (options) => {
+      const { next, context } = options;
+      if (context.auth) return next();
+      const auth = await runAuth(config, options);
+      if (auth === void 0) {
+        const { authConfigs } = options.procedure["~orpc"];
+        if (context.auth !== false && config === authConfigs.at(-1)) {
+          let authDescriptions = authConfigs.map(authDescription).join(", ");
+          if (authConfigs.length > 1) {
+            authDescriptions = `one of: ${authDescriptions}`;
+          }
+          throw new ORPCError("UNAUTHORIZED", {
+            message: `Authentication required. You must provide ${authDescriptions}`
+          });
+        }
+        return next();
+      }
+      return next({ context: { auth } });
+    });
+    return new this.constructor({
+      ...this["~orpc"],
+      authConfigs: [...this["~orpc"].authConfigs, config],
+      middlewares: addMiddleware(this["~orpc"].middlewares, middleware)
+    });
+  }
   useGating(gates, isGateEnabled) {
     return this.use(({ next, context }) => {
       return gatingContext.run(
@@ -155,6 +230,9 @@ class ProcedureBuilder extends ContractProcedure {
    * @see {@link https://orpc.unnoq.com/docs/procedure Procedure Docs}
    */
   handler(handler) {
+    if (this["~orpc"].schemas.outputSchema === initialSchemas.outputSchema) {
+      throw new Error("You must call .output() before calling .handler()");
+    }
     return new DecoratedProcedure({
       ...this["~orpc"],
       handler
@@ -206,31 +284,6 @@ function decorateMiddleware(middleware) {
     );
     return mapped;
   };
-  decorated.concat = (concatMiddleware, mapInput) => {
-    const mapped = mapInput ? decorateMiddleware(concatMiddleware).mapInput(mapInput) : concatMiddleware;
-    const concatted = decorateMiddleware((options, input, output, ...rest) => {
-      const merged = middleware(
-        {
-          ...options,
-          next: (...[nextOptions1]) => mapped(
-            {
-              ...options,
-              context: { ...options.context, ...nextOptions1?.context },
-              next: (...[nextOptions2]) => options.next({ context: { ...nextOptions1?.context, ...nextOptions2?.context } })
-            },
-            input,
-            output,
-            ...rest
-          )
-        },
-        input,
-        output,
-        ...rest
-      );
-      return merged;
-    });
-    return concatted;
-  };
   return decorated;
 }
 
@@ -252,98 +305,347 @@ class Builder extends BuilderWithMiddlewares {
     return decorateMiddleware(middleware);
   }
 }
-function createApiBuilder(opts = {}) {
-  return new Builder({
-    route: {},
-    meta: opts.meta ?? {},
-    errorMap: {},
-    inputValidationIndex: 0,
-    outputValidationIndex: 0,
-    middlewares: [
-      onError((error, _options) => {
-        console.dir(error, { depth: null });
-      })
-    ],
-    schemas: initialSchemas,
-    // NB: this is a relic from orpc -- I'm not convinced there's a need for this (or if there is, that it's
-    // the best solution). For now I've removed the interface to configure it externally.
-    dedupeLeadingMiddlewares: true
-  });
-}
-const os = createApiBuilder();
+const baseApi = new Builder({
+  route: {},
+  meta: {},
+  inputValidationIndex: 0,
+  outputValidationIndex: 0,
+  middlewares: [
+    onError((error, _options) => {
+      console.dir(error, { depth: null });
+    })
+  ],
+  schemas: initialSchemas,
+  // NB: this is a relic from orpc -- I'm not convinced there's a need for this (or if there is, that it's
+  // the best solution). For now I've removed the interface to configure it externally.
+  dedupeLeadingMiddlewares: true,
+  authConfigs: []
+});
 
-function implementerInternal(contract, middlewares) {
-  if (isContractProcedure(contract)) {
-    const impl2 = new Builder({
-      ...contract["~orpc"],
-      middlewares,
-      inputValidationIndex: middlewares.length,
-      outputValidationIndex: middlewares.length,
-      dedupeLeadingMiddlewares: true
-    });
-    return impl2;
+const FLEXIBLE_DATE_FORMAT_REGEX = /^[^-]+-[^-]+-[^-]+$/;
+class experimental_JsonSchemaCoercer {
+  coerce(schema, value, options = {}) {
+    const [, coerced] = this.#coerce(schema, value, options);
+    return coerced;
   }
-  const impl = new Proxy(contract, {
-    get: (target, key) => {
-      if (typeof key !== "string") {
-        return Reflect.get(target, key);
-      }
-      let method;
-      if (key === "middleware") {
-        method = (mid) => decorateMiddleware(mid);
-      } else if (key === "use") {
-        method = (mid) => {
-          return implementerInternal(contract, addMiddleware(middlewares, mid));
-        };
-      } else if (key === "router") {
-        method = (router) => {
-          const adapted = enhanceRouter(router, {
-            middlewares,
-            errorMap: {},
-            prefix: void 0,
-            tags: void 0,
-            dedupeLeadingMiddlewares: true
-          });
-          return setHiddenRouterContract(adapted, contract);
-        };
+  #coerce(schema, originalValue, options) {
+    if (typeof schema === "boolean") {
+      return [schema, originalValue];
+    }
+    if (Array.isArray(schema.type)) {
+      return this.#coerce(
+        {
+          anyOf: schema.type.map((type) => ({ ...schema, type }))
+        },
+        originalValue,
+        options
+      );
+    }
+    let coerced = originalValue;
+    let satisfied = true;
+    if (typeof schema.$ref === "string") {
+      const refSchema = options?.components?.[schema.$ref];
+      if (refSchema !== void 0) {
+        const [subSatisfied, subCoerced] = this.#coerce(refSchema, coerced, options);
+        coerced = subCoerced;
+        satisfied = subSatisfied;
       }
-      const next = getContractRouter(target, [key]);
-      if (!next) {
-        return method ?? next;
+    }
+    const enumValues = schema.const !== void 0 ? [schema.const] : schema.enum;
+    if (enumValues !== void 0 && !enumValues.includes(coerced)) {
+      if (typeof coerced === "string") {
+        const numberValue = this.#stringToNumber(coerced);
+        if (enumValues.includes(numberValue)) {
+          coerced = numberValue;
+        } else {
+          const booleanValue = this.#stringToBoolean(coerced);
+          if (enumValues.includes(booleanValue)) {
+            coerced = booleanValue;
+          } else {
+            satisfied = false;
+          }
+        }
+      } else {
+        satisfied = false;
       }
-      const nextImpl = implementerInternal(next, middlewares);
-      if (method) {
-        return new Proxy(method, {
-          get(_, key2) {
-            return Reflect.get(nextImpl, key2);
+    }
+    if (typeof schema.type === "string") {
+      switch (schema.type) {
+        case "null": {
+          if (coerced !== null) {
+            satisfied = false;
+          }
+          break;
+        }
+        case "string": {
+          if (typeof coerced !== "string") {
+            satisfied = false;
           }
-        });
+          break;
+        }
+        case "number": {
+          if (typeof coerced === "string") {
+            coerced = this.#stringToNumber(coerced);
+          }
+          if (typeof coerced !== "number") {
+            satisfied = false;
+          }
+          break;
+        }
+        case "integer": {
+          if (typeof coerced === "string") {
+            coerced = this.#stringToInteger(coerced);
+          }
+          if (typeof coerced !== "number" || !Number.isInteger(coerced)) {
+            satisfied = false;
+          }
+          break;
+        }
+        case "boolean": {
+          if (typeof coerced === "string") {
+            coerced = this.#stringToBoolean(coerced);
+          }
+          if (typeof coerced !== "boolean") {
+            satisfied = false;
+          }
+          break;
+        }
+        case "array": {
+          if (Array.isArray(coerced)) {
+            const prefixItemSchemas = "prefixItems" in schema ? toArray(schema.prefixItems) : Array.isArray(schema.items) ? schema.items : [];
+            const itemSchema = Array.isArray(schema.items) ? schema.additionalItems : schema.items;
+            let shouldUseCoercedItems = false;
+            const coercedItems = coerced.map((item, i) => {
+              const subSchema = prefixItemSchemas[i] ?? itemSchema;
+              if (subSchema === void 0) {
+                satisfied = false;
+                return item;
+              }
+              const [subSatisfied, subCoerced] = this.#coerce(subSchema, item, options);
+              if (!subSatisfied) {
+                satisfied = false;
+              }
+              if (subCoerced !== item) {
+                shouldUseCoercedItems = true;
+              }
+              return subCoerced;
+            });
+            if (coercedItems.length < prefixItemSchemas.length) {
+              satisfied = false;
+            }
+            if (shouldUseCoercedItems) {
+              coerced = coercedItems;
+            }
+          } else {
+            satisfied = false;
+          }
+          break;
+        }
+        case "object": {
+          if (Array.isArray(coerced)) {
+            coerced = { ...coerced };
+          }
+          if (isObject(coerced)) {
+            let shouldUseCoercedItems = false;
+            const coercedItems = {};
+            const patternProperties = Object.entries(schema.patternProperties ?? {}).map(
+              ([key, value]) => [new RegExp(key), value]
+            );
+            for (const key in coerced) {
+              const value = coerced[key];
+              const subSchema = schema.properties?.[key] ?? patternProperties.find(([pattern]) => pattern.test(key))?.[1] ?? schema.additionalProperties;
+              if (value === void 0 && !schema.required?.includes(key)) {
+                coercedItems[key] = value;
+              } else if (subSchema === void 0) {
+                coercedItems[key] = value;
+                satisfied = false;
+              } else {
+                const [subSatisfied, subCoerced] = this.#coerce(subSchema, value, options);
+                coercedItems[key] = subCoerced;
+                if (!subSatisfied) {
+                  satisfied = false;
+                }
+                if (subCoerced !== value) {
+                  shouldUseCoercedItems = true;
+                }
+              }
+            }
+            if (schema.required?.some((key) => !Object.hasOwn(coercedItems, key))) {
+              satisfied = false;
+            }
+            if (shouldUseCoercedItems) {
+              coerced = coercedItems;
+            }
+          } else {
+            satisfied = false;
+          }
+          break;
+        }
       }
-      return nextImpl;
     }
-  });
-  return impl;
-}
-function implement(contract) {
-  const implInternal = implementerInternal(contract, []);
-  const impl = new Proxy(implInternal, {
-    get: (target, key) => {
-      let method;
-      if (key === "$context") {
-        method = () => impl;
+    if ("x-native-type" in schema && typeof schema["x-native-type"] === "string") {
+      switch (schema["x-native-type"]) {
+        case JsonSchemaXNativeType.Date: {
+          if (typeof coerced === "string") {
+            coerced = this.#stringToDate(coerced);
+          }
+          if (!(coerced instanceof Date)) {
+            satisfied = false;
+          }
+          break;
+        }
+        case JsonSchemaXNativeType.BigInt: {
+          switch (typeof coerced) {
+            case "string":
+              coerced = this.#stringToBigInt(coerced);
+              break;
+            case "number":
+              coerced = this.#numberToBigInt(coerced);
+              break;
+          }
+          if (typeof coerced !== "bigint") {
+            satisfied = false;
+          }
+          break;
+        }
+        case JsonSchemaXNativeType.RegExp: {
+          if (typeof coerced === "string") {
+            coerced = this.#stringToRegExp(coerced);
+          }
+          if (!(coerced instanceof RegExp)) {
+            satisfied = false;
+          }
+          break;
+        }
+        case JsonSchemaXNativeType.Url: {
+          if (typeof coerced === "string") {
+            coerced = this.#stringToURL(coerced);
+          }
+          if (!(coerced instanceof URL)) {
+            satisfied = false;
+          }
+          break;
+        }
+        case JsonSchemaXNativeType.Set: {
+          if (Array.isArray(coerced)) {
+            coerced = this.#arrayToSet(coerced);
+          }
+          if (!(coerced instanceof Set)) {
+            satisfied = false;
+          }
+          break;
+        }
+        case JsonSchemaXNativeType.Map: {
+          if (Array.isArray(coerced)) {
+            coerced = this.#arrayToMap(coerced);
+          }
+          if (!(coerced instanceof Map)) {
+            satisfied = false;
+          }
+          break;
+        }
       }
-      const next = Reflect.get(target, key);
-      if (!method || !next || typeof next !== "function" && typeof next !== "object") {
-        return method || next;
+    }
+    if (schema.allOf) {
+      for (const subSchema of schema.allOf) {
+        const [subSatisfied, subCoerced] = this.#coerce(subSchema, coerced, options);
+        coerced = subCoerced;
+        if (!subSatisfied) {
+          satisfied = false;
+        }
       }
-      return new Proxy(method, {
-        get(_, key2) {
-          return Reflect.get(next, key2);
+    }
+    for (const key of ["anyOf", "oneOf"]) {
+      if (schema[key]) {
+        let bestOptions;
+        for (const subSchema of schema[key]) {
+          const [subSatisfied, subCoerced] = this.#coerce(subSchema, coerced, options);
+          if (subSatisfied) {
+            if (!bestOptions || subCoerced === coerced) {
+              bestOptions = { coerced: subCoerced, satisfied: subSatisfied };
+            }
+            if (subCoerced === coerced) {
+              break;
+            }
+          }
         }
-      });
+        coerced = bestOptions ? bestOptions.coerced : coerced;
+        satisfied = bestOptions ? bestOptions.satisfied : false;
+      }
+    }
+    if (typeof schema.not !== "undefined") {
+      const [notSatisfied] = this.#coerce(schema.not, coerced, options);
+      if (notSatisfied) {
+        satisfied = false;
+      }
+    }
+    return [satisfied, coerced];
+  }
+  #stringToNumber(value) {
+    const num = Number.parseFloat(value);
+    if (Number.isNaN(num) || num !== Number(value)) {
+      return value;
+    }
+    return num;
+  }
+  #stringToInteger(value) {
+    const num = Number.parseInt(value);
+    if (Number.isNaN(num) || num !== Number(value)) {
+      return value;
+    }
+    return num;
+  }
+  #stringToBoolean(value) {
+    const lower = value.toLowerCase();
+    if (lower === "false" || lower === "off") {
+      return false;
+    }
+    if (lower === "true" || lower === "on") {
+      return true;
+    }
+    return value;
+  }
+  #stringToBigInt(value) {
+    return guard(() => BigInt(value)) ?? value;
+  }
+  #numberToBigInt(value) {
+    return guard(() => BigInt(value)) ?? value;
+  }
+  #stringToDate(value) {
+    const date = new Date(value);
+    if (Number.isNaN(date.getTime()) || !FLEXIBLE_DATE_FORMAT_REGEX.test(value)) {
+      return value;
     }
-  });
-  return impl;
+    return date;
+  }
+  #stringToRegExp(value) {
+    const match = value.match(/^\/(.*)\/([a-z]*)$/);
+    if (match) {
+      const [, pattern, flags] = match;
+      return guard(() => new RegExp(pattern, flags)) ?? value;
+    }
+    return value;
+  }
+  #stringToURL(value) {
+    return guard(() => new URL(value)) ?? value;
+  }
+  #arrayToSet(value) {
+    const set = new Set(value);
+    if (set.size !== value.length) {
+      return value;
+    }
+    return set;
+  }
+  #arrayToMap(value) {
+    if (value.some((item) => !Array.isArray(item) || item.length !== 2)) {
+      return value;
+    }
+    const result = new Map(value);
+    if (result.size !== value.length) {
+      return value;
+    }
+    return result;
+  }
 }
 
 function createAssertedLazyProcedure(lazied) {
@@ -360,42 +662,26 @@ function createAssertedLazyProcedure(lazied) {
   }, getLazyMeta(lazied));
   return lazyProcedure;
 }
-function createContractedProcedure(procedure, contract) {
-  return new Procedure({
-    ...procedure["~orpc"],
-    errorMap: contract["~orpc"].errorMap,
-    route: contract["~orpc"].route,
-    meta: contract["~orpc"].meta
-  });
-}
 function call(procedure, input, ...rest) {
   const options = resolveMaybeOptionalOptions(rest);
   return createProcedureClient(procedure, options)(input, options);
 }
 
-function createRouterClient(router, ...rest) {
-  const options = resolveMaybeOptionalOptions(rest);
-  if (isProcedure(router)) {
-    const caller = createProcedureClient(router, options);
-    return caller;
-  }
-  const procedureCaller = isLazy(router) ? createProcedureClient(createAssertedLazyProcedure(router), options) : {};
-  const recursive = new Proxy(procedureCaller, {
-    get(target, key) {
-      if (typeof key !== "string") {
-        return Reflect.get(target, key);
-      }
-      const next = getRouter(router, [key]);
-      if (!next) {
-        return Reflect.get(target, key);
-      }
-      return createRouterClient(next, {
-        ...rest[0],
-        path: [...rest[0]?.path ?? [], key]
-      });
+function isSchemaIssue(issue) {
+  if (!isTypescriptObject(issue) || typeof issue.message !== "string") {
+    return false;
+  }
+  if (issue.path !== void 0) {
+    if (!Array.isArray(issue.path)) {
+      return false;
     }
-  });
-  return recursive;
+    if (!issue.path.every(
+      (segment) => isPropertyKey(segment) || isTypescriptObject(segment) && isPropertyKey(segment.key)
+    )) {
+      return false;
+    }
+  }
+  return true;
 }
 
-export { Builder, BuilderWithMiddlewares, DecoratedProcedure, Procedure, ProcedureBuilder, addMiddleware, call, createApiBuilder, createAssertedLazyProcedure, createContractedProcedure, createProcedureClient, createRouterClient, decorateMiddleware, enhanceRouter, getLazyMeta, getRouter, implement, implementerInternal, isLazy, isProcedure, lazyInternal, os, setHiddenRouterContract, unlazy };
+export { Builder, BuilderWithMiddlewares, Contract, DecoratedProcedure, JsonSchemaXNativeType, Procedure, ProcedureBuilder, addMiddleware, baseApi, call, createAssertedLazyProcedure, createProcedureClient, decorateMiddleware, enhanceRouter, experimental_JsonSchemaCoercer, getLazyMeta, initialSchemas, isProcedure, isSchemaIssue, lazyInternal, mergeMeta, parseEndpointDefinition, unlazy };