Refactored entities to better locations. Implemented better support f…

…or EntityFactory (e.g. test functions and explain functions).
hyperifyio · Dec 16, 2023 · 231e766 · 231e766
1 parent 167de8b
commit 231e766
Show file tree

Hide file tree

Showing 160 changed files with 4,037 additions and 2,938 deletions.
diff --git a/components/HyperComponentCollection.ts b/components/HyperComponentCollection.ts
@@ -3,10 +3,10 @@
 import { reduce } from "../functions/reduce";
 import { uniq } from "../functions/uniq";
 import { LogService } from "../LogService";
-import { ComponentDTO } from "../dto/ComponentDTO";
+import { ComponentDTO } from "../entities/component/ComponentDTO";
 import { ComponentFactory } from "../services/ComponentFactory";
 import { ComponentFactoryService } from "../services/ComponentFactoryService";
-import { ComponentEntity } from "../entities/ComponentEntity";
+import { ComponentEntity } from "../entities/component/ComponentEntity";
 import { ComponentType } from "../entities/types/ComponentType";
 import { registerActionButtonComponent } from "./actionButton/ActionButtonComponent";
 import { registerArticleComponent } from "./article/ArticleComponent";

diff --git a/components/actionButton/ActionButtonComponent.ts b/components/actionButton/ActionButtonComponent.ts
@@ -1,7 +1,7 @@
 // Copyright (c) 2023. Sendanor <info@sendanor.fi>. All rights reserved.
 
-import { createComponentDTO, ComponentDTO } from "../../dto/ComponentDTO";
-import { HyperComponent } from "../../dto/types/HyperComponent";
+import { createComponentDTO, ComponentDTO } from "../../entities/component/ComponentDTO";
+import { HyperComponent } from "../../entities/types/HyperComponent";
 import { ComponentFactory } from "../../services/ComponentFactory";
 
 export const ACTION_BUTTON_COMPONENT_NAME: string = 'ActionButtonComponent';

diff --git a/components/actionButton/ActionButtonEntity.ts b/components/actionButton/ActionButtonEntity.ts
@@ -2,8 +2,8 @@
 
 import { ReadonlyJsonAny } from "../../Json";
 import { isString } from "../../types/String";
