refactor: rename versions -> monorepo.json

And transpose the packages. This is cleaner.

Author: hansl

.monorepo.json

@@ -0,0 +1,24 @@
+{
+  "packages": {
+    "@_/benchmark": {
+      "version": "0.0.9",
+      "hash": "d8f46247086fb87b670c039256b02fa4"
+    },
+    "@angular-devkit/build-optimizer": {
+      "version": "0.0.25",
+      "hash": "4ad20c668e59d3dc1397dc61722e8a35"
+    },
+    "@angular-devkit/core": {
+      "version": "0.0.17",
+      "hash": "22ccb2169d795924bc532fedff34b532"
+    },
+    "@angular-devkit/schematics": {
+      "version": "0.0.30",
+      "hash": "7740fc3b41c4201045695b89d3f36f9f"
+    },
+    "@schematics/angular": {
+      "version": "0.0.41",
+      "hash": "e9ded458a88d07b5f0b5f4a33ef820cb"
+    }
+  }
+}

lib/packages.ts

@@ -15,6 +15,7 @@ import * as ts from 'typescript';
 
 const glob = require('glob');
 const distRoot = path.join(__dirname, '../dist');
+const { packages: monorepoPackages } = require('../.monorepo.json');
 
 
 export interface PackageInfo {
@@ -30,7 +31,9 @@ export interface PackageInfo {
   packageJson: JsonObject;
   dependencies: string[];
 
+  dirty: boolean;
   hash: string;
+  version: string;
 }
 export type PackageMap = { [name: string]: PackageInfo };
 
@@ -190,6 +193,8 @@ export const packages: PackageMap =
 
         dependencies: [],
         hash: '',
+        dirty: false,
+        version: monorepoPackages[name].version || '0.0.0',
       };
 
       return packages;
