@orpc/openapi 0.0.0-next.b4e6d3a → 0.0.0-next.b825e0c

package/dist/{chunk-HC5PVG4R.js → chunk-BHJYKXQL.js}

@@ -5,7 +5,7 @@ var __export = (target, all) => {
 };
 
 // src/json-serializer.ts
-import { isObject } from "@orpc/shared";
+import { isPlainObject } from "@orpc/shared";
 var JSONSerializer = class {
   serialize(payload) {
     if (payload instanceof Set)
@@ -26,7 +26,7 @@ var JSONSerializer = class {
       return payload.toString();
     if (payload instanceof URL)
       return payload.toString();
-    if (!isObject(payload))
+    if (!isPlainObject(payload))
       return payload;
     return Object.keys(payload).reduce(
       (carry, key) => {
@@ -49,4 +49,4 @@ export {
   JSONSerializer,
   standardizeHTTPPath
 };
-//# sourceMappingURL=chunk-HC5PVG4R.js.map
+//# sourceMappingURL=chunk-BHJYKXQL.js.map

package/dist/{chunk-NHYWV7BW.js → chunk-HQ34JZI7.js}

@@ -1,7 +1,7 @@
 import {
   OpenAPICodec,
   OpenAPIMatcher
-} from "./chunk-DRV7KYES.js";
+} from "./chunk-M5HOHBLW.js";
 
 // src/adapters/fetch/openapi-handler.ts
 import { fetchRequestToStandardRequest, standardResponseToFetchResponse } from "@orpc/server/fetch";
@@ -29,4 +29,4 @@ var OpenAPIHandler = class {
 export {
   OpenAPIHandler
 };
-//# sourceMappingURL=chunk-NHYWV7BW.js.map
+//# sourceMappingURL=chunk-HQ34JZI7.js.map

package/dist/{chunk-DRV7KYES.js → chunk-M5HOHBLW.js}

@@ -2,7 +2,7 @@ import {
   JSONSerializer,
   __export,
   standardizeHTTPPath
-} from "./chunk-HC5PVG4R.js";
+} from "./chunk-BHJYKXQL.js";
 
 // src/adapters/standard/bracket-notation.ts
 var bracket_notation_exports = {};
@@ -13,9 +13,9 @@ __export(bracket_notation_exports, {
   serialize: () => serialize,
   stringifyPath: () => stringifyPath
 });
-import { isObject } from "@orpc/shared";
+import { isPlainObject } from "@orpc/shared";
 function serialize(payload, parentKey = "") {
-  if (!Array.isArray(payload) && !isObject(payload))
+  if (!Array.isArray(payload) && !isPlainObject(payload))
     return [["", payload]];
   const result = [];
   function helper(value, path) {
@@ -23,7 +23,7 @@ function serialize(payload, parentKey = "") {
       value.forEach((item, index) => {
         helper(item, [...path, String(index)]);
       });
-    } else if (isObject(value)) {
+    } else if (isPlainObject(value)) {
       for (const [key, val] of Object.entries(value)) {
         helper(val, [...path, key]);
       }
@@ -223,7 +223,7 @@ function parsePath(path) {
 
 // src/adapters/standard/openapi-codec.ts
 import { fallbackContractConfig } from "@orpc/contract";
-import { isObject as isObject2 } from "@orpc/shared";
+import { isPlainObject as isPlainObject2, once } from "@orpc/shared";
 
 // src/adapters/standard/openapi-serializer.ts
 import { findDeepMatches } from "@orpc/shared";
@@ -261,43 +261,54 @@ var OpenAPISerializer = class {
   }
 };
 
+// src/adapters/standard/schema-coercer.ts
+var CompositeSchemaCoercer = class {
+  constructor(coercers) {
+    this.coercers = coercers;
+  }
+  coerce(schema, value) {
+    let current = value;
+    for (const coercer of this.coercers) {
+      current = coercer.coerce(schema, current);
+    }
+    return current;
+  }
+};
+
 // src/adapters/standard/openapi-codec.ts
 var OpenAPICodec = class {
   serializer;
+  compositeSchemaCoercer;
   constructor(options) {
     this.serializer = options?.serializer ?? new OpenAPISerializer();
+    this.compositeSchemaCoercer = new CompositeSchemaCoercer(options?.schemaCoercers ?? []);
   }
   async decode(request, params, procedure) {
     const inputStructure = fallbackContractConfig("defaultInputStructure", procedure["~orpc"].route.inputStructure);
     if (inputStructure === "compact") {
       const data = request.method === "GET" ? this.serializer.deserialize(request.url.searchParams) : this.serializer.deserialize(await request.body());
       if (data === void 0) {
-        return params;
+        return this.compositeSchemaCoercer.coerce(procedure["~orpc"].inputSchema, params);
       }
-      if (isObject2(data)) {
-        return {
+      if (isPlainObject2(data)) {
+        return this.compositeSchemaCoercer.coerce(procedure["~orpc"].inputSchema, {
           ...params,
           ...data
-        };
+        });
       }
-      return data;
+      return this.compositeSchemaCoercer.coerce(procedure["~orpc"].inputSchema, data);
     }
-    const deserializeSearchParams = () => {
+    const query = once(() => {
       return this.serializer.deserialize(request.url.searchParams);
-    };
-    return {
+    });
+    return this.compositeSchemaCoercer.coerce(procedure["~orpc"].inputSchema, {
       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 });
+        return query();
       },
       headers: request.headers,
       body: this.serializer.deserialize(await request.body())
-    };
+    });
   }
   encode(output, procedure) {
     const successStatus = fallbackContractConfig("defaultSuccessStatus", procedure["~orpc"].route.successStatus);
@@ -309,7 +320,7 @@ var OpenAPICodec = class {
         body: this.serializer.serialize(output)
       };
     }
-    if (!isObject2(output)) {
+    if (!isPlainObject2(output)) {
       throw new Error(
         'Invalid output structure for "detailed" output. Expected format: { body: any, headers?: Record<string, string | string[] | undefined> }'
       );
@@ -414,7 +425,8 @@ function convertOpenAPIPathToRouterPath(path) {
 export {
   bracket_notation_exports,
   OpenAPISerializer,
+  CompositeSchemaCoercer,
   OpenAPICodec,
   OpenAPIMatcher
 };
-//# sourceMappingURL=chunk-DRV7KYES.js.map
+//# sourceMappingURL=chunk-M5HOHBLW.js.map

package/dist/fetch.js

@@ -1,8 +1,8 @@
 import {
   OpenAPIHandler
-} from "./chunk-NHYWV7BW.js";
-import "./chunk-DRV7KYES.js";
-import "./chunk-HC5PVG4R.js";
+} from "./chunk-HQ34JZI7.js";
+import "./chunk-M5HOHBLW.js";
+import "./chunk-BHJYKXQL.js";
 export {
   OpenAPIHandler
 };

package/dist/hono.js

@@ -1,8 +1,8 @@
 import {
   OpenAPIHandler
-} from "./chunk-NHYWV7BW.js";
-import "./chunk-DRV7KYES.js";
-import "./chunk-HC5PVG4R.js";
+} from "./chunk-HQ34JZI7.js";
+import "./chunk-M5HOHBLW.js";
+import "./chunk-BHJYKXQL.js";
 export {
   OpenAPIHandler
 };

package/dist/index.js

@@ -1,53 +1,7 @@
 import {
   JSONSerializer,
   standardizeHTTPPath
-} from "./chunk-HC5PVG4R.js";
-
-// src/openapi-operation-extender.ts
-import { isProcedure } from "@orpc/server";
-var OPERATION_EXTENDER_SYMBOL = Symbol("ORPC_OPERATION_EXTENDER");
-function setOperationExtender(o, extend) {
-  return new Proxy(o, {
-    get(target, prop, receiver) {
-      if (prop === OPERATION_EXTENDER_SYMBOL) {
-        return extend;
-      }
-      return Reflect.get(target, prop, receiver);
-    }
-  });
-}
-function getOperationExtender(o) {
-  return o[OPERATION_EXTENDER_SYMBOL];
-}
-function extendOperation(operation, procedure) {
-  const operationExtenders = [];
-  for (const errorItem of Object.values(procedure["~orpc"].errorMap)) {
-    const maybeExtender = getOperationExtender(errorItem);
-    if (maybeExtender) {
-      operationExtenders.push(maybeExtender);
-    }
-  }
-  if (isProcedure(procedure)) {
-    for (const middleware of procedure["~orpc"].middlewares) {
-      const maybeExtender = getOperationExtender(middleware);
-      if (maybeExtender) {
-        operationExtenders.push(maybeExtender);
-      }
-    }
-  }
-  let currentOperation = operation;
-  for (const extender of operationExtenders) {
-    if (typeof extender === "function") {
-      currentOperation = extender(currentOperation, procedure);
-    } else {
-      currentOperation = {
-        ...currentOperation,
-        ...extender
-      };
-    }
-  }
-  return currentOperation;
-}
+} from "./chunk-BHJYKXQL.js";
 
 // src/openapi.ts
 import { OpenApiBuilder } from "openapi3-ts/oas31";
@@ -229,14 +183,14 @@ var OpenAPIOutputStructureParser = class {
 };
 
 // src/openapi-parameters-builder.ts
-import { get, isObject, omit } from "@orpc/shared";
+import { get, isPlainObject, omit } from "@orpc/shared";
 var OpenAPIParametersBuilder = class {
   build(paramIn, jsonSchema, options) {
     const parameters = [];
     for (const name in jsonSchema.properties) {
       const schema = jsonSchema.properties[name];
       const paramExamples = jsonSchema.examples?.filter((example) => {
-        return isObject(example) && name in example;
+        return isPlainObject(example) && name in example;
       }).map((example) => {
         return example[name];
       });
@@ -297,7 +251,7 @@ var CompositeSchemaConverter = class {
 };
 
 // src/schema-utils.ts
-import { isObject as isObject2 } from "@orpc/shared";
+import { isPlainObject as isPlainObject2 } from "@orpc/shared";
 
 // src/schema.ts
 import * as JSONSchema from "json-schema-typed/draft-2020-12";
@@ -359,7 +313,7 @@ var SchemaUtils = class {
     }, {});
     matched.required = schema.required?.filter((key) => separatedProperties.includes(key));
     matched.examples = schema.examples?.map((example) => {
-      if (!isObject2(example)) {
+      if (!isPlainObject2(example)) {
         return example;
       }
       return Object.entries(example).reduce((acc, [key, value]) => {
@@ -375,7 +329,7 @@ var SchemaUtils = class {
     }, {});
     rest.required = schema.required?.filter((key) => !separatedProperties.includes(key));
     rest.examples = schema.examples?.map((example) => {
-      if (!isObject2(example)) {
+      if (!isPlainObject2(example)) {
         return example;
       }
       return Object.entries(example).reduce((acc, [key, value]) => {
@@ -552,9 +506,8 @@ var OpenAPIGenerator = class {
           requestBody,
           responses
         };
-        const extendedOperation = extendOperation(operation, contract);
         builder.addPath(httpPath, {
-          [method.toLocaleLowerCase()]: extendedOperation
+          [method.toLocaleLowerCase()]: operation
         });
       } catch (e) {
         if (e instanceof OpenAPIError) {
@@ -576,11 +529,6 @@ var OpenAPIGenerator = class {
     return this.jsonSerializer.serialize(builder.getSpec());
   }
 };
-
-// src/index.ts
-var oo = {
-  spec: setOperationExtender
-};
 export {
   CompositeSchemaConverter,
   JSONSchema,
@@ -593,10 +541,6 @@ export {
   OpenAPIPathParser,
   OpenApiBuilder,
   SchemaUtils,
-  extendOperation,
-  getOperationExtender,
-  oo,
-  setOperationExtender,
   standardizeHTTPPath
 };
 //# sourceMappingURL=index.js.map

package/dist/next.js

@@ -1,8 +1,8 @@
 import {
   OpenAPIHandler
-} from "./chunk-NHYWV7BW.js";
-import "./chunk-DRV7KYES.js";
-import "./chunk-HC5PVG4R.js";
+} from "./chunk-HQ34JZI7.js";
+import "./chunk-M5HOHBLW.js";
+import "./chunk-BHJYKXQL.js";
 export {
   OpenAPIHandler
 };

package/dist/node.js

@@ -1,8 +1,8 @@
 import {
   OpenAPICodec,
   OpenAPIMatcher
-} from "./chunk-DRV7KYES.js";
-import "./chunk-HC5PVG4R.js";
+} from "./chunk-M5HOHBLW.js";
+import "./chunk-BHJYKXQL.js";
 
 // src/adapters/node/openapi-handler.ts
 import { nodeHttpResponseSendStandardResponse, nodeHttpToStandardRequest } from "@orpc/server/node";

package/dist/src/adapters/fetch/openapi-handler.d.ts

@@ -1,11 +1,10 @@
 import type { Context, Router } from '@orpc/server';
 import type { FetchHandler, FetchHandleResult } from '@orpc/server/fetch';
-import type { StandardHandleOptions } from '@orpc/server/standard';
-import type { MaybeOptionalOptions } from '@orpc/shared';
+import type { StandardHandleRest } from '@orpc/server/standard';
 import type { OpenAPIHandlerOptions } from '../standard';
 export declare class OpenAPIHandler<T extends Context> implements FetchHandler<T> {
     private readonly standardHandler;
     constructor(router: Router<T, any>, options?: NoInfer<OpenAPIHandlerOptions<T>>);
-    handle(request: Request, ...rest: MaybeOptionalOptions<StandardHandleOptions<T>>): Promise<FetchHandleResult>;
+    handle(request: Request, ...rest: StandardHandleRest<T>): Promise<FetchHandleResult>;
 }
 //# sourceMappingURL=openapi-handler.d.ts.map

package/dist/src/adapters/node/openapi-handler.d.ts

@@ -1,11 +1,10 @@
 import type { Context, Router } from '@orpc/server';
 import type { NodeHttpHandler, NodeHttpHandleResult, NodeHttpRequest, NodeHttpResponse } from '@orpc/server/node';
-import type { StandardHandleOptions } from '@orpc/server/standard';
-import type { MaybeOptionalOptions } from '@orpc/shared';
+import type { StandardHandleRest } from '@orpc/server/standard';
 import type { OpenAPIHandlerOptions } from '../standard';
 export declare class OpenAPIHandler<T extends Context> implements NodeHttpHandler<T> {
     private readonly standardHandler;
     constructor(router: Router<T, any>, options?: NoInfer<OpenAPIHandlerOptions<T>>);
-    handle(req: NodeHttpRequest, res: NodeHttpResponse, ...rest: MaybeOptionalOptions<StandardHandleOptions<T>>): Promise<NodeHttpHandleResult>;
+    handle(req: NodeHttpRequest, res: NodeHttpResponse, ...rest: StandardHandleRest<T>): Promise<NodeHttpHandleResult>;
 }
 //# sourceMappingURL=openapi-handler.d.ts.map

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

@@ -3,4 +3,5 @@ export * from './openapi-codec';
 export * from './openapi-handler';
 export * from './openapi-matcher';
 export * from './openapi-serializer';
+export * from './schema-coercer';
 //# sourceMappingURL=index.d.ts.map

package/dist/src/adapters/standard/openapi-codec.d.ts

@@ -2,11 +2,14 @@ import type { AnyProcedure } from '@orpc/server';
 import type { StandardCodec, StandardParams, StandardRequest, StandardResponse } from '@orpc/server/standard';
 import { type ORPCError } from '@orpc/contract';
 import { OpenAPISerializer } from './openapi-serializer';
+import { type SchemaCoercer } from './schema-coercer';
 export interface OpenAPICodecOptions {
     serializer?: OpenAPISerializer;
+    schemaCoercers?: SchemaCoercer[];
 }
 export declare class OpenAPICodec implements StandardCodec {
     private readonly serializer;
+    private readonly compositeSchemaCoercer;
     constructor(options?: OpenAPICodecOptions);
     decode(request: StandardRequest, params: StandardParams | undefined, procedure: AnyProcedure): Promise<unknown>;
     encode(output: unknown, procedure: AnyProcedure): StandardResponse;

package/dist/src/adapters/standard/schema-coercer.d.ts

@@ -0,0 +1,10 @@
+import type { Schema } from '@orpc/contract';
+export interface SchemaCoercer {
+    coerce(schema: Schema, value: unknown): unknown;
+}
+export declare class CompositeSchemaCoercer implements SchemaCoercer {
+    private readonly coercers;
+    constructor(coercers: SchemaCoercer[]);
+    coerce(schema: Schema, value: unknown): unknown;
+}
+//# sourceMappingURL=schema-coercer.d.ts.map

package/dist/src/index.d.ts

@@ -1,17 +1,12 @@
 /** unnoq */
-import { setOperationExtender } from './openapi-operation-extender';
 export * from './json-serializer';
 export * from './openapi';
 export * from './openapi-content-builder';
 export * from './openapi-generator';
-export * from './openapi-operation-extender';
 export * from './openapi-parameters-builder';
 export * from './openapi-path-parser';
 export * from './schema';
 export * from './schema-converter';
 export * from './schema-utils';
 export * from './utils';
-export declare const oo: {
-    spec: typeof setOperationExtender;
-};
 //# sourceMappingURL=index.d.ts.map

package/dist/standard.js

@@ -1,12 +1,14 @@
 import {
+  CompositeSchemaCoercer,
   OpenAPICodec,
   OpenAPIMatcher,
   OpenAPISerializer,
   bracket_notation_exports
-} from "./chunk-DRV7KYES.js";
-import "./chunk-HC5PVG4R.js";
+} from "./chunk-M5HOHBLW.js";
+import "./chunk-BHJYKXQL.js";
 export {
   bracket_notation_exports as BracketNotation,
+  CompositeSchemaCoercer,
   OpenAPICodec,
   OpenAPIMatcher,
   OpenAPISerializer

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@orpc/openapi",
   "type": "module",
-  "version": "0.0.0-next.b4e6d3a",
+  "version": "0.0.0-next.b825e0c",
   "license": "MIT",
   "homepage": "https://orpc.unnoq.com",
   "repository": {
@@ -54,15 +54,18 @@
     "dist"
   ],
   "dependencies": {
+    "@standard-schema/spec": "1.0.0-beta.4",
+    "@types/content-disposition": "^0.5.8",
+    "content-disposition": "^0.5.4",
     "escape-string-regexp": "^5.0.0",
     "fast-content-type-parse": "^2.0.0",
     "json-schema-typed": "^8.0.1",
     "openapi3-ts": "^4.4.0",
     "rou3": "^0.5.1",
     "wildcard-match": "^5.1.3",
-    "@orpc/contract": "0.0.0-next.b4e6d3a",
-    "@orpc/server": "0.0.0-next.b4e6d3a",
-    "@orpc/shared": "0.0.0-next.b4e6d3a"
+    "@orpc/contract": "0.0.0-next.b825e0c",
+    "@orpc/server": "0.0.0-next.b825e0c",
+    "@orpc/shared": "0.0.0-next.b825e0c"
   },
   "devDependencies": {
     "@readme/openapi-parser": "^2.6.0",

package/dist/src/openapi-operation-extender.d.ts

@@ -1,7 +0,0 @@
-import type { AnyContractProcedure } from '@orpc/contract';
-import type { OpenAPI } from './openapi';
-export type OverrideOperationValue = OpenAPI.OperationObject | ((current: OpenAPI.OperationObject, procedure: AnyContractProcedure) => OpenAPI.OperationObject);
-export declare function setOperationExtender<T extends object>(o: T, extend: OverrideOperationValue): T;
-export declare function getOperationExtender(o: object): OverrideOperationValue | undefined;
-export declare function extendOperation(operation: OpenAPI.OperationObject, procedure: AnyContractProcedure): OpenAPI.OperationObject;
-//# sourceMappingURL=openapi-operation-extender.d.ts.map