GitHub/mermaid
1
0
Fork 0
mirror of https://github.com/mermaid-js/mermaid.git synced 2025-01-14 06:43:25 +08:00
Code Issues Projects Releases Wiki Activity

feat(arch): improved error handling

Browse Source
This commit is contained in:
NicolasNewman 2024-03-31 13:51:40 -05:00
parent 10682ef31f
commit b911bd3e42
2 changed files with 39 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
packages/mermaid/src/diagrams/architecture/architectureDb.ts
View File

@ -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,

3
packages/mermaid/src/diagrams/architecture/architectureTypes.ts
View File

@ -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;
}