Skip to content

Don't require a variables argument when no GraphQL variables #459

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
merged 1 commit into from
Oct 10, 2024
Merged

Don't require a variables argument when no GraphQL variables #459

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 2 additions & 4 deletions ...ces/leetcode-api/src/api/active-daily-coding-challenge-question/fetchGraphQL.generated.ts
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions workspaces/leetcode-api/src/api/active-daily-coding-challenge-question/main.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,7 @@ export type ActiveDailyCodingChallengeQuestion = z.infer<
>;

export async function fetchActiveDailyCodingChallengeQuestionWithoutDateValidation(): Promise<ActiveDailyCodingChallengeQuestion> {
// TODO: have a way to omit variables when there aren't any
const { activeDailyCodingChallengeQuestion } = await fetchGraphQL({});
const { activeDailyCodingChallengeQuestion } = await fetchGraphQL();

return activeDailyCodingChallengeQuestionZodType.parse(
activeDailyCodingChallengeQuestion,
Expand Down
10 changes: 5 additions & 5 deletions workspaces/leetcode-api/src/scripts/codegen/graphqlCodegenPlugin.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import invariant from "invariant";
import nullthrows from "nullthrows";
import { z } from "zod";

import { isObject } from "@code-chronicles/util/isObject";
import { only } from "@code-chronicles/util/only";
import { spliceString } from "@code-chronicles/util/spliceString";

Expand All @@ -28,12 +27,13 @@ export const plugin: PluginFunction<{}> = async function plugin(
const { document, rawSDL: unminifiedGraphQL, location } = only(documents);
const definition = only(nullthrows(document).definitions);
invariant(
isObject(definition) &&
definition.kind === "OperationDefinition" &&
definition.kind === "OperationDefinition" &&
definition.operation === "query",
"Expected a query!",
);

const hasVariables = (definition?.variableDefinitions ?? []).length > 0;

// TODO: should we call it a Zod schema instead?

// Generate a Zod type to parse the result!
Expand Down Expand Up @@ -86,8 +86,8 @@ export const plugin: PluginFunction<{}> = async function plugin(
export type QueryResult = z.infer<typeof queryResultZodType>;
export type QueryVariables = OriginalQueryVariables;

export async function fetchGraphQL(variables: QueryVariables): Promise<QueryResult> {
const untrustedData = await getGraphQLClient().request(QUERY, variables);
export async function fetchGraphQL(${hasVariables ? "variables: QueryVariables" : ""}): Promise<QueryResult> {
const untrustedData = await getGraphQLClient().request(QUERY${hasVariables ? ", variables" : ""});

// The type annotation serves as a TypeScript assert that the generated
// Zod type is compatible with the types generated by GraphQL Codegen.
Expand Down
Loading