@kaito-http/core 4.0.0-beta.31 → 4.0.0-beta.32

package/dist/index.cjs

@@ -1263,8 +1263,7 @@ var Router = class _Router {
           params: rawParams
         });
         if (result instanceof KaitoSSEResponse) {
-          const body2 = route.openapi?.body;
-          const schema = body2 && "schema" in body2 ? body2.schema : void 0;
+          const schema = route.openapi && "schema" in route.openapi ? route.openapi.schema : void 0;
           const stringStream = result.events.pipeThrough(
             new TransformStream({
               transform(event, controller) {
@@ -1296,8 +1295,8 @@ var Router = class _Router {
           }
           return result;
         }
-        if (route.openapi && "schema" in route.openapi.body && route.openapi.body.schema) {
-          const parsed = route.openapi.body.schema.serialize(result);
+        if (route.openapi && "schema" in route.openapi && route.openapi.schema) {
+          const parsed = route.openapi.schema.serialize(result);
           return head.toResponse(parsed);
         }
         if (result === void 0) {
@@ -1417,7 +1416,7 @@ var Router = class _Router {
         paths[pathWithColonParamsReplaceWithCurlyBraces] = {};
       }
       let contentType;
-      const type = route.openapi.body.type;
+      const type = route.openapi.type;
       switch (type) {
         case "json":
           contentType = "application/json";
@@ -1431,15 +1430,15 @@ var Router = class _Router {
         default:
           throw new Error(`Unknown output type in route ${route.method} ${route.path}: ${type}`);
       }
-      if ("schema" in route.openapi.body && route.openapi.body.schema) visit(route.openapi.body.schema);
+      if ("schema" in route.openapi && route.openapi.schema) visit(route.openapi.schema);
       if (route.body) visit(route.body);
-      const responseSchema = "schema" in route.openapi.body && route.openapi.body.schema ? route.openapi.body.schema.toOpenAPI() : { type: "string" };
+      const responseSchema = "schema" in route.openapi && route.openapi.schema ? route.openapi.schema.toOpenAPI() : { type: "string" };
       const item = {
         ...route.openapi.summary ? { summary: route.openapi.summary } : {},
         description: route.openapi?.description ?? "Successful response",
         responses: {
           200: {
-            description: route.openapi.body.description ?? "Successful response",
+            description: route.openapi.description ?? "Successful response",
             content: {
               [contentType]: {
                 schema: responseSchema

package/dist/index.d.cts

@@ -157,33 +157,45 @@ type AnyQuery = {
     [key in string]: any;
 };
 type Through<From, To, RequiredParams extends string> = (context: From, params: Record<RequiredParams, string>) => Promise<To>;
-type SSEOutputSpecWithSchema = {
+/**
+ * Wraps BaseSchema to prevent the schema from participating in inference for `Output`.
+ *
+ * BaseSchema's `_output` is covariant (readonly), which means when both `run()` and the schema
+ * compete to infer `ResultOutput`, TypeScript widens to the less specific type (e.g. `string`
+ * instead of `"us-east-1"`). `NoInfer` ensures `Output` is only inferred from
+ * `run()`, and the schema only checks against it via the contravariant `serialize` property.
+ *
+ * @see https://github.com/microsoft/TypeScript/issues/51756
+ */
+type OutputSchema<Output> = BaseSchema<any, any, any> & {
+    serialize: (value: NoInfer<Output>) => JSONValue;
+};
+type SSEOutputSpecWithSchema<Output> = {
     type: 'sse';
-    schema: BaseSchema<any, any, any>;
+    schema: OutputSchema<Output>;
+    summary?: string | undefined;
     description?: string | undefined;
 };
 type SSEOutputSpecWithoutSchema = {
     type: 'sse';
     schema?: undefined;
+    summary?: string | undefined;
     description?: string | undefined;
 };
-type SSEOutputSpec = SSEOutputSpecWithSchema | SSEOutputSpecWithoutSchema;
-type JSONOutputSpec = {
+type SSEOutputSpec<Output> = SSEOutputSpecWithSchema<Output> | SSEOutputSpecWithoutSchema;
+type JSONOutputSpec<Output> = {
     type: 'json';
-    schema: BaseSchema<any, any, any>;
+    schema: OutputSchema<Output>;
+    summary?: string | undefined;
     description?: string | undefined;
 };
 type ResponseOutputSpec = {
     type: 'response';
+    summary?: string | undefined;
     description?: string | undefined;
 };
-type OutputSpec = SSEOutputSpec | JSONOutputSpec | ResponseOutputSpec;
-type OpenAPISpec<Body extends OutputSpec = OutputSpec> = {
-    summary?: string;
-    description?: string;
-    body: Body;
-};
-type OpenAPISpecFor<ResultOutput> = 0 extends 1 & ResultOutput ? OpenAPISpec : [ResultOutput] extends [never] ? OpenAPISpec : [ResultOutput] extends [KaitoSSEResponse<any>] ? [ResultOutput extends KaitoSSEResponse<SSEEvent<infer U, any>> ? U : never] extends [JSONValue] ? OpenAPISpec<SSEOutputSpec> : OpenAPISpec<SSEOutputSpecWithSchema> : [ResultOutput] extends [Response] ? OpenAPISpec<ResponseOutputSpec> : OpenAPISpec<JSONOutputSpec>;
+type AnyOutputSpec = SSEOutputSpec<any> | JSONOutputSpec<any> | ResponseOutputSpec;
+type OpenAPISpecFor<ResultOutput> = [ResultOutput] extends [never] ? AnyOutputSpec : [ResultOutput] extends [KaitoSSEResponse<infer Event>] ? Event extends SSEEvent<infer U, any> ? [U] extends [JSONValue] ? SSEOutputSpec<Event> : SSEOutputSpecWithSchema<Event> : SSEOutputSpec<any> : [ResultOutput] extends [Response] ? ResponseOutputSpec : JSONOutputSpec<ResultOutput>;
 type Route<ContextFrom, ContextTo, RouterInput extends readonly unknown[], ResultOutput, Path extends string, AdditionalParams extends string, Method extends KaitoMethod, Query extends Record<string, JSONValue>, BodyInput extends JSONValue, BodyOutput> = {
     body?: BaseSchema<BodyInput, BodyOutput, BaseSchemaDef<BodyInput>>;
     query?: {
@@ -191,7 +203,7 @@ type Route<ContextFrom, ContextTo, RouterInput extends readonly unknown[], Resul
     };
     path: Path;
     method: Method;
-    openapi?: OpenAPISpec;
+    openapi?: AnyOutputSpec;
     router: Router<ContextFrom, ContextTo, AdditionalParams, AnyRoute, RouterInput>;
     run(data: RouteRunData<ExtractRouteParams<Path> | AdditionalParams, ContextTo, Query, BodyOutput>): Promise<ResultOutput> | ResultOutput;
 };
@@ -297,4 +309,4 @@ interface KaitoConfig<ContextFrom, Input extends readonly unknown[]> {
  */
 declare const create: <Context = null, Input extends readonly unknown[] = []>(config?: KaitoConfig<Context, Input>) => Router<Context, Context, never, never, Input>;
 
-export { type AnyQuery, type AnyRoute, AnySchemaFor, BaseSchema, BaseSchemaDef, type ExtractRouteParams, type GetContext, type InferRoutes, type JSONOutputSpec, JSONValue, type KaitoConfig, KaitoError, KaitoHead, type KaitoMethod, KaitoRequest, type MaybePromise, type OpenAPISpec, type OpenAPISpecFor, type OutputSpec, type ResponseOutputSpec, type Route, type RouteRunData, Router, type RouterState, type SSEOutputSpec, type SSEOutputSpecWithSchema, type SSEOutputSpecWithoutSchema, type Through, WrappedError, create, isNodeLikeDev };
+export { type AnyOutputSpec, type AnyQuery, type AnyRoute, AnySchemaFor, BaseSchema, BaseSchemaDef, type ExtractRouteParams, type GetContext, type InferRoutes, type JSONOutputSpec, JSONValue, type KaitoConfig, KaitoError, KaitoHead, type KaitoMethod, KaitoRequest, type MaybePromise, type OpenAPISpecFor, type ResponseOutputSpec, type Route, type RouteRunData, Router, type RouterState, type SSEOutputSpec, type SSEOutputSpecWithSchema, type SSEOutputSpecWithoutSchema, type Through, WrappedError, create, isNodeLikeDev };

package/dist/index.d.ts

@@ -157,33 +157,45 @@ type AnyQuery = {
     [key in string]: any;
 };
 type Through<From, To, RequiredParams extends string> = (context: From, params: Record<RequiredParams, string>) => Promise<To>;
-type SSEOutputSpecWithSchema = {
+/**
+ * Wraps BaseSchema to prevent the schema from participating in inference for `Output`.
+ *
+ * BaseSchema's `_output` is covariant (readonly), which means when both `run()` and the schema
+ * compete to infer `ResultOutput`, TypeScript widens to the less specific type (e.g. `string`
+ * instead of `"us-east-1"`). `NoInfer` ensures `Output` is only inferred from
+ * `run()`, and the schema only checks against it via the contravariant `serialize` property.
+ *
+ * @see https://github.com/microsoft/TypeScript/issues/51756
+ */
+type OutputSchema<Output> = BaseSchema<any, any, any> & {
+    serialize: (value: NoInfer<Output>) => JSONValue;
+};
+type SSEOutputSpecWithSchema<Output> = {
     type: 'sse';
-    schema: BaseSchema<any, any, any>;
+    schema: OutputSchema<Output>;
+    summary?: string | undefined;
     description?: string | undefined;
 };
 type SSEOutputSpecWithoutSchema = {
     type: 'sse';
     schema?: undefined;
+    summary?: string | undefined;
     description?: string | undefined;
 };
-type SSEOutputSpec = SSEOutputSpecWithSchema | SSEOutputSpecWithoutSchema;
-type JSONOutputSpec = {
+type SSEOutputSpec<Output> = SSEOutputSpecWithSchema<Output> | SSEOutputSpecWithoutSchema;
+type JSONOutputSpec<Output> = {
     type: 'json';
-    schema: BaseSchema<any, any, any>;
+    schema: OutputSchema<Output>;
+    summary?: string | undefined;
     description?: string | undefined;
 };
 type ResponseOutputSpec = {
     type: 'response';
+    summary?: string | undefined;
     description?: string | undefined;
 };
-type OutputSpec = SSEOutputSpec | JSONOutputSpec | ResponseOutputSpec;
-type OpenAPISpec<Body extends OutputSpec = OutputSpec> = {
-    summary?: string;
-    description?: string;
-    body: Body;
-};
-type OpenAPISpecFor<ResultOutput> = 0 extends 1 & ResultOutput ? OpenAPISpec : [ResultOutput] extends [never] ? OpenAPISpec : [ResultOutput] extends [KaitoSSEResponse<any>] ? [ResultOutput extends KaitoSSEResponse<SSEEvent<infer U, any>> ? U : never] extends [JSONValue] ? OpenAPISpec<SSEOutputSpec> : OpenAPISpec<SSEOutputSpecWithSchema> : [ResultOutput] extends [Response] ? OpenAPISpec<ResponseOutputSpec> : OpenAPISpec<JSONOutputSpec>;
+type AnyOutputSpec = SSEOutputSpec<any> | JSONOutputSpec<any> | ResponseOutputSpec;
+type OpenAPISpecFor<ResultOutput> = [ResultOutput] extends [never] ? AnyOutputSpec : [ResultOutput] extends [KaitoSSEResponse<infer Event>] ? Event extends SSEEvent<infer U, any> ? [U] extends [JSONValue] ? SSEOutputSpec<Event> : SSEOutputSpecWithSchema<Event> : SSEOutputSpec<any> : [ResultOutput] extends [Response] ? ResponseOutputSpec : JSONOutputSpec<ResultOutput>;
 type Route<ContextFrom, ContextTo, RouterInput extends readonly unknown[], ResultOutput, Path extends string, AdditionalParams extends string, Method extends KaitoMethod, Query extends Record<string, JSONValue>, BodyInput extends JSONValue, BodyOutput> = {
     body?: BaseSchema<BodyInput, BodyOutput, BaseSchemaDef<BodyInput>>;
     query?: {
@@ -191,7 +203,7 @@ type Route<ContextFrom, ContextTo, RouterInput extends readonly unknown[], Resul
     };
     path: Path;
     method: Method;
-    openapi?: OpenAPISpec;
+    openapi?: AnyOutputSpec;
     router: Router<ContextFrom, ContextTo, AdditionalParams, AnyRoute, RouterInput>;
     run(data: RouteRunData<ExtractRouteParams<Path> | AdditionalParams, ContextTo, Query, BodyOutput>): Promise<ResultOutput> | ResultOutput;
 };
@@ -297,4 +309,4 @@ interface KaitoConfig<ContextFrom, Input extends readonly unknown[]> {
  */
 declare const create: <Context = null, Input extends readonly unknown[] = []>(config?: KaitoConfig<Context, Input>) => Router<Context, Context, never, never, Input>;
 
-export { type AnyQuery, type AnyRoute, AnySchemaFor, BaseSchema, BaseSchemaDef, type ExtractRouteParams, type GetContext, type InferRoutes, type JSONOutputSpec, JSONValue, type KaitoConfig, KaitoError, KaitoHead, type KaitoMethod, KaitoRequest, type MaybePromise, type OpenAPISpec, type OpenAPISpecFor, type OutputSpec, type ResponseOutputSpec, type Route, type RouteRunData, Router, type RouterState, type SSEOutputSpec, type SSEOutputSpecWithSchema, type SSEOutputSpecWithoutSchema, type Through, WrappedError, create, isNodeLikeDev };
+export { type AnyOutputSpec, type AnyQuery, type AnyRoute, AnySchemaFor, BaseSchema, BaseSchemaDef, type ExtractRouteParams, type GetContext, type InferRoutes, type JSONOutputSpec, JSONValue, type KaitoConfig, KaitoError, KaitoHead, type KaitoMethod, KaitoRequest, type MaybePromise, type OpenAPISpecFor, type ResponseOutputSpec, type Route, type RouteRunData, Router, type RouterState, type SSEOutputSpec, type SSEOutputSpecWithSchema, type SSEOutputSpecWithoutSchema, type Through, WrappedError, create, isNodeLikeDev };

package/dist/index.js

@@ -233,8 +233,7 @@ var Router = class _Router {
           params: rawParams
         });
         if (result instanceof KaitoSSEResponse) {
-          const body2 = route.openapi?.body;
-          const schema = body2 && "schema" in body2 ? body2.schema : void 0;
+          const schema = route.openapi && "schema" in route.openapi ? route.openapi.schema : void 0;
           const stringStream = result.events.pipeThrough(
             new TransformStream({
               transform(event, controller) {
@@ -266,8 +265,8 @@ var Router = class _Router {
           }
           return result;
         }
-        if (route.openapi && "schema" in route.openapi.body && route.openapi.body.schema) {
-          const parsed = route.openapi.body.schema.serialize(result);
+        if (route.openapi && "schema" in route.openapi && route.openapi.schema) {
+          const parsed = route.openapi.schema.serialize(result);
           return head.toResponse(parsed);
         }
         if (result === void 0) {
@@ -387,7 +386,7 @@ var Router = class _Router {
         paths[pathWithColonParamsReplaceWithCurlyBraces] = {};
       }
       let contentType;
-      const type = route.openapi.body.type;
+      const type = route.openapi.type;
       switch (type) {
         case "json":
           contentType = "application/json";
@@ -401,15 +400,15 @@ var Router = class _Router {
         default:
           throw new Error(`Unknown output type in route ${route.method} ${route.path}: ${type}`);
       }
-      if ("schema" in route.openapi.body && route.openapi.body.schema) visit(route.openapi.body.schema);
+      if ("schema" in route.openapi && route.openapi.schema) visit(route.openapi.schema);
       if (route.body) visit(route.body);
-      const responseSchema = "schema" in route.openapi.body && route.openapi.body.schema ? route.openapi.body.schema.toOpenAPI() : { type: "string" };
+      const responseSchema = "schema" in route.openapi && route.openapi.schema ? route.openapi.schema.toOpenAPI() : { type: "string" };
       const item = {
         ...route.openapi.summary ? { summary: route.openapi.summary } : {},
         description: route.openapi?.description ?? "Successful response",
         responses: {
           200: {
-            description: route.openapi.body.description ?? "Successful response",
+            description: route.openapi.description ?? "Successful response",
             content: {
               [contentType]: {
                 schema: responseSchema

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@kaito-http/core",
   "type": "module",
-  "version": "4.0.0-beta.31",
+  "version": "4.0.0-beta.32",
   "author": "Alistair Smith <hi@alistair.sh>",
   "repository": "https://github.com/kaito-http/kaito",
   "dependencies": {