Merge pull request #97 from antmendoza/fix-test_

fix example test

Author: antmendoza

examples/node/index.js

@@ -1,18 +1,18 @@
-const { workflowBuilder, injectstateBuilder } = require('../../dist');
-const workflow = workflowBuilder()
-                  .id("helloworld")
-                  .version("1.0")
-                  .name("Hello World Workflow")
-                  .description("Inject Hello World")
-                  .start("Hello State")
-                  .states([
-                    injectstateBuilder()
-                      .name("Hello State")
-                      .data({
-                          "result": "Hello World!"
-                      })
-                      .end(true)
-                      .build()
-                  ])
-                  .build();
+const { workflowBuilder, injectstateBuilder } = require('../../dist');
+const workflow = workflowBuilder()
+                  .id("helloworld")
+                  .version("1.0")
+                  .name("Hello World Workflow")
+                  .description("Inject Hello World")
+                  .start("Hello State")
+                  .states([
+                    injectstateBuilder()
+                      .name("Hello State")
+                      .data({
+                          "result": "Hello World!"
+                      })
+                      .end(true)
+                      .build()
+                  ])
+                  .build();
 console.log(workflow.id);

src/lib/builders/foreachstate-builder.ts

@@ -28,6 +28,10 @@ import { validators } from '../validators';
 function foreachstateBuildingFn(data: Specification.Foreachstate): () => Specification.Foreachstate {
   return () => {
     data.type = 'foreach';
+
+    //FIXME https://github.com/serverlessworkflow/sdk-typescript/issues/95
+
+    data.usedForCompensation = data.usedForCompensation || false;
     const validate = validators.get('Foreachstate');
     // TODO: ignore validation if no validator or throw ?
     if (!validate) return data;

src/lib/definitions/workflow.ts

@@ -151,7 +151,7 @@ export interface Actiondatafilter {
 /**
  * Branch Definition
  */
-export type Branch = /* Branch Definition */
+export type Branch /* Branch Definition */ =
   | {
       /**
        * Branch name
@@ -305,13 +305,13 @@ export interface Databasedswitch {
   usedForCompensation?: boolean;
   metadata?: /* Metadata information */ Metadata;
 }
-export type Datacondition = /* Switch state data based condition */
+export type Datacondition /* Switch state data based condition */ =
   | Transitiondatacondition
   | /* Switch state data based condition */ Enddatacondition;
 /**
  * Default definition. Can be either a transition or end definition
  */
-export type Defaultdef = /* Default definition. Can be either a transition or end definition */
+export type Defaultdef /* Default definition. Can be either a transition or end definition */ =
   | {
       transition: Transition;
       end?: End;
@@ -501,7 +501,7 @@ export interface Eventbasedswitch {
   usedForCompensation?: boolean;
   metadata?: /* Metadata information */ Metadata;
 }
-export type Eventcondition = /* Switch state data event condition */
+export type Eventcondition /* Switch state data event condition */ =
   | Transitioneventcondition
   | /* Switch state data event condition */ Enddeventcondition;
 export interface Eventdatafilter {
@@ -576,120 +576,82 @@ export type Events = string /* uri */ | [Eventdef, ...Eventdef[]];
  */
 export type Eventstate =
   /* This state is used to wait for events from event sources, then consumes them and invoke one or more actions to run in sequence or parallel */
-    | {
-        /**
-         * Unique State id
-         */
-        id?: string;
-        /**
-         * State name
-         */
-        name: string;
-        /**
-         * State type
-         */
-        type: 'event';
-        /**
-         * If true consuming one of the defined events causes its associated actions to be performed. If false all of the defined events must be consumed in order for actions to be performed
-         */
-        exclusive?: boolean;
-        /**
-         * Define the events to be consumed and optional actions to be performed
-         */
-        onEvents: Onevents[];
-        /**
-         * Time period to wait for incoming events (ISO 8601 format)
-         */
-        timeout?: string;
-        stateDataFilter?: Statedatafilter;
-        /**
-         * States error handling and retries definitions
-         */
-        onErrors?: Error[];
-        transition?: Transition;
-        end: End;
-        /**
-         * Unique Name of a workflow state which is responsible for compensation of this state
-         */
-        compensatedBy?: string;
-        metadata?: /* Metadata information */ Metadata;
-      }
-    | {
-        /**
-         * Unique State id
-         */
-        id?: string;
-        /**
-         * State name
-         */
-        name: string;
-        /**
-         * State type
-         */
-        type: 'event';
-        /**
-         * If true consuming one of the defined events causes its associated actions to be performed. If false all of the defined events must be consumed in order for actions to be performed
-         */
-        exclusive?: boolean;
-        /**
-         * Define the events to be consumed and optional actions to be performed
-         */
-        onEvents: Onevents[];
-        /**
-         * Time period to wait for incoming events (ISO 8601 format)
-         */
-        timeout?: string;
-        stateDataFilter?: Statedatafilter;
-        /**
-         * States error handling and retries definitions
-         */
-        onErrors?: Error[];
-        transition: Transition;
-        end?: End;
-        /**
-         * Unique Name of a workflow state which is responsible for compensation of this state
-         */
-        compensatedBy?: string;
-        metadata?: /* Metadata information */ Metadata;
-      }
-    | {
-        /**
-         * Unique State id
-         */
-        id?: string;
-        /**
-         * State name
-         */
-        name: string;
-        /**
-         * State type
-         */
-        type: 'event';
-        /**
-         * If true consuming one of the defined events causes its associated actions to be performed. If false all of the defined events must be consumed in order for actions to be performed
-         */
-        exclusive?: boolean;
-        /**
-         * Define the events to be consumed and optional actions to be performed
-         */
-        onEvents: Onevents[];
-        /**
-         * Time period to wait for incoming events (ISO 8601 format)
-         */
-        timeout?: string;
-        stateDataFilter?: Statedatafilter;
-        /**
-         * States error handling and retries definitions
-         */
-        onErrors?: Error[];
-        transition?: Transition;
-        end: End;
-        /**
-         * Unique Name of a workflow state which is responsible for compensation of this state
-         */
-        compensatedBy?: string;
-        metadata?: /* Metadata information */ Metadata;
-      };
+  | {
+      /**
+       * Unique State id
+       */
+      id?: string;
+      /**
+       * State name
+       */
+      name: string;
+      /**
+       * State type
+       */
+      type: 'event';
+      /**
+       * If true consuming one of the defined events causes its associated actions to be performed. If false all of the defined events must be consumed in order for actions to be performed
+       */
+      exclusive?: boolean;
+      /**
+       * Define the events to be consumed and optional actions to be performed
+       */
+      onEvents: Onevents[];
+      /**
+       * Time period to wait for incoming events (ISO 8601 format)
+       */
+      timeout?: string;
+      stateDataFilter?: Statedatafilter;
+      /**
+       * States error handling and retries definitions
+       */
+      onErrors?: Error[];
+      transition?: Transition;
+      end: End;
+      /**
+       * Unique Name of a workflow state which is responsible for compensation of this state
+       */
+      compensatedBy?: string;
+      metadata?: /* Metadata information */ Metadata;
+    }
+  | {
+      /**
+       * Unique State id
+       */
+      id?: string;
+      /**
+       * State name
+       */
+      name: string;
+      /**
+       * State type
+       */
+      type: 'event';
+      /**
+       * If true consuming one of the defined events causes its associated actions to be performed. If false all of the defined events must be consumed in order for actions to be performed
+       */
+      exclusive?: boolean;
+      /**
+       * Define the events to be consumed and optional actions to be performed
+       */
+      onEvents: Onevents[];
+      /**
+       * Time period to wait for incoming events (ISO 8601 format)
+       */
+      timeout?: string;
+      stateDataFilter?: Statedatafilter;
+      /**
+       * States error handling and retries definitions
+       */
+      onErrors?: Error[];
+      transition: Transition;
+      end?: End;
+      /**
+       * Unique Name of a workflow state which is responsible for compensation of this state
+       */
+      compensatedBy?: string;
+      metadata?: /* Metadata information */ Metadata;
+    };
 export interface Exectimeout {
   /**
    * Timeout duration (ISO 8601 duration format)
@@ -1135,7 +1097,7 @@ export interface Subflowstate {
   usedForCompensation?: boolean;
   metadata?: /* Metadata information */ Metadata;
 }
-export type Switchstate = /* Permits transitions to other states based on data conditions */
+export type Switchstate /* Permits transitions to other states based on data conditions */ =
   | Databasedswitch
   | /* Permits transitions to other states based on events */ Eventbasedswitch;
 export type Transition =

src/lib/schema/workflow.json

@@ -590,14 +590,6 @@
             "onEvents",
             "transition"
           ]
-        },
-        {
-          "required": [
-            "name",
-            "type",
-            "onEvents",
-            "end"
-          ]
         }
       ]
     },
@@ -703,14 +695,6 @@
               "actions",
               "transition"
             ]
-          },
-          {
-            "required": [
-              "name",
-              "type",
-              "actions",
-              "end"
-            ]
           }
         ]
       }
@@ -828,14 +812,6 @@
               "branches",
               "transition"
             ]
-          },
-          {
-            "required": [
-              "name",
-              "type",
-              "branches",
-              "end"
-            ]
           }
         ]
       }