Fix date parsing error handling + upgrade deps

schickling · schickling · commit d0424fad3242 · 2022-04-15T11:39:45.000+02:00
diff --git a/examples/archive/playground-azimuth-colocated/package.json b/examples/archive/playground-azimuth-colocated/package.json
@@ -9,7 +9,7 @@
   "dependencies": {
     "date-fns": "^2.28.0",
     "marked": "^3.0.4",
-    "next": "^12.1.1",
+    "next": "^12.1.5",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
     "react-helmet": "^6.1.0",
diff --git a/examples/archive/playground-azimuth-contentful/package.json b/examples/archive/playground-azimuth-contentful/package.json
@@ -9,7 +9,7 @@
   "dependencies": {
     "date-fns": "^2.28.0",
     "marked": "^3.0.4",
-    "next": "^12.1.1",
+    "next": "^12.1.5",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
     "react-helmet": "^6.1.0",
diff --git a/examples/archive/playground-azimuth-sanity/web/package.json b/examples/archive/playground-azimuth-sanity/web/package.json
@@ -12,7 +12,7 @@
     "contentlayer": "workspace:*",
     "date-fns": "^2.28.0",
     "marked": "^3.0.4",
-    "next": "^12.1.1",
+    "next": "^12.1.5",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
     "react-helmet": "^6.1.0",
diff --git a/examples/archive/playground-azimuth/package.json b/examples/archive/playground-azimuth/package.json
@@ -9,7 +9,7 @@
   "dependencies": {
     "date-fns": "^2.28.0",
     "marked": "^3.0.4",
-    "next": "^12.1.1",
+    "next": "^12.1.5",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
     "react-helmet": "^6.1.0",
diff --git a/examples/archive/playground-contentful-starter/package.json b/examples/archive/playground-contentful-starter/package.json
@@ -9,7 +9,7 @@
   },
   "dependencies": {
     "date-fns": "^2.28.0",
-    "next": "^12.1.1",
+    "next": "^12.1.5",
     "react": "17.0.2",
     "react-dom": "17.0.2"
   },
diff --git a/examples/archive/starter-js/package.json b/examples/archive/starter-js/package.json
@@ -9,7 +9,7 @@
   },
   "dependencies": {
     "date-fns": "^2.28.0",
-    "next": "^12.1.1",
+    "next": "^12.1.5",
     "react": "17.0.2",
     "react-dom": "17.0.2"
   },
diff --git a/examples/archive/starter/package.json b/examples/archive/starter/package.json
@@ -8,7 +8,7 @@
   },
   "dependencies": {
     "date-fns": "^2.28.0",
-    "next": "^12.1.1",
+    "next": "^12.1.5",
     "react": "17.0.2",
     "react-dom": "17.0.2"
   },
diff --git a/examples/next-contentlayer-example b/examples/next-contentlayer-example
@@ -1 +1 @@
-Subproject commit 946fad9a56afd2b5e501b9c5bffef24bbdcfcecc
+Subproject commit 476c91d9cef80fb18db39efe819f5e16310fd389
diff --git a/package.json b/package.json
@@ -36,7 +36,7 @@
     "eslint-plugin-import": "^2.25.4",
     "eslint-plugin-react-hooks": "^4.3.0",
     "eslint-plugin-simple-import-sort": "^7.0.0",
-    "prettier": "^2.6.1",
+    "prettier": "^2.6.2",
     "ts-patch": "^2.0.1",
     "typescript": "^4.6.3"
   },
diff --git a/packages/@contentlayer/source-files/package.json b/packages/@contentlayer/source-files/package.json
@@ -55,7 +55,7 @@
     "@types/tap": "^15.0.5",
     "@types/yaml": "^1.9.7",
     "faker": "^5.5.3",
-    "vite": "^2.8.6",
-    "vitest": "^0.7.12"
+    "vite": "^2.9.5",
+    "vitest": "^0.9.3"
   }
 }
diff --git a/packages/@contentlayer/source-files/src/__test__/mapping.spec.ts b/packages/@contentlayer/source-files/src/__test__/mapping.spec.ts
@@ -1,5 +1,5 @@
 import * as core from '@contentlayer/core'
