Skip to content

refactor: update ExtractValidation type to use 'unknown' #36318

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
kodiakhq merged 4 commits into from
Jun 29, 2025
Merged

refactor: update ExtractValidation type to use 'unknown' #36318

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3b59e25
fix: update ExtractValidation type to handle unknown case
ahmed-n-abdeltwab Jun 28, 2025
cd8c5da
test: add comprehensive tests for ExtractRoutesFromAPI with various q…
ahmed-n-abdeltwab Jun 28, 2025
c555307
refactor: simplify ExtractRoutesFromAPI tests
ahmed-n-abdeltwab Jun 28, 2025
1abd4cd
fix: update ExtractValidation type to handle unknown case correctly
ahmed-n-abdeltwab Jun 28, 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
20 changes: 20 additions & 0 deletions apps/meteor/app/api/server/ApiClass.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,3 +39,23 @@ it('Should return the expected type', () => {
>;
true as test;
});

describe('ExtractRoutesFromAPI', () => {
it('Should extract correct function signature when query is not present', () => {
type APIWithNeverQuery = APIClass<
'/v1',
{
method: 'GET';
path: '/v1/endpoint.test';
response: {
200: ValidateFunction<unknown>;
};
authRequired: true;
}
>;
type ExpectedFunctionSignature = Expect<
ShallowEqual<ExtractRoutesFromAPI<APIWithNeverQuery>['/v1/endpoint.test']['GET'], () => unknown>
>;
true as ExpectedFunctionSignature;
});
});
4 changes: 3 additions & 1 deletion apps/meteor/app/api/server/ApiClass.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,9 @@ type ConvertToRoute<TRoute extends MinimalRoute> = {
[K in TRoute['path']]: {
[K2 in Extract<TRoute, { path: K }>['method']]: K2 extends 'GET'
? (
params: ExtractValidation<Extract<TRoute, { path: K; method: K2 }>['query']>,
...args: [ExtractValidation<Extract<TRoute, { path: K; method: K2 }>['query']>] extends [never]
? [params?: never]
: [params: ExtractValidation<Extract<TRoute, { path: K; method: K2 }>['query']>]
) => ExtractValidation<Extract<TRoute, { path: K; method: K2 }>['response'][200]>
: K2 extends 'POST'
? (
Expand Down
Loading