refactor(pipes): remove LimitTo pipe in favor of slice pipe

itslenny · vsavkin · commit d890c4f8276c · 2015-09-15T11:42:31.000-07:00
diff --git a/modules/angular2/src/core/facade/collection.dart b/modules/angular2/src/core/facade/collection.dart
@@ -182,11 +182,13 @@ class ListWrapper {
   }
 
   static List slice(List l, [int from = 0, int to]) {
+    from = _startOffset(l, from);
+    to = _endOffset(l, to);
     //in JS if from > to an empty array is returned
     if(to != null && from > to) {
       return [];
     }
-    return l.sublist(_startOffset(l, from), _endOffset(l, to));
+    return l.sublist(from, to);
   }
 
   static List splice(List l, int from, int length) {
@@ -213,7 +215,7 @@ class ListWrapper {
   // the end of the list
   static int _startOffset(List l, int start) {
     int len = l.length;
-    return start = start < 0 ? max(len + start, 0) : min(start, len);
+    return start < 0 ? max(len + start, 0) : min(start, len);
   }
 
   // JS splice, slice, fill functions can take end < 0 which indicates a position relative to
diff --git a/modules/angular2/src/core/facade/lang.dart b/modules/angular2/src/core/facade/lang.dart
@@ -95,11 +95,13 @@ class StringWrapper {
   }
 
   static String slice(String s, [int start = 0, int end]) {
+    start = _startOffset(s, start);
+    end = _endOffset(s, end);
     //in JS if start > end an empty string is returned
     if(end != null && start > end) {
       return "";
     }
-    return s.substring(_startOffset(s, start), _endOffset(s, end));
+    return s.substring(start, end);
   }
 
   static String substring(String s, int start, [int end]) {
@@ -120,7 +122,7 @@ class StringWrapper {
   // the end of the string
   static int _startOffset(String s, int start) {
     int len = s.length;
-    return start = start < 0 ? math.max(len + start, 0) : math.min(start, len);
+    return start < 0 ? math.max(len + start, 0) : math.min(start, len);
   }
 
   // JS slice function can take end < 0 which indicates a position relative to
diff --git a/modules/angular2/src/core/pipes.ts b/modules/angular2/src/core/pipes.ts
@@ -8,7 +8,7 @@ export {AsyncPipe} from './pipes/async_pipe';
 export {DatePipe} from './pipes/date_pipe';
 export {DEFAULT_PIPES, DEFAULT_PIPES_TOKEN} from './pipes/default_pipes';
 export {JsonPipe} from './pipes/json_pipe';
-export {LimitToPipe} from './pipes/limit_to_pipe';
+export {SlicePipe} from './pipes/slice_pipe';
 export {LowerCasePipe} from './pipes/lowercase_pipe';
 export {NumberPipe, DecimalPipe, PercentPipe, CurrencyPipe} from './pipes/number_pipe';
 export {UpperCasePipe} from './pipes/uppercase_pipe';
diff --git a/modules/angular2/src/core/pipes/default_pipes.ts b/modules/angular2/src/core/pipes/default_pipes.ts
@@ -2,7 +2,7 @@ import {AsyncPipe} from './async_pipe';
 import {UpperCasePipe} from './uppercase_pipe';
 import {LowerCasePipe} from './lowercase_pipe';
 import {JsonPipe} from './json_pipe';
-import {LimitToPipe} from './limit_to_pipe';
+import {SlicePipe} from './slice_pipe';
 import {DatePipe} from './date_pipe';
 import {DecimalPipe, PercentPipe, CurrencyPipe} from './number_pipe';
 
@@ -14,7 +14,7 @@ const DEFAULT_PIPES_LIST = CONST_EXPR([
   UpperCasePipe,
   LowerCasePipe,
   JsonPipe,
-  LimitToPipe,
+  SlicePipe,
   DecimalPipe,
   PercentPipe,
   CurrencyPipe,
diff --git a/modules/angular2/src/core/pipes/limit_to_pipe.ts b/modules/angular2/src/core/pipes/limit_to_pipe.ts
diff --git a/modules/angular2/src/core/pipes/slice_pipe.ts b/modules/angular2/src/core/pipes/slice_pipe.ts
@@ -3,9 +3,9 @@ import {
   isString,
   isArray,
   StringWrapper,
-  BaseException,
   CONST
 } from 'angular2/src/core/facade/lang';
+import {BaseException} from 'angular2/src/core/facade/exceptions';
 import {ListWrapper} from 'angular2/src/core/facade/collection';
 import {Injectable} from 'angular2/di';
 
@@ -76,7 +76,7 @@ import {Pipe} from '../metadata';
 @Pipe({name: 'slice'})
 @Injectable()
 export class SlicePipe implements PipeTransform {
-  transform(value: any, args: List<any> = null): any {
+  transform(value: any, args: any[] = null): any {
     if (isBlank(args) || args.length == 0) {
       throw new BaseException('Slice pipe requires one argument');
     }
@@ -85,7 +85,7 @@ export class SlicePipe implements PipeTransform {
     }
     if (isBlank(value)) return value;
     var start: number = args[0];
-    var end: number = args.length > 1 ? args[1] : value.length;
+    var end: number = args.length > 1 ? args[1] : null;
     if (isString(value)) {
       return StringWrapper.slice(value, start, end);
     }
diff --git a/modules/angular2/test/core/facade/collection_spec.ts b/modules/angular2/test/core/facade/collection_spec.ts
@@ -63,8 +63,10 @@ export function main() {
       it('should support negative end',
          () => { expect(ListWrapper.slice(l, -3, -1)).toEqual([2, 3]); });
 
-      it('should return empty list if start is greater than end',
-         () => { expect(ListWrapper.slice(l, 4, 2)).toEqual([]); });
+      it('should return empty list if start is greater than end', () => {
+        expect(ListWrapper.slice(l, 4, 2)).toEqual([]);
+        expect(ListWrapper.slice(l, -2, -4)).toEqual([]);
+      });
     });
 
     describe('indexOf', () => {
diff --git a/modules/angular2/test/core/facade/lang_spec.ts b/modules/angular2/test/core/facade/lang_spec.ts
@@ -76,8 +76,10 @@ export function main() {
       it('should support negative end',
          () => { expect(StringWrapper.slice(s, -3, -1)).toEqual("hi"); });
 
-      it('should return empty string if start is greater than end',
-         () => { expect(StringWrapper.slice(s, 4, 2)).toEqual(""); });
+      it('should return empty string if start is greater than end', () => {
+        expect(StringWrapper.slice(s, 4, 2)).toEqual("");
+        expect(StringWrapper.slice(s, -2, -4)).toEqual("");
+      });
     });
 
   });
diff --git a/modules/angular2/test/core/pipes/limit_to_pipe_spec.ts b/modules/angular2/test/core/pipes/limit_to_pipe_spec.ts

Original file line number	Diff line number	Diff line change
`@@ -182,11 +182,13 @@ class ListWrapper {`
`182`	`182`	`}`
`183`	`183`
`184`	`184`	`static List slice(List l, [int from = 0, int to]) {`
	`185`	`+ from = _startOffset(l, from);`
	`186`	`+ to = _endOffset(l, to);`
`185`	`187`	`//in JS if from > to an empty array is returned`
`186`	`188`	`if(to != null && from > to) {`
`187`	`189`	`return [];`
`188`	`190`	`}`
`189`		`- return l.sublist(_startOffset(l, from), _endOffset(l, to));`
	`191`	`+ return l.sublist(from, to);`
`190`	`192`	`}`
`191`	`193`
`192`	`194`	`static List splice(List l, int from, int length) {`
`@@ -213,7 +215,7 @@ class ListWrapper {`
`213`	`215`	`// the end of the list`
`214`	`216`	`static int _startOffset(List l, int start) {`
`215`	`217`	`int len = l.length;`
`216`		`- return start = start < 0 ? max(len + start, 0) : min(start, len);`
	`218`	`+ return start < 0 ? max(len + start, 0) : min(start, len);`
`217`	`219`	`}`
`218`	`220`
`219`	`221`	`// JS splice, slice, fill functions can take end < 0 which indicates a position relative to`
Original file line number	Diff line number	Diff line change
`@@ -95,11 +95,13 @@ class StringWrapper {`
`95`	`95`	`}`
`96`	`96`
`97`	`97`	`static String slice(String s, [int start = 0, int end]) {`
	`98`	`+ start = _startOffset(s, start);`
	`99`	`+ end = _endOffset(s, end);`
`98`	`100`	`//in JS if start > end an empty string is returned`
`99`	`101`	`if(end != null && start > end) {`
`100`	`102`	`return "";`
`101`	`103`	`}`
`102`		`- return s.substring(_startOffset(s, start), _endOffset(s, end));`
	`104`	`+ return s.substring(start, end);`
`103`	`105`	`}`
`104`	`106`
`105`	`107`	`static String substring(String s, int start, [int end]) {`
`@@ -120,7 +122,7 @@ class StringWrapper {`
`120`	`122`	`// the end of the string`
`121`	`123`	`static int _startOffset(String s, int start) {`
`122`	`124`	`int len = s.length;`
`123`		`- return start = start < 0 ? math.max(len + start, 0) : math.min(start, len);`
	`125`	`+ return start < 0 ? math.max(len + start, 0) : math.min(start, len);`
`124`	`126`	`}`
`125`	`127`
`126`	`128`	`// JS slice function can take end < 0 which indicates a position relative to`