Remove superfluous lifts #380

sciety · Mar 8, 2021 · e2d5f53 · e2d5f53
1 parent bb9b689
commit e2d5f53
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 24 deletions.
diff --git a/scripts/find-reviews-from-ncrc.ts b/scripts/find-reviews-from-ncrc.ts
@@ -45,7 +45,7 @@ void (async (): Promise<void> => {
       }),
       constant('unavailable' as const),
     )),
-    T.map(E.chain(flow(
+    TE.chainEitherK(flow(
       (res) => res?.data?.values,
       O.fromNullable,
       O.map(flow(
@@ -54,7 +54,7 @@ void (async (): Promise<void> => {
         RA.filter((row) => /(biorxiv|medrxiv)/i.test(row.journal)),
       )),
       E.fromOption(constant('unavailable' as const)),
-    ))),
+    )),
     T.map(E.fold(
       () => {
         process.stderr.write('error');

diff --git a/src/home-page/render-feed.ts b/src/home-page/render-feed.ts
@@ -1,8 +1,10 @@
+import * as E from 'fp-ts/Either';
 import * as O from 'fp-ts/Option';
 import * as T from 'fp-ts/Task';
 import * as TE from 'fp-ts/TaskEither';
 import * as B from 'fp-ts/boolean';
-import { constant, pipe } from 'fp-ts/function';
+import { constant, flow, pipe } from 'fp-ts/function';
+import { identity } from 'io-ts';
 import { HtmlFragment, toHtmlFragment } from '../types/html-fragment';
 import { UserId } from '../types/user-id';
 
@@ -50,10 +52,10 @@ const renderAsSection = (contents: HtmlFragment) => toHtmlFragment(`
   </section>
 `);
 
-export const renderFeed = <E>(
+export const renderFeed = <Err>(
   isFollowingSomething: IsFollowingSomething,
-  getEvents: GetEvents<E>,
-  renderSummaryFeedList: RenderSummaryFeedList<E>,
+  getEvents: GetEvents<Err>,
+  renderSummaryFeedList: RenderSummaryFeedList<Err>,
 ): RenderFeed => (uid) => pipe(
     uid,
     TE.fromOption(constant(welcomeMessage)),
@@ -75,10 +77,9 @@ export const renderFeed = <E>(
         (summaryFeedList) => TE.right(summaryFeedList),
       ),
     ),
-    TE.fold(
-      (left) => T.of(left),
-      (right) => T.of(right),
-    ),
-    T.map(toHtmlFragment),
-    T.map(renderAsSection),
+    T.map(flow(
+      E.fold(identity, identity),
+      toHtmlFragment,
+      renderAsSection,
+    )),
   );
diff --git a/src/infrastructure/fetch-datacite-review.ts b/src/infrastructure/fetch-datacite-review.ts
@@ -28,15 +28,14 @@ const fetchReviewContent = (
     async () => fetchDataset(reviewIri),
     constant('unavailable' as const), // TODO might be 'not-found'
   ),
-  TE.chain(flow(
+  TE.chainEitherK(flow(
     (graph) => graph.out(schema.description).value,
     E.fromNullable('unavailable' as const),
     E.map(toHtmlFragment),
     E.map((fullText) => ({
       fullText,
       url: new URL(reviewIri.value),
     })),
-    TE.fromEither,
   )),
   TE.map((review) => {
     logger('debug', 'Retrieved review', { review });
@@ -53,7 +52,6 @@ export const fetchDataciteReview = (fetchDataset: FetchDataset, logger: Logger):
       return url;
     },
     namedNode,
-    TE.right,
-    TE.chain((reviewIri) => fetchReviewContent(fetchDataset, logger, reviewIri)),
+    (reviewIri) => fetchReviewContent(fetchDataset, logger, reviewIri),
   )
 );
diff --git a/src/infrastructure/fetch-ncrc-review.ts b/src/infrastructure/fetch-ncrc-review.ts
@@ -142,8 +142,7 @@ const getNcrcReview = (logger: Logger) => (rowNumber: number) => pipe(
 );
 
 export const fetchNcrcReview = (logger: Logger): FetchNcrcReview => flow(
-  TE.right,
-  TE.chain(getRowNumber(logger)),
+  getRowNumber(logger),
   TE.chainW(getNcrcReview(logger)),
   TE.map(constructNcrcReview),
 );
diff --git a/src/infrastructure/get-article-version-events-from-biorxiv.ts b/src/infrastructure/get-article-version-events-from-biorxiv.ts
@@ -35,10 +35,9 @@ const makeRequest = (doi: Doi, server: ArticleServer) => ({ getJson, logger }: D
     async () => getJson(`https://api.biorxiv.org/details/${server}/${doi.value}`),
     E.toError,
   ),
-  TE.chain(flow(
+  TE.chainEitherK(flow(
     biorxivArticleDetails.decode,
-    TE.fromEither,
-    TE.mapLeft((e) => new Error(PR.failure(e).join('\n'))),
+    E.mapLeft((errors) => new Error(PR.failure(errors).join('\n'))),
   )),
   TE.swap,
   TE.chainFirstW(flow(

diff --git a/src/infrastructure/get-events-from-database.ts b/src/infrastructure/get-events-from-database.ts
@@ -27,9 +27,8 @@ export const getEventsFromDatabase = (
     TE.right,
   )),
   TE.map(RA.map((row) => ({ ...row, ...row.payload }))),
-  TE.chain(flow(
+  TE.chainEitherK(flow(
     domainEvents.decode,
-    TE.fromEither,
-    TE.mapLeft((errors) => new Error(PR.failure(errors).join('\n'))),
+    E.mapLeft((errors) => new Error(PR.failure(errors).join('\n'))),
   )),
 );