revert some magic

packages/core/src/Extension.ts

@@ -39,7 +39,7 @@ export default abstract class Extension {
     return []
   }
 
-  keys(): string | { [key: string]: Function } {
+  keys(): { [key: string]: Function } {
     return {}
   }
 

packages/core/src/ExtensionManager.ts

@@ -79,17 +79,7 @@ export default class ExtensionManager {
 
   get keymaps() {
     return collect(this.extensions)
-      .map(extension => {
+      .map(extension => extension.keys())
-        const keys = extension.keys()
-
-        if (typeof keys === 'string') {
-          return {
-            [keys]: () => this.editor.command(extension.name)
-          }
-        }
-
-        return keys
-      })
       .filter(keys => !!Object.keys(keys).length)
       .map(keys => keymap(keys))
       .toArray()

packages/extension-bold/index.ts

@@ -42,13 +42,14 @@ export default class Bold extends Mark {
   }
 
   keys() {
-    return 'Mod-b'
+    return {
+      'Mod-b': () => this.editor.bold()
+    }
   }
 
   inputRules() {
     return ['**', '__'].map(character => {
-      return markInputRule(
+      const regex = VerEx()
-        VerEx()
         .add('(?:^|\\s)')
         .beginCapture()
         .find(character)
@@ -57,16 +58,15 @@ export default class Bold extends Mark {
         .endCapture()
         .find(character)
         .endCapture()
-          .endOfLine(),
+        .endOfLine()
-        this.type,
+
-      )
+      return markInputRule(regex, this.type)
     })
   }
 
   pasteRules() {
     return ['**', '__'].map(character => {
-      return markPasteRule(
+      const regex = VerEx()
-        VerEx()
         .add('(?:^|\\s)')
         .beginCapture()
         .find(character)
@@ -74,9 +74,9 @@ export default class Bold extends Mark {
         .somethingBut(character)
         .endCapture()
         .find(character)
-          .endCapture(),
+        .endCapture()
-        this.type,
+
-      )
+      return markPasteRule(regex, this.type)
     })
   }
 

packages/extension-code/index.ts

@@ -33,12 +33,13 @@ export default class Code extends Mark {
   }
 
   keys() {
-    return 'Mod-`'
+    return {
+      'Mod-`': () => this.editor.code()
+    }
   }
 
   inputRules() {
-    return markInputRule(
+    const regex = VerEx()
-      VerEx()
       .add('(?:^|\\s)')
       .beginCapture()
       .find('`')
@@ -47,14 +48,13 @@ export default class Code extends Mark {
       .endCapture()
       .find('`')
       .endCapture()
-        .endOfLine(),
+      .endOfLine()
-      this.type,
+
-    )
+    return markInputRule(regex, this.type)
   }
 
   pasteRules() {
-    return markPasteRule(
+    const regex = VerEx()
-      VerEx()
       .add('(?:^|\\s)')
       .beginCapture()
       .find('`')
@@ -62,9 +62,9 @@ export default class Code extends Mark {
       .somethingBut('`')
       .endCapture()
       .find('`')
-        .endCapture(),
+      .endCapture()
-      this.type,
+
-    )
+    return markPasteRule(regex, this.type)
   }
 
 }

packages/extension-italic/index.ts

@@ -34,13 +34,14 @@ export default class Italic extends Mark {
   }
 
   keys() {
-    return 'Mod-i'
+    return {
+      'Mod-i': () => this.editor.italic()
+    }
   }
 
   inputRules() {
     return ['*', '_'].map(character => {
-      return markInputRule(
+      const regex = VerEx()
-        VerEx()
         .add('(?:^|\\s)')
         .beginCapture()
         .find(character)
@@ -49,16 +50,15 @@ export default class Italic extends Mark {
         .endCapture()
         .find(character)
         .endCapture()
-          .endOfLine(),
+        .endOfLine()
-        this.type,
+
-      )
+      return markInputRule(regex, this.type)
     })
   }
 
   pasteRules() {
     return ['*', '_'].map(character => {
-      return markPasteRule(
+      const regex = VerEx()
-        VerEx()
         .add('(?:^|\\s)')
         .beginCapture()
         .find(character)
@@ -66,9 +66,9 @@ export default class Italic extends Mark {
         .somethingBut(character)
         .endCapture()
         .find(character)
-          .endCapture(),
+        .endCapture()
-        this.type,
+
-      )
+      return markPasteRule(regex, this.type)
     })
   }