refactor(@angular/cli): move update version resolution directly to CLI command

Removes the @schematics/update:update schematic and moves the package version resolution, group expansion, and peer dependency validation logic directly into the CLI's update command.

This simplifies the command execution flow, eliminates sharing state via global variables, and enables direct unit testing of the resolution plan in isolated temporary directories without host monorepo package leakage.

Author: clydin

packages/angular/cli/BUILD.bazel

@@ -29,7 +29,6 @@ RUNTIME_ASSETS = glob(
     include = [
         "bin/**/*",
         "src/**/*.md",
-        "src/**/*.json",
     ],
     exclude = [
         "lib/config/workspace-schema.json",
@@ -53,7 +52,6 @@ ts_project(
     ) + [
         # These files are generated from the JSON schema
         "//packages/angular/cli:lib/config/workspace-schema.ts",
-        "//packages/angular/cli:src/commands/update/schematic/schema.ts",
     ],
     data = RUNTIME_ASSETS,
     deps = [
@@ -105,11 +103,6 @@ ts_json_schema(
     data = CLI_SCHEMA_DATA,
 )
 
-ts_json_schema(
-    name = "update_schematic_schema",
-    src = "src/commands/update/schematic/schema.json",
-)
-
 ts_project(
     name = "angular-cli_test_lib",
     testonly = True,

packages/angular/cli/src/commands/update/cli.ts

@@ -24,6 +24,12 @@ import type { InstalledPackage, PackageManager, PackageManifest } from '../../pa
 import { colors } from '../../utilities/color';
 import { disableVersionCheck } from '../../utilities/environment-options';
 import { assertIsError } from '../../utilities/error';
+import {
+  UpdatePlan,
+  applyUpdatePlan,
+  printUpdateUsageMessage,
+  resolveUserUpdatePlan,
+} from './update-resolver';
 import {
   checkCLIVersion,
   coerceVersionNumber,
@@ -32,12 +38,7 @@ import {
 } from './utilities/cli-version';
 import { ANGULAR_PACKAGES_REGEXP } from './utilities/constants';
 import { checkCleanGit } from './utilities/git';
-import {
-  commitChanges,
-  executeMigration,
-  executeMigrations,
-  executeSchematic,
-} from './utilities/migration';
+import { commitChanges, executeMigration, executeMigrations } from './utilities/migration';
 
 interface UpdateCommandArgs {
   packages?: string[];
@@ -54,8 +55,6 @@ interface UpdateCommandArgs {
 
 class CommandError extends Error {}
 
-const UPDATE_SCHEMATIC_COLLECTION = path.join(__dirname, 'schematic/collection.json');
-
 export default class UpdateCommandModule extends CommandModule<UpdateCommandArgs> {
   override scope = CommandScope.In;
   protected override shouldReportAnalytics = false;
@@ -244,23 +243,28 @@ export default class UpdateCommandModule extends CommandModule<UpdateCommandArgs
     });
 
     if (packages.length === 0) {
-      // Show status
-      const { success } = await executeSchematic(
-        workflow,
-        logger,
-        UPDATE_SCHEMATIC_COLLECTION,
-        'update',
-        {
-          force: options.force,
-          next: options.next,
-          verbose: options.verbose,
-          packageManager: packageManager.name,
-          packages: [],
-          workspaceRoot: this.context.root,
-        },
-      );
+      try {
+        const plan = await resolveUserUpdatePlan(
+          {
+            force: options.force,
+            next: options.next,
+            verbose: options.verbose,
+            packageManager: packageManager.name,
+            packages: [],
+            workspaceRoot: this.context.root,
+          },
+          logger,
+        );
+
+        printUpdateUsageMessage(plan.packageInfoMap, logger, options.next);
 
-      return success ? 0 : 1;
+        return 0;
+      } catch (error) {
+        assertIsError(error);
+        logger.error(error.message);
+
+        return 1;
+      }
     }
 
     return options.migrateOnly
@@ -509,88 +513,93 @@ export default class UpdateCommandModule extends CommandModule<UpdateCommandArgs
       return 0;
     }
 
-    const { success } = await executeSchematic(
-      workflow,
-      logger,
-      UPDATE_SCHEMATIC_COLLECTION,
-      'update',
-      {
-        verbose: options.verbose,
-        force: options.force,
-        next: options.next,
-        packageManager: this.context.packageManager.name,
-        packages: packagesToUpdate,
-        workspaceRoot: this.context.root,
-      },
-    );
-
-    if (success) {
-      const { root: commandRoot } = this.context;
-      const ignorePeerDependencies = await shouldForcePackageManager(
-        packageManager,
+    let plan: UpdatePlan;
+    try {
+      plan = await resolveUserUpdatePlan(
+        {
+          packages: packagesToUpdate,
+          force: options.force,
+          next: options.next,
+          packageManager: packageManager.name,
+          verbose: options.verbose,
+          workspaceRoot: this.context.root,
+        },
         logger,
-        options.verbose,
       );
-      const tasks = new Listr([
-        {
-          title: 'Cleaning node modules directory',
-          async task(_, task) {
-            try {
-              await fs.rm(path.join(commandRoot, 'node_modules'), {
-                force: true,
-                recursive: true,
-                maxRetries: 3,
-              });
-            } catch (e) {
-              assertIsError(e);
-              if (e.code === 'ENOENT') {
-                task.skip('Cleaning not required. Node modules directory not found.');
-              }
+    } catch (error) {
+      assertIsError(error);
+      logger.error(error.message);
+
+      return 1;
+    }
+
+    try {
+      await applyUpdatePlan(this.context.root, plan, logger);
+    } catch (error) {
+      assertIsError(error);
+      logger.error(`Error updating package.json: ${error.message}`);
+
+      return 1;
+    }
+
+    const { root: commandRoot } = this.context;
+    const ignorePeerDependencies = await shouldForcePackageManager(
+      packageManager,
+      logger,
+      options.verbose,
+    );
+    const tasks = new Listr([
+      {
+        title: 'Cleaning node modules directory',
+        async task(_, task) {
+          try {
+            await fs.rm(path.join(commandRoot, 'node_modules'), {
+              force: true,
+              recursive: true,
+              maxRetries: 3,
+            });
+          } catch (e) {
+            assertIsError(e);
+            if (e.code === 'ENOENT') {
+              task.skip('Cleaning not required. Node modules directory not found.');
             }
-          },
+          }
         },
-        {
-          title: 'Installing packages',
-          async task() {
-            try {
-              await packageManager.install({
-                ignorePeerDependencies,
-              });
-            } catch (e) {
-              throw new CommandError('Unable to install packages');
-            }
-          },
+      },
+      {
+        title: 'Installing packages',
+        async task() {
+          try {
+            await packageManager.install({
+              ignorePeerDependencies,
+            });
+          } catch (e) {
+            throw new CommandError('Unable to install packages');
+          }
         },
-      ]);
-      try {
-        await tasks.run();
-      } catch (e) {
-        if (e instanceof CommandError) {
-          return 1;
-        }
-
-        throw e;
+      },
+    ]);
+    try {
+      await tasks.run();
+    } catch (e) {
+      if (e instanceof CommandError) {
+        return 1;
       }
+
+      throw e;
     }
 
-    if (success && options.createCommits) {
+    if (options.createCommits) {
       if (
         !commitChanges(logger, `Angular CLI update for packages - ${packagesToUpdate.join(', ')}`)
       ) {
         return 1;
       }
     }
 
-    // This is a temporary workaround to allow data to be passed back from the update schematic
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    const migrations = (global as any).externalMigrations as {
-      package: string;
-      collection: string;
-      from: string;
-      to: string;
-    }[];
+    const migrations = plan.migrationsToRun;
 
-    if (success && migrations) {
+    if (migrations) {
       const rootRequire = createRequire(this.context.root + '/');
       for (const migration of migrations) {
         // Resolve the package from the workspace root, as otherwise it will be resolved from the temp
@@ -631,10 +640,29 @@ export default class UpdateCommandModule extends CommandModule<UpdateCommandArgs
           return 1;
         }
 
+        const pkgJson = await fs.readFile(path.join(this.context.root, 'package.json'), 'utf8');
+        logger.info(`--- DIAGNOSTIC: package.json =\n${pkgJson}`);
+
+        logger.info(
+          `--- DIAGNOSTIC: package ${migration.package} -> packagePath=${packagePath}, collection=${migration.collection}`,
+        );
+
+        const localMigrations = path.join(packagePath, migration.collection);
+        logger.info(`--- DIAGNOSTIC: localMigrations path = ${localMigrations}`);
+        logger.info(`--- DIAGNOSTIC: localMigrations exists = ${existsSync(localMigrations)}`);
+
+        try {
+          const files = await fs.readdir(packagePath);
+          logger.info(`--- DIAGNOSTIC: files in packagePath = ${files.join(', ')}`);
+        } catch (err) {
+          assertIsError(err);
+          logger.info(`--- DIAGNOSTIC: failed to read packagePath: ${err.message}`);
+        }
+
         let migrations;
 
         // Check if it is a package-local location
-        const localMigrations = path.join(packagePath, migration.collection);
+        // const localMigrations = path.join(packagePath, migration.collection);
         if (existsSync(localMigrations)) {
           migrations = localMigrations;
         } else {
@@ -673,7 +701,7 @@ export default class UpdateCommandModule extends CommandModule<UpdateCommandArgs
       }
     }
 
-    return success ? 0 : 1;
+    return 0;
   }
 }