serverlessworkflow
diff --git a/‎examples/browser/index.html
+1-1 b/‎examples/browser/index.html
+1-1
diff --git a/‎examples/browser/mermaid.html
+1-1 b/‎examples/browser/mermaid.html
+1-1
diff --git a/‎src/lib/builders/action-builder.ts
+1-1 b/‎src/lib/builders/action-builder.ts
+1-1
diff --git a/‎src/lib/builders/authdef-builder.ts
+1-1 b/‎src/lib/builders/authdef-builder.ts
+1-1
diff --git a/‎src/lib/builders/branch-builder.ts
+1-1 b/‎src/lib/builders/branch-builder.ts
+1-1
diff --git a/‎src/lib/builders/callbackstate-builder.ts
+1-1 b/‎src/lib/builders/callbackstate-builder.ts
+1-1
diff --git a/‎src/lib/builders/continueasdef-builder.ts
+1-1 b/‎src/lib/builders/continueasdef-builder.ts
+1-1
diff --git a/‎src/lib/builders/databasedswitchstate-builder.ts
+1-1 b/‎src/lib/builders/databasedswitchstate-builder.ts
+1-1
diff --git a/‎src/lib/builders/defaultconditiondef-builder.ts
+1-1 b/‎src/lib/builders/defaultconditiondef-builder.ts
+1-1
diff --git a/‎src/lib/builders/end-builder.ts
+1-1 b/‎src/lib/builders/end-builder.ts
+1-1
diff --git a/‎src/lib/builders/enddatacondition-builder.ts
+1-1 b/‎src/lib/builders/enddatacondition-builder.ts
+1-1
diff --git a/‎src/lib/builders/enddeventcondition-builder.ts
+1-1 b/‎src/lib/builders/enddeventcondition-builder.ts
+1-1
diff --git a/‎src/lib/builders/error-builder.ts
+1-1 b/‎src/lib/builders/error-builder.ts
+1-1
diff --git a/‎src/lib/builders/eventbasedswitchstate-builder.ts
+1-1 b/‎src/lib/builders/eventbasedswitchstate-builder.ts
+1-1
diff --git a/‎src/lib/builders/eventdef-builder.ts
+1-1 b/‎src/lib/builders/eventdef-builder.ts
+1-1
diff --git a/‎src/lib/builders/eventref-builder.ts
+1-1 b/‎src/lib/builders/eventref-builder.ts
+1-1
diff --git a/‎src/lib/builders/eventstate-builder.ts
+1-1 b/‎src/lib/builders/eventstate-builder.ts
+1-1
diff --git a/‎src/lib/builders/foreachstate-builder.ts
+1-1 b/‎src/lib/builders/foreachstate-builder.ts
+1-1
diff --git a/‎src/lib/builders/function-builder.ts
+1-1 b/‎src/lib/builders/function-builder.ts
+1-1
diff --git a/‎src/lib/builders/functionref-builder.ts
+1-1 b/‎src/lib/builders/functionref-builder.ts
+1-1
diff --git a/‎src/lib/builders/injectstate-builder.ts
+1-1 b/‎src/lib/builders/injectstate-builder.ts
+1-1
diff --git a/‎src/lib/builders/onevents-builder.ts
+1-1 b/‎src/lib/builders/onevents-builder.ts
+1-1
diff --git a/‎src/lib/builders/operationstate-builder.ts
+1-1 b/‎src/lib/builders/operationstate-builder.ts
+1-1
diff --git a/‎src/lib/builders/parallelstate-builder.ts
+1-1 b/‎src/lib/builders/parallelstate-builder.ts
+1-1
diff --git a/‎src/lib/builders/sleepstate-builder.ts
+1-1 b/‎src/lib/builders/sleepstate-builder.ts
+1-1
diff --git a/‎src/lib/builders/subflowref-builder.ts
+1-1 b/‎src/lib/builders/subflowref-builder.ts
+1-1
diff --git a/‎src/lib/builders/timeouts-builder.ts
+1-1 b/‎src/lib/builders/timeouts-builder.ts
+1-1
diff --git a/‎src/lib/builders/transition-builder.ts
+1-1 b/‎src/lib/builders/transition-builder.ts
+1-1
diff --git a/‎src/lib/builders/transitiondatacondition-builder.ts
+1-1 b/‎src/lib/builders/transitiondatacondition-builder.ts
+1-1
diff --git a/‎src/lib/builders/transitioneventcondition-builder.ts
+1-1 b/‎src/lib/builders/transitioneventcondition-builder.ts
+1-1
diff --git a/‎src/lib/builders/workflow-builder.ts
+1-1 b/‎src/lib/builders/workflow-builder.ts
+1-1
diff --git a/‎src/lib/builders/workflow-exec-timeout-builder.ts
+1-1 b/‎src/lib/builders/workflow-exec-timeout-builder.ts
+1-1
diff --git a/‎src/lib/definitions/action.ts
+13-6 b/‎src/lib/definitions/action.ts
+13-6
diff --git a/‎src/lib/definitions/authdef.ts
+9-3 b/‎src/lib/definitions/authdef.ts
+9-3
@@ -8,7 +8,7 @@
   </head>
   <body>
     <!-- 
