From 8ad39d77fd5f8a8b83c7af85ee7330c77b7eb631 Mon Sep 17 00:00:00 2001
From: chris <kokosias@yahoo.gr>
Date: Thu, 20 Oct 2022 20:26:28 +0300
Subject: [PATCH] default wax services to core
---
wax-prosemirror-core/index.js | 10 ++++++++++
wax-prosemirror-core/src/Application.js | 2 +-
.../src/config/defaultConfig.js | 17 +++++++----------
.../DefaultLayout/DefaultLayout.js | 0
.../defaultServices}/LayoutService/Layout.js | 0
.../LayoutService/LayoutService.js | 0
.../LayoutService/components/LayoutFactory.js | 0
.../LayoutService/components/componentPlugin.js | 0
.../config/defaultServices}/MenuService/Menu.js | 0
.../MenuService/MenuCollection.js | 0
.../defaultServices}/MenuService/MenuService.js | 0
.../defaultServices}/MenuService/MenuWrapper.js | 0
.../OverlayService/OverlayComponent.js | 0
.../OverlayService/OverlayService.js | 0
.../OverlayService/usePosition.js | 0
.../PortalService/AbstractNodeView.js | 0
.../PortalService/PortalService.js | 0
.../defaultServices}/PortalService/Portals.js | 0
.../PortalService/components/PortalComponent.js | 0
.../PortalService/portalPlugin.js | 0
.../defaultServices}/RulesService/Rules.js | 0
.../RulesService/RulesService.js | 0
.../defaultServices}/SchemaService/Mark.js | 0
.../defaultServices}/SchemaService/Node.js | 0
.../defaultServices}/SchemaService/ParseRule.js | 0
.../defaultServices}/SchemaService/Schema.js | 0
.../SchemaService/SchemaService.js | 0
.../ShortCutsService/ShortCuts.js | 0
.../ShortCutsService/ShortCutsService.js | 0
wax-prosemirror-core/src/utilities/lib/Tools.js | 1 -
.../utilities}/lib/helpers/QuestionsNodeView.js | 2 +-
wax-prosemirror-services/index.js | 10 ----------
.../src/EssayService/EssayAnswerNodeView.js | 2 +-
.../src/EssayService/EssayQuestionNodeView.js | 2 +-
.../FillTheGapContainerNodeView.js | 2 +-
.../FillTheGapNodeView.js | 2 +-
.../MatchingContainerNodeView.js | 2 +-
.../MatchingService/MatchingOptionNodeView.js | 2 +-
.../MultipleChoiceContainerNodeView.js | 2 +-
.../MultipleChoiceNodeView.js | 2 +-
...tipleChoiceSingleCorrectContainerNodeView.js | 2 +-
.../MultipleChoiceSingleCorrectNodeView.js | 2 +-
.../QuestionMultipleSingleNodeView.js | 2 +-
.../QuestionNodeView.js | 2 +-
.../QuestionTrueFalseNodeView.js | 2 +-
.../TrueFalseContainerNodeView.js | 2 +-
.../TrueFalseNodeView.js | 2 +-
.../QuestionTrueFalseSingleNodeView.js | 2 +-
.../TrueFalseSingleCorrectContainerNodeView.js | 2 +-
.../TrueFalseSingleCorrectNodeView.js | 2 +-
.../MultipleDropDownNodeView.js | 2 +-
.../MultipleDropDownContainerNodeView.js | 2 +-
52 files changed, 39 insertions(+), 43 deletions(-)
rename {wax-prosemirror-services/src => wax-prosemirror-core/src/config/defaultServices}/LayoutService/DefaultLayout/DefaultLayout.js (100%)
rename {wax-prosemirror-services/src => wax-prosemirror-core/src/config/defaultServices}/LayoutService/Layout.js (100%)
rename {wax-prosemirror-services/src => wax-prosemirror-core/src/config/defaultServices}/LayoutService/LayoutService.js (100%)
rename {wax-prosemirror-services/src => wax-prosemirror-core/src/config/defaultServices}/LayoutService/components/LayoutFactory.js (100%)
rename {wax-prosemirror-services/src => wax-prosemirror-core/src/config/defaultServices}/LayoutService/components/componentPlugin.js (100%)
rename {wax-prosemirror-services/src => wax-prosemirror-core/src/config/defaultServices}/MenuService/Menu.js (100%)
rename {wax-prosemirror-services/src => wax-prosemirror-core/src/config/defaultServices}/MenuService/MenuCollection.js (100%)
rename {wax-prosemirror-services/src => wax-prosemirror-core/src/config/defaultServices}/MenuService/MenuService.js (100%)
rename {wax-prosemirror-services/src => wax-prosemirror-core/src/config/defaultServices}/MenuService/MenuWrapper.js (100%)
rename {wax-prosemirror-services/src => wax-prosemirror-core/src/config/defaultServices}/OverlayService/OverlayComponent.js (100%)
rename {wax-prosemirror-services/src => wax-prosemirror-core/src/config/defaultServices}/OverlayService/OverlayService.js (100%)
rename {wax-prosemirror-services/src => wax-prosemirror-core/src/config/defaultServices}/OverlayService/usePosition.js (100%)
rename {wax-prosemirror-services/src => wax-prosemirror-core/src/config/defaultServices}/PortalService/AbstractNodeView.js (100%)
rename {wax-prosemirror-services/src => wax-prosemirror-core/src/config/defaultServices}/PortalService/PortalService.js (100%)
rename {wax-prosemirror-services/src => wax-prosemirror-core/src/config/defaultServices}/PortalService/Portals.js (100%)
rename {wax-prosemirror-services/src => wax-prosemirror-core/src/config/defaultServices}/PortalService/components/PortalComponent.js (100%)
rename {wax-prosemirror-services/src => wax-prosemirror-core/src/config/defaultServices}/PortalService/portalPlugin.js (100%)
rename {wax-prosemirror-services/src => wax-prosemirror-core/src/config/defaultServices}/RulesService/Rules.js (100%)
rename {wax-prosemirror-services/src => wax-prosemirror-core/src/config/defaultServices}/RulesService/RulesService.js (100%)
rename {wax-prosemirror-services/src => wax-prosemirror-core/src/config/defaultServices}/SchemaService/Mark.js (100%)
rename {wax-prosemirror-services/src => wax-prosemirror-core/src/config/defaultServices}/SchemaService/Node.js (100%)
rename {wax-prosemirror-services/src => wax-prosemirror-core/src/config/defaultServices}/SchemaService/ParseRule.js (100%)
rename {wax-prosemirror-services/src => wax-prosemirror-core/src/config/defaultServices}/SchemaService/Schema.js (100%)
rename {wax-prosemirror-services/src => wax-prosemirror-core/src/config/defaultServices}/SchemaService/SchemaService.js (100%)
rename {wax-prosemirror-services/src => wax-prosemirror-core/src/config/defaultServices}/ShortCutsService/ShortCuts.js (100%)
rename {wax-prosemirror-services/src => wax-prosemirror-core/src/config/defaultServices}/ShortCutsService/ShortCutsService.js (100%)
rename {wax-prosemirror-services/src => wax-prosemirror-core/src/utilities}/lib/helpers/QuestionsNodeView.js (92%)
diff --git a/wax-prosemirror-core/index.js b/wax-prosemirror-core/index.js
index 0e2b3c304..b46d15e5b 100644
--- a/wax-prosemirror-core/index.js
+++ b/wax-prosemirror-core/index.js
@@ -8,4 +8,14 @@ export { default as Middleware } from './src/utilities/lib/Middleware';
export { default as ToolGroup } from './src/utilities/lib/ToolGroup';
export { default as Tools } from './src/utilities/lib/Tools';
+/* Base services */
+export { default as LayoutService } from './src/config/defaultServices/LayoutService/LayoutService';
+export { default as PortalService } from './src/config/defaultServices/PortalService/PortalService';
+export { default as MenuService } from './src/config/defaultServices/MenuService/MenuService';
+export { default as OverlayService } from './src/config/defaultServices/OverlayService/OverlayService';
+export { default as RulesService } from './src/config/defaultServices/RulesService/RulesService';
+export { default as SchemaService } from './src/config/defaultServices/SchemaService/SchemaService';
+export { default as ShortCutsService } from './src/config/defaultServices/ShortCutsService/ShortCutsService';
+export { default as QuestionsNodeView } from './src/utilities/lib/helpers/QuestionsNodeView';
+
export { default as Wax } from './src/Wax';
diff --git a/wax-prosemirror-core/src/Application.js b/wax-prosemirror-core/src/Application.js
index 33d89fade..ef7f4f8a3 100644
--- a/wax-prosemirror-core/src/Application.js
+++ b/wax-prosemirror-core/src/Application.js
@@ -1,5 +1,5 @@
import { Container } from 'inversify';
-import 'reflect-metadata';
+// import 'reflect-metadata';
import deepmerge from 'deepmerge';
import Config from './config/Config';
import defaultConfig from './config/defaultConfig';
diff --git a/wax-prosemirror-core/src/config/defaultConfig.js b/wax-prosemirror-core/src/config/defaultConfig.js
index 9871d85c8..8b5f98f72 100644
--- a/wax-prosemirror-core/src/config/defaultConfig.js
+++ b/wax-prosemirror-core/src/config/defaultConfig.js
@@ -1,13 +1,10 @@
-/* eslint-disable import/no-extraneous-dependencies */
-import {
- SchemaService,
- MenuService,
- RulesService,
- ShortCutsService,
- LayoutService,
- OverlayService,
- PortalService,
-} from 'wax-prosemirror-services';
+import SchemaService from './defaultServices/SchemaService/SchemaService';
+import RulesService from './defaultServices/RulesService/RulesService';
+import ShortCutsService from './defaultServices/ShortCutsService/ShortCutsService';
+import LayoutService from './defaultServices/LayoutService/LayoutService';
+import PortalService from './defaultServices/PortalService/PortalService';
+import MenuService from './defaultServices/MenuService/MenuService';
+import OverlayService from './defaultServices/OverlayService/OverlayService';
export default () => ({
services: [
diff --git a/wax-prosemirror-services/src/LayoutService/DefaultLayout/DefaultLayout.js b/wax-prosemirror-core/src/config/defaultServices/LayoutService/DefaultLayout/DefaultLayout.js
similarity index 100%
rename from wax-prosemirror-services/src/LayoutService/DefaultLayout/DefaultLayout.js
rename to wax-prosemirror-core/src/config/defaultServices/LayoutService/DefaultLayout/DefaultLayout.js
diff --git a/wax-prosemirror-services/src/LayoutService/Layout.js b/wax-prosemirror-core/src/config/defaultServices/LayoutService/Layout.js
similarity index 100%
rename from wax-prosemirror-services/src/LayoutService/Layout.js
rename to wax-prosemirror-core/src/config/defaultServices/LayoutService/Layout.js
diff --git a/wax-prosemirror-services/src/LayoutService/LayoutService.js b/wax-prosemirror-core/src/config/defaultServices/LayoutService/LayoutService.js
similarity index 100%
rename from wax-prosemirror-services/src/LayoutService/LayoutService.js
rename to wax-prosemirror-core/src/config/defaultServices/LayoutService/LayoutService.js
diff --git a/wax-prosemirror-services/src/LayoutService/components/LayoutFactory.js b/wax-prosemirror-core/src/config/defaultServices/LayoutService/components/LayoutFactory.js
similarity index 100%
rename from wax-prosemirror-services/src/LayoutService/components/LayoutFactory.js
rename to wax-prosemirror-core/src/config/defaultServices/LayoutService/components/LayoutFactory.js
diff --git a/wax-prosemirror-services/src/LayoutService/components/componentPlugin.js b/wax-prosemirror-core/src/config/defaultServices/LayoutService/components/componentPlugin.js
similarity index 100%
rename from wax-prosemirror-services/src/LayoutService/components/componentPlugin.js
rename to wax-prosemirror-core/src/config/defaultServices/LayoutService/components/componentPlugin.js
diff --git a/wax-prosemirror-services/src/MenuService/Menu.js b/wax-prosemirror-core/src/config/defaultServices/MenuService/Menu.js
similarity index 100%
rename from wax-prosemirror-services/src/MenuService/Menu.js
rename to wax-prosemirror-core/src/config/defaultServices/MenuService/Menu.js
diff --git a/wax-prosemirror-services/src/MenuService/MenuCollection.js b/wax-prosemirror-core/src/config/defaultServices/MenuService/MenuCollection.js
similarity index 100%
rename from wax-prosemirror-services/src/MenuService/MenuCollection.js
rename to wax-prosemirror-core/src/config/defaultServices/MenuService/MenuCollection.js
diff --git a/wax-prosemirror-services/src/MenuService/MenuService.js b/wax-prosemirror-core/src/config/defaultServices/MenuService/MenuService.js
similarity index 100%
rename from wax-prosemirror-services/src/MenuService/MenuService.js
rename to wax-prosemirror-core/src/config/defaultServices/MenuService/MenuService.js
diff --git a/wax-prosemirror-services/src/MenuService/MenuWrapper.js b/wax-prosemirror-core/src/config/defaultServices/MenuService/MenuWrapper.js
similarity index 100%
rename from wax-prosemirror-services/src/MenuService/MenuWrapper.js
rename to wax-prosemirror-core/src/config/defaultServices/MenuService/MenuWrapper.js
diff --git a/wax-prosemirror-services/src/OverlayService/OverlayComponent.js b/wax-prosemirror-core/src/config/defaultServices/OverlayService/OverlayComponent.js
similarity index 100%
rename from wax-prosemirror-services/src/OverlayService/OverlayComponent.js
rename to wax-prosemirror-core/src/config/defaultServices/OverlayService/OverlayComponent.js
diff --git a/wax-prosemirror-services/src/OverlayService/OverlayService.js b/wax-prosemirror-core/src/config/defaultServices/OverlayService/OverlayService.js
similarity index 100%
rename from wax-prosemirror-services/src/OverlayService/OverlayService.js
rename to wax-prosemirror-core/src/config/defaultServices/OverlayService/OverlayService.js
diff --git a/wax-prosemirror-services/src/OverlayService/usePosition.js b/wax-prosemirror-core/src/config/defaultServices/OverlayService/usePosition.js
similarity index 100%
rename from wax-prosemirror-services/src/OverlayService/usePosition.js
rename to wax-prosemirror-core/src/config/defaultServices/OverlayService/usePosition.js
diff --git a/wax-prosemirror-services/src/PortalService/AbstractNodeView.js b/wax-prosemirror-core/src/config/defaultServices/PortalService/AbstractNodeView.js
similarity index 100%
rename from wax-prosemirror-services/src/PortalService/AbstractNodeView.js
rename to wax-prosemirror-core/src/config/defaultServices/PortalService/AbstractNodeView.js
diff --git a/wax-prosemirror-services/src/PortalService/PortalService.js b/wax-prosemirror-core/src/config/defaultServices/PortalService/PortalService.js
similarity index 100%
rename from wax-prosemirror-services/src/PortalService/PortalService.js
rename to wax-prosemirror-core/src/config/defaultServices/PortalService/PortalService.js
diff --git a/wax-prosemirror-services/src/PortalService/Portals.js b/wax-prosemirror-core/src/config/defaultServices/PortalService/Portals.js
similarity index 100%
rename from wax-prosemirror-services/src/PortalService/Portals.js
rename to wax-prosemirror-core/src/config/defaultServices/PortalService/Portals.js
diff --git a/wax-prosemirror-services/src/PortalService/components/PortalComponent.js b/wax-prosemirror-core/src/config/defaultServices/PortalService/components/PortalComponent.js
similarity index 100%
rename from wax-prosemirror-services/src/PortalService/components/PortalComponent.js
rename to wax-prosemirror-core/src/config/defaultServices/PortalService/components/PortalComponent.js
diff --git a/wax-prosemirror-services/src/PortalService/portalPlugin.js b/wax-prosemirror-core/src/config/defaultServices/PortalService/portalPlugin.js
similarity index 100%
rename from wax-prosemirror-services/src/PortalService/portalPlugin.js
rename to wax-prosemirror-core/src/config/defaultServices/PortalService/portalPlugin.js
diff --git a/wax-prosemirror-services/src/RulesService/Rules.js b/wax-prosemirror-core/src/config/defaultServices/RulesService/Rules.js
similarity index 100%
rename from wax-prosemirror-services/src/RulesService/Rules.js
rename to wax-prosemirror-core/src/config/defaultServices/RulesService/Rules.js
diff --git a/wax-prosemirror-services/src/RulesService/RulesService.js b/wax-prosemirror-core/src/config/defaultServices/RulesService/RulesService.js
similarity index 100%
rename from wax-prosemirror-services/src/RulesService/RulesService.js
rename to wax-prosemirror-core/src/config/defaultServices/RulesService/RulesService.js
diff --git a/wax-prosemirror-services/src/SchemaService/Mark.js b/wax-prosemirror-core/src/config/defaultServices/SchemaService/Mark.js
similarity index 100%
rename from wax-prosemirror-services/src/SchemaService/Mark.js
rename to wax-prosemirror-core/src/config/defaultServices/SchemaService/Mark.js
diff --git a/wax-prosemirror-services/src/SchemaService/Node.js b/wax-prosemirror-core/src/config/defaultServices/SchemaService/Node.js
similarity index 100%
rename from wax-prosemirror-services/src/SchemaService/Node.js
rename to wax-prosemirror-core/src/config/defaultServices/SchemaService/Node.js
diff --git a/wax-prosemirror-services/src/SchemaService/ParseRule.js b/wax-prosemirror-core/src/config/defaultServices/SchemaService/ParseRule.js
similarity index 100%
rename from wax-prosemirror-services/src/SchemaService/ParseRule.js
rename to wax-prosemirror-core/src/config/defaultServices/SchemaService/ParseRule.js
diff --git a/wax-prosemirror-services/src/SchemaService/Schema.js b/wax-prosemirror-core/src/config/defaultServices/SchemaService/Schema.js
similarity index 100%
rename from wax-prosemirror-services/src/SchemaService/Schema.js
rename to wax-prosemirror-core/src/config/defaultServices/SchemaService/Schema.js
diff --git a/wax-prosemirror-services/src/SchemaService/SchemaService.js b/wax-prosemirror-core/src/config/defaultServices/SchemaService/SchemaService.js
similarity index 100%
rename from wax-prosemirror-services/src/SchemaService/SchemaService.js
rename to wax-prosemirror-core/src/config/defaultServices/SchemaService/SchemaService.js
diff --git a/wax-prosemirror-services/src/ShortCutsService/ShortCuts.js b/wax-prosemirror-core/src/config/defaultServices/ShortCutsService/ShortCuts.js
similarity index 100%
rename from wax-prosemirror-services/src/ShortCutsService/ShortCuts.js
rename to wax-prosemirror-core/src/config/defaultServices/ShortCutsService/ShortCuts.js
diff --git a/wax-prosemirror-services/src/ShortCutsService/ShortCutsService.js b/wax-prosemirror-core/src/config/defaultServices/ShortCutsService/ShortCutsService.js
similarity index 100%
rename from wax-prosemirror-services/src/ShortCutsService/ShortCutsService.js
rename to wax-prosemirror-core/src/config/defaultServices/ShortCutsService/ShortCutsService.js
diff --git a/wax-prosemirror-core/src/utilities/lib/Tools.js b/wax-prosemirror-core/src/utilities/lib/Tools.js
index 00718ebaa..f6a92e488 100644
--- a/wax-prosemirror-core/src/utilities/lib/Tools.js
+++ b/wax-prosemirror-core/src/utilities/lib/Tools.js
@@ -4,7 +4,6 @@ import { v4 as uuidv4 } from 'uuid';
import { isEmpty } from 'lodash';
import { injectable, inject } from 'inversify';
import { Button } from 'wax-prosemirror-components';
-import 'reflect-metadata';
@injectable()
class Tools {
diff --git a/wax-prosemirror-services/src/lib/helpers/QuestionsNodeView.js b/wax-prosemirror-core/src/utilities/lib/helpers/QuestionsNodeView.js
similarity index 92%
rename from wax-prosemirror-services/src/lib/helpers/QuestionsNodeView.js
rename to wax-prosemirror-core/src/utilities/lib/helpers/QuestionsNodeView.js
index e776a218e..1c38f0507 100644
--- a/wax-prosemirror-services/src/lib/helpers/QuestionsNodeView.js
+++ b/wax-prosemirror-core/src/utilities/lib/helpers/QuestionsNodeView.js
@@ -1,4 +1,4 @@
-import AbstractNodeView from '../../PortalService/AbstractNodeView';
+import AbstractNodeView from '../../../config/defaultServices/PortalService/AbstractNodeView';
export default class QuestionsNodeView extends AbstractNodeView {
constructor(
diff --git a/wax-prosemirror-services/index.js b/wax-prosemirror-services/index.js
index 80610c3e9..a2121f85a 100644
--- a/wax-prosemirror-services/index.js
+++ b/wax-prosemirror-services/index.js
@@ -1,13 +1,3 @@
-/* Base Services move to core */
-export { default as LayoutService } from './src/LayoutService/LayoutService';
-export { default as PortalService } from './src/PortalService/PortalService';
-export { default as MenuService } from './src/MenuService/MenuService';
-export { default as OverlayService } from './src/OverlayService/OverlayService';
-export { default as RulesService } from './src/RulesService/RulesService';
-export { default as SchemaService } from './src/SchemaService/SchemaService';
-export { default as ShortCutsService } from './src/ShortCutsService/ShortCutsService';
-export { default as AbstractNodeView } from './src/PortalService/AbstractNodeView';
-
/*
All Elements services
*/
diff --git a/wax-prosemirror-services/src/EssayService/EssayAnswerNodeView.js b/wax-prosemirror-services/src/EssayService/EssayAnswerNodeView.js
index 0b56c83e7..d2ee9ec6d 100644
--- a/wax-prosemirror-services/src/EssayService/EssayAnswerNodeView.js
+++ b/wax-prosemirror-services/src/EssayService/EssayAnswerNodeView.js
@@ -1,4 +1,4 @@
-import QuestionsNodeView from '../lib/helpers/QuestionsNodeView';
+import { QuestionsNodeView } from 'wax-prosemirror-core';
export default class EssayAnswerNodeView extends QuestionsNodeView {
constructor(
diff --git a/wax-prosemirror-services/src/EssayService/EssayQuestionNodeView.js b/wax-prosemirror-services/src/EssayService/EssayQuestionNodeView.js
index dd941003d..d76164984 100644
--- a/wax-prosemirror-services/src/EssayService/EssayQuestionNodeView.js
+++ b/wax-prosemirror-services/src/EssayService/EssayQuestionNodeView.js
@@ -1,4 +1,4 @@
-import QuestionsNodeView from '../lib/helpers/QuestionsNodeView';
+import { QuestionsNodeView } from 'wax-prosemirror-core';
export default class EssayQuestionNodeView extends QuestionsNodeView {
constructor(
diff --git a/wax-prosemirror-services/src/FillTheGapQuestionService/FillTheGapContainerNodeView.js b/wax-prosemirror-services/src/FillTheGapQuestionService/FillTheGapContainerNodeView.js
index b973b767c..23e37bbb0 100644
--- a/wax-prosemirror-services/src/FillTheGapQuestionService/FillTheGapContainerNodeView.js
+++ b/wax-prosemirror-services/src/FillTheGapQuestionService/FillTheGapContainerNodeView.js
@@ -1,4 +1,4 @@
-import QuestionsNodeView from '../lib/helpers/QuestionsNodeView';
+import { QuestionsNodeView } from 'wax-prosemirror-core';
export default class FillTheGapContainerNodeView extends QuestionsNodeView {
constructor(
diff --git a/wax-prosemirror-services/src/FillTheGapQuestionService/FillTheGapNodeView.js b/wax-prosemirror-services/src/FillTheGapQuestionService/FillTheGapNodeView.js
index c8b2081b4..2b4510812 100644
--- a/wax-prosemirror-services/src/FillTheGapQuestionService/FillTheGapNodeView.js
+++ b/wax-prosemirror-services/src/FillTheGapQuestionService/FillTheGapNodeView.js
@@ -1,4 +1,4 @@
-import QuestionsNodeView from '../lib/helpers/QuestionsNodeView';
+import { QuestionsNodeView } from 'wax-prosemirror-core';
export default class FillTheGapNodeView extends QuestionsNodeView {
constructor(
diff --git a/wax-prosemirror-services/src/MatchingService/MatchingContainerNodeView.js b/wax-prosemirror-services/src/MatchingService/MatchingContainerNodeView.js
index 387c6ccc3..1eb103735 100644
--- a/wax-prosemirror-services/src/MatchingService/MatchingContainerNodeView.js
+++ b/wax-prosemirror-services/src/MatchingService/MatchingContainerNodeView.js
@@ -1,4 +1,4 @@
-import QuestionsNodeView from '../lib/helpers/QuestionsNodeView';
+import { QuestionsNodeView } from 'wax-prosemirror-core';
export default class MatchingContainerNodeView extends QuestionsNodeView {
constructor(
diff --git a/wax-prosemirror-services/src/MatchingService/MatchingOptionNodeView.js b/wax-prosemirror-services/src/MatchingService/MatchingOptionNodeView.js
index f5a9656cb..9d5d78d1d 100644
--- a/wax-prosemirror-services/src/MatchingService/MatchingOptionNodeView.js
+++ b/wax-prosemirror-services/src/MatchingService/MatchingOptionNodeView.js
@@ -1,4 +1,4 @@
-import QuestionsNodeView from '../lib/helpers/QuestionsNodeView';
+import { QuestionsNodeView } from 'wax-prosemirror-core';
export default class MatchingOptionNodeView extends QuestionsNodeView {
constructor(
diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceContainerNodeView.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceContainerNodeView.js
index f22b73d48..e914da795 100644
--- a/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceContainerNodeView.js
+++ b/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceContainerNodeView.js
@@ -1,4 +1,4 @@
-import QuestionsNodeView from '../lib/helpers/QuestionsNodeView';
+import { QuestionsNodeView } from 'wax-prosemirror-core';
export default class MultipleChoiceContainerNodeView extends QuestionsNodeView {
constructor(
diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceNodeView.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceNodeView.js
index e72d3e88b..78a157c9c 100644
--- a/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceNodeView.js
+++ b/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceNodeView.js
@@ -1,4 +1,4 @@
-import QuestionsNodeView from '../lib/helpers/QuestionsNodeView';
+import { QuestionsNodeView } from 'wax-prosemirror-core';
export default class MultipleChoiceNodeView extends QuestionsNodeView {
constructor(
diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/MultipleChoiceSingleCorrectContainerNodeView.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/MultipleChoiceSingleCorrectContainerNodeView.js
index 2d79fe742..c04f4e616 100644
--- a/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/MultipleChoiceSingleCorrectContainerNodeView.js
+++ b/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/MultipleChoiceSingleCorrectContainerNodeView.js
@@ -1,4 +1,4 @@
-import QuestionsNodeView from '../../lib/helpers/QuestionsNodeView';
+import { QuestionsNodeView } from 'wax-prosemirror-core';
export default class MultipleChoiceSingleCorrectContainerNodeView extends QuestionsNodeView {
constructor(
diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/MultipleChoiceSingleCorrectNodeView.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/MultipleChoiceSingleCorrectNodeView.js
index e650e3a32..fc7b76f69 100644
--- a/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/MultipleChoiceSingleCorrectNodeView.js
+++ b/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/MultipleChoiceSingleCorrectNodeView.js
@@ -1,4 +1,4 @@
-import QuestionsNodeView from '../../lib/helpers/QuestionsNodeView';
+import { QuestionsNodeView } from 'wax-prosemirror-core';
export default class MultipleChoiceSingleCorrectNodeView extends QuestionsNodeView {
constructor(
diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/QuestionMultipleSingleNodeView.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/QuestionMultipleSingleNodeView.js
index 32b24344c..4a69d5614 100644
--- a/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/QuestionMultipleSingleNodeView.js
+++ b/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/QuestionMultipleSingleNodeView.js
@@ -1,4 +1,4 @@
-import QuestionsNodeView from '../../lib/helpers/QuestionsNodeView';
+import { QuestionsNodeView } from 'wax-prosemirror-core';
export default class QuestionMultipleSingleNodeView extends QuestionsNodeView {
constructor(
diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/QuestionNodeView.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/QuestionNodeView.js
index 1e122f446..71d2ec94a 100644
--- a/wax-prosemirror-services/src/MultipleChoiceQuestionService/QuestionNodeView.js
+++ b/wax-prosemirror-services/src/MultipleChoiceQuestionService/QuestionNodeView.js
@@ -1,4 +1,4 @@
-import QuestionsNodeView from '../lib/helpers/QuestionsNodeView';
+import { QuestionsNodeView } from 'wax-prosemirror-core';
export default class QuestionNodeView extends QuestionsNodeView {
constructor(
diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseQuestionService/QuestionTrueFalseNodeView.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseQuestionService/QuestionTrueFalseNodeView.js
index 11fa2e31c..b5f13a61f 100644
--- a/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseQuestionService/QuestionTrueFalseNodeView.js
+++ b/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseQuestionService/QuestionTrueFalseNodeView.js
@@ -1,4 +1,4 @@
-import QuestionsNodeView from '../../lib/helpers/QuestionsNodeView';
+import { QuestionsNodeView } from 'wax-prosemirror-core';
export default class QuestionTrueFalseNodeView extends QuestionsNodeView {
constructor(
diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseQuestionService/TrueFalseContainerNodeView.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseQuestionService/TrueFalseContainerNodeView.js
index 87e1f2816..6e01a409b 100644
--- a/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseQuestionService/TrueFalseContainerNodeView.js
+++ b/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseQuestionService/TrueFalseContainerNodeView.js
@@ -1,4 +1,4 @@
-import QuestionsNodeView from '../../lib/helpers/QuestionsNodeView';
+import { QuestionsNodeView } from 'wax-prosemirror-core';
export default class TrueFalseContainerNodeView extends QuestionsNodeView {
constructor(
diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseQuestionService/TrueFalseNodeView.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseQuestionService/TrueFalseNodeView.js
index 88b51be2a..99c31163c 100644
--- a/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseQuestionService/TrueFalseNodeView.js
+++ b/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseQuestionService/TrueFalseNodeView.js
@@ -1,4 +1,4 @@
-import QuestionsNodeView from '../../lib/helpers/QuestionsNodeView';
+import { QuestionsNodeView } from 'wax-prosemirror-core';
export default class TrueFalseNodeView extends QuestionsNodeView {
constructor(
diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/QuestionTrueFalseSingleNodeView.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/QuestionTrueFalseSingleNodeView.js
index d7d1919b3..9625f18c5 100644
--- a/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/QuestionTrueFalseSingleNodeView.js
+++ b/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/QuestionTrueFalseSingleNodeView.js
@@ -1,4 +1,4 @@
-import QuestionsNodeView from '../../lib/helpers/QuestionsNodeView';
+import { QuestionsNodeView } from 'wax-prosemirror-core';
export default class QuestionTrueFalseSingleNodeView extends QuestionsNodeView {
constructor(
diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/TrueFalseSingleCorrectContainerNodeView.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/TrueFalseSingleCorrectContainerNodeView.js
index 0d8e5e3de..4a815e5b3 100644
--- a/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/TrueFalseSingleCorrectContainerNodeView.js
+++ b/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/TrueFalseSingleCorrectContainerNodeView.js
@@ -1,4 +1,4 @@
-import QuestionsNodeView from '../../lib/helpers/QuestionsNodeView';
+import { QuestionsNodeView } from 'wax-prosemirror-core';
export default class TrueFalseSingleCorrectContainerNodeView extends QuestionsNodeView {
constructor(
diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/TrueFalseSingleCorrectNodeView.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/TrueFalseSingleCorrectNodeView.js
index 31ec0d59e..23e69427f 100644
--- a/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/TrueFalseSingleCorrectNodeView.js
+++ b/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/TrueFalseSingleCorrectNodeView.js
@@ -1,4 +1,4 @@
-import QuestionsNodeView from '../../lib/helpers/QuestionsNodeView';
+import { QuestionsNodeView } from 'wax-prosemirror-core';
export default class TrueFalseSingleCorrectNodeView extends QuestionsNodeView {
constructor(
diff --git a/wax-prosemirror-services/src/MultipleDropDownService/CreateDropDownService/MultipleDropDownNodeView.js b/wax-prosemirror-services/src/MultipleDropDownService/CreateDropDownService/MultipleDropDownNodeView.js
index aa8ac0a39..7b1d397d6 100644
--- a/wax-prosemirror-services/src/MultipleDropDownService/CreateDropDownService/MultipleDropDownNodeView.js
+++ b/wax-prosemirror-services/src/MultipleDropDownService/CreateDropDownService/MultipleDropDownNodeView.js
@@ -1,4 +1,4 @@
-import QuestionsNodeView from '../../lib/helpers/QuestionsNodeView';
+import { QuestionsNodeView } from 'wax-prosemirror-core';
export default class MultipleDropDownNodeView extends QuestionsNodeView {
constructor(
diff --git a/wax-prosemirror-services/src/MultipleDropDownService/MultipleDropDownContainerNodeView.js b/wax-prosemirror-services/src/MultipleDropDownService/MultipleDropDownContainerNodeView.js
index ed50a9c56..fe43906a4 100644
--- a/wax-prosemirror-services/src/MultipleDropDownService/MultipleDropDownContainerNodeView.js
+++ b/wax-prosemirror-services/src/MultipleDropDownService/MultipleDropDownContainerNodeView.js
@@ -1,4 +1,4 @@
-import QuestionsNodeView from '../lib/helpers/QuestionsNodeView';
+import { QuestionsNodeView } from 'wax-prosemirror-core';
export default class MultipleDropDownContainerNodeView extends QuestionsNodeView {
constructor(
--
GitLab