@@ -211,4 +216,7 @@ for (const pkgName of Object.keys(packages)) {
 // Update the hash values of each.
 for (const pkgName of Object.keys(packages)) {
   packages[pkgName].hash = _getHashOf(packages[pkgName]);
+  if (packages[pkgName].hash != monorepoPackages[pkgName].hash) {
+    packages[pkgName].dirty = true;
+  }
 }

scripts/build.ts

@@ -257,22 +257,22 @@ export default function(argv: { local?: boolean }, logger: Logger) {
 
   logger.info('Setting versions...');
 
-  const { versions } = require(path.join(__dirname, '../versions.json'));
   const versionLogger = new Logger('versions', logger);
   for (const packageName of sortedPackages) {
     versionLogger.info(packageName);
     const pkg = packages[packageName];
     const packageJsonPath = path.join(pkg.dist, 'package.json');
     const packageJson = pkg.packageJson;
+    const version = pkg.version;
 
-    if (versions[packageName]) {
-      packageJson['version'] = versions[packageName];
+    if (version) {
+      packageJson['version'] = version;
     } else {
       versionLogger.error('No version found... Only updating dependencies.');
     }
 
-    for (const depName of Object.keys(versions)) {
-      const v = versions[depName];
+    for (const depName of Object.keys(packages)) {
+      const v = packages[depName].version;
       for (const depKey of ['dependencies', 'peerDependencies', 'devDependencies']) {
         const obj = packageJson[depKey] as JsonObject | null;
         if (obj && obj[depName]) {

scripts/release.ts

@@ -12,23 +12,22 @@ import * as semver from 'semver';
 import { ReleaseType } from 'semver';
 import { packages } from '../lib/packages';
 
-const { hashes, versions } = require('../versions.json');
+
+const { packages: monorepo } = require('../.monorepo.json');
 
 
 function _showVersions(logger: Logger) {
-  for (const pkg of Object.keys(versions)) {
-    if (!(pkg in packages)) {
-      logger.fatal(`"${pkg}" not an official package...`);
-    }
+  for (const pkgName of Object.keys(packages)) {
+    const pkg = packages[pkgName];
 
-    const version = versions[pkg] || '???';
-    const hash = packages[pkg].hash;
-    const diff = hashes[pkg] !== hash ? '!' : '';
+    const version = pkg.version || '???';
+    const hash = pkg.hash;
+    const diff = pkg.dirty ? '!' : '';
 
-    const pad1 = '                                  '.slice(pkg.length);
+    const pad1 = '                                  '.slice(pkgName.length);
     const pad2 = '          '.slice(version.length);
-    const message = `${pkg} ${pad1}v${version}${pad2}${hash} ${diff}`;
-    if (packages[pkg].private) {
+    const message = `${pkgName} ${pad1}v${version}${pad2}${hash} ${diff}`;
+    if (pkg.private) {
       logger.debug(message);
     } else {
       logger.info(message);
@@ -39,24 +38,21 @@ function _showVersions(logger: Logger) {
 
 function _upgrade(release: string, logger: Logger) {
   for (const pkg of Object.keys(packages)) {
-    if (!(pkg in versions)) {
-      versions[pkg] = '0.0.0';
-    }
-
     const hash = packages[pkg].hash;
-    const version = versions[pkg] || '0.0.0';
+    const version = packages[pkg].version;
+    const dirty = packages[pkg].dirty;
     let newVersion: string | null = version;
 
     if (release == 'minor-beta') {
-      if (hash !== hashes[pkg]) {
+      if (dirty) {
         if (version.match(/-beta\.\d+$/)) {
           newVersion = semver.inc(version, 'prerelease');
         } else {
           newVersion = semver.inc(version, 'minor') + '-beta.0';
         }
       }
     } else if (release == 'minor-rc') {
-      if (hash !== hashes[pkg]) {
+      if (dirty) {
         if (version.match(/-rc/)) {
           newVersion = semver.inc(version, 'prerelease');
         } else if (version.match(/-beta\.\d+$/)) {
@@ -66,15 +62,15 @@ function _upgrade(release: string, logger: Logger) {
         }
       }
     } else if (release == 'major-beta') {
-      if (hash !== hashes[pkg]) {
+      if (dirty) {
         if (version.match(/-beta\.\d+$/)) {
           newVersion = semver.inc(version, 'prerelease');
         } else {
           newVersion = semver.inc(version, 'major') + '-beta.0';
         }
       }
     } else if (release == 'major-rc') {
-      if (hash !== hashes[pkg]) {
+      if (dirty) {
         if (version.match(/-rc/)) {
           newVersion = semver.inc(version, 'prerelease');
         } else if (version.match(/-beta\.\d+$/)) {
@@ -83,15 +79,15 @@ function _upgrade(release: string, logger: Logger) {
           newVersion = semver.inc(version, 'major') + '-rc.0';
         }
       }
-    } else if (hash !== hashes[pkg] || release !== 'patch') {
+    } else if (dirty || release !== 'patch') {
       newVersion = semver.inc(version, release as ReleaseType);
     }
 
     let message = '';
     if (newVersion && version !== newVersion) {
       message = `${pkg} changed... updating v${version} => v${newVersion}`;
-      versions[pkg] = newVersion;
-      hashes[pkg] = hash;
+      monorepo[pkg].version = newVersion;
+      monorepo[pkg].hash = hash;
     } else {
       message = `${pkg} SAME: v${version}`;
     }
@@ -123,8 +119,8 @@ export default function(args: { _: string[], 'dry-run'?: boolean }, logger: Logg
     case 'patch':
       _upgrade(maybeRelease, logger);
       if (!dryRun) {
-        fs.writeFileSync(path.join(__dirname, '../versions.json'),
-                         JSON.stringify({ versions, hashes }, null, 2) + '\n');
+        fs.writeFileSync(path.join(__dirname, '../.monorepo.json'),
+                         JSON.stringify({ packages: monorepo }, null, 2) + '\n');
       }
       process.exit(0);
       break;

scripts/test.ts

@@ -18,7 +18,6 @@ import { packages } from '../lib/packages';
 
 
 const Jasmine = require('jasmine');
-const { versions } = require('../versions.json');
 
 const projectBaseDir = join(__dirname, '..');
 require('source-map-support').install({
@@ -243,7 +242,7 @@ export default function (args: ParsedArgs, logger: Logger) {
       .filter(p => Object.keys(packages).some(name => {
         const relativeRoot = relative(projectBaseDir, packages[name].root);
 
-        return p.startsWith(relativeRoot) && packages[name].hash !== versions[name];
+        return p.startsWith(relativeRoot) && packages[name].dirty;
       }));
 
     logger.info(`Found ${tests.length} spec files, out of ${allTests.length}.`);