fix(core): Missing pairing info (n8n-io#7326)

Github issue / Community forum post (link here to close automatically):

packages/nodes-base/nodes/Airtable/test/v2/node/base/getMany.test.ts

@@ -61,29 +61,35 @@ describe('Test AirtableV2, base => getMany', () => {
 					name: 'base 1',
 					permissionLevel: 'create',
 				},
-				pairedItem: {
-					item: 0,
-				},
+				pairedItem: [
+					{
+						item: 0,
+					},
+				],
 			},
 			{
 				json: {
 					id: 'appYYY',
 					name: 'base 2',
 					permissionLevel: 'edit',
 				},
-				pairedItem: {
-					item: 0,
-				},
+				pairedItem: [
+					{
+						item: 0,
+					},
+				],
 			},
 			{
 				json: {
 					id: 'appZZZ',
 					name: 'base 3',
 					permissionLevel: 'create',
 				},
-				pairedItem: {
-					item: 0,
-				},
+				pairedItem: [
+					{
+						item: 0,
+					},
+				],
 			},
 		]);
 	});
@@ -107,9 +113,11 @@ describe('Test AirtableV2, base => getMany', () => {
 					name: 'base 2',
 					permissionLevel: 'edit',
 				},
-				pairedItem: {
-					item: 0,
-				},
+				pairedItem: [
+					{
+						item: 0,
+					},
+				],
 			},
 		]);
 	});

packages/nodes-base/nodes/Airtable/test/v2/node/helpers.ts

