feat(notion): improve errors handling

Author: kerwanp

packages/@contentlayer/source-notion/src/fetchData/errors.ts

@@ -0,0 +1,8 @@
+import type * as core from '@contentlayer/core'
+import { Tagged } from '@contentlayer/utils/effect'
+
+export class ComputedValueError extends Tagged('ComputedValueError')<{
+  readonly error: unknown
+  readonly documentTypeDef: core.DocumentTypeDef
+  readonly document: core.Document
+}> {}

packages/@contentlayer/source-notion/src/fetchData/fetchAllDocuments.ts

@@ -40,7 +40,6 @@ export const fetchAllDocuments = ({ databaseTypeDefs, schemaDef, options }: Fetc
         T.chain((chunks) => T.reduce_(chunks, [] as DataCache.CacheItem[], (z, a) => T.succeed([...z, ...a]))),
       ),
     ),
-
     T.map((chunks) => Chunk.reduce_(chunks, [] as DataCache.CacheItem[], (z, a) => [...z, ...a])),
     T.map((documents) => ({ cacheItemsMap: Object.fromEntries(documents.map((_) => [_.document._id, _])) })),
     OT.withSpan('@contentlayer/source-notion/fetchData:fetchAllDocuments'),

packages/@contentlayer/source-notion/src/fetchData/getComputedValues.ts

@@ -1,6 +1,8 @@
 import type * as core from '@contentlayer/core'
 import { OT, pipe, T } from '@contentlayer/utils/effect'
 
+import { ComputedValueError } from './errors.js'
+
 export type GetComputedValuesArgs = {
   document: core.Document
   documentTypeDef: core.DocumentTypeDef
@@ -13,7 +15,7 @@ export const getComputedValues = ({ document, documentTypeDef }: GetComputedValu
       mapValue: (field) =>
         T.tryCatchPromise(
           async () => field.resolve(document),
-          () => new Error('TODO: Make error'),
+          (error) => new ComputedValueError({ error, documentTypeDef, document }),
         ),
     }),
     OT.withSpan('@contentlayer/source-notion/fetchData:getComputedValues'),

packages/@contentlayer/source-notion/src/fetchData/makeCacheItem.ts

@@ -19,7 +19,7 @@ export const makeCacheItem = ({ databaseTypeDef, documentTypeDef, page, options
     T.gen(function* ($) {
       const document = yield* $(makeDocument({ documentTypeDef, databaseTypeDef, page, options }))
 
-      const computedValues = yield $(getComputedValues({ document, documentTypeDef }))
+      const computedValues = yield* $(getComputedValues({ document, documentTypeDef }))
 
       Object.entries(computedValues).forEach(([fieldName, value]) => {
         document[fieldName] = value

packages/@contentlayer/source-notion/src/mapping/index.ts

@@ -1,6 +1,6 @@
 import type * as core from '@contentlayer/core'
 import type { Has } from '@contentlayer/utils/effect'
-import { pipe, T } from '@contentlayer/utils/effect'
+import { T } from '@contentlayer/utils/effect'
 import type { NotionRenderer } from '@notion-render/client'
 import type * as notion from '@notionhq/client'
 
@@ -66,7 +66,6 @@ export type FieldFunctions<T extends DatabasePropertyTypes = DatabasePropertyTyp
 }
 
 type FieldMappingType = {
-  // TODO : Remove optional
   [key in DatabasePropertyTypes]: FieldFunctions
 }
 
@@ -93,43 +92,18 @@ const FieldMapping: FieldMappingType = {
   rollup: fieldRollup,
 }
 
-export const getFieldFunctions = <T extends DatabasePropertyTypes = DatabasePropertyTypes>(
-  type: DatabasePropertyTypes,
-) =>
-  pipe(
-    T.sync(() => FieldMapping[type] as FieldFunctions<T> | undefined),
-
-    T.chain((func) =>
-      T.cond_(
-        !!func,
-        () => func!,
-        () => 'fail' as const, // TODO : Error
-      ),
-    ),
-  )
-
 export const getFieldDef = <T extends DatabasePropertyTypes>(
   args: { property: DatabaseProperties } & Omit<GetFieldDefArgs<T>, 'propertyData'>,
 ) =>
-  pipe(
-    getFieldFunctions(args.property.type),
-    T.chain((functions) =>
-      functions.getFieldDef({
-        propertyData: getDatabasePropertyData(args.property),
-        ...args,
-      }),
-    ),
-  )
+  FieldMapping[args.property.type].getFieldDef({
+    propertyData: getDatabasePropertyData(args.property),
+    ...args,
+  })
 
 export const getFieldData = <T extends PagePropertyTypes>(
   args: { property: PageProperties } & Omit<GetFieldDataArgs<T>, 'propertyData'>,
 ) =>
-  pipe(
-    getFieldFunctions(args.property.type),
-    T.chain((functions) =>
-      functions.getFieldData({
-        propertyData: getPagePropertyData(args.property),
-        ...args,
-      }),
-    ),
-  )
+  FieldMapping[args.property.type].getFieldData({
+    propertyData: getPagePropertyData(args.property),
+    ...args,
+  })

packages/@contentlayer/source-notion/src/schema/provideFieldDef.ts

@@ -31,6 +31,5 @@ export const provideFieldDef = ({ property, databaseTypeDef, getDocumentTypeDef
         } as FieldDef
       }),
     ),
-    T.catchAll(() => T.succeed(undefined)), // TODO : Better error handling
     OT.withSpan('@contentlayer/source-notion/schema:provideFieldDef'),
   )