feat(@contentlayer): make documentTypeMap explicit in makeCacheItemFr…

…omFilePath

packages/@contentlayer/source-files/src/__test__/fetchData/utils.ts

@@ -54,6 +54,10 @@ export const runTest = async ({
           previousCache: undefined,
           contentTypeMap,
         }),
+        // TODO: DocumentTypeMap is now explicitly returned from
+        // makeCacheItemFromFilePath in [1]. Verify that it is tested somewhere
+        // else, as we're throwing it away here.
+        T.map((_) => _.tuple[0]),
         These.effectToEither,
       ),
     )

packages/@contentlayer/source-files/src/fetchData/DocumentTypeMap.ts

@@ -1,46 +1,47 @@
 import type { PosixFilePath } from '@contentlayer/utils'
-import type { Has } from '@contentlayer/utils/effect'
-import { HashMap, O, pipe, State, T, Tagged } from '@contentlayer/utils/effect'
+import type { Has, Option, These } from '@contentlayer/utils/effect'
+import { HashMap, O, pipe, State, T, Tagged, Tuple } from '@contentlayer/utils/effect'
 
 export type DocumentTypeName = string
 
 export class DocumentTypeMap extends Tagged('@local/DocumentTypeMap')<{
-    readonly map: HashMap.HashMap<DocumentTypeName, PosixFilePath[]>
+  readonly map: HashMap.HashMap<DocumentTypeName, PosixFilePath[]>
 }> {
-    static init = () => new DocumentTypeMap({ map: HashMap.make() })
+  static init = () => new DocumentTypeMap({ map: HashMap.make() })
 
-    add = (documentTypeName: DocumentTypeName, filePath: PosixFilePath) => {
-        const oldPaths = pipe(
-            HashMap.get_(this.map, documentTypeName),
-            O.getOrElse(() => []),
-        )
+  add = (documentTypeName: DocumentTypeName, filePath: PosixFilePath) => {
+    const oldPaths = pipe(
+      HashMap.get_(this.map, documentTypeName),
+      O.getOrElse(() => []),
+    )
 
-        return new DocumentTypeMap({
-            map: HashMap.set_(this.map, documentTypeName, [...oldPaths, filePath]),
-        })
-    }
+    return new DocumentTypeMap({
+      map: HashMap.set_(this.map, documentTypeName, [...oldPaths, filePath]),
+    })
+  }
 
-    getFilePaths = (documentTypeName: DocumentTypeName): O.Option<PosixFilePath[]> =>
-        HashMap.get_(this.map, documentTypeName)
+  getFilePaths = (documentTypeName: DocumentTypeName): O.Option<PosixFilePath[]> =>
+    HashMap.get_(this.map, documentTypeName)
 }
 
 /**
-* This state is needed for certain kinds of error handling (e.g. to check if singleton documents have been provided)
-*/
+ * This state is needed for certain kinds of error handling (e.g. to check if singleton documents have been provided)
+ */
 export const DocumentTypeMapState = State.State<DocumentTypeMap>(DocumentTypeMap._tag)
 
-export const serialize = () => pipe(
+export const serialize = () =>
+  pipe(
     DocumentTypeMapState.get,
     // FIXME: unsafe
-    T.chain(map => T.succeedWith(() => JSON.stringify(map))),
-);
+    T.chain((map) => T.succeedWith(() => JSON.stringify(map))),
+  )
 
 export function provideFromSerialized(serialized: string) {
-    return pipe(
-        // FIXME: unsafe
-        T.succeedWith<DocumentTypeMap>(() => JSON.parse(serialized)),
-        T.map(map => T.provideSomeLayer(DocumentTypeMapState.Live(new DocumentTypeMap(map))))
-    )
+  return pipe(
+    // FIXME: unsafe
+    T.succeedWith<DocumentTypeMap>(() => JSON.parse(serialized)),
+    T.map((map) => T.provideSomeLayer(DocumentTypeMapState.Live(new DocumentTypeMap(map)))),
+  )
 }
 
 export const provideDocumentTypeMapState = T.provideSomeLayer(DocumentTypeMapState.Live(DocumentTypeMap.init()))