-      Run http-server from the project root then navigate to http://localhost:8080/examples/browser/mermaid.html
+      Run http-server from the project root then navigate to http://localhost:8080/examples/browser/index.html
     -->
     <div id="output"></div>
     <script src="../../dist/umd/index.umd.js"></script>
 
@@ -8,7 +8,7 @@
 </head>
 <body>
 <!--
-  Run http-server from the project root then navigate to http://localhost:8080/examples/browser/index.html
+  Run http-server from the project root then navigate to http://localhost:8080/examples/browser/mermaid.html
 -->
 <div id="mermaid"  class="mermaid"></div>
 <script src="../../dist/umd/index.umd.js"></script>
 
@@ -27,7 +27,7 @@ function actionBuildingFn(data: Specification.Action): () => Specification.Actio
   return () => {
     const model = new Specification.Action(data);
 
-    validate('Action', model);
+    validate('Action', model.normalize());
     return model;
   };
 }
 
@@ -27,7 +27,7 @@ function authdefBuildingFn(data: Specification.Authdef): () => Specification.Aut
   return () => {
     const model = new Specification.Authdef(data);
 
-    validate('Authdef', model);
+    validate('Authdef', model.normalize());
     return model;
   };
 }
 
@@ -27,7 +27,7 @@ function branchBuildingFn(data: Specification.Branch): () => Specification.Branc
   return () => {
     const model = new Specification.Branch(data);
 
-    validate('Branch', model);
+    validate('Branch', model.normalize());
     return model;
   };
 }
 
@@ -30,7 +30,7 @@ function callbackstateBuildingFn(data: Specification.Callbackstate): () => Speci
 
     setEndValueIfNoTransition(model);
 
-    validate('Callbackstate', model);
+    validate('Callbackstate', model.normalize());
     return model;
   };
 }
 
@@ -27,7 +27,7 @@ function continueasdefBuildingFn(data: Specification.Continueasdef): () => Speci
   return () => {
     const model = new Specification.Continueasdef(data);
 
-    validate('Continueasdef', model);
+    validate('Continueasdef', model.normalize());
     return model;
   };
 }
 
@@ -29,7 +29,7 @@ function databasedswitchstateBuildingFn(
   return () => {
     const model = new Specification.Databasedswitchstate(data);
 
-    validate('Databasedswitchstate', model);
+    validate('Databasedswitchstate', model.normalize());
     return model;
   };
 }
 
@@ -29,7 +29,7 @@ function defaultconditiondefBuildingFn(
   return () => {
     const model = new Specification.Defaultconditiondef(data);
 
-    validate('Defaultconditiondef', model);
+    validate('Defaultconditiondef', model.normalize());
     return model;
   };
 }
 
@@ -27,7 +27,7 @@ function endBuildingFn(data: Specification.End): () => Specification.End {
   return () => {
     const model = new Specification.End(data);
 
-    validate('End', model);
+    validate('End', model.normalize());
     return model;
   };
 }
 
@@ -27,7 +27,7 @@ function enddataconditionBuildingFn(data: Specification.Enddatacondition): () =>
   return () => {
     const model = new Specification.Enddatacondition(data);
 
-    validate('Enddatacondition', model);
+    validate('Enddatacondition', model.normalize());
     return model;
   };
 }
 
