refactor: iterator as first param

streetsidesoftware · Apr 10, 2020 · 6425306 · 6425306
1 parent 03fbd5d
commit 6425306
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 18 deletions.
diff --git a/src/operators/operators.ts b/src/operators/operators.ts
@@ -56,7 +56,7 @@ export function combine<T, U, V>(
  * apply a mapping function to an Iterable.
  */
 export function map<T, U>(fnMap: (t: T) => U): ChainFunction<T, U> {
-    return (i: IterableLike<T>) => op.map(fnMap, i);
+    return (i: IterableLike<T>) => op.map(i, fnMap);
 }
 
 export function scan<T>(fnReduce: (prevValue: T, curValue: T, curIndex: number) => T): ChainFunction<T>;

diff --git a/src/operators/operatorsBase.test.ts b/src/operators/operatorsBase.test.ts
@@ -2,12 +2,6 @@ import * as op from './operatorsBase';
 import { toIterator } from '../util/util';
 
 describe('Tests Operators', () => {
-    test('test the curring part of GS.map', () => {
-        const fnMap = op.map((a: number) => 2 * a);
-        expect(fnMap).toBeInstanceOf(Function);
-        expect([...fnMap([1, 2, 3])]).toEqual([2, 4, 6]);
-    });
-
     test('tests scanMap -- running sum', () => {
         // let only the first occurrence of a value through.
         const result = [1, 2, 1, 3, 2, 1, 3]

diff --git a/src/operators/operatorsBase.ts b/src/operators/operatorsBase.ts
@@ -71,22 +71,14 @@ export function* combine<T, U, V>(
 /**
  * apply a mapping function to an Iterable.
  */
-export function map<T, U>(fnMap: (t: T) => U): (i: IterableLike<T>) => IterableIterator<U>;
-export function map<T, U>(fnMap: (t: T) => U, i: IterableLike<T>): IterableIterator<U>;
-export function map<T, U>(fnMap: (t: T) => U, i?: IterableLike<T>): IterableIterator<U> | ((i: IterableLike<T>) => IterableIterator<U>) {
-    function* fn<T, U>(fnMap: (t: T) => U, i: IterableLike<T>): IterableIterator<U> {
+export function map<T, U>(i: IterableLike<T>, fnMap: (t: T) => U): IterableIterator<U> {
+    function* fn<T, U>(i: IterableLike<T>, fnMap: (t: T) => U): IterableIterator<U> {
         for (const v of i) {
             yield fnMap(v);
         }
     }
 
-    if (i !== undefined) {
-        return fn(fnMap, i);
-    }
-
-    return function(i: IterableLike<T>) {
-        return fn(fnMap, i);
-    };
+    return fn(i, fnMap);
 }
 
 export function scan<T>(i: IterableLike<T>, fnReduce: (prevValue: T, curValue: T, curIndex: number) => T): IterableIterator<T>;