loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

typescript-axios: withSeparateModelsAndApi - use import types properly. (#18625)

Browse Source
This commit is contained in:
Miroslav Šedivý 2024-05-15 11:30:18 +02:00 committed by GitHub
parent affb6bc1f7
commit 014cd2cb2b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
10 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/openapi-generator/src/main/resources/typescript-axios/apiInner.mustache vendored
View File

@ -18,10 +18,10 @@ import FormData from 'form-data'
// @ts-ignore // @ts-ignore
import { DUMMY_BASE_URL, assertParamExists, setApiKeyToObject, setBasicAuthToObject, setBearerAuthToObject, setOAuthToObject, setSearchParams, serializeDataIfNeeded, toPathString, createRequestFunction } from '{{apiRelativeToRoot}}common'; import { DUMMY_BASE_URL, assertParamExists, setApiKeyToObject, setBasicAuthToObject, setBearerAuthToObject, setOAuthToObject, setSearchParams, serializeDataIfNeeded, toPathString, createRequestFunction } from '{{apiRelativeToRoot}}common';
// @ts-ignore // @ts-ignore
import { BASE_PATH, COLLECTION_FORMATS, RequestArgs, BaseAPI, RequiredError, operationServerMap } from '{{apiRelativeToRoot}}base'; import { BASE_PATH, COLLECTION_FORMATS, type RequestArgs, BaseAPI, RequiredError, operationServerMap } from '{{apiRelativeToRoot}}base';
{{#imports}} {{#imports}}
// @ts-ignore // @ts-ignore
import { {{classname}} } from '{{apiRelativeToRoot}}{{tsModelPackage}}'; import type { {{classname}} } from '{{apiRelativeToRoot}}{{tsModelPackage}}';
{{/imports}} {{/imports}}
{{/withSeparateModelsAndApi}} {{/withSeparateModelsAndApi}}
{{^withSeparateModelsAndApi}} {{^withSeparateModelsAndApi}}

6
modules/openapi-generator/src/main/resources/typescript-axios/model.mustache vendored
View File

@ -4,13 +4,13 @@
{{#withSeparateModelsAndApi}}{{#hasAllOf}}{{#allOf}} {{#withSeparateModelsAndApi}}{{#hasAllOf}}{{#allOf}}
// May contain unused imports in some cases // May contain unused imports in some cases
// @ts-ignore // @ts-ignore
import { {{class}} } from './{{filename}}';{{/allOf}}{{/hasAllOf}}{{#hasOneOf}}{{#oneOf}} import type { {{class}} } from './{{filename}}';{{/allOf}}{{/hasAllOf}}{{#hasOneOf}}{{#oneOf}}
// May contain unused imports in some cases // May contain unused imports in some cases
// @ts-ignore // @ts-ignore
import { {{class}} } from './{{filename}}';{{/oneOf}}{{/hasOneOf}}{{^hasAllOf}}{{^hasOneOf}}{{#imports}} import type { {{class}} } from './{{filename}}';{{/oneOf}}{{/hasOneOf}}{{^hasAllOf}}{{^hasOneOf}}{{#imports}}
// May contain unused imports in some cases // May contain unused imports in some cases
// @ts-ignore // @ts-ignore
import { {{class}} } from './{{filename}}';{{/imports}}{{/hasOneOf}}{{/hasAllOf}}{{/withSeparateModelsAndApi}} import type { {{class}} } from './{{filename}}';{{/imports}}{{/hasOneOf}}{{/hasAllOf}}{{/withSeparateModelsAndApi}}
{{#models}}{{#model}} {{#models}}{{#model}}
{{#isEnum}}{{>modelEnum}}{{/isEnum}}{{#oneOf}}{{#-first}}{{>modelOneOf}}{{/-first}}{{/oneOf}}{{#allOf}}{{#-first}}{{>modelAllOf}}{{/-first}}{{/allOf}}{{^isEnum}}{{^oneOf}}{{^allOf}}{{>modelGeneric}}{{/allOf}}{{/oneOf}}{{/isEnum}} {{#isEnum}}{{>modelEnum}}{{/isEnum}}{{#oneOf}}{{#-first}}{{>modelOneOf}}{{/-first}}{{/oneOf}}{{#allOf}}{{#-first}}{{>modelAllOf}}{{/-first}}{{/allOf}}{{^isEnum}}{{^oneOf}}{{^allOf}}{{>modelGeneric}}{{/allOf}}{{/oneOf}}{{/isEnum}}
{{/model}}{{/models}} {{/model}}{{/models}}

2
samples/client/others/typescript-axios/with-separate-models-and-api-inheritance/model/abstract-user-dto.ts
View File

@ -15,7 +15,7 @@
// May contain unused imports in some cases // May contain unused imports in some cases
// @ts-ignore // @ts-ignore
import { BranchDto } from './branch-dto'; import type { BranchDto } from './branch-dto';
/** /**
* *

2
samples/client/others/typescript-axios/with-separate-models-and-api-inheritance/model/flat-stock-pick-order-dto.ts
View File

@ -15,7 +15,7 @@
// May contain unused imports in some cases // May contain unused imports in some cases
// @ts-ignore // @ts-ignore
import { AbstractFlatStockPickOrderBaseDto } from './abstract-flat-stock-pick-order-base-dto'; import type { AbstractFlatStockPickOrderBaseDto } from './abstract-flat-stock-pick-order-base-dto';
/** /**
* @type FlatStockPickOrderDto * @type FlatStockPickOrderDto

4
samples/client/others/typescript-axios/with-separate-models-and-api-inheritance/model/internal-authenticated-user-dto.ts
View File

@ -15,10 +15,10 @@
// May contain unused imports in some cases // May contain unused imports in some cases
// @ts-ignore // @ts-ignore
import { AbstractUserDto } from './abstract-user-dto'; import type { AbstractUserDto } from './abstract-user-dto';
// May contain unused imports in some cases // May contain unused imports in some cases
// @ts-ignore // @ts-ignore
import { BranchDto } from './branch-dto'; import type { BranchDto } from './branch-dto';
/** /**
* @type InternalAuthenticatedUserDto * @type InternalAuthenticatedUserDto

4
samples/client/others/typescript-axios/with-separate-models-and-api-inheritance/model/remote-authenticated-user-dto.ts
View File

@ -15,10 +15,10 @@
// May contain unused imports in some cases // May contain unused imports in some cases
// @ts-ignore // @ts-ignore
import { AbstractUserDto } from './abstract-user-dto'; import type { AbstractUserDto } from './abstract-user-dto';
// May contain unused imports in some cases // May contain unused imports in some cases
// @ts-ignore // @ts-ignore
import { BranchDto } from './branch-dto'; import type { BranchDto } from './branch-dto';
/** /**
* @type RemoteAuthenticatedUserDto * @type RemoteAuthenticatedUserDto

6
samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/api/another/level/pet-api.ts
View File

@ -20,11 +20,11 @@ import globalAxios from 'axios';
// @ts-ignore // @ts-ignore
import { DUMMY_BASE_URL, assertParamExists, setApiKeyToObject, setBasicAuthToObject, setBearerAuthToObject, setOAuthToObject, setSearchParams, serializeDataIfNeeded, toPathString, createRequestFunction } from '../../../common'; import { DUMMY_BASE_URL, assertParamExists, setApiKeyToObject, setBasicAuthToObject, setBearerAuthToObject, setOAuthToObject, setSearchParams, serializeDataIfNeeded, toPathString, createRequestFunction } from '../../../common';
// @ts-ignore // @ts-ignore
import { BASE_PATH, COLLECTION_FORMATS, RequestArgs, BaseAPI, RequiredError, operationServerMap } from '../../../base'; import { BASE_PATH, COLLECTION_FORMATS, type RequestArgs, BaseAPI, RequiredError, operationServerMap } from '../../../base';
// @ts-ignore // @ts-ignore
import { ApiResponse } from '../../../model/some/levels/deep'; import type { ApiResponse } from '../../../model/some/levels/deep';
// @ts-ignore // @ts-ignore
import { Pet } from '../../../model/some/levels/deep'; import type { Pet } from '../../../model/some/levels/deep';
/** /**
* PetApi - axios parameter creator * PetApi - axios parameter creator
* @export * @export

4
samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/api/another/level/store-api.ts
View File

@ -20,9 +20,9 @@ import globalAxios from 'axios';
// @ts-ignore // @ts-ignore
import { DUMMY_BASE_URL, assertParamExists, setApiKeyToObject, setBasicAuthToObject, setBearerAuthToObject, setOAuthToObject, setSearchParams, serializeDataIfNeeded, toPathString, createRequestFunction } from '../../../common'; import { DUMMY_BASE_URL, assertParamExists, setApiKeyToObject, setBasicAuthToObject, setBearerAuthToObject, setOAuthToObject, setSearchParams, serializeDataIfNeeded, toPathString, createRequestFunction } from '../../../common';
// @ts-ignore // @ts-ignore
import { BASE_PATH, COLLECTION_FORMATS, RequestArgs, BaseAPI, RequiredError, operationServerMap } from '../../../base'; import { BASE_PATH, COLLECTION_FORMATS, type RequestArgs, BaseAPI, RequiredError, operationServerMap } from '../../../base';
// @ts-ignore // @ts-ignore
import { Order } from '../../../model/some/levels/deep'; import type { Order } from '../../../model/some/levels/deep';
/** /**
* StoreApi - axios parameter creator * StoreApi - axios parameter creator
* @export * @export

4
samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/api/another/level/user-api.ts
View File

@ -20,9 +20,9 @@ import globalAxios from 'axios';
// @ts-ignore // @ts-ignore
import { DUMMY_BASE_URL, assertParamExists, setApiKeyToObject, setBasicAuthToObject, setBearerAuthToObject, setOAuthToObject, setSearchParams, serializeDataIfNeeded, toPathString, createRequestFunction } from '../../../common'; import { DUMMY_BASE_URL, assertParamExists, setApiKeyToObject, setBasicAuthToObject, setBearerAuthToObject, setOAuthToObject, setSearchParams, serializeDataIfNeeded, toPathString, createRequestFunction } from '../../../common';
// @ts-ignore // @ts-ignore
import { BASE_PATH, COLLECTION_FORMATS, RequestArgs, BaseAPI, RequiredError, operationServerMap } from '../../../base'; import { BASE_PATH, COLLECTION_FORMATS, type RequestArgs, BaseAPI, RequiredError, operationServerMap } from '../../../base';
// @ts-ignore // @ts-ignore
import { User } from '../../../model/some/levels/deep'; import type { User } from '../../../model/some/levels/deep';
/** /**
* UserApi - axios parameter creator * UserApi - axios parameter creator
* @export * @export

4
samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/model/some/levels/deep/pet.ts
View File

@ -15,10 +15,10 @@
// May contain unused imports in some cases // May contain unused imports in some cases
// @ts-ignore // @ts-ignore
import { Category } from './category'; import type { Category } from './category';
// May contain unused imports in some cases // May contain unused imports in some cases
// @ts-ignore // @ts-ignore
import { Tag } from './tag'; import type { Tag } from './tag';
/** /**
* A pet for sale in the pet store * A pet for sale in the pet store