From fbdc156981152bd38647d94af56c113caefdc298 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Sun, 20 Sep 2020 23:19:27 +0200
Subject: [PATCH 01/25] add basic new chaining

---
 docs/gridsome.server.js                  |  2 +-
 docs/src/demos/Examples/Simple/index.vue |  9 ++-
 packages/core/src/Editor.ts              | 79 ++++++++++++++++++++----
 packages/core/src/commands/focus.ts      | 48 +++++++++-----
 packages/core/src/commands/index.ts      | 36 +++++------
 packages/core/src/commands/insertHTML.ts | 33 +++++++---
 packages/core/src/commands/insertText.ts | 12 ++--
 7 files changed, 159 insertions(+), 60 deletions(-)

diff --git a/docs/gridsome.server.js b/docs/gridsome.server.js
index cf1f4775..c4dc9255 100644
--- a/docs/gridsome.server.js
+++ b/docs/gridsome.server.js
@@ -71,7 +71,7 @@ module.exports = function (api) {
         .test(/\.tsx?$/)
         .use()
           .loader('ts-loader')
-          .options({ appendTsSuffixTo: [/\.vue$/] })
+          .options({ transpileOnly: true, appendTsSuffixTo: [/\.vue$/] })
 
     config.module
       .rule('jsx')
diff --git a/docs/src/demos/Examples/Simple/index.vue b/docs/src/demos/Examples/Simple/index.vue
index bc7c2501..ab5a70f8 100644
--- a/docs/src/demos/Examples/Simple/index.vue
+++ b/docs/src/demos/Examples/Simple/index.vue
@@ -1,5 +1,11 @@
 <template>
-  <editor-content :editor="editor" />
+  <div>
+    <button @click="() => console.log(editor.focus())">focus</button>
+    <button @click="() => console.log(editor.insertText('hello'))">insert</button>
+    <button @click="editor.chain().focus().insertText('wat').insertHTML('<p>2</p>').run()">chain</button>
+    <button @click="editor.chain().insertText('1').focus().run()">chain</button>
+    <editor-content :editor="editor" />
+  </div>
 </template>
 
 <script>
@@ -16,6 +22,7 @@ export default {
   data() {
     return {
       editor: null,
+      console: console,
     }
   },
 
diff --git a/packages/core/src/Editor.ts b/packages/core/src/Editor.ts
index 03f531a3..fc31a2ca 100644
--- a/packages/core/src/Editor.ts
+++ b/packages/core/src/Editor.ts
@@ -20,7 +20,13 @@ import ComponentRenderer from './ComponentRenderer'
 import defaultPlugins from './plugins'
 import * as commands from './commands'
 
-export type Command = (next: Function, editor: Editor) => (...args: any) => any
+// export type Command = (next: Function, editor: Editor) => (...args: any) => any
+
+// export type Command = (...args: any) => ({ editor: Editor }) => boolean
+export type Command = (props: {
+  editor: Editor
+  tr: Transaction
+}) => boolean
 
 export interface CommandSpec {
   [key: string]: Command
@@ -108,7 +114,42 @@ export class Editor extends EventEmitter {
       return
     }
 
-    return (...args: any) => command(...args)
+    return (...args: any) => {
+      const { tr } = this.state
+      const callback = command(...args)({ editor: this.proxy, tr })
+      this.view.dispatch(tr)
+
+      return callback
+    }
+  }
+
+  public chain() {
+    // const { tr } = this.state
+    const tr = this.state.tr
+    const callbacks = []
+
+    return new Proxy({}, {
+      get: (target, name: string, proxy) => {
+        if (name === 'run') {
+          this.view.dispatch(tr)
+
+          return () => callbacks.every(callback => callback === true)
+        }
+
+        const command = this.commands[name]
+
+        if (!command) {
+          throw new Error(`tiptap: command '${name}' not found.`)
+        }
+
+        return (...args: any) => {
+          const callback = command(...args)({ editor: this.proxy, tr })
+          callbacks.push(callback)
+
+          return proxy
+        }
+      }
+    })
   }
 
   /**
@@ -155,7 +196,7 @@ export class Editor extends EventEmitter {
    * @param name The name of your command
    * @param callback The method of your command
    */
-  public registerCommand(name: string, callback: Command): Editor {
+  public registerCommand(name: string, callback: (bla?: any) => Command): Editor {
     if (this.commands[name]) {
       throw new Error(`tiptap: command '${name}' is already defined.`)
     }
@@ -164,16 +205,32 @@ export class Editor extends EventEmitter {
       throw new Error(`tiptap: '${name}' is a protected name.`)
     }
 
-    this.commands[name] = this.chainCommand((...args: any) => {
-      // console.log('command', this.lastCommandValue)
-      const commandValue = callback(() => {}, this.proxy)(...args)
+    // this.commands[name] = this.chainCommand((...args: any) => {
+    //   // console.log('command', this.lastCommandValue)
+    //   const commandValue = callback(() => {}, this.proxy)(...args)
 
-      // if (commandValue !== undefined) {
-        this.lastCommandValue = commandValue
-      // }
+    //   // if (commandValue !== undefined) {
+    //     this.lastCommandValue = commandValue
+    //   // }
 
-      return this.proxy
-    })
+    //   return this.proxy
+    // })
+
+    
+    // this.commands[name] = (...args: any) => {
+    //   const tr = this.state.tr
+    //   callback(...args)({ editor: this.proxy, tr })
+    //   this.view.dispatch(tr)
+    // }
+
+    this.commands[name] = callback
+
+    //   // if (commandValue !== undefined) {
+    //     this.lastCommandValue = commandValue
+    //   // }
+
+    //   return this.proxy
+    // })
 
     return this.proxy
   }
diff --git a/packages/core/src/commands/focus.ts b/packages/core/src/commands/focus.ts
index a2f3ef19..893e0d7b 100644
--- a/packages/core/src/commands/focus.ts
+++ b/packages/core/src/commands/focus.ts
@@ -1,8 +1,8 @@
-import { Editor } from '../Editor'
+import { Editor, Command } from '../Editor'
 import { TextSelection } from 'prosemirror-state'
 import minMax from '../utils/minMax'
 
-type FocusCommand = (position?: Position) => Editor
+type FocusCommand = (position?: Position) => Command
 
 declare module '../Editor' {
   interface Editor {
@@ -44,25 +44,45 @@ function resolveSelection(editor: Editor, position: Position = null): ResolvedSe
   }
 }
 
-export default (next: Function, editor: Editor) => (position = null) => {
-  const { view, state } = editor
+// export default (next: Function, editor: Editor) => (position = null) => {
+//   const { view, state } = editor
+
+//   if ((view.hasFocus() && position === null) || position === false) {
+//     next()
+//     return
+//   }
+
+//   const { from, to } = resolveSelection(editor, position)
+//   const { doc, tr } = state
+//   const resolvedFrom = minMax(from, 0, doc.content.size)
+//   const resolvedEnd = minMax(to, 0, doc.content.size)
+//   const selection = TextSelection.create(doc, resolvedFrom, resolvedEnd)
+//   const transaction = tr.setSelection(selection)
+
+//   view.dispatch(transaction)
+//   view.focus()
+//   //@ts-ignore
+//   // console.log(bla)
+//   // return 'FOCUS'
+//   next()
+// }
+
+
+export const focus: FocusCommand = (position = null) => ({ editor, tr }) => {
+  const { view } = editor
 
   if ((view.hasFocus() && position === null) || position === false) {
-    next()
-    return
+    return true
   }
 
   const { from, to } = resolveSelection(editor, position)
-  const { doc, tr } = state
+  const { doc } = tr
   const resolvedFrom = minMax(from, 0, doc.content.size)
   const resolvedEnd = minMax(to, 0, doc.content.size)
   const selection = TextSelection.create(doc, resolvedFrom, resolvedEnd)
-  const transaction = tr.setSelection(selection)
-
-  view.dispatch(transaction)
+  
+  tr.setSelection(selection)
   view.focus()
-  //@ts-ignore
-  // console.log(bla)
-  // return 'FOCUS'
-  next()
+
+  return true
 }
\ No newline at end of file
diff --git a/packages/core/src/commands/index.ts b/packages/core/src/commands/index.ts
index 75594286..5d41397e 100644
--- a/packages/core/src/commands/index.ts
+++ b/packages/core/src/commands/index.ts
@@ -1,18 +1,18 @@
-export { default as blur } from './blur'
-export { default as clearContent } from './clearContent'
-export { default as deleteSelection } from './deleteSelection'
-export { default as focus } from './focus'
-export { default as insertHTML } from './insertHTML'
-export { default as insertText } from './insertText'
-export { default as liftListItem } from './liftListItem'
-export { default as removeMark } from './removeMark'
-export { default as removeMarks } from './removeMarks'
-export { default as replaceWithNode } from './replaceWithNode'
-export { default as selectAll } from './selectAll'
-export { default as selectParentNode } from './selectParentNode'
-export { default as setContent } from './setContent'
-export { default as sinkListItem } from './sinkListItem'
-export { default as splitListItem } from './splitListItem'
-export { default as toggleMark } from './toggleMark'
-export { default as toggleNode } from './toggleNode'
-export { default as updateMark } from './updateMark'
+// export { default as blur } from './blur'
+// export { default as clearContent } from './clearContent'
+// export { default as deleteSelection } from './deleteSelection'
+export { focus } from './focus'
+export { insertHTML } from './insertHTML'
+export { insertText } from './insertText'
+// export { default as liftListItem } from './liftListItem'
+// export { default as removeMark } from './removeMark'
+// export { default as removeMarks } from './removeMarks'
+// export { default as replaceWithNode } from './replaceWithNode'
+// export { default as selectAll } from './selectAll'
+// export { default as selectParentNode } from './selectParentNode'
+// export { default as setContent } from './setContent'
+// export { default as sinkListItem } from './sinkListItem'
+// export { default as splitListItem } from './splitListItem'
+// export { default as toggleMark } from './toggleMark'
+// export { default as toggleNode } from './toggleNode'
+// export { default as updateMark } from './updateMark'
diff --git a/packages/core/src/commands/insertHTML.ts b/packages/core/src/commands/insertHTML.ts
index e274a0b0..a53c3877 100644
--- a/packages/core/src/commands/insertHTML.ts
+++ b/packages/core/src/commands/insertHTML.ts
@@ -1,8 +1,10 @@
 import { DOMParser } from 'prosemirror-model'
-import { Editor } from '../Editor'
+import { Selection } from 'prosemirror-state'
+import { Command } from '../Editor'
 import elementFromString from '../utils/elementFromString'
+import {ReplaceStep, ReplaceAroundStep} from "prosemirror-transform"
 
-type InsertHTMLCommand = (value: string) => Editor
+type InsertHTMLCommand = (value: string) => Command
 
 declare module '../Editor' {
   interface Editor {
@@ -10,13 +12,28 @@ declare module '../Editor' {
   }
 }
 
-export default (next: Function, editor: Editor) => (value: string) => {
-  const { view, state } = editor
-  const { selection } = state
+// TODO: move to utils
+// https://github.com/ProseMirror/prosemirror-state/blob/master/src/selection.js#L466
+function selectionToInsertionEnd(tr, startLen, bias) {
+  let last = tr.steps.length - 1
+  if (last < startLen) return
+  let step = tr.steps[last]
+  if (!(step instanceof ReplaceStep || step instanceof ReplaceAroundStep)) return
+  let map = tr.mapping.maps[last], end
+  map.forEach((_from, _to, _newFrom, newTo) => { if (end == null) end = newTo })
+  tr.setSelection(Selection.near(tr.doc.resolve(end), bias))
+}
+
+export const insertHTML: InsertHTMLCommand = value => ({ tr, editor }) => {
+  console.log({tr })
+  const { state } = editor
+  const { selection } = tr
   const element = elementFromString(value)
   const slice = DOMParser.fromSchema(state.schema).parseSlice(element)
-  const transaction = state.tr.insert(selection.anchor, slice.content)
 
-  view.dispatch(transaction)
-  next()
+  tr.insert(selection.anchor, slice.content)
+  // TODO: set correct bias by content
+  selectionToInsertionEnd(tr, tr.steps.length - 1, -1)
+
+  return true
 }
\ No newline at end of file
diff --git a/packages/core/src/commands/insertText.ts b/packages/core/src/commands/insertText.ts
index 49043046..e53d3901 100644
--- a/packages/core/src/commands/insertText.ts
+++ b/packages/core/src/commands/insertText.ts
@@ -1,6 +1,6 @@
-import { Editor } from '../Editor'
+import { Command } from '../Editor'
 
-type InsertTextCommand = (value: string) => Editor
+type InsertTextCommand = (value: string) => Command
 
 declare module '../Editor' {
   interface Editor {
@@ -8,10 +8,8 @@ declare module '../Editor' {
   }
 }
 
-export default (next: Function, editor: Editor) => (value: string) => {
-  const { view, state } = editor
-  const transaction = state.tr.insertText(value)
+export const insertText: InsertTextCommand = value => ({ tr }) => {
+  tr.insertText(value)
 
-  view.dispatch(transaction)
-  next()
+  return true
 }

From f6270c0e0c2aa32b90078b1550d4e8ab969f4338 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Sun, 20 Sep 2020 23:44:38 +0200
Subject: [PATCH 02/25] add more commands

---
 docs/src/demos/Examples/Simple/index.vue   |  5 +++--
 packages/core/src/commands/blur.ts         | 11 ++++++-----
 packages/core/src/commands/clearContent.ts | 10 ++++++----
 packages/core/src/commands/index.ts        |  6 +++---
 packages/core/src/commands/insertHTML.ts   |  2 --
 packages/core/src/commands/setContent.ts   | 20 +++++++++-----------
 6 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/docs/src/demos/Examples/Simple/index.vue b/docs/src/demos/Examples/Simple/index.vue
index ab5a70f8..cba3febe 100644
--- a/docs/src/demos/Examples/Simple/index.vue
+++ b/docs/src/demos/Examples/Simple/index.vue
@@ -2,8 +2,9 @@
   <div>
     <button @click="() => console.log(editor.focus())">focus</button>
     <button @click="() => console.log(editor.insertText('hello'))">insert</button>
-    <button @click="editor.chain().focus().insertText('wat').insertHTML('<p>2</p>').run()">chain</button>
-    <button @click="editor.chain().insertText('1').focus().run()">chain</button>
+    <button @click="editor.chain().focus().insertText('wat').insertHTML('<p>2</p>').run()">chain 1</button>
+    <button @click="editor.chain().insertText('1').focus().run()">chain 2</button>
+    <button @click="editor.chain().setContent('reset').insertText('1').clearContent().run()">setContent</button>
     <editor-content :editor="editor" />
   </div>
 </template>
diff --git a/packages/core/src/commands/blur.ts b/packages/core/src/commands/blur.ts
index ffe18b02..3815fb7f 100644
--- a/packages/core/src/commands/blur.ts
+++ b/packages/core/src/commands/blur.ts
@@ -1,6 +1,6 @@
-import { Editor } from '../Editor'
+import { Command } from '../Editor'
 
-type BlurCommand = () => Editor
+type BlurCommand = () => Command
 
 declare module '../Editor' {
   interface Editor {
@@ -8,9 +8,10 @@ declare module '../Editor' {
   }
 }
 
-export default (next: Function, { view }: Editor) => () => {
-  const element = view.dom as HTMLElement
+export const blur: BlurCommand = () => ({ editor }) => {
+  const element = editor.view.dom as HTMLElement
 
   element.blur()
-  next()
+
+  return true
 }
diff --git a/packages/core/src/commands/clearContent.ts b/packages/core/src/commands/clearContent.ts
index e93325e7..64e75a3c 100644
--- a/packages/core/src/commands/clearContent.ts
+++ b/packages/core/src/commands/clearContent.ts
@@ -1,6 +1,6 @@
-import { Editor } from '../Editor'
+import { Command } from '../Editor'
 
-type ClearContentCommand = (emitUpdate?: Boolean) => Editor
+type ClearContentCommand = (emitUpdate?: Boolean) => Command
 
 declare module '../Editor' {
   interface Editor {
@@ -8,7 +8,9 @@ declare module '../Editor' {
   }
 }
 
-export default (next: Function, editor: Editor) => (emitUpdate = false) => {
+export const clearContent: ClearContentCommand = (emitUpdate = false) => ({ editor }) => {
+  // TODO: doesn’t work, we have to re-use `tr`
   editor.setContent('', emitUpdate)
-  next()
+
+  return true
 }
diff --git a/packages/core/src/commands/index.ts b/packages/core/src/commands/index.ts
index 5d41397e..46cd18ac 100644
--- a/packages/core/src/commands/index.ts
+++ b/packages/core/src/commands/index.ts
@@ -1,5 +1,5 @@
-// export { default as blur } from './blur'
-// export { default as clearContent } from './clearContent'
+export { blur } from './blur'
+export { clearContent } from './clearContent'
 // export { default as deleteSelection } from './deleteSelection'
 export { focus } from './focus'
 export { insertHTML } from './insertHTML'
@@ -10,7 +10,7 @@ export { insertText } from './insertText'
 // export { default as replaceWithNode } from './replaceWithNode'
 // export { default as selectAll } from './selectAll'
 // export { default as selectParentNode } from './selectParentNode'
-// export { default as setContent } from './setContent'
+export { setContent } from './setContent'
 // export { default as sinkListItem } from './sinkListItem'
 // export { default as splitListItem } from './splitListItem'
 // export { default as toggleMark } from './toggleMark'
diff --git a/packages/core/src/commands/insertHTML.ts b/packages/core/src/commands/insertHTML.ts
index a53c3877..bec1e0ad 100644
--- a/packages/core/src/commands/insertHTML.ts
+++ b/packages/core/src/commands/insertHTML.ts
@@ -25,14 +25,12 @@ function selectionToInsertionEnd(tr, startLen, bias) {
 }
 
 export const insertHTML: InsertHTMLCommand = value => ({ tr, editor }) => {
-  console.log({tr })
   const { state } = editor
   const { selection } = tr
   const element = elementFromString(value)
   const slice = DOMParser.fromSchema(state.schema).parseSlice(element)
 
   tr.insert(selection.anchor, slice.content)
-  // TODO: set correct bias by content
   selectionToInsertionEnd(tr, tr.steps.length - 1, -1)
 
   return true
diff --git a/packages/core/src/commands/setContent.ts b/packages/core/src/commands/setContent.ts
index 7c18b726..bc9717bd 100644
--- a/packages/core/src/commands/setContent.ts
+++ b/packages/core/src/commands/setContent.ts
@@ -1,11 +1,11 @@
-import { Editor } from '../Editor'
+import { Command } from '../Editor'
 import { TextSelection } from 'prosemirror-state'
 
 type SetContentCommand = (
   content: string,
   emitUpdate?: Boolean,
   parseOptions?: any,
-) => Editor
+) => Command
 
 declare module '../Editor' {
   interface Editor {
@@ -13,21 +13,19 @@ declare module '../Editor' {
   }
 }
 
-export default (next: Function, editor: Editor) => (content: string, emitUpdate: Boolean = false, parseOptions = {}) => {
+export const setContent: SetContentCommand = (content = null, emitUpdate = false, parseOptions = {}) => ({ tr, editor }) => {
   if (content === null) {
-    next()
-    return
+    return false
   }
 
-  const { view, state, createDocument } = editor
-  const { doc, tr } = state
+  const { createDocument } = editor
+  const { doc } = tr
   const document = createDocument(content, parseOptions)
   const selection = TextSelection.create(doc, 0, doc.content.size)
-  const transaction = tr
-    .setSelection(selection)
+  
+  tr.setSelection(selection)
     .replaceSelectionWith(document, false)
     .setMeta('preventUpdate', !emitUpdate)
 
-  view.dispatch(transaction)
-  next()
+  return true
 }

From 432b30f1a62ce8e3492fe38c7beb0871b4292803 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Mon, 21 Sep 2020 00:14:59 +0200
Subject: [PATCH 03/25] add way to nest commands

---
 packages/core/src/Editor.ts                | 19 ++++++++++++++++++-
 packages/core/src/commands/clearContent.ts |  7 ++-----
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/packages/core/src/Editor.ts b/packages/core/src/Editor.ts
index fc31a2ca..058583f9 100644
--- a/packages/core/src/Editor.ts
+++ b/packages/core/src/Editor.ts
@@ -26,6 +26,8 @@ import * as commands from './commands'
 export type Command = (props: {
   editor: Editor
   tr: Transaction
+  // TODO: find correct type
+  commands: any
 }) => boolean
 
 export interface CommandSpec {
@@ -143,7 +145,22 @@ export class Editor extends EventEmitter {
         }
 
         return (...args: any) => {
-          const callback = command(...args)({ editor: this.proxy, tr })
+          const props = {
+            editor: this.proxy,
+            tr,
+          }
+
+          Object.defineProperty(props, 'commands', {
+            get: function() {
+              return Object.fromEntries(Object
+                .entries(this.commands)
+                .map(([name, command]) => {
+                  return [name, (...args) => command(...args)(props)]
+                }))
+            }.bind(this)
+          });
+
+          const callback = command(...args)(props)
           callbacks.push(callback)
 
           return proxy
diff --git a/packages/core/src/commands/clearContent.ts b/packages/core/src/commands/clearContent.ts
index 64e75a3c..978c8c1d 100644
--- a/packages/core/src/commands/clearContent.ts
+++ b/packages/core/src/commands/clearContent.ts
@@ -8,9 +8,6 @@ declare module '../Editor' {
   }
 }
 
-export const clearContent: ClearContentCommand = (emitUpdate = false) => ({ editor }) => {
-  // TODO: doesn’t work, we have to re-use `tr`
-  editor.setContent('', emitUpdate)
-
-  return true
+export const clearContent: ClearContentCommand = (emitUpdate = false) => ({ commands }) => {
+  return commands.setContent('', emitUpdate)
 }

From c1a941a042b548f3157a30597535dc09270673c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Mon, 21 Sep 2020 18:40:32 +0200
Subject: [PATCH 04/25] add support for prosemirror commands

---
 docs/src/demos/Examples/Simple/index.vue      |  1 +
 packages/core/src/Editor.ts                   | 48 +++++++++++++++++--
 packages/core/src/commands/deleteSelection.ts | 11 ++---
 packages/core/src/commands/index.ts           |  2 +-
 4 files changed, 52 insertions(+), 10 deletions(-)

diff --git a/docs/src/demos/Examples/Simple/index.vue b/docs/src/demos/Examples/Simple/index.vue
index cba3febe..e146722d 100644
--- a/docs/src/demos/Examples/Simple/index.vue
+++ b/docs/src/demos/Examples/Simple/index.vue
@@ -5,6 +5,7 @@
     <button @click="editor.chain().focus().insertText('wat').insertHTML('<p>2</p>').run()">chain 1</button>
     <button @click="editor.chain().insertText('1').focus().run()">chain 2</button>
     <button @click="editor.chain().setContent('reset').insertText('1').clearContent().run()">setContent</button>
+    <button @click="editor.chain().deleteSelection().run()">deleteSelection</button>
     <editor-content :editor="editor" />
   </div>
 </template>
diff --git a/packages/core/src/Editor.ts b/packages/core/src/Editor.ts
index 058583f9..e9f28dfc 100644
--- a/packages/core/src/Editor.ts
+++ b/packages/core/src/Editor.ts
@@ -28,6 +28,7 @@ export type Command = (props: {
   tr: Transaction
   // TODO: find correct type
   commands: any
+  state: EditorState
 }) => boolean
 
 export interface CommandSpec {
@@ -118,7 +119,14 @@ export class Editor extends EventEmitter {
 
     return (...args: any) => {
       const { tr } = this.state
-      const callback = command(...args)({ editor: this.proxy, tr })
+      const callback = command(...args)({
+        editor: this.proxy,
+        state: this.chainableEditorState(tr, this.state),
+        view: this.view,
+        dispatch: () => {},
+        tr,
+      })
+
       this.view.dispatch(tr)
 
       return callback
@@ -126,8 +134,7 @@ export class Editor extends EventEmitter {
   }
 
   public chain() {
-    // const { tr } = this.state
-    const tr = this.state.tr
+    const { tr } = this.state
     const callbacks = []
 
     return new Proxy({}, {
@@ -147,6 +154,9 @@ export class Editor extends EventEmitter {
         return (...args: any) => {
           const props = {
             editor: this.proxy,
+            state: this.chainableEditorState(tr, this.state),
+            view: this.view,
+            dispatch: () => {},
             tr,
           }
 
@@ -169,6 +179,38 @@ export class Editor extends EventEmitter {
     })
   }
 
+  protected chainableEditorState(tr: Transaction, state: EditorState): EditorState {
+    let selection = tr.selection
+    let doc = tr.doc
+    let storedMarks = tr.storedMarks
+
+    return {
+      ...state,
+      schema: state.schema,
+      plugins: state.plugins,
+      apply: state.apply.bind(state),
+      applyTransaction: state.applyTransaction.bind(state),
+      reconfigure: state.reconfigure.bind(state),
+      toJSON: state.toJSON.bind(state),
+      get storedMarks() {
+        return storedMarks
+      },
+      get selection() {
+        return selection
+      },
+      get doc() {
+        return doc
+      },
+      get tr() {
+        selection = tr.selection
+        doc = tr.doc
+        storedMarks = tr.storedMarks
+
+        return tr
+      },
+    };
+  }
+
   /**
    * Update editor options.
    *
diff --git a/packages/core/src/commands/deleteSelection.ts b/packages/core/src/commands/deleteSelection.ts
index 63bbd7a3..3ee15721 100644
--- a/packages/core/src/commands/deleteSelection.ts
+++ b/packages/core/src/commands/deleteSelection.ts
@@ -1,7 +1,7 @@
-import { Editor } from '../Editor'
-import { deleteSelection } from 'prosemirror-commands'
+import { Command } from '../Editor'
+import { deleteSelection as originalDeleteSelection } from 'prosemirror-commands'
 
-type DeleteSelectionCommand = () => Editor
+type DeleteSelectionCommand = () => Command
 
 declare module '../Editor' {
   interface Editor {
@@ -9,7 +9,6 @@ declare module '../Editor' {
   }
 }
 
-export default (next: Function, { state, view }: Editor) => () => {
-  deleteSelection(state, view.dispatch)
-  next()
+export const deleteSelection: DeleteSelectionCommand = () => ({ state, dispatch }) => {
+  return originalDeleteSelection(state, dispatch)
 }
diff --git a/packages/core/src/commands/index.ts b/packages/core/src/commands/index.ts
index 46cd18ac..39588c4f 100644
--- a/packages/core/src/commands/index.ts
+++ b/packages/core/src/commands/index.ts
@@ -1,6 +1,6 @@
 export { blur } from './blur'
 export { clearContent } from './clearContent'
-// export { default as deleteSelection } from './deleteSelection'
+export { deleteSelection } from './deleteSelection'
 export { focus } from './focus'
 export { insertHTML } from './insertHTML'
 export { insertText } from './insertText'

From 4c392d5759f651faa0fe44cdf1acd246c4d23c2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Mon, 21 Sep 2020 20:11:32 +0200
Subject: [PATCH 05/25] refactoring

---
 packages/core/src/Editor.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/core/src/Editor.ts b/packages/core/src/Editor.ts
index e9f28dfc..35cecfda 100644
--- a/packages/core/src/Editor.ts
+++ b/packages/core/src/Editor.ts
@@ -123,7 +123,7 @@ export class Editor extends EventEmitter {
         editor: this.proxy,
         state: this.chainableEditorState(tr, this.state),
         view: this.view,
-        dispatch: () => {},
+        dispatch: () => false,
         tr,
       })
 
@@ -156,7 +156,7 @@ export class Editor extends EventEmitter {
             editor: this.proxy,
             state: this.chainableEditorState(tr, this.state),
             view: this.view,
-            dispatch: () => {},
+            dispatch: () => false,
             tr,
           }
 

From 778e0649798897c45fa41baedbcc033be9998ee9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Mon, 21 Sep 2020 21:40:44 +0200
Subject: [PATCH 06/25] add basic ChainedCommands type

---
 docs/src/demos/Examples/Simple/index.vue      |  2 +-
 packages/core/src/Editor.ts                   | 21 ++++++++++++-------
 packages/core/src/commands/deleteSelection.ts |  6 ++++++
 3 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/docs/src/demos/Examples/Simple/index.vue b/docs/src/demos/Examples/Simple/index.vue
index e146722d..14a97cf5 100644
--- a/docs/src/demos/Examples/Simple/index.vue
+++ b/docs/src/demos/Examples/Simple/index.vue
@@ -5,7 +5,7 @@
     <button @click="editor.chain().focus().insertText('wat').insertHTML('<p>2</p>').run()">chain 1</button>
     <button @click="editor.chain().insertText('1').focus().run()">chain 2</button>
     <button @click="editor.chain().setContent('reset').insertText('1').clearContent().run()">setContent</button>
-    <button @click="editor.chain().deleteSelection().run()">deleteSelection</button>
+    <button @click="editor.chain().focus().deleteSelection().run()">deleteSelection</button>
     <editor-content :editor="editor" />
   </div>
 </template>
diff --git a/packages/core/src/Editor.ts b/packages/core/src/Editor.ts
index 35cecfda..27815826 100644
--- a/packages/core/src/Editor.ts
+++ b/packages/core/src/Editor.ts
@@ -19,6 +19,7 @@ import Mark from './Mark'
 import ComponentRenderer from './ComponentRenderer'
 import defaultPlugins from './plugins'
 import * as commands from './commands'
+import { deleteSelection } from 'prosemirror-commands'
 
 // export type Command = (next: Function, editor: Editor) => (...args: any) => any
 
@@ -35,18 +36,24 @@ export interface CommandSpec {
   [key: string]: Command
 }
 
-type EditorContent = string | JSON | null
+export interface Commands {}
 
-// interface Element {
-//   editor?: Editor
-// }
+// export type CommandNames = Extract<keyof Commands, string>
+
+export type ChainedCommands = {
+  [Command in keyof Commands]: Commands[Command] extends (...args: any[]) => any
+  ? (...args: Parameters<Commands[Command]>) => ChainedCommands
+  : never
+} & {
+  run: () => boolean
+}
+
+type EditorContent = string | JSON | null
 
 interface HTMLElement {
   editor?: Editor
 }
 
-// Element.prototype.editor = Editor
-
 interface EditorOptions {
   element: Element,
   content: EditorContent,
@@ -176,7 +183,7 @@ export class Editor extends EventEmitter {
           return proxy
         }
       }
-    })
+    }) as ChainedCommands
   }
 
   protected chainableEditorState(tr: Transaction, state: EditorState): EditorState {
diff --git a/packages/core/src/commands/deleteSelection.ts b/packages/core/src/commands/deleteSelection.ts
index 3ee15721..c2fde9f6 100644
--- a/packages/core/src/commands/deleteSelection.ts
+++ b/packages/core/src/commands/deleteSelection.ts
@@ -9,6 +9,12 @@ declare module '../Editor' {
   }
 }
 
+// declare module '../Editor' {
+//   interface Commands {
+//     deleteSelection: DeleteSelectionCommand,
+//   }
+// }
+
 export const deleteSelection: DeleteSelectionCommand = () => ({ state, dispatch }) => {
   return originalDeleteSelection(state, dispatch)
 }

From 4da71ecfbb281e29a88d7c0440209cceb6f451f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Mon, 21 Sep 2020 23:17:30 +0200
Subject: [PATCH 07/25] add some more commands

---
 docs/src/demos/Examples/Basic/index.vue       | 36 +++++++++----------
 packages/core/index.ts                        |  4 +--
 packages/core/src/Editor.ts                   | 26 ++++++++++----
 packages/core/src/commands/index.ts           | 22 ++++++------
 packages/core/src/commands/liftListItem.ts    | 14 ++++----
 packages/core/src/commands/removeMark.ts      | 15 ++++----
 packages/core/src/commands/removeMarks.ts     | 20 +++++------
 packages/core/src/commands/replaceWithNode.ts | 19 +++++-----
 packages/core/src/commands/selectAll.ts       | 11 +++---
 .../core/src/commands/selectParentNode.ts     | 11 +++---
 packages/core/src/commands/sinkListItem.ts    | 14 ++++----
 packages/core/src/commands/splitListItem.ts   | 14 ++++----
 packages/core/src/commands/toggleMark.ts      | 14 ++++----
 packages/core/src/commands/toggleNode.ts      | 17 ++++-----
 packages/core/src/commands/updateMark.ts      | 15 ++++----
 packages/extension-blockquote/index.ts        | 12 +++----
 packages/extension-bold/index.ts              | 13 +++----
 packages/extension-bullet-list/index.ts       | 12 +++----
 packages/extension-code-block/index.ts        | 12 +++----
 packages/extension-code/index.ts              | 12 +++----
 packages/extension-hard-break/index.ts        | 22 ++++++------
 packages/extension-heading/index.ts           | 13 +++----
 packages/extension-history/index.ts           | 16 ++++-----
 packages/extension-horizontal-rule/index.ts   | 16 ++++-----
 packages/extension-italic/index.ts            | 13 +++----
 packages/extension-strike/index.ts            | 13 +++----
 packages/extension-underline/index.ts         | 11 +++---
 27 files changed, 207 insertions(+), 210 deletions(-)

diff --git a/docs/src/demos/Examples/Basic/index.vue b/docs/src/demos/Examples/Basic/index.vue
index ddf9dccc..cb6fd3fb 100644
--- a/docs/src/demos/Examples/Basic/index.vue
+++ b/docs/src/demos/Examples/Basic/index.vue
@@ -1,58 +1,58 @@
 <template>
   <div>
     <div v-if="editor">
-      <button @click="editor.focus().removeMarks()">
+      <button @click="editor.chain().focus().removeMarks().run()">
         clear format
       </button>
-      <button @click="editor.focus().bold()" :class="{ 'is-active': editor.isActive('bold') }">
+      <button @click="editor.chain().focus().bold().run()" :class="{ 'is-active': editor.isActive('bold') }">
         bold
       </button>
-      <button @click="editor.focus().italic()" :class="{ 'is-active': editor.isActive('italic') }">
+      <button @click="editor.chain().focus().italic().run()" :class="{ 'is-active': editor.isActive('italic') }">
         italic
       </button>
-      <button @click="editor.focus().underline()" :class="{ 'is-active': editor.isActive('underline') }">
+      <button @click="editor.chain().focus().underline().run()" :class="{ 'is-active': editor.isActive('underline') }">
         underline
       </button>
-      <button @click="editor.focus().strike()" :class="{ 'is-active': editor.isActive('strike') }">
+      <button @click="editor.chain().focus().strike().run()" :class="{ 'is-active': editor.isActive('strike') }">
         strike
       </button>
-      <button @click="editor.focus().code()" :class="{ 'is-active': editor.isActive('code') }">
+      <button @click="editor.chain().focus().code().run()" :class="{ 'is-active': editor.isActive('code') }">
         code
       </button>
-      <button @click="editor.focus().codeBlock()" :class="{ 'is-active': editor.isActive('codeBlock') }">
+      <button @click="editor.chain().focus().codeBlock().run()" :class="{ 'is-active': editor.isActive('codeBlock') }">
         code block
       </button>
-      <button @click="editor.focus().heading({ level: 1 })" :class="{ 'is-active': editor.isActive('heading', { level: 1 }) }">
+      <button @click="editor.chain().focus().heading({ level: 1 }).run()" :class="{ 'is-active': editor.isActive('heading', { level: 1 }) }">
         h1
       </button>
-      <button @click="editor.focus().heading({ level: 2 })" :class="{ 'is-active': editor.isActive('heading', { level: 2 }) }">
+      <button @click="editor.chain().focus().heading({ level: 2 }).run()" :class="{ 'is-active': editor.isActive('heading', { level: 2 }) }">
         h2
       </button>
-      <button @click="editor.focus().heading({ level: 3 })" :class="{ 'is-active': editor.isActive('heading', { level: 3 }) }">
+      <button @click="editor.chain().focus().heading({ level: 3 }).run()" :class="{ 'is-active': editor.isActive('heading', { level: 3 }) }">
         h3
       </button>
-      <button @click="editor.focus().heading({ level: 4 })" :class="{ 'is-active': editor.isActive('heading', { level: 4 }) }">
+      <button @click="editor.chain().focus().heading({ level: 4 }).run()" :class="{ 'is-active': editor.isActive('heading', { level: 4 }) }">
         h4
       </button>
-      <button @click="editor.focus().heading({ level: 5 })" :class="{ 'is-active': editor.isActive('heading', { level: 5 }) }">
+      <button @click="editor.chain().focus().heading({ level: 5 }).run()" :class="{ 'is-active': editor.isActive('heading', { level: 5 }) }">
         h5
       </button>
-      <button @click="editor.focus().heading({ level: 6 })" :class="{ 'is-active': editor.isActive('heading', { level: 6 }) }">
+      <button @click="editor.chain().focus().heading({ level: 6 }).run()" :class="{ 'is-active': editor.isActive('heading', { level: 6 }) }">
         h6
       </button>
-      <button @click="editor.focus().blockquote()" :class="{ 'is-active': editor.isActive('blockquote') }">
+      <button @click="editor.chain().focus().blockquote().run()" :class="{ 'is-active': editor.isActive('blockquote') }">
         blockquote
       </button>
-      <button @click="editor.focus().horizontalRule()">
+      <button @click="editor.chain().focus().horizontalRule().run()">
         horizontal rule
       </button>
-      <button @click="editor.focus().hardBreak()">
+      <button @click="editor.chain().focus().hardBreak().run()">
         hard break
       </button>
-      <button @click="editor.focus().undo()">
+      <button @click="editor.chain().focus().undo().run()">
         undo
       </button>
-      <button @click="editor.focus().redo()">
+      <button @click="editor.chain().focus().redo().run()">
         redo
       </button>
     </div>
diff --git a/packages/core/index.ts b/packages/core/index.ts
index 99135e79..86af73a3 100644
--- a/packages/core/index.ts
+++ b/packages/core/index.ts
@@ -1,7 +1,7 @@
-import { Editor, CommandSpec } from './src/Editor'
+import { Editor, Command, CommandSpec } from './src/Editor'
 
 export default Editor
-export { Editor, CommandSpec }
+export { Editor, Command, CommandSpec }
 export { default as ComponentRenderer } from './src/ComponentRenderer'
 export { default as Extension } from './src/Extension'
 export { default as Node } from './src/Node'
diff --git a/packages/core/src/Editor.ts b/packages/core/src/Editor.ts
index 27815826..1509bbfa 100644
--- a/packages/core/src/Editor.ts
+++ b/packages/core/src/Editor.ts
@@ -21,19 +21,18 @@ import defaultPlugins from './plugins'
 import * as commands from './commands'
 import { deleteSelection } from 'prosemirror-commands'
 
-// export type Command = (next: Function, editor: Editor) => (...args: any) => any
-
-// export type Command = (...args: any) => ({ editor: Editor }) => boolean
 export type Command = (props: {
   editor: Editor
   tr: Transaction
   // TODO: find correct type
   commands: any
-  state: EditorState
+  state: EditorState,
+  view: EditorView,
+  dispatch: () => any
 }) => boolean
 
 export interface CommandSpec {
-  [key: string]: Command
+  [key: string]: (...args: any[]) => Command
 }
 
 export interface Commands {}
@@ -126,13 +125,26 @@ export class Editor extends EventEmitter {
 
     return (...args: any) => {
       const { tr } = this.state
-      const callback = command(...args)({
+
+      const props = {
         editor: this.proxy,
         state: this.chainableEditorState(tr, this.state),
         view: this.view,
         dispatch: () => false,
         tr,
-      })
+      }
+
+      Object.defineProperty(props, 'commands', {
+        get: function() {
+          return Object.fromEntries(Object
+            .entries(this.commands)
+            .map(([name, command]) => {
+              return [name, (...args) => command(...args)(props)]
+            }))
+        }.bind(this)
+      });
+
+      const callback = command(...args)(props)
 
       this.view.dispatch(tr)
 
diff --git a/packages/core/src/commands/index.ts b/packages/core/src/commands/index.ts
index 39588c4f..0c6c0430 100644
--- a/packages/core/src/commands/index.ts
+++ b/packages/core/src/commands/index.ts
@@ -4,15 +4,15 @@ export { deleteSelection } from './deleteSelection'
 export { focus } from './focus'
 export { insertHTML } from './insertHTML'
 export { insertText } from './insertText'
-// export { default as liftListItem } from './liftListItem'
-// export { default as removeMark } from './removeMark'
-// export { default as removeMarks } from './removeMarks'
-// export { default as replaceWithNode } from './replaceWithNode'
-// export { default as selectAll } from './selectAll'
-// export { default as selectParentNode } from './selectParentNode'
+export { liftListItem } from './liftListItem'
+export { removeMark } from './removeMark'
+export { removeMarks } from './removeMarks'
+export { replaceWithNode } from './replaceWithNode'
+export { selectAll } from './selectAll'
+export { selectParentNode } from './selectParentNode'
 export { setContent } from './setContent'
-// export { default as sinkListItem } from './sinkListItem'
-// export { default as splitListItem } from './splitListItem'
-// export { default as toggleMark } from './toggleMark'
-// export { default as toggleNode } from './toggleNode'
-// export { default as updateMark } from './updateMark'
+export { sinkListItem } from './sinkListItem'
+export { splitListItem } from './splitListItem'
+export { toggleMark } from './toggleMark'
+export { toggleNode } from './toggleNode'
+export { updateMark } from './updateMark'
diff --git a/packages/core/src/commands/liftListItem.ts b/packages/core/src/commands/liftListItem.ts
index 70152169..da8cdf80 100644
--- a/packages/core/src/commands/liftListItem.ts
+++ b/packages/core/src/commands/liftListItem.ts
@@ -1,9 +1,9 @@
-import { Editor } from '../Editor'
-import { liftListItem } from 'prosemirror-schema-list'
+import { Command } from '../Editor'
+import { liftListItem as originalLiftListItem } from 'prosemirror-schema-list'
 import { NodeType } from 'prosemirror-model'
 import getNodeType from '../utils/getNodeType'
 
-type LiftListItem = (typeOrName: string | NodeType) => Editor
+type LiftListItem = (typeOrName: string | NodeType) => Command
 
 declare module '../Editor' {
   interface Editor {
@@ -11,10 +11,8 @@ declare module '../Editor' {
   }
 }
 
-export default (next: Function, editor: Editor) => (typeOrName: string | NodeType) => {
-  const { view, state, schema } = editor
-  const type = getNodeType(typeOrName, schema)
+export const liftListItem: LiftListItem = (typeOrName) => ({ state, dispatch }) => {
+  const type = getNodeType(typeOrName, state.schema)
 
-  liftListItem(type)(state, view.dispatch)
-  next()
+  return originalLiftListItem(type)(state, dispatch)
 }
diff --git a/packages/core/src/commands/removeMark.ts b/packages/core/src/commands/removeMark.ts
index 8c62ff1c..42207aff 100644
--- a/packages/core/src/commands/removeMark.ts
+++ b/packages/core/src/commands/removeMark.ts
@@ -1,9 +1,9 @@
-import { Editor } from '../Editor'
+import { Command } from '../Editor'
 import { MarkType } from 'prosemirror-model'
 import getMarkType from '../utils/getMarkType'
 import getMarkRange from '../utils/getMarkRange'
 
-type RemoveMarkCommand = (typeOrName: string | MarkType) => Editor
+type RemoveMarkCommand = (typeOrName: string | MarkType) => Command
 
 declare module '../Editor' {
   interface Editor {
@@ -11,10 +11,9 @@ declare module '../Editor' {
   }
 }
 
-export default (next: Function, editor: Editor) => (typeOrName: string | MarkType) => {
-  const { view, state, schema } = editor
-  const { tr, selection } = state
-  const type = getMarkType(typeOrName, schema)
+export const removeMark: RemoveMarkCommand = (typeOrName) => ({ tr, state }) => {
+  const { selection } = tr
+  const type = getMarkType(typeOrName, state.schema)
   let { from, to, $from, empty } = selection
 
   if (empty) {
@@ -27,6 +26,6 @@ export default (next: Function, editor: Editor) => (typeOrName: string | MarkTyp
   }
 
   tr.removeMark(from, to, type)
-  view.dispatch(tr)
-  next()
+
+  return true
 }
diff --git a/packages/core/src/commands/removeMarks.ts b/packages/core/src/commands/removeMarks.ts
index f838916e..9fe98d41 100644
--- a/packages/core/src/commands/removeMarks.ts
+++ b/packages/core/src/commands/removeMarks.ts
@@ -1,6 +1,6 @@
-import { Editor } from '../Editor'
+import { Command } from '../Editor'
 
-type RemoveMarksCommand = () => Editor
+type RemoveMarksCommand = () => Command
 
 declare module '../Editor' {
   interface Editor {
@@ -8,23 +8,19 @@ declare module '../Editor' {
   }
 }
 
-export default (next: Function, editor: Editor) => () => {
-  const { state, view, schema } = editor
-  const { selection, tr } = state
+export const removeMarks: RemoveMarksCommand = () => ({ tr, state }) => {
+  const { selection } = tr
   const { from, to, empty } = selection
-  let transaction = tr
 
   if (empty) {
-    next()
-    return
+    return true
   }
 
   Object
-    .entries(schema.marks)
+    .entries(state.schema.marks)
     .forEach(([name, mark]) => {
-      transaction.removeMark(from, to, mark)
+      tr.removeMark(from, to, mark)
     })
 
-  view.dispatch(transaction)
-  next()
+  return true
 }
diff --git a/packages/core/src/commands/replaceWithNode.ts b/packages/core/src/commands/replaceWithNode.ts
index ffdcf87f..e1d32e2f 100644
--- a/packages/core/src/commands/replaceWithNode.ts
+++ b/packages/core/src/commands/replaceWithNode.ts
@@ -1,4 +1,4 @@
-import { Editor } from '../Editor'
+import { Command } from '../Editor'
 import { NodeType } from 'prosemirror-model'
 import getNodeType from '../utils/getNodeType'
 
@@ -11,7 +11,7 @@ type ReplaceWithNodeCommand = (
   typeOrName: NodeType,
   attrs: {},
   range?: Range,
-) => Editor
+) => Command
 
 declare module '../Editor' {
   interface Editor {
@@ -19,17 +19,18 @@ declare module '../Editor' {
   }
 }
 
-export default (next: Function, editor: Editor) => (typeOrName: NodeType, attrs: {}, range?: Range) => {
-  const { view, state, schema } = editor
-  const { $from, $to } = state.selection
-  const type = getNodeType(typeOrName, schema)
+export const replaceWithNode: ReplaceWithNodeCommand = (typeOrName, attrs = {}, range) => ({ view, tr, state }) => {
+  const { $from, $to } = tr.selection
+  const type = getNodeType(typeOrName, state.schema)
   const index = $from.index()
   const from = range ? range.from : $from.pos
   const to = range ? range.to : $to.pos
 
-  if ($from.parent.canReplaceWith(index, index, type)) {
-    view.dispatch(state.tr.replaceWith(from, to, type.create(attrs)))
+  if (!$from.parent.canReplaceWith(index, index, type)) {
+    return false
   }
+  
+  view.dispatch(tr.replaceWith(from, to, type.create(attrs)))
 
-  next()
+  return true
 }
diff --git a/packages/core/src/commands/selectAll.ts b/packages/core/src/commands/selectAll.ts
index 39b7b1a6..fcb3d3ea 100644
--- a/packages/core/src/commands/selectAll.ts
+++ b/packages/core/src/commands/selectAll.ts
@@ -1,7 +1,7 @@
-import { Editor } from '../Editor'
-import { selectAll } from 'prosemirror-commands'
+import { Command } from '../Editor'
+import { selectAll as originalSelectAll } from 'prosemirror-commands'
 
-type SelectAllCommand = () => Editor
+type SelectAllCommand = () => Command
 
 declare module '../Editor' {
   interface Editor {
@@ -9,7 +9,6 @@ declare module '../Editor' {
   }
 }
 
-export default (next: Function, { state, view }: Editor) => () => {
-  selectAll(state, view.dispatch)
-  next()
+export const selectAll: SelectAllCommand = () => ({ state, dispatch }) => {
+  return originalSelectAll(state, dispatch)
 }
diff --git a/packages/core/src/commands/selectParentNode.ts b/packages/core/src/commands/selectParentNode.ts
index 73ef2466..dbc29f92 100644
--- a/packages/core/src/commands/selectParentNode.ts
+++ b/packages/core/src/commands/selectParentNode.ts
@@ -1,7 +1,7 @@
-import { Editor } from '../Editor'
-import { selectParentNode } from 'prosemirror-commands'
+import { Command } from '../Editor'
+import { selectParentNode as originalSelectParentNode } from 'prosemirror-commands'
 
-type SelectParentNodeCommand = () => Editor
+type SelectParentNodeCommand = () => Command
 
 declare module '../Editor' {
   interface Editor {
@@ -9,7 +9,6 @@ declare module '../Editor' {
   }
 }
 
-export default (next: Function, { state, view }: Editor) => () => {
-  selectParentNode(state, view.dispatch)
-  next()
+export const selectParentNode: SelectParentNodeCommand = () => ({ state, dispatch }) => {
+  return originalSelectParentNode(state, dispatch)
 }
diff --git a/packages/core/src/commands/sinkListItem.ts b/packages/core/src/commands/sinkListItem.ts
index d2cfa5fa..e350cdba 100644
--- a/packages/core/src/commands/sinkListItem.ts
+++ b/packages/core/src/commands/sinkListItem.ts
@@ -1,9 +1,9 @@
-import { Editor } from '../Editor'
-import { sinkListItem } from 'prosemirror-schema-list'
+import { Command } from '../Editor'
+import { sinkListItem as originalSinkListItem } from 'prosemirror-schema-list'
 import { NodeType } from 'prosemirror-model'
 import getNodeType from '../utils/getNodeType'
 
-type SinkListItem = (typeOrName: string | NodeType) => Editor
+type SinkListItem = (typeOrName: string | NodeType) => Command
 
 declare module '../Editor' {
   interface Editor {
@@ -11,10 +11,8 @@ declare module '../Editor' {
   }
 }
 
-export default (next: Function, editor: Editor) => (typeOrName: string | NodeType) => {
-  const { view, state, schema } = editor
-  const type = getNodeType(typeOrName, schema)
+export const sinkListItem: SinkListItem = (typeOrName) => ({ state, dispatch }) => {
+  const type = getNodeType(typeOrName, state.schema)
 
-  sinkListItem(type)(state, view.dispatch)
-  next()
+  return originalSinkListItem(type)(state, dispatch)
 }
diff --git a/packages/core/src/commands/splitListItem.ts b/packages/core/src/commands/splitListItem.ts
index 81e9b4a7..9411eab7 100644
--- a/packages/core/src/commands/splitListItem.ts
+++ b/packages/core/src/commands/splitListItem.ts
@@ -1,9 +1,9 @@
-import { Editor } from '../Editor'
-import { splitListItem } from 'prosemirror-schema-list'
+import { Command } from '../Editor'
+import { splitListItem as originalSplitListItem } from 'prosemirror-schema-list'
 import { NodeType } from 'prosemirror-model'
 import getNodeType from '../utils/getNodeType'
 
-type SplitListItem = (typeOrName: string | NodeType) => Editor
+type SplitListItem = (typeOrName: string | NodeType) => Command
 
 declare module '../Editor' {
   interface Editor {
@@ -11,10 +11,8 @@ declare module '../Editor' {
   }
 }
 
-export default (next: Function, editor: Editor) => (typeOrName: string | NodeType) => {
-  const { view, state, schema } = editor
-  const type = getNodeType(typeOrName, schema)
+export const splitListItem: SplitListItem = (typeOrName) => ({ state, dispatch }) => {
+  const type = getNodeType(typeOrName, state.schema)
 
-  return splitListItem(type)(state, view.dispatch)
-  // next()
+  return originalSplitListItem(type)(state, dispatch)
 }
diff --git a/packages/core/src/commands/toggleMark.ts b/packages/core/src/commands/toggleMark.ts
index 62374342..5b2fe95a 100644
--- a/packages/core/src/commands/toggleMark.ts
+++ b/packages/core/src/commands/toggleMark.ts
@@ -1,9 +1,9 @@
-import { Editor } from '../Editor'
-import { toggleMark } from 'prosemirror-commands'
+import { Command } from '../Editor'
+import { toggleMark as originalToggleMark } from 'prosemirror-commands'
 import { MarkType } from 'prosemirror-model'
 import getMarkType from '../utils/getMarkType'
 
-type ToggleMarkCommand = (typeOrName: string | MarkType) => Editor
+type ToggleMarkCommand = (typeOrName: string | MarkType) => Command
 
 declare module '../Editor' {
   interface Editor {
@@ -11,10 +11,8 @@ declare module '../Editor' {
   }
 }
 
-export default (next: Function, editor: Editor) => (typeOrName: string | MarkType) => {
-  const { view, state, schema } = editor
-  const type = getMarkType(typeOrName, schema)
+export const toggleMark: ToggleMarkCommand = (typeOrName) => ({ state, dispatch }) => {
+  const type = getMarkType(typeOrName, state.schema)
 
-  toggleMark(type)(state, view.dispatch)
-  next()
+  return originalToggleMark(type)(state, dispatch)
 }
diff --git a/packages/core/src/commands/toggleNode.ts b/packages/core/src/commands/toggleNode.ts
index e654ad20..09d9ff3a 100644
--- a/packages/core/src/commands/toggleNode.ts
+++ b/packages/core/src/commands/toggleNode.ts
@@ -1,6 +1,6 @@
 import { NodeType } from 'prosemirror-model'
 import { setBlockType } from 'prosemirror-commands'
-import { Editor } from '../Editor'
+import { Command } from '../Editor'
 import nodeIsActive from '../utils/nodeIsActive'
 import getNodeType from '../utils/getNodeType'
 
@@ -8,7 +8,7 @@ type ToggleNodeCommand = (
   typeOrName: string | NodeType,
   toggleType: string | NodeType,
   attrs?: {}
-) => Editor
+) => Command
 
 declare module '../Editor' {
   interface Editor {
@@ -16,17 +16,14 @@ declare module '../Editor' {
   }
 }
 
-export default (next: Function, editor: Editor) => (typeOrName: string | NodeType, toggleTypeOrName: string | NodeType, attrs = {}) => {
-  const { view, state, schema } = editor
-  const type = getNodeType(typeOrName, schema)
-  const toggleType = getNodeType(toggleTypeOrName, schema)
+export const toggleNode: ToggleNodeCommand = (typeOrName, toggleTypeOrName, attrs = {}) => ({ state, dispatch }) => {
+  const type = getNodeType(typeOrName, state.schema)
+  const toggleType = getNodeType(toggleTypeOrName, state.schema)
   const isActive = nodeIsActive(state, type, attrs)
 
   if (isActive) {
-    setBlockType(toggleType)(view.state, view.dispatch)
+    return setBlockType(toggleType)(state, dispatch)
   } else {
-    setBlockType(type, attrs)(view.state, view.dispatch)
+    return setBlockType(type, attrs)(state, dispatch)
   }
-
-  next()
 }
diff --git a/packages/core/src/commands/updateMark.ts b/packages/core/src/commands/updateMark.ts
index a0f535e6..354dbdcf 100644
--- a/packages/core/src/commands/updateMark.ts
+++ b/packages/core/src/commands/updateMark.ts
@@ -1,4 +1,4 @@
-import { Editor } from '../Editor'
+import { Command } from '../Editor'
 import { MarkType } from 'prosemirror-model'
 import getMarkType from '../utils/getMarkType'
 import getMarkRange from '../utils/getMarkRange'
@@ -6,7 +6,7 @@ import getMarkRange from '../utils/getMarkRange'
 type UpdateMarkCommand = (
   typeOrName: string | MarkType,
   attrs: {},
-) => Editor
+) => Command
 
 declare module '../Editor' {
   interface Editor {
@@ -14,11 +14,10 @@ declare module '../Editor' {
   }
 }
 
-export default (next: Function, editor: Editor) => (typeOrName: string | MarkType, attrs = {}) => {
-  const { view, state, schema } = editor
-  const { tr, selection, doc } = state
+export const updateMark: UpdateMarkCommand = (typeOrName, attrs = {}) => ({ tr, state }) => {
+  const { selection, doc } = tr
   let { from, to, $from, empty } = selection
-  const type = getMarkType(typeOrName, schema)
+  const type = getMarkType(typeOrName, state.schema)
 
   if (empty) {
     const range = getMarkRange($from, type)
@@ -36,6 +35,6 @@ export default (next: Function, editor: Editor) => (typeOrName: string | MarkTyp
   }
 
   tr.addMark(from, to, type.create(attrs))
-  view.dispatch(tr)
-  next()
+
+  return true
 }
diff --git a/packages/extension-blockquote/index.ts b/packages/extension-blockquote/index.ts
index 848c226d..9d5ee350 100644
--- a/packages/extension-blockquote/index.ts
+++ b/packages/extension-blockquote/index.ts
@@ -21,12 +21,12 @@ export default new Node()
     ],
     toDOM: () => ['blockquote', 0],
   }))
-  .commands(({ editor, name }) => ({
-    [name]: next => attrs => {
-      editor.toggleNode(name, 'paragraph', attrs)
-      next()
-    },
-  }))
+  // .commands(({ editor, name }) => ({
+  //   [name]: next => attrs => {
+  //     editor.toggleNode(name, 'paragraph', attrs)
+  //     next()
+  //   },
+  // }))
   .keys(({ editor }) => ({
     'Shift-Mod-9': () => editor.blockquote(),
   }))
diff --git a/packages/extension-bold/index.ts b/packages/extension-bold/index.ts
index ca93bd55..400d1e88 100644
--- a/packages/extension-bold/index.ts
+++ b/packages/extension-bold/index.ts
@@ -1,8 +1,10 @@
-import { Mark, markInputRule, markPasteRule } from '@tiptap/core'
+import { Command, Mark, markInputRule, markPasteRule } from '@tiptap/core'
+
+export type BoldCommand = () => Command
 
 declare module '@tiptap/core/src/Editor' {
   interface Editor {
-    bold(): Editor,
+    bold: BoldCommand,
   }
 }
 
@@ -29,10 +31,9 @@ export default new Mark()
     ],
     toDOM: () => ['strong', 0],
   }))
-  .commands(({ editor, name }) => ({
-    bold: next => () => {
-      editor.toggleMark(name)
-      next()
+  .commands(({ name }) => ({
+    bold: () => ({ commands }) => {
+      return commands.toggleMark(name)
     },
   }))
   .keys(({ editor }) => ({
diff --git a/packages/extension-bullet-list/index.ts b/packages/extension-bullet-list/index.ts
index 79e4905b..6c39c1a5 100644
--- a/packages/extension-bullet-list/index.ts
+++ b/packages/extension-bullet-list/index.ts
@@ -17,12 +17,12 @@ export default new Node()
     ],
     toDOM: () => ['ul', 0],
   }))
-  .commands(({ editor, type }) => ({
-    [name]: next => attrs => {
-      // editor.toggleList(type, editor.schema.nodes.list_item)
-      next()
-    },
-  }))
+  // .commands(({ editor, type }) => ({
+  //   [name]: next => attrs => {
+  //     // editor.toggleList(type, editor.schema.nodes.list_item)
+  //     next()
+  //   },
+  // }))
   .keys(({ editor }) => ({
     'Shift-Ctrl-8': () => editor.bulletList(),
   }))
diff --git a/packages/extension-code-block/index.ts b/packages/extension-code-block/index.ts
index bd392542..5291e58d 100644
--- a/packages/extension-code-block/index.ts
+++ b/packages/extension-code-block/index.ts
@@ -21,12 +21,12 @@ export default new Node()
     ],
     toDOM: () => ['pre', ['code', 0]],
   }))
-  .commands(({ editor, name }) => ({
-    [name]: next => attrs => {
-      editor.toggleNode(name, 'paragraph', attrs)
-      next()
-    },
-  }))
+  // .commands(({ editor, name }) => ({
+  //   [name]: next => attrs => {
+  //     editor.toggleNode(name, 'paragraph', attrs)
+  //     next()
+  //   },
+  // }))
   .keys(({ editor }) => ({
     'Shift-Ctrl-\\': () => editor.codeBlock()
   }))
diff --git a/packages/extension-code/index.ts b/packages/extension-code/index.ts
index cba8c320..cb1f1c7c 100644
--- a/packages/extension-code/index.ts
+++ b/packages/extension-code/index.ts
@@ -18,12 +18,12 @@ export default new Mark()
     ],
     toDOM: () => ['code', 0],
   }))
-  .commands(({ editor, name }) => ({
-    code: next => () => {
-      editor.toggleMark(name)
-      next()
-    },
-  }))
+  // .commands(({ editor, name }) => ({
+  //   code: next => () => {
+  //     editor.toggleMark(name)
+  //     next()
+  //   },
+  // }))
   .keys(({ editor }) => ({
     'Mod-`': () => editor.code()
   }))
diff --git a/packages/extension-hard-break/index.ts b/packages/extension-hard-break/index.ts
index 1020fba1..a1fd83ba 100644
--- a/packages/extension-hard-break/index.ts
+++ b/packages/extension-hard-break/index.ts
@@ -18,19 +18,19 @@ export default new Node()
     ],
     toDOM: () => ['br'],
   }))
-  .commands(({ editor, type }) => ({
-    hardBreak: next => () => {
-      const { state, view } = editor
-      const { dispatch } = view
+  // .commands(({ editor, type }) => ({
+  //   hardBreak: next => () => {
+  //     const { state, view } = editor
+  //     const { dispatch } = view
 
-      chainCommands(exitCode, () => {
-        dispatch(state.tr.replaceSelectionWith(type.create()).scrollIntoView())
-        return true
-      })(state, dispatch, view)
+  //     chainCommands(exitCode, () => {
+  //       dispatch(state.tr.replaceSelectionWith(type.create()).scrollIntoView())
+  //       return true
+  //     })(state, dispatch, view)
 
-      next()
-    },
-  }))
+  //     next()
+  //   },
+  // }))
   .keys(({ editor }) => ({
     'Mod-Enter': () => editor.hardBreak(),
     'Shift-Enter': () => editor.hardBreak(),
diff --git a/packages/extension-heading/index.ts b/packages/extension-heading/index.ts
index f29fd39a..d38d69c8 100644
--- a/packages/extension-heading/index.ts
+++ b/packages/extension-heading/index.ts
@@ -1,4 +1,4 @@
-import { Node } from '@tiptap/core'
+import { Command, Node } from '@tiptap/core'
 import { textblockTypeInputRule } from 'prosemirror-inputrules'
 
 type Level = 1 | 2 | 3 | 4 | 5 | 6
@@ -7,9 +7,11 @@ export interface HeadingOptions {
   levels: Level[],
 }
 
+export type HeadingCommand = (level: Level) => Command
+
 declare module '@tiptap/core/src/Editor' {
   interface Editor {
-    heading(level: Level): Editor,
+    heading: HeadingCommand,
   }
 }
 
@@ -35,10 +37,9 @@ export default new Node<HeadingOptions>()
       })),
     toDOM: node => [`h${node.attrs.level}`, 0],
   }))
-  .commands(({ editor, name }) => ({
-    [name]: next => attrs => {
-      editor.toggleNode(name, 'paragraph', attrs)
-      next()
+  .commands(({ name }) => ({
+    [name]: attrs => ({ commands }) => {
+      return commands.toggleNode(name, 'paragraph', attrs)
     },
   }))
   // TODO: Keyboard Shortcuts
diff --git a/packages/extension-history/index.ts b/packages/extension-history/index.ts
index 4d17c61c..19b76388 100644
--- a/packages/extension-history/index.ts
+++ b/packages/extension-history/index.ts
@@ -1,4 +1,4 @@
-import { Extension } from '@tiptap/core'
+import { Command, Extension } from '@tiptap/core'
 import {
   history,
   undo,
@@ -9,8 +9,8 @@ import {
 
 declare module '@tiptap/core/src/Editor' {
   interface Editor {
-    undo(): Editor,
-    redo(): Editor,
+    undo: () => Command,
+    redo: () => Command,
   }
 }
 
@@ -24,13 +24,11 @@ export default new Extension<HistoryOptions>()
     historyPluginOptions: {},
   })
   .commands(() => ({
-    undo: (next, { view }) => () => {
-      undo(view.state, view.dispatch)
-      next()
+    undo: () => ({ state, dispatch }) => {
+      return undo(state, dispatch)
     },
-    redo: (next, { view }) => () => {
-      redo(view.state, view.dispatch)
-      next()
+    redo: () => ({ state, dispatch }) => {
+      return redo(state, dispatch)
     },
   }))
   .keys(({ editor }) => ({
diff --git a/packages/extension-horizontal-rule/index.ts b/packages/extension-horizontal-rule/index.ts
index 9804d105..86746101 100644
--- a/packages/extension-horizontal-rule/index.ts
+++ b/packages/extension-horizontal-rule/index.ts
@@ -13,15 +13,15 @@ export default new Node()
     parseDOM: [{ tag: 'hr' }],
     toDOM: () => ['hr'],
   }))
-  .commands(({ editor, type }) => ({
-    horizontalRule: next => () => {
-      const { state, view } = editor
-      const { dispatch } = view
+  // .commands(({ editor, type }) => ({
+  //   horizontalRule: next => () => {
+  //     const { state, view } = editor
+  //     const { dispatch } = view
 
-      dispatch(state.tr.replaceSelectionWith(type.create()))
-      next()
-    },
-  }))
+  //     dispatch(state.tr.replaceSelectionWith(type.create()))
+  //     next()
+  //   },
+  // }))
   .inputRules(({ type }) => [
     nodeInputRule(/^(?:---|___\s|\*\*\*\s)$/, type),
   ])
diff --git a/packages/extension-italic/index.ts b/packages/extension-italic/index.ts
index 237b8ac4..59ea8a95 100644
--- a/packages/extension-italic/index.ts
+++ b/packages/extension-italic/index.ts
@@ -1,8 +1,10 @@
-import { Mark, markInputRule, markPasteRule } from '@tiptap/core'
+import { Command, Mark, markInputRule, markPasteRule } from '@tiptap/core'
+
+export type ItalicCommand = () => Command
 
 declare module '@tiptap/core/src/Editor' {
   interface Editor {
-    italic(): Editor,
+    italic: ItalicCommand,
   }
 }
 
@@ -21,10 +23,9 @@ export default new Mark()
     ],
     toDOM: () => ['em', 0],
   }))
-  .commands(({ editor, name }) => ({
-    italic: next => () => {
-      editor.toggleMark(name)
-      next()
+  .commands(({ name }) => ({
+    italic: () => ({ commands }) => {
+      return commands.toggleMark(name)
     },
   }))
   .keys(({ editor }) => ({
diff --git a/packages/extension-strike/index.ts b/packages/extension-strike/index.ts
index 350648c4..815fe547 100644
--- a/packages/extension-strike/index.ts
+++ b/packages/extension-strike/index.ts
@@ -1,8 +1,10 @@
-import { Mark, markInputRule, markPasteRule } from '@tiptap/core'
+import { Command, Mark, markInputRule, markPasteRule } from '@tiptap/core'
+
+type StrikeCommand = () => Command
 
 declare module '@tiptap/core/src/Editor' {
   interface Editor {
-    strike(): Editor,
+    strike: StrikeCommand,
   }
 }
 
@@ -29,10 +31,9 @@ export default new Mark()
     ],
     toDOM: () => ['s', 0],
   }))
-  .commands(({ editor, name }) => ({
-    strike: next => () => {
-      editor.toggleMark(name)
-      next()
+  .commands(({ name }) => ({
+    strike: () => ({ commands }) => {
+      return commands.toggleMark(name)
     },
   }))
   .keys(({ editor }) => ({
diff --git a/packages/extension-underline/index.ts b/packages/extension-underline/index.ts
index abb950fa..465caae5 100644
--- a/packages/extension-underline/index.ts
+++ b/packages/extension-underline/index.ts
@@ -1,8 +1,10 @@
-import { Mark } from '@tiptap/core'
+import { Command, Mark } from '@tiptap/core'
+
+export type UnderlineCommand = () => Command
 
 declare module '@tiptap/core/src/Editor' {
   interface Editor {
-    underline(): Editor,
+    underline: UnderlineCommand,
   }
 }
 
@@ -21,9 +23,8 @@ export default new Mark()
     toDOM: () => ['u', 0],
   }))
   .commands(({ editor, name }) => ({
-    underline: next => () => {
-      editor.toggleMark(name)
-      next()
+    underline: () => ({ commands }) => {
+      return commands.toggleMark(name)
     },
   }))
   .keys(({ editor }) => ({

From 78ff453030e7b2a75d6d6db3f1d98ba38a32c897 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Mon, 21 Sep 2020 23:44:35 +0200
Subject: [PATCH 08/25] fix ts errors

---
 docs/gridsome.server.js                   |  2 +-
 packages/core/src/Editor.ts               | 14 ++++++++------
 packages/core/src/commands/insertHTML.ts  | 11 ++++++-----
 packages/core/src/commands/removeMarks.ts |  4 ++--
 packages/core/src/commands/setContent.ts  |  6 +-----
 packages/extension-list-item/index.ts     |  2 +-
 6 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/docs/gridsome.server.js b/docs/gridsome.server.js
index c4dc9255..7d9bfde2 100644
--- a/docs/gridsome.server.js
+++ b/docs/gridsome.server.js
@@ -71,7 +71,7 @@ module.exports = function (api) {
         .test(/\.tsx?$/)
         .use()
           .loader('ts-loader')
-          .options({ transpileOnly: true, appendTsSuffixTo: [/\.vue$/] })
+          .options({ transpileOnly: false, appendTsSuffixTo: [/\.vue$/] })
 
     config.module
       .rule('jsx')
diff --git a/packages/core/src/Editor.ts b/packages/core/src/Editor.ts
index 1509bbfa..a74273b6 100644
--- a/packages/core/src/Editor.ts
+++ b/packages/core/src/Editor.ts
@@ -134,15 +134,16 @@ export class Editor extends EventEmitter {
         tr,
       }
 
+      const self = this
       Object.defineProperty(props, 'commands', {
         get: function() {
           return Object.fromEntries(Object
-            .entries(this.commands)
+            .entries(self.commands)
             .map(([name, command]) => {
-              return [name, (...args) => command(...args)(props)]
+              return [name, (...args: any[]) => command(...args)(props)]
             }))
         }.bind(this)
-      });
+      })
 
       const callback = command(...args)(props)
 
@@ -154,7 +155,7 @@ export class Editor extends EventEmitter {
 
   public chain() {
     const { tr } = this.state
-    const callbacks = []
+    const callbacks: boolean[] = []
 
     return new Proxy({}, {
       get: (target, name: string, proxy) => {
@@ -179,12 +180,13 @@ export class Editor extends EventEmitter {
             tr,
           }
 
+          const self = this
           Object.defineProperty(props, 'commands', {
             get: function() {
               return Object.fromEntries(Object
-                .entries(this.commands)
+                .entries(self.commands)
                 .map(([name, command]) => {
-                  return [name, (...args) => command(...args)(props)]
+                  return [name, (...args: any[]) => command(...args)(props)]
                 }))
             }.bind(this)
           });
diff --git a/packages/core/src/commands/insertHTML.ts b/packages/core/src/commands/insertHTML.ts
index bec1e0ad..a21df16d 100644
--- a/packages/core/src/commands/insertHTML.ts
+++ b/packages/core/src/commands/insertHTML.ts
@@ -1,5 +1,5 @@
 import { DOMParser } from 'prosemirror-model'
-import { Selection } from 'prosemirror-state'
+import { Selection, Transaction } from 'prosemirror-state'
 import { Command } from '../Editor'
 import elementFromString from '../utils/elementFromString'
 import {ReplaceStep, ReplaceAroundStep} from "prosemirror-transform"
@@ -14,14 +14,15 @@ declare module '../Editor' {
 
 // TODO: move to utils
 // https://github.com/ProseMirror/prosemirror-state/blob/master/src/selection.js#L466
-function selectionToInsertionEnd(tr, startLen, bias) {
+function selectionToInsertionEnd(tr: Transaction, startLen: number, bias: number) {
   let last = tr.steps.length - 1
   if (last < startLen) return
   let step = tr.steps[last]
   if (!(step instanceof ReplaceStep || step instanceof ReplaceAroundStep)) return
-  let map = tr.mapping.maps[last], end
-  map.forEach((_from, _to, _newFrom, newTo) => { if (end == null) end = newTo })
-  tr.setSelection(Selection.near(tr.doc.resolve(end), bias))
+  let map = tr.mapping.maps[last]
+  let end = 0
+  map.forEach((_from, _to, _newFrom, newTo) => { if (end == 0) end = newTo })
+  tr.setSelection(Selection.near(tr.doc.resolve(end as unknown as number), bias))
 }
 
 export const insertHTML: InsertHTMLCommand = value => ({ tr, editor }) => {
diff --git a/packages/core/src/commands/removeMarks.ts b/packages/core/src/commands/removeMarks.ts
index 9fe98d41..8b4d2847 100644
--- a/packages/core/src/commands/removeMarks.ts
+++ b/packages/core/src/commands/removeMarks.ts
@@ -8,7 +8,7 @@ declare module '../Editor' {
   }
 }
 
-export const removeMarks: RemoveMarksCommand = () => ({ tr, state }) => {
+export const removeMarks: RemoveMarksCommand = () => ({ tr, state, view }) => {
   const { selection } = tr
   const { from, to, empty } = selection
 
@@ -19,7 +19,7 @@ export const removeMarks: RemoveMarksCommand = () => ({ tr, state }) => {
   Object
     .entries(state.schema.marks)
     .forEach(([name, mark]) => {
-      tr.removeMark(from, to, mark)
+      tr.removeMark(from, to, mark as any)
     })
 
   return true
diff --git a/packages/core/src/commands/setContent.ts b/packages/core/src/commands/setContent.ts
index bc9717bd..50a7641c 100644
--- a/packages/core/src/commands/setContent.ts
+++ b/packages/core/src/commands/setContent.ts
@@ -13,11 +13,7 @@ declare module '../Editor' {
   }
 }
 
-export const setContent: SetContentCommand = (content = null, emitUpdate = false, parseOptions = {}) => ({ tr, editor }) => {
-  if (content === null) {
-    return false
-  }
-
+export const setContent: SetContentCommand = (content = '', emitUpdate = false, parseOptions = {}) => ({ tr, editor }) => {
   const { createDocument } = editor
   const { doc } = tr
   const document = createDocument(content, parseOptions)
diff --git a/packages/extension-list-item/index.ts b/packages/extension-list-item/index.ts
index a29b53da..4b55442b 100644
--- a/packages/extension-list-item/index.ts
+++ b/packages/extension-list-item/index.ts
@@ -12,7 +12,7 @@ export default new Node()
     toDOM: () => ['li', 0],
   }))
   .keys(({ editor, name }) => ({
-    Enter: () => editor.splitListItem(name).focus()
+    // Enter: () => editor.chain().focus().splitListItem(name).run()
     // Tab: () => editor.sinkListItem(name),
     // 'Shift-Tab': () => editor.liftListItem(name),
   }))

From 655d72191421c6c15c181c83041755106108ec28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Mon, 21 Sep 2020 23:48:55 +0200
Subject: [PATCH 09/25] update dependencies

---
 docs/package.json                        | 10 +--
 package.json                             |  4 +-
 packages/core/package.json               |  4 +-
 packages/core/src/plugins/index.ts       |  2 +-
 packages/core/src/utils/undoInputRule.ts | 32 ---------
 packages/html/package.json               |  2 +-
 yarn.lock                                | 89 +++++++++++++-----------
 7 files changed, 59 insertions(+), 84 deletions(-)
 delete mode 100644 packages/core/src/utils/undoInputRule.ts

diff --git a/docs/package.json b/docs/package.json
index c839c3d5..b88d8662 100644
--- a/docs/package.json
+++ b/docs/package.json
@@ -10,26 +10,26 @@
     "@gridsome/remark-prismjs": "^0.4.0",
     "@gridsome/source-filesystem": "^0.6.2",
     "@gridsome/transformer-json": "^0.2.1",
-    "@gridsome/vue-remark": "^0.2.4",
+    "@gridsome/vue-remark": "^0.2.5",
     "@mvasilkov/outdent": "^1.0.4",
     "collect.js": "^4.28.2",
     "globby": "^11.0.0",
-    "gridsome": "0.7.20",
+    "gridsome": "0.7.21",
     "gridsome-plugin-simple-analytics": "^1.1.0",
     "raw-loader": "^4.0.0",
     "react": "^16.13.1",
     "react-dom": "^16.13.1",
     "remark-container": "^0.1.2",
-    "typescript": "^4.0.2",
+    "typescript": "^4.0.3",
     "vue-github-button": "^1.1.2"
   },
   "devDependencies": {
     "@babel/preset-env": "^7.11.5",
     "@babel/preset-react": "^7.10.4",
-    "html-loader": "^1.1.0",
+    "html-loader": "^1.3.1",
     "node-sass": "^4.14.1",
     "sass-loader": "^9.0.3",
     "style-resources-loader": "^1.3.3",
-    "ts-loader": "^8.0.3"
+    "ts-loader": "^8.0.4"
   }
 }
diff --git a/package.json b/package.json
index 7bc9f069..5a0b7abd 100644
--- a/package.json
+++ b/package.json
@@ -29,12 +29,12 @@
     "@types/prosemirror-state": "^1.2.5",
     "@types/prosemirror-transform": "^1.1.1",
     "@types/prosemirror-view": "^1.15.0",
-    "cypress": "^5.1.0",
+    "cypress": "^5.2.0",
     "lerna": "^3.22.1",
     "microbundle": "^0.12.3",
     "sass-loader": "^9.0.3",
     "typedoc": "^0.18.0",
-    "typescript": "^4.0.2",
+    "typescript": "^4.0.3",
     "vue": "^2.6.12"
   }
 }
diff --git a/packages/core/package.json b/packages/core/package.json
index 0e431465..8596d981 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -22,9 +22,9 @@
     "prosemirror-commands": "^1.1.3",
     "prosemirror-dropcursor": "^1.3.2",
     "prosemirror-gapcursor": "^1.1.5",
-    "prosemirror-inputrules": "^1.1.2",
+    "prosemirror-inputrules": "^1.1.3",
     "prosemirror-keymap": "^1.1.3",
-    "prosemirror-model": "^1.9.1",
+    "prosemirror-model": "^1.11.2",
     "prosemirror-schema-list": "^1.1.4",
     "prosemirror-state": "^1.3.3",
     "prosemirror-tables": "^1.1.1",
diff --git a/packages/core/src/plugins/index.ts b/packages/core/src/plugins/index.ts
index d4b64f83..188a1b3d 100644
--- a/packages/core/src/plugins/index.ts
+++ b/packages/core/src/plugins/index.ts
@@ -4,7 +4,7 @@ import { dropCursor } from 'prosemirror-dropcursor'
 import { gapCursor } from 'prosemirror-gapcursor'
 import editable from './editable'
 import focus from './focus'
-import undoInputRule from '../utils/undoInputRule'
+import { undoInputRule } from 'prosemirror-inputrules'
 
 export default [
   () => dropCursor(),
diff --git a/packages/core/src/utils/undoInputRule.ts b/packages/core/src/utils/undoInputRule.ts
deleted file mode 100644
index d3a94f18..00000000
--- a/packages/core/src/utils/undoInputRule.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import { EditorState, Transaction } from 'prosemirror-state'
-
-// source: https://github.com/ProseMirror/prosemirror-inputrules/blob/2d3ae3abe3428a1b4d343808915aafeff8563371/src/inputrules.js#L101
-export default function undoInputRule(state: EditorState, dispatch?: (tr: Transaction<any>) => void) {
-  let plugins = state.plugins
-
-  for (let i = 0; i < plugins.length; i++) {
-    let plugin = plugins[i], undoable
-    // @ts-ignore
-    if (plugin.spec.isInputRules && (undoable = plugin.getState(state))) {
-      if (dispatch) {
-        let tr = state.tr, toUndo = undoable.transform
-
-        for (let j = toUndo.steps.length - 1; j >= 0; j--) {
-          tr.step(toUndo.steps[j].invert(toUndo.docs[j]))
-        }
-
-        let marks = tr.doc.resolve(undoable.from).marks()
-
-        if (!undoable.text) {
-          return false
-        }
-
-        dispatch(tr.replaceWith(undoable.from, undoable.to, state.schema.text(undoable.text, marks)))
-      }
-
-      return true
-    }
-  }
-
-  return false
-}
\ No newline at end of file
diff --git a/packages/html/package.json b/packages/html/package.json
index ad70d7ef..b88cddfc 100644
--- a/packages/html/package.json
+++ b/packages/html/package.json
@@ -10,6 +10,6 @@
     "@tiptap/core": "2.x",
     "@types/jsdom": "^16.2.4",
     "jsdom": "^16.4.0",
-    "prosemirror-model": "^1.11.0"
+    "prosemirror-model": "^1.11.2"
   }
 }
diff --git a/yarn.lock b/yarn.lock
index 08d55f62..b4c5abe0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1146,10 +1146,10 @@
   dependencies:
     json-parse-better-errors "^1.0.2"
 
-"@gridsome/transformer-remark@^0.6.2":
-  version "0.6.2"
-  resolved "https://registry.yarnpkg.com/@gridsome/transformer-remark/-/transformer-remark-0.6.2.tgz#ab8822556cdbc9dd4a53115aa125668b233d6998"
-  integrity sha512-6kkdKg35vuCiZYfNxM+rqkZjG9ztgCAVT8bb3Kqqu+/FNCwMYUInIfWeW7ApAjj+ng/YFG1tB+fAABCeH3sEbw==
+"@gridsome/transformer-remark@^0.6.3":
+  version "0.6.3"
+  resolved "https://registry.yarnpkg.com/@gridsome/transformer-remark/-/transformer-remark-0.6.3.tgz#bac601e7f7aa8c346d83137334168059b6a26c9d"
+  integrity sha512-pU98Kn+/DIK1fBaop6QbL4+HMchbg3Nz57duBWVAtQ0WDLjNzYm1EnqsTjQyxrgt077sEjSLScrVmoAsxlsLZQ==
   dependencies:
     gray-matter "^4.0.2"
     hash-sum "^1.0.2"
@@ -1167,17 +1167,17 @@
     unist-util-visit "^1.4.0"
     vfile "^4.0.0"
 
-"@gridsome/vue-remark@^0.2.4":
-  version "0.2.4"
-  resolved "https://registry.yarnpkg.com/@gridsome/vue-remark/-/vue-remark-0.2.4.tgz#42bf05135269e4b550ca0ab34ba634b5e7d89627"
-  integrity sha512-l6MMzkcsWcwruuV9Ug3CFHA9187qgAK0BHe45/9cSG/Byqh78wsgC9ltZ8b0LroZTdKOb5m83pD0ptNlGETBnQ==
+"@gridsome/vue-remark@^0.2.5":
+  version "0.2.5"
+  resolved "https://registry.yarnpkg.com/@gridsome/vue-remark/-/vue-remark-0.2.5.tgz#cb84a09b62b57eca26599ddc29427fe4788b7f9c"
+  integrity sha512-zK/cQ/kf8T0p9cjHKa4ZiTbZKBTSi79hhkFemT3ubOJVTKwaPFiU2mw3lJYjiJn/RWViwWBHUrDRTktL8bnyZQ==
   dependencies:
     "@babel/core" "^7.0.0"
     "@babel/parser" "^7.0.0"
     "@babel/preset-env" "^7.0.0"
     "@babel/traverse" "^7.0.0"
     "@gridsome/source-filesystem" "^0.6.2"
-    "@gridsome/transformer-remark" "^0.6.2"
+    "@gridsome/transformer-remark" "^0.6.3"
     hash-sum "^1.0.2"
     hast-util-to-html "^5.0.0"
     he "^1.2.0"
@@ -4688,10 +4688,10 @@ cyclist@^1.0.1:
   resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-1.0.1.tgz#596e9698fd0c80e12038c2b82d6eb1b35b6224d9"
   integrity sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk=
 
-cypress@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/cypress/-/cypress-5.1.0.tgz#979e9ff3e0acd792eefd365bf104046479a9643b"
-  integrity sha512-craPRO+Viu4268s7eBvX5VJW8aBYcAQT+EwEccQSMY+eH1ZPwnxIgyDlmMWvxLVX9SkWxOlZbEycPyzanQScBQ==
+cypress@^5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/cypress/-/cypress-5.2.0.tgz#6902efd90703242a2539f0623c6e1118aff01f95"
+  integrity sha512-9S2spcrpIXrQ+CQIKHsjRoLQyRc2ehB06clJXPXXp1zyOL/uZMM3Qc20ipNki4CcNwY0nBTQZffPbRpODeGYQg==
   dependencies:
     "@cypress/listr-verbose-renderer" "^0.4.1"
     "@cypress/request" "^2.88.5"
@@ -6547,10 +6547,10 @@ graceful-fs@^4.1.10, graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb"
   integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==
 
-graphql-compose@^7.3.0:
-  version "7.21.0"
-  resolved "https://registry.yarnpkg.com/graphql-compose/-/graphql-compose-7.21.0.tgz#fdf154ff51a7c76624265d7e152cb53a6924d326"
-  integrity sha512-//zmQjJ8q4FS3Y13xFxdT/+keoD8mpi68aAWFQREvIr+ojnotvJ2qTj7vnHraGaHJAhjMj0kktTeSICDoXkeFQ==
+graphql-compose@7.20.1:
+  version "7.20.1"
+  resolved "https://registry.yarnpkg.com/graphql-compose/-/graphql-compose-7.20.1.tgz#9b44c1cae615d760c265ce515b3ddbcfdeaa7bd6"
+  integrity sha512-4SQgGGIeNdZn5+XrYgQ3ma+nKUzQG861TGB6tRVQaUALVZ6IraY0wzZtPmypR4un2B0Cvt90HXsF6pDQFNnwTA==
   dependencies:
     graphql-type-json "0.3.2"
     object-path "^0.11.4"
@@ -6598,10 +6598,10 @@ gridsome-plugin-simple-analytics@^1.1.0:
   dependencies:
     simple-analytics-vue "^1.1.0"
 
-gridsome@0.7.20:
-  version "0.7.20"
-  resolved "https://registry.yarnpkg.com/gridsome/-/gridsome-0.7.20.tgz#6b45135468db1185e5aea4b3e699d2c2d1e3557d"
-  integrity sha512-htk50W1dHLpoZ3iWQUZtBWki+STJDqzXxnrb/WBpDaGD9nW3gQK7HgPVVTVntqjTiJKoB1PT7q/g5mflJkgWuw==
+gridsome@0.7.21:
+  version "0.7.21"
+  resolved "https://registry.yarnpkg.com/gridsome/-/gridsome-0.7.21.tgz#8f1ed742a14ee2a88c0286b0d3e623d509d334f2"
+  integrity sha512-PtdVorQDpihsgr4IXeLH6QTySiPVNhadnSjEgQP8zfY+2Ir7goifPpIohOBT65nXJj/j7to9f429PSDTlJUe7w==
   dependencies:
     "@babel/code-frame" "^7.5.5"
     "@babel/core" "^7.0.0"
@@ -6633,7 +6633,7 @@ gridsome@0.7.20:
     fs-extra "^7.0.1"
     globby "^9.0.0"
     graphql "^14.4.2"
-    graphql-compose "^7.3.0"
+    graphql-compose "7.20.1"
     graphql-playground-middleware-express "^1.7.12"
     hash-sum "^1.0.2"
     hirestime "^3.2.1"
@@ -6979,15 +6979,15 @@ html-entities@^1.2.0:
   resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-1.3.1.tgz#fb9a1a4b5b14c5daba82d3e34c6ae4fe701a0e44"
   integrity sha512-rhE/4Z3hIhzHAUKbW8jVcCyuT5oJCXXqhN/6mXXVCpzTmvJnoH2HL/bt3EZ6p55jbFJBeAe1ZNpL5BugLujxNA==
 
-html-loader@^1.1.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/html-loader/-/html-loader-1.3.0.tgz#2cbca7794702818b60f55b3b7c73ab642236635a"
-  integrity sha512-c4ROd3YokzLWj6YUfI/NcqAsZI8ULtKfkE/8W862vxd2fMst4SVIQt+RVMNUnNmnz0p4uz7Wqc7PXZOdm5KAXA==
+html-loader@^1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/html-loader/-/html-loader-1.3.1.tgz#16ae142e23daa4f0d67a2ac2fccaa087be5d64e2"
+  integrity sha512-zL+z9mIhcXEXuHqzriTwZR4ZslZHi5IFNhjyJHyhJlhEgR8VtLTPbqeR5TdbNtHtb88zbVmlNB8ia2vr/GTrbA==
   dependencies:
     html-minifier-terser "^5.1.1"
     htmlparser2 "^4.1.0"
     loader-utils "^2.0.0"
-    schema-utils "^2.7.0"
+    schema-utils "^2.7.1"
 
 html-minifier-terser@^5.1.1:
   version "5.1.1"
@@ -10798,10 +10798,10 @@ prosemirror-history@^1.1.3:
     prosemirror-transform "^1.0.0"
     rope-sequence "^1.3.0"
 
-prosemirror-inputrules@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/prosemirror-inputrules/-/prosemirror-inputrules-1.1.2.tgz#487e46c763e1212a4577397aba7706139084f012"
-  integrity sha512-Ja5Z3BWestlHYGvtSGqyvxMeB8QEuBjlHM8YnKtLGUXMDp965qdDV4goV8lJb17kIWHk7e7JNj6Catuoa3302g==
+prosemirror-inputrules@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/prosemirror-inputrules/-/prosemirror-inputrules-1.1.3.tgz#93f9199ca02473259c30d7e352e4c14022d54638"
+  integrity sha512-ZaHCLyBtvbyIHv0f5p6boQTIJjlD6o2NPZiEaZWT2DA+j591zS29QQEMT4lBqwcLW3qRSf7ZvoKNbf05YrsStw==
   dependencies:
     prosemirror-state "^1.0.0"
     prosemirror-transform "^1.0.0"
@@ -10814,13 +10814,20 @@ prosemirror-keymap@^1.0.0, prosemirror-keymap@^1.1.2, prosemirror-keymap@^1.1.3:
     prosemirror-state "^1.0.0"
     w3c-keyname "^2.2.0"
 
-prosemirror-model@^1.0.0, prosemirror-model@^1.1.0, prosemirror-model@^1.11.0, prosemirror-model@^1.8.1, prosemirror-model@^1.9.1:
+prosemirror-model@^1.0.0, prosemirror-model@^1.1.0, prosemirror-model@^1.8.1:
   version "1.11.1"
   resolved "https://registry.yarnpkg.com/prosemirror-model/-/prosemirror-model-1.11.1.tgz#549d81afe1e887cfb2b42ab280c8bf54021dbdc4"
   integrity sha512-cscne7s40lTQbZrU8fHBGI5awS2qX91w9wChl3HicKG2lkPS6cdGQADXbDCIU8SFl6lQYEsmIzn8F66Wm19YhA==
   dependencies:
     orderedmap "^1.1.0"
 
+prosemirror-model@^1.11.2:
+  version "1.11.2"
+  resolved "https://registry.yarnpkg.com/prosemirror-model/-/prosemirror-model-1.11.2.tgz#3ce08172b465bc725c8808c18c2e9378fe69418d"
+  integrity sha512-+gM+x1VUfGAyKR/g0bK7FC46fVNq0xVVL859QAQ7my2p5HzKrPps/pSbYn7T50XTG2r2IhZJChsUFUBHtcoN0Q==
+  dependencies:
+    orderedmap "^1.1.0"
+
 prosemirror-schema-list@^1.1.4:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/prosemirror-schema-list/-/prosemirror-schema-list-1.1.4.tgz#471f9caf2d2bed93641d2e490434c0d2d4330df1"
@@ -11842,7 +11849,7 @@ schema-utils@^1.0.0:
     ajv-errors "^1.0.0"
     ajv-keywords "^3.1.0"
 
-schema-utils@^2.6.1, schema-utils@^2.6.5, schema-utils@^2.7.0:
+schema-utils@^2.6.1, schema-utils@^2.6.5, schema-utils@^2.7.0, schema-utils@^2.7.1:
   version "2.7.1"
   resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.1.tgz#1ca4f32d1b24c590c203b8e7a50bf0ea4cd394d7"
   integrity sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==
@@ -13121,10 +13128,10 @@ trough@^1.0.0:
   dependencies:
     glob "^7.1.2"
 
-ts-loader@^8.0.3:
-  version "8.0.3"
-  resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-8.0.3.tgz#56858f4296edf1ed55e01f8520552984d3f0911c"
-  integrity sha512-wsqfnVdB7xQiqhqbz2ZPLGHLPZbHVV5Qn/MNFZkCFxRU1miDyxKORucDGxKtsQJ63Rfza0udiUxWF5nHY6bpdQ==
+ts-loader@^8.0.4:
+  version "8.0.4"
+  resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-8.0.4.tgz#02b9c91fbcfdb3114d8b1e98a3829265270eee7a"
+  integrity sha512-5u8KF1SW8eCUb/Ff7At81e3wznPmT/27fvaGRO9CziVy+6NlPVRvrzSox4OwU0/e6OflOUB32Err4VquysCSAQ==
   dependencies:
     chalk "^2.3.0"
     enhanced-resolve "^4.0.0"
@@ -13234,10 +13241,10 @@ typescript@^3.9.5:
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.7.tgz#98d600a5ebdc38f40cb277522f12dc800e9e25fa"
   integrity sha512-BLbiRkiBzAwsjut4x/dsibSTB6yWpwT5qWmC2OfuCg3GgVQCSgMs4vEctYPhsaGtd0AeuuHMkjZ2h2WG8MSzRw==
 
-typescript@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.0.2.tgz#7ea7c88777c723c681e33bf7988be5d008d05ac2"
-  integrity sha512-e4ERvRV2wb+rRZ/IQeb3jm2VxBsirQLpQhdxplZ2MEzGvDkkMmPglecnNDfSUBivMjP93vRbngYYDQqQ/78bcQ==
+typescript@^4.0.3:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.0.3.tgz#153bbd468ef07725c1df9c77e8b453f8d36abba5"
+  integrity sha512-tEu6DGxGgRJPb/mVPIZ48e69xCn2yRmCgYmDugAVwmJ6o+0u1RI18eO7E7WBTLYLaEVVOhwQmcdhQHweux/WPg==
 
 uglify-js@3.4.x:
   version "3.4.10"

From dcac67c61af0ea28e25809feb9577cd60675c9cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Tue, 22 Sep 2020 09:08:08 +0200
Subject: [PATCH 10/25] fix more commands

---
 docs/src/demos/Examples/History/index.vue     |   4 +-
 docs/src/demos/Examples/Simple/index.vue      |  11 +-
 .../src/demos/Extensions/Blockquote/index.vue |   2 +-
 docs/src/demos/Extensions/Bold/index.vue      |   2 +-
 .../src/demos/Extensions/BulletList/index.vue |   2 +-
 docs/src/demos/Extensions/Code/index.vue      |   2 +-
 docs/src/demos/Extensions/CodeBlock/index.vue |   2 +-
 docs/src/demos/Extensions/HardBreak/index.vue |   2 +-
 docs/src/demos/Extensions/Heading/index.vue   |   6 +-
 docs/src/demos/Extensions/History/index.vue   |   4 +-
 .../demos/Extensions/HorizontalRule/index.vue |   2 +-
 docs/src/demos/Extensions/Italic/index.vue    |   2 +-
 docs/src/demos/Extensions/Strike/index.vue    |   2 +-
 docs/src/demos/Extensions/Underline/index.vue |   2 +-
 .../src/demos/Guide/BuildYourEditor/index.vue |  14 +-
 docs/src/demos/React/index.jsx                |   4 +-
 docs/src/demos/SimpleMenuBar/index.vue        |   2 +-
 docs/src/docPages/overview/upgrade-guide.md   |   2 +-
 packages/core/src/Editor.ts                   |   2 +-
 packages/extension-bullet-list/index.ts       |  11 +-
 packages/extension-code-block/index.ts        |  19 +-
 packages/extension-code/index.ts              |  17 +-
 packages/extension-hard-break/index.ts        |  27 ++-
 packages/extension-horizontal-rule/index.ts   |  20 +-
 yarn.lock                                     | 186 +++++++++---------
 25 files changed, 167 insertions(+), 182 deletions(-)

diff --git a/docs/src/demos/Examples/History/index.vue b/docs/src/demos/Examples/History/index.vue
index c7f014b6..de173234 100644
--- a/docs/src/demos/Examples/History/index.vue
+++ b/docs/src/demos/Examples/History/index.vue
@@ -1,10 +1,10 @@
 <template>
   <div>
     <div v-if="editor">
-      <button @click="editor.focus().undo()">
+      <button @click="editor.chain().focus().undo().run()">
         undo
       </button>
-      <button @click="editor.focus().redo()">
+      <button @click="editor.chain().focus().redo().run()">
         redo
       </button>
     </div>
diff --git a/docs/src/demos/Examples/Simple/index.vue b/docs/src/demos/Examples/Simple/index.vue
index 14a97cf5..bc7c2501 100644
--- a/docs/src/demos/Examples/Simple/index.vue
+++ b/docs/src/demos/Examples/Simple/index.vue
@@ -1,13 +1,5 @@
 <template>
-  <div>
-    <button @click="() => console.log(editor.focus())">focus</button>
-    <button @click="() => console.log(editor.insertText('hello'))">insert</button>
-    <button @click="editor.chain().focus().insertText('wat').insertHTML('<p>2</p>').run()">chain 1</button>
-    <button @click="editor.chain().insertText('1').focus().run()">chain 2</button>
-    <button @click="editor.chain().setContent('reset').insertText('1').clearContent().run()">setContent</button>
-    <button @click="editor.chain().focus().deleteSelection().run()">deleteSelection</button>
-    <editor-content :editor="editor" />
-  </div>
+  <editor-content :editor="editor" />
 </template>
 
 <script>
@@ -24,7 +16,6 @@ export default {
   data() {
     return {
       editor: null,
-      console: console,
     }
   },
 
diff --git a/docs/src/demos/Extensions/Blockquote/index.vue b/docs/src/demos/Extensions/Blockquote/index.vue
index 4400e641..3c49a4ac 100644
--- a/docs/src/demos/Extensions/Blockquote/index.vue
+++ b/docs/src/demos/Extensions/Blockquote/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div v-if="editor">
-    <button @click="editor.focus().blockquote()" :class="{ 'is-active': editor.isActive('blockquote') }">
+    <button @click="editor.chain().focus().blockquote().run()" :class="{ 'is-active': editor.isActive('blockquote') }">
       blockquote
     </button>
 
diff --git a/docs/src/demos/Extensions/Bold/index.vue b/docs/src/demos/Extensions/Bold/index.vue
index 15a0b064..8a0113cc 100644
--- a/docs/src/demos/Extensions/Bold/index.vue
+++ b/docs/src/demos/Extensions/Bold/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div v-if="editor">
-    <button @click="editor.focus().bold()" :class="{ 'is-active': editor.isActive('bold') }">
+    <button @click="editor.chain().focus().bold().run()" :class="{ 'is-active': editor.isActive('bold') }">
       bold
     </button>
 
diff --git a/docs/src/demos/Extensions/BulletList/index.vue b/docs/src/demos/Extensions/BulletList/index.vue
index 96ee5dd1..401ad57b 100644
--- a/docs/src/demos/Extensions/BulletList/index.vue
+++ b/docs/src/demos/Extensions/BulletList/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div v-if="editor">
-    <!-- <button @click="editor.focus().bulletList()" :class="{ 'is-active': editor.isActive('bulletList') }">
+    <!-- <button @click="editor.chain().focus().bulletList().run()" :class="{ 'is-active': editor.isActive('bulletList') }">
       bullet list
     </button> -->
 
diff --git a/docs/src/demos/Extensions/Code/index.vue b/docs/src/demos/Extensions/Code/index.vue
index 1fd678b7..8b188ad5 100644
--- a/docs/src/demos/Extensions/Code/index.vue
+++ b/docs/src/demos/Extensions/Code/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div v-if="editor">
-    <button @click="editor.focus().code()" :class="{ 'is-active': editor.isActive('code') }">
+    <button @click="editor.chain().focus().code().run()" :class="{ 'is-active': editor.isActive('code') }">
       code
     </button>
 
diff --git a/docs/src/demos/Extensions/CodeBlock/index.vue b/docs/src/demos/Extensions/CodeBlock/index.vue
index 84eefdf4..a8598483 100644
--- a/docs/src/demos/Extensions/CodeBlock/index.vue
+++ b/docs/src/demos/Extensions/CodeBlock/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div v-if="editor">
-    <button @click="editor.focus().codeBlock()" :class="{ 'is-active': editor.isActive('codeBlock') }">
+    <button @click="editor.chain().focus().codeBlock().run()" :class="{ 'is-active': editor.isActive('codeBlock') }">
       code block
     </button>
 
diff --git a/docs/src/demos/Extensions/HardBreak/index.vue b/docs/src/demos/Extensions/HardBreak/index.vue
index abe1009c..718751b7 100644
--- a/docs/src/demos/Extensions/HardBreak/index.vue
+++ b/docs/src/demos/Extensions/HardBreak/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div v-if="editor">
-    <button @click="editor.focus().hardBreak()">
+    <button @click="editor.chain().focus().hardBreak().run()">
       hardBreak
     </button>
 
diff --git a/docs/src/demos/Extensions/Heading/index.vue b/docs/src/demos/Extensions/Heading/index.vue
index 893259e5..c3dd7808 100644
--- a/docs/src/demos/Extensions/Heading/index.vue
+++ b/docs/src/demos/Extensions/Heading/index.vue
@@ -1,12 +1,12 @@
 <template>
   <div v-if="editor">
-    <button @click="editor.focus().heading({ level: 1 })" :class="{ 'is-active': editor.isActive('heading', { level: 1 }) }">
+    <button @click="editor.chain().focus().heading({ level: 1 }).run()" :class="{ 'is-active': editor.isActive('heading', { level: 1 }) }">
       h1
     </button>
-    <button @click="editor.focus().heading({ level: 2 })" :class="{ 'is-active': editor.isActive('heading', { level: 2 }) }">
+    <button @click="editor.chain().focus().heading({ level: 2 }).run()" :class="{ 'is-active': editor.isActive('heading', { level: 2 }) }">
       h2
     </button>
-    <button @click="editor.focus().heading({ level: 3 })" :class="{ 'is-active': editor.isActive('heading', { level: 3 }) }">
+    <button @click="editor.chain().focus().heading({ level: 3 }).run()" :class="{ 'is-active': editor.isActive('heading', { level: 3 }) }">
       h3
     </button>
 
diff --git a/docs/src/demos/Extensions/History/index.vue b/docs/src/demos/Extensions/History/index.vue
index 01380e9a..32cddd50 100644
--- a/docs/src/demos/Extensions/History/index.vue
+++ b/docs/src/demos/Extensions/History/index.vue
@@ -1,9 +1,9 @@
 <template>
   <div v-if="editor">
-    <button @click="editor.focus().undo()">
+    <button @click="editor.chain().focus().undo().run()">
       undo
     </button>
-    <button @click="editor.focus().redo()">
+    <button @click="editor.chain().focus().redo().run()">
       redo
     </button>
 
diff --git a/docs/src/demos/Extensions/HorizontalRule/index.vue b/docs/src/demos/Extensions/HorizontalRule/index.vue
index 88995efc..b6ac4dea 100644
--- a/docs/src/demos/Extensions/HorizontalRule/index.vue
+++ b/docs/src/demos/Extensions/HorizontalRule/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div v-if="editor">
-    <button @click="editor.focus().horizontalRule()">
+    <button @click="editor.chain().focus().horizontalRule().run()">
       horizontalRule
     </button>
 
diff --git a/docs/src/demos/Extensions/Italic/index.vue b/docs/src/demos/Extensions/Italic/index.vue
index 4bb9ac4f..1ca72e0a 100644
--- a/docs/src/demos/Extensions/Italic/index.vue
+++ b/docs/src/demos/Extensions/Italic/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div v-if="editor">
-    <button @click="editor.focus().italic()" :class="{ 'is-active': editor.isActive('italic') }">
+    <button @click="editor.chain().focus().italic().run()" :class="{ 'is-active': editor.isActive('italic') }">
       italic
     </button>
 
diff --git a/docs/src/demos/Extensions/Strike/index.vue b/docs/src/demos/Extensions/Strike/index.vue
index 4bb21f49..54bd0233 100644
--- a/docs/src/demos/Extensions/Strike/index.vue
+++ b/docs/src/demos/Extensions/Strike/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div v-if="editor">
-    <button @click="editor.focus().strike()" :class="{ 'is-active': editor.isActive('strike') }">
+    <button @click="editor.chain().focus().strike().run()" :class="{ 'is-active': editor.isActive('strike') }">
       strike
     </button>
 
diff --git a/docs/src/demos/Extensions/Underline/index.vue b/docs/src/demos/Extensions/Underline/index.vue
index 4c51c58e..a56ff0fd 100644
--- a/docs/src/demos/Extensions/Underline/index.vue
+++ b/docs/src/demos/Extensions/Underline/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div v-if="editor">
-    <button @click="editor.focus().underline()" :class="{ 'is-active': editor.isActive('underline') }">
+    <button @click="editor.chain().focus().underline().run()" :class="{ 'is-active': editor.isActive('underline') }">
       underline
     </button>
 
diff --git a/docs/src/demos/Guide/BuildYourEditor/index.vue b/docs/src/demos/Guide/BuildYourEditor/index.vue
index c1800d82..c1dc2d7f 100644
--- a/docs/src/demos/Guide/BuildYourEditor/index.vue
+++ b/docs/src/demos/Guide/BuildYourEditor/index.vue
@@ -1,25 +1,25 @@
 <template>
   <div>
     <div v-if="editor">
-      <button @click="editor.focus().removeMarks()">
+      <button @click="editor.chain().focus().removeMarks().run()">
         clear formatting
       </button>
-      <button @click="editor.focus().undo()">
+      <button @click="editor.chain().focus().undo().run()">
         undo
       </button>
-      <button @click="editor.focus().redo()">
+      <button @click="editor.chain().focus().redo().run()">
         redo
       </button>
-      <button @click="editor.focus().bold()" :class="{ 'is-active': editor.isActive('bold') }">
+      <button @click="editor.chain().focus().bold().run()" :class="{ 'is-active': editor.isActive('bold') }">
         bold
       </button>
-      <button @click="editor.focus().italic()" :class="{ 'is-active': editor.isActive('italic') }">
+      <button @click="editor.chain().focus().italic().run()" :class="{ 'is-active': editor.isActive('italic') }">
         italic
       </button>
-      <button @click="editor.focus().heading({ level: 1 })" :class="{ 'is-active': editor.isActive('heading', { level: 1 }) }">
+      <button @click="editor.chain().focus().heading({ level: 1 }).run()" :class="{ 'is-active': editor.isActive('heading', { level: 1 }) }">
         h1
       </button>
-      <button @click="editor.focus().heading({ level: 2 })" :class="{ 'is-active': editor.isActive('heading', { level: 2 }) }">
+      <button @click="editor.chain().focus().heading({ level: 2 }).run()" :class="{ 'is-active': editor.isActive('heading', { level: 2 }) }">
         h2
       </button>
     </div>
diff --git a/docs/src/demos/React/index.jsx b/docs/src/demos/React/index.jsx
index 630a3d56..71974c17 100644
--- a/docs/src/demos/React/index.jsx
+++ b/docs/src/demos/React/index.jsx
@@ -9,12 +9,12 @@ const MenuBar = () => {
 
   return (
     <>
-      <button onClick={() => editor.focus().removeMarks()}>
+      <button onClick={() => editor.chain().focus().removeMarks().run()}>
         Clear formatting
       </button>
       <button
         className={`${editor.isActive('bold') ? 'is-active' : ''}`}
-        onClick={() => editor.focus().bold()}
+        onClick={() => editor.chain().focus().bold().run()}
       >
         Bold
       </button>
diff --git a/docs/src/demos/SimpleMenuBar/index.vue b/docs/src/demos/SimpleMenuBar/index.vue
index 6ecb79ef..bc14f862 100644
--- a/docs/src/demos/SimpleMenuBar/index.vue
+++ b/docs/src/demos/SimpleMenuBar/index.vue
@@ -5,7 +5,7 @@
       <button
         class="menubar__button"
         :class="{ 'is-active': editor.isActive('bold') }"
-        @click="editor.focus().bold()"
+        @click="editor.chain().focus().bold().run()"
       >
         Bold
       </button>
diff --git a/docs/src/docPages/overview/upgrade-guide.md b/docs/src/docPages/overview/upgrade-guide.md
index df195d26..1fb70bdb 100644
--- a/docs/src/docPages/overview/upgrade-guide.md
+++ b/docs/src/docPages/overview/upgrade-guide.md
@@ -73,5 +73,5 @@ Currently, blockquotes must not be nested anymore. That said, we’re working on
 We tried to hide the `.focus()` command from you with tiptap 1 and executed that on every other command. That led to issues in specific use cases, where you want to run a command, but don’t want to focus the editor. With tiptap 2.x you have to explicitly call the `focus()` and you probably want to do that in a lot of places. Here is an example:
 
 ```js
-editor.focus().bold()
+editor.chain().focus().bold().run()
 ```
diff --git a/packages/core/src/Editor.ts b/packages/core/src/Editor.ts
index a74273b6..6c1d4131 100644
--- a/packages/core/src/Editor.ts
+++ b/packages/core/src/Editor.ts
@@ -28,7 +28,7 @@ export type Command = (props: {
   commands: any
   state: EditorState,
   view: EditorView,
-  dispatch: () => any
+  dispatch: (args?: any) => any
 }) => boolean
 
 export interface CommandSpec {
diff --git a/packages/extension-bullet-list/index.ts b/packages/extension-bullet-list/index.ts
index 6c39c1a5..c2e2e87a 100644
--- a/packages/extension-bullet-list/index.ts
+++ b/packages/extension-bullet-list/index.ts
@@ -1,9 +1,11 @@
-import { Node } from '@tiptap/core'
+import { Command, Node } from '@tiptap/core'
 import { wrappingInputRule } from 'prosemirror-inputrules'
 
+export type BulletListCommand = () => Command
+
 declare module '@tiptap/core/src/Editor' {
   interface Editor {
-    bulletList(): Editor,
+    bulletList: BulletListCommand,
   }
 }
 
@@ -18,9 +20,8 @@ export default new Node()
     toDOM: () => ['ul', 0],
   }))
   // .commands(({ editor, type }) => ({
-  //   [name]: next => attrs => {
-  //     // editor.toggleList(type, editor.schema.nodes.list_item)
-  //     next()
+  //   bulletList: () => ({ commands }) => {
+  //     return commands.toggleList(type, editor.schema.nodes.list_item)
   //   },
   // }))
   .keys(({ editor }) => ({
diff --git a/packages/extension-code-block/index.ts b/packages/extension-code-block/index.ts
index 5291e58d..77612d77 100644
--- a/packages/extension-code-block/index.ts
+++ b/packages/extension-code-block/index.ts
@@ -1,14 +1,16 @@
-import { Node } from '@tiptap/core'
+import { Command, Node } from '@tiptap/core'
 import { textblockTypeInputRule } from 'prosemirror-inputrules'
 
+export type CodeBlockCommand = () => Command
+
 declare module '@tiptap/core/src/Editor' {
   interface Editor {
-    codeBlock(): Editor,
+    codeBlock: CodeBlockCommand,
   }
 }
 
 export default new Node()
-  .name('codeBlock')
+  .name('code_block')
   .schema(() => ({
     content: 'text*',
     marks: '',
@@ -21,12 +23,11 @@ export default new Node()
     ],
     toDOM: () => ['pre', ['code', 0]],
   }))
-  // .commands(({ editor, name }) => ({
-  //   [name]: next => attrs => {
-  //     editor.toggleNode(name, 'paragraph', attrs)
-  //     next()
-  //   },
-  // }))
+  .commands(({ name }) => ({
+    codeBlock: attrs => ({ commands }) => {
+      return commands.toggleNode(name, 'paragraph', attrs)
+    },
+  }))
   .keys(({ editor }) => ({
     'Shift-Ctrl-\\': () => editor.codeBlock()
   }))
diff --git a/packages/extension-code/index.ts b/packages/extension-code/index.ts
index cb1f1c7c..c7f624e5 100644
--- a/packages/extension-code/index.ts
+++ b/packages/extension-code/index.ts
@@ -1,8 +1,10 @@
-import { Mark, markInputRule, markPasteRule } from '@tiptap/core'
+import { Command, Mark, markInputRule, markPasteRule } from '@tiptap/core'
+
+export type CodeCommand = () => Command
 
 declare module '@tiptap/core/src/Editor' {
   interface Editor {
-    code(): Editor,
+    code: CodeCommand,
   }
 }
 
@@ -18,12 +20,11 @@ export default new Mark()
     ],
     toDOM: () => ['code', 0],
   }))
-  // .commands(({ editor, name }) => ({
-  //   code: next => () => {
-  //     editor.toggleMark(name)
-  //     next()
-  //   },
-  // }))
+  .commands(({ name }) => ({
+    code: () => ({ commands }) => {
+      return commands.toggleMark(name)
+    },
+  }))
   .keys(({ editor }) => ({
     'Mod-`': () => editor.code()
   }))
diff --git a/packages/extension-hard-break/index.ts b/packages/extension-hard-break/index.ts
index a1fd83ba..77bc1fc0 100644
--- a/packages/extension-hard-break/index.ts
+++ b/packages/extension-hard-break/index.ts
@@ -1,9 +1,11 @@
-import { Node } from '@tiptap/core'
+import { Command, Node } from '@tiptap/core'
 import { chainCommands, exitCode } from 'prosemirror-commands'
 
+export type HardBreakCommand = () => Command
+
 declare module '@tiptap/core/src/Editor' {
   interface Editor {
-    hardBreak(): Editor,
+    hardBreak: HardBreakCommand,
   }
 }
 
@@ -18,19 +20,14 @@ export default new Node()
     ],
     toDOM: () => ['br'],
   }))
-  // .commands(({ editor, type }) => ({
-  //   hardBreak: next => () => {
-  //     const { state, view } = editor
-  //     const { dispatch } = view
-
-  //     chainCommands(exitCode, () => {
-  //       dispatch(state.tr.replaceSelectionWith(type.create()).scrollIntoView())
-  //       return true
-  //     })(state, dispatch, view)
-
-  //     next()
-  //   },
-  // }))
+  .commands(({ editor, type }) => ({
+    hardBreak: () => ({ tr, state, dispatch, view }) => {
+      return chainCommands(exitCode, () => {
+        dispatch(tr.replaceSelectionWith(type.create()).scrollIntoView())
+        return true
+      })(state, dispatch, view)
+    },
+  }))
   .keys(({ editor }) => ({
     'Mod-Enter': () => editor.hardBreak(),
     'Shift-Enter': () => editor.hardBreak(),
diff --git a/packages/extension-horizontal-rule/index.ts b/packages/extension-horizontal-rule/index.ts
index 86746101..7a4be787 100644
--- a/packages/extension-horizontal-rule/index.ts
+++ b/packages/extension-horizontal-rule/index.ts
@@ -1,8 +1,10 @@
-import { Node, nodeInputRule } from '@tiptap/core'
+import { Command, Node, nodeInputRule } from '@tiptap/core'
+
+export type HorizontalRuleCommand = () => Command
 
 declare module '@tiptap/core/src/Editor' {
   interface Editor {
-    horizontalRule(): Editor,
+    horizontalRule: HorizontalRuleCommand,
   }
 }
 
@@ -13,15 +15,13 @@ export default new Node()
     parseDOM: [{ tag: 'hr' }],
     toDOM: () => ['hr'],
   }))
-  // .commands(({ editor, type }) => ({
-  //   horizontalRule: next => () => {
-  //     const { state, view } = editor
-  //     const { dispatch } = view
+  .commands(({ type }) => ({
+    horizontalRule: () => ({ tr }) => {
+      tr.replaceSelectionWith(type.create())
 
-  //     dispatch(state.tr.replaceSelectionWith(type.create()))
-  //     next()
-  //   },
-  // }))
+      return true
+    },
+  }))
   .inputRules(({ type }) => [
     nodeInputRule(/^(?:---|___\s|\*\*\*\s)$/, type),
   ])
diff --git a/yarn.lock b/yarn.lock
index b4c5abe0..26b964a5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2021,16 +2021,16 @@
     once "^1.4.0"
 
 "@octokit/request@^5.2.0":
-  version "5.4.8"
-  resolved "https://registry.yarnpkg.com/@octokit/request/-/request-5.4.8.tgz#13ad36e172bb57e78bacf02cd86210d1f7412f04"
-  integrity sha512-mWbxjsARJzAq5xp+ZrQfotc+MHFz3/Am2qATJwflv4PZ1TjhgIJnr60PCVdZT9Z/tl+uPXooaVgeviy1KkDlLQ==
+  version "5.4.9"
+  resolved "https://registry.yarnpkg.com/@octokit/request/-/request-5.4.9.tgz#0a46f11b82351b3416d3157261ad9b1558c43365"
+  integrity sha512-CzwVvRyimIM1h2n9pLVYfTDmX9m+KHSgCpqPsY8F1NdEK8IaWqXhSBXsdjOBFZSpEcxNEeg4p0UO9cQ8EnOCLA==
   dependencies:
     "@octokit/endpoint" "^6.0.1"
     "@octokit/request-error" "^2.0.0"
     "@octokit/types" "^5.0.0"
     deprecation "^2.0.0"
     is-plain-object "^5.0.0"
-    node-fetch "^2.3.0"
+    node-fetch "^2.6.1"
     once "^1.4.0"
     universal-user-agent "^6.0.0"
 
@@ -2064,9 +2064,9 @@
     "@types/node" ">= 8"
 
 "@octokit/types@^5.0.0", "@octokit/types@^5.0.1":
-  version "5.4.1"
-  resolved "https://registry.yarnpkg.com/@octokit/types/-/types-5.4.1.tgz#d5d5f2b70ffc0e3f89467c3db749fa87fc3b7031"
-  integrity sha512-OlMlSySBJoJ6uozkr/i03nO5dlYQyE05vmQNZhAh9MyO4DPBP88QlwsDVLmVjIMFssvIZB6WO0ctIGMRG+xsJQ==
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/@octokit/types/-/types-5.5.0.tgz#e5f06e8db21246ca102aa28444cdb13ae17a139b"
+  integrity sha512-UZ1pErDue6bZNjYOotCNveTXArOMZQFG6hKJfOnGnulVCMcVVi7YIIuuR4WfBhjo7zgpmzn/BkPDnUXtNx+PcQ==
   dependencies:
     "@types/node" ">= 8"
 
@@ -2210,9 +2210,9 @@
   integrity sha1-aaI6OtKcrwCX8G7aWbNh7i8GOfY=
 
 "@types/node@*", "@types/node@>= 8":
-  version "14.10.1"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.10.1.tgz#cc323bad8e8a533d4822f45ce4e5326f36e42177"
-  integrity sha512-aYNbO+FZ/3KGeQCEkNhHFRIzBOUgc7QvcVNKXbfnhDkSfwUv91JsQQa10rDgKSTSLkXZ1UIyPe4FJJNVgw1xWQ==
+  version "14.11.2"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.11.2.tgz#2de1ed6670439387da1c9f549a2ade2b0a799256"
+  integrity sha512-jiE3QIxJ8JLNcb1Ps6rDbysDhN4xa8DJJvuC9prr6w+1tIh+QAbYyNF3tyiZNLDBIuBCf4KEcV2UvQm/V60xfA==
 
 "@types/normalize-package-data@^2.4.0":
   version "2.4.0"
@@ -2396,9 +2396,9 @@
   integrity sha512-1+7CwjQ0Kasml6rHoNQUmbISwqLNNfFVBUcZl6QBremUl296ZmLrVQPqJP5pyAAWjZke5bpI1hlj+LVVuT7Jcg==
 
 "@vue/babel-plugin-jsx@^1.0.0-0":
-  version "1.0.0-rc.2"
-  resolved "https://registry.yarnpkg.com/@vue/babel-plugin-jsx/-/babel-plugin-jsx-1.0.0-rc.2.tgz#2c72a6bf6d10f57bb6bf1a2799214a541933345b"
-  integrity sha512-NVTDsaYShZx8ZqZo1Z0ndNrdoLfwRTwz0e6S+7SEn3j21WwlbVHMhD6t/tDBhvscwAQ5N/AFuCCrf90iyC5sHA==
+  version "1.0.0-rc.3"
+  resolved "https://registry.yarnpkg.com/@vue/babel-plugin-jsx/-/babel-plugin-jsx-1.0.0-rc.3.tgz#ab477ee95c764fbe68842a2eddd474f122e70ac6"
+  integrity sha512-/Ibq0hoKsidnHWPhgRpjcjYhYcHpqEm2fiKVAPO88OXZNHGwaGgS4yXkC6TDEvlZep4mBDo+2S5T81wpbVh90Q==
   dependencies:
     "@babel/helper-module-imports" "^7.0.0"
     "@babel/plugin-syntax-jsx" "^7.0.0"
@@ -2771,9 +2771,9 @@ ajv-keywords@^3.1.0, ajv-keywords@^3.4.1, ajv-keywords@^3.5.2:
   integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==
 
 ajv@^6.1.0, ajv@^6.10.2, ajv@^6.12.3, ajv@^6.12.4:
-  version "6.12.4"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.4.tgz#0614facc4522127fa713445c6bfd3ebd376e2234"
-  integrity sha512-eienB2c9qVQs2KWexhkrdMLVDoIQCz5KSeLxwg9Lzk4DOfBtIK9PQwwufcsn1jjGuf9WZmqPMbGxOzfcuphJCQ==
+  version "6.12.5"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.5.tgz#19b0e8bae8f476e5ba666300387775fb1a00a4da"
+  integrity sha512-lRF8RORchjpKG50/WFf8xmg7sgCLFiYNNnqdKflk63whMQcWR5ngGjiSXkL9bjxy6B2npOK2HSMN49jEBMSkag==
   dependencies:
     fast-deep-equal "^3.1.1"
     fast-json-stable-stringify "^2.0.0"
@@ -3436,13 +3436,13 @@ browserify-zlib@^0.2.0:
     pako "~1.0.5"
 
 browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.8.5:
-  version "4.14.2"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.14.2.tgz#1b3cec458a1ba87588cc5e9be62f19b6d48813ce"
-  integrity sha512-HI4lPveGKUR0x2StIz+2FXfDk9SfVMrxn6PLh1JeGUwcuoDkdKZebWiyLRJ68iIPDpMI4JLVDf7S7XzslgWOhw==
+  version "4.14.3"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.14.3.tgz#381f9e7f13794b2eb17e1761b4f118e8ae665a53"
+  integrity sha512-GcZPC5+YqyPO4SFnz48/B0YaCwS47Q9iPChRGi6t7HhflKBcINzFrJvRfC+jp30sRMKxF+d4EHGs27Z0XP1NaQ==
   dependencies:
-    caniuse-lite "^1.0.30001125"
-    electron-to-chromium "^1.3.564"
-    escalade "^3.0.2"
+    caniuse-lite "^1.0.30001131"
+    electron-to-chromium "^1.3.570"
+    escalade "^3.1.0"
     node-releases "^1.1.61"
 
 btoa-lite@^1.0.0:
@@ -3709,10 +3709,10 @@ caniuse-api@^3.0.0:
     lodash.memoize "^4.1.2"
     lodash.uniq "^4.5.0"
 
-caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001125:
-  version "1.0.30001125"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001125.tgz#2a1a51ee045a0a2207474b086f628c34725e997b"
-  integrity sha512-9f+r7BW8Qli917mU3j0fUaTweT3f3vnX/Lcs+1C73V+RADmFme+Ih0Br8vONQi3X0lseOe6ZHfsZLCA8MSjxUA==
+caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001131:
+  version "1.0.30001135"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001135.tgz#995b1eb94404a3c9a0d7600c113c9bb27f2cd8aa"
+  integrity sha512-ziNcheTGTHlu9g34EVoHQdIu5g4foc8EsxMGC7Xkokmvw0dqNtX8BS8RgCgFBaAiSp2IdjvBxNdh0ssib28eVQ==
 
 case-sensitive-paths-webpack-plugin@^2.2.0:
   version "2.3.0"
@@ -4792,11 +4792,11 @@ debug@^3.1.0, debug@^3.1.1, debug@^3.2.6:
     ms "^2.1.1"
 
 debug@^4.1.0, debug@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791"
-  integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.2.0.tgz#7f150f93920e94c58f5574c2fd01a3110effe7f1"
+  integrity sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==
   dependencies:
-    ms "^2.1.1"
+    ms "2.1.2"
 
 debuglog@^1.0.1:
   version "1.0.1"
@@ -5086,9 +5086,9 @@ dom-serializer@0:
     entities "^2.0.0"
 
 dom-serializer@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-1.0.1.tgz#79695eb49af3cd8abc8d93a73da382deb1ca0795"
-  integrity sha512-1Aj1Qy3YLbdslkI75QEOfdp9TkQ3o8LRISAzxOibjBs/xWwr1WxZFOQphFkZuepHFGo+kB8e5FVJSS0faAJ4Rw==
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-1.1.0.tgz#5f7c828f1bfc44887dc2a315ab5c45691d544b58"
+  integrity sha512-ox7bvGXt2n+uLWtCRLybYx60IrOlWL/aCebWJk1T0d4m3y2tzf4U3ij9wBMUb6YJZpz06HCCYuyCDveE2xXmzQ==
   dependencies:
     domelementtype "^2.0.1"
     domhandler "^3.0.0"
@@ -5105,9 +5105,9 @@ domelementtype@1, domelementtype@^1.3.1:
   integrity sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==
 
 domelementtype@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.0.1.tgz#1f8bdfe91f5a78063274e803b4bdcedf6e94f94d"
-  integrity sha512-5HOHUDsYZWV8FGWN0Njbr/Rn7f/eWSQi1v7+HsUVwXgn8nWWlL64zKDkS0n8ZmQ3mlWOMuXOnR+7Nx/5tMO5AQ==
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.0.2.tgz#f3b6e549201e46f588b59463dd77187131fe6971"
+  integrity sha512-wFwTwCVebUrMgGeAwRL/NhZtHAUyT9n9yg4IMDwf10+6iCMxSkVq9MGCVEH+QZWo1nNidy8kNvwmv4zWHDTqvA==
 
 domexception@^2.0.1:
   version "2.0.1"
@@ -5147,9 +5147,9 @@ domutils@^1.5.1, domutils@^1.7.0:
     domelementtype "1"
 
 domutils@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/domutils/-/domutils-2.2.0.tgz#f3ce1610af5c30280bde1b71f84b018b958f32cf"
-  integrity sha512-0haAxVr1PR0SqYwCH7mxMpHZUwjih9oPPedqpR/KufsnxPyZ9dyVw1R5093qnJF3WXSbjBkdzRWLw/knJV/fAg==
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/domutils/-/domutils-2.3.0.tgz#6469c63a3da2de0c3016f3a59e6a969e10705bce"
+  integrity sha512-xWC75PM3QF6MjE5e58OzwTX0B/rPQnlqH0YyXB/c056RtVJA+eu60da2I/bdnEHzEYC00g8QaZUlAbqOZVbOsw==
   dependencies:
     dom-serializer "^1.0.1"
     domelementtype "^2.0.1"
@@ -5255,10 +5255,10 @@ ee-first@1.1.1:
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
   integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
 
-electron-to-chromium@^1.3.564:
-  version "1.3.566"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.566.tgz#e373876bb63e5c9bbcbe1b48cbb2db000f79bf88"
-  integrity sha512-V0fANdGN7waOE0tvCDhjf1vqPRevG3eo0asYm42c4t1qmZSunlnUuWQDxglUi9wDpbKQlGIttMJ+2DYpRwvYRA==
+electron-to-chromium@^1.3.570:
+  version "1.3.570"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.570.tgz#3f5141cc39b4e3892a276b4889980dabf1d29c7f"
+  integrity sha512-Y6OCoVQgFQBP5py6A/06+yWxUZHDlNr/gNDGatjH8AZqXl8X0tE4LfjLJsXGz/JmWJz8a6K7bR1k+QzZ+k//fg==
 
 elegant-spinner@^1.0.1:
   version "1.0.1"
@@ -5438,10 +5438,10 @@ es6-promisify@^6.1.1:
   resolved "https://registry.yarnpkg.com/es6-promisify/-/es6-promisify-6.1.1.tgz#46837651b7b06bf6fff893d03f29393668d01621"
   integrity sha512-HBL8I3mIki5C1Cc9QjKUenHtnG0A5/xA8Q/AllRcfiwl2CZFXGK7ddBiCoRwAix4i2KxcQfjtIVcrVbB3vbmwg==
 
-escalade@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.0.2.tgz#6a580d70edb87880f22b4c91d0d56078df6962c4"
-  integrity sha512-gPYAU37hYCUhW5euPeR+Y74F7BL+IBsV93j5cvGriSaD1aG6MGsqsV1yamRdrWrb2j3aiZvb0X+UBOWpx3JWtQ==
+escalade@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.0.tgz#e8e2d7c7a8b76f6ee64c2181d6b8151441602d4e"
+  integrity sha512-mAk+hPSO8fLDkhV7V0dXazH5pDc6MrjBTPyD3VeKzxnVFjH1MIxbCdqGZB9O8+EwWakZs3ZCbDS4IpRt79V1ig==
 
 escape-goat@^2.0.0:
   version "2.1.1"
@@ -6555,19 +6555,19 @@ graphql-compose@7.20.1:
     graphql-type-json "0.3.2"
     object-path "^0.11.4"
 
-graphql-playground-html@^1.6.27:
-  version "1.6.27"
-  resolved "https://registry.yarnpkg.com/graphql-playground-html/-/graphql-playground-html-1.6.27.tgz#4ead6ef79c275184bbc90f3d69b4f764b5192090"
-  integrity sha512-f+M74WgZVwoY7CyT3teKpS1W/Zg6p0X4SbQT32oWz8QQ62ipQV0c+Xc/SvAwiBMxVgrbRsw3Yqvz8XdX56e4xw==
+graphql-playground-html@^1.6.28:
+  version "1.6.28"
+  resolved "https://registry.yarnpkg.com/graphql-playground-html/-/graphql-playground-html-1.6.28.tgz#4a7c2e368c3f44deb7e86b70d3782b65edc64213"
+  integrity sha512-22uwTEGjZg0h9rYcM7WspcMPVsixAE8m56tNzwjGr2Y3pNY7OctbsMkJ3EPtPcL6ZdUpzsa4rMgYR54BGmTrpQ==
   dependencies:
     xss "^1.0.6"
 
 graphql-playground-middleware-express@^1.7.12:
-  version "1.7.20"
-  resolved "https://registry.yarnpkg.com/graphql-playground-middleware-express/-/graphql-playground-middleware-express-1.7.20.tgz#6417f0c97af3a38b60b432fcc93f20d43c6e21e6"
-  integrity sha512-ldFtpVfG2cX9CyqRJFL7rff759hcY8R1MPIThGs9Z90BBLdL7I/MXz8DYqjBngYrKJjyRDPpu6MwOFn/t6+ISA==
+  version "1.7.21"
+  resolved "https://registry.yarnpkg.com/graphql-playground-middleware-express/-/graphql-playground-middleware-express-1.7.21.tgz#e3af11848232000a2d61ab3c216d467fb6cf8376"
+  integrity sha512-CjPHDZqJ8ifS6v+JCyEZOEGrR8eKHWaUIUawggfUlW1xFFHCNcBhG4/S7EnSUspaUldSnL/cFcBp4yLhYkG53A==
   dependencies:
-    graphql-playground-html "^1.6.27"
+    graphql-playground-html "^1.6.28"
 
 graphql-type-json@0.3.2:
   version "0.3.2"
@@ -7516,9 +7516,9 @@ is-buffer@^2.0.0:
   integrity sha512-Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A==
 
 is-callable@^1.1.4, is-callable@^1.2.0:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.1.tgz#4d1e21a4f437509d25ce55f8184350771421c96d"
-  integrity sha512-wliAfSzx6V+6WfMOmus1xy0XvSgf/dlStkvTfq7F0g4bOIW0PSUbnyse3NhDwdyYS1ozfUtAAySqTws3z9Eqgg==
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.2.tgz#c7c6715cd22d4ddb48d3e19970223aceabb080d9"
+  integrity sha512-dnMqspv5nU3LoewK2N/y7KLtxtakvTuaCsU9FU50/QDmdbHNy/4/JuRtMHqRU22o3q+W89YQndQEeCVwK+3qrA==
 
 is-ci@^2.0.0:
   version "2.0.0"
@@ -9105,9 +9105,9 @@ module-details-from-path@^1.0.3:
   integrity sha1-EUyUlnPiqKNenTV4hSeqN7Z52is=
 
 moment@^2.24.0, moment@^2.27.0:
-  version "2.27.0"
-  resolved "https://registry.yarnpkg.com/moment/-/moment-2.27.0.tgz#8bff4e3e26a236220dfe3e36de756b6ebaa0105d"
-  integrity sha512-al0MUK7cpIcglMv3YF13qSgdAIqxHTO7brRtaz3DlSULbqfazqkc5kEjNrLDOM7fsjshoFIihnU8snrP7zUvhQ==
+  version "2.28.0"
+  resolved "https://registry.yarnpkg.com/moment/-/moment-2.28.0.tgz#cdfe73ce01327cee6537b0fafac2e0f21a237d75"
+  integrity sha512-Z5KOjYmnHyd/ukynmFd/WwyXHd7L4J9vTI/nn5Ap9AVUgaAE15VvQ9MOGmJJygEUklupqIrFnor/tjTwRU+tQw==
 
 move-concurrently@^1.0.1:
   version "1.0.1"
@@ -9145,7 +9145,7 @@ ms@2.1.1:
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"
   integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==
 
-ms@^2.0.0, ms@^2.1.1:
+ms@2.1.2, ms@^2.0.0, ms@^2.1.1:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
   integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
@@ -9249,9 +9249,9 @@ node-abi@^2.7.0:
     semver "^5.4.1"
 
 node-addon-api@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-3.0.0.tgz#812446a1001a54f71663bed188314bba07e09247"
-  integrity sha512-sSHCgWfJ+Lui/u+0msF3oyCgvdkhxDbkCS6Q8uiJquzOimkJBvX6hl5aSSA7DR1XbMpdM8r7phjcF63sF4rkKg==
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-3.0.2.tgz#04bc7b83fd845ba785bb6eae25bc857e1ef75681"
+  integrity sha512-+D4s2HCnxPd5PjjI0STKwncjXTUKKqm74MDMz9OPXavjsGmjkvwgLtA5yoxJUdmpj52+2u+RrXgPipahKczMKg==
 
 node-fetch-npm@^2.0.2:
   version "2.0.4"
@@ -9262,7 +9262,7 @@ node-fetch-npm@^2.0.2:
     json-parse-better-errors "^1.0.0"
     safe-buffer "^5.1.1"
 
-node-fetch@^2.3.0, node-fetch@^2.5.0:
+node-fetch@^2.5.0, node-fetch@^2.6.1:
   version "2.6.1"
   resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz#045bd323631f76ed2e2b55573394416b639a0052"
   integrity sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==
@@ -10267,9 +10267,9 @@ postcss-discard-overridden@^4.0.1:
     postcss "^7.0.0"
 
 postcss-load-config@^2.0.0, postcss-load-config@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-2.1.0.tgz#c84d692b7bb7b41ddced94ee62e8ab31b417b003"
-  integrity sha512-4pV3JJVPLd5+RueiVVB+gFOAa7GWc25XQcMp86Zexzke69mKf6Nx9LRcQywdz7yZI9n1udOxmLuAwTBypypF8Q==
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-2.1.1.tgz#0a684bb8beb05e55baf922f7ab44c3edb17cf78e"
+  integrity sha512-D2ENobdoZsW0+BHy4x1CAkXtbXtYWYRIxL/JbtRBqrRGOPtJ2zoga/bEZWhV/ShWB5saVxJMzbMdSyA/vv4tXw==
   dependencies:
     cosmiconfig "^5.0.0"
     import-cwd "^2.0.0"
@@ -10549,13 +10549,14 @@ postcss-selector-parser@^5.0.0:
     uniq "^1.0.1"
 
 postcss-selector-parser@^6.0.0, postcss-selector-parser@^6.0.2:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.2.tgz#934cf799d016c83411859e09dcecade01286ec5c"
-  integrity sha512-36P2QR59jDTOAiIkqEprfJDsoNrvwFei3eCqKd1Y0tUsBimsq39BLp7RD+JWny3WgB1zGhJX8XVePwm9k4wdBg==
+  version "6.0.3"
+  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.3.tgz#766d77728728817cc140fa1ac6da5e77f9fada98"
+  integrity sha512-0ClFaY4X1ra21LRqbW6y3rUbWcxnSVkDFG57R7Nxus9J9myPFlv+jYDMohzpkBx0RrjjiqjtycpchQ+PLGmZ9w==
   dependencies:
     cssesc "^3.0.0"
     indexes-of "^1.0.1"
     uniq "^1.0.1"
+    util-deprecate "^1.0.2"
 
 postcss-svgo@^4.0.2:
   version "4.0.2"
@@ -10605,9 +10606,9 @@ postcss@^6.0.1:
     supports-color "^5.4.0"
 
 postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.27, postcss@^7.0.32, postcss@^7.0.5, postcss@^7.0.6:
-  version "7.0.32"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.32.tgz#4310d6ee347053da3433db2be492883d62cec59d"
-  integrity sha512-03eXong5NLnNCD05xscnGKGDZ98CyzoqPSMjOe6SuoQY7Z2hIj0Ld1g/O/UQRuOle2aRtiIRDg9tDcTGAkLfKw==
+  version "7.0.34"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.34.tgz#f2baf57c36010df7de4009940f21532c16d65c20"
+  integrity sha512-H/7V2VeNScX9KE83GDrDZNiGT1m2H+UTnlinIzhjlLX9hfMUn1mHNnGeX81a1c8JSBdBvqk7c2ZOG6ZPn5itGw==
   dependencies:
     chalk "^2.4.2"
     source-map "^0.6.1"
@@ -10814,14 +10815,7 @@ prosemirror-keymap@^1.0.0, prosemirror-keymap@^1.1.2, prosemirror-keymap@^1.1.3:
     prosemirror-state "^1.0.0"
     w3c-keyname "^2.2.0"
 
-prosemirror-model@^1.0.0, prosemirror-model@^1.1.0, prosemirror-model@^1.8.1:
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/prosemirror-model/-/prosemirror-model-1.11.1.tgz#549d81afe1e887cfb2b42ab280c8bf54021dbdc4"
-  integrity sha512-cscne7s40lTQbZrU8fHBGI5awS2qX91w9wChl3HicKG2lkPS6cdGQADXbDCIU8SFl6lQYEsmIzn8F66Wm19YhA==
-  dependencies:
-    orderedmap "^1.1.0"
-
-prosemirror-model@^1.11.2:
+prosemirror-model@^1.0.0, prosemirror-model@^1.1.0, prosemirror-model@^1.11.2, prosemirror-model@^1.8.1:
   version "1.11.2"
   resolved "https://registry.yarnpkg.com/prosemirror-model/-/prosemirror-model-1.11.2.tgz#3ce08172b465bc725c8808c18c2e9378fe69418d"
   integrity sha512-+gM+x1VUfGAyKR/g0bK7FC46fVNq0xVVL859QAQ7my2p5HzKrPps/pSbYn7T50XTG2r2IhZJChsUFUBHtcoN0Q==
@@ -11309,9 +11303,9 @@ regex-not@^1.0.0, regex-not@^1.0.2:
     safe-regex "^1.1.0"
 
 regexpu-core@^4.7.0:
-  version "4.7.0"
-  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.7.0.tgz#fcbf458c50431b0bb7b45d6967b8192d91f3d938"
-  integrity sha512-TQ4KXRnIn6tz6tjnrXEkD/sshygKH/j5KzK86X8MkeHyZ8qst/LZ89j3X4/8HEIfHANTFIP/AbXakeRhWIl5YQ==
+  version "4.7.1"
+  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.7.1.tgz#2dea5a9a07233298fbf0db91fa9abc4c6e0f8ad6"
+  integrity sha512-ywH2VUraA44DZQuRKzARmw6S66mr48pQVva4LBeRhcOltJ6hExvWly5ZjFLYo67xbIxb6W1q4bAGtgfEl20zfQ==
   dependencies:
     regenerate "^1.4.0"
     regenerate-unicode-properties "^8.2.0"
@@ -12232,9 +12226,9 @@ sort-object-keys@^1.1.3:
   integrity sha512-855pvK+VkU7PaKYPc+Jjnmt4EzejQHyhhF33q31qG8x7maDzkeFhAAThdCYay11CISO+qAMwjOBP+fPZe0IPyg==
 
 sort-package-json@^1.15.0:
-  version "1.44.0"
-  resolved "https://registry.yarnpkg.com/sort-package-json/-/sort-package-json-1.44.0.tgz#470330be868f8a524a4607b26f2a0233e93d8b6d"
-  integrity sha512-u9GUZvpavUCXV5SbEqXu9FRbsJrYU6WM10r3zA0gymGPufK5X82MblCLh9GW9l46pXKEZvK+FA3eVTqC4oMp4A==
+  version "1.46.0"
+  resolved "https://registry.yarnpkg.com/sort-package-json/-/sort-package-json-1.46.0.tgz#ea30a03d17c23762bfbf115fa54500459508c9ca"
+  integrity sha512-Fn5iiGKkATkEOQ0rol45dClfvNNW3r6PZ87mU4rbpz/M0Dxz+0D6oEU8nfpwUB5rd8u+WzsH2BQ/kRDwz+yVDQ==
   dependencies:
     detect-indent "^6.0.0"
     detect-newline "3.1.0"
@@ -12326,9 +12320,9 @@ spdx-expression-parse@^3.0.0:
     spdx-license-ids "^3.0.0"
 
 spdx-license-ids@^3.0.0:
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz#3694b5804567a458d3c8045842a6358632f62654"
-  integrity sha512-J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q==
+  version "3.0.6"
+  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.6.tgz#c80757383c28abf7296744998cbc106ae8b854ce"
+  integrity sha512-+orQK83kyMva3WyPf59k1+Y525csj5JejicWut55zeTWANuN17qSiSLUXWtzHeNWORSvT7GLDJ/E/XiIWoXBTw==
 
 split-string@^3.0.1, split-string@^3.0.2:
   version "3.1.0"
@@ -13592,7 +13586,7 @@ use@^3.1.0:
   resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f"
   integrity sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==
 
-util-deprecate@^1.0.1, util-deprecate@~1.0.1:
+util-deprecate@^1.0.1, util-deprecate@^1.0.2, util-deprecate@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
   integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
@@ -13923,9 +13917,9 @@ webpack-sources@^1.1.0, webpack-sources@^1.4.0, webpack-sources@^1.4.1:
     source-map "~0.6.1"
 
 webpack@^4.29.3:
-  version "4.44.1"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.44.1.tgz#17e69fff9f321b8f117d1fda714edfc0b939cc21"
-  integrity sha512-4UOGAohv/VGUNQJstzEywwNxqX417FnjZgZJpJQegddzPmTvph37eBIRbRTfdySXzVtJXLJfbMN3mMYhM6GdmQ==
+  version "4.44.2"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.44.2.tgz#6bfe2b0af055c8b2d1e90ed2cd9363f841266b72"
+  integrity sha512-6KJVGlCxYdISyurpQ0IPTklv+DULv05rs2hseIXer6D7KrUicRDLFb4IUM1S6LUAKypPM/nSiVSuv8jHu1m3/Q==
   dependencies:
     "@webassemblyjs/ast" "1.9.0"
     "@webassemblyjs/helper-module-context" "1.9.0"

From 80c2d2681e1f7677a8ec50c994a9c375efc3a569 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Tue, 22 Sep 2020 09:15:04 +0200
Subject: [PATCH 11/25] fix blockquote

---
 packages/extension-blockquote/index.ts | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/packages/extension-blockquote/index.ts b/packages/extension-blockquote/index.ts
index 9d5ee350..565c1153 100644
--- a/packages/extension-blockquote/index.ts
+++ b/packages/extension-blockquote/index.ts
@@ -1,9 +1,11 @@
-import { Node } from '@tiptap/core'
+import { Command, Node } from '@tiptap/core'
 import { textblockTypeInputRule } from 'prosemirror-inputrules'
 
+export type BlockquoteCommand = () => Command
+
 declare module '@tiptap/core/src/Editor' {
   interface Editor {
-    blockquote(): Editor,
+    blockquote: BlockquoteCommand,
   }
 }
 
@@ -21,12 +23,11 @@ export default new Node()
     ],
     toDOM: () => ['blockquote', 0],
   }))
-  // .commands(({ editor, name }) => ({
-  //   [name]: next => attrs => {
-  //     editor.toggleNode(name, 'paragraph', attrs)
-  //     next()
-  //   },
-  // }))
+  .commands(({ name }) => ({
+    [name]: attrs => ({ commands }) => {
+      return commands.toggleNode(name, 'paragraph', attrs)
+    },
+  }))
   .keys(({ editor }) => ({
     'Shift-Mod-9': () => editor.blockquote(),
   }))

From 0aa5a4c47451624475b501c0d43d344a5e492340 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Tue, 22 Sep 2020 09:15:09 +0200
Subject: [PATCH 12/25] disable list test for now

---
 .../demos/Extensions/BulletList/index.spec.js | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/docs/src/demos/Extensions/BulletList/index.spec.js b/docs/src/demos/Extensions/BulletList/index.spec.js
index f6cebc8a..aa88e551 100644
--- a/docs/src/demos/Extensions/BulletList/index.spec.js
+++ b/docs/src/demos/Extensions/BulletList/index.spec.js
@@ -10,24 +10,24 @@ context('/api/extensions/bullet-list', () => {
     })
   })
 
-  it('should make a bullet list from different markdown shortcuts', () => {
-    cy.get('.ProseMirror').then(([{ editor }]) => {
-      editor.clearContent()
-    })
+  // it('should make a bullet list from different markdown shortcuts', () => {
+  //   cy.get('.ProseMirror').then(([{ editor }]) => {
+  //     editor.clearContent()
+  //   })
 
-    cy.get('.ProseMirror')
-      .type('* List Item 1{enter}+ List Item 2{enter}- List Item 3')
+  //   cy.get('.ProseMirror')
+  //     .type('* List Item 1{enter}+ List Item 2{enter}- List Item 3')
 
-    cy.get('.ProseMirror')
-      .find('li:nth-child(1)')
-      .should('contain', 'List Item 1')
+  //   cy.get('.ProseMirror')
+  //     .find('li:nth-child(1)')
+  //     .should('contain', 'List Item 1')
 
-    cy.get('.ProseMirror')
-      .find('li:nth-child(2)')
-      .should('contain', 'List Item 2')
+  //   cy.get('.ProseMirror')
+  //     .find('li:nth-child(2)')
+  //     .should('contain', 'List Item 2')
 
-    cy.get('.ProseMirror')
-      .find('li:nth-child(3)')
-      .should('contain', 'List Item 3')
-  })
+  //   cy.get('.ProseMirror')
+  //     .find('li:nth-child(3)')
+  //     .should('contain', 'List Item 3')
+  // })
 })
\ No newline at end of file

From 119fdd0dff5ab675ac4358e5f0882177e755f7aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Tue, 22 Sep 2020 10:49:38 +0200
Subject: [PATCH 13/25] improve command handling

---
 packages/core/src/Editor.ts                    | 13 +++++++++++--
 packages/core/src/commands/blur.ts             |  2 +-
 packages/core/src/commands/clearContent.ts     |  2 +-
 packages/core/src/commands/deleteSelection.ts  |  8 +-------
 packages/core/src/commands/focus.ts            |  2 +-
 packages/core/src/commands/insertHTML.ts       |  2 +-
 packages/core/src/commands/insertText.ts       |  2 +-
 packages/core/src/commands/liftListItem.ts     |  2 +-
 packages/core/src/commands/removeMark.ts       |  2 +-
 packages/core/src/commands/removeMarks.ts      |  2 +-
 packages/core/src/commands/replaceWithNode.ts  |  2 +-
 packages/core/src/commands/selectAll.ts        |  2 +-
 packages/core/src/commands/selectParentNode.ts |  2 +-
 packages/core/src/commands/setContent.ts       |  2 +-
 packages/core/src/commands/sinkListItem.ts     |  2 +-
 packages/core/src/commands/splitListItem.ts    |  2 +-
 packages/core/src/commands/toggleMark.ts       |  2 +-
 packages/core/src/commands/toggleNode.ts       |  2 +-
 packages/core/src/commands/updateMark.ts       |  2 +-
 packages/extension-blockquote/index.ts         |  2 +-
 packages/extension-bold/index.ts               |  2 +-
 packages/extension-bullet-list/index.ts        |  2 +-
 packages/extension-code-block/index.ts         |  2 +-
 packages/extension-code/index.ts               |  2 +-
 packages/extension-hard-break/index.ts         |  2 +-
 packages/extension-heading/index.ts            |  2 +-
 packages/extension-history/index.ts            |  2 +-
 packages/extension-horizontal-rule/index.ts    |  2 +-
 packages/extension-italic/index.ts             |  2 +-
 packages/extension-strike/index.ts             |  2 +-
 packages/extension-underline/index.ts          |  2 +-
 31 files changed, 41 insertions(+), 38 deletions(-)

diff --git a/packages/core/src/Editor.ts b/packages/core/src/Editor.ts
index 6c1d4131..23f2dcc8 100644
--- a/packages/core/src/Editor.ts
+++ b/packages/core/src/Editor.ts
@@ -37,7 +37,13 @@ export interface CommandSpec {
 
 export interface Commands {}
 
-// export type CommandNames = Extract<keyof Commands, string>
+export type CommandNames = Extract<keyof Commands, string>
+
+export type SingleCommands = {
+  [Command in keyof Commands]: Commands[Command] extends (...args: any[]) => any
+  ? (...args: Parameters<Commands[Command]>) => boolean
+  : never
+}
 
 export type ChainedCommands = {
   [Command in keyof Commands]: Commands[Command] extends (...args: any[]) => any
@@ -62,6 +68,10 @@ interface EditorOptions {
   editable: boolean,
 }
 
+declare module './Editor' {
+  interface Editor extends SingleCommands {}
+}
+
 @magicMethods
 export class Editor extends EventEmitter {
 
@@ -85,7 +95,6 @@ export class Editor extends EventEmitter {
     editable: true,
   }
 
-
   constructor(options: Partial<EditorOptions> = {}) {
     super()
     this.options = { ...this.options, ...options }
diff --git a/packages/core/src/commands/blur.ts b/packages/core/src/commands/blur.ts
index 3815fb7f..bf8d28f5 100644
--- a/packages/core/src/commands/blur.ts
+++ b/packages/core/src/commands/blur.ts
@@ -3,7 +3,7 @@ import { Command } from '../Editor'
 type BlurCommand = () => Command
 
 declare module '../Editor' {
-  interface Editor {
+  interface Commands {
     blur: BlurCommand,
   }
 }
diff --git a/packages/core/src/commands/clearContent.ts b/packages/core/src/commands/clearContent.ts
index 978c8c1d..beb87c55 100644
--- a/packages/core/src/commands/clearContent.ts
+++ b/packages/core/src/commands/clearContent.ts
@@ -3,7 +3,7 @@ import { Command } from '../Editor'
 type ClearContentCommand = (emitUpdate?: Boolean) => Command
 
 declare module '../Editor' {
-  interface Editor {
+  interface Commands {
     clearContent: ClearContentCommand,
   }
 }
diff --git a/packages/core/src/commands/deleteSelection.ts b/packages/core/src/commands/deleteSelection.ts
index c2fde9f6..7d74c5df 100644
--- a/packages/core/src/commands/deleteSelection.ts
+++ b/packages/core/src/commands/deleteSelection.ts
@@ -4,17 +4,11 @@ import { deleteSelection as originalDeleteSelection } from 'prosemirror-commands
 type DeleteSelectionCommand = () => Command
 
 declare module '../Editor' {
-  interface Editor {
+  interface Commands {
     deleteSelection: DeleteSelectionCommand,
   }
 }
 
-// declare module '../Editor' {
-//   interface Commands {
-//     deleteSelection: DeleteSelectionCommand,
-//   }
-// }
-
 export const deleteSelection: DeleteSelectionCommand = () => ({ state, dispatch }) => {
   return originalDeleteSelection(state, dispatch)
 }
diff --git a/packages/core/src/commands/focus.ts b/packages/core/src/commands/focus.ts
index 893e0d7b..6291d2c1 100644
--- a/packages/core/src/commands/focus.ts
+++ b/packages/core/src/commands/focus.ts
@@ -5,7 +5,7 @@ import minMax from '../utils/minMax'
 type FocusCommand = (position?: Position) => Command
 
 declare module '../Editor' {
-  interface Editor {
+  interface Commands {
     focus: FocusCommand
   }
 }
diff --git a/packages/core/src/commands/insertHTML.ts b/packages/core/src/commands/insertHTML.ts
index a21df16d..362602d6 100644
--- a/packages/core/src/commands/insertHTML.ts
+++ b/packages/core/src/commands/insertHTML.ts
@@ -7,7 +7,7 @@ import {ReplaceStep, ReplaceAroundStep} from "prosemirror-transform"
 type InsertHTMLCommand = (value: string) => Command
 
 declare module '../Editor' {
-  interface Editor {
+  interface Commands {
     insertHTML: InsertHTMLCommand,
   }
 }
diff --git a/packages/core/src/commands/insertText.ts b/packages/core/src/commands/insertText.ts
index e53d3901..e48609e9 100644
--- a/packages/core/src/commands/insertText.ts
+++ b/packages/core/src/commands/insertText.ts
@@ -3,7 +3,7 @@ import { Command } from '../Editor'
 type InsertTextCommand = (value: string) => Command
 
 declare module '../Editor' {
-  interface Editor {
+  interface Commands {
     insertText: InsertTextCommand,
   }
 }
diff --git a/packages/core/src/commands/liftListItem.ts b/packages/core/src/commands/liftListItem.ts
index da8cdf80..0508e2ae 100644
--- a/packages/core/src/commands/liftListItem.ts
+++ b/packages/core/src/commands/liftListItem.ts
@@ -6,7 +6,7 @@ import getNodeType from '../utils/getNodeType'
 type LiftListItem = (typeOrName: string | NodeType) => Command
 
 declare module '../Editor' {
-  interface Editor {
+  interface Commands {
     liftListItem: LiftListItem,
   }
 }
diff --git a/packages/core/src/commands/removeMark.ts b/packages/core/src/commands/removeMark.ts
index 42207aff..71456afb 100644
--- a/packages/core/src/commands/removeMark.ts
+++ b/packages/core/src/commands/removeMark.ts
@@ -6,7 +6,7 @@ import getMarkRange from '../utils/getMarkRange'
 type RemoveMarkCommand = (typeOrName: string | MarkType) => Command
 
 declare module '../Editor' {
-  interface Editor {
+  interface Commands {
     toggleMark: RemoveMarkCommand,
   }
 }
diff --git a/packages/core/src/commands/removeMarks.ts b/packages/core/src/commands/removeMarks.ts
index 8b4d2847..f71400d2 100644
--- a/packages/core/src/commands/removeMarks.ts
+++ b/packages/core/src/commands/removeMarks.ts
@@ -3,7 +3,7 @@ import { Command } from '../Editor'
 type RemoveMarksCommand = () => Command
 
 declare module '../Editor' {
-  interface Editor {
+  interface Commands {
     removeMarks: RemoveMarksCommand,
   }
 }
diff --git a/packages/core/src/commands/replaceWithNode.ts b/packages/core/src/commands/replaceWithNode.ts
index e1d32e2f..233897d6 100644
--- a/packages/core/src/commands/replaceWithNode.ts
+++ b/packages/core/src/commands/replaceWithNode.ts
@@ -14,7 +14,7 @@ type ReplaceWithNodeCommand = (
 ) => Command
 
 declare module '../Editor' {
-  interface Editor {
+  interface Commands {
     replaceText: ReplaceWithNodeCommand,
   }
 }
diff --git a/packages/core/src/commands/selectAll.ts b/packages/core/src/commands/selectAll.ts
index fcb3d3ea..293bc8c6 100644
--- a/packages/core/src/commands/selectAll.ts
+++ b/packages/core/src/commands/selectAll.ts
@@ -4,7 +4,7 @@ import { selectAll as originalSelectAll } from 'prosemirror-commands'
 type SelectAllCommand = () => Command
 
 declare module '../Editor' {
-  interface Editor {
+  interface Commands {
     selectAll: SelectAllCommand,
   }
 }
diff --git a/packages/core/src/commands/selectParentNode.ts b/packages/core/src/commands/selectParentNode.ts
index dbc29f92..32ccbc05 100644
--- a/packages/core/src/commands/selectParentNode.ts
+++ b/packages/core/src/commands/selectParentNode.ts
@@ -4,7 +4,7 @@ import { selectParentNode as originalSelectParentNode } from 'prosemirror-comman
 type SelectParentNodeCommand = () => Command
 
 declare module '../Editor' {
-  interface Editor {
+  interface Commands {
     selectParentNode: SelectParentNodeCommand,
   }
 }
diff --git a/packages/core/src/commands/setContent.ts b/packages/core/src/commands/setContent.ts
index 50a7641c..8daa605d 100644
--- a/packages/core/src/commands/setContent.ts
+++ b/packages/core/src/commands/setContent.ts
@@ -8,7 +8,7 @@ type SetContentCommand = (
 ) => Command
 
 declare module '../Editor' {
-  interface Editor {
+  interface Commands {
     setContent: SetContentCommand,
   }
 }
diff --git a/packages/core/src/commands/sinkListItem.ts b/packages/core/src/commands/sinkListItem.ts
index e350cdba..fc1743fb 100644
--- a/packages/core/src/commands/sinkListItem.ts
+++ b/packages/core/src/commands/sinkListItem.ts
@@ -6,7 +6,7 @@ import getNodeType from '../utils/getNodeType'
 type SinkListItem = (typeOrName: string | NodeType) => Command
 
 declare module '../Editor' {
-  interface Editor {
+  interface Commands {
     sinkListItem: SinkListItem,
   }
 }
diff --git a/packages/core/src/commands/splitListItem.ts b/packages/core/src/commands/splitListItem.ts
index 9411eab7..75dc79f4 100644
--- a/packages/core/src/commands/splitListItem.ts
+++ b/packages/core/src/commands/splitListItem.ts
@@ -6,7 +6,7 @@ import getNodeType from '../utils/getNodeType'
 type SplitListItem = (typeOrName: string | NodeType) => Command
 
 declare module '../Editor' {
-  interface Editor {
+  interface Commands {
     splitListItem: SplitListItem,
   }
 }
diff --git a/packages/core/src/commands/toggleMark.ts b/packages/core/src/commands/toggleMark.ts
index 5b2fe95a..2dad4937 100644
--- a/packages/core/src/commands/toggleMark.ts
+++ b/packages/core/src/commands/toggleMark.ts
@@ -6,7 +6,7 @@ import getMarkType from '../utils/getMarkType'
 type ToggleMarkCommand = (typeOrName: string | MarkType) => Command
 
 declare module '../Editor' {
-  interface Editor {
+  interface Commands {
     toggleMark: ToggleMarkCommand,
   }
 }
diff --git a/packages/core/src/commands/toggleNode.ts b/packages/core/src/commands/toggleNode.ts
index 09d9ff3a..95642645 100644
--- a/packages/core/src/commands/toggleNode.ts
+++ b/packages/core/src/commands/toggleNode.ts
@@ -11,7 +11,7 @@ type ToggleNodeCommand = (
 ) => Command
 
 declare module '../Editor' {
-  interface Editor {
+  interface Commands {
     toggleNode: ToggleNodeCommand,
   }
 }
diff --git a/packages/core/src/commands/updateMark.ts b/packages/core/src/commands/updateMark.ts
index 354dbdcf..c66a6449 100644
--- a/packages/core/src/commands/updateMark.ts
+++ b/packages/core/src/commands/updateMark.ts
@@ -9,7 +9,7 @@ type UpdateMarkCommand = (
 ) => Command
 
 declare module '../Editor' {
-  interface Editor {
+  interface Commands {
     updateMark: UpdateMarkCommand,
   }
 }
diff --git a/packages/extension-blockquote/index.ts b/packages/extension-blockquote/index.ts
index 565c1153..5c2fac4c 100644
--- a/packages/extension-blockquote/index.ts
+++ b/packages/extension-blockquote/index.ts
@@ -4,7 +4,7 @@ import { textblockTypeInputRule } from 'prosemirror-inputrules'
 export type BlockquoteCommand = () => Command
 
 declare module '@tiptap/core/src/Editor' {
-  interface Editor {
+  interface Commands {
     blockquote: BlockquoteCommand,
   }
 }
diff --git a/packages/extension-bold/index.ts b/packages/extension-bold/index.ts
index 400d1e88..2ac2a9e5 100644
--- a/packages/extension-bold/index.ts
+++ b/packages/extension-bold/index.ts
@@ -3,7 +3,7 @@ import { Command, Mark, markInputRule, markPasteRule } from '@tiptap/core'
 export type BoldCommand = () => Command
 
 declare module '@tiptap/core/src/Editor' {
-  interface Editor {
+  interface Commands {
     bold: BoldCommand,
   }
 }
diff --git a/packages/extension-bullet-list/index.ts b/packages/extension-bullet-list/index.ts
index c2e2e87a..2ed6b84f 100644
--- a/packages/extension-bullet-list/index.ts
+++ b/packages/extension-bullet-list/index.ts
@@ -4,7 +4,7 @@ import { wrappingInputRule } from 'prosemirror-inputrules'
 export type BulletListCommand = () => Command
 
 declare module '@tiptap/core/src/Editor' {
-  interface Editor {
+  interface Commands {
     bulletList: BulletListCommand,
   }
 }
diff --git a/packages/extension-code-block/index.ts b/packages/extension-code-block/index.ts
index 77612d77..91aa9309 100644
--- a/packages/extension-code-block/index.ts
+++ b/packages/extension-code-block/index.ts
@@ -4,7 +4,7 @@ import { textblockTypeInputRule } from 'prosemirror-inputrules'
 export type CodeBlockCommand = () => Command
 
 declare module '@tiptap/core/src/Editor' {
-  interface Editor {
+  interface Commands {
     codeBlock: CodeBlockCommand,
   }
 }
diff --git a/packages/extension-code/index.ts b/packages/extension-code/index.ts
index c7f624e5..7731cb50 100644
--- a/packages/extension-code/index.ts
+++ b/packages/extension-code/index.ts
@@ -3,7 +3,7 @@ import { Command, Mark, markInputRule, markPasteRule } from '@tiptap/core'
 export type CodeCommand = () => Command
 
 declare module '@tiptap/core/src/Editor' {
-  interface Editor {
+  interface Commands {
     code: CodeCommand,
   }
 }
diff --git a/packages/extension-hard-break/index.ts b/packages/extension-hard-break/index.ts
index 77bc1fc0..1baaa68a 100644
--- a/packages/extension-hard-break/index.ts
+++ b/packages/extension-hard-break/index.ts
@@ -4,7 +4,7 @@ import { chainCommands, exitCode } from 'prosemirror-commands'
 export type HardBreakCommand = () => Command
 
 declare module '@tiptap/core/src/Editor' {
-  interface Editor {
+  interface Commands {
     hardBreak: HardBreakCommand,
   }
 }
diff --git a/packages/extension-heading/index.ts b/packages/extension-heading/index.ts
index d38d69c8..82749be9 100644
--- a/packages/extension-heading/index.ts
+++ b/packages/extension-heading/index.ts
@@ -10,7 +10,7 @@ export interface HeadingOptions {
 export type HeadingCommand = (level: Level) => Command
 
 declare module '@tiptap/core/src/Editor' {
-  interface Editor {
+  interface Commands {
     heading: HeadingCommand,
   }
 }
diff --git a/packages/extension-history/index.ts b/packages/extension-history/index.ts
index 19b76388..0f389dbe 100644
--- a/packages/extension-history/index.ts
+++ b/packages/extension-history/index.ts
@@ -8,7 +8,7 @@ import {
 } from 'prosemirror-history'
 
 declare module '@tiptap/core/src/Editor' {
-  interface Editor {
+  interface Commands {
     undo: () => Command,
     redo: () => Command,
   }
diff --git a/packages/extension-horizontal-rule/index.ts b/packages/extension-horizontal-rule/index.ts
index 7a4be787..9398a6d7 100644
--- a/packages/extension-horizontal-rule/index.ts
+++ b/packages/extension-horizontal-rule/index.ts
@@ -3,7 +3,7 @@ import { Command, Node, nodeInputRule } from '@tiptap/core'
 export type HorizontalRuleCommand = () => Command
 
 declare module '@tiptap/core/src/Editor' {
-  interface Editor {
+  interface Commands {
     horizontalRule: HorizontalRuleCommand,
   }
 }
diff --git a/packages/extension-italic/index.ts b/packages/extension-italic/index.ts
index 59ea8a95..3bf2e1f3 100644
--- a/packages/extension-italic/index.ts
+++ b/packages/extension-italic/index.ts
@@ -3,7 +3,7 @@ import { Command, Mark, markInputRule, markPasteRule } from '@tiptap/core'
 export type ItalicCommand = () => Command
 
 declare module '@tiptap/core/src/Editor' {
-  interface Editor {
+  interface Commands {
     italic: ItalicCommand,
   }
 }
diff --git a/packages/extension-strike/index.ts b/packages/extension-strike/index.ts
index 815fe547..e8470564 100644
--- a/packages/extension-strike/index.ts
+++ b/packages/extension-strike/index.ts
@@ -3,7 +3,7 @@ import { Command, Mark, markInputRule, markPasteRule } from '@tiptap/core'
 type StrikeCommand = () => Command
 
 declare module '@tiptap/core/src/Editor' {
-  interface Editor {
+  interface Commands {
     strike: StrikeCommand,
   }
 }
diff --git a/packages/extension-underline/index.ts b/packages/extension-underline/index.ts
index 465caae5..0ba4541e 100644
--- a/packages/extension-underline/index.ts
+++ b/packages/extension-underline/index.ts
@@ -3,7 +3,7 @@ import { Command, Mark } from '@tiptap/core'
 export type UnderlineCommand = () => Command
 
 declare module '@tiptap/core/src/Editor' {
-  interface Editor {
+  interface Commands {
     underline: UnderlineCommand,
   }
 }

From 8ca8e041fdd62630272c14cec1f597663e2feaa5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Tue, 22 Sep 2020 15:22:24 +0200
Subject: [PATCH 14/25] refactoring

---
 packages/core/src/Editor.ts              | 10 ++++-----
 packages/core/src/commands/blur.ts       |  4 ++--
 packages/core/src/commands/focus.ts      | 28 +-----------------------
 packages/core/src/commands/insertHTML.ts |  3 +--
 4 files changed, 8 insertions(+), 37 deletions(-)

diff --git a/packages/core/src/Editor.ts b/packages/core/src/Editor.ts
index 23f2dcc8..cad48bfb 100644
--- a/packages/core/src/Editor.ts
+++ b/packages/core/src/Editor.ts
@@ -19,16 +19,14 @@ import Mark from './Mark'
 import ComponentRenderer from './ComponentRenderer'
 import defaultPlugins from './plugins'
 import * as commands from './commands'
-import { deleteSelection } from 'prosemirror-commands'
 
 export type Command = (props: {
-  editor: Editor
-  tr: Transaction
-  // TODO: find correct type
-  commands: any
+  editor: Editor,
+  tr: Transaction,
+  commands: SingleCommands,
   state: EditorState,
   view: EditorView,
-  dispatch: (args?: any) => any
+  dispatch: (args?: any) => any,
 }) => boolean
 
 export interface CommandSpec {
diff --git a/packages/core/src/commands/blur.ts b/packages/core/src/commands/blur.ts
index bf8d28f5..ec46a8ba 100644
--- a/packages/core/src/commands/blur.ts
+++ b/packages/core/src/commands/blur.ts
@@ -8,8 +8,8 @@ declare module '../Editor' {
   }
 }
 
-export const blur: BlurCommand = () => ({ editor }) => {
-  const element = editor.view.dom as HTMLElement
+export const blur: BlurCommand = () => ({ view }) => {
+  const element = view.dom as HTMLElement
 
   element.blur()
 
diff --git a/packages/core/src/commands/focus.ts b/packages/core/src/commands/focus.ts
index 6291d2c1..b9b9ae51 100644
--- a/packages/core/src/commands/focus.ts
+++ b/packages/core/src/commands/focus.ts
@@ -44,33 +44,7 @@ function resolveSelection(editor: Editor, position: Position = null): ResolvedSe
   }
 }
 
-// export default (next: Function, editor: Editor) => (position = null) => {
-//   const { view, state } = editor
-
-//   if ((view.hasFocus() && position === null) || position === false) {
-//     next()
-//     return
-//   }
-
-//   const { from, to } = resolveSelection(editor, position)
-//   const { doc, tr } = state
-//   const resolvedFrom = minMax(from, 0, doc.content.size)
-//   const resolvedEnd = minMax(to, 0, doc.content.size)
-//   const selection = TextSelection.create(doc, resolvedFrom, resolvedEnd)
-//   const transaction = tr.setSelection(selection)
-
-//   view.dispatch(transaction)
-//   view.focus()
-//   //@ts-ignore
-//   // console.log(bla)
-//   // return 'FOCUS'
-//   next()
-// }
-
-
-export const focus: FocusCommand = (position = null) => ({ editor, tr }) => {
-  const { view } = editor
-
+export const focus: FocusCommand = (position = null) => ({ editor, view, tr }) => {
   if ((view.hasFocus() && position === null) || position === false) {
     return true
   }
diff --git a/packages/core/src/commands/insertHTML.ts b/packages/core/src/commands/insertHTML.ts
index 362602d6..ccee22f9 100644
--- a/packages/core/src/commands/insertHTML.ts
+++ b/packages/core/src/commands/insertHTML.ts
@@ -25,8 +25,7 @@ function selectionToInsertionEnd(tr: Transaction, startLen: number, bias: number
   tr.setSelection(Selection.near(tr.doc.resolve(end as unknown as number), bias))
 }
 
-export const insertHTML: InsertHTMLCommand = value => ({ tr, editor }) => {
-  const { state } = editor
+export const insertHTML: InsertHTMLCommand = value => ({ tr, state }) => {
   const { selection } = tr
   const element = elementFromString(value)
   const slice = DOMParser.fromSchema(state.schema).parseSlice(element)

From 25a79b4aea04fcdcbbe4aab096fd83c3ad2e2856 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Tue, 22 Sep 2020 15:29:30 +0200
Subject: [PATCH 15/25] add broken chain

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

diff --git a/packages/core/src/Editor.ts b/packages/core/src/Editor.ts
index cad48bfb..f98ae33a 100644
--- a/packages/core/src/Editor.ts
+++ b/packages/core/src/Editor.ts
@@ -24,6 +24,7 @@ export type Command = (props: {
   editor: Editor,
   tr: Transaction,
   commands: SingleCommands,
+  // chain: () => ChainedCommands,
   state: EditorState,
   view: EditorView,
   dispatch: (args?: any) => any,
@@ -138,6 +139,7 @@ export class Editor extends EventEmitter {
         state: this.chainableEditorState(tr, this.state),
         view: this.view,
         dispatch: () => false,
+        // chain: this.chain.bind(this),
         tr,
       }
 
@@ -184,6 +186,7 @@ export class Editor extends EventEmitter {
             state: this.chainableEditorState(tr, this.state),
             view: this.view,
             dispatch: () => false,
+            // chain: this.chain.bind(this),
             tr,
           }
 

From 2856900c6a99968d3809369e68c3761fb3f3fcef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Tue, 22 Sep 2020 20:23:54 +0200
Subject: [PATCH 16/25] fix splitlistitem

---
 packages/core/src/Editor.ts           | 48 ---------------------------
 packages/core/src/ExtensionManager.ts | 13 +-------
 packages/extension-list-item/index.ts |  2 +-
 3 files changed, 2 insertions(+), 61 deletions(-)

diff --git a/packages/core/src/Editor.ts b/packages/core/src/Editor.ts
index f98ae33a..3fb95e2d 100644
--- a/packages/core/src/Editor.ts
+++ b/packages/core/src/Editor.ts
@@ -79,8 +79,6 @@ export class Editor extends EventEmitter {
   private extensionManager!: ExtensionManager
   private commands: { [key: string]: any } = {}
   private css!: HTMLStyleElement
-  private lastCommand = Promise.resolve()
-  public lastCommandValue: any = undefined
   public schema!: Schema
   public view!: EditorView
   public selection = { from: 0, to: 0 }
@@ -295,33 +293,8 @@ export class Editor extends EventEmitter {
       throw new Error(`tiptap: '${name}' is a protected name.`)
     }
 
-    // this.commands[name] = this.chainCommand((...args: any) => {
-    //   // console.log('command', this.lastCommandValue)
-    //   const commandValue = callback(() => {}, this.proxy)(...args)
-
-    //   // if (commandValue !== undefined) {
-    //     this.lastCommandValue = commandValue
-    //   // }
-
-    //   return this.proxy
-    // })
-
-    
-    // this.commands[name] = (...args: any) => {
-    //   const tr = this.state.tr
-    //   callback(...args)({ editor: this.proxy, tr })
-    //   this.view.dispatch(tr)
-    // }
-
     this.commands[name] = callback
 
-    //   // if (commandValue !== undefined) {
-    //     this.lastCommandValue = commandValue
-    //   // }
-
-    //   return this.proxy
-    // })
-
     return this.proxy
   }
 
@@ -335,27 +308,6 @@ export class Editor extends EventEmitter {
     return this.commands[name](...options)
   }
 
-  /**
-   * Wraps a command to make it chainable.
-   *
-   * @param method
-   */
-  private chainCommand = (method: Function) => (...args: any) => {
-    // console.log('chain', this.lastCommandValue)
-    // this.lastCommand = this.lastCommand
-    //   .then(() => {
-        
-    //     const jo = method.apply(this, args)
-
-    //     console.log({jo})
-    //   })
-    //   // .then(method.apply(this, args))
-    //   .catch(console.error)
-    method.apply(this, args)
-
-    return this.proxy
-  }
-
   /**
    * Register a ProseMirror plugin.
    *
diff --git a/packages/core/src/ExtensionManager.ts b/packages/core/src/ExtensionManager.ts
index 4f4f4e54..df056a02 100644
--- a/packages/core/src/ExtensionManager.ts
+++ b/packages/core/src/ExtensionManager.ts
@@ -94,18 +94,7 @@ export default class ExtensionManager {
     return collect(this.extensions)
       .map(extension => extension.config.keys)
       .filter(keys => keys)
-      .map(keys => {
-        const values = Object.entries(keys).map(([key, action]) => {
-          return [key, () => {
-            this.editor.lastCommandValue = undefined
-            // @ts-ignore
-            const bla = action().lastCommandValue
-            // console.log({bla})
-            return bla
-          }]
-        })
-        return keymap(Object.fromEntries(values))
-      })
+      .map(keys => keymap(keys))
       .toArray()
   }
 
diff --git a/packages/extension-list-item/index.ts b/packages/extension-list-item/index.ts
index 4b55442b..e1ae0b52 100644
--- a/packages/extension-list-item/index.ts
+++ b/packages/extension-list-item/index.ts
@@ -12,7 +12,7 @@ export default new Node()
     toDOM: () => ['li', 0],
   }))
   .keys(({ editor, name }) => ({
-    // Enter: () => editor.chain().focus().splitListItem(name).run()
+    Enter: () => editor.splitListItem(name),
     // Tab: () => editor.sinkListItem(name),
     // 'Shift-Tab': () => editor.liftListItem(name),
   }))

From 2c9973af8cb87a09448c127d6be686c6ff693a70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Tue, 22 Sep 2020 20:39:24 +0200
Subject: [PATCH 17/25] fix bullet list

---
 .../demos/Extensions/BulletList/index.spec.js | 32 ++++++------
 .../src/demos/Extensions/BulletList/index.vue |  4 +-
 packages/core/src/commands/index.ts           |  1 +
 packages/core/src/commands/toggleList.ts      | 50 +++++++++++++++++++
 packages/extension-bullet-list/index.ts       | 10 ++--
 packages/extension-list-item/index.ts         |  8 ++-
 6 files changed, 77 insertions(+), 28 deletions(-)
 create mode 100644 packages/core/src/commands/toggleList.ts

diff --git a/docs/src/demos/Extensions/BulletList/index.spec.js b/docs/src/demos/Extensions/BulletList/index.spec.js
index aa88e551..c3615e94 100644
--- a/docs/src/demos/Extensions/BulletList/index.spec.js
+++ b/docs/src/demos/Extensions/BulletList/index.spec.js
@@ -10,24 +10,24 @@ context('/api/extensions/bullet-list', () => {
     })
   })
 
-  // it('should make a bullet list from different markdown shortcuts', () => {
-  //   cy.get('.ProseMirror').then(([{ editor }]) => {
-  //     editor.clearContent()
-  //   })
+  it('should make a bullet list from different markdown shortcuts', () => {
+    cy.get('.ProseMirror').then(([{ editor }]) => {
+      editor.clearContent()
+    })
 
-  //   cy.get('.ProseMirror')
-  //     .type('* List Item 1{enter}+ List Item 2{enter}- List Item 3')
+    cy.get('.ProseMirror')
+      .type('* List Item 1{enter}{enter}+ List Item 2{enter}{enter}- List Item 3')
 
-  //   cy.get('.ProseMirror')
-  //     .find('li:nth-child(1)')
-  //     .should('contain', 'List Item 1')
+    cy.get('.ProseMirror')
+      .find('li:nth-child(1)')
+      .should('contain', 'List Item 1')
 
-  //   cy.get('.ProseMirror')
-  //     .find('li:nth-child(2)')
-  //     .should('contain', 'List Item 2')
+    cy.get('.ProseMirror')
+      .find('li:nth-child(2)')
+      .should('contain', 'List Item 2')
 
-  //   cy.get('.ProseMirror')
-  //     .find('li:nth-child(3)')
-  //     .should('contain', 'List Item 3')
-  // })
+    cy.get('.ProseMirror')
+      .find('li:nth-child(3)')
+      .should('contain', 'List Item 3')
+  })
 })
\ No newline at end of file
diff --git a/docs/src/demos/Extensions/BulletList/index.vue b/docs/src/demos/Extensions/BulletList/index.vue
index 401ad57b..7808c9c7 100644
--- a/docs/src/demos/Extensions/BulletList/index.vue
+++ b/docs/src/demos/Extensions/BulletList/index.vue
@@ -1,8 +1,8 @@
 <template>
   <div v-if="editor">
-    <!-- <button @click="editor.chain().focus().bulletList().run()" :class="{ 'is-active': editor.isActive('bulletList') }">
+    <button @click="editor.chain().focus().bulletList().run()" :class="{ 'is-active': editor.isActive('bulletList') }">
       bullet list
-    </button> -->
+    </button>
 
     <editor-content :editor="editor" />
   </div>
diff --git a/packages/core/src/commands/index.ts b/packages/core/src/commands/index.ts
index 0c6c0430..68b1315b 100644
--- a/packages/core/src/commands/index.ts
+++ b/packages/core/src/commands/index.ts
@@ -13,6 +13,7 @@ export { selectParentNode } from './selectParentNode'
 export { setContent } from './setContent'
 export { sinkListItem } from './sinkListItem'
 export { splitListItem } from './splitListItem'
+export { toggleList } from './toggleList'
 export { toggleMark } from './toggleMark'
 export { toggleNode } from './toggleNode'
 export { updateMark } from './updateMark'
diff --git a/packages/core/src/commands/toggleList.ts b/packages/core/src/commands/toggleList.ts
new file mode 100644
index 00000000..699decdb
--- /dev/null
+++ b/packages/core/src/commands/toggleList.ts
@@ -0,0 +1,50 @@
+import { Command } from '../Editor'
+import { wrapInList, liftListItem } from 'prosemirror-schema-list'
+import { findParentNode } from 'prosemirror-utils'
+import { Node, NodeType, Schema } from 'prosemirror-model'
+import getNodeType from '../utils/getNodeType'
+
+type ToggleListCommand = (
+  listType: string | NodeType,
+  itemType: string | NodeType,
+) => Command
+
+declare module '../Editor' {
+  interface Commands {
+    toggleList: ToggleListCommand,
+  }
+}
+
+function isList(node: Node, schema: Schema) {
+  return (node.type === schema.nodes.bullet_list
+    || node.type === schema.nodes.ordered_list
+    || node.type === schema.nodes.todo_list)
+}
+
+export const toggleList: ToggleListCommand = (listTypeOrName, itemTypeOrName) => ({ tr, state, dispatch }) => {
+  const listType = getNodeType(listTypeOrName, state.schema)
+  const itemType = getNodeType(itemTypeOrName, state.schema)
+  const { schema, selection } = state
+  const { $from, $to } = selection
+  const range = $from.blockRange($to)
+
+  if (!range) {
+    return false
+  }
+
+  const parentList = findParentNode(node => isList(node, schema))(selection)
+
+  if (range.depth >= 1 && parentList && range.depth - parentList.depth <= 1) {
+    if (parentList.node.type === listType) {
+      return liftListItem(itemType)(state, dispatch)
+    }
+
+    if (isList(parentList.node, schema) && listType.validContent(parentList.node.content)) {
+      tr.setNodeMarkup(parentList.pos, listType)
+
+      return false
+    }
+  }
+
+  return wrapInList(listType)(state, dispatch)
+}
diff --git a/packages/extension-bullet-list/index.ts b/packages/extension-bullet-list/index.ts
index 2ed6b84f..54949f12 100644
--- a/packages/extension-bullet-list/index.ts
+++ b/packages/extension-bullet-list/index.ts
@@ -19,11 +19,11 @@ export default new Node()
     ],
     toDOM: () => ['ul', 0],
   }))
-  // .commands(({ editor, type }) => ({
-  //   bulletList: () => ({ commands }) => {
-  //     return commands.toggleList(type, editor.schema.nodes.list_item)
-  //   },
-  // }))
+  .commands(({ name }) => ({
+    bulletList: () => ({ commands }) => {
+      return commands.toggleList(name, 'list_item')
+    },
+  }))
   .keys(({ editor }) => ({
     'Shift-Ctrl-8': () => editor.bulletList(),
   }))
diff --git a/packages/extension-list-item/index.ts b/packages/extension-list-item/index.ts
index e1ae0b52..28561bda 100644
--- a/packages/extension-list-item/index.ts
+++ b/packages/extension-list-item/index.ts
@@ -6,14 +6,12 @@ export default new Node()
     content: 'paragraph block*',
     defining: true,
     draggable: false,
-    parseDOM: [
-      { tag: 'li' },
-    ],
+    parseDOM: [{ tag: 'li' }],
     toDOM: () => ['li', 0],
   }))
   .keys(({ editor, name }) => ({
     Enter: () => editor.splitListItem(name),
-    // Tab: () => editor.sinkListItem(name),
-    // 'Shift-Tab': () => editor.liftListItem(name),
+    Tab: () => editor.sinkListItem(name),
+    'Shift-Tab': () => editor.liftListItem(name),
   }))
   .create()

From 9229de8881d1090c7c97bc85205ee1edd1e7ccf4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Tue, 22 Sep 2020 20:45:30 +0200
Subject: [PATCH 18/25] add ordered list extension

---
 packages/extension-ordered-list/index.ts     | 51 ++++++++++++++++++++
 packages/extension-ordered-list/package.json | 17 +++++++
 2 files changed, 68 insertions(+)
 create mode 100644 packages/extension-ordered-list/index.ts
 create mode 100644 packages/extension-ordered-list/package.json

diff --git a/packages/extension-ordered-list/index.ts b/packages/extension-ordered-list/index.ts
new file mode 100644
index 00000000..b4c58b27
--- /dev/null
+++ b/packages/extension-ordered-list/index.ts
@@ -0,0 +1,51 @@
+import { Command, Node } from '@tiptap/core'
+import { wrappingInputRule } from 'prosemirror-inputrules'
+
+export type OrderedListCommand = () => Command
+
+declare module '@tiptap/core/src/Editor' {
+  interface Commands {
+    orderedList: OrderedListCommand,
+  }
+}
+
+export default new Node()
+  .name('ordered_list')
+  .schema(() => ({
+    attrs: {
+      order: {
+        default: 1,
+      },
+    },
+    content: 'list_item+',
+    group: 'block',
+    parseDOM: [{
+      tag: 'ol',
+      getAttrs: node => ({
+        order: (node as HTMLElement).hasAttribute('start')
+          ? +(node as HTMLElement).getAttribute('start')
+          : 1,
+      }),
+    }],
+    toDOM: node => (node.attrs.order === 1
+      ? ['ol', 0]
+      : ['ol', { start: node.attrs.order }, 0]
+    ),
+  }))
+  .commands(({ name }) => ({
+    orderedList: () => ({ commands }) => {
+      return commands.toggleList(name, 'list_item')
+    },
+  }))
+  .keys(({ editor }) => ({
+    'Shift-Ctrl-9': () => editor.orderedList(),
+  }))
+  .inputRules(({ type }) => [
+    wrappingInputRule(
+      /^(\d+)\.\s$/,
+      type,
+      match => ({ order: +match[1] }),
+      (match, node) => node.childCount + node.attrs.order === +match[1],
+    ),
+  ])
+  .create()
diff --git a/packages/extension-ordered-list/package.json b/packages/extension-ordered-list/package.json
new file mode 100644
index 00000000..e7f4ae03
--- /dev/null
+++ b/packages/extension-ordered-list/package.json
@@ -0,0 +1,17 @@
+{
+  "name": "@tiptap/extension-ordered-list",
+  "version": "1.0.0",
+  "source": "index.ts",
+  "main": "dist/tiptap-extension-ordered-list.js",
+  "umd:main": "dist/tiptap-extension-ordered-list.umd.js",
+  "module": "dist/tiptap-extension-ordered-list.mjs", 
+  "unpkg": "dist/tiptap-extension-ordered-list.js",
+  "jsdelivr": "dist/tiptap-extension-ordered-list.js",
+  "files": [
+    "src",
+    "dist"
+  ],
+  "peerDependencies": {
+    "@tiptap/core": "2.x"
+  }
+}

From faf1e1d4ab72a0e791144669cdbda91f0140608a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Tue, 22 Sep 2020 21:25:32 +0200
Subject: [PATCH 19/25] add basic commandmanager

---
 packages/core/src/CommandManager.ts | 137 ++++++++++++++++++++++++++++
 packages/core/src/Editor.ts         | 129 +++-----------------------
 2 files changed, 152 insertions(+), 114 deletions(-)
 create mode 100644 packages/core/src/CommandManager.ts

diff --git a/packages/core/src/CommandManager.ts b/packages/core/src/CommandManager.ts
new file mode 100644
index 00000000..604663ce
--- /dev/null
+++ b/packages/core/src/CommandManager.ts
@@ -0,0 +1,137 @@
+import { EditorState, Transaction } from "prosemirror-state";
+import { ChainedCommands, Editor } from "./Editor";
+
+export default class CommandManager {
+
+  editor: Editor
+  commands: { [key: string]: any } = {}
+
+  constructor(editor: Editor, commands: any) {
+    this.editor = editor
+    this.commands = commands
+  }
+
+  public runSingleCommand(name: string) {
+    const { commands, editor } = this
+    const { state, view } = editor
+    const command = commands[name]
+    
+    if (!command) {
+      // TODO: prevent vue devtools to throw error
+      // throw new Error(`tiptap: command '${name}' not found.`)
+      return
+    }
+    
+    return (...args: any) => {
+      const { tr } = state
+
+      const props = {
+        editor: this.editor,
+        state: this.chainableEditorState(tr, state),
+        view,
+        dispatch: () => false,
+        // chain: this.chain.bind(this),
+        tr,
+      }
+
+      Object.defineProperty(props, 'commands', {
+        get: function() {
+          return Object.fromEntries(Object
+            .entries(commands)
+            .map(([name, command]) => {
+              return [name, (...args: any[]) => command(...args)(props)]
+            }))
+        }
+      })
+
+      const callback = command(...args)(props)
+
+      view.dispatch(tr)
+
+      return callback
+    }
+  }
+
+  public createChain() {
+    const { commands, editor } = this
+    const { state, view } = editor
+    const { tr } = state
+    const callbacks: boolean[] = []
+
+    return new Proxy({}, {
+      get: (target, name: string, proxy) => {
+        if (name === 'run') {
+          view.dispatch(tr)
+
+          return () => callbacks.every(callback => callback === true)
+        }
+
+        const command = commands[name]
+
+        if (!command) {
+          throw new Error(`tiptap: command '${name}' not found.`)
+        }
+
+        return (...args: any) => {
+          const props = {
+            editor: editor,
+            state: this.chainableEditorState(tr, state),
+            view: view,
+            dispatch: () => false,
+            // chain: this.chain.bind(this),
+            tr,
+          }
+
+          // const self = this.editor
+          Object.defineProperty(props, 'commands', {
+            get: function() {
+              return Object.fromEntries(Object
+                .entries(commands)
+                .map(([name, command]) => {
+                  return [name, (...args: any[]) => command(...args)(props)]
+                }))
+            }
+          });
+
+          const callback = command(...args)(props)
+          callbacks.push(callback)
+
+          return proxy
+        }
+      }
+    }) as ChainedCommands
+  }
+
+  public chainableEditorState(tr: Transaction, state: EditorState): EditorState {
+    let selection = tr.selection
+    let doc = tr.doc
+    let storedMarks = tr.storedMarks
+
+    return {
+      ...state,
+      schema: state.schema,
+      plugins: state.plugins,
+      apply: state.apply.bind(state),
+      applyTransaction: state.applyTransaction.bind(state),
+      reconfigure: state.reconfigure.bind(state),
+      toJSON: state.toJSON.bind(state),
+      get storedMarks() {
+        return storedMarks
+      },
+      get selection() {
+        return selection
+      },
+      get doc() {
+        return doc
+      },
+      get tr() {
+        selection = tr.selection
+        doc = tr.doc
+        storedMarks = tr.storedMarks
+
+        return tr
+      },
+    };
+  }
+
+}
\ No newline at end of file
diff --git a/packages/core/src/Editor.ts b/packages/core/src/Editor.ts
index 3fb95e2d..e2f894fc 100644
--- a/packages/core/src/Editor.ts
+++ b/packages/core/src/Editor.ts
@@ -11,6 +11,7 @@ import getMarkAttrs from './utils/getMarkAttrs'
 import removeElement from './utils/removeElement'
 import getSchemaTypeByName from './utils/getSchemaTypeByName'
 import getHtmlFromFragment from './utils/getHtmlFromFragment'
+import CommandManager from './CommandManager'
 import ExtensionManager from './ExtensionManager'
 import EventEmitter from './EventEmitter'
 import Extension from './Extension'
@@ -76,6 +77,7 @@ export class Editor extends EventEmitter {
 
   public renderer!: any
   private proxy!: Editor
+  private commandManager!: CommandManager
   private extensionManager!: ExtensionManager
   private commands: { [key: string]: any } = {}
   private css!: HTMLStyleElement
@@ -107,6 +109,7 @@ export class Editor extends EventEmitter {
     this.extensionManager.resolveConfigs()
     this.createView()
     this.registerCommands(commands)
+    this.createCommandManager()
 
     if (this.options.injectCSS) {
       require('./style.css')
@@ -121,123 +124,14 @@ export class Editor extends EventEmitter {
    * @param name The name of the command
    */
   private __get(name: string) {
-    const command = this.commands[name]
-
-    if (!command) {
-      // TODO: prevent vue devtools to throw error
-      // throw new Error(`tiptap: command '${name}' not found.`)
-      return
-    }
-
-    return (...args: any) => {
-      const { tr } = this.state
-
-      const props = {
-        editor: this.proxy,
-        state: this.chainableEditorState(tr, this.state),
-        view: this.view,
-        dispatch: () => false,
-        // chain: this.chain.bind(this),
-        tr,
-      }
-
-      const self = this
-      Object.defineProperty(props, 'commands', {
-        get: function() {
-          return Object.fromEntries(Object
-            .entries(self.commands)
-            .map(([name, command]) => {
-              return [name, (...args: any[]) => command(...args)(props)]
-            }))
-        }.bind(this)
-      })
-
-      const callback = command(...args)(props)
-
-      this.view.dispatch(tr)
-
-      return callback
-    }
+    return this.commandManager.runSingleCommand(name)
   }
 
+  /**
+   * Create a command chain to call multiple commands at once.
+   */
   public chain() {
-    const { tr } = this.state
-    const callbacks: boolean[] = []
-
-    return new Proxy({}, {
-      get: (target, name: string, proxy) => {
-        if (name === 'run') {
-          this.view.dispatch(tr)
-
-          return () => callbacks.every(callback => callback === true)
-        }
-
-        const command = this.commands[name]
-
-        if (!command) {
-          throw new Error(`tiptap: command '${name}' not found.`)
-        }
-
-        return (...args: any) => {
-          const props = {
-            editor: this.proxy,
-            state: this.chainableEditorState(tr, this.state),
-            view: this.view,
-            dispatch: () => false,
-            // chain: this.chain.bind(this),
-            tr,
-          }
-
-          const self = this
-          Object.defineProperty(props, 'commands', {
-            get: function() {
-              return Object.fromEntries(Object
-                .entries(self.commands)
-                .map(([name, command]) => {
-                  return [name, (...args: any[]) => command(...args)(props)]
-                }))
-            }.bind(this)
-          });
-
-          const callback = command(...args)(props)
-          callbacks.push(callback)
-
-          return proxy
-        }
-      }
-    }) as ChainedCommands
-  }
-
-  protected chainableEditorState(tr: Transaction, state: EditorState): EditorState {
-    let selection = tr.selection
-    let doc = tr.doc
-    let storedMarks = tr.storedMarks
-
-    return {
-      ...state,
-      schema: state.schema,
-      plugins: state.plugins,
-      apply: state.apply.bind(state),
-      applyTransaction: state.applyTransaction.bind(state),
-      reconfigure: state.reconfigure.bind(state),
-      toJSON: state.toJSON.bind(state),
-      get storedMarks() {
-        return storedMarks
-      },
-      get selection() {
-        return selection
-      },
-      get doc() {
-        return doc
-      },
-      get tr() {
-        selection = tr.selection
-        doc = tr.doc
-        storedMarks = tr.storedMarks
-
-        return tr
-      },
-    };
+    return this.commandManager.createChain()
   }
 
   /**
@@ -345,6 +239,13 @@ export class Editor extends EventEmitter {
     this.extensionManager = new ExtensionManager(this.options.extensions, this.proxy)
   }
 
+  /**
+   * Creates an command manager.
+   */
+  private createCommandManager() {
+    this.commandManager = new CommandManager(this.proxy, this.commands)
+  }
+
   /**
    * Creates a ProseMirror schema.
    */

From 0e1f8c464535f82b372cf035e8744c5f8492e20f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Tue, 22 Sep 2020 21:35:02 +0200
Subject: [PATCH 20/25] refactoring

---
 packages/core/src/CommandManager.ts | 69 +++++++++++------------------
 1 file changed, 27 insertions(+), 42 deletions(-)

diff --git a/packages/core/src/CommandManager.ts b/packages/core/src/CommandManager.ts
index 604663ce..73c0085f 100644
--- a/packages/core/src/CommandManager.ts
+++ b/packages/core/src/CommandManager.ts
@@ -24,26 +24,7 @@ export default class CommandManager {
     
     return (...args: any) => {
       const { tr } = state
-
-      const props = {
-        editor: this.editor,
-        state: this.chainableEditorState(tr, state),
-        view,
-        dispatch: () => false,
-        // chain: this.chain.bind(this),
-        tr,
-      }
-
-      Object.defineProperty(props, 'commands', {
-        get: function() {
-          return Object.fromEntries(Object
-            .entries(commands)
-            .map(([name, command]) => {
-              return [name, (...args: any[]) => command(...args)(props)]
-            }))
-        }
-      })
-
+      const props = this.buildProps(tr)
       const callback = command(...args)(props)
 
       view.dispatch(tr)
@@ -59,7 +40,7 @@ export default class CommandManager {
     const callbacks: boolean[] = []
 
     return new Proxy({}, {
-      get: (target, name: string, proxy) => {
+      get: (_, name: string, proxy) => {
         if (name === 'run') {
           view.dispatch(tr)
 
@@ -73,26 +54,7 @@ export default class CommandManager {
         }
 
         return (...args: any) => {
-          const props = {
-            editor: editor,
-            state: this.chainableEditorState(tr, state),
-            view: view,
-            dispatch: () => false,
-            // chain: this.chain.bind(this),
-            tr,
-          }
-
-          // const self = this.editor
-          Object.defineProperty(props, 'commands', {
-            get: function() {
-              return Object.fromEntries(Object
-                .entries(commands)
-                .map(([name, command]) => {
-                  return [name, (...args: any[]) => command(...args)(props)]
-                }))
-            }
-          });
-
+          const props = this.buildProps(tr)
           const callback = command(...args)(props)
           callbacks.push(callback)
 
@@ -102,7 +64,30 @@ export default class CommandManager {
     }) as ChainedCommands
   }
 
-  public chainableEditorState(tr: Transaction, state: EditorState): EditorState {
+  public buildProps(tr: Transaction) {
+    const { editor, commands } = this
+    const { state, view } = editor
+
+    const props = {
+      editor,
+      state: this.chainableState(tr, state),
+      view,
+      dispatch: () => false,
+      // chain: this.chain.bind(this),
+      tr,
+      get commands() {
+        return Object.fromEntries(Object
+          .entries(commands)
+          .map(([name, command]) => {
+            return [name, (...args: any[]) => command(...args)(props)]
+          }))
+      }
+    }
+
+    return props
+  }
+
+  public chainableState(tr: Transaction, state: EditorState): EditorState {
     let selection = tr.selection
     let doc = tr.doc
     let storedMarks = tr.storedMarks

From 87166ab8c816aefea24ad650461363a2ceffb01b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Tue, 22 Sep 2020 21:54:44 +0200
Subject: [PATCH 21/25] add optional chaining

---
 babel.config.js      | 3 +++
 docs/babel.config.js | 3 +++
 docs/package.json    | 1 +
 package.json         | 1 +
 4 files changed, 8 insertions(+)

diff --git a/babel.config.js b/babel.config.js
index edef9fd3..6e5192b8 100644
--- a/babel.config.js
+++ b/babel.config.js
@@ -2,4 +2,7 @@ module.exports = {
   presets: [
     '@babel/preset-env',
   ],
+  plugins: [
+    '@babel/plugin-proposal-optional-chaining',
+  ],
 }
\ No newline at end of file
diff --git a/docs/babel.config.js b/docs/babel.config.js
index 9a353e32..017d1e3b 100644
--- a/docs/babel.config.js
+++ b/docs/babel.config.js
@@ -3,4 +3,7 @@ module.exports = {
     '@babel/preset-env',
     '@babel/preset-react',
   ],
+  plugins: [
+    '@babel/plugin-proposal-optional-chaining',
+  ],
 }
\ No newline at end of file
diff --git a/docs/package.json b/docs/package.json
index b88d8662..3581fd3d 100644
--- a/docs/package.json
+++ b/docs/package.json
@@ -24,6 +24,7 @@
     "vue-github-button": "^1.1.2"
   },
   "devDependencies": {
+    "@babel/plugin-proposal-optional-chaining": "^7.11.0",
     "@babel/preset-env": "^7.11.5",
     "@babel/preset-react": "^7.10.4",
     "html-loader": "^1.3.1",
diff --git a/package.json b/package.json
index 5a0b7abd..855b4319 100644
--- a/package.json
+++ b/package.json
@@ -20,6 +20,7 @@
     "reset": "yarn clean:packages && rm -rf ./**/.cache && rm -rf ./**/node_modules && rm -rf ./yarn.lock && yarn install"
   },
   "devDependencies": {
+    "@babel/plugin-proposal-optional-chaining": "^7.11.0",
     "@babel/preset-env": "^7.11.5",
     "@types/prosemirror-commands": "^1.0.3",
     "@types/prosemirror-history": "^1.0.1",

From a865ec4b4eaa22534eb50606ac7600ef66b3d742 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Tue, 22 Sep 2020 21:54:52 +0200
Subject: [PATCH 22/25] fix bug

---
 packages/extension-ordered-list/index.ts | 2 +-
 packages/starter-kit/index.ts            | 2 ++
 packages/starter-kit/package.json        | 1 +
 packages/vue-starter-kit/index.ts        | 2 ++
 packages/vue-starter-kit/package.json    | 1 +
 5 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/packages/extension-ordered-list/index.ts b/packages/extension-ordered-list/index.ts
index b4c58b27..492dc546 100644
--- a/packages/extension-ordered-list/index.ts
+++ b/packages/extension-ordered-list/index.ts
@@ -23,7 +23,7 @@ export default new Node()
       tag: 'ol',
       getAttrs: node => ({
         order: (node as HTMLElement).hasAttribute('start')
-          ? +(node as HTMLElement).getAttribute('start')
+          ? parseInt((node as HTMLElement).getAttribute('start') || '')
           : 1,
       }),
     }],
diff --git a/packages/starter-kit/index.ts b/packages/starter-kit/index.ts
index dce2e9b9..d16ab0dd 100644
--- a/packages/starter-kit/index.ts
+++ b/packages/starter-kit/index.ts
@@ -13,6 +13,7 @@ import Underline from '@tiptap/extension-underline'
 import Blockquote from '@tiptap/extension-blockquote'
 import HorizontalRule from '@tiptap/extension-horizontal-rule'
 import BulletList from '@tiptap/extension-bullet-list'
+import OrderedList from '@tiptap/extension-ordered-list'
 import ListItem from '@tiptap/extension-list-item'
 
 export default function defaultExtensions() {
@@ -32,6 +33,7 @@ export default function defaultExtensions() {
     Blockquote(),
     HorizontalRule(),
     BulletList(),
+    OrderedList(),
     ListItem(),
   ]
 }
\ No newline at end of file
diff --git a/packages/starter-kit/package.json b/packages/starter-kit/package.json
index db6457be..8e2e0d4d 100644
--- a/packages/starter-kit/package.json
+++ b/packages/starter-kit/package.json
@@ -27,6 +27,7 @@
     "@tiptap/extension-blockquote": "1.x",
     "@tiptap/extension-horizontal-rule": "1.x",
     "@tiptap/extension-bullet-list": "1.x",
+    "@tiptap/extension-ordered-list": "1.x",
     "@tiptap/extension-list-item": "1.x"
   }
 }
diff --git a/packages/vue-starter-kit/index.ts b/packages/vue-starter-kit/index.ts
index 0701952d..4d603f36 100644
--- a/packages/vue-starter-kit/index.ts
+++ b/packages/vue-starter-kit/index.ts
@@ -15,6 +15,7 @@ import Underline from '@tiptap/extension-underline'
 import Blockquote from '@tiptap/extension-blockquote'
 import HorizontalRule from '@tiptap/extension-horizontal-rule'
 import BulletList from '@tiptap/extension-bullet-list'
+import OrderedList from '@tiptap/extension-ordered-list'
 import ListItem from '@tiptap/extension-list-item'
 
 export function defaultExtensions() {
@@ -34,6 +35,7 @@ export function defaultExtensions() {
     Blockquote(),
     HorizontalRule(),
     BulletList(),
+    OrderedList(),
     ListItem(),
   ]
 }
\ No newline at end of file
diff --git a/packages/vue-starter-kit/package.json b/packages/vue-starter-kit/package.json
index 0cfb1835..f34d39f3 100644
--- a/packages/vue-starter-kit/package.json
+++ b/packages/vue-starter-kit/package.json
@@ -28,6 +28,7 @@
     "@tiptap/extension-blockquote": "1.x",
     "@tiptap/extension-horizontal-rule": "1.x",
     "@tiptap/extension-bullet-list": "1.x",
+    "@tiptap/extension-ordered-list": "1.x",
     "@tiptap/extension-list-item": "1.x"
   }
 }

From 389756d25881b673080927d6c38a9713ab8c3ad7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Tue, 22 Sep 2020 23:06:37 +0200
Subject: [PATCH 23/25] add support for nested chained commands

---
 packages/core/src/CommandManager.ts | 23 +++++++++++++++--------
 packages/core/src/Editor.ts         |  2 +-
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/packages/core/src/CommandManager.ts b/packages/core/src/CommandManager.ts
index 73c0085f..c6e8295b 100644
--- a/packages/core/src/CommandManager.ts
+++ b/packages/core/src/CommandManager.ts
@@ -33,16 +33,23 @@ export default class CommandManager {
     }
   }
 
-  public createChain() {
+  public createChain(startTr?: Transaction) {
     const { commands, editor } = this
     const { state, view } = editor
-    const { tr } = state
     const callbacks: boolean[] = []
+    const hasStartTransaction = !!startTr
+    const tr = hasStartTransaction ? startTr : state.tr
+
+    if (!tr) {
+      return
+    }
 
     return new Proxy({}, {
       get: (_, name: string, proxy) => {
         if (name === 'run') {
-          view.dispatch(tr)
+          if (!hasStartTransaction) {
+            view.dispatch(tr)
+          }
 
           return () => callbacks.every(callback => callback === true)
         }
@@ -69,12 +76,12 @@ export default class CommandManager {
     const { state, view } = editor
 
     const props = {
-      editor,
-      state: this.chainableState(tr, state),
-      view,
-      dispatch: () => false,
-      // chain: this.chain.bind(this),
       tr,
+      editor,
+      view,
+      state: this.chainableState(tr, state),
+      dispatch: () => false,
+      chain: () => this.createChain(tr),
       get commands() {
         return Object.fromEntries(Object
           .entries(commands)
diff --git a/packages/core/src/Editor.ts b/packages/core/src/Editor.ts
index e2f894fc..48af420f 100644
--- a/packages/core/src/Editor.ts
+++ b/packages/core/src/Editor.ts
@@ -25,7 +25,7 @@ export type Command = (props: {
   editor: Editor,
   tr: Transaction,
   commands: SingleCommands,
-  // chain: () => ChainedCommands,
+  chain: () => ChainedCommands,
   state: EditorState,
   view: EditorView,
   dispatch: (args?: any) => any,

From 9a8ce8c5fb28d5615a60e834baaa5aaeda55a532 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Tue, 22 Sep 2020 23:34:18 +0200
Subject: [PATCH 24/25] refactoring

---
 packages/core/index.ts         |  4 ++--
 packages/core/src/Editor.ts    | 12 +++++++-----
 packages/core/src/Extension.ts |  4 ++--
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/packages/core/index.ts b/packages/core/index.ts
index 86af73a3..13b1a00a 100644
--- a/packages/core/index.ts
+++ b/packages/core/index.ts
@@ -1,7 +1,7 @@
-import { Editor, Command, CommandSpec } from './src/Editor'
+import { Editor, Command, CommandsSpec } from './src/Editor'
 
 export default Editor
-export { Editor, Command, CommandSpec }
+export { Editor, Command, CommandsSpec }
 export { default as ComponentRenderer } from './src/ComponentRenderer'
 export { default as Extension } from './src/Extension'
 export { default as Node } from './src/Node'
diff --git a/packages/core/src/Editor.ts b/packages/core/src/Editor.ts
index 48af420f..069c8206 100644
--- a/packages/core/src/Editor.ts
+++ b/packages/core/src/Editor.ts
@@ -31,8 +31,10 @@ export type Command = (props: {
   dispatch: (args?: any) => any,
 }) => boolean
 
-export interface CommandSpec {
-  [key: string]: (...args: any[]) => Command
+export type CommandSpec = (...args: any[]) => Command
+
+export interface CommandsSpec {
+  [key: string]: CommandSpec
 }
 
 export interface Commands {}
@@ -79,7 +81,7 @@ export class Editor extends EventEmitter {
   private proxy!: Editor
   private commandManager!: CommandManager
   private extensionManager!: ExtensionManager
-  private commands: { [key: string]: any } = {}
+  private commands: CommandsSpec = {}
   private css!: HTMLStyleElement
   public schema!: Schema
   public view!: EditorView
@@ -166,7 +168,7 @@ export class Editor extends EventEmitter {
    *
    * @param commands A list of commands
    */
-  public registerCommands(commands: CommandSpec) {
+  public registerCommands(commands: CommandsSpec) {
     Object
       .entries(commands)
       .forEach(([name, command]) => this.registerCommand(name, command))
@@ -178,7 +180,7 @@ export class Editor extends EventEmitter {
    * @param name The name of your command
    * @param callback The method of your command
    */
-  public registerCommand(name: string, callback: (bla?: any) => Command): Editor {
+  public registerCommand(name: string, callback: CommandSpec): Editor {
     if (this.commands[name]) {
       throw new Error(`tiptap: command '${name}' is already defined.`)
     }
diff --git a/packages/core/src/Extension.ts b/packages/core/src/Extension.ts
index bf5451f4..873c424b 100644
--- a/packages/core/src/Extension.ts
+++ b/packages/core/src/Extension.ts
@@ -1,6 +1,6 @@
 import cloneDeep from 'clone-deep'
 import { Plugin } from 'prosemirror-state'
-import { Editor, CommandSpec } from './Editor'
+import { Editor, CommandsSpec } from './Editor'
 
 type AnyObject = {
   [key: string]: any
@@ -26,7 +26,7 @@ export interface ExtensionProps<Options> {
 export interface ExtensionMethods<Props, Options> {
   name: string
   options: Options
-  commands: (params: Props) => CommandSpec
+  commands: (params: Props) => CommandsSpec
   inputRules: (params: Props) => any[]
   pasteRules: (params: Props) => any[]
   keys: (params: Props) => {

From b0378e593d17bd636dff013d8ca178e3ee32f4d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Wed, 23 Sep 2020 08:59:21 +0200
Subject: [PATCH 25/25] move code to commandmanager

---
 packages/core/src/CommandManager.ts | 28 ++++++++++++++++++++++++----
 packages/core/src/Editor.ts         | 28 ++++------------------------
 2 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/packages/core/src/CommandManager.ts b/packages/core/src/CommandManager.ts
index c6e8295b..2ebeab31 100644
--- a/packages/core/src/CommandManager.ts
+++ b/packages/core/src/CommandManager.ts
@@ -1,14 +1,34 @@
-import { EditorState, Transaction } from "prosemirror-state";
-import { ChainedCommands, Editor } from "./Editor";
+import { EditorState, Transaction } from "prosemirror-state"
+import { ChainedCommands, Editor, CommandSpec } from "./Editor"
+import getAllMethodNames from './utils/getAllMethodNames'
 
 export default class CommandManager {
 
   editor: Editor
   commands: { [key: string]: any } = {}
 
-  constructor(editor: Editor, commands: any) {
+  constructor(editor: Editor) {
     this.editor = editor
-    this.commands = commands
+  }
+
+  /**
+   * Register a command.
+   *
+   * @param name The name of your command
+   * @param callback The method of your command
+   */
+  public registerCommand(name: string, callback: CommandSpec): Editor {
+    if (this.commands[name]) {
+      throw new Error(`tiptap: command '${name}' is already defined.`)
+    }
+
+    if (getAllMethodNames(this.editor).includes(name)) {
+      throw new Error(`tiptap: '${name}' is a protected name.`)
+    }
+
+    this.commands[name] = callback
+
+    return this.editor
   }
 
   public runSingleCommand(name: string) {
diff --git a/packages/core/src/Editor.ts b/packages/core/src/Editor.ts
index 069c8206..8a9dddef 100644
--- a/packages/core/src/Editor.ts
+++ b/packages/core/src/Editor.ts
@@ -3,7 +3,6 @@ import { EditorView} from 'prosemirror-view'
 import { Schema, DOMParser, DOMSerializer } from 'prosemirror-model'
 import magicMethods from './utils/magicMethods'
 import elementFromString from './utils/elementFromString'
-import getAllMethodNames from './utils/getAllMethodNames'
 import nodeIsActive from './utils/nodeIsActive'
 import markIsActive from './utils/markIsActive'
 import getNodeAttrs from './utils/getNodeAttrs'
@@ -81,7 +80,6 @@ export class Editor extends EventEmitter {
   private proxy!: Editor
   private commandManager!: CommandManager
   private extensionManager!: ExtensionManager
-  private commands: CommandsSpec = {}
   private css!: HTMLStyleElement
   public schema!: Schema
   public view!: EditorView
@@ -106,12 +104,12 @@ export class Editor extends EventEmitter {
    * This method is called after the proxy is initialized.
    */
   private init() {
+    this.createCommandManager()
     this.createExtensionManager()
     this.createSchema()
     this.extensionManager.resolveConfigs()
     this.createView()
     this.registerCommands(commands)
-    this.createCommandManager()
 
     if (this.options.injectCSS) {
       require('./style.css')
@@ -181,29 +179,11 @@ export class Editor extends EventEmitter {
    * @param callback The method of your command
    */
   public registerCommand(name: string, callback: CommandSpec): Editor {
-    if (this.commands[name]) {
-      throw new Error(`tiptap: command '${name}' is already defined.`)
-    }
-
-    if (getAllMethodNames(this).includes(name)) {
-      throw new Error(`tiptap: '${name}' is a protected name.`)
-    }
-
-    this.commands[name] = callback
+    this.commandManager.registerCommand(name, callback)
 
     return this.proxy
   }
 
-  /**
-   * Call a command.
-   *
-   * @param name The name of the command you want to call.
-   * @param options The options of the command.
-   */
-  public command(name: string, ...options: any) {
-    return this.commands[name](...options)
-  }
-
   /**
    * Register a ProseMirror plugin.
    *
@@ -245,7 +225,7 @@ export class Editor extends EventEmitter {
    * Creates an command manager.
    */
   private createCommandManager() {
-    this.commandManager = new CommandManager(this.proxy, this.commands)
+    this.commandManager = new CommandManager(this.proxy)
   }
 
   /**
@@ -401,5 +381,5 @@ export class Editor extends EventEmitter {
     this.removeAllListeners()
     removeElement(this.css)
   }
-
+  
 }