From b911bd3e42012d7026744f4c5d2e04aad92fe42c Mon Sep 17 00:00:00 2001
From: NicolasNewman <nanewman01@gmail.com>
Date: Sun, 31 Mar 2024 13:51:40 -0500
Subject: [PATCH] feat(arch): improved error handling

---
 .../diagrams/architecture/architectureDb.ts   | 40 +++++++++++++++++--
 .../architecture/architectureTypes.ts         |  3 +-
 2 files changed, 39 insertions(+), 4 deletions(-)

diff --git a/packages/mermaid/src/diagrams/architecture/architectureDb.ts b/packages/mermaid/src/diagrams/architecture/architectureDb.ts
index 6f00be0d4..e08e71c36 100644
--- a/packages/mermaid/src/diagrams/architecture/architectureDb.ts
+++ b/packages/mermaid/src/diagrams/architecture/architectureDb.ts
@@ -27,27 +27,44 @@ export const DEFAULT_ARCHITECTURE_DB: ArchitectureFields = {
   services: [],
   groups: [],
   lines: [],
-  cnt: 0,
+  registeredIds: {},
   config: DEFAULT_ARCHITECTURE_CONFIG,
 } as const;
 
 let services = DEFAULT_ARCHITECTURE_DB.services;
 let groups = DEFAULT_ARCHITECTURE_DB.groups;
 let lines = DEFAULT_ARCHITECTURE_DB.lines;
+let registeredIds = DEFAULT_ARCHITECTURE_DB.registeredIds;
 let elements: Record<string, D3Element> = {};
-let cnt = DEFAULT_ARCHITECTURE_DB.cnt;
 
 const clear = (): void => {
   services = structuredClone(DEFAULT_ARCHITECTURE_DB.services);
   groups = structuredClone(DEFAULT_ARCHITECTURE_DB.groups);
   lines = structuredClone(DEFAULT_ARCHITECTURE_DB.lines);
+  registeredIds = structuredClone(DEFAULT_ARCHITECTURE_DB.registeredIds)
   elements = {};
-  cnt = 0;
   commonClear();
 };
 
 const addService = function (id: string, opts: Omit<ArchitectureService, 'id'> = {}) {
   const { icon, in: inside, title } = opts;
+  if (registeredIds[id] !== undefined) {
+    throw new Error(`The service id [${id}] is already in use by another ${registeredIds[id]}`)
+  }
+  if (inside !== undefined) {
+    if (id === inside) {
+      throw new Error(`The service [${id}] cannot be placed within itself`)
+    }
+    if (registeredIds[inside] === undefined) {
+      throw new Error(`The service [${id}]'s parent does not exist. Please make sure the parent is created before this service`)
+    }
+    if (registeredIds[inside] === 'service') {
+      throw new Error(`The service [${id}]'s parent is not a group`);
+    }
+  }
+
+  registeredIds[id] = 'service';
+
   services.push({
     id,
     icon,
@@ -59,6 +76,23 @@ const getServices = (): ArchitectureService[] => services;
 
 const addGroup = function (id: string, opts: Omit<ArchitectureGroup, 'id'> = {}) {
   const { icon, in: inside, title } = opts;
+  if (registeredIds[id] !== undefined) {
+    throw new Error(`The group id [${id}] is already in use by another ${registeredIds[id]}`)
+  }
+  if (inside !== undefined) {
+    if (id === inside) {
+      throw new Error(`The group [${id}] cannot be placed within itself`)
+    }
+    if (registeredIds[inside] === undefined) {
+      throw new Error(`The group [${id}]'s parent does not exist. Please make sure the parent is created before this group`)
+    }
+    if (registeredIds[inside] === 'service') {
+      throw new Error(`The group [${id}]'s parent is not a group`);
+    }
+  }
+
+  registeredIds[id] = 'group';
+
   groups.push({
     id,
     icon,
diff --git a/packages/mermaid/src/diagrams/architecture/architectureTypes.ts b/packages/mermaid/src/diagrams/architecture/architectureTypes.ts
index cb95074e4..21c620c61 100644
--- a/packages/mermaid/src/diagrams/architecture/architectureTypes.ts
+++ b/packages/mermaid/src/diagrams/architecture/architectureTypes.ts
@@ -51,6 +51,7 @@ export interface ArchitectureLine {
 }
 
 export interface ArchitectureDB extends DiagramDB {
+  clear: () => void;
   addService: (id: string, opts: Omit<ArchitectureService, 'id'>) => void;
   getServices: () => ArchitectureService[];
   addGroup: (id: string, opts: Omit<ArchitectureGroup, 'id'>) => void;
@@ -71,6 +72,6 @@ export interface ArchitectureFields {
   services: ArchitectureService[];
   groups: ArchitectureGroup[];
   lines: ArchitectureLine[];
-  cnt: number;
+  registeredIds: Record<string, 'service' | 'group'>;
   config: ArchitectureDiagramConfig;
 }