@orpc/openapi 1.0.0-beta.5 → 1.0.0-beta.7

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

@@ -1,6 +1,6 @@
 import { Context, Router } from '@orpc/server';
 import { FetchHandler, FetchHandlerOptions } from '@orpc/server/fetch';
-import { S as StandardOpenAPIHandlerOptions } from '../../shared/openapi.IfmmOyba.mjs';
+import { S as StandardOpenAPIHandlerOptions } from '../../shared/openapi.D3j94c9n.mjs';
 import '@orpc/openapi-client/standard';
 import '@orpc/server/standard';
 

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

@@ -1,6 +1,6 @@
 import { Context, Router } from '@orpc/server';
 import { FetchHandler, FetchHandlerOptions } from '@orpc/server/fetch';
-import { S as StandardOpenAPIHandlerOptions } from '../../shared/openapi.IfmmOyba.js';
+import { S as StandardOpenAPIHandlerOptions } from '../../shared/openapi.D3j94c9n.js';
 import '@orpc/openapi-client/standard';
 import '@orpc/server/standard';
 

package/dist/adapters/fetch/index.mjs

@@ -1,10 +1,17 @@
-export { O as OpenAPIHandler } from '../../shared/openapi.CGZ7t-VN.mjs';
-import '@orpc/openapi-client/standard';
-import '@orpc/server/fetch';
-import '@orpc/server/standard';
-import '../../shared/openapi.sdeu0I7N.mjs';
+import { FetchHandler } from '@orpc/server/fetch';
 import '@orpc/contract';
 import '@orpc/shared';
+import { a as StandardOpenAPIHandler } from '../../shared/openapi.p5tsmBXx.mjs';
 import '@orpc/client/standard';
 import '@orpc/server';
 import 'rou3';
+import '@orpc/openapi-client/standard';
+import '@orpc/server/standard';
+
+class OpenAPIHandler extends FetchHandler {
+  constructor(router, options = {}) {
+    super(new StandardOpenAPIHandler(router, options), options);
+  }
+}
+
+export { OpenAPIHandler };

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

@@ -1,6 +1,6 @@
 import { Context, Router } from '@orpc/server';
 import { NodeHttpHandler, NodeHttpHandlerOptions } from '@orpc/server/node';
-import { S as StandardOpenAPIHandlerOptions } from '../../shared/openapi.IfmmOyba.mjs';
+import { S as StandardOpenAPIHandlerOptions } from '../../shared/openapi.D3j94c9n.mjs';
 import '@orpc/openapi-client/standard';
 import '@orpc/server/standard';
 

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

@@ -1,6 +1,6 @@
 import { Context, Router } from '@orpc/server';
 import { NodeHttpHandler, NodeHttpHandlerOptions } from '@orpc/server/node';
-import { S as StandardOpenAPIHandlerOptions } from '../../shared/openapi.IfmmOyba.js';
+import { S as StandardOpenAPIHandlerOptions } from '../../shared/openapi.D3j94c9n.js';
 import '@orpc/openapi-client/standard';
 import '@orpc/server/standard';
 

package/dist/adapters/node/index.mjs

@@ -1,21 +1,16 @@
-import { StandardOpenAPIJsonSerializer, StandardBracketNotationSerializer, StandardOpenAPISerializer } from '@orpc/openapi-client/standard';
 import { NodeHttpHandler } from '@orpc/server/node';
-import { StandardHandler } from '@orpc/server/standard';
-import { a as StandardOpenAPIMatcher, S as StandardOpenAPICodec } from '../../shared/openapi.sdeu0I7N.mjs';
 import '@orpc/contract';
 import '@orpc/shared';
+import { a as StandardOpenAPIHandler } from '../../shared/openapi.p5tsmBXx.mjs';
 import '@orpc/client/standard';
 import '@orpc/server';
 import 'rou3';
