Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 6 additions & 1 deletion src/adapters/node-http/procedures.ts
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,12 @@ export const createProcedureCache = (router: OpenApiRouter) => {
}

const procedure = procedureMethodCache.get(procedureRegExp);
const pathInput = procedureRegExp.exec(path)?.groups ?? {};
const pathInput = Object.fromEntries(
Object.entries(procedureRegExp.exec(path)?.groups ?? {}).map(([key, value]) => [
key,
decodeURIComponent(value),
]),
);

return { procedure, pathInput };
};
Expand Down
32 changes: 32 additions & 0 deletions test/adapters/express.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,11 @@ describe('express adapter', () => {
.input(z.object({ name: z.string() }))
.output(z.object({ greeting: z.string() }))
.query(({ input }) => ({ greeting: `Hello ${input.name}!` })),
sayHelloWithParam: t.procedure
.meta({ openapi: { method: 'GET', path: `/say-hello-with-param/{name}` } })
.input(z.object({ name: z.string() }))
.output(z.object({ greeting: z.string() }))
.query(({ input }) => ({ greeting: `Hello ${input.name}!` })),
});

const { url, close } = createExpressServerWithRouter({
Expand Down Expand Up @@ -111,6 +116,33 @@ describe('express adapter', () => {
expect(createContextMock).toHaveBeenCalledTimes(1);
expect(responseMetaMock).toHaveBeenCalledTimes(1);
expect(onErrorMock).toHaveBeenCalledTimes(0);

clearMocks();
}
{
const res = await fetch(`${url}/say-hello-with-param/Lily`, { method: 'GET' });

expect(res.status).toBe(200);
expect(await res.json()).toEqual({ greeting: 'Hello Lily!' });
expect(createContextMock).toHaveBeenCalledTimes(1);
expect(responseMetaMock).toHaveBeenCalledTimes(1);
expect(onErrorMock).toHaveBeenCalledTimes(0);

clearMocks();
}

{
const res = await fetch(`${url}/say-hello-with-param/${encodeURIComponent('Li::ly')}`, {
method: 'GET',
});

expect(res.status).toBe(200);
expect(await res.json()).toEqual({ greeting: 'Hello Li::ly!' });
expect(createContextMock).toHaveBeenCalledTimes(1);
expect(responseMetaMock).toHaveBeenCalledTimes(1);
expect(onErrorMock).toHaveBeenCalledTimes(0);

clearMocks();
}

close();
Expand Down