mudhorn/n8n
1
0
Fork 0
mirror of https://github.com/n8n-io/n8n.git synced 2025-03-05 20:50:17 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

removed generated paired items

Browse source
This commit is contained in:
Michael Kret 2024-11-13 12:55:41 +02:00
parent 3e0c6cb3d2
commit b2e44499d1
30 changed files with 58 additions and 205 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
packages/nodes-base/nodes/Airtable/v1/AirtableV1.node.ts
View file

@ -10,7 +10,6 @@ import type {
import { NodeConnectionType, NodeOperationError } from 'n8n-workflow'; import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
import { oldVersionNotice } from '../../../utils/descriptions'; import { oldVersionNotice } from '../../../utils/descriptions';
import { generatePairedItemData } from '../../../utils/utilities';
import type { IRecord } from './GenericFunctions'; import type { IRecord } from './GenericFunctions';
import { apiRequest, apiRequestAllItems, downloadRecordAttachments } from './GenericFunctions'; import { apiRequest, apiRequestAllItems, downloadRecordAttachments } from './GenericFunctions';
@ -737,24 +736,16 @@ export class AirtableV1 implements INodeType {
const downloadFieldNames = ( const downloadFieldNames = (
this.getNodeParameter('downloadFieldNames', 0) as string this.getNodeParameter('downloadFieldNames', 0) as string
).split(','); ).split(',');
const pairedItem = generatePairedItemData(items.length);
const data = await downloadRecordAttachments.call( const data = await downloadRecordAttachments.call(
this, this,
responseData.records as IRecord[], responseData.records as IRecord[],
downloadFieldNames, downloadFieldNames,
pairedItem,
); );
return [data]; return [data];
} }
// We can return from here return [this.helpers.returnJsonArray(returnData)];
const itemData = generatePairedItemData(items.length);
return [
this.helpers.constructExecutionMetaData(this.helpers.returnJsonArray(returnData), {
itemData,
}),
];
} catch (error) { } catch (error) {
if (this.continueOnFail()) { if (this.continueOnFail()) {
returnData.push({ json: { error: error.message } }); returnData.push({ json: { error: error.message } });

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

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

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

@ -4,7 +4,7 @@ import type {
INodeProperties, INodeProperties,
IExecuteFunctions, IExecuteFunctions,
} from 'n8n-workflow'; } from 'n8n-workflow';
import { generatePairedItemData, updateDisplayOptions } from '../../../../../utils/utilities'; import { updateDisplayOptions } from '../../../../../utils/utilities';
import { apiRequest, apiRequestAllItems, downloadRecordAttachments } from '../../transport'; import { apiRequest, apiRequestAllItems, downloadRecordAttachments } from '../../transport';
import type { IRecord } from '../../helpers/interfaces'; import type { IRecord } from '../../helpers/interfaces';
import { flattenOutput } from '../../helpers/utils'; import { flattenOutput } from '../../helpers/utils';
@ -155,12 +155,9 @@ export async function execute(
const endpoint = `${base}/${table}`; const endpoint = `${base}/${table}`;
let itemsLength = items.length ? 1 : 0; let itemsLength = items.length ? 1 : 0;
let fallbackPairedItems;
if (nodeVersion >= 2.1) { if (nodeVersion >= 2.1) {
itemsLength = items.length; itemsLength = items.length;
} else {
fallbackPairedItems = generatePairedItemData(items.length);
} }
for (let i = 0; i < itemsLength; i++) { for (let i = 0; i < itemsLength; i++) {
@ -207,7 +204,7 @@ export async function execute(
this, this,
responseData.records as IRecord[], responseData.records as IRecord[],
options.downloadFields as string[], options.downloadFields as string[],
fallbackPairedItems || [{ item: i }], nodeVersion >= 2.1 ? [{ item: i }] : undefined,
); );
returnData.push(...itemWithAttachments); returnData.push(...itemWithAttachments);
continue; continue;
@ -219,7 +216,7 @@ export async function execute(
json: flattenOutput(record), json: flattenOutput(record),
})) as INodeExecutionData[]; })) as INodeExecutionData[];
const itemData = fallbackPairedItems || [{ item: i }]; const itemData = nodeVersion >= 2.1 ? [{ item: i }] : [];
const executionData = this.helpers.constructExecutionMetaData(records, { const executionData = this.helpers.constructExecutionMetaData(records, {
itemData, itemData,

9
packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflow.node.ts
View file

@ -5,7 +5,7 @@ import type {
INodeType, INodeType,
INodeTypeDescription, INodeTypeDescription,
} from 'n8n-workflow'; } from 'n8n-workflow';
import { generatePairedItemData } from '../../utils/utilities';
import { getWorkflowInfo } from './GenericFunctions'; import { getWorkflowInfo } from './GenericFunctions';
export class ExecuteWorkflow implements INodeType { export class ExecuteWorkflow implements INodeType {
@ -278,8 +278,6 @@ export class ExecuteWorkflow implements INodeType {
items, items,
); );
const fallbackPairedItemData = generatePairedItemData(items.length);
for (const output of workflowResult) { for (const output of workflowResult) {
const sameLength = output.length === items.length; const sameLength = output.length === items.length;
@ -288,17 +286,14 @@ export class ExecuteWorkflow implements INodeType {
if (sameLength) { if (sameLength) {
item.pairedItem = { item: itemIndex }; item.pairedItem = { item: itemIndex };
} else {
item.pairedItem = fallbackPairedItemData;
} }
} }
} }
return workflowResult; return workflowResult;
} catch (error) { } catch (error) {
const pairedItem = generatePairedItemData(items.length);
if (this.continueOnFail()) { if (this.continueOnFail()) {
return [[{ json: { error: error.message }, pairedItem }]]; return [[{ json: { error: error.message } }]];
} }
throw error; throw error;
} }

5
packages/nodes-base/nodes/Files/ConvertToFile/actions/spreadsheet.operation.ts
View file

@ -5,7 +5,7 @@ import {
type INodeProperties, type INodeProperties,
} from 'n8n-workflow'; } from 'n8n-workflow';
import { generatePairedItemData, updateDisplayOptions } from '@utils/utilities'; import { updateDisplayOptions } from '@utils/utilities';
import type { JsonToSpreadsheetBinaryOptions, JsonToSpreadsheetBinaryFormat } from '@utils/binary'; import type { JsonToSpreadsheetBinaryOptions, JsonToSpreadsheetBinaryFormat } from '@utils/binary';
import { convertJsonToSpreadsheetBinary } from '@utils/binary'; import { convertJsonToSpreadsheetBinary } from '@utils/binary';
@ -99,7 +99,6 @@ export async function execute(
) { ) {
let returnData: INodeExecutionData[] = []; let returnData: INodeExecutionData[] = [];
const pairedItem = generatePairedItemData(items.length);
try { try {
const options = this.getNodeParameter('options', 0, {}) as JsonToSpreadsheetBinaryOptions; const options = this.getNodeParameter('options', 0, {}) as JsonToSpreadsheetBinaryOptions;
const binaryPropertyName = this.getNodeParameter('binaryPropertyName', 0, 'data'); const binaryPropertyName = this.getNodeParameter('binaryPropertyName', 0, 'data');
@ -117,7 +116,6 @@ export async function execute(
binary: { binary: {
[binaryPropertyName]: binaryData, [binaryPropertyName]: binaryData,
}, },
pairedItem,
}; };
returnData = [newItem]; returnData = [newItem];
@ -127,7 +125,6 @@ export async function execute(
json: { json: {
error: error.message, error: error.message,
}, },
pairedItem,
}); });
} else { } else {
throw new NodeOperationError(this.getNode(), error); throw new NodeOperationError(this.getNode(), error);

5
packages/nodes-base/nodes/Files/ConvertToFile/actions/toJson.operation.ts
View file

@ -1,7 +1,7 @@
import type { IExecuteFunctions, INodeExecutionData, INodeProperties } from 'n8n-workflow'; import type { IExecuteFunctions, INodeExecutionData, INodeProperties } from 'n8n-workflow';
import { NodeOperationError } from 'n8n-workflow'; import { NodeOperationError } from 'n8n-workflow';
import { generatePairedItemData, updateDisplayOptions } from '@utils/utilities'; import { updateDisplayOptions } from '@utils/utilities';
import { createBinaryFromJson } from '@utils/binary'; import { createBinaryFromJson } from '@utils/binary';
import { encodeDecodeOptions } from '@utils/descriptions'; import { encodeDecodeOptions } from '@utils/descriptions';
@ -92,7 +92,6 @@ export async function execute(this: IExecuteFunctions, items: INodeExecutionData
const mode = this.getNodeParameter('mode', 0, 'once') as string; const mode = this.getNodeParameter('mode', 0, 'once') as string;
if (mode === 'once') { if (mode === 'once') {
const pairedItem = generatePairedItemData(items.length);
try { try {
const options = this.getNodeParameter('options', 0, {}); const options = this.getNodeParameter('options', 0, {});
const binaryPropertyName = this.getNodeParameter('binaryPropertyName', 0, 'data'); const binaryPropertyName = this.getNodeParameter('binaryPropertyName', 0, 'data');
@ -114,7 +113,6 @@ export async function execute(this: IExecuteFunctions, items: INodeExecutionData
binary: { binary: {
[binaryPropertyName]: binaryData, [binaryPropertyName]: binaryData,
}, },
pairedItem,
}; };
returnData = [newItem]; returnData = [newItem];
@ -124,7 +122,6 @@ export async function execute(this: IExecuteFunctions, items: INodeExecutionData
json: { json: {
error: error.message, error: error.message,
}, },
pairedItem,
}); });
} }
throw new NodeOperationError(this.getNode(), error); throw new NodeOperationError(this.getNode(), error);

