fixed tests

Author: schickling

packages/@contentlayer/source-files/src/schema/provideSchema.ts

@@ -56,7 +56,7 @@ export const makeCoreSchema = ({
 
       const computedFields = Object.entries(documentDef.computedFields ?? {}).map<core.ComputedField>(
         ([name, computedField]) => ({
-          ...utils.pick(computedField, ['description', 'type']),
+          ...utils.pick(computedField, ['description', 'type'], false),
           name,
           // NOTE we need to flip the variance here (casting a core.Document to a LocalDocument)
           resolve: computedField.resolve as core.ComputedFieldResolver,
@@ -65,7 +65,7 @@ export const makeCoreSchema = ({
 
       const coreDocumentDef: core.DocumentTypeDef = {
         _tag: 'DocumentTypeDef',
-        ...utils.pick(documentDef, ['name', 'description']),
+        ...utils.pick(documentDef, ['name', 'description'], false),
         isSingleton: documentDef.isSingleton ?? false,
         fieldDefs,
         computedFields,
@@ -80,7 +80,7 @@ export const makeCoreSchema = ({
 
       const coreNestedTypeDef: core.NestedTypeDef = {
         _tag: 'NestedTypeDef',
-        ...utils.pick(nestedDef, ['description']),
+        ...utils.pick(nestedDef, ['description'], false),
         name: nestedDef.name,
         fieldDefs: getFieldDefEntries(nestedDef.fields ?? []).map((_) =>
           fieldDefEntryToCoreFieldDef(_, options.fieldOptions),
@@ -135,7 +135,7 @@ const fieldDefEntryToCoreFieldDef = (
   fieldOptions: core.FieldOptions,
 ): core.FieldDef => {
   const baseFields: core.FieldDefBase = {
-    ...utils.pick(fieldDef, ['type', 'default', 'description']),
+    ...utils.pick(fieldDef, ['type', 'default', 'description'], false),
     name,
     isRequired: fieldDef.required ?? false,
     isSystemField: false,
@@ -231,7 +231,7 @@ const fieldDefEntryToCoreFieldDef = (
     case 'string':
       return {
         // needs to pick again since fieldDef.type has been
-        ...utils.pick(fieldDef, ['type', 'default', 'description']),
+        ...utils.pick(fieldDef, ['type', 'default', 'description'], false),
         isRequired: fieldDef.required ?? false,
         name,
         isSystemField: false,
@@ -254,7 +254,7 @@ const fieldListItemsToCoreFieldListDefItems = (
     case 'markdown':
     case 'mdx':
     case 'image':
-      return utils.pick(listFieldDefItem, ['type'])
+      return utils.pick(listFieldDefItem, ['type'], false)
     case 'enum':
       return {
         type: 'enum',

packages/@contentlayer/utils/src/object/pick.ts

@@ -3,12 +3,18 @@ type OrUndefined<T> = { [K in keyof T]: T[K] | undefined }
 type PickRequired<T> = { [K in keyof T as undefined extends T[K] ? never : K]: T[K] }
 type ConvertPick<T> = ConvertUndefined<T> & PickRequired<T>
 
-export const pick = <Obj, Keys extends keyof Obj>(obj: Obj, keys: Keys[]): ConvertPick<{ [K in Keys]: Obj[K] }> => {
+export const pick = <Obj, Keys extends keyof Obj>(
+  obj: Obj,
+  keys: Keys[],
+  /** Whether to filter out explicit `undefined` values */
+  filterUndefined = true,
+): ConvertPick<{ [K in Keys]: Obj[K] }> => {
   return keys.reduce((acc, key) => {
     const val = obj[key]
-    if (val !== undefined) {
-      acc[key] = val
-    }
+    if (val === undefined && filterUndefined) return acc
+
+    acc[key] = val
+
     return acc
   }, {} as any)
 }

packages/integration-tests/src/image-field/index.test.ts

@@ -40,7 +40,7 @@ test('mdx-image-field ', async () => {
 
   expect(allPosts[0].coverImage).toMatchInlineSnapshot(`
     {
-      "blurhashDataUrl": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAICAYAAADED76LAAAACXBIWXMAAAsTAAALEwEAmpwYAAAArklEQVR4nF2OSw6CQBBEuZKGwfl4Io1BNqAMwwV1YTRGl4gLI3+8QJludeOiU13J6+ryMlPjMxWsqVjZzytY2cEjY1UDpwfk5sVKnoFggJfphi8iccViskMkLt/EGqkY4RGd6wGJKrEOTohlgdyMsJoATmgR+mes/ANS80AojlhO93Cm/QENNuqOeHbDVj6RyBKxKpCZ5vOCfjndwekelEbKO5fsqUPLrf+Hkgl4A4q9pmrNTiK/AAAAAElFTkSuQmCC",
+      "blurhashDataUrl": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAICAMAAADz0U65AAAACVBMVEV8Oe1uNNJ3OOKPJhaEAAAACXBIWXMAAAPoAAAD6AG1e1JrAAAAHUlEQVR4nGNgwAIYGRkhDCZGJqgAE0SIiQmEsAAAAyMAF5ferjEAAAAASUVORK5CYII=",
       "filePath": "posts/image-a.png",
       "format": "png",
       "height": 480,