Improve backend types

openapistack · Sep 10, 2024 · dfbbcff · dfbbcff
1 parent b719c5e
commit dfbbcff
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "openapicmd",
   "description": "OpenAPI Command Line Tool",
-  "version": "2.6.0-beta.1",
+  "version": "2.6.0-beta.2",
   "author": "Viljami Kuosmanen <[email protected]>",
   "bin": {
     "openapi": "./bin/run.js"

diff --git a/src/typegen/typegen.ts b/src/typegen/typegen.ts
@@ -86,9 +86,10 @@ function generateBackendOperationMethodTypes(
     '}',
     '',
     'export type OperationContext<operationId extends keyof Operations> = Operations[operationId]["context"];',
-    'export type OperationResponse<operationId extends keyof Operations> = Operations[operationId]["response"];',
-    'export type OperationResponseCallback<operationId extends keyof Operations> = (response: OperationResponse<operationId>, ...args: unknown[]) => any;',
-    'export type OperationHandler<operationId extends keyof Operations, HandlerArgs extends unknown[] = unknown[]> = (...params: [OperationContext<operationId>, ...HandlerArgs]) => Promise<OperationResponseCallback<operationId> | OperationResponse<operationId>>;',
+    'export type OperationResponseBody<operationId extends keyof Operations> = Operations[operationId]["response"];',
+    'export type TypedApiResponse<ResponseBody, ResponseModel = Record<string, any>> = ResponseModel & { _t?: ResponseBody };',
+    'export type OperationResponse<operationId extends keyof Operations> = TypedApiResponse<OperationResponseBody<operationId>>;',
+    'export type OperationHandler<operationId extends keyof Operations, HandlerArgs extends unknown[] = unknown[]> = (...params: [OperationContext<operationId>, ...HandlerArgs]) => Promise<OperationResponse<operationId>>;',
   ].join('\n');
 }