From c840a562defc5aad039a524fa81adfa25cfc7e2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Fri, 13 Nov 2020 16:07:20 +0100
Subject: [PATCH 01/16] rename attributes to HTMLAttributes

---
 packages/core/src/ExtensionManager.ts           |  4 ++--
 packages/core/src/MarkExtension.ts              |  2 +-
 packages/core/src/NodeExtension.ts              |  2 +-
 packages/core/src/types.ts                      |  2 +-
 packages/core/src/utils/getSchema.ts            |  4 ++--
 packages/extension-blockquote/src/index.ts      |  4 ++--
 packages/extension-bold/src/index.ts            |  4 ++--
 packages/extension-bullet-list/src/index.ts     |  4 ++--
 packages/extension-code-block/src/index.ts      |  4 ++--
 packages/extension-code/src/index.ts            |  4 ++--
 packages/extension-hard-break/src/index.ts      |  4 ++--
 packages/extension-heading/src/index.ts         |  8 ++++++--
 packages/extension-highlight/src/index.ts       |  4 ++--
 packages/extension-horizontal-rule/src/index.ts |  4 ++--
 packages/extension-image/src/index.ts           |  4 ++--
 packages/extension-italic/src/index.ts          |  4 ++--
 packages/extension-link/src/index.ts            |  4 ++--
 packages/extension-list-item/src/index.ts       |  4 ++--
 packages/extension-ordered-list/src/index.ts    |  6 +++---
 packages/extension-paragraph/src/index.ts       |  4 ++--
 packages/extension-strike/src/index.ts          |  4 ++--
 packages/extension-task-item/src/index.ts       | 10 +++++-----
 packages/extension-task-list/src/index.ts       |  4 ++--
 packages/extension-text-style/src/index.ts      |  4 ++--
 packages/extension-underline/src/index.ts       |  4 ++--
 25 files changed, 55 insertions(+), 51 deletions(-)

diff --git a/packages/core/src/ExtensionManager.ts b/packages/core/src/ExtensionManager.ts
index 80ec7e71..5c6ea347 100644
--- a/packages/core/src/ExtensionManager.ts
+++ b/packages/core/src/ExtensionManager.ts
@@ -122,14 +122,14 @@ export default class ExtensionManager {
           getPos: (() => number) | boolean,
           decorations: Decoration[],
         ) => {
-          const attributes = getRenderedAttributes(node, extensionAttributes)
+          const HTMLAttributes = getRenderedAttributes(node, extensionAttributes)
 
           return renderer({
             editor,
             node,
             getPos,
             decorations,
-            attributes,
+            HTMLAttributes,
           })
         }
 
diff --git a/packages/core/src/MarkExtension.ts b/packages/core/src/MarkExtension.ts
index da1d1f41..36c46bfa 100644
--- a/packages/core/src/MarkExtension.ts
+++ b/packages/core/src/MarkExtension.ts
@@ -45,7 +45,7 @@ export interface MarkExtensionSpec<Options = {}, Commands = {}> extends Overwrit
     },
     props: {
       mark: Mark,
-      attributes: { [key: string]: any },
+      HTMLAttributes: { [key: string]: any },
     }
   ) => DOMOutputSpec) | null,
 
diff --git a/packages/core/src/NodeExtension.ts b/packages/core/src/NodeExtension.ts
index d7401cd1..73c1d90a 100644
--- a/packages/core/src/NodeExtension.ts
+++ b/packages/core/src/NodeExtension.ts
@@ -80,7 +80,7 @@ export interface NodeExtensionSpec<Options = {}, Commands = {}> extends Overwrit
     },
     props: {
       node: Node,
-      attributes: { [key: string]: any },
+      HTMLAttributes: { [key: string]: any },
     }
   ) => DOMOutputSpec) | null,
 
diff --git a/packages/core/src/types.ts b/packages/core/src/types.ts
index ff8fcea2..fd0065f0 100644
--- a/packages/core/src/types.ts
+++ b/packages/core/src/types.ts
@@ -49,7 +49,7 @@ export type NodeViewRendererProps = {
   node: Node,
   getPos: (() => number) | boolean,
   decorations: Decoration[],
-  attributes: AnyObject,
+  HTMLAttributes: { [key: string]: any },
 }
 
 export type NodeViewRenderer = (props: NodeViewRendererProps) => NodeView
