Skip to content

QueryKeys: default query keys to include any params #9

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
7nohe merged 1 commit into from
Mar 27, 2023
Merged

QueryKeys: default query keys to include any params #9

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
38 changes: 28 additions & 10 deletions src/createUseQuery.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,10 @@ export const createUseQuery = (
}

const customHookName = `use${className}${capitalizeFirstLetter(methodName)}`;
const queryKey = `${customHookName}Key`
const queryKey = `${customHookName}Key`;

const queryKeyGenericType = ts.factory.createTypeReferenceNode('TQueryKey', undefined);
const queryKeyConstraint = ts.factory.createTypeReferenceNode('Array', [ts.factory.createKeywordTypeNode(ts.SyntaxKind.UnknownKeyword)]);

return [
ts.factory.createVariableStatement(
Expand All @@ -66,19 +69,22 @@ export const createUseQuery = (
undefined,
ts.factory.createArrowFunction(
undefined,
undefined,
ts.factory.createNodeArray([
ts.factory.createTypeParameterDeclaration(
undefined,
'TQueryKey',
queryKeyConstraint,
ts.factory.createArrayTypeNode(ts.factory.createKeywordTypeNode(ts.SyntaxKind.UnknownKeyword)),
),
]),
[
...requestParam,
ts.factory.createParameterDeclaration(
undefined,
undefined,
ts.factory.createIdentifier("queryKey"),
undefined,
ts.factory.createArrayTypeNode(ts.factory.createKeywordTypeNode(ts.SyntaxKind.StringKeyword)),
ts.factory.createArrayLiteralExpression(
[],
false
)
ts.factory.createToken(ts.SyntaxKind.QuestionToken),
queryKeyGenericType,
),
ts.factory.createParameterDeclaration(
undefined,
Expand Down Expand Up @@ -130,7 +136,7 @@ export const createUseQuery = (
),
ts.factory.createArrayTypeNode(
ts.factory.createKeywordTypeNode(
ts.SyntaxKind.StringKeyword
ts.SyntaxKind.UnknownKeyword,
)
),
]
Expand Down Expand Up @@ -159,7 +165,19 @@ export const createUseQuery = (
ts.factory.createArrayLiteralExpression(
[
ts.factory.createIdentifier(queryKey),
ts.factory.createSpreadElement(ts.factory.createIdentifier("queryKey"))
ts.factory.createSpreadElement(ts.factory.createParenthesizedExpression(ts.factory.createBinaryExpression(
ts.factory.createIdentifier("queryKey"),
ts.factory.createToken(ts.SyntaxKind.QuestionQuestionToken),
method.parameters.length ? ts.factory.createArrayLiteralExpression([
ts.factory.createObjectLiteralExpression(
method.parameters.map((param) =>
ts.factory.createShorthandPropertyAssignment(
ts.factory.createIdentifier(param.name.getText(node)),
),
),
),
]) : ts.factory.createArrayLiteralExpression([]),
))),
],
false
),
Expand Down