Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

typescript-axios: withSeparateModelsAndApi - fix missing import type #18625

Merged
merged 1 commit into from
May 15, 2024
Merged

typescript-axios: withSeparateModelsAndApi - fix missing import type #18625

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions modules/openapi-generator/src/main/resources/typescript-axios/apiInner.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ import FormData from 'form-data'
// @ts-ignore
import { DUMMY_BASE_URL, assertParamExists, setApiKeyToObject, setBasicAuthToObject, setBearerAuthToObject, setOAuthToObject, setSearchParams, serializeDataIfNeeded, toPathString, createRequestFunction } from '{{apiRelativeToRoot}}common';
// @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}}
// @ts-ignore
import { {{classname}} } from '{{apiRelativeToRoot}}{{tsModelPackage}}';
import type { {{classname}} } from '{{apiRelativeToRoot}}{{tsModelPackage}}';
{{/imports}}
{{/withSeparateModelsAndApi}}
{{^withSeparateModelsAndApi}}
Expand Down
6 changes: 3 additions & 3 deletions modules/openapi-generator/src/main/resources/typescript-axios/model.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
{{#withSeparateModelsAndApi}}{{#hasAllOf}}{{#allOf}}
// May contain unused imports in some cases
// @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
// @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
// @ts-ignore
import { {{class}} } from './{{filename}}';{{/imports}}{{/hasOneOf}}{{/hasAllOf}}{{/withSeparateModelsAndApi}}
import type { {{class}} } from './{{filename}}';{{/imports}}{{/hasOneOf}}{{/hasAllOf}}{{/withSeparateModelsAndApi}}
{{#models}}{{#model}}
{{#isEnum}}{{>modelEnum}}{{/isEnum}}{{#oneOf}}{{#-first}}{{>modelOneOf}}{{/-first}}{{/oneOf}}{{#allOf}}{{#-first}}{{>modelAllOf}}{{/-first}}{{/allOf}}{{^isEnum}}{{^oneOf}}{{^allOf}}{{>modelGeneric}}{{/allOf}}{{/oneOf}}{{/isEnum}}
{{/model}}{{/models}}
2 changes: 1 addition & 1 deletion ...hers/typescript-axios/with-separate-models-and-api-inheritance/model/abstract-user-dto.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

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

/**
*
Expand Down
2 changes: 1 addition & 1 deletion ...escript-axios/with-separate-models-and-api-inheritance/model/flat-stock-pick-order-dto.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

// May contain unused imports in some cases
// @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
Expand Down
4 changes: 2 additions & 2 deletions ...t-axios/with-separate-models-and-api-inheritance/model/internal-authenticated-user-dto.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@

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

/**
* @type InternalAuthenticatedUserDto
Expand Down
4 changes: 2 additions & 2 deletions ...ipt-axios/with-separate-models-and-api-inheritance/model/remote-authenticated-user-dto.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@

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

/**
* @type RemoteAuthenticatedUserDto
Expand Down
6 changes: 3 additions & 3 deletions ...pt-axios/builds/with-npm-version-and-separate-models-and-api/api/another/level/pet-api.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ import globalAxios from 'axios';
// @ts-ignore
import { DUMMY_BASE_URL, assertParamExists, setApiKeyToObject, setBasicAuthToObject, setBearerAuthToObject, setOAuthToObject, setSearchParams, serializeDataIfNeeded, toPathString, createRequestFunction } from '../../../common';
// @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
import { ApiResponse } from '../../../model/some/levels/deep';
import type { ApiResponse } from '../../../model/some/levels/deep';
// @ts-ignore
import { Pet } from '../../../model/some/levels/deep';
import type { Pet } from '../../../model/some/levels/deep';
/**
* PetApi - axios parameter creator
* @export
Expand Down
4 changes: 2 additions & 2 deletions ...-axios/builds/with-npm-version-and-separate-models-and-api/api/another/level/store-api.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ import globalAxios from 'axios';
// @ts-ignore
import { DUMMY_BASE_URL, assertParamExists, setApiKeyToObject, setBasicAuthToObject, setBearerAuthToObject, setOAuthToObject, setSearchParams, serializeDataIfNeeded, toPathString, createRequestFunction } from '../../../common';
// @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
import { Order } from '../../../model/some/levels/deep';
import type { Order } from '../../../model/some/levels/deep';
/**
* StoreApi - axios parameter creator
* @export
Expand Down
4 changes: 2 additions & 2 deletions ...t-axios/builds/with-npm-version-and-separate-models-and-api/api/another/level/user-api.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ import globalAxios from 'axios';
// @ts-ignore
import { DUMMY_BASE_URL, assertParamExists, setApiKeyToObject, setBasicAuthToObject, setBearerAuthToObject, setOAuthToObject, setSearchParams, serializeDataIfNeeded, toPathString, createRequestFunction } from '../../../common';
// @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
import { User } from '../../../model/some/levels/deep';
import type { User } from '../../../model/some/levels/deep';
/**
* UserApi - axios parameter creator
* @export
Expand Down
4 changes: 2 additions & 2 deletions ...t-axios/builds/with-npm-version-and-separate-models-and-api/model/some/levels/deep/pet.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@

// May contain unused imports in some cases
// @ts-ignore
import { Category } from './category';
import type { Category } from './category';
// May contain unused imports in some cases
// @ts-ignore
import { Tag } from './tag';
import type { Tag } from './tag';

/**
* A pet for sale in the pet store
Expand Down