@@ -27,7 +27,7 @@ function enddeventconditionBuildingFn(data: Specification.Enddeventcondition): (
   return () => {
     const model = new Specification.Enddeventcondition(data);
 
-    validate('Enddeventcondition', model);
+    validate('Enddeventcondition', model.normalize());
     return model;
   };
 }
 
@@ -30,7 +30,7 @@ function errorBuildingFn(data: Specification.Error): () => Specification.Error {
 
     setEndValueIfNoTransition(model);
 
-    validate('Error', model);
+    validate('Error', model.normalize());
     return model;
   };
 }
 
@@ -29,7 +29,7 @@ function eventbasedswitchstateBuildingFn(
   return () => {
     const model = new Specification.Eventbasedswitchstate(data);
 
-    validate('Eventbasedswitchstate', model);
+    validate('Eventbasedswitchstate', model.normalize());
     return model;
   };
 }
 
@@ -27,7 +27,7 @@ function eventdefBuildingFn(data: Specification.Eventdef): () => Specification.E
   return () => {
     const model = new Specification.Eventdef(data);
 
-    validate('Eventdef', model);
+    validate('Eventdef', model.normalize());
     return model;
   };
 }
 
@@ -27,7 +27,7 @@ function eventrefBuildingFn(data: Specification.Eventref): () => Specification.E
   return () => {
     const model = new Specification.Eventref(data);
 
-    validate('Eventref', model);
+    validate('Eventref', model.normalize());
     return model;
   };
 }
 
@@ -30,7 +30,7 @@ function eventstateBuildingFn(data: Specification.Eventstate): () => Specificati
 
     setEndValueIfNoTransition(model);
 
-    validate('Eventstate', model);
+    validate('Eventstate', model.normalize());
     return model;
   };
 }
 
@@ -30,7 +30,7 @@ function foreachstateBuildingFn(data: Specification.Foreachstate): () => Specifi
 
     setEndValueIfNoTransition(model);
 
-    validate('Foreachstate', model);
+    validate('Foreachstate', model.normalize());
     return model;
   };
 }
 
@@ -27,7 +27,7 @@ function functionBuildingFn(data: Specification.Function): () => Specification.F
   return () => {
     const model = new Specification.Function(data);
 
-    validate('Function', model);
+    validate('Function', model.normalize());
     return model;
   };
 }
 
@@ -27,7 +27,7 @@ function functionrefBuildingFn(data: Specification.Functionref): () => Specifica
   return () => {
     const model = new Specification.Functionref(data);
 
-    validate('Functionref', model);
+    validate('Functionref', model.normalize());
     return model;
   };
 }
 
@@ -30,7 +30,7 @@ function injectstateBuildingFn(data: Specification.Injectstate): () => Specifica
 
     setEndValueIfNoTransition(model);
 
-    validate('Injectstate', model);
+    validate('Injectstate', model.normalize());
     return model;
   };
 }
 
@@ -27,7 +27,7 @@ function oneventsBuildingFn(data: Specification.Onevents): () => Specification.O
   return () => {
     const model = new Specification.Onevents(data);
 
-    validate('Onevents', model);
+    validate('Onevents', model.normalize());
     return model;
   };
 }
 
@@ -30,7 +30,7 @@ function operationstateBuildingFn(data: Specification.Operationstate): () => Spe
 
     setEndValueIfNoTransition(model);
 
-    validate('Operationstate', model);
+    validate('Operationstate', model.normalize());
     return model;
   };
 }
 
@@ -30,7 +30,7 @@ function parallelstateBuildingFn(data: Specification.Parallelstate): () => Speci
 
     setEndValueIfNoTransition(model);
 
-    validate('Parallelstate', model);
+    validate('Parallelstate', model.normalize());
     return model;
   };
 }
 
@@ -27,7 +27,7 @@ function sleepstateBuildingFn(data: Specification.Sleepstate): () => Specificati
   return () => {
     const model = new Specification.Sleepstate(data);
 
-    validate('Sleepstate', model);
+    validate('Sleepstate', model.normalize());
     return model;
   };
 }
 
