From 25609d69c49852772dabf818b9688086fd07187a Mon Sep 17 00:00:00 2001 From: NicolasNewman Date: Mon, 22 Jul 2024 09:34:36 -0500 Subject: [PATCH] chore(arch): changed syntax keyword from architecture -> architecture-beta --- demos/architecture.html | 264 +++++++++--------- docs/syntax/architecture.md | 10 +- .../mermaid/src/docs/syntax/architecture.md | 6 +- .../architecture/architecture.langium | 2 +- 4 files changed, 141 insertions(+), 141 deletions(-) diff --git a/demos/architecture.html b/demos/architecture.html index 3855d6d0a..02f7c0a11 100644 --- a/demos/architecture.html +++ b/demos/architecture.html @@ -1,24 +1,23 @@ + + + + Architecture Mermaid Quick Test Page + + + - - - - Architecture Mermaid Quick Test Page - - - - - -

Architecture diagram demo

-

Simple diagram with groups

- 
-      architecture
+  
+    
Architecture diagram demo

+    
Simple diagram with groups

+    
+      architecture-beta
         group api(cloud)[API]
 
         service db(database)[Database] in api
@@ -32,11 +31,11 @@
         disk2 T--B db
         server T--B gateway
     

-  

+    

 
-  
Groups within groups

-  
-      architecture
+    
Groups within groups

+    
+      architecture-beta
         group api[API]
         group public[Public API] in api
         group private[Private API] in api
@@ -56,18 +55,18 @@
 
         serv1 L--R gateway
     

-  

+    

 
-  
Default icon (?) from unknown icon name

-  
-      architecture
+    
Default icon (?) from unknown icon name

+    
+      architecture-beta
         service unknown(iconnamedoesntexist)[Unknown Icon]
     

-  

+    

 
-  
Split Direction

-  
-      architecture
+    
Split Direction

+    
+      architecture-beta
         service db(database)[Database]
         service s3(disk)[Storage]
         service serv1(server)[Server 1]
@@ -79,11 +78,11 @@
         serv2 L--B s3
         serv1 T--B disk
     

-  

+    

 
-  
Arrow Tests

-  
-      architecture
+    
Arrow Tests

+    
+      architecture-beta
         service servC(server)[Server 1]
         service servL(server)[Server 2]
         service servR(server)[Server 3]
@@ -100,8 +99,8 @@
         servR (T--R) servT
         servR (B--R) servB
     

-  
-      architecture
+    
+      architecture-beta
         service servC(server)[Server 1]
         service servL(server)[Server 2]
         service servR(server)[Server 3]
@@ -118,11 +117,11 @@
         servT (R--T) servR
         servB (R--B) servR
     

-  

+    

 
-  
Group Edges

-  
-      architecture
+    
Group Edges

+    
+      architecture-beta
         group left_group(cloud)[Left]
         group right_group(cloud)[Right]
         group top_group(cloud)[Top]
@@ -139,12 +138,13 @@
         right_disk{group} (L--R) center_disk{group}
         top_disk{group} (B--T) center_disk{group}
         bottom_disk{group} (T--B) center_disk{group}
-  

-  

+  

+    

 
-  
Edge Label Test

-  
-      architecture
+    
Edge Label Test

+    
+      architecture-beta
         service servC(server)[Server 1]
         service servL(server)[Server 2]
         service servR(server)[Server 3]
@@ -161,8 +161,8 @@
         servR T-[Label]-R servT
         servR B-[Label]-R servB
     

-  
-      architecture
+    
+      architecture-beta
         service servC(server)[Server 1]
         service servL(server)[Server 2]
         service servR(server)[Server 3]
@@ -180,10 +180,10 @@
         servR B-[Label that is Long]-R servB
     

 
-  

-  
Junction Demo

-  
-      architecture
+    

+    
Junction Demo

+    
+      architecture-beta
         service left_disk(disk)[Disk]
         service top_disk(disk)[Disk]
         service bottom_disk(disk)[Disk]
@@ -199,11 +199,11 @@
         top_gateway B--T juncR
         bottom_gateway T--B juncR
     

-  

+    

 
-  
Junction Demo Groups

-  
-      architecture
+    
Junction Demo Groups

+    
+      architecture-beta
         group left
         group right
         service left_disk(disk)[Disk] in left
@@ -224,87 +224,87 @@
 
         juncC{group} R--L) juncR{group}
     

-  

+    

 
-  
AWS Icon Demo

