@temporary-name/server 1.9.3-alpha.d9b25e999833b2b788712bccd5957f10e42416b0 → 1.9.3-alpha.dff27b31c00072e392d67d0cd8ca5b94835839f9

package/dist/adapters/aws-lambda/index.mjs

@@ -1,13 +1,13 @@
 import { resolveMaybeOptionalOptions } from '@temporary-name/shared';
 import { toStandardLazyRequest, sendStandardResponse } from '@temporary-name/standard-server-aws-lambda';
-import { S as StandardHandler, r as resolveFriendlyStandardHandleOptions } from '../../shared/server.BeBVpcA9.mjs';
+import { S as StandardHandler, r as resolveFriendlyStandardHandleOptions } from '../../shared/server.CqTex_jI.mjs';
 import '@temporary-name/contract';
 import '@temporary-name/standard-server';
 import '@temporary-name/server';
 import 'rou3';
 import '../../shared/server.BYYf0Wn6.mjs';
 import '@temporary-name/zod';
-import '../../shared/server.BEHw7Eyx.mjs';
+import '../../shared/server.Kxw442A9.mjs';
 
 class AwsLambdaHandler {
   sendStandardResponseOptions;

package/dist/adapters/fetch/index.mjs

@@ -1,13 +1,13 @@
 import { ORPCError, toArray, intercept, resolveMaybeOptionalOptions } from '@temporary-name/shared';
 import { toStandardLazyRequest, toFetchResponse } from '@temporary-name/standard-server-fetch';
-import { C as CompositeStandardHandlerPlugin, S as StandardHandler, r as resolveFriendlyStandardHandleOptions } from '../../shared/server.BeBVpcA9.mjs';
+import { C as CompositeStandardHandlerPlugin, S as StandardHandler, r as resolveFriendlyStandardHandleOptions } from '../../shared/server.CqTex_jI.mjs';
 import '@temporary-name/contract';
 import '@temporary-name/standard-server';
 import '@temporary-name/server';
 import 'rou3';
 import '@temporary-name/zod';
 import '../../shared/server.BYYf0Wn6.mjs';
-import '../../shared/server.BEHw7Eyx.mjs';
+import '../../shared/server.Kxw442A9.mjs';
 
 class BodyLimitPlugin {
   maxBodySize;

package/dist/adapters/node/index.mjs

@@ -1,14 +1,14 @@
 import { once, ORPCError, toArray, intercept, resolveMaybeOptionalOptions } from '@temporary-name/shared';
 import compression from '@temporary-name/interop/compression';
 import { toStandardLazyRequest, sendStandardResponse } from '@temporary-name/standard-server-node';
-import { C as CompositeStandardHandlerPlugin, S as StandardHandler, r as resolveFriendlyStandardHandleOptions } from '../../shared/server.BeBVpcA9.mjs';
+import { C as CompositeStandardHandlerPlugin, S as StandardHandler, r as resolveFriendlyStandardHandleOptions } from '../../shared/server.CqTex_jI.mjs';
 import '@temporary-name/contract';
 import '@temporary-name/standard-server';
 import '@temporary-name/server';
 import 'rou3';
 import '@temporary-name/zod';
 import '../../shared/server.BYYf0Wn6.mjs';
-import '../../shared/server.BEHw7Eyx.mjs';
+import '../../shared/server.Kxw442A9.mjs';
 
 class BodyLimitPlugin {
   maxBodySize;

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

@@ -6,7 +6,7 @@ export { F as FriendlyStandardHandleOptions, d as decodeParams, r as resolveFrie
 import '@temporary-name/contract';
 import '../../shared/server.C3RuMHWl.mjs';
 
-declare function decode(request: StandardLazyRequest, params: Record<string, string> | undefined, procedure: AnyProcedure): Promise<unknown>;
+declare function decode(request: StandardLazyRequest, pathParams: Record<string, string> | undefined): Promise<unknown>;
 declare function encode(output: unknown, procedure: AnyProcedure): StandardResponse;
 declare function encodeError(error: ORPCError<any, any>): StandardResponse;
 

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

@@ -6,7 +6,7 @@ export { F as FriendlyStandardHandleOptions, d as decodeParams, r as resolveFrie
 import '@temporary-name/contract';
 import '../../shared/server.C3RuMHWl.js';
 
-declare function decode(request: StandardLazyRequest, params: Record<string, string> | undefined, procedure: AnyProcedure): Promise<unknown>;
+declare function decode(request: StandardLazyRequest, pathParams: Record<string, string> | undefined): Promise<unknown>;
 declare function encode(output: unknown, procedure: AnyProcedure): StandardResponse;
 declare function encodeError(error: ORPCError<any, any>): StandardResponse;
 

package/dist/adapters/standard/index.mjs

@@ -1,9 +1,9 @@
-export { C as CompositeStandardHandlerPlugin, S as StandardHandler, b as StandardOpenAPIMatcher, d as decode, c as decodeParams, e as encode, a as encodeError, r as resolveFriendlyStandardHandleOptions, t as toRou3Pattern } from '../../shared/server.BeBVpcA9.mjs';
+export { C as CompositeStandardHandlerPlugin, S as StandardHandler, b as StandardOpenAPIMatcher, d as decode, c as decodeParams, e as encode, a as encodeError, r as resolveFriendlyStandardHandleOptions, t as toRou3Pattern } from '../../shared/server.CqTex_jI.mjs';
 import '@temporary-name/shared';
 import '@temporary-name/standard-server';
 import '../../shared/server.BYYf0Wn6.mjs';
 import '@temporary-name/contract';
 import '@temporary-name/zod';
-import '../../shared/server.BEHw7Eyx.mjs';
+import '../../shared/server.Kxw442A9.mjs';
 import '@temporary-name/server';
 import 'rou3';

package/dist/index.d.mts

@@ -1,5 +1,5 @@
 import { AnySchema, ErrorMap, Meta, EnhanceRouteOptions, MergedErrorMap, AnyContractRouter, AnyContractProcedure, ContractProcedure, Route, InferSchemaOutput, InferSchemaInput, ContractRouter, ContractProcedureDef, Schema, InferContractRouterErrorMap, InferContractRouterMeta, ErrorFromErrorMap } from '@temporary-name/contract';
-export { ContractProcedure, ContractProcedureDef, ContractRouter, ErrorMap, ErrorMapItem, InferSchemaInput, InferSchemaOutput, InputStructure, MergedErrorMap, Meta, OutputStructure, Route, Schema, ValidationError, eventIterator, validateORPCError } from '@temporary-name/contract';
+export { ContractProcedure, ContractProcedureDef, ContractRouter, ErrorMap, ErrorMapItem, InferSchemaInput, InferSchemaOutput, MergedErrorMap, Meta, OutputStructure, Route, Schema, ValidationError, eventIterator, validateORPCError } from '@temporary-name/contract';
 import { ClientContext, MaybeOptionalOptions, IntersectPick, HTTPPath, ClientOptions, ClientPromiseResult } from '@temporary-name/shared';
 export { AsyncIteratorClass, ClientContext, EventPublisher, EventPublisherOptions, EventPublisherSubscribeIteratorOptions, HTTPMethod, HTTPPath, IntersectPick, ORPCError, Registry, ThrowableError, asyncIteratorToStream as eventIteratorToStream, isDefinedError, onError, onFinish, onStart, onSuccess, safe, streamToAsyncIteratorClass as streamToEventIterator } from '@temporary-name/shared';
 import { SchemaClass } from '@temporary-name/zod';

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import { AnySchema, ErrorMap, Meta, EnhanceRouteOptions, MergedErrorMap, AnyContractRouter, AnyContractProcedure, ContractProcedure, Route, InferSchemaOutput, InferSchemaInput, ContractRouter, ContractProcedureDef, Schema, InferContractRouterErrorMap, InferContractRouterMeta, ErrorFromErrorMap } from '@temporary-name/contract';
-export { ContractProcedure, ContractProcedureDef, ContractRouter, ErrorMap, ErrorMapItem, InferSchemaInput, InferSchemaOutput, InputStructure, MergedErrorMap, Meta, OutputStructure, Route, Schema, ValidationError, eventIterator, validateORPCError } from '@temporary-name/contract';
+export { ContractProcedure, ContractProcedureDef, ContractRouter, ErrorMap, ErrorMapItem, InferSchemaInput, InferSchemaOutput, MergedErrorMap, Meta, OutputStructure, Route, Schema, ValidationError, eventIterator, validateORPCError } from '@temporary-name/contract';
 import { ClientContext, MaybeOptionalOptions, IntersectPick, HTTPPath, ClientOptions, ClientPromiseResult } from '@temporary-name/shared';
 export { AsyncIteratorClass, ClientContext, EventPublisher, EventPublisherOptions, EventPublisherSubscribeIteratorOptions, HTTPMethod, HTTPPath, IntersectPick, ORPCError, Registry, ThrowableError, asyncIteratorToStream as eventIteratorToStream, isDefinedError, onError, onFinish, onStart, onSuccess, safe, streamToAsyncIteratorClass as streamToEventIterator } from '@temporary-name/shared';
 import { SchemaClass } from '@temporary-name/zod';

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/shared/{server.BeBVpcA9.mjs → server.CqTex_jI.mjs}

@@ -2,44 +2,25 @@ import { isObject, stringifyJSON, isORPCErrorStatus, tryDecodeURIComponent, valu
 import { flattenHeader } from '@temporary-name/standard-server';
 import { c as createProcedureClient } from './server.BYYf0Wn6.mjs';
 import { fallbackContractConfig } from '@temporary-name/contract';
-import { d as deserialize, s as serialize, a as standardizeHTTPPath } from './server.BEHw7Eyx.mjs';
+import { d as deserialize, s as serialize, b as bracketNotationDeserialize, a as standardizeHTTPPath } from './server.Kxw442A9.mjs';
 import { traverseContractProcedures, isProcedure, getLazyMeta, unlazy, getRouter, createContractedProcedure } from '@temporary-name/server';
 import { createRouter, addRoute, findRoute } from 'rou3';
 
-async function decode(request, params, procedure) {
-  const inputStructure = fallbackContractConfig(
-    "defaultInputStructure",
-    procedure["~orpc"].route.inputStructure
-  );
-  if (inputStructure === "compact") {
-    const data = request.method === "GET" ? deserialize(request.url.searchParams) : deserialize(await request.body());
-    if (data === void 0) {
-      return params;
-    }
-    if (isObject(data)) {
-      return {
-        ...params,
-        ...data
-      };
-    }
-    return data;
-  }
+async function decode(request, pathParams) {
   const deserializeSearchParams = () => {
-    return deserialize(request.url.searchParams);
-  };
-  return {
-    params,
-    get query() {
-      const value = deserializeSearchParams();
-      Object.defineProperty(this, "query", { value, writable: true });
-      return value;
-    },
-    set query(value) {
-      Object.defineProperty(this, "query", { value, writable: true });
-    },
-    headers: request.headers,
-    body: deserialize(await request.body())
+    return bracketNotationDeserialize(Array.from(request.url.searchParams.entries()));
   };
+  const data = request.method === "GET" ? deserializeSearchParams() : deserialize(await request.body());
+  if (data === void 0) {
+    return pathParams;
+  }
+  if (isObject(data)) {
+    return {
+      ...pathParams,
+      ...data
+    };
+  }
+  return data;
 }
 function encode(output, procedure) {
   const successStatus = fallbackContractConfig(
@@ -236,10 +217,7 @@ class StandardHandler {
               span?.setAttribute("rpc.system", ORPC_NAME);
               span?.setAttribute("rpc.method", match.path.join("."));
               step = "decode_input";
-              let input = await runWithSpan(
-                { name: "decode_input" },
-                () => decode(request2, match.params, match.procedure)
-              );
+              let input = await runWithSpan({ name: "decode_input" }, () => decode(request2, match.params));
               step = void 0;
               if (isAsyncIteratorObject(input)) {
                 input = asyncIteratorWithSpan(

package/dist/shared/{server.BEHw7Eyx.mjs → server.Kxw442A9.mjs}

@@ -244,4 +244,4 @@ function getDynamicParams(path) {
   })) : void 0;
 }
 
-export { standardizeHTTPPath as a, deserialize as d, getDynamicParams as g, jsonSerialize as j, serialize as s };
+export { standardizeHTTPPath as a, bracketNotationDeserialize as b, deserialize as d, getDynamicParams as g, jsonSerialize as j, serialize as s };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@temporary-name/server",
   "type": "module",
-  "version": "1.9.3-alpha.d9b25e999833b2b788712bccd5957f10e42416b0",
+  "version": "1.9.3-alpha.dff27b31c00072e392d67d0cd8ca5b94835839f9",
   "license": "MIT",
   "homepage": "https://www.stainless.com/",
   "repository": {
@@ -73,15 +73,15 @@
     "cookie": "^1.0.2",
     "rou3": "^0.7.7",
     "zod": "^4.1.12",
-    "@temporary-name/interop": "1.9.3-alpha.d9b25e999833b2b788712bccd5957f10e42416b0",
-    "@temporary-name/json-schema": "1.9.3-alpha.d9b25e999833b2b788712bccd5957f10e42416b0",
-    "@temporary-name/standard-server": "1.9.3-alpha.d9b25e999833b2b788712bccd5957f10e42416b0",
-    "@temporary-name/shared": "1.9.3-alpha.d9b25e999833b2b788712bccd5957f10e42416b0",
-    "@temporary-name/standard-server-aws-lambda": "1.9.3-alpha.d9b25e999833b2b788712bccd5957f10e42416b0",
-    "@temporary-name/standard-server-node": "1.9.3-alpha.d9b25e999833b2b788712bccd5957f10e42416b0",
-    "@temporary-name/zod": "1.9.3-alpha.d9b25e999833b2b788712bccd5957f10e42416b0",
-    "@temporary-name/contract": "1.9.3-alpha.d9b25e999833b2b788712bccd5957f10e42416b0",
-    "@temporary-name/standard-server-fetch": "1.9.3-alpha.d9b25e999833b2b788712bccd5957f10e42416b0"
+    "@temporary-name/interop": "1.9.3-alpha.dff27b31c00072e392d67d0cd8ca5b94835839f9",
+    "@temporary-name/json-schema": "1.9.3-alpha.dff27b31c00072e392d67d0cd8ca5b94835839f9",
+    "@temporary-name/standard-server": "1.9.3-alpha.dff27b31c00072e392d67d0cd8ca5b94835839f9",
+    "@temporary-name/standard-server-aws-lambda": "1.9.3-alpha.dff27b31c00072e392d67d0cd8ca5b94835839f9",
+    "@temporary-name/contract": "1.9.3-alpha.dff27b31c00072e392d67d0cd8ca5b94835839f9",
+    "@temporary-name/standard-server-fetch": "1.9.3-alpha.dff27b31c00072e392d67d0cd8ca5b94835839f9",
+    "@temporary-name/shared": "1.9.3-alpha.dff27b31c00072e392d67d0cd8ca5b94835839f9",
+    "@temporary-name/standard-server-node": "1.9.3-alpha.dff27b31c00072e392d67d0cd8ca5b94835839f9",
+    "@temporary-name/zod": "1.9.3-alpha.dff27b31c00072e392d67d0cd8ca5b94835839f9"
   },
   "devDependencies": {
     "@types/supertest": "^6.0.3",