Skip to content

fix the locateImports functions #6285

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.

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
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 8 additions & 5 deletions packages/codemods/src/utils/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,21 +11,24 @@ module.exports = ({ root, jscodeshift }) => {
return jscodeshift.identifier(identifier)
}

const findImportSpecifiers = () =>
const findImportSpecifiers = (packageName) =>
root
.find(jscodeshift.ImportDeclaration, {
source: {
value: 'react-query',
value: packageName,
},
})
.find(jscodeshift.ImportSpecifier, {})

const locateImports = (identifiers) => {
const locateImports = (
identifiers,
packageName = '@tanstack/react-query',
) => {
const findNamespaceImportIdentifier = () => {
const specifier = root
.find(jscodeshift.ImportDeclaration, {
source: {
value: 'react-query',
value: packageName,
},
})
.find(jscodeshift.ImportNamespaceSpecifier)
Expand Down Expand Up @@ -53,7 +56,7 @@ module.exports = ({ root, jscodeshift }) => {
}
}

const importSpecifiers = findImportSpecifiers()
const importSpecifiers = findImportSpecifiers(packageName)
const identifierMap = {}

for (const identifier of identifiers) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
module.exports = ({ jscodeshift, utils, root }) => {
module.exports = ({
jscodeshift,
utils,
root,
packageName = '@tanstack/react-query',
}) => {
const isGetQueryCacheMethodCall = (
initializer,
importIdentifiers,
Expand Down Expand Up @@ -106,7 +111,10 @@ module.exports = ({ jscodeshift, utils, root }) => {

const execute = (replacer) => {
findQueryCacheMethodCalls(
utils.locateImports(['QueryCache', 'QueryClient', 'useQueryClient']),
utils.locateImports(
['QueryCache', 'QueryClient', 'useQueryClient'],
packageName,
),
).replaceWith(replacer)
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
module.exports = ({ jscodeshift, utils, root }) => {
module.exports = ({
jscodeshift,
utils,
root,
packageName = '@tanstack/react-query',
}) => {
const filterQueryClientMethodCalls = (node, methods) =>
utils.isIdentifier(node) && methods.includes(node.name)

Expand Down Expand Up @@ -37,7 +42,7 @@ module.exports = ({ jscodeshift, utils, root }) => {

const execute = (methods, replacer) => {
findQueryClientMethodCalls(
utils.locateImports(['QueryClient', 'useQueryClient']),
utils.locateImports(['QueryClient', 'useQueryClient'], packageName),
methods,
).replaceWith(replacer)
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
module.exports = ({ jscodeshift, utils, root }) => {
module.exports = ({
jscodeshift,
utils,
root,
packageName = '@tanstack/react-query',
}) => {
const filterUseQueryLikeHookCalls = (node, importIdentifiers, hooks) => {
for (const hook of hooks) {
const selector = utils.getSelectorByImports(importIdentifiers, hook)
Expand All @@ -21,9 +26,10 @@ module.exports = ({ jscodeshift, utils, root }) => {
)

const execute = (hooks, replacer) => {
findUseQueryLikeHookCalls(utils.locateImports(hooks), hooks).replaceWith(
replacer,
)
findUseQueryLikeHookCalls(
utils.locateImports(hooks, packageName),
hooks,
).replaceWith(replacer)
}

return {
Expand Down
66 changes: 57 additions & 9 deletions packages/codemods/src/v4/key-transformation.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,19 @@ const createQueryClientTransformer = require('../utils/transformers/query-client
// eslint-disable-next-line @typescript-eslint/no-var-requires
const createQueryCacheTransformer = require('../utils/transformers/query-cache-transformer')

const transformQueryClientUsages = ({ jscodeshift, utils, root, filePath }) => {
const transformer = createQueryClientTransformer({ jscodeshift, utils, root })
const transformQueryClientUsages = ({
jscodeshift,
utils,
root,
filePath,
packageName,
}) => {
const transformer = createQueryClientTransformer({
jscodeshift,
utils,
root,
packageName,
})
const replacer = createKeyReplacer({ jscodeshift, root, filePath })

transformer.execute(
Expand Down Expand Up @@ -41,11 +52,17 @@ const transformQueryClientUsages = ({ jscodeshift, utils, root, filePath }) => {
)
}

const transformUseQueriesUsages = ({ jscodeshift, utils, root }) => {
const transformUseQueriesUsages = ({
jscodeshift,
utils,
root,
packageName,
}) => {
const transformer = createUseQueryLikeTransformer({
jscodeshift,
utils,
root,
packageName,
})
const replacer = ({ node }) => {
/**
Expand Down Expand Up @@ -82,11 +99,13 @@ const transformUseQueryLikeUsages = ({
utils,
root,
filePath,
packageName,
}) => {
const transformer = createUseQueryLikeTransformer({
jscodeshift,
utils,
root,
packageName,
})

transformer.execute(
Expand All @@ -109,8 +128,19 @@ const transformUseQueryLikeUsages = ({
)
}

const transformQueryCacheUsages = ({ jscodeshift, utils, root, filePath }) => {
const transformer = createQueryCacheTransformer({ jscodeshift, utils, root })
const transformQueryCacheUsages = ({
jscodeshift,
utils,
root,
filePath,
packageName,
}) => {
const transformer = createQueryCacheTransformer({
jscodeshift,
utils,
root,
packageName,
})
const replacer = createKeyReplacer({ jscodeshift, root, filePath })

transformer.execute(replacer)
Expand All @@ -124,15 +154,33 @@ module.exports = (file, api) => {

const utils = createUtilsObject({ root, jscodeshift })
const filePath = file.path
const packageName = 'react-query'

// This function transforms usages like `useQuery` and `useMutation`.
transformUseQueryLikeUsages({ jscodeshift, utils, root, filePath })
transformUseQueryLikeUsages({
jscodeshift,
utils,
root,
filePath,
packageName,
})
// This function transforms usages of `useQueries`.
transformUseQueriesUsages({ jscodeshift, utils, root })
transformUseQueriesUsages({
jscodeshift,
utils,
root,
packageName,
})
// This function transforms usages of `QueryClient`.
transformQueryClientUsages({ jscodeshift, utils, root, filePath })
transformQueryClientUsages({
jscodeshift,
utils,
root,
filePath,
packageName,
})
// This function transforms usages of `QueryCache`.
transformQueryCacheUsages({ jscodeshift, utils, root, filePath })
transformQueryCacheUsages({ jscodeshift, utils, root, filePath, packageName })

return root.toSource({ quote: 'single', lineTerminator: '\n' })
}