Clean up the semantics of package descriptions.

lib/src/lock_file.dart

 // Copyright (c) 2012, 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 pub.lock_file;
 
 import 'dart:collection';
 
 import 'package:path/path.dart' as p;
 import 'package:package_config/packages_file.dart' as packages_file;
 import 'package:pub_semver/pub_semver.dart';
 import 'package:source_span/source_span.dart';
 import 'package:yaml/yaml.dart';
 
 import 'io.dart';
 import 'package.dart';
 import 'source_registry.dart';
 import 'utils.dart';
 
 /// A parsed and validated `pubspec.lock` file.
 class LockFile {
   /// The source registry with which the lock file's IDs are interpreted.
   final SourceRegistry _sources;
 
   /// The packages this lockfile pins.
   final Map<String, PackageId> packages;
 
   /// Creates a new lockfile containing [ids].
-  ///
-  /// Throws an [ArgumentError] if any package has an unresolved ID according to
-  /// [Source.isResolved].
   factory LockFile(Iterable<PackageId> ids, SourceRegistry sources) {
-    var packages = {};
-    for (var id in ids) {
-      if (id.isRoot) continue;
-
-      if (!sources[id.source].isResolved(id)) {
-        throw new ArgumentError('ID "$id" is not resolved.');
-      }
-
-      packages[id.name] = id;
-    }
-
+    var packages = new Map.fromIterable(
+        ids.where((id) => !id.isRoot),
+        key: (id) => id.name);
     return new LockFile._(packages, sources);
   }
 
   LockFile._(Map<String, PackageId> packages, this._sources)
       : packages = new UnmodifiableMapView(packages);
 
   LockFile.empty(this._sources)
       : packages = const {};
 
   /// Loads a lockfile from [filePath].
@@ skipping 37 matching lines @@
         _validate(spec.containsKey('source'),
             'Package $name is missing a source.', spec);
         var sourceName = spec['source'];
 
         _validate(spec.containsKey('description'),
             'Package $name is missing a description.', spec);
         var description = spec['description'];
 
         // Let the source parse the description.
         var source = sources[sourceName];
+        var id;
         try {
-          description = source.parseDescription(filePath, description,
-              fromLockFile: true);
+          id = source.parseId(name, version, description);
         } on FormatException catch (ex) {
           throw new SourceSpanFormatException(ex.message,
-              spec.nodes['source'].span);
+              spec.nodes['description'].span);
         }
 
-        var id = new PackageId(name, sourceName, version, description);
-
         // Validate the name.
         _validate(name == id.name,
             "Package name $name doesn't match ${id.name}.", spec);
 
         packages[name] = id;
       });
     }
 
     return new LockFile._(packages, sources);
   }
 
   /// If [condition] is `false` throws a format error with [message] for [node].
   static void _validate(bool condition, String message, YamlNode node) {
     if (condition) return;
     throw new SourceSpanFormatException(message, node.span);
   }
 
   /// Returns a copy of this LockFile with [id] added.
   ///
-  /// Throws an [ArgumentError] if [id] isn't resolved according to
-  /// [Source.isResolved]. If there's already an ID with the same name as [id]
-  /// in the LockFile, it's overwritten.
+  /// If there's already an ID with the same name as [id] in the LockFile, it's
+  /// overwritten.
   LockFile setPackage(PackageId id) {
     if (id.isRoot) return this;
 
-    if (!_sources[id.source].isResolved(id)) {
-      throw new ArgumentError('ID "$id" is not resolved.');
-    }
-
     var packages = new Map.from(this.packages);
     packages[id.name] = id;
     return new LockFile._(packages, _sources);
   }
 
   /// Returns a copy of this LockFile with a package named [name] removed.
   ///
   /// Returns an identical [LockFile] if there's no package named [name].
   LockFile removePackage(String name) {
     if (!this.packages.containsKey(name)) return this;
@@ skipping 41 matching lines @@
       };
     });
 
     return """
 # Generated by pub
 # See http://pub.dartlang.org/doc/glossary.html#lockfile
 ${yamlToString({'packages': data})}
 """;
   }
 }