admin/n8n-enterprise-unlocked
1
0
Fork 0
mirror of https://github.com/Abdulazizzn/n8n-enterprise-unlocked.git synced 2025-12-18 02:21:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(core): Fix .map calls on NodeExecutionOutput (no-changelog) (#11955)

Browse Source
This commit is contained in:
कारतोफ्फेलस्क्रिप्ट™
2024-12-02 16:55:01 +01:00
committed by GitHub
parent 967340a293
commit 969439ce56
10 changed files with 75 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
packages/nodes-base/nodes/Merge/test/v3/operations.test.ts
View File

@@ -100,7 +100,7 @@ describe('Test MergeV3, combineBySql operation', () => {
inputsData,
);
expect(returnData[0].json).toEqual({
expect(returnData[0][0].json).toEqual({
data_1: 'a',
id: 1,
data: 'aa',
@@ -120,7 +120,9 @@ describe('Test MergeV3, combineBySql operation', () => {
[inputsData[0], []],
);
expect(returnData[0].json).toEqual({
expect(returnData.length).toEqual(1);
expect(returnData[0].length).toEqual(5);
expect(returnData[0][0].json).toEqual({
data: 'a',
data_1: 'a',
id: 1,
@@ -179,13 +181,15 @@ describe('Test MergeV3, combineBySql operation', () => {
inputsData,
);
expect(returnData[0].json).toEqual({
expect(returnData.length).toEqual(1);
expect(returnData[0].length).toEqual(5);
expect(returnData[0][0].json).toEqual({
id: 1,
data: 'aa',
name: 'Sam',
country: 'PL',
});
expect(returnData[4].json).toEqual({
expect(returnData[0][4].json).toEqual({
id: 5,
data: 'ff',
country: 'ES',
@@ -203,8 +207,9 @@ describe('Test MergeV3, combineBySql operation', () => {
inputsData,
);
expect(returnData.length).toEqual(3);
expect(returnData[2].json).toEqual({
expect(returnData.length).toEqual(1);
expect(returnData[0].length).toEqual(3);
expect(returnData[0][2].json).toEqual({
id: 3,
data: 'cc',
name: 'Jon',
@@ -223,8 +228,9 @@ describe('Test MergeV3, combineBySql operation', () => {
inputsData,
);
expect(returnData.length).toEqual(7);
expect(returnData[2].json).toEqual({
expect(returnData.length).toEqual(1);
expect(returnData[0].length).toEqual(7);
expect(returnData[0][2].json).toEqual({
id: 3,
data: 'cc',
name: 'Jon',
@@ -242,8 +248,9 @@ describe('Test MergeV3, combineBySql operation', () => {
inputsData,
);
expect(returnData.length).toEqual(25);
expect(returnData[0].json).toEqual({
expect(returnData.length).toEqual(1);
expect(returnData[0].length).toEqual(25);
expect(returnData[0][0].json).toEqual({
data_1: 'a',
id: 1,
data: 'aa',
@@ -262,8 +269,9 @@ describe('Test MergeV3, append operation', () => {
inputsData,
);
expect(returnData.length).toEqual(10);
expect(returnData[0].json).toEqual({
expect(returnData.length).toEqual(1);
expect(returnData[0].length).toEqual(10);
expect(returnData[0][0].json).toEqual({
id: 1,
data: 'a',
name: 'Sam',
@@ -283,8 +291,9 @@ describe('Test MergeV3, combineByFields operation', () => {
inputsData,
);
expect(returnData.length).toEqual(3);
expect(returnData[1].json).toEqual({
expect(returnData.length).toEqual(1);
expect(returnData[0].length).toEqual(3);
expect(returnData[0][1].json).toEqual({
id: 2,
data: 'bb',
name: 'Dan',
@@ -302,8 +311,9 @@ describe('Test MergeV3, combineByPosition operation', () => {
inputsData,
);
expect(returnData.length).toEqual(5);
expect(returnData[4].json).toEqual({
expect(returnData.length).toEqual(1);
expect(returnData[0].length).toEqual(5);
expect(returnData[0][4].json).toEqual({
id: 5,
data: 'ff',
name: 'Joe',
@@ -325,8 +335,9 @@ describe('Test MergeV3, chooseBranch operation', () => {
inputsData,
);
expect(returnData.length).toEqual(5);
expect(returnData[0].json).toEqual({
expect(returnData.length).toEqual(1);
expect(returnData[0].length).toEqual(5);
expect(returnData[0][0].json).toEqual({
id: 1,
data: 'aa',
country: 'PL',
@@ -345,8 +356,9 @@ describe('Test MergeV3, combineAll operation', () => {
inputsData,
);
expect(returnData.length).toEqual(25);
expect(returnData[0].json).toEqual({
expect(returnData.length).toEqual(1);
expect(returnData[0].length).toEqual(25);
expect(returnData[0][0].json).toEqual({
id: 1,
data: 'aa',
name: 'Sam',

4
packages/nodes-base/nodes/Merge/v3/actions/mode/append.ts
View File

@@ -20,12 +20,12 @@ export const description = updateDisplayOptions(displayOptions, properties);
export async function execute(
this: IExecuteFunctions,
inputsData: INodeExecutionData[][],
): Promise<INodeExecutionData[]> {
): Promise<INodeExecutionData[][]> {
const returnData: INodeExecutionData[] = [];
for (let i = 0; i < inputsData.length; i++) {
returnData.push.apply(returnData, inputsData[i]);
}
return returnData;
return [returnData];
}

4
packages/nodes-base/nodes/Merge/v3/actions/mode/chooseBranch.ts
View File

@@ -72,7 +72,7 @@ export const description = updateDisplayOptions(displayOptions, properties);
export async function execute(
this: IExecuteFunctions,
inputsData: INodeExecutionData[][],
): Promise<INodeExecutionData[]> {
): Promise<INodeExecutionData[][]> {
const returnData: INodeExecutionData[] = [];
const chooseBranchMode = this.getNodeParameter('chooseBranchMode', 0) as string;
@@ -105,5 +105,5 @@ export async function execute(
}
}
return returnData;
return [returnData];
}

6
packages/nodes-base/nodes/Merge/v3/actions/mode/combineAll.ts
View File

@@ -35,7 +35,7 @@ export const description = updateDisplayOptions(displayOptions, properties);
export async function execute(
this: IExecuteFunctions,
inputsData: INodeExecutionData[][],
): Promise<INodeExecutionData[]> {
): Promise<INodeExecutionData[][]> {
const returnData: INodeExecutionData[] = [];
const clashHandling = this.getNodeParameter(
@@ -59,7 +59,7 @@ export async function execute(
const mergeIntoSingleObject = selectMergeMethod(clashHandling);
if (!input1 || !input2) {
return returnData;
return [returnData];
}
let entry1: INodeExecutionData;
@@ -79,5 +79,5 @@ export async function execute(
}
}
return returnData;
return [returnData];
}

26
packages/nodes-base/nodes/Merge/v3/actions/mode/combineByFields.ts
View File

@@ -260,7 +260,7 @@ export const description = updateDisplayOptions(displayOptions, properties);
export async function execute(
this: IExecuteFunctions,
inputsData: INodeExecutionData[][],
): Promise<INodeExecutionData[]> {
): Promise<INodeExecutionData[][]> {
const returnData: INodeExecutionData[] = [];
const advanced = this.getNodeParameter('advanced', 0) as boolean;
let matchFields;
@@ -297,7 +297,7 @@ export async function execute(
options.disableDotNotation || false,
'Input 1',
);
if (!input1) return returnData;
if (!input1) return [returnData];
input2 = checkInput(
this.getInputData(1),
@@ -306,14 +306,14 @@ export async function execute(
'Input 2',
);
} else {
if (!input1) return returnData;
if (!input1) return [returnData];
}
if (input1.length === 0 || input2.length === 0) {
if (!input1.length && joinMode === 'keepNonMatches' && outputDataFrom === 'input1')
return returnData;
return [returnData];
if (!input2.length && joinMode === 'keepNonMatches' && outputDataFrom === 'input2')
return returnData;
return [returnData];
if (joinMode === 'keepMatches') {
// Stop the execution
@@ -326,11 +326,11 @@ export async function execute(
return [];
} else {
// Return the data of any of the inputs that contains data
return [...input1, ...input2];
return [[...input1, ...input2]];
}
}
if (!input1) return returnData;
if (!input1) return [returnData];
if (!input2 || !matchFields.length) {
if (
@@ -338,9 +338,9 @@ export async function execute(
joinMode === 'keepEverything' ||
joinMode === 'enrichInput2'
) {
return returnData;
return [returnData];
}
return input1;
return [input1];
}
const matches = findMatches(input1, input2, matchFields, options);
@@ -378,16 +378,16 @@ export async function execute(
if (joinMode === 'keepNonMatches') {
if (outputDataFrom === 'input1') {
return matches.unmatched1;
return [matches.unmatched1];
}
if (outputDataFrom === 'input2') {
return matches.unmatched2;
return [matches.unmatched2];
}
if (outputDataFrom === 'both') {
let output: INodeExecutionData[] = [];
output = output.concat(addSourceField(matches.unmatched1, 'input1'));
output = output.concat(addSourceField(matches.unmatched2, 'input2'));
return output;
return [output];
}
}
@@ -415,5 +415,5 @@ export async function execute(
}
}
return returnData;
return [returnData];
}

4
packages/nodes-base/nodes/Merge/v3/actions/mode/combineByPosition.ts
View File

@@ -50,7 +50,7 @@ export const description = updateDisplayOptions(displayOptions, properties);
export async function execute(
this: IExecuteFunctions,
inputsData: INodeExecutionData[][],
): Promise<INodeExecutionData[]> {
): Promise<INodeExecutionData[][]> {
const returnData: INodeExecutionData[] = [];
const clashHandling = this.getNodeParameter(
@@ -120,5 +120,5 @@ export async function execute(
returnData.push({ json, binary, pairedItem });
}
return returnData;
return [returnData];
}

4
packages/nodes-base/nodes/Merge/v3/actions/mode/combineBySql.ts
View File

@@ -41,7 +41,7 @@ export const description = updateDisplayOptions(displayOptions, properties);
export async function execute(
this: IExecuteFunctions,
inputsData: INodeExecutionData[][],
): Promise<INodeExecutionData[]> {
): Promise<INodeExecutionData[][]> {
const nodeId = this.getNode().id;
const returnData: INodeExecutionData[] = [];
const pairedItem: IPairedItemData[] = [];
@@ -132,5 +132,5 @@ export async function execute(
delete alasql.databases[nodeId];
return returnData;
return [returnData];
}

10
packages/nodes-base/nodes/Merge/v3/actions/router.ts
View File

@@ -1,4 +1,4 @@
import { NodeExecutionOutput, type IExecuteFunctions } from 'n8n-workflow';
import type { IExecuteFunctions } from 'n8n-workflow';
import { getNodeInputsData } from '../helpers/utils';
import type { MergeType } from './node.type';
import * as mode from './mode';
@@ -12,11 +12,5 @@ export async function router(this: IExecuteFunctions) {
operationMode = combineBy;
}
const returnData = await mode[operationMode as MergeType].execute.call(this, inputsData);
if (returnData instanceof NodeExecutionOutput) {
return returnData;
} else {
return [returnData];
}
return await mode[operationMode as MergeType].execute.call(this, inputsData);
}