Skip to content

fix(eslint-plugin-query): ignore all non-identifier properties in rule infinite-query-property-order #8158

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 9, 2024
Merged

fix(eslint-plugin-query): ignore all non-identifier properties in rule infinite-query-property-order #8158

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
3 changes: 3 additions & 0 deletions packages/eslint-plugin-query/src/__tests__/infinite-query-property-order.rule.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ const orderIndependentProps = [
'queryKey',
'...objectExpressionSpread',
'...callExpressionSpread',
'...memberCallExpressionSpread',
] as const
type OrderIndependentProps = (typeof orderIndependentProps)[number]

Expand Down Expand Up @@ -147,6 +148,8 @@ function getCode({
return `...objectExpressionSpread`
case '...callExpressionSpread':
return callExpressionSpread
case '...memberCallExpressionSpread':
return '...myOptions.infiniteQueryOptions()'
case 'queryKey':
return `queryKey: ['projects']`
case 'queryFn':
Expand Down
14 changes: 2 additions & 12 deletions ...lugin-query/src/rules/infinite-query-property-order/infinite-query-property-order.rule.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,23 +56,13 @@ export const rule = createRule({
return
}

const properties = allProperties.flatMap((p) => {
const properties = allProperties.flatMap((p, index) => {
if (
p.type === AST_NODE_TYPES.Property &&
p.key.type === AST_NODE_TYPES.Identifier
) {
return { name: p.key.name, property: p }
} else if (p.type === AST_NODE_TYPES.SpreadElement) {
if (p.argument.type === AST_NODE_TYPES.Identifier) {
return { name: p.argument.name, property: p }
} else if (p.argument.type === AST_NODE_TYPES.CallExpression) {
if (p.argument.callee.type === AST_NODE_TYPES.Identifier) {
return { name: p.argument.callee.name, property: p }
}
}
throw new Error('Unsupported spread element')
}
return []
} else return { name: `_property_${index}`, property: p }
})

const sortedProperties = sortDataByOrder(properties, sortRules, 'name')
Expand Down
Loading