diff --git a/modules/openapi-generator/src/main/resources/typescript/index.mustache b/modules/openapi-generator/src/main/resources/typescript/index.mustache
index f8cad2b47c14..f6703891eb90 100644
--- a/modules/openapi-generator/src/main/resources/typescript/index.mustache
+++ b/modules/openapi-generator/src/main/resources/typescript/index.mustache
@@ -4,7 +4,7 @@ export * from "./auth/auth{{importFileExtension}}";
 export * from "./models/all{{importFileExtension}}";
 {{/models.0}}
 export { createConfiguration } from "./configuration{{importFileExtension}}"
-export{{#platforms}}{{#deno}} type{{/deno}}{{/platforms}} { Configuration } from "./configuration{{importFileExtension}}"
+export type { Configuration } from "./configuration{{importFileExtension}}"
 export * from "./apis/exception{{importFileExtension}}";
 export * from "./servers{{importFileExtension}}";
 export { RequiredError } from "./apis/baseapi{{importFileExtension}}";
@@ -13,10 +13,10 @@ export { RequiredError } from "./apis/baseapi{{importFileExtension}}";
 export { Middleware } from './middleware{{importFileExtension}}';
 {{/useRxJS}}
 {{^useRxJS}}
-export{{#platforms}}{{#deno}} type{{/deno}}{{/platforms}} { PromiseMiddleware as Middleware } from './middleware{{importFileExtension}}';
+export type { PromiseMiddleware as Middleware } from './middleware{{importFileExtension}}';
 {{/useRxJS}}
 {{#useObjectParameters}}
-export { {{#apiInfo}}{{#apis}}{{#operations}}{{#operation}}{{#platforms}}{{#deno}}type {{/deno}}{{/platforms}}{{classname}}{{operationIdCamelCase}}Request, {{/operation}}Object{{classname}} as {{classname}}{{^-last}}, {{/-last}} {{/operations}}{{/apis}}{{/apiInfo}}} from './types/ObjectParamAPI{{importFileExtension}}';
+export { {{#apiInfo}}{{#apis}}{{#operations}}{{#operation}}type {{classname}}{{operationIdCamelCase}}Request, {{/operation}}Object{{classname}} as {{classname}}{{^-last}}, {{/-last}} {{/operations}}{{/apis}}{{/apiInfo}}} from './types/ObjectParamAPI{{importFileExtension}}';
 {{/useObjectParameters}}
 {{^useObjectParameters}}
 {{#useRxJS}}
diff --git a/samples/client/others/typescript/builds/array-of-lists/index.ts b/samples/client/others/typescript/builds/array-of-lists/index.ts
index 89069bd11889..6d001268247c 100644
--- a/samples/client/others/typescript/builds/array-of-lists/index.ts
+++ b/samples/client/others/typescript/builds/array-of-lists/index.ts
@@ -2,11 +2,11 @@ export * from "./http/http";
 export * from "./auth/auth";
 export * from "./models/all";
 export { createConfiguration } from "./configuration"
-export { Configuration } from "./configuration"
+export type { Configuration } from "./configuration"
 export * from "./apis/exception";
 export * from "./servers";
 export { RequiredError } from "./apis/baseapi";
 
-export { PromiseMiddleware as Middleware } from './middleware';
+export type { PromiseMiddleware as Middleware } from './middleware';
 export { PromiseDefaultApi as DefaultApi } from './types/PromiseAPI';
 
diff --git a/samples/client/others/typescript/builds/null-types-simple/index.ts b/samples/client/others/typescript/builds/null-types-simple/index.ts
index 791121d1c8dc..c5bc5ff26cc0 100644
--- a/samples/client/others/typescript/builds/null-types-simple/index.ts
+++ b/samples/client/others/typescript/builds/null-types-simple/index.ts
@@ -2,11 +2,11 @@ export * from "./http/http";
 export * from "./auth/auth";
 export * from "./models/all";
 export { createConfiguration } from "./configuration"
-export { Configuration } from "./configuration"
+export type { Configuration } from "./configuration"
 export * from "./apis/exception";
 export * from "./servers";
 export { RequiredError } from "./apis/baseapi";
 
-export { PromiseMiddleware as Middleware } from './middleware';
+export type { PromiseMiddleware as Middleware } from './middleware';
 export { } from './types/PromiseAPI';
 
diff --git a/samples/client/others/typescript/builds/with-unique-items/index.ts b/samples/client/others/typescript/builds/with-unique-items/index.ts
index 89069bd11889..6d001268247c 100644
--- a/samples/client/others/typescript/builds/with-unique-items/index.ts
+++ b/samples/client/others/typescript/builds/with-unique-items/index.ts
@@ -2,11 +2,11 @@ export * from "./http/http";
 export * from "./auth/auth";
 export * from "./models/all";
 export { createConfiguration } from "./configuration"
-export { Configuration } from "./configuration"
+export type { Configuration } from "./configuration"
 export * from "./apis/exception";
 export * from "./servers";
 export { RequiredError } from "./apis/baseapi";
 
-export { PromiseMiddleware as Middleware } from './middleware';
+export type { PromiseMiddleware as Middleware } from './middleware';
 export { PromiseDefaultApi as DefaultApi } from './types/PromiseAPI';
 
diff --git a/samples/client/others/typescript/encode-decode/build/index.ts b/samples/client/others/typescript/encode-decode/build/index.ts
index 89069bd11889..6d001268247c 100644
--- a/samples/client/others/typescript/encode-decode/build/index.ts
+++ b/samples/client/others/typescript/encode-decode/build/index.ts
@@ -2,11 +2,11 @@ export * from "./http/http";
 export * from "./auth/auth";
 export * from "./models/all";
 export { createConfiguration } from "./configuration"
-export { Configuration } from "./configuration"
+export type { Configuration } from "./configuration"
 export * from "./apis/exception";
 export * from "./servers";
 export { RequiredError } from "./apis/baseapi";
 
-export { PromiseMiddleware as Middleware } from './middleware';
+export type { PromiseMiddleware as Middleware } from './middleware';
 export { PromiseDefaultApi as DefaultApi } from './types/PromiseAPI';
 
diff --git a/samples/openapi3/client/petstore/typescript/builds/browser/index.ts b/samples/openapi3/client/petstore/typescript/builds/browser/index.ts
index 61ec7fec0cec..8e69260419b8 100644
--- a/samples/openapi3/client/petstore/typescript/builds/browser/index.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/browser/index.ts
@@ -2,11 +2,11 @@ export * from "./http/http";
 export * from "./auth/auth";
 export * from "./models/all";
 export { createConfiguration } from "./configuration"
-export { Configuration } from "./configuration"
+export type { Configuration } from "./configuration"
 export * from "./apis/exception";
 export * from "./servers";
 export { RequiredError } from "./apis/baseapi";
 
-export { PromiseMiddleware as Middleware } from './middleware';
+export type { PromiseMiddleware as Middleware } from './middleware';
 export { PromisePetApi as PetApi,  PromiseStoreApi as StoreApi,  PromiseUserApi as UserApi } from './types/PromiseAPI';
 
diff --git a/samples/openapi3/client/petstore/typescript/builds/composed-schemas/index.ts b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/index.ts
index 89069bd11889..6d001268247c 100644
--- a/samples/openapi3/client/petstore/typescript/builds/composed-schemas/index.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/index.ts
@@ -2,11 +2,11 @@ export * from "./http/http";
 export * from "./auth/auth";
 export * from "./models/all";
 export { createConfiguration } from "./configuration"
-export { Configuration } from "./configuration"
+export type { Configuration } from "./configuration"
 export * from "./apis/exception";
 export * from "./servers";
 export { RequiredError } from "./apis/baseapi";
 
-export { PromiseMiddleware as Middleware } from './middleware';
+export type { PromiseMiddleware as Middleware } from './middleware';
 export { PromiseDefaultApi as DefaultApi } from './types/PromiseAPI';
 
diff --git a/samples/openapi3/client/petstore/typescript/builds/default/index.ts b/samples/openapi3/client/petstore/typescript/builds/default/index.ts
index 61ec7fec0cec..8e69260419b8 100644
--- a/samples/openapi3/client/petstore/typescript/builds/default/index.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/default/index.ts
@@ -2,11 +2,11 @@ export * from "./http/http";
 export * from "./auth/auth";
 export * from "./models/all";
 export { createConfiguration } from "./configuration"
-export { Configuration } from "./configuration"
+export type { Configuration } from "./configuration"
 export * from "./apis/exception";
 export * from "./servers";
 export { RequiredError } from "./apis/baseapi";
 
-export { PromiseMiddleware as Middleware } from './middleware';
+export type { PromiseMiddleware as Middleware } from './middleware';
 export { PromisePetApi as PetApi,  PromiseStoreApi as StoreApi,  PromiseUserApi as UserApi } from './types/PromiseAPI';
 
diff --git a/samples/openapi3/client/petstore/typescript/builds/explode-query/index.ts b/samples/openapi3/client/petstore/typescript/builds/explode-query/index.ts
index 498de9b8a5ea..19ef8b964a74 100644
--- a/samples/openapi3/client/petstore/typescript/builds/explode-query/index.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/explode-query/index.ts
@@ -2,11 +2,11 @@ export * from "./http/http";
 export * from "./auth/auth";
 export * from "./models/all";
 export { createConfiguration } from "./configuration"
-export { Configuration } from "./configuration"
+export type { Configuration } from "./configuration"
 export * from "./apis/exception";
 export * from "./servers";
 export { RequiredError } from "./apis/baseapi";
 
-export { PromiseMiddleware as Middleware } from './middleware';
+export type { PromiseMiddleware as Middleware } from './middleware';
 export { PromiseAnotherFakeApi as AnotherFakeApi,  PromiseDefaultApi as DefaultApi,  PromiseFakeApi as FakeApi,  PromiseFakeClassnameTags123Api as FakeClassnameTags123Api,  PromisePetApi as PetApi,  PromiseStoreApi as StoreApi,  PromiseUserApi as UserApi } from './types/PromiseAPI';
 
diff --git a/samples/openapi3/client/petstore/typescript/builds/inversify/index.ts b/samples/openapi3/client/petstore/typescript/builds/inversify/index.ts
index fd45f69c4278..0097c028ed14 100644
--- a/samples/openapi3/client/petstore/typescript/builds/inversify/index.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/inversify/index.ts
@@ -2,12 +2,12 @@ export * from "./http/http";
 export * from "./auth/auth";
 export * from "./models/all";
 export { createConfiguration } from "./configuration"
-export { Configuration } from "./configuration"
+export type { Configuration } from "./configuration"
 export * from "./apis/exception";
 export * from "./servers";
 export { RequiredError } from "./apis/baseapi";
 
-export { PromiseMiddleware as Middleware } from './middleware';
+export type { PromiseMiddleware as Middleware } from './middleware';
 export { PromisePetApi as PetApi,  PromiseStoreApi as StoreApi,  PromiseUserApi as UserApi } from './types/PromiseAPI';
 
 export * from "./services/index";
diff --git a/samples/openapi3/client/petstore/typescript/builds/jquery/index.ts b/samples/openapi3/client/petstore/typescript/builds/jquery/index.ts
index 61ec7fec0cec..8e69260419b8 100644
--- a/samples/openapi3/client/petstore/typescript/builds/jquery/index.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/jquery/index.ts
@@ -2,11 +2,11 @@ export * from "./http/http";
 export * from "./auth/auth";
 export * from "./models/all";
 export { createConfiguration } from "./configuration"
-export { Configuration } from "./configuration"
+export type { Configuration } from "./configuration"
 export * from "./apis/exception";
 export * from "./servers";
 export { RequiredError } from "./apis/baseapi";
 
-export { PromiseMiddleware as Middleware } from './middleware';
+export type { PromiseMiddleware as Middleware } from './middleware';
 export { PromisePetApi as PetApi,  PromiseStoreApi as StoreApi,  PromiseUserApi as UserApi } from './types/PromiseAPI';
 
diff --git a/samples/openapi3/client/petstore/typescript/builds/nullable-enum/index.ts b/samples/openapi3/client/petstore/typescript/builds/nullable-enum/index.ts
index 89069bd11889..6d001268247c 100644
--- a/samples/openapi3/client/petstore/typescript/builds/nullable-enum/index.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/nullable-enum/index.ts
@@ -2,11 +2,11 @@ export * from "./http/http";
 export * from "./auth/auth";
 export * from "./models/all";
 export { createConfiguration } from "./configuration"
-export { Configuration } from "./configuration"
+export type { Configuration } from "./configuration"
 export * from "./apis/exception";
 export * from "./servers";
 export { RequiredError } from "./apis/baseapi";
 
-export { PromiseMiddleware as Middleware } from './middleware';
+export type { PromiseMiddleware as Middleware } from './middleware';
 export { PromiseDefaultApi as DefaultApi } from './types/PromiseAPI';
 
diff --git a/samples/openapi3/client/petstore/typescript/builds/object_params/index.ts b/samples/openapi3/client/petstore/typescript/builds/object_params/index.ts
index 14f1249f31a3..f0461a413617 100644
--- a/samples/openapi3/client/petstore/typescript/builds/object_params/index.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/object_params/index.ts
@@ -2,11 +2,11 @@ export * from "./http/http";
 export * from "./auth/auth";
 export * from "./models/all";
 export { createConfiguration } from "./configuration"
-export { Configuration } from "./configuration"
+export type { Configuration } from "./configuration"
 export * from "./apis/exception";
 export * from "./servers";
 export { RequiredError } from "./apis/baseapi";
 
-export { PromiseMiddleware as Middleware } from './middleware';
-export { PetApiAddPetRequest, PetApiDeletePetRequest, PetApiFindPetsByStatusRequest, PetApiFindPetsByTagsRequest, PetApiGetPetByIdRequest, PetApiUpdatePetRequest, PetApiUpdatePetWithFormRequest, PetApiUploadFileRequest, ObjectPetApi as PetApi,  StoreApiDeleteOrderRequest, StoreApiGetInventoryRequest, StoreApiGetOrderByIdRequest, StoreApiPlaceOrderRequest, ObjectStoreApi as StoreApi,  UserApiCreateUserRequest, UserApiCreateUsersWithArrayInputRequest, UserApiCreateUsersWithListInputRequest, UserApiDeleteUserRequest, UserApiGetUserByNameRequest, UserApiLoginUserRequest, UserApiLogoutUserRequest, UserApiUpdateUserRequest, ObjectUserApi as UserApi } from './types/ObjectParamAPI';
+export type { PromiseMiddleware as Middleware } from './middleware';
+export { type PetApiAddPetRequest, type PetApiDeletePetRequest, type PetApiFindPetsByStatusRequest, type PetApiFindPetsByTagsRequest, type PetApiGetPetByIdRequest, type PetApiUpdatePetRequest, type PetApiUpdatePetWithFormRequest, type PetApiUploadFileRequest, ObjectPetApi as PetApi,  type StoreApiDeleteOrderRequest, type StoreApiGetInventoryRequest, type StoreApiGetOrderByIdRequest, type StoreApiPlaceOrderRequest, ObjectStoreApi as StoreApi,  type UserApiCreateUserRequest, type UserApiCreateUsersWithArrayInputRequest, type UserApiCreateUsersWithListInputRequest, type UserApiDeleteUserRequest, type UserApiGetUserByNameRequest, type UserApiLoginUserRequest, type UserApiLogoutUserRequest, type UserApiUpdateUserRequest, ObjectUserApi as UserApi } from './types/ObjectParamAPI';