order-properties-on-serialization

src/lib/definitions/callbackstate.ts

@@ -47,7 +47,12 @@ export class Callbackstate {
   constructor(model: any) {
     this.sourceModel = Object.assign({}, model);
 
-    const defaultModel = { type: 'callback', usedForCompensation: false };
+    const defaultModel = {
+      id: undefined,
+      name: undefined,
+      type: 'callback',
+      usedForCompensation: false,
+    };
     Object.assign(this, defaultModel, model);
 
     overwriteAction(this);
@@ -59,7 +64,6 @@ export class Callbackstate {
     overwriteEnd(this);
     overwriteMetadata(this);
   }
-
   /**
    * Unique state id
    */

src/lib/definitions/databasedswitchstate.ts

@@ -40,7 +40,7 @@ export class Databasedswitchstate {
   constructor(model: any) {
     this.sourceModel = Object.assign({}, model);
 
-    const defaultModel = { type: 'switch', usedForCompensation: false };
+    const defaultModel = { id: undefined, name: undefined, type: 'switch', usedForCompensation: false };
     Object.assign(this, defaultModel, model);
 
     overwriteStateDataFilter(this);

src/lib/definitions/eventbasedswitchstate.ts

@@ -40,10 +40,7 @@ export class Eventbasedswitchstate {
   constructor(model: any) {
     this.sourceModel = Object.assign({}, model);
 
-    const defaultModel = {
-      type: 'switch',
-      usedForCompensation: false,
-    };
+    const defaultModel = { id: undefined, name: undefined, type: 'switch', usedForCompensation: false };
     Object.assign(this, defaultModel, model);
 
     overwriteStateDataFilter(this);
@@ -53,7 +50,6 @@ export class Eventbasedswitchstate {
     overwriteDefaultCondition(this);
     overwriteMetadata(this);
   }
-
   /**
    * Unique State id
    */

src/lib/definitions/eventstate.ts

@@ -20,6 +20,7 @@ import { Onevents } from './onevents';
 import { Statedatafilter } from './statedatafilter';
 import { Transition } from './transition';
 import {
+  cleanSourceModelProperty,
   normalizeEnd,
   normalizeExclusive,
   normalizeOnErrors,
@@ -30,10 +31,9 @@ import {
   overwriteOnErrors,
   overwriteOnEvents,
   overwriteStateDataFilter,
+  overwriteTimeoutWithStateExecTimeout,
   overwriteTransition,
   setEndValueIfNoTransition,
-  overwriteTimeoutWithStateExecTimeout,
-  cleanSourceModelProperty,
 } from './utils';
 import { ActionExecTimeout, EventTimeout } from './types';
 import { StateExecTimeout } from './stateExecTimeout';
@@ -44,7 +44,12 @@ export class Eventstate /* This state is used to wait for events from event sour
   constructor(model: any) {
     this.sourceModel = Object.assign({}, model);
 
-    const defaultModel = { type: 'event', exclusive: true };
+    const defaultModel = {
+      id: undefined,
+      name: undefined,
+      type: 'event',
+      exclusive: true,
+    };
     Object.assign(this, defaultModel, model);
 
     overwriteOnEvents(this);

src/lib/definitions/foreachstate.ts

@@ -20,8 +20,10 @@ import { Metadata } from './metadata';
 import { Statedatafilter } from './statedatafilter';
 import { Transition } from './transition';
 import {
+  cleanSourceModelProperty,
   normalizeActions,
   normalizeEnd,
+  normalizeMode,
   normalizeOnErrors,
   normalizeTransition,
   normalizeUsedForCompensation,
@@ -30,11 +32,9 @@ import {
   overwriteMetadata,
   overwriteOnErrors,
   overwriteStateDataFilter,
+  overwriteTimeoutWithStateExecTimeout,
   overwriteTransition,
   setEndValueIfNoTransition,
-  normalizeMode,
-  overwriteTimeoutWithStateExecTimeout,
-  cleanSourceModelProperty,
 } from './utils';
 import { ActionExecTimeout } from './types';
 import { StateExecTimeout } from './stateExecTimeout';
@@ -45,7 +45,13 @@ export class Foreachstate {
   constructor(model: any) {
     this.sourceModel = Object.assign({}, model);
 
-    const defaultModel = { type: 'foreach', usedForCompensation: false, mode: 'parallel' };
+    const defaultModel = {
+      id: undefined,
+      name: undefined,
+      type: 'foreach',
+      usedForCompensation: false,
+      mode: 'parallel',
+    };
     Object.assign(this, defaultModel, model);
 
     overwriteEnd(this);
@@ -120,7 +126,6 @@ export class Foreachstate {
    * If true, this state is used to compensate another state. Default is false
    */
   usedForCompensation?: boolean;
-
   /**
    * Specifies how iterations are to be performed (sequentially or in parallel)
    */

src/lib/definitions/injectstate.ts

@@ -39,7 +39,12 @@ export class Injectstate {
   constructor(model: any) {
     this.sourceModel = Object.assign({}, model);
 
-    const defaultModel = { type: 'inject', usedForCompensation: false };
+    const defaultModel = {
+      id: undefined,
+      name: undefined,
+      type: 'inject',
+      usedForCompensation: false,
+    };
     Object.assign(this, defaultModel, model);
 
     overwriteEnd(this);

src/lib/definitions/operationstate.ts

@@ -46,6 +46,8 @@ export class Operationstate {
     this.sourceModel = Object.assign({}, model);
 
     const defaultModel = {
+      id: undefined,
+      name: undefined,
       type: 'operation',
       actionMode: 'sequential',
       usedForCompensation: false,

src/lib/definitions/parallelstate.ts

@@ -21,6 +21,7 @@ import { Metadata } from './metadata';
 import { Statedatafilter } from './statedatafilter';
 import { Transition } from './transition';
 import {
+  cleanSourceModelProperty,
   normalizeBranches,
   normalizeCompletionType,
   normalizeEnd,
@@ -32,10 +33,9 @@ import {
   overwriteMetadata,
   overwriteOnErrors,
   overwriteStateDataFilter,
+  overwriteTimeoutWithStateExecTimeout,
   overwriteTransition,
   setEndValueIfNoTransition,
-  overwriteTimeoutWithStateExecTimeout,
-  cleanSourceModelProperty,
 } from './utils';
 import { BranchExecTimeout } from './types';
 import { StateExecTimeout } from './stateExecTimeout';
@@ -47,6 +47,8 @@ export class Parallelstate {
     this.sourceModel = Object.assign({}, model);
 
     const defaultModel = {
+      id: undefined,
+      name: undefined,
       type: 'parallel',
       completionType: 'allOf',
       usedForCompensation: false,

src/lib/definitions/sleepstate.ts

@@ -42,6 +42,8 @@ export class Sleepstate {
     this.sourceModel = Object.assign({}, model);
 
     const defaultModel = {
+      id: undefined,
+      name: undefined,
       type: 'sleep',
       usedForCompensation: false,
     };

src/lib/definitions/workflow.ts

@@ -51,9 +51,20 @@ export class Workflow {
     this.sourceModel = Object.assign({}, model);
 
     const defaultModel = {
+      id: undefined,
+      name: undefined,
+      version: undefined,
+      description: undefined,
+      specVersion: undefined,
+      start: undefined,
+      states: undefined,
+      functions: undefined,
+      events: undefined,
+      retries: undefined,
+      timeouts: undefined,
       expressionLang: 'jq',
       keepActive: true,
-    } as Specification.Workflow;
+    };
 
     Object.assign(this, defaultModel, model);
 

tests/examples/applicantrequest.json

@@ -1,20 +1,14 @@
 {
   "id": "applicantrequest",
-  "version": "1.0",
-  "specVersion": "0.8",
   "name": "Applicant Request Decision Workflow",
+  "version": "1.0",
   "description": "Determine if applicant request is valid",
+  "specVersion": "0.8",
   "start": "CheckApplication",
-  "functions": [
-    {
-      "name": "sendRejectionEmailFunction",
-      "operation": "http://myapis.org/applicationapi.json#emailRejection"
-    }
-  ],
   "states":[
     {
-      "type":"switch",
       "name":"CheckApplication",
+      "type":"switch",
       "dataConditions": [
         {
           "condition": "${ .applicants | .age >= 18 }",
@@ -30,8 +24,8 @@
       }
     },
     {
-      "type": "operation",
       "name": "StartApplication",
+      "type": "operation",
       "actions": [
         {
           "subFlowRef": "startApplicationWorkflowId"
@@ -40,9 +34,9 @@
       "end": true
     },
     {
+      "name":"RejectApplication",
       "type":"operation",
       "actionMode":"sequential",
-      "name":"RejectApplication",
       "actions":[
         {
           "functionRef": {
@@ -55,5 +49,11 @@
       ],
       "end": true
     }
+  ],
+  "functions": [
+    {
+      "name": "sendRejectionEmailFunction",
+      "operation": "http://myapis.org/applicationapi.json#emailRejection"
+    }
   ]
 }

tests/examples/booklending.json

@@ -6,8 +6,8 @@
   "start": "Book Lending Request",
   "states": [
     {
-      "type": "event",
       "name": "Book Lending Request",
+      "type": "event",
       "onEvents": [
         {
           "eventRefs": ["Book Lending Request Event"]
@@ -16,8 +16,8 @@
       "transition": "Get Book Status"
     },
     {
-      "type": "operation",
       "name": "Get Book Status",
+      "type": "operation",
       "actions": [
         {
           "functionRef": {
@@ -31,8 +31,8 @@
       "transition": "Book Status Decision"
     },
     {
-      "type": "switch",
       "name": "Book Status Decision",
+      "type": "switch",
       "dataConditions": [
         {
           "name": "Book is on loan",
@@ -50,8 +50,8 @@
       }
     },
     {
-      "type": "operation",
       "name": "Report Status To Lender",
+      "type": "operation",
       "actions": [
         {
           "functionRef": {
@@ -66,8 +66,8 @@
       "transition": "Wait for Lender response"
     },
     {
-      "type": "switch",
       "name": "Wait for Lender response",
+      "type": "switch",
       "eventConditions": [
         {
           "name": "Hold Book",
@@ -85,8 +85,8 @@
       }
     },
     {
-      "type": "operation",
       "name": "Request Hold",
+      "type": "operation",
       "actions": [
         {
           "functionRef": {
@@ -101,14 +101,14 @@
       "transition": "Sleep two weeks"
     },
     {
-      "type": "sleep",
       "name": "Sleep two weeks",
+      "type": "sleep",
       "duration": "PT2W",
       "transition": "Get Book Status"
     },
     {
-      "type": "operation",
       "name": "Check Out Book",
+      "type": "operation",
       "actions": [
         {
           "functionRef": {