-import { ComponentEntity } from "../../entities/ComponentEntity";
-import { createActionDTO, ActionDTO } from "../../dto/ActionDTO";
+import { ComponentEntity } from "../../entities/component/ComponentEntity";
+import { createActionDTO, ActionDTO } from "../../entities/action/ActionDTO";
 import { ACTION_BUTTON_COMPONENT_NAME } from "./ActionButtonComponent";
 
 export class ActionButtonEntity extends ComponentEntity {

diff --git a/components/article/ArticleComponent.test.ts b/components/article/ArticleComponent.test.ts
@@ -1,4 +1,4 @@
-import { HyperComponent } from "../../dto/types/HyperComponent";
+import { HyperComponent } from "../../entities/types/HyperComponent";
 import {ARTICLE_COMPONENT_NAME, ArticleComponent, createArticleComponent} from "./ArticleComponent";
 
 describe('createArticleComponent', () => {

diff --git a/components/article/ArticleComponent.ts b/components/article/ArticleComponent.ts
@@ -1,7 +1,7 @@
 // Copyright (c) 2023. Sendanor <info@sendanor.fi>. All rights reserved.
 
-import { createComponentDTO, ComponentDTO } from "../../dto/ComponentDTO";
-import { HyperComponent } from "../../dto/types/HyperComponent";
+import { createComponentDTO, ComponentDTO } from "../../entities/component/ComponentDTO";
+import { HyperComponent } from "../../entities/types/HyperComponent";
 import { ComponentFactory } from "../../services/ComponentFactory";
 
 export const ARTICLE_COMPONENT_NAME: string = 'ArticleComponent';

diff --git a/components/article/ArticleEntity.ts b/components/article/ArticleEntity.ts
@@ -1,6 +1,6 @@
 // Copyright (c) 2023. Sendanor <info@sendanor.fi>. All rights reserved.
 
-import { ComponentEntity } from "../../entities/ComponentEntity";
+import { ComponentEntity } from "../../entities/component/ComponentEntity";
 import { ARTICLE_COMPONENT_NAME } from "./ArticleComponent";
 
 export class ArticleEntity extends ComponentEntity {

diff --git a/components/button/ButtonComponent.test.ts b/components/button/ButtonComponent.test.ts
@@ -1,4 +1,4 @@
-import { HyperComponent } from "../../dto/types/HyperComponent";
+import { HyperComponent } from "../../entities/types/HyperComponent";
 import {BUTTON_COMPONENT_NAME, ButtonComponent, createButtonComponent} from "./ButtonComponent";
 
 describe('createButtonComponent', () => {

diff --git a/components/button/ButtonComponent.ts b/components/button/ButtonComponent.ts
@@ -1,7 +1,7 @@
 // Copyright (c) 2023. Sendanor <info@sendanor.fi>. All rights reserved.
 
-import { createComponentDTO, ComponentDTO } from "../../dto/ComponentDTO";
-import { HyperComponent } from "../../dto/types/HyperComponent";
+import { createComponentDTO, ComponentDTO } from "../../entities/component/ComponentDTO";
+import { HyperComponent } from "../../entities/types/HyperComponent";
 import { ComponentFactory } from "../../services/ComponentFactory";
 
 export const BUTTON_COMPONENT_NAME: string = 'ButtonComponent';

diff --git a/components/button/ButtonEntity.ts b/components/button/ButtonEntity.ts
@@ -1,6 +1,6 @@
 // Copyright (c) 2023. Sendanor <info@sendanor.fi>. All rights reserved.
 
-import { ComponentEntity } from "../../entities/ComponentEntity";
+import { ComponentEntity } from "../../entities/component/ComponentEntity";
 import { BUTTON_COMPONENT_NAME } from "./ButtonComponent";
 
 export class ButtonEntity extends ComponentEntity {

diff --git a/components/div/DivComponent.ts b/components/div/DivComponent.ts
@@ -1,7 +1,7 @@
 // Copyright (c) 2023. Sendanor <info@sendanor.fi>. All rights reserved.
 
-import { createComponentDTO, ComponentDTO } from "../../dto/ComponentDTO";
-import { HyperComponent } from "../../dto/types/HyperComponent";
+import { createComponentDTO, ComponentDTO } from "../../entities/component/ComponentDTO";
+import { HyperComponent } from "../../entities/types/HyperComponent";
 import { ComponentFactory } from "../../services/ComponentFactory";
 
 export const DIV_COMPONENT_NAME: string = 'DivComponent';

diff --git a/components/div/DivEntity.ts b/components/div/DivEntity.ts
@@ -1,6 +1,6 @@
 // Copyright (c) 2023. Sendanor <info@sendanor.fi>. All rights reserved.
 
-import { ComponentEntity } from "../../entities/ComponentEntity";
+import { ComponentEntity } from "../../entities/component/ComponentEntity";
 import { DIV_COMPONENT_NAME } from "./DivComponent";
 
 export class DivEntity extends ComponentEntity {

diff --git a/components/form/FormComponent.ts b/components/form/FormComponent.ts
@@ -1,7 +1,7 @@
 // Copyright (c) 2023. Sendanor <info@sendanor.fi>. All rights reserved.
 
-import { createComponentDTO, ComponentDTO } from "../../dto/ComponentDTO";
-import { HyperComponent } from "../../dto/types/HyperComponent";
+import { createComponentDTO, ComponentDTO } from "../../entities/component/ComponentDTO";
+import { HyperComponent } from "../../entities/types/HyperComponent";
 import { ComponentFactory } from "../../services/ComponentFactory";
 
 export const FORM_COMPONENT_NAME: string = 'FormComponent';

diff --git a/components/form/FormEntity.ts b/components/form/FormEntity.ts
@@ -1,7 +1,7 @@
 // Copyright (c) 2023. Sendanor <info@sendanor.fi>. All rights reserved.
 
-import { ComponentContent } from "../../dto/ComponentDTO";
-import { ComponentEntity } from "../../entities/ComponentEntity";
+import { ComponentContent } from "../../entities/component/ComponentDTO";
+import { ComponentEntity } from "../../entities/component/ComponentEntity";
 import { FORM_COMPONENT_NAME } from "./FormComponent";
 
 export class FormEntity extends ComponentEntity {

diff --git a/components/heading/HeadingComponent.ts b/components/heading/HeadingComponent.ts
@@ -1,7 +1,7 @@
 // Copyright (c) 2023. Sendanor <info@sendanor.fi>. All rights reserved.
 
-import { createComponentDTO, ComponentDTO } from "../../dto/ComponentDTO";
-import { HyperComponent } from "../../dto/types/HyperComponent";
+import { createComponentDTO, ComponentDTO } from "../../entities/component/ComponentDTO";
+import { HyperComponent } from "../../entities/types/HyperComponent";
 import { ComponentFactory } from "../../services/ComponentFactory";
 
 export const HEADING_COMPONENT_NAME: string = 'HeadingComponent';

diff --git a/components/heading/HeadingEntity.ts b/components/heading/HeadingEntity.ts
@@ -1,6 +1,6 @@
 // Copyright (c) 2023. Sendanor <info@sendanor.fi>. All rights reserved.
 
-import { ComponentEntity } from "../../entities/ComponentEntity";
+import { ComponentEntity } from "../../entities/component/ComponentEntity";
 import { HEADING_COMPONENT_NAME } from "./HeadingComponent";
 
 export class HeadingEntity extends ComponentEntity {

diff --git a/components/image/ImageComponent.ts b/components/image/ImageComponent.ts
@@ -1,7 +1,7 @@
 // Copyright (c) 2023. Sendanor <info@sendanor.fi>. All rights reserved.
 
-import { createComponentDTO, ComponentDTO } from "../../dto/ComponentDTO";
-import { HyperComponent } from "../../dto/types/HyperComponent";
+import { createComponentDTO, ComponentDTO } from "../../entities/component/ComponentDTO";
+import { HyperComponent } from "../../entities/types/HyperComponent";
 import { ComponentFactory } from "../../services/ComponentFactory";
 
 export const IMAGE_COMPONENT_NAME: string = 'ImageComponent';

diff --git a/components/image/ImageEntity.ts b/components/image/ImageEntity.ts
@@ -1,6 +1,6 @@
 // Copyright (c) 2023. Sendanor <info@sendanor.fi>. All rights reserved.
 
-import { ComponentEntity } from "../../entities/ComponentEntity";
+import { ComponentEntity } from "../../entities/component/ComponentEntity";
 import { IMAGE_COMPONENT_NAME } from "./ImageComponent";
 
 const IMAGE_SOURCE_META_KEY : string = "source";

diff --git a/components/linkButton/LinkButtonComponent.test.ts b/components/linkButton/LinkButtonComponent.test.ts
@@ -1,4 +1,4 @@
-import { HyperComponent } from "../../dto/types/HyperComponent";
+import { HyperComponent } from "../../entities/types/HyperComponent";
 import {createLinkButtonComponent, LinkButtonComponent, LINK_BUTTON_COMPONENT_NAME} from "./LinkButtonComponent";
 
 describe('createLinkButtonComponent', () => {

diff --git a/components/linkButton/LinkButtonComponent.ts b/components/linkButton/LinkButtonComponent.ts
@@ -1,10 +1,10 @@
 // Copyright (c) 2023. Sendanor <info@sendanor.fi>. All rights reserved.
 
-import { ComponentDTO, createComponentDTO } from "../../dto/ComponentDTO";
-import { BorderStyle } from "../../dto/types/BorderStyle";
-import { HyperComponent } from "../../dto/types/HyperComponent";
-import { BorderEntity } from "../../entities/BorderEntity";
-import { StyleEntity } from "../../entities/StyleEntity";
+import { ComponentDTO, createComponentDTO } from "../../entities/component/ComponentDTO";
+import { BorderStyle } from "../../entities/types/BorderStyle";
+import { HyperComponent } from "../../entities/types/HyperComponent";
+import { BorderEntity } from "../../entities/border/BorderEntity";
+import { StyleEntity } from "../../entities/style/StyleEntity";
 import { ComponentFactory } from "../../services/ComponentFactory";
 
 export const LINK_BUTTON_COMPONENT_NAME: string = 'LinkButtonComponent';

diff --git a/components/linkButton/LinkButtonEntity.ts b/components/linkButton/LinkButtonEntity.ts
@@ -1,6 +1,6 @@
 // Copyright (c) 2023. Sendanor <info@sendanor.fi>. All rights reserved.
 
-import { ComponentEntity } from "../../entities/ComponentEntity";
+import { ComponentEntity } from "../../entities/component/ComponentEntity";
 import { LINK_BUTTON_COMPONENT_NAME } from "./LinkButtonComponent";
 
 export class LinkButtonEntity extends ComponentEntity {

diff --git a/components/paragraph/ParagraphComponent.ts b/components/paragraph/ParagraphComponent.ts
@@ -1,7 +1,7 @@
 // Copyright (c) 2023. Sendanor <info@sendanor.fi>. All rights reserved.
 
-import { createComponentDTO, ComponentDTO } from "../../dto/ComponentDTO";
-import { HyperComponent } from "../../dto/types/HyperComponent";
+import { createComponentDTO, ComponentDTO } from "../../entities/component/ComponentDTO";
+import { HyperComponent } from "../../entities/types/HyperComponent";
 import { ComponentFactory } from "../../services/ComponentFactory";
 
 export const PARAGRAPH_COMPONENT_NAME: string = 'ParagraphComponent';

diff --git a/components/paragraph/ParagraphEntity.ts b/components/paragraph/ParagraphEntity.ts
@@ -1,6 +1,6 @@
 // Copyright (c) 2023. Sendanor <info@sendanor.fi>. All rights reserved.
 
-import { ComponentEntity } from "../../entities/ComponentEntity";
+import { ComponentEntity } from "../../entities/component/ComponentEntity";
 import { PARAGRAPH_COMPONENT_NAME } from "./ParagraphComponent";
 
 export class ParagraphEntity extends ComponentEntity {

diff --git a/components/span/SpanComponent.ts b/components/span/SpanComponent.ts
@@ -1,7 +1,7 @@
 // Copyright (c) 2023. Sendanor <info@sendanor.fi>. All rights reserved.
 
-import { createComponentDTO, ComponentDTO } from "../../dto/ComponentDTO";
-import { HyperComponent } from "../../dto/types/HyperComponent";
+import { createComponentDTO, ComponentDTO } from "../../entities/component/ComponentDTO";
+import { HyperComponent } from "../../entities/types/HyperComponent";
 import { ComponentFactory } from "../../services/ComponentFactory";
 
 export const SPAN_COMPONENT_NAME: string = 'SpanComponent';

diff --git a/components/span/SpanEntity.ts b/components/span/SpanEntity.ts
@@ -1,6 +1,6 @@
 // Copyright (c) 2023. Sendanor <info@sendanor.fi>. All rights reserved.
 
-import { ComponentEntity } from "../../entities/ComponentEntity";
+import { ComponentEntity } from "../../entities/component/ComponentEntity";
 import { SPAN_COMPONENT_NAME } from "./SpanComponent";
 
 export class SpanEntity extends ComponentEntity {

diff --git a/components/subTitle/SubTitleComponent.ts b/components/subTitle/SubTitleComponent.ts
@@ -1,7 +1,7 @@
 // Copyright (c) 2023. Sendanor <info@sendanor.fi>. All rights reserved.
 
-import { createComponentDTO, ComponentDTO } from "../../dto/ComponentDTO";
-import { HyperComponent } from "../../dto/types/HyperComponent";
+import { createComponentDTO, ComponentDTO } from "../../entities/component/ComponentDTO";
+import { HyperComponent } from "../../entities/types/HyperComponent";
 import { ComponentFactory } from "../../services/ComponentFactory";
 
 export const SUB_TITLE_COMPONENT_NAME: string = 'SubTitleComponent';

diff --git a/components/subTitle/SubTitleEntity.ts b/components/subTitle/SubTitleEntity.ts
@@ -1,6 +1,6 @@
 // Copyright (c) 2023. Sendanor <info@sendanor.fi>. All rights reserved.
 
-import { ComponentEntity } from "../../entities/ComponentEntity";
+import { ComponentEntity } from "../../entities/component/ComponentEntity";
 import { SUB_TITLE_COMPONENT_NAME } from "./SubTitleComponent";
 
 export class SubTitleEntity extends ComponentEntity {

diff --git a/components/table/TableComponent.ts b/components/table/TableComponent.ts
@@ -1,7 +1,7 @@
 // Copyright (c) 2023. Sendanor <info@sendanor.fi>. All rights reserved.
 
-import { createComponentDTO, ComponentDTO } from "../../dto/ComponentDTO";
-import { HyperComponent } from "../../dto/types/HyperComponent";
+import { createComponentDTO, ComponentDTO } from "../../entities/component/ComponentDTO";
+import { HyperComponent } from "../../entities/types/HyperComponent";
 import { ComponentFactory } from "../../services/ComponentFactory";
 
 export const TABLE_COMPONENT_NAME: string = 'TableComponent';

diff --git a/components/table/TableEntity.ts b/components/table/TableEntity.ts
@@ -1,7 +1,7 @@
 // Copyright (c) 2023. Sendanor <info@sendanor.fi>. All rights reserved.
 
-import { ComponentContent } from "../../dto/ComponentDTO";
-import { ComponentEntity } from "../../entities/ComponentEntity";
+import { ComponentContent } from "../../entities/component/ComponentDTO";
+import { ComponentEntity } from "../../entities/component/ComponentEntity";
 import { TABLE_COMPONENT_NAME } from "./TableComponent";
 import { TableRowEntity } from "./row/TableRowEntity";
 

diff --git a/components/table/column/TableColumnComponent.ts b/components/table/column/TableColumnComponent.ts
@@ -1,7 +1,7 @@
 // Copyright (c) 2023. Sendanor <info@sendanor.fi>. All rights reserved.
 
-import { createComponentDTO, ComponentDTO } from "../../../dto/ComponentDTO";
-import { HyperComponent } from "../../../dto/types/HyperComponent";
+import { createComponentDTO, ComponentDTO } from "../../../entities/component/ComponentDTO";
+import { HyperComponent } from "../../../entities/types/HyperComponent";
 import { ComponentFactory } from "../../../services/ComponentFactory";
 
 export const TABLE_COLUMN_COMPONENT_NAME: string = 'TableColumnComponent';

diff --git a/components/table/column/TableColumnEntity.ts b/components/table/column/TableColumnEntity.ts
@@ -1,6 +1,6 @@
 // Copyright (c) 2023. Sendanor <info@sendanor.fi>. All rights reserved.
 
-import { ComponentEntity, ComponentEntityContent } from "../../../entities/ComponentEntity";
+import { ComponentEntity, ComponentEntityContent } from "../../../entities/component/ComponentEntity";
 import { TABLE_COLUMN_COMPONENT_NAME } from "./TableColumnComponent";
 
 export class TableColumnEntity extends ComponentEntity {

diff --git a/components/table/row/TableRowComponent.ts b/components/table/row/TableRowComponent.ts
@@ -1,7 +1,7 @@
 // Copyright (c) 2023. Sendanor <info@sendanor.fi>. All rights reserved.
 
-import { createComponentDTO, ComponentDTO } from "../../../dto/ComponentDTO";
-import { HyperComponent } from "../../../dto/types/HyperComponent";
+import { createComponentDTO, ComponentDTO } from "../../../entities/component/ComponentDTO";
+import { HyperComponent } from "../../../entities/types/HyperComponent";
 import { ComponentFactory } from "../../../services/ComponentFactory";
 
 export const TABLE_ROW_COMPONENT_NAME: string = 'TableRowComponent';

diff --git a/components/table/row/TableRowEntity.ts b/components/table/row/TableRowEntity.ts
@@ -1,6 +1,6 @@
 // Copyright (c) 2023. Sendanor <info@sendanor.fi>. All rights reserved.
 
-import { ComponentEntity, ComponentEntityContent } from "../../../entities/ComponentEntity";
+import { ComponentEntity, ComponentEntityContent } from "../../../entities/component/ComponentEntity";
 import { TableColumnEntity } from "../column/TableColumnEntity";
 import { TABLE_ROW_COMPONENT_NAME } from "./TableRowComponent";
 

diff --git a/components/title/TitleComponent.test.ts b/components/title/TitleComponent.test.ts
@@ -1,4 +1,4 @@
-import { HyperComponent } from "../../dto/types/HyperComponent";
+import { HyperComponent } from "../../entities/types/HyperComponent";
 import {createTitleComponent, TITLE_COMPONENT_NAME, TitleComponent} from "./TitleComponent";
 
 describe('createTitleTextComponent', () => {

diff --git a/components/title/TitleComponent.ts b/components/title/TitleComponent.ts
@@ -1,7 +1,7 @@
 // Copyright (c) 2023. Sendanor <info@sendanor.fi>. All rights reserved.
 
-import { createComponentDTO, ComponentDTO } from "../../dto/ComponentDTO";
-import { HyperComponent } from "../../dto/types/HyperComponent";
+import { createComponentDTO, ComponentDTO } from "../../entities/component/ComponentDTO";
+import { HyperComponent } from "../../entities/types/HyperComponent";
 import { ComponentFactory } from "../../services/ComponentFactory";
 
 export const TITLE_COMPONENT_NAME: string = 'TitleComponent';

diff --git a/components/title/TitleEntity.ts b/components/title/TitleEntity.ts
@@ -1,6 +1,6 @@
 // Copyright (c) 2023. Sendanor <info@sendanor.fi>. All rights reserved.
 
-import { ComponentEntity } from "../../entities/ComponentEntity";
+import { ComponentEntity } from "../../entities/component/ComponentEntity";
 import { TITLE_COMPONENT_NAME } from "./TitleComponent";
 
 export class TitleEntity extends ComponentEntity {

diff --git a/dto/ColorDTO.ts b/dto/ColorDTO.ts