From 44e7542ee6945d64a828c80403eb3cfab486205a Mon Sep 17 00:00:00 2001 From: Viacheslav Zavoruev Date: Fri, 26 Sep 2025 23:45:12 +0200 Subject: [PATCH] [typescript-axios]: `withSeparateModelsAndApi` handles `importFileExtension` Separate models are located in `modelPackage` folder with `index.ts` file. ESM requires an index file with the provided extension when `importFileExtension` is defined. --- .../src/main/resources/typescript-axios/apiInner.mustache | 2 +- .../src/main/resources/typescript-axios/index.mustache | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/typescript-axios/apiInner.mustache b/modules/openapi-generator/src/main/resources/typescript-axios/apiInner.mustache index c514cc57c52e..046261bc973f 100644 --- a/modules/openapi-generator/src/main/resources/typescript-axios/apiInner.mustache +++ b/modules/openapi-generator/src/main/resources/typescript-axios/apiInner.mustache @@ -22,7 +22,7 @@ import { DUMMY_BASE_URL, assertParamExists, setApiKeyToObject, setBasicAuthToObj import { BASE_PATH, COLLECTION_FORMATS, type RequestArgs, BaseAPI, RequiredError, operationServerMap } from '{{apiRelativeToRoot}}base{{importFileExtension}}'; {{#imports}} // @ts-ignore -import type { {{classname}} } from '{{apiRelativeToRoot}}{{tsModelPackage}}{{importFileExtension}}'; +import type { {{classname}} } from '{{apiRelativeToRoot}}{{tsModelPackage}}{{#importFileExtension}}/index{{importFileExtension}}{{/importFileExtension}}'; {{/imports}} {{/withSeparateModelsAndApi}} {{^withSeparateModelsAndApi}} diff --git a/modules/openapi-generator/src/main/resources/typescript-axios/index.mustache b/modules/openapi-generator/src/main/resources/typescript-axios/index.mustache index 37fb945c259d..fca806d2a6c5 100644 --- a/modules/openapi-generator/src/main/resources/typescript-axios/index.mustache +++ b/modules/openapi-generator/src/main/resources/typescript-axios/index.mustache @@ -5,4 +5,4 @@ export * from "./api{{importFileExtension}}"; export * from "./configuration{{importFileExtension}}"; -{{#withSeparateModelsAndApi}}export * from "./{{tsModelPackage}}{{importFileExtension}}";{{/withSeparateModelsAndApi}} +{{#withSeparateModelsAndApi}}export * from "./{{tsModelPackage}}{{#importFileExtension}}/index{{importFileExtension}}{{/importFileExtension}}";{{/withSeparateModelsAndApi}}