refactor: fixing code smells

codibre · Nov 7, 2024 · 0c626a8 · 0c626a8
1 parent 9ed2876
commit 0c626a8
Show file tree

Hide file tree

Showing 3 changed files with 184 additions and 175 deletions.
diff --git a/src/recipes/branch-recipe.ts b/src/recipes/branch-recipe.ts
@@ -9,7 +9,7 @@ interface LinkedNode<T> {
 function getBranchedAsyncIterable<T>(
   node: LinkedNode<T> | undefined,
   iterator: AsyncIterator<T>,
-  context: { next?: Promise<IteratorResult<T>> },
+  context: { next?: Promise<void> },
 ) {
   return {
     [Symbol.asyncIterator]() {
@@ -21,18 +21,10 @@ function getBranchedAsyncIterable<T>(
             value = node.value;
             done = false;
             if (!node.next) {
-              const promise = (context.next ??= new Promise(
-                async (resolve, reject) => {
-                  try {
-                    const next = await iterator.next();
-                    if (!next.done) node!.next = { value: next.value };
-                    context.next = undefined;
-                    resolve(next);
-                  } catch (err) {
-                    reject(err);
-                  }
-                },
-              ));
+              const promise = (context.next ??= iterator.next().then((next) => {
+                if (!next.done) node!.next = { value: next.value };
+                context.next = undefined;
+              }));
               return promise.then(() => {
                 node = node!.next;
                 return { done, value };
@@ -63,10 +55,6 @@ function getBranchedIterable<T>(
             if (!node.next) {
               const next = iterator.next();
               if (!next.done) node.next = { value: next.value };
-              return new Promise((resolve) => {
-                node = node!.next;
-                resolve({ done, value });
-              });
             }
             node = node.next;
           }

diff --git a/test/benchmark/branch-benchmark.spec.js b/test/benchmark/branch-benchmark.spec.js
@@ -12,12 +12,6 @@ function* interval(init, final) {
 }
 
 let log = '';
-let min = [];
-let max = [];
-let avg = [];
-let minBranch = [];
-let maxBranch = [];
-let avgBranch = [];
 const errors = new Set();
 function getBase() {
   return fluent(interval(1, ITEMS))
@@ -30,18 +24,18 @@ function getBase() {
 
 benchmarkSuite
   .add('separated', () => {
-    min = getBase().min();
-    max = getBase().max();
-    avg = getBase().avg();
+    getBase().min();
+    getBase().max();
+    getBase().avg();
   })
   .add('manual branch', () => {
-    base = getBase().toArray();
-    min = fluent(base).min();
-    max = fluent(base).max();
-    avg = fluent(base).avg();
+    const base = getBase().toArray();
+    fluent(base).min();
+    fluent(base).max();
+    fluent(base).avg();
   })
   .add('banching', async () => {
-    [minBranch, maxBranch, avgBranch] = await getBase()
+    await getBase()
       .branch(
         x => x.min(),
         x => x.max(),