refactor(ListWrapper): get ride of ListWrapper.join

vicb · vicb · commit b6537ad6091e · 2015-10-07T06:39:14.000Z
diff --git a/modules/angular2/src/core/change_detection/codegen_name_util.ts b/modules/angular2/src/core/change_detection/codegen_name_util.ts
@@ -109,8 +109,8 @@ export class CodegenNameUtil {
       }
     }
     var assignmentsCode =
-        ListWrapper.isEmpty(assignments) ? '' : `${ListWrapper.join(assignments, '=')} = false;`;
-    return `var ${ListWrapper.join(declarations, ',')};${assignmentsCode}`;
+        ListWrapper.isEmpty(assignments) ? '' : `${assignments.join('=')} = false;`;
+    return `var ${declarations.join(',')};${assignmentsCode}`;
   }
 
   /**
@@ -169,20 +169,16 @@ export class CodegenNameUtil {
 
     // At least one assignment.
     fields.push(`${this._utilName}.uninitialized;`);
-    return ListWrapper.join(fields, ' = ');
+    return fields.join(' = ');
   }
 
   /**
    * Generates statements destroying all pipe variables.
    */
   genPipeOnDestroy(): string {
-    return ListWrapper.join(
-        ListWrapper.map(
-            ListWrapper.filter(this._records, (r) => { return r.isPipeRecord(); }),
-            (r) => {
-              return `${this._utilName}.callPipeOnDestroy(${this.getPipeName(r.selfIndex)});`;
-            }),
-        '\n');
+    return ListWrapper.filter(this._records, (r) => { return r.isPipeRecord(); })
+        .map(r => `${this._utilName}.callPipeOnDestroy(${this.getPipeName(r.selfIndex)});`)
+        .join('\n');
   }
 
   getPipeName(idx: number): string {
diff --git a/modules/angular2/src/core/change_detection/proto_change_detector.ts b/modules/angular2/src/core/change_detection/proto_change_detector.ts
@@ -314,8 +314,7 @@ function _arrayFn(length: number): Function {
 }
 
 function _mapPrimitiveName(keys: any[]) {
-  var stringifiedKeys =
-      ListWrapper.join(ListWrapper.map(keys, (k) => isString(k) ? `"${k}"` : `${k}`), ", ");
+  var stringifiedKeys = keys.map(k => isString(k) ? `"${k}"` : `${k}`).join(', ');
   return `mapFn([${stringifiedKeys}])`;
 }
 
diff --git a/modules/angular2/src/core/compiler/xhr_mock.ts b/modules/angular2/src/core/compiler/xhr_mock.ts
@@ -5,15 +5,9 @@ import {BaseException, WrappedException} from 'angular2/src/core/facade/exceptio
 import {PromiseCompleter, PromiseWrapper, Promise} from 'angular2/src/core/facade/async';
 
 export class MockXHR extends XHR {
-  private _expectations: _Expectation[];
+  private _expectations: _Expectation[] = [];
   private _definitions = new Map<string, string>();
-  private _requests: _PendingRequest[];
-
-  constructor() {
-    super();
-    this._expectations = [];
-    this._requests = [];
-  }
+  private _requests: _PendingRequest[] = [];
 
   get(url: string): Promise<string> {
     var request = new _PendingRequest(url);
@@ -50,7 +44,7 @@ export class MockXHR extends XHR {
       urls.push(expectation.url);
     }
 
-    throw new BaseException(`Unsatisfied requests: ${ListWrapper.join(urls, ', ')}`);
+    throw new BaseException(`Unsatisfied requests: ${urls.join(', ')}`);
   }
 
   private _processRequest(request: _PendingRequest) {
diff --git a/modules/angular2/src/core/debug/debug_element_view_listener.ts b/modules/angular2/src/core/debug/debug_element_view_listener.ts
@@ -20,7 +20,7 @@ var _nextId = 0;
 
 function _setElementId(element, indices: number[]) {
   if (isPresent(element)) {
-    DOM.setData(element, NG_ID_PROPERTY, ListWrapper.join(indices, NG_ID_SEPARATOR));
+    DOM.setData(element, NG_ID_PROPERTY, indices.join(NG_ID_SEPARATOR));
   }
 }
 
diff --git a/modules/angular2/src/core/dom/parse5_adapter.ts b/modules/angular2/src/core/dom/parse5_adapter.ts
@@ -356,15 +356,15 @@ export class Parse5DomAdapter extends DomAdapter {
     var index = classList.indexOf(classname);
     if (index == -1) {
       classList.push(classname);
-      element.attribs["class"] = element.className = ListWrapper.join(classList, " ");
+      element.attribs["class"] = element.className = classList.join(" ");
     }
   }
   removeClass(element, classname: string) {
     var classList = this.classList(element);
     var index = classList.indexOf(classname);
     if (index > -1) {
       classList.splice(index, 1);
-      element.attribs["class"] = element.className = ListWrapper.join(classList, " ");
+      element.attribs["class"] = element.className = classList.join(" ");
     }
   }
   hasClass(element, classname: string): boolean {
diff --git a/modules/angular2/src/core/facade/collection.dart b/modules/angular2/src/core/facade/collection.dart
@@ -167,7 +167,6 @@ class ListWrapper {
     l.clear();
   }
 
-  static String join(List l, String s) => l.join(s);
   static bool isEmpty(Iterable list) => list.isEmpty;
   static void fill(List l, value, [int start = 0, int end]) {
     l.fillRange(_startOffset(l, start), _endOffset(l, end), value);
diff --git a/modules/angular2/src/core/facade/collection.ts b/modules/angular2/src/core/facade/collection.ts
@@ -245,7 +245,6 @@ export class ListWrapper {
     return false;
   }
   static clear(list: any[]) { list.length = 0; }
-  static join(list: any[], s: string): string { return list.join(s); }
   static isEmpty(list: any[]): boolean { return list.length == 0; }
   static fill(list: any[], value: any, start: number = 0, end: number = null) {
     list.fill(value, start, end === null ? list.length : end);
diff --git a/modules/angular2/src/core/forms/directives/shared.ts b/modules/angular2/src/core/forms/directives/shared.ts
@@ -42,7 +42,7 @@ export function setUpControl(control: Control, dir: NgControl): void {
 }
 
 function _throwError(dir: NgControl, message: string): void {
-  var path = ListWrapper.join(dir.path, " -> ");
+  var path = dir.path.join(" -> ");
   throw new BaseException(`${message} '${path}'`);
 }
 
diff --git a/modules/angular2/src/http/url_search_params.ts b/modules/angular2/src/http/url_search_params.ts
@@ -130,7 +130,7 @@ export class URLSearchParams {
     MapWrapper.forEach(this.paramsMap, (values, k) => {
       ListWrapper.forEach(values, v => { paramsList.push(k + '=' + v); });
     });
-    return ListWrapper.join(paramsList, '&');
+    return paramsList.join('&');
   }
 
   delete (param: string): void { MapWrapper.delete(this.paramsMap, param); }
diff --git a/modules/angular2/src/test_lib/utils.ts b/modules/angular2/src/test_lib/utils.ts
@@ -21,7 +21,7 @@ export class Log {
 
   clear(): void { this._result = []; }
 
-  result(): string { return ListWrapper.join(this._result, "; "); }
+  result(): string { return this._result.join("; "); }
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -314,8 +314,7 @@ function _arrayFn(length: number): Function {`
`314`	`314`	`}`
`315`	`315`
`316`	`316`	`function _mapPrimitiveName(keys: any[]) {`
`317`		`- var stringifiedKeys =`
`318`		- ListWrapper.join(ListWrapper.map(keys, (k) => isString(k) ? `"${k}"` : `${k}`), ", ");
	`317`	+ var stringifiedKeys = keys.map(k => isString(k) ? `"${k}"` : `${k}`).join(', ');
`319`	`318`	return `mapFn([${stringifiedKeys}])`;
`320`	`319`	`}`
`321`	`320`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ var _nextId = 0;`
`20`	`20`
`21`	`21`	`function _setElementId(element, indices: number[]) {`
`22`	`22`	`if (isPresent(element)) {`
`23`		`- DOM.setData(element, NG_ID_PROPERTY, ListWrapper.join(indices, NG_ID_SEPARATOR));`
	`23`	`+ DOM.setData(element, NG_ID_PROPERTY, indices.join(NG_ID_SEPARATOR));`
`24`	`24`	`}`
`25`	`25`	`}`
`26`	`26`
Original file line number	Diff line number	Diff line change
`@@ -356,15 +356,15 @@ export class Parse5DomAdapter extends DomAdapter {`
`356`	`356`	`var index = classList.indexOf(classname);`
`357`	`357`	`if (index == -1) {`
`358`	`358`	`classList.push(classname);`
`359`		`- element.attribs["class"] = element.className = ListWrapper.join(classList, " ");`
	`359`	`+ element.attribs["class"] = element.className = classList.join(" ");`
`360`	`360`	`}`
`361`	`361`	`}`
`362`	`362`	`removeClass(element, classname: string) {`
`363`	`363`	`var classList = this.classList(element);`
`364`	`364`	`var index = classList.indexOf(classname);`
`365`	`365`	`if (index > -1) {`
`366`	`366`	`classList.splice(index, 1);`
`367`		`- element.attribs["class"] = element.className = ListWrapper.join(classList, " ");`
	`367`	`+ element.attribs["class"] = element.className = classList.join(" ");`
`368`	`368`	`}`
`369`	`369`	`}`
`370`	`370`	`hasClass(element, classname: string): boolean {`
Original file line number	Diff line number	Diff line change
`@@ -167,7 +167,6 @@ class ListWrapper {`
`167`	`167`	`l.clear();`
`168`	`168`	`}`
`169`	`169`
`170`		`- static String join(List l, String s) => l.join(s);`
`171`	`170`	`static bool isEmpty(Iterable list) => list.isEmpty;`
`172`	`171`	`static void fill(List l, value, [int start = 0, int end]) {`
`173`	`172`	`l.fillRange(_startOffset(l, start), _endOffset(l, end), value);`
Original file line number	Diff line number	Diff line change
`@@ -245,7 +245,6 @@ export class ListWrapper {`
`245`	`245`	`return false;`
`246`	`246`	`}`
`247`	`247`	`static clear(list: any[]) { list.length = 0; }`
`248`		`- static join(list: any[], s: string): string { return list.join(s); }`
`249`	`248`	`static isEmpty(list: any[]): boolean { return list.length == 0; }`
`250`	`249`	`static fill(list: any[], value: any, start: number = 0, end: number = null) {`
`251`	`250`	`list.fill(value, start, end === null ? list.length : end);`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ export function setUpControl(control: Control, dir: NgControl): void {`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`function _throwError(dir: NgControl, message: string): void {`
`45`		`- var path = ListWrapper.join(dir.path, " -> ");`
	`45`	`+ var path = dir.path.join(" -> ");`
`46`	`46`	throw new BaseException(`${message} '${path}'`);
`47`	`47`	`}`
`48`	`48`
Original file line number	Diff line number	Diff line change
`@@ -130,7 +130,7 @@ export class URLSearchParams {`
`130`	`130`	`MapWrapper.forEach(this.paramsMap, (values, k) => {`
`131`	`131`	`ListWrapper.forEach(values, v => { paramsList.push(k + '=' + v); });`
`132`	`132`	`});`
`133`		`- return ListWrapper.join(paramsList, '&');`
	`133`	`+ return paramsList.join('&');`
`134`	`134`	`}`
`135`	`135`
`136`	`136`	`delete (param: string): void { MapWrapper.delete(this.paramsMap, param); }`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ export class Log {`
`21`	`21`
`22`	`22`	`clear(): void { this._result = []; }`
`23`	`23`
`24`		`- result(): string { return ListWrapper.join(this._result, "; "); }`
	`24`	`+ result(): string { return this._result.join("; "); }`
`25`	`25`	`}`
`26`	`26`
`27`	`27`