Tighten up the Docmap type to conform to the fp-ts Json type #3334

src/read-side/non-html-views/docmaps/docmap-index/docmap-index.ts

@@ -1,4 +1,3 @@
-import { Json } from 'fp-ts/Json';
 import * as RA from 'fp-ts/ReadonlyArray';
 import * as TE from 'fp-ts/TaskEither';
 import { pipe } from 'fp-ts/function';
@@ -24,5 +23,5 @@ export const docmapIndex: DocmapIndex = (dependencies) => (query) => pipe(
     internalErrorResponse.status,
   )),
   TE.map(RA.map(renderDocmap)),
-  TE.map((docmaps) => toNonHtmlViewRepresentation({ articles: docmaps } as Json, 'application/ld+json')),
+  TE.map((docmaps) => toNonHtmlViewRepresentation({ articles: docmaps }, 'application/ld+json')),
 );

src/read-side/non-html-views/docmaps/docmap/docmap-type.ts

@@ -27,10 +27,15 @@ type Editor = {
   role: 'editor',
 };
 
+type ContentItem = {
+  'type': 'web-page' | 'web-content',
+  url: string,
+};
+
 type Output = {
   type: 'review-article' | 'evaluation-summary' | 'reply',
   published: string,
-  content: ReadonlyArray<unknown>,
+  content: ReadonlyArray<ContentItem>,
 };
 
 type Action = {

src/read-side/non-html-views/docmaps/docmap/docmap.ts

@@ -1,5 +1,4 @@
 import * as E from 'fp-ts/Either';
-import { Json } from 'fp-ts/Json';
 import * as TE from 'fp-ts/TaskEither';
 import { pipe } from 'fp-ts/function';
 import { StatusCodes } from 'http-status-codes';
@@ -29,5 +28,5 @@ export const docmap = (
     decodedParams.doi,
     generateDocmaps(ports),
   )),
-  TE.map((state) => toNonHtmlViewRepresentation(state as Json, 'application/ld+json')),
+  TE.map((state) => toNonHtmlViewRepresentation(state, 'application/ld+json')),
 );

src/read-side/non-html-views/docmaps/docmap/render-docmap.ts

@@ -30,15 +30,15 @@ const createAction = (expressionDoi: EDOI.ExpressionDoi) => (evaluation: Evaluat
       published: evaluation.publishedAt.toISOString(),
       content: [
         {
-          type: 'web-page',
+          type: 'web-page' as const,
           url: evaluation.sourceUrl.toString(),
         },
         {
-          type: 'web-page',
+          type: 'web-page' as const,
           url: `https://sciety.org${constructPaperActivityPageHref(expressionDoi)}#${EL.serialize(evaluation.evaluationLocator)}`,
         },
         {
-          type: 'web-content',
+          type: 'web-content' as const,
           url: `https://sciety.org/evaluations/${EL.serialize(evaluation.evaluationLocator)}/content`,
         },
       ],