Merge pull request #16870 from IgniteUI/copilot/sub-pr-16742

[WIP] Refactor core and grids/core for further improvements

Author: kdinev

projects/igniteui-angular/migrations/migration-collection.json

@@ -258,6 +258,13 @@
             "factory": "./update-21_0_0_import-migration",
             "recommended": true,
             "optional": true
+        },
+        "migration-52": {
+            "version": "21.1.0",
+            "description": "Migrates IgxGridGroupByAreaComponent import from grids/core to grids/grid",
+            "factory": "./update-21_1_0_import-migration",
+            "recommended": true,
+            "optional": true
         }
     }
 }

projects/igniteui-angular/migrations/update-21_1_0_import-migration/index.ts

@@ -0,0 +1,160 @@
+import type {
+    FileVisitor,
+    Rule,
+    SchematicContext,
+    Tree
+} from '@angular-devkit/schematics';
+import * as ts from 'typescript';
+import { IG_PACKAGE_NAME, IG_LICENSED_PACKAGE_NAME, igNamedImportFilter } from '../common/tsUtils';
+
+const version = '21.1.0';
+
+// Entry point mapping for moved exports in 21.1.0
+const ENTRY_POINT_MAP = new Map<string, string>([
+    // IgxGridGroupByAreaComponent moved from grids/core to grids/grid
+    ['IgxGridGroupByAreaComponent', 'grids/grid']
+]);
+
+function migrateImportDeclaration(node: ts.ImportDeclaration, sourceFile: ts.SourceFile): { start: number, end: number, replacement: string } | null {
+    if (!igNamedImportFilter(node)) {
+        return null;
+    }
+
+    const importPath = node.moduleSpecifier.text;
+    const namedBindings = node.importClause.namedBindings;
+
+    // Only process grids/core imports for this migration
+    if (importPath !== `${IG_PACKAGE_NAME}/grids/core` && importPath !== `${IG_LICENSED_PACKAGE_NAME}/grids/core`) {
+        return null;
+    }
+
+    // Group imports by entry point
+    const entryPointGroups = new Map<string, string[]>();
+    const remainingInCore: string[] = [];
+
+    for (const element of namedBindings.elements) {
+        const name = element.name.text;
+        const alias = element.propertyName?.text;
+        const importName = alias || name;
+
+        const fullImport = alias ? `${importName} as ${name}` : importName;
+
+        // Check if this import needs to be moved
+        if (ENTRY_POINT_MAP.has(importName)) {
+            const targetEntryPoint = ENTRY_POINT_MAP.get(importName)!;
+            if (!entryPointGroups.has(targetEntryPoint)) {
+                entryPointGroups.set(targetEntryPoint, []);
+            }
+            entryPointGroups.get(targetEntryPoint)!.push(fullImport);
+        } else {
+            // Keep in grids/core
+            remainingInCore.push(fullImport);
+        }
+    }
+
+    // If nothing changed, return null
+    if (entryPointGroups.size === 0) {
+        return null;
+    }
+
+    // Generate new import statements
+    const newImports: string[] = [];
+    
+    // Add remaining grids/core imports first
+    if (remainingInCore.length > 0) {
+        const sortedImports = remainingInCore.sort();
+        newImports.push(`import { ${sortedImports.join(', ')} } from '${importPath}';`);
+    }
+    
+    // Add moved imports
+    for (const [entryPoint, imports] of entryPointGroups) {
+        const sortedImports = imports.sort();
+        const basePackage = importPath.replace('/grids/core', '');
+        newImports.push(`import { ${sortedImports.join(', ')} } from '${basePackage}/${entryPoint}';`);
+    }
+
+    return {
+        start: node.getStart(sourceFile),
+        end: node.getEnd(),
+        replacement: newImports.join('\n')
+    };
+}
+
+function migrateFile(filePath: string, content: string): string {
+    const sourceFile = ts.createSourceFile(
+        filePath,
+        content,
+        ts.ScriptTarget.Latest,
+        true
+    );
+
+    const changes: { start: number, end: number, replacement: string }[] = [];
+
+    function visit(node: ts.Node) {
+        if (ts.isImportDeclaration(node)) {
+            const change = migrateImportDeclaration(node, sourceFile);
+            if (change) {
+                changes.push(change);
+            }
+        }
+
+        ts.forEachChild(node, visit);
+    }
+
+    visit(sourceFile);
+
+    // Apply changes in reverse order to maintain positions
+    changes.sort((a, b) => b.start - a.start);
+
+    let result = content;
+    for (const change of changes) {
+        result = result.substring(0, change.start) + change.replacement + result.substring(change.end);
+    }
+
+    return result;
+}
+
+export default function migrate(): Rule {
+    return async (host: Tree, context: SchematicContext) => {
+        context.logger.info(`Applying optional import migration for Ignite UI for Angular to version ${version}`);
+        context.logger.info('Migrating imports to new entry points...');
+
+        const visit: FileVisitor = (filePath) => {
+            // Only process TypeScript files
+            if (!filePath.endsWith('.ts')) {
+                return;
+            }
+
+            // Skip node_modules and dist
+            if (filePath.includes('node_modules') || filePath.includes('dist')) {
+                return;
+            }
+
+            const content = host.read(filePath);
+            if (!content) {
+                return;
+            }
+
+            const originalContent = content.toString();
+
+            // Check if file has grids/core imports
+            if (!originalContent.includes(`from '${IG_PACKAGE_NAME}/grids/core'`) && !originalContent.includes(`from "${IG_PACKAGE_NAME}/grids/core"`) &&
+                !originalContent.includes(`from '${IG_LICENSED_PACKAGE_NAME}/grids/core'`) && !originalContent.includes(`from "${IG_LICENSED_PACKAGE_NAME}/grids/core"`)) {
+                return;
+            }
+
+            const migratedContent = migrateFile(filePath, originalContent);
+
+            if (migratedContent !== originalContent) {
+                host.overwrite(filePath, migratedContent);
+                context.logger.info(`  ✓ Migrated ${filePath}`);
+            }
+        };
+
+        host.visit(visit);
+
+        context.logger.info('Migration complete!');
+        context.logger.info('Breaking changes:');
+        context.logger.info('  - IgxGridGroupByAreaComponent moved from igniteui-angular/grids/core to igniteui-angular/grids/grid');
+    };
+}