From 1009bb8fb762a02d9e0546c19ee378ad89d99826 Mon Sep 17 00:00:00 2001
From: Nikolay Rozhkov <nironame@gmail.com>
Date: Mon, 19 Jun 2023 04:29:41 +0300
Subject: [PATCH] Prettify

---
 .../src/diagrams/sankey/parser/sankey.spec.js |  5 +-
 .../mermaid/src/diagrams/sankey/sankeyDB.ts   |  6 +--
 .../src/diagrams/sankey/sankeyRenderer.ts     | 54 ++++++++++---------
 run                                           |  6 ++-
 4 files changed, 40 insertions(+), 31 deletions(-)

diff --git a/packages/mermaid/src/diagrams/sankey/parser/sankey.spec.js b/packages/mermaid/src/diagrams/sankey/parser/sankey.spec.js
index 3bc40e151..d42fa7f74 100644
--- a/packages/mermaid/src/diagrams/sankey/parser/sankey.spec.js
+++ b/packages/mermaid/src/diagrams/sankey/parser/sankey.spec.js
@@ -148,10 +148,9 @@ describe('Sankey diagram', function () {
         "UK land based bioenergy"   ->      182.01   -> "Bio-conversion"
         "Wave"                      ->      19.013   -> "Electricity grid"
         "Wind"                      ->      289.366  -> "Electricity grid"
-        `
+        `;
         parser.parse(str);
-
-      })
+      });
     });
   });
 });
diff --git a/packages/mermaid/src/diagrams/sankey/sankeyDB.ts b/packages/mermaid/src/diagrams/sankey/sankeyDB.ts
index 0757eac7c..fd96ef1c2 100644
--- a/packages/mermaid/src/diagrams/sankey/sankeyDB.ts
+++ b/packages/mermaid/src/diagrams/sankey/sankeyDB.ts
@@ -23,7 +23,7 @@ let links: Array<Link> = [];
 let nodes: Array<Node> = [];
 let nodesHash: Record<string, Node> = {};
 
-const clear = function() {
+const clear = function () {
   links = [];
   nodes = [];
   nodesHash = {};
@@ -57,7 +57,7 @@ class Link {
  * @param value - number, float or integer, describes the amount to be passed
  */
 // const addLink = ({ source, target, amount }: ILink = {}): Link => {
-const addLink = function(source?: Node, target?: Node, value?: number): Link {
+const addLink = function (source?: Node, target?: Node, value?: number): Link {
   const link: Link = new Link();
 
   // TODO: make attribute setters
@@ -90,7 +90,7 @@ class Node {
  *
  * @param id - The id Node
  */
-const addNode = function(ID: string): Node {
+const addNode = function (ID: string): Node {
   ID = common.sanitizeText(ID, configApi.getConfig());
   let node: Node;
   if (nodesHash[ID] === undefined) {
diff --git a/packages/mermaid/src/diagrams/sankey/sankeyRenderer.ts b/packages/mermaid/src/diagrams/sankey/sankeyRenderer.ts
index cbb409811..37362803a 100644
--- a/packages/mermaid/src/diagrams/sankey/sankeyRenderer.ts
+++ b/packages/mermaid/src/diagrams/sankey/sankeyRenderer.ts
@@ -88,14 +88,14 @@ export const draw = function (text: string, id: string, _version: string, diagOb
   //
   const graph = {
     nodes: [],
-    links: []
-  }
+    links: [],
+  };
 
-  diagObj.db.getNodes().forEach(node => {
+  diagObj.db.getNodes().forEach((node) => {
     graph.nodes.push({ id: node.ID, title: node.title });
   });
 
-  diagObj.db.getLinks().forEach(link => {
+  diagObj.db.getLinks().forEach((link) => {
     graph.links.push({ source: link.source.ID, target: link.target.ID, value: link.value });
   });
 
@@ -154,44 +154,50 @@ export const draw = function (text: string, id: string, _version: string, diagOb
     .data(graph.nodes)
     .join('g')
     .attr('class', 'node')
-    .attr("transform", function (d) { return "translate(" + d.x0 + "," + d.y0 + ")"; })
+    .attr('transform', function (d) {
+      return 'translate(' + d.x0 + ',' + d.y0 + ')';
+    })
     .attr('x', (d) => d.x0)
     .attr('y', (d) => d.y0)
     .append('rect')
-    .attr('height', (d) => { return (d.y1 - d.y0); })
+    .attr('height', (d) => {
+      return d.y1 - d.y0;
+    })
     .attr('width', (d) => d.x1 - d.x0)
     .attr('fill', (d) => color(d.id));
 
   // Create text for nodes
   svg
-    .append("g")
+    .append('g')
     .attr('class', 'node-labels')
-    .attr("font-family", "sans-serif")
-    .attr("font-size", 14)
+    .attr('font-family', 'sans-serif')
+    .attr('font-size', 14)
     .selectAll('text')
     .data(graph.nodes)
     .join('text')
-    .attr("x", d => d.x0 < width / 2 ? d.x1 + 6 : d.x0 - 6)
-    .attr("y", d => (d.y1 + d.y0) / 2)
-    .attr("dy", "0.35em")
-    .attr("text-anchor", d => d.x0 < width / 2 ? "start" : "end")
-    .text(d => d.title)
+    .attr('x', (d) => (d.x0 < width / 2 ? d.x1 + 6 : d.x0 - 6))
+    .attr('y', (d) => (d.y1 + d.y0) / 2)
+    .attr('dy', '0.35em')
+    .attr('text-anchor', (d) => (d.x0 < width / 2 ? 'start' : 'end'))
+    .text((d) => d.title);
 
   // Creates the paths that represent the links.
-  const link_g = svg.append("g")
+  const link_g = svg
+    .append('g')
     .attr('class', 'links')
-    .attr("fill", "none")
-    .attr("stroke-opacity", 0.5)
-    .selectAll(".link")
+    .attr('fill', 'none')
+    .attr('stroke-opacity', 0.5)
+    .selectAll('.link')
     .data(graph.links)
-    .join("g")
+    .join('g')
     .attr('class', 'link')
-    .style("mix-blend-mode", "multiply");
+    .style('mix-blend-mode', 'multiply');
 
-  link_g.append("path")
-    .attr("d", d3SankeyLinkHorizontal())
-    .attr("stroke", d => color(d.source.id))
-    .attr("stroke-width", d => Math.max(1, d.width));
+  link_g
+    .append('path')
+    .attr('d', d3SankeyLinkHorizontal())
+    .attr('stroke', (d) => color(d.source.id))
+    .attr('stroke-width', (d) => Math.max(1, d.width));
 
   // const { nodes, links } = generator({
   //   nodes: graph.nodes,
diff --git a/run b/run
index 09f63cb82..473c6aaff 100755
--- a/run
+++ b/run
@@ -25,8 +25,12 @@ test | vitest | e2e )
 $RUN mermaid sh -c "npx pnpm $command $args"
 ;;
 
+prettier)
+$RUN mermaid sh -c "npx pnpm prettier --write $args"
+;;
+
 lint)
-$RUN mermaid sh -c "npx pnpm -w run lint:fix"
+$RUN mermaid sh -c "npx pnpm -w run lint:fix $args"
 ;;
 
 dev)