From 5aeb7bf4ecb32f6d1f7e8b58aeebc64f809bbc89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Wed, 9 Sep 2020 21:12:25 +0200
Subject: [PATCH] fix structure

---
 packages/core/src/ExtensionManager.ts         | 30 +++----------------
 .../core/src/utils/getMarksFromExtensions.ts  |  4 +--
 .../core/src/utils/getNodesFromExtensions.ts  |  4 +--
 .../src/utils/getTopNodeFromExtensions.ts     |  4 +--
 4 files changed, 10 insertions(+), 32 deletions(-)

diff --git a/packages/core/src/ExtensionManager.ts b/packages/core/src/ExtensionManager.ts
index a32d023f..178beaa6 100644
--- a/packages/core/src/ExtensionManager.ts
+++ b/packages/core/src/ExtensionManager.ts
@@ -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[] {
diff --git a/packages/core/src/utils/getMarksFromExtensions.ts b/packages/core/src/utils/getMarksFromExtensions.ts
index fca51100..63c890bf 100644
--- a/packages/core/src/utils/getMarksFromExtensions.ts
+++ b/packages/core/src/utils/getMarksFromExtensions.ts
@@ -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()
 }
\ No newline at end of file
diff --git a/packages/core/src/utils/getNodesFromExtensions.ts b/packages/core/src/utils/getNodesFromExtensions.ts
index 94604110..409c04fc 100644
--- a/packages/core/src/utils/getNodesFromExtensions.ts
+++ b/packages/core/src/utils/getNodesFromExtensions.ts
@@ -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()
 }
\ No newline at end of file
diff --git a/packages/core/src/utils/getTopNodeFromExtensions.ts b/packages/core/src/utils/getTopNodeFromExtensions.ts
index 360bc57e..a7ce3e63 100644
--- a/packages/core/src/utils/getTopNodeFromExtensions.ts
+++ b/packages/core/src/utils/getTopNodeFromExtensions.ts
@@ -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
   }
 }
\ No newline at end of file