Prettify

mermaid-js · Sep 11, 2023 · f6e9444 · f6e9444
1 parent 2e99c99
commit f6e9444
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 21 deletions.
diff --git a/packages/mermaid/src/diagrams/railroad/railroadDB.ts b/packages/mermaid/src/diagrams/railroad/railroadDB.ts
@@ -2,7 +2,7 @@
 import * as configApi from '../../config.js';
 import type { DiagramDB } from '../../diagram-api/types.js';
 
-import { clear as commonClear } from '../../commonDb.js';
+import { clear as commonClear } from '../common/commonDb.js';
 
 const clear = (): void => {
   commonClear();
@@ -160,30 +160,32 @@ const addZeroOrMany = (chunk: Chunk): Chunk => {
   return new ZeroOrMany(chunk);
 };
 const addRuleOrChoice = (ID: string, chunk: Chunk) => {
-  if(rules[ID]) {
+  if (rules[ID]) {
     const value = rules[ID];
     const alternative = addChoice([value, chunk]);
     rules[ID] = alternative;
   } else {
     rules[ID] = chunk;
   }
-}
+};
 
 const addSequence = (chunks: Chunk[]): Chunk => {
   if (!Array.isArray(chunks)) {
     console.error('Sequence`s chunks are not array', chunks);
   }
 
-  if(configApi.getConfig().railroad?.compressed) {
-    chunks = chunks.map((chunk) => {
-      if(chunk instanceof Sequence) {
-        return chunk.chunks;
-      }
-      return chunk;
-    }).flat();
+  if (configApi.getConfig().railroad?.compressed) {
+    chunks = chunks
+      .map((chunk) => {
+        if (chunk instanceof Sequence) {
+          return chunk.chunks;
+        }
+        return chunk;
+      })
+      .flat();
   }
 
-  if(chunks.length === 1) {
+  if (chunks.length === 1) {
     return chunks[0];
   } else {
     return new Sequence(chunks);
@@ -195,16 +197,18 @@ const addChoice = (chunks: Chunk[]): Chunk => {
     console.error('Alternative chunks are not array', chunks);
   }
 
-  if(configApi.getConfig().railroad?.compressed) {
-    chunks = chunks.map((chunk) => {
-      if(chunk instanceof Choice) {
-        return chunk.chunks;
-      }
-      return chunk;
-    }).flat();
+  if (configApi.getConfig().railroad?.compressed) {
+    chunks = chunks
+      .map((chunk) => {
+        if (chunk instanceof Choice) {
+          return chunk.chunks;
+        }
+        return chunk;
+      })
+      .flat();
   }
 
-  if(chunks.length === 1) {
+  if (chunks.length === 1) {
     return chunks[0];
   } else {
     return new Choice(chunks);

diff --git a/packages/mermaid/src/diagrams/railroad/railroadGrammar.jison b/packages/mermaid/src/diagrams/railroad/railroadGrammar.jison
@@ -264,7 +264,7 @@ prim
   | '[' choice ']' { $$=yy.addZeroOrOne($choice); }
   | '{' choice '}' { $$=yy.addZeroOrMany($choice); }
   | '"' (QSTRING)?\[qstring_] '"' {
-      $$=yy.addTerm($qstring_, '"');
+      $$=yy.addTerm($qstring_, '"'); // TODO: add bunch of terminals instead of one?
     }
   | APOSTROPHE (STRING)?\[string_] APOSTROPHE {
       $$=yy.addTerm($string_, "'");

diff --git a/packages/mermaid/src/schemas/config.schema.yaml b/packages/mermaid/src/schemas/config.schema.yaml
@@ -1888,7 +1888,6 @@ $defs: # JSON Schema definition (maybe we should move these to a seperate file)
         type: boolean
         default: true
 
-
   FontCalculator:
     title: Font Calculator
     description: |