+import '@orpc/openapi-client/standard';
+import '@orpc/server/standard';
 
 class OpenAPIHandler extends NodeHttpHandler {
   constructor(router, options = {}) {
-    const jsonSerializer = new StandardOpenAPIJsonSerializer(options);
-    const bracketNotationSerializer = new StandardBracketNotationSerializer();
-    const serializer = new StandardOpenAPISerializer(jsonSerializer, bracketNotationSerializer);
-    const matcher = new StandardOpenAPIMatcher();
-    const codec = new StandardOpenAPICodec(serializer);
-    super(new StandardHandler(router, matcher, codec, options), options);
+    super(new StandardOpenAPIHandler(router, options), options);
   }
 }
 

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

@@ -3,7 +3,7 @@ import { StandardOpenAPISerializer } from '@orpc/openapi-client/standard';
 import { AnyProcedure, AnyRouter } from '@orpc/server';
 import { StandardCodec, StandardParams, StandardMatcher, StandardMatchResult } from '@orpc/server/standard';
 import { StandardLazyRequest, StandardResponse } from '@orpc/standard-server';
-export { S as StandardOpenAPIHandlerOptions } from '../../shared/openapi.IfmmOyba.mjs';
+export { a as StandardOpenAPIHandler, S as StandardOpenAPIHandlerOptions } from '../../shared/openapi.D3j94c9n.mjs';
 
 declare class StandardOpenAPICodec implements StandardCodec {
     private readonly serializer;

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

@@ -3,7 +3,7 @@ import { StandardOpenAPISerializer } from '@orpc/openapi-client/standard';
 import { AnyProcedure, AnyRouter } from '@orpc/server';
 import { StandardCodec, StandardParams, StandardMatcher, StandardMatchResult } from '@orpc/server/standard';
 import { StandardLazyRequest, StandardResponse } from '@orpc/standard-server';
-export { S as StandardOpenAPIHandlerOptions } from '../../shared/openapi.IfmmOyba.js';
+export { a as StandardOpenAPIHandler, S as StandardOpenAPIHandlerOptions } from '../../shared/openapi.D3j94c9n.js';
 
 declare class StandardOpenAPICodec implements StandardCodec {
     private readonly serializer;

package/dist/adapters/standard/index.mjs

@@ -1,7 +1,8 @@
-export { S as StandardOpenAPICodec, a as StandardOpenAPIMatcher, d as decodeParams, t as toRou3Pattern } from '../../shared/openapi.sdeu0I7N.mjs';
+export { S as StandardOpenAPICodec, a as StandardOpenAPIHandler, b as StandardOpenAPIMatcher, d as decodeParams, t as toRou3Pattern } from '../../shared/openapi.p5tsmBXx.mjs';
+import '@orpc/openapi-client/standard';
+import '@orpc/server/standard';
 import '@orpc/contract';
 import '@orpc/shared';
 import '@orpc/client/standard';
 import '@orpc/server';
 import 'rou3';
-import '@orpc/openapi-client/standard';

package/dist/index.d.mts

@@ -105,9 +105,11 @@ declare function separateObjectSchema(schema: ObjectSchema, separatedProperties:
  * @internal
  */
 declare function filterSchemaBranches(schema: JSONSchema, check: (schema: JSONSchema) => boolean, matches?: JSONSchema[]): [matches: JSONSchema[], rest: JSONSchema | undefined];
+declare function applySchemaOptionality(required: boolean, schema: JSONSchema): JSONSchema;
 
 declare const oo: {
     spec: typeof customOpenAPIOperation;
 };
 
-export { CompositeSchemaConverter, type ConditionalSchemaConverter, type FileSchema, LOGIC_KEYWORDS, type ObjectSchema, OpenAPIGenerator, type OpenAPIGeneratorOptions, type OverrideOperationValue, type SchemaConvertOptions, type SchemaConverter, applyCustomOpenAPIOperation, checkParamsSchema, customOpenAPIOperation, filterSchemaBranches, getCustomOpenAPIOperation, isAnySchema, isFileSchema, isObjectSchema, oo, separateObjectSchema, toOpenAPIContent, toOpenAPIEventIteratorContent, toOpenAPIMethod, toOpenAPIParameters, toOpenAPIPath, toOpenAPISchema };
+export { CompositeSchemaConverter, LOGIC_KEYWORDS, OpenAPIGenerator, applyCustomOpenAPIOperation, applySchemaOptionality, checkParamsSchema, customOpenAPIOperation, filterSchemaBranches, getCustomOpenAPIOperation, isAnySchema, isFileSchema, isObjectSchema, oo, separateObjectSchema, toOpenAPIContent, toOpenAPIEventIteratorContent, toOpenAPIMethod, toOpenAPIParameters, toOpenAPIPath, toOpenAPISchema };
+export type { ConditionalSchemaConverter, FileSchema, ObjectSchema, OpenAPIGeneratorOptions, OverrideOperationValue, SchemaConvertOptions, SchemaConverter };

package/dist/index.d.ts

@@ -105,9 +105,11 @@ declare function separateObjectSchema(schema: ObjectSchema, separatedProperties:
  * @internal
  */
 declare function filterSchemaBranches(schema: JSONSchema, check: (schema: JSONSchema) => boolean, matches?: JSONSchema[]): [matches: JSONSchema[], rest: JSONSchema | undefined];
+declare function applySchemaOptionality(required: boolean, schema: JSONSchema): JSONSchema;
 
 declare const oo: {
     spec: typeof customOpenAPIOperation;
 };
 
-export { CompositeSchemaConverter, type ConditionalSchemaConverter, type FileSchema, LOGIC_KEYWORDS, type ObjectSchema, OpenAPIGenerator, type OpenAPIGeneratorOptions, type OverrideOperationValue, type SchemaConvertOptions, type SchemaConverter, applyCustomOpenAPIOperation, checkParamsSchema, customOpenAPIOperation, filterSchemaBranches, getCustomOpenAPIOperation, isAnySchema, isFileSchema, isObjectSchema, oo, separateObjectSchema, toOpenAPIContent, toOpenAPIEventIteratorContent, toOpenAPIMethod, toOpenAPIParameters, toOpenAPIPath, toOpenAPISchema };
+export { CompositeSchemaConverter, LOGIC_KEYWORDS, OpenAPIGenerator, applyCustomOpenAPIOperation, applySchemaOptionality, checkParamsSchema, customOpenAPIOperation, filterSchemaBranches, getCustomOpenAPIOperation, isAnySchema, isFileSchema, isObjectSchema, oo, separateObjectSchema, toOpenAPIContent, toOpenAPIEventIteratorContent, toOpenAPIMethod, toOpenAPIParameters, toOpenAPIPath, toOpenAPISchema };
+export type { ConditionalSchemaConverter, FileSchema, ObjectSchema, OpenAPIGeneratorOptions, OverrideOperationValue, SchemaConvertOptions, SchemaConverter };

package/dist/index.mjs

@@ -3,7 +3,7 @@ import { fallbackORPCErrorStatus, fallbackORPCErrorMessage } from '@orpc/client'
 import { toHttpPath } from '@orpc/client/standard';
 import { fallbackContractConfig, getEventIteratorSchemaDetails } from '@orpc/contract';
 import { standardizeHTTPPath, StandardOpenAPIJsonSerializer, getDynamicParams } from '@orpc/openapi-client/standard';
-import { isObject, findDeepMatches, clone } from '@orpc/shared';
+import { isObject, findDeepMatches, toArray, clone } from '@orpc/shared';
 export { Format as JSONSchemaFormat } from 'json-schema-typed/draft-2020-12';
 
 const OPERATION_EXTENDER_SYMBOL = Symbol("ORPC_OPERATION_EXTENDER");
@@ -173,6 +173,17 @@ function filterSchemaBranches(schema, check, matches = []) {
   }
   return [matches, schema];
 }
+function applySchemaOptionality(required, schema) {
+  if (required) {
+    return schema;
+  }
+  return {
+    anyOf: [
+      schema,
+      { not: {} }
+    ]
+  };
+}
 
 function toOpenAPIPath(path) {
   return standardizeHTTPPath(path).replace(/\/\{\+([^}]+)\}/g, "/{$1}");
@@ -293,7 +304,7 @@ class OpenAPIGenerator {
   converter;
   constructor(options = {}) {
     this.serializer = new StandardOpenAPIJsonSerializer(options);
-    this.converter = new CompositeSchemaConverter(options.schemaConverters ?? []);
+    this.converter = new CompositeSchemaConverter(toArray(options.schemaConverters));
   }
   async generate(router, base) {
     const doc = clone(base);
@@ -435,13 +446,13 @@ ${errors.join("\n\n")}`
       };
       return;
     }
-    const [_, json] = this.converter.convert(outputSchema, { strategy: "output" });
+    const [required, json] = this.converter.convert(outputSchema, { strategy: "output" });
     ref.responses ??= {};
     ref.responses[status] = {
       description
     };
     if (outputStructure === "compact") {
-      ref.responses[status].content = toOpenAPIContent(json);
+      ref.responses[status].content = toOpenAPIContent(applySchemaOptionality(required, json));
       return;
     }
     const error = new OpenAPIGeneratorError(
@@ -463,7 +474,9 @@ ${errors.join("\n\n")}`
       }
     }
     if (json.properties?.body !== void 0) {
-      ref.responses[status].content = toOpenAPIContent(json.properties.body);
+      ref.responses[status].content = toOpenAPIContent(
+        applySchemaOptionality(json.required?.includes("body") ?? false, json.properties.body)
+      );
     }
   }
   #errorResponse(ref, def) {
@@ -520,4 +533,4 @@ const oo = {
   spec: customOpenAPIOperation
 };
 
-export { CompositeSchemaConverter, LOGIC_KEYWORDS, OpenAPIGenerator, applyCustomOpenAPIOperation, checkParamsSchema, customOpenAPIOperation, filterSchemaBranches, getCustomOpenAPIOperation, isAnySchema, isFileSchema, isObjectSchema, oo, separateObjectSchema, toOpenAPIContent, toOpenAPIEventIteratorContent, toOpenAPIMethod, toOpenAPIParameters, toOpenAPIPath, toOpenAPISchema };
+export { CompositeSchemaConverter, LOGIC_KEYWORDS, OpenAPIGenerator, applyCustomOpenAPIOperation, applySchemaOptionality, checkParamsSchema, customOpenAPIOperation, filterSchemaBranches, getCustomOpenAPIOperation, isAnySchema, isFileSchema, isObjectSchema, oo, separateObjectSchema, toOpenAPIContent, toOpenAPIEventIteratorContent, toOpenAPIMethod, toOpenAPIParameters, toOpenAPIPath, toOpenAPISchema };

package/dist/shared/openapi.D3j94c9n.d.mts

@@ -0,0 +1,12 @@
+import { StandardOpenAPIJsonSerializerOptions } from '@orpc/openapi-client/standard';
+import { Context, Router } from '@orpc/server';
+import { StandardHandlerOptions, StandardHandler } from '@orpc/server/standard';
+
+interface StandardOpenAPIHandlerOptions<T extends Context> extends StandardHandlerOptions<T>, StandardOpenAPIJsonSerializerOptions {
+}
+declare class StandardOpenAPIHandler<T extends Context> extends StandardHandler<T> {
+    constructor(router: Router<any, T>, options: NoInfer<StandardOpenAPIHandlerOptions<T>>);
+}
+
+export { StandardOpenAPIHandler as a };
+export type { StandardOpenAPIHandlerOptions as S };

package/dist/shared/openapi.D3j94c9n.d.ts

@@ -0,0 +1,12 @@
+import { StandardOpenAPIJsonSerializerOptions } from '@orpc/openapi-client/standard';
+import { Context, Router } from '@orpc/server';
+import { StandardHandlerOptions, StandardHandler } from '@orpc/server/standard';
+
+interface StandardOpenAPIHandlerOptions<T extends Context> extends StandardHandlerOptions<T>, StandardOpenAPIJsonSerializerOptions {
+}
+declare class StandardOpenAPIHandler<T extends Context> extends StandardHandler<T> {
+    constructor(router: Router<any, T>, options: NoInfer<StandardOpenAPIHandlerOptions<T>>);
+}
+
+export { StandardOpenAPIHandler as a };
+export type { StandardOpenAPIHandlerOptions as S };

package/dist/shared/{openapi.sdeu0I7N.mjs → openapi.p5tsmBXx.mjs}

@@ -1,9 +1,10 @@
+import { standardizeHTTPPath, StandardOpenAPIJsonSerializer, StandardBracketNotationSerializer, StandardOpenAPISerializer } from '@orpc/openapi-client/standard';
+import { StandardHandler } from '@orpc/server/standard';
 import { fallbackContractConfig } from '@orpc/contract';
 import { isObject } from '@orpc/shared';
 import { toHttpPath } from '@orpc/client/standard';
 import { traverseContractProcedures, isProcedure, getLazyMeta, unlazy, getRouter, createContractedProcedure } from '@orpc/server';
 import { createRouter, addRoute, findRoute } from 'rou3';
-import { standardizeHTTPPath } from '@orpc/openapi-client/standard';
 
 class StandardOpenAPICodec {
   constructor(serializer) {
@@ -143,4 +144,15 @@ class StandardOpenAPIMatcher {
   }
 }
 
-export { StandardOpenAPICodec as S, StandardOpenAPIMatcher as a, decodeParams as d, toRou3Pattern as t };
+class StandardOpenAPIHandler extends StandardHandler {
+  constructor(router, options) {
+    const jsonSerializer = new StandardOpenAPIJsonSerializer(options);
+    const bracketNotationSerializer = new StandardBracketNotationSerializer();
+    const serializer = new StandardOpenAPISerializer(jsonSerializer, bracketNotationSerializer);
+    const matcher = new StandardOpenAPIMatcher();
+    const codec = new StandardOpenAPICodec(serializer);
+    super(router, matcher, codec, options);
+  }
+}
+
+export { StandardOpenAPICodec as S, StandardOpenAPIHandler as a, StandardOpenAPIMatcher as b, decodeParams as d, toRou3Pattern as t };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@orpc/openapi",
   "type": "module",
-  "version": "1.0.0-beta.5",
+  "version": "1.0.0-beta.7",
   "license": "MIT",
   "homepage": "https://orpc.unnoq.com",
   "repository": {
@@ -29,16 +29,6 @@
       "import": "./dist/adapters/fetch/index.mjs",
       "default": "./dist/adapters/fetch/index.mjs"
     },
-    "./hono": {
-      "types": "./dist/adapters/hono/index.d.mts",
-      "import": "./dist/adapters/hono/index.mjs",
-      "default": "./dist/adapters/hono/index.mjs"
-    },
-    "./next": {
-      "types": "./dist/adapters/next/index.d.mts",
-      "import": "./dist/adapters/next/index.mjs",
-      "default": "./dist/adapters/next/index.mjs"
-    },
     "./node": {
       "types": "./dist/adapters/node/index.d.mts",
       "import": "./dist/adapters/node/index.mjs",
@@ -52,12 +42,12 @@
     "json-schema-typed": "^8.0.1",
     "openapi-types": "^12.1.3",
     "rou3": "^0.5.1",
-    "@orpc/client": "1.0.0-beta.5",
-    "@orpc/contract": "1.0.0-beta.5",
-    "@orpc/server": "1.0.0-beta.5",
-    "@orpc/openapi-client": "1.0.0-beta.5",
-    "@orpc/shared": "1.0.0-beta.5",
-    "@orpc/standard-server": "1.0.0-beta.5"
+    "@orpc/client": "1.0.0-beta.7",
+    "@orpc/contract": "1.0.0-beta.7",
+    "@orpc/server": "1.0.0-beta.7",
+    "@orpc/shared": "1.0.0-beta.7",
+    "@orpc/openapi-client": "1.0.0-beta.7",
+    "@orpc/standard-server": "1.0.0-beta.7"
   },
   "devDependencies": {
     "zod": "^3.24.2"

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

@@ -1,6 +0,0 @@
-export { OpenAPIHandler } from '../fetch/index.mjs';
-import '@orpc/server';
-import '@orpc/server/fetch';
-import '../../shared/openapi.IfmmOyba.mjs';
-import '@orpc/openapi-client/standard';
-import '@orpc/server/standard';

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

@@ -1,6 +0,0 @@
-export { OpenAPIHandler } from '../fetch/index.js';
-import '@orpc/server';
-import '@orpc/server/fetch';
-import '../../shared/openapi.IfmmOyba.js';
-import '@orpc/openapi-client/standard';
-import '@orpc/server/standard';

package/dist/adapters/hono/index.mjs

@@ -1,10 +0,0 @@
-export { O as OpenAPIHandler } from '../../shared/openapi.CGZ7t-VN.mjs';
-import '@orpc/openapi-client/standard';
-import '@orpc/server/fetch';
-import '@orpc/server/standard';
-import '../../shared/openapi.sdeu0I7N.mjs';
-import '@orpc/contract';
-import '@orpc/shared';
-import '@orpc/client/standard';
-import '@orpc/server';
-import 'rou3';

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

@@ -1,6 +0,0 @@
-export { OpenAPIHandler } from '../fetch/index.mjs';
-import '@orpc/server';
-import '@orpc/server/fetch';
-import '../../shared/openapi.IfmmOyba.mjs';
-import '@orpc/openapi-client/standard';
-import '@orpc/server/standard';

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

@@ -1,6 +0,0 @@
-export { OpenAPIHandler } from '../fetch/index.js';
-import '@orpc/server';
-import '@orpc/server/fetch';
-import '../../shared/openapi.IfmmOyba.js';
-import '@orpc/openapi-client/standard';
-import '@orpc/server/standard';

package/dist/adapters/next/index.mjs

@@ -1,10 +0,0 @@
-export { O as OpenAPIHandler } from '../../shared/openapi.CGZ7t-VN.mjs';
-import '@orpc/openapi-client/standard';
-import '@orpc/server/fetch';
-import '@orpc/server/standard';
-import '../../shared/openapi.sdeu0I7N.mjs';
-import '@orpc/contract';
-import '@orpc/shared';
-import '@orpc/client/standard';
-import '@orpc/server';
-import 'rou3';

package/dist/shared/openapi.CGZ7t-VN.mjs

@@ -1,17 +0,0 @@
-import { StandardOpenAPIJsonSerializer, StandardBracketNotationSerializer, StandardOpenAPISerializer } from '@orpc/openapi-client/standard';
-import { FetchHandler } from '@orpc/server/fetch';
-import { StandardHandler } from '@orpc/server/standard';
-import { a as StandardOpenAPIMatcher, S as StandardOpenAPICodec } from './openapi.sdeu0I7N.mjs';
-
-class OpenAPIHandler extends FetchHandler {
-  constructor(router, options = {}) {
-    const jsonSerializer = new StandardOpenAPIJsonSerializer(options);
-    const bracketNotationSerializer = new StandardBracketNotationSerializer();
-    const serializer = new StandardOpenAPISerializer(jsonSerializer, bracketNotationSerializer);
-    const matcher = new StandardOpenAPIMatcher();
-    const codec = new StandardOpenAPICodec(serializer);
-    super(new StandardHandler(router, matcher, codec, options), options);
-  }
-}
-
-export { OpenAPIHandler as O };

package/dist/shared/openapi.IfmmOyba.d.mts

@@ -1,8 +0,0 @@
-import { StandardOpenAPIJsonSerializerOptions } from '@orpc/openapi-client/standard';
-import { Context } from '@orpc/server';
-import { StandardHandlerOptions } from '@orpc/server/standard';
-
-interface StandardOpenAPIHandlerOptions<T extends Context> extends StandardHandlerOptions<T>, StandardOpenAPIJsonSerializerOptions {
-}
-
-export type { StandardOpenAPIHandlerOptions as S };

package/dist/shared/openapi.IfmmOyba.d.ts

@@ -1,8 +0,0 @@
-import { StandardOpenAPIJsonSerializerOptions } from '@orpc/openapi-client/standard';
-import { Context } from '@orpc/server';
-import { StandardHandlerOptions } from '@orpc/server/standard';
-
-interface StandardOpenAPIHandlerOptions<T extends Context> extends StandardHandlerOptions<T>, StandardOpenAPIJsonSerializerOptions {
-}
-
-export type { StandardOpenAPIHandlerOptions as S };