@temporary-name/server 1.9.3-alpha.16e8a4f82a5b0af6e22263774a4af4e6f9afd8bc → 1.9.3-alpha.1a5ff4923d25c9d83e80d717687ebc859f5312f2

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';
@@ -530,94 +530,77 @@ ${errors.join("\n\n")}`
   }
   async #request(doc, ref, def, baseSchemaConvertOptions) {
     const method = fallbackContractConfig("defaultMethod", def.route.method);
-    const details = getEventIteratorSchemaDetails(def.inputSchema);
-    if (details) {
-      ref.requestBody = {
-        required: true,
-        content: toOpenAPIEventIteratorContent(
-          await this.converter.convert(details.yields, { ...baseSchemaConvertOptions, strategy: "input" }),
-          await this.converter.convert(details.returns, { ...baseSchemaConvertOptions, strategy: "input" })
-        )
-      };
-      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, {
+    const [_pathRequired, pathSchema] = await this.converter.convert(def.schemas.pathSchema, {
       ...baseSchemaConvertOptions,
       strategy: "input",
-      minStructureDepthForRef: dynamicParams?.length || inputStructure === "detailed" ? 1 : 0
+      minStructureDepthForRef: 1
     });
-    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(
+        // TODO: fix this error
+        'When input structure is "compact", and path has dynamic params, input schema must be an object with all dynamic params as required.'
+      );
+      if (!isObjectSchema(pathSchema)) {
+        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)
-        };
+      if (!checkParamsSchema(pathSchema, dynamicParams)) {
+        throw error;
+      }
+      ref.parameters ??= [];
+      ref.parameters.push(...toOpenAPIParameters(pathSchema, "path"));
+    } else {
+      const error = new OpenAPIGeneratorError("Params set via path do not match those on the route");
+      if (!isObjectSchema(pathSchema)) {
+        console.log("FOO", pathSchema);
+        throw error;
+      }
+      if (!checkParamsSchema(pathSchema, [])) {
+        console.log("BAR", pathSchema);
+        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.'
-      );
+    const [_queryRequired, querySchema] = await this.converter.convert(def.schemas.querySchema, {
+      ...baseSchemaConvertOptions,
+      strategy: "input",
+      minStructureDepthForRef: 0
+    });
+    if (!isAnySchema(querySchema)) {
+      const resolvedSchema = resolveOpenAPIJsonSchemaRef(doc, querySchema);
+      if (!isObjectSchema(resolvedSchema)) {
+        throw new OpenAPIGeneratorError("Query param schema must satisfy: object | any | unknown");
+      }
+      ref.parameters ??= [];
+      ref.parameters.push(...toOpenAPIParameters(resolvedSchema, "query"));
     }
-    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;
+    if (method !== "GET") {
+      const details = getEventIteratorSchemaDetails(def.schemas.bodySchema);
+      if (details) {
+        ref.requestBody = {
+          required: true,
+          content: toOpenAPIEventIteratorContent(
+            await this.converter.convert(details.yields, { ...baseSchemaConvertOptions, strategy: "input" }),
+            await this.converter.convert(details.returns, { ...baseSchemaConvertOptions, strategy: "input" })
+          )
+        };
+      } else {
+        const [bodyRequired, bodySchema] = await this.converter.convert(def.schemas.bodySchema, {
+          ...baseSchemaConvertOptions,
+          strategy: "input",
+          minStructureDepthForRef: 0
+        });
+        if (isAnySchema(bodySchema)) {
+          return;
         }
-        const parameterIn = from === "params" ? "path" : from === "headers" ? "header" : "query";
-        ref.parameters ??= [];
-        ref.parameters.push(...toOpenAPIParameters(resolvedSchema, parameterIn));
+        ref.requestBody = {
+          required: bodyRequired,
+          content: toOpenAPIContent(bodySchema)
+        };
       }
     }
-    if (schema.properties?.body !== void 0) {
-      ref.requestBody = {
-        required: schema.required?.includes("body"),
-        content: toOpenAPIContent(schema.properties.body)
-      };
-    }
   }
   async #successResponse(doc, ref, def, baseSchemaConvertOptions) {
-    const outputSchema = def.outputSchema;
+    const outputSchema = def.schemas.outputSchema;
     const status = fallbackContractConfig("defaultSuccessStatus", def.route.successStatus);
     const description = fallbackContractConfig("defaultSuccessDescription", def.route?.successDescription);
     const eventIteratorSchemaDetails = getEventIteratorSchemaDetails(outputSchema);

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.BCcLYvdF.mjs';
+import { C as Context, H as ProcedureClientInterceptorOptions } from '../shared/server.DecvGKtb.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.CdeqmULw.js';
+import { C as Context, H as ProcedureClientInterceptorOptions } from '../shared/server.DecvGKtb.js';
 import { Meta } from '@temporary-name/contract';
 
 interface BatchHandlerOptions<T extends Context> {

package/dist/shared/{server.DLsti1Pv.mjs → server.B--sAUhn.mjs}

@@ -1,67 +1,37 @@
-import { isObject, stringifyJSON, isORPCErrorStatus, tryDecodeURIComponent, value, toHttpPath, toArray, intercept, runWithSpan, ORPC_NAME, isAsyncIteratorObject, asyncIteratorWithSpan, setSpanError, ORPCError, toORPCError } from '@temporary-name/shared';
+import { stringifyJSON, isObject, isORPCErrorStatus, tryDecodeURIComponent, toHttpPath, toArray, intercept, runWithSpan, ORPC_NAME, isAsyncIteratorObject, asyncIteratorWithSpan, setSpanError, ORPCError, toORPCError } from '@temporary-name/shared';
 import { flattenHeader } from '@temporary-name/standard-server';
-import { c as createProcedureClient } from './server.BKh8I1Ny.mjs';
+import { c as createProcedureClient } from './server.CHV9AQHl.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, b as bracketNotationDeserialize, s as serialize, a as standardizeHTTPPath } from './server.Kxw442A9.mjs';
 import { traverseContractProcedures, isProcedure, getLazyMeta, unlazy, getRouter, createContractedProcedure } from '@temporary-name/server';
 import { createRouter, addRoute, findRoute } from 'rou3';
 
-class StandardOpenAPICodec {
-  constructor() {
-  }
-  async 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;
-    }
-    const deserializeSearchParams = () => {
-      return deserialize(request.url.searchParams);
-    };
+async function decode(request, pathParams) {
+  return {
+    path: pathParams ?? {},
+    query: bracketNotationDeserialize(Array.from(request.url.searchParams.entries())),
+    headers: request.headers,
+    body: deserialize(await request.body()) ?? {}
+  };
+}
+function encode(output, procedure) {
+  const successStatus = fallbackContractConfig(
+    "defaultSuccessStatus",
+    procedure["~orpc"].route.successStatus
+  );
+  const outputStructure = fallbackContractConfig(
+    "defaultOutputStructure",
+    procedure["~orpc"].route.outputStructure
+  );
+  if (outputStructure === "compact") {
     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())
+      status: successStatus,
+      headers: {},
+      body: serialize(output)
     };
   }
-  encode(output, procedure) {
-    const successStatus = fallbackContractConfig(
-      "defaultSuccessStatus",
-      procedure["~orpc"].route.successStatus
-    );
-    const outputStructure = fallbackContractConfig(
-      "defaultOutputStructure",
-      procedure["~orpc"].route.outputStructure
-    );
-    if (outputStructure === "compact") {
-      return {
-        status: successStatus,
-        headers: {},
-        body: serialize(output)
-      };
-    }
-    if (!this.#isDetailedOutput(output)) {
-      throw new Error(`
+  if (!isDetailedOutput(output)) {
+    throw new Error(`
         Invalid "detailed" output structure:
         \u2022 Expected an object with optional properties:
           - status (number 200-399)
@@ -72,32 +42,31 @@ class StandardOpenAPICodec {
         Actual value:
           ${stringifyJSON(output)}
       `);
-    }
-    return {
-      status: output.status ?? successStatus,
-      headers: output.headers ?? {},
-      body: serialize(output.body)
-    };
   }
