refactor(collections): moves series and parallel to collections; refa…

…ctor source and tests to match usage of newest api
rafamel · Oct 31, 2019 · 84046fd · 84046fd
1 parent 3da1ac2
commit 84046fd
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 8 deletions.
diff --git a/src/collections/index.ts b/src/collections/index.ts
@@ -0,0 +1,2 @@
+export { default as parallel } from './parallel';
+export { default as series } from './series';
diff --git a/src/parallel.ts → src/collections/parallel.ts b/src/parallel.ts → src/collections/parallel.ts
@@ -1,4 +1,4 @@
-import deferred from './create/deferred';
+import { Promist } from '~/classes';
 
 export function map<T>(
   arr: Array<Promise<T> | T>,
@@ -37,7 +37,7 @@ export function reduce<T>(
   return Promise.all(arr).then((resArr) => {
     return resArr.slice(1).reduce(
       (acc, x, i) => {
-        const p = deferred();
+        const p = new Promist();
         acc.then((val) => p.resolve(val)).catch((err) => p.reject(err));
         return fn(p, x, i + 1, resArr);
       },

diff --git a/src/series.ts → src/collections/series.ts b/src/series.ts → src/collections/series.ts
diff --git a/test/parallel.test.ts → test/collections/parallel.test.ts b/test/parallel.test.ts → test/collections/parallel.test.ts
@@ -1,5 +1,5 @@
-import parallel from '~/parallel';
-import lazy from '~/create/lazy';
+import parallel from '~/collections/parallel';
+import { LazyPromist } from '~/classes';
 
 const createArr = (arr: number[] = [1, 2, 3, 4]): Array<Promise<number>> => {
   return arr.map((x) => Promise.resolve(x));
@@ -11,7 +11,9 @@ const createDelayedArr = (
   return Array(50)
     .fill(0)
     .map((_, i) => {
-      return lazy((resolve) => setTimeout(() => resolve(i), ms * (n - i)));
+      return new LazyPromist((resolve) => {
+        setTimeout(() => resolve(i), ms * (n - i));
+      });
     });
 };
 

diff --git a/test/series.test.ts → test/collections/series.test.ts b/test/series.test.ts → test/collections/series.test.ts
@@ -1,5 +1,5 @@
-import series from '~/series';
-import lazy from '~/create/lazy';
+import series from '~/collections/series';
+import { LazyPromist } from '~/classes';
 
 const createArr = (arr: number[] = [1, 2, 3, 4]): Array<Promise<number>> => {
   return arr.map((x) => Promise.resolve(x));
@@ -11,7 +11,9 @@ const createDelayedArr = (
   return Array(50)
     .fill(0)
     .map((_, i) => {
-      return lazy((resolve) => setTimeout(() => resolve(i), ms * (n - i)));
+      return new LazyPromist((resolve) => {
+        setTimeout(() => resolve(i), ms * (n - i));
+      });
     });
 };