@@ -16,6 +16,9 @@ export const node: INode = {
 
 export const createMockExecuteFunction = (nodeParameters: IDataObject) => {
 	const fakeExecuteFunction = {
+		getInputData() {
+			return [{ json: {} }];
+		},
 		getNodeParameter(
 			parameterName: string,
 			_itemIndex: number,

packages/nodes-base/nodes/Airtable/test/v2/node/record/search.test.ts

@@ -110,9 +110,11 @@ describe('Test AirtableV2, search operation', () => {
 		expect(result).toHaveLength(2);
 		expect(result[0]).toEqual({
 			json: { id: 'recYYY', foo: 'foo 2', bar: 'bar 2' },
-			pairedItem: {
-				item: 0,
-			},
+			pairedItem: [
+				{
+					item: 0,
+				},
+			],
 		});
 	});
 
@@ -152,9 +154,11 @@ describe('Test AirtableV2, search operation', () => {
 		expect(result).toHaveLength(1);
 		expect(result[0]).toEqual({
 			json: { id: 'recYYY', foo: 'foo 2', bar: 'bar 2' },
-			pairedItem: {
-				item: 0,
-			},
+			pairedItem: [
+				{
+					item: 0,
+				},
+			],
 		});
 	});
 });

packages/nodes-base/nodes/Airtable/v1/AirtableV1.node.ts

@@ -13,6 +13,7 @@ import type { IRecord } from './GenericFunctions';
 import { apiRequest, apiRequestAllItems, downloadRecordAttachments } from './GenericFunctions';
 
 import { oldVersionNotice } from '../../../utils/descriptions';
+import { generatePairedItemData } from '../../../utils/utilities';
 
 const versionDescription: INodeTypeDescription = {
 	displayName: 'Airtable',
@@ -727,9 +728,11 @@ export class AirtableV1 implements INodeType {
 				}
 
 				// We can return from here
+				const itemData = generatePairedItemData(items.length);
+
 				return [
 					this.helpers.constructExecutionMetaData(this.helpers.returnJsonArray(returnData), {
-						itemData: { item: 0 },
+						itemData,
 					}),
 				];
 			} catch (error) {

packages/nodes-base/nodes/Airtable/v2/actions/base/getMany.operation.ts

@@ -4,7 +4,11 @@ import type {
 	INodeProperties,
 	IExecuteFunctions,
 } from 'n8n-workflow';
-import { updateDisplayOptions, wrapData } from '../../../../../utils/utilities';
+import {
+	generatePairedItemData,
+	updateDisplayOptions,
+	wrapData,
+} from '../../../../../utils/utilities';
 import { apiRequest } from '../../transport';
 
 const properties: INodeProperties[] = [
@@ -107,8 +111,10 @@ export async function execute(this: IExecuteFunctions): Promise<INodeExecutionDa
 		bases = bases.filter((base) => permissionLevel.includes(base.permissionLevel as string));
 	}
 
+	const itemData = generatePairedItemData(this.getInputData().length);
+
 	const returnData = this.helpers.constructExecutionMetaData(wrapData(bases), {
-		itemData: { item: 0 },
+		itemData,
 	});
 
 	return returnData;

packages/nodes-base/nodes/Airtable/v2/actions/record/search.operation.ts

@@ -4,7 +4,7 @@ import type {
 	INodeProperties,
 	IExecuteFunctions,
 } from 'n8n-workflow';
-import { updateDisplayOptions } from '../../../../../utils/utilities';
+import { generatePairedItemData, updateDisplayOptions } from '../../../../../utils/utilities';
 import { apiRequest, apiRequestAllItems, downloadRecordAttachments } from '../../transport';
 import type { IRecord } from '../../helpers/interfaces';
 import { flattenOutput } from '../../helpers/utils';
@@ -205,8 +205,10 @@ export async function execute(
 			json: flattenOutput(record as IDataObject),
 		}));
 
+		const itemData = generatePairedItemData(items.length);
+
 		returnData = this.helpers.constructExecutionMetaData(returnData, {
-			itemData: { item: 0 },
+			itemData,
 		});
 	} catch (error) {
 		if (this.continueOnFail()) {

packages/nodes-base/nodes/CompareDatasets/GenericFunctions.ts

@@ -9,7 +9,7 @@ import unset from 'lodash/unset';
 import { cloneDeep } from 'lodash';
 import set from 'lodash/set';
 import union from 'lodash/union';
-import { fuzzyCompare } from '@utils/utilities';
+import { fuzzyCompare, preparePairedItemDataArray } from '@utils/utilities';
 
 type PairToMatch = {
 	field1: string;
@@ -141,6 +141,10 @@ function compareItems(
 
 	return {
 		json: { keys, same, different, ...(!isEmpty(skipped) && { skipped }) },
+		pairedItem: [
+			...preparePairedItemDataArray(item1.pairedItem),
+			...preparePairedItemDataArray(item2.pairedItem),
+		],
 	} as INodeExecutionData;
 }
 

packages/nodes-base/nodes/Filter/Filter.node.ts

@@ -340,6 +340,10 @@ export class Filter implements INodeType {
 						value2,
 					);
 
+					if (item.pairedItem === undefined) {
+						item.pairedItem = [{ item: itemIndex }];
+					}
+
 					// If the operation is "OR" it means the item did match one condition no ned to check further
 					if (compareResult && combineConditions === 'OR') {
 						returnDataTrue.push(item);

packages/nodes-base/nodes/Google/BigQuery/v1/GoogleBigQueryV1.node.ts

@@ -20,6 +20,7 @@ import { recordFields, recordOperations } from './RecordDescription';
 import { v4 as uuid } from 'uuid';
 
 import { oldVersionNotice } from '@utils/descriptions';
+import { generatePairedItemData } from '../../../../utils/utilities';
 
 const versionDescription: INodeTypeDescription = {
 	displayName: 'Google BigQuery',
@@ -198,6 +199,8 @@ export class GoogleBigQueryV1 implements INodeType {
 
 				body.rows = rows;
 
+				const itemData = generatePairedItemData(items.length);
+
 				try {
 					responseData = await googleApiRequest.call(
 						this,
@@ -208,14 +211,14 @@ export class GoogleBigQueryV1 implements INodeType {
 
 					const executionData = this.helpers.constructExecutionMetaData(
 						this.helpers.returnJsonArray(responseData as IDataObject[]),
-						{ itemData: { item: 0 } },
+						{ itemData },
 					);
 					returnData.push(...executionData);
 				} catch (error) {
 					if (this.continueOnFail()) {
 						const executionErrorData = this.helpers.constructExecutionMetaData(
 							this.helpers.returnJsonArray({ error: error.message }),
-							{ itemData: { item: 0 } },
+							{ itemData },
 						);
 						returnData.push(...executionErrorData);
 					}

packages/nodes-base/nodes/Google/BigQuery/v2/actions/database/insert.operation.ts

@@ -6,7 +6,7 @@ import type {
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 import { v4 as uuid } from 'uuid';
-import { updateDisplayOptions } from '@utils/utilities';
+import { generatePairedItemData, updateDisplayOptions } from '@utils/utilities';
 import type { TableSchema } from '../../helpers/interfaces';
 import { checkSchema, wrapData } from '../../helpers/utils';
 import { googleApiRequest } from '../../transport';
@@ -225,6 +225,7 @@ export async function execute(this: IExecuteFunctions): Promise<INodeExecutionDa
 		}
 	}
 
+	const itemData = generatePairedItemData(items.length);
 	for (let i = 0; i < rows.length; i += batchSize) {
 		const batch = rows.slice(i, i + batchSize);
 		body.rows = batch;
@@ -279,7 +280,7 @@ export async function execute(this: IExecuteFunctions): Promise<INodeExecutionDa
 
 		const executionData = this.helpers.constructExecutionMetaData(
 			wrapData(responseData as IDataObject[]),
-			{ itemData: { item: 0 } },
+			{ itemData },
 		);
 
 		returnData.push(...executionData);

packages/nodes-base/nodes/Google/Firebase/CloudFirestore/GoogleFirebaseCloudFirestore.node.ts

@@ -19,6 +19,7 @@ import {
 import { collectionFields, collectionOperations } from './CollectionDescription';
 
 import { documentFields, documentOperations } from './DocumentDescription';
+import { generatePairedItemData } from '../../../../utils/utilities';
 
 export class GoogleFirebaseCloudFirestore implements INodeType {
 	description: INodeTypeDescription = {
@@ -90,6 +91,7 @@ export class GoogleFirebaseCloudFirestore implements INodeType {
 
 	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
 		const items = this.getInputData();
+		const itemData = generatePairedItemData(items.length);
 		const returnData: INodeExecutionData[] = [];
 		let responseData;
 		const resource = this.getNodeParameter('resource', 0);
@@ -130,7 +132,7 @@ export class GoogleFirebaseCloudFirestore implements INodeType {
 
 				const executionData = this.helpers.constructExecutionMetaData(
 					this.helpers.returnJsonArray(responseData as IDataObject[]),
-					{ itemData: { item: 0 } },
+					{ itemData },
 				);
 
 				returnData.push(...executionData);
@@ -213,7 +215,7 @@ export class GoogleFirebaseCloudFirestore implements INodeType {
 
 				const executionData = this.helpers.constructExecutionMetaData(
 					this.helpers.returnJsonArray(responseData as IDataObject[]),
-					{ itemData: { item: 0 } },
+					{ itemData },
 				);
 
 				returnData.push(...executionData);
@@ -395,7 +397,7 @@ export class GoogleFirebaseCloudFirestore implements INodeType {
 
 				const executionData = this.helpers.constructExecutionMetaData(
 					this.helpers.returnJsonArray(responseData as IDataObject[]),
-					{ itemData: { item: 0 } },
+					{ itemData },
 				);
 
 				returnData.push(...executionData);

packages/nodes-base/nodes/Google/Sheet/v1/GoogleSheetsV1.node.ts

@@ -26,6 +26,7 @@ import { googleApiRequest, hexToRgb } from './GenericFunctions';
 
 import { versionDescription } from './versionDescription';
 import { getGoogleAccessToken } from '../../GenericFunctions';
+import { generatePairedItemData } from '../../../../utils/utilities';
 
 export class GoogleSheetsV1 implements INodeType {
 	description: INodeTypeDescription;
@@ -295,7 +296,16 @@ export class GoogleSheetsV1 implements INodeType {
 						returnData = [];
 					}
 
-					return [this.helpers.returnJsonArray(returnData)];
+					const pairedItem = generatePairedItemData(items.length);
+
+					const lookupOutput = returnData.map((item) => {
+						return {
+							json: item,
+							pairedItem,
+						};
+					});
+
+					return [lookupOutput];
 				} catch (error) {
 					if (this.continueOnFail()) {
 						return [this.helpers.returnJsonArray({ error: error.message })];

packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/append.operation.ts

@@ -234,6 +234,13 @@ export async function execute(
 	if (nodeVersion < 4 || dataMode === 'autoMapInputData') {
 		return items;
 	} else {
-		return this.helpers.returnJsonArray(setData);
+		const returnData: INodeExecutionData[] = [];
+		for (const [index, entry] of setData.entries()) {
+			returnData.push({
+				json: entry,
+				pairedItems: { item: index },
+			});
+		}
+		return returnData;
 	}
 }

packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/appendOrUpdate.operation.ts

@@ -387,6 +387,13 @@ export async function execute(
 	if (nodeVersion < 4 || dataMode === 'autoMapInputData') {
 		return items;
 	} else {
-		return this.helpers.returnJsonArray(mappedValues);
+		const returnData: INodeExecutionData[] = [];
+		for (const [index, entry] of mappedValues.entries()) {
+			returnData.push({
+				json: entry,
+				pairedItems: { item: index },
+			});
+		}
+		return returnData;
 	}
 }

packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/create.operation.ts

@@ -3,6 +3,7 @@ import type { SheetProperties } from '../../helpers/GoogleSheets.types';
 import { apiRequest } from '../../transport';
 import type { GoogleSheet } from '../../helpers/GoogleSheet';
 import { getExistingSheetNames, hexToRgb } from '../../helpers/GoogleSheets.utils';
+import { wrapData } from '../../../../../../utils/utilities';
 
 export const description: SheetProperties = [
 	{
@@ -78,7 +79,7 @@ export async function execute(
 	sheetName: string,
 ): Promise<INodeExecutionData[]> {
 	let responseData;
-	const returnData: IDataObject[] = [];
+	const returnData: INodeExecutionData[] = [];
 	const items = this.getInputData();
 
 	const existingSheetNames = await getExistingSheetNames(sheet);
@@ -120,7 +121,12 @@ export async function execute(
 
 		existingSheetNames.push(sheetTitle);
 
-		returnData.push(responseData as IDataObject);
+		const executionData = this.helpers.constructExecutionMetaData(
+			wrapData(responseData as IDataObject[]),
+			{ itemData: { item: i } },
+		);
+
+		returnData.push(...executionData);
 	}
-	return this.helpers.returnJsonArray(returnData);
+	return returnData;
 }