@ethlete/core 5.0.0-next.60 → 5.0.0-next.61

package/generators/migrate-to-v5/apply-replacements.js

@@ -0,0 +1,14 @@
+const IDENTIFIER_CHAR = /[\w$]/;
+export function applyReplacements(content, replacements) {
+    return [...replacements]
+        .sort(([a], [b]) => b.length - a.length)
+        .reduce((result, [original, replacement]) => result.replace(snippetPattern(original), () => replacement), content);
+}
+function snippetPattern(snippet) {
+    const start = IDENTIFIER_CHAR.test(snippet.charAt(0)) ? '(?<![\\w$])' : '';
+    const end = IDENTIFIER_CHAR.test(snippet.charAt(snippet.length - 1)) ? '(?![\\w$])' : '';
+    return new RegExp(`${start}${escapeRegExp(snippet)}${end}`, 'g');
+}
+function escapeRegExp(value) {
+    return value.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+}

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

@@ -1,4 +1,4 @@
-import { logger } from '@nx/devkit';
+import { collectFiles } from './migration-files.js';
 /**
  * Symbol renames in TypeScript files (imports + usage).
  */
@@ -45,71 +45,25 @@ const HOST_DIRECTIVE_REPLACEMENTS = [
     ["'etProvideTheme: theme'", "'etProvideColor: color'"],
     ['"etProvideTheme: theme"', '"etProvideColor: color"'],
 ];