-  encodeError(error) {
-    return {
-      status: error.status,
-      headers: {},
-      body: serialize(error.toJSON(), { outputFormat: "plain" })
-    };
+  return {
+    status: output.status ?? successStatus,
+    headers: output.headers ?? {},
+    body: serialize(output.body)
+  };
+}
+function encodeError(error) {
+  return {
+    status: error.status,
+    headers: {},
+    body: serialize(error.toJSON(), { outputFormat: "plain" })
+  };
+}
+function isDetailedOutput(output) {
+  if (!isObject(output)) {
+    return false;
   }
-  #isDetailedOutput(output) {
-    if (!isObject(output)) {
-      return false;
-    }
-    if (output.headers && !isObject(output.headers)) {
-      return false;
-    }
-    if (output.status !== void 0 && (typeof output.status !== "number" || !Number.isInteger(output.status) || isORPCErrorStatus(output.status))) {
-      return false;
-    }
-    return true;
+  if (output.headers && !isObject(output.headers)) {
+    return false;
+  }
+  if (output.status !== void 0 && (typeof output.status !== "number" || !Number.isInteger(output.status) || isORPCErrorStatus(output.status))) {
+    return false;
   }
+  return true;
 }
 
 function resolveFriendlyStandardHandleOptions(options) {
@@ -121,9 +90,6 @@ class StandardOpenAPIMatcher {
   pendingRouters = [];
   init(router, path = []) {
     const laziedOptions = traverseContractProcedures({ router, path }, (traverseOptions) => {
-      if (!value(true, traverseOptions)) {
-        return;
-      }
       const { path: path2, contract } = traverseOptions;
       const method = fallbackContractConfig("defaultMethod", contract["~orpc"].route.method);
       const httpPath = toRou3Pattern(contract["~orpc"].route.path ?? toHttpPath(path2));
@@ -204,10 +170,8 @@ class StandardHandler {
   clientInterceptors;
   rootInterceptors;
   matcher;
-  codec;
   constructor(router, options) {
     this.matcher = new StandardOpenAPIMatcher();
-    this.codec = new StandardOpenAPICodec();
     const plugins = new CompositeStandardHandlerPlugin(options.plugins);
     plugins.init(options, router);
     this.interceptors = toArray(options.interceptors);
@@ -242,15 +206,12 @@ 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" },
-                () => this.codec.decode(request2, match.params, match.procedure)
-              );
+              const input = await runWithSpan({ name: "decode_input" }, () => decode(request2, match.params));
               step = void 0;
-              if (isAsyncIteratorObject(input)) {
-                input = asyncIteratorWithSpan(
+              if (isAsyncIteratorObject(input.body)) {
+                input.body = asyncIteratorWithSpan(
                   { name: "consume_event_iterator_input", signal: request2.signal },
-                  input
+                  input.body
                 );
               }
               const client = createProcedureClient(match.procedure, {
@@ -264,7 +225,7 @@ class StandardHandler {
                 lastEventId: flattenHeader(request2.headers["last-event-id"])
               });
               step = void 0;
-              const response = this.codec.encode(output, match.procedure);
+              const response = encode(output, match.procedure);
               return {
                 matched: true,
                 response
@@ -279,7 +240,7 @@ class StandardHandler {
             message: `Malformed request. Ensure the request body is properly formatted and the 'Content-Type' header is set correctly.`,
             cause: e
           }) : toORPCError(e);
-          const response = this.codec.encodeError(error);
+          const response = encodeError(error);
           return {
             matched: true,
             response
@@ -290,4 +251,4 @@ class StandardHandler {
   }
 }
 
-export { CompositeStandardHandlerPlugin as C, StandardHandler as S, StandardOpenAPICodec as a, StandardOpenAPIMatcher as b, decodeParams as d, resolveFriendlyStandardHandleOptions as r, toRou3Pattern as t };
+export { CompositeStandardHandlerPlugin as C, StandardHandler as S, encodeError as a, StandardOpenAPIMatcher as b, decodeParams as c, decode as d, encode as e, resolveFriendlyStandardHandleOptions as r, toRou3Pattern as t };

package/dist/shared/{server.CQyYNJ1H.d.ts → server.BCcLYvdF.d.mts}

@@ -1,7 +1,7 @@
 import { Meta } from '@temporary-name/contract';
 import { HTTPPath, Interceptor } from '@temporary-name/shared';
 import { StandardLazyRequest, StandardResponse } from '@temporary-name/standard-server';
-import { C as Context, R as Router, E as ProcedureClientInterceptorOptions } from './server.BKSOrA6h.js';
+import { C as Context, R as Router, H as ProcedureClientInterceptorOptions } from './server.DecvGKtb.mjs';
 
 interface StandardHandlerPlugin<T extends Context> {
     order?: number;
@@ -48,7 +48,6 @@ declare class StandardHandler<T extends Context> {
     private readonly clientInterceptors;
     private readonly rootInterceptors;
     private readonly matcher;
-    private readonly codec;
     constructor(router: Router<any, T>, options: NoInfer<StandardHandlerOptions<T>>);
     handle(request: StandardLazyRequest, options: StandardHandleOptions<T>): Promise<StandardHandleResult>;
 }