build: add hashes to package map

hansl · hansl · commit 5f2770c0f775 · 2018-06-05T17:55:14.000-07:00
diff --git a/lib/packages.ts b/lib/packages.ts
@@ -8,10 +8,12 @@
 'use strict';
 
 import { JsonObject } from '@angular-devkit/core';
+import * as crypto from 'crypto';
 import * as fs from 'fs';
 import * as path from 'path';
 import * as ts from 'typescript';
 
+const glob = require('glob');
 const distRoot = path.join(__dirname, '../dist');
 
 
@@ -27,10 +29,44 @@ export interface PackageInfo {
   private: boolean;
   packageJson: JsonObject;
   dependencies: string[];
+
+  hash: string;
 }
 export type PackageMap = { [name: string]: PackageInfo };
 
 
+const hashCache: {[name: string]: string | null} = {};
+function _getHashOf(pkg: PackageInfo): string {
+  if (!(pkg.name in hashCache)) {
+    hashCache[pkg.name] = null;
+    const md5Stream = crypto.createHash('md5');
+
+    // Update the stream with all files content.
+    const files: string[] = glob.sync(path.join(pkg.root, '**'), { nodir: true });
+    files.forEach(filePath => {
+      md5Stream.write(`\0${filePath}\0`);
+      md5Stream.write(fs.readFileSync(filePath));
+    });
+    // Update the stream with all versions of upstream dependencies.
+    pkg.dependencies.forEach(depName => {
+      md5Stream.write(`\0${depName}\0${_getHashOf(packages[depName])}\0`);
+    });
+
+    md5Stream.end();
+
+    hashCache[pkg.name] = (md5Stream.read() as Buffer).toString('hex');
+  }
+
+  if (!hashCache[pkg.name]) {
+    // Protect against circular dependency.
+    throw new Error('Circular dependency detected between the following packages: '
+      + Object.keys(hashCache).filter(key => hashCache[key] == null).join(', '));
+  }
+
+  return hashCache[pkg.name] !;
+}
+
+
 function loadPackageJson(p: string) {
   const root = require('../package.json');
   const pkg = require(p);
@@ -108,8 +144,10 @@ const packageJsonPaths = _findAllPackageJson(path.join(__dirname, '..'), exclude
   // Remove the root package.json.
   .filter(p => p != path.join(__dirname, '../package.json'));
 
-// All the supported packages. Go through the packages directory and create a _map of
-// name => fullPath.
+
+// All the supported packages. Go through the packages directory and create a map of
+// name => PackageInfo. This map is partial as it lacks some information that requires the
+// map itself to finish building.
 export const packages: PackageMap =
   packageJsonPaths
     .map(pkgPath => ({ root: path.dirname(pkgPath) }))
@@ -136,12 +174,14 @@ export const packages: PackageMap =
         root: pkgRoot,
         relative: path.relative(path.dirname(__dirname), pkgRoot),
         main: path.resolve(pkgRoot, 'src/index.ts'),
-        dependencies: [],
         private: packageJson.private,
         tar: path.join(distRoot, name.replace('/', '_') + '.tgz'),
         bin,
         name,
         packageJson,
+
+        dependencies: [],
+        hash: '',
       };
 
       return packages;
@@ -158,3 +198,9 @@ for (const pkgName of Object.keys(packages)) {
         || name in (pkgJson.peerDependencies || {});
   });
 }
+
+
+// Update the hash values of each.
+for (const pkgName of Object.keys(packages)) {
+  packages[pkgName].hash = _getHashOf(packages[pkgName]);
+}
diff --git a/scripts/release.ts b/scripts/release.ts
@@ -10,46 +10,19 @@ import * as fs from 'fs';
 import * as path from 'path';
 import * as semver from 'semver';
 import { ReleaseType } from 'semver';
-import { PackageInfo, packages } from '../lib/packages';
+import { packages } from '../lib/packages';
 
-const crypto = require('crypto');
-const glob = require('glob');
 const { hashes, versions } = require('../versions.json');
 
 
-const hashCache: {[name: string]: string} = {};
-function _getHashOf(pkg: PackageInfo): string {
-  if (!(pkg.name in hashCache)) {
-    const md5Stream = crypto.createHash('md5');
-
-    // Update the stream with all files content.
-    const files: string[] = glob.sync(path.join(pkg.root, '**'), { nodir: true });
-    files.forEach(filePath => {
-      md5Stream.write(`\0${filePath}\0`);
-      md5Stream.write(fs.readFileSync(filePath));
-    });
-    // Update the stream with all versions of upstream dependencies.
-    pkg.dependencies.forEach(depName => {
-      md5Stream.write(`\0${depName}\0${_getHashOf(packages[depName])}\0`);
-    });
-
-    md5Stream.end();
-
-    hashCache[pkg.name] = md5Stream.read().toString('hex');
-  }
-
-  return hashCache[pkg.name];
-}
-
-
 function _showVersions(logger: Logger) {
   for (const pkg of Object.keys(versions)) {
     if (!(pkg in packages)) {
       logger.fatal(`"${pkg}" not an official package...`);
     }
 
     const version = versions[pkg] || '???';
-    const hash = _getHashOf(packages[pkg]);
+    const hash = packages[pkg].hash;
     const diff = hashes[pkg] !== hash ? '!' : '';
 
     const pad1 = '                                  '.slice(pkg.length);
@@ -70,7 +43,7 @@ function _upgrade(release: string, logger: Logger) {
       versions[pkg] = '0.0.0';
     }
 
-    const hash = _getHashOf(packages[pkg]);
+    const hash = packages[pkg].hash;
     const version = versions[pkg];
     let newVersion: string = version;
 
