Replaced Components screens with TreeView component

src/application/EnvironmentInteractor.mts

@@ -1,15 +1,9 @@
-import Environment from '~/domain/Environment.mjs';
+import type { Properties } from '~/types/Properties.mjs';
+import { Assumption, Component, Constraint, ConstraintCategory, Effect, Environment, GlossaryTerm, Invariant, type Uuid } from '~/domain/index.mjs';
 import Interactor from './Interactor.mjs';
 import type Presenter from './Presenter.mjs';
 import type Repository from './Repository.mjs';
-import type { Uuid } from '~/domain/Uuid.mjs';
-import Assumption from '~/domain/Assumption.mjs';
-import type { Properties } from '~/types/Properties.mjs';
-import Component from '~/domain/Component.mjs';
-import Constraint, { ConstraintCategory } from '~/domain/Constraint.mjs';
-import Effect from '~/domain/Effect.mjs';
-import GlossaryTerm from '~/domain/GlossaryTerm.mjs';
-import Invariant from '~/domain/Invariant.mjs';
+import treeFind from '~/lib/treeFind.mjs';
 
 export default class EnvironmentInteractor extends Interactor<Environment> {
     constructor({ presenter, repository }: {
@@ -38,26 +32,35 @@ export default class EnvironmentInteractor extends Interactor<Environment> {
     }
 
     async createComponent(
-        { environmentId, name, description, interfaceDefinition }: {
+        { environmentId, parentId, label }: {
             environmentId: Uuid;
-            name: string;
-            description: string;
-            interfaceDefinition: string;
+            parentId?: Uuid;
+            label: string;
         }
-    ) {
+    ): Promise<Component> {
         const environment = await this.repository.get(environmentId);
 
         if (!environment)
             throw new Error(`Environment ${environmentId} not found`);
 
-        environment.components.push(new Component({
-            id: crypto.randomUUID(),
-            name,
-            description,
-            statement: interfaceDefinition
-        }));
+        const parent = !parentId ? environment :
+            environment.components.map(c => treeFind(parentId, c))
+                .find(x => x) ?? environment,
+            component = new Component({
+                id: crypto.randomUUID(),
+                name: label,
+                statement: '',
+                children: []
+            });
+
+        if (parent instanceof Environment)
+            environment.components.push(component);
+        else
+            parent.children.push(component);
 
         await this.repository.update(environment);
+
+        return component;
     }
 
     async createConstraint(
@@ -147,14 +150,22 @@ export default class EnvironmentInteractor extends Interactor<Environment> {
     }
 
     async deleteComponent(
-        { environmentId, id }: { environmentId: Uuid; id: Uuid }
+        { environmentId, id, parentId }: { environmentId: Uuid; id: Uuid; parentId?: Uuid }
     ) {
         const environment = await this.repository.get(environmentId);
 
         if (!environment)
             throw new Error(`Environment ${environmentId} not found`);
 
-        environment.components = environment.components.filter(x => x.id !== id);
+        const parent = !parentId ? environment :
+            environment.components.map(c => treeFind(parentId, c))
+                .find(x => x) ?? environment;
+
+        if (parent instanceof Environment)
+            environment.components = environment.components.filter(x => x.id !== id);
+        else
+            parent.children = parent.children.filter(x => x.id !== id);
+
         await this.repository.update(environment);
     }
 
@@ -223,17 +234,36 @@ export default class EnvironmentInteractor extends Interactor<Environment> {
     }
 
     async updateComponent(
-        { environmentId, component }: { environmentId: Uuid; component: Properties<Component> }
+        { environmentId, id, parentId, label }:
+            { environmentId: Uuid; id: Uuid; parentId?: Uuid; label: string }
     ) {
-        const environment = await this.repository.get(environmentId),
-            newComponent = new Component(component);
+        const environment = await this.repository.get(environmentId);
 
         if (!environment)
             throw new Error(`Environment ${environmentId} not found`);
 
-        environment.components = environment.components.map(x =>
-            x.id === component.id ? newComponent : x
-        );
+        const parent = !parentId ? environment :
+            environment.components.map(c => treeFind(parentId, c))
+                .find(x => x) ?? environment;
+
+        if (parent instanceof Environment)
+            parent.components = environment.components.map(c =>
+                c.id === id ? new Component({
+                    id,
+                    name: label,
+                    statement: '',
+                    children: c.children
+                }) : c
+            );
+        else
+            parent.children = parent.children.map(c =>
+                c.id === id ? new Component({
+                    id,
+                    name: label,
+                    statement: '',
+                    children: c.children
+                }) : c
+            );
 
         await this.repository.update(environment);
     }

src/application/GoalsInteractor.mts

@@ -1,13 +1,8 @@
-import Goals from '~/domain/Goals.mjs';
+import { Behavior, Goals, Limit, Stakeholder, UseCase, type Uuid } from '~/domain/index.mjs';
 import Interactor from './Interactor.mjs';
 import type Presenter from './Presenter.mjs';
 import type Repository from './Repository.mjs';
-import type { Uuid } from '~/domain/Uuid.mjs';
-import Behavior from '~/domain/Behavior.mjs';
 import type { Properties } from '~/types/Properties.mjs';
-import Limit from '~/domain/Limit.mjs';
-import Stakeholder from '~/domain/Stakeholder.mjs';
-import UseCase from '~/domain/UseCase.mjs';
 
 export default class GoalsInteractor extends Interactor<Goals> {
     constructor({ presenter, repository }: {

src/application/Interactor.mts

@@ -1,8 +1,7 @@
-import type Entity from '~/domain/Entity.mjs';
+import { type Entity, type Uuid } from '~/domain/index.mjs';
 import type Repository from './Repository.mjs';
 import type Presenter from './Presenter.mjs';
 import type { Properties } from '~/types/Properties.mjs';
-import type { Uuid } from '~/domain/Uuid.mjs';
 
 export default abstract class Interactor<E extends Entity> {
     #presenter; #repository; #Entity;

src/application/Presenter.mts

@@ -1,4 +1,4 @@
-import type Entity from '~/domain/Entity.mjs';
+import { type Entity } from '~/domain/index.mjs';
 
 export default interface Presenter<E extends Entity> {
     presentItem(entity: E): void;

src/application/ProjectInteractor.mts

@@ -1,4 +1,4 @@
-import Project from '~/domain/Project.mjs';
+import { Project } from '~/domain/index.mjs';
 import Interactor from './Interactor.mjs';
 import type Presenter from './Presenter.mjs';
 import type Repository from './Repository.mjs';

src/application/Repository.mts

@@ -1,4 +1,4 @@
-import type Entity from '~/domain/Entity.mjs';
+import { type Entity } from '~/domain/index.mjs';
 import type Mapper from './Mapper.mjs';
 
 export default abstract class Repository<E extends Entity> extends EventTarget {

src/application/SolutionInteractor.mts

@@ -1,4 +1,4 @@
-import Solution from '~/domain/Solution.mjs';
+import { Solution } from '~/domain/index.mjs';
 import Interactor from './Interactor.mjs';
 import type Presenter from './Presenter.mjs';
 import type Repository from './Repository.mjs';

src/application/SystemInteractor.mts

@@ -1,10 +1,8 @@
-import System from '~/domain/System.mjs';
+import { Component, System, type Uuid } from '~/domain/index.mjs';
 import Interactor from './Interactor.mjs';
 import type Presenter from './Presenter.mjs';
 import type Repository from './Repository.mjs';
-import type { Uuid } from '~/domain/Uuid.mjs';
-import Component from '~/domain/Component.mjs';
-import type { Properties } from '~/types/Properties.mjs';
+import treeFind from '~/lib/treeFind.mjs';
 
 export default class SystemInteractor extends Interactor<System> {
     constructor({ presenter, repository }: {
@@ -15,52 +13,88 @@ export default class SystemInteractor extends Interactor<System> {
     }
 
     async createComponent(
-        { systemId, name, description, interfaceDefinition }: {
+        { systemId, parentId, label }: {
             systemId: Uuid;
-            name: string;
-            description: string;
-            interfaceDefinition: string;
+            parentId?: Uuid;
+            label: string;
         }
-    ) {
+    ): Promise<Component> {
         const system = await this.repository.get(systemId);
 
         if (!system)
             throw new Error(`System ${systemId} not found`);
 
-        system.components.push(new Component({
-            id: crypto.randomUUID(),
-            name,
-            description,
-            statement: interfaceDefinition
-        }));
+        const parent = !parentId ? system :
+            system.components.map(c => treeFind(parentId, c))
+                .find(x => x) ?? system,
+            component = new Component({
+                id: crypto.randomUUID(),
+                name: label,
+                statement: '',
+                children: []
+            });
+
+        if (parent instanceof System)
+            system.components.push(component);
+        else
+            parent.children.push(component);
 
         await this.repository.update(system);
+
+        return component;
     }
 
     async deleteComponent(
-        { systemId, id }: { systemId: Uuid; id: Uuid }
+        { systemId, id, parentId }: { systemId: Uuid; id: Uuid; parentId?: Uuid }
     ) {
         const system = await this.repository.get(systemId);
 
         if (!system)
             throw new Error(`System ${systemId} not found`);
 
-        system.components = system.components.filter(x => x.id !== id);
+        const parent = !parentId ? system :
+            system.components.map(c => treeFind(parentId, c))
+                .find(x => x) ?? system;
+
+        if (parent instanceof System)
+            system.components = system.components.filter(x => x.id !== id);
+        else
+            parent.children = parent.children.filter(x => x.id !== id);
+
         await this.repository.update(system);
     }
 
     async updateComponent(
-        { systemId, component }: { systemId: Uuid; component: Properties<Component> }
+        { systemId, id, parentId, label }:
+            { systemId: Uuid; id: Uuid; parentId?: Uuid; label: string }
     ) {
-        const system = await this.repository.get(systemId),
-            newComponent = new Component(component);
+        const system = await this.repository.get(systemId);
 
         if (!system)
             throw new Error(`System ${systemId} not found`);
 
-        system.components = system.components.map(x =>
-            x.id === component.id ? newComponent : x
-        );
+        const parent = !parentId ? system :
+            system.components.map(c => treeFind(parentId, c))
+                .find(x => x) ?? system;
+
+        if (parent instanceof System)
+            parent.components = system.components.map(c =>
+                c.id === id ? new Component({
+                    id,
+                    name: label,
+                    statement: '',
+                    children: c.children
+                }) : c
+            );
+        else
+            parent.children = parent.children.map(c =>
+                c.id === id ? new Component({
+                    id,
+                    name: label,
+                    statement: '',
+                    children: c.children
+                }) : c
+            );
 
         await this.repository.update(system);
     }

src/data/BehaviorRepository.mts

@@ -1,4 +1,4 @@
-import Behavior from '~/domain/Behavior.mjs';
+import { Behavior } from '~/domain/index.mjs';
 import StorageRepository from './StorageRepository.mjs';
 import BehaviorToJsonMapper from '~/mappers/BehaviorToJsonMapper.mjs';
 import pkg from '~/../package.json' with { type: 'json' };

src/data/EnvironmentRepository.mts

@@ -1,4 +1,4 @@
-import Environment from '~/domain/Environment.mjs';
+import { Environment } from '~/domain/index.mjs';
 import StorageRepository from './StorageRepository.mjs';
 import EnvironmentToJsonMapper from '~/mappers/EnvironmentToJsonMapper.mjs';
 import pkg from '~/../package.json' with { type: 'json' };

src/data/GoalsRepository.mts

@@ -1,4 +1,4 @@
-import Goals from '~/domain/Goals.mjs';
+import { Goals } from '~/domain/index.mjs';
 import StorageRepository from './StorageRepository.mjs';
 import GoalsToJsonMapper from '~/mappers/GoalsToJsonMapper.mjs';
 import pkg from '~/../package.json' with { type: 'json' };

src/data/ProjectRepository.mts

@@ -1,4 +1,4 @@
-import Project from '~/domain/Project.mjs';
+import { Project } from '~/domain/index.mjs';
 import StorageRepository from './StorageRepository.mjs';
 import ProjectToJsonMapper from '~/mappers/ProjectToJsonMapper.mjs';
 import pkg from '~/../package.json' with { type: 'json' };

src/data/SlugRepository.mts

@@ -1,4 +1,4 @@
-import type SlugEntity from '~/domain/SlugEntity.mjs';
+import { type SlugEntity } from '~/domain/index.mjs';
 import StorageRepository from './StorageRepository.mjs';
 import type Mapper from '~/application/Mapper.mjs';
 import type { EntityJson } from '~/mappers/EntityToJsonMapper.mjs';

src/data/SolutionRepository.mts

@@ -1,4 +1,4 @@
-import type Solution from '~/domain/Solution.mjs';
+import { type Solution } from '~/domain/index.mjs';
 import SolutionToJsonMapper from '~/mappers/SolutionToJsonMapper.mjs';
 import pkg from '~/../package.json' with { type: 'json' };
 import type { SemVerString } from '~/lib/SemVer.mjs';

src/data/StorageRepository.mts

@@ -1,4 +1,4 @@
-import type Entity from '~/domain/Entity.mjs';
+import { type Entity } from '~/domain/index.mjs';
 import type { EntityJson } from '~/mappers/EntityToJsonMapper.mjs';
 import type Mapper from '~/application/Mapper.mjs';
 import Repository from '~/application/Repository.mjs';

src/data/StorageRepository.test.mts

@@ -1,7 +1,7 @@
+import { Behavior } from '~/domain/index.mjs';
 import { describe, test } from 'node:test';
 import assert from 'node:assert/strict';
 import StorageRepository from './StorageRepository.mjs';
-import Behavior from '~/domain/Behavior.mjs';
 // @ts-expect-error: No typings available
 import DomStorage from 'dom-storage';
 import BehaviorToJsonMapper from '~/mappers/BehaviorToJsonMapper.mjs';

src/data/SystemRepository.mts

@@ -1,4 +1,4 @@
-import type System from '~/domain/System.mjs';
+import { type System } from '~/domain/index.mjs';
 import type { SemVerString } from '~/lib/SemVer.mjs';
 import StorageRepository from './StorageRepository.mjs';
 import pkg from '~/../package.json' with { type: 'json' };

src/domain/Assumption.mts

@@ -1,12 +1,12 @@
 import type { Properties } from '~/types/Properties.mjs';
-import Requirement from './Requirement.mjs';
+import { Requirement } from './index.mjs';
 
 /**
  * An assumption is a property of the environment that is assumed to be true.
  * Assumptions are used to simplify the problem and to make it more tractable.
  * An example of an assumption would be: "Screen resolutions will not change during the execution of the program."
  */
-export default class Assumption extends Requirement {
+export class Assumption extends Requirement {
     constructor(properties: Properties<Assumption>) {
         super(properties);
     }

src/domain/Behavior.mts

@@ -1,10 +1,10 @@
 import type { Properties } from '~/types/Properties.mjs';
-import Requirement from './Requirement.mjs';
+import { Requirement } from './index.mjs';
 
 /**
  * A Behavior is a specification of how a system produces an outcome or effect.
  */
-export default class Behavior extends Requirement {
+export class Behavior extends Requirement {
     constructor(options: Properties<Behavior>) {
         super(options);
     }