fixup! refactor(@angular/cli): remove old package manager utilities

Author: alan-agius4

packages/angular/cli/src/command-builder/command-module.ts

@@ -8,7 +8,7 @@
 
 import { schema } from '@angular-devkit/core';
 import { readFileSync } from 'node:fs';
-import { join, posix } from 'node:path';
+import { join, posix, relative } from 'node:path';
 import type { ArgumentsCamelCase, Argv, CommandModule as YargsCommandModule } from 'yargs';
 import { Parser as yargsParser } from 'yargs/helpers';
 import { getAnalyticsUserId } from '../analytics/analytics';
@@ -73,9 +73,10 @@ export abstract class CommandModule<T extends {} = {}> implements CommandModuleI
           describe: this.describe,
           ...(this.longDescriptionPath
             ? {
-                longDescriptionRelativePath: path
-                  .relative(join(__dirname, '../../../../'), this.longDescriptionPath)
-                  .replace(/\\/g, posix.sep),
+                longDescriptionRelativePath: relative(
+                  join(__dirname, '../../../../'),
+                  this.longDescriptionPath,
+                ).replace(/\\/g, posix.sep),
                 longDescription: readFileSync(this.longDescriptionPath, 'utf8').replace(
                   /\r\n/g,
                   '\n',

packages/angular/cli/src/command-builder/command-runner.ts

@@ -18,7 +18,8 @@ import {
   RootCommands,
   RootCommandsAliases,
 } from '../commands/command-config';
-import { PackageManagerName, createPackageManager } from '../package-managers';
+import { createPackageManager } from '../package-managers';
+import { ConfiguredPackageManagerInfo } from '../package-managers/factory';
 import { colors } from '../utilities/color';
 import { AngularWorkspace, getProjectByCwd, getWorkspace } from '../utilities/config';
 import { assertIsError } from '../utilities/error';
@@ -64,13 +65,12 @@ export async function runCommand(args: string[], logger: logging.Logger): Promis
   }
 
   const root = workspace?.basePath ?? process.cwd();
-
-  const cacheConfig = getCacheConfig(workspace);
+  const cacheConfig = workspace && getCacheConfig(workspace);
   const packageManager = await createPackageManager({
     cwd: root,
     logger,
-    dryRun,
-    tempDirectory: cacheConfig.enabled ? cacheConfig.path : undefined,
+    dryRun: dryRun || help || jsonHelp || getYargsCompletions,
+    tempDirectory: cacheConfig?.enabled ? cacheConfig.path : undefined,
     configuredPackageManager: await getConfiguredPackageManager(
       root,
       workspace,
@@ -187,14 +187,14 @@ async function getCommandsToRegister(
  * @param root The root directory of the workspace.
  * @param localWorkspace The local workspace.
  * @param globalWorkspace The global workspace.
- * @returns The package manager name.
+ * @returns The package manager name and version.
  */
 async function getConfiguredPackageManager(
   root: string,
   localWorkspace: AngularWorkspace | undefined,
   globalWorkspace: AngularWorkspace,
-): Promise<PackageManagerName | undefined> {
-  let result: PackageManagerName | undefined;
+): Promise<ConfiguredPackageManagerInfo | undefined> {
+  let result: ConfiguredPackageManagerInfo | undefined;
 
   try {
     const packageJsonPath = join(root, 'package.json');
@@ -223,13 +223,15 @@ async function getConfiguredPackageManager(
 /**
  * Get the package manager name from a JSON value.
  * @param source The JSON value to get the package manager name from.
- * @returns The package manager name.
+ * @returns The package manager name and version.
  */
-function getPackageManager(source: JsonValue | undefined): PackageManagerName | undefined {
+function getPackageManager(
+  source: JsonValue | undefined,
+): ConfiguredPackageManagerInfo | undefined {
   if (source && isJsonObject(source)) {
     const value = source['packageManager'];
     if (typeof value === 'string') {
-      return value.split('@', 1)[0] as unknown as PackageManagerName;
+      return value.split('@', 2) as unknown as ConfiguredPackageManagerInfo;
     }
   }
 

packages/angular/cli/src/command-builder/definitions.ts

@@ -8,7 +8,7 @@
 
 import { logging } from '@angular-devkit/core';
 import type { Argv, CamelCaseKey } from 'yargs';
-import { PackageManager } from '../package-managers/package-manager';
+import type { PackageManager } from '../package-managers/package-manager';
 import { AngularWorkspace } from '../utilities/config';
 
 export enum CommandScope {

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

@@ -20,7 +20,7 @@ import {
   Options,
 } from '../../command-builder/command-module';
 import { SchematicEngineHost } from '../../command-builder/utilities/schematic-engine-host';
-import { InstalledPackage, PackageManager, PackageManifest } from '../../package-managers';
+import type { InstalledPackage, PackageManager, PackageManifest } from '../../package-managers';
 import { colors } from '../../utilities/color';
 import { disableVersionCheck } from '../../utilities/environment-options';
 import { assertIsError } from '../../utilities/error';

packages/angular/cli/src/commands/update/utilities/cli-version.ts

@@ -11,7 +11,7 @@ import { spawnSync } from 'node:child_process';
 import { existsSync, promises as fs } from 'node:fs';
 import { join, resolve } from 'node:path';
 import * as semver from 'semver';
-import { PackageManager } from '../../../package-managers';
+import type { PackageManager } from '../../../package-managers';
 import { VERSION } from '../../../utilities/version';
 import { ANGULAR_PACKAGES_REGEXP } from './constants';
 

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

@@ -56,7 +56,7 @@ export default class VersionCommandModule
    */
   async run(options: { json?: boolean }): Promise<void> {
     const { logger } = this.context;
-    const versionInfo = gatherVersionInfo(this.context);
+    const versionInfo = await gatherVersionInfo(this.context);
 
     if (options.json) {
       // eslint-disable-next-line no-console

packages/angular/cli/src/commands/version/version-info.ts

@@ -7,6 +7,8 @@
  */
 
 import { createRequire } from 'node:module';
+import { CommandContext } from '../../command-builder/definitions';
+import { PackageManager } from '../../package-managers';
 import { VERSION } from '../../utilities/version';
 
 /**
@@ -81,10 +83,7 @@ const PACKAGE_PATTERNS = [
  * Gathers all the version information from the environment and workspace.
  * @returns An object containing all the version information.
  */
-export function gatherVersionInfo(context: {
-  packageManager: { name: string; version: string | undefined };
-  root: string;
-}): VersionInfo {
+export async function gatherVersionInfo(context: CommandContext): Promise<VersionInfo> {
   // Trailing slash is used to allow the path to be treated as a directory
   const workspaceRequire = createRequire(context.root + '/');
 
@@ -132,7 +131,7 @@ export function gatherVersionInfo(context: {
       },
       packageManager: {
         name: context.packageManager.name,
-        version: context.packageManager.version,
+        version: await context.packageManager.getVersion(),
       },
     },
     packages,

packages/angular/cli/src/package-managers/factory.ts

@@ -14,6 +14,11 @@ import { Logger } from './logger';
 import { PackageManager } from './package-manager';
 import { PackageManagerName, SUPPORTED_PACKAGE_MANAGERS } from './package-manager-descriptor';
 
+/**
+ * Information about the package manager to use for a given project.
+ */
+export type ConfiguredPackageManagerInfo = [name?: PackageManagerName, version?: string];
+
 /**
  * The default package manager to use when none is discovered or configured.
  */
@@ -59,19 +64,18 @@ async function getPackageManagerVersion(
 async function determinePackageManager(
   host: Host,
   cwd: string,
-  configured?: PackageManagerName,
+  configured: ConfiguredPackageManagerInfo = [],
   logger?: Logger,
   dryRun?: boolean,
 ): Promise<{
   name: PackageManagerName;
   source: 'configured' | 'discovered' | 'default';
   version?: string;
 }> {
-  let name: PackageManagerName;
+  let [name, version] = configured;
   let source: 'configured' | 'discovered' | 'default';
 
-  if (configured) {
-    name = configured;
+  if (name) {
     source = 'configured';
     logger?.debug(`Using configured package manager: '${name}'.`);
   } else {
@@ -89,7 +93,6 @@ async function determinePackageManager(
     }
   }
 
-  let version: string | undefined;
   if (name === 'yarn' && !dryRun) {
     assert.deepStrictEqual(
       SUPPORTED_PACKAGE_MANAGERS.yarn.versionCommand,
@@ -98,7 +101,7 @@ async function determinePackageManager(
     );
 
     try {
-      version = await getPackageManagerVersion(host, cwd, name, logger);
+      version ??= await getPackageManagerVersion(host, cwd, name, logger);
       if (version && major(version) < 2) {
         name = 'yarn-classic';
         logger?.debug(`Detected yarn classic. Using 'yarn-classic'.`);
@@ -124,7 +127,7 @@ async function determinePackageManager(
  */
 export async function createPackageManager(options: {
   cwd: string;
-  configuredPackageManager?: PackageManagerName;
+  configuredPackageManager?: ConfiguredPackageManagerInfo;
   logger?: Logger;
   dryRun?: boolean;
   tempDirectory?: string;

packages/angular/cli/src/package-managers/host.ts

@@ -14,7 +14,7 @@
  */
 
 import { type SpawnOptions, spawn } from 'node:child_process';
-import { Stats, constants, existsSync } from 'node:fs';
+import { Stats, constants } from 'node:fs';
 import { copyFile, mkdir, mkdtemp, readFile, readdir, rm, stat, writeFile } from 'node:fs/promises';
 import { platform, tmpdir } from 'node:os';
 import { join } from 'node:path';
@@ -27,9 +27,10 @@ export interface Host {
   /**
    * Creates a directory.
    * @param path The path to the directory.
+   * @param options Options for the directory creation.
    * @returns A promise that resolves when the directory is created.
    */
-  mkdir(path: string): Promise<void>;
+  mkdir(path: string, options?: { recursive?: boolean }): Promise<string | undefined>;
 
   /**
    * Gets the stats of a file or directory.

packages/angular/cli/src/package-managers/package-manager.ts

@@ -550,7 +550,7 @@ export class PackageManager {
         await this.host.stat(tempDirectory);
       } catch {
         // If the cache directory doesn't exist, create it.
-        await this.host.mkdir(tempDirectory);
+        await this.host.mkdir(tempDirectory, { recursive: true });
       }
     }