Fix support for functions in data

unifiedjs · Sep 5, 2023 · 8dee2ab · 8dee2ab
1 parent 0d78ebb
commit 8dee2ab
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 9 deletions.
diff --git a/lib/index.js b/lib/index.js
@@ -346,8 +346,8 @@
  *   be stored on the `result` field of {@link VFile `VFile`}.
  */
 
-import structuredClone from '@ungap/structured-clone'
 import {bail} from 'bail'
+import extend from 'extend'
 import {ok as assert} from 'devlop'
 import isPlainObj from 'is-plain-obj'
 import {trough} from 'trough'
@@ -507,7 +507,7 @@ export class Processor extends CallableInstance {
       destination.use(...attacher)
     }
 
-    destination.data(structuredClone(this.namespace))
+    destination.data(extend(true, {}, this.namespace))
 
     return destination
   }
@@ -1115,10 +1115,7 @@ export class Processor extends CallableInstance {
       addList(result.plugins)
 
       if (result.settings) {
-        namespace.settings = {
-          ...namespace.settings,
-          ...structuredClone(result.settings)
-        }
+        namespace.settings = extend(true, namespace.settings, result.settings)
       }
     }
 
@@ -1166,7 +1163,7 @@ export class Processor extends CallableInstance {
         let [primary, ...rest] = parameters
         const currentPrimary = attachers[entryIndex][1]
         if (isPlainObj(currentPrimary) && isPlainObj(primary)) {
-          primary = structuredClone({...currentPrimary, ...primary})
+          primary = extend(true, currentPrimary, primary)
         }
 
         attachers[entryIndex] = [plugin, primary, ...rest]

diff --git a/package.json b/package.json
@@ -46,18 +46,18 @@
   ],
   "dependencies": {
     "@types/unist": "^3.0.0",
-    "@ungap/structured-clone": "^1.0.0",
     "bail": "^2.0.0",
     "devlop": "^1.0.0",
+    "extend": "^3.0.0",
     "is-plain-obj": "^4.0.0",
     "trough": "^2.0.0",
     "vfile": "^6.0.0"
   },
   "devDependencies": {
+    "@types/extend": "^3.0.0",
     "@types/hast": "^3.0.0",
     "@types/mdast": "^4.0.0",
     "@types/node": "^20.0.0",
-    "@types/ungap__structured-clone": "^0.3.0",
     "c8": "^8.0.0",
     "prettier": "^3.0.0",
     "remark-cli": "^11.0.0",

diff --git a/test/data.js b/test/data.js
@@ -39,4 +39,15 @@ test('`data`', async function (t) {
       baz: 'qux'
     })
   })
+
+  await t.test('should support functions in data', async function () {
+    const fn = unified().data('fn', func)().data('fn')
+
+    assert(typeof fn === 'function')
+    assert.equal(fn, func)
+
+    function func() {
+      return 'alpha'
+    }
+  })
 })
diff --git a/test/types.d.ts b/test/types.d.ts
@@ -3,6 +3,7 @@ declare module 'unified' {
     baz?: 'qux' | undefined
     foo?: 'bar' | undefined
     x?: boolean | undefined
+    fn?: Function | undefined
   }
 
   interface Settings {