@ethlete/core 5.0.0-next.53 → 5.0.0-next.54

package/generators/devtools-about/generator.js

@@ -1,5 +1,5 @@
 import { formatFiles, joinPathFragments, logger, readProjectConfiguration, updateProjectConfiguration, visitNotIgnoredFiles, } from '@nx/devkit';
-const SCRIPT_PATH = 'tools/generate-build-info.js';
+const SCRIPT_PATH = 'tools/generate-build-info.cjs';
 const SCRIPT = `const { execSync } = require('child_process');
 const fs = require('fs');
 const path = require('path');
@@ -56,24 +56,33 @@ const relativeImport = (from, to) => {
 };
 /** Wires the `provideQueryDevtools({ about })` call up to the generated constant, if it can be found. */
 const wireProvider = (tree, projectRoot, outputPath) => {
-    let wired = false;
+    const candidates = [];
     visitNotIgnoredFiles(tree, projectRoot, (file) => {
-        if (wired || !file.endsWith('.ts'))
+        if (!file.endsWith('.ts') ||
+            file.endsWith('.spec.ts') ||
+            file.endsWith('.test.ts') ||
+            file.endsWith('.stories.ts')) {
             return;
+        }
         const contents = tree.read(file, 'utf-8');
         if (!contents?.includes('provideQueryDevtools('))
             return;
-        if (!contents.includes('provideQueryDevtools()')) {
+        candidates.push({ file, contents });
+    });
+    const alreadyWired = candidates.some(({ contents }) => /provideQueryDevtools\(\s*{[\s\S]*?about\s*:\s*APP_BUILD_INFO/.test(contents));
+    if (alreadyWired)
+        return true;
+    const candidate = candidates.find(({ contents }) => contents.includes('provideQueryDevtools()'));
+    if (!candidate) {
+        for (const { file } of candidates) {
             logger.warn(`${file} already passes options to provideQueryDevtools() - add \`about: APP_BUILD_INFO\` to them yourself.`);
-            wired = true;
-            return;
         }
