fix structure

This commit is contained in:
Philipp Kühn
2020-09-09 21:12:25 +02:00
parent 25864fba11
commit 5aeb7bf4ec
4 changed files with 10 additions and 32 deletions

View File

@@ -53,38 +53,16 @@ export default class ExtensionManager {
})
}
// get topNode() {
// return getTopNodeFromExtensions(this.extensions)
// }
// get nodes(): any {
// return getNodesFromExtensions(this.extensions)
// }
// get marks(): any {
// return getMarksFromExtensions(this.extensions)
// }
get topNode(): any {
const topNode = collect(this.extensions).firstWhere('config.topNode', true)
if (topNode) {
return topNode.config.name
}
return getTopNodeFromExtensions(this.extensions)
}
get nodes(): any {
return collect(this.extensions)
.where('type', 'node')
.mapWithKeys((extension: Node) => [extension.config.name, extension.config.schema])
.all()
return getNodesFromExtensions(this.extensions)
}
get marks(): any {
return collect(this.extensions)
.where('type', 'mark')
.mapWithKeys((extension: Mark) => [extension.config.name, extension.config.schema])
.all()
return getMarksFromExtensions(this.extensions)
}
get plugins(): Plugin[] {

View File

@@ -4,7 +4,7 @@ import { Extensions } from '../types'
export default function getMarksFromExtensions(extensions: Extensions): any {
return collect(extensions)
.where('extensionType', 'mark')
.mapWithKeys((extension: Mark) => [extension.name, extension.schema()])
.where('type', 'mark')
.mapWithKeys((extension: Mark) => [extension.config.name, extension.config.schema])
.all()
}

View File

@@ -4,7 +4,7 @@ import { Extensions } from '../types'
export default function getNodesFromExtensions(extensions: Extensions): any {
return collect(extensions)
.where('extensionType', 'node')
.mapWithKeys((extension: Node) => [extension.name, extension.schema()])
.where('type', 'node')
.mapWithKeys((extension: Node) => [extension.config.name, extension.config.schema])
.all()
}

View File

@@ -2,9 +2,9 @@ import collect from 'collect.js'
import { Extensions } from '../types'
export default function getTopNodeFromExtensions(extensions: Extensions): any {
const topNode = collect(extensions).firstWhere('topNode', true)
const topNode = collect(extensions).firstWhere('config.topNode', true)
if (topNode) {
return topNode.name
return topNode.config.name
}
}