fix(core): Fix missing successful items on continueErrorOutput with multiple outputs (#10218)

packages/core/src/WorkflowExecute.ts

@@ -1125,7 +1125,6 @@ export class WorkflowExecute {
 									);
 
 									const errorItems: INodeExecutionData[] = [];
-									const successItems: INodeExecutionData[] = [];
 									const closeFunctions: CloseFunction[] = [];
 									// Create a WorkflowDataProxy instance that we can get the data of the
 									// item which did error
@@ -1150,8 +1149,10 @@ export class WorkflowExecute {
 										outputIndex < mainOutputTypes.length - 1;
 										outputIndex++
 									) {
-										successItems.length = 0;
+										const successItems: INodeExecutionData[] = [];
-										const items = nodeSuccessData.length ? nodeSuccessData[0] : [];
+										const items = nodeSuccessData[outputIndex]?.length
+											? nodeSuccessData[outputIndex]
+											: [];
 
 										while (items.length) {
 											const item = items.pop();

packages/core/test/WorkflowExecute.test.ts

@@ -120,7 +120,10 @@ describe('WorkflowExecute', () => {
 						if (nodeData.data === undefined) {
 							return null;
 						}
-						return nodeData.data.main[0]!.map((entry) => entry.json);
+						const toMap = testData.output.testAllOutputs
+							? nodeData.data.main
+							: [nodeData.data.main[0]!];
+						return toMap.map((data) => data!.map((entry) => entry.json));
 					});
 
 					// expect(resultData).toEqual(testData.output.nodeData[nodeName]);

packages/core/test/helpers/constants.ts

@@ -2785,25 +2785,31 @@ export const v1WorkflowExecuteTests: WorkflowTestData[] = [
 			nodeExecutionOrder: ['Start', 'Set1', 'Set2', 'Set2'],
 			nodeData: {
 				Set1: [
+					[
 						[
 							{
 								value1: 1,
 							},
 						],
 					],
+				],
 				Set2: [
+					[
 						[
 							{
 								value1: 1,
 								value2: 2,
 							},
 						],
+					],
+					[
 						[
 							{
 								value2: 2,
 							},
 						],
 					],
+				],
 			},
 		},
 	},
@@ -3064,20 +3070,25 @@ export const v1WorkflowExecuteTests: WorkflowTestData[] = [
 			],
 			nodeData: {
 				Set1: [
+					[
 						[
 							{
 								value1: 1,
 							},
 						],
 					],
+				],
 				Set2: [
+					[
 						[
 							{
 								value2: 2,
 							},
 						],
 					],
+				],
 				Set3: [
+					[
 						[
 							{
 								value1: 1,
@@ -3085,7 +3096,9 @@ export const v1WorkflowExecuteTests: WorkflowTestData[] = [
 							},
 						],
 					],
+				],
 				Set4: [
+					[
 						[
 							{
 								value1: 1,
@@ -3094,7 +3107,9 @@ export const v1WorkflowExecuteTests: WorkflowTestData[] = [
 							},
 						],
 					],
+				],
 				Merge1: [
+					[
 						[
 							{
 								value1: 1,
@@ -3104,26 +3119,18 @@ export const v1WorkflowExecuteTests: WorkflowTestData[] = [
 							},
 						],
 					],
+				],
 				Merge2: [
+					[
 						[
 							{
 								value2: 2,
 							},
 						],
 					],
+				],
 				Merge3: [
 					[
-						{
-							value1: 1,
-							value3: 3,
-							value4: 4,
-						},
-						{
-							value2: 2,
-						},
-					],
-				],
-				Merge4: [
 						[
 							{
 								value1: 1,
@@ -3135,6 +3142,21 @@ export const v1WorkflowExecuteTests: WorkflowTestData[] = [
 							},
 						],
 					],
+				],
+				Merge4: [
+					[
+						[
+							{
+								value1: 1,
+								value3: 3,
+								value4: 4,
+							},
+							{
+								value2: 2,
+							},
+						],
+					],
+				],
 			},
 		},
 	},
@@ -3903,68 +3925,89 @@ export const v1WorkflowExecuteTests: WorkflowTestData[] = [
 				'Merge2',
 			],
 			nodeData: {
-				Start: [[{}]],
+				Start: [[[{}]]],
 				Set1: [
+					[
 						[
 							{
 								counter: 1,
 							},
 						],
+					],
+					[
 						[
 							{
 								counter: 2,
 							},
 						],
+					],
+					[
 						[
 							{
 								counter: 3,
 							},
 						],
 					],
+				],
 				Set: [
+					[
 						[
 							{
 								counter: 1,
 							},
 						],
+					],
+					[
 						[
 							{
 								counter: 2,
 							},
 						],
+					],
+					[
 						[
 							{
 								counter: 3,
 							},
 						],
 					],
+				],
 				IF1: [
+					[
 						[
 							{
 								counter: 1,
 							},
 						],
+					],
+					[
 						[
 							{
 								counter: 2,
 							},
 						],
-					[],
+					],
+					[[]],
 				],
 				IF: [
+					[
 						[
 							{
 								counter: 1,
 							},
 						],
+					],
+					[
 						[
 							{
 								counter: 2,
 							},
 						],
-					[],
+					],
+					[[]],
 				],
 				Merge1: [
+					[
 						[
 							{
 								counter: 1,
@@ -3973,6 +4016,8 @@ export const v1WorkflowExecuteTests: WorkflowTestData[] = [
 								counter: 1,
 							},
 						],
+					],
+					[
 						[
 							{
 								counter: 2,
@@ -3982,7 +4027,9 @@ export const v1WorkflowExecuteTests: WorkflowTestData[] = [
 							},
 						],
 					],
+				],
 				Merge: [
+					[
 						[
 							{
 								counter: 3,
@@ -3990,7 +4037,9 @@ export const v1WorkflowExecuteTests: WorkflowTestData[] = [
 							{},
 						],
 					],
+				],
 				Merge2: [
+					[
 						[
 							{
 								counter: 1,
@@ -4003,6 +4052,8 @@ export const v1WorkflowExecuteTests: WorkflowTestData[] = [
 							},
 							{},
 						],
+					],
+					[
 						[
 							{
 								counter: 2,
@@ -4012,6 +4063,7 @@ export const v1WorkflowExecuteTests: WorkflowTestData[] = [
 							},
 						],
 					],
+				],
 			},
 		},
 	},
@@ -4158,12 +4210,14 @@ export const v1WorkflowExecuteTests: WorkflowTestData[] = [
 			nodeExecutionOrder: ['Start', 'Set', 'IF', 'NoOp1', 'Merge'],
 			nodeData: {
 				Merge: [
+					[
 						[
 							{
 								test: 'a',
 							},
 						],
 					],
+				],
 			},
 		},
 	},
@@ -4534,20 +4588,25 @@ export const v1WorkflowExecuteTests: WorkflowTestData[] = [
 			],
 			nodeData: {
 				Merge1: [
+					[
 						[
 							{
 								test: 'a',
 							},
 						],
 					],
+				],
 				Merge2: [
+					[
 						[
 							{
 								test: 'a',
 							},
 						],
 					],
+				],
 				Merge4: [
+					[
 						[
 							{
 								test: 'a',
@@ -4557,7 +4616,9 @@ export const v1WorkflowExecuteTests: WorkflowTestData[] = [
 							},
 						],
 					],
+				],
 				Merge5: [
+					[
 						[
 							{
 								test: 'a',
@@ -4567,20 +4628,9 @@ export const v1WorkflowExecuteTests: WorkflowTestData[] = [
 							},
 						],
 					],
+				],
 				Merge6: [
 					[
-						{
-							test: 'a',
-						},
-						{
-							test: 'a',
-						},
-						{
-							test: 'a',
-						},
-					],
-				],
-				Merge7: [
 						[
 							{
 								test: 'a',
@@ -4593,6 +4643,338 @@ export const v1WorkflowExecuteTests: WorkflowTestData[] = [
 							},
 						],
 					],
+				],
+				Merge7: [
+					[
+						[
+							{
+								test: 'a',
+							},
+							{
+								test: 'a',
+							},
+							{
+								test: 'a',
+							},
+						],
+					],
+				],
+			},
+		},
+	},
+	{
+		description:
+			'Should output successful branches on multi-output nodes with continueErrorOutput selected',
+		input: {
+			workflowData: {
+				nodes: [
+					{
+						parameters: {},
+						id: '84b789e9-0dfc-4aa3-b0b2-cedf8966f904',
+						name: 'Start',
+						type: 'n8n-nodes-base.start',
+						position: [440, 1100],
+						typeVersion: 1,
+					},
+					{
+						parameters: {
+							assignments: {
+								assignments: [
+									{
+										id: '1ba24256-5b24-43cb-9638-fc1c2074d210',
+										name: 'name',
+										value: 'foo',
+										type: 'string',
+									},
+									{
+										id: 'eee5a4fe-923d-46a2-b19e-c18b97a6c535',
+										name: 'value',
+										value: 'bar',
+										type: 'string',
+									},
+								],
+							},
+							options: {},
+						},
+						id: '01720c87-f4ae-4e0f-89d7-0612a378226b',
+						name: 'Edit Fields',
+						type: 'n8n-nodes-base.set',
+						typeVersion: 3.4,
+						position: [780, 980],
+					},
+					{
+						parameters: {
+							assignments: {
+								assignments: [
+									{
+										id: '9182c7f5-7262-4366-8c04-cbf2bae338c1',
+										name: 'name',
+										value: 'bar',
+										type: 'string',
+									},
+									{
+										id: 'cba31e58-23a9-4620-9cfc-ebb433528e6a',
+										name: 'value',
+										value: 'baz',
+										type: 'string',
+									},
+								],
+							},
+							options: {},
+						},
+						id: '2e7977b0-f74f-46e7-af48-e5cbb41706e4',
+						name: 'Edit Fields1',
+						type: 'n8n-nodes-base.set',
+						typeVersion: 3.4,
+						position: [780, 1180],
+					},
+					{
+						parameters: {},
+						id: '95f67825-9244-44dc-82b9-7a6d7792e948',
+						name: 'Merge',
+						type: 'n8n-nodes-base.merge',
+						typeVersion: 1,
+						position: [1080, 1060],
+					},
+					{
+						parameters: {
+							assignments: {
+								assignments: [
+									{
+										id: '14d413c6-5088-4fb9-a895-e2e71557322d',
+										name: 'name',
+										value: '={{ $json.name }}',
+										type: 'string',
+									},
+									{
+										id: '77f3d6d9-5ae7-4109-9144-9832f3e9f3bc',
+										name: 'value',
+										value: '={{ $json.value }}',
+										type: 'string',
+									},
+								],
+							},
+							options: {},
+						},
+						id: '89c06371-f539-4574-86a8-6ba9994924b4',
+						name: 'Edit Fields3',
+						type: 'n8n-nodes-base.set',
+						typeVersion: 3.4,
+						position: [1580, 1180],
+					},
+					{
+						parameters: {
+							conditions: {
+								options: {
+									caseSensitive: true,
+									leftValue: '',
+									typeValidation: 'strict',
+								},
+								conditions: [
+									{
+										id: '96f95963-0edc-4d65-9935-6e141f39fcb1',
+										leftValue: '={{ $json.name }}',
+										rightValue: 'foo',
+										operator: {
+											type: 'string',
+											operation: 'equals',
+											name: 'filter.operator.equals',
+										},
+									},
+								],
+								combinator: 'and',
+							},
+							options: {},
+						},
+						id: '6fcdb8ea-9afc-44cb-a125-cef6cbb5765b',
+						name: 'If1',
+						type: 'n8n-nodes-base.if',
+						typeVersion: 2,
+						position: [1360, 1060],
+						onError: 'continueErrorOutput',
+					},
+					{
+						parameters: {
+							assignments: {
+								assignments: [
+									{
+										id: 'c8974629-7b62-40f8-8add-08e4dc8698be',
+										name: 'name',
+										value: '={{ $json.name }}',
+										type: 'string',
+									},
+									{
+										id: '341a502e-3952-4654-b299-822fb2d303fe',
+										name: 'value',
+										value: '={{ $json.value }}',
+										type: 'string',
+									},
+								],
+							},
+							options: {},
+						},
+						id: 'b4152f19-d0e6-43cd-8a90-9a7396856367',
+						name: 'Edit Fields2',
+						type: 'n8n-nodes-base.set',
+						typeVersion: 3.4,
+						position: [1580, 900],
+					},
+				],
+				connections: {
+					Start: {
+						main: [
+							[
+								{
+									node: 'Edit Fields',
+									type: NodeConnectionType.Main,
+									index: 0,
+								},
+								{
+									node: 'Edit Fields1',
+									type: NodeConnectionType.Main,
+									index: 0,
+								},
+							],
+						],
+					},
+					'Edit Fields': {
+						main: [
+							[
+								{
+									node: 'Merge',
+									type: NodeConnectionType.Main,
+									index: 0,
+								},
+							],
+						],
+					},
+					'Edit Fields1': {
+						main: [
+							[
+								{
+									node: 'Merge',
+									type: NodeConnectionType.Main,
+									index: 1,
+								},
+							],
+						],
+					},
+					Merge: {
+						main: [
+							[
+								{
+									node: 'If1',
+									type: NodeConnectionType.Main,
+									index: 0,
+								},
+							],
+						],
+					},
+					If1: {
+						main: [
+							[
+								{
+									node: 'Edit Fields2',
+									type: NodeConnectionType.Main,
+									index: 0,
+								},
+							],
+							[
+								{
+									node: 'Edit Fields3',
+									type: NodeConnectionType.Main,
+									index: 0,
+								},
+							],
+						],
+					},
+				},
+			},
+		},
+		output: {
+			nodeExecutionOrder: [
+				'Start',
+				'Edit Fields',
+				'Edit Fields1',
+				'Merge',
+				'If1',
+				'Edit Fields2',
+				'Edit Fields3',
+			],
+			testAllOutputs: true,
+			nodeData: {
+				Start: [[[{}]]],
+				'Edit Fields': [
+					[
+						[
+							{
+								name: 'foo',
+								value: 'bar',
+							},
+						],
+					],
+				],
+				'Edit Fields1': [
+					[
+						[
+							{
+								name: 'bar',
+								value: 'baz',
+							},
+						],
+					],
+				],
+				Merge: [
+					[
+						[
+							{
+								name: 'foo',
+								value: 'bar',
+							},
+							{
+								name: 'bar',
+								value: 'baz',
+							},
+						],
+					],
+				],
+				If1: [
+					[
+						[
+							{
+								name: 'foo',
+								value: 'bar',
+							},
+						],
+						[
+							{
+								name: 'bar',
+								value: 'baz',
+							},
+						],
+						[],
+					],
+				],
+				'Edit Fields2': [
+					[
+						[
+							{
+								name: 'foo',
+								value: 'bar',
+							},
+						],
+					],
+				],
+				'Edit Fields3': [
+					[
+						[
+							{
+								name: 'bar',
+								value: 'baz',
+							},
+						],
+					],
+				],
 			},
 		},
 	},

packages/workflow/src/Interfaces.ts

@@ -2257,6 +2257,7 @@ export interface WorkflowTestData {
 	};
 	output: {
 		nodeExecutionOrder?: string[];
+		testAllOutputs?: boolean;
 		nodeData: {
 			[key: string]: any[][];
 		};