Add file hashes to SdkBundle; rename to PackageBundle.

pkg/analyzer_cli/lib/src/package_analyzer.dart

 // Copyright (c) 2015, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 library analyzer_cli.src.package_analyzer;
 
+import 'dart:convert';
 import 'dart:core' hide Resource;
 import 'dart:io' as io;
 
 import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/file_system/file_system.dart';
 import 'package:analyzer/file_system/physical_file_system.dart';
 import 'package:analyzer/source/package_map_resolver.dart';
 import 'package:analyzer/src/context/cache.dart';
 import 'package:analyzer/src/context/context.dart';
 import 'package:analyzer/src/generated/engine.dart';
 import 'package:analyzer/src/generated/error.dart';
 import 'package:analyzer/src/generated/resolver.dart';
 import 'package:analyzer/src/generated/sdk_io.dart';
 import 'package:analyzer/src/generated/source.dart';
 import 'package:analyzer/src/generated/source_io.dart';
 import 'package:analyzer/src/summary/format.dart';
 import 'package:analyzer/src/summary/idl.dart';
 import 'package:analyzer/src/summary/resynthesize.dart';
 import 'package:analyzer/src/summary/summarize_elements.dart';
 import 'package:analyzer/src/summary/summary_sdk.dart';
 import 'package:analyzer/src/task/dart.dart';
 import 'package:analyzer/task/dart.dart';
 import 'package:analyzer/task/model.dart';
 import 'package:analyzer_cli/src/analyzer_impl.dart';
 import 'package:analyzer_cli/src/driver.dart';
 import 'package:analyzer_cli/src/error_formatter.dart';
 import 'package:analyzer_cli/src/options.dart';
+import 'package:crypto/crypto.dart';
 import 'package:path/path.dart' as pathos;
 
 /**
  * If [uri] has the `package` scheme in form of `package:pkg/file.dart`,
  * return the `pkg` name.  Otherwise return `null`.
  */
 String getPackageName(Uri uri) {
   if (uri.scheme != 'package') {
     return null;
   }
@@ skipping 34 matching lines @@
   }
 
   @override
   bool hasLibrarySummary(String uri) {
     return linkedMap.containsKey(uri);
   }
 
   void _fillMaps(String path) {
     io.File file = new io.File(path);
     List<int> buffer = file.readAsBytesSync();
-    SdkBundle bundle = new SdkBundle.fromBuffer(buffer);
+    PackageBundle bundle = new PackageBundle.fromBuffer(buffer);
     for (int i = 0; i < bundle.unlinkedUnitUris.length; i++) {
       unlinkedMap[bundle.unlinkedUnitUris[i]] = bundle.unlinkedUnits[i];
     }
     for (int i = 0; i < bundle.linkedLibraryUris.length; i++) {
       linkedMap[bundle.linkedLibraryUris[i]] = bundle.linkedLibraries[i];
     }
   }
 }
 
 /**
@@ skipping 145 matching lines @@
   String packageLibPath;
 
   final ResourceProvider resourceProvider = PhysicalResourceProvider.INSTANCE;
   InternalAnalysisContext context;
   final List<Source> explicitSources = <Source>[];
 
   final List<String> linkedLibraryUris = <String>[];
   final List<LinkedLibraryBuilder> linkedLibraries = <LinkedLibraryBuilder>[];
   final List<String> unlinkedUnitUris = <String>[];
   final List<UnlinkedUnitBuilder> unlinkedUnits = <UnlinkedUnitBuilder>[];
+  final List<String> unlinkedUnitHashes = <String>[];
 
   PackageAnalyzer(this.options);
 
   /**
    * Perform package analysis according to the given [options].
    */
   ErrorSeverity analyze() {
     packagePath = options.packageModePath;
     packageLibPath = resourceProvider.pathContext.join(packagePath, 'lib');
     if (packageLibPath == null) {
@@ skipping 41 matching lines @@
     if (options.packageSummaryOutput != null) {
       for (Source source in context.librarySources) {
         if (pathos.isWithin(packageLibPath, source.fullName)) {
           LibraryElement libraryElement = context.getLibraryElement(source);
           if (libraryElement != null) {
             _serializeSingleLibrary(libraryElement);
           }
         }
       }
       // Write the whole package bundle.
-      SdkBundleBuilder sdkBundle = new SdkBundleBuilder(
+      PackageBundleBuilder sdkBundle = new PackageBundleBuilder(
           linkedLibraryUris: linkedLibraryUris,
           linkedLibraries: linkedLibraries,
           unlinkedUnitUris: unlinkedUnitUris,
-          unlinkedUnits: unlinkedUnits);
+          unlinkedUnits: unlinkedUnits,
+          unlinkedUnitHashes: unlinkedUnitHashes);
       io.File file = new io.File(options.packageSummaryOutput);
       file.writeAsBytesSync(sdkBundle.toBuffer(), mode: io.FileMode.WRITE_ONLY);
     }
 
     // Process errors.
     _printErrors();
     return _computeMaxSeverity();
   }
 
   ErrorSeverity _computeMaxSeverity() {
@@ skipping 42 matching lines @@
   Source _createSourceInContext(File file) {
     Source source = file.createSource();
     if (context == null) {
       return source;
     }
     Uri uri = context.sourceFactory.restoreUri(source);
     return file.createSource(uri);
   }
 
   /**
+   * Compute a hash of the given file contents.
+   */
+  String _hash(String contents) {
+    MD5 md5 = new MD5();
+    md5.add(UTF8.encode(contents));
+    return CryptoUtils.bytesToHex(md5.close());
+  }
+
+  /**
    * Print errors for all explicit sources.
    */
   void _printErrors() {
     StringSink sink = options.machineFormat ? errorSink : outSink;
     ErrorFormatter formatter = new ErrorFormatter(
         sink,
         options,
         (AnalysisError error) =>
             AnalyzerImpl.processError(error, options, context));
     for (Source source in explicitSources) {
       AnalysisErrorInfo errorInfo = context.getErrors(source);
       formatter.formatErrors([errorInfo]);
     }
   }
 
   /**
    * Serialize the library with the given [element].
    */
   void _serializeSingleLibrary(LibraryElement element) {
     String uri = element.source.uri.toString();
     LibrarySerializationResult libraryResult =
         serializeLibrary(element, context.typeProvider, options.strongMode);
     linkedLibraryUris.add(uri);
     linkedLibraries.add(libraryResult.linked);
     unlinkedUnitUris.addAll(libraryResult.unitUris);
     unlinkedUnits.addAll(libraryResult.unlinkedUnits);
+    for (Source source in libraryResult.unitSources) {
+      unlinkedUnitHashes.add(_hash(source.contents.data));
+    }
   }
 }