Merge pull request #3 from emonkak/2.0

Version 2.0

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@emonkak/enumerable",
-  "version": "1.1.0",
+  "version": "2.0.0",
   "description": "Provides the individual methods of LINQ as a module",
   "main": "index.js",
   "scripts": {
@@ -9,7 +9,6 @@
     "lint": "tslint 'src/**/*.ts' 'test/**/*.ts'",
     "prebuild": "rm -f -r dist",
     "precover": "rm -f -r .nyc_output coverage",
-    "prepublish": "npm run build",
     "test": "mocha --recursive --compilers ts:ts-node/register",
     "watch": "tsc --watch"
   },

src/extensions/maxBy.ts

@@ -1,14 +1,14 @@
 import maxByFn from '../maxBy';
 import { Enumerable } from '../internal/Enumerable';
 
-function maxBy<TSource, TKey>(this: Enumerable<TSource>, keySelector: (element: TSource) => TKey): TSource[] {
-    return maxByFn.call(this.source, keySelector);
+function maxBy<TSource, TKey>(this: Enumerable<TSource>, keySelector: (element: TSource) => TKey): Enumerable<TSource> {
+    return this.lift<TSource>(maxByFn.call(this.source, keySelector));
 }
 
 Enumerable.prototype.maxBy = maxBy;
 
 declare module '../internal/Enumerable' {
     interface Enumerable<TSource> {
-        maxBy<TKey>(keySelector: (element: TSource) => TKey): TSource[];
+        maxBy<TKey>(keySelector: (element: TSource) => TKey): Enumerable<TSource>;
     }
 }

src/extensions/minBy.ts

@@ -1,14 +1,14 @@
 import minByFn from '../minBy';
 import { Enumerable } from '../internal/Enumerable';
 
-function minBy<TSource, TKey>(this: Enumerable<TSource>, keySelector: (element: TSource) => TKey): TSource[] {
-    return minByFn.call(this.source, keySelector);
+function minBy<TSource, TKey>(this: Enumerable<TSource>, keySelector: (element: TSource) => TKey): Enumerable<TSource> {
+    return this.lift<TSource>(minByFn.call(this.source, keySelector));
 }
 
 Enumerable.prototype.minBy = minBy;
 
 declare module '../internal/Enumerable' {
     interface Enumerable<TSource> {
-        minBy<TKey>(keySelector: (element: TSource) => TKey): TSource[];
+        minBy<TKey>(keySelector: (element: TSource) => TKey): Enumerable<TSource>;
     }
 }

src/static/repeat.ts

@@ -2,7 +2,7 @@ import EmptyPartition from '../internal/EmptyPartition';
 import { argumentOutOfRange } from '../internal/errors';
 import RepeatPartition from '../internal/RepeatPartition';
 
-export default function repeat<TSource>(element: TSource, count?: number): Iterable<TSource> {
+export default function repeat<TSource>(element: TSource, count: number = Infinity): Iterable<TSource> {
     if (count < 0) {
         throw argumentOutOfRange('count');
     }
@@ -11,9 +11,5 @@ export default function repeat<TSource>(element: TSource, count?: number): Itera
         return new EmptyPartition<TSource>();
     }
 
-    if (count == null) {
-        count = Infinity;
-    }
-
     return new RepeatPartition(element, count);
 }

src/toArray.ts

@@ -1,3 +1,3 @@
 export default function toArray<TSource>(this: Iterable<TSource>): TSource[] {
-    return Array.from(this);
+    return Array.isArray(this) ? this as TSource[] : Array.from(this);
 }

test/maxByTest.ts

@@ -3,7 +3,7 @@ import Enumerable from './bundle';
 
 describe('maxBy()', () => {
     it('should returns the elements with the minimum key value by using the default comparer to compare key values', () => {
-        assert.deepEqual(new Enumerable([3, 2, 1, 2, 3]).maxBy(x => x), [3, 3]);
-        assert.deepEqual(new Enumerable(['ab', 'abc', 'ab', 'a', 'ab', 'abc', 'ab']).maxBy(s => s.length), ['abc', 'abc']);
+        assert.deepEqual(new Enumerable([3, 2, 1, 2, 3]).maxBy(x => x).toArray(), [3, 3]);
+        assert.deepEqual(new Enumerable(['ab', 'abc', 'ab', 'a', 'ab', 'abc', 'ab']).maxBy(s => s.length).toArray(), ['abc', 'abc']);
     });
 });

test/minByTest.ts

@@ -3,7 +3,7 @@ import Enumerable from './bundle';
 
 describe('minBy()', () => {
     it('should returns the elements with the maximum key value by using the default comparer to compare key values', () => {
-        assert.deepEqual(new Enumerable([1, 2, 3, 2, 1]).minBy(x => x), [1, 1]);
-        assert.deepEqual(new Enumerable(['ab', 'a', 'ab', 'abc', 'ab', 'a', 'ab']).minBy(s => s.length), ['a', 'a']);
+        assert.deepEqual(new Enumerable([1, 2, 3, 2, 1]).minBy(x => x).toArray(), [1, 1]);
+        assert.deepEqual(new Enumerable(['ab', 'a', 'ab', 'abc', 'ab', 'a', 'ab']).minBy(s => s.length).toArray(), ['a', 'a']);
     });
 });