fix(@schematics/update): fix logic to coerce the version number

And add unit tests for it.

Author: hansl

packages/schematics/update/migrate/index.ts

@@ -18,6 +18,36 @@ import * as semver from 'semver';
 import { PostUpdateSchema } from './schema';
 
 
+/**
+ * Cleans up "short" version numbers so they become valid semver. For example;
+ *   1 => 1.0.0
+ *   1.2 => 1.2.0
+ *   1-beta => 1.0.0-beta
+ *
+ * Exported for testing only.
+ * @internal
+ */
+export function _coerceVersionNumber(version: string): string | null {
+  if (!version.match(/^\d{1,30}\.\d{1,30}\.\d{1,30}/)) {
+    const match = version.match(/^\d{1,30}(\.\d{1,30})*/);
+
+    if (!match) {
+      return null;
+    }
+
+    if (!match[1]) {
+      version = version.substr(0, match[0].length) + '.0.0' + version.substr(match[0].length);
+    } else if (!match[2]) {
+      version = version.substr(0, match[0].length) + '.0' + version.substr(match[0].length);
+    } else {
+      return null;
+    }
+  }
+
+  return semver.valid(version);
+}
+
+
 export default function(options: PostUpdateSchema): Rule {
   return (tree: Tree, context: SchematicContext) => {
     const schematicsToRun: { name: string; version: string; }[] = [];
@@ -28,16 +58,12 @@ export default function(options: PostUpdateSchema): Rule {
       const schematic = collection.createSchematic(name, true);
 
       const description: JsonObject = schematic.description as JsonObject;
+      let version = description['version'];
 
-      if (typeof description['version'] == 'string') {
-        let version = description['version'] as string;
-        if (!version.match(/^\d{1,30}\.\d{1,30}\.\d{1,30}$/)) {
-          version += '.0';
-        }
-        if (!version.match(/^\d{1,30}\.\d{1,30}\.\d{1,30}$/)) {
-          version += '.0';
-        }
-        if (!semver.valid(version)) {
+      if (typeof version == 'string') {
+        version = _coerceVersionNumber(version);
+
+        if (!version) {
           throw new SchematicsException(
             `Invalid migration version: ${JSON.stringify(description['version'])}`,
           );

packages/schematics/update/migrate/index_spec.ts

@@ -9,6 +9,7 @@ import { virtualFs } from '@angular-devkit/core';
 import { HostTree } from '@angular-devkit/schematics';
 import { SchematicTestRunner, UnitTestTree } from '@angular-devkit/schematics/testing';
 import { map } from 'rxjs/operators';
+import { _coerceVersionNumber } from './index';
 
 
 describe('@schematics/update:migrate', () => {
@@ -56,3 +57,29 @@ describe('@schematics/update:migrate', () => {
     ).toPromise().then(done, done.fail);
   });
 });
+
+
+describe('_coerceVersionNumber', () => {
+  const testCases: { [expected: string]: string | null } = {
+    '1': '1.0.0',
+    '1.2': '1.2.0',
+    '1.2.3': '1.2.3',
+    '1-beta.0': '1.0.0-beta.0',
+    '1.2-beta.0': '1.2.0-beta.0',
+    '1.2.3-beta.0': '1.2.3-beta.0',
+    'a': null,
+    '1.a': null,
+    '1a': null,
+    '1.': null,
+    '1.-beta.0': null,
+  };
+
+  Object.keys(testCases).forEach(input => {
+    const expected = testCases[input];
+    it(`${JSON.stringify(input)} => ${JSON.stringify(expected)}`, () => {
+      const actual = _coerceVersionNumber(input);
+
+      expect(actual).toBe(expected);
+    });
+  });
+});