Skip to content

Commit e1f1437

Browse files
committed
fix: rest模式下生成了错误的method
1 parent 09e12b8 commit e1f1437

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

src/lib/generate-template.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ export const generateTemplate = async (
1919
classMode === 'rest'
2020
? generateMethodModeClass(className, metas)
2121
: classMode === 'rpc-group'
22-
? generateUriModelClassWithGroup(className, metas)
23-
: generateUriModelClass(className, metas);
22+
? generateRpcModelClassWithGroup(className, metas)
23+
: generateRpcModelClass(className, metas);
2424

2525
let content = `
2626
${generateNamespaceTpl(className, metas)}
@@ -96,7 +96,7 @@ export class ${className}<T extends object = object> extends BaseOpenapiClient<T
9696
return `${method}<K extends keyof ${className}_${method}_paths>(
9797
uri: K, ...rest: ${opts}
9898
): Promise<${className}_${method}_paths[K]['response']> {
99-
return this.request(uri, "get", ...rest);
99+
return this.request(uri, "${method}", ...rest);
100100
}
101101
`;
102102
})
@@ -106,7 +106,7 @@ export class ${className}<T extends object = object> extends BaseOpenapiClient<T
106106
}`;
107107
};
108108

109-
export const generateUriModelClass = (className: string, metas: Metas) => {
109+
export const generateRpcModelClass = (className: string, metas: Metas) => {
110110
return `
111111
export class ${className}<T extends object = object> extends BaseOpenapiClient<T> {
112112
${methods
@@ -128,7 +128,7 @@ export class ${className}<T extends object = object> extends BaseOpenapiClient<T
128128
}`;
129129
};
130130

131-
export const generateUriModelClassWithGroup = (className: string, metas: Metas) => {
131+
export const generateRpcModelClassWithGroup = (className: string, metas: Metas) => {
132132
const namespaces = [
133133
...new Set(
134134
methods.flatMap((method) => metas[method].flatMap((meta) => meta.tags || [])),

test/lib/generate-template.test.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import {
55
generateNamespaceTpl,
66
generatePathRelationTpl,
77
generateTemplate,
8-
generateUriModelClass,
9-
generateUriModelClassWithGroup,
8+
generateRpcModelClass,
9+
generateRpcModelClassWithGroup,
1010
} from '../../src/lib/generate-template';
1111
import prettier from 'prettier';
1212
import { getBasicMetas } from '../mocks/get-basic-matea';
@@ -369,7 +369,7 @@ describe('类', () => {
369369
uri: K,
370370
...rest: [opts?: Client_patch_paths[K]['request'] & BaseOpenapiClient.UserInputOpts<T>]
371371
): Promise<Client_patch_paths[K]['response']> {
372-
return this.request(uri, 'get', ...rest);
372+
return this.request(uri, 'patch', ...rest);
373373
}
374374
375375
protected override pickContentTypes(uri: string, method: string) {
@@ -381,7 +381,7 @@ describe('类', () => {
381381
});
382382

383383
test('[uri] 只生成接口对应的方法', async () => {
384-
const content = generateUriModelClass('Client', metas);
384+
const content = generateRpcModelClass('Client', metas);
385385
await expect(formatDocs(content)).resolves.toMatchInlineSnapshot(`
386386
"export class Client<T extends object = object> extends BaseOpenapiClient<T> {
387387
/**
@@ -498,7 +498,7 @@ describe('类', () => {
498498
});
499499

500500
test('命名空间', async () => {
501-
const content = generateUriModelClassWithGroup('Client', metas);
501+
const content = generateRpcModelClassWithGroup('Client', metas);
502502
await expect(formatDocs(content)).resolves.toMatchInlineSnapshot(`
503503
"export class Client<T extends object = object> extends BaseOpenapiClient<T> {
504504
readonly user = {

0 commit comments

Comments
 (0)