added default values and normalize method

Signed-off-by: Antonio Mendoza Pérez <antmendoza@gmail.com>

Author: antmendoza

src/lib/builders/callbackstate-builder.ts

@@ -18,6 +18,7 @@
 import { Builder, builder } from '../builder';
 import { Specification } from '../definitions';
 import { validate } from '../utils';
+import { setEndValueIfNoTransition } from '../definitions/utils';
 
 /**
  * The internal function used by the builder proxy to validate and return its underlying object
@@ -28,6 +29,8 @@ function callbackstateBuildingFn(data: Specification.Callbackstate): () => Speci
   return () => {
     const model = new Specification.Callbackstate(data);
 
+    setEndValueIfNoTransition(model);
+
     validate('Callbackstate', model);
     return model;
   };

src/lib/builders/defaultdef-builder.ts

@@ -18,6 +18,7 @@
 import { Builder, builder } from '../builder';
 import { Specification } from '../definitions';
 import { validate } from '../utils';
+import { setEndValueIfNoTransition } from '../definitions/utils';
 
 /**
  * The internal function used by the builder proxy to validate and return its underlying object
@@ -28,6 +29,8 @@ function defaultdefBuildingFn(data: Specification.Defaultdef): () => Specificati
   return () => {
     const model = new Specification.Defaultdef(data);
 
+    setEndValueIfNoTransition(model);
+
     validate('Defaultdef', model);
     return model;
   };

src/lib/builders/delaystate-builder.ts

@@ -18,6 +18,7 @@
 import { Builder, builder } from '../builder';
 import { Specification } from '../definitions';
 import { validate } from '../utils';
+import { setEndValueIfNoTransition } from '../definitions/utils';
 
 /**
  * The internal function used by the builder proxy to validate and return its underlying object
@@ -28,6 +29,8 @@ function delaystateBuildingFn(data: Specification.Delaystate): () => Specificati
   return () => {
     const model = new Specification.Delaystate(data);
 
+    setEndValueIfNoTransition(model);
+
     validate('Delaystate', model);
     return model;
   };

src/lib/builders/error-builder.ts

@@ -18,6 +18,7 @@
 import { Builder, builder } from '../builder';
 import { Specification } from '../definitions';
 import { validate } from '../utils';
+import { setEndValueIfNoTransition } from '../definitions/utils';
 
 /**
  * The internal function used by the builder proxy to validate and return its underlying object
@@ -28,6 +29,8 @@ function errorBuildingFn(data: Specification.Error): () => Specification.Error {
   return () => {
     const model = new Specification.Error(data);
 
+    setEndValueIfNoTransition(model);
+
     validate('Error', model);
     return model;
   };

src/lib/builders/eventstate-builder.ts

@@ -18,6 +18,7 @@
 import { Builder, builder } from '../builder';
 import { Specification } from '../definitions';
 import { validate } from '../utils';
+import { setEndValueIfNoTransition } from '../definitions/utils';
 
 /**
  * The internal function used by the builder proxy to validate and return its underlying object
@@ -28,9 +29,7 @@ function eventstateBuildingFn(data: Specification.Eventstate): () => Specificati
   return () => {
     const model = new Specification.Eventstate(data);
 
-    if (!data.end && !data.transition) {
-      model.end = true;
-    }
+    setEndValueIfNoTransition(model);
 
     validate('Eventstate', model);
     return model;

src/lib/builders/foreachstate-builder.ts

@@ -18,6 +18,7 @@
 import { Builder, builder } from '../builder';
 import { Specification } from '../definitions';
 import { validate } from '../utils';
+import { setEndValueIfNoTransition } from '../definitions/utils';
 
 /**
  * The internal function used by the builder proxy to validate and return its underlying object
@@ -28,9 +29,7 @@ function foreachstateBuildingFn(data: Specification.Foreachstate): () => Specifi
   return () => {
     const model = new Specification.Foreachstate(data);
 
-    if (!data.end && !data.transition) {
-      model.end = true;
-    }
+    setEndValueIfNoTransition(model);
 
     validate('Foreachstate', model);
     return model;

src/lib/builders/function-builder.ts

@@ -28,9 +28,6 @@ function functionBuildingFn(data: Specification.Function): () => Specification.F
   return () => {
     const model = new Specification.Function(data);
 
-    //set the value coming from data
-    model.type = data.type;
-
     validate('Function', model);
     return model;
   };

src/lib/builders/injectstate-builder.ts

@@ -18,6 +18,7 @@
 import { Builder, builder } from '../builder';
 import { Specification } from '../definitions';
 import { validate } from '../utils';
+import { setEndValueIfNoTransition } from '../definitions/utils';
 
 /**
  * The internal function used by the builder proxy to validate and return its underlying object
@@ -26,14 +27,12 @@ import { validate } from '../utils';
  */
 function injectstateBuildingFn(data: Specification.Injectstate): () => Specification.Injectstate {
   return () => {
-    const result = new Specification.Injectstate(data);
+    const model = new Specification.Injectstate(data);
 
-    if (!data.end && !data.transition) {
-      result.end = true;
-    }
+    setEndValueIfNoTransition(model);
 
-    validate('Injectstate', result);
-    return result;
+    validate('Injectstate', model);
+    return model;
   };
 }
 

src/lib/builders/metadata-builder.ts

@@ -26,10 +26,10 @@ import { validate } from '../utils';
  */
 function metadataBuildingFn(data: Specification.Metadata): () => Specification.Metadata {
   return () => {
-    const result = new Specification.Metadata(data);
+    const model = new Specification.Metadata(data);
 
-    validate('Metadata', result);
-    return result;
+    validate('Metadata', model);
+    return model;
   };
 }
 

src/lib/builders/operationstate-builder.ts

@@ -18,6 +18,7 @@
 import { Builder, builder } from '../builder';
 import { Specification } from '../definitions';
 import { validate } from '../utils';
+import { setEndValueIfNoTransition } from '../definitions/utils';
 
 /**
  * The internal function used by the builder proxy to validate and return its underlying object
@@ -28,9 +29,7 @@ function operationstateBuildingFn(data: Specification.Operationstate): () => Spe
   return () => {
     const model = new Specification.Operationstate(data);
 
-    if (!data.end && !data.transition) {
-      model.end = true;
-    }
+    setEndValueIfNoTransition(model);
 
     validate('Operationstate', model);
     return model;