@ethlete/query 5.43.1 → 6.0.0-next.0

package/generators/migrate-to-query-v3/migration.js

@@ -1,13 +1,9 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = migrate;
-const tslib_1 = require("tslib");
-const devkit_1 = require("@nx/devkit");
-const ts = tslib_1.__importStar(require("typescript"));
-async function migrate(tree, schema) {
+import { formatFiles, getProjects, visitNotIgnoredFiles } from '@nx/devkit';
+import * as ts from 'typescript';
+export default async function migrate(tree, schema) {
     const queryClientFiles = new Map(); // filepath -> config names
     const variableRenames = new Map(); // old name -> new name
-    (0, devkit_1.visitNotIgnoredFiles)(tree, '', (filePath) => {
+    visitNotIgnoredFiles(tree, '', (filePath) => {
         if (!filePath.endsWith('.ts'))
             return;
         const content = tree.read(filePath, 'utf-8');
@@ -15,10 +11,6 @@ async function migrate(tree, schema) {
             return;
         let modified = false;
         let newContent = content;
-        if (needsExperimentalQueryImport(content)) {
-            newContent = addExperimentalQueryImport(newContent);
-            modified = true;
-        }
         if (hasQueryClientInstantiation(content)) {
             const renames = new Map();
             newContent = migrateQueryClientToConfig(newContent, renames);
@@ -56,7 +48,7 @@ async function migrate(tree, schema) {
     if (variableRenames.size > 0) {
         updateImportsAcrossWorkspace(tree, variableRenames);
     }
-    // Replace AnyQuery with E.AnyLegacyQuery everywhere
+    // Replace AnyV2Query with AnyLegacyQuery everywhere
     replaceAnyQueryWithLegacy(tree);
     // Remove devtools usage
     removeDevtoolsUsage(tree);
@@ -65,43 +57,10 @@ async function migrate(tree, schema) {
     // Check for legacy query creator usage (step 1: just collect and report)
     checkLegacyQueryCreatorUsage(tree);
     if (!schema.skipFormat) {
-        await (0, devkit_1.formatFiles)(tree);
+        await formatFiles(tree);
     }
 }
 //#endregion
-//#region import ExperimentalQuery as E
-function needsExperimentalQueryImport(content) {
-    // Check if file imports from @ethlete/query
-    const hasQueryImport = /from\s+['"]@ethlete\/query['"]/.test(content);
-    // Check if already has ExperimentalQuery import
-    const hasExperimentalQueryImport = /import\s*{[^}]*ExperimentalQuery/.test(content);
-    return hasQueryImport && !hasExperimentalQueryImport;
-}
-function addExperimentalQueryImport(content) {
-    const sourceFile = ts.createSourceFile('temp.ts', content, ts.ScriptTarget.Latest, true);
-    let queryImportNode;
-    ts.forEachChild(sourceFile, (node) => {
-        if (ts.isImportDeclaration(node) &&
-            ts.isStringLiteral(node.moduleSpecifier) &&
-            node.moduleSpecifier.text === '@ethlete/query') {
-            queryImportNode = node;
-        }
-    });
-    if (!queryImportNode || !queryImportNode.importClause?.namedBindings) {
-        return content;
-    }
-    const namedBindings = queryImportNode.importClause.namedBindings;
-    if (!ts.isNamedImports(namedBindings)) {
-        return content;
-    }
-    const importStart = queryImportNode.getStart(sourceFile);
-    const importEnd = queryImportNode.getEnd();
-    const existingImports = namedBindings.elements.map((el) => el.getText(sourceFile));
-    const newImports = [...existingImports, 'ExperimentalQuery as E'];
-    const newImportStatement = `import { ${newImports.join(', ')} } from '@ethlete/query';`;
-    return content.slice(0, importStart) + newImportStatement + content.slice(importEnd);
-}
-//#endregion
 //#region Query client to config
 function hasQueryClientInstantiation(content) {
     const sourceFile = ts.createSourceFile('temp.ts', content, ts.ScriptTarget.Latest, true);
@@ -113,12 +72,12 @@ function hasQueryClientInstantiation(content) {
             node.moduleSpecifier.text === '@ethlete/query' &&
             node.importClause?.namedBindings &&
             ts.isNamedImports(node.importClause.namedBindings)) {
-            const hasQueryClient = node.importClause.namedBindings.elements.some((el) => el.name.text === 'QueryClient');
+            const hasQueryClient = node.importClause.namedBindings.elements.some((el) => el.name.text === 'V2QueryClient');
             if (hasQueryClient) {
                 hasQueryClientImport = true;
             }
         }
-        if (ts.isNewExpression(node) && ts.isIdentifier(node.expression) && node.expression.text === 'QueryClient') {
+        if (ts.isNewExpression(node) && ts.isIdentifier(node.expression) && node.expression.text === 'V2QueryClient') {
             hasNewQueryClient = true;
         }
         ts.forEachChild(node, visit);
@@ -134,7 +93,7 @@ function migrateQueryClientToConfig(content, renamesOut) {
         // Find: new QueryClient({ baseRoute: '...' })
         if (ts.isNewExpression(node) &&
             ts.isIdentifier(node.expression) &&
-            node.expression.text === 'QueryClient' &&
+            node.expression.text === 'V2QueryClient' &&
             node.arguments &&
             node.arguments.length > 0) {
             const configArg = node.arguments[0];
@@ -188,25 +147,68 @@ function removeQueryClientImport(content) {
         }
     });
     if (!queryImportNode?.importClause?.namedBindings || !ts.isNamedImports(queryImportNode.importClause.namedBindings)) {
-        return content;
+        // No @ethlete/query import exists - create one with necessary imports
+        const newImportsNeeded = [
+            'createQueryClientConfig',
+            'createGetQuery',
+            'createPostQuery',
+            'createPutQuery',
+            'createPatchQuery',
+            'createDeleteQuery',
+        ];
+        // Find last import to insert after it
+        let lastImportEnd = 0;
+        ts.forEachChild(sourceFile, (node) => {
+            if (ts.isImportDeclaration(node)) {
+                const end = node.getEnd();
+                if (end > lastImportEnd) {
+                    lastImportEnd = end;
+                }
+            }
+        });
+        const newImportStatement = `\nimport { ${newImportsNeeded.join(', ')} } from '@ethlete/query';`;
+        if (lastImportEnd > 0) {
+            return content.slice(0, lastImportEnd) + newImportStatement + content.slice(lastImportEnd);
+        }
+        return `import { ${newImportsNeeded.join(', ')} } from '@ethlete/query';\n\n${content}`;
     }
     const namedBindings = queryImportNode.importClause.namedBindings;
-    const elements = namedBindings.elements.filter((el) => el.name.text !== 'QueryClient');
-    // If no imports left, remove the entire import statement
-    if (elements.length === 0) {
+    const elements = namedBindings.elements.filter((el) => el.name.text !== 'V2QueryClient');
+    // Add the new imports we need
+    const newImportsNeeded = new Set([
+        'createQueryClientConfig',
+        'createGetQuery',
+        'createPostQuery',
+        'createPutQuery',
+        'createPatchQuery',
+        'createDeleteQuery',
+    ]);
+    // Check which imports already exist
+    elements.forEach((el) => {
+        newImportsNeeded.delete(el.name.text);
+    });
+    // Combine existing imports with new ones
+    const allImports = [...elements.map((el) => el.getText(sourceFile)), ...Array.from(newImportsNeeded).sort()].sort();
+    // If no imports left after removing V2QueryClient, we still need to add the new ones
+    if (elements.length === 0 && newImportsNeeded.size > 0) {
+        const newImportStatement = `import { ${Array.from(newImportsNeeded).sort().join(', ')} } from '@ethlete/query';`;
         const importStart = queryImportNode.getStart(sourceFile);
         const importEnd = queryImportNode.getEnd();
-        // Also remove the newline after the import
-        const nextChar = content[importEnd];
-        const endPos = nextChar === '\n' ? importEnd + 1 : importEnd;
-        return content.slice(0, importStart) + content.slice(endPos);
+        return content.slice(0, importStart) + newImportStatement + content.slice(importEnd);
+    }
+    // If we removed V2QueryClient but have other imports, reconstruct with new ones
+    if (elements.length > 0 || newImportsNeeded.size > 0) {
+        const importStart = queryImportNode.getStart(sourceFile);
+        const importEnd = queryImportNode.getEnd();
+        const newImportStatement = `import { ${allImports.join(', ')} } from '@ethlete/query';`;
+        return content.slice(0, importStart) + newImportStatement + content.slice(importEnd);
     }
-    // Otherwise, reconstruct import without QueryClient
+    // If truly no imports needed, remove the import line
     const importStart = queryImportNode.getStart(sourceFile);
     const importEnd = queryImportNode.getEnd();
-    const newImports = elements.map((el) => el.getText(sourceFile));
-    const newImportStatement = `import { ${newImports.join(', ')} } from '@ethlete/query';`;
-    return content.slice(0, importStart) + newImportStatement + content.slice(importEnd);
+    const nextChar = content[importEnd];
+    const endPos = nextChar === '\n' ? importEnd + 1 : importEnd;
+    return content.slice(0, importStart) + content.slice(endPos);
 }
 function renameVariables(content, renames) {
     if (renames.size === 0)
@@ -293,7 +295,7 @@ function migrateConfigObject(configArg, node, sourceFile) {
             newConfig.push(`retryFn: ${retryFnValue}`);
         }
     }
-    return `E.createQueryClientConfig({\n  ${newConfig.join(',\n  ')}\n})`;
+    return `createQueryClientConfig({\n  ${newConfig.join(',\n  ')}\n})`;
 }
 function getVariableNameForQueryClient(node, sourceFile) {
     let parent = node.parent;
@@ -310,17 +312,13 @@ function extractClientConfigNames(content) {
     const sourceFile = ts.createSourceFile('temp.ts', content, ts.ScriptTarget.Latest, true);
     const configNames = [];
     function visit(node) {
-        // Find: const XXX = E.createQueryClientConfig(...)
+        // Find: const XXX = createQueryClientConfig(...)
         if (ts.isVariableDeclaration(node) &&
             ts.isIdentifier(node.name) &&
             node.initializer &&
             ts.isCallExpression(node.initializer)) {
             const callExpr = node.initializer;
-            if (ts.isPropertyAccessExpression(callExpr.expression) &&
-                ts.isIdentifier(callExpr.expression.expression) &&
-                callExpr.expression.expression.text === 'E' &&
-                ts.isIdentifier(callExpr.expression.name) &&
-                callExpr.expression.name.text === 'createQueryClientConfig') {
+            if (ts.isIdentifier(callExpr.expression) && callExpr.expression.text === 'createQueryClientConfig') {
                 // This extracts the NEW variable name (apiClientConfig)
                 // But we should extract the name from the config object instead!
                 const nameArg = callExpr.arguments[0];
@@ -340,7 +338,7 @@ function extractClientConfigNames(content) {
 //#endregion
 //#region Add query client providers to apps
 function updateDependentApps(tree, queryClientFiles) {
-    const projects = (0, devkit_1.getProjects)(tree);
+    const projects = getProjects(tree);
     const updatedApps = [];
     const warnedApps = [];
     // Find all apps
@@ -397,6 +395,8 @@ function findImportedClientConfigs(content, queryClientFiles) {
     return importedConfigs;
 }
 function addQueryClientProviders(content, clientConfigs) {
+    // Ensure provideQueryClient is imported
+    content = ensureImportFromQuery(content, ['provideQueryClient']);
     const sourceFile = ts.createSourceFile('temp.ts', content, ts.ScriptTarget.Latest, true);
     let providersArrayNode;
     function visit(node) {
@@ -411,7 +411,7 @@ function addQueryClientProviders(content, clientConfigs) {
     visit(sourceFile);
     if (!providersArrayNode)
         return content;
-    const newProviders = clientConfigs.map((config) => `E.provideQueryClient(${config})`);
+    const newProviders = clientConfigs.map((config) => `provideQueryClient(${config})`);
     const elements = providersArrayNode.elements;
     if (elements.length > 0) {
         const insertPosition = elements[elements.length - 1].getEnd();
@@ -428,7 +428,7 @@ function addQueryClientProviders(content, clientConfigs) {
 //#region Update imports across workspace
 function updateImportsAcrossWorkspace(tree, renames) {
     const updatedFiles = [];
-    (0, devkit_1.visitNotIgnoredFiles)(tree, '', (filePath) => {
+    visitNotIgnoredFiles(tree, '', (filePath) => {
         if (!filePath.endsWith('.ts'))
             return;
         const content = tree.read(filePath, 'utf-8');
@@ -520,11 +520,7 @@ function addQueryCreatorsToFile(content, configNames) {
             node.initializer &&
             ts.isCallExpression(node.initializer)) {
             const callExpr = node.initializer;
-            if (ts.isPropertyAccessExpression(callExpr.expression) &&
-                ts.isIdentifier(callExpr.expression.expression) &&
-                callExpr.expression.expression.text === 'E' &&
-                ts.isIdentifier(callExpr.expression.name) &&
-                callExpr.expression.name.text === 'createQueryClientConfig') {
+            if (ts.isIdentifier(callExpr.expression) && callExpr.expression.text === 'createQueryClientConfig') {
                 const configName = node.name.text;
                 // Find the variable statement (const/let/var line)
                 let parent = node.parent;
@@ -559,11 +555,11 @@ function addQueryCreatorsToFile(content, configNames) {
 function generateCreatorsForConfig(configName) {
     const configNameWithoutClientSuffix = configName.replace('Client', '');
     const creators = [
-        `export const ${configNameWithoutClientSuffix}Get = E.createGetQuery(${configName}Config);`,
-        `export const ${configNameWithoutClientSuffix}Post = E.createPostQuery(${configName}Config);`,
-        `export const ${configNameWithoutClientSuffix}Put = E.createPutQuery(${configName}Config);`,
-        `export const ${configNameWithoutClientSuffix}Patch = E.createPatchQuery(${configName}Config);`,
-        `export const ${configNameWithoutClientSuffix}Delete = E.createDeleteQuery(${configName}Config);`,
+        `export const ${configNameWithoutClientSuffix}Get = createGetQuery(${configName}Config);`,
+        `export const ${configNameWithoutClientSuffix}Post = createPostQuery(${configName}Config);`,
+        `export const ${configNameWithoutClientSuffix}Put = createPutQuery(${configName}Config);`,
+        `export const ${configNameWithoutClientSuffix}Patch = createPatchQuery(${configName}Config);`,
+        `export const ${configNameWithoutClientSuffix}Delete = createDeleteQuery(${configName}Config);`,
     ];
     return creators.join('\n');
 }
@@ -583,7 +579,7 @@ function createNewQueryCreators(tree, queryClientFiles) {
         });
     });
     // Step 1: Find all legacy query creators and analyze them
-    (0, devkit_1.visitNotIgnoredFiles)(tree, '', (filePath) => {
+    visitNotIgnoredFiles(tree, '', (filePath) => {
         if (!filePath.endsWith('.ts') || filePath.endsWith('.spec.ts'))
             return;
         const content = tree.read(filePath, 'utf-8');
@@ -748,6 +744,8 @@ function transformLegacyQueryCreators(content, legacyCreators, queryClientFiles)
     for (const { start, end, replacement } of replacements) {
         result = result.slice(0, start) + replacement + result.slice(end);
     }
+    // Ensure createLegacyQueryCreator is imported
+    result = ensureImportFromQuery(result, ['createLegacyQueryCreator']);
     // Update imports to include necessary creator functions
     result = addCreatorImports(result, creatorsByClient);
     return result;
@@ -895,7 +893,7 @@ function generateNewQueryCreator(creator, sourceFile) {
 }
 function generateLegacyWrapper(creator) {
     const legacyName = toLegacyName(creator.name);
-    return `export const ${legacyName} = E.createLegacyQueryCreator({ creator: ${creator.name} });`;
+    return `export const ${legacyName} = createLegacyQueryCreator({ creator: ${creator.name} });`;
 }
 function createAuthProviders(tree, authProvidersNeeded, queryClientFiles) {
     const createdProviders = [];
@@ -922,7 +920,7 @@ function createAuthProviders(tree, authProvidersNeeded, queryClientFiles) {
     if (createdProviders.length > 0) {
         console.log('\n✅ Created auth providers in:');
         createdProviders.forEach((file) => console.log(`   - ${file}`));
-        console.warn('\n⚠️ Make sure to provide them in the respective app.config/main.ts providers array using E.provideBearerAuthProvider(yourConfigName)');
+        console.warn('\n⚠️ Make sure to provide them in the respective app.config/main.ts providers array using provideBearerAuthProvider(yourConfigName)');
     }
 }
 function addAuthProviderInjectFunction(content, clientName) {
@@ -965,6 +963,8 @@ function addAuthProviderInjectFunction(content, clientName) {
     return result.slice(0, authProviderPosition) + injectFunction + result.slice(authProviderPosition);
 }
 function addAuthProviderToFile(content, clientName, configName) {
+    // Ensure createBearerAuthProviderConfig is imported
+    content = ensureImportFromQuery(content, ['createBearerAuthProviderConfig']);
     const sourceFile = ts.createSourceFile('temp.ts', content, ts.ScriptTarget.Latest, true);
     // Find where the config is declared
     let configPosition;
@@ -974,7 +974,6 @@ function addAuthProviderToFile(content, clientName, configName) {
             node.name.text === configName &&
             node.initializer &&
             ts.isCallExpression(node.initializer)) {
-            // Find the variable statement
             let parent = node.parent;
             while (parent && !ts.isVariableStatement(parent)) {
                 parent = parent.parent;
@@ -990,13 +989,21 @@ function addAuthProviderToFile(content, clientName, configName) {
         return content;
     const authProviderCode = `
 
-export const ${clientName}AuthProviderConfig = E.createBearerAuthProviderConfig({
+export const ${clientName}AuthProviderConfig = createBearerAuthProviderConfig({
   name: '${clientName}',
   queryClientRef: ${configName}.token,
 });`;
     return content.slice(0, configPosition) + authProviderCode + content.slice(configPosition);
 }
 function generateSecureQueryCreators(content, clientName) {
+    // Ensure secure query creator functions are imported
+    content = ensureImportFromQuery(content, [
+        'createSecureGetQuery',
+        'createSecurePostQuery',
+        'createSecurePutQuery',
+        'createSecurePatchQuery',
+        'createSecureDeleteQuery',
+    ]);
     const sourceFile = ts.createSourceFile('temp.ts', content, ts.ScriptTarget.Latest, true);
     // Find where the auth provider is declared
     let authProviderPosition;
@@ -1023,11 +1030,11 @@ function generateSecureQueryCreators(content, clientName) {
     const clientNameWithoutClient = clientName.replace('Client', '');
     const configName = `${clientName}Config`;
     const secureCreators = [
-        `export const ${clientNameWithoutClient}GetSecure = E.createSecureGetQuery(${configName}, ${authProviderName});`,
-        `export const ${clientNameWithoutClient}PostSecure = E.createSecurePostQuery(${configName}, ${authProviderName});`,
-        `export const ${clientNameWithoutClient}PutSecure = E.createSecurePutQuery(${configName}, ${authProviderName});`,
-        `export const ${clientNameWithoutClient}PatchSecure = E.createSecurePatchQuery(${configName}, ${authProviderName});`,
-        `export const ${clientNameWithoutClient}DeleteSecure = E.createSecureDeleteQuery(${configName}, ${authProviderName});`,
+        `export const ${clientNameWithoutClient}GetSecure = createSecureGetQuery(${configName}, ${authProviderName});`,
+        `export const ${clientNameWithoutClient}PostSecure = createSecurePostQuery(${configName}, ${authProviderName});`,
+        `export const ${clientNameWithoutClient}PutSecure = createSecurePutQuery(${configName}, ${authProviderName});`,
+        `export const ${clientNameWithoutClient}PatchSecure = createSecurePatchQuery(${configName}, ${authProviderName});`,
+        `export const ${clientNameWithoutClient}DeleteSecure = createSecureDeleteQuery(${configName}, ${authProviderName});`,
     ].join('\n');
     return content.slice(0, authProviderPosition) + '\n\n' + secureCreators + content.slice(authProviderPosition);
 }
@@ -1037,7 +1044,7 @@ function updateLegacyCreatorImportsAndUsages(tree, queryClientFiles) {
     const legacyCreators = new Map(); // original name -> legacy name
     const updatedFiles = [];
     // Step 1: Find all legacy wrappers that were created
-    (0, devkit_1.visitNotIgnoredFiles)(tree, '', (filePath) => {
+    visitNotIgnoredFiles(tree, '', (filePath) => {
         if (!filePath.endsWith('.ts') || filePath.endsWith('.spec.ts'))
             return;
         const content = tree.read(filePath, 'utf-8');
@@ -1052,7 +1059,7 @@ function updateLegacyCreatorImportsAndUsages(tree, queryClientFiles) {
         return;
     console.log(`\n✅ Found ${legacyCreators.size} legacy query creator wrappers`);
     // Step 2: Update imports and usages across the workspace
-    (0, devkit_1.visitNotIgnoredFiles)(tree, '', (filePath) => {
+    visitNotIgnoredFiles(tree, '', (filePath) => {
         if (!filePath.endsWith('.ts') || filePath.endsWith('.spec.ts'))
             return;
         const content = tree.read(filePath, 'utf-8');
@@ -1078,25 +1085,21 @@ function updateLegacyCreatorImportsAndUsages(tree, queryClientFiles) {
     }
 }
 function containsLegacyWrapperDefinitions(content) {
-    return content.includes('E.createLegacyQueryCreator');
+    return content.includes('createLegacyQueryCreator');
 }
 function findLegacyWrappers(content) {
     const wrappers = new Map(); // original name -> legacy name
     const sourceFile = ts.createSourceFile('temp.ts', content, ts.ScriptTarget.Latest, true);
     function visit(node) {
-        // Find: export const legacyGetUsers = E.createLegacyQueryCreator({ creator: getUsers });
+        // Find: export const legacyGetUsers = createLegacyQueryCreator({ creator: getUsers });
         if (ts.isVariableDeclaration(node) &&
             ts.isIdentifier(node.name) &&
             node.name.text.startsWith('legacy') &&
             node.initializer &&
             ts.isCallExpression(node.initializer)) {
             const callExpr = node.initializer;
-            // Check if it's E.createLegacyQueryCreator
-            if (ts.isPropertyAccessExpression(callExpr.expression) &&
-                ts.isIdentifier(callExpr.expression.expression) &&
-                callExpr.expression.expression.text === 'E' &&
-                ts.isIdentifier(callExpr.expression.name) &&
-                callExpr.expression.name.text === 'createLegacyQueryCreator') {
+            // Check if it's createLegacyQueryCreator
+            if (ts.isIdentifier(callExpr.expression) && callExpr.expression.text === 'createLegacyQueryCreator') {
                 // Extract the original creator name from the config object
                 if (callExpr.arguments.length > 0 && ts.isObjectLiteralExpression(callExpr.arguments[0])) {
                     const configObj = callExpr.arguments[0];
@@ -1274,7 +1277,7 @@ function updateLegacyCreatorUsages(content, legacyCreators) {
 //#endregion
 //#region Remove provideQueryClientForDevtools and QueryDevtoolsComponent in ts / et-query-devtools in html usage
 function removeDevtoolsUsage(tree) {
-    const projects = (0, devkit_1.getProjects)(tree);
+    const projects = getProjects(tree);
     const removedFromFiles = [];
     // Only check app config files for provideQueryClientForDevtools
     for (const [, projectConfig] of projects.entries()) {
@@ -1295,7 +1298,7 @@ function removeDevtoolsUsage(tree) {
         }
     }
     // Check all TypeScript files for QueryDevtoolsComponent imports
-    (0, devkit_1.visitNotIgnoredFiles)(tree, '', (filePath) => {
+    visitNotIgnoredFiles(tree, '', (filePath) => {
         if (!filePath.endsWith('.ts'))
             return;
         const content = tree.read(filePath, 'utf-8');
@@ -1313,7 +1316,7 @@ function removeDevtoolsUsage(tree) {
         }
     });
     // Check all HTML files for et-query-devtools
-    (0, devkit_1.visitNotIgnoredFiles)(tree, '', (filePath) => {
+    visitNotIgnoredFiles(tree, '', (filePath) => {
         if (!filePath.endsWith('.html'))
             return;
         const content = tree.read(filePath, 'utf-8');
@@ -1336,80 +1339,33 @@ function removeDevtoolsUsage(tree) {
     }
 }
 function removeProvideQueryClientForDevtools(content) {
-    const sourceFile = ts.createSourceFile('temp.ts', content, ts.ScriptTarget.Latest, true);
-    const replacements = [];
-    function visit(node) {
-        // Remove provideQueryClientForDevtools from provider arrays
-        if (ts.isCallExpression(node)) {
-            if (ts.isIdentifier(node.expression) && node.expression.text === 'provideQueryClientForDevtools') {
-                // Find the array this call is in
-                let parent = node.parent;
-                // Walk up until we find an array literal expression
-                while (parent) {
-                    if (ts.isArrayLiteralExpression(parent)) {
-                        // Find which element contains our call expression
-                        const elementIndex = parent.elements.findIndex((el) => {
-                            // Check if this element or any of its descendants is our node
-                            let found = false;
-                            function search(n) {
-                                if (n === node) {
-                                    found = true;
-                                    return;
-                                }
-                                ts.forEachChild(n, search);
-                            }
-                            search(el);
-                            return found;
-                        });
-                        if (elementIndex !== -1) {
-                            const element = parent.elements[elementIndex];
-                            let start = element.getStart(sourceFile);
-                            let end = element.getEnd();
-                            // Handle comma and whitespace removal
-                            if (elementIndex < parent.elements.length - 1) {
-                                // Not the last element - remove trailing comma and whitespace
-                                const nextElement = parent.elements[elementIndex + 1];
-                                const textBetween = content.slice(end, nextElement.getStart(sourceFile));
-                                const commaIndex = textBetween.indexOf(',');
-                                if (commaIndex !== -1) {
-                                    end += commaIndex + 1;
-                                    // Also remove whitespace after comma
-                                    while (end < content.length && /\s/.test(content[end])) {
-                                        end++;
-                                    }
-                                }
-                            }
-                            else if (elementIndex > 0) {
-                                // Last element - remove leading comma and whitespace
-                                const prevElement = parent.elements[elementIndex - 1];
-                                const textBetween = content.slice(prevElement.getEnd(), start);
-                                const commaIndex = textBetween.lastIndexOf(',');
-                                if (commaIndex !== -1) {
-                                    start = prevElement.getEnd() + commaIndex;
-                                }
-                            }
-                            // Remove leading whitespace/newlines
-                            while (start > 0 && /\s/.test(content[start - 1])) {
-                                start--;
-                            }
-                            replacements.push({ start, end, replacement: '' });
-                        }
-                        break;
-                    }
-                    parent = parent.parent;
-                }
-            }
-        }
-        ts.forEachChild(node, visit);
-    }
-    visit(sourceFile);
-    // Apply replacements in reverse order
+    // Simple regex approach to handle the common case
+    // Match: ...(condition ? [] : [provideQueryClientForDevtools(...), ...])
+    // Pattern 1: Remove entire spread when it only contains devtools
     let result = content;
-    replacements.sort((a, b) => b.start - a.start);
-    for (const { start, end, replacement } of replacements) {
-        result = result.slice(0, start) + replacement + result.slice(end);
-    }
-    // Remove the import if it exists
+    // Match spread expressions that contain only provideQueryClientForDevtools calls
+    // This handles: ...(env.production ? [] : [devtools, devtools])
+    const spreadPattern = /\.\.\.\([^)]+\?\s*\[\]\s*:\s*\[([\s\S]*?)\]\),?\s*/g;
+    result = result.replace(spreadPattern, (match, innerContent) => {
+        // Check if innerContent only has provideQueryClientForDevtools calls
+        const lines = innerContent.split('\n').filter((line) => line.trim());
+        const hasOnlyDevtools = lines.every((line) => line.trim().startsWith('provideQueryClientForDevtools') || line.trim() === '' || line.trim() === ',');
+        if (hasOnlyDevtools) {
+            return ''; // Remove the entire spread
+        }
+        // Otherwise, remove individual provideQueryClientForDevtools calls
+        const cleaned = innerContent
+            .split('\n')
+            .filter((line) => !line.includes('provideQueryClientForDevtools'))
+            .join('\n');
+        return match.replace(innerContent, cleaned);
+    });
+    // Pattern 2: Remove standalone provideQueryClientForDevtools in regular arrays
+    result = result.replace(/^\s*provideQueryClientForDevtools\([^)]*\),?\s*$/gm, '');
+    // Clean up empty lines and trailing commas
+    result = result.replace(/,\s*,/g, ','); // Double commas
+    result = result.replace(/\[\s*,/g, '['); // Leading comma in array
+    result = result.replace(/,\s*\]/g, ']'); // Trailing comma before closing bracket
     return removeDevtoolsImports(result);
 }
 function removeQueryDevtoolsComponent(content) {
@@ -1515,17 +1471,17 @@ function removeDevtoolsFromHtml(content) {
     return result;
 }
 //#endregion
-//#region Turn AnyQuery into E.AnyLegacyQuery everywhere and do the same with AnyQueryCreator
+//#region Turn AnyV2Query into AnyLegacyQuery everywhere and do the same with AnyV2QueryCreator
 function replaceAnyQueryWithLegacy(tree) {
     const updatedFiles = [];
-    (0, devkit_1.visitNotIgnoredFiles)(tree, '', (filePath) => {
+    visitNotIgnoredFiles(tree, '', (filePath) => {
         if (!filePath.endsWith('.ts') || filePath.endsWith('.spec.ts'))
             return;
         const content = tree.read(filePath, 'utf-8');
         if (!content)
             return;
-        // Only process if it contains AnyQuery or AnyQueryCreator
-        if (!content.includes('AnyQuery') && !content.includes('AnyQueryCreator'))
+        // Only process if it contains AnyV2Query or AnyV2QueryCreator
+        if (!content.includes('AnyV2Query') && !content.includes('AnyV2QueryCreator'))
             return;
         const newContent = replaceAnyQueryInFile(content);
         if (newContent !== content) {
@@ -1534,7 +1490,7 @@ function replaceAnyQueryWithLegacy(tree) {
         }
     });
     if (updatedFiles.length > 0) {
-        console.log('\n✅ Replaced AnyQuery and AnyQueryCreator with E.AnyLegacyQuery and E.AnyLegacyQueryCreator in:');
+        console.log('\n✅ Replaced AnyV2Query and AnyV2QueryCreator with AnyLegacyQuery and AnyLegacyQueryCreator in:');
         updatedFiles.forEach((file) => console.log(`   - ${file}`));
     }
 }
@@ -1542,25 +1498,25 @@ function replaceAnyQueryInFile(content) {
     const sourceFile = ts.createSourceFile('temp.ts', content, ts.ScriptTarget.Latest, true);
     const replacements = [];
     function visit(node) {
-        // Find type references to AnyQuery and AnyQueryCreator
+        // Find type references to AnyV2Query and AnyV2QueryCreator
         if (ts.isTypeReferenceNode(node) && ts.isIdentifier(node.typeName)) {
-            if (node.typeName.text === 'AnyQuery') {
+            if (node.typeName.text === 'AnyV2Query') {
                 replacements.push({
                     start: node.getStart(sourceFile),
                     end: node.getEnd(),
-                    replacement: 'E.AnyLegacyQuery',
+                    replacement: 'AnyLegacyQuery',
                 });
             }
-            else if (node.typeName.text === 'AnyQueryCreator') {
+            else if (node.typeName.text === 'AnyV2QueryCreator') {
                 replacements.push({
                     start: node.getStart(sourceFile),
                     end: node.getEnd(),
-                    replacement: 'E.AnyLegacyQueryCreator',
+                    replacement: 'AnyLegacyQueryCreator',
                 });
             }
         }
         // Find identifier references (for runtime usage)
-        if (ts.isIdentifier(node) && (node.text === 'AnyQuery' || node.text === 'AnyQueryCreator')) {
+        if (ts.isIdentifier(node) && (node.text === 'AnyV2Query' || node.text === 'AnyV2QueryCreator')) {
             // Check if this is part of a type reference (already handled above)
             const parent = node.parent;
             if (ts.isTypeReferenceNode(parent) && parent.typeName === node) {
@@ -1573,7 +1529,7 @@ function replaceAnyQueryInFile(content) {
                 return;
             }
             // Replace standalone references
-            const replacement = node.text === 'AnyQuery' ? 'E.AnyLegacyQuery' : 'E.AnyLegacyQueryCreator';
+            const replacement = node.text === 'AnyV2Query' ? 'AnyLegacyQuery' : 'AnyLegacyQueryCreator';
             replacements.push({
                 start: node.getStart(sourceFile),
                 end: node.getEnd(),
@@ -1589,11 +1545,18 @@ function replaceAnyQueryInFile(content) {
     for (const { start, end, replacement } of replacements) {
         result = result.slice(0, start) + replacement + result.slice(end);
     }
-    // Remove AnyQuery and AnyQueryCreator from imports and ensure ExperimentalQuery as E exists
+    // Remove AnyV2Query and AnyV2QueryCreator from imports
     result = removeAnyQueryFromImports(result);
-    // Make sure we have ExperimentalQuery as E import
-    if (!result.includes('ExperimentalQuery as E')) {
-        result = addExperimentalQueryImport(result);
+    // Add AnyLegacyQuery and AnyLegacyQueryCreator imports if needed
+    if (result.includes('AnyLegacyQuery') || result.includes('AnyLegacyQueryCreator')) {
+        const importsToAdd = [];
+        if (result.includes('AnyLegacyQuery')) {
+            importsToAdd.push('AnyLegacyQuery');
+        }
+        if (result.includes('AnyLegacyQueryCreator')) {
+            importsToAdd.push('AnyLegacyQueryCreator');
+        }
+        result = ensureImportFromQuery(result, importsToAdd);
     }
     return result;
 }
@@ -1613,7 +1576,7 @@ function removeAnyQueryFromImports(content) {
         return content;
     }
     const namedBindings = queryImportNode.importClause.namedBindings;
-    const elementsToKeep = namedBindings.elements.filter((el) => el.name.text !== 'AnyQuery' && el.name.text !== 'AnyQueryCreator');
+    const elementsToKeep = namedBindings.elements.filter((el) => el.name.text !== 'AnyV2Query' && el.name.text !== 'AnyV2QueryCreator');
     if (elementsToKeep.length === namedBindings.elements.length) {
         // Nothing to remove
         return content;
@@ -1629,7 +1592,7 @@ function removeAnyQueryFromImports(content) {
             end++;
         return content.slice(0, start) + content.slice(end);
     }
-    // Reconstruct import without AnyQuery and AnyQueryCreator
+    // Reconstruct import without AnyV2Query and AnyV2QueryCreator
     const newImports = elementsToKeep.map((el) => el.getText(sourceFile));
     const moduleSpecifier = queryImportNode.moduleSpecifier.text;
     const newImportStatement = `import { ${newImports.join(', ')} } from '${moduleSpecifier}';`;
@@ -1671,11 +1634,7 @@ function addInjectFunctionsToFile(content, configNames) {
             node.initializer &&
             ts.isCallExpression(node.initializer)) {
             const callExpr = node.initializer;
-            if (ts.isPropertyAccessExpression(callExpr.expression) &&
-                ts.isIdentifier(callExpr.expression.expression) &&
-                callExpr.expression.expression.text === 'E' &&
-                ts.isIdentifier(callExpr.expression.name) &&
-                callExpr.expression.name.text === 'createQueryClientConfig') {
+            if (ts.isIdentifier(callExpr.expression) && callExpr.expression.text === 'createQueryClientConfig') {
                 const configName = node.name.text;
                 // Find the variable statement
                 let parent = node.parent;
@@ -1769,7 +1728,7 @@ function checkLegacyQueryCreatorUsage(tree) {
     console.log('\n🔍 Checking for legacy query creator usages...');
     // Step 1: Collect all usages BEFORE any transformations
     const allUsages = [];
-    (0, devkit_1.visitNotIgnoredFiles)(tree, '', (filePath) => {
+    visitNotIgnoredFiles(tree, '', (filePath) => {
         if (!filePath.endsWith('.ts') || filePath.endsWith('.spec.ts'))
             return;
         const content = tree.read(filePath, 'utf-8');
@@ -1873,11 +1832,7 @@ function findLegacyCreatorNames(sourceFile, content) {
             node.initializer &&
             ts.isCallExpression(node.initializer)) {
             const callExpr = node.initializer;
-            if (ts.isPropertyAccessExpression(callExpr.expression) &&
-                ts.isIdentifier(callExpr.expression.expression) &&
-                callExpr.expression.expression.text === 'E' &&
-                ts.isIdentifier(callExpr.expression.name) &&
-                callExpr.expression.name.text === 'createLegacyQueryCreator') {
+            if (ts.isIdentifier(callExpr.expression) && callExpr.expression.text === 'createLegacyQueryCreator') {
                 names.add(node.name.text);
             }
         }
@@ -1900,14 +1855,6 @@ function determineUsageContext(node, sourceFile) {
                 if (ts.isIdentifier(expr) && expr.text === 'queryComputed') {
                     return 'queryComputed';
                 }
-                // Check for E.queryComputed()
-                if (ts.isPropertyAccessExpression(expr) &&
-                    ts.isIdentifier(expr.expression) &&
-                    expr.expression.text === 'E' &&
-                    ts.isIdentifier(expr.name) &&
-                    expr.name.text === 'queryComputed') {
-                    return 'queryComputed';
-                }
             }
         }
         // Check for constructor
@@ -2217,7 +2164,7 @@ function transformLegacyCreatorPrepareCall(tree, classInjectors, pollingInfo) {
         filesByPath.get(classInfo.filePath).push(classInfo);
     });
     // Also check files with standalone function usages
-    (0, devkit_1.visitNotIgnoredFiles)(tree, '', (filePath) => {
+    visitNotIgnoredFiles(tree, '', (filePath) => {
         if (!filePath.endsWith('.ts') || filePath.endsWith('.spec.ts'))
             return;
         if (filesByPath.has(filePath))
@@ -2764,7 +2711,7 @@ function containsInjectCall(node) {
 //#region Migrate empty .prepare() calls to .prepare({})
 function migrateEmptyPrepareCalls(tree) {
     const updatedFiles = [];
-    (0, devkit_1.visitNotIgnoredFiles)(tree, '', (filePath) => {
+    visitNotIgnoredFiles(tree, '', (filePath) => {
         if (!filePath.endsWith('.ts') || filePath.endsWith('.spec.ts'))
             return;
         const content = tree.read(filePath, 'utf-8');
@@ -2820,7 +2767,7 @@ function transformEmptyPrepareCalls(content) {
 }
 function detectPollingUsage(tree) {
     const pollingInfo = new Map();
-    (0, devkit_1.visitNotIgnoredFiles)(tree, '', (filePath) => {
+    visitNotIgnoredFiles(tree, '', (filePath) => {
         if (filePath.endsWith('.spec.ts'))
             return;
         const content = tree.read(filePath, 'utf-8');
@@ -2947,4 +2894,50 @@ function shouldAddDestroyOnResponse(queryVariableName, pollingInfo) {
     return true;
 }
 //#endregion
+//#region Helper function to ensure imports from @ethlete/query
+function ensureImportFromQuery(content, importsNeeded) {
+    const sourceFile = ts.createSourceFile('temp.ts', content, ts.ScriptTarget.Latest, true);
+    let queryImportNode;
+    ts.forEachChild(sourceFile, (node) => {
+        if (ts.isImportDeclaration(node) &&
+            ts.isStringLiteral(node.moduleSpecifier) &&
+            node.moduleSpecifier.text === '@ethlete/query') {
+            queryImportNode = node;
+        }
+    });
+    const missingImports = new Set(importsNeeded);
+    if (queryImportNode?.importClause?.namedBindings && ts.isNamedImports(queryImportNode.importClause.namedBindings)) {
+        const namedBindings = queryImportNode.importClause.namedBindings;
+        // Check which imports already exist
+        namedBindings.elements.forEach((el) => {
+            missingImports.delete(el.name.text);
+        });
+        if (missingImports.size === 0) {
+            return content; // All needed imports already exist
+        }
+        // Add missing imports to existing import statement
+        const existingImports = namedBindings.elements.map((el) => el.getText(sourceFile));
+        const allImports = [...existingImports, ...Array.from(missingImports).sort()].sort();
+        const newImportStatement = `import { ${allImports.join(', ')} } from '@ethlete/query';`;
+        const importStart = queryImportNode.getStart(sourceFile);
+        const importEnd = queryImportNode.getEnd();
+        return content.slice(0, importStart) + newImportStatement + content.slice(importEnd);
+    }
+    // No @ethlete/query import exists - create one
+    let lastImportEnd = 0;
+    ts.forEachChild(sourceFile, (node) => {
+        if (ts.isImportDeclaration(node)) {
+            const end = node.getEnd();
+            if (end > lastImportEnd) {
+                lastImportEnd = end;
+            }
+        }
+    });
+    const newImportStatement = `\nimport { ${Array.from(missingImports).sort().join(', ')} } from '@ethlete/query';`;
+    if (lastImportEnd > 0) {
+        return content.slice(0, lastImportEnd) + newImportStatement + content.slice(lastImportEnd);
+    }
+    return `import { ${Array.from(missingImports).sort().join(', ')} } from '@ethlete/query';\n\n${content}`;
+}
+//#endregion
 //# sourceMappingURL=migration.js.map