feat: remove MapWrapper.create()/get()/set().

Better dart2js code, better Angular code.

Author: mprobst

modules/angular2/src/change_detection/coalesce.ts

@@ -1,5 +1,5 @@
 import {isPresent} from 'angular2/src/facade/lang';
-import {List, ListWrapper, Map, MapWrapper} from 'angular2/src/facade/collection';
+import {List, ListWrapper, Map} from 'angular2/src/facade/collection';
 import {RecordType, ProtoRecord} from './proto_record';
 
 /**
@@ -14,7 +14,7 @@ import {RecordType, ProtoRecord} from './proto_record';
  */
 export function coalesce(records: List<ProtoRecord>): List<ProtoRecord> {
   var res: List<ProtoRecord> = [];
-  var indexMap: Map<number, number> = MapWrapper.create();
+  var indexMap: Map<number, number> = new Map<number, number>();
 
   for (var i = 0; i < records.length; ++i) {
     var r = records[i];
@@ -23,14 +23,14 @@ export function coalesce(records: List<ProtoRecord>): List<ProtoRecord> {
 
     if (isPresent(matchingRecord) && record.lastInBinding) {
       res.push(_selfRecord(record, matchingRecord.selfIndex, res.length + 1));
-      MapWrapper.set(indexMap, r.selfIndex, matchingRecord.selfIndex);
+      indexMap.set(r.selfIndex, matchingRecord.selfIndex);
 
     } else if (isPresent(matchingRecord) && !record.lastInBinding) {
-      MapWrapper.set(indexMap, r.selfIndex, matchingRecord.selfIndex);
+      indexMap.set(r.selfIndex, matchingRecord.selfIndex);
 
     } else {
       res.push(record);
-      MapWrapper.set(indexMap, r.selfIndex, record.selfIndex);
+      indexMap.set(r.selfIndex, record.selfIndex);
     }
   }
 
@@ -59,6 +59,6 @@ function _replaceIndices(r: ProtoRecord, selfIndex: number, indexMap: Map<any, a
 }
 
 function _map(indexMap: Map<any, any>, value: number) {
-  var r = MapWrapper.get(indexMap, value);
+  var r = indexMap.get(value);
   return isPresent(r) ? r : value;
 }

modules/angular2/src/change_detection/parser/locals.ts

@@ -18,7 +18,7 @@ export class Locals {
 
   get(name: string) {
     if (MapWrapper.contains(this.current, name)) {
-      return MapWrapper.get(this.current, name);
+      return this.current.get(name);
     }
 
     if (isPresent(this.parent)) {
@@ -33,7 +33,7 @@ export class Locals {
     // exposed to the public API.
     // TODO: vsavkin maybe it should check only the local map
     if (MapWrapper.contains(this.current, name)) {
-      MapWrapper.set(this.current, name, value);
+      this.current.set(name, value);
     } else {
       throw new BaseException(
           `Setting of new keys post-construction is not supported. Key: ${name}.`);

modules/angular2/src/change_detection/pipes/iterable_changes.ts

@@ -574,16 +574,16 @@ class _DuplicateItemRecordList {
 }
 
 class _DuplicateMap {
-  map: Map<any, _DuplicateItemRecordList> = MapWrapper.create();
+  map: Map<any, _DuplicateItemRecordList> = new Map();
 
   put(record: CollectionChangeRecord) {
     // todo(vicb) handle corner cases
     var key = getMapKey(record.item);
 
-    var duplicates = MapWrapper.get(this.map, key);
+    var duplicates = this.map.get(key);
     if (!isPresent(duplicates)) {
       duplicates = new _DuplicateItemRecordList();
-      MapWrapper.set(this.map, key, duplicates);
+      this.map.set(key, duplicates);
     }
     duplicates.add(record);
   }
@@ -598,7 +598,7 @@ class _DuplicateMap {
   get(value, afterIndex = null): CollectionChangeRecord {
     var key = getMapKey(value);
 
-    var recordList = MapWrapper.get(this.map, key);
+    var recordList = this.map.get(key);
     return isBlank(recordList) ? null : recordList.get(value, afterIndex);
   }
 
@@ -611,7 +611,7 @@ class _DuplicateMap {
     var key = getMapKey(record.item);
     // todo(vicb)
     // assert(this.map.containsKey(key));
-    var recordList: _DuplicateItemRecordList = MapWrapper.get(this.map, key);
+    var recordList: _DuplicateItemRecordList = this.map.get(key);
     // Remove the list of duplicates when it gets empty
     if (recordList.remove(record)) {
       MapWrapper.delete(this.map, key);

modules/angular2/src/change_detection/pipes/keyvalue_changes.ts

@@ -19,7 +19,7 @@ export class KeyValueChangesFactory extends PipeFactory {
  * @exportedAs angular2/pipes
  */
 export class KeyValueChanges extends Pipe {
-  private _records: Map<any, any> = MapWrapper.create();
+  private _records: Map<any, any> = new Map();
   private _mapHead: KVChangeRecord = null;
   private _previousMapHead: KVChangeRecord = null;
   private _changesHead: KVChangeRecord = null;
@@ -106,10 +106,10 @@ export class KeyValueChanges extends Pipe {
           this._addToRemovals(oldSeqRecord);
         }
         if (MapWrapper.contains(records, key)) {
-          newSeqRecord = MapWrapper.get(records, key);
+          newSeqRecord = records.get(key);
         } else {
           newSeqRecord = new KVChangeRecord(key);
-          MapWrapper.set(records, key, newSeqRecord);
+          records.set(key, newSeqRecord);
           newSeqRecord.currentValue = value;
           this._addToAdditions(newSeqRecord);
         }

modules/angular2/src/core/compiler/compiler.ts

@@ -32,24 +32,22 @@ import * as renderApi from 'angular2/src/render/api';
  */
 @Injectable()
 export class CompilerCache {
-  _cache: Map<Type, AppProtoView> = MapWrapper.create();
-  _hostCache: Map<Type, AppProtoView> = MapWrapper.create();
+  _cache: Map<Type, AppProtoView> = new Map();
+  _hostCache: Map<Type, AppProtoView> = new Map();
 
-  set(component: Type, protoView: AppProtoView): void {
-    MapWrapper.set(this._cache, component, protoView);
-  }
+  set(component: Type, protoView: AppProtoView): void { this._cache.set(component, protoView); }
 
   get(component: Type): AppProtoView {
-    var result = MapWrapper.get(this._cache, component);
+    var result = this._cache.get(component);
     return normalizeBlank(result);
   }
 
   setHost(component: Type, protoView: AppProtoView): void {
-    MapWrapper.set(this._hostCache, component, protoView);
+    this._hostCache.set(component, protoView);
   }
 
   getHost(component: Type): AppProtoView {
-    var result = MapWrapper.get(this._hostCache, component);
+    var result = this._hostCache.get(component);
     return normalizeBlank(result);
   }
 
@@ -79,7 +77,7 @@ export class Compiler {
               render: renderApi.RenderCompiler, protoViewFactory: ProtoViewFactory) {
     this._reader = reader;
     this._compilerCache = cache;
-    this._compiling = MapWrapper.create();
+    this._compiling = new Map();
     this._templateResolver = templateResolver;
     this._componentUrlMapper = componentUrlMapper;
     this._urlResolver = urlResolver;
@@ -132,7 +130,7 @@ export class Compiler {
       return protoView;
     }
 
-    var pvPromise = MapWrapper.get(this._compiling, component);
+    var pvPromise = this._compiling.get(component);
     if (isPresent(pvPromise)) {
       // The component is already being compiled, attach to the existing Promise
       // instead of re-compiling the component.
@@ -160,7 +158,7 @@ export class Compiler {
               return this._compileNestedProtoViews(componentBinding, renderPv, boundDirectives);
             });
 
-    MapWrapper.set(this._compiling, component, pvPromise);
+    this._compiling.set(component, pvPromise);
     return pvPromise;
   }
 

modules/angular2/src/core/compiler/component_url_mapper.ts

@@ -16,15 +16,13 @@ export class RuntimeComponentUrlMapper extends ComponentUrlMapper {
 
   constructor() {
     super();
-    this._componentUrls = MapWrapper.create();
+    this._componentUrls = new Map();
   }
 
-  setComponentUrl(component: Type, url: string) {
-    MapWrapper.set(this._componentUrls, component, url);
-  }
+  setComponentUrl(component: Type, url: string) { this._componentUrls.set(component, url); }
 
   getUrl(component: Type): string {
-    var url = MapWrapper.get(this._componentUrls, component);
+    var url = this._componentUrls.get(component);
     if (isPresent(url)) return url;
     return super.getUrl(component);
   }

modules/angular2/src/core/compiler/element_injector.ts

@@ -234,7 +234,7 @@ export class DirectiveBinding extends ResolvedBinding {
   get hostActions(): Map<string, string> {
     return isPresent(this.metadata) && isPresent(this.metadata.hostActions) ?
                this.metadata.hostActions :
-               MapWrapper.create();
+               new Map();
   }
 
   get changeDetection() { return this.metadata.changeDetection; }
@@ -418,14 +418,14 @@ export class ProtoElementInjector {
   private static _createHostInjectorBindingData(dirBindings: List<ResolvedBinding>,
                                                 bd: List<BindingData>,
                                                 firstBindingIsComponent: boolean) {
-    var visitedIds: Map<number, boolean> = MapWrapper.create();
+    var visitedIds: Map<number, boolean> = new Map();
     ListWrapper.forEach(dirBindings, dirBinding => {
       ListWrapper.forEach(dirBinding.resolvedHostInjectables, b => {
         if (MapWrapper.contains(visitedIds, b.key.id)) {
           throw new BaseException(
               `Multiple directives defined the same host injectable: "${stringify(b.key.token)}"`);
         }
-        MapWrapper.set(visitedIds, b.key.id, true);
+        visitedIds.set(b.key.id, true);
         bd.push(ProtoElementInjector._createBindingData(firstBindingIsComponent, dirBinding,
                                                         dirBindings,
                                                         ProtoElementInjector._createBinding(b)));
@@ -734,7 +734,7 @@ export class ElementInjector extends TreeNode<ElementInjector> {
   }
 
   getVariableBinding(name: string): any {
-    var index = MapWrapper.get(this._proto.directiveVariableBindings, name);
+    var index = this._proto.directiveVariableBindings.get(name);
     return isPresent(index) ? this.getDirectiveAtIndex(<number>index) : this.getElementRef();
   }
 
@@ -892,7 +892,7 @@ export class ElementInjector extends TreeNode<ElementInjector> {
   private _buildAttribute(dep: DirectiveDependency): string {
     var attributes = this._proto.attributes;
     if (isPresent(attributes) && MapWrapper.contains(attributes, dep.attributeName)) {
-      return MapWrapper.get(attributes, dep.attributeName);
+      return attributes.get(dep.attributeName);
     } else {
       return null;
     }

modules/angular2/src/core/compiler/proto_view_factory.ts

@@ -20,7 +20,7 @@ import {ElementBinder} from './element_binder';
 import {ProtoElementInjector, DirectiveBinding} from './element_injector';
 
 class BindingRecordsCreator {
-  _directiveRecordsMap: Map<number, DirectiveRecord> = MapWrapper.create();
+  _directiveRecordsMap: Map<number, DirectiveRecord> = new Map();
   _textNodeIndex: number = 0;
 
   getBindingRecords(elementBinders: List<renderApi.ElementBinder>,
@@ -116,17 +116,18 @@ class BindingRecordsCreator {
     var id = boundElementIndex * 100 + directiveIndex;
 
     if (!MapWrapper.contains(this._directiveRecordsMap, id)) {
-      MapWrapper.set(this._directiveRecordsMap, id, new DirectiveRecord({
-                       directiveIndex: new DirectiveIndex(boundElementIndex, directiveIndex),
-                       callOnAllChangesDone: directiveMetadata.callOnAllChangesDone,
-                       callOnChange: directiveMetadata.callOnChange,
-                       callOnCheck: directiveMetadata.callOnCheck,
-                       callOnInit: directiveMetadata.callOnInit,
-                       changeDetection: directiveMetadata.changeDetection
-                     }));
+      this._directiveRecordsMap.set(
+          id, new DirectiveRecord({
+            directiveIndex: new DirectiveIndex(boundElementIndex, directiveIndex),
+            callOnAllChangesDone: directiveMetadata.callOnAllChangesDone,
+            callOnChange: directiveMetadata.callOnChange,
+            callOnCheck: directiveMetadata.callOnCheck,
+            callOnInit: directiveMetadata.callOnInit,
+            changeDetection: directiveMetadata.changeDetection
+          }));
     }
 
-    return MapWrapper.get(this._directiveRecordsMap, id);
+    return this._directiveRecordsMap.get(id);
   }
 }
 
@@ -245,10 +246,9 @@ function _collectNestedProtoViewsVariableBindings(
 }
 
 function _createVariableBindings(renderProtoView): Map<string, string> {
-  var variableBindings = MapWrapper.create();
-  MapWrapper.forEach(renderProtoView.variableBindings, (mappedName, varName) => {
-    MapWrapper.set(variableBindings, varName, mappedName);
-  });
+  var variableBindings = new Map();
+  MapWrapper.forEach(renderProtoView.variableBindings,
+                     (mappedName, varName) => { variableBindings.set(varName, mappedName); });
   return variableBindings;
 }
 
@@ -276,12 +276,11 @@ function _createVariableNames(parentVariableNames, renderProtoView): List<string
 
 export function createVariableLocations(
     elementBinders: List<renderApi.ElementBinder>): Map<string, number> {
-  var variableLocations = MapWrapper.create();
+  var variableLocations = new Map();
   for (var i = 0; i < elementBinders.length; i++) {
     var binder = elementBinders[i];
-    MapWrapper.forEach(binder.variableBindings, (mappedName, varName) => {
-      MapWrapper.set(variableLocations, mappedName, i);
-    });
+    MapWrapper.forEach(binder.variableBindings,
+                       (mappedName, varName) => { variableLocations.set(mappedName, i); });
   }
   return variableLocations;
 }
@@ -348,7 +347,7 @@ function _createProtoElementInjector(binderIndex, parentPeiWithDistance, renderE
   return protoElementInjector;
 }
 
-function _createElementBinder(protoView, boundElementIndex, renderElementBinder,
+function _createElementBinder(protoView: AppProtoView, boundElementIndex, renderElementBinder,
                               protoElementInjector, componentDirectiveBinding,
                               directiveBindings): ElementBinder {
   var parent = null;
@@ -363,19 +362,18 @@ function _createElementBinder(protoView, boundElementIndex, renderElementBinder,
   // in order to prevent new variables from being set later in the lifecycle. Since we don't want
   // to actually create variable bindings for the $implicit bindings, add to the
   // protoLocals manually.
-  MapWrapper.forEach(renderElementBinder.variableBindings, (mappedName, varName) => {
-    MapWrapper.set(protoView.protoLocals, mappedName, null);
-  });
+  MapWrapper.forEach(renderElementBinder.variableBindings,
+                     (mappedName, varName) => { protoView.protoLocals.set(mappedName, null); });
   return elBinder;
 }
 
 export function createDirectiveVariableBindings(
     renderElementBinder: renderApi.ElementBinder,
     directiveBindings: List<DirectiveBinding>): Map<string, number> {
-  var directiveVariableBindings = MapWrapper.create();
+  var directiveVariableBindings = new Map();
   MapWrapper.forEach(renderElementBinder.variableBindings, (templateName, exportAs) => {
     var dirIndex = _findDirectiveIndexByExportAs(renderElementBinder, directiveBindings, exportAs);
-    MapWrapper.set(directiveVariableBindings, templateName, dirIndex);
+    directiveVariableBindings.set(templateName, dirIndex);
   });
   return directiveVariableBindings;
 }

modules/angular2/src/core/compiler/template_resolver.ts

@@ -9,14 +9,14 @@ import {reflector} from 'angular2/src/reflection/reflection';
 
 @Injectable()
 export class TemplateResolver {
-  _cache: Map<Type, /*node*/ any> = MapWrapper.create();
+  _cache: Map<Type, /*node*/ any> = new Map();
 
   resolve(component: Type): View {
-    var view = MapWrapper.get(this._cache, component);
+    var view = this._cache.get(component);
 
     if (isBlank(view)) {
       view = this._resolve(component);
-      MapWrapper.set(this._cache, component, view);
+      this._cache.set(component, view);
     }
 
     return view;