@temporary-name/server 1.9.3-alpha.e09726e1bf5340c7b7052eeabcb4935b3c85ce93 → 1.9.3-alpha.e2d8d164da72fb570c2b14a4fa956c80f9e33cdc

package/dist/index.mjs

@@ -1,49 +1,11 @@
-import { isContractProcedure, mergeErrorMap, mergeMeta, mergeRoute, mergePrefix, enhanceRoute, mergeTags, getContractRouter } from '@temporary-name/contract';
-export { ValidationError, eventIterator, type, 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 { c as createProcedureClient, i as isLazy, g as getLazyMeta, l as lazy, u as unlazy, a as gatingContext } from './shared/server.BKh8I1Ny.mjs';
-export { L as LAZY_SYMBOL, b as createORPCErrorConstructorMap, m as mergeCurrentContext, d as middlewareOutputFn } from './shared/server.BKh8I1Ny.mjs';
+import { isContractProcedure, mergePrefix, mergeErrorMap, enhanceRoute, mergeTags, ContractProcedure, mergeMeta, mergeRoute, prefixRoute, getContractRouter } from '@temporary-name/contract';
+export { ValidationError, eventIterator, validateORPCError } from '@temporary-name/contract';
+import { SchemaClass, gatingContext } from '@temporary-name/zod';
+import { c as createProcedureClient, i as isLazy, g as getLazyMeta, l as lazy, u as unlazy } from './shared/server.BYYf0Wn6.mjs';
+export { L as LAZY_SYMBOL, a as createORPCErrorConstructorMap, m as mergeCurrentContext, b as middlewareOutputFn } from './shared/server.BYYf0Wn6.mjs';
 export { getEventMeta, withEventMeta } from '@temporary-name/standard-server';
-import 'node:async_hooks';
-import 'zod';
-import 'zod/v4/core';
-
-function decorateMiddleware(middleware) {
-  const decorated = ((...args) => middleware(...args));
-  decorated.mapInput = (mapInput) => {
-    const mapped = decorateMiddleware(
-      (options, input, ...rest) => middleware(options, mapInput(input), ...rest)
-    );
-    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;
-}
 
 function isStartWithMiddlewares(middlewares, compare) {
   if (compare.length > middlewares.length) {
@@ -82,55 +44,10 @@ function isProcedure(item) {
   if (item instanceof Procedure) {
     return true;
   }
-  return isContractProcedure(item) && "middlewares" in item["~orpc"] && "inputValidationIndex" in item["~orpc"] && "outputValidationIndex" in item["~orpc"] && "handler" in item["~orpc"];
+  return isContractProcedure(item) && "middlewares" in item["~orpc"] && "handler" in item["~orpc"];
 }
 
 class DecoratedProcedure extends Procedure {
-  /**
-   * Adds type-safe custom errors.
-   * The provided errors are spared-merged with any existing errors.
-   *
-   * @see {@link https://orpc.unnoq.com/docs/error-handling#type%E2%80%90safe-error-handling Type-Safe Error Handling Docs}
-   */
-  errors(errors) {
-    return new DecoratedProcedure({
-      ...this["~orpc"],
-      errorMap: mergeErrorMap(this["~orpc"].errorMap, errors)
-    });
-  }
-  /**
-   * Sets or updates the metadata.
-   * The provided metadata is spared-merged with any existing metadata.
-   *
-   * @see {@link https://orpc.unnoq.com/docs/metadata Metadata Docs}
-   */
-  meta(meta) {
-    return new DecoratedProcedure({
-      ...this["~orpc"],
-      meta: mergeMeta(this["~orpc"].meta, meta)
-    });
-  }
-  /**
-   * Sets or updates the route definition.
-   * The provided route is spared-merged with any existing route.
-   * This option is typically relevant when integrating with OpenAPI.
-   *
-   * @see {@link https://orpc.unnoq.com/docs/openapi/routing OpenAPI Routing Docs}
-   * @see {@link https://orpc.unnoq.com/docs/openapi/input-output-structure OpenAPI Input/Output Structure Docs}
-   */
-  route(route) {
-    return new DecoratedProcedure({
-      ...this["~orpc"],
-      route: mergeRoute(this["~orpc"].route, route)
-    });
-  }
-  use(middleware, mapInput) {
-    const mapped = mapInput ? decorateMiddleware(middleware).mapInput(mapInput) : middleware;
-    return new DecoratedProcedure({
-      ...this["~orpc"],
-      middlewares: addMiddleware(this["~orpc"].middlewares, mapped)
-    });
-  }
   /**
    * Make this procedure callable (works like a function while still being a procedure).
    *
@@ -295,87 +212,49 @@ async function unlazyRouter(router) {
   return unlazied;
 }
 
-class Builder {
-  /**
-   * This property holds the defined options.
-   */
-  "~orpc";
+class ProcedureBuilder extends ContractProcedure {
+  z;
   constructor(def) {
-    this["~orpc"] = def;
-  }
-  /**
-   * Set or override the initial context.
-   *
-   * @see {@link https://orpc.unnoq.com/docs/context Context Docs}
-   */
-  $context() {
-    return this;
-  }
-  /**
-   * Creates a middleware.
-   *
-   * @see {@link https://orpc.unnoq.com/docs/middleware Middleware Docs}
-   */
-  middleware(middleware) {
-    return decorateMiddleware(middleware);
+    super(def);
+    this.z = new SchemaClass();
   }
   /**
-   * Adds type-safe custom errors.
-   * The provided errors are spared-merged with any existing errors.
+   * 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 Builder({
+    return new ProcedureBuilder({
       ...this["~orpc"],
       errorMap: mergeErrorMap(this["~orpc"].errorMap, errors)
     });
   }
   /**
-   * 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 Builder({
-      ...this["~orpc"],
-      middlewares: addMiddleware(this["~orpc"].middlewares, middleware)
-    });
-  }
-  useGating(gates, isGateEnabled) {
-    return this.use(({ next, context }) => {
-      return gatingContext.run(
-        (gate) => isGateEnabled(gate, context),
-        () => next({ context: { isGateEnabled } })
-      );
-    });
-  }
-  /**
-   * Sets or updates the metadata.
-   * The provided metadata is spared-merged with any existing metadata.
+   * Sets or updates the metadata for the contract.
+   * The provided metadata is spared-merged with any existing metadata in the contract.
    *
    * @see {@link https://orpc.unnoq.com/docs/metadata Metadata Docs}
    */
   meta(meta) {
-    return new Builder({
+    return new ProcedureBuilder({
       ...this["~orpc"],
       meta: mergeMeta(this["~orpc"].meta, meta)
     });
   }
   /**
-   * Sets or updates the route definition.
-   * The provided route is spared-merged with any existing route.
+   * Sets or updates the route definition for the contract.
+   * The provided route is spared-merged with any existing route in the contract.
    * This option is typically relevant when integrating with OpenAPI.
    *
    * @see {@link https://orpc.unnoq.com/docs/openapi/routing OpenAPI Routing Docs}
    * @see {@link https://orpc.unnoq.com/docs/openapi/input-output-structure OpenAPI Input/Output Structure Docs}
    */
   route(route) {
-    return new Builder({
+    const { prefix } = this["~orpc"];
+    return new ProcedureBuilder({
       ...this["~orpc"],
-      route: mergeRoute(this["~orpc"].route, route)
+      route: mergeRoute(this["~orpc"].route, prefix ? prefixRoute(route, prefix) : route)
     });
   }
   /**
@@ -384,7 +263,7 @@ class Builder {
    * @see {@link https://orpc.unnoq.com/docs/procedure#input-output-validation Input Validation Docs}
    */
   input(schema) {
-    return new Builder({
+    return new ProcedureBuilder({
       ...this["~orpc"],
       inputSchema: schema,
       inputValidationIndex: this["~orpc"].middlewares.length
@@ -396,12 +275,33 @@ class Builder {
    * @see {@link https://orpc.unnoq.com/docs/procedure#input-output-validation Output Validation Docs}
    */
   output(schema) {
-    return new Builder({
+    return new ProcedureBuilder({
       ...this["~orpc"],
       outputSchema: schema,
       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)
+    });
+  }
+  useGating(gates, isGateEnabled) {
+    return this.use(({ next, context }) => {
+      return gatingContext.run(
+        (gate) => isGateEnabled(gate, context),
+        () => next({ context: { isGateEnabled } })
+      );
+    });
+  }
   /**
    * Defines the handler of the procedure.
    *
@@ -413,6 +313,8 @@ class Builder {
       handler
     });
   }
+}
+class BuilderWithMiddlewares extends ProcedureBuilder {
   /**
    * Prefixes all procedures in the router.
    * The provided prefix is post-appended to any existing router prefix.
@@ -422,7 +324,7 @@ class Builder {
    * @see {@link https://orpc.unnoq.com/docs/openapi/routing#route-prefixes OpenAPI Route Prefixes Docs}
    */
   prefix(prefix) {
-    return new Builder({
+    return new this.constructor({
       ...this["~orpc"],
       prefix: mergePrefix(this["~orpc"].prefix, prefix)
     });
@@ -434,7 +336,7 @@ class Builder {
    * @see {@link https://orpc.unnoq.com/docs/openapi/openapi-specification#operation-metadata OpenAPI Operation Metadata Docs}
    */
   tag(...tags) {
-    return new Builder({
+    return new this.constructor({
       ...this["~orpc"],
       tags: mergeTags(this["~orpc"].tags, tags)
     });
@@ -447,25 +349,71 @@ class Builder {
   router(router) {
     return enhanceRouter(router, this["~orpc"]);
   }
+}
+
+function decorateMiddleware(middleware) {
+  const decorated = ((...args) => middleware(...args));
+  decorated.mapInput = (mapInput) => {
+    const mapped = decorateMiddleware(
+      (options, input, ...rest) => middleware(options, mapInput(input), ...rest)
+    );
+    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;
+}
+
+class Builder extends BuilderWithMiddlewares {
+  /**
+   * Set or override the initial context.
+   *
+   * @see {@link https://orpc.unnoq.com/docs/context Context Docs}
+   */
+  $context() {
+    return this;
+  }
   /**
-   * Create a lazy router
-   * And applies all of the previously defined options to the specified router.
+   * Creates a middleware.
    *
-   * @see {@link https://orpc.unnoq.com/docs/router#extending-router Extending Router Docs}
+   * @see {@link https://orpc.unnoq.com/docs/middleware Middleware Docs}
    */
-  lazyRoute(loader) {
-    return enhanceRouter(lazy(loader), this["~orpc"]);
+  middleware(middleware) {
+    return decorateMiddleware(middleware);
   }
 }
 function createApiBuilder(opts = {}) {
-  const base = new Builder({
+  return new Builder({
     route: {},
     meta: opts.meta ?? {},
     errorMap: {},
     inputValidationIndex: 0,
     outputValidationIndex: 0,
     middlewares: [
-      onError((error, options) => {
+      onError((error, _options) => {
         console.dir(error, { depth: null });
       })
     ],
@@ -473,7 +421,6 @@ function createApiBuilder(opts = {}) {
     // the best solution). For now I've removed the interface to configure it externally.
     dedupeLeadingMiddlewares: true
   });
-  return base;
 }
 const os = createApiBuilder();
 
@@ -614,4 +561,4 @@ function createRouterClient(router, ...rest) {
   return recursive;
 }
 
-export { Builder, DecoratedProcedure, Procedure, addMiddleware, call, createAccessibleLazyRouter, createApiBuilder, createAssertedLazyProcedure, createContractedProcedure, createProcedureClient, createRouterClient, decorateMiddleware, enhanceRouter, getHiddenRouterContract, getLazyMeta, getRouter, implement, implementerInternal, isLazy, isProcedure, isStartWithMiddlewares, lazy, mergeMiddlewares, os, resolveContractProcedures, setHiddenRouterContract, traverseContractProcedures, unlazy, unlazyRouter };
+export { Builder, BuilderWithMiddlewares, DecoratedProcedure, Procedure, ProcedureBuilder, addMiddleware, call, createAccessibleLazyRouter, createApiBuilder, createAssertedLazyProcedure, createContractedProcedure, createProcedureClient, createRouterClient, decorateMiddleware, enhanceRouter, getHiddenRouterContract, getLazyMeta, getRouter, implement, implementerInternal, isLazy, isProcedure, isStartWithMiddlewares, lazy, mergeMiddlewares, os, resolveContractProcedures, setHiddenRouterContract, traverseContractProcedures, unlazy, unlazyRouter };

package/dist/openapi/index.mjs

@@ -1,7 +1,7 @@
 import { isProcedure, resolveContractProcedures, ORPCError, createRouterClient } from '@temporary-name/server';
 import { fallbackContractConfig, getEventIteratorSchemaDetails } from '@temporary-name/contract';
 import { isObject, stringifyJSON, findDeepMatches, toArray, clone, value, toHttpPath, isORPCErrorStatus, fallbackORPCErrorStatus, fallbackORPCErrorMessage, resolveMaybeOptionalOptions, createORPCErrorFromJson } from '@temporary-name/shared';
-import { a as standardizeHTTPPath, j as jsonSerialize, g as getDynamicParams, d as deserialize, s as serialize } from '../shared/server.BEHw7Eyx.mjs';
+import { a as standardizeHTTPPath, j as jsonSerialize, g as getDynamicParams, d as deserialize, s as serialize } from '../shared/server.Kxw442A9.mjs';
 import '@temporary-name/standard-server';
 import { TypeName } from '@temporary-name/interop/json-schema-typed/draft-2020-12';
 export { ContentEncoding as JSONSchemaContentEncoding, Format as JSONSchemaFormat, TypeName as JSONSchemaTypeName } from '@temporary-name/interop/json-schema-typed/draft-2020-12';
@@ -542,77 +542,43 @@ ${errors.join("\n\n")}`
       return;
     }
     const dynamicParams = getDynamicParams(def.route.path)?.map((v) => v.name);
-    const inputStructure = fallbackContractConfig("defaultInputStructure", def.route.inputStructure);
     let [required, schema] = await this.converter.convert(def.inputSchema, {
       ...baseSchemaConvertOptions,
       strategy: "input",
-      minStructureDepthForRef: dynamicParams?.length || inputStructure === "detailed" ? 1 : 0
+      minStructureDepthForRef: dynamicParams?.length ? 1 : 0
     });
     if (isAnySchema(schema) && !dynamicParams?.length) {
       return;
     }
-    if (inputStructure === "compact") {
-      if (dynamicParams?.length) {
-        const error2 = new OpenAPIGeneratorError(
-          'When input structure is "compact", and path has dynamic params, input schema must be an object with all dynamic params as required.'
-        );
-        if (!isObjectSchema(schema)) {
-          throw error2;
-        }
-        const [paramsSchema, rest] = separateObjectSchema(schema, dynamicParams);
-        schema = rest;
-        required = rest.required ? rest.required.length !== 0 : false;
-        if (!checkParamsSchema(paramsSchema, dynamicParams)) {
-          throw error2;
-        }
-        ref.parameters ??= [];
-        ref.parameters.push(...toOpenAPIParameters(paramsSchema, "path"));
+    if (dynamicParams?.length) {
+      const error = new OpenAPIGeneratorError(
+        'When input structure is "compact", and path has dynamic params, input schema must be an object with all dynamic params as required.'
+      );
+      if (!isObjectSchema(schema)) {
+        throw error;
       }
-      if (method === "GET") {
-        const resolvedSchema = resolveOpenAPIJsonSchemaRef(doc, schema);
-        if (!isObjectSchema(resolvedSchema)) {
-          throw new OpenAPIGeneratorError(
-            'When method is "GET", input schema must satisfy: object | any | unknown'
-          );
-        }
-        ref.parameters ??= [];
-        ref.parameters.push(...toOpenAPIParameters(resolvedSchema, "query"));
-      } else {
-        ref.requestBody = {
-          required,
-          content: toOpenAPIContent(schema)
-        };
+      const [paramsSchema, rest] = separateObjectSchema(schema, dynamicParams);
+      schema = rest;
+      required = rest.required ? rest.required.length !== 0 : false;
+      if (!checkParamsSchema(paramsSchema, dynamicParams)) {
+        throw error;
       }
-      return;
-    }
-    const error = new OpenAPIGeneratorError(
-      'When input structure is "detailed", input schema must satisfy: { params?: Record<string, unknown>, query?: Record<string, unknown>, headers?: Record<string, unknown>, body?: unknown }'
-    );
-    if (!isObjectSchema(schema)) {
-      throw error;
-    }
-    const resolvedParamSchema = schema.properties?.params !== void 0 ? resolveOpenAPIJsonSchemaRef(doc, schema.properties.params) : void 0;
-    if (dynamicParams?.length && (resolvedParamSchema === void 0 || !isObjectSchema(resolvedParamSchema) || !checkParamsSchema(resolvedParamSchema, dynamicParams))) {
-      throw new OpenAPIGeneratorError(
-        'When input structure is "detailed" and path has dynamic params, the "params" schema must be an object with all dynamic params as required.'
-      );
-    }
-    for (const from of ["params", "query", "headers"]) {
-      const fromSchema = schema.properties?.[from];
-      if (fromSchema !== void 0) {
-        const resolvedSchema = resolveOpenAPIJsonSchemaRef(doc, fromSchema);
-        if (!isObjectSchema(resolvedSchema)) {
-          throw error;
-        }
-        const parameterIn = from === "params" ? "path" : from === "headers" ? "header" : "query";
-        ref.parameters ??= [];
-        ref.parameters.push(...toOpenAPIParameters(resolvedSchema, parameterIn));
+      ref.parameters ??= [];
+      ref.parameters.push(...toOpenAPIParameters(paramsSchema, "path"));
+    }
+    if (method === "GET") {
+      const resolvedSchema = resolveOpenAPIJsonSchemaRef(doc, schema);
+      if (!isObjectSchema(resolvedSchema)) {
+        throw new OpenAPIGeneratorError(
+          'When method is "GET", input schema must satisfy: object | any | unknown'
+        );
       }
-    }
-    if (schema.properties?.body !== void 0) {
+      ref.parameters ??= [];
+      ref.parameters.push(...toOpenAPIParameters(resolvedSchema, "query"));
+    } else {
       ref.requestBody = {
-        required: schema.required?.includes("body"),
-        content: toOpenAPIContent(schema.properties.body)
+        required,
+        content: toOpenAPIContent(schema)
       };
     }
   }

package/dist/plugins/index.d.mts

@@ -1,8 +1,8 @@
 import { Value, Promisable, ORPCError } from '@temporary-name/shared';
 import { StandardRequest, StandardHeaders } from '@temporary-name/standard-server';
 import { BatchResponseBodyItem } from '@temporary-name/standard-server/batch';
-import { S as StandardHandlerInterceptorOptions, a as StandardHandlerPlugin, b as StandardHandlerOptions } from '../shared/server.C1fnTLq0.mjs';
-import { C as Context, E as ProcedureClientInterceptorOptions } from '../shared/server.BKSOrA6h.mjs';
+import { S as StandardHandlerInterceptorOptions, a as StandardHandlerPlugin, b as StandardHandlerOptions } from '../shared/server.CT1xhSmE.mjs';
+import { C as Context, E as ProcedureClientInterceptorOptions } from '../shared/server.C3RuMHWl.mjs';
 import { Meta } from '@temporary-name/contract';
 
 interface BatchHandlerOptions<T extends Context> {

package/dist/plugins/index.d.ts

@@ -1,8 +1,8 @@
 import { Value, Promisable, ORPCError } from '@temporary-name/shared';
 import { StandardRequest, StandardHeaders } from '@temporary-name/standard-server';
 import { BatchResponseBodyItem } from '@temporary-name/standard-server/batch';
-import { S as StandardHandlerInterceptorOptions, a as StandardHandlerPlugin, b as StandardHandlerOptions } from '../shared/server.CQyYNJ1H.js';
-import { C as Context, E as ProcedureClientInterceptorOptions } from '../shared/server.BKSOrA6h.js';
+import { S as StandardHandlerInterceptorOptions, a as StandardHandlerPlugin, b as StandardHandlerOptions } from '../shared/server.cjcgLdr1.js';
+import { C as Context, E as ProcedureClientInterceptorOptions } from '../shared/server.C3RuMHWl.js';
 import { Meta } from '@temporary-name/contract';
 
 interface BatchHandlerOptions<T extends Context> {

package/dist/shared/{server.BeuTpcmO.d.mts → server.B93y_8tj.d.mts}

@@ -1,6 +1,6 @@
 import { HTTPPath } from '@temporary-name/shared';
-import { C as Context } from './server.BKSOrA6h.mjs';
-import { c as StandardHandleOptions } from './server.C1fnTLq0.mjs';
+import { C as Context } from './server.C3RuMHWl.mjs';
+import { c as StandardHandleOptions } from './server.CT1xhSmE.mjs';
 
 type FriendlyStandardHandleOptions<T extends Context> = Omit<StandardHandleOptions<T>, 'context'> & (Record<never, never> extends T ? {
     context?: T;