-import { DummyTracing } from '@contentlayer/utils'
+import { DummyTracing, unknownToPosixFilePath } from '@contentlayer/utils'
 import type { HasClock, HasConsole, OT } from '@contentlayer/utils/effect'
 import { pipe, provideConsole, T } from '@contentlayer/utils/effect'
 import { expect, test } from 'vitest'
@@ -33,6 +33,8 @@ test('getDataForFieldDef', async () => {
     const transformedData = await runPromise(
       getDataForFieldDef({
         rawFieldData,
+        typeName: __unusedValue,
+        coreSchemaDef: { hash: '', documentTypeDefMap: {}, nestedTypeDefMap: {} },
         contentDirPath: __unusedValue,
         fieldDef: {
           type,
@@ -42,7 +44,6 @@ test('getDataForFieldDef', async () => {
           default: undefined,
           description: undefined,
         },
-        coreSchemaDef: { hash: '', documentTypeDefMap: {}, nestedTypeDefMap: {} },
         relativeFilePath: __unusedValue,
         options: {
           fieldOptions: core.defaultFieldOptions,
@@ -69,7 +70,76 @@ test('getDataForFieldDef', async () => {
   })
 })
 
-const runPromise = (eff: T.Effect<OT.HasTracer & HasClock & HasConsole & HasDocumentContext, unknown, any>) =>
+test('getDataForFieldDef error', async () => {
+  const testValue = async ({
+    type,
+    rawFieldData,
+    options,
+  }: {
+    type: 'date'
+    rawFieldData: any
+    options?: Partial<core.PluginOptions>
+  }) => {
+    const transformedData = await runPromise(
+      pipe(
+        getDataForFieldDef({
+          rawFieldData,
+          typeName: 'Post',
+          coreSchemaDef: { hash: '', documentTypeDefMap: {}, nestedTypeDefMap: {} },
+          contentDirPath: __unusedValue,
+          fieldDef: {
+            type,
+            name: 'someField',
+            isSystemField: false,
+            isRequired: false,
+            default: undefined,
+            description: undefined,
+          },
+          relativeFilePath: unknownToPosixFilePath('some/path/doc.md'),
+          options: {
+            fieldOptions: core.defaultFieldOptions,
+            markdown: undefined,
+            mdx: undefined,
+            date: undefined,
+            disableImportAliasWarning: false,
+            ...options,
+          },
+        }),
+        T.either,
+      ),
+    )
+
+    expect(transformedData._tag).toBe('Left')
+    expect(transformedData).toMatchInlineSnapshot(`
+      Left {
+        "_tag": "Left",
+        "left": IncompatibleFieldDataError {
+          "_tag": "IncompatibleFieldDataError",
+          "category": "MissingOrIncompatibleData",
+          "documentFilePath": "some/path/doc.md",
+          "documentTypeName": "Post",
+          "incompatibleFieldData": "2022-0",
+          "renderHeadline": [Function],
+          "renderLine": [Function],
+          Symbol(): {
+            "documentFilePath": "some/path/doc.md",
+            "documentTypeName": "Post",
+            "incompatibleFieldData": "2022-0",
+          },
+          Symbol(): [
+            "documentFilePath",
+            "documentTypeName",
+            "incompatibleFieldData",
+          ],
+        },
+      }
+    `)
+  }
+
+  await testValue({ type: 'date', rawFieldData: '2022-0' })
+})
+
+const runPromise = <A>(eff: T.Effect<OT.HasTracer & HasClock & HasConsole & HasDocumentContext, unknown, A>) =>
   pipe(eff, T.provide(DummyTracing), provideConsole, provideTestDocumentContext, T.runPromise)
 
 const provideTestDocumentContext = provideDocumentContext({
diff --git a/packages/@contentlayer/source-files/src/fetchData/mapping.ts b/packages/@contentlayer/source-files/src/fetchData/mapping.ts
@@ -52,6 +52,7 @@ export const makeDocument = ({
             getDataForFieldDef({
               fieldDef,
               rawFieldData: rawData[fieldDef.name],
+              typeName: documentTypeDef.name,
               coreSchemaDef,
               options,
               relativeFilePath,
@@ -95,6 +96,7 @@ type MakeDocumentInternalError =
   | UnexpectedMarkdownError
   | UnexpectedMDXError
   | FetchDataError.NoSuchNestedDocumentTypeError
+  | FetchDataError.IncompatibleFieldDataError
 
 const rawContentHasBody = (_: RawContent): _ is RawContentMarkdown | RawContentMDX =>
   'body' in _ && _.body !== undefined
@@ -134,6 +136,7 @@ const makeNestedDocument = ({
           getDataForFieldDef({
             fieldDef,
             rawFieldData: rawObjectData[fieldDef.name],
+            typeName,
             coreSchemaDef,
             options,
             relativeFilePath,
@@ -152,13 +155,15 @@ const makeNestedDocument = ({
 const getDataForFieldDef = ({
   fieldDef,
   rawFieldData,
+  typeName,
   coreSchemaDef,
   options,
   relativeFilePath,
   contentDirPath,
 }: {
   fieldDef: core.FieldDef
   rawFieldData: any
+  typeName: string
   coreSchemaDef: core.SchemaDef
   options: core.PluginOptions
   relativeFilePath: PosixFilePath
@@ -245,11 +250,25 @@ const getDataForFieldDef = ({
           ),
         )
       case 'date':
-        let dateValue = new Date(rawFieldData)
-        if (options.date?.timezone) {
-          dateValue = dateFnsTz.zonedTimeToUtc(dateValue, options.date.timezone)
-        }
-        return dateValue.toISOString()
+        const value = yield* $(
+          T.tryCatch(
+            () => {
+              let dateValue = new Date(rawFieldData)
+              if (options.date?.timezone) {
+                dateValue = dateFnsTz.zonedTimeToUtc(dateValue, options.date.timezone)
+              }
+              return dateValue.toISOString()
+            },
+            () =>
+              new FetchDataError.IncompatibleFieldDataError({
+                documentFilePath: relativeFilePath,
+                documentTypeName: typeName,
+                incompatibleFieldData: rawFieldData,
+              }),
+          ),
+        )
+
+        return value
       case 'markdown': {
         const isBodyField = fieldDef.name === options.fieldOptions.bodyFieldName
         // NOTE for the body field, we're passing the entire document file contents to MDX (e.g. in case some remark/rehype plugins need access to the frontmatter)
diff --git a/packages/@contentlayer/utils/package.json b/packages/@contentlayer/utils/package.json
@@ -70,7 +70,7 @@
     "chokidar": "^3.5.3",
     "hash-wasm": "^4.9.0",
     "inflection": "^1.13.2",
-    "oo-ascii-tree": "^1.55.1",
+    "oo-ascii-tree": "^1.56.0",
     "ts-pattern": "^4.0.1",
     "type-fest": "^2.12.1"
   },
diff --git a/packages/contentlayer-stackbit-yaml-generator/package.json b/packages/contentlayer-stackbit-yaml-generator/package.json
@@ -25,7 +25,7 @@
   "devDependencies": {
     "contentlayer": "workspace:*",
     "typescript": "^4.6.3",
-    "vite": "^2.8.6",
-    "vitest": "^0.7.12"
+    "vite": "^2.9.5",
+    "vitest": "^0.9.3"
   }
 }
diff --git a/packages/next-contentlayer/package.json b/packages/next-contentlayer/package.json
@@ -44,7 +44,7 @@
     "react-dom": "*"
   },
   "devDependencies": {
-    "next": "^12.1.1",
+    "next": "^12.1.5",
     "typescript": "^4.6.3"
   },
   "author": "schickling",
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@`
`55`	`55`	`"@types/tap": "^15.0.5",`
`56`	`56`	`"@types/yaml": "^1.9.7",`
`57`	`57`	`"faker": "^5.5.3",`
`58`		`- "vite": "^2.8.6",`
`59`		`- "vitest": "^0.7.12"`
	`58`	`+ "vite": "^2.9.5",`
	`59`	`+ "vitest": "^0.9.3"`
`60`	`60`	`}`
`61`	`61`	`}`