From 6c4ad9ee809e16b71cf827121327e77ded77120a Mon Sep 17 00:00:00 2001
From: Kevin Kantesaria <kkantesaria@splunk.com>
Date: Mon, 2 Dec 2024 16:23:32 -0500
Subject: [PATCH] fix: typed router export

Signed-off-by: kevspl <kkantesaria@splunk.com>
---
 packages/backend-openapi-utils/src/index.ts    |  2 +-
 packages/backend-openapi-utils/src/router.ts   | 18 +++++++++++++++++-
 .../src/types/generated.ts                     | 12 ------------
 3 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/packages/backend-openapi-utils/src/index.ts b/packages/backend-openapi-utils/src/index.ts
index a66894d473..9389fe3be6 100644
--- a/packages/backend-openapi-utils/src/index.ts
+++ b/packages/backend-openapi-utils/src/index.ts
@@ -30,7 +30,7 @@ export type {
   CookieParameters,
   PathParameters,
 } from './utility';
-export type { ApiRouter } from './router';
+export type { ApiRouter, TypedRouter } from './router';
 export type { PathTemplate } from './types/common';
 export { wrapInOpenApiTestServer, wrapServer } from './testUtils';
 export {
diff --git a/packages/backend-openapi-utils/src/router.ts b/packages/backend-openapi-utils/src/router.ts
index 253fc1596e..48d89054ba 100644
--- a/packages/backend-openapi-utils/src/router.ts
+++ b/packages/backend-openapi-utils/src/router.ts
@@ -14,7 +14,12 @@
  * limitations under the License.
  */
 import { Router } from 'express';
-import { DocRequestMatcher, RequiredDoc } from './types';
+import {
+  DocRequestMatcher,
+  EndpointMap,
+  EndpointMapRequestMatcher,
+  RequiredDoc,
+} from './types';
 
 /**
  * Typed Express router based on an OpenAPI 3.1 spec.
@@ -37,3 +42,14 @@ export interface ApiRouter<Doc extends RequiredDoc> extends Router {
 
   head: DocRequestMatcher<Doc, this, 'head'>;
 }
+
+/**
+ * @public
+ */
+export interface TypedRouter<GeneratedEndpointMap extends EndpointMap>
+  extends Router {
+  get: EndpointMapRequestMatcher<GeneratedEndpointMap, this, 'get'>;
+  post: EndpointMapRequestMatcher<GeneratedEndpointMap, this, 'post'>;
+  put: EndpointMapRequestMatcher<GeneratedEndpointMap, this, 'put'>;
+  delete: EndpointMapRequestMatcher<GeneratedEndpointMap, this, '_delete'>;
+}
diff --git a/packages/backend-openapi-utils/src/types/generated.ts b/packages/backend-openapi-utils/src/types/generated.ts
index b0b80f45fb..e4d5dada72 100644
--- a/packages/backend-openapi-utils/src/types/generated.ts
+++ b/packages/backend-openapi-utils/src/types/generated.ts
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { Router } from 'express';
 import type core from 'express-serve-static-core';
 import { PathTemplate, ValueOf } from './common';
 
@@ -209,14 +208,3 @@ export interface EndpointMapRequestMatcher<
     >
   ): T;
 }
-
-/**
- * @public
- */
-export interface TypedRouter<GeneratedEndpointMap extends EndpointMap>
-  extends Router {
-  get: EndpointMapRequestMatcher<GeneratedEndpointMap, this, 'get'>;
-  post: EndpointMapRequestMatcher<GeneratedEndpointMap, this, 'post'>;
-  put: EndpointMapRequestMatcher<GeneratedEndpointMap, this, 'put'>;
-  delete: EndpointMapRequestMatcher<GeneratedEndpointMap, this, '_delete'>;
-}