-export default async function migrateColorNaming(tree) {
-    logger.log('\n🔄 Migrating theme → color naming...\n');
-    const tsFiles = [];
-    const htmlFiles = [];
-    const cssFiles = [];
-    findFiles('.', tree, tsFiles, htmlFiles, cssFiles);
+export default async function migrateColorNaming(tree, scope) {
     let filesModified = 0;
-    for (const filePath of tsFiles) {
-        const wasModified = migrateTypeScriptFile(tree, filePath);
-        if (wasModified) {
+    for (const filePath of collectFiles(tree, scope, ['.ts', '.html', '.css', '.scss'])) {
+        const wasModified = filePath.endsWith('.ts')
+            ? migrateTypeScriptFile(tree, filePath)
+            : filePath.endsWith('.html')
+                ? migrateTemplateFile(tree, filePath)
+                : migrateCssFile(tree, filePath);
+        if (wasModified)
             filesModified++;
-            logger.log(`  ✓ ${filePath}`);
-        }
-    }
-    for (const filePath of htmlFiles) {
-        const wasModified = migrateTemplateFile(tree, filePath);
-        if (wasModified) {
-            filesModified++;
-            logger.log(`  ✓ ${filePath}`);
-        }
-    }
-    for (const filePath of cssFiles) {
-        const wasModified = migrateCssFile(tree, filePath);
-        if (wasModified) {
-            filesModified++;
-            logger.log(`  ✓ ${filePath}`);
-        }
-    }
-    if (filesModified > 0) {
-        logger.log(`\n✅ Successfully migrated color naming in ${filesModified} file(s)\n`);
-    }
-    else {
-        logger.log('\nℹ️  No files needed migration\n');
-    }
-}
-function findFiles(dir, tree, tsFiles, htmlFiles, cssFiles) {
-    const children = tree.children(dir);
-    for (const child of children) {
-        const path = dir === '.' ? child : `${dir}/${child}`;
-        if (tree.isFile(path)) {
-            if (path.includes('node_modules'))
-                continue;
-            if (path.endsWith('.ts')) {
-                tsFiles.push(path);
-            }
-            else if (path.endsWith('.html')) {
-                htmlFiles.push(path);
-            }
-            else if (path.endsWith('.css') || path.endsWith('.scss')) {
-                cssFiles.push(path);
-            }
-        }
-        else {
-            if (child === 'node_modules')
-                continue;
-            findFiles(path, tree, tsFiles, htmlFiles, cssFiles);
-        }
     }
+    return { filesChanged: filesModified, review: [] };
 }
 function migrateTypeScriptFile(tree, filePath) {
     let content = tree.read(filePath, 'utf-8');
     if (!content)
         return false;
     const original = content;
-    if (!/from\s+['"]@ethlete\/(?:core|cdk)['"]/.test(content))
+    if (!/from\s+['"]@ethlete\/(?:core|cdk|theming)['"]/.test(content))
         return false;
     // Rename symbols
     for (const [oldName, newName] of Object.entries(TS_SYMBOL_RENAMES)) {

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

@@ -1,40 +1,65 @@
-import { logger } from '@nx/devkit';
 import * as ts from 'typescript';
-export default async function migrateCreateProvider(tree) {
-    logger.log('\n🔄 Migrating createProvider imports from @ethlete/cdk to @ethlete/core...\n');
-    const tsFiles = [];
-    // Recursively find all TypeScript files
-    function findTsFiles(dir) {
-        const children = tree.children(dir);
-        for (const child of children) {
-            const path = dir === '.' ? child : `${dir}/${child}`;
-            if (tree.isFile(path)) {
-                if (path.endsWith('.ts') && !path.includes('node_modules')) {
-                    tsFiles.push(path);
-                }
-            }
-            else {
-                if (child === 'node_modules')
-                    continue;
-                findTsFiles(path);
-            }
-        }
-    }
-    findTsFiles('.');
+import { collectFiles } from './migration-files.js';
+export default async function migrateCreateProvider(tree, scope) {
+    const review = [];
     let filesModified = 0;
-    for (const filePath of tsFiles) {
-        const wasModified = migrateCreateProviderInFile(tree, filePath);
-        if (wasModified) {
+    for (const filePath of collectFiles(tree, scope, ['.ts'])) {
+        const reexportsModified = migrateCreateProviderReexports(tree, filePath, review);
+        const wasModified = migrateCreateProviderInFile(tree, filePath) || reexportsModified;
+        if (wasModified)
             filesModified++;
-            logger.log(`  ✓ ${filePath}`);
-        }
     }
-    if (filesModified > 0) {
-        logger.log(`\n✅ Successfully migrated createProvider in ${filesModified} file(s)\n`);
+    return { filesChanged: filesModified, review };
+}
+function migrateCreateProviderReexports(tree, filePath, review) {
+    const content = tree.read(filePath, 'utf-8');
+    if (!content || !content.includes('createProvider'))
+        return false;
+    const sourceFile = ts.createSourceFile(filePath, content, ts.ScriptTarget.Latest, true);
+    const edits = [];
+    for (const statement of sourceFile.statements) {
+        if (!ts.isImportDeclaration(statement) && !ts.isExportDeclaration(statement))
+            continue;
+        if (!statement.moduleSpecifier || !ts.isStringLiteral(statement.moduleSpecifier))
+            continue;
+        if (statement.moduleSpecifier.text !== '@ethlete/cdk')
+            continue;
+        if (ts.isImportDeclaration(statement)) {
+            const bindings = statement.importClause?.namedBindings;
+            if (bindings && ts.isNamespaceImport(bindings) && content.includes(`${bindings.name.text}.createProvider`)) {
+                review.push(`${filePath}: ${bindings.name.text}.createProvider is used through a namespace import of @ethlete/cdk. Switch it to createProvider from @ethlete/core manually.`);
+            }
+            continue;
+        }
+        const clause = statement.exportClause;
+        if (!clause) {
+            review.push(`${filePath}: "export * from '@ethlete/cdk'" may re-export createProvider. Re-export it from @ethlete/core manually.`);
+            continue;
+        }
+        if (ts.isNamespaceExport(clause))
+            continue;
+        const isCreateProvider = (element) => (element.propertyName?.text ?? element.name.text) === 'createProvider';
+        const moved = clause.elements.filter(isCreateProvider);
+        if (moved.length === 0)
+            continue;
+        const rest = clause.elements.filter((element) => !isCreateProvider(element));
+        const typeOnly = statement.isTypeOnly ? 'type ' : '';
+        const lines = [
+            ...(rest.length > 0
+                ? [`export ${typeOnly}{ ${rest.map((el) => el.getText(sourceFile)).join(', ')} } from '@ethlete/cdk';`]
+                : []),
+            `export ${typeOnly}{ ${moved.map((el) => el.getText(sourceFile)).join(', ')} } from '@ethlete/core';`,
+        ];
+        edits.push({ start: statement.getStart(sourceFile), end: statement.getEnd(), text: lines.join('\n') });
     }
-    else {
-        logger.log('\nℹ️  No files needed migration\n');
+    if (edits.length === 0)
+        return false;
+    let updatedContent = content;
+    for (const edit of edits.reverse()) {
+        updatedContent = updatedContent.slice(0, edit.start) + edit.text + updatedContent.slice(edit.end);
     }
+    tree.write(filePath, updatedContent);
+    return true;
 }
 function migrateCreateProviderInFile(tree, filePath) {
     const content = tree.read(filePath, 'utf-8');
@@ -44,7 +69,6 @@ function migrateCreateProviderInFile(tree, filePath) {
     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)) {
             const modulePath = statement.moduleSpecifier.text;
@@ -58,18 +82,15 @@ function migrateCreateProviderInFile(tree, filePath) {
             }
         }
     }
-    // If createProvider is not imported from @ethlete/cdk, nothing to do
     if (!hasCreateProviderInCdk)
         return false;
     let updatedContent = content;
-    // 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.propertyName?.text ?? element.name.text) !== 'createProvider');
         const importStart = cdkImport.getStart(sourceFile);
         const importEnd = cdkImport.getEnd();
         if (otherImports.length === 0) {
-            // Remove entire import line including newline
             let lineStart = importStart;
             while (lineStart > 0 && content[lineStart - 1] !== '\n') {
                 lineStart--;
@@ -84,15 +105,12 @@ function migrateCreateProviderInFile(tree, filePath) {
             updatedContent = content.slice(0, lineStart) + content.slice(lineEnd);
         }
         else {
-            // Keep other imports
             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);
         }
     }
-    // Re-parse after first modification
     const intermediateSourceFile = ts.createSourceFile(filePath, updatedContent, ts.ScriptTarget.Latest, true);
-    // Find @ethlete/core import in the updated content
     let updatedCoreImport;
     for (const statement of intermediateSourceFile.statements) {
         if (ts.isImportDeclaration(statement) && ts.isStringLiteral(statement.moduleSpecifier)) {
@@ -102,11 +120,9 @@ function migrateCreateProviderInFile(tree, filePath) {
             }
         }
     }
-    // Add createProvider to @ethlete/core import
     if (updatedCoreImport?.importClause?.namedBindings &&
         ts.isNamedImports(updatedCoreImport.importClause.namedBindings)) {
         const namedBindings = updatedCoreImport.importClause.namedBindings;
-        // Check if createProvider already exists
         const hasCreateProvider = namedBindings.elements.some((element) => (element.propertyName?.text ?? element.name.text) === 'createProvider');
         if (!hasCreateProvider) {
             const importStart = updatedCoreImport.getStart(intermediateSourceFile);
@@ -118,10 +134,8 @@ function migrateCreateProviderInFile(tree, filePath) {
         }
     }
     else {
-        // Add new import from @ethlete/core at the top
         const firstImportIndex = updatedContent.indexOf('import');
         if (firstImportIndex !== -1) {
-            // Add after other imports
             let insertPosition;
             let lastImportEnd = firstImportIndex;
             for (const statement of intermediateSourceFile.statements) {
@@ -133,7 +147,6 @@ function migrateCreateProviderInFile(tree, filePath) {
                 }
             }
             insertPosition = lastImportEnd;
-            // Find end of line
             while (insertPosition < updatedContent.length && updatedContent[insertPosition] !== '\n') {
                 insertPosition++;
             }
@@ -146,7 +159,6 @@ function migrateCreateProviderInFile(tree, filePath) {
                     updatedContent.slice(insertPosition);
         }
         else {
-            // No imports, add at the beginning
             updatedContent = `import { ${createProviderImport} } from '@ethlete/core';\n\n` + updatedContent;
         }
     }

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

@@ -0,0 +1,13 @@
+import { createMigrationScope } from '../migrate-provider-shape/migration-scope.js';
+const SKIPPED_DIRECTORIES = new Set(['node_modules', 'dist', '.git', '.angular', '.nx']);
+export const collectFiles = (tree, scope, extensions) => {
+    const files = [];
+    (scope ?? createMigrationScope(tree, {})).visit(tree, (filePath) => {
+        if (filePath.split('/').some((segment) => SKIPPED_DIRECTORIES.has(segment)))
+            return;
+        if (!extensions.some((extension) => filePath.endsWith(extension)))
+            return;
+        files.push(filePath);
+    });
+    return files;
+};

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

@@ -1,38 +1,42 @@
-import { formatFiles } from '@nx/devkit';
+import { formatFiles, logger } from '@nx/devkit';
+import { createMigrationScope, } from '../migrate-provider-shape/migration-scope.js';
 import migrateColorNaming from './color-naming.js';
 import migrateCreateProvider from './create-provider.js';
 import reportRemovedExports from './removed-exports.js';
 import migrateRouterStateService from './router-state-service.js';
 import migrateViewportService from './viewport-service.js';
 export default async function migrate(tree, schema) {
-    console.log('\n🔄 Starting core v5 migration...');
-    const shouldMigrateViewportService = schema.migrateViewportService !== false;
-    const shouldMigrateCreateProvider = schema.migrateCreateProvider !== false;
-    const shouldMigrateRouterStateService = schema.migrateRouterStateService !== false;
-    if (shouldMigrateViewportService) {
-        console.log('  • Migrating viewport service...');
-        await migrateViewportService(tree);
-    }
-    if (shouldMigrateCreateProvider) {
-        console.log('  • Migrating create provider...');
-        await migrateCreateProvider(tree);
-    }
-    if (shouldMigrateRouterStateService) {
-        await migrateRouterStateService(tree);
-    }
-    const shouldMigrateColorNaming = schema.migrateColorNaming !== false;
-    if (shouldMigrateColorNaming) {
-        console.log('  • Migrating theme → color naming...');
-        await migrateColorNaming(tree);
-    }
-    if (schema.reportRemovedExports !== false) {
-        console.log('  • Reporting removed exports...');
-        await reportRemovedExports(tree);
+    const scope = createMigrationScope(tree, schema);
+    logger.info('\n🔄 Starting core v5 migration...');
+    logger.info(`   Scope: ${scope.describe()}`);
+    const transforms = [
+        { label: 'ViewportService', enabled: schema.migrateViewportService !== false, run: migrateViewportService },
+        { label: 'createProvider', enabled: schema.migrateCreateProvider !== false, run: migrateCreateProvider },
+        {
+            label: 'RouterStateService',
+            enabled: schema.migrateRouterStateService !== false,
+            run: migrateRouterStateService,
+        },
+        { label: 'Theme → color naming', enabled: schema.migrateColorNaming !== false, run: migrateColorNaming },
+        { label: 'Removed exports', enabled: schema.reportRemovedExports !== false, run: reportRemovedExports },
+    ];
+    const reports = [];
+    for (const transform of transforms) {
+        if (!transform.enabled)
+            continue;
+        logger.info(`  • ${transform.label}...`);
+        reports.push([transform.label, await transform.run(tree, scope)]);
     }
     if (!schema.skipFormat) {
-        console.log('  • Formatting files...');
         await formatFiles(tree);
     }
-    console.log('\n✅ Migration completed successfully!');
+    logger.info('\nSummary:');
+    for (const [label, report] of reports) {
+        const review = report.review.length > 0 ? `, ${report.review.length} to review manually` : '';
+        logger.info(`  • ${label}: ${report.filesChanged} file(s) changed${review}`);
+        for (const message of report.review) {
+            logger.warn(`    ⚠ ${message}`);
+        }
+    }
+    logger.info('\n✅ Migration completed. Review the diff before committing.');
 }
-//#endregion

package/generators/migrate-to-v5/removed-exports.js

@@ -1,4 +1,5 @@
 import * as ts from 'typescript';
+import { collectFiles } from './migration-files.js';
 const REMOVED_EXPORTS = new Map([
     ...['Memo', 'MemoConfig', 'MemoResolver', 'MapLike'].map((name) => [name, 'the @Memo decorator']),
     ...[
@@ -31,34 +32,13 @@ const REMOVED_EXPORTS = new Map([
     ].map((name) => [name, 'the props module']),
 ]);
 const ET_PROPS_ATTRIBUTE = /\betProps\b/;
-export default async function reportRemovedExports(tree) {
-    const findings = new Map();
-    function walkFiles(dir) {
-        for (const child of tree.children(dir)) {
-            if (child === 'node_modules')
-                continue;
-            const path = dir === '.' ? child : `${dir}/${child}`;
-            if (!tree.isFile(path)) {
-                walkFiles(path);
-                continue;
-            }
-            const messages = path.endsWith('.ts')
-                ? findRemovedImports(tree, path)
-                : path.endsWith('.html')
-                    ? findEtPropsUsage(tree, path)
-                    : [];
-            if (messages.length > 0)
-                findings.set(path, messages);
-        }
+export default async function reportRemovedExports(tree, scope) {
+    const review = [];
+    for (const filePath of collectFiles(tree, scope, ['.ts', '.html'])) {
+        const messages = filePath.endsWith('.ts') ? findRemovedImports(tree, filePath) : findEtPropsUsage(tree, filePath);
+        review.push(...messages.map((message) => `${filePath}: ${message}`));
     }
-    walkFiles('.');
-    if (findings.size === 0)
-        return;
-    console.log('\n⚠️  Manual migration required for the following files:');
-    findings.forEach((messages, file) => {
-        console.log(`\n📄 ${file}:`);
-        messages.forEach((message) => console.log(`   - ${message}`));
-    });
+    return { filesChanged: 0, review };
 }
 function findRemovedImports(tree, filePath) {
     const content = tree.read(filePath, 'utf-8');