Neater

Author: benjie

grafast/dataplan-pg/src/adaptors/pg.ts

@@ -660,8 +660,7 @@ export class PgSubscriber<
           Object.values(this.topics).forEach((iterators) => {
             if (iterators) {
               for (const iterator of iterators) {
-                const r = iterator.throw!(e);
-                r.then(null, noop);
+                iterator.throw!(e).then(null, noop);
               }
             }
           });
@@ -741,11 +740,9 @@ export class PgSubscriber<
       for (const topic of Object.keys(this.topics)) {
         for (const asyncIterableIterator of this.topics[topic]!) {
           if (asyncIterableIterator.return) {
-            const result = asyncIterableIterator.return();
-            result.then(null, noop);
+            asyncIterableIterator.return().then(null, noop);
           } else if (asyncIterableIterator.throw) {
-            const result = asyncIterableIterator.throw(new Error("Released"));
-            result.then(null, noop);
+            asyncIterableIterator.throw(new Error("Released")).then(null, noop);
           } else {
             // What do we do now?!
             // TYPES: if instead of using an AsyncIterableIterator we required it was an AsyncGenerator then this problem would go away.

grafast/dataplan-pg/src/executor.ts

@@ -899,9 +899,7 @@ ${duration}
         batch.forEach(({ resultIndex }) => {
           const stream = streams[resultIndex];
           if (isAsyncIterable(stream)) {
-            const it = stream[Symbol.asyncIterator]();
-            const r = it.throw?.(e);
-            r?.then(null, noop);
+            stream[Symbol.asyncIterator]().throw?.(e)?.then(null, noop);
           }
           const ep = Promise.reject(e);
           // Avoid unhandled promise rejection errors

grafast/dataplan-pg/src/steps/pgSelect.ts

@@ -1255,8 +1255,7 @@ export class PgSelectStep<
             } else if (streamInitialCount != null && l < streamInitialCount) {
               done = true;
               const r = innerIterator.return?.();
-              r?.then(null, noop);
-              return Promise.resolve({ value: undefined, done });
+              return r ?? Promise.resolve({ value: undefined, done });
             } else {
               return innerIterator.next();
             }

grafast/grafast/src/engine/distributor.ts

@@ -381,8 +381,7 @@ export function distributor<TData>(
     }
 
     const onAbort = () => {
-      const result = iterator.return();
-      result.then(null, noop);
+      iterator.return().then(null, noop);
     };
     const iterator = {
       [Symbol.asyncIterator]() {

grafast/grafast/src/prepare.ts

@@ -224,18 +224,15 @@ const finalize = (
       promise.then(
         () => {
           iterator.push({ hasNext: false });
-          const result = iterator.return(undefined);
-          result.then(null, noop);
+          iterator.return(undefined).then(null, noop);
         },
         (e) => {
-          const result = iterator.throw(e);
-          result.then(null, noop);
+          iterator.throw(e).then(null, noop);
         },
       );
     } else {
       iterator.push({ hasNext: false });
-      const result = iterator.return(undefined);
-      result.then(null, noop);
+      iterator.return(undefined).then(null, noop);
     }
 
     return iterator;
@@ -517,8 +514,7 @@ function executePreemptive(
             break;
           }
           if (!next) {
-            const result = iterator.throw(new Error("Invalid iteration"));
-            result.then(null, noop);
+            iterator.throw(new Error("Invalid iteration")).then(null, noop);
             break;
           }
           const { done, value } = next;
@@ -764,8 +760,7 @@ function newIterator<T = any>(
               } catch (e) {
                 // ignore
               }
-              const result = this.throw(e);
-              result.then(null, noop);
+              this.throw(e).then(null, noop);
             },
           );
         } else {

grafast/grafserv/src/mapIterator.ts

@@ -52,14 +52,12 @@ export function mapIterator<T, U>(
     },
     return(value) {
       status = 2;
-      const r = iterator.return?.(value);
-      r?.then(null, noop);
+      iterator.return?.(value)?.then(null, noop);
       return Promise.resolve({ value: undefined, done: true });
     },
     throw(error) {
       status = 2;
-      const r = iterator.throw?.(error);
-      r?.then(null, noop);
+      iterator.throw?.(error)?.then(null, noop);
       return Promise.reject(error);
     },
     [Symbol.asyncIterator]() {

grafast/grafserv/src/servers/fastify/v4/index.ts

@@ -143,11 +143,9 @@ export class FastifyGrafserv extends GrafservBase {
           if (!bufferIteratorHandled) {
             try {
               if (bufferIterator.return) {
-                const result = bufferIterator.return();
-                result.then(null, noop);
+                bufferIterator.return().then(null, noop);
               } else if (bufferIterator.throw) {
-                const result = bufferIterator.throw(e);
-                result.then(null, noop);
+                bufferIterator.throw(e).then(null, noop);
               }
             } catch (e2) {
               /* nom nom nom */

grafast/grafserv/src/servers/h3/v1/index.ts

@@ -199,11 +199,9 @@ export class H3Grafserv extends GrafservBase {
           if (!bufferIteratorHandled) {
             try {
               if (bufferIterator.return) {
-                const result = bufferIterator.return();
-                result.then(null, noop);
+                bufferIterator.return().then(null, noop);
               } else if (bufferIterator.throw) {
-                const result = bufferIterator.throw(e);
-                result.then(null, noop);
+                bufferIterator.throw(e).then(null, noop);
               }
             } catch (e2) {
               /* nom nom nom */

grafast/grafserv/src/servers/node/index.ts

@@ -203,8 +203,7 @@ export class NodeGrafservBase extends GrafservBase {
             // Clean up when connection closes.
             const cleanup = () => {
               try {
-                const r = bufferIterator.return?.();
-                r?.then(null, noop);
+                bufferIterator.return?.()?.then(null, noop);
               } catch {
                 /* nom nom nom */
               }

postgraphile/postgraphile/__tests__/helpers.ts

@@ -511,8 +511,7 @@ export async function runTestQuery(
             if (operationType === "subscription") {
               const iterator = result[Symbol.asyncIterator]();
               // Terminate the subscription
-              const r = iterator.return?.();
-              r?.then(null, noop);
+              iterator.return?.()?.then(null, noop);
             }
 
             // Now wait for all payloads to have been collected