fix(remark-fff): 🐛 use deepmerge

.changeset/four-clocks-buy.md

@@ -0,0 +1,5 @@
+---
+"remark-fff": patch
+---
+
+Version 1.2.0-alpha.2

packages/remark-fff/package.json

@@ -47,6 +47,7 @@
     "api-extractor": "api-extractor run --local --verbose"
   },
   "dependencies": {
+    "@fastify/deepmerge": "^1.3.0",
     "fff-flavored-frontmatter": "workspace:*",
     "unified": "^11.0.4"
   },

packages/remark-fff/src/plugin.ts

@@ -1,5 +1,6 @@
 import type { Plugin, Transformer } from 'unified'
 
+import deepmerge from '@fastify/deepmerge'
 import { strict, transform } from 'fff-flavored-frontmatter'
 
 import type { RemarkFFFOptions } from './types'
@@ -19,6 +20,7 @@ export const remarkFFF: Plugin<[RemarkFFFOptions]>
     },
   ): Transformer =>
     (_tree, file) => {
+      const merge = deepmerge({ all: true })
       let targets: string[] | undefined
 
       // Compatible with old target parameters before 1.2.
@@ -62,9 +64,9 @@ export const remarkFFF: Plugin<[RemarkFFFOptions]>
       )
 
       file.data = targets
-        ? {
-            ...file.data,
-            ...targets.reduceRight((output, key) => ({ [key]: output }), output),
-          }
+        ? merge(
+          file.data,
+          targets.reduceRight((output, key) => ({ [key]: output }), output),
+        )
         : output
     }

packages/remark-fff/test/frontmatter.spec.ts

@@ -13,23 +13,30 @@ describe('remark-fff', () => {
   it('mdsvex-hugo', () => {
     const file = new VFile({
       data: {
+        a: 'b',
         fm: {
           draft: true,
           images: 'https://fff.js.org/glowing_star.svg',
         },
       },
     })
-    const { fm } = remark().use(remarkFrontmatter).use(remarkFFF, {
-      presets: [hugo],
-      target: 'mdsvex',
-    }).processSync(file).data as { fm: FFFFlavoredFrontmatter }
+    const { a, fm } = remark()
+      .use(remarkFrontmatter).use(remarkFFF, {
+        presets: [hugo],
+        target: 'mdsvex',
+      }).processSync(file).data as {
+        a: string
+        fm: FFFFlavoredFrontmatter
+      }
+    expect(a).toEqual('b')
     // expect(fm.image).toEqual('https://fff.js.org/glowing_star.svg')
     expect(fm.flags).toEqual(['draft'])
   })
   it('astro-hexo', () => {
     const file = new VFile({
       data: {
         astro: {
+          a: 'b',
           frontmatter: {
             categories: ['foo', 'bar', 'baz'],
             date: '2023-01-01',
@@ -39,15 +46,17 @@ describe('remark-fff', () => {
         },
       },
     })
-    const { frontmatter: fm } = remark()
+    const { a, frontmatter: fm } = remark()
       .use(remarkFrontmatter)
       .use(remarkFFF, {
         presets: [hexo],
         target: 'astro',
       })
       .processSync(file).data.astro as {
+        a: string
         frontmatter: FFFFlavoredFrontmatter
       }
+    expect(a).toEqual('b')
     expect(fm.created).toEqual('2023-01-01')
     expect(fm.summary).toEqual('lorem ipsum')
     // expect(fm.tags).toEqual(['fooo', 'baar', 'baaz', 'foo', 'bar', 'baz'])
@@ -142,6 +151,9 @@ describe('remark-fff strict mode', () => {
               },
             },
           },
+          e: {
+            f: 'g',
+          },
         },
       },
     })
@@ -151,7 +163,13 @@ describe('remark-fff strict mode', () => {
         presets: [{ created: 'date' }],
         target: ['a', 'b', 'c', 'd'],
       })
-      .processSync(file).data as { a: { b: { c: { d: FFFFlavoredFrontmatter } } } }
+      .processSync(file).data as {
+        a: {
+          b: { c: { d: FFFFlavoredFrontmatter } }
+          e: { f: string }
+        }
+      }
     expect(data.a.b.c.d.created).toEqual('2023-12-25')
+    expect(data.a.e.f).toEqual('g')
   })
 })