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

package/README.md

@@ -53,6 +53,7 @@ You can find the full documentation [here](https://orpc.unnoq.com).
 - [@orpc/contract](https://www.npmjs.com/package/@orpc/contract): Build your API contract.
 - [@orpc/server](https://www.npmjs.com/package/@orpc/server): Build your API or implement API contract.
 - [@orpc/client](https://www.npmjs.com/package/@orpc/client): Consume your API on the client with type-safety.
+- [@orpc/react](https://www.npmjs.com/package/@orpc/react): Utilities for integrating oRPC with React and React Server Actions.
 - [@orpc/react-query](https://www.npmjs.com/package/@orpc/react-query): Integration with [React Query](https://tanstack.com/query/latest/docs/framework/react/overview).
 - [@orpc/vue-query](https://www.npmjs.com/package/@orpc/vue-query): Integration with [Vue Query](https://tanstack.com/query/latest/docs/framework/vue/overview).
 - [@orpc/solid-query](https://www.npmjs.com/package/@orpc/solid-query): Integration with [Solid Query](https://tanstack.com/query/latest/docs/framework/solid/overview).

package/dist/adapters/fetch/index.mjs

@@ -1,11 +1,10 @@
-export { O as OpenAPIHandler } from '../../shared/openapi.G9ZZkQ6q.mjs';
+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.BNHmrMe2.mjs';
+import '../../shared/openapi.sdeu0I7N.mjs';
 import '@orpc/contract';
 import '@orpc/shared';
+import '@orpc/client/standard';
 import '@orpc/server';
 import 'rou3';
-import '../../shared/openapi.DZzpQAb-.mjs';
-import 'json-schema-typed/draft-2020-12';

package/dist/adapters/hono/index.mjs

@@ -1,11 +1,10 @@
-export { O as OpenAPIHandler } from '../../shared/openapi.G9ZZkQ6q.mjs';
+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.BNHmrMe2.mjs';
+import '../../shared/openapi.sdeu0I7N.mjs';
 import '@orpc/contract';
 import '@orpc/shared';
+import '@orpc/client/standard';
 import '@orpc/server';
 import 'rou3';
-import '../../shared/openapi.DZzpQAb-.mjs';
-import 'json-schema-typed/draft-2020-12';

package/dist/adapters/next/index.mjs

@@ -1,11 +1,10 @@
-export { O as OpenAPIHandler } from '../../shared/openapi.G9ZZkQ6q.mjs';
+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.BNHmrMe2.mjs';
+import '../../shared/openapi.sdeu0I7N.mjs';
 import '@orpc/contract';
 import '@orpc/shared';
+import '@orpc/client/standard';
 import '@orpc/server';
 import 'rou3';
-import '../../shared/openapi.DZzpQAb-.mjs';
-import 'json-schema-typed/draft-2020-12';

package/dist/adapters/node/index.mjs

@@ -1,13 +1,12 @@
 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.BNHmrMe2.mjs';
-import '@orpc/shared';
-import 'json-schema-typed/draft-2020-12';
+import { a as StandardOpenAPIMatcher, S as StandardOpenAPICodec } from '../../shared/openapi.sdeu0I7N.mjs';
 import '@orpc/contract';
+import '@orpc/shared';
+import '@orpc/client/standard';
 import '@orpc/server';
 import 'rou3';
-import '../../shared/openapi.DZzpQAb-.mjs';
 
 class OpenAPIHandler extends NodeHttpHandler {
   constructor(router, options = {}) {

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

@@ -1,10 +1,9 @@
-import { ORPCError } from '@orpc/client';
+import { ORPCError, HTTPPath } from '@orpc/client';
 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';
-import { HTTPPath } from '@orpc/contract';
 
 declare class StandardOpenAPICodec implements StandardCodec {
     private readonly serializer;

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

@@ -1,10 +1,9 @@
-import { ORPCError } from '@orpc/client';
+import { ORPCError, HTTPPath } from '@orpc/client';
 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';
-import { HTTPPath } from '@orpc/contract';
 
 declare class StandardOpenAPICodec implements StandardCodec {
     private readonly serializer;

package/dist/adapters/standard/index.mjs

@@ -1,7 +1,7 @@
-export { S as StandardOpenAPICodec, a as StandardOpenAPIMatcher, d as decodeParams, t as toRou3Pattern } from '../../shared/openapi.BNHmrMe2.mjs';
+export { S as StandardOpenAPICodec, a as StandardOpenAPIMatcher, d as decodeParams, t as toRou3Pattern } from '../../shared/openapi.sdeu0I7N.mjs';
 import '@orpc/contract';
 import '@orpc/shared';
+import '@orpc/client/standard';
 import '@orpc/server';
 import 'rou3';
-import '../../shared/openapi.DZzpQAb-.mjs';
-import 'json-schema-typed/draft-2020-12';
+import '@orpc/openapi-client/standard';

package/dist/index.d.mts

@@ -1,10 +1,11 @@
-import { AnyContractProcedure, AnySchema, AnyContractRouter, HTTPPath, HTTPMethod } from '@orpc/contract';
+import { AnyContractProcedure, AnySchema, AnyContractRouter } from '@orpc/contract';
 import { OpenAPIV3_1 } from 'openapi-types';
 export { OpenAPIV3_1 as OpenAPI } from 'openapi-types';
 import { StandardOpenAPIJsonSerializerOptions } from '@orpc/openapi-client/standard';
 import { AnyRouter } from '@orpc/server';
 import { JSONSchema } from 'json-schema-typed/draft-2020-12';
 export { JSONSchema, Format as JSONSchemaFormat } from 'json-schema-typed/draft-2020-12';
+import { HTTPPath, HTTPMethod } from '@orpc/client';
 
 type OverrideOperationValue = Partial<OpenAPIV3_1.OperationObject> | ((current: OpenAPIV3_1.OperationObject, procedure: AnyContractProcedure) => OpenAPIV3_1.OperationObject);
 declare function customOpenAPIOperation<T extends object>(o: T, extend: OverrideOperationValue): T;
@@ -55,10 +56,6 @@ declare class OpenAPIGenerator {
     generate(router: AnyContractRouter | AnyRouter, base: Omit<OpenAPIV3_1.Document, 'openapi'>): Promise<OpenAPIV3_1.Document>;
 }
 
-/**
- * @internal
- */
-declare function standardizeHTTPPath(path: HTTPPath): HTTPPath;
 /**
  * @internal
  */
@@ -67,10 +64,6 @@ declare function toOpenAPIPath(path: HTTPPath): string;
  * @internal
  */
 declare function toOpenAPIMethod(method: HTTPMethod): Lowercase<HTTPMethod>;
-/**
- * @internal
- */
-declare function getDynamicParams(path: HTTPPath | undefined): string[] | undefined;
 /**
  * @internal
  */
@@ -117,4 +110,4 @@ 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, getDynamicParams, isAnySchema, isFileSchema, isObjectSchema, oo, separateObjectSchema, standardizeHTTPPath, toOpenAPIContent, toOpenAPIEventIteratorContent, toOpenAPIMethod, toOpenAPIParameters, toOpenAPIPath, toOpenAPISchema };
+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 };

package/dist/index.d.ts

@@ -1,10 +1,11 @@
-import { AnyContractProcedure, AnySchema, AnyContractRouter, HTTPPath, HTTPMethod } from '@orpc/contract';
+import { AnyContractProcedure, AnySchema, AnyContractRouter } from '@orpc/contract';
 import { OpenAPIV3_1 } from 'openapi-types';
 export { OpenAPIV3_1 as OpenAPI } from 'openapi-types';
 import { StandardOpenAPIJsonSerializerOptions } from '@orpc/openapi-client/standard';
 import { AnyRouter } from '@orpc/server';
 import { JSONSchema } from 'json-schema-typed/draft-2020-12';
 export { JSONSchema, Format as JSONSchemaFormat } from 'json-schema-typed/draft-2020-12';
+import { HTTPPath, HTTPMethod } from '@orpc/client';
 
 type OverrideOperationValue = Partial<OpenAPIV3_1.OperationObject> | ((current: OpenAPIV3_1.OperationObject, procedure: AnyContractProcedure) => OpenAPIV3_1.OperationObject);
 declare function customOpenAPIOperation<T extends object>(o: T, extend: OverrideOperationValue): T;
@@ -55,10 +56,6 @@ declare class OpenAPIGenerator {
     generate(router: AnyContractRouter | AnyRouter, base: Omit<OpenAPIV3_1.Document, 'openapi'>): Promise<OpenAPIV3_1.Document>;
 }
 
-/**
- * @internal
- */
-declare function standardizeHTTPPath(path: HTTPPath): HTTPPath;
 /**
  * @internal
  */
@@ -67,10 +64,6 @@ declare function toOpenAPIPath(path: HTTPPath): string;
  * @internal
  */
 declare function toOpenAPIMethod(method: HTTPMethod): Lowercase<HTTPMethod>;
-/**
- * @internal
- */
-declare function getDynamicParams(path: HTTPPath | undefined): string[] | undefined;
 /**
  * @internal
  */
@@ -117,4 +110,4 @@ 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, getDynamicParams, isAnySchema, isFileSchema, isObjectSchema, oo, separateObjectSchema, standardizeHTTPPath, toOpenAPIContent, toOpenAPIEventIteratorContent, toOpenAPIMethod, toOpenAPIParameters, toOpenAPIPath, toOpenAPISchema };
+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 };

package/dist/index.mjs

@@ -1,10 +1,9 @@
-import { isProcedure, resolveContractProcedures, toHttpPath } from '@orpc/server';
+import { isProcedure, resolveContractProcedures } from '@orpc/server';
 import { fallbackORPCErrorStatus, fallbackORPCErrorMessage } from '@orpc/client';
+import { toHttpPath } from '@orpc/client/standard';
 import { fallbackContractConfig, getEventIteratorSchemaDetails } from '@orpc/contract';
-import { StandardOpenAPIJsonSerializer } from '@orpc/openapi-client/standard';
-import { clone } from '@orpc/shared';
-import { t as toOpenAPIMethod, a as toOpenAPIPath, b as toOpenAPIEventIteratorContent, g as getDynamicParams, i as isAnySchema, c as isObjectSchema, d as separateObjectSchema, e as checkParamsSchema, f as toOpenAPIParameters, h as toOpenAPIContent, j as toOpenAPISchema } from './shared/openapi.DZzpQAb-.mjs';
-export { L as LOGIC_KEYWORDS, l as filterSchemaBranches, k as isFileSchema, s as standardizeHTTPPath } from './shared/openapi.DZzpQAb-.mjs';
+import { standardizeHTTPPath, StandardOpenAPIJsonSerializer, getDynamicParams } from '@orpc/openapi-client/standard';
+import { isObject, findDeepMatches, clone } from '@orpc/shared';
 export { Format as JSONSchemaFormat } from 'json-schema-typed/draft-2020-12';
 
 const OPERATION_EXTENDER_SYMBOL = Symbol("ORPC_OPERATION_EXTENDER");
@@ -51,6 +50,227 @@ function applyCustomOpenAPIOperation(operation, contract) {
   return currentOperation;
 }
 
+const LOGIC_KEYWORDS = [
+  "$dynamicRef",
+  "$ref",
+  "additionalItems",
+  "additionalProperties",
+  "allOf",
+  "anyOf",
+  "const",
+  "contains",
+  "contentEncoding",
+  "contentMediaType",
+  "contentSchema",
+  "dependencies",
+  "dependentRequired",
+  "dependentSchemas",
+  "else",
+  "enum",
+  "exclusiveMaximum",
+  "exclusiveMinimum",
+  "format",
+  "if",
+  "items",
+  "maxContains",
+  "maximum",
+  "maxItems",
+  "maxLength",
+  "maxProperties",
+  "minContains",
+  "minimum",
+  "minItems",
+  "minLength",
+  "minProperties",
+  "multipleOf",
+  "not",
+  "oneOf",
+  "pattern",
+  "patternProperties",
+  "prefixItems",
+  "properties",
+  "propertyNames",
+  "required",
+  "then",
+  "type",
+  "unevaluatedItems",
+  "unevaluatedProperties",
+  "uniqueItems"
+];
+
+function isFileSchema(schema) {
+  return isObject(schema) && schema.type === "string" && typeof schema.contentMediaType === "string";
+}
+function isObjectSchema(schema) {
+  return isObject(schema) && schema.type === "object";
+}
+function isAnySchema(schema) {
+  if (schema === true) {
+    return true;
+  }
+  if (Object.keys(schema).every((k) => !LOGIC_KEYWORDS.includes(k))) {
+    return true;
+  }
+  return false;
+}
+function separateObjectSchema(schema, separatedProperties) {
+  if (Object.keys(schema).some((k) => k !== "type" && k !== "properties" && k !== "required" && LOGIC_KEYWORDS.includes(k))) {
+    return [{ type: "object" }, schema];
+  }
+  const matched = { ...schema };
+  const rest = { ...schema };
+  matched.properties = schema.properties && Object.entries(schema.properties).filter(([key]) => separatedProperties.includes(key)).reduce((acc, [key, value]) => {
+    acc[key] = value;
+    return acc;
+  }, {});
+  matched.required = schema.required?.filter((key) => separatedProperties.includes(key));
+  matched.examples = schema.examples?.map((example) => {
+    if (!isObject(example)) {
+      return example;
+    }
+    return Object.entries(example).reduce((acc, [key, value]) => {
+      if (separatedProperties.includes(key)) {
+        acc[key] = value;
+      }
+      return acc;
+    }, {});
+  });
+  rest.properties = schema.properties && Object.entries(schema.properties).filter(([key]) => !separatedProperties.includes(key)).reduce((acc, [key, value]) => {
+    acc[key] = value;
+    return acc;
+  }, {});
+  rest.required = schema.required?.filter((key) => !separatedProperties.includes(key));
+  rest.examples = schema.examples?.map((example) => {
+    if (!isObject(example)) {
+      return example;
+    }
+    return Object.entries(example).reduce((acc, [key, value]) => {
+      if (!separatedProperties.includes(key)) {
+        acc[key] = value;
+      }
+      return acc;
+    }, {});
+  });
+  return [matched, rest];
+}
+function filterSchemaBranches(schema, check, matches = []) {
+  if (check(schema)) {
+    matches.push(schema);
+    return [matches, void 0];
+  }
+  if (isObject(schema)) {
+    for (const keyword of ["anyOf", "oneOf"]) {
+      if (schema[keyword] && Object.keys(schema).every(
+        (k) => k === keyword || !LOGIC_KEYWORDS.includes(k)
+      )) {
+        const rest = schema[keyword].map((s) => filterSchemaBranches(s, check, matches)[1]).filter((v) => !!v);
+        if (rest.length === 1 && typeof rest[0] === "object") {
+          return [matches, { ...schema, [keyword]: void 0, ...rest[0] }];
+        }
+        return [matches, { ...schema, [keyword]: rest }];
+      }
+    }
+  }
+  return [matches, schema];
+}
+
+function toOpenAPIPath(path) {
+  return standardizeHTTPPath(path).replace(/\/\{\+([^}]+)\}/g, "/{$1}");
+}
+function toOpenAPIMethod(method) {
+  return method.toLocaleLowerCase();
+}
+function toOpenAPIContent(schema) {
+  const content = {};
+  const [matches, restSchema] = filterSchemaBranches(schema, isFileSchema);
+  for (const file of matches) {
+    content[file.contentMediaType] = {
+      schema: toOpenAPISchema(file)
+    };
+  }
+  if (restSchema !== void 0) {
+    content["application/json"] = {
+      schema: toOpenAPISchema(restSchema)
+    };
+    const isStillHasFileSchema = findDeepMatches((v) => isObject(v) && isFileSchema(v), restSchema).values.length > 0;
+    if (isStillHasFileSchema) {
+      content["multipart/form-data"] = {
+        schema: toOpenAPISchema(restSchema)
+      };
+    }
+  }
+  return content;
+}
+function toOpenAPIEventIteratorContent([yieldsRequired, yieldsSchema], [returnsRequired, returnsSchema]) {
+  return {
+    "text/event-stream": {
+      schema: toOpenAPISchema({
+        oneOf: [
+          {
+            type: "object",
+            properties: {
+              event: { const: "message" },
+              data: yieldsSchema,
+              id: { type: "string" },
+              retry: { type: "number" }
+            },
+            required: yieldsRequired ? ["event", "data"] : ["event"]
+          },
+          {
+            type: "object",
+            properties: {
+              event: { const: "done" },
+              data: returnsSchema,
+              id: { type: "string" },
+              retry: { type: "number" }
+            },
+            required: returnsRequired ? ["event", "data"] : ["event"]
+          },
+          {
+            type: "object",
+            properties: {
+              event: { const: "error" },
+              data: {},
+              id: { type: "string" },
+              retry: { type: "number" }
+            },
+            required: ["event"]
+          }
+        ]
+      })
+    }
+  };
+}
+function toOpenAPIParameters(schema, parameterIn) {
+  const parameters = [];
+  for (const key in schema.properties) {
+    const keySchema = schema.properties[key];
+    parameters.push({
+      name: key,
+      in: parameterIn,
+      required: schema.required?.includes(key),
+      style: parameterIn === "query" ? "deepObject" : void 0,
+      explode: parameterIn === "query" ? true : void 0,
+      schema: toOpenAPISchema(keySchema)
+    });
+  }
+  return parameters;
+}
+function checkParamsSchema(schema, params) {
+  const properties = Object.keys(schema.properties ?? {});
+  const required = schema.required ?? [];
+  if (properties.length !== params.length || properties.some((v) => !params.includes(v))) {
+    return false;
+  }
+  if (required.length !== params.length || required.some((v) => !params.includes(v))) {
+    return false;
+  }
+  return true;
+}
+function toOpenAPISchema(schema) {
+  return schema === true ? {} : schema === false ? { not: {} } : schema;
+}
+
 class CompositeSchemaConverter {
   converters;
   constructor(converters) {
@@ -130,7 +350,7 @@ ${errors.join("\n\n")}`
       };
       return;
     }
-    const dynamicParams = getDynamicParams(def.route.path);
+    const dynamicParams = getDynamicParams(def.route.path)?.map((v) => v.name);
     const inputStructure = fallbackContractConfig("defaultInputStructure", def.route.inputStructure);
     let [required, schema] = this.converter.convert(def.inputSchema, { strategy: "input" });
     if (isAnySchema(schema) && !dynamicParams?.length) {
@@ -300,4 +520,4 @@ const oo = {
   spec: customOpenAPIOperation
 };
 
-export { CompositeSchemaConverter, OpenAPIGenerator, applyCustomOpenAPIOperation, checkParamsSchema, customOpenAPIOperation, getCustomOpenAPIOperation, getDynamicParams, isAnySchema, isObjectSchema, oo, separateObjectSchema, toOpenAPIContent, toOpenAPIEventIteratorContent, toOpenAPIMethod, toOpenAPIParameters, toOpenAPIPath, toOpenAPISchema };
+export { CompositeSchemaConverter, LOGIC_KEYWORDS, OpenAPIGenerator, applyCustomOpenAPIOperation, checkParamsSchema, customOpenAPIOperation, filterSchemaBranches, getCustomOpenAPIOperation, isAnySchema, isFileSchema, isObjectSchema, oo, separateObjectSchema, toOpenAPIContent, toOpenAPIEventIteratorContent, toOpenAPIMethod, toOpenAPIParameters, toOpenAPIPath, toOpenAPISchema };

package/dist/shared/{openapi.G9ZZkQ6q.mjs → openapi.CGZ7t-VN.mjs}

@@ -1,9 +1,7 @@
 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.BNHmrMe2.mjs';
-import '@orpc/shared';
-import 'json-schema-typed/draft-2020-12';
+import { a as StandardOpenAPIMatcher, S as StandardOpenAPICodec } from './openapi.sdeu0I7N.mjs';
 
 class OpenAPIHandler extends FetchHandler {
   constructor(router, options = {}) {

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

@@ -1,8 +1,9 @@
 import { fallbackContractConfig } from '@orpc/contract';
 import { isObject } from '@orpc/shared';
-import { traverseContractProcedures, toHttpPath, isProcedure, getLazyMeta, unlazy, getRouter, createContractedProcedure } from '@orpc/server';
+import { toHttpPath } from '@orpc/client/standard';
+import { traverseContractProcedures, isProcedure, getLazyMeta, unlazy, getRouter, createContractedProcedure } from '@orpc/server';
 import { createRouter, addRoute, findRoute } from 'rou3';
-import { s as standardizeHTTPPath } from './openapi.DZzpQAb-.mjs';
+import { standardizeHTTPPath } from '@orpc/openapi-client/standard';
 
 class StandardOpenAPICodec {
   constructor(serializer) {
@@ -65,7 +66,7 @@ class StandardOpenAPICodec {
     return {
       status: error.status,
       headers: {},
-      body: this.serializer.serialize(error.toJSON())
+      body: this.serializer.serialize(error.toJSON(), { outputFormat: "plain" })
     };
   }
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@orpc/openapi",
   "type": "module",
-  "version": "1.0.0-beta.4",
+  "version": "1.0.0-beta.5",
   "license": "MIT",
   "homepage": "https://orpc.unnoq.com",
   "repository": {
@@ -52,12 +52,12 @@
     "json-schema-typed": "^8.0.1",
     "openapi-types": "^12.1.3",
     "rou3": "^0.5.1",
-    "@orpc/client": "1.0.0-beta.4",
-    "@orpc/openapi-client": "1.0.0-beta.4",
-    "@orpc/shared": "1.0.0-beta.4",
-    "@orpc/contract": "1.0.0-beta.4",
-    "@orpc/standard-server": "1.0.0-beta.4",
-    "@orpc/server": "1.0.0-beta.4"
+    "@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"
   },
   "devDependencies": {
     "zod": "^3.24.2"

package/dist/shared/openapi.DZzpQAb-.mjs

@@ -1,231 +0,0 @@
-import { isObject, findDeepMatches } from '@orpc/shared';
-import 'json-schema-typed/draft-2020-12';
-
-const LOGIC_KEYWORDS = [
-  "$dynamicRef",
-  "$ref",
-  "additionalItems",
-  "additionalProperties",
-  "allOf",
-  "anyOf",
-  "const",
-  "contains",
-  "contentEncoding",
-  "contentMediaType",
-  "contentSchema",
-  "dependencies",
-  "dependentRequired",
-  "dependentSchemas",
-  "else",
-  "enum",
-  "exclusiveMaximum",
-  "exclusiveMinimum",
-  "format",
-  "if",
-  "items",
-  "maxContains",
-  "maximum",
-  "maxItems",
-  "maxLength",
-  "maxProperties",
-  "minContains",
-  "minimum",
-  "minItems",
-  "minLength",
-  "minProperties",
-  "multipleOf",
-  "not",
-  "oneOf",
-  "pattern",
-  "patternProperties",
-  "prefixItems",
-  "properties",
-  "propertyNames",
-  "required",
-  "then",
-  "type",
-  "unevaluatedItems",
-  "unevaluatedProperties",
-  "uniqueItems"
-];
-
-function isFileSchema(schema) {
-  return isObject(schema) && schema.type === "string" && typeof schema.contentMediaType === "string";
-}
-function isObjectSchema(schema) {
-  return isObject(schema) && schema.type === "object";
-}
-function isAnySchema(schema) {
-  if (schema === true) {
-    return true;
-  }
-  if (Object.keys(schema).every((k) => !LOGIC_KEYWORDS.includes(k))) {
-    return true;
-  }
-  return false;
-}
-function separateObjectSchema(schema, separatedProperties) {
-  if (Object.keys(schema).some((k) => k !== "type" && k !== "properties" && k !== "required" && LOGIC_KEYWORDS.includes(k))) {
-    return [{ type: "object" }, schema];
-  }
-  const matched = { ...schema };
-  const rest = { ...schema };
-  matched.properties = schema.properties && Object.entries(schema.properties).filter(([key]) => separatedProperties.includes(key)).reduce((acc, [key, value]) => {
-    acc[key] = value;
-    return acc;
-  }, {});
-  matched.required = schema.required?.filter((key) => separatedProperties.includes(key));
-  matched.examples = schema.examples?.map((example) => {
-    if (!isObject(example)) {
-      return example;
-    }
-    return Object.entries(example).reduce((acc, [key, value]) => {
-      if (separatedProperties.includes(key)) {
-        acc[key] = value;
-      }
-      return acc;
-    }, {});
-  });
-  rest.properties = schema.properties && Object.entries(schema.properties).filter(([key]) => !separatedProperties.includes(key)).reduce((acc, [key, value]) => {
-    acc[key] = value;
-    return acc;
-  }, {});
-  rest.required = schema.required?.filter((key) => !separatedProperties.includes(key));
-  rest.examples = schema.examples?.map((example) => {
-    if (!isObject(example)) {
-      return example;
-    }
-    return Object.entries(example).reduce((acc, [key, value]) => {
-      if (!separatedProperties.includes(key)) {
-        acc[key] = value;
-      }
-      return acc;
-    }, {});
-  });
-  return [matched, rest];
-}
-function filterSchemaBranches(schema, check, matches = []) {
-  if (check(schema)) {
-    matches.push(schema);
-    return [matches, void 0];
-  }
-  if (isObject(schema)) {
-    for (const keyword of ["anyOf", "oneOf"]) {
-      if (schema[keyword] && Object.keys(schema).every(
-        (k) => k === keyword || !LOGIC_KEYWORDS.includes(k)
-      )) {
-        const rest = schema[keyword].map((s) => filterSchemaBranches(s, check, matches)[1]).filter((v) => !!v);
-        if (rest.length === 1 && typeof rest[0] === "object") {
-          return [matches, { ...schema, [keyword]: void 0, ...rest[0] }];
-        }
-        return [matches, { ...schema, [keyword]: rest }];
-      }
-    }
-  }
-  return [matches, schema];
-}
-
-function standardizeHTTPPath(path) {
-  return `/${path.replace(/\/{2,}/g, "/").replace(/^\/|\/$/g, "")}`;
-}
-function toOpenAPIPath(path) {
-  return standardizeHTTPPath(path).replace(/\/\{\+([^}]+)\}/g, "/{$1}");
-}
-function toOpenAPIMethod(method) {
-  return method.toLocaleLowerCase();
-}
-function getDynamicParams(path) {
-  return path ? standardizeHTTPPath(path).match(/\/\{([^}]+)\}/g)?.map((v) => v.match(/\{\+?([^}]+)\}/)[1]) : void 0;
-}
-function toOpenAPIContent(schema) {
-  const content = {};
-  const [matches, restSchema] = filterSchemaBranches(schema, isFileSchema);
-  for (const file of matches) {
-    content[file.contentMediaType] = {
-      schema: toOpenAPISchema(file)
-    };
-  }
-  if (restSchema !== void 0) {
-    content["application/json"] = {
-      schema: toOpenAPISchema(restSchema)
-    };
-    const isStillHasFileSchema = findDeepMatches((v) => isObject(v) && isFileSchema(v), restSchema).values.length > 0;
-    if (isStillHasFileSchema) {
-      content["multipart/form-data"] = {
-        schema: toOpenAPISchema(restSchema)
-      };
-    }
-  }
-  return content;
-}
-function toOpenAPIEventIteratorContent([yieldsRequired, yieldsSchema], [returnsRequired, returnsSchema]) {
-  return {
-    "text/event-stream": {
-      schema: toOpenAPISchema({
-        oneOf: [
-          {
-            type: "object",
-            properties: {
-              event: { const: "message" },
-              data: yieldsSchema,
-              id: { type: "string" },
-              retry: { type: "number" }
-            },
-            required: yieldsRequired ? ["event", "data"] : ["event"]
-          },
-          {
-            type: "object",
-            properties: {
-              event: { const: "done" },
-              data: returnsSchema,
-              id: { type: "string" },
-              retry: { type: "number" }
-            },
-            required: returnsRequired ? ["event", "data"] : ["event"]
-          },
-          {
-            type: "object",
-            properties: {
-              event: { const: "error" },
-              data: {},
-              id: { type: "string" },
-              retry: { type: "number" }
-            },
-            required: ["event"]
-          }
-        ]
-      })
-    }
-  };
-}
-function toOpenAPIParameters(schema, parameterIn) {
-  const parameters = [];
-  for (const key in schema.properties) {
-    const keySchema = schema.properties[key];
-    parameters.push({
-      name: key,
-      in: parameterIn,
-      required: schema.required?.includes(key),
-      style: parameterIn === "query" ? "deepObject" : void 0,
-      explode: parameterIn === "query" ? true : void 0,
-      schema: toOpenAPISchema(keySchema)
-    });
-  }
-  return parameters;
-}
-function checkParamsSchema(schema, params) {
-  const properties = Object.keys(schema.properties ?? {});
-  const required = schema.required ?? [];
-  if (properties.length !== params.length || properties.some((v) => !params.includes(v))) {
-    return false;
-  }
-  if (required.length !== params.length || required.some((v) => !params.includes(v))) {
-    return false;
-  }
-  return true;
-}
-function toOpenAPISchema(schema) {
-  return schema === true ? {} : schema === false ? { not: {} } : schema;
-}
-
-export { LOGIC_KEYWORDS as L, toOpenAPIPath as a, toOpenAPIEventIteratorContent as b, isObjectSchema as c, separateObjectSchema as d, checkParamsSchema as e, toOpenAPIParameters as f, getDynamicParams as g, toOpenAPIContent as h, isAnySchema as i, toOpenAPISchema as j, isFileSchema as k, filterSchemaBranches as l, standardizeHTTPPath as s, toOpenAPIMethod as t };