Skip to content

Commit 0cf1a13

Browse files
committed
allow relative paths for baseUrl
1 parent 1d53b41 commit 0cf1a13

File tree

2 files changed

+12
-2
lines changed
  • packages
    • openapi-ts/src/plugins/@hey-api/client-core
    • openapi-ts-tests/test/__snapshots__/2.0.x/servers-base-path

2 files changed

+12
-2
lines changed

packages/openapi-ts-tests/test/__snapshots__/2.0.x/servers-base-path/client.gen.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,6 @@ import { type Config, type ClientOptions as DefaultClientOptions, createClient,
1313
*/
1414
export type CreateClientConfig<T extends DefaultClientOptions = ClientOptions> = (override?: Config<DefaultClientOptions & T>) => Config<Required<DefaultClientOptions> & T>;
1515

16-
export const client = createClient(createConfig<ClientOptions>());
16+
export const client = createClient(createConfig<ClientOptions>({
17+
baseUrl: '/v1'
18+
}));

packages/openapi-ts/src/plugins/@hey-api/client-core/client.ts

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import { compiler } from '../../../compiler';
22
import { clientModulePath } from '../../../generate/client';
33
import { parseUrl } from '../../../utils/url';
4-
import { clientId, getClientBaseUrlKey } from '../client-core/utils';
54
import { typesId } from '../typescript/ref';
65
import type { PluginHandler } from './types';
6+
import { clientId, getClientBaseUrlKey } from './utils';
77

88
const resolveBaseUrlString: PluginHandler<string | undefined> = ({
99
context,
@@ -69,6 +69,14 @@ export const createClient: PluginHandler = ({ context, plugin }) => {
6969
key: getClientBaseUrlKey(context.config),
7070
value: resolvedBaseUrl,
7171
});
72+
} else if (resolvedBaseUrl !== '/' && resolvedBaseUrl.startsWith('/')) {
73+
const baseUrl = resolvedBaseUrl.endsWith('/')
74+
? resolvedBaseUrl.slice(0, -1)
75+
: resolvedBaseUrl;
76+
defaultValues.push({
77+
key: getClientBaseUrlKey(context.config),
78+
value: baseUrl,
79+
});
7280
}
7381
}
7482

0 commit comments

Comments
 (0)