Skip to content

fix: 修复引用类型返回值在 types.ts中也包含了 namespace 的问题 #398

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

Merged
rookie-luochao merged 2 commits into from
Jul 11, 2025
Merged

fix: 修复引用类型返回值在 types.ts中也包含了 namespace 的问题 #398

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5315b1a
fix: 修复引用类型返回值在 types.ts中也包含了 namespace 的问题
AdoKevin Jul 10, 2025
3061db4
chore: add changeset
AdoKevin Jul 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/tender-pianos-jump.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'openapi-ts-request': patch
---

fix: 修复引用类型返回值在 types.ts中也包含了 namespace 的问题
10 changes: 7 additions & 3 deletions src/generator/serviceGenarator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -641,6 +641,10 @@ export default class ServiceGenerator {
const params =
this.getParamsTP(newApi.parameters, newApi.path) || {};
const body = this.getBodyTP(
newApi.requestBody as RequestBodyObject,
this.config.namespace
);
const bodyWithoutNamespace = this.getBodyTP(
newApi.requestBody as RequestBodyObject
);
const response = this.getResponseTP(newApi.responses);
Expand All @@ -665,7 +669,7 @@ export default class ServiceGenerator {
const bodyName = upperFirst(`${functionName}Body`);
this.interfaceTPConfigs.push({
typeName: bodyName,
type: body?.type,
type: bodyWithoutNamespace?.type,
isEnum: false,
props: [],
});
Expand Down Expand Up @@ -931,7 +935,7 @@ export default class ServiceGenerator {
return resolveTypeName(`${namespace}${typeName ?? data.operationId}Params`);
}

private getBodyTP(requestBody: RequestBodyObject) {
private getBodyTP(requestBody: RequestBodyObject, namespace?: string) {
const reqBody = this.resolveRefObject(requestBody);

if (isEmpty(reqBody)) {
Expand All @@ -958,7 +962,7 @@ export default class ServiceGenerator {
const bodySchema = {
mediaType,
required,
type: this.getType(schema, this.config.namespace),
type: this.getType(schema, namespace),
isAnonymous: false,
};

Expand Down
2 changes: 1 addition & 1 deletion test/__snapshots__/common/小驼峰命名文件和请求函数.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -366,7 +366,7 @@ export type User = {
userStatus?: number;
};

export type UserCreateWithListUsingPostBody = API.User[];
export type UserCreateWithListUsingPostBody = User[];

export type userLoginUsingGetParams = {
/** The user name for login */
Expand Down
2 changes: 1 addition & 1 deletion test/__snapshots__/common/支持 null 类型作为默认值.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -366,7 +366,7 @@ export type User = {
userStatus: number | null;
};

export type UserCreateWithListUsingPostBody = API.User[];
export type UserCreateWithListUsingPostBody = User[];

export type userLoginUsingGetParams = {
/** The user name for login */
Expand Down
2 changes: 1 addition & 1 deletion test/__snapshots__/common/正常命名文件和请求函数.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -497,7 +497,7 @@ export type User = {
userStatus?: number;
};

export type UserCreateWithListUsingPostBody = API.User[];
export type UserCreateWithListUsingPostBody = User[];

export type userLoginUsingGetParams = {
/** The user name for login */
Expand Down
2 changes: 1 addition & 1 deletion test/__snapshots__/common/测试将中文 tag 名称翻译成英文 tag 名称.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,7 @@ export type User = {
userStatus?: number;
};

export type UserCreateWithListUsingPostBody = API.User[];
export type UserCreateWithListUsingPostBody = User[];

export type userLoginUsingGetParams = {
/** The user name for login */
Expand Down
4 changes: 2 additions & 2 deletions test/__snapshots__/common/测试生成 JSON Schemas.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4841,7 +4841,7 @@ export type v1ApiAppAppIdDatasetsUsingDeleteParams = {
datasetID: string;
};

export type V1ApiAppAppIdDatasetsUsingPostBody = API.AppDatasets[];
export type V1ApiAppAppIdDatasetsUsingPostBody = AppDatasets[];

export type v1ApiAppAppIdDatasetsUsingPostParams = {
/** 应用id */
Expand Down Expand Up @@ -5233,7 +5233,7 @@ export type v2ApiWorkspacesRecommendedMessageIdDetailsUsingGetParams = {
};

export type V2ApiWorkspacesWorkspaceIdAppAppIdDatasetsJoinUsingPostBody =
API.AppDatasets[];
AppDatasets[];

export type v2ApiWorkspacesWorkspaceIdAppAppIdDatasetsJoinUsingPostParams = {
/** 空间ID */
Expand Down
4 changes: 2 additions & 2 deletions test/__snapshots__/common/测试生成 react-query 的 vue 模式.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4276,7 +4276,7 @@ export type v1ApiAppAppIdDatasetsUsingDeleteParams = {
datasetID: string;
};

export type V1ApiAppAppIdDatasetsUsingPostBody = API.AppDatasets[];
export type V1ApiAppAppIdDatasetsUsingPostBody = AppDatasets[];

export type v1ApiAppAppIdDatasetsUsingPostParams = {
/** 应用id */
Expand Down Expand Up @@ -4668,7 +4668,7 @@ export type v2ApiWorkspacesRecommendedMessageIdDetailsUsingGetParams = {
};

export type V2ApiWorkspacesWorkspaceIdAppAppIdDatasetsJoinUsingPostBody =
API.AppDatasets[];
AppDatasets[];

export type v2ApiWorkspacesWorkspaceIdAppAppIdDatasetsJoinUsingPostParams = {
/** 空间ID */
Expand Down
4 changes: 2 additions & 2 deletions test/__snapshots__/common/测试生成 react-query.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4276,7 +4276,7 @@ export type v1ApiAppAppIdDatasetsUsingDeleteParams = {
datasetID: string;
};

export type V1ApiAppAppIdDatasetsUsingPostBody = API.AppDatasets[];
export type V1ApiAppAppIdDatasetsUsingPostBody = AppDatasets[];

export type v1ApiAppAppIdDatasetsUsingPostParams = {
/** 应用id */
Expand Down Expand Up @@ -4668,7 +4668,7 @@ export type v2ApiWorkspacesRecommendedMessageIdDetailsUsingGetParams = {
};

export type V2ApiWorkspacesWorkspaceIdAppAppIdDatasetsJoinUsingPostBody =
API.AppDatasets[];
AppDatasets[];

export type v2ApiWorkspacesWorkspaceIdAppAppIdDatasetsJoinUsingPostParams = {
/** 空间ID */
Expand Down
4 changes: 2 additions & 2 deletions test/__snapshots__/common/测试解析 swagger.yaml_openapi.yaml.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -395,9 +395,9 @@ export type User = {
userStatus?: number;
};

export type UserCreateWithArrayUsingPostBody = API.User[];
export type UserCreateWithArrayUsingPostBody = User[];

export type UserCreateWithListUsingPostBody = API.User[];
export type UserCreateWithListUsingPostBody = User[];

export type userLoginUsingGetParams = {
/** The user name for login */
Expand Down
4 changes: 2 additions & 2 deletions test/__snapshots__/common/测试设置 path 前缀.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -395,9 +395,9 @@ export type User = {
userStatus?: number;
};

export type UserCreateWithArrayUsingPostBody = API.User[];
export type UserCreateWithArrayUsingPostBody = User[];

export type UserCreateWithListUsingPostBody = API.User[];
export type UserCreateWithListUsingPostBody = User[];

export type userLoginUsingGetParams = {
/** The user name for login */
Expand Down
4 changes: 2 additions & 2 deletions test/__snapshots__/common/生成枚举翻译, 生成 type 翻译.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4511,7 +4511,7 @@ export type v1ApiAppAppIdDatasetsUsingDeleteParams = {
datasetID: string;
};

export type V1ApiAppAppIdDatasetsUsingPostBody = API.AppDatasets[];
export type V1ApiAppAppIdDatasetsUsingPostBody = AppDatasets[];

export type v1ApiAppAppIdDatasetsUsingPostParams = {
/** 应用id */
Expand Down Expand Up @@ -4903,7 +4903,7 @@ export type v2ApiWorkspacesRecommendedMessageIdDetailsUsingGetParams = {
};

export type V2ApiWorkspacesWorkspaceIdAppAppIdDatasetsJoinUsingPostBody =
API.AppDatasets[];
AppDatasets[];

export type v2ApiWorkspacesWorkspaceIdAppAppIdDatasetsJoinUsingPostParams = {
/** 空间ID */
Expand Down