@@ -27,7 +27,7 @@ function subflowrefBuildingFn(data: Specification.Subflowref): () => Specificati
   return () => {
     const model = new Specification.Subflowref(data);
 
-    validate('Subflowref', model);
+    validate('Subflowref', model.normalize());
     return model;
   };
 }
 
@@ -27,7 +27,7 @@ function timeoutsBuildingFn(data: Specification.Timeouts): () => Specification.T
   return () => {
     const model = new Specification.Timeouts(data);
 
-    validate('Timeouts', model);
+    validate('Timeouts', model.normalize());
     return model;
   };
 }
 
@@ -27,7 +27,7 @@ function transitionBuildingFn(data: Specification.Transition): () => Specificati
   return () => {
     const model = new Specification.Transition(data);
 
-    validate('Transition', model);
+    validate('Transition', model.normalize());
     return model;
   };
 }
 
@@ -29,7 +29,7 @@ function transitiondataconditionBuildingFn(
   return () => {
     const model = new Specification.Transitiondatacondition(data);
 
-    validate('Transitiondatacondition', model);
+    validate('Transitiondatacondition', model.normalize());
     return model;
   };
 }
 
@@ -29,7 +29,7 @@ function transitioneventconditionBuildingFn(
   return () => {
     const model = new Specification.Transitioneventcondition(data);
 
-    validate('Transitioneventcondition', model);
+    validate('Transitioneventcondition', model.normalize());
     return model;
   };
 }
 
@@ -27,7 +27,7 @@ function workflowBuildingFn(data: Specification.Workflow): () => Specification.W
   return () => {
     const model = new Specification.Workflow(data);
 
-    validate('Workflow', model);
+    validate('Workflow', model.normalize());
     return model;
   };
 }
 
@@ -29,7 +29,7 @@ function workflowExecTimeoutBuildingFn(
   return () => {
     const model = new Specification.WorkflowExecTimeout(data);
 
-    validate('WorkflowExecTimeout', model);
+    validate('WorkflowExecTimeout', model.normalize());
     return model;
   };
 }
 