diff --git a/packages/core/src/utils/getSchema.ts b/packages/core/src/utils/getSchema.ts
index 1a191f50..72d3db62 100644
--- a/packages/core/src/utils/getSchema.ts
+++ b/packages/core/src/utils/getSchema.ts
@@ -50,7 +50,7 @@ export default function getSchema(extensions: Extensions): Schema {
     if (extension.renderHTML) {
       schema.toDOM = node => (extension.renderHTML as Function)?.bind(context)({
         node,
-        attributes: getRenderedAttributes(node, extensionAttributes),
+        HTMLAttributes: getRenderedAttributes(node, extensionAttributes),
       })
     }
 
@@ -79,7 +79,7 @@ export default function getSchema(extensions: Extensions): Schema {
     if (extension.renderHTML) {
       schema.toDOM = mark => (extension.renderHTML as Function)?.bind(context)({
         mark,
-        attributes: getRenderedAttributes(mark, extensionAttributes),
+        HTMLAttributes: getRenderedAttributes(mark, extensionAttributes),
       })
     }
 
diff --git a/packages/extension-blockquote/src/index.ts b/packages/extension-blockquote/src/index.ts
index f4995c35..5df5ae47 100644
--- a/packages/extension-blockquote/src/index.ts
+++ b/packages/extension-blockquote/src/index.ts
@@ -18,8 +18,8 @@ const Blockquote = createNode({
     ]
   },
 
-  renderHTML({ attributes }) {
-    return ['blockquote', attributes, 0]
+  renderHTML({ HTMLAttributes }) {
+    return ['blockquote', HTMLAttributes, 0]
   },
 
   addCommands() {
diff --git a/packages/extension-bold/src/index.ts b/packages/extension-bold/src/index.ts
index 4b649d4d..ee37ebb4 100644
--- a/packages/extension-bold/src/index.ts
+++ b/packages/extension-bold/src/index.ts
@@ -26,8 +26,8 @@ const Bold = createMark({
     ]
   },
 
-  renderHTML({ attributes }) {
-    return ['strong', attributes, 0]
+  renderHTML({ HTMLAttributes }) {
+    return ['strong', HTMLAttributes, 0]
   },
 
   addCommands() {
diff --git a/packages/extension-bullet-list/src/index.ts b/packages/extension-bullet-list/src/index.ts
index cc1c1990..49b6f292 100644
--- a/packages/extension-bullet-list/src/index.ts
+++ b/packages/extension-bullet-list/src/index.ts
@@ -16,8 +16,8 @@ const BulletList = createNode({
     ]
   },
 
-  renderHTML({ attributes }) {
-    return ['ul', attributes, 0]
+  renderHTML({ HTMLAttributes }) {
+    return ['ul', HTMLAttributes, 0]
   },
 
   addCommands() {
diff --git a/packages/extension-code-block/src/index.ts b/packages/extension-code-block/src/index.ts
index 5fa068ec..d8203b5a 100644
--- a/packages/extension-code-block/src/index.ts
+++ b/packages/extension-code-block/src/index.ts
@@ -64,8 +64,8 @@ const CodeBlock = createNode({
     ]
   },
 
-  renderHTML({ attributes }) {
-    return ['pre', ['code', attributes, 0]]
+  renderHTML({ HTMLAttributes }) {
+    return ['pre', ['code', HTMLAttributes, 0]]
   },
 
   addCommands() {
diff --git a/packages/extension-code/src/index.ts b/packages/extension-code/src/index.ts
index 30679ee1..7b68e0d6 100644
--- a/packages/extension-code/src/index.ts
+++ b/packages/extension-code/src/index.ts
@@ -16,8 +16,8 @@ const Code = createMark({
     ]
   },
 
-  renderHTML({ attributes }) {
-    return ['code', attributes, 0]
+  renderHTML({ HTMLAttributes }) {
+    return ['code', HTMLAttributes, 0]
   },
 
   addCommands() {
diff --git a/packages/extension-hard-break/src/index.ts b/packages/extension-hard-break/src/index.ts
index 95b92ca6..be300ba9 100644
--- a/packages/extension-hard-break/src/index.ts
+++ b/packages/extension-hard-break/src/index.ts
@@ -16,8 +16,8 @@ const HardBreak = createNode({
     ]
   },
 
-  renderHTML({ attributes }) {
-    return ['br', attributes]
+  renderHTML({ HTMLAttributes }) {
+    return ['br', HTMLAttributes]
   },
 
   addCommands() {
diff --git a/packages/extension-heading/src/index.ts b/packages/extension-heading/src/index.ts
index d5053f7c..2cef9f7c 100644
--- a/packages/extension-heading/src/index.ts
+++ b/packages/extension-heading/src/index.ts
@@ -5,6 +5,9 @@ type Level = 1 | 2 | 3 | 4 | 5 | 6
 
 export interface HeadingOptions {
   levels: Level[],
+  HTMLAttributes: {
+    [key: string]: any
+  },
 }
 
 const Heading = createNode({
@@ -12,6 +15,7 @@ const Heading = createNode({
 
   defaultOptions: <HeadingOptions>{
     levels: [1, 2, 3, 4, 5, 6],
+    HTMLAttributes: {},
   },
 
   content: 'inline*',
@@ -37,13 +41,13 @@ const Heading = createNode({
       }))
   },
 
-  renderHTML({ node, attributes }) {
+  renderHTML({ node, HTMLAttributes }) {
     const hasLevel = this.options.levels.includes(node.attrs.level)
     const level = hasLevel
       ? node.attrs.level
       : this.options.levels[0]
 
-    return [`h${level}`, attributes, 0]
+    return [`h${level}`, HTMLAttributes, 0]
   },
 
   addCommands() {
diff --git a/packages/extension-highlight/src/index.ts b/packages/extension-highlight/src/index.ts
index fac55d1f..44586cce 100644
--- a/packages/extension-highlight/src/index.ts
+++ b/packages/extension-highlight/src/index.ts
@@ -42,8 +42,8 @@ const Highlight = createMark({
     ]
   },
 
-  renderHTML({ attributes }) {
-    return ['mark', attributes, 0]
+  renderHTML({ HTMLAttributes }) {
+    return ['mark', HTMLAttributes, 0]
   },
 
   addCommands() {
diff --git a/packages/extension-horizontal-rule/src/index.ts b/packages/extension-horizontal-rule/src/index.ts
index a4dd2ca1..d0babb66 100644
--- a/packages/extension-horizontal-rule/src/index.ts
+++ b/packages/extension-horizontal-rule/src/index.ts
@@ -11,8 +11,8 @@ const HorizontalRule = createNode({
     ]
   },
 
-  renderHTML({ attributes }) {
-    return ['hr', attributes]
+  renderHTML({ HTMLAttributes }) {
+    return ['hr', HTMLAttributes]
   },
 
   addCommands() {
diff --git a/packages/extension-image/src/index.ts b/packages/extension-image/src/index.ts
index 09ee1318..1957cddb 100644
--- a/packages/extension-image/src/index.ts
+++ b/packages/extension-image/src/index.ts
@@ -45,8 +45,8 @@ const Image = createNode({
     ]
   },
 
-  renderHTML({ attributes }) {
-    return ['img', attributes]
+  renderHTML({ HTMLAttributes }) {
+    return ['img', HTMLAttributes]
   },
 
   addCommands() {
diff --git a/packages/extension-italic/src/index.ts b/packages/extension-italic/src/index.ts
index 772a5cba..ad5a6390 100644
--- a/packages/extension-italic/src/index.ts
+++ b/packages/extension-italic/src/index.ts
@@ -25,8 +25,8 @@ const Italic = createMark({
     ]
   },
 
-  renderHTML({ attributes }) {
-    return ['em', attributes, 0]
+  renderHTML({ HTMLAttributes }) {
+    return ['em', HTMLAttributes, 0]
   },
 
   addCommands() {
diff --git a/packages/extension-link/src/index.ts b/packages/extension-link/src/index.ts
index 16c81d95..70334a1c 100644
--- a/packages/extension-link/src/index.ts
+++ b/packages/extension-link/src/index.ts
@@ -39,8 +39,8 @@ const Link = createMark({
     ]
   },
 
-  renderHTML({ attributes }) {
-    return ['a', mergeAttributes(attributes, { rel: this.options.rel }), 0]
+  renderHTML({ HTMLAttributes }) {
+    return ['a', mergeAttributes(HTMLAttributes, { rel: this.options.rel }), 0]
   },
 
   addCommands() {
diff --git a/packages/extension-list-item/src/index.ts b/packages/extension-list-item/src/index.ts
index f75f5d80..8e3c05bd 100644
--- a/packages/extension-list-item/src/index.ts
+++ b/packages/extension-list-item/src/index.ts
@@ -15,8 +15,8 @@ const ListItem = createNode({
     ]
   },
 
-  renderHTML({ attributes }) {
-    return ['li', attributes, 0]
+  renderHTML({ HTMLAttributes }) {
+    return ['li', HTMLAttributes, 0]
   },
 
   addKeyboardShortcuts() {
diff --git a/packages/extension-ordered-list/src/index.ts b/packages/extension-ordered-list/src/index.ts
index 10ccfd59..11da5dd6 100644
--- a/packages/extension-ordered-list/src/index.ts
+++ b/packages/extension-ordered-list/src/index.ts
@@ -31,12 +31,12 @@ const OrderedList = createNode({
     ]
   },
 
-  renderHTML({ attributes }) {
-    const { start, ...attributesWithoutStart } = attributes
+  renderHTML({ HTMLAttributes }) {
+    const { start, ...attributesWithoutStart } = HTMLAttributes
 
     return start === 1
       ? ['ol', attributesWithoutStart, 0]
-      : ['ol', attributes, 0]
+      : ['ol', HTMLAttributes, 0]
   },
 
   addCommands() {
diff --git a/packages/extension-paragraph/src/index.ts b/packages/extension-paragraph/src/index.ts
index 6f7c24d8..246d1ac2 100644
--- a/packages/extension-paragraph/src/index.ts
+++ b/packages/extension-paragraph/src/index.ts
@@ -14,8 +14,8 @@ const Paragraph = createNode({
     ]
   },
 
-  renderHTML({ attributes }) {
-    return ['p', attributes, 0]
+  renderHTML({ HTMLAttributes }) {
+    return ['p', HTMLAttributes, 0]
   },
 
   addCommands() {
diff --git a/packages/extension-strike/src/index.ts b/packages/extension-strike/src/index.ts
index 1775b457..8856ba6e 100644
--- a/packages/extension-strike/src/index.ts
+++ b/packages/extension-strike/src/index.ts
@@ -25,8 +25,8 @@ const Strike = createMark({
     ]
   },
 
-  renderHTML({ attributes }) {
-    return ['s', attributes, 0]
+  renderHTML({ HTMLAttributes }) {
+    return ['s', HTMLAttributes, 0]
   },
 
   addCommands() {
diff --git a/packages/extension-task-item/src/index.ts b/packages/extension-task-item/src/index.ts
index a30c25ea..9f3eeb37 100644
--- a/packages/extension-task-item/src/index.ts
+++ b/packages/extension-task-item/src/index.ts
@@ -43,8 +43,8 @@ const TaskItem = createNode({
     ]
   },
 
-  renderHTML({ attributes }) {
-    return ['li', mergeAttributes(attributes, { 'data-type': 'taskItem' }), 0]
+  renderHTML({ HTMLAttributes }) {
+    return ['li', mergeAttributes(HTMLAttributes, { 'data-type': 'taskItem' }), 0]
   },
 
   addKeyboardShortcuts() {
@@ -64,7 +64,7 @@ const TaskItem = createNode({
   },
 
   addNodeView() {
-    return ({ attributes, getPos, editor }) => {
+    return ({ HTMLAttributes, getPos, editor }) => {
       const { view } = editor
       const listItem = document.createElement('li')
       const checkbox = document.createElement('input')
@@ -82,13 +82,13 @@ const TaskItem = createNode({
         }
       })
 
-      if (attributes['data-checked'] === true) {
+      if (HTMLAttributes['data-checked'] === true) {
         checkbox.setAttribute('checked', 'checked')
       }
 
       listItem.append(checkbox, content)
 
-      Object.entries(attributes).forEach(([key, value]) => {
+      Object.entries(HTMLAttributes).forEach(([key, value]) => {
         listItem.setAttribute(key, value)
       })
 
diff --git a/packages/extension-task-list/src/index.ts b/packages/extension-task-list/src/index.ts
index 7f3173d3..862578b2 100644
--- a/packages/extension-task-list/src/index.ts
+++ b/packages/extension-task-list/src/index.ts
@@ -16,8 +16,8 @@ const TaskList = createNode({
     ]
   },
 
-  renderHTML({ attributes }) {
-    return ['ul', mergeAttributes(attributes, { 'data-type': 'taskList' }), 0]
+  renderHTML({ HTMLAttributes }) {
+    return ['ul', mergeAttributes(HTMLAttributes, { 'data-type': 'taskList' }), 0]
   },
 
   addCommands() {
diff --git a/packages/extension-text-style/src/index.ts b/packages/extension-text-style/src/index.ts
index 73f35981..1eead702 100644
--- a/packages/extension-text-style/src/index.ts
+++ b/packages/extension-text-style/src/index.ts
@@ -20,8 +20,8 @@ const TextStyle = createMark({
     ]
   },
 
-  renderHTML({ attributes }) {
-    return ['span', attributes, 0]
+  renderHTML({ HTMLAttributes }) {
+    return ['span', HTMLAttributes, 0]
   },
 
   addCommands() {
diff --git a/packages/extension-underline/src/index.ts b/packages/extension-underline/src/index.ts
index 39628b7f..bd4e0081 100644
--- a/packages/extension-underline/src/index.ts
+++ b/packages/extension-underline/src/index.ts
@@ -14,8 +14,8 @@ const Underline = createMark({
     ]
   },
 
-  renderHTML({ attributes }) {
-    return ['u', attributes, 0]
+  renderHTML({ HTMLAttributes }) {
+    return ['u', HTMLAttributes, 0]
   },
 
   addCommands() {

From 2591ffe41916dc0ec92202898b58cb331172b6c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Fri, 13 Nov 2020 16:44:22 +0100
Subject: [PATCH 02/16] add HTMLAttributes to defaultoptions

---
 packages/extension-blockquote/src/index.ts    | 10 ++++++++++
 packages/extension-bold/src/index.ts          | 10 ++++++++++
 packages/extension-bullet-list/src/index.ts   | 10 ++++++++++
 packages/extension-code-block/src/index.ts    |  4 ++++
 packages/extension-code/src/index.ts          | 15 +++++++++++++-
 packages/extension-highlight/src/index.ts     | 10 ++++++++++
 .../extension-horizontal-rule/src/index.ts    | 10 ++++++++++
 packages/extension-image/src/index.ts         |  4 ++++
 packages/extension-italic/src/index.ts        | 15 +++++++++++++-
 packages/extension-link/src/index.ts          | 20 ++++++++++++-------
 packages/extension-list-item/src/index.ts     | 10 ++++++++++
 packages/extension-ordered-list/src/index.ts  | 10 ++++++++++
 packages/extension-paragraph/paragraph.vue    |  9 ---------
 packages/extension-paragraph/src/index.ts     | 11 +++++++++-
 packages/extension-strike/src/index.ts        | 15 +++++++++++++-
 packages/extension-task-item/src/index.ts     | 16 +++++++++------
 packages/extension-task-list/src/index.ts     | 10 ++++++++++
 packages/extension-underline/src/index.ts     | 10 ++++++++++
 18 files changed, 173 insertions(+), 26 deletions(-)
 delete mode 100644 packages/extension-paragraph/paragraph.vue

diff --git a/packages/extension-blockquote/src/index.ts b/packages/extension-blockquote/src/index.ts
index 5df5ae47..e916cb7d 100644
--- a/packages/extension-blockquote/src/index.ts
+++ b/packages/extension-blockquote/src/index.ts
@@ -1,11 +1,21 @@
 import { Command, createNode } from '@tiptap/core'
 import { wrappingInputRule } from 'prosemirror-inputrules'
 
+export interface BlockquoteOptions {
+  HTMLAttributes: {
+    [key: string]: any
+  },
+}
+
 export const inputRegex = /^\s*>\s$/gm
 
 const Blockquote = createNode({
   name: 'blockquote',
 
+  defaultOptions: <BlockquoteOptions>{
+    HTMLAttributes: {},
+  },
+
   content: 'block*',
 
   group: 'block',
diff --git a/packages/extension-bold/src/index.ts b/packages/extension-bold/src/index.ts
index ee37ebb4..e4800856 100644
--- a/packages/extension-bold/src/index.ts
+++ b/packages/extension-bold/src/index.ts
@@ -2,6 +2,12 @@ import {
   Command, createMark, markInputRule, markPasteRule,
 } from '@tiptap/core'
 
+export interface BoldOptions {
+  HTMLAttributes: {
+    [key: string]: any
+  },
+}
+
 export const starInputRegex = /(?:^|\s)((?:\*\*)((?:[^*]+))(?:\*\*))$/gm
 export const starPasteRegex = /(?:^|\s)((?:\*\*)((?:[^*]+))(?:\*\*))/gm
 export const underscoreInputRegex = /(?:^|\s)((?:__)((?:[^__]+))(?:__))$/gm
@@ -10,6 +16,10 @@ export const underscorePasteRegex = /(?:^|\s)((?:__)((?:[^__]+))(?:__))/gm
 const Bold = createMark({
   name: 'bold',
 
+  defaultOptions: <BoldOptions>{
+    HTMLAttributes: {},
+  },
+
   parseHTML() {
     return [
       {
diff --git a/packages/extension-bullet-list/src/index.ts b/packages/extension-bullet-list/src/index.ts
index 49b6f292..49800640 100644
--- a/packages/extension-bullet-list/src/index.ts
+++ b/packages/extension-bullet-list/src/index.ts
@@ -1,11 +1,21 @@
 import { Command, createNode } from '@tiptap/core'
 import { wrappingInputRule } from 'prosemirror-inputrules'
 
+export interface BulletListOptions {
+  HTMLAttributes: {
+    [key: string]: any
+  },
+}
+
 export const inputRegex = /^\s*([-+*])\s$/
 
 const BulletList = createNode({
   name: 'bulletList',
 
+  defaultOptions: <BulletListOptions>{
+    HTMLAttributes: {},
+  },
+
   group: 'block list',
 
   content: 'listItem+',
diff --git a/packages/extension-code-block/src/index.ts b/packages/extension-code-block/src/index.ts
index d8203b5a..42ec0825 100644
--- a/packages/extension-code-block/src/index.ts
+++ b/packages/extension-code-block/src/index.ts
@@ -3,6 +3,9 @@ import { textblockTypeInputRule } from 'prosemirror-inputrules'
 
 export interface CodeBlockOptions {
   languageClassPrefix: string,
+  HTMLAttributes: {
+    [key: string]: any
+  },
 }
 
 export const backtickInputRegex = /^```(?<language>[a-z]*)? $/
@@ -13,6 +16,7 @@ const CodeBlock = createNode({
 
   defaultOptions: <CodeBlockOptions>{
     languageClassPrefix: 'language-',
+    HTMLAttributes: {},
   },
 
   content: 'text*',
diff --git a/packages/extension-code/src/index.ts b/packages/extension-code/src/index.ts
index 7b68e0d6..78d89378 100644
--- a/packages/extension-code/src/index.ts
+++ b/packages/extension-code/src/index.ts
@@ -1,13 +1,26 @@
 import {
-  Command, createMark, markInputRule, markPasteRule,
+  Command,
+  createMark,
+  markInputRule,
+  markPasteRule,
 } from '@tiptap/core'
 
+export interface CodeOptions {
+  HTMLAttributes: {
+    [key: string]: any
+  },
+}
+
 export const inputRegex = /(?:^|\s)((?:`)((?:[^`]+))(?:`))$/gm
 export const pasteRegex = /(?:^|\s)((?:`)((?:[^`]+))(?:`))/gm
 
 const Code = createMark({
   name: 'code',
 
+  defaultOptions: <CodeOptions>{
+    HTMLAttributes: {},
+  },
+
   excludes: '_',
 
   parseHTML() {
diff --git a/packages/extension-highlight/src/index.ts b/packages/extension-highlight/src/index.ts
index 44586cce..e9d1d8f1 100644
--- a/packages/extension-highlight/src/index.ts
+++ b/packages/extension-highlight/src/index.ts
@@ -5,12 +5,22 @@ import {
   markPasteRule,
 } from '@tiptap/core'
 
+export interface HighlightOptions {
+  HTMLAttributes: {
+    [key: string]: any
+  },
+}
+
 export const inputRegex = /(?:^|\s)((?:==)((?:[^~]+))(?:==))$/gm
 export const pasteRegex = /(?:^|\s)((?:==)((?:[^~]+))(?:==))/gm
 
 const Highlight = createMark({
   name: 'highlight',
 
+  defaultOptions: <HighlightOptions>{
+    HTMLAttributes: {},
+  },
+
   addAttributes() {
     return {
       color: {
diff --git a/packages/extension-horizontal-rule/src/index.ts b/packages/extension-horizontal-rule/src/index.ts
index d0babb66..e14749a6 100644
--- a/packages/extension-horizontal-rule/src/index.ts
+++ b/packages/extension-horizontal-rule/src/index.ts
@@ -1,8 +1,18 @@
 import { Command, createNode, nodeInputRule } from '@tiptap/core'
 
+export interface HorizontalRuleOptions {
+  HTMLAttributes: {
+    [key: string]: any
+  },
+}
+
 const HorizontalRule = createNode({
   name: 'horizontalRule',
 
+  defaultOptions: <HorizontalRuleOptions>{
+    HTMLAttributes: {},
+  },
+
   group: 'block',
 
   parseHTML() {
diff --git a/packages/extension-image/src/index.ts b/packages/extension-image/src/index.ts
index 1957cddb..1db0edb4 100644
--- a/packages/extension-image/src/index.ts
+++ b/packages/extension-image/src/index.ts
@@ -2,6 +2,9 @@ import { Command, createNode, nodeInputRule } from '@tiptap/core'
 
 export interface ImageOptions {
   inline: boolean,
+  HTMLAttributes: {
+    [key: string]: any
+  },
 }
 
 export const inputRegex = /!\[(.+|:?)]\((\S+)(?:(?:\s+)["'](\S+)["'])?\)/
@@ -11,6 +14,7 @@ const Image = createNode({
 
   defaultOptions: <ImageOptions>{
     inline: false,
+    HTMLAttributes: {},
   },
 
   inline() {
diff --git a/packages/extension-italic/src/index.ts b/packages/extension-italic/src/index.ts
index ad5a6390..3828c3cd 100644
--- a/packages/extension-italic/src/index.ts
+++ b/packages/extension-italic/src/index.ts
@@ -1,7 +1,16 @@
 import {
-  Command, createMark, markInputRule, markPasteRule,
+  Command,
+  createMark,
+  markInputRule,
+  markPasteRule,
 } from '@tiptap/core'
 
+export interface ItalicOptions {
+  HTMLAttributes: {
+    [key: string]: any
+  },
+}
+
 export const starInputRegex = /(?:^|\s)((?:\*)((?:[^*]+))(?:\*))$/gm
 export const starPasteRegex = /(?:^|\s)((?:\*)((?:[^*]+))(?:\*))/gm
 export const underscoreInputRegex = /(?:^|\s)((?:_)((?:[^_]+))(?:_))$/gm
@@ -10,6 +19,10 @@ export const underscorePasteRegex = /(?:^|\s)((?:_)((?:[^_]+))(?:_))/gm
 const Italic = createMark({
   name: 'italic',
 
+  defaultOptions: <ItalicOptions>{
+    HTMLAttributes: {},
+  },
+
   parseHTML() {
     return [
       {
diff --git a/packages/extension-link/src/index.ts b/packages/extension-link/src/index.ts
index 70334a1c..5298bc10 100644
--- a/packages/extension-link/src/index.ts
+++ b/packages/extension-link/src/index.ts
@@ -1,12 +1,16 @@
 import {
-  Command, createMark, markPasteRule, mergeAttributes,
+  Command,
+  createMark,
+  markPasteRule,
+  mergeAttributes,
 } from '@tiptap/core'
 import { Plugin, PluginKey } from 'prosemirror-state'
 
 export interface LinkOptions {
   openOnClick: boolean,
-  target: string,
-  rel: string,
+  HTMLAttributes: {
+    [key: string]: any
+  },
 }
 
 export const pasteRegex = /https?:\/\/(?:www\.)?[-a-zA-Z0-9@:%._+~#=]{1,256}\.[a-zA-Z]{2,}\b(?:[-a-zA-Z0-9@:%._+~#=?!&/()]*)/gi
@@ -18,8 +22,10 @@ const Link = createMark({
 
   defaultOptions: <LinkOptions>{
     openOnClick: true,
-    target: '_blank',
-    rel: 'noopener noreferrer nofollow',
+    HTMLAttributes: {
+      target: '_blank',
+      rel: 'noopener noreferrer nofollow',
+    },
   },
 
   addAttributes() {
@@ -28,7 +34,7 @@ const Link = createMark({
         default: null,
       },
       target: {
-        default: this.options.target,
+        default: this.options.HTMLAttributes.target,
       },
     }
   },
@@ -40,7 +46,7 @@ const Link = createMark({
   },
 
   renderHTML({ HTMLAttributes }) {
-    return ['a', mergeAttributes(HTMLAttributes, { rel: this.options.rel }), 0]
+    return ['a', mergeAttributes(HTMLAttributes, { rel: this.options.HTMLAttributes.rel }), 0]
   },
 
   addCommands() {
diff --git a/packages/extension-list-item/src/index.ts b/packages/extension-list-item/src/index.ts
index 8e3c05bd..c9bdca34 100644
--- a/packages/extension-list-item/src/index.ts
+++ b/packages/extension-list-item/src/index.ts
@@ -1,8 +1,18 @@
 import { createNode } from '@tiptap/core'
 
+export interface ListItemOptions {
+  HTMLAttributes: {
+    [key: string]: any
+  },
+}
+
 const ListItem = createNode({
   name: 'listItem',
 
+  defaultOptions: <ListItemOptions>{
+    HTMLAttributes: {},
+  },
+
   content: '(paragraph|list?)+',
 
   defining: true,
diff --git a/packages/extension-ordered-list/src/index.ts b/packages/extension-ordered-list/src/index.ts
index 11da5dd6..7a3f67c5 100644
--- a/packages/extension-ordered-list/src/index.ts
+++ b/packages/extension-ordered-list/src/index.ts
@@ -1,11 +1,21 @@
 import { Command, createNode } from '@tiptap/core'
 import { wrappingInputRule } from 'prosemirror-inputrules'
 
+export interface OrderedListOptions {
+  HTMLAttributes: {
+    [key: string]: any
+  },
+}
+
 export const inputRegex = /^(\d+)\.\s$/
 
 const OrderedList = createNode({
   name: 'orderedList',
 
+  defaultOptions: <OrderedListOptions>{
+    HTMLAttributes: {},
+  },
+
   group: 'block list',
 
   content: 'listItem+',
diff --git a/packages/extension-paragraph/paragraph.vue b/packages/extension-paragraph/paragraph.vue
deleted file mode 100644
index 7fc13d8c..00000000
--- a/packages/extension-paragraph/paragraph.vue
+++ /dev/null
@@ -1,9 +0,0 @@
-<template>
-  <p data-component="yeah" ref="content"></p>
-</template>
-
-<script>
-export default {
-
-}
-</script>
diff --git a/packages/extension-paragraph/src/index.ts b/packages/extension-paragraph/src/index.ts
index 246d1ac2..f5fd23b5 100644
--- a/packages/extension-paragraph/src/index.ts
+++ b/packages/extension-paragraph/src/index.ts
@@ -1,9 +1,18 @@
 import { Command, createNode } from '@tiptap/core'
-// import ParagraphComponent from './paragraph.vue'
+
+export interface ParagraphOptions {
+  HTMLAttributes: {
+    [key: string]: any
+  },
+}
 
 const Paragraph = createNode({
   name: 'paragraph',
 
+  // defaultOptions: <ParagraphOptions>{
+  //   HTMLAttributes: {},
+  // },
+
   group: 'block',
 
   content: 'inline*',
diff --git a/packages/extension-strike/src/index.ts b/packages/extension-strike/src/index.ts
index 8856ba6e..20707ce5 100644
--- a/packages/extension-strike/src/index.ts
+++ b/packages/extension-strike/src/index.ts
@@ -1,13 +1,26 @@
 import {
-  Command, createMark, markInputRule, markPasteRule,
+  Command,
+  createMark,
+  markInputRule,
+  markPasteRule,
 } from '@tiptap/core'
 
+export interface StrikeOptions {
+  HTMLAttributes: {
+    [key: string]: any
+  },
+}
+
 export const inputRegex = /(?:^|\s)((?:~~)((?:[^~]+))(?:~~))$/gm
 export const pasteRegex = /(?:^|\s)((?:~~)((?:[^~]+))(?:~~))/gm
 
 const Strike = createMark({
   name: 'strike',
 
+  defaultOptions: <StrikeOptions>{
+    HTMLAttributes: {},
+  },
+
   parseHTML() {
     return [
       {
diff --git a/packages/extension-task-item/src/index.ts b/packages/extension-task-item/src/index.ts
index 9f3eeb37..ab98ba52 100644
--- a/packages/extension-task-item/src/index.ts
+++ b/packages/extension-task-item/src/index.ts
@@ -1,25 +1,29 @@
 import { createNode, mergeAttributes } from '@tiptap/core'
 import { wrappingInputRule } from 'prosemirror-inputrules'
 
-export const inputRegex = /^\s*(\[([ |x])\])\s$/
-
 export interface TaskItemOptions {
   nested: boolean,
+  HTMLAttributes: {
+    [key: string]: any
+  },
 }
 
+export const inputRegex = /^\s*(\[([ |x])\])\s$/
+
 const TaskItem = createNode({
   name: 'taskItem',
 
+  defaultOptions: <TaskItemOptions>{
+    nested: false,
+    HTMLAttributes: {},
+  },
+
   content() {
     return this.options.nested ? '(paragraph|taskList)+' : 'paragraph+'
   },
 
   defining: true,
 
-  defaultOptions: <TaskItemOptions>{
-    nested: false,
-  },
-
   addAttributes() {
     return {
       checked: {
diff --git a/packages/extension-task-list/src/index.ts b/packages/extension-task-list/src/index.ts
index 862578b2..240eb55d 100644
--- a/packages/extension-task-list/src/index.ts
+++ b/packages/extension-task-list/src/index.ts
@@ -1,8 +1,18 @@
 import { Command, createNode, mergeAttributes } from '@tiptap/core'
 
+export interface TaskListOptions {
+  HTMLAttributes: {
+    [key: string]: any
+  },
+}
+
 const TaskList = createNode({
   name: 'taskList',
 
+  defaultOptions: <TaskListOptions>{
+    HTMLAttributes: {},
+  },
+
   group: 'block list',
 
   content: 'taskItem+',
diff --git a/packages/extension-underline/src/index.ts b/packages/extension-underline/src/index.ts
index bd4e0081..1f270f47 100644
--- a/packages/extension-underline/src/index.ts
+++ b/packages/extension-underline/src/index.ts
@@ -1,8 +1,18 @@
 import { Command, createMark } from '@tiptap/core'
 
+export interface UnderlineOptions {
+  HTMLAttributes: {
+    [key: string]: any
+  },
+}
+
 const Underline = createMark({
   name: 'underline',
 
+  defaultOptions: <UnderlineOptions>{
+    HTMLAttributes: {},
+  },
+
   parseHTML() {
     return [
       {

From 41ce8c0743ccda7b831f72d1a64ee62993bda298 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Fri, 13 Nov 2020 16:46:12 +0100
Subject: [PATCH 03/16] fix lint

---
 docs/src/components/PageNavigation/index.vue        | 7 ++++++-
 docs/src/demos/Examples/MarkdownShortcuts/index.vue | 1 -
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/docs/src/components/PageNavigation/index.vue b/docs/src/components/PageNavigation/index.vue
index 6f2073a2..c12e25e3 100644
--- a/docs/src/components/PageNavigation/index.vue
+++ b/docs/src/components/PageNavigation/index.vue
@@ -41,7 +41,12 @@ export default {
     flattenedItems() {
       const flattenedItems = []
 
-      this.items.forEach(({ title, link, redirect, items }) => {
+      this.items.forEach(({
+        title,
+        link,
+        redirect,
+        items,
+      }) => {
         flattenedItems.push({
           title,
           link,
diff --git a/docs/src/demos/Examples/MarkdownShortcuts/index.vue b/docs/src/demos/Examples/MarkdownShortcuts/index.vue
index d2176b57..5bd851c1 100644
--- a/docs/src/demos/Examples/MarkdownShortcuts/index.vue
+++ b/docs/src/demos/Examples/MarkdownShortcuts/index.vue
@@ -6,7 +6,6 @@
 
 <script>
 import { Editor, EditorContent, defaultExtensions } from '@tiptap/vue-starter-kit'
-import Strike from '@tiptap/extension-strike'
 import Highlight from '@tiptap/extension-highlight'
 
 export default {

From 9d7e022ccb3633e92fc62c16c2575751cee2004b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Sat, 14 Nov 2020 09:23:47 +0100
Subject: [PATCH 04/16] fix bug

---
 packages/core/src/Extension.ts            | 2 +-
 packages/core/src/MarkExtension.ts        | 2 +-
 packages/core/src/NodeExtension.ts        | 2 +-
 packages/extension-paragraph/src/index.ts | 6 +++---
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/core/src/Extension.ts b/packages/core/src/Extension.ts
index bcd91541..cc40bfb0 100644
--- a/packages/core/src/Extension.ts
+++ b/packages/core/src/Extension.ts
@@ -2,7 +2,7 @@ import { Plugin } from 'prosemirror-state'
 import { Editor } from './Editor'
 import { GlobalAttributes } from './types'
 
-export interface ExtensionSpec<Options = {}, Commands = {}> {
+export interface ExtensionSpec<Options = any, Commands = {}> {
   /**
    * Name
    */
diff --git a/packages/core/src/MarkExtension.ts b/packages/core/src/MarkExtension.ts
index 36c46bfa..6cb3c981 100644
--- a/packages/core/src/MarkExtension.ts
+++ b/packages/core/src/MarkExtension.ts
@@ -6,7 +6,7 @@ import { ExtensionSpec, defaultExtension } from './Extension'
 import { Attributes, Overwrite } from './types'
 import { Editor } from './Editor'
 
-export interface MarkExtensionSpec<Options = {}, Commands = {}> extends Overwrite<ExtensionSpec<Options, Commands>, {
+export interface MarkExtensionSpec<Options = any, Commands = {}> extends Overwrite<ExtensionSpec<Options, Commands>, {
   /**
    * Inclusive
    */
diff --git a/packages/core/src/NodeExtension.ts b/packages/core/src/NodeExtension.ts
index 73c1d90a..e48075da 100644
--- a/packages/core/src/NodeExtension.ts
+++ b/packages/core/src/NodeExtension.ts
@@ -6,7 +6,7 @@ import { ExtensionSpec, defaultExtension } from './Extension'
 import { Attributes, NodeViewRenderer, Overwrite } from './types'
 import { Editor } from './Editor'
 
-export interface NodeExtensionSpec<Options = {}, Commands = {}> extends Overwrite<ExtensionSpec<Options, Commands>, {
+export interface NodeExtensionSpec<Options = any, Commands = {}> extends Overwrite<ExtensionSpec<Options, Commands>, {
   /**
    * TopNode
    */
diff --git a/packages/extension-paragraph/src/index.ts b/packages/extension-paragraph/src/index.ts
index c384c0dc..4a1d5c59 100644
--- a/packages/extension-paragraph/src/index.ts
+++ b/packages/extension-paragraph/src/index.ts
@@ -9,9 +9,9 @@ export interface ParagraphOptions {
 const Paragraph = createNode({
   name: 'paragraph',
 
-  // defaultOptions: <ParagraphOptions>{
-  //   HTMLAttributes: {},
-  // },
+  defaultOptions: <ParagraphOptions>{
+    HTMLAttributes: {},
+  },
 
   group: 'block',
 

From 2a321f6739d1791cf95214ca67321f3cd07bf564 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Sat, 14 Nov 2020 17:27:59 +0100
Subject: [PATCH 05/16] merge HTMLAttributes

---
 packages/core/src/utils/getSchema.ts          | 11 ++++-
 packages/core/src/utils/mergeAttributes.ts    | 40 ++++++++++---------
 packages/extension-link/src/index.ts          |  9 +----
 .../integration/core/mergeAttributes.spec.ts  |  9 +++++
 4 files changed, 41 insertions(+), 28 deletions(-)

diff --git a/packages/core/src/utils/getSchema.ts b/packages/core/src/utils/getSchema.ts
index 72d3db62..ee0bed4d 100644
--- a/packages/core/src/utils/getSchema.ts
+++ b/packages/core/src/utils/getSchema.ts
@@ -6,6 +6,7 @@ import getRenderedAttributes from './getRenderedAttributes'
 import isEmptyObject from './isEmptyObject'
 import injectExtensionAttributesToParseRule from './injectExtensionAttributesToParseRule'
 import callOrReturn from './callOrReturn'
+import mergeAttributes from './mergeAttributes'
 
 function cleanUpSchemaItem<T>(data: T) {
   return Object.fromEntries(Object.entries(data).filter(([key, value]) => {
@@ -50,7 +51,10 @@ export default function getSchema(extensions: Extensions): Schema {
     if (extension.renderHTML) {
       schema.toDOM = node => (extension.renderHTML as Function)?.bind(context)({
         node,
-        HTMLAttributes: getRenderedAttributes(node, extensionAttributes),
+        HTMLAttributes: mergeAttributes(
+          extension.options.HTMLAttributes,
+          getRenderedAttributes(node, extensionAttributes),
+        ),
       })
     }
 
@@ -79,7 +83,10 @@ export default function getSchema(extensions: Extensions): Schema {
     if (extension.renderHTML) {
       schema.toDOM = mark => (extension.renderHTML as Function)?.bind(context)({
         mark,
-        HTMLAttributes: getRenderedAttributes(mark, extensionAttributes),
+        HTMLAttributes: mergeAttributes(
+          extension.options.HTMLAttributes,
+          getRenderedAttributes(mark, extensionAttributes),
+        ),
       })
     }
 
diff --git a/packages/core/src/utils/mergeAttributes.ts b/packages/core/src/utils/mergeAttributes.ts
index 733c8cb9..558bdf21 100644
--- a/packages/core/src/utils/mergeAttributes.ts
+++ b/packages/core/src/utils/mergeAttributes.ts
@@ -1,26 +1,28 @@
 import { AnyObject } from '../types'
 
-export default function mergeAttributes(...object: AnyObject[]) {
-  return object.reduce((items, item) => {
-    const mergedAttributes = { ...items }
+export default function mergeAttributes(...objects: AnyObject[]) {
+  return objects
+    .filter(item => !!item)
+    .reduce((items, item) => {
+      const mergedAttributes = { ...items }
 
-    Object.entries(item).forEach(([key, value]) => {
-      const exists = mergedAttributes[key]
+      Object.entries(item).forEach(([key, value]) => {
+        const exists = mergedAttributes[key]
 
-      if (!exists) {
-        mergedAttributes[key] = value
-        return
-      }
+        if (!exists) {
+          mergedAttributes[key] = value
+          return
+        }
 
-      if (key === 'class') {
-        mergedAttributes[key] = [mergedAttributes[key], value].join(' ')
-      } else if (key === 'style') {
-        mergedAttributes[key] = [mergedAttributes[key], value].join('; ')
-      } else {
-        mergedAttributes[key] = value
-      }
-    })
+        if (key === 'class') {
+          mergedAttributes[key] = [mergedAttributes[key], value].join(' ')
+        } else if (key === 'style') {
+          mergedAttributes[key] = [mergedAttributes[key], value].join('; ')
+        } else {
+          mergedAttributes[key] = value
+        }
+      })
 
-    return mergedAttributes
-  }, {})
+      return mergedAttributes
+    }, {})
 }
diff --git a/packages/extension-link/src/index.ts b/packages/extension-link/src/index.ts
index 2bf0dd2e..cd8c1a28 100644
--- a/packages/extension-link/src/index.ts
+++ b/packages/extension-link/src/index.ts
@@ -1,9 +1,4 @@
-import {
-  Command,
-  createMark,
-  markPasteRule,
-  mergeAttributes,
-} from '@tiptap/core'
+import { Command, createMark, markPasteRule } from '@tiptap/core'
 import { Plugin, PluginKey } from 'prosemirror-state'
 
 export interface LinkOptions {
@@ -46,7 +41,7 @@ const Link = createMark({
   },
 
   renderHTML({ HTMLAttributes }) {
-    return ['a', mergeAttributes(HTMLAttributes, { rel: this.options.HTMLAttributes.rel }), 0]
+    return ['a', HTMLAttributes, 0]
   },
 
   addCommands() {
diff --git a/tests/cypress/integration/core/mergeAttributes.spec.ts b/tests/cypress/integration/core/mergeAttributes.spec.ts
index 5a6a24e0..fcb2aac5 100644
--- a/tests/cypress/integration/core/mergeAttributes.spec.ts
+++ b/tests/cypress/integration/core/mergeAttributes.spec.ts
@@ -57,4 +57,13 @@ describe('mergeAttributes', () => {
       style: 'color: red; background: green',
     })
   })
+
+  it('should ignore falsy values', () => {
+    // @ts-expect-error
+    const value = mergeAttributes(undefined, { class: 'foo' })
+
+    expect(value).to.deep.eq({
+      class: 'foo',
+    })
+  })
 })

From 17dd2843668626e532fb3d082d102ba647f74c59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Sat, 14 Nov 2020 17:38:49 +0100
Subject: [PATCH 06/16] fix tests

---
 docs/src/demos/Marks/Link/index.spec.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/src/demos/Marks/Link/index.spec.js b/docs/src/demos/Marks/Link/index.spec.js
index 39c5b313..f4124bf2 100644
--- a/docs/src/demos/Marks/Link/index.spec.js
+++ b/docs/src/demos/Marks/Link/index.spec.js
@@ -13,21 +13,21 @@ context('/api/marks/link', () => {
   it('should parse a tags correctly', () => {
     cy.get('.ProseMirror').then(([{ editor }]) => {
       editor.commands.setContent('<p><a href="#">Example Text</a></p>')
-      expect(editor.getHTML()).to.eq('<p><a href="#" target="_blank" rel="noopener noreferrer nofollow">Example Text</a></p>')
+      expect(editor.getHTML()).to.eq('<p><a target="_blank" rel="noopener noreferrer nofollow" href="#">Example Text</a></p>')
     })
   })
 
   it('should parse a tags with target attribute correctly', () => {
     cy.get('.ProseMirror').then(([{ editor }]) => {
       editor.commands.setContent('<p><a href="#" target="_self">Example Text</a></p>')
-      expect(editor.getHTML()).to.eq('<p><a href="#" target="_self" rel="noopener noreferrer nofollow">Example Text</a></p>')
+      expect(editor.getHTML()).to.eq('<p><a target="_self" rel="noopener noreferrer nofollow" href="#">Example Text</a></p>')
     })
   })
 
   it('should parse a tags with rel attribute correctly', () => {
     cy.get('.ProseMirror').then(([{ editor }]) => {
       editor.commands.setContent('<p><a href="#" rel="follow">Example Text</a></p>')
-      expect(editor.getHTML()).to.eq('<p><a href="#" target="_blank" rel="noopener noreferrer nofollow">Example Text</a></p>')
+      expect(editor.getHTML()).to.eq('<p><a target="_blank" rel="noopener noreferrer nofollow" href="#">Example Text</a></p>')
     })
   })
 

From 034ee139a39b789ea38d7dc87d05c6094268792b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Sun, 15 Nov 2020 23:25:25 +0100
Subject: [PATCH 07/16] add new syntax to all packages

---
 packages/core/src/Extension.ts                | 120 ++++++++++-----
 packages/core/src/MarkExtension.ts            | 119 ++++++++++-----
 packages/core/src/NodeExtension.ts            | 143 ++++++++++++------
 packages/core/src/extensions/commands.ts      |   4 +-
 packages/core/src/extensions/editable.ts      |   4 +-
 packages/core/src/extensions/focusEvents.ts   |   4 +-
 packages/core/src/extensions/keymap.ts        |   4 +-
 packages/extension-blockquote/src/index.ts    |   4 +-
 packages/extension-bold/src/index.ts          |   4 +-
 packages/extension-bullet-list/src/index.ts   |   4 +-
 packages/extension-code-block/src/index.ts    |   4 +-
 packages/extension-code/src/index.ts          |   4 +-
 .../src/index.ts                              |   4 +-
 packages/extension-collaboration/src/index.ts |   4 +-
 packages/extension-document/src/index.ts      |   4 +-
 packages/extension-dropcursor/src/index.ts    |   4 +-
 packages/extension-focus/src/index.ts         |   4 +-
 packages/extension-font-family/src/index.ts   |   4 +-
 packages/extension-gapcursor/src/index.ts     |   4 +-
 packages/extension-hard-break/src/index.ts    |   4 +-
 packages/extension-heading/src/index.ts       |   4 +-
 packages/extension-highlight/src/index.ts     |   4 +-
 packages/extension-history/src/index.ts       |   4 +-
 .../extension-horizontal-rule/src/index.ts    |   4 +-
 packages/extension-image/src/index.ts         |   4 +-
 packages/extension-italic/src/index.ts        |   4 +-
 packages/extension-link/src/index.ts          |   4 +-
 packages/extension-list-item/src/index.ts     |   4 +-
 packages/extension-ordered-list/src/index.ts  |   4 +-
 packages/extension-paragraph/src/index.ts     |   4 +-
 packages/extension-strike/src/index.ts        |   4 +-
 packages/extension-task-item/src/index.ts     |   4 +-
 packages/extension-task-list/src/index.ts     |   4 +-
 packages/extension-text-align/src/index.ts    |   4 +-
 packages/extension-text-style/src/index.ts    |   4 +-
 packages/extension-text/src/index.ts          |   4 +-
 packages/extension-typography/src/index.ts    |   4 +-
 packages/extension-underline/src/index.ts     |   4 +-
 packages/starter-kit/src/index.ts             |  36 ++---
 39 files changed, 353 insertions(+), 205 deletions(-)

diff --git a/packages/core/src/Extension.ts b/packages/core/src/Extension.ts
index cc40bfb0..48d23b4e 100644
--- a/packages/core/src/Extension.ts
+++ b/packages/core/src/Extension.ts
@@ -63,51 +63,93 @@ export interface ExtensionSpec<Options = any, Commands = {}> {
   }) => Plugin[],
 }
 
-/**
- * Extension interface for internal usage
- */
-export type Extension = Required<Omit<ExtensionSpec, 'defaultOptions'> & {
-  type: string,
-  options: {
-    [key: string]: any
-  },
-}>
+// /**
+//  * Extension interface for internal usage
+//  */
+// export type Extension = Required<Omit<ExtensionSpec, 'defaultOptions'> & {
+//   type: string,
+//   options: {
+//     [key: string]: any
+//   },
+// }>
 
-/**
- * Default extension
- */
-export const defaultExtension: Extension = {
-  name: 'extension',
-  type: 'extension',
-  options: {},
-  addGlobalAttributes: () => [],
-  addCommands: () => ({}),
-  addKeyboardShortcuts: () => ({}),
-  addInputRules: () => [],
-  addPasteRules: () => [],
-  addProseMirrorPlugins: () => [],
-}
+// /**
+//  * Default extension
+//  */
+// export const defaultExtension: Extension = {
+//   name: 'extension',
+//   type: 'extension',
+//   options: {},
+//   addGlobalAttributes: () => [],
+//   addCommands: () => ({}),
+//   addKeyboardShortcuts: () => ({}),
+//   addInputRules: () => [],
+//   addPasteRules: () => [],
+//   addProseMirrorPlugins: () => [],
+// }
 
-export function createExtension<Options extends {}, Commands extends {}>(config: ExtensionSpec<Options, Commands>) {
-  const extend = <ExtendedOptions = Options, ExtendedCommands = Commands>(extendedConfig: Partial<ExtensionSpec<ExtendedOptions, ExtendedCommands>>) => {
-    return createExtension({
-      ...config,
-      ...extendedConfig,
-    } as ExtensionSpec<ExtendedOptions, ExtendedCommands>)
+// export function createExtension<Options extends {}, Commands extends {}>(config: ExtensionSpec<Options, Commands>) {
+//   const extend = <ExtendedOptions = Options, ExtendedCommands = Commands>(extendedConfig: Partial<ExtensionSpec<ExtendedOptions, ExtendedCommands>>) => {
+//     return createExtension({
+//       ...config,
+//       ...extendedConfig,
+//     } as ExtensionSpec<ExtendedOptions, ExtendedCommands>)
+//   }
+
+//   const setOptions = (options?: Partial<Options>) => {
+//     const { defaultOptions, ...rest } = config
+
+//     return {
+//       ...defaultExtension,
+//       ...rest,
+//       options: {
+//         ...defaultOptions,
+//         ...options,
+//       } as Options,
+//     }
+//   }
+
+//   return Object.assign(setOptions, { config, extend })
+// }
+
+export class Extension<Options = any, Commands = any> {
+  config: Required<ExtensionSpec> = {
+    name: 'extension',
+    defaultOptions: {},
+    addGlobalAttributes: () => [],
+    addCommands: () => ({}),
+    addKeyboardShortcuts: () => ({}),
+    addInputRules: () => [],
+    addPasteRules: () => [],
+    addProseMirrorPlugins: () => [],
   }
 
-  const setOptions = (options?: Partial<Options>) => {
-    const { defaultOptions, ...rest } = config
+  options!: Options
 
-    return {
-      ...defaultExtension,
-      ...rest,
-      options: {
-        ...defaultOptions,
-        ...options,
-      } as Options,
+  constructor(config: ExtensionSpec<Options, Commands>) {
+    this.config = {
+      ...this.config,
+      ...config,
+    }
+
+    this.options = this.config.defaultOptions
+  }
+
+  static create<O, C>(config: ExtensionSpec<O, C>) {
+    return new Extension<O, C>(config)
+  }
+
+  set(options: Options) {
+    this.options = {
+      ...this.config.defaultOptions,
+      ...options,
     }
   }
 
-  return Object.assign(setOptions, { config, extend })
+  extend<ExtendedOptions = Options, ExtendedCommands = Commands>(extendedConfig: Partial<ExtensionSpec<ExtendedOptions, ExtendedCommands>>) {
+    return new Extension<ExtendedOptions, ExtendedCommands>({
+      ...this.config,
+      ...extendedConfig,
+    } as ExtensionSpec<ExtendedOptions, ExtendedCommands>)
+  }
 }
diff --git a/packages/core/src/MarkExtension.ts b/packages/core/src/MarkExtension.ts
index 6cb3c981..971ba1a9 100644
--- a/packages/core/src/MarkExtension.ts
+++ b/packages/core/src/MarkExtension.ts
@@ -2,7 +2,7 @@ import {
   DOMOutputSpec, MarkSpec, Mark, MarkType,
 } from 'prosemirror-model'
 import { Plugin } from 'prosemirror-state'
-import { ExtensionSpec, defaultExtension } from './Extension'
+import { ExtensionSpec } from './Extension'
 import { Attributes, Overwrite } from './types'
 import { Editor } from './Editor'
 
@@ -106,46 +106,95 @@ export interface MarkExtensionSpec<Options = any, Commands = {}> extends Overwri
   }) => Plugin[],
 }> {}
 
-export type MarkExtension = Required<Omit<MarkExtensionSpec, 'defaultOptions'> & {
-  type: string,
-  options: {
-    [key: string]: any
-  },
-}>
+// export type MarkExtension = Required<Omit<MarkExtensionSpec, 'defaultOptions'> & {
+//   type: string,
+//   options: {
+//     [key: string]: any
+//   },
+// }>
 
-const defaultMark: MarkExtension = {
-  ...defaultExtension,
-  type: 'mark',
-  name: 'mark',
-  inclusive: null,
-  excludes: null,
-  group: null,
-  spanning: null,
-  parseHTML: () => null,
-  renderHTML: null,
-  addAttributes: () => ({}),
-}
+// const defaultMark: MarkExtension = {
+//   ...defaultExtension,
+//   type: 'mark',
+//   name: 'mark',
+//   inclusive: null,
+//   excludes: null,
+//   group: null,
+//   spanning: null,
+//   parseHTML: () => null,
+//   renderHTML: null,
+//   addAttributes: () => ({}),
+// }
 
-export function createMark<Options extends {}, Commands extends {}>(config: MarkExtensionSpec<Options, Commands>) {
-  const extend = <ExtendedOptions = Options, ExtendedCommands = Commands>(extendedConfig: Partial<MarkExtensionSpec<ExtendedOptions, ExtendedCommands>>) => {
-    return createMark({
-      ...config,
-      ...extendedConfig,
-    } as MarkExtensionSpec<ExtendedOptions, ExtendedCommands>)
+// export function createMark<Options extends {}, Commands extends {}>(config: MarkExtensionSpec<Options, Commands>) {
+//   const extend = <ExtendedOptions = Options, ExtendedCommands = Commands>(extendedConfig: Partial<MarkExtensionSpec<ExtendedOptions, ExtendedCommands>>) => {
+//     return createMark({
+//       ...config,
+//       ...extendedConfig,
+//     } as MarkExtensionSpec<ExtendedOptions, ExtendedCommands>)
+//   }
+
+//   const setOptions = (options?: Partial<Options>) => {
+//     const { defaultOptions, ...rest } = config
+
+//     return {
+//       ...defaultMark,
+//       ...rest,
+//       options: {
+//         ...defaultOptions,
+//         ...options,
+//       } as Options,
+//     }
+//   }
+
+//   return Object.assign(setOptions, { config, extend })
+// }
+
+export class MarkExtension<Options = any, Commands = any> {
+  config: Required<MarkExtensionSpec> = {
+    name: 'mark',
+    defaultOptions: {},
+    addGlobalAttributes: () => [],
+    addCommands: () => ({}),
+    addKeyboardShortcuts: () => ({}),
+    addInputRules: () => [],
+    addPasteRules: () => [],
+    addProseMirrorPlugins: () => [],
+    inclusive: null,
+    excludes: null,
+    group: null,
+    spanning: null,
+    parseHTML: () => null,
+    renderHTML: null,
+    addAttributes: () => ({}),
   }
 
-  const setOptions = (options?: Partial<Options>) => {
-    const { defaultOptions, ...rest } = config
+  options!: Options
 
-    return {
-      ...defaultMark,
-      ...rest,
-      options: {
-        ...defaultOptions,
-        ...options,
-      } as Options,
+  constructor(config: MarkExtensionSpec<Options, Commands>) {
+    this.config = {
+      ...this.config,
+      ...config,
+    }
+
+    this.options = this.config.defaultOptions
+  }
+
+  static create<O, C>(config: MarkExtensionSpec<O, C>) {
+    return new MarkExtension<O, C>(config)
+  }
+
+  set(options: Options) {
+    this.options = {
+      ...this.config.defaultOptions,
+      ...options,
     }
   }
 
-  return Object.assign(setOptions, { config, extend })
+  extend<ExtendedOptions = Options, ExtendedCommands = Commands>(extendedConfig: Partial<MarkExtensionSpec<ExtendedOptions, ExtendedCommands>>) {
+    return new MarkExtension<ExtendedOptions, ExtendedCommands>({
+      ...this.config,
+      ...extendedConfig,
+    } as MarkExtensionSpec<ExtendedOptions, ExtendedCommands>)
+  }
 }
diff --git a/packages/core/src/NodeExtension.ts b/packages/core/src/NodeExtension.ts
index e48075da..92a9e05f 100644
--- a/packages/core/src/NodeExtension.ts
+++ b/packages/core/src/NodeExtension.ts
@@ -2,7 +2,7 @@ import {
   DOMOutputSpec, NodeSpec, Node, NodeType,
 } from 'prosemirror-model'
 import { Plugin } from 'prosemirror-state'
-import { ExtensionSpec, defaultExtension } from './Extension'
+import { ExtensionSpec } from './Extension'
 import { Attributes, NodeViewRenderer, Overwrite } from './types'
 import { Editor } from './Editor'
 
@@ -150,54 +150,111 @@ export interface NodeExtensionSpec<Options = any, Commands = {}> extends Overwri
   }) => NodeViewRenderer) | null,
 }> {}
 
-export type NodeExtension = Required<Omit<NodeExtensionSpec, 'defaultOptions'> & {
-  type: string,
-  options: {
-    [key: string]: any
-  },
-}>
+// export type NodeExtension = Required<Omit<NodeExtensionSpec, 'defaultOptions'> & {
+//   type: string,
+//   options: {
+//     [key: string]: any
+//   },
+// }>
 
-const defaultNode: NodeExtension = {
-  ...defaultExtension,
-  type: 'node',
-  name: 'node',
-  topNode: false,
-  content: null,
-  marks: null,
-  group: null,
-  inline: null,
-  atom: null,
-  selectable: null,
-  draggable: null,
-  code: null,
-  defining: null,
-  isolating: null,
-  parseHTML: () => null,
-  renderHTML: null,
-  addAttributes: () => ({}),
-  addNodeView: null,
-}
+// const defaultNode: NodeExtension = {
+//   ...defaultExtension,
+//   type: 'node',
+//   name: 'node',
+//   topNode: false,
+//   content: null,
+//   marks: null,
+//   group: null,
+//   inline: null,
+//   atom: null,
+//   selectable: null,
+//   draggable: null,
+//   code: null,
+//   defining: null,
+//   isolating: null,
+//   parseHTML: () => null,
+//   renderHTML: null,
+//   addAttributes: () => ({}),
+//   addNodeView: null,
+// }
 
-export function createNode<Options extends {}, Commands extends {}>(config: NodeExtensionSpec<Options, Commands>) {
-  const extend = <ExtendedOptions = Options, ExtendedCommands = Commands>(extendedConfig: Partial<NodeExtensionSpec<ExtendedOptions, ExtendedCommands>>) => {
-    return createNode({
-      ...config,
-      ...extendedConfig,
-    } as NodeExtensionSpec<ExtendedOptions, ExtendedCommands>)
+// export function createNode<Options extends {}, Commands extends {}>(config: NodeExtensionSpec<Options, Commands>) {
+//   const extend = <ExtendedOptions = Options, ExtendedCommands = Commands>(extendedConfig: Partial<NodeExtensionSpec<ExtendedOptions, ExtendedCommands>>) => {
+//     return createNode({
+//       ...config,
+//       ...extendedConfig,
+//     } as NodeExtensionSpec<ExtendedOptions, ExtendedCommands>)
+//   }
+
+//   const setOptions = (options?: Partial<Options>) => {
+//     const { defaultOptions, ...rest } = config
+
+//     return {
+//       ...defaultNode,
+//       ...rest,
+//       options: {
+//         ...defaultOptions,
+//         ...options,
+//       } as Options,
+//     }
+//   }
+
+//   return Object.assign(setOptions, { config, extend })
+// }
+
+export class NodeExtension<Options = any, Commands = any> {
+  config: Required<NodeExtensionSpec> = {
+    name: 'node',
+    defaultOptions: {},
+    addGlobalAttributes: () => [],
+    addCommands: () => ({}),
+    addKeyboardShortcuts: () => ({}),
+    addInputRules: () => [],
+    addPasteRules: () => [],
+    addProseMirrorPlugins: () => [],
+    topNode: false,
+    content: null,
+    marks: null,
+    group: null,
+    inline: null,
+    atom: null,
+    selectable: null,
+    draggable: null,
+    code: null,
+    defining: null,
+    isolating: null,
+    parseHTML: () => null,
+    renderHTML: null,
+    addAttributes: () => ({}),
+    addNodeView: null,
   }
 
-  const setOptions = (options?: Partial<Options>) => {
-    const { defaultOptions, ...rest } = config
+  options!: Options
 
-    return {
-      ...defaultNode,
-      ...rest,
-      options: {
-        ...defaultOptions,
-        ...options,
-      } as Options,
+  constructor(config: NodeExtensionSpec<Options, Commands>) {
+    this.config = {
+      ...this.config,
+      ...config,
+    }
+
+    this.options = this.config.defaultOptions
+  }
+
+  static create<O, C>(config: NodeExtensionSpec<O, C>) {
+    return new NodeExtension<O, C>(config)
+  }
+
+  set(options: Options) {
+    this.options = {
+      ...this.config.defaultOptions,
+      ...options,
     }
   }
 
-  return Object.assign(setOptions, { config, extend })
+  extend<ExtendedOptions = Options, ExtendedCommands = Commands>(extendedConfig: Partial<NodeExtensionSpec<ExtendedOptions, ExtendedCommands>>) {
+    return new NodeExtension<ExtendedOptions, ExtendedCommands>({
+      ...this.config,
+      ...extendedConfig,
+    } as NodeExtensionSpec<ExtendedOptions, ExtendedCommands>)
+  }
 }
diff --git a/packages/core/src/extensions/commands.ts b/packages/core/src/extensions/commands.ts
index 5b7e7a67..3b82b620 100644
--- a/packages/core/src/extensions/commands.ts
+++ b/packages/core/src/extensions/commands.ts
@@ -1,4 +1,4 @@
-import { createExtension } from '../Extension'
+import { Extension } from '../Extension'
 import blur from '../commands/blur'
 import clearContent from '../commands/clearContent'
 import clearNodes from '../commands/clearNodes'
@@ -28,7 +28,7 @@ import updateMarkAttributes from '../commands/updateMarkAttributes'
 import updateNodeAttributes from '../commands/updateNodeAttributes'
 import wrapInList from '../commands/wrapInList'
 
-export const Commands = createExtension({
+export const Commands = Extension.create({
   addCommands() {
     return {
       /**
diff --git a/packages/core/src/extensions/editable.ts b/packages/core/src/extensions/editable.ts
index 2efe4a03..9a67f7e1 100644
--- a/packages/core/src/extensions/editable.ts
+++ b/packages/core/src/extensions/editable.ts
@@ -1,7 +1,7 @@
 import { Plugin, PluginKey } from 'prosemirror-state'
-import { createExtension } from '../Extension'
+import { Extension } from '../Extension'
 
-export const Editable = createExtension({
+export const Editable = Extension.create({
   addProseMirrorPlugins() {
     return [
       new Plugin({
diff --git a/packages/core/src/extensions/focusEvents.ts b/packages/core/src/extensions/focusEvents.ts
index c0d770fc..468d105f 100644
--- a/packages/core/src/extensions/focusEvents.ts
+++ b/packages/core/src/extensions/focusEvents.ts
@@ -1,7 +1,7 @@
 import { Plugin, PluginKey } from 'prosemirror-state'
-import { createExtension } from '../Extension'
+import { Extension } from '../Extension'
 
-export const FocusEvents = createExtension({
+export const FocusEvents = Extension.create({
   addProseMirrorPlugins() {
     const { editor } = this
 
diff --git a/packages/core/src/extensions/keymap.ts b/packages/core/src/extensions/keymap.ts
index 087cbd7b..99486512 100644
--- a/packages/core/src/extensions/keymap.ts
+++ b/packages/core/src/extensions/keymap.ts
@@ -10,9 +10,9 @@ import {
   selectNodeBackward,
 } from 'prosemirror-commands'
 import { undoInputRule } from 'prosemirror-inputrules'
-import { createExtension } from '../Extension'
+import { Extension } from '../Extension'
 
-export const Keymap = createExtension({
+export const Keymap = Extension.create({
   addKeyboardShortcuts() {
     const handleBackspace = () => this.editor.commands.try(({ state, dispatch }) => [
       () => undoInputRule(state, dispatch),
diff --git a/packages/extension-blockquote/src/index.ts b/packages/extension-blockquote/src/index.ts
index 8b35de8b..99f4c67e 100644
--- a/packages/extension-blockquote/src/index.ts
+++ b/packages/extension-blockquote/src/index.ts
@@ -1,4 +1,4 @@
-import { Command, createNode } from '@tiptap/core'
+import { Command, NodeExtension } from '@tiptap/core'
 import { wrappingInputRule } from 'prosemirror-inputrules'
 
 export interface BlockquoteOptions {
@@ -9,7 +9,7 @@ export interface BlockquoteOptions {
 
 export const inputRegex = /^\s*>\s$/gm
 
-const Blockquote = createNode({
+const Blockquote = NodeExtension.create({
   name: 'blockquote',
 
   defaultOptions: <BlockquoteOptions>{
diff --git a/packages/extension-bold/src/index.ts b/packages/extension-bold/src/index.ts
index 98469c29..4c917278 100644
--- a/packages/extension-bold/src/index.ts
+++ b/packages/extension-bold/src/index.ts
@@ -1,5 +1,5 @@
 import {
-  Command, createMark, markInputRule, markPasteRule,
+  Command, MarkExtension, markInputRule, markPasteRule,
 } from '@tiptap/core'
 
 export interface BoldOptions {
@@ -13,7 +13,7 @@ export const starPasteRegex = /(?:^|\s)((?:\*\*)((?:[^*]+))(?:\*\*))/gm
 export const underscoreInputRegex = /(?:^|\s)((?:__)((?:[^__]+))(?:__))$/gm
 export const underscorePasteRegex = /(?:^|\s)((?:__)((?:[^__]+))(?:__))/gm
 
-const Bold = createMark({
+const Bold = MarkExtension.create({
   name: 'bold',
 
   defaultOptions: <BoldOptions>{
diff --git a/packages/extension-bullet-list/src/index.ts b/packages/extension-bullet-list/src/index.ts
index f3a575e0..dce59806 100644
--- a/packages/extension-bullet-list/src/index.ts
+++ b/packages/extension-bullet-list/src/index.ts
@@ -1,4 +1,4 @@
-import { Command, createNode } from '@tiptap/core'
+import { Command, NodeExtension } from '@tiptap/core'
 import { wrappingInputRule } from 'prosemirror-inputrules'
 
 export interface BulletListOptions {
@@ -9,7 +9,7 @@ export interface BulletListOptions {
 
 export const inputRegex = /^\s*([-+*])\s$/
 
-const BulletList = createNode({
+const BulletList = NodeExtension.create({
   name: 'bulletList',
 
   defaultOptions: <BulletListOptions>{
diff --git a/packages/extension-code-block/src/index.ts b/packages/extension-code-block/src/index.ts
index 4de6089c..bcc50552 100644
--- a/packages/extension-code-block/src/index.ts
+++ b/packages/extension-code-block/src/index.ts
@@ -1,4 +1,4 @@
-import { Command, createNode } from '@tiptap/core'
+import { Command, NodeExtension } from '@tiptap/core'
 import { textblockTypeInputRule } from 'prosemirror-inputrules'
 
 export interface CodeBlockOptions {
@@ -11,7 +11,7 @@ export interface CodeBlockOptions {
 export const backtickInputRegex = /^```(?<language>[a-z]*)? $/
 export const tildeInputRegex = /^~~~(?<language>[a-z]*)? $/
 
-const CodeBlock = createNode({
+const CodeBlock = NodeExtension.create({
   name: 'codeBlock',
 
   defaultOptions: <CodeBlockOptions>{
diff --git a/packages/extension-code/src/index.ts b/packages/extension-code/src/index.ts
index 3a5307c8..2998e274 100644
--- a/packages/extension-code/src/index.ts
+++ b/packages/extension-code/src/index.ts
@@ -1,6 +1,6 @@
 import {
   Command,
-  createMark,
+  MarkExtension,
   markInputRule,
   markPasteRule,
 } from '@tiptap/core'
@@ -14,7 +14,7 @@ export interface CodeOptions {
 export const inputRegex = /(?:^|\s)((?:`)((?:[^`]+))(?:`))$/gm
 export const pasteRegex = /(?:^|\s)((?:`)((?:[^`]+))(?:`))/gm
 
-const Code = createMark({
+const Code = MarkExtension.create({
   name: 'code',
 
   defaultOptions: <CodeOptions>{
diff --git a/packages/extension-collaboration-cursor/src/index.ts b/packages/extension-collaboration-cursor/src/index.ts
index ce71674b..ae88704c 100644
--- a/packages/extension-collaboration-cursor/src/index.ts
+++ b/packages/extension-collaboration-cursor/src/index.ts
@@ -1,4 +1,4 @@
-import { createExtension, Command } from '@tiptap/core'
+import { Extension, Command } from '@tiptap/core'
 import { yCursorPlugin } from 'y-prosemirror'
 
 export interface CollaborationCursorOptions {
@@ -8,7 +8,7 @@ export interface CollaborationCursorOptions {
   render (user: { name: string, color: string }): HTMLElement,
 }
 
-const CollaborationCursor = createExtension({
+const CollaborationCursor = Extension.create({
   defaultOptions: <CollaborationCursorOptions>{
     provider: null,
     name: 'Someone',
diff --git a/packages/extension-collaboration/src/index.ts b/packages/extension-collaboration/src/index.ts
index c85fd16b..729ef245 100644
--- a/packages/extension-collaboration/src/index.ts
+++ b/packages/extension-collaboration/src/index.ts
@@ -1,4 +1,4 @@
-import { createExtension } from '@tiptap/core'
+import { Extension } from '@tiptap/core'
 import {
   redo, undo, ySyncPlugin, yUndoPlugin,
 } from 'y-prosemirror'
@@ -8,7 +8,7 @@ export interface CollaborationOptions {
   type: any,
 }
 
-const Collaboration = createExtension({
+const Collaboration = Extension.create({
   defaultOptions: <CollaborationOptions>{
     provider: null,
     type: null,
diff --git a/packages/extension-document/src/index.ts b/packages/extension-document/src/index.ts
index f743b3d1..6816a860 100644
--- a/packages/extension-document/src/index.ts
+++ b/packages/extension-document/src/index.ts
@@ -1,6 +1,6 @@
-import { createNode } from '@tiptap/core'
+import { NodeExtension } from '@tiptap/core'
 
-const Document = createNode({
+const Document = NodeExtension.create({
   name: 'document',
   topNode: true,
   content: 'block+',
diff --git a/packages/extension-dropcursor/src/index.ts b/packages/extension-dropcursor/src/index.ts
index 4d457f10..fd951be2 100644
--- a/packages/extension-dropcursor/src/index.ts
+++ b/packages/extension-dropcursor/src/index.ts
@@ -1,7 +1,7 @@
-import { createExtension } from '@tiptap/core'
+import { Extension } from '@tiptap/core'
 import { dropCursor } from 'prosemirror-dropcursor'
 
-const Dropcursor = createExtension({
+const Dropcursor = Extension.create({
   addProseMirrorPlugins() {
     return [
       dropCursor(),
diff --git a/packages/extension-focus/src/index.ts b/packages/extension-focus/src/index.ts
index a6a59b89..62c7844c 100644
--- a/packages/extension-focus/src/index.ts
+++ b/packages/extension-focus/src/index.ts
@@ -1,4 +1,4 @@
-import { createExtension } from '@tiptap/core'
+import { Extension } from '@tiptap/core'
 import { Plugin, PluginKey } from 'prosemirror-state'
 import { DecorationSet, Decoration } from 'prosemirror-view'
 
@@ -7,7 +7,7 @@ export interface FocusOptions {
   nested: boolean,
 }
 
-const FocusClasses = createExtension({
+const FocusClasses = Extension.create({
   defaultOptions: <FocusOptions>{
     className: 'has-focus',
     nested: false,
diff --git a/packages/extension-font-family/src/index.ts b/packages/extension-font-family/src/index.ts
index 6af0cc0e..e83846dc 100644
--- a/packages/extension-font-family/src/index.ts
+++ b/packages/extension-font-family/src/index.ts
@@ -1,11 +1,11 @@
-import { Command, createExtension } from '@tiptap/core'
+import { Command, Extension } from '@tiptap/core'
 import '@tiptap/extension-text-style'
 
 type FontFamilyOptions = {
   types: string[],
 }
 
-const FontFamily = createExtension({
+const FontFamily = Extension.create({
   defaultOptions: <FontFamilyOptions>{
     types: ['textStyle'],
   },
diff --git a/packages/extension-gapcursor/src/index.ts b/packages/extension-gapcursor/src/index.ts
index 8ed452f4..09ee3846 100644
--- a/packages/extension-gapcursor/src/index.ts
+++ b/packages/extension-gapcursor/src/index.ts
@@ -1,7 +1,7 @@
-import { createExtension } from '@tiptap/core'
+import { Extension } from '@tiptap/core'
 import { gapCursor } from 'prosemirror-gapcursor'
 
-const Gapcursor = createExtension({
+const Gapcursor = Extension.create({
   addProseMirrorPlugins() {
     return [
       gapCursor(),
diff --git a/packages/extension-hard-break/src/index.ts b/packages/extension-hard-break/src/index.ts
index 9e674e53..5d448e9b 100644
--- a/packages/extension-hard-break/src/index.ts
+++ b/packages/extension-hard-break/src/index.ts
@@ -1,7 +1,7 @@
-import { Command, createNode } from '@tiptap/core'
+import { Command, NodeExtension } from '@tiptap/core'
 import { exitCode } from 'prosemirror-commands'
 
-const HardBreak = createNode({
+const HardBreak = NodeExtension.create({
   name: 'hardBreak',
 
   inline: true,
diff --git a/packages/extension-heading/src/index.ts b/packages/extension-heading/src/index.ts
index 6cab6f61..e7678dc7 100644
--- a/packages/extension-heading/src/index.ts
+++ b/packages/extension-heading/src/index.ts
@@ -1,4 +1,4 @@
-import { Command, createNode } from '@tiptap/core'
+import { Command, NodeExtension } from '@tiptap/core'
 import { textblockTypeInputRule } from 'prosemirror-inputrules'
 
 type Level = 1 | 2 | 3 | 4 | 5 | 6
@@ -10,7 +10,7 @@ export interface HeadingOptions {
   },
 }
 
-const Heading = createNode({
+const Heading = NodeExtension.create({
   name: 'heading',
 
   defaultOptions: <HeadingOptions>{
diff --git a/packages/extension-highlight/src/index.ts b/packages/extension-highlight/src/index.ts
index f3fbeb88..c8a662b6 100644
--- a/packages/extension-highlight/src/index.ts
+++ b/packages/extension-highlight/src/index.ts
@@ -1,6 +1,6 @@
 import {
   Command,
-  createMark,
+  MarkExtension,
   markInputRule,
   markPasteRule,
 } from '@tiptap/core'
@@ -14,7 +14,7 @@ export interface HighlightOptions {
 export const inputRegex = /(?:^|\s)((?:==)((?:[^~]+))(?:==))$/gm
 export const pasteRegex = /(?:^|\s)((?:==)((?:[^~]+))(?:==))/gm
 
-const Highlight = createMark({
+const Highlight = MarkExtension.create({
   name: 'highlight',
 
   defaultOptions: <HighlightOptions>{
diff --git a/packages/extension-history/src/index.ts b/packages/extension-history/src/index.ts
index f3c4e4c1..6f389f2e 100644
--- a/packages/extension-history/src/index.ts
+++ b/packages/extension-history/src/index.ts
@@ -1,4 +1,4 @@
-import { Command, createExtension } from '@tiptap/core'
+import { Command, Extension } from '@tiptap/core'
 import { history, undo, redo } from 'prosemirror-history'
 
 export interface HistoryOptions {
@@ -6,7 +6,7 @@ export interface HistoryOptions {
   newGroupDelay: number,
 }
 
-const History = createExtension({
+const History = Extension.create({
   defaultOptions: <HistoryOptions>{
     depth: 100,
     newGroupDelay: 500,
diff --git a/packages/extension-horizontal-rule/src/index.ts b/packages/extension-horizontal-rule/src/index.ts
index 6b8f22cb..5091c2e6 100644
--- a/packages/extension-horizontal-rule/src/index.ts
+++ b/packages/extension-horizontal-rule/src/index.ts
@@ -1,4 +1,4 @@
-import { Command, createNode, nodeInputRule } from '@tiptap/core'
+import { Command, NodeExtension, nodeInputRule } from '@tiptap/core'
 
 export interface HorizontalRuleOptions {
   HTMLAttributes: {
@@ -6,7 +6,7 @@ export interface HorizontalRuleOptions {
   },
 }
 
-const HorizontalRule = createNode({
+const HorizontalRule = NodeExtension.create({
   name: 'horizontalRule',
 
   defaultOptions: <HorizontalRuleOptions>{
diff --git a/packages/extension-image/src/index.ts b/packages/extension-image/src/index.ts
index 7713b24b..50dbd561 100644
--- a/packages/extension-image/src/index.ts
+++ b/packages/extension-image/src/index.ts
@@ -1,4 +1,4 @@
-import { Command, createNode, nodeInputRule } from '@tiptap/core'
+import { Command, NodeExtension, nodeInputRule } from '@tiptap/core'
 
 export interface ImageOptions {
   inline: boolean,
@@ -9,7 +9,7 @@ export interface ImageOptions {
 
 export const inputRegex = /!\[(.+|:?)]\((\S+)(?:(?:\s+)["'](\S+)["'])?\)/
 
-const Image = createNode({
+const Image = NodeExtension.create({
   name: 'image',
 
   defaultOptions: <ImageOptions>{
diff --git a/packages/extension-italic/src/index.ts b/packages/extension-italic/src/index.ts
index 55ee50ae..f493761a 100644
--- a/packages/extension-italic/src/index.ts
+++ b/packages/extension-italic/src/index.ts
@@ -1,6 +1,6 @@
 import {
   Command,
-  createMark,
+  MarkExtension,
   markInputRule,
   markPasteRule,
 } from '@tiptap/core'
@@ -16,7 +16,7 @@ export const starPasteRegex = /(?:^|\s)((?:\*)((?:[^*]+))(?:\*))/gm
 export const underscoreInputRegex = /(?:^|\s)((?:_)((?:[^_]+))(?:_))$/gm
 export const underscorePasteRegex = /(?:^|\s)((?:_)((?:[^_]+))(?:_))/gm
 
-const Italic = createMark({
+const Italic = MarkExtension.create({
   name: 'italic',
 
   defaultOptions: <ItalicOptions>{
diff --git a/packages/extension-link/src/index.ts b/packages/extension-link/src/index.ts
index cd8c1a28..b931661f 100644
--- a/packages/extension-link/src/index.ts
+++ b/packages/extension-link/src/index.ts
@@ -1,4 +1,4 @@
-import { Command, createMark, markPasteRule } from '@tiptap/core'
+import { Command, MarkExtension, markPasteRule } from '@tiptap/core'
 import { Plugin, PluginKey } from 'prosemirror-state'
 
 export interface LinkOptions {
@@ -10,7 +10,7 @@ export interface LinkOptions {
 
 export const pasteRegex = /https?:\/\/(?:www\.)?[-a-zA-Z0-9@:%._+~#=]{1,256}\.[a-zA-Z]{2,}\b(?:[-a-zA-Z0-9@:%._+~#=?!&/()]*)/gi
 
-const Link = createMark({
+const Link = MarkExtension.create({
   name: 'link',
 
   inclusive: false,
diff --git a/packages/extension-list-item/src/index.ts b/packages/extension-list-item/src/index.ts
index c9bdca34..76f49785 100644
--- a/packages/extension-list-item/src/index.ts
+++ b/packages/extension-list-item/src/index.ts
@@ -1,4 +1,4 @@
-import { createNode } from '@tiptap/core'
+import { NodeExtension } from '@tiptap/core'
 
 export interface ListItemOptions {
   HTMLAttributes: {
@@ -6,7 +6,7 @@ export interface ListItemOptions {
   },
 }
 
-const ListItem = createNode({
+const ListItem = NodeExtension.create({
   name: 'listItem',
 
   defaultOptions: <ListItemOptions>{
diff --git a/packages/extension-ordered-list/src/index.ts b/packages/extension-ordered-list/src/index.ts
index bf32d7bb..247b0930 100644
--- a/packages/extension-ordered-list/src/index.ts
+++ b/packages/extension-ordered-list/src/index.ts
@@ -1,4 +1,4 @@
-import { Command, createNode } from '@tiptap/core'
+import { Command, NodeExtension } from '@tiptap/core'
 import { wrappingInputRule } from 'prosemirror-inputrules'
 
 export interface OrderedListOptions {
@@ -9,7 +9,7 @@ export interface OrderedListOptions {
 
 export const inputRegex = /^(\d+)\.\s$/
 
-const OrderedList = createNode({
+const OrderedList = NodeExtension.create({
   name: 'orderedList',
 
   defaultOptions: <OrderedListOptions>{
diff --git a/packages/extension-paragraph/src/index.ts b/packages/extension-paragraph/src/index.ts
index 4a1d5c59..9f2dbcef 100644
--- a/packages/extension-paragraph/src/index.ts
+++ b/packages/extension-paragraph/src/index.ts
@@ -1,4 +1,4 @@
-import { Command, createNode } from '@tiptap/core'
+import { Command, NodeExtension } from '@tiptap/core'
 
 export interface ParagraphOptions {
   HTMLAttributes: {
@@ -6,7 +6,7 @@ export interface ParagraphOptions {
   },
 }
 
-const Paragraph = createNode({
+const Paragraph = NodeExtension.create({
   name: 'paragraph',
 
   defaultOptions: <ParagraphOptions>{
diff --git a/packages/extension-strike/src/index.ts b/packages/extension-strike/src/index.ts
index 31091519..bd6f1914 100644
--- a/packages/extension-strike/src/index.ts
+++ b/packages/extension-strike/src/index.ts
@@ -1,6 +1,6 @@
 import {
   Command,
-  createMark,
+  MarkExtension,
   markInputRule,
   markPasteRule,
 } from '@tiptap/core'
@@ -14,7 +14,7 @@ export interface StrikeOptions {
 export const inputRegex = /(?:^|\s)((?:~~)((?:[^~]+))(?:~~))$/gm
 export const pasteRegex = /(?:^|\s)((?:~~)((?:[^~]+))(?:~~))/gm
 
-const Strike = createMark({
+const Strike = MarkExtension.create({
   name: 'strike',
 
   defaultOptions: <StrikeOptions>{
diff --git a/packages/extension-task-item/src/index.ts b/packages/extension-task-item/src/index.ts
index ab98ba52..b6ea4cfd 100644
--- a/packages/extension-task-item/src/index.ts
+++ b/packages/extension-task-item/src/index.ts
@@ -1,4 +1,4 @@
-import { createNode, mergeAttributes } from '@tiptap/core'
+import { NodeExtension, mergeAttributes } from '@tiptap/core'
 import { wrappingInputRule } from 'prosemirror-inputrules'
 
 export interface TaskItemOptions {
@@ -10,7 +10,7 @@ export interface TaskItemOptions {
 
 export const inputRegex = /^\s*(\[([ |x])\])\s$/
 
-const TaskItem = createNode({
+const TaskItem = NodeExtension.create({
   name: 'taskItem',
 
   defaultOptions: <TaskItemOptions>{
diff --git a/packages/extension-task-list/src/index.ts b/packages/extension-task-list/src/index.ts
index 5e6439f0..0a5d0f96 100644
--- a/packages/extension-task-list/src/index.ts
+++ b/packages/extension-task-list/src/index.ts
@@ -1,4 +1,4 @@
-import { Command, createNode, mergeAttributes } from '@tiptap/core'
+import { Command, NodeExtension, mergeAttributes } from '@tiptap/core'
 
 export interface TaskListOptions {
   HTMLAttributes: {
@@ -6,7 +6,7 @@ export interface TaskListOptions {
   },
 }
 
-const TaskList = createNode({
+const TaskList = NodeExtension.create({
   name: 'taskList',
 
   defaultOptions: <TaskListOptions>{
diff --git a/packages/extension-text-align/src/index.ts b/packages/extension-text-align/src/index.ts
index 6d4bbd1d..63fb2279 100644
--- a/packages/extension-text-align/src/index.ts
+++ b/packages/extension-text-align/src/index.ts
@@ -1,4 +1,4 @@
-import { Command, createExtension } from '@tiptap/core'
+import { Command, Extension } from '@tiptap/core'
 
 type TextAlignOptions = {
   types: string[],
@@ -6,7 +6,7 @@ type TextAlignOptions = {
   defaultAlignment: string,
 }
 
-const TextAlign = createExtension({
+const TextAlign = Extension.create({
   defaultOptions: <TextAlignOptions>{
     types: ['heading', 'paragraph'],
     alignments: ['left', 'center', 'right', 'justify'],
diff --git a/packages/extension-text-style/src/index.ts b/packages/extension-text-style/src/index.ts
index 2d8078c3..fa0633e2 100644
--- a/packages/extension-text-style/src/index.ts
+++ b/packages/extension-text-style/src/index.ts
@@ -1,6 +1,6 @@
-import { Command, createMark, getMarkAttrs } from '@tiptap/core'
+import { Command, MarkExtension, getMarkAttrs } from '@tiptap/core'
 
-const TextStyle = createMark({
+const TextStyle = MarkExtension.create({
   name: 'textStyle',
 
   parseHTML() {
diff --git a/packages/extension-text/src/index.ts b/packages/extension-text/src/index.ts
index b670bed4..d0a6029a 100644
--- a/packages/extension-text/src/index.ts
+++ b/packages/extension-text/src/index.ts
@@ -1,6 +1,6 @@
-import { createNode } from '@tiptap/core'
+import { NodeExtension } from '@tiptap/core'
 
-const Text = createNode({
+const Text = NodeExtension.create({
   name: 'text',
   group: 'inline',
 })
diff --git a/packages/extension-typography/src/index.ts b/packages/extension-typography/src/index.ts
index 80590283..34e696c4 100644
--- a/packages/extension-typography/src/index.ts
+++ b/packages/extension-typography/src/index.ts
@@ -1,4 +1,4 @@
-import { createExtension } from '@tiptap/core'
+import { Extension } from '@tiptap/core'
 import {
   emDash,
   ellipsis,
@@ -20,7 +20,7 @@ export const laquo = new InputRule(/<<$/, '«')
 export const raquo = new InputRule(/>>$/, '»')
 export const multiplication = new InputRule(/\d+\s?([*x])\s?\d+$/, '×')
 
-const Typography = createExtension({
+const Typography = Extension.create({
   addInputRules() {
     return [
       emDash,
diff --git a/packages/extension-underline/src/index.ts b/packages/extension-underline/src/index.ts
index 1f270f47..7ea37688 100644
--- a/packages/extension-underline/src/index.ts
+++ b/packages/extension-underline/src/index.ts
@@ -1,4 +1,4 @@
-import { Command, createMark } from '@tiptap/core'
+import { Command, MarkExtension } from '@tiptap/core'
 
 export interface UnderlineOptions {
   HTMLAttributes: {
@@ -6,7 +6,7 @@ export interface UnderlineOptions {
   },
 }
 
-const Underline = createMark({
+const Underline = MarkExtension.create({
   name: 'underline',
 
   defaultOptions: <UnderlineOptions>{
diff --git a/packages/starter-kit/src/index.ts b/packages/starter-kit/src/index.ts
index 8dd4c848..26524cb1 100644
--- a/packages/starter-kit/src/index.ts
+++ b/packages/starter-kit/src/index.ts
@@ -23,23 +23,23 @@ export function defaultExtensions(options: {
   heading: HeadingOptions,
 }) {
   return [
-    Dropcursor(),
-    Gapcursor(),
-    Document(),
-    History(options?.history),
-    Paragraph(),
-    Text(),
-    Bold(),
-    Italic(),
-    Code(),
-    CodeBlock(options?.codeBlock),
-    Heading(options?.heading),
-    HardBreak(),
-    Strike(),
-    Blockquote(),
-    HorizontalRule(),
-    BulletList(),
-    OrderedList(),
-    ListItem(),
+    Dropcursor,
+    Gapcursor,
+    Document,
+    History.set(options?.history),
+    Paragraph,
+    Text,
+    Bold,
+    Italic,
+    Code,
+    CodeBlock.set(options?.codeBlock),
+    Heading.set(options?.heading),
+    HardBreak,
+    Strike,
+    Blockquote,
+    HorizontalRule,
+    BulletList,
+    OrderedList,
+    ListItem,
   ]
 }

From c87f49c1fe46871f77919f22492d2161a4f11cb4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Mon, 16 Nov 2020 09:43:17 +0100
Subject: [PATCH 08/16] improve new extensions

---
 .../demos/Api/Schema/GenerateHTML/index.vue   |  6 +-
 .../Examples/CollaborativeEditing/index.vue   |  4 +-
 docs/src/demos/Examples/Formatting/index.vue  | 16 ++---
 docs/src/demos/Examples/Links/index.vue       |  8 +--
 .../Examples/MarkdownShortcuts/index.vue      |  2 +-
 docs/src/demos/Examples/Minimalist/index.vue  |  6 +-
 docs/src/demos/Examples/TodoApp/index.vue     | 10 +--
 .../demos/ExtensionConfiguration/index.vue    |  8 +--
 .../demos/Extensions/Collaboration/index.vue  |  8 +--
 .../Extensions/CollaborationCursor/index.vue  | 10 +--
 .../src/demos/Extensions/Dropcursor/index.vue | 10 +--
 docs/src/demos/Extensions/Focus/index.vue     | 14 ++---
 .../src/demos/Extensions/FontFamily/index.vue | 10 +--
 docs/src/demos/Extensions/Gapcursor/index.vue | 10 +--
 docs/src/demos/Extensions/History/index.vue   |  8 +--
 docs/src/demos/Extensions/TextAlign/index.vue | 10 +--
 .../src/demos/Extensions/Typography/index.vue |  8 +--
 .../src/demos/Guide/BuildYourEditor/index.vue | 18 +++---
 docs/src/demos/Marks/Bold/index.vue           |  8 +--
 docs/src/demos/Marks/Code/index.vue           |  8 +--
 docs/src/demos/Marks/Highlight/index.vue      |  8 +--
 docs/src/demos/Marks/Italic/index.vue         |  8 +--
 docs/src/demos/Marks/Link/index.vue           |  8 +--
 docs/src/demos/Marks/Strike/index.vue         |  8 +--
 docs/src/demos/Marks/TextStyle/index.vue      |  8 +--
 docs/src/demos/Marks/Underline/index.vue      |  8 +--
 docs/src/demos/Nodes/Blockquote/index.vue     |  8 +--
 docs/src/demos/Nodes/BulletList/index.vue     | 10 +--
 docs/src/demos/Nodes/CodeBlock/index.vue      |  8 +--
 docs/src/demos/Nodes/Document/index.vue       |  6 +-
 docs/src/demos/Nodes/HardBreak/index.vue      |  8 +--
 docs/src/demos/Nodes/Heading/index.vue        |  8 +--
 docs/src/demos/Nodes/HorizontalRule/index.vue |  8 +--
 docs/src/demos/Nodes/Image/index.vue          | 10 +--
 docs/src/demos/Nodes/ListItem/index.vue       | 12 ++--
 docs/src/demos/Nodes/OrderedList/index.vue    | 10 +--
 docs/src/demos/Nodes/Paragraph/index.vue      |  6 +-
 docs/src/demos/Nodes/TaskItem/index.vue       | 10 +--
 docs/src/demos/Nodes/TaskList/index.vue       | 10 +--
 docs/src/demos/Nodes/Text/index.vue           |  6 +-
 packages/core/src/Editor.ts                   | 62 ++++++++++++++++++-
 packages/core/src/Extension.ts                | 51 +--------------
 packages/core/src/ExtensionManager.ts         | 30 ++++-----
 packages/core/src/MarkExtension.ts            | 48 +-------------
 packages/core/src/NodeExtension.ts            | 56 +----------------
 .../src/utils/getAttributesFromExtensions.ts  |  6 +-
 packages/core/src/utils/getSchema.ts          | 54 ++++++++--------
 packages/core/src/utils/isList.ts             |  4 +-
 packages/core/src/utils/splitExtensions.ts    |  6 +-
 .../integration/core/generateHTML.spec.ts     |  6 +-
 50 files changed, 296 insertions(+), 377 deletions(-)

diff --git a/docs/src/demos/Api/Schema/GenerateHTML/index.vue b/docs/src/demos/Api/Schema/GenerateHTML/index.vue
index b0a6eda4..1fa55904 100644
--- a/docs/src/demos/Api/Schema/GenerateHTML/index.vue
+++ b/docs/src/demos/Api/Schema/GenerateHTML/index.vue
@@ -27,9 +27,9 @@ export default {
 
   mounted() {
     this.html = generateHTML(this.json, [
-      Document(),
-      Paragraph(),
-      Text(),
+      Document,
+      Paragraph,
+      Text,
     ])
   },
 }
diff --git a/docs/src/demos/Examples/CollaborativeEditing/index.vue b/docs/src/demos/Examples/CollaborativeEditing/index.vue
index 36403f81..f1be445c 100644
--- a/docs/src/demos/Examples/CollaborativeEditing/index.vue
+++ b/docs/src/demos/Examples/CollaborativeEditing/index.vue
@@ -135,11 +135,11 @@ export default {
     this.editor = new Editor({
       extensions: [
         ...defaultExtensions(),
-        Collaboration({
+        Collaboration.set({
           provider: this.provider,
           type: this.type,
         }),
-        CollaborationCursor({
+        CollaborationCursor.set({
           provider: this.provider,
           name: this.name,
           color: this.color,
diff --git a/docs/src/demos/Examples/Formatting/index.vue b/docs/src/demos/Examples/Formatting/index.vue
index ce9c2a99..a42d1dbd 100644
--- a/docs/src/demos/Examples/Formatting/index.vue
+++ b/docs/src/demos/Examples/Formatting/index.vue
@@ -61,16 +61,16 @@ export default {
   mounted() {
     this.editor = new Editor({
       extensions: [
-        Document(),
-        Paragraph(),
-        Text(),
-        Heading({
+        Document,
+        Paragraph,
+        Text,
+        Heading.set({
           level: [1, 2, 3],
         }),
-        Bold(),
-        Italic(),
-        TextAlign(),
-        HardBreak(),
+        Bold,
+        Italic,
+        TextAlign,
+        HardBreak,
       ],
       content: `
         <h3>Girls Just Want to Have Fun (Cyndi Lauper)</h2>
diff --git a/docs/src/demos/Examples/Links/index.vue b/docs/src/demos/Examples/Links/index.vue
index 933dd0f8..6bb39c7d 100644
--- a/docs/src/demos/Examples/Links/index.vue
+++ b/docs/src/demos/Examples/Links/index.vue
@@ -32,10 +32,10 @@ export default {
   mounted() {
     this.editor = new Editor({
       extensions: [
-        Document(),
-        Paragraph(),
-        Text(),
-        Link(),
+        Document,
+        Paragraph,
+        Text,
+        Link,
       ],
       content: `
         <p>
diff --git a/docs/src/demos/Examples/MarkdownShortcuts/index.vue b/docs/src/demos/Examples/MarkdownShortcuts/index.vue
index 5bd851c1..c5f69fb3 100644
--- a/docs/src/demos/Examples/MarkdownShortcuts/index.vue
+++ b/docs/src/demos/Examples/MarkdownShortcuts/index.vue
@@ -37,7 +37,7 @@ export default {
       `,
       extensions: [
         ...defaultExtensions(),
-        Highlight(),
+        Highlight,
       ],
     })
   },
diff --git a/docs/src/demos/Examples/Minimalist/index.vue b/docs/src/demos/Examples/Minimalist/index.vue
index 8f53dc21..8eeccee3 100644
--- a/docs/src/demos/Examples/Minimalist/index.vue
+++ b/docs/src/demos/Examples/Minimalist/index.vue
@@ -22,9 +22,9 @@ export default {
   mounted() {
     this.editor = new Editor({
       extensions: [
-        Document(),
-        Paragraph(),
-        Text(),
+        Document,
+        Paragraph,
+        Text,
       ],
       content: `
         <p>
diff --git a/docs/src/demos/Examples/TodoApp/index.vue b/docs/src/demos/Examples/TodoApp/index.vue
index 702d9499..f72fd71a 100644
--- a/docs/src/demos/Examples/TodoApp/index.vue
+++ b/docs/src/demos/Examples/TodoApp/index.vue
@@ -35,11 +35,11 @@ export default {
   mounted() {
     this.editor = new Editor({
       extensions: [
-        CustomDocument(),
-        Paragraph(),
-        Text(),
-        TaskList(),
-        CustomTaskItem(),
+        CustomDocument,
+        Paragraph,
+        Text,
+        TaskList,
+        CustomTaskItem,
       ],
       content: `
         <ul data-type="taskList">
diff --git a/docs/src/demos/ExtensionConfiguration/index.vue b/docs/src/demos/ExtensionConfiguration/index.vue
index 5aba7929..01231a4f 100644
--- a/docs/src/demos/ExtensionConfiguration/index.vue
+++ b/docs/src/demos/ExtensionConfiguration/index.vue
@@ -26,10 +26,10 @@ export default {
     this.editor = new Editor({
       content: '<p>I’m running tiptap with Vue.js. This demo is interactive, try to edit the text.</p>',
       extensions: [
-        Document(),
-        Paragraph(),
-        Text(),
-        Bold(),
+        Document,
+        Paragraph,
+        Text,
+        Bold,
       ],
     })
   },
diff --git a/docs/src/demos/Extensions/Collaboration/index.vue b/docs/src/demos/Extensions/Collaboration/index.vue
index 7a95586a..73d8e929 100644
--- a/docs/src/demos/Extensions/Collaboration/index.vue
+++ b/docs/src/demos/Extensions/Collaboration/index.vue
@@ -37,10 +37,10 @@ export default {
       //   <p>Example Text</p>
       // `,
       extensions: [
-        Document(),
-        Paragraph(),
-        Text(),
-        Collaboration({
+        Document,
+        Paragraph,
+        Text,
+        Collaboration.set({
           provider: this.provider,
           type: this.type,
         }),
diff --git a/docs/src/demos/Extensions/CollaborationCursor/index.vue b/docs/src/demos/Extensions/CollaborationCursor/index.vue
index a7314bdf..ed764a06 100644
--- a/docs/src/demos/Extensions/CollaborationCursor/index.vue
+++ b/docs/src/demos/Extensions/CollaborationCursor/index.vue
@@ -38,14 +38,14 @@ export default {
       //   <p>Example Text</p>
       // `,
       extensions: [
-        Document(),
-        Paragraph(),
-        Text(),
-        Collaboration({
+        Document,
+        Paragraph,
+        Text,
+        Collaboration.set({
           provider: this.provider,
           type: this.type,
         }),
-        CollaborationCursor({
+        CollaborationCursor.set({
           provider: this.provider,
           name: 'Cyndi Lauper',
           color: '#f783ac',
diff --git a/docs/src/demos/Extensions/Dropcursor/index.vue b/docs/src/demos/Extensions/Dropcursor/index.vue
index 613f754d..4414f5c1 100644
--- a/docs/src/demos/Extensions/Dropcursor/index.vue
+++ b/docs/src/demos/Extensions/Dropcursor/index.vue
@@ -26,11 +26,11 @@ export default {
   mounted() {
     this.editor = new Editor({
       extensions: [
-        Document(),
-        Paragraph(),
-        Text(),
-        Image(),
-        Dropcursor(),
+        Document,
+        Paragraph,
+        Text,
+        Image,
+        Dropcursor,
       ],
       content: `
         <p>Try to drag around the image. While you drag, the editor should show a decoration under your cursor. The so called dropcursor.</p>
diff --git a/docs/src/demos/Extensions/Focus/index.vue b/docs/src/demos/Extensions/Focus/index.vue
index fa38363e..7da2bc89 100644
--- a/docs/src/demos/Extensions/Focus/index.vue
+++ b/docs/src/demos/Extensions/Focus/index.vue
@@ -28,16 +28,16 @@ export default {
   mounted() {
     this.editor = new Editor({
       extensions: [
-        Document(),
-        Paragraph(),
-        Text(),
-        Focus({
+        Document,
+        Paragraph,
+        Text,
+        Focus.set({
           className: 'has-focus',
           nested: true,
         }),
-        Code(),
-        BulletList(),
-        ListItem(),
+        Code,
+        BulletList,
+        ListItem,
       ],
       autoFocus: true,
       content: `
diff --git a/docs/src/demos/Extensions/FontFamily/index.vue b/docs/src/demos/Extensions/FontFamily/index.vue
index a76515b3..b2a43a4a 100644
--- a/docs/src/demos/Extensions/FontFamily/index.vue
+++ b/docs/src/demos/Extensions/FontFamily/index.vue
@@ -46,11 +46,11 @@ export default {
   mounted() {
     this.editor = new Editor({
       extensions: [
-        Document(),
-        Paragraph(),
-        Text(),
-        TextStyle(),
-        FontFamily(),
+        Document,
+        Paragraph,
+        Text,
+        TextStyle,
+        FontFamily,
       ],
       content: `
         <p><span style="font-family: Inter">Did you know that Inter is a really nice font for interfaces?</span></p>
diff --git a/docs/src/demos/Extensions/Gapcursor/index.vue b/docs/src/demos/Extensions/Gapcursor/index.vue
index ce5a475d..1abcee45 100644
--- a/docs/src/demos/Extensions/Gapcursor/index.vue
+++ b/docs/src/demos/Extensions/Gapcursor/index.vue
@@ -26,11 +26,11 @@ export default {
   mounted() {
     this.editor = new Editor({
       extensions: [
-        Document(),
-        Paragraph(),
-        Text(),
-        Image(),
-        Gapcursor(),
+        Document,
+        Paragraph,
+        Text,
+        Image,
+        Gapcursor,
       ],
       content: `
         <p>Try to set the cursor behind the image with your arrow keys! You should see big blinking cursor right from the image. This is the gapcursor.</p>
diff --git a/docs/src/demos/Extensions/History/index.vue b/docs/src/demos/Extensions/History/index.vue
index b44d168e..3946b239 100644
--- a/docs/src/demos/Extensions/History/index.vue
+++ b/docs/src/demos/Extensions/History/index.vue
@@ -33,10 +33,10 @@ export default {
   mounted() {
     this.editor = new Editor({
       extensions: [
-        Document(),
-        Paragraph(),
-        Text(),
-        History(),
+        Document,
+        Paragraph,
+        Text,
+        History,
       ],
       content: `
         <p>
diff --git a/docs/src/demos/Extensions/TextAlign/index.vue b/docs/src/demos/Extensions/TextAlign/index.vue
index 8b5e963a..c7ff0694 100644
--- a/docs/src/demos/Extensions/TextAlign/index.vue
+++ b/docs/src/demos/Extensions/TextAlign/index.vue
@@ -42,11 +42,11 @@ export default {
   mounted() {
     this.editor = new Editor({
       extensions: [
-        Document(),
-        Paragraph(),
-        Text(),
-        Heading(),
-        TextAlign(),
+        Document,
+        Paragraph,
+        Text,
+        Heading,
+        TextAlign,
       ],
       content: `
         <h2>Heading</h2>
diff --git a/docs/src/demos/Extensions/Typography/index.vue b/docs/src/demos/Extensions/Typography/index.vue
index f4b01a5e..622b0e0e 100644
--- a/docs/src/demos/Extensions/Typography/index.vue
+++ b/docs/src/demos/Extensions/Typography/index.vue
@@ -25,10 +25,10 @@ export default {
   mounted() {
     this.editor = new Editor({
       extensions: [
-        Document(),
-        Paragraph(),
-        Text(),
-        Typography(),
+        Document,
+        Paragraph,
+        Text,
+        Typography,
       ],
       content: `
         <p>“I have been suffering from Typomania all my life, a sickness that is incurable but not lethal.”</p>
diff --git a/docs/src/demos/Guide/BuildYourEditor/index.vue b/docs/src/demos/Guide/BuildYourEditor/index.vue
index 07fa9eb5..5229d4c9 100644
--- a/docs/src/demos/Guide/BuildYourEditor/index.vue
+++ b/docs/src/demos/Guide/BuildYourEditor/index.vue
@@ -55,15 +55,15 @@ export default {
     this.editor = new Editor({
       content: '<h2>Hey there!</h2><p>This editor is based on Prosemirror, fully extendable and headless. You can easily add custom nodes as Vue components.</p>',
       extensions: [
-        Document(),
-        Paragraph(),
-        Text(),
-        CodeBlock(),
-        History(),
-        Bold(),
-        Italic(),
-        Code(),
-        Heading(),
+        Document,
+        Paragraph,
+        Text,
+        CodeBlock,
+        History,
+        Bold,
+        Italic,
+        Code,
+        Heading,
       ],
     })
   },
diff --git a/docs/src/demos/Marks/Bold/index.vue b/docs/src/demos/Marks/Bold/index.vue
index 8cc71857..4639ece4 100644
--- a/docs/src/demos/Marks/Bold/index.vue
+++ b/docs/src/demos/Marks/Bold/index.vue
@@ -30,10 +30,10 @@ export default {
   mounted() {
     this.editor = new Editor({
       extensions: [
-        Document(),
-        Paragraph(),
-        Text(),
-        Bold(),
+        Document,
+        Paragraph,
+        Text,
+        Bold,
       ],
       content: `
         <p>This isn’t bold.</p>
diff --git a/docs/src/demos/Marks/Code/index.vue b/docs/src/demos/Marks/Code/index.vue
index 78d782dd..ac874df5 100644
--- a/docs/src/demos/Marks/Code/index.vue
+++ b/docs/src/demos/Marks/Code/index.vue
@@ -30,10 +30,10 @@ export default {
   mounted() {
     this.editor = new Editor({
       extensions: [
-        Document(),
-        Paragraph(),
-        Text(),
-        Code(),
+        Document,
+        Paragraph,
+        Text,
+        Code,
       ],
       content: `
         <p>This isn’t code.</p>
diff --git a/docs/src/demos/Marks/Highlight/index.vue b/docs/src/demos/Marks/Highlight/index.vue
index 1028d415..1d766605 100644
--- a/docs/src/demos/Marks/Highlight/index.vue
+++ b/docs/src/demos/Marks/Highlight/index.vue
@@ -61,10 +61,10 @@ export default {
   mounted() {
     this.editor = new Editor({
       extensions: [
-        Document(),
-        Paragraph(),
-        Text(),
-        Highlight(),
+        Document,
+        Paragraph,
+        Text,
+        Highlight,
       ],
       content: `
           <p>This isn’t highlighted.</s></p>
diff --git a/docs/src/demos/Marks/Italic/index.vue b/docs/src/demos/Marks/Italic/index.vue
index ae605f45..c736e023 100644
--- a/docs/src/demos/Marks/Italic/index.vue
+++ b/docs/src/demos/Marks/Italic/index.vue
@@ -30,10 +30,10 @@ export default {
   mounted() {
     this.editor = new Editor({
       extensions: [
-        Document(),
-        Paragraph(),
-        Text(),
-        Italic(),
+        Document,
+        Paragraph,
+        Text,
+        Italic,
       ],
       content: `
         <p>This isn’t italic.</p>
diff --git a/docs/src/demos/Marks/Link/index.vue b/docs/src/demos/Marks/Link/index.vue
index 4297b8c1..296f6e8c 100644
--- a/docs/src/demos/Marks/Link/index.vue
+++ b/docs/src/demos/Marks/Link/index.vue
@@ -32,10 +32,10 @@ export default {
   mounted() {
     this.editor = new Editor({
       extensions: [
-        Document(),
-        Paragraph(),
-        Text(),
-        Link(),
+        Document,
+        Paragraph,
+        Text,
+        Link,
       ],
       content: `
         <p>
diff --git a/docs/src/demos/Marks/Strike/index.vue b/docs/src/demos/Marks/Strike/index.vue
index eb5ab579..c3dc75d0 100644
--- a/docs/src/demos/Marks/Strike/index.vue
+++ b/docs/src/demos/Marks/Strike/index.vue
@@ -30,10 +30,10 @@ export default {
   mounted() {
     this.editor = new Editor({
       extensions: [
-        Document(),
-        Paragraph(),
-        Text(),
-        Strike(),
+        Document,
+        Paragraph,
+        Text,
+        Strike,
       ],
       content: `
           <p>This isn’t striked through.</s></p>
diff --git a/docs/src/demos/Marks/TextStyle/index.vue b/docs/src/demos/Marks/TextStyle/index.vue
index 32cfbe85..40a06983 100644
--- a/docs/src/demos/Marks/TextStyle/index.vue
+++ b/docs/src/demos/Marks/TextStyle/index.vue
@@ -26,10 +26,10 @@ export default {
   mounted() {
     this.editor = new Editor({
       extensions: [
-        Document(),
-        Paragraph(),
-        Text(),
-        TextStyle(),
+        Document,
+        Paragraph,
+        Text,
+        TextStyle,
       ],
       content: `
         <p><span>This has a &lt;span&gt; tag without a style attribute, so it’s thrown away.</span></p>
diff --git a/docs/src/demos/Marks/Underline/index.vue b/docs/src/demos/Marks/Underline/index.vue
index 1ea31b47..a1511948 100644
--- a/docs/src/demos/Marks/Underline/index.vue
+++ b/docs/src/demos/Marks/Underline/index.vue
@@ -30,10 +30,10 @@ export default {
   mounted() {
     this.editor = new Editor({
       extensions: [
-        Document(),
-        Paragraph(),
-        Text(),
-        Underline(),
+        Document,
+        Paragraph,
+        Text,
+        Underline,
       ],
       content: `
         <p>There is no underline here.</p>
diff --git a/docs/src/demos/Nodes/Blockquote/index.vue b/docs/src/demos/Nodes/Blockquote/index.vue
index 4f584035..15148420 100644
--- a/docs/src/demos/Nodes/Blockquote/index.vue
+++ b/docs/src/demos/Nodes/Blockquote/index.vue
@@ -30,10 +30,10 @@ export default {
   mounted() {
     this.editor = new Editor({
       extensions: [
-        Document(),
-        Paragraph(),
-        Text(),
-        Blockquote(),
+        Document,
+        Paragraph,
+        Text,
+        Blockquote,
       ],
       content: `
           <blockquote>
diff --git a/docs/src/demos/Nodes/BulletList/index.vue b/docs/src/demos/Nodes/BulletList/index.vue
index 70491f71..c501ef12 100644
--- a/docs/src/demos/Nodes/BulletList/index.vue
+++ b/docs/src/demos/Nodes/BulletList/index.vue
@@ -31,11 +31,11 @@ export default {
   mounted() {
     this.editor = new Editor({
       extensions: [
-        Document(),
-        Paragraph(),
-        Text(),
-        BulletList(),
-        ListItem(),
+        Document,
+        Paragraph,
+        Text,
+        BulletList,
+        ListItem,
       ],
       content: `
         <ul>
diff --git a/docs/src/demos/Nodes/CodeBlock/index.vue b/docs/src/demos/Nodes/CodeBlock/index.vue
index 9eb2b818..4da9c34e 100644
--- a/docs/src/demos/Nodes/CodeBlock/index.vue
+++ b/docs/src/demos/Nodes/CodeBlock/index.vue
@@ -30,10 +30,10 @@ export default {
   mounted() {
     this.editor = new Editor({
       extensions: [
-        Document(),
-        Paragraph(),
-        Text(),
-        CodeBlock(),
+        Document,
+        Paragraph,
+        Text,
+        CodeBlock,
       ],
       content: `
         <p>
diff --git a/docs/src/demos/Nodes/Document/index.vue b/docs/src/demos/Nodes/Document/index.vue
index 349a817e..18afe7bf 100644
--- a/docs/src/demos/Nodes/Document/index.vue
+++ b/docs/src/demos/Nodes/Document/index.vue
@@ -25,9 +25,9 @@ export default {
   mounted() {
     this.editor = new Editor({
       extensions: [
-        Document(),
-        Paragraph(),
-        Text(),
+        Document,
+        Paragraph,
+        Text,
       ],
       content: `
         <p>The Document extension is required. Though, you can write your own implementation, e. g. to give it custom name.</p>
diff --git a/docs/src/demos/Nodes/HardBreak/index.vue b/docs/src/demos/Nodes/HardBreak/index.vue
index 8eed497b..ea2bee88 100644
--- a/docs/src/demos/Nodes/HardBreak/index.vue
+++ b/docs/src/demos/Nodes/HardBreak/index.vue
@@ -30,10 +30,10 @@ export default {
   mounted() {
     this.editor = new Editor({
       extensions: [
-        Document(),
-        Paragraph(),
-        Text(),
-        HardBreak(),
+        Document,
+        Paragraph,
+        Text,
+        HardBreak,
       ],
       content: `
         <p>
diff --git a/docs/src/demos/Nodes/Heading/index.vue b/docs/src/demos/Nodes/Heading/index.vue
index ce4e0f43..2f8c474d 100644
--- a/docs/src/demos/Nodes/Heading/index.vue
+++ b/docs/src/demos/Nodes/Heading/index.vue
@@ -36,10 +36,10 @@ export default {
   mounted() {
     this.editor = new Editor({
       extensions: [
-        Document(),
-        Paragraph(),
-        Text(),
-        Heading({
+        Document,
+        Paragraph,
+        Text,
+        Heading.set({
           levels: [1, 2, 3],
         }),
       ],
diff --git a/docs/src/demos/Nodes/HorizontalRule/index.vue b/docs/src/demos/Nodes/HorizontalRule/index.vue
index 4b4f23e2..a2743866 100644
--- a/docs/src/demos/Nodes/HorizontalRule/index.vue
+++ b/docs/src/demos/Nodes/HorizontalRule/index.vue
@@ -30,10 +30,10 @@ export default {
   mounted() {
     this.editor = new Editor({
       extensions: [
-        Document(),
-        Paragraph(),
-        Text(),
-        HorizontalRule(),
+        Document,
+        Paragraph,
+        Text,
+        HorizontalRule,
       ],
       content: `
         <p>This is a paragraph.</p>
diff --git a/docs/src/demos/Nodes/Image/index.vue b/docs/src/demos/Nodes/Image/index.vue
index a101cda5..143b1322 100644
--- a/docs/src/demos/Nodes/Image/index.vue
+++ b/docs/src/demos/Nodes/Image/index.vue
@@ -38,11 +38,11 @@ export default {
   mounted() {
     this.editor = new Editor({
       extensions: [
-        Document(),
-        Paragraph(),
-        Text(),
-        Image(),
-        Dropcursor(),
+        Document,
+        Paragraph,
+        Text,
+        Image,
+        Dropcursor,
       ],
       content: `
         <p>This is a basic example of implementing images. Drag to re-order.</p>
diff --git a/docs/src/demos/Nodes/ListItem/index.vue b/docs/src/demos/Nodes/ListItem/index.vue
index 86137256..9cc93b50 100644
--- a/docs/src/demos/Nodes/ListItem/index.vue
+++ b/docs/src/demos/Nodes/ListItem/index.vue
@@ -35,12 +35,12 @@ export default {
   mounted() {
     this.editor = new Editor({
       extensions: [
-        Document(),
-        Paragraph(),
-        Text(),
-        BulletList(),
-        OrderedList(),
-        ListItem(),
+        Document,
+        Paragraph,
+        Text,
+        BulletList,
+        OrderedList,
+        ListItem,
       ],
       content: `
         <p>
diff --git a/docs/src/demos/Nodes/OrderedList/index.vue b/docs/src/demos/Nodes/OrderedList/index.vue
index 0677b451..45eda95c 100644
--- a/docs/src/demos/Nodes/OrderedList/index.vue
+++ b/docs/src/demos/Nodes/OrderedList/index.vue
@@ -31,11 +31,11 @@ export default {
   mounted() {
     this.editor = new Editor({
       extensions: [
-        Document(),
-        Paragraph(),
-        Text(),
-        OrderedList(),
-        ListItem(),
+        Document,
+        Paragraph,
+        Text,
+        OrderedList,
+        ListItem,
       ],
       content: `
         <ol>
diff --git a/docs/src/demos/Nodes/Paragraph/index.vue b/docs/src/demos/Nodes/Paragraph/index.vue
index 971711b8..f296f183 100644
--- a/docs/src/demos/Nodes/Paragraph/index.vue
+++ b/docs/src/demos/Nodes/Paragraph/index.vue
@@ -25,9 +25,9 @@ export default {
   mounted() {
     this.editor = new Editor({
       extensions: [
-        Document(),
-        Paragraph(),
-        Text(),
+        Document,
+        Paragraph,
+        Text,
       ],
       content: `
         <p>The Paragraph extension is not required, but it’s very likely you want to use it. It’s needed to write paragraphs of text. 🤓</p>
diff --git a/docs/src/demos/Nodes/TaskItem/index.vue b/docs/src/demos/Nodes/TaskItem/index.vue
index db0385f3..4e279bc3 100644
--- a/docs/src/demos/Nodes/TaskItem/index.vue
+++ b/docs/src/demos/Nodes/TaskItem/index.vue
@@ -27,11 +27,11 @@ export default {
   mounted() {
     this.editor = new Editor({
       extensions: [
-        Document(),
-        Paragraph(),
-        Text(),
-        TaskList(),
-        TaskItem(),
+        Document,
+        Paragraph,
+        Text,
+        TaskList,
+        TaskItem,
       ],
       content: `
         <ul data-type="task_list">
diff --git a/docs/src/demos/Nodes/TaskList/index.vue b/docs/src/demos/Nodes/TaskList/index.vue
index 6baf52e5..4627bc7b 100644
--- a/docs/src/demos/Nodes/TaskList/index.vue
+++ b/docs/src/demos/Nodes/TaskList/index.vue
@@ -31,11 +31,11 @@ export default {
   mounted() {
     this.editor = new Editor({
       extensions: [
-        Document(),
-        Paragraph(),
-        Text(),
-        TaskList(),
-        TaskItem(),
+        Document,
+        Paragraph,
+        Text,
+        TaskList,
+        TaskItem,
       ],
       content: `
         <ul data-type="task_list">
diff --git a/docs/src/demos/Nodes/Text/index.vue b/docs/src/demos/Nodes/Text/index.vue
index a3557624..af5648d5 100644
--- a/docs/src/demos/Nodes/Text/index.vue
+++ b/docs/src/demos/Nodes/Text/index.vue
@@ -25,9 +25,9 @@ export default {
   mounted() {
     this.editor = new Editor({
       extensions: [
-        Document(),
-        Paragraph(),
-        Text(),
+        Document,
+        Paragraph,
+        Text,
       ],
       content: `
         <p>The Text extension is required, at least if you want to have text in your text editor and that’s very likely.</p>
diff --git a/packages/core/src/Editor.ts b/packages/core/src/Editor.ts
index 8757cabb..7350a28c 100644
--- a/packages/core/src/Editor.ts
+++ b/packages/core/src/Editor.ts
@@ -14,6 +14,9 @@ import createStyleTag from './utils/createStyleTag'
 import CommandManager from './CommandManager'
 import ExtensionManager from './ExtensionManager'
 import EventEmitter from './EventEmitter'
+import { Extension } from './Extension'
+import { NodeExtension } from './NodeExtension'
+import { MarkExtension } from './MarkExtension'
 import { Extensions, UnionToIntersection, PickValue } from './types'
 import * as extensions from './extensions'
 import style from './style'
@@ -37,7 +40,62 @@ export interface CommandsSpec {
 
 export interface AllExtensions {}
 
-export type AllCommands = UnionToIntersection<ReturnType<PickValue<ReturnType<AllExtensions[keyof AllExtensions]>, 'addCommands'>>>
+// type names = AllExtensions[keyof AllExtensions]
+// type onlyExtensions = AllExtensions[keyof AllExtensions] extends Extension ? '1' : '0'
+// type onlyExtensions = AllExtensions[keyof AllExtensions extends Extension ? '1' : '0']
+
+// export type OnlyExtensions = {
+//   [Item in keyof AllExtensions]: AllExtensions[Item] extends Extension
+//   ? AllExtensions[Item]
+//   : never
+// }
+
+// type ExtractCat<A> = A extends Extension ? A : never
+
+// export type OnlyExtensions = ExtractCat<Item in keyof AllExtensions>
+
+// type ExtractCommands<G> = G extends Extension<any, infer S> ? S : never
+// type Test = UnionToIntersection<ExtractCommands<OnlyExtensions[keyof OnlyExtensions]>>
+
+// type SubType<Base, Condition> = Pick<Base, {
+//   [Key in keyof Base]: Base[Key] extends Condition ? Key : never
+// }[keyof Base]>;
+
+// type OnlyExtensions = SubType<AllExtensions, Extension>
+// type ExtractCommands<G> = G extends Extension<any, infer S> ? S : never
+// type Test = ExtractCommands<OnlyExtensions[keyof OnlyExtensions]>
+
+// type ExtractCommands<G> = G extends Extension<any, infer S>
+//   ? never
+//   : G extends NodeExtension<any, infer T>
+//     ? never
+//     : G extends MarkExtension<any, infer U>
+//       ? U
+//       : never
+
+// export type Bla = {
+//   [Item in keyof AllExtensions]: AllExtensions[Item] extends Extension<any, infer S>
+//     ? S
+//     : AllExtensions[Item] extends NodeExtension<any, infer T>
+//       ? T
+//       : AllExtensions[Item] extends MarkExtension<any, infer U>
+//         ? U
+//         : never
+// }
+
+export type Bla = {
+  [Item in keyof AllExtensions]: AllExtensions[Item] extends Extension<any, infer ExtensionCommands>
+    ? ExtensionCommands
+    : AllExtensions[Item] extends NodeExtension<any, infer NodeExtensionCommands>
+      ? NodeExtensionCommands
+      : AllExtensions[Item] extends MarkExtension<any, infer MarkExtensionCommands>
+        ? MarkExtensionCommands
+        : never
+}
+
+type ValuesOf<T> = T[keyof T];
+type KeysWithTypeOf<T, Type> = ({[P in keyof T]: T[P] extends Type ? P : never })[keyof T]
+type AllCommands = UnionToIntersection<ValuesOf<Pick<Bla, KeysWithTypeOf<Bla, {}>>>>
 
 export type SingleCommands = {
   [Item in keyof AllCommands]: AllCommands[Item] extends (...args: any[]) => any
@@ -239,7 +297,7 @@ export class Editor extends EventEmitter {
    * Creates an extension manager.
    */
   private createExtensionManager() {
-    const coreExtensions = Object.entries(extensions).map(([, extension]) => extension())
+    const coreExtensions = Object.entries(extensions).map(([, extension]) => extension)
     const allExtensions = [...this.options.extensions, ...coreExtensions]
 
     this.extensionManager = new ExtensionManager(allExtensions, this.proxy)
diff --git a/packages/core/src/Extension.ts b/packages/core/src/Extension.ts
index 48d23b4e..aec32953 100644
--- a/packages/core/src/Extension.ts
+++ b/packages/core/src/Extension.ts
@@ -63,55 +63,6 @@ export interface ExtensionSpec<Options = any, Commands = {}> {
   }) => Plugin[],
 }
 
-// /**
-//  * Extension interface for internal usage
-//  */
-// export type Extension = Required<Omit<ExtensionSpec, 'defaultOptions'> & {
-//   type: string,
-//   options: {
-//     [key: string]: any
-//   },
-// }>
-
-// /**
-//  * Default extension
-//  */
-// export const defaultExtension: Extension = {
-//   name: 'extension',
-//   type: 'extension',
-//   options: {},
-//   addGlobalAttributes: () => [],
-//   addCommands: () => ({}),
-//   addKeyboardShortcuts: () => ({}),
-//   addInputRules: () => [],
-//   addPasteRules: () => [],
-//   addProseMirrorPlugins: () => [],
-// }
-
-// export function createExtension<Options extends {}, Commands extends {}>(config: ExtensionSpec<Options, Commands>) {
-//   const extend = <ExtendedOptions = Options, ExtendedCommands = Commands>(extendedConfig: Partial<ExtensionSpec<ExtendedOptions, ExtendedCommands>>) => {
-//     return createExtension({
-//       ...config,
-//       ...extendedConfig,
-//     } as ExtensionSpec<ExtendedOptions, ExtendedCommands>)
-//   }
-
-//   const setOptions = (options?: Partial<Options>) => {
-//     const { defaultOptions, ...rest } = config
-
-//     return {
-//       ...defaultExtension,
-//       ...rest,
-//       options: {
-//         ...defaultOptions,
-//         ...options,
-//       } as Options,
-//     }
-//   }
-
-//   return Object.assign(setOptions, { config, extend })
-// }
-
 export class Extension<Options = any, Commands = any> {
   config: Required<ExtensionSpec> = {
     name: 'extension',
@@ -144,6 +95,8 @@ export class Extension<Options = any, Commands = any> {
       ...this.config.defaultOptions,
       ...options,
     }
+
+    return this
   }
 
   extend<ExtendedOptions = Options, ExtendedCommands = Commands>(extendedConfig: Partial<ExtensionSpec<ExtendedOptions, ExtendedCommands>>) {
diff --git a/packages/core/src/ExtensionManager.ts b/packages/core/src/ExtensionManager.ts
index 5c6ea347..eb10635a 100644
--- a/packages/core/src/ExtensionManager.ts
+++ b/packages/core/src/ExtensionManager.ts
@@ -28,10 +28,10 @@ export default class ExtensionManager {
       const context = {
         options: extension.options,
         editor: this.editor,
-        type: getSchemaTypeByName(extension.name, this.schema),
+        type: getSchemaTypeByName(extension.config.name, this.schema),
       }
 
-      const commands = extension.addCommands.bind(context)()
+      const commands = extension.config.addCommands.bind(context)()
 
       editor.registerCommands(commands)
     })
@@ -43,10 +43,10 @@ export default class ExtensionManager {
         const context = {
           options: extension.options,
           editor: this.editor,
-          type: getSchemaTypeByName(extension.name, this.schema),
+          type: getSchemaTypeByName(extension.config.name, this.schema),
         }
 
-        return extension.addProseMirrorPlugins.bind(context)()
+        return extension.config.addProseMirrorPlugins.bind(context)()
       })
       .flat()
 
@@ -64,10 +64,10 @@ export default class ExtensionManager {
         const context = {
           options: extension.options,
           editor: this.editor,
-          type: getSchemaTypeByName(extension.name, this.schema),
+          type: getSchemaTypeByName(extension.config.name, this.schema),
         }
 
-        return extension.addInputRules.bind(context)()
+        return extension.config.addInputRules.bind(context)()
       })
       .flat()
   }
@@ -78,10 +78,10 @@ export default class ExtensionManager {
         const context = {
           options: extension.options,
           editor: this.editor,
-          type: getSchemaTypeByName(extension.name, this.schema),
+          type: getSchemaTypeByName(extension.config.name, this.schema),
         }
 
-        return extension.addPasteRules.bind(context)()
+        return extension.config.addPasteRules.bind(context)()
       })
       .flat()
   }
@@ -91,10 +91,10 @@ export default class ExtensionManager {
       const context = {
         options: extension.options,
         editor: this.editor,
-        type: getSchemaTypeByName(extension.name, this.schema),
+        type: getSchemaTypeByName(extension.config.name, this.schema),
       }
 
-      return keymap(extension.addKeyboardShortcuts.bind(context)())
+      return keymap(extension.config.addKeyboardShortcuts.bind(context)())
     })
   }
 
@@ -104,17 +104,17 @@ export default class ExtensionManager {
     const allAttributes = getAttributesFromExtensions(this.extensions)
 
     return Object.fromEntries(nodeExtensions
-      .filter(extension => !!extension.addNodeView)
+      .filter(extension => !!extension.config.addNodeView)
       .map(extension => {
-        const extensionAttributes = allAttributes.filter(attribute => attribute.type === extension.name)
+        const extensionAttributes = allAttributes.filter(attribute => attribute.type === extension.config.name)
         const context = {
           options: extension.options,
           editor,
-          type: getSchemaTypeByName(extension.name, this.schema),
+          type: getSchemaTypeByName(extension.config.name, this.schema),
         }
 
         // @ts-ignore
-        const renderer = extension.addNodeView?.bind(context)?.() as NodeViewRenderer
+        const renderer = extension.config.addNodeView?.bind(context)?.() as NodeViewRenderer
 
         const nodeview = (
           node: ProsemirrorNode,
@@ -133,7 +133,7 @@ export default class ExtensionManager {
           })
         }
 
-        return [extension.name, nodeview]
+        return [extension.config.name, nodeview]
       }))
   }
 
diff --git a/packages/core/src/MarkExtension.ts b/packages/core/src/MarkExtension.ts
index 971ba1a9..64a7e9e6 100644
--- a/packages/core/src/MarkExtension.ts
+++ b/packages/core/src/MarkExtension.ts
@@ -106,51 +106,7 @@ export interface MarkExtensionSpec<Options = any, Commands = {}> extends Overwri
   }) => Plugin[],
 }> {}
 
-// export type MarkExtension = Required<Omit<MarkExtensionSpec, 'defaultOptions'> & {
-//   type: string,
-//   options: {
-//     [key: string]: any
-//   },
-// }>
-
-// const defaultMark: MarkExtension = {
-//   ...defaultExtension,
-//   type: 'mark',
-//   name: 'mark',
-//   inclusive: null,
-//   excludes: null,
-//   group: null,
-//   spanning: null,
-//   parseHTML: () => null,
-//   renderHTML: null,
-//   addAttributes: () => ({}),
-// }
-
-// export function createMark<Options extends {}, Commands extends {}>(config: MarkExtensionSpec<Options, Commands>) {
-//   const extend = <ExtendedOptions = Options, ExtendedCommands = Commands>(extendedConfig: Partial<MarkExtensionSpec<ExtendedOptions, ExtendedCommands>>) => {
-//     return createMark({
-//       ...config,
-//       ...extendedConfig,
-//     } as MarkExtensionSpec<ExtendedOptions, ExtendedCommands>)
-//   }
-
-//   const setOptions = (options?: Partial<Options>) => {
-//     const { defaultOptions, ...rest } = config
-
-//     return {
-//       ...defaultMark,
-//       ...rest,
-//       options: {
-//         ...defaultOptions,
-//         ...options,
-//       } as Options,
-//     }
-//   }
-
-//   return Object.assign(setOptions, { config, extend })
-// }
-
-export class MarkExtension<Options = any, Commands = any> {
+export class MarkExtension<Options = any, Commands = {}> {
   config: Required<MarkExtensionSpec> = {
     name: 'mark',
     defaultOptions: {},
@@ -189,6 +145,8 @@ export class MarkExtension<Options = any, Commands = any> {
       ...this.config.defaultOptions,
       ...options,
     }
+
+    return this
   }
 
   extend<ExtendedOptions = Options, ExtendedCommands = Commands>(extendedConfig: Partial<MarkExtensionSpec<ExtendedOptions, ExtendedCommands>>) {
diff --git a/packages/core/src/NodeExtension.ts b/packages/core/src/NodeExtension.ts
index 92a9e05f..79991887 100644
--- a/packages/core/src/NodeExtension.ts
+++ b/packages/core/src/NodeExtension.ts
@@ -150,59 +150,7 @@ export interface NodeExtensionSpec<Options = any, Commands = {}> extends Overwri
   }) => NodeViewRenderer) | null,
 }> {}
 
-// export type NodeExtension = Required<Omit<NodeExtensionSpec, 'defaultOptions'> & {
-//   type: string,
-//   options: {
-//     [key: string]: any
-//   },
-// }>
-
-// const defaultNode: NodeExtension = {
-//   ...defaultExtension,
-//   type: 'node',
-//   name: 'node',
-//   topNode: false,
-//   content: null,
-//   marks: null,
-//   group: null,
-//   inline: null,
-//   atom: null,
-//   selectable: null,
-//   draggable: null,
-//   code: null,
-//   defining: null,
-//   isolating: null,
-//   parseHTML: () => null,
-//   renderHTML: null,
-//   addAttributes: () => ({}),
-//   addNodeView: null,
-// }
-
-// export function createNode<Options extends {}, Commands extends {}>(config: NodeExtensionSpec<Options, Commands>) {
-//   const extend = <ExtendedOptions = Options, ExtendedCommands = Commands>(extendedConfig: Partial<NodeExtensionSpec<ExtendedOptions, ExtendedCommands>>) => {
-//     return createNode({
-//       ...config,
-//       ...extendedConfig,
-//     } as NodeExtensionSpec<ExtendedOptions, ExtendedCommands>)
-//   }
-
-//   const setOptions = (options?: Partial<Options>) => {
-//     const { defaultOptions, ...rest } = config
-
-//     return {
-//       ...defaultNode,
-//       ...rest,
-//       options: {
-//         ...defaultOptions,
-//         ...options,
-//       } as Options,
-//     }
-//   }
-
-//   return Object.assign(setOptions, { config, extend })
-// }
-
-export class NodeExtension<Options = any, Commands = any> {
+export class NodeExtension<Options = any, Commands = {}> {
   config: Required<NodeExtensionSpec> = {
     name: 'node',
     defaultOptions: {},
@@ -249,6 +197,8 @@ export class NodeExtension<Options = any, Commands = any> {
       ...this.config.defaultOptions,
       ...options,
     }
+
+    return this
   }
 
   extend<ExtendedOptions = Options, ExtendedCommands = Commands>(extendedConfig: Partial<NodeExtensionSpec<ExtendedOptions, ExtendedCommands>>) {
diff --git a/packages/core/src/utils/getAttributesFromExtensions.ts b/packages/core/src/utils/getAttributesFromExtensions.ts
index 62a327c3..389d435a 100644
--- a/packages/core/src/utils/getAttributesFromExtensions.ts
+++ b/packages/core/src/utils/getAttributesFromExtensions.ts
@@ -27,7 +27,7 @@ export default function getAttributesFromExtensions(extensions: Extensions) {
       options: extension.options,
     }
 
-    const globalAttributes = extension.addGlobalAttributes.bind(context)() as GlobalAttributes
+    const globalAttributes = extension.config.addGlobalAttributes.bind(context)() as GlobalAttributes
 
     globalAttributes.forEach(globalAttribute => {
       globalAttribute.types.forEach(type => {
@@ -52,13 +52,13 @@ export default function getAttributesFromExtensions(extensions: Extensions) {
       options: extension.options,
     }
 
-    const attributes = extension.addAttributes.bind(context)() as Attributes
+    const attributes = extension.config.addAttributes.bind(context)() as Attributes
 
     Object
       .entries(attributes)
       .forEach(([name, attribute]) => {
         extensionAttributes.push({
-          type: extension.name,
+          type: extension.config.name,
           name,
           attribute: {
             ...defaultAttribute,
diff --git a/packages/core/src/utils/getSchema.ts b/packages/core/src/utils/getSchema.ts
index ee0bed4d..39bb24c4 100644
--- a/packages/core/src/utils/getSchema.ts
+++ b/packages/core/src/utils/getSchema.ts
@@ -21,35 +21,35 @@ function cleanUpSchemaItem<T>(data: T) {
 export default function getSchema(extensions: Extensions): Schema {
   const allAttributes = getAttributesFromExtensions(extensions)
   const { nodeExtensions, markExtensions } = splitExtensions(extensions)
-  const topNode = nodeExtensions.find(extension => extension.topNode)?.name
+  const topNode = nodeExtensions.find(extension => extension.config.topNode)?.config.name
 
   const nodes = Object.fromEntries(nodeExtensions.map(extension => {
-    const extensionAttributes = allAttributes.filter(attribute => attribute.type === extension.name)
+    const extensionAttributes = allAttributes.filter(attribute => attribute.type === extension.config.name)
     const context = { options: extension.options }
     const schema: NodeSpec = cleanUpSchemaItem({
-      content: callOrReturn(extension.content, context),
-      marks: callOrReturn(extension.marks, context),
-      group: callOrReturn(extension.group, context),
-      inline: callOrReturn(extension.inline, context),
-      atom: callOrReturn(extension.atom, context),
-      selectable: callOrReturn(extension.selectable, context),
-      draggable: callOrReturn(extension.draggable, context),
-      code: callOrReturn(extension.code, context),
-      defining: callOrReturn(extension.defining, context),
-      isolating: callOrReturn(extension.isolating, context),
+      content: callOrReturn(extension.config.content, context),
+      marks: callOrReturn(extension.config.marks, context),
+      group: callOrReturn(extension.config.group, context),
+      inline: callOrReturn(extension.config.inline, context),
+      atom: callOrReturn(extension.config.atom, context),
+      selectable: callOrReturn(extension.config.selectable, context),
+      draggable: callOrReturn(extension.config.draggable, context),
+      code: callOrReturn(extension.config.code, context),
+      defining: callOrReturn(extension.config.defining, context),
+      isolating: callOrReturn(extension.config.isolating, context),
       attrs: Object.fromEntries(extensionAttributes.map(extensionAttribute => {
         return [extensionAttribute.name, { default: extensionAttribute?.attribute?.default }]
       })),
     })
 
-    if (extension.parseHTML) {
-      schema.parseDOM = extension.parseHTML
+    if (extension.config.parseHTML) {
+      schema.parseDOM = extension.config.parseHTML
         .bind(context)()
         ?.map(parseRule => injectExtensionAttributesToParseRule(parseRule, extensionAttributes))
     }
 
-    if (extension.renderHTML) {
-      schema.toDOM = node => (extension.renderHTML as Function)?.bind(context)({
+    if (extension.config.renderHTML) {
+      schema.toDOM = node => (extension.config.renderHTML as Function)?.bind(context)({
         node,
         HTMLAttributes: mergeAttributes(
           extension.options.HTMLAttributes,
@@ -58,30 +58,30 @@ export default function getSchema(extensions: Extensions): Schema {
       })
     }
 
-    return [extension.name, schema]
+    return [extension.config.name, schema]
   }))
 
   const marks = Object.fromEntries(markExtensions.map(extension => {
-    const extensionAttributes = allAttributes.filter(attribute => attribute.type === extension.name)
+    const extensionAttributes = allAttributes.filter(attribute => attribute.type === extension.config.name)
     const context = { options: extension.options }
     const schema: MarkSpec = cleanUpSchemaItem({
-      inclusive: callOrReturn(extension.inclusive, context),
-      excludes: callOrReturn(extension.excludes, context),
-      group: callOrReturn(extension.group, context),
-      spanning: callOrReturn(extension.spanning, context),
+      inclusive: callOrReturn(extension.config.inclusive, context),
+      excludes: callOrReturn(extension.config.excludes, context),
+      group: callOrReturn(extension.config.group, context),
+      spanning: callOrReturn(extension.config.spanning, context),
       attrs: Object.fromEntries(extensionAttributes.map(extensionAttribute => {
         return [extensionAttribute.name, { default: extensionAttribute?.attribute?.default }]
       })),
     })
 
-    if (extension.parseHTML) {
-      schema.parseDOM = extension.parseHTML
+    if (extension.config.parseHTML) {
+      schema.parseDOM = extension.config.parseHTML
         .bind(context)()
         ?.map(parseRule => injectExtensionAttributesToParseRule(parseRule, extensionAttributes))
     }
 
-    if (extension.renderHTML) {
-      schema.toDOM = mark => (extension.renderHTML as Function)?.bind(context)({
+    if (extension.config.renderHTML) {
+      schema.toDOM = mark => (extension.config.renderHTML as Function)?.bind(context)({
         mark,
         HTMLAttributes: mergeAttributes(
           extension.options.HTMLAttributes,
@@ -90,7 +90,7 @@ export default function getSchema(extensions: Extensions): Schema {
       })
     }
 
-    return [extension.name, schema]
+    return [extension.config.name, schema]
   }))
 
   return new Schema({
diff --git a/packages/core/src/utils/isList.ts b/packages/core/src/utils/isList.ts
index 860e3f64..808f220f 100644
--- a/packages/core/src/utils/isList.ts
+++ b/packages/core/src/utils/isList.ts
@@ -4,13 +4,13 @@ import callOrReturn from './callOrReturn'
 
 export default function isList(name: string, extensions: Extensions) {
   const { nodeExtensions } = splitExtensions(extensions)
-  const extension = nodeExtensions.find(item => item.name === name)
+  const extension = nodeExtensions.find(item => item.config.name === name)
 
   if (!extension) {
     return false
   }
 
-  const groups = callOrReturn(extension.group, { options: extension.options })
+  const groups = callOrReturn(extension.config.group, { options: extension.options })
 
   if (typeof groups !== 'string') {
     return false
diff --git a/packages/core/src/utils/splitExtensions.ts b/packages/core/src/utils/splitExtensions.ts
index b34a853d..1b69ab7e 100644
--- a/packages/core/src/utils/splitExtensions.ts
+++ b/packages/core/src/utils/splitExtensions.ts
@@ -4,9 +4,9 @@ import { NodeExtension } from '../NodeExtension'
 import { MarkExtension } from '../MarkExtension'
 
 export default function splitExtensions(extensions: Extensions) {
-  const baseExtensions = extensions.filter(extension => extension.type === 'extension') as Extension[]
-  const nodeExtensions = extensions.filter(extension => extension.type === 'node') as NodeExtension[]
-  const markExtensions = extensions.filter(extension => extension.type === 'mark') as MarkExtension[]
+  const baseExtensions = extensions.filter(extension => extension instanceof Extension) as Extension[]
+  const nodeExtensions = extensions.filter(extension => extension instanceof NodeExtension) as NodeExtension[]
+  const markExtensions = extensions.filter(extension => extension instanceof MarkExtension) as MarkExtension[]
 
   return {
     baseExtensions,
diff --git a/tests/cypress/integration/core/generateHTML.spec.ts b/tests/cypress/integration/core/generateHTML.spec.ts
index 05b553dd..39bfacd2 100644
--- a/tests/cypress/integration/core/generateHTML.spec.ts
+++ b/tests/cypress/integration/core/generateHTML.spec.ts
@@ -19,9 +19,9 @@ describe('generateHTML', () => {
     }
 
     const html = generateHTML(json, [
-      Document(),
-      Paragraph(),
-      Text(),
+      Document,
+      Paragraph,
+      Text,
     ])
 
     expect(html).to.eq('<p>Example Text</p>')

From dac2434cd3a459907d6de8cbda86bc47daf4bdb9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Mon, 16 Nov 2020 10:03:12 +0100
Subject: [PATCH 09/16] update docs

---
 docs/src/docPages/api/extensions.md           | 14 ++---
 docs/src/docPages/api/schema.md               | 54 +++++++++----------
 .../docPages/guide/build-custom-extensions.md | 30 +++++------
 docs/src/docPages/guide/custom-styling.md     | 20 +++----
 .../docPages/guide/working-with-typescript.md |  8 +--
 docs/src/docPages/overview/upgrade-guide.md   | 12 ++---
 6 files changed, 69 insertions(+), 69 deletions(-)

diff --git a/docs/src/docPages/api/extensions.md b/docs/src/docPages/api/extensions.md
index d46c4f44..aa9c37cc 100644
--- a/docs/src/docPages/api/extensions.md
+++ b/docs/src/docPages/api/extensions.md
@@ -23,20 +23,20 @@ You don’t have to use it, but we prepared a `@tiptap/vue-starter-kit` which in
 You’re free to create your own extensions for tiptap. Here is the boilerplate code that’s need to create and register your own extension:
 
 ```js
-import { createExtension } from '@tiptap/core'
+import { Extension } from '@tiptap/core'
 
-const CustomExtension = createExtension({
+const CustomExtension = Extension.create({
   // Your code here
 })
 
 const editor = new Editor({
   extensions: [
     // Register your custom extension with the editor.
-    CustomExtension(),
+    CustomExtension,
     // … and don’t forget all other extensions.
-    Document(),
-    Paragraph(),
-    Text(),
+    Document,
+    Paragraph,
+    Text,
     // …
   ],
 ```
@@ -49,7 +49,7 @@ ProseMirror has a fantastic eco system with many amazing plugins. If you want to
 ```js
 import { history } from 'prosemirror-history'
 
-const History = createExtension({
+const History = Extension.create({
   addProseMirrorPlugins() {
     return [
       history(),
diff --git a/docs/src/docPages/api/schema.md b/docs/src/docPages/api/schema.md
index d5f0bd14..1078119e 100644
--- a/docs/src/docPages/api/schema.md
+++ b/docs/src/docPages/api/schema.md
@@ -38,15 +38,15 @@ In tiptap every node, mark and extension is living in its own file. This allows
 
 ```js
 // the tiptap schema API
-import { createNode } from '@tiptap/core'
+import { NodeExtension } from '@tiptap/core'
 
-const Document = createNode({
+const Document = NodeExtension.create({
   name: 'document',
   topNode: true,
   content: 'block+',
 })
 
-const Paragraph = createNode({
+const Paragraph = NodeExtension.create({
   name: 'paragraph',
   group: 'block',
   content: 'inline*',
@@ -55,12 +55,12 @@ const Paragraph = createNode({
       { tag: 'p' },
     ]
   },
-  renderHTML({ attributes }) {
-    return ['p', attributes, 0]
+  renderHTML({ HTMLAttributes }) {
+    return ['p', HTMLAttributes, 0]
   },
 })
 
-const Text = createNode({
+const Text = NodeExtension.create({
   name: 'text',
   group: 'inline',
 })
@@ -79,7 +79,7 @@ Marks can be applied to specific parts of a node. That’s the case for **bold**
 The content attribute defines exactly what kind of content the node can have. ProseMirror is really strict with that. That means, content which doesn’t fit the schema is thrown away. It expects a name or group as a string. Here are a few examples:
 
 ```js
-createNode({
+NodeExtension.create({
   // must have one ore more blocks
   content: 'block+',
 
@@ -99,7 +99,7 @@ createNode({
 You can define which marks are allowed inside of a node with the `marks` setting of the schema. Add a one or more names or groups of marks, allow all or disallow all marks like this:
 
 ```js
-createNode({
+NodeExtension.create({
   // allows only the 'bold' mark
   marks: 'bold',
 
@@ -118,7 +118,7 @@ createNode({
 Add this node to a group of extensions, which can be referred to in the [content](#content) attribute of the schema.
 
 ```js
-createNode({
+NodeExtension.create({
   // add to 'block' group
   group: 'block',
 
@@ -134,7 +134,7 @@ createNode({
 Nodes can be rendered inline, too. When setting `inline: true` nodes are rendered in line with the text. That’s the case for mentions. The result is more like a mark, but with the functionality of a node. One difference is the resulting JSON document. Multiple marks are applied at once, inline nodes would result in a nested structure.
 
 ```js
-createNode({
+NodeExtension.create({
   // renders nodes in line with the text, for example
   inline: true,
 })
@@ -144,7 +144,7 @@ createNode({
 Nodes with `atom: true` aren’t directly editable and should be treated as a single unit. It’s not so likely to use that in a editor context, but this is how it would look like:
 
 ```js
-createNode({
+NodeExtension.create({
   atom: true,
 })
 ```
@@ -153,7 +153,7 @@ createNode({
 Besides the already visible text selection, there is an invisible node selection. If you want to make your nodes selectable, you can configure it like this:
 
 ```js
-createNode({
+NodeExtension.create({
   selectable: true,
 })
 ```
@@ -162,7 +162,7 @@ createNode({
 All nodes can be configured to be draggable (by default they aren’t) with this setting:
 
 ```js
-createNode({
+NodeExtension.create({
   draggable: true,
 })
 ```
@@ -171,7 +171,7 @@ createNode({
 Users expect code to behave very differently. For all kind of nodes containing code, you can set `code: true` to take this into account.
 
 ```js
-createNode({
+NodeExtension.create({
   code: true,
 })
 ```
@@ -182,7 +182,7 @@ Nodes get dropped when their entire content is replaced (for example, when pasti
 Typically, that applies to [`Blockquote`](/api/node/blockquote), [`CodeBlock`](/api/node/code-block), [`Heading`](/api/node/heading), and [`ListItem`](/api/node/list-item).
 
 ```js
-createNode({
+NodeExtension.create({
   defining: true,
 })
 ```
@@ -191,7 +191,7 @@ createNode({
 For nodes that should fence the cursor for regular editing operations like backspacing, for example a TableCell, set `isolating: true`.
 
 ```js
-createNode({
+NodeExtension.create({
   isolating: true,
 })
 ```
@@ -201,7 +201,7 @@ createNode({
 If you don’t want the mark to be active when the cursor is at its end, set inclusive to `false`. For example, that’s how it’s configured for [`Link`](/api/marks/link) marks:
 
 ```js
-createMark({
+MarkExtension.create({
   inclusive: false,
 })
 ```
@@ -210,7 +210,7 @@ createMark({
 By default all nodes can be applied at the same time. With the excludes attribute you can define which marks must not coexist with the mark. For example, the inline code mark excludes any other mark (bold, italic, and all others).
 
 ```js
-createMark({
+MarkExtension.create({
   // must not coexist with the bold mark
   excludes: 'bold'
   // exclude any other mark
@@ -222,7 +222,7 @@ createMark({
 Add this mark to a group of extensions, which can be referred to in the content attribute of the schema.
 
 ```js
-createMark({
+MarkExtension.create({
   // add this mark to the 'basic' group
   group: 'basic',
   // add this mark to the 'basic' and the 'foobar' group
@@ -234,7 +234,7 @@ createMark({
 Users expect code to behave very differently. For all kind of marks containing code, you can set `code: true` to take this into account.
 
 ```js
-createMark({
+MarkExtension.create({
   code: true,
 })
 ```
@@ -243,7 +243,7 @@ createMark({
 By default marks can span multiple nodes when rendered as HTML. Set `spanning: false` to indicate that a mark must not span multiple nodes.
 
 ```js
-createMark({
+MarkExtension.create({
   spanning: false,
 })
 ```
@@ -262,9 +262,9 @@ import Text from '@tiptap/extension-text'
 
 const editor = new Editor({
   extensions: [
-    Document(),
-    Paragraph(),
-    Text(),
+    Document,
+    Paragraph,
+    Text,
     // add more extensions here
   ])
 })
@@ -282,9 +282,9 @@ import Paragraph from '@tiptap/extension-paragraph'
 import Text from '@tiptap/extension-text'
 
 const schema = getSchema([
-  Document(),
-  Paragraph(),
-  Text(),
+  Document,
+  Paragraph,
+  Text,
   // add more extensions here
 ])
 ```
diff --git a/docs/src/docPages/guide/build-custom-extensions.md b/docs/src/docPages/guide/build-custom-extensions.md
index e768d712..1ad920d0 100644
--- a/docs/src/docPages/guide/build-custom-extensions.md
+++ b/docs/src/docPages/guide/build-custom-extensions.md
@@ -171,9 +171,9 @@ Attributes can be applied to multiple extensions at once. That’s useful for te
 Take a closer look at [the full source code](https://github.com/ueberdosis/tiptap-next/tree/main/packages/extension-text-align) of the [`TextAlign`](/api/extensions/text-align) extension to see a more complex example. But here is how it works in a nutshell:
 
 ```js
-import { createExtension } from '@tiptap/core'
+import { Extension } from '@tiptap/core'
 
-const TextAlign = createExtension({
+const TextAlign = Extension.create({
   addGlobalAttributes() {
     return [
       {
@@ -204,8 +204,8 @@ const TextAlign = createExtension({
 With the `renderHTML` function you can control how an extension is rendered to HTML. We pass an attributes object to it, with all local attributes, global attributes, and configured CSS classes. Here is an example from the `Bold` extension:
 
 ```js
-renderHTML({ attributes }) {
-  return ['strong', attributes, 0]
+renderHTML({ HTMLAttributes }) {
+  return ['strong', HTMLAttributes, 0]
 },
 ```
 
@@ -214,16 +214,16 @@ The first value in the array should be the name of HTML tag. If the second eleme
 The number zero (representing a hole) is used to indicate where the content should be inserted. Let’s look at the rendering of the `CodeBlock` extension with two nested tags:
 
 ```js
-renderHTML({ attributes }) {
-  return ['pre', ['code', attributes, 0]]
+renderHTML({ HTMLAttributes }) {
+  return ['pre', ['code', HTMLAttributes, 0]]
 },
 ```
 
 If you want to add some specific attributes there, import the `mergeAttributes` helper from `@tiptap/core`:
 
 ```js
-renderHTML({ attributes }) {
-  return ['a', mergeAttributes(attributes, { rel: this.options.rel }), 0]
+renderHTML({ HTMLAttributes }) {
+  return ['a', mergeAttributes(HTMLAttributes, { rel: this.options.rel }), 0]
 },
 ```
 
@@ -386,33 +386,33 @@ const CustomLink = Link.extend({
 There is a whole lot to learn about node views, so head over to the [dedicated section in our guide about node views](/guide/advanced-node-views) for more information. If you’re looking for a real-world example, look at the source code of the [`TaskItem`](/api/nodes/task-item) node. This is using a node view to render the checkboxes.
 
 ## Start from scratch
-You can also build your own extensions from scratch with the `createNode()`, `createMark()`, and `createExtension()` functions. Pass an option with your code and configuration.
+You can also build your own extensions from scratch with the `NodeExtension`, `MarkExtension`, and `Extension` classes. Pass an option with your code and configuration.
 
 And if everything is working fine, don’t forget to [share it with the community](https://github.com/ueberdosis/tiptap-next/issues/new/choose).
 
 ### Create a node
 ```js
-import { createNode } from '@tiptap/core'
+import { NodeExtension } from '@tiptap/core'
 
-const CustomNode = createNode({
+const CustomNode = NodeExtension.create({
   // Your code goes here.
 })
 ```
 
 ### Create a mark
 ```js
-import { createMark } from '@tiptap/core'
+import { MarkExtension } from '@tiptap/core'
 
-const CustomMark = createMark({
+const CustomMark = MarkExtension.create({
   // Your code goes here.
 })
 ```
 
 ### Create an extension
 ```js
-import { createExtension } from '@tiptap/core'
+import { Extension } from '@tiptap/core'
 
-const CustomExtension = createExtension({
+const CustomExtension = Extension.create({
   // Your code goes here.
 })
 ```
diff --git a/docs/src/docPages/guide/custom-styling.md b/docs/src/docPages/guide/custom-styling.md
index cc9706da..ca5b91ec 100644
--- a/docs/src/docPages/guide/custom-styling.md
+++ b/docs/src/docPages/guide/custom-styling.md
@@ -28,23 +28,23 @@ p {
 ## Option 2: Add custom classes
 Most extensions have a `class` option, which you can use to add a custom CSS class to the HTML tag.
 
-Most extensions allow you to add attributes to the rendered HTML through the `attributes` configuration. You can use that to add a custom class (or any other attribute):
+Most extensions allow you to add attributes to the rendered HTML through the `HTMLAttributes` configuration. You can use that to add a custom class (or any other attribute):
 
 ```js
 new Editor({
   extensions: [
-    Document(),
-    Paragraph({
-      attributes: {
+    Document,
+    Paragraph.set({
+      HTMLAttributes: {
         class: 'my-custom-paragraph',
       },
     }),
-    Heading({
-      attributes: {
+    Heading.set({
+      HTMLAttributes: {
         class: 'my-custom-heading',
       },
     }),
-    Text(),
+    Text,
   ]
 })
 ```
@@ -65,10 +65,10 @@ You can even customize the markup for every extension. This will make a custom b
 import Bold from '@tiptap/extension-bold'
 
 const CustomBold = Bold.extend({
-  renderHTML({ attributes }) {
+  renderHTML({ HTMLAttributes }) {
     // Original:
-    // return ['strong', attributes, 0]
-    return ['b', attributes, 0]
+    // return ['strong', HTMLAttributes, 0]
+    return ['b', HTMLAttributes, 0]
   },
 })
 
diff --git a/docs/src/docPages/guide/working-with-typescript.md b/docs/src/docPages/guide/working-with-typescript.md
index 37dbdc1e..a7aed418 100644
--- a/docs/src/docPages/guide/working-with-typescript.md
+++ b/docs/src/docPages/guide/working-with-typescript.md
@@ -15,13 +15,13 @@ If you’re using TypeScript in your project and want to extend tiptap, there ar
 To extend or create default options for an extension, you’ll need to define a custom type, here is an example:
 
 ```js
-import { createExtension } from '@tiptap/core'
+import { Extension } from '@tiptap/core'
 
 export interface CustomExtensionOptions {
   awesomeness: number,
 }
 
-const CustomExtension = createExtension({
+const CustomExtension = Extension.create({
   defaultOptions: <CustomExtensionOptions>{
     awesomeness: 100,
   },
@@ -32,9 +32,9 @@ const CustomExtension = createExtension({
 The core package also exports a `Command` type, which needs to be added to all commands that you specify in your code. Here is an example:
 
 ```js
-import { Command, createExtension } from '@tiptap/core'
+import { Command, Extension } from '@tiptap/core'
 
-const CustomExtension = createExtension({
+const CustomExtension = Extension.create({
   addCommands() {
     return {
       /**
diff --git a/docs/src/docPages/overview/upgrade-guide.md b/docs/src/docPages/overview/upgrade-guide.md
index ca012d1d..8b0a2972 100644
--- a/docs/src/docPages/overview/upgrade-guide.md
+++ b/docs/src/docPages/overview/upgrade-guide.md
@@ -29,9 +29,9 @@ import Text from '@tiptap/extension-text'
 
 new Editor({
   extensions: [
-    Document(),
-    Paragraph(),
-    Text(),
+    Document,
+    Paragraph,
+    Text,
     // all your other extensions
   ]
 })
@@ -44,9 +44,9 @@ new Editor({
 In case you’ve built some custom extensions for your project, you’re required to rewrite them to fit the new API. No worries, you can keep a lot of your work though. The `schema`, `commands`, `keys`, `inputRules` and `pasteRules` all work like they did before. It’s just different how you register them.
 
 ```js
-import { createNode } from '@tiptap/core'
+import { NodeExtension } from '@tiptap/core'
 
-const CustomExtension = createNode({
+const CustomExtension = NodeExtension.create({
   name: 'custom_extension'
   defaultOptions: {
     …
@@ -57,7 +57,7 @@ const CustomExtension = createNode({
   parseHTML() {
     …
   },
-  renderHTML({ node, attributes }) {
+  renderHTML({ node, HTMLAttributes }) {
     …
   },
   addCommands() {

From b450bb98508ed4e7cbb178b8f369efd5189c0673 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Mon, 16 Nov 2020 10:03:21 +0100
Subject: [PATCH 10/16] we dont need this anymore

---
 packages/core/src/extensions/editable.ts | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/packages/core/src/extensions/editable.ts b/packages/core/src/extensions/editable.ts
index 9a67f7e1..4dc9f2d0 100644
--- a/packages/core/src/extensions/editable.ts
+++ b/packages/core/src/extensions/editable.ts
@@ -14,9 +14,8 @@ export const Editable = Extension.create({
   },
 })
 
-// TODO: Editable circularly references itself!?
-// declare module '@tiptap/core' {
-//   interface AllExtensions {
-//     Editable: typeof Editable,
-//   }
-// }
+declare module '@tiptap/core' {
+  interface AllExtensions {
+    Editable: typeof Editable,
+  }
+}

From 0fdfe33820b95edd95d9ada193bba5d2884fb77b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Mon, 16 Nov 2020 10:22:12 +0100
Subject: [PATCH 11/16] create new instance on extension set method

---
 packages/core/src/Extension.ts     | 11 ++++++++++-
 packages/core/src/MarkExtension.ts | 11 ++++++++++-
 packages/core/src/NodeExtension.ts | 11 ++++++++++-
 3 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/packages/core/src/Extension.ts b/packages/core/src/Extension.ts
index aec32953..9c4063a9 100644
--- a/packages/core/src/Extension.ts
+++ b/packages/core/src/Extension.ts
@@ -90,7 +90,16 @@ export class Extension<Options = any, Commands = any> {
     return new Extension<O, C>(config)
   }
 
-  set(options: Options) {
+  set(options: Partial<Options>) {
+    return Extension
+      .create<Options, Commands>(this.config as ExtensionSpec<Options, Commands>)
+      .#set({
+        ...this.config.defaultOptions,
+        ...options,
+      })
+  }
+
+  #set = (options: Partial<Options>) => {
     this.options = {
       ...this.config.defaultOptions,
       ...options,
diff --git a/packages/core/src/MarkExtension.ts b/packages/core/src/MarkExtension.ts
index 64a7e9e6..a934eb7c 100644
--- a/packages/core/src/MarkExtension.ts
+++ b/packages/core/src/MarkExtension.ts
@@ -140,7 +140,16 @@ export class MarkExtension<Options = any, Commands = {}> {
     return new MarkExtension<O, C>(config)
   }
 
-  set(options: Options) {
+  set(options: Partial<Options>) {
+    return MarkExtension
+      .create<Options, Commands>(this.config as MarkExtensionSpec<Options, Commands>)
+      .#set({
+        ...this.config.defaultOptions,
+        ...options,
+      })
+  }
+
+  #set = (options: Partial<Options>) => {
     this.options = {
       ...this.config.defaultOptions,
       ...options,
diff --git a/packages/core/src/NodeExtension.ts b/packages/core/src/NodeExtension.ts
index 79991887..84e9cf77 100644
--- a/packages/core/src/NodeExtension.ts
+++ b/packages/core/src/NodeExtension.ts
@@ -192,7 +192,16 @@ export class NodeExtension<Options = any, Commands = {}> {
     return new NodeExtension<O, C>(config)
   }
 
-  set(options: Options) {
+  set(options: Partial<Options>) {
+    return NodeExtension
+      .create<Options, Commands>(this.config as NodeExtensionSpec<Options, Commands>)
+      .#set({
+        ...this.config.defaultOptions,
+        ...options,
+      })
+  }
+
+  #set = (options: Partial<Options>) => {
     this.options = {
       ...this.config.defaultOptions,
       ...options,

From 9c411f4830e01e0ced8a586fe0592f8ea7d35cfb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Mon, 16 Nov 2020 10:23:57 +0100
Subject: [PATCH 12/16] fix bug

---
 docs/src/components/PageNavigation/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/src/components/PageNavigation/index.vue b/docs/src/components/PageNavigation/index.vue
index c12e25e3..2612543f 100644
--- a/docs/src/components/PageNavigation/index.vue
+++ b/docs/src/components/PageNavigation/index.vue
@@ -76,7 +76,7 @@ export default {
     previousPage() {
       let previousIndex = this.currentIndex - 1
 
-      while (this.flattenedItems[previousIndex].redirect) {
+      while (this.flattenedItems[previousIndex]?.redirect) {
         previousIndex -= 1
       }
 

From 356696772e1546546b575e823739ee9de2d4736f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Mon, 16 Nov 2020 10:29:01 +0100
Subject: [PATCH 13/16] fix lint

---
 packages/core/src/Editor.ts | 49 +++----------------------------------
 1 file changed, 3 insertions(+), 46 deletions(-)

diff --git a/packages/core/src/Editor.ts b/packages/core/src/Editor.ts
index 7350a28c..7b9c9df2 100644
--- a/packages/core/src/Editor.ts
+++ b/packages/core/src/Editor.ts
@@ -17,7 +17,7 @@ import EventEmitter from './EventEmitter'
 import { Extension } from './Extension'
 import { NodeExtension } from './NodeExtension'
 import { MarkExtension } from './MarkExtension'
-import { Extensions, UnionToIntersection, PickValue } from './types'
+import { Extensions, UnionToIntersection } from './types'
 import * as extensions from './extensions'
 import style from './style'
 
@@ -40,50 +40,7 @@ export interface CommandsSpec {
 
 export interface AllExtensions {}
 
-// type names = AllExtensions[keyof AllExtensions]
-// type onlyExtensions = AllExtensions[keyof AllExtensions] extends Extension ? '1' : '0'
-// type onlyExtensions = AllExtensions[keyof AllExtensions extends Extension ? '1' : '0']
-
-// export type OnlyExtensions = {
-//   [Item in keyof AllExtensions]: AllExtensions[Item] extends Extension
-//   ? AllExtensions[Item]
-//   : never
-// }
-
-// type ExtractCat<A> = A extends Extension ? A : never
-
-// export type OnlyExtensions = ExtractCat<Item in keyof AllExtensions>
-
-// type ExtractCommands<G> = G extends Extension<any, infer S> ? S : never
-// type Test = UnionToIntersection<ExtractCommands<OnlyExtensions[keyof OnlyExtensions]>>
-
-// type SubType<Base, Condition> = Pick<Base, {
-//   [Key in keyof Base]: Base[Key] extends Condition ? Key : never
-// }[keyof Base]>;
-
-// type OnlyExtensions = SubType<AllExtensions, Extension>
-// type ExtractCommands<G> = G extends Extension<any, infer S> ? S : never
-// type Test = ExtractCommands<OnlyExtensions[keyof OnlyExtensions]>
-
-// type ExtractCommands<G> = G extends Extension<any, infer S>
-//   ? never
-//   : G extends NodeExtension<any, infer T>
-//     ? never
-//     : G extends MarkExtension<any, infer U>
-//       ? U
-//       : never
-
-// export type Bla = {
-//   [Item in keyof AllExtensions]: AllExtensions[Item] extends Extension<any, infer S>
-//     ? S
-//     : AllExtensions[Item] extends NodeExtension<any, infer T>
-//       ? T
-//       : AllExtensions[Item] extends MarkExtension<any, infer U>
-//         ? U
-//         : never
-// }
-
-export type Bla = {
+export type UnfilteredCommands = {
   [Item in keyof AllExtensions]: AllExtensions[Item] extends Extension<any, infer ExtensionCommands>
     ? ExtensionCommands
     : AllExtensions[Item] extends NodeExtension<any, infer NodeExtensionCommands>
@@ -95,7 +52,7 @@ export type Bla = {
 
 type ValuesOf<T> = T[keyof T];
 type KeysWithTypeOf<T, Type> = ({[P in keyof T]: T[P] extends Type ? P : never })[keyof T]
-type AllCommands = UnionToIntersection<ValuesOf<Pick<Bla, KeysWithTypeOf<Bla, {}>>>>
+type AllCommands = UnionToIntersection<ValuesOf<Pick<UnfilteredCommands, KeysWithTypeOf<UnfilteredCommands, {}>>>>
 
 export type SingleCommands = {
   [Item in keyof AllCommands]: AllCommands[Item] extends (...args: any[]) => any

From b44aafa97ca13445845d25cb6492cc9732e75bea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Mon, 16 Nov 2020 11:07:06 +0100
Subject: [PATCH 14/16] rename set to configure

---
 docs/src/demos/Examples/CollaborativeEditing/index.vue  | 4 ++--
 docs/src/demos/Examples/Formatting/index.vue            | 2 +-
 docs/src/demos/Extensions/Collaboration/index.vue       | 2 +-
 docs/src/demos/Extensions/CollaborationCursor/index.vue | 4 ++--
 docs/src/demos/Extensions/Focus/index.vue               | 2 +-
 docs/src/demos/Nodes/Heading/index.vue                  | 2 +-
 docs/src/docPages/guide/custom-styling.md               | 4 ++--
 packages/core/src/Extension.ts                          | 6 +++---
 packages/core/src/MarkExtension.ts                      | 6 +++---
 packages/core/src/NodeExtension.ts                      | 6 +++---
 packages/starter-kit/src/index.ts                       | 6 +++---
 11 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/docs/src/demos/Examples/CollaborativeEditing/index.vue b/docs/src/demos/Examples/CollaborativeEditing/index.vue
index f1be445c..6566ba61 100644
--- a/docs/src/demos/Examples/CollaborativeEditing/index.vue
+++ b/docs/src/demos/Examples/CollaborativeEditing/index.vue
@@ -135,11 +135,11 @@ export default {
     this.editor = new Editor({
       extensions: [
         ...defaultExtensions(),
-        Collaboration.set({
+        Collaboration.configure({
           provider: this.provider,
           type: this.type,
         }),
-        CollaborationCursor.set({
+        CollaborationCursor.configure({
           provider: this.provider,
           name: this.name,
           color: this.color,
diff --git a/docs/src/demos/Examples/Formatting/index.vue b/docs/src/demos/Examples/Formatting/index.vue
index a42d1dbd..4d628f42 100644
--- a/docs/src/demos/Examples/Formatting/index.vue
+++ b/docs/src/demos/Examples/Formatting/index.vue
@@ -64,7 +64,7 @@ export default {
         Document,
         Paragraph,
         Text,
-        Heading.set({
+        Heading.configure({
           level: [1, 2, 3],
         }),
         Bold,
diff --git a/docs/src/demos/Extensions/Collaboration/index.vue b/docs/src/demos/Extensions/Collaboration/index.vue
index 73d8e929..14838608 100644
--- a/docs/src/demos/Extensions/Collaboration/index.vue
+++ b/docs/src/demos/Extensions/Collaboration/index.vue
@@ -40,7 +40,7 @@ export default {
         Document,
         Paragraph,
         Text,
-        Collaboration.set({
+        Collaboration.configure({
           provider: this.provider,
           type: this.type,
         }),
diff --git a/docs/src/demos/Extensions/CollaborationCursor/index.vue b/docs/src/demos/Extensions/CollaborationCursor/index.vue
index ed764a06..571d362a 100644
--- a/docs/src/demos/Extensions/CollaborationCursor/index.vue
+++ b/docs/src/demos/Extensions/CollaborationCursor/index.vue
@@ -41,11 +41,11 @@ export default {
         Document,
         Paragraph,
         Text,
-        Collaboration.set({
+        Collaboration.configure({
           provider: this.provider,
           type: this.type,
         }),
-        CollaborationCursor.set({
+        CollaborationCursor.configure({
           provider: this.provider,
           name: 'Cyndi Lauper',
           color: '#f783ac',
diff --git a/docs/src/demos/Extensions/Focus/index.vue b/docs/src/demos/Extensions/Focus/index.vue
index 7da2bc89..fcd1730a 100644
--- a/docs/src/demos/Extensions/Focus/index.vue
+++ b/docs/src/demos/Extensions/Focus/index.vue
@@ -31,7 +31,7 @@ export default {
         Document,
         Paragraph,
         Text,
-        Focus.set({
+        Focus.configure({
           className: 'has-focus',
           nested: true,
         }),
diff --git a/docs/src/demos/Nodes/Heading/index.vue b/docs/src/demos/Nodes/Heading/index.vue
index 2f8c474d..b8d47e8e 100644
--- a/docs/src/demos/Nodes/Heading/index.vue
+++ b/docs/src/demos/Nodes/Heading/index.vue
@@ -39,7 +39,7 @@ export default {
         Document,
         Paragraph,
         Text,
-        Heading.set({
+        Heading.configure({
           levels: [1, 2, 3],
         }),
       ],
diff --git a/docs/src/docPages/guide/custom-styling.md b/docs/src/docPages/guide/custom-styling.md
index ca5b91ec..168556c7 100644
--- a/docs/src/docPages/guide/custom-styling.md
+++ b/docs/src/docPages/guide/custom-styling.md
@@ -34,12 +34,12 @@ Most extensions allow you to add attributes to the rendered HTML through the `HT
 new Editor({
   extensions: [
     Document,
-    Paragraph.set({
+    Paragraph.configure({
       HTMLAttributes: {
         class: 'my-custom-paragraph',
       },
     }),
-    Heading.set({
+    Heading.configure({
       HTMLAttributes: {
         class: 'my-custom-heading',
       },
diff --git a/packages/core/src/Extension.ts b/packages/core/src/Extension.ts
index 9c4063a9..6cf271ed 100644
--- a/packages/core/src/Extension.ts
+++ b/packages/core/src/Extension.ts
@@ -90,16 +90,16 @@ export class Extension<Options = any, Commands = any> {
     return new Extension<O, C>(config)
   }
 
-  set(options: Partial<Options>) {
+  configure(options: Partial<Options>) {
     return Extension
       .create<Options, Commands>(this.config as ExtensionSpec<Options, Commands>)
-      .#set({
+      .#configure({
         ...this.config.defaultOptions,
         ...options,
       })
   }
 
-  #set = (options: Partial<Options>) => {
+  #configure = (options: Partial<Options>) => {
     this.options = {
       ...this.config.defaultOptions,
       ...options,
diff --git a/packages/core/src/MarkExtension.ts b/packages/core/src/MarkExtension.ts
index a934eb7c..66f64e80 100644
--- a/packages/core/src/MarkExtension.ts
+++ b/packages/core/src/MarkExtension.ts
@@ -140,16 +140,16 @@ export class MarkExtension<Options = any, Commands = {}> {
     return new MarkExtension<O, C>(config)
   }
 
-  set(options: Partial<Options>) {
+  configure(options: Partial<Options>) {
     return MarkExtension
       .create<Options, Commands>(this.config as MarkExtensionSpec<Options, Commands>)
-      .#set({
+      .#configure({
         ...this.config.defaultOptions,
         ...options,
       })
   }
 
-  #set = (options: Partial<Options>) => {
+  #configure = (options: Partial<Options>) => {
     this.options = {
       ...this.config.defaultOptions,
       ...options,
diff --git a/packages/core/src/NodeExtension.ts b/packages/core/src/NodeExtension.ts
index 84e9cf77..80aa9b40 100644
--- a/packages/core/src/NodeExtension.ts
+++ b/packages/core/src/NodeExtension.ts
@@ -192,16 +192,16 @@ export class NodeExtension<Options = any, Commands = {}> {
     return new NodeExtension<O, C>(config)
   }
 
-  set(options: Partial<Options>) {
+  configure(options: Partial<Options>) {
     return NodeExtension
       .create<Options, Commands>(this.config as NodeExtensionSpec<Options, Commands>)
-      .#set({
+      .#configure({
         ...this.config.defaultOptions,
         ...options,
       })
   }
 
-  #set = (options: Partial<Options>) => {
+  #configure = (options: Partial<Options>) => {
     this.options = {
       ...this.config.defaultOptions,
       ...options,
diff --git a/packages/starter-kit/src/index.ts b/packages/starter-kit/src/index.ts
index 26524cb1..89d6cd6f 100644
--- a/packages/starter-kit/src/index.ts
+++ b/packages/starter-kit/src/index.ts
@@ -26,14 +26,14 @@ export function defaultExtensions(options: {
     Dropcursor,
     Gapcursor,
     Document,
-    History.set(options?.history),
+    History.configure(options?.history),
     Paragraph,
     Text,
     Bold,
     Italic,
     Code,
-    CodeBlock.set(options?.codeBlock),
-    Heading.set(options?.heading),
+    CodeBlock.configure(options?.codeBlock),
+    Heading.configure(options?.heading),
     HardBreak,
     Strike,
     Blockquote,

From 8a7603edaf591d169d7b43a3ec5ae9d71abd9340 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Mon, 16 Nov 2020 11:19:43 +0100
Subject: [PATCH 15/16] replace NodeExtension with Node, replace MarkExtension
 with Mark

---
 docs/src/docPages/api/schema.md               | 38 +++++++++----------
 .../docPages/guide/build-custom-extensions.md | 10 ++---
 docs/src/docPages/overview/upgrade-guide.md   |  4 +-
 packages/core/src/Editor.ts                   | 12 +++---
 .../core/src/{MarkExtension.ts => Mark.ts}    | 15 +++++---
 .../core/src/{NodeExtension.ts => Node.ts}    | 15 +++++---
 packages/core/src/index.ts                    |  4 +-
 packages/core/src/types.ts                    | 10 ++---
 packages/core/src/utils/splitExtensions.ts    |  8 ++--
 packages/extension-blockquote/src/index.ts    |  4 +-
 packages/extension-bold/src/index.ts          |  4 +-
 packages/extension-bullet-list/src/index.ts   |  4 +-
 packages/extension-code-block/src/index.ts    |  4 +-
 packages/extension-code/src/index.ts          |  4 +-
 packages/extension-document/src/index.ts      |  4 +-
 packages/extension-hard-break/src/index.ts    |  4 +-
 packages/extension-heading/src/index.ts       |  4 +-
 packages/extension-highlight/src/index.ts     |  4 +-
 .../extension-horizontal-rule/src/index.ts    |  4 +-
 packages/extension-image/src/index.ts         |  4 +-
 packages/extension-italic/src/index.ts        |  4 +-
 packages/extension-link/src/index.ts          |  4 +-
 packages/extension-list-item/src/index.ts     |  4 +-
 packages/extension-ordered-list/src/index.ts  |  4 +-
 packages/extension-paragraph/src/index.ts     |  4 +-
 packages/extension-strike/src/index.ts        |  4 +-
 packages/extension-task-item/src/index.ts     |  4 +-
 packages/extension-task-list/src/index.ts     |  4 +-
 packages/extension-text-style/src/index.ts    |  4 +-
 packages/extension-text/src/index.ts          |  4 +-
 packages/extension-underline/src/index.ts     |  4 +-
 31 files changed, 105 insertions(+), 99 deletions(-)
 rename packages/core/src/{MarkExtension.ts => Mark.ts} (92%)
 rename packages/core/src/{NodeExtension.ts => Node.ts} (94%)

diff --git a/docs/src/docPages/api/schema.md b/docs/src/docPages/api/schema.md
index 1078119e..172bb851 100644
--- a/docs/src/docPages/api/schema.md
+++ b/docs/src/docPages/api/schema.md
@@ -38,15 +38,15 @@ In tiptap every node, mark and extension is living in its own file. This allows
 
 ```js
 // the tiptap schema API
-import { NodeExtension } from '@tiptap/core'
+import { Node } from '@tiptap/core'
 
-const Document = NodeExtension.create({
+const Document = Node.create({
   name: 'document',
   topNode: true,
   content: 'block+',
 })
 
-const Paragraph = NodeExtension.create({
+const Paragraph = Node.create({
   name: 'paragraph',
   group: 'block',
   content: 'inline*',
@@ -60,7 +60,7 @@ const Paragraph = NodeExtension.create({
   },
 })
 
-const Text = NodeExtension.create({
+const Text = Node.create({
   name: 'text',
   group: 'inline',
 })
@@ -79,7 +79,7 @@ Marks can be applied to specific parts of a node. That’s the case for **bold**
 The content attribute defines exactly what kind of content the node can have. ProseMirror is really strict with that. That means, content which doesn’t fit the schema is thrown away. It expects a name or group as a string. Here are a few examples:
 
 ```js
-NodeExtension.create({
+Node.create({
   // must have one ore more blocks
   content: 'block+',
 
@@ -99,7 +99,7 @@ NodeExtension.create({
 You can define which marks are allowed inside of a node with the `marks` setting of the schema. Add a one or more names or groups of marks, allow all or disallow all marks like this:
 
 ```js
-NodeExtension.create({
+Node.create({
   // allows only the 'bold' mark
   marks: 'bold',
 
@@ -118,7 +118,7 @@ NodeExtension.create({
 Add this node to a group of extensions, which can be referred to in the [content](#content) attribute of the schema.
 
 ```js
-NodeExtension.create({
+Node.create({
   // add to 'block' group
   group: 'block',
 
@@ -134,7 +134,7 @@ NodeExtension.create({
 Nodes can be rendered inline, too. When setting `inline: true` nodes are rendered in line with the text. That’s the case for mentions. The result is more like a mark, but with the functionality of a node. One difference is the resulting JSON document. Multiple marks are applied at once, inline nodes would result in a nested structure.
 
 ```js
-NodeExtension.create({
+Node.create({
   // renders nodes in line with the text, for example
   inline: true,
 })
@@ -144,7 +144,7 @@ NodeExtension.create({
 Nodes with `atom: true` aren’t directly editable and should be treated as a single unit. It’s not so likely to use that in a editor context, but this is how it would look like:
 
 ```js
-NodeExtension.create({
+Node.create({
   atom: true,
 })
 ```
@@ -153,7 +153,7 @@ NodeExtension.create({
 Besides the already visible text selection, there is an invisible node selection. If you want to make your nodes selectable, you can configure it like this:
 
 ```js
-NodeExtension.create({
+Node.create({
   selectable: true,
 })
 ```
@@ -162,7 +162,7 @@ NodeExtension.create({
 All nodes can be configured to be draggable (by default they aren’t) with this setting:
 
 ```js
-NodeExtension.create({
+Node.create({
   draggable: true,
 })
 ```
@@ -171,7 +171,7 @@ NodeExtension.create({
 Users expect code to behave very differently. For all kind of nodes containing code, you can set `code: true` to take this into account.
 
 ```js
-NodeExtension.create({
+Node.create({
   code: true,
 })
 ```
@@ -182,7 +182,7 @@ Nodes get dropped when their entire content is replaced (for example, when pasti
 Typically, that applies to [`Blockquote`](/api/node/blockquote), [`CodeBlock`](/api/node/code-block), [`Heading`](/api/node/heading), and [`ListItem`](/api/node/list-item).
 
 ```js
-NodeExtension.create({
+Node.create({
   defining: true,
 })
 ```
@@ -191,7 +191,7 @@ NodeExtension.create({
 For nodes that should fence the cursor for regular editing operations like backspacing, for example a TableCell, set `isolating: true`.
 
 ```js
-NodeExtension.create({
+Node.create({
   isolating: true,
 })
 ```
@@ -201,7 +201,7 @@ NodeExtension.create({
 If you don’t want the mark to be active when the cursor is at its end, set inclusive to `false`. For example, that’s how it’s configured for [`Link`](/api/marks/link) marks:
 
 ```js
-MarkExtension.create({
+Mark.create({
   inclusive: false,
 })
 ```
@@ -210,7 +210,7 @@ MarkExtension.create({
 By default all nodes can be applied at the same time. With the excludes attribute you can define which marks must not coexist with the mark. For example, the inline code mark excludes any other mark (bold, italic, and all others).
 
 ```js
-MarkExtension.create({
+Mark.create({
   // must not coexist with the bold mark
   excludes: 'bold'
   // exclude any other mark
@@ -222,7 +222,7 @@ MarkExtension.create({
 Add this mark to a group of extensions, which can be referred to in the content attribute of the schema.
 
 ```js
-MarkExtension.create({
+Mark.create({
   // add this mark to the 'basic' group
   group: 'basic',
   // add this mark to the 'basic' and the 'foobar' group
@@ -234,7 +234,7 @@ MarkExtension.create({
 Users expect code to behave very differently. For all kind of marks containing code, you can set `code: true` to take this into account.
 
 ```js
-MarkExtension.create({
+Mark.create({
   code: true,
 })
 ```
@@ -243,7 +243,7 @@ MarkExtension.create({
 By default marks can span multiple nodes when rendered as HTML. Set `spanning: false` to indicate that a mark must not span multiple nodes.
 
 ```js
-MarkExtension.create({
+Mark.create({
   spanning: false,
 })
 ```
diff --git a/docs/src/docPages/guide/build-custom-extensions.md b/docs/src/docPages/guide/build-custom-extensions.md
index 1ad920d0..34acf50a 100644
--- a/docs/src/docPages/guide/build-custom-extensions.md
+++ b/docs/src/docPages/guide/build-custom-extensions.md
@@ -386,24 +386,24 @@ const CustomLink = Link.extend({
 There is a whole lot to learn about node views, so head over to the [dedicated section in our guide about node views](/guide/advanced-node-views) for more information. If you’re looking for a real-world example, look at the source code of the [`TaskItem`](/api/nodes/task-item) node. This is using a node view to render the checkboxes.
 
 ## Start from scratch
-You can also build your own extensions from scratch with the `NodeExtension`, `MarkExtension`, and `Extension` classes. Pass an option with your code and configuration.
+You can also build your own extensions from scratch with the `Node`, `Mark`, and `Extension` classes. Pass an option with your code and configuration.
 
 And if everything is working fine, don’t forget to [share it with the community](https://github.com/ueberdosis/tiptap-next/issues/new/choose).
 
 ### Create a node
 ```js
-import { NodeExtension } from '@tiptap/core'
+import { Node } from '@tiptap/core'
 
-const CustomNode = NodeExtension.create({
+const CustomNode = Node.create({
   // Your code goes here.
 })
 ```
 
 ### Create a mark
 ```js
-import { MarkExtension } from '@tiptap/core'
+import { Mark } from '@tiptap/core'
 
-const CustomMark = MarkExtension.create({
+const CustomMark = Mark.create({
   // Your code goes here.
 })
 ```
diff --git a/docs/src/docPages/overview/upgrade-guide.md b/docs/src/docPages/overview/upgrade-guide.md
index 8b0a2972..b6826e57 100644
--- a/docs/src/docPages/overview/upgrade-guide.md
+++ b/docs/src/docPages/overview/upgrade-guide.md
@@ -44,9 +44,9 @@ new Editor({
 In case you’ve built some custom extensions for your project, you’re required to rewrite them to fit the new API. No worries, you can keep a lot of your work though. The `schema`, `commands`, `keys`, `inputRules` and `pasteRules` all work like they did before. It’s just different how you register them.
 
 ```js
-import { NodeExtension } from '@tiptap/core'
+import { Node } from '@tiptap/core'
 
-const CustomExtension = NodeExtension.create({
+const CustomExtension = Node.create({
   name: 'custom_extension'
   defaultOptions: {
     …
diff --git a/packages/core/src/Editor.ts b/packages/core/src/Editor.ts
index 7b9c9df2..f22cd5d1 100644
--- a/packages/core/src/Editor.ts
+++ b/packages/core/src/Editor.ts
@@ -15,8 +15,8 @@ import CommandManager from './CommandManager'
 import ExtensionManager from './ExtensionManager'
 import EventEmitter from './EventEmitter'
 import { Extension } from './Extension'
-import { NodeExtension } from './NodeExtension'
-import { MarkExtension } from './MarkExtension'
+import { Node } from './Node'
+import { Mark } from './Mark'
 import { Extensions, UnionToIntersection } from './types'
 import * as extensions from './extensions'
 import style from './style'
@@ -43,10 +43,10 @@ export interface AllExtensions {}
 export type UnfilteredCommands = {
   [Item in keyof AllExtensions]: AllExtensions[Item] extends Extension<any, infer ExtensionCommands>
     ? ExtensionCommands
-    : AllExtensions[Item] extends NodeExtension<any, infer NodeExtensionCommands>
-      ? NodeExtensionCommands
-      : AllExtensions[Item] extends MarkExtension<any, infer MarkExtensionCommands>
-        ? MarkExtensionCommands
+    : AllExtensions[Item] extends Node<any, infer NodeCommands>
+      ? NodeCommands
+      : AllExtensions[Item] extends Mark<any, infer MarkCommands>
+        ? MarkCommands
         : never
 }
 
diff --git a/packages/core/src/MarkExtension.ts b/packages/core/src/Mark.ts
similarity index 92%
rename from packages/core/src/MarkExtension.ts
rename to packages/core/src/Mark.ts
index 66f64e80..34617220 100644
--- a/packages/core/src/MarkExtension.ts
+++ b/packages/core/src/Mark.ts
@@ -1,5 +1,8 @@
 import {
-  DOMOutputSpec, MarkSpec, Mark, MarkType,
+  DOMOutputSpec,
+  MarkSpec,
+  Mark as ProseMirrorMark,
+  MarkType,
 } from 'prosemirror-model'
 import { Plugin } from 'prosemirror-state'
 import { ExtensionSpec } from './Extension'
@@ -44,7 +47,7 @@ export interface MarkExtensionSpec<Options = any, Commands = {}> extends Overwri
       options: Options,
     },
     props: {
-      mark: Mark,
+      mark: ProseMirrorMark,
       HTMLAttributes: { [key: string]: any },
     }
   ) => DOMOutputSpec) | null,
@@ -106,7 +109,7 @@ export interface MarkExtensionSpec<Options = any, Commands = {}> extends Overwri
   }) => Plugin[],
 }> {}
 
-export class MarkExtension<Options = any, Commands = {}> {
+export class Mark<Options = any, Commands = {}> {
   config: Required<MarkExtensionSpec> = {
     name: 'mark',
     defaultOptions: {},
@@ -137,11 +140,11 @@ export class MarkExtension<Options = any, Commands = {}> {
   }
 
   static create<O, C>(config: MarkExtensionSpec<O, C>) {
-    return new MarkExtension<O, C>(config)
+    return new Mark<O, C>(config)
   }
 
   configure(options: Partial<Options>) {
-    return MarkExtension
+    return Mark
       .create<Options, Commands>(this.config as MarkExtensionSpec<Options, Commands>)
       .#configure({
         ...this.config.defaultOptions,
@@ -159,7 +162,7 @@ export class MarkExtension<Options = any, Commands = {}> {
   }
 
   extend<ExtendedOptions = Options, ExtendedCommands = Commands>(extendedConfig: Partial<MarkExtensionSpec<ExtendedOptions, ExtendedCommands>>) {
-    return new MarkExtension<ExtendedOptions, ExtendedCommands>({
+    return new Mark<ExtendedOptions, ExtendedCommands>({
       ...this.config,
       ...extendedConfig,
     } as MarkExtensionSpec<ExtendedOptions, ExtendedCommands>)
diff --git a/packages/core/src/NodeExtension.ts b/packages/core/src/Node.ts
similarity index 94%
rename from packages/core/src/NodeExtension.ts
rename to packages/core/src/Node.ts
index 80aa9b40..8252840c 100644
--- a/packages/core/src/NodeExtension.ts
+++ b/packages/core/src/Node.ts
@@ -1,5 +1,8 @@
 import {
-  DOMOutputSpec, NodeSpec, Node, NodeType,
+  DOMOutputSpec,
+  NodeSpec,
+  Node as ProseMirrorNode,
+  NodeType,
 } from 'prosemirror-model'
 import { Plugin } from 'prosemirror-state'
 import { ExtensionSpec } from './Extension'
@@ -79,7 +82,7 @@ export interface NodeExtensionSpec<Options = any, Commands = {}> extends Overwri
       options: Options,
     },
     props: {
-      node: Node,
+      node: ProseMirrorNode,
       HTMLAttributes: { [key: string]: any },
     }
   ) => DOMOutputSpec) | null,
@@ -150,7 +153,7 @@ export interface NodeExtensionSpec<Options = any, Commands = {}> extends Overwri
   }) => NodeViewRenderer) | null,
 }> {}
 
-export class NodeExtension<Options = any, Commands = {}> {
+export class Node<Options = any, Commands = {}> {
   config: Required<NodeExtensionSpec> = {
     name: 'node',
     defaultOptions: {},
@@ -189,11 +192,11 @@ export class NodeExtension<Options = any, Commands = {}> {
   }
 
   static create<O, C>(config: NodeExtensionSpec<O, C>) {
-    return new NodeExtension<O, C>(config)
+    return new Node<O, C>(config)
   }
 
   configure(options: Partial<Options>) {
-    return NodeExtension
+    return Node
       .create<Options, Commands>(this.config as NodeExtensionSpec<Options, Commands>)
       .#configure({
         ...this.config.defaultOptions,
@@ -211,7 +214,7 @@ export class NodeExtension<Options = any, Commands = {}> {
   }
 
   extend<ExtendedOptions = Options, ExtendedCommands = Commands>(extendedConfig: Partial<NodeExtensionSpec<ExtendedOptions, ExtendedCommands>>) {
-    return new NodeExtension<ExtendedOptions, ExtendedCommands>({
+    return new Node<ExtendedOptions, ExtendedCommands>({
       ...this.config,
       ...extendedConfig,
     } as NodeExtensionSpec<ExtendedOptions, ExtendedCommands>)
diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts
index 76199f78..63dee913 100644
--- a/packages/core/src/index.ts
+++ b/packages/core/src/index.ts
@@ -6,8 +6,8 @@ export {
 } from './Editor'
 
 export * from './Extension'
-export * from './NodeExtension'
-export * from './MarkExtension'
+export * from './Node'
+export * from './Mark'
 export * from './types'
 
 export { default as nodeInputRule } from './inputRules/nodeInputRule'
diff --git a/packages/core/src/types.ts b/packages/core/src/types.ts
index fd0065f0..d45214fb 100644
--- a/packages/core/src/types.ts
+++ b/packages/core/src/types.ts
@@ -1,11 +1,11 @@
-import { Node } from 'prosemirror-model'
+import { Node as ProseMirrorNode } from 'prosemirror-model'
 import { Decoration, NodeView } from 'prosemirror-view'
 import { Extension } from './Extension'
-import { NodeExtension } from './NodeExtension'
-import { MarkExtension } from './MarkExtension'
+import { Node } from './Node'
+import { Mark } from './Mark'
 import { Editor } from './Editor'
 
-export type Extensions = (Extension | NodeExtension | MarkExtension)[]
+export type Extensions = (Extension | Node | Mark)[]
 
 export type Attribute = {
   default: any,
@@ -46,7 +46,7 @@ export type AnyObject = {
 
 export type NodeViewRendererProps = {
   editor: Editor,
-  node: Node,
+  node: ProseMirrorNode,
   getPos: (() => number) | boolean,
   decorations: Decoration[],
   HTMLAttributes: { [key: string]: any },
diff --git a/packages/core/src/utils/splitExtensions.ts b/packages/core/src/utils/splitExtensions.ts
index 1b69ab7e..97c6c9fe 100644
--- a/packages/core/src/utils/splitExtensions.ts
+++ b/packages/core/src/utils/splitExtensions.ts
@@ -1,12 +1,12 @@
 import { Extensions } from '../types'
 import { Extension } from '../Extension'
-import { NodeExtension } from '../NodeExtension'
-import { MarkExtension } from '../MarkExtension'
+import { Node } from '../Node'
+import { Mark } from '../Mark'
 
 export default function splitExtensions(extensions: Extensions) {
   const baseExtensions = extensions.filter(extension => extension instanceof Extension) as Extension[]
-  const nodeExtensions = extensions.filter(extension => extension instanceof NodeExtension) as NodeExtension[]
-  const markExtensions = extensions.filter(extension => extension instanceof MarkExtension) as MarkExtension[]
+  const nodeExtensions = extensions.filter(extension => extension instanceof Node) as Node[]
+  const markExtensions = extensions.filter(extension => extension instanceof Mark) as Mark[]
 
   return {
     baseExtensions,
diff --git a/packages/extension-blockquote/src/index.ts b/packages/extension-blockquote/src/index.ts
index 99f4c67e..d0d3f318 100644
--- a/packages/extension-blockquote/src/index.ts
+++ b/packages/extension-blockquote/src/index.ts
@@ -1,4 +1,4 @@
-import { Command, NodeExtension } from '@tiptap/core'
+import { Command, Node } from '@tiptap/core'
 import { wrappingInputRule } from 'prosemirror-inputrules'
 
 export interface BlockquoteOptions {
@@ -9,7 +9,7 @@ export interface BlockquoteOptions {
 
 export const inputRegex = /^\s*>\s$/gm
 
-const Blockquote = NodeExtension.create({
+const Blockquote = Node.create({
   name: 'blockquote',
 
   defaultOptions: <BlockquoteOptions>{
diff --git a/packages/extension-bold/src/index.ts b/packages/extension-bold/src/index.ts
index 4c917278..64ff675e 100644
--- a/packages/extension-bold/src/index.ts
+++ b/packages/extension-bold/src/index.ts
@@ -1,5 +1,5 @@
 import {
-  Command, MarkExtension, markInputRule, markPasteRule,
+  Command, Mark, markInputRule, markPasteRule,
 } from '@tiptap/core'
 
 export interface BoldOptions {
@@ -13,7 +13,7 @@ export const starPasteRegex = /(?:^|\s)((?:\*\*)((?:[^*]+))(?:\*\*))/gm
 export const underscoreInputRegex = /(?:^|\s)((?:__)((?:[^__]+))(?:__))$/gm
 export const underscorePasteRegex = /(?:^|\s)((?:__)((?:[^__]+))(?:__))/gm
 
-const Bold = MarkExtension.create({
+const Bold = Mark.create({
   name: 'bold',
 
   defaultOptions: <BoldOptions>{
diff --git a/packages/extension-bullet-list/src/index.ts b/packages/extension-bullet-list/src/index.ts
index dce59806..3fa2338b 100644
--- a/packages/extension-bullet-list/src/index.ts
+++ b/packages/extension-bullet-list/src/index.ts
@@ -1,4 +1,4 @@
-import { Command, NodeExtension } from '@tiptap/core'
+import { Command, Node } from '@tiptap/core'
 import { wrappingInputRule } from 'prosemirror-inputrules'
 
 export interface BulletListOptions {
@@ -9,7 +9,7 @@ export interface BulletListOptions {
 
 export const inputRegex = /^\s*([-+*])\s$/
 
-const BulletList = NodeExtension.create({
+const BulletList = Node.create({
   name: 'bulletList',
 
   defaultOptions: <BulletListOptions>{
diff --git a/packages/extension-code-block/src/index.ts b/packages/extension-code-block/src/index.ts
index bcc50552..2d697e9d 100644
--- a/packages/extension-code-block/src/index.ts
+++ b/packages/extension-code-block/src/index.ts
@@ -1,4 +1,4 @@
-import { Command, NodeExtension } from '@tiptap/core'
+import { Command, Node } from '@tiptap/core'
 import { textblockTypeInputRule } from 'prosemirror-inputrules'
 
 export interface CodeBlockOptions {
@@ -11,7 +11,7 @@ export interface CodeBlockOptions {
 export const backtickInputRegex = /^```(?<language>[a-z]*)? $/
 export const tildeInputRegex = /^~~~(?<language>[a-z]*)? $/
 
-const CodeBlock = NodeExtension.create({
+const CodeBlock = Node.create({
   name: 'codeBlock',
 
   defaultOptions: <CodeBlockOptions>{
diff --git a/packages/extension-code/src/index.ts b/packages/extension-code/src/index.ts
index 2998e274..5eb5909e 100644
--- a/packages/extension-code/src/index.ts
+++ b/packages/extension-code/src/index.ts
@@ -1,6 +1,6 @@
 import {
   Command,
-  MarkExtension,
+  Mark,
   markInputRule,
   markPasteRule,
 } from '@tiptap/core'
@@ -14,7 +14,7 @@ export interface CodeOptions {
 export const inputRegex = /(?:^|\s)((?:`)((?:[^`]+))(?:`))$/gm
 export const pasteRegex = /(?:^|\s)((?:`)((?:[^`]+))(?:`))/gm
 
-const Code = MarkExtension.create({
+const Code = Mark.create({
   name: 'code',
 
   defaultOptions: <CodeOptions>{
diff --git a/packages/extension-document/src/index.ts b/packages/extension-document/src/index.ts
index 6816a860..5c9b4796 100644
--- a/packages/extension-document/src/index.ts
+++ b/packages/extension-document/src/index.ts
@@ -1,6 +1,6 @@
-import { NodeExtension } from '@tiptap/core'
+import { Node } from '@tiptap/core'
 
-const Document = NodeExtension.create({
+const Document = Node.create({
   name: 'document',
   topNode: true,
   content: 'block+',
diff --git a/packages/extension-hard-break/src/index.ts b/packages/extension-hard-break/src/index.ts
index 5d448e9b..677b0941 100644
--- a/packages/extension-hard-break/src/index.ts
+++ b/packages/extension-hard-break/src/index.ts
@@ -1,7 +1,7 @@
-import { Command, NodeExtension } from '@tiptap/core'
+import { Command, Node } from '@tiptap/core'
 import { exitCode } from 'prosemirror-commands'
 
-const HardBreak = NodeExtension.create({
+const HardBreak = Node.create({
   name: 'hardBreak',
 
   inline: true,
diff --git a/packages/extension-heading/src/index.ts b/packages/extension-heading/src/index.ts
index e7678dc7..c02b8a81 100644
--- a/packages/extension-heading/src/index.ts
+++ b/packages/extension-heading/src/index.ts
@@ -1,4 +1,4 @@
-import { Command, NodeExtension } from '@tiptap/core'
+import { Command, Node } from '@tiptap/core'
 import { textblockTypeInputRule } from 'prosemirror-inputrules'
 
 type Level = 1 | 2 | 3 | 4 | 5 | 6
@@ -10,7 +10,7 @@ export interface HeadingOptions {
   },
 }
 
-const Heading = NodeExtension.create({
+const Heading = Node.create({
   name: 'heading',
 
   defaultOptions: <HeadingOptions>{
diff --git a/packages/extension-highlight/src/index.ts b/packages/extension-highlight/src/index.ts
index c8a662b6..c3298aa6 100644
--- a/packages/extension-highlight/src/index.ts
+++ b/packages/extension-highlight/src/index.ts
@@ -1,6 +1,6 @@
 import {
   Command,
-  MarkExtension,
+  Mark,
   markInputRule,
   markPasteRule,
 } from '@tiptap/core'
@@ -14,7 +14,7 @@ export interface HighlightOptions {
 export const inputRegex = /(?:^|\s)((?:==)((?:[^~]+))(?:==))$/gm
 export const pasteRegex = /(?:^|\s)((?:==)((?:[^~]+))(?:==))/gm
 
-const Highlight = MarkExtension.create({
+const Highlight = Mark.create({
   name: 'highlight',
 
   defaultOptions: <HighlightOptions>{
diff --git a/packages/extension-horizontal-rule/src/index.ts b/packages/extension-horizontal-rule/src/index.ts
index 5091c2e6..ebab3e3b 100644
--- a/packages/extension-horizontal-rule/src/index.ts
+++ b/packages/extension-horizontal-rule/src/index.ts
@@ -1,4 +1,4 @@
-import { Command, NodeExtension, nodeInputRule } from '@tiptap/core'
+import { Command, Node, nodeInputRule } from '@tiptap/core'
 
 export interface HorizontalRuleOptions {
   HTMLAttributes: {
@@ -6,7 +6,7 @@ export interface HorizontalRuleOptions {
   },
 }
 
-const HorizontalRule = NodeExtension.create({
+const HorizontalRule = Node.create({
   name: 'horizontalRule',
 
   defaultOptions: <HorizontalRuleOptions>{
diff --git a/packages/extension-image/src/index.ts b/packages/extension-image/src/index.ts
index 50dbd561..7eeb831b 100644
--- a/packages/extension-image/src/index.ts
+++ b/packages/extension-image/src/index.ts
@@ -1,4 +1,4 @@
-import { Command, NodeExtension, nodeInputRule } from '@tiptap/core'
+import { Command, Node, nodeInputRule } from '@tiptap/core'
 
 export interface ImageOptions {
   inline: boolean,
@@ -9,7 +9,7 @@ export interface ImageOptions {
 
 export const inputRegex = /!\[(.+|:?)]\((\S+)(?:(?:\s+)["'](\S+)["'])?\)/
 
-const Image = NodeExtension.create({
+const Image = Node.create({
   name: 'image',
 
   defaultOptions: <ImageOptions>{
diff --git a/packages/extension-italic/src/index.ts b/packages/extension-italic/src/index.ts
index f493761a..9843f65e 100644
--- a/packages/extension-italic/src/index.ts
+++ b/packages/extension-italic/src/index.ts
@@ -1,6 +1,6 @@
 import {
   Command,
-  MarkExtension,
+  Mark,
   markInputRule,
   markPasteRule,
 } from '@tiptap/core'
@@ -16,7 +16,7 @@ export const starPasteRegex = /(?:^|\s)((?:\*)((?:[^*]+))(?:\*))/gm
 export const underscoreInputRegex = /(?:^|\s)((?:_)((?:[^_]+))(?:_))$/gm
 export const underscorePasteRegex = /(?:^|\s)((?:_)((?:[^_]+))(?:_))/gm
 
-const Italic = MarkExtension.create({
+const Italic = Mark.create({
   name: 'italic',
 
   defaultOptions: <ItalicOptions>{
diff --git a/packages/extension-link/src/index.ts b/packages/extension-link/src/index.ts
index b931661f..3570b998 100644
--- a/packages/extension-link/src/index.ts
+++ b/packages/extension-link/src/index.ts
@@ -1,4 +1,4 @@
-import { Command, MarkExtension, markPasteRule } from '@tiptap/core'
+import { Command, Mark, markPasteRule } from '@tiptap/core'
 import { Plugin, PluginKey } from 'prosemirror-state'
 
 export interface LinkOptions {
@@ -10,7 +10,7 @@ export interface LinkOptions {
 
 export const pasteRegex = /https?:\/\/(?:www\.)?[-a-zA-Z0-9@:%._+~#=]{1,256}\.[a-zA-Z]{2,}\b(?:[-a-zA-Z0-9@:%._+~#=?!&/()]*)/gi
 
-const Link = MarkExtension.create({
+const Link = Mark.create({
   name: 'link',
 
   inclusive: false,
diff --git a/packages/extension-list-item/src/index.ts b/packages/extension-list-item/src/index.ts
index 76f49785..b0d88118 100644
--- a/packages/extension-list-item/src/index.ts
+++ b/packages/extension-list-item/src/index.ts
@@ -1,4 +1,4 @@
-import { NodeExtension } from '@tiptap/core'
+import { Node } from '@tiptap/core'
 
 export interface ListItemOptions {
   HTMLAttributes: {
@@ -6,7 +6,7 @@ export interface ListItemOptions {
   },
 }
 
-const ListItem = NodeExtension.create({
+const ListItem = Node.create({
   name: 'listItem',
 
   defaultOptions: <ListItemOptions>{
diff --git a/packages/extension-ordered-list/src/index.ts b/packages/extension-ordered-list/src/index.ts
index 247b0930..d20b361a 100644
--- a/packages/extension-ordered-list/src/index.ts
+++ b/packages/extension-ordered-list/src/index.ts
@@ -1,4 +1,4 @@
-import { Command, NodeExtension } from '@tiptap/core'
+import { Command, Node } from '@tiptap/core'
 import { wrappingInputRule } from 'prosemirror-inputrules'
 
 export interface OrderedListOptions {
@@ -9,7 +9,7 @@ export interface OrderedListOptions {
 
 export const inputRegex = /^(\d+)\.\s$/
 
-const OrderedList = NodeExtension.create({
+const OrderedList = Node.create({
   name: 'orderedList',
 
   defaultOptions: <OrderedListOptions>{
diff --git a/packages/extension-paragraph/src/index.ts b/packages/extension-paragraph/src/index.ts
index 9f2dbcef..961d08eb 100644
--- a/packages/extension-paragraph/src/index.ts
+++ b/packages/extension-paragraph/src/index.ts
@@ -1,4 +1,4 @@
-import { Command, NodeExtension } from '@tiptap/core'
+import { Command, Node } from '@tiptap/core'
 
 export interface ParagraphOptions {
   HTMLAttributes: {
@@ -6,7 +6,7 @@ export interface ParagraphOptions {
   },
 }
 
-const Paragraph = NodeExtension.create({
+const Paragraph = Node.create({
   name: 'paragraph',
 
   defaultOptions: <ParagraphOptions>{
diff --git a/packages/extension-strike/src/index.ts b/packages/extension-strike/src/index.ts
index bd6f1914..197e949e 100644
--- a/packages/extension-strike/src/index.ts
+++ b/packages/extension-strike/src/index.ts
@@ -1,6 +1,6 @@
 import {
   Command,
-  MarkExtension,
+  Mark,
   markInputRule,
   markPasteRule,
 } from '@tiptap/core'
@@ -14,7 +14,7 @@ export interface StrikeOptions {
 export const inputRegex = /(?:^|\s)((?:~~)((?:[^~]+))(?:~~))$/gm
 export const pasteRegex = /(?:^|\s)((?:~~)((?:[^~]+))(?:~~))/gm
 
-const Strike = MarkExtension.create({
+const Strike = Mark.create({
   name: 'strike',
 
   defaultOptions: <StrikeOptions>{
diff --git a/packages/extension-task-item/src/index.ts b/packages/extension-task-item/src/index.ts
index b6ea4cfd..ce7c0ab3 100644
--- a/packages/extension-task-item/src/index.ts
+++ b/packages/extension-task-item/src/index.ts
@@ -1,4 +1,4 @@
-import { NodeExtension, mergeAttributes } from '@tiptap/core'
+import { Node, mergeAttributes } from '@tiptap/core'
 import { wrappingInputRule } from 'prosemirror-inputrules'
 
 export interface TaskItemOptions {
@@ -10,7 +10,7 @@ export interface TaskItemOptions {
 
 export const inputRegex = /^\s*(\[([ |x])\])\s$/
 
-const TaskItem = NodeExtension.create({
+const TaskItem = Node.create({
   name: 'taskItem',
 
   defaultOptions: <TaskItemOptions>{
diff --git a/packages/extension-task-list/src/index.ts b/packages/extension-task-list/src/index.ts
index 0a5d0f96..554cf283 100644
--- a/packages/extension-task-list/src/index.ts
+++ b/packages/extension-task-list/src/index.ts
@@ -1,4 +1,4 @@
-import { Command, NodeExtension, mergeAttributes } from '@tiptap/core'
+import { Command, Node, mergeAttributes } from '@tiptap/core'
 
 export interface TaskListOptions {
   HTMLAttributes: {
@@ -6,7 +6,7 @@ export interface TaskListOptions {
   },
 }
 
-const TaskList = NodeExtension.create({
+const TaskList = Node.create({
   name: 'taskList',
 
   defaultOptions: <TaskListOptions>{
diff --git a/packages/extension-text-style/src/index.ts b/packages/extension-text-style/src/index.ts
index fa0633e2..bed66e32 100644
--- a/packages/extension-text-style/src/index.ts
+++ b/packages/extension-text-style/src/index.ts
@@ -1,6 +1,6 @@
-import { Command, MarkExtension, getMarkAttrs } from '@tiptap/core'
+import { Command, Mark, getMarkAttrs } from '@tiptap/core'
 
-const TextStyle = MarkExtension.create({
+const TextStyle = Mark.create({
   name: 'textStyle',
 
   parseHTML() {
diff --git a/packages/extension-text/src/index.ts b/packages/extension-text/src/index.ts
index d0a6029a..b6bea78d 100644
--- a/packages/extension-text/src/index.ts
+++ b/packages/extension-text/src/index.ts
@@ -1,6 +1,6 @@
-import { NodeExtension } from '@tiptap/core'
+import { Node } from '@tiptap/core'
 
-const Text = NodeExtension.create({
+const Text = Node.create({
   name: 'text',
   group: 'inline',
 })
diff --git a/packages/extension-underline/src/index.ts b/packages/extension-underline/src/index.ts
index 7ea37688..0f9cb39c 100644
--- a/packages/extension-underline/src/index.ts
+++ b/packages/extension-underline/src/index.ts
@@ -1,4 +1,4 @@
-import { Command, MarkExtension } from '@tiptap/core'
+import { Command, Mark } from '@tiptap/core'
 
 export interface UnderlineOptions {
   HTMLAttributes: {
@@ -6,7 +6,7 @@ export interface UnderlineOptions {
   },
 }
 
-const Underline = MarkExtension.create({
+const Underline = Mark.create({
   name: 'underline',
 
   defaultOptions: <UnderlineOptions>{

From e6bff7a4cdb557d015338dff8944fc1d966ad873 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Mon, 16 Nov 2020 11:21:54 +0100
Subject: [PATCH 16/16] rename

---
 packages/core/src/Extension.ts | 14 +++++++-------
 packages/core/src/Mark.ts      | 16 ++++++++--------
 packages/core/src/Node.ts      | 16 ++++++++--------
 3 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/packages/core/src/Extension.ts b/packages/core/src/Extension.ts
index 6cf271ed..4061ec2a 100644
--- a/packages/core/src/Extension.ts
+++ b/packages/core/src/Extension.ts
@@ -2,7 +2,7 @@ import { Plugin } from 'prosemirror-state'
 import { Editor } from './Editor'
 import { GlobalAttributes } from './types'
 
-export interface ExtensionSpec<Options = any, Commands = {}> {
+export interface ExtensionConfig<Options = any, Commands = {}> {
   /**
    * Name
    */
@@ -64,7 +64,7 @@ export interface ExtensionSpec<Options = any, Commands = {}> {
 }
 
 export class Extension<Options = any, Commands = any> {
-  config: Required<ExtensionSpec> = {
+  config: Required<ExtensionConfig> = {
     name: 'extension',
     defaultOptions: {},
     addGlobalAttributes: () => [],
@@ -77,7 +77,7 @@ export class Extension<Options = any, Commands = any> {
 
   options!: Options
 
-  constructor(config: ExtensionSpec<Options, Commands>) {
+  constructor(config: ExtensionConfig<Options, Commands>) {
     this.config = {
       ...this.config,
       ...config,
@@ -86,13 +86,13 @@ export class Extension<Options = any, Commands = any> {
     this.options = this.config.defaultOptions
   }
 
-  static create<O, C>(config: ExtensionSpec<O, C>) {
+  static create<O, C>(config: ExtensionConfig<O, C>) {
     return new Extension<O, C>(config)
   }
 
   configure(options: Partial<Options>) {
     return Extension
-      .create<Options, Commands>(this.config as ExtensionSpec<Options, Commands>)
+      .create<Options, Commands>(this.config as ExtensionConfig<Options, Commands>)
       .#configure({
         ...this.config.defaultOptions,
         ...options,
@@ -108,10 +108,10 @@ export class Extension<Options = any, Commands = any> {
     return this
   }
 
-  extend<ExtendedOptions = Options, ExtendedCommands = Commands>(extendedConfig: Partial<ExtensionSpec<ExtendedOptions, ExtendedCommands>>) {
+  extend<ExtendedOptions = Options, ExtendedCommands = Commands>(extendedConfig: Partial<ExtensionConfig<ExtendedOptions, ExtendedCommands>>) {
     return new Extension<ExtendedOptions, ExtendedCommands>({
       ...this.config,
       ...extendedConfig,
-    } as ExtensionSpec<ExtendedOptions, ExtendedCommands>)
+    } as ExtensionConfig<ExtendedOptions, ExtendedCommands>)
   }
 }
diff --git a/packages/core/src/Mark.ts b/packages/core/src/Mark.ts
index 34617220..c5d64fc9 100644
--- a/packages/core/src/Mark.ts
+++ b/packages/core/src/Mark.ts
@@ -5,11 +5,11 @@ import {
   MarkType,
 } from 'prosemirror-model'
 import { Plugin } from 'prosemirror-state'
-import { ExtensionSpec } from './Extension'
+import { ExtensionConfig } from './Extension'
 import { Attributes, Overwrite } from './types'
 import { Editor } from './Editor'
 
-export interface MarkExtensionSpec<Options = any, Commands = {}> extends Overwrite<ExtensionSpec<Options, Commands>, {
+export interface MarkConfig<Options = any, Commands = {}> extends Overwrite<ExtensionConfig<Options, Commands>, {
   /**
    * Inclusive
    */
@@ -110,7 +110,7 @@ export interface MarkExtensionSpec<Options = any, Commands = {}> extends Overwri
 }> {}
 
 export class Mark<Options = any, Commands = {}> {
-  config: Required<MarkExtensionSpec> = {
+  config: Required<MarkConfig> = {
     name: 'mark',
     defaultOptions: {},
     addGlobalAttributes: () => [],
@@ -130,7 +130,7 @@ export class Mark<Options = any, Commands = {}> {
 
   options!: Options
 
-  constructor(config: MarkExtensionSpec<Options, Commands>) {
+  constructor(config: MarkConfig<Options, Commands>) {
     this.config = {
       ...this.config,
       ...config,
@@ -139,13 +139,13 @@ export class Mark<Options = any, Commands = {}> {
     this.options = this.config.defaultOptions
   }
 
-  static create<O, C>(config: MarkExtensionSpec<O, C>) {
+  static create<O, C>(config: MarkConfig<O, C>) {
     return new Mark<O, C>(config)
   }
 
   configure(options: Partial<Options>) {
     return Mark
-      .create<Options, Commands>(this.config as MarkExtensionSpec<Options, Commands>)
+      .create<Options, Commands>(this.config as MarkConfig<Options, Commands>)
       .#configure({
         ...this.config.defaultOptions,
         ...options,
@@ -161,10 +161,10 @@ export class Mark<Options = any, Commands = {}> {
     return this
   }
 
-  extend<ExtendedOptions = Options, ExtendedCommands = Commands>(extendedConfig: Partial<MarkExtensionSpec<ExtendedOptions, ExtendedCommands>>) {
+  extend<ExtendedOptions = Options, ExtendedCommands = Commands>(extendedConfig: Partial<MarkConfig<ExtendedOptions, ExtendedCommands>>) {
     return new Mark<ExtendedOptions, ExtendedCommands>({
       ...this.config,
       ...extendedConfig,
-    } as MarkExtensionSpec<ExtendedOptions, ExtendedCommands>)
+    } as MarkConfig<ExtendedOptions, ExtendedCommands>)
   }
 }
diff --git a/packages/core/src/Node.ts b/packages/core/src/Node.ts
index 8252840c..7b4517e3 100644
--- a/packages/core/src/Node.ts
+++ b/packages/core/src/Node.ts
@@ -5,11 +5,11 @@ import {
   NodeType,
 } from 'prosemirror-model'
 import { Plugin } from 'prosemirror-state'
-import { ExtensionSpec } from './Extension'
+import { ExtensionConfig } from './Extension'
 import { Attributes, NodeViewRenderer, Overwrite } from './types'
 import { Editor } from './Editor'
 
-export interface NodeExtensionSpec<Options = any, Commands = {}> extends Overwrite<ExtensionSpec<Options, Commands>, {
+export interface NodeConfig<Options = any, Commands = {}> extends Overwrite<ExtensionConfig<Options, Commands>, {
   /**
    * TopNode
    */
@@ -154,7 +154,7 @@ export interface NodeExtensionSpec<Options = any, Commands = {}> extends Overwri
 }> {}
 
 export class Node<Options = any, Commands = {}> {
-  config: Required<NodeExtensionSpec> = {
+  config: Required<NodeConfig> = {
     name: 'node',
     defaultOptions: {},
     addGlobalAttributes: () => [],
@@ -182,7 +182,7 @@ export class Node<Options = any, Commands = {}> {
 
   options!: Options
 
-  constructor(config: NodeExtensionSpec<Options, Commands>) {
+  constructor(config: NodeConfig<Options, Commands>) {
     this.config = {
       ...this.config,
       ...config,
@@ -191,13 +191,13 @@ export class Node<Options = any, Commands = {}> {
     this.options = this.config.defaultOptions
   }
 
-  static create<O, C>(config: NodeExtensionSpec<O, C>) {
+  static create<O, C>(config: NodeConfig<O, C>) {
     return new Node<O, C>(config)
   }
 
   configure(options: Partial<Options>) {
     return Node
-      .create<Options, Commands>(this.config as NodeExtensionSpec<Options, Commands>)
+      .create<Options, Commands>(this.config as NodeConfig<Options, Commands>)
       .#configure({
         ...this.config.defaultOptions,
         ...options,
@@ -213,10 +213,10 @@ export class Node<Options = any, Commands = {}> {
     return this
   }
 
-  extend<ExtendedOptions = Options, ExtendedCommands = Commands>(extendedConfig: Partial<NodeExtensionSpec<ExtendedOptions, ExtendedCommands>>) {
+  extend<ExtendedOptions = Options, ExtendedCommands = Commands>(extendedConfig: Partial<NodeConfig<ExtendedOptions, ExtendedCommands>>) {
     return new Node<ExtendedOptions, ExtendedCommands>({
       ...this.config,
       ...extendedConfig,
-    } as NodeExtensionSpec<ExtendedOptions, ExtendedCommands>)
+    } as NodeConfig<ExtendedOptions, ExtendedCommands>)
   }
 }