test: more robust tests for nodes and marks too

ueberdosis · Jun 18, 2024 · a7e02b3 · a7e02b3
1 parent daa3c66
commit a7e02b3
Show file tree

Hide file tree

Showing 4 changed files with 399 additions and 396 deletions.
diff --git a/packages/core/src/Extension.ts b/packages/core/src/Extension.ts
@@ -468,6 +468,7 @@ export class Extension<Options = any, Storage = any> {
     extension.name = this.name
     // Set the parent to be our parent
     extension.parent = this.parent
+    console.log('configuring', this.name, extension.name, this.options, extension.options)
 
     return extension
   }
@@ -489,11 +490,11 @@ export class Extension<Options = any, Storage = any> {
       )
     }
 
-    extension.options = callOrReturn(
+    extension.options = mergeDeep(callOrReturn(
       getExtensionField<AnyConfig['addOptions']>(extension, 'addOptions', {
         name: extension.name,
       }),
-    )
+    ), this.options as Record<string, any>) as ExtendedOptions
 
     extension.storage = callOrReturn(
       getExtensionField<AnyConfig['addStorage']>(extension, 'addStorage', {

diff --git a/packages/core/src/Mark.ts b/packages/core/src/Mark.ts
@@ -621,11 +621,11 @@ export class Mark<Options = any, Storage = any> {
       )
     }
 
-    extension.options = callOrReturn(
+    extension.options = mergeDeep(callOrReturn(
       getExtensionField<AnyConfig['addOptions']>(extension, 'addOptions', {
         name: extension.name,
       }),
-    )
+    ), this.options as Record<string, any>) as ExtendedOptions
 
     extension.storage = callOrReturn(
       getExtensionField<AnyConfig['addStorage']>(extension, 'addStorage', {

diff --git a/packages/core/src/Node.ts b/packages/core/src/Node.ts
@@ -812,11 +812,11 @@ export class Node<Options = any, Storage = any> {
       )
     }
 
-    extension.options = callOrReturn(
+    extension.options = mergeDeep(callOrReturn(
       getExtensionField<AnyConfig['addOptions']>(extension, 'addOptions', {
         name: extension.name,
       }),
-    )
+    ), this.options as Record<string, any>) as ExtendedOptions
 
     extension.storage = callOrReturn(
       getExtensionField<AnyConfig['addStorage']>(extension, 'addStorage', {