Skip to content
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

Jump to bottom

fix(eslint-plugin): support rule prefer-object-syntax with multi lines #4637

Merged
merged 2 commits into from Dec 14, 2022
Merged

fix(eslint-plugin): support rule prefer-object-syntax with multi lines #4637

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
594217e
fix rule prefer-object-syntax with multilines
Newbie012 Dec 14, 2022
bfde964
simplify
Newbie012 Dec 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
27 changes: 27 additions & 0 deletions ...lint-plugin-query/src/rules/prefer-query-object-syntax/prefer-query-object-syntax.test.ts
View file
Open in desktop
Expand Up @@ -287,5 +287,32 @@ ruleTester.run(name, rule, {
createQuery({ queryKey: ['data'], queryFn: () => fetchData(), enabled: false });
`,
},
{
code: normalizeIndent`
import { createQuery } from "@tanstack/solid-query";
createQuery(
['key'],
() => Promise.resolve('data')
);
`,
errors: [{ messageId: 'preferObjectSyntax' }],
output: normalizeIndent`
import { createQuery } from "@tanstack/solid-query";
createQuery({ queryKey: ['key'], queryFn: () => Promise.resolve('data') });
`,
},
{
code: normalizeIndent`
import { createQuery } from "@tanstack/solid-query";
createQuery(
['key'], () => Promise.resolve('data')
);
`,
errors: [{ messageId: 'preferObjectSyntax' }],
output: normalizeIndent`
import { createQuery } from "@tanstack/solid-query";
createQuery({ queryKey: ['key'], queryFn: () => Promise.resolve('data') });
`,
},
],
})
16 changes: 4 additions & 12 deletions ...es/eslint-plugin-query/src/rules/prefer-query-object-syntax/prefer-query-object-syntax.ts
View file
Open in desktop
Expand Up @@ -185,7 +185,6 @@ function runCheckOnNode(params: {
node: callNode,
messageId: 'preferObjectSyntax',
fix(fixer) {
const ruleFixes: TSESLint.RuleFix[] = []
const optionsObjectProperties: string[] = []

// queryKey
Expand Down Expand Up @@ -216,20 +215,13 @@ function runCheckOnNode(params: {
optionsObjectProperties.push(...existingObjectProperties)
}

const argumentsRange = ASTUtils.getRangeOfArguments(callNode)

if (argumentsRange) {
ruleFixes.push(fixer.removeRange(argumentsRange))
if (callNode.callee.type !== AST_NODE_TYPES.Identifier) {
return null
}

ruleFixes.push(
fixer.insertTextAfterRange(
[callNode.range[0], callNode.range[1] - 1],
`{ ${optionsObjectProperties.join(', ')} }`,
),
)
const argsText = `{ ${optionsObjectProperties.join(', ')} }`

return ruleFixes
return fixer.replaceText(callNode, `${callNode.callee.name}(${argsText})`)
},
})
}
9 changes: 0 additions & 9 deletions packages/eslint-plugin-query/src/utils/ast-utils.ts
View file
Open in desktop
Expand Up @@ -128,15 +128,6 @@ export const ASTUtils = {

return identifier
},
getRangeOfArguments(
node: TSESTree.CallExpression,
): TSESTree.Range | undefined {
const firstArgument = node.arguments[0]
const lastArgument = node.arguments[node.arguments.length - 1]
return firstArgument && lastArgument
? [firstArgument.range[0], lastArgument.range[1]]
: undefined
},
getExternalRefs(params: {
scopeManager: TSESLint.Scope.ScopeManager
node: TSESTree.Node
Expand Down