Observatory grab-bag for 1.4 release.

runtime/bin/vmservice/client/lib/src/service/object.dart

 // Copyright (c) 2014, 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.
 
 part of service;
 
 /// A [ServiceObject] is an object known to the VM service and is tied
 /// to an owning [Isolate].
 abstract class ServiceObject extends Observable {
   /// The owner of this [ServiceObject].  This can be an [Isolate], a
@@ skipping 12 matching lines @@
   String _id;
 
   /// The service type of this object.
   @reflectable String get serviceType => _serviceType;
   String _serviceType;
 
   /// The complete service url of this object.
   @reflectable String get link => isolate.relativeLink(_id);
 
   /// The complete service url of this object with a '#/' prefix.
+  // TODO(turnidge): Figure out why using a getter here messes up polymer.
   @reflectable String get hashLink => '#/${link}';
   @reflectable set hashLink(var o) { /* silence polymer */ }
 
   /// Has this object been fully loaded?
   bool get loaded => _loaded;
   bool _loaded = false;
 
   /// Is this object cacheable?  That is, is it impossible for the [id]
   /// of this object to change?
   bool get canCache => false;
@@ skipping 23 matching lines @@
     switch (type) {
       case 'Code':
         obj = new Code._empty(owner);
         break;
       case 'Error':
         obj = new DartError._empty(owner);
         break;
       case 'Isolate':
         obj = new Isolate._empty(owner);
         break;
+      case 'Library':
+        obj = new Library._empty(owner);
+        break;
       case 'ServiceError':
         obj = new ServiceError._empty(owner);
         break;
       case 'ServiceException':
         obj = new ServiceException._empty(owner);
         break;
       case 'Script':
         obj = new Script._empty(owner);
         break;
       default:
@@ skipping 483 matching lines @@
     // Cache miss.  Get the object from the vm directly.
     return vm.getAsMap(relativeLink(id)).then((ObservableMap map) {
         var obj = new ServiceObject._fromMap(this, map);
         if (obj.canCache) {
           _cache.putIfAbsent(id, () => obj);
         }
         return obj;
       });
   }
 
-  @observable ServiceMap rootLib;
-  @observable ObservableList<ServiceMap> libraries =
-      new ObservableList<ServiceMap>();
+  @observable Library rootLib;
+  @observable ObservableList<Library> libraries =
+      new ObservableList<Library>();
   @observable ObservableMap topFrame;
 
   @observable String name;
   @observable String vmName;
   @observable String mainPort;
   @observable Map entry;
 
   @observable final Map<String, double> timers =
       toObservable(new Map<String, double>());
 
@@ skipping 140 matching lines @@
 }
 
 /// A [ServiceObject] which implements [ObservableMap].
 class ServiceMap extends ServiceObject implements ObservableMap {
   final ObservableMap _map = new ObservableMap();
   static String objectIdRingPrefix = 'objects/';
 
   bool get canCache {
     return (_serviceType == 'Class' ||
             _serviceType == 'Function' ||
-            _serviceType == 'Library') &&
+            _serviceType == 'Field') &&
            !_id.startsWith(objectIdRingPrefix);
   }
-  bool get immutable => canCache;
+  bool get immutable => false;
 
   ServiceMap._empty(ServiceObjectOwner owner) : super._empty(owner);
 
   String toString() => _map.toString();
 
   void _upgradeValues() {
     assert(owner != null);
     _upgradeCollection(_map, owner);
   }
 
@@ skipping 88 matching lines @@
 
   void _update(ObservableMap map, bool mapIsRef) {
     kind = map['kind'];
     message = map['message'];
     response = map['response'];
     name = 'ServiceException $kind';
     vmName = name;
   }
 }
 
+class Library extends ServiceObject {
+  @observable String url;
+  @reflectable final imports = new ObservableList<Library>();
+  @reflectable final scripts = new ObservableList<Script>();
+  @reflectable final classes = new ObservableList<ServiceMap>();
+  @reflectable final variables = new ObservableList<ServiceMap>();
+  @reflectable final functions = new ObservableList<ServiceMap>();
+
+  bool get canCache => true;
+  bool get immutable => false;
+
+  Library._empty(ServiceObjectOwner owner) : super._empty(owner);
+
+  void _update(ObservableMap map, bool mapIsRef) {
+    url = map['url'];
+    var shortUrl = url;
+    if (url.startsWith('file://') ||
+        url.startsWith('http://')) {
+      shortUrl = url.substring(url.lastIndexOf('/') + 1);
+    }
+    name = map['user_name'];
+    if (name.isEmpty) {
+      name = shortUrl;
+    }
+    vmName = map['name'];
+    if (mapIsRef) {
+      return;
+    }
+    _loaded = true;
+    _upgradeCollection(map, isolate);
+    imports.clear();
+    imports.addAll(map['imports']);
+    scripts.clear();
+    scripts.addAll(map['scripts']);
+    classes.clear();
+    classes.addAll(map['classes']);
+    variables.clear();
+    variables.addAll(map['variables']);
+    functions.clear();
+    functions.addAll(map['functions']);
+  }
+}
+
 class ScriptLine {
   @reflectable final int line;
   @reflectable final String text;
   ScriptLine(this.line, this.text);
 }
 
 class Script extends ServiceObject {
   @reflectable final lines = new ObservableList<ScriptLine>();
   @reflectable final hits = new ObservableMap<int, int>();
   @observable String kind;
@@ skipping 563 matching lines @@
     var v = list[i];
     if ((v is ObservableMap) && _isServiceMap(v)) {
       list[i] = owner.getFromMap(v);
     } else if (v is ObservableList) {
       _upgradeObservableList(v, owner);
     } else if (v is ObservableMap) {
       _upgradeObservableMap(v, owner);
     }
   }
 }