From fee2b244a1796bbcb07661062830160d6cc06821 Mon Sep 17 00:00:00 2001
From: Nikolay Rozhkov <nironame@gmail.com>
Date: Fri, 7 Jul 2023 14:12:18 +0300
Subject: [PATCH] Small cleanup

---
 packages/mermaid/src/config.type.ts           |  6 ++--
 .../mermaid/src/diagrams/block/blockDB.ts     | 33 ++++++++++---------
 .../src/diagrams/block/blockRenderer.ts       | 11 +------
 .../mermaid/src/diagrams/block/blockTypes.ts  |  6 ++++
 4 files changed, 27 insertions(+), 29 deletions(-)

diff --git a/packages/mermaid/src/config.type.ts b/packages/mermaid/src/config.type.ts
index fdb2450ba..becfc90e6 100644
--- a/packages/mermaid/src/config.type.ts
+++ b/packages/mermaid/src/config.type.ts
@@ -1,6 +1,7 @@
 // TODO: This was auto generated from defaultConfig. Needs to be verified.
 
 import DOMPurify from 'dompurify';
+import { BlockConfig } from './diagrams/block/blockTypes.js';
 
 export interface MermaidConfig {
   theme?: string;
@@ -33,7 +34,7 @@ export interface MermaidConfig {
   gitGraph?: GitGraphDiagramConfig;
   c4?: C4DiagramConfig;
   sankey?: SankeyDiagramConfig;
-  block?: BlockDiagramConfig;
+  block?: BlockConfig;
   dompurifyConfig?: DOMPurify.Config;
   wrap?: boolean;
   fontSize?: number;
@@ -422,9 +423,6 @@ export interface SankeyDiagramConfig extends BaseDiagramConfig {
   linkColor?: SankeyLinkColor | string;
   nodeAlignment?: SankeyNodeAlignment;
 }
-export interface BlockDiagramConfig extends BaseDiagramConfig {
-  padding?: number;
-}
 
 export interface FontConfig {
   fontSize?: string | number;
diff --git a/packages/mermaid/src/diagrams/block/blockDB.ts b/packages/mermaid/src/diagrams/block/blockDB.ts
index 4cb611b17..db216160a 100644
--- a/packages/mermaid/src/diagrams/block/blockDB.ts
+++ b/packages/mermaid/src/diagrams/block/blockDB.ts
@@ -1,12 +1,14 @@
+import type { BlockDB } from './blockTypes.js';
+
 import * as configApi from '../../config.js';
-import common from '../common/common.js';
+// import common from '../common/common.js';
 import {
-  setAccTitle,
-  getAccTitle,
-  getAccDescription,
-  setAccDescription,
-  setDiagramTitle,
-  getDiagramTitle,
+  // setAccTitle,
+  // getAccTitle,
+  // getAccDescription,
+  // setAccDescription,
+  // setDiagramTitle,
+  // getDiagramTitle,
   clear as commonClear,
 } from '../../commonDb.js';
 
@@ -14,7 +16,6 @@ type Block = {
   ID: string;
 };
 
-// Array of nodes guarantees their order
 let blocks: Block[] = [];
 
 const clear = (): void => {
@@ -22,14 +23,16 @@ const clear = (): void => {
   commonClear();
 };
 
-export default {
+const db: BlockDB = {
   getConfig: () => configApi.getConfig().block,
 
-  getAccTitle,
-  setAccTitle,
-  getAccDescription,
-  setAccDescription,
-  getDiagramTitle,
-  setDiagramTitle,
+  // getAccTitle,
+  // setAccTitle,
+  // getAccDescription,
+  // setAccDescription,
+  // getDiagramTitle,
+  // setDiagramTitle,
   clear,
 };
+
+export default db;
\ No newline at end of file
diff --git a/packages/mermaid/src/diagrams/block/blockRenderer.ts b/packages/mermaid/src/diagrams/block/blockRenderer.ts
index 5a2f595bc..cfa9cc522 100644
--- a/packages/mermaid/src/diagrams/block/blockRenderer.ts
+++ b/packages/mermaid/src/diagrams/block/blockRenderer.ts
@@ -9,18 +9,14 @@ import {
 
 import { configureSvgSize } from '../../setupGraphViewbox.js';
 import { Uid } from '../../rendering-util/uid.js';
-import type { SankeyLinkColor, SankeyNodeAlignment } from '../../config.type.js';
 
 export const draw = function (text: string, id: string, _version: string, diagObj: Diagram): void {
-  // Get the config
-  const { securityLevel, sankey: conf } = configApi.getConfig();
-  const defaultSankeyConfig = configApi!.defaultConfig!.blockDiagram!;
-
   // TODO:
   // This code repeats for every diagram
   // Figure out what is happening there, probably it should be separated
   // The main thing is svg object that is a d3 wrapper for svg operations
   //
+  const { securityLevel } = configApi.getConfig();
   let sandboxElement: any;
   if (securityLevel === 'sandbox') {
     sandboxElement = d3select('#i' + id);
@@ -44,11 +40,6 @@ export const draw = function (text: string, id: string, _version: string, diagOb
   // Prepare data for construction based on diagObj.db
   // This must be a mutable object with `nodes` and `links` properties:
   //
-  //    {
-  //      "nodes": [ { "id": "Alice" }, { "id": "Bob" }, { "id": "Carol" } ],
-  //      "links": [ { "source": "Alice", "target": "Bob", "value": 23 }, { "source": "Bob", "target": "Carol", "value": 43 } ]
-  //    }
-  //
   // @ts-ignore TODO: db type
   const graph = diagObj.db.getGraph();
 
diff --git a/packages/mermaid/src/diagrams/block/blockTypes.ts b/packages/mermaid/src/diagrams/block/blockTypes.ts
index 28e5cd167..014e6b7cb 100644
--- a/packages/mermaid/src/diagrams/block/blockTypes.ts
+++ b/packages/mermaid/src/diagrams/block/blockTypes.ts
@@ -1,5 +1,11 @@
 import type { DiagramDB } from '../../diagram-api/types.js';
+import type { BaseDiagramConfig } from '../../config.type.js';
+
+export interface BlockConfig extends BaseDiagramConfig {
+  padding?: number;
+}
 
 export interface BlockDB extends DiagramDB {
   clear: () => void;
+  getConfig: () => BlockConfig | undefined;
 }