refactor(@angular/cli): use canonical npm logic to determine update package version

Author: clydin

packages/angular/cli/commands/add-impl.ts

@@ -90,7 +90,7 @@ export class AddCommand extends SchematicCommand<AddCommandSchema> {
         }
       } else if (!latestManifest || (await this.hasMismatchedPeer(latestManifest))) {
         // 'latest' is invalid so search for most recent matching package
-        const versionManifests = Array.from(packageMetadata.versions.values()).filter(
+        const versionManifests = Object.values(packageMetadata.versions).filter(
           value => !prerelease(value.version),
         );
 

packages/angular/cli/commands/update-impl.ts

@@ -8,7 +8,6 @@
 import { execSync } from 'child_process';
 import * as fs from 'fs';
 import * as path from 'path';
-import * as semver from 'semver';
 import { Arguments, Option } from '../models/interface';
 import { SchematicCommand } from '../models/schematic-command';
 import { getPackageManager } from '../utilities/package-manager';
@@ -21,7 +20,11 @@ import {
 import { PackageTreeNode, findNodeDependencies, readPackageTree } from '../utilities/package-tree';
 import { Schema as UpdateCommandSchema } from './update';
 
-const npa = require('npm-package-arg');
+const npa = require('npm-package-arg') as (selector: string) => PackageIdentifier;
+const pickManifest = require('npm-pick-manifest') as (
+  metadata: PackageMetadata,
+  selector: string,
+) => PackageManifest;
 
 const oldConfigFileNames = ['.angular-cli.json', 'angular-cli.json'];
 
@@ -37,7 +40,7 @@ export class UpdateCommand extends SchematicCommand<UpdateCommandSchema> {
     const packages: PackageIdentifier[] = [];
     for (const request of options['--'] || []) {
       try {
-        const packageIdentifier: PackageIdentifier = npa(request);
+        const packageIdentifier = npa(request);
 
         // only registry identifiers are supported
         if (!packageIdentifier.registry) {
@@ -245,7 +248,7 @@ export class UpdateCommand extends SchematicCommand<UpdateCommandSchema> {
 
     const requests: {
       identifier: PackageIdentifier;
-      node: PackageTreeNode | string;
+      node: PackageTreeNode;
     }[] = [];
 
     // Validate packages actually are part of the workspace
@@ -258,11 +261,7 @@ export class UpdateCommand extends SchematicCommand<UpdateCommandSchema> {
       }
 
       // If a specific version is requested and matches the installed version, skip.
-      if (
-        pkg.type === 'version' &&
-        typeof node === 'object' &&
-        node.package.version === pkg.fetchSpec
-      ) {
+      if (pkg.type === 'version' && node.package.version === pkg.fetchSpec) {
         this.logger.info(`Package '${pkg.name}' is already at '${pkg.fetchSpec}'.`);
         continue;
       }
@@ -294,18 +293,34 @@ export class UpdateCommand extends SchematicCommand<UpdateCommandSchema> {
       // Try to find a package version based on the user requested package specifier
       // registry specifier types are either version, range, or tag
       let manifest: PackageManifest | undefined;
-      if (requestIdentifier.type === 'version') {
-        manifest = metadata.versions.get(requestIdentifier.fetchSpec);
-      } else if (requestIdentifier.type === 'range') {
-        const maxVersion = semver.maxSatisfying(
-          Array.from(metadata.versions.keys()),
-          requestIdentifier.fetchSpec,
-        );
-        if (maxVersion) {
-          manifest = metadata.versions.get(maxVersion);
+      if (
+        requestIdentifier.type === 'version' ||
+        requestIdentifier.type === 'range' ||
+        requestIdentifier.type === 'tag'
+      ) {
+        try {
+          manifest = pickManifest(metadata, requestIdentifier.fetchSpec);
+        } catch (e) {
+          if (e.code === 'ETARGET') {
+            // If not found and next was used and user did not provide a specifier, try latest.
+            // Package may not have a next tag.
+            if (
+              requestIdentifier.type === 'tag' &&
+              requestIdentifier.fetchSpec === 'next' &&
+              !requestIdentifier.rawSpec
+            ) {
+              try {
+                manifest = pickManifest(metadata, 'latest');
+              } catch (e) {
+                if (e.code !== 'ETARGET' && e.code !== 'ENOVERSIONS') {
+                  throw e;
+                }
+              }
+            }
+          } else if (e.code !== 'ENOVERSIONS') {
+            throw e;
+          }
         }
-      } else if (requestIdentifier.type === 'tag') {
-        manifest = metadata.tags[requestIdentifier.fetchSpec];
       }
 
       if (!manifest) {
@@ -316,10 +331,7 @@ export class UpdateCommand extends SchematicCommand<UpdateCommandSchema> {
         return 1;
       }
 
-      if (
-        (typeof node === 'string' && manifest.version === node) ||
-        (typeof node === 'object' && manifest.version === node.package.version)
-      ) {
+      if (manifest.version === node.package.version) {
         this.logger.info(`Package '${packageName}' is already up to date.`);
         continue;
       }

packages/angular/cli/package.json

@@ -36,6 +36,7 @@
     "ini": "1.3.5",
     "inquirer": "6.5.1",
     "npm-package-arg": "6.1.0",
+    "npm-pick-manifest": "3.0.2",
     "open": "6.4.0",
     "pacote": "9.5.5",
     "read-package-tree": "5.3.1",

packages/angular/cli/utilities/package-metadata.ts

@@ -50,7 +50,7 @@ export interface PackageManifest {
 export interface PackageMetadata {
   name: string;
   tags: { [tag: string]: PackageManifest | undefined };
-  versions: Map<string, PackageManifest>;
+  versions: Record<string, PackageManifest>;
 }
 
 let npmrc: { [key: string]: string };
@@ -179,18 +179,22 @@ export async function fetchPackageMetadata(
   const metadata: PackageMetadata = {
     name: response.name,
     tags: {},
-    versions: new Map(),
+    versions: {},
   };
 
   if (response.versions) {
     for (const [version, manifest] of Object.entries(response.versions)) {
-      metadata.versions.set(version, normalizeManifest(manifest as {}));
+      metadata.versions[version] = normalizeManifest(manifest as {});
     }
   }
 
   if (response['dist-tags']) {
+    // Store this for use with other npm utility packages
+    // tslint:disable-next-line: no-any
+    (metadata as any)['dist-tags'] = response['dist-tags'];
+
     for (const [tag, version] of Object.entries(response['dist-tags'])) {
-      const manifest = metadata.versions.get(version as string);
+      const manifest = metadata.versions[version as string];
       if (manifest) {
         metadata.tags[tag] = manifest;
       } else if (verbose) {

yarn.lock

@@ -8092,6 +8092,15 @@ npm-packlist@^1.1.6:
     ignore-walk "^3.0.1"
     npm-bundled "^1.0.1"
 
+npm-pick-manifest@3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/npm-pick-manifest/-/npm-pick-manifest-3.0.2.tgz#f4d9e5fd4be2153e5f4e5f9b7be8dc419a99abb7"
+  integrity sha512-wNprTNg+X5nf+tDi+hbjdHhM4bX+mKqv6XmPh7B5eG+QY9VARfQPfCEH013H5GqfNj6ee8Ij2fg8yk0mzps1Vw==
+  dependencies:
+    figgy-pudding "^3.5.1"
+    npm-package-arg "^6.0.0"
+    semver "^5.4.1"
+
 npm-pick-manifest@^2.2.3:
   version "2.2.3"
   resolved "https://registry.yarnpkg.com/npm-pick-manifest/-/npm-pick-manifest-2.2.3.tgz#32111d2a9562638bb2c8f2bf27f7f3092c8fae40"