Merge pull request #141 from antmendoza/fix-end-condition-mermaid_

fixed-end-condition-mermaid

Author: antmendoza

src/lib/definitions/function.ts

@@ -34,7 +34,7 @@ export class Function {
   /**
    * Defines the function type. Is either `rest`, `asyncapi, `rpc`, `graphql`, `odata`, `expression`, or `custom`. Default is `rest`
    */
-  type?: 'rest' | 'asyncapi' | 'rpc' | 'graphql' | 'odata' | 'expression' | "custom";
+  type?: 'rest' | 'asyncapi' | 'rpc' | 'graphql' | 'odata' | 'expression' | 'custom';
   /**
    * References an auth definition name to be used to access to resource defined in the operation parameter
    */

src/lib/diagram/mermaidState.ts

@@ -82,9 +82,9 @@ export class MermaidState {
           ...this.naturalTransition(stateName, transitionDataCondition.transition, transitionDataCondition.condition)
         );
 
-        const endDataCondition = dataCondition as Specification.Enddatacondition; //TODO
+        const endDataCondition = dataCondition as Specification.Enddatacondition;
         if (endDataCondition.end) {
-          transitions.push(this.transitionDescription(stateName, endDataCondition.name, endDataCondition.condition));
+          transitions.push(this.transitionDescription(stateName, '[*]', transitionDataCondition.condition));
         }
       });
 

tests/lib/diagram/mermaidState.spec.ts

@@ -109,6 +109,35 @@ CheckApplication --> RejectApplication : \${ .applicants | .age < 18 }
 CheckApplication --> RejectApplication : default`);
   });
 
+  it('should create source code for data-based state with end condition', () => {
+    const databasedswitch = new Specification.Databasedswitch(
+      JSON.parse(`{
+      "type":"switch",
+      "name":"CheckApplication",
+      "dataConditions": [
+        {
+          "condition": "\${ .applicants | .age >= 18 }",
+          "transition": "StartApplication"
+        },
+        {
+          "condition": "\${ .applicants | .age < 18 }",
+          "end": true
+        }
+      ],
+      "defaultCondition": {
+        "transition": "StartApplication"
+      }
+    }`)
+    );
+    const mermaidState = new MermaidState(databasedswitch);
+    expect(mermaidState.sourceCode()).toBe(`CheckApplication : CheckApplication
+CheckApplication : type = Switch State
+CheckApplication : Condition type = data-based
+CheckApplication --> StartApplication : \${ .applicants | .age >= 18 }
+CheckApplication --> [*] : \${ .applicants | .age < 18 }
+CheckApplication --> StartApplication : default`);
+  });
+
   it('should create source code for operation state', () => {
     const states = new Specification.Operationstate(
       JSON.parse(`{