-  
-    architecture
-      service s3(s3)[Cloud Store]
-      service ec2(ec2)[Server]
-      service wave(wavelength)[Wave]
+    
AWS Icon Demo

+    
+    architecture-beta
+      service s3(aws:s3)[Cloud Store]
+      service ec2(aws:ec2)[Server]
+      service wave(aws:wavelength)[Wave]
 
       s3 L--R ec2
       s3 T--B wave
-  

+  

 
-  
-
-
-
\ No newline at end of file
+        iconLibraries: ['aws:full'],
+      });
+      function callback() {
+        alert('It worked');
+      }
+      mermaid.parseError = function (err, hash) {
+        console.error('In parse error:');
+        console.error(err);
+      };
+    
+  
+
diff --git a/docs/syntax/architecture.md b/docs/syntax/architecture.md
index 30b3bd581..361e84aa8 100644
--- a/docs/syntax/architecture.md
+++ b/docs/syntax/architecture.md
@@ -11,7 +11,7 @@
 ## Example
 
 ```mermaid-example
-architecture
+architecture-beta
     group api(cloud)[API]
 
     service db(database)[Database] in api
@@ -25,7 +25,7 @@ architecture
 ```
 
 ```mermaid
-architecture
+architecture-beta
     group api(cloud)[API]
 
     service db(database)[Database] in api
@@ -44,7 +44,7 @@ The building blocks of an architecture are `groups`, `services`, `edges`, and `j
 
 For supporting components, icons are declared by surrounding the icon name with `()`, while labels are declared by surrounding the text with `[]`.
 
-To begin an architecture diagram, use the keyword `architecture`, followed by your groups, services, edges, and junctions. While each of the 3 building blocks can be declared in any order, care must be taken to ensure the identifier was previously declared by another component.
+To begin an architecture diagram, use the keyword `architecture-beta`, followed by your groups, services, edges, and junctions. While each of the 3 building blocks can be declared in any order, care must be taken to ensure the identifier was previously declared by another component.
 
 ### Groups
 
@@ -156,7 +156,7 @@ junction {junction id} (in {parent id})?
 ```
 
 ```mermaid-example
-architecture
+architecture-beta
     service left_disk(disk)[Disk]
     service top_disk(disk)[Disk]
     service bottom_disk(disk)[Disk]
@@ -174,7 +174,7 @@ architecture
 ```
 
 ```mermaid
-architecture
+architecture-beta
     service left_disk(disk)[Disk]
     service top_disk(disk)[Disk]
     service bottom_disk(disk)[Disk]
diff --git a/packages/mermaid/src/docs/syntax/architecture.md b/packages/mermaid/src/docs/syntax/architecture.md
index 8be375522..336269048 100644
--- a/packages/mermaid/src/docs/syntax/architecture.md
+++ b/packages/mermaid/src/docs/syntax/architecture.md
@@ -5,7 +5,7 @@
 ## Example
 
 ```mermaid-example
-architecture
+architecture-beta
     group api(cloud)[API]
 
     service db(database)[Database] in api
@@ -24,7 +24,7 @@ The building blocks of an architecture are `groups`, `services`, `edges`, and `j
 
 For supporting components, icons are declared by surrounding the icon name with `()`, while labels are declared by surrounding the text with `[]`.
 
-To begin an architecture diagram, use the keyword `architecture`, followed by your groups, services, edges, and junctions. While each of the 3 building blocks can be declared in any order, care must be taken to ensure the identifier was previously declared by another component.
+To begin an architecture diagram, use the keyword `architecture-beta`, followed by your groups, services, edges, and junctions. While each of the 3 building blocks can be declared in any order, care must be taken to ensure the identifier was previously declared by another component.
 
 ### Groups
 
@@ -136,7 +136,7 @@ junction {junction id} (in {parent id})?
 ```
 
 ```mermaid-example
-architecture
+architecture-beta
     service left_disk(disk)[Disk]
     service top_disk(disk)[Disk]
     service bottom_disk(disk)[Disk]
diff --git a/packages/parser/src/language/architecture/architecture.langium b/packages/parser/src/language/architecture/architecture.langium
index 31eeaa7d0..79a3899e8 100644
--- a/packages/parser/src/language/architecture/architecture.langium
+++ b/packages/parser/src/language/architecture/architecture.langium
@@ -3,7 +3,7 @@ import "../common/common";
 
 entry Architecture:
     NEWLINE*
-    "architecture"
+    "architecture-beta"
     (
     NEWLINE* TitleAndAccessibilities
     | NEWLINE* Statement*