Skip to content

Commit ac97077

Browse files
antmendozaantmendoza
committed
removed-ifObject
Signed-off-by: Antonio Mendoza Pérez <[email protected]>
1 parent 4b6bbb2 commit ac97077

23 files changed

+259
-264
lines changed

‎examples/browser/index.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
</head>
99
<body>
1010
<!--
11-
Run http-server from the project root then navigate to http://localhost:8080/examples/browser/mermaid.html
11+
Run http-server from the project root then navigate to http://localhost:8080/examples/browser/index.html
1212
-->
1313
<div id="output"></div>
1414
<script src="../../dist/umd/index.umd.js"></script>

‎examples/browser/mermaid.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
</head>
99
<body>
1010
<!--
11-
Run http-server from the project root then navigate to http://localhost:8080/examples/browser/index.html
11+
Run http-server from the project root then navigate to http://localhost:8080/examples/browser/mermaid.html
1212
-->
1313
<div id="mermaid" class="mermaid"></div>
1414
<script src="../../dist/umd/index.umd.js"></script>

‎src/lib/definitions/action.ts

+6-6
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ import {
2020
cleanSourceModelProperty,
2121
normalizeEventRef,
2222
normalizeFunctionRef,
23-
normalizeSubFlowRefIfObject,
23+
normalizeSubFlowRef,
2424
overwriteActionDataFilter,
2525
overwriteEventRef,
26-
overwriteFunctionRefIfObject,
26+
overwriteFunctionRef,
2727
overwriteSleep,
28-
overwriteSubFlowRefIfObject,
28+
overwriteSubFlowRef,
2929
} from './utils';
3030
import { Subflowref } from './subflowref';
3131
import { Sleep } from './sleep';
@@ -38,9 +38,9 @@ export class Action {
3838

3939
Object.assign(this, model);
4040

41-
overwriteFunctionRefIfObject(this);
41+
overwriteFunctionRef(this);
4242
overwriteEventRef(this);
43-
overwriteSubFlowRefIfObject(this);
43+
overwriteSubFlowRef(this);
4444
overwriteSleep(this);
4545
overwriteActionDataFilter(this);
4646
}
@@ -82,7 +82,7 @@ export class Action {
8282
normalize = (): Action => {
8383
const clone = new Action(this);
8484

85-
normalizeSubFlowRefIfObject(clone);
85+
normalizeSubFlowRef(clone);
8686
normalizeEventRef(clone);
8787
normalizeFunctionRef(clone);
8888

‎src/lib/definitions/authdef.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
import { cleanSourceModelProperty, normalizeScheme, overwritePropertiesIfObject } from './utils';
17+
import { cleanSourceModelProperty, normalizeScheme, overwriteProperties } from './utils';
1818
import { Properties } from './types';
1919

2020
export class Authdef {
@@ -26,7 +26,7 @@ export class Authdef {
2626
const defaultModel = { scheme: 'basic' };
2727
Object.assign(this, defaultModel, model);
2828

29-
overwritePropertiesIfObject(this);
29+
overwriteProperties(this);
3030
}
3131
/**
3232
* Unique auth definition name

‎src/lib/definitions/callbackstate.ts

+8-8
Original file line numberDiff line numberDiff line change
@@ -24,18 +24,18 @@ import { Transition } from './transition';
2424
import {
2525
cleanSourceModelProperty,
2626
normalizeAction,
27-
normalizeEndIfObject,
27+
normalizeEnd,
2828
normalizeOnErrors,
29-
normalizeTransitionIfObject,
29+
normalizeTransition,
3030
normalizeUsedForCompensation,
3131
overwriteAction,
32-
overwriteEndIfObject,
32+
overwriteEnd,
3333
overwriteEventDataFilter,
3434
overwriteMetadata,
3535
overwriteOnErrors,
3636
overwriteStateDataFilter,
3737
overwriteTimeoutWithStateExecTimeout,
38-
overwriteTransitionIfObject,
38+
overwriteTransition,
3939
setEndValueIfNoTransition,
4040
} from './utils';
4141
import { ActionExecTimeout, EventTimeout } from './types';
@@ -55,8 +55,8 @@ export class Callbackstate {
5555
overwriteEventDataFilter(this);
5656
overwriteStateDataFilter(this);
5757
overwriteOnErrors(this);
58-
overwriteTransitionIfObject(this);
59-
overwriteEndIfObject(this);
58+
overwriteTransition(this);
59+
overwriteEnd(this);
6060
overwriteMetadata(this);
6161
}
6262

@@ -127,8 +127,8 @@ export class Callbackstate {
127127

128128
normalizeAction(clone);
129129
normalizeOnErrors(clone);
130-
normalizeTransitionIfObject(clone);
131-
normalizeEndIfObject(clone);
130+
normalizeTransition(clone);
131+
normalizeEnd(clone);
132132
normalizeUsedForCompensation(clone, this.sourceModel);
133133
setEndValueIfNoTransition(clone);
134134

‎src/lib/definitions/defaultconditiondef.ts

+8-8
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ import { End } from './end';
1818
import { Transition } from './transition';
1919
import {
2020
cleanSourceModelProperty,
21-
normalizeEndIfObject,
22-
normalizeTransitionIfObject,
23-
overwriteEndIfObject,
24-
overwriteTransitionIfObject,
21+
normalizeEnd,
22+
normalizeTransition,
23+
overwriteEnd,
24+
overwriteTransition,
2525
setEndValueIfNoTransition,
2626
} from './utils';
2727
export class Defaultconditiondef /* DefaultCondition definition. Can be either a transition or end definition */ {
@@ -32,8 +32,8 @@ export class Defaultconditiondef /* DefaultCondition definition. Can be either a
3232

3333
Object.assign(this, model);
3434

35-
overwriteTransitionIfObject(this);
36-
overwriteEndIfObject(this);
35+
overwriteTransition(this);
36+
overwriteEnd(this);
3737
}
3838

3939
transition: string | Transition;
@@ -46,8 +46,8 @@ export class Defaultconditiondef /* DefaultCondition definition. Can be either a
4646
normalize = (): Defaultconditiondef => {
4747
const clone = new Defaultconditiondef(this);
4848

49-
normalizeEndIfObject(clone);
50-
normalizeTransitionIfObject(clone);
49+
normalizeEnd(clone);
50+
normalizeTransition(clone);
5151
setEndValueIfNoTransition(clone);
5252

5353
cleanSourceModelProperty(clone);

‎src/lib/definitions/end.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ import { Produceeventdef } from './produceeventdef';
1717
import {
1818
cleanSourceModelProperty,
1919
normalizeCompensate,
20-
normalizeContinueAsIfObject,
20+
normalizeContinueAs,
2121
normalizeTerminate,
22-
overwriteContinueAsIfObject,
22+
overwriteContinueAs,
2323
overwriteProduceEvents,
2424
} from './utils';
2525
import { Continueasdef } from './continueasdef';
@@ -37,7 +37,7 @@ export class End {
3737
Object.assign(this, defaultModel, model);
3838

3939
overwriteProduceEvents(this);
40-
overwriteContinueAsIfObject(this);
40+
overwriteContinueAs(this);
4141
}
4242

4343
/**
@@ -63,7 +63,7 @@ export class End {
6363

6464
normalizeCompensate(clone, this.sourceModel);
6565
normalizeTerminate(clone, this.sourceModel);
66-
normalizeContinueAsIfObject(clone);
66+
normalizeContinueAs(clone);
6767

6868
cleanSourceModelProperty(clone);
6969
return clone;

‎src/lib/definitions/enddatacondition.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616
import { End } from './end';
1717
import { Metadata } from './metadata';
18-
import { cleanSourceModelProperty, normalizeEndIfObject, overwriteEndIfObject, overwriteMetadata } from './utils';
18+
import { cleanSourceModelProperty, normalizeEnd, overwriteEnd, overwriteMetadata } from './utils';
1919

2020
export class Enddatacondition {
2121
sourceModel?: Enddatacondition;
@@ -25,7 +25,7 @@ export class Enddatacondition {
2525

2626
Object.assign(this, model);
2727

28-
overwriteEndIfObject(this);
28+
overwriteEnd(this);
2929
overwriteMetadata(this);
3030
}
3131

@@ -50,7 +50,7 @@ export class Enddatacondition {
5050
normalize = (): Enddatacondition => {
5151
const clone = new Enddatacondition(this);
5252

53-
normalizeEndIfObject(clone);
53+
normalizeEnd(clone);
5454

5555
cleanSourceModelProperty(clone);
5656

‎src/lib/definitions/enddeventcondition.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ import { Eventdatafilter } from './eventdatafilter';
1818
import { Metadata } from './metadata';
1919
import {
2020
cleanSourceModelProperty,
21-
normalizeEndIfObject,
22-
overwriteEndIfObject,
21+
normalizeEnd,
22+
overwriteEnd,
2323
overwriteEventDataFilter,
2424
overwriteMetadata,
2525
} from './utils';
@@ -32,7 +32,7 @@ export class Enddeventcondition {
3232

3333
Object.assign(this, model);
3434

35-
overwriteEndIfObject(this);
35+
overwriteEnd(this);
3636
overwriteEventDataFilter(this);
3737
overwriteMetadata(this);
3838
}
@@ -62,7 +62,7 @@ export class Enddeventcondition {
6262
normalize = (): Enddeventcondition => {
6363
const clone = new Enddeventcondition(this);
6464

65-
normalizeEndIfObject(clone);
65+
normalizeEnd(clone);
6666

6767
cleanSourceModelProperty(clone);
6868

‎src/lib/definitions/error.ts

+8-8
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ import { End } from './end';
1717
import { Transition } from './transition';
1818
import {
1919
cleanSourceModelProperty,
20-
normalizeEndIfObject,
21-
normalizeTransitionIfObject,
22-
overwriteEndIfObject,
23-
overwriteTransitionIfObject,
20+
normalizeEnd,
21+
normalizeTransition,
22+
overwriteEnd,
23+
overwriteTransition,
2424
setEndValueIfNoTransition,
2525
} from './utils';
2626

@@ -32,8 +32,8 @@ export class Error {
3232

3333
Object.assign(this, model);
3434

35-
overwriteTransitionIfObject(this);
36-
overwriteEndIfObject(this);
35+
overwriteTransition(this);
36+
overwriteEnd(this);
3737
}
3838

3939
/**
@@ -54,8 +54,8 @@ export class Error {
5454
normalize = (): Error => {
5555
const clone = new Error(this);
5656

57-
normalizeEndIfObject(clone);
58-
normalizeTransitionIfObject(clone);
57+
normalizeEnd(clone);
58+
normalizeTransition(clone);
5959

6060
setEndValueIfNoTransition(clone);
6161

‎src/lib/definitions/eventstate.ts

+8-8
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,17 @@ import { Onevents } from './onevents';
2020
import { Statedatafilter } from './statedatafilter';
2121
import { Transition } from './transition';
2222
import {
23-
normalizeEndIfObject,
23+
normalizeEnd,
2424
normalizeExclusive,
2525
normalizeOnErrors,
2626
normalizeOnEvents,
27-
normalizeTransitionIfObject,
28-
overwriteEndIfObject,
27+
normalizeTransition,
28+
overwriteEnd,
2929
overwriteMetadata,
3030
overwriteOnErrors,
3131
overwriteOnEvents,
3232
overwriteStateDataFilter,
33-
overwriteTransitionIfObject,
33+
overwriteTransition,
3434
setEndValueIfNoTransition,
3535
overwriteTimeoutWithStateExecTimeout,
3636
cleanSourceModelProperty,
@@ -51,8 +51,8 @@ export class Eventstate /* This state is used to wait for events from event sour
5151
overwriteTimeoutWithStateExecTimeout(this);
5252
overwriteStateDataFilter(this);
5353
overwriteOnErrors(this);
54-
overwriteTransitionIfObject(this);
55-
overwriteEndIfObject(this);
54+
overwriteTransition(this);
55+
overwriteEnd(this);
5656
overwriteMetadata(this);
5757
}
5858

@@ -107,8 +107,8 @@ export class Eventstate /* This state is used to wait for events from event sour
107107
normalizeExclusive(clone, this.sourceModel);
108108
normalizeOnEvents(clone);
109109
normalizeOnErrors(clone);
110-
normalizeTransitionIfObject(clone);
111-
normalizeEndIfObject(clone);
110+
normalizeTransition(clone);
111+
normalizeEnd(clone);
112112
setEndValueIfNoTransition(clone);
113113

114114
cleanSourceModelProperty(clone);

‎src/lib/definitions/foreachstate.ts

+8-8
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,16 @@ import { Statedatafilter } from './statedatafilter';
2121
import { Transition } from './transition';
2222
import {
2323
normalizeActions,
24-
normalizeEndIfObject,
24+
normalizeEnd,
2525
normalizeOnErrors,
26-
normalizeTransitionIfObject,
26+
normalizeTransition,
2727
normalizeUsedForCompensation,
2828
overwriteActions,
29-
overwriteEndIfObject,
29+
overwriteEnd,
3030
overwriteMetadata,
3131
overwriteOnErrors,
3232
overwriteStateDataFilter,
33-
overwriteTransitionIfObject,
33+
overwriteTransition,
3434
setEndValueIfNoTransition,
3535
normalizeMode,
3636
overwriteTimeoutWithStateExecTimeout,
@@ -48,12 +48,12 @@ export class Foreachstate {
4848
const defaultModel = { type: 'foreach', usedForCompensation: false, mode: 'parallel' };
4949
Object.assign(this, defaultModel, model);
5050

51-
overwriteEndIfObject(this);
51+
overwriteEnd(this);
5252
overwriteActions(this);
5353
overwriteTimeoutWithStateExecTimeout(this);
5454
overwriteStateDataFilter(this);
5555
overwriteOnErrors(this);
56-
overwriteTransitionIfObject(this);
56+
overwriteTransition(this);
5757
overwriteMetadata(this);
5858
}
5959

@@ -134,10 +134,10 @@ export class Foreachstate {
134134
normalize = (): Foreachstate => {
135135
const clone = new Foreachstate(this);
136136

137-
normalizeEndIfObject(clone);
137+
normalizeEnd(clone);
138138
normalizeActions(clone);
139139
normalizeOnErrors(clone);
140-
normalizeTransitionIfObject(clone);
140+
normalizeTransition(clone);
141141
normalizeUsedForCompensation(clone, this.sourceModel);
142142
normalizeMode(clone, this.sourceModel);
143143
setEndValueIfNoTransition(clone);

0 commit comments

Comments
 (0)