@@ -17,25 +17,30 @@ import { Actiondatafilter } from './actiondatafilter';
 import { Eventref } from './eventref';
 import { Functionref } from './functionref';
 import {
+  cleanSourceModelProperty,
   normalizeEventRef,
   normalizeFunctionRef,
-  normalizeSubFlowRefIfObject,
+  normalizeSubFlowRef,
   overwriteActionDataFilter,
   overwriteEventRef,
-  overwriteFunctionRefIfObject,
+  overwriteFunctionRef,
   overwriteSleep,
-  overwriteSubFlowRefIfObject,
+  overwriteSubFlowRef,
 } from './utils';
 import { Subflowref } from './subflowref';
 import { Sleep } from './sleep';
 
 export class Action {
+  sourceModel?: Action;
+
   constructor(model: any) {
+    this.sourceModel = Object.assign({}, model);
+
     Object.assign(this, model);
 
-    overwriteFunctionRefIfObject(this);
+    overwriteFunctionRef(this);
     overwriteEventRef(this);
-    overwriteSubFlowRefIfObject(this);
+    overwriteSubFlowRef(this);
     overwriteSleep(this);
     overwriteActionDataFilter(this);
   }
@@ -77,10 +82,12 @@ export class Action {
   normalize = (): Action => {
     const clone = new Action(this);
 
-    normalizeSubFlowRefIfObject(clone);
+    normalizeSubFlowRef(clone);
     normalizeEventRef(clone);
     normalizeFunctionRef(clone);
 
+    cleanSourceModelProperty(clone);
+
     return clone;
   };
 }
@@ -14,15 +14,19 @@
  * limitations under the License.
  */
 
-import { normalizeScheme, overwritePropertiesIfObject } from './utils';
+import { cleanSourceModelProperty, normalizeScheme, overwriteProperties } from './utils';
 import { Properties } from './types';
 
 export class Authdef {
+  sourceModel?: Authdef;
+
   constructor(model: any) {
+    this.sourceModel = Object.assign({}, model);
+
     const defaultModel = { scheme: 'basic' };
     Object.assign(this, defaultModel, model);
 
-    overwritePropertiesIfObject(this);
+    overwriteProperties(this);
   }
   /**
    * Unique auth definition name
@@ -41,7 +45,9 @@ export class Authdef {
   normalize = (): Authdef => {
     const clone = new Authdef(this);
 
-    normalizeScheme(clone);
+    normalizeScheme(clone, this.sourceModel);
+
+    cleanSourceModelProperty(clone);
 
     return clone;
   };
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ function actionBuildingFn(data: Specification.Action): () => Specification.Actio`
`27`	`27`	`return () => {`
`28`	`28`	`const model = new Specification.Action(data);`
`29`	`29`
`30`		`- validate('Action', model);`
	`30`	`+ validate('Action', model.normalize());`
`31`	`31`	`return model;`
`32`	`32`	`};`
`33`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ function authdefBuildingFn(data: Specification.Authdef): () => Specification.Aut`
`27`	`27`	`return () => {`
`28`	`28`	`const model = new Specification.Authdef(data);`
`29`	`29`
`30`		`- validate('Authdef', model);`
	`30`	`+ validate('Authdef', model.normalize());`
`31`	`31`	`return model;`
`32`	`32`	`};`
`33`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ function branchBuildingFn(data: Specification.Branch): () => Specification.Branc`
`27`	`27`	`return () => {`
`28`	`28`	`const model = new Specification.Branch(data);`
`29`	`29`
`30`		`- validate('Branch', model);`
	`30`	`+ validate('Branch', model.normalize());`
`31`	`31`	`return model;`
`32`	`32`	`};`
`33`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ function callbackstateBuildingFn(data: Specification.Callbackstate): () => Speci`
`30`	`30`
`31`	`31`	`setEndValueIfNoTransition(model);`
`32`	`32`
`33`		`- validate('Callbackstate', model);`
	`33`	`+ validate('Callbackstate', model.normalize());`
`34`	`34`	`return model;`
`35`	`35`	`};`
`36`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ function continueasdefBuildingFn(data: Specification.Continueasdef): () => Speci`
`27`	`27`	`return () => {`
`28`	`28`	`const model = new Specification.Continueasdef(data);`
`29`	`29`
`30`		`- validate('Continueasdef', model);`
	`30`	`+ validate('Continueasdef', model.normalize());`
`31`	`31`	`return model;`
`32`	`32`	`};`
`33`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ function databasedswitchstateBuildingFn(`
`29`	`29`	`return () => {`
`30`	`30`	`const model = new Specification.Databasedswitchstate(data);`
`31`	`31`
`32`		`- validate('Databasedswitchstate', model);`
	`32`	`+ validate('Databasedswitchstate', model.normalize());`
`33`	`33`	`return model;`
`34`	`34`	`};`
`35`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ function defaultconditiondefBuildingFn(`
`29`	`29`	`return () => {`
`30`	`30`	`const model = new Specification.Defaultconditiondef(data);`
`31`	`31`
`32`		`- validate('Defaultconditiondef', model);`
	`32`	`+ validate('Defaultconditiondef', model.normalize());`
`33`	`33`	`return model;`
`34`	`34`	`};`
`35`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ function endBuildingFn(data: Specification.End): () => Specification.End {`
`27`	`27`	`return () => {`
`28`	`28`	`const model = new Specification.End(data);`
`29`	`29`
`30`		`- validate('End', model);`
	`30`	`+ validate('End', model.normalize());`
`31`	`31`	`return model;`
`32`	`32`	`};`
`33`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ function enddataconditionBuildingFn(data: Specification.Enddatacondition): () =>`
`27`	`27`	`return () => {`
`28`	`28`	`const model = new Specification.Enddatacondition(data);`
`29`	`29`
`30`		`- validate('Enddatacondition', model);`
	`30`	`+ validate('Enddatacondition', model.normalize());`
`31`	`31`	`return model;`
`32`	`32`	`};`
`33`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ function enddeventconditionBuildingFn(data: Specification.Enddeventcondition): (`
`27`	`27`	`return () => {`
`28`	`28`	`const model = new Specification.Enddeventcondition(data);`
`29`	`29`
`30`		`- validate('Enddeventcondition', model);`
	`30`	`+ validate('Enddeventcondition', model.normalize());`
`31`	`31`	`return model;`
`32`	`32`	`};`
`33`	`33`	`}`