Skip to content

Commit 9ebec7b

Browse files
devhelprdevhelpr
committed
improve (nested) compositions working
1 parent 51696b7 commit 9ebec7b

File tree

8 files changed

+2964
-73
lines changed

8 files changed

+2964
-73
lines changed

‎examples-test-flows/function-with-composition(simple).json‎

Lines changed: 355 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,355 @@
1+
{
2+
"schemaType": "flow",
3+
"schemaVersion": "0.0.1",
4+
"id": "1234",
5+
"flows": {
6+
"flow": {
7+
"flowType": "flow",
8+
"nodes": [
9+
{
10+
"id": "be50b738-2cf3-4f28-bd61-523bfdaa55e3",
11+
"x": -325.3323871793421,
12+
"y": 487.21250666101184,
13+
"width": 200,
14+
"height": 128.00003051757812,
15+
"nodeType": "Shape",
16+
"nodeInfo": {
17+
"type": "call-function",
18+
"formValues": {
19+
"functionCall": "test()"
20+
},
21+
"nodeCannotBeReplaced": false,
22+
"showFormOnlyInPopup": false,
23+
"useInCompositionOnly": false,
24+
"keepPopupOpenAfterUpdate": false
25+
}
26+
},
27+
{
28+
"id": "c8193019-11a5-4844-b4e8-795c6c83071c",
29+
"x": -1124.2065111635716,
30+
"y": 1183.6915110552613,
31+
"width": 150,
32+
"height": 100,
33+
"nodeType": "Shape",
34+
"nodeInfo": {
35+
"type": "function",
36+
"formValues": {
37+
"node": "test",
38+
"parameters": ""
39+
}
40+
}
41+
},
42+
{
43+
"id": "d05ef983-27e8-42a7-a788-849425a5d1a8",
44+
"x": 87.09643817113991,
45+
"y": 550.0121649674742,
46+
"width": 119.99988437645214,
47+
"height": 56.000054950458185,
48+
"nodeType": "Shape",
49+
"nodeInfo": {
50+
"type": "show-input",
51+
"formValues": {
52+
"name": "",
53+
"data-type": "default"
54+
},
55+
"initializeOnStartFlow": true,
56+
"isSettingsPopup": true
57+
}
58+
},
59+
{
60+
"id": "9744dfce-66c1-4f22-8503-43bbbc168a5d",
61+
"x": 1014.744693296234,
62+
"y": 1169.7847059325388,
63+
"width": 199.99993896484375,
64+
"height": 113.0390625,
65+
"nodeType": "Shape",
66+
"nodeInfo": {
67+
"type": "composition-bfc098e6-3519-4db9-acac-33b851bf515c",
68+
"formValues": {},
69+
"nodeCannotBeReplaced": false,
70+
"showFormOnlyInPopup": false,
71+
"useInCompositionOnly": false,
72+
"keepPopupOpenAfterUpdate": false,
73+
"isComposition": true,
74+
"compositionId": "bfc098e6-3519-4db9-acac-33b851bf515c"
75+
}
76+
},
77+
{
78+
"id": "819f5c82-c6f3-407a-bf7a-1208bc8db0b1",
79+
"x": 1477.7283003174725,
80+
"y": 1229.0809753488732,
81+
"width": 120.00002235250635,
82+
"height": 55.99993466945448,
83+
"nodeType": "Shape",
84+
"nodeInfo": {
85+
"type": "show-input",
86+
"formValues": {
87+
"name": "",
88+
"data-type": "default"
89+
},
90+
"initializeOnStartFlow": true,
91+
"isSettingsPopup": true
92+
}
93+
},
94+
{
95+
"id": "d8f038f9-4330-49f6-9647-0551a7b9bc12",
96+
"x": -1393.5588077302689,
97+
"y": 644.8354373931107,
98+
"width": 174.42191903108585,
99+
"height": 83.9999788971526,
100+
"nodeType": "Shape",
101+
"nodeInfo": {
102+
"type": "scope-variable",
103+
"formValues": {
104+
"variableName": "test",
105+
"initialValue": "101",
106+
"fieldType": "value",
107+
"fieldValueType": "number",
108+
"enumValues": [],
109+
"initialEnumValue": ""
110+
},
111+
"isVariable": true,
112+
"nodeCannotBeReplaced": true
113+
}
114+
},
115+
{
116+
"id": "850746ce-ed77-4a23-bc1e-5ade9486a9d1",
117+
"x": -411.22280819754053,
118+
"y": 1169.7847260301155,
119+
"width": 200,
120+
"height": 112,
121+
"nodeType": "Shape",
122+
"nodeInfo": {
123+
"type": "value",
124+
"formValues": {
125+
"value": "202"
126+
}
127+
}
128+
},
129+
{
130+
"id": "df171d3e-d12c-4de1-9070-91f43d3caaca",
131+
"x": 301.76093354582724,
132+
"y": 1169.7847260301155,
133+
"width": 200,
134+
"height": 128,
135+
"nodeType": "Shape",
136+
"nodeInfo": {
137+
"type": "set-variable",
138+
"formValues": {
139+
"variableName": "test"
140+
},
141+
"nodeCannotBeReplaced": false,
142+
"showFormOnlyInPopup": false,
143+
"useInCompositionOnly": false,
144+
"keepPopupOpenAfterUpdate": false
145+
}
146+
},
147+
{
148+
"id": "c8710cf1-7b65-46c6-93f8-7361466f47af",
149+
"x": -974.2065111635716,
150+
"y": 1233.6915110552613,
151+
"endX": -411.22280819754053,
152+
"endY": 1225.7847260301155,
153+
"startNodeId": "c8193019-11a5-4844-b4e8-795c6c83071c",
154+
"endNodeId": "850746ce-ed77-4a23-bc1e-5ade9486a9d1",
155+
"startThumbName": "output",
156+
"endThumbName": "input",
157+
"lineType": "BezierCubic",
158+
"nodeType": "Connection",
159+
"layer": 1,
160+
"nodeInfo": {}
161+
},
162+
{
163+
"id": "9f4818a8-d4f2-4d04-87f8-e64ac8d43b44",
164+
"x": -125.3323871793421,
165+
"y": 551.2125219198009,
166+
"endX": 87.09643817113991,
167+
"endY": 580.0121649674742,
168+
"startNodeId": "be50b738-2cf3-4f28-bd61-523bfdaa55e3",
169+
"endNodeId": "d05ef983-27e8-42a7-a788-849425a5d1a8",
170+
"startThumbName": "output",
171+
"endThumbName": "input",
172+
"lineType": "BezierCubic",
173+
"nodeType": "Connection",
174+
"layer": 1,
175+
"nodeInfo": {}
176+
},
177+
{
178+
"id": "85ff7f53-84f2-45b4-af87-1a5780b16e98",
179+
"x": 1214.7446322610776,
180+
"y": 1228.823792541645,
181+
"endX": 1477.7283003174725,
182+
"endY": 1259.0809753488732,
183+
"startNodeId": "9744dfce-66c1-4f22-8503-43bbbc168a5d",
184+
"endNodeId": "819f5c82-c6f3-407a-bf7a-1208bc8db0b1",
185+
"startThumbName": "081839fa-8532-418e-a3a4-cc2548dfc943",
186+
"endThumbName": "input",
187+
"lineType": "BezierCubic",
188+
"nodeType": "Connection",
189+
"layer": 1,
190+
"nodeInfo": {}
191+
},
192+
{
193+
"id": "bcb19952-905d-4e19-bece-e4da83bf3e93",
194+
"x": -211.22280819754053,
195+
"y": 1225.7847260301155,
196+
"endX": 301.76093354582724,
197+
"endY": 1233.7847260301155,
198+
"startNodeId": "850746ce-ed77-4a23-bc1e-5ade9486a9d1",
199+
"endNodeId": "df171d3e-d12c-4de1-9070-91f43d3caaca",
200+
"startThumbName": "output",
201+
"endThumbName": "input",
202+
"lineType": "BezierCubic",
203+
"nodeType": "Connection",
204+
"layer": 1,
205+
"nodeInfo": {}
206+
},
207+
{
208+
"id": "c9eeece5-f610-4c74-891c-d0b2d2733b1c",
209+
"x": 501.76093354582724,
210+
"y": 1233.7847260301155,
211+
"endX": 1014.744693296234,
212+
"endY": 1228.8237684325388,
213+
"startNodeId": "df171d3e-d12c-4de1-9070-91f43d3caaca",
214+
"endNodeId": "9744dfce-66c1-4f22-8503-43bbbc168a5d",
215+
"startThumbName": "output",
216+
"endThumbName": "50eedbc1-361e-4ce2-b04c-0cf18127dc3c",
217+
"lineType": "BezierCubic",
218+
"nodeType": "Connection",
219+
"layer": 1,
220+
"nodeInfo": {}
221+
}
222+
]
223+
}
224+
},
225+
"compositions": {
226+
"bfc098e6-3519-4db9-acac-33b851bf515c": {
227+
"id": "bfc098e6-3519-4db9-acac-33b851bf515c",
228+
"name": "test",
229+
"nodes": [
230+
{
231+
"id": "c680c68b-4f46-4b96-be22-d544f76023d2",
232+
"x": -411.2226278966839,
233+
"y": 1169.7844916512554,
234+
"width": 200,
235+
"height": 100,
236+
"nodeType": "Shape",
237+
"nodeInfo": {
238+
"type": "expression",
239+
"formValues": {
240+
"expression": "303+test",
241+
"inputType": "number"
242+
},
243+
"showFormOnlyInPopup": true,
244+
"isSettingsPopup": true,
245+
"supportsPreview": true
246+
}
247+
},
248+
{
249+
"id": "50eedbc1-361e-4ce2-b04c-0cf18127dc3c",
250+
"x": -811.2226278966839,
251+
"y": 1069.7844916512554,
252+
"width": 200,
253+
"height": 197,
254+
"nodeType": "Shape",
255+
"nodeInfo": {
256+
"type": "thumb-input",
257+
"formValues": {
258+
"valueType": "",
259+
"thumbName": ""
260+
},
261+
"nodeCannotBeReplaced": false,
262+
"showFormOnlyInPopup": false,
263+
"useInCompositionOnly": false,
264+
"keepPopupOpenAfterUpdate": false
265+
}
266+
},
267+
{
268+
"id": "081839fa-8532-418e-a3a4-cc2548dfc943",
269+
"x": -56.9678573561096,
270+
"y": 1113.671641818554,
271+
"width": 200,
272+
"height": 197,
273+
"nodeType": "Shape",
274+
"nodeInfo": {
275+
"type": "thumb-output",
276+
"formValues": {
277+
"valueType": "value",
278+
"thumbName": "output"
279+
},
280+
"nodeCannotBeReplaced": false,
281+
"showFormOnlyInPopup": false,
282+
"useInCompositionOnly": false,
283+
"keepPopupOpenAfterUpdate": false
284+
}
285+
},
286+
{
287+
"id": "7ae86e01-0fdd-47b2-983b-40c8a4667be3",
288+
"x": -611.2226278966839,
289+
"y": 1168.2844916512554,
290+
"endX": -411.2226278966839,
291+
"endY": 1219.7844916512554,
292+
"startNodeId": "50eedbc1-361e-4ce2-b04c-0cf18127dc3c",
293+
"endNodeId": "c680c68b-4f46-4b96-be22-d544f76023d2",
294+
"startThumbName": "output",
295+
"endThumbName": "input",
296+
"lineType": "BezierCubic",
297+
"nodeType": "Connection",
298+
"layer": 1,
299+
"nodeInfo": {}
300+
},
301+
{
302+
"id": "cc96b879-641f-4bd5-b650-69974e864c2d",
303+
"x": -211.2226278966839,
304+
"y": 1219.7844916512554,
305+
"endX": -56.9678573561096,
306+
"endY": 1212.171641818554,
307+
"startNodeId": "c680c68b-4f46-4b96-be22-d544f76023d2",
308+
"endNodeId": "081839fa-8532-418e-a3a4-cc2548dfc943",
309+
"startThumbName": "output",
310+
"endThumbName": "input",
311+
"lineType": "BezierCubic",
312+
"nodeType": "Connection",
313+
"layer": 1,
314+
"nodeInfo": {}
315+
}
316+
],
317+
"thumbs": [
318+
{
319+
"thumbIndex": 0,
320+
"thumbType": "EndConnectorLeft",
321+
"connectionType": "end",
322+
"prefixLabel": "",
323+
"name": "input_0",
324+
"internalName": "input",
325+
"thumbConstraint": "",
326+
"color": "white",
327+
"thumbIdentifierWithinNode": "6cac6cf6-b2b5-46cc-b42f-55b313a93034",
328+
"nodeId": "c680c68b-4f46-4b96-be22-d544f76023d2"
329+
}
330+
],
331+
"inputNodes": [
332+
{
333+
"id": "c680c68b-4f46-4b96-be22-d544f76023d2",
334+
"x": -411.2226278966839,
335+
"y": 1169.7844916512554,
336+
"width": 200,
337+
"height": 100,
338+
"nodeType": "Shape",
339+
"nodeInfo": {
340+
"type": "expression",
341+
"formValues": {
342+
"expression": "303",
343+
"inputType": "number"
344+
},
345+
"showFormOnlyInPopup": true,
346+
"isSettingsPopup": true,
347+
"supportsPreview": true,
348+
"taskType": "expression"
349+
}
350+
}
351+
],
352+
"outputNodes": []
353+
}
354+
}
355+
}

0 commit comments

Comments
 (0)