feat: add syntax sugar for aggreage inside

feakin · Nov 2, 2022 · 1a275f5 · 1a275f5
1 parent 558acdc
commit 1a275f5
Show file tree

Hide file tree

Showing 3 changed files with 109 additions and 2 deletions.
diff --git a/docs/samples/impl.fkl b/docs/samples/impl.fkl
@@ -99,3 +99,13 @@ env Staging {
     url: "mysql://localhost:3306/test"
   }
 }
+
+SourceSet sourceSet {
+  feakin {
+    srcDir: ["src/main/resources/uml"]
+  }
+  puml {
+    parser: "PlantUML"
+    srcDir: ["src/main/resources/uml"]
+  }
+}
diff --git a/fkl_parser/src/parser/fkl.pest b/fkl_parser/src/parser/fkl.pest
@@ -22,7 +22,7 @@ declaration = {
 include_decl = { "include" ~ string }
 
 context_map_decl = {
-  "ContextMap" ~ identifier? ~ "{" ~ (used_context_node | context_node_rel | inline_doc)* ~ "}"
+  "ContextMap" ~ identifier? ~ "{" ~ (context_decl | used_context_node | context_node_rel | inline_doc)* ~ "}"
 }
 
 context_decl = {
@@ -82,7 +82,7 @@ ext_module_decl = {
 }
 
 aggregate_decl = {
-  "Aggregate" ~ identifier ~ "{" ~ (entity_decl | inline_doc | used_domain_event_decl | used_domain_objects_decl )* ~ "}"
+  "Aggregate" ~ identifier ~ "{" ~ (entity_decl | struct_decl | inline_doc | used_domain_event_decl | used_domain_objects_decl )* ~ "}"
 }
 
 used_domain_objects_decl = {

diff --git a/fkl_parser/src/parser/parser.rs b/fkl_parser/src/parser/parser.rs
@@ -100,6 +100,10 @@ fn consume_context_map(pair: Pair<Rule>) -> ContextMapDecl {
         identify.name = p.as_str().to_string();
         identify.loc = Loc::from_pair(p.as_span());
       }
+      Rule::context_decl => {
+        let context_decl = consume_context(p);
+        context_decl_map.insert(context_decl.name.clone(), context_decl);
+      }
       Rule::context_node_rel => {
         let mut names: Vec<String> = vec![];
         let mut direction: RelationDirection = RelationDirection::Undirected;
@@ -230,6 +234,18 @@ fn consume_aggregate(pair: Pair<Rule>) -> AggregateDecl {
       Rule::used_domain_event_decl => {
         aggregate.domain_events = consume_use_domain_events(p);
       }
+      Rule::struct_decl => {
+        let default_struct = consume_struct(p);
+        let fields = default_struct.fields;
+        aggregate.entities.push(EntityDecl {
+          name: aggregate.name.to_string(),
+          is_aggregate_root: false,
+          identify: Default::default(),
+          inline_doc: "".to_string(),
+          fields,
+          value_objects: vec![],
+        });
+      }
       _ => println!("unreachable aggregate rule: {:?}", p.as_rule())
     };
   }
@@ -1721,6 +1737,87 @@ env Local {
     }));
   }
 
+  #[test]
+  fn syntax_sugar() {
+    let decls = parse(r#"ContextMap architecture {
+    Context analyze {
+        Aggregate ArchSystem {
+            Struct {
+                id: String;
+                name: String;
+            }
+
+            Entity ArchComponent {
+                Struct {
+                    name: String;
+                    type: ArchComponentType
+                }
+            }
+        }
+    }
+}
+"#).or_else(|e| {
+      println!("{}", e);
+      Err(e)
+    }).unwrap();
+
+    assert_eq!(decls[0], FklDeclaration::ContextMap(ContextMapDecl {
+      name: Identifier {
+        name: "architecture".to_string(),
+        loc: Loc(11, 23),
+      },
+      contexts: vec![
+        BoundedContextDecl {
+          name: "analyze".to_string(),
+          aggregates: vec![
+            AggregateDecl {
+              name: "ArchSystem".to_string(),
+              inline_doc: "".to_string(),
+              used_domain_objects: vec![],
+              entities: vec![
+                EntityDecl {
+                  name: "ArchSystem".to_string(),
+                  is_aggregate_root: false,
+                  identify: Default::default(),
+                  inline_doc: "".to_string(),
+                  fields: vec![
+                    VariableDefinition { name: "id".to_string(), type_type: "String".to_string(), initializer: None },
+                    VariableDefinition { name: "name".to_string(), type_type: "String".to_string(), initializer: None },
+                  ],
+                  value_objects: vec![],
+                },
+                EntityDecl {
+                  name: "ArchComponent".to_string(),
+                  is_aggregate_root: false,
+                  identify: Default::default(),
+                  inline_doc: "".to_string(),
+                  fields: vec![
+                    VariableDefinition {
+                      name: "name".to_string(),
+                      type_type: "String".to_string(),
+                      initializer: None,
+                    },
+                    VariableDefinition {
+                      name: "type".to_string(),
+                      type_type: "ArchComponentType".to_string(),
+                      initializer: None,
+                    },
+                  ],
+                  value_objects: vec![],
+                },
+              ],
+              value_objects: vec![],
+              domain_events: vec![],
+            },
+          ],
+          domain_events: vec![],
+          used_domain_objects: vec![],
+        },
+      ],
+      relations: vec![],
+    }));
+  }
+
   #[test]
   fn include_other_file() {
     let _decls = parse(r#"include "./layer.rs""#).or_else(|e| {