-        const importPath = relativeImport(file, outputPath);
-        tree.write(file, `import { APP_BUILD_INFO } from '${importPath}';\n` +
-            contents.replace('provideQueryDevtools()', 'provideQueryDevtools({ about: APP_BUILD_INFO })'));
-        wired = true;
-    });
-    return wired;
+        return candidates.length > 0;
+    }
+    const importPath = relativeImport(candidate.file, outputPath);
+    tree.write(candidate.file, `import { APP_BUILD_INFO } from '${importPath}';\n` +
+        candidate.contents.replace('provideQueryDevtools()', 'provideQueryDevtools({ about: APP_BUILD_INFO })'));
+    return true;
 };
 export const devtoolsAboutGenerator = async (tree, options) => {
     const project = readProjectConfiguration(tree, options.project);
@@ -85,8 +94,9 @@ export const devtoolsAboutGenerator = async (tree, options) => {
     const gitignore = tree.read('.gitignore', 'utf-8') ?? '';
     // Regenerated on every build, and its SHA changes with every commit - committing it would put a
     // one-line diff in every commit that says nothing about the change.
-    if (!gitignore.includes(outputPath))
-        tree.write('.gitignore', `${gitignore.trimEnd()}\n${outputPath}\n`);
+    if (!gitignore.includes(outputPath)) {
+        tree.write('.gitignore', `${gitignore.trimEnd()}${gitignore.trim() ? '\n' : ''}${outputPath}\n`);
+    }
     project.targets ??= {};
     project.targets['build-info'] = {
         executor: 'nx:run-commands',
@@ -110,4 +120,3 @@ export const devtoolsAboutGenerator = async (tree, options) => {
         await formatFiles(tree);
 };
 export default devtoolsAboutGenerator;
-//# sourceMappingURL=generator.js.map

package/generators/generators.json

@@ -1,32 +1,33 @@
 {
+  "$schema": "https://json.schemastore.org/nx-generators",
   "generators": {
     "migrate-to-v5": {
-      "factory": "./migrate-to-v5/migration",
+      "implementation": "./migrate-to-v5/migration",
       "schema": "./migrate-to-v5/schema.json",
       "description": "Migrate to v5"
     },
     "migrate-provider-shape": {
-      "factory": "./migrate-provider-shape/migration",
+      "implementation": "./migrate-provider-shape/migration",
       "schema": "./migrate-provider-shape/schema.json",
       "description": "Rewrite destructured provider tuples into the tree-shakeable definition shape"
     },
     "migrate-surface-interaction-swatch": {
-      "factory": "./migrate-surface-interaction-swatch/migration",
+      "implementation": "./migrate-surface-interaction-swatch/migration",
       "schema": "./migrate-surface-interaction-swatch/schema.json",
       "description": "Rewrite surface theme interactionColor maps into the { color, onColor, inkColor } swatch shape"
     },
     "tailwind-4-color-theme": {
-      "factory": "./tailwind-4-color-theme/generator",
+      "implementation": "./tailwind-4-color-theme/generator",
       "schema": "./tailwind-4-color-theme/schema.json",
       "description": "Generate color theming for Tailwind CSS v4"
     },
     "tailwind-4-surface-theme": {
-      "factory": "./tailwind-4-surface-theme/generator",
+      "implementation": "./tailwind-4-surface-theme/generator",
       "schema": "./tailwind-4-surface-theme/schema.json",
       "description": "Generate surface theming for Tailwind CSS v4"
     },
     "devtools-about": {
-      "factory": "./devtools-about/generator",
+      "implementation": "./devtools-about/generator",
       "schema": "./devtools-about/schema.json",
       "description": "Generate the app's build info and wire it into provideQueryDevtools({ about })"
     }

package/generators/migrate-provider-shape/migration-scope.js

@@ -23,13 +23,13 @@ export const createMigrationScope = (tree, options) => {
             describe: () => 'the whole workspace',
         };
     }
+    const uniqueRoots = [...new Set(roots)].filter((root) => !roots.some((candidate) => candidate !== root && (root === candidate || root.startsWith(`${candidate}/`))));
     return {
         visit: (targetTree, callback) => {
-            for (const root of roots) {
+            for (const root of uniqueRoots) {
                 visitNotIgnoredFiles(targetTree, root, callback);
             }
         },
-        describe: () => roots.join(', '),
+        describe: () => uniqueRoots.join(', '),
     };
 };
-//# sourceMappingURL=migration-scope.js.map

package/generators/migrate-provider-shape/migration.js

@@ -48,4 +48,3 @@ export default async function migrateProviderShape(tree, schema) {
         console.log(`⚠️  ${tasks.length} site(s) need a manual decision - see ${PROVIDER_SHAPE_REPORT_PATH}.`);
     }
 }
-//# sourceMappingURL=migration.js.map

package/generators/migrate-provider-shape/provider-shape.js

@@ -48,8 +48,27 @@ const uniqueDefinitionName = (bindingNames, taken) => {
     taken.add(candidate);
     return candidate;
 };
+const collectImportedFactories = (sourceFile) => {
+    const importedFactories = new Map();
+    for (const statement of sourceFile.statements) {
+        if (!ts.isImportDeclaration(statement) || !ts.isStringLiteral(statement.moduleSpecifier))
+            continue;
+        if (!statement.moduleSpecifier.text.startsWith('@ethlete/'))
+            continue;
+        const bindings = statement.importClause?.namedBindings;
+        if (!bindings || !ts.isNamedImports(bindings))
+            continue;
+        for (const element of bindings.elements) {
+            const importedName = element.propertyName?.text ?? element.name.text;
+            if (isKnownFactory(importedName))
+                importedFactories.set(element.name.text, importedName);
+        }
+    }
+    return importedFactories;
+};
 const findTupleSites = (sourceFile) => {
     const sites = [];
+    const importedFactories = collectImportedFactories(sourceFile);
     for (const statement of sourceFile.statements) {
         if (!ts.isVariableStatement(statement) || statement.declarationList.declarations.length !== 1)
             continue;
@@ -59,14 +78,16 @@ const findTupleSites = (sourceFile) => {
         const call = declaration.initializer;
         if (!call || !ts.isCallExpression(call) || !ts.isIdentifier(call.expression))
             continue;
-        const factory = call.expression.text;
-        if (!isKnownFactory(factory))
+        const factory = importedFactories.get(call.expression.text);
+        if (!factory)
             continue;
         const bindings = declaration.name.elements.map((element) => {
             if (ts.isOmittedExpression(element) || !ts.isIdentifier(element.name))
                 return null;
             return element.name.text;
         });
+        if (bindings.length > POSITION_TO_EXTRACTOR.length)
+            continue;
         sites.push({
             statement,
             call,
@@ -108,26 +129,23 @@ const rewriteSite = (content, sourceFile, site, definitionName) => {
 const rewriteImports = (sourceFile, factoriesUsed, extractorsUsed) => {
     const rewrites = [];
     const imports = sourceFile.statements.filter(ts.isImportDeclaration);
-    /** The declaration the extractors join: the one that already provides them, else any core import. */
+    const replacementsUsed = new Set([...factoriesUsed].flatMap((factory) => (FACTORY_TO_DEFINE[factory] ? [FACTORY_TO_DEFINE[factory]] : [])));
     const extractorHost = imports.find((statement) => namedImportsOf(statement, sourceFile)?.some((name) => extractorsUsed.has(name))) ??
-        imports.find((statement) => {
-            const names = namedImportsOf(statement, sourceFile);
-            return names?.some((name) => FACTORY_TO_DEFINE[name] !== undefined) || isCoreImport(statement);
-        });
+        imports.find(isCoreImport);
     for (const statement of imports) {
         const bindings = statement.importClause?.namedBindings;
         if (!bindings || !ts.isNamedImports(bindings))
             continue;
-        const names = bindings.elements.map((element) => element.getText(sourceFile));
-        // A ref factory keeps its name and its import; only a replaced factory is swapped out.
-        const replaced = names.filter((name) => factoriesUsed.has(name) && FACTORY_TO_DEFINE[name] !== undefined);
-        const extractors = statement === extractorHost ? [...extractorsUsed] : [];
-        if (replaced.length === 0 && extractors.length === 0)
+        const elements = bindings.elements.map((element) => ({
+            text: element.getText(sourceFile),
+            importedName: element.propertyName?.text ?? element.name.text,
+        }));
+        const replaced = elements.filter((element) => factoriesUsed.has(element.importedName) && FACTORY_TO_DEFINE[element.importedName] !== undefined);
+        const additions = statement === extractorHost ? [...replacementsUsed, ...extractorsUsed] : [];
+        if (replaced.length === 0 && additions.length === 0)
             continue;
-        const kept = names.filter((name) => !replaced.includes(name));
-        const merged = [
-            ...new Set([...kept, ...replaced.map((factory) => FACTORY_TO_DEFINE[factory]), ...extractors]),
-        ].sort((a, b) => a.toLowerCase().localeCompare(b.toLowerCase()));
+        const kept = elements.filter((element) => !replaced.includes(element)).map((element) => element.text);
+        const merged = [...new Set([...kept, ...additions])].sort((a, b) => a.toLowerCase().localeCompare(b.toLowerCase()));
         rewrites.push({
             start: bindings.getStart(sourceFile),
             end: bindings.getEnd(),
@@ -139,7 +157,7 @@ const rewriteImports = (sourceFile, factoriesUsed, extractorsUsed) => {
     // Nothing to join - the file only imported a ref factory from another package, so add a core import.
     const anchor = imports[imports.length - 1];
     const position = anchor ? anchor.getEnd() : 0;
-    const statement = `import { ${[...extractorsUsed].sort().join(', ')} } from '@ethlete/core';`;
+    const statement = `import { ${[...replacementsUsed, ...extractorsUsed].sort().join(', ')} } from '@ethlete/core';`;
     rewrites.push({ start: position, end: position, text: anchor ? `\n${statement}` : `${statement}\n` });
     return rewrites;
 };
@@ -163,10 +181,7 @@ export const migrateProviderShapeInFile = (filePath, content) => {
     const tasks = collectTasks(filePath, sourceFile, sites);
     if (sites.length === 0)
         return { content, changed: false, tasks };
-    const taken = new Set(sourceFile.statements
-        .filter(ts.isVariableStatement)
-        .flatMap((statement) => statement.declarationList.declarations)
-        .flatMap((declaration) => (ts.isIdentifier(declaration.name) ? [declaration.name.text] : [])));
+    const taken = collectTopLevelNames(sourceFile);
     const factoriesUsed = new Set(sites.map((site) => site.factory));
     const extractorsUsed = new Set(sites.flatMap((site) => site.bindings.flatMap((binding, index) => (binding === null ? [] : [POSITION_TO_EXTRACTOR[index]]))));
     const edits = [
@@ -183,12 +198,40 @@ export const migrateProviderShapeInFile = (filePath, content) => {
 const collectTasks = (filePath, sourceFile, sites) => {
     const rewritten = new Set(sites.map((site) => site.statement));
     const tasks = [];
+    const importedFactories = collectImportedFactories(sourceFile);
+    for (const statement of sourceFile.statements) {
+        if (!ts.isExportDeclaration(statement))
+            continue;
+        if (!statement.moduleSpecifier || !ts.isStringLiteral(statement.moduleSpecifier))
+            continue;
+        if (!statement.moduleSpecifier.text.startsWith('@ethlete/') || !statement.exportClause)
+            continue;
+        if (!ts.isNamedExports(statement.exportClause))
+            continue;
+        for (const element of statement.exportClause.elements) {
+            const exportedName = element.propertyName?.text ?? element.name.text;
+            if (!isKnownFactory(exportedName))
+                continue;
+            const { line } = sourceFile.getLineAndCharacterOfPosition(element.getStart(sourceFile));
+            tasks.push({
+                id: `provider-shape:${filePath}:${line + 1}`,
+                file: filePath,
+                line: line + 1,
+                message: `The \`${exportedName}\` re-export must be migrated manually because the replacement API returns a provider definition.`,
+            });
+        }
+    }
     const visit = (node) => {
-        if (ts.isCallExpression(node) && ts.isIdentifier(node.expression) && isKnownFactory(node.expression.text)) {
+        if (ts.isCallExpression(node) && ts.isIdentifier(node.expression)) {
+            const importedFactory = importedFactories.get(node.expression.text);
+            if (!importedFactory || FACTORY_TO_DEFINE[importedFactory] === undefined) {
+                ts.forEachChild(node, visit);
+                return;
+            }
             const statement = enclosingStatement(node);
             if (!statement || !rewritten.has(statement)) {
                 const { line } = sourceFile.getLineAndCharacterOfPosition(node.getStart(sourceFile));
-                const factory = node.expression.text;
+                const factory = importedFactory;
                 const replacement = FACTORY_TO_DEFINE[factory];
                 tasks.push({
                     id: `provider-shape:${filePath}:${line + 1}`,
@@ -205,6 +248,31 @@ const collectTasks = (filePath, sourceFile, sites) => {
     visit(sourceFile);
     return tasks;
 };
+const collectTopLevelNames = (sourceFile) => {
+    const names = new Set();
+    for (const statement of sourceFile.statements) {
+        if (ts.isImportDeclaration(statement)) {
+            const clause = statement.importClause;
+            if (clause?.name)
+                names.add(clause.name.text);
+            const bindings = clause?.namedBindings;
+            if (bindings && ts.isNamedImports(bindings))
+                bindings.elements.forEach((element) => names.add(element.name.text));
+            if (bindings && ts.isNamespaceImport(bindings))
+                names.add(bindings.name.text);
+        }
+        else if (ts.isVariableStatement(statement)) {
+            for (const declaration of statement.declarationList.declarations) {
+                if (ts.isIdentifier(declaration.name))
+                    names.add(declaration.name.text);
+            }
+        }
+        else if ((ts.isClassDeclaration(statement) || ts.isFunctionDeclaration(statement)) && statement.name) {
+            names.add(statement.name.text);
+        }
+    }
+    return names;
+};
 const enclosingStatement = (node) => {
     let current = node;
     while (current && !ts.isSourceFile(current)) {
@@ -214,4 +282,3 @@ const enclosingStatement = (node) => {
     }
     return undefined;
 };
-//# sourceMappingURL=provider-shape.js.map

package/generators/migrate-surface-interaction-swatch/interaction-swatch.js

@@ -18,6 +18,16 @@ const findFlatInteractionColor = (sourceFile) => {
         if (initializer?.isKind(SyntaxKind.ObjectLiteralExpression) && isFlatInteractionColor(initializer)) {
             return initializer;
         }
+        if (initializer?.isKind(SyntaxKind.Identifier)) {
+            const declaration = sourceFile
+                .getVariableDeclarations()
+                .find((candidate) => candidate.getName() === initializer.getText());
+            const referencedInitializer = declaration?.getInitializer();
+            if (referencedInitializer?.isKind(SyntaxKind.ObjectLiteralExpression) &&
+                isFlatInteractionColor(referencedInitializer)) {
+                return referencedInitializer;
+            }
+        }
     }
     return null;
 };
@@ -38,6 +48,16 @@ export const migrateInteractionSwatchInFile = (filePath, content) => {
         changed = true;
         initializer = findFlatInteractionColor(sourceFile);
     }
-    return { changed, content: changed ? sourceFile.getFullText() : content };
+    const unresolved = sourceFile
+        .getDescendantsOfKind(SyntaxKind.PropertyAssignment)
+        .filter((property) => property.getName() === 'interactionColor')
+        .flatMap((property) => {
+        const initializer = property.getInitializer();
+        return initializer && !initializer.isKind(SyntaxKind.ObjectLiteralExpression) ? [initializer.getText()] : [];
+    });
+    return {
+        changed,
+        content: changed ? sourceFile.getFullText() : content,
+        ...(unresolved.length > 0 ? { unresolved } : {}),
+    };
 };
-//# sourceMappingURL=interaction-swatch.js.map

package/generators/migrate-surface-interaction-swatch/migration.js

@@ -6,6 +6,7 @@ export default async function migrateSurfaceInteractionSwatch(tree, schema) {
     const scope = createMigrationScope(tree, schema);
     console.log(`   Scope: ${scope.describe()}`);
     let filesChanged = 0;
+    let unresolvedCount = 0;
     scope.visit(tree, (filePath) => {
         if (!filePath.endsWith('.ts') || filePath.endsWith('.d.ts'))
             return;
@@ -13,6 +14,10 @@ export default async function migrateSurfaceInteractionSwatch(tree, schema) {
         if (!before)
             return;
         const result = migrateInteractionSwatchInFile(filePath, before);
+        for (const expression of result.unresolved ?? []) {
+            unresolvedCount++;
+            console.warn(`   ⚠ ${filePath}: could not resolve interactionColor value ${expression}`);
+        }
         if (!result.changed)
             return;
         tree.write(filePath, result.content);
@@ -22,8 +27,10 @@ export default async function migrateSurfaceInteractionSwatch(tree, schema) {
     console.log(filesChanged === 0
         ? '   Nothing to migrate.\n'
         : `\n✅ Migrated ${filesChanged} file(s). Regenerate your surface CSS with \`nx g @ethlete/core:tailwind-4-surface-theme\`.\n`);
+    if (unresolvedCount > 0) {
+        console.warn(`   Review ${unresolvedCount} unresolved interactionColor value(s) manually.\n`);
+    }
     if (!schema.skipFormat) {
         await formatFiles(tree);
     }
 }
-//# sourceMappingURL=migration.js.map

package/generators/migrate-to-v5/color-naming.js

@@ -5,10 +5,10 @@ import { logger } from '@nx/devkit';
 const TS_SYMBOL_RENAMES = {
     ProvideThemeDirective: 'ProvideColorDirective',
     THEME_PROVIDER: 'COLOR_PROVIDER',
-    ColorThemedDirective: 'ColoredDirective',
-    ColorThemedStylesComponent: 'ColoredStylesComponent',
-    SurfaceThemedDirective: 'SurfacedDirective',
-    SurfaceThemedStylesComponent: 'SurfacedStylesComponent',
+    ColorThemedDirective: 'ColorInteractiveDirective',
+    ColorThemedStylesComponent: 'ColorInteractiveStylesComponent',
+    SurfaceThemedDirective: 'SurfaceInteractiveDirective',
+    SurfaceThemedStylesComponent: 'SurfaceInteractiveStylesComponent',
     injectThemesPrefix: 'injectColorThemesPrefix',
     createCssThemeName: 'createCssColorThemeName',
 };
@@ -18,14 +18,10 @@ const TS_SYMBOL_RENAMES = {
 const TEMPLATE_REPLACEMENTS = [
     ['[etProvideTheme]', '[etProvideColor]'],
     ['etProvideTheme', 'etProvideColor'],
-    ['[etProvideAltTheme]', '[etProvideAltColor]'],
-    ['etProvideAltTheme', 'etProvideAltColor'],
-    ['[etColorThemed]', '[etColored]'],
-    ['etColorThemed', 'etColored'],
-    ['[etSurfaceThemed]', '[etSurfaced]'],
-    ['etSurfaceThemed', 'etSurfaced'],
-    ['[theme]=', '[color]='],
-    ['[altTheme]=', '[altColor]='],
+    ['[etColorThemed]', '[etColorInteractive]'],
+    ['etColorThemed', 'etColorInteractive'],
+    ['[etSurfaceThemed]', '[etSurfaceInteractive]'],
+    ['etSurfaceThemed', 'etSurfaceInteractive'],
     ['et-theme-alt--', 'et-color-alt--'],
     ['et-theme--', 'et-color--'],
 ];
@@ -33,8 +29,8 @@ const TEMPLATE_REPLACEMENTS = [
  * CSS class name replacements.
  */
 const CSS_REPLACEMENTS = [
-    ['.et-color-themed', '.et-colored'],
-    ['.et-surface-themed', '.et-surfaced'],
+    ['.et-color-themed', '.et-color-interactive'],
+    ['.et-surface-themed', '.et-surface-interactive'],
     ['.et-theme--', '.et-color--'],
     ['.et-theme-alt--', '.et-color-alt--'],
 ];
@@ -43,13 +39,11 @@ const CSS_REPLACEMENTS = [
  */
 const HOST_DIRECTIVE_REPLACEMENTS = [
     ["'etProvideTheme:theme'", "'etProvideColor:color'"],
-    ["'etProvideAltTheme:altTheme'", "'etProvideAltColor:altColor'"],
     ["'etProvideTheme:color'", "'etProvideColor:color'"],
-    ["'etProvideAltTheme:altColor'", "'etProvideAltColor:altColor'"],
     ['"etProvideTheme:theme"', '"etProvideColor:color"'],
-    ['"etProvideAltTheme:altTheme"', '"etProvideAltColor:altColor"'],
     ['"etProvideTheme"', '"etProvideColor"'],
-    ['"etProvideAltTheme"', '"etProvideAltColor"'],
+    ["'etProvideTheme: theme'", "'etProvideColor: color'"],
+    ['"etProvideTheme: theme"', '"etProvideColor: color"'],
 ];
 export default async function migrateColorNaming(tree) {
     logger.log('\n🔄 Migrating theme → color naming...\n');
@@ -93,7 +87,7 @@ function findFiles(dir, tree, tsFiles, htmlFiles, cssFiles) {
         if (tree.isFile(path)) {
             if (path.includes('node_modules'))
                 continue;
-            if (path.endsWith('.ts') && !path.endsWith('.spec.ts')) {
+            if (path.endsWith('.ts')) {
                 tsFiles.push(path);
             }
             else if (path.endsWith('.html')) {
@@ -115,6 +109,8 @@ function migrateTypeScriptFile(tree, filePath) {
     if (!content)
         return false;
     const original = content;
+    if (!/from\s+['"]@ethlete\/(?:core|cdk)['"]/.test(content))
+        return false;
     // Rename symbols
     for (const [oldName, newName] of Object.entries(TS_SYMBOL_RENAMES)) {
         content = replaceWholeWord(content, oldName, newName);
@@ -172,4 +168,3 @@ function replaceWholeWord(content, oldWord, newWord) {
 function escapeRegex(str) {
     return str.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
 }
-//# sourceMappingURL=color-naming.js.map

package/generators/migrate-to-v5/create-provider.js

@@ -9,11 +9,13 @@ export default async function migrateCreateProvider(tree) {
         for (const child of children) {
             const path = dir === '.' ? child : `${dir}/${child}`;
             if (tree.isFile(path)) {
-                if (path.endsWith('.ts') && !path.includes('node_modules') && !path.endsWith('.spec.ts')) {
+                if (path.endsWith('.ts') && !path.includes('node_modules')) {
                     tsFiles.push(path);
                 }
             }
             else {
+                if (child === 'node_modules')
+                    continue;
                 findTsFiles(path);
             }
         }
@@ -41,6 +43,7 @@ function migrateCreateProviderInFile(tree, filePath) {
     const sourceFile = ts.createSourceFile(filePath, content, ts.ScriptTarget.Latest, true);
     let cdkImport;
     let hasCreateProviderInCdk = false;
+    let createProviderImport = 'createProvider';
     // Find relevant imports
     for (const statement of sourceFile.statements) {
         if (ts.isImportDeclaration(statement) && ts.isStringLiteral(statement.moduleSpecifier)) {
@@ -48,7 +51,9 @@ function migrateCreateProviderInFile(tree, filePath) {
             if (modulePath === '@ethlete/cdk') {
                 cdkImport = statement;
                 if (statement.importClause?.namedBindings && ts.isNamedImports(statement.importClause.namedBindings)) {
-                    hasCreateProviderInCdk = statement.importClause.namedBindings.elements.some((element) => element.name.text === 'createProvider');
+                    const specifier = statement.importClause.namedBindings.elements.find((element) => (element.propertyName?.text ?? element.name.text) === 'createProvider');
+                    hasCreateProviderInCdk = !!specifier;
+                    createProviderImport = specifier?.getText(sourceFile) ?? createProviderImport;
                 }
             }
         }
@@ -60,7 +65,7 @@ function migrateCreateProviderInFile(tree, filePath) {
     // Remove createProvider from @ethlete/cdk import
     if (cdkImport && cdkImport.importClause?.namedBindings && ts.isNamedImports(cdkImport.importClause.namedBindings)) {
         const namedBindings = cdkImport.importClause.namedBindings;
-        const otherImports = namedBindings.elements.filter((element) => element.name.text !== 'createProvider');
+        const otherImports = namedBindings.elements.filter((element) => (element.propertyName?.text ?? element.name.text) !== 'createProvider');
         const importStart = cdkImport.getStart(sourceFile);
         const importEnd = cdkImport.getEnd();
         if (otherImports.length === 0) {
@@ -80,7 +85,7 @@ function migrateCreateProviderInFile(tree, filePath) {
         }
         else {
             // Keep other imports
-            const newImports = otherImports.map((el) => el.name.text).join(', ');
+            const newImports = otherImports.map((el) => el.getText(sourceFile)).join(', ');
             const newImportText = `import { ${newImports} } from '@ethlete/cdk';`;
             updatedContent = content.slice(0, importStart) + newImportText + content.slice(importEnd);
         }
@@ -102,12 +107,12 @@ function migrateCreateProviderInFile(tree, filePath) {
         ts.isNamedImports(updatedCoreImport.importClause.namedBindings)) {
         const namedBindings = updatedCoreImport.importClause.namedBindings;
         // Check if createProvider already exists
-        const hasCreateProvider = namedBindings.elements.some((element) => element.name.text === 'createProvider');
+        const hasCreateProvider = namedBindings.elements.some((element) => (element.propertyName?.text ?? element.name.text) === 'createProvider');
         if (!hasCreateProvider) {
             const importStart = updatedCoreImport.getStart(intermediateSourceFile);
             const importEnd = updatedCoreImport.getEnd();
-            const existingImports = namedBindings.elements.map((el) => el.name.text);
-            const allImports = [...existingImports, 'createProvider'].sort();
+            const existingImports = namedBindings.elements.map((el) => el.getText(intermediateSourceFile));
+            const allImports = [...existingImports, createProviderImport].sort();
             const newImportText = `import { ${allImports.join(', ')} } from '@ethlete/core';`;
             updatedContent = updatedContent.slice(0, importStart) + newImportText + updatedContent.slice(importEnd);
         }
@@ -137,12 +142,12 @@ function migrateCreateProviderInFile(tree, filePath) {
             }
             updatedContent =
                 updatedContent.slice(0, insertPosition) +
-                    "import { createProvider } from '@ethlete/core';\n" +
+                    `import { ${createProviderImport} } from '@ethlete/core';\n` +
                     updatedContent.slice(insertPosition);
         }
         else {
             // No imports, add at the beginning
-            updatedContent = "import { createProvider } from '@ethlete/core';\n\n" + updatedContent;
+            updatedContent = `import { ${createProviderImport} } from '@ethlete/core';\n\n` + updatedContent;
         }
     }
     if (updatedContent !== content) {
@@ -151,4 +156,3 @@ function migrateCreateProviderInFile(tree, filePath) {
     }
     return false;
 }
-//# sourceMappingURL=create-provider.js.map

package/generators/migrate-to-v5/migration.js

@@ -31,4 +31,3 @@ export default async function migrate(tree, schema) {
     console.log('\n✅ Migration completed successfully!');
 }
 //#endregion
-//# sourceMappingURL=migration.js.map