6
packages/nodes-base/nodes/Ftp/Ftp.node.ts
View file

@ -18,7 +18,7 @@ import type {
INodeTypeDescription, INodeTypeDescription,
JsonObject, JsonObject,
} from 'n8n-workflow'; } from 'n8n-workflow';
import { formatPrivateKey, generatePairedItemData } from '@utils/utilities'; import { formatPrivateKey } from '@utils/utilities';
interface ReturnFtpItem { interface ReturnFtpItem {
type: string; type: string;
@ -549,9 +549,7 @@ export class Ftp implements INodeType {
} }
} catch (error) { } catch (error) {
if (this.continueOnFail()) { if (this.continueOnFail()) {
const pairedItem = generatePairedItemData(items.length); return [[{ json: { error: error.message } }]];
return [[{ json: { error: error.message }, pairedItem }]];
} }
throw error; throw error;
} }

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

@ -12,7 +12,7 @@ import type {
import { NodeConnectionType, NodeApiError } from 'n8n-workflow'; import { NodeConnectionType, NodeApiError } from 'n8n-workflow';
import { v4 as uuid } from 'uuid'; import { v4 as uuid } from 'uuid';
import { generatePairedItemData } from '../../../../utils/utilities';
import { googleApiRequest, googleApiRequestAllItems, simplify } from './GenericFunctions'; import { googleApiRequest, googleApiRequestAllItems, simplify } from './GenericFunctions';
import { recordFields, recordOperations } from './RecordDescription'; import { recordFields, recordOperations } from './RecordDescription';
@ -196,8 +196,6 @@ export class GoogleBigQueryV1 implements INodeType {
body.rows = rows; body.rows = rows;
const itemData = generatePairedItemData(items.length);
try { try {
responseData = await googleApiRequest.call( responseData = await googleApiRequest.call(
this, this,
@ -206,17 +204,11 @@ export class GoogleBigQueryV1 implements INodeType {
body, body,
); );
const executionData = this.helpers.constructExecutionMetaData( const executionData = this.helpers.returnJsonArray(responseData as IDataObject[]);
this.helpers.returnJsonArray(responseData as IDataObject[]),
{ itemData },
);
returnData.push(...executionData); returnData.push(...executionData);
} catch (error) { } catch (error) {
if (this.continueOnFail()) { if (this.continueOnFail()) {
const executionErrorData = this.helpers.constructExecutionMetaData( const executionErrorData = this.helpers.returnJsonArray({ error: error.message });
this.helpers.returnJsonArray({ error: error.message }),
{ itemData },
);
returnData.push(...executionErrorData); returnData.push(...executionErrorData);
} }
throw new NodeApiError(this.getNode(), error as JsonObject, { itemIndex: 0 }); throw new NodeApiError(this.getNode(), error as JsonObject, { itemIndex: 0 });

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

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

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

@ -9,7 +9,6 @@ import type {
} from 'n8n-workflow'; } from 'n8n-workflow';
import { NodeConnectionType, jsonParse } from 'n8n-workflow'; import { NodeConnectionType, jsonParse } from 'n8n-workflow';
import { generatePairedItemData } from '../../../../utils/utilities';
import { import {
fullDocumentToJson, fullDocumentToJson,
googleApiRequest, googleApiRequest,
@ -122,7 +121,7 @@ export class GoogleFirebaseCloudFirestore implements INodeType {
async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> { async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
const items = this.getInputData(); const items = this.getInputData();
const itemData = generatePairedItemData(items.length);
const returnData: INodeExecutionData[] = []; const returnData: INodeExecutionData[] = [];
let responseData; let responseData;
@ -137,7 +136,7 @@ export class GoogleFirebaseCloudFirestore implements INodeType {
if (nodeVersion >= 1.1) { if (nodeVersion >= 1.1) {
itemsLength = items.length; itemsLength = items.length;
} else { } else {
fallbackPairedItems = generatePairedItemData(items.length); fallbackPairedItems = [];
} }
if (resource === 'document') { if (resource === 'document') {
@ -173,10 +172,7 @@ export class GoogleFirebaseCloudFirestore implements INodeType {
.filter((el: IDataObject) => !!el); .filter((el: IDataObject) => !!el);
} }
const executionData = this.helpers.constructExecutionMetaData( const executionData = this.helpers.returnJsonArray(responseData as IDataObject[]);
this.helpers.returnJsonArray(responseData as IDataObject[]),
{ itemData },
);
returnData.push(...executionData); returnData.push(...executionData);
} else if (operation === 'create') { } else if (operation === 'create') {

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

@ -14,7 +14,7 @@ import type {
import { NodeOperationError } from 'n8n-workflow'; import { NodeOperationError } from 'n8n-workflow';
import { getGoogleAccessToken } from '../../GenericFunctions'; import { getGoogleAccessToken } from '../../GenericFunctions';
import { generatePairedItemData } from '../../../../utils/utilities';
import type { import type {
ILookupValues, ILookupValues,
ISheetUpdateData, ISheetUpdateData,
@ -296,12 +296,9 @@ export class GoogleSheetsV1 implements INodeType {
returnData = []; returnData = [];
} }
const pairedItem = generatePairedItemData(items.length);
const lookupOutput = returnData.map((item) => { const lookupOutput = returnData.map((item) => {
return { return {
json: item, json: item,
pairedItem,
}; };
}); });

7
packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/delete.operation.ts
View file

@ -2,7 +2,7 @@ import type { IExecuteFunctions, IDataObject, INodeExecutionData } from 'n8n-wor
import type { SheetProperties } from '../../helpers/GoogleSheets.types'; import type { SheetProperties } from '../../helpers/GoogleSheets.types';
import type { GoogleSheet } from '../../helpers/GoogleSheet'; import type { GoogleSheet } from '../../helpers/GoogleSheet';
import { getColumnNumber, untilSheetSelected } from '../../helpers/GoogleSheets.utils'; import { getColumnNumber, untilSheetSelected } from '../../helpers/GoogleSheets.utils';
import { generatePairedItemData, wrapData } from '../../../../../../utils/utilities'; import { wrapData } from '../../../../../../utils/utilities';
export const description: SheetProperties = [ export const description: SheetProperties = [
{ {
@ -165,10 +165,7 @@ export async function execute(
await sheet.spreadsheetBatchUpdate(requests); await sheet.spreadsheetBatchUpdate(requests);
} }
const itemData = generatePairedItemData(this.getInputData().length); const returnData = wrapData({ success: true });
const returnData = this.helpers.constructExecutionMetaData(wrapData({ success: true }), {
itemData,
});
return returnData; return returnData;
} }

9
packages/nodes-base/nodes/Hubspot/V2/HubspotV2.node.ts
View file

@ -19,7 +19,7 @@ import { NodeApiError, NodeConnectionType, NodeOperationError } from 'n8n-workfl
import { snakeCase } from 'change-case'; import { snakeCase } from 'change-case';
import set from 'lodash/set'; import set from 'lodash/set';
import { generatePairedItemData } from '../../../utils/utilities';
import { import {
clean, clean,
getAssociations, getAssociations,
@ -1192,12 +1192,7 @@ export class HubspotV2 implements INodeType {
); );
} }
const itemData = generatePairedItemData(items.length); const executionData = this.helpers.returnJsonArray(responseData as IDataObject[]);
const executionData = this.helpers.constructExecutionMetaData(
this.helpers.returnJsonArray(responseData as IDataObject[]),
{ itemData },
);
returnData.push(...executionData); returnData.push(...executionData);
} catch (error) { } catch (error) {
if (this.continueOnFail()) { if (this.continueOnFail()) {

9
packages/nodes-base/nodes/Kafka/Kafka.node.ts
View file

@ -15,7 +15,6 @@ import type {
INodeTypeDescription, INodeTypeDescription,
} from 'n8n-workflow'; } from 'n8n-workflow';
import { ApplicationError, NodeConnectionType, NodeOperationError } from 'n8n-workflow'; import { ApplicationError, NodeConnectionType, NodeOperationError } from 'n8n-workflow';
import { generatePairedItemData } from '../../utils/utilities';
export class Kafka implements INodeType { export class Kafka implements INodeType {
description: INodeTypeDescription = { description: INodeTypeDescription = {
@ -260,7 +259,6 @@ export class Kafka implements INodeType {
async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> { async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
const items = this.getInputData(); const items = this.getInputData();
const itemData = generatePairedItemData(items.length);
const length = items.length; const length = items.length;
@ -400,15 +398,12 @@ export class Kafka implements INodeType {
await producer.disconnect(); await producer.disconnect();
const executionData = this.helpers.constructExecutionMetaData( const executionData = this.helpers.returnJsonArray(responseData);
this.helpers.returnJsonArray(responseData),
{ itemData },
);
return [executionData]; return [executionData];
} catch (error) { } catch (error) {
if (this.continueOnFail()) { if (this.continueOnFail()) {
return [[{ json: { error: error.message }, pairedItem: itemData }]]; return [[{ json: { error: error.message } }]];
} else { } else {
throw error; throw error;
} }

12
packages/nodes-base/nodes/Microsoft/Excel/v1/MicrosoftExcelV1.node.ts
View file

@ -11,7 +11,6 @@ import type {
} from 'n8n-workflow'; } from 'n8n-workflow';
import { NodeApiError, NodeConnectionType } from 'n8n-workflow'; import { NodeApiError, NodeConnectionType } from 'n8n-workflow';
import { generatePairedItemData } from '../../../../utils/utilities';
import { import {
microsoftApiRequest, microsoftApiRequest,
microsoftApiRequestAllItems, microsoftApiRequestAllItems,
@ -176,7 +175,6 @@ export class MicrosoftExcelV1 implements INodeType {
async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> { async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
const items = this.getInputData(); const items = this.getInputData();
const itemData = generatePairedItemData(items.length);
const returnData: INodeExecutionData[] = []; const returnData: INodeExecutionData[] = [];
const length = items.length; const length = items.length;
let qs: IDataObject = {}; let qs: IDataObject = {};
@ -248,18 +246,12 @@ export class MicrosoftExcelV1 implements INodeType {
{ 'workbook-session-id': id }, { 'workbook-session-id': id },
); );
const executionData = this.helpers.constructExecutionMetaData( const executionData = this.helpers.returnJsonArray(responseData as IDataObject[]);
this.helpers.returnJsonArray(responseData as IDataObject[]),
{ itemData },
);
returnData.push(...executionData); returnData.push(...executionData);
} catch (error) { } catch (error) {
if (this.continueOnFail()) { if (this.continueOnFail()) {
const executionErrorData = this.helpers.constructExecutionMetaData( const executionErrorData = this.helpers.returnJsonArray({ error: error.message });
this.helpers.returnJsonArray({ error: error.message }),
{ itemData },
);
returnData.push(...executionErrorData); returnData.push(...executionErrorData);
} else { } else {
throw error; throw error;

8
packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/append.operation.ts
View file

@ -8,7 +8,7 @@ import type { ExcelResponse } from '../../helpers/interfaces';
import { prepareOutput } from '../../helpers/utils'; import { prepareOutput } from '../../helpers/utils';
import { microsoftApiRequest } from '../../transport'; import { microsoftApiRequest } from '../../transport';
import { tableRLC, workbookRLC, worksheetRLC } from '../common.descriptions'; import { tableRLC, workbookRLC, worksheetRLC } from '../common.descriptions';
import { generatePairedItemData, processJsonInput, updateDisplayOptions } from '@utils/utilities'; import { processJsonInput, updateDisplayOptions } from '@utils/utilities';
const properties: INodeProperties[] = [ const properties: INodeProperties[] = [
workbookRLC, workbookRLC,
@ -272,11 +272,7 @@ export async function execute(
); );
} catch (error) { } catch (error) {
if (this.continueOnFail()) { if (this.continueOnFail()) {
const itemData = generatePairedItemData(this.getInputData().length); const executionErrorData = this.helpers.returnJsonArray({ error: error.message });
const executionErrorData = this.helpers.constructExecutionMetaData(
this.helpers.returnJsonArray({ error: error.message }),
{ itemData },
);
returnData.push(...executionErrorData); returnData.push(...executionErrorData);
} else { } else {
throw error; throw error;

8
packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/update.operation.ts
View file

@ -14,7 +14,7 @@ import {
} from '../../helpers/utils'; } from '../../helpers/utils';
import { microsoftApiRequest } from '../../transport'; import { microsoftApiRequest } from '../../transport';
import { workbookRLC, worksheetRLC } from '../common.descriptions'; import { workbookRLC, worksheetRLC } from '../common.descriptions';
import { generatePairedItemData, processJsonInput, updateDisplayOptions } from '@utils/utilities'; import { processJsonInput, updateDisplayOptions } from '@utils/utilities';
const properties: INodeProperties[] = [ const properties: INodeProperties[] = [
workbookRLC, workbookRLC,
@ -373,11 +373,7 @@ export async function execute(
} }
} catch (error) { } catch (error) {
if (this.continueOnFail()) { if (this.continueOnFail()) {
const itemData = generatePairedItemData(this.getInputData().length); const executionErrorData = this.helpers.returnJsonArray({ error: error.message });
const executionErrorData = this.helpers.constructExecutionMetaData(
this.helpers.returnJsonArray({ error: error.message }),
{ itemData },
);
returnData.push(...executionErrorData); returnData.push(...executionErrorData);
} else { } else {
throw error; throw error;

8
packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/upsert.operation.ts
View file

@ -14,7 +14,7 @@ import {
} from '../../helpers/utils'; } from '../../helpers/utils';
import { microsoftApiRequest } from '../../transport'; import { microsoftApiRequest } from '../../transport';
import { workbookRLC, worksheetRLC } from '../common.descriptions'; import { workbookRLC, worksheetRLC } from '../common.descriptions';
import { generatePairedItemData, processJsonInput, updateDisplayOptions } from '@utils/utilities'; import { processJsonInput, updateDisplayOptions } from '@utils/utilities';
const properties: INodeProperties[] = [ const properties: INodeProperties[] = [
workbookRLC, workbookRLC,
@ -380,11 +380,7 @@ export async function execute(
); );
} catch (error) { } catch (error) {
if (this.continueOnFail()) { if (this.continueOnFail()) {
const itemData = generatePairedItemData(this.getInputData().length); const executionErrorData = this.helpers.returnJsonArray({ error: error.message });
const executionErrorData = this.helpers.constructExecutionMetaData(
this.helpers.returnJsonArray({ error: error.message }),
{ itemData },
);
returnData.push(...executionErrorData); returnData.push(...executionErrorData);
} else { } else {
throw error; throw error;

8
packages/nodes-base/nodes/Microsoft/Excel/v2/helpers/utils.ts
View file

@ -1,7 +1,7 @@
import type { IDataObject, IExecuteFunctions, INode, INodeExecutionData } from 'n8n-workflow'; import type { IDataObject, IExecuteFunctions, INode, INodeExecutionData } from 'n8n-workflow';
import { NodeOperationError } from 'n8n-workflow'; import { NodeOperationError } from 'n8n-workflow';
import type { ExcelResponse, SheetData, UpdateSummary } from './interfaces'; import type { ExcelResponse, SheetData, UpdateSummary } from './interfaces';
import { generatePairedItemData, wrapData } from '@utils/utilities'; import { wrapData } from '@utils/utilities';
type PrepareOutputConfig = { type PrepareOutputConfig = {
rawData: boolean; rawData: boolean;
@ -60,11 +60,7 @@ export function prepareOutput(
returnData.push(...executionData); returnData.push(...executionData);
} }
} else { } else {
const itemData = generatePairedItemData(this.getInputData().length); const executionData = wrapData({ [config.dataProperty || 'data']: responseData });
const executionData = this.helpers.constructExecutionMetaData(
wrapData({ [config.dataProperty || 'data']: responseData }),
{ itemData },
);
returnData.push(...executionData); returnData.push(...executionData);
} }

9
packages/nodes-base/nodes/Microsoft/Sql/MicrosoftSql.node.ts
View file

@ -12,7 +12,7 @@ import {
NodeConnectionType, NodeConnectionType,
} from 'n8n-workflow'; } from 'n8n-workflow';
import { flatten, generatePairedItemData, getResolvables } from '@utils/utilities'; import { flatten, getResolvables } from '@utils/utilities';
import { import {
configurePool, configurePool,
@ -343,12 +343,7 @@ export class MicrosoftSql implements INodeType {
responseData = await deleteOperation(tables, pool); responseData = await deleteOperation(tables, pool);
} }
const itemData = generatePairedItemData(items.length); returnData = this.helpers.returnJsonArray(responseData);
returnData = this.helpers.constructExecutionMetaData(
this.helpers.returnJsonArray(responseData),
{ itemData },
);
} catch (error) { } catch (error) {
if (this.continueOnFail()) { if (this.continueOnFail()) {
responseData = items; responseData = items;

27
packages/nodes-base/nodes/MongoDb/MongoDb.node.ts
View file

@ -18,7 +18,6 @@ import type {
Sort, Sort,
} from 'mongodb'; } from 'mongodb';
import { ObjectId } from 'mongodb'; import { ObjectId } from 'mongodb';
import { generatePairedItemData } from '../../utils/utilities';
import { nodeProperties } from './MongoDbProperties'; import { nodeProperties } from './MongoDbProperties';
import { import {
@ -120,7 +119,7 @@ export class MongoDb implements INodeType {
if (nodeVersion >= 1.1) { if (nodeVersion >= 1.1) {
itemsLength = items.length; itemsLength = items.length;
} else { } else {
fallbackPairedItems = generatePairedItemData(items.length); fallbackPairedItems = [];
} }
if (operation === 'aggregate') { if (operation === 'aggregate') {
@ -233,7 +232,6 @@ export class MongoDb implements INodeType {
} }
if (operation === 'findOneAndReplace') { if (operation === 'findOneAndReplace') {
fallbackPairedItems = fallbackPairedItems ?? generatePairedItemData(items.length);
const fields = prepareFields(this.getNodeParameter('fields', 0) as string); const fields = prepareFields(this.getNodeParameter('fields', 0) as string);
const useDotNotation = this.getNodeParameter('options.useDotNotation', 0, false) as boolean; const useDotNotation = this.getNodeParameter('options.useDotNotation', 0, false) as boolean;
const dateFields = prepareFields( const dateFields = prepareFields(
@ -268,14 +266,10 @@ export class MongoDb implements INodeType {
} }
} }
returnData = this.helpers.constructExecutionMetaData( returnData = this.helpers.returnJsonArray(updateItems);
this.helpers.returnJsonArray(updateItems),
{ itemData: fallbackPairedItems },
);
} }
if (operation === 'findOneAndUpdate') { if (operation === 'findOneAndUpdate') {
fallbackPairedItems = fallbackPairedItems ?? generatePairedItemData(items.length);
const fields = prepareFields(this.getNodeParameter('fields', 0) as string); const fields = prepareFields(this.getNodeParameter('fields', 0) as string);
const useDotNotation = this.getNodeParameter('options.useDotNotation', 0, false) as boolean; const useDotNotation = this.getNodeParameter('options.useDotNotation', 0, false) as boolean;
const dateFields = prepareFields( const dateFields = prepareFields(
@ -310,14 +304,10 @@ export class MongoDb implements INodeType {
} }
} }
returnData = this.helpers.constructExecutionMetaData( returnData = this.helpers.returnJsonArray(updateItems);
this.helpers.returnJsonArray(updateItems),
{ itemData: fallbackPairedItems },
);
} }
if (operation === 'insert') { if (operation === 'insert') {
fallbackPairedItems = fallbackPairedItems ?? generatePairedItemData(items.length);
let responseData: IDataObject[] = []; let responseData: IDataObject[] = [];
try { try {
// Prepare the data to insert and copy it to be returned // Prepare the data to insert and copy it to be returned
@ -348,14 +338,10 @@ export class MongoDb implements INodeType {
} }
} }
returnData = this.helpers.constructExecutionMetaData( returnData = this.helpers.returnJsonArray(responseData);
this.helpers.returnJsonArray(responseData),
{ itemData: fallbackPairedItems },
);
} }
if (operation === 'update') { if (operation === 'update') {
fallbackPairedItems = fallbackPairedItems ?? generatePairedItemData(items.length);
const fields = prepareFields(this.getNodeParameter('fields', 0) as string); const fields = prepareFields(this.getNodeParameter('fields', 0) as string);
const useDotNotation = this.getNodeParameter('options.useDotNotation', 0, false) as boolean; const useDotNotation = this.getNodeParameter('options.useDotNotation', 0, false) as boolean;
const dateFields = prepareFields( const dateFields = prepareFields(
@ -390,10 +376,7 @@ export class MongoDb implements INodeType {
} }
} }
returnData = this.helpers.constructExecutionMetaData( returnData = this.helpers.returnJsonArray(updateItems);
this.helpers.returnJsonArray(updateItems),
{ itemData: fallbackPairedItems },
);
} }
await client.close(); await client.close();

7
packages/nodes-base/nodes/Postgres/v2/helpers/utils.ts
View file

@ -7,7 +7,6 @@ import type {
} from 'n8n-workflow'; } from 'n8n-workflow';
import { NodeOperationError, jsonParse } from 'n8n-workflow'; import { NodeOperationError, jsonParse } from 'n8n-workflow';
import { generatePairedItemData } from '../../../../utils/utilities';
import type { import type {
ColumnInfo, ColumnInfo,
EnumInfo, EnumInfo,
@ -234,17 +233,15 @@ export function configureQueryRunner(
.flat(); .flat();
if (!returnData.length) { if (!returnData.length) {
const pairedItem = generatePairedItemData(queries.length);
if ((options?.nodeVersion as number) < 2.3) { if ((options?.nodeVersion as number) < 2.3) {
if (emptyReturnData.length) { if (emptyReturnData.length) {
emptyReturnData[0].pairedItem = pairedItem; emptyReturnData[0].pairedItem = undefined;
} }
returnData = emptyReturnData; returnData = emptyReturnData;
} else { } else {
returnData = queries.every((query) => isSelectQuery(query.query)) returnData = queries.every((query) => isSelectQuery(query.query))
? [] ? []
: [{ json: { success: true }, pairedItem }]; : [{ json: { success: true } }];
} }
} }
} catch (err) { } catch (err) {

17
packages/nodes-base/nodes/QuickBase/QuickBase.node.ts
View file

@ -10,7 +10,6 @@ import type {
} from 'n8n-workflow'; } from 'n8n-workflow';
import { NodeConnectionType, NodeOperationError } from 'n8n-workflow'; import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
import { generatePairedItemData } from '../../utils/utilities';
import { import {
getFieldsObject, getFieldsObject,
quickbaseApiRequest, quickbaseApiRequest,
@ -117,7 +116,6 @@ export class QuickBase implements INodeType {
async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> { async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
const items = this.getInputData(); const items = this.getInputData();
const itemData = generatePairedItemData(items.length);
const returnData: INodeExecutionData[] = []; const returnData: INodeExecutionData[] = [];
const length = items.length; const length = items.length;
const qs: IDataObject = {}; const qs: IDataObject = {};
@ -295,10 +293,7 @@ export class QuickBase implements INodeType {
} }
} }
const executionData = this.helpers.constructExecutionMetaData( const executionData = this.helpers.returnJsonArray(responseData as IDataObject[]);
this.helpers.returnJsonArray(responseData as IDataObject[]),
{ itemData },
);
returnData.push(...executionData); returnData.push(...executionData);
} }
@ -465,10 +460,7 @@ export class QuickBase implements INodeType {
} }
} }
const executionData = this.helpers.constructExecutionMetaData( const executionData = this.helpers.returnJsonArray(responseData as IDataObject[]);
this.helpers.returnJsonArray(responseData as IDataObject[]),
{ itemData },
);
returnData.push(...executionData); returnData.push(...executionData);
} }
@ -548,10 +540,7 @@ export class QuickBase implements INodeType {
} }
} }
const executionData = this.helpers.constructExecutionMetaData( const executionData = this.helpers.returnJsonArray(responseData as IDataObject[]);
this.helpers.returnJsonArray(responseData as IDataObject[]),
{ itemData },
);
returnData.push(...executionData); returnData.push(...executionData);
} }

3
packages/nodes-base/nodes/ReadBinaryFiles/ReadBinaryFiles.node.ts
View file

@ -7,7 +7,6 @@ import {
} from 'n8n-workflow'; } from 'n8n-workflow';
import glob from 'fast-glob'; import glob from 'fast-glob';
import { generatePairedItemData } from '../../utils/utilities';
export class ReadBinaryFiles implements INodeType { export class ReadBinaryFiles implements INodeType {
description: INodeTypeDescription = { description: INodeTypeDescription = {
@ -48,7 +47,6 @@ export class ReadBinaryFiles implements INodeType {
async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> { async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
const fileSelector = this.getNodeParameter('fileSelector', 0) as string; const fileSelector = this.getNodeParameter('fileSelector', 0) as string;
const dataPropertyName = this.getNodeParameter('dataPropertyName', 0); const dataPropertyName = this.getNodeParameter('dataPropertyName', 0);
const pairedItem = generatePairedItemData(this.getInputData().length);
const files = await glob(fileSelector); const files = await glob(fileSelector);
@ -60,7 +58,6 @@ export class ReadBinaryFiles implements INodeType {
[dataPropertyName]: await this.helpers.prepareBinaryData(stream, filePath), [dataPropertyName]: await this.helpers.prepareBinaryData(stream, filePath),
}, },
json: {}, json: {},
pairedItem,
}); });
} }

8
packages/nodes-base/nodes/RespondToWebhook/RespondToWebhook.node.ts
View file

@ -20,7 +20,7 @@ import {
} from 'n8n-workflow'; } from 'n8n-workflow';
import set from 'lodash/set'; import set from 'lodash/set';
import jwt from 'jsonwebtoken'; import jwt from 'jsonwebtoken';
import { formatPrivateKey, generatePairedItemData } from '../../utils/utilities'; import { formatPrivateKey } from '../../utils/utilities';
export class RespondToWebhook implements INodeType { export class RespondToWebhook implements INodeType {
description: INodeTypeDescription = { description: INodeTypeDescription = {
@ -444,11 +444,7 @@ export class RespondToWebhook implements INodeType {
this.sendResponse(response); this.sendResponse(response);
} catch (error) { } catch (error) {
if (this.continueOnFail()) { if (this.continueOnFail()) {
const itemData = generatePairedItemData(items.length); const returnData = [{ json: { error: error.message } }];
const returnData = this.helpers.constructExecutionMetaData(
[{ json: { error: error.message } }],
{ itemData },
);
return [returnData]; return [returnData];
} }

4
packages/nodes-base/nodes/RssFeedRead/RssFeedRead.node.ts
View file

@ -5,11 +5,11 @@ import type {
INodeExecutionData, INodeExecutionData,
INodeType, INodeType,
INodeTypeDescription, INodeTypeDescription,
IPairedItemData,
} from 'n8n-workflow'; } from 'n8n-workflow';
import { NodeConnectionType, NodeOperationError } from 'n8n-workflow'; import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
import Parser from 'rss-parser'; import Parser from 'rss-parser';
import { generatePairedItemData } from '../../utils/utilities';
// Utility function // Utility function
@ -76,7 +76,7 @@ export class RssFeedRead implements INodeType {
if (nodeVersion >= 1.1) { if (nodeVersion >= 1.1) {
itemsLength = items.length; itemsLength = items.length;
} else { } else {
fallbackPairedItems = generatePairedItemData(items.length); fallbackPairedItems = [] as IPairedItemData[];
} }
for (let i = 0; i < itemsLength; i++) { for (let i = 0; i < itemsLength; i++) {

5
packages/nodes-base/nodes/SpreadsheetFile/v1/SpreadsheetFileV1.node.ts
View file

@ -29,7 +29,7 @@ import {
fromFileOptions, fromFileOptions,
toFileOptions, toFileOptions,
} from '../description'; } from '../description';
import { flattenObject, generatePairedItemData } from '@utils/utilities'; import { flattenObject } from '@utils/utilities';
import { oldVersionNotice } from '@utils/descriptions'; import { oldVersionNotice } from '@utils/descriptions';
export class SpreadsheetFileV1 implements INodeType { export class SpreadsheetFileV1 implements INodeType {
@ -58,7 +58,6 @@ export class SpreadsheetFileV1 implements INodeType {
async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> { async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
const items = this.getInputData(); const items = this.getInputData();
const pairedItem = generatePairedItemData(items.length);
const operation = this.getNodeParameter('operation', 0); const operation = this.getNodeParameter('operation', 0);
@ -230,7 +229,6 @@ export class SpreadsheetFileV1 implements INodeType {
const newItem: INodeExecutionData = { const newItem: INodeExecutionData = {
json: {}, json: {},
binary: {}, binary: {},
pairedItem,
}; };
let fileName = `spreadsheet.${fileFormat}`; let fileName = `spreadsheet.${fileFormat}`;
@ -247,7 +245,6 @@ export class SpreadsheetFileV1 implements INodeType {
json: { json: {
error: error.message, error: error.message,
}, },
pairedItem,
}); });
} else { } else {
throw error; throw error;

5
packages/nodes-base/nodes/SpreadsheetFile/v2/toFile.operation.ts
View file

@ -1,7 +1,6 @@
import type { IExecuteFunctions, INodeExecutionData, INodeProperties } from 'n8n-workflow'; import type { IExecuteFunctions, INodeExecutionData, INodeProperties } from 'n8n-workflow';
import { toFileOptions, toFileProperties } from '../description'; import { toFileOptions, toFileProperties } from '../description';
import { generatePairedItemData } from '@utils/utilities';
import type { JsonToSpreadsheetBinaryFormat, JsonToSpreadsheetBinaryOptions } from '@utils/binary'; import type { JsonToSpreadsheetBinaryFormat, JsonToSpreadsheetBinaryOptions } from '@utils/binary';
import { convertJsonToSpreadsheetBinary } from '@utils/binary'; import { convertJsonToSpreadsheetBinary } from '@utils/binary';
@ -10,8 +9,6 @@ export const description: INodeProperties[] = [...toFileProperties, toFileOption
export async function execute(this: IExecuteFunctions, items: INodeExecutionData[]) { export async function execute(this: IExecuteFunctions, items: INodeExecutionData[]) {
const returnData: INodeExecutionData[] = []; const returnData: INodeExecutionData[] = [];
const pairedItem = generatePairedItemData(items.length);
try { try {
const binaryPropertyName = this.getNodeParameter('binaryPropertyName', 0); const binaryPropertyName = this.getNodeParameter('binaryPropertyName', 0);
const fileFormat = this.getNodeParameter('fileFormat', 0) as JsonToSpreadsheetBinaryFormat; const fileFormat = this.getNodeParameter('fileFormat', 0) as JsonToSpreadsheetBinaryFormat;
@ -24,7 +21,6 @@ export async function execute(this: IExecuteFunctions, items: INodeExecutionData
binary: { binary: {
[binaryPropertyName]: binaryData, [binaryPropertyName]: binaryData,
}, },
pairedItem,
}; };
returnData.push(newItem); returnData.push(newItem);
@ -34,7 +30,6 @@ export async function execute(this: IExecuteFunctions, items: INodeExecutionData
json: { json: {
error: error.message, error: error.message,
}, },
pairedItem,
}); });
} else { } else {
throw error; throw error;

7
packages/nodes-base/nodes/Stackby/Stackby.node.ts
View file

@ -7,7 +7,6 @@ import type {
} from 'n8n-workflow'; } from 'n8n-workflow';
import { NodeConnectionType, NodeOperationError } from 'n8n-workflow'; import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
import { generatePairedItemData } from '../../utils/utilities';
import type { IRecord } from './GenericFunction'; import type { IRecord } from './GenericFunction';
import { apiRequest, apiRequestAllItems } from './GenericFunction'; import { apiRequest, apiRequestAllItems } from './GenericFunction';
@ -283,11 +282,7 @@ export class Stackby implements INodeType {
); );
} catch (error) { } catch (error) {
if (this.continueOnFail()) { if (this.continueOnFail()) {
const itemData = generatePairedItemData(items.length); const executionErrorData = this.helpers.returnJsonArray({ error: error.message });
const executionErrorData = this.helpers.constructExecutionMetaData(
this.helpers.returnJsonArray({ error: error.message }),
{ itemData },
);
returnData.push(...executionErrorData); returnData.push(...executionErrorData);
} else { } else {
throw error; throw error;

6
packages/nodes-base/nodes/Transform/Summarize/Summarize.node.ts
View file

@ -6,7 +6,7 @@ import {
type INodeType, type INodeType,
type INodeTypeDescription, type INodeTypeDescription,
} from 'n8n-workflow'; } from 'n8n-workflow';
import { generatePairedItemData } from '../../../utils/utilities';
import { import {
type Aggregations, type Aggregations,
NUMERICAL_AGGREGATIONS, NUMERICAL_AGGREGATIONS,
@ -318,9 +318,7 @@ export class Summarize implements INodeType {
checkIfFieldExists.call(this, newItems, fieldsToSummarize, getValue); checkIfFieldExists.call(this, newItems, fieldsToSummarize, getValue);
} catch (error) { } catch (error) {
if (options.continueIfFieldNotFound) { if (options.continueIfFieldNotFound) {
const itemData = generatePairedItemData(items.length); return [[{ json: {} }]];
return [[{ json: {}, pairedItem: itemData }]];
} else { } else {
throw error; throw error;
} }