Merge pull request #114 from antmendoza/from-types-to-classes

moved from types to classes

Author: antmendoza

README.md

@@ -19,7 +19,7 @@ To build the project and run tests locally:
 ```sh
 git clone https://github.com/serverlessworkflow/sdk-typescript.git
 cd sdk-typescript
-npm install && npm run update-code-base && npm run test
+npm install && npm run test
 ```
 
 
@@ -66,7 +66,6 @@ const workflow: Specification.Workflow = workflowBuilder()
       .data({
           "result": "Hello World!"
       })
-      .end(true)
       .build()
   ])
   .build();
@@ -76,9 +75,9 @@ const workflow: Specification.Workflow = workflowBuilder()
 #### Load a file JSON/YAML to a Workflow instance
 
 ```typescript
-import { Specification, WorkflowConverter } from '@severlessworkflow/sdk-typescript';
+import { Specification, Workflow } from '@severlessworkflow/sdk-typescript';
 
-const workflow: Specification.Workflow = WorkflowConverter.fromString(source);
+const workflow: Specification.Workflow = Workflow.fromSource(source);
 ```
 Where `source` is a JSON or a YAML string.
 
@@ -109,18 +108,18 @@ const workflow: Specification.Workflow = workflowBuilder()
 ```
 
 You can convert it to its string representation in JSON or YAML format 
-by using the static methods `toJson` or `toYaml` respectively:
+by using the static methods `Workflow.toJson` or `Workflow.toYaml` respectively:
 
 ```typescript
-import { WorkflowConverter } from '@severlessworkflow/sdk-typescript';
+import { Workflow } from '../src/lib/definitions/workflow';
 
-const workflowAsJson: string = WorkflowConverter.toJson(workflow);
+const workflowAsJson: string = Workflow.toJson(workflow);
 ```
 
 ```typescript
-import { WorkflowConverter } from '@severlessworkflow/sdk-typescript';
+import { Workflow } from '../src/lib/definitions/workflow';
 
-const workflowAsYaml: string = WorkflowConverter.toYaml(workflow);
+const workflowAsYaml: string = Workflow.toYaml(workflow);
 ```
 
 
@@ -169,4 +168,4 @@ const injectionStateValidator: ValidateFunction<Specification.Injectstate> = val
 if (!injectionStateValidator(injectionState)) {
   injectionStateValidator.errors.forEach(error => console.error(error.message));
 }
-```
+```

src/lib/builders/action-builder.ts

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

src/lib/builders/actiondatafilter-builder.ts

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

src/lib/builders/branch-builder.ts

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

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
@@ -26,9 +27,12 @@ import { validate } from '../utils';
  */
 function callbackstateBuildingFn(data: Specification.Callbackstate): () => Specification.Callbackstate {
   return () => {
-    data.type = 'callback';
-    validate('Callbackstate', data);
-    return data;
+    const model = new Specification.Callbackstate(data);
+
+    setEndValueIfNoTransition(model);
+
+    validate('Callbackstate', model);
+    return model;
   };
 }
 

src/lib/builders/correlation-def-builder.ts

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

src/lib/builders/crondef-builder.ts

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

src/lib/builders/databasedswitch-builder.ts

@@ -26,9 +26,10 @@ import { validate } from '../utils';
  */
 function databasedswitchBuildingFn(data: Specification.Databasedswitch): () => Specification.Databasedswitch {
   return () => {
-    data.type = 'switch';
-    validate('Databasedswitch', data);
-    return data;
+    const model = new Specification.Databasedswitch(data);
+
+    validate('Databasedswitch', model);
+    return model;
   };
 }
 

src/lib/builders/datacondition-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,8 +27,12 @@ import { validate } from '../utils';
  */
 function defaultdefBuildingFn(data: Specification.Defaultdef): () => Specification.Defaultdef {
   return () => {
-    validate('Defaultdef', data);
-    return data;
+    const model = new Specification.Defaultdef(data);
+
+    setEndValueIfNoTransition(model);
+
+    validate('Defaultdef', model);
+    return model;
   };
 }