fix extension manager

docs/src/demos/Examples/Focus/index.vue

@@ -31,16 +31,16 @@ export default {
   mounted() {
     this.editor = new Editor({
       extensions: [
-        new Document(),
+        Document(),
-        new History(),
+        History(),
-        new Paragraph(),
+        Paragraph(),
-        new Text(),
+        Text(),
-        new Bold(),
+        Bold(),
-        new Italic(),
+        Italic(),
-        new Code(),
+        Code(),
-        new CodeBlock(),
+        CodeBlock(),
-        new Heading(),
+        Heading(),
-        new Focus({
+        Focus({
           className: 'has-focus',
           nested: true,
         }),

docs/src/demos/Examples/Simple/index.vue

@@ -24,9 +24,9 @@ export default {
     this.editor = new Editor({
       content: '<p>This is a radically reduced version of tiptap for minimalisits. It has only support for a document, paragraphs and text, that’s it.</p>',
       extensions: [
-        new Document(),
+        Document(),
-        new Paragraph(),
+        Paragraph(),
-        new Text(),
+        Text(),
       ],
     })
 

docs/src/demos/ExtensionConfiguration/index.vue

@@ -26,10 +26,10 @@ export default {
     this.editor = new Editor({
       content: '<p>I’m running tiptap with Vue.js. This demo is interactive, try to edit the text.</p>',
       extensions: [
-        new Document(),
+        Document(),
-        new Paragraph(),
+        Paragraph(),
-        new Text(),
+        Text(),
-        new Bold(),
+        Bold(),
       ],
     })
   },

docs/src/demos/Extensions/Bold/index.vue

@@ -30,10 +30,10 @@ export default {
   mounted() {
     this.editor = new Editor({
       extensions: [
-        new Document(),
+        Document(),
-        new Paragraph(),
+        Paragraph(),
-        new Text(),
+        Text(),
-        new Bold(),
+        Bold(),
       ],
       content: `
         <p>This isn’t bold.</p>

docs/src/demos/Extensions/Code/index.vue

@@ -30,10 +30,10 @@ export default {
   mounted() {
     this.editor = new Editor({
       extensions: [
-        new Document(),
+        Document(),
-        new Paragraph(),
+        Paragraph(),
-        new Text(),
+        Text(),
-        new Code(),
+        Code(),
       ],
       content: `
         <p>This isn’t code.</p>

docs/src/demos/Extensions/History/index.vue

@@ -33,10 +33,10 @@ export default {
   mounted() {
     this.editor = new Editor({
       extensions: [
-        new Document(),
+        Document(),
-        new Paragraph(),
+        Paragraph(),
-        new Text(),
+        Text(),
-        new History(),
+        History(),
       ],
       content: `
         <p>Edit this text and press undo to test this extension.</p>

docs/src/demos/Extensions/Italic/index.vue

@@ -30,10 +30,10 @@ export default {
   mounted() {
     this.editor = new Editor({
       extensions: [
-        new Document(),
+        Document(),
-        new Paragraph(),
+        Paragraph(),
-        new Text(),
+        Text(),
-        new Italic(),
+        Italic(),
       ],
       content: `
         <p>This isn’t italic.</p>

docs/src/demos/Guide/BuildYourEditor/index.vue

@@ -55,15 +55,15 @@ export default {
     this.editor = new Editor({
       content: '<h2>Hey there!</h2><p>This editor is based on Prosemirror, fully extendable and renderless. You can easily add custom nodes as Vue components.</p>',
       extensions: [
-        new Document(),
+        Document(),
-        new Paragraph(),
+        Paragraph(),
-        new Text(),
+        Text(),
-        new CodeBlock(),
+        CodeBlock(),
-        new History(),
+        History(),
-        new Bold(),
+        Bold(),
-        new Italic(),
+        Italic(),
-        new Code(),
+        Code(),
-        new Heading(),
+        Heading(),
       ],
     })
   },

docs/src/docPages/api/extensions/blockquote.md

@@ -39,7 +39,7 @@ export default {
     return {
       editor: new Editor({
         extensions: [
-          new Blockquote(),
+          Blockquote(),
         ],
         content: `
           <blockquote>

docs/src/docPages/api/extensions/bullet-list.md

@@ -43,7 +43,7 @@ export default {
     return {
       editor: new Editor({
         extensions: [
-          new BulletList(),
+          BulletList(),
         ],
         content: `
           <ul>

docs/src/docPages/api/extensions/heading.md

@@ -51,7 +51,7 @@ export default {
     return {
       editor: new Editor({
         extensions: [
-          new Heading({
+          Heading({
             levels: [1, 2],
           }),
         ],

docs/src/docPages/api/extensions/horizontal-rule.md

@@ -39,7 +39,7 @@ export default {
     return {
       editor: new Editor({
         extensions: [
-          new HorizontalRule(),
+          HorizontalRule(),
         ],
         content: `
           <p>Some text.</p>

docs/src/docPages/api/extensions/ordered-list.md

@@ -43,7 +43,7 @@ export default {
     return {
       editor: new Editor({
         extensions: [
-          new OrderedList(),
+          OrderedList(),
         ],
         content: `
           <ol>

docs/src/docPages/api/extensions/placeholder.md

@@ -66,10 +66,10 @@ You have to include all table extensions (`TableHeader`, `TableCell` & `TableRow
       return {
         editor: new Editor({
           extensions: [
-            new Table(),
+            Table(),
-            new TableCell(),
+            TableCell(),
-            new TableHeader(),
+            TableHeader(),
-            new TableRow(),
+            TableRow(),
           ],
           content: ''
         }),

docs/src/docPages/api/extensions/strike.md

@@ -40,7 +40,7 @@ export default {
     return {
       editor: new Editor({
         extensions: [
-          new Strike(),
+          Strike(),
         ],
         content: `
           <p><s>That's strikethrough.</s></p>

docs/src/docPages/api/extensions/todo-list.md

@@ -43,10 +43,10 @@ export default {
     return {
       editor: new Editor({
         extensions: [
-          new TodoItem({
+          TodoItem({
             nested: true,
           }),
-          new TodoList(),
+          TodoList(),
         ],
         content: `
           <ul data-type="todo_list">

docs/src/docPages/api/extensions/underline.md

@@ -40,7 +40,7 @@ export default {
     return {
       editor: new Editor({
         extensions: [
-          new Underline(),
+          Underline(),
         ],
         content: `
           <p><u>This is underlined.</u></p>

docs/src/docPages/general/roadmap.md

@@ -2,7 +2,7 @@
 
 ## New features
 
-* generate schema without initializing tiptap, to make SSR easier (e. g. `getSchema([new Doc(), new Paragraph()])`)
+* generate schema without initializing tiptap, to make SSR easier (e. g. `getSchema([Doc(), Paragraph()])`)
 
 ## Requested features
 

packages/core/src/Editor.ts

@@ -12,6 +12,9 @@ import removeElement from './utils/removeElement'
 import getSchemaTypeByName from './utils/getSchemaTypeByName'
 import ExtensionManager from './ExtensionManager'
 import EventEmitter from './EventEmitter'
+import Extension from './Extension'
+import Node from './Node'
+import Mark from './Mark'
 import ComponentRenderer from './ComponentRenderer'
 import defaultPlugins from './plugins'
 import * as commands from './commands'
@@ -27,7 +30,7 @@ type EditorContent = string | JSON | null
 interface EditorOptions {
   element: Element,
   content: EditorContent,
-  extensions: Function[],
+  extensions: (Extension | Node | Mark)[],
   injectCSS: boolean,
   autoFocus: 'start' | 'end' | number | boolean | null,
   editable: boolean,

packages/core/src/Extension.ts

@@ -78,9 +78,15 @@ export interface ExtensionExtends<Callback = ExtensionCallback> {
   plugins: (params: Callback) => Plugin[]
 }
 
-export default class Extension<Options, Extends extends ExtensionExtends = ExtensionExtends> {
+export default class Extension<Options = {}, Extends extends ExtensionExtends = ExtensionExtends> {
   type = 'extension'
-  configs: any = {}
+  config: any = {}
+  configs: {
+    [key: string]: {
+      stategy: 'extend' | 'overwrite'
+      value: any
+    }[]
+  } = {} 
   usedOptions: Partial<Options> = {}
 
   protected storeConfig(key: string, value: any, stategy: 'extend' | 'overwrite') {

packages/core/src/ExtensionManager.ts

@@ -1,3 +1,4 @@
+import deepmerge from 'deepmerge'
 import collect from 'collect.js'
 import { Plugin } from 'prosemirror-state'
 import { keymap } from 'prosemirror-keymap'
@@ -10,8 +11,7 @@ import Node from './Node'
 import Mark from './Mark'
 import capitalize from './utils/capitalize'
 
-// type Extensions = (Extension | Node | Mark)[]
+type Extensions = (Extension | Node | Mark)[]
-type Extensions = Function[]
 
 export default class ExtensionManager {
 
@@ -22,77 +22,106 @@ export default class ExtensionManager {
     this.editor = editor
     this.extensions = extensions
     this.extensions.forEach(extension => {
-      console.log({extension})
+      const simpleConfigs = ['name', 'defaults']
-      // extension.bindEditor(editor)
+
-      // editor.on('schemaCreated', () => {
+      Object
-      //   this.editor.registerCommands(extension.commands())
+        .entries(extension.configs)
-      //   extension.created()
+        .sort(([name]) => simpleConfigs.includes(name) ? -1 : 1)
-      // })
+        .forEach(([name, configs]) => {
+          extension.config[name] = configs.reduce((accumulator, { stategy, value: rawValue }) => {
+            const isSimpleConfig = simpleConfigs.includes(name)
+            const props = isSimpleConfig
+              ? undefined
+              : {
+                editor,
+                options: deepmerge(extension.config.defaults, extension.usedOptions),
+                type: {},
+                name: '',
+              }
+            const value = typeof rawValue === 'function'
+              ? rawValue(props)
+              : rawValue
+
+            if (accumulator === undefined) {
+              return value
+            }
+
+            if (stategy === 'overwrite') {
+              return value
+            }
+
+            if (stategy === 'extend') {
+              return deepmerge(accumulator, value)
+            }
+
+            return accumulator
+          }, undefined)
+        })
+
+      editor.on('schemaCreated', () => {
+        if (extension.config.commands) {
+          this.editor.registerCommands(extension.config.commands)
+        }
+      })
     })
   }
 
   get topNode() {
-    const topNode = collect(this.extensions).firstWhere('topNode', true)
+    const topNode = collect(this.extensions).firstWhere('config.topNode', true)
 
     if (topNode) {
-      return topNode.name
+      return topNode.config.name
     }
   }
 
   get nodes(): any {
-    // return collect(this.extensions)
+    return collect(this.extensions)
-    //   .where('extensionType', 'node')
+      .where('type', 'node')
-    //   .mapWithKeys((extension: Node) => [extension.name, extension.schema()])
+      .mapWithKeys((extension: Node) => [extension.config.name, extension.config.schema])
-    //   .all()
+      .all()
-    return []
   }
 
   get marks(): any {
-    // return collect(this.extensions)
+    return collect(this.extensions)
-    //   .where('extensionType', 'mark')
+      .where('type', 'mark')
-    //   .mapWithKeys((extension: Mark) => [extension.name, extension.schema()])
+      .mapWithKeys((extension: Mark) => [extension.config.name, extension.config.schema])
-    //   .all()
+      .all()
-    return []
   }
 
   get plugins(): Plugin[] {
-    // const plugins = collect(this.extensions)
+    const plugins = collect(this.extensions)
-    //   .flatMap(extension => extension.plugins())
+      .flatMap(extension => extension.config.plugins)
-    //   .toArray()
+      .filter(plugin => plugin)
+      .toArray()
 
-    // return [
+    return [
-    //   ...plugins,
+      ...plugins,
-    //   ...this.keymaps,
+      ...this.keymaps,
-    //   ...this.pasteRules,
+      ...this.pasteRules,
-    //   inputRules({ rules: this.inputRules }),
+      inputRules({ rules: this.inputRules }),
-    // ]
+    ]
-
-    return []
   }
 
   get inputRules(): any {
-    // return collect(this.extensions)
+    return collect(this.extensions)
-    //   .flatMap(extension => extension.inputRules())
+      .flatMap(extension => extension.config.inputRules)
-    //   .toArray()
+      .filter(plugin => plugin)
-
+      .toArray()
-    return {}
   }
 
   get pasteRules(): any {
-    // return collect(this.extensions)
+    return collect(this.extensions)
-    //   .flatMap(extension => extension.pasteRules())
+      .flatMap(extension => extension.config.pasteRules)
-    //   .toArray()
+      .filter(plugin => plugin)
-    return {}
+      .toArray()
   }
 
   get keymaps() {
-    // return collect(this.extensions)
+    return collect(this.extensions)
-    //   .map(extension => extension.keys())
+      .map(extension => extension.config.keys)
-    //   .filter(keys => !!Object.keys(keys).length)
+      .filter(keys => keys)
-    //   // @ts-ignore
+      .map(keys => keymap(keys))
-    //   .map(keys => keymap(keys))
+      .toArray()
-    //   .toArray()
-    return []
   }
 
   get nodeViews() {