diff --git a/packages/core/src/Interfaces.ts b/packages/core/src/Interfaces.ts index 41a44e0057..538a1127ca 100644 --- a/packages/core/src/Interfaces.ts +++ b/packages/core/src/Interfaces.ts @@ -3,26 +3,10 @@ import type { IPollResponse, ITriggerResponse, IWorkflowSettings as IWorkflowSettingsWorkflow, - IExecuteFunctions as IExecuteFunctionsBase, - IExecuteSingleFunctions as IExecuteSingleFunctionsBase, - IHookFunctions as IHookFunctionsBase, - ILoadOptionsFunctions as ILoadOptionsFunctionsBase, - IPollFunctions as IPollFunctionsBase, - ITriggerFunctions as ITriggerFunctionsBase, - IWebhookFunctions as IWebhookFunctionsBase, BinaryMetadata, ValidationResult, } from 'n8n-workflow'; -// TODO: remove these after removing `n8n-core` dependency from `nodes-bases` -export type IExecuteFunctions = IExecuteFunctionsBase; -export type IExecuteSingleFunctions = IExecuteSingleFunctionsBase; -export type IHookFunctions = IHookFunctionsBase; -export type ILoadOptionsFunctions = ILoadOptionsFunctionsBase; -export type IPollFunctions = IPollFunctionsBase; -export type ITriggerFunctions = ITriggerFunctionsBase; -export type IWebhookFunctions = IWebhookFunctionsBase; - export interface IProcessMessage { // eslint-disable-next-line @typescript-eslint/no-explicit-any data?: any; diff --git a/packages/node-dev/README.md b/packages/node-dev/README.md index a168441623..f115f25e7b 100644 --- a/packages/node-dev/README.md +++ b/packages/node-dev/README.md @@ -61,8 +61,8 @@ would look like this: File named: `MyNode.node.ts` ```TypeScript -import { IExecuteFunctions } from 'n8n-core'; import { + IExecuteFunctions, INodeExecutionData, INodeType, INodeTypeDescription, diff --git a/packages/nodes-base/nodes/Aws/Rekognition/test/AwsRekognition.node.test.ts b/packages/nodes-base/nodes/Aws/Rekognition/test/AwsRekognition.node.test.ts index a0ce422e44..0c237d6002 100644 --- a/packages/nodes-base/nodes/Aws/Rekognition/test/AwsRekognition.node.test.ts +++ b/packages/nodes-base/nodes/Aws/Rekognition/test/AwsRekognition.node.test.ts @@ -1,4 +1,4 @@ -import { getWorkflowFilenames, testWorkflows } from '../../../../test/nodes/Helpers'; +import { getWorkflowFilenames, testWorkflows } from '@test/nodes/Helpers'; import nock from 'nock'; diff --git a/packages/nodes-base/nodes/Chargebee/Chargebee.node.ts b/packages/nodes-base/nodes/Chargebee/Chargebee.node.ts index 781c252bce..4440599a5c 100644 --- a/packages/nodes-base/nodes/Chargebee/Chargebee.node.ts +++ b/packages/nodes-base/nodes/Chargebee/Chargebee.node.ts @@ -448,7 +448,6 @@ export class Chargebee implements INodeType { async execute(this: IExecuteFunctions): Promise { const items = this.getInputData(); const returnData: INodeExecutionData[] = []; - let _item: INodeExecutionData; const credentials = await this.getCredentials('chargebeeApi'); @@ -461,7 +460,6 @@ export class Chargebee implements INodeType { for (let i = 0; i < items.length; i++) { try { - _item = items[i]; const resource = this.getNodeParameter('resource', i); const operation = this.getNodeParameter('operation', i); diff --git a/packages/nodes-base/nodes/Code/test/Code.node.test.ts b/packages/nodes-base/nodes/Code/test/Code.node.test.ts index 15a42f5e82..770295d1a1 100644 --- a/packages/nodes-base/nodes/Code/test/Code.node.test.ts +++ b/packages/nodes-base/nodes/Code/test/Code.node.test.ts @@ -3,11 +3,7 @@ import { NodeVM } from 'vm2'; import type { IExecuteFunctions, IWorkflowDataProxyData } from 'n8n-workflow'; import { NodeHelpers } from 'n8n-workflow'; import { normalizeItems } from 'n8n-core'; -import { - testWorkflows, - getWorkflowFilenames, - initBinaryDataManager, -} from '../../../test/nodes/Helpers'; +import { testWorkflows, getWorkflowFilenames, initBinaryDataManager } from '@test/nodes/Helpers'; import { Code } from '../Code.node'; import { ValidationError } from '../ValidationError'; diff --git a/packages/nodes-base/nodes/CompareDatasets/test/node/CompareDatasets.test.ts b/packages/nodes-base/nodes/CompareDatasets/test/node/CompareDatasets.test.ts index 80c545b795..36b48febcc 100644 --- a/packages/nodes-base/nodes/CompareDatasets/test/node/CompareDatasets.test.ts +++ b/packages/nodes-base/nodes/CompareDatasets/test/node/CompareDatasets.test.ts @@ -1,4 +1,4 @@ -import { testWorkflows, getWorkflowFilenames } from '../../../../test/nodes/Helpers'; +import { testWorkflows, getWorkflowFilenames } from '@test/nodes/Helpers'; const workflows = getWorkflowFilenames(__dirname); diff --git a/packages/nodes-base/nodes/Compression/test/node/Compression.test.ts b/packages/nodes-base/nodes/Compression/test/node/Compression.test.ts index f6ad4066ae..5fbe417963 100644 --- a/packages/nodes-base/nodes/Compression/test/node/Compression.test.ts +++ b/packages/nodes-base/nodes/Compression/test/node/Compression.test.ts @@ -1,5 +1,5 @@ /* eslint-disable @typescript-eslint/no-loop-func */ -import type { WorkflowTestData } from '../../../../test/nodes/types'; +import type { WorkflowTestData } from '@test/nodes/types'; import type { IDataObject } from 'n8n-workflow'; import { @@ -7,8 +7,8 @@ import { setup, initBinaryDataManager, readJsonFileSync, -} from '../../../../test/nodes/Helpers'; -import { executeWorkflow } from '../../../../test/nodes/ExecuteWorkflow'; +} from '@test/nodes/Helpers'; +import { executeWorkflow } from '@test/nodes/ExecuteWorkflow'; import path from 'path'; import os from 'node:os'; diff --git a/packages/nodes-base/nodes/CrateDb/CrateDb.node.ts b/packages/nodes-base/nodes/CrateDb/CrateDb.node.ts index 689881910e..01dab5751e 100644 --- a/packages/nodes-base/nodes/CrateDb/CrateDb.node.ts +++ b/packages/nodes-base/nodes/CrateDb/CrateDb.node.ts @@ -373,7 +373,7 @@ export class CrateDb implements INodeType { returning, ); } - const _updateItems = await db.multi(pgp.helpers.concat(queries)); + await db.multi(pgp.helpers.concat(queries)); returnItems = this.helpers.returnJsonArray(getItemsCopy(items, columns)); } } else { diff --git a/packages/nodes-base/nodes/Crypto/test/Crypto.test.ts b/packages/nodes-base/nodes/Crypto/test/Crypto.test.ts index f78e21610b..ab4742b70d 100644 --- a/packages/nodes-base/nodes/Crypto/test/Crypto.test.ts +++ b/packages/nodes-base/nodes/Crypto/test/Crypto.test.ts @@ -1,11 +1,7 @@ import fs from 'fs'; import fsPromises from 'fs/promises'; import { Readable } from 'stream'; -import { - testWorkflows, - getWorkflowFilenames, - initBinaryDataManager, -} from '../../../test/nodes/Helpers'; +import { testWorkflows, getWorkflowFilenames, initBinaryDataManager } from '@test/nodes/Helpers'; const workflows = getWorkflowFilenames(__dirname); diff --git a/packages/nodes-base/nodes/DateTime/test/node/DateTime.test.ts b/packages/nodes-base/nodes/DateTime/test/node/DateTime.test.ts index 98c2b2f1f5..99110c67b0 100644 --- a/packages/nodes-base/nodes/DateTime/test/node/DateTime.test.ts +++ b/packages/nodes-base/nodes/DateTime/test/node/DateTime.test.ts @@ -1,5 +1,5 @@ import moment from 'moment'; -import { testWorkflows, getWorkflowFilenames } from '../../../../test/nodes/Helpers'; +import { testWorkflows, getWorkflowFilenames } from '@test/nodes/Helpers'; const workflows = getWorkflowFilenames(__dirname); diff --git a/packages/nodes-base/nodes/Disqus/Disqus.node.ts b/packages/nodes-base/nodes/Disqus/Disqus.node.ts index 41222d243c..47d556c754 100644 --- a/packages/nodes-base/nodes/Disqus/Disqus.node.ts +++ b/packages/nodes-base/nodes/Disqus/Disqus.node.ts @@ -577,12 +577,10 @@ export class Disqus implements INodeType { let endpoint = ''; let requestMethod = ''; - let _body: IDataObject | Buffer; let qs: IDataObject; for (let i = 0; i < items.length; i++) { try { - _body = {}; qs = {}; if (resource === 'forum') { diff --git a/packages/nodes-base/nodes/ExecuteCommand/test/ExecuteCommand.node.test.ts b/packages/nodes-base/nodes/ExecuteCommand/test/ExecuteCommand.node.test.ts index 28f8018e11..bde43182f1 100644 --- a/packages/nodes-base/nodes/ExecuteCommand/test/ExecuteCommand.node.test.ts +++ b/packages/nodes-base/nodes/ExecuteCommand/test/ExecuteCommand.node.test.ts @@ -1,4 +1,4 @@ -import { testWorkflows, getWorkflowFilenames } from '../../../test/nodes/Helpers'; +import { testWorkflows, getWorkflowFilenames } from '@test/nodes/Helpers'; const workflows = getWorkflowFilenames(__dirname); describe('Execute Execute Command Node', () => testWorkflows(workflows)); diff --git a/packages/nodes-base/nodes/Filter/test/Filter.node.test.ts b/packages/nodes-base/nodes/Filter/test/Filter.node.test.ts index 7bb6dfc1c7..218ced5f51 100644 --- a/packages/nodes-base/nodes/Filter/test/Filter.node.test.ts +++ b/packages/nodes-base/nodes/Filter/test/Filter.node.test.ts @@ -1,4 +1,4 @@ -import { testWorkflows, getWorkflowFilenames } from '../../../test/nodes/Helpers'; +import { testWorkflows, getWorkflowFilenames } from '@test/nodes/Helpers'; const workflows = getWorkflowFilenames(__dirname); diff --git a/packages/nodes-base/nodes/Git/Git.node.ts b/packages/nodes-base/nodes/Git/Git.node.ts index b4dc39c57e..7c8a69c5f3 100644 --- a/packages/nodes-base/nodes/Git/Git.node.ts +++ b/packages/nodes-base/nodes/Git/Git.node.ts @@ -217,12 +217,9 @@ export class Git implements INodeType { }; const operation = this.getNodeParameter('operation', 0); - let _item: INodeExecutionData; const returnItems: INodeExecutionData[] = []; for (let itemIndex = 0; itemIndex < items.length; itemIndex++) { try { - _item = items[itemIndex]; - const repositoryPath = this.getNodeParameter('repositoryPath', itemIndex, '') as string; const options = this.getNodeParameter('options', itemIndex, {}); diff --git a/packages/nodes-base/nodes/Gitlab/Gitlab.node.ts b/packages/nodes-base/nodes/Gitlab/Gitlab.node.ts index 421c5905ca..aa928d7957 100644 --- a/packages/nodes-base/nodes/Gitlab/Gitlab.node.ts +++ b/packages/nodes-base/nodes/Gitlab/Gitlab.node.ts @@ -1319,22 +1319,22 @@ export class Gitlab implements INodeType { const items = this.getInputData(); const returnData: INodeExecutionData[] = []; - let _credentials; + // let _credentials; - const authenticationMethod = this.getNodeParameter('authentication', 0); + // const authenticationMethod = this.getNodeParameter('authentication', 0); - try { - if (authenticationMethod === 'accessToken') { - _credentials = await this.getCredentials('gitlabApi'); - } else { - _credentials = await this.getCredentials('gitlabOAuth2Api'); - } - } catch (error) { - if (this.continueOnFail()) { - return [this.helpers.returnJsonArray([{ error: error.message }])]; - } - throw new NodeOperationError(this.getNode(), error as Error); - } + // try { + // if (authenticationMethod === 'accessToken') { + // _credentials = await this.getCredentials('gitlabApi'); + // } else { + // _credentials = await this.getCredentials('gitlabOAuth2Api'); + // } + // } catch (error) { + // if (this.continueOnFail()) { + // return [this.helpers.returnJsonArray([{ error: error.message }])]; + // } + // throw new NodeOperationError(this.getNode(), error as Error); + // } // Operations which overwrite the returned data const overwriteDataOperations = [ diff --git a/packages/nodes-base/nodes/Google/BigQuery/test/v2/node/executeQuery.test.ts b/packages/nodes-base/nodes/Google/BigQuery/test/v2/node/executeQuery.test.ts index e424ba7a11..7f36571bd4 100644 --- a/packages/nodes-base/nodes/Google/BigQuery/test/v2/node/executeQuery.test.ts +++ b/packages/nodes-base/nodes/Google/BigQuery/test/v2/node/executeQuery.test.ts @@ -1,8 +1,8 @@ import type { INodeTypes } from 'n8n-workflow'; -import { setup, workflowToTests } from '../../../../../../test/nodes/Helpers'; -import type { WorkflowTestData } from '../../../../../../test/nodes/types'; -import { executeWorkflow } from '../../../../../../test/nodes/ExecuteWorkflow'; +import { setup, workflowToTests } from '@test/nodes/Helpers'; +import type { WorkflowTestData } from '@test/nodes/types'; +import { executeWorkflow } from '@test/nodes/ExecuteWorkflow'; import * as transport from '../../../v2/transport'; diff --git a/packages/nodes-base/nodes/Google/BigQuery/test/v2/node/insert.autoMapMode.test.ts b/packages/nodes-base/nodes/Google/BigQuery/test/v2/node/insert.autoMapMode.test.ts index c795562832..13c2d4ae77 100644 --- a/packages/nodes-base/nodes/Google/BigQuery/test/v2/node/insert.autoMapMode.test.ts +++ b/packages/nodes-base/nodes/Google/BigQuery/test/v2/node/insert.autoMapMode.test.ts @@ -1,8 +1,8 @@ import type { INodeTypes } from 'n8n-workflow'; -import { setup, workflowToTests } from '../../../../../../test/nodes/Helpers'; -import type { WorkflowTestData } from '../../../../../../test/nodes/types'; -import { executeWorkflow } from '../../../../../../test/nodes/ExecuteWorkflow'; +import { setup, workflowToTests } from '@test/nodes/Helpers'; +import type { WorkflowTestData } from '@test/nodes/types'; +import { executeWorkflow } from '@test/nodes/ExecuteWorkflow'; import nock from 'nock'; import * as transport from '../../../v2/transport'; diff --git a/packages/nodes-base/nodes/Google/BigQuery/test/v2/node/insert.manualMode.test.ts b/packages/nodes-base/nodes/Google/BigQuery/test/v2/node/insert.manualMode.test.ts index 52005cb834..8478555f3d 100644 --- a/packages/nodes-base/nodes/Google/BigQuery/test/v2/node/insert.manualMode.test.ts +++ b/packages/nodes-base/nodes/Google/BigQuery/test/v2/node/insert.manualMode.test.ts @@ -1,8 +1,8 @@ import type { INodeTypes } from 'n8n-workflow'; -import { setup, workflowToTests } from '../../../../../../test/nodes/Helpers'; -import type { WorkflowTestData } from '../../../../../../test/nodes/types'; -import { executeWorkflow } from '../../../../../../test/nodes/ExecuteWorkflow'; +import { setup, workflowToTests } from '@test/nodes/Helpers'; +import type { WorkflowTestData } from '@test/nodes/types'; +import { executeWorkflow } from '@test/nodes/ExecuteWorkflow'; import nock from 'nock'; import * as transport from '../../../v2/transport'; diff --git a/packages/nodes-base/nodes/Google/BigQuery/test/v2/utils/utils.test.ts b/packages/nodes-base/nodes/Google/BigQuery/test/v2/utils/utils.test.ts index 0af16e8eb2..80b27a351d 100644 --- a/packages/nodes-base/nodes/Google/BigQuery/test/v2/utils/utils.test.ts +++ b/packages/nodes-base/nodes/Google/BigQuery/test/v2/utils/utils.test.ts @@ -1,8 +1,11 @@ -import type { IDataObject } from 'n8n-workflow'; +import type { IDataObject, IExecuteFunctions } from 'n8n-workflow'; +import { constructExecutionMetaData } from 'n8n-core'; import { prepareOutput } from '../../../v2/helpers/utils'; +import { mock } from 'jest-mock-extended'; describe('Google BigQuery v2 Utils', () => { it('should prepareOutput', () => { + const thisArg = mock({ helpers: mock({ constructExecutionMetaData }) }); const response: IDataObject = { kind: 'bigquery#getQueryResultsResponse', etag: 'e_tag', @@ -211,7 +214,7 @@ describe('Google BigQuery v2 Utils', () => { jobComplete: true, cacheHit: true, }; - const returnData = prepareOutput(response, 0, false, false); + const returnData = prepareOutput.call(thisArg, response, 0, false, false); expect(returnData).toBeDefined(); // expect(returnData).toHaveProperty('nodes'); diff --git a/packages/nodes-base/nodes/Google/BigQuery/v1/GoogleBigQueryV1.node.ts b/packages/nodes-base/nodes/Google/BigQuery/v1/GoogleBigQueryV1.node.ts index 748aaad449..3e3f4ff6ee 100644 --- a/packages/nodes-base/nodes/Google/BigQuery/v1/GoogleBigQueryV1.node.ts +++ b/packages/nodes-base/nodes/Google/BigQuery/v1/GoogleBigQueryV1.node.ts @@ -1,8 +1,7 @@ /* eslint-disable n8n-nodes-base/node-filename-against-convention */ -import type { IExecuteFunctions } from 'n8n-core'; - import type { IDataObject, + IExecuteFunctions, ILoadOptionsFunctions, INodeExecutionData, INodePropertyOptions, diff --git a/packages/nodes-base/nodes/Google/BigQuery/v2/GoogleBigQueryV2.node.ts b/packages/nodes-base/nodes/Google/BigQuery/v2/GoogleBigQueryV2.node.ts index 771b93e95f..1c0f589da7 100644 --- a/packages/nodes-base/nodes/Google/BigQuery/v2/GoogleBigQueryV2.node.ts +++ b/packages/nodes-base/nodes/Google/BigQuery/v2/GoogleBigQueryV2.node.ts @@ -1,7 +1,6 @@ /* eslint-disable n8n-nodes-base/node-filename-against-convention */ -import type { IExecuteFunctions } from 'n8n-core'; - import type { + IExecuteFunctions, INodeExecutionData, INodeType, INodeTypeBaseDescription, diff --git a/packages/nodes-base/nodes/Google/BigQuery/v2/actions/database/executeQuery.operation.ts b/packages/nodes-base/nodes/Google/BigQuery/v2/actions/database/executeQuery.operation.ts index 7a73c36ab8..b08920cdb1 100644 --- a/packages/nodes-base/nodes/Google/BigQuery/v2/actions/database/executeQuery.operation.ts +++ b/packages/nodes-base/nodes/Google/BigQuery/v2/actions/database/executeQuery.operation.ts @@ -1,6 +1,9 @@ -import type { IExecuteFunctions } from 'n8n-core'; - -import type { IDataObject, INodeExecutionData, INodeProperties } from 'n8n-workflow'; +import type { + IDataObject, + IExecuteFunctions, + INodeExecutionData, + INodeProperties, +} from 'n8n-workflow'; import { NodeOperationError, sleep } from 'n8n-workflow'; import { getResolvables, updateDisplayOptions } from '@utils/utilities'; @@ -232,7 +235,7 @@ export async function execute(this: IExecuteFunctions): Promise error.message); diff --git a/packages/nodes-base/nodes/Google/BigQuery/v2/actions/database/insert.operation.ts b/packages/nodes-base/nodes/Google/BigQuery/v2/actions/database/insert.operation.ts index 1906811f69..5a8fa3fc51 100644 --- a/packages/nodes-base/nodes/Google/BigQuery/v2/actions/database/insert.operation.ts +++ b/packages/nodes-base/nodes/Google/BigQuery/v2/actions/database/insert.operation.ts @@ -1,5 +1,9 @@ -import type { IExecuteFunctions } from 'n8n-core'; -import type { IDataObject, INodeExecutionData, INodeProperties } from 'n8n-workflow'; +import type { + IDataObject, + IExecuteFunctions, + INodeExecutionData, + INodeProperties, +} from 'n8n-workflow'; import { NodeOperationError } from 'n8n-workflow'; import { v4 as uuid } from 'uuid'; import { updateDisplayOptions } from '@utils/utilities'; diff --git a/packages/nodes-base/nodes/Google/BigQuery/v2/actions/router.ts b/packages/nodes-base/nodes/Google/BigQuery/v2/actions/router.ts index e2888a85ee..1e62b9449b 100644 --- a/packages/nodes-base/nodes/Google/BigQuery/v2/actions/router.ts +++ b/packages/nodes-base/nodes/Google/BigQuery/v2/actions/router.ts @@ -1,5 +1,4 @@ -import type { IExecuteFunctions } from 'n8n-core'; -import type { INodeExecutionData } from 'n8n-workflow'; +import type { IExecuteFunctions, INodeExecutionData } from 'n8n-workflow'; import { NodeOperationError } from 'n8n-workflow'; import type { GoogleBigQuery } from './node.type'; diff --git a/packages/nodes-base/nodes/Google/BigQuery/v2/helpers/utils.ts b/packages/nodes-base/nodes/Google/BigQuery/v2/helpers/utils.ts index 7325446592..96fd1787d7 100644 --- a/packages/nodes-base/nodes/Google/BigQuery/v2/helpers/utils.ts +++ b/packages/nodes-base/nodes/Google/BigQuery/v2/helpers/utils.ts @@ -1,6 +1,4 @@ -import type { IExecuteFunctions } from 'n8n-core'; -import { constructExecutionMetaData } from 'n8n-core'; -import type { IDataObject, INodeExecutionData } from 'n8n-workflow'; +import type { IDataObject, IExecuteFunctions, INodeExecutionData } from 'n8n-workflow'; import { jsonParse, NodeOperationError } from 'n8n-workflow'; import type { SchemaField, TableRawData, TableSchema } from './interfaces'; @@ -56,6 +54,7 @@ export function simplify(data: TableRawData[], schema: SchemaField[], includeSch } export function prepareOutput( + this: IExecuteFunctions, response: IDataObject, itemIndex: number, rawOutput: boolean, @@ -82,9 +81,12 @@ export function prepareOutput( } } - const executionData = constructExecutionMetaData(wrapData(responseData as IDataObject[]), { - itemData: { item: itemIndex }, - }); + const executionData = this.helpers.constructExecutionMetaData( + wrapData(responseData as IDataObject[]), + { + itemData: { item: itemIndex }, + }, + ); return executionData; } diff --git a/packages/nodes-base/nodes/Google/BigQuery/v2/transport/index.ts b/packages/nodes-base/nodes/Google/BigQuery/v2/transport/index.ts index b616917b17..5c3785afeb 100644 --- a/packages/nodes-base/nodes/Google/BigQuery/v2/transport/index.ts +++ b/packages/nodes-base/nodes/Google/BigQuery/v2/transport/index.ts @@ -1,7 +1,12 @@ import type { OptionsWithUri } from 'request'; -import type { IExecuteFunctions, IExecuteSingleFunctions, ILoadOptionsFunctions } from 'n8n-core'; -import type { IDataObject, JsonObject } from 'n8n-workflow'; +import type { + IDataObject, + IExecuteFunctions, + IExecuteSingleFunctions, + ILoadOptionsFunctions, + JsonObject, +} from 'n8n-workflow'; import { NodeApiError, NodeOperationError } from 'n8n-workflow'; import { getGoogleAccessToken } from '../../../GenericFunctions'; diff --git a/packages/nodes-base/nodes/Google/Drive/test/v2/node/drive/create.test.ts b/packages/nodes-base/nodes/Google/Drive/test/v2/node/drive/create.test.ts index a86a7e8265..55b84d7763 100644 --- a/packages/nodes-base/nodes/Google/Drive/test/v2/node/drive/create.test.ts +++ b/packages/nodes-base/nodes/Google/Drive/test/v2/node/drive/create.test.ts @@ -16,9 +16,6 @@ jest.mock('../../../../v2/transport', () => { }; }); -// eslint-disable-next-line @typescript-eslint/no-unused-vars, unused-imports/no-unused-imports -import * as uuid from 'uuid'; - jest.mock('uuid', () => { const originalModule = jest.requireActual('uuid'); return { diff --git a/packages/nodes-base/nodes/Google/Drive/v2/actions/drive/create.operation.ts b/packages/nodes-base/nodes/Google/Drive/v2/actions/drive/create.operation.ts index 47f3be8a0b..deb4a321fb 100644 --- a/packages/nodes-base/nodes/Google/Drive/v2/actions/drive/create.operation.ts +++ b/packages/nodes-base/nodes/Google/Drive/v2/actions/drive/create.operation.ts @@ -1,7 +1,11 @@ -import type { IExecuteFunctions } from 'n8n-core'; -import type { IDataObject, INodeExecutionData, INodeProperties } from 'n8n-workflow'; +import type { + IDataObject, + IExecuteFunctions, + INodeExecutionData, + INodeProperties, +} from 'n8n-workflow'; -import { updateDisplayOptions } from '../../../../../../utils/utilities'; +import { updateDisplayOptions } from '@utils/utilities'; import { googleApiRequest } from '../../transport'; import { v4 as uuid } from 'uuid'; diff --git a/packages/nodes-base/nodes/Google/Drive/v2/actions/drive/deleteDrive.operation.ts b/packages/nodes-base/nodes/Google/Drive/v2/actions/drive/deleteDrive.operation.ts index 080c103eab..e1ea452356 100644 --- a/packages/nodes-base/nodes/Google/Drive/v2/actions/drive/deleteDrive.operation.ts +++ b/packages/nodes-base/nodes/Google/Drive/v2/actions/drive/deleteDrive.operation.ts @@ -1,7 +1,6 @@ -import type { IExecuteFunctions } from 'n8n-core'; -import type { INodeExecutionData, INodeProperties } from 'n8n-workflow'; +import type { IExecuteFunctions, INodeExecutionData, INodeProperties } from 'n8n-workflow'; -import { updateDisplayOptions } from '../../../../../../utils/utilities'; +import { updateDisplayOptions } from '@utils/utilities'; import { googleApiRequest } from '../../transport'; import { sharedDriveRLC } from '../common.descriptions'; diff --git a/packages/nodes-base/nodes/Google/Drive/v2/actions/drive/get.operation.ts b/packages/nodes-base/nodes/Google/Drive/v2/actions/drive/get.operation.ts index cab2ee8a48..a7813ef3f4 100644 --- a/packages/nodes-base/nodes/Google/Drive/v2/actions/drive/get.operation.ts +++ b/packages/nodes-base/nodes/Google/Drive/v2/actions/drive/get.operation.ts @@ -1,7 +1,11 @@ -import type { IExecuteFunctions } from 'n8n-core'; -import type { IDataObject, INodeExecutionData, INodeProperties } from 'n8n-workflow'; +import type { + IExecuteFunctions, + IDataObject, + INodeExecutionData, + INodeProperties, +} from 'n8n-workflow'; -import { updateDisplayOptions } from '../../../../../../utils/utilities'; +import { updateDisplayOptions } from '@utils/utilities'; import { googleApiRequest } from '../../transport'; import { sharedDriveRLC } from '../common.descriptions'; diff --git a/packages/nodes-base/nodes/Google/Drive/v2/actions/drive/list.operation.ts b/packages/nodes-base/nodes/Google/Drive/v2/actions/drive/list.operation.ts index cd0fffa2ca..61ff570fb8 100644 --- a/packages/nodes-base/nodes/Google/Drive/v2/actions/drive/list.operation.ts +++ b/packages/nodes-base/nodes/Google/Drive/v2/actions/drive/list.operation.ts @@ -1,7 +1,11 @@ -import type { IExecuteFunctions } from 'n8n-core'; -import type { IDataObject, INodeExecutionData, INodeProperties } from 'n8n-workflow'; +import type { + IExecuteFunctions, + IDataObject, + INodeExecutionData, + INodeProperties, +} from 'n8n-workflow'; -import { updateDisplayOptions } from '../../../../../../utils/utilities'; +import { updateDisplayOptions } from '@utils/utilities'; import { googleApiRequest, googleApiRequestAllItems } from '../../transport'; diff --git a/packages/nodes-base/nodes/Google/Drive/v2/actions/drive/update.operation.ts b/packages/nodes-base/nodes/Google/Drive/v2/actions/drive/update.operation.ts index 04e51cfa06..99b5d5468a 100644 --- a/packages/nodes-base/nodes/Google/Drive/v2/actions/drive/update.operation.ts +++ b/packages/nodes-base/nodes/Google/Drive/v2/actions/drive/update.operation.ts @@ -1,7 +1,11 @@ -import type { IExecuteFunctions } from 'n8n-core'; -import type { IDataObject, INodeExecutionData, INodeProperties } from 'n8n-workflow'; +import type { + IExecuteFunctions, + IDataObject, + INodeExecutionData, + INodeProperties, +} from 'n8n-workflow'; -import { updateDisplayOptions } from '../../../../../../utils/utilities'; +import { updateDisplayOptions } from '@utils/utilities'; import { googleApiRequest } from '../../transport'; import { sharedDriveRLC } from '../common.descriptions'; diff --git a/packages/nodes-base/nodes/Google/Drive/v2/actions/file/copy.operation.ts b/packages/nodes-base/nodes/Google/Drive/v2/actions/file/copy.operation.ts index 20cad67780..04444abb4c 100644 --- a/packages/nodes-base/nodes/Google/Drive/v2/actions/file/copy.operation.ts +++ b/packages/nodes-base/nodes/Google/Drive/v2/actions/file/copy.operation.ts @@ -1,12 +1,12 @@ -import type { IExecuteFunctions } from 'n8n-core'; import type { IDataObject, + IExecuteFunctions, INodeExecutionData, INodeParameterResourceLocator, INodeProperties, } from 'n8n-workflow'; -import { updateDisplayOptions } from '../../../../../../utils/utilities'; +import { updateDisplayOptions } from '@utils/utilities'; import { googleApiRequest } from '../../transport'; import { driveRLC, fileRLC, folderRLC } from '../common.descriptions'; import { setParentFolder } from '../../helpers/utils'; diff --git a/packages/nodes-base/nodes/Google/Drive/v2/actions/file/createFromText.operation.ts b/packages/nodes-base/nodes/Google/Drive/v2/actions/file/createFromText.operation.ts index 2d109c51ca..36b5c9c89f 100644 --- a/packages/nodes-base/nodes/Google/Drive/v2/actions/file/createFromText.operation.ts +++ b/packages/nodes-base/nodes/Google/Drive/v2/actions/file/createFromText.operation.ts @@ -1,7 +1,11 @@ -import type { IExecuteFunctions } from 'n8n-core'; -import type { IDataObject, INodeExecutionData, INodeProperties } from 'n8n-workflow'; +import type { + IDataObject, + IExecuteFunctions, + INodeExecutionData, + INodeProperties, +} from 'n8n-workflow'; -import { updateDisplayOptions } from '../../../../../../utils/utilities'; +import { updateDisplayOptions } from '@utils/utilities'; import { driveRLC, folderRLC, updateCommonOptions } from '../common.descriptions'; import { googleApiRequest } from '../../transport'; import { DRIVE } from '../../helpers/interfaces'; diff --git a/packages/nodes-base/nodes/Google/Drive/v2/actions/file/deleteFile.operation.ts b/packages/nodes-base/nodes/Google/Drive/v2/actions/file/deleteFile.operation.ts index 3d76965e39..5116f05d7c 100644 --- a/packages/nodes-base/nodes/Google/Drive/v2/actions/file/deleteFile.operation.ts +++ b/packages/nodes-base/nodes/Google/Drive/v2/actions/file/deleteFile.operation.ts @@ -1,7 +1,6 @@ -import type { IExecuteFunctions } from 'n8n-core'; -import type { INodeExecutionData, INodeProperties } from 'n8n-workflow'; +import type { IExecuteFunctions, INodeExecutionData, INodeProperties } from 'n8n-workflow'; -import { updateDisplayOptions } from '../../../../../../utils/utilities'; +import { updateDisplayOptions } from '@utils/utilities'; import { googleApiRequest } from '../../transport'; import { fileRLC } from '../common.descriptions'; diff --git a/packages/nodes-base/nodes/Google/Drive/v2/actions/file/download.operation.ts b/packages/nodes-base/nodes/Google/Drive/v2/actions/file/download.operation.ts index 47341f5f30..bf84af9a72 100644 --- a/packages/nodes-base/nodes/Google/Drive/v2/actions/file/download.operation.ts +++ b/packages/nodes-base/nodes/Google/Drive/v2/actions/file/download.operation.ts @@ -1,12 +1,12 @@ -import type { IExecuteFunctions } from 'n8n-core'; import type { + IExecuteFunctions, IBinaryKeyData, IDataObject, INodeExecutionData, INodeProperties, } from 'n8n-workflow'; -import { updateDisplayOptions } from '../../../../../../utils/utilities'; +import { updateDisplayOptions } from '@utils/utilities'; import { googleApiRequest } from '../../transport'; import { fileRLC } from '../common.descriptions'; diff --git a/packages/nodes-base/nodes/Google/Drive/v2/actions/file/move.operation.ts b/packages/nodes-base/nodes/Google/Drive/v2/actions/file/move.operation.ts index e2b4aac1d5..7a7e743095 100644 --- a/packages/nodes-base/nodes/Google/Drive/v2/actions/file/move.operation.ts +++ b/packages/nodes-base/nodes/Google/Drive/v2/actions/file/move.operation.ts @@ -1,7 +1,11 @@ -import type { IExecuteFunctions } from 'n8n-core'; -import type { IDataObject, INodeExecutionData, INodeProperties } from 'n8n-workflow'; +import type { + IExecuteFunctions, + IDataObject, + INodeExecutionData, + INodeProperties, +} from 'n8n-workflow'; -import { updateDisplayOptions } from '../../../../../../utils/utilities'; +import { updateDisplayOptions } from '@utils/utilities'; import { driveRLC, fileRLC, folderRLC } from '../common.descriptions'; import { googleApiRequest } from '../../transport'; import { setParentFolder } from '../../helpers/utils'; diff --git a/packages/nodes-base/nodes/Google/Drive/v2/actions/file/share.operation.ts b/packages/nodes-base/nodes/Google/Drive/v2/actions/file/share.operation.ts index 9db3dd3882..3285559d3d 100644 --- a/packages/nodes-base/nodes/Google/Drive/v2/actions/file/share.operation.ts +++ b/packages/nodes-base/nodes/Google/Drive/v2/actions/file/share.operation.ts @@ -1,7 +1,11 @@ -import type { IExecuteFunctions } from 'n8n-core'; -import type { IDataObject, INodeExecutionData, INodeProperties } from 'n8n-workflow'; +import type { + IDataObject, + IExecuteFunctions, + INodeExecutionData, + INodeProperties, +} from 'n8n-workflow'; -import { updateDisplayOptions } from '../../../../../../utils/utilities'; +import { updateDisplayOptions } from '@utils/utilities'; import { googleApiRequest } from '../../transport'; import { fileRLC, permissionsOptions, shareOptions } from '../common.descriptions'; diff --git a/packages/nodes-base/nodes/Google/Drive/v2/actions/file/update.operation.ts b/packages/nodes-base/nodes/Google/Drive/v2/actions/file/update.operation.ts index 3e5c8a595a..ddd728f1bb 100644 --- a/packages/nodes-base/nodes/Google/Drive/v2/actions/file/update.operation.ts +++ b/packages/nodes-base/nodes/Google/Drive/v2/actions/file/update.operation.ts @@ -1,8 +1,12 @@ -import type { IExecuteFunctions } from 'n8n-core'; -import type { IDataObject, INodeExecutionData, INodeProperties } from 'n8n-workflow'; +import type { + IDataObject, + IExecuteFunctions, + INodeExecutionData, + INodeProperties, +} from 'n8n-workflow'; import { NodeOperationError } from 'n8n-workflow'; -import { updateDisplayOptions } from '../../../../../../utils/utilities'; +import { updateDisplayOptions } from '@utils/utilities'; import { getItemBinaryData, prepareQueryString, diff --git a/packages/nodes-base/nodes/Google/Drive/v2/actions/file/upload.operation.ts b/packages/nodes-base/nodes/Google/Drive/v2/actions/file/upload.operation.ts index 0ed1107d96..17b5bb3fcc 100644 --- a/packages/nodes-base/nodes/Google/Drive/v2/actions/file/upload.operation.ts +++ b/packages/nodes-base/nodes/Google/Drive/v2/actions/file/upload.operation.ts @@ -1,7 +1,11 @@ -import type { IExecuteFunctions } from 'n8n-core'; -import type { IDataObject, INodeExecutionData, INodeProperties } from 'n8n-workflow'; +import type { + IDataObject, + IExecuteFunctions, + INodeExecutionData, + INodeProperties, +} from 'n8n-workflow'; -import { updateDisplayOptions } from '../../../../../../utils/utilities'; +import { updateDisplayOptions } from '@utils/utilities'; import { googleApiRequest } from '../../transport'; import { driveRLC, folderRLC, updateCommonOptions } from '../common.descriptions'; import { diff --git a/packages/nodes-base/nodes/Google/Drive/v2/actions/fileFolder/search.operation.ts b/packages/nodes-base/nodes/Google/Drive/v2/actions/fileFolder/search.operation.ts index 597b15cf72..5041d8f2f2 100644 --- a/packages/nodes-base/nodes/Google/Drive/v2/actions/fileFolder/search.operation.ts +++ b/packages/nodes-base/nodes/Google/Drive/v2/actions/fileFolder/search.operation.ts @@ -1,7 +1,11 @@ -import type { IExecuteFunctions } from 'n8n-core'; -import type { IDataObject, INodeExecutionData, INodeProperties } from 'n8n-workflow'; +import type { + IDataObject, + IExecuteFunctions, + INodeExecutionData, + INodeProperties, +} from 'n8n-workflow'; -import { updateDisplayOptions } from '../../../../../../utils/utilities'; +import { updateDisplayOptions } from '@utils/utilities'; import { driveRLC, fileTypesOptions, folderRLC } from '../common.descriptions'; import { googleApiRequest, googleApiRequestAllItems } from '../../transport'; import { prepareQueryString, updateDriveScopes } from '../../helpers/utils'; diff --git a/packages/nodes-base/nodes/Google/Drive/v2/actions/folder/create.operation.ts b/packages/nodes-base/nodes/Google/Drive/v2/actions/folder/create.operation.ts index 8b2165bf32..3a9a5bdbec 100644 --- a/packages/nodes-base/nodes/Google/Drive/v2/actions/folder/create.operation.ts +++ b/packages/nodes-base/nodes/Google/Drive/v2/actions/folder/create.operation.ts @@ -1,7 +1,11 @@ -import type { IExecuteFunctions } from 'n8n-core'; -import type { IDataObject, INodeExecutionData, INodeProperties } from 'n8n-workflow'; +import type { + IDataObject, + IExecuteFunctions, + INodeExecutionData, + INodeProperties, +} from 'n8n-workflow'; -import { updateDisplayOptions } from '../../../../../../utils/utilities'; +import { updateDisplayOptions } from '@utils/utilities'; import { googleApiRequest } from '../../transport'; import { driveRLC, folderRLC } from '../common.descriptions'; import { DRIVE } from '../../helpers/interfaces'; diff --git a/packages/nodes-base/nodes/Google/Drive/v2/actions/folder/deleteFolder.operation.ts b/packages/nodes-base/nodes/Google/Drive/v2/actions/folder/deleteFolder.operation.ts index d6dc077009..dfbbf7f607 100644 --- a/packages/nodes-base/nodes/Google/Drive/v2/actions/folder/deleteFolder.operation.ts +++ b/packages/nodes-base/nodes/Google/Drive/v2/actions/folder/deleteFolder.operation.ts @@ -1,7 +1,6 @@ -import type { IExecuteFunctions } from 'n8n-core'; -import type { INodeExecutionData, INodeProperties } from 'n8n-workflow'; +import type { IExecuteFunctions, INodeExecutionData, INodeProperties } from 'n8n-workflow'; -import { updateDisplayOptions } from '../../../../../../utils/utilities'; +import { updateDisplayOptions } from '@utils/utilities'; import { googleApiRequest } from '../../transport'; import { folderNoRootRLC } from '../common.descriptions'; diff --git a/packages/nodes-base/nodes/Google/Drive/v2/actions/folder/share.operation.ts b/packages/nodes-base/nodes/Google/Drive/v2/actions/folder/share.operation.ts index e597ec3919..e31db0c16b 100644 --- a/packages/nodes-base/nodes/Google/Drive/v2/actions/folder/share.operation.ts +++ b/packages/nodes-base/nodes/Google/Drive/v2/actions/folder/share.operation.ts @@ -1,7 +1,11 @@ -import type { IExecuteFunctions } from 'n8n-core'; -import type { IDataObject, INodeExecutionData, INodeProperties } from 'n8n-workflow'; +import type { + IExecuteFunctions, + IDataObject, + INodeExecutionData, + INodeProperties, +} from 'n8n-workflow'; -import { updateDisplayOptions } from '../../../../../../utils/utilities'; +import { updateDisplayOptions } from '@utils/utilities'; import { googleApiRequest } from '../../transport'; import { folderNoRootRLC, permissionsOptions, shareOptions } from '../common.descriptions'; diff --git a/packages/nodes-base/nodes/Google/GenericFunctions.ts b/packages/nodes-base/nodes/Google/GenericFunctions.ts index 4ee5f0dc4c..1ee4a2d902 100644 --- a/packages/nodes-base/nodes/Google/GenericFunctions.ts +++ b/packages/nodes-base/nodes/Google/GenericFunctions.ts @@ -1,5 +1,11 @@ -import type { IExecuteFunctions, IExecuteSingleFunctions, ILoadOptionsFunctions } from 'n8n-core'; -import type { ICredentialTestFunctions, IDataObject, IPollFunctions } from 'n8n-workflow'; +import type { + IExecuteFunctions, + IExecuteSingleFunctions, + ILoadOptionsFunctions, + ICredentialTestFunctions, + IDataObject, + IPollFunctions, +} from 'n8n-workflow'; import type { OptionsWithUri } from 'request'; import moment from 'moment-timezone'; diff --git a/packages/nodes-base/nodes/Google/Sheet/v1/GoogleSheet.ts b/packages/nodes-base/nodes/Google/Sheet/v1/GoogleSheet.ts index 272780fe72..224b2f5c0e 100644 --- a/packages/nodes-base/nodes/Google/Sheet/v1/GoogleSheet.ts +++ b/packages/nodes-base/nodes/Google/Sheet/v1/GoogleSheet.ts @@ -399,7 +399,7 @@ export class GoogleSheet { if (itemKey === undefined || itemKey === null) { // Item does not have the indexKey so we can ignore it or append it if upsert true if (upsert) { - const _data = await this.appendSheetData( + await this.appendSheetData( [inputItem], this.encodeRange(range), keyRowIndex, @@ -415,7 +415,7 @@ export class GoogleSheet { if (itemKeyIndex === -1) { // Key does not exist in the Sheet so it can not be updated so skip it or append it if upsert true if (upsert) { - const _data = await this.appendSheetData( + await this.appendSheetData( [inputItem], this.encodeRange(range), keyRowIndex, diff --git a/packages/nodes-base/nodes/Google/Sheet/v1/GoogleSheetsV1.node.ts b/packages/nodes-base/nodes/Google/Sheet/v1/GoogleSheetsV1.node.ts index 4ad70703f0..e3d7865075 100644 --- a/packages/nodes-base/nodes/Google/Sheet/v1/GoogleSheetsV1.node.ts +++ b/packages/nodes-base/nodes/Google/Sheet/v1/GoogleSheetsV1.node.ts @@ -130,7 +130,7 @@ export class GoogleSheetsV1 implements INodeType { const usePathForKeyRow = (options.usePathForKeyRow || false) as boolean; // Convert data into array format - const _data = await sheet.appendSheetData( + await sheet.appendSheetData( setData, sheet.encodeRange(range), keyRow, @@ -242,7 +242,7 @@ export class GoogleSheetsV1 implements INodeType { } } - const _data = await sheet.spreadsheetBatchUpdate(requests); + await sheet.spreadsheetBatchUpdate(requests); const items = this.getInputData(); return await this.prepareOutputData(items); @@ -395,7 +395,7 @@ export class GoogleSheetsV1 implements INodeType { }); } - const _data = await sheet.batchUpdate(updateData, valueInputMode); + await sheet.batchUpdate(updateData, valueInputMode); } else { const keyName = this.getNodeParameter('key', 0) as string; const keyRow = parseInt(this.getNodeParameter('keyRow', 0) as string, 10); @@ -406,7 +406,7 @@ export class GoogleSheetsV1 implements INodeType { setData.push(item.json); }); - const _data = await sheet.updateSheetData( + await sheet.updateSheetData( setData, keyName, range, diff --git a/packages/nodes-base/nodes/Google/Sheet/v1/versionDescription.ts b/packages/nodes-base/nodes/Google/Sheet/v1/versionDescription.ts index 2d7798cdd7..294df40cd9 100644 --- a/packages/nodes-base/nodes/Google/Sheet/v1/versionDescription.ts +++ b/packages/nodes-base/nodes/Google/Sheet/v1/versionDescription.ts @@ -1,7 +1,7 @@ /* eslint-disable n8n-nodes-base/node-filename-against-convention */ import type { INodeTypeDescription } from 'n8n-workflow'; -import { oldVersionNotice } from '../../../../utils/descriptions'; +import { oldVersionNotice } from '@utils/descriptions'; export const versionDescription: INodeTypeDescription = { displayName: 'Google Sheets ', diff --git a/packages/nodes-base/nodes/Google/Sheet/v2/methods/resourceMapping.ts b/packages/nodes-base/nodes/Google/Sheet/v2/methods/resourceMapping.ts index 1534d41e49..a5ebbaff3b 100644 --- a/packages/nodes-base/nodes/Google/Sheet/v2/methods/resourceMapping.ts +++ b/packages/nodes-base/nodes/Google/Sheet/v2/methods/resourceMapping.ts @@ -1,5 +1,4 @@ -import type { ILoadOptionsFunctions } from 'n8n-core'; -import type { IDataObject, ResourceMapperFields } from 'n8n-workflow'; +import type { IDataObject, ILoadOptionsFunctions, ResourceMapperFields } from 'n8n-workflow'; import { GoogleSheet } from '../helpers/GoogleSheet'; import type { ResourceLocator } from '../helpers/GoogleSheets.types'; import { getSpreadsheetId } from '../helpers/GoogleSheets.utils'; diff --git a/packages/nodes-base/nodes/HelpScout/HelpScout.node.ts b/packages/nodes-base/nodes/HelpScout/HelpScout.node.ts index 6cc6cd0329..4844aa6ff7 100644 --- a/packages/nodes-base/nodes/HelpScout/HelpScout.node.ts +++ b/packages/nodes-base/nodes/HelpScout/HelpScout.node.ts @@ -113,7 +113,6 @@ export class HelpScout implements INodeType { ); for (const tag of tags) { const tagName = tag.name; - const _tagId = tag.id; returnData.push({ name: tagName, value: tagName, @@ -457,7 +456,6 @@ export class HelpScout implements INodeType { //https://developer.helpscout.com/mailbox-api/endpoints/conversations/threads/chat if (operation === 'create') { const conversationId = this.getNodeParameter('conversationId', i) as string; - const _type = this.getNodeParameter('type', i) as string; const text = this.getNodeParameter('text', i) as string; const additionalFields = this.getNodeParameter('additionalFields', i); const attachments = this.getNodeParameter('attachmentsUi', i) as IDataObject; diff --git a/packages/nodes-base/nodes/HtmlExtract/test/HtmlExtract.node.test.ts b/packages/nodes-base/nodes/HtmlExtract/test/HtmlExtract.node.test.ts index b5db1b38bb..ef08ff6a28 100644 --- a/packages/nodes-base/nodes/HtmlExtract/test/HtmlExtract.node.test.ts +++ b/packages/nodes-base/nodes/HtmlExtract/test/HtmlExtract.node.test.ts @@ -1,4 +1,4 @@ -import { testWorkflows, getWorkflowFilenames } from '../../../test/nodes/Helpers'; +import { testWorkflows, getWorkflowFilenames } from '@test/nodes/Helpers'; const workflows = getWorkflowFilenames(__dirname); diff --git a/packages/nodes-base/nodes/HttpRequest/test/node/HttpRequest.test.ts b/packages/nodes-base/nodes/HttpRequest/test/node/HttpRequest.test.ts index b59a9bfe48..9be90520ca 100644 --- a/packages/nodes-base/nodes/HttpRequest/test/node/HttpRequest.test.ts +++ b/packages/nodes-base/nodes/HttpRequest/test/node/HttpRequest.test.ts @@ -1,9 +1,4 @@ -import { - setup, - equalityTest, - workflowToTests, - getWorkflowFilenames, -} from '../../../../test/nodes/Helpers'; +import { setup, equalityTest, workflowToTests, getWorkflowFilenames } from '@test/nodes/Helpers'; import nock from 'nock'; diff --git a/packages/nodes-base/nodes/Hubspot/V1/GenericFunctions.ts b/packages/nodes-base/nodes/Hubspot/V1/GenericFunctions.ts index 9c279d2c92..0f666c1bef 100644 --- a/packages/nodes-base/nodes/Hubspot/V1/GenericFunctions.ts +++ b/packages/nodes-base/nodes/Hubspot/V1/GenericFunctions.ts @@ -1,16 +1,13 @@ import type { OptionsWithUri } from 'request'; -import type { - IExecuteFunctions, - IExecuteSingleFunctions, - IHookFunctions, - ILoadOptionsFunctions, -} from 'n8n-core'; - import type { ICredentialDataDecryptedObject, ICredentialTestFunctions, IDataObject, + IExecuteFunctions, + IExecuteSingleFunctions, + IHookFunctions, + ILoadOptionsFunctions, JsonObject, } from 'n8n-workflow'; import { NodeApiError } from 'n8n-workflow'; diff --git a/packages/nodes-base/nodes/Hubspot/V1/HubspotV1.node.ts b/packages/nodes-base/nodes/Hubspot/V1/HubspotV1.node.ts index 946740b41c..d69ea1be34 100644 --- a/packages/nodes-base/nodes/Hubspot/V1/HubspotV1.node.ts +++ b/packages/nodes-base/nodes/Hubspot/V1/HubspotV1.node.ts @@ -1,10 +1,9 @@ -import type { IExecuteFunctions } from 'n8n-core'; - import type { ICredentialDataDecryptedObject, ICredentialsDecrypted, ICredentialTestFunctions, IDataObject, + IExecuteFunctions, ILoadOptionsFunctions, INodeCredentialTestResult, INodeExecutionData, diff --git a/packages/nodes-base/nodes/Hubspot/V2/HubspotV2.node.ts b/packages/nodes-base/nodes/Hubspot/V2/HubspotV2.node.ts index 5710bd3f99..f4992e4dff 100644 --- a/packages/nodes-base/nodes/Hubspot/V2/HubspotV2.node.ts +++ b/packages/nodes-base/nodes/Hubspot/V2/HubspotV2.node.ts @@ -1,10 +1,9 @@ -import type { IExecuteFunctions } from 'n8n-core'; - import type { ICredentialDataDecryptedObject, ICredentialsDecrypted, ICredentialTestFunctions, IDataObject, + IExecuteFunctions, ILoadOptionsFunctions, INodeCredentialTestResult, INodeExecutionData, diff --git a/packages/nodes-base/nodes/ICalendar/test/node/ICalendar.test.ts b/packages/nodes-base/nodes/ICalendar/test/node/ICalendar.test.ts index 1566c91b45..f9adbf508f 100644 --- a/packages/nodes-base/nodes/ICalendar/test/node/ICalendar.test.ts +++ b/packages/nodes-base/nodes/ICalendar/test/node/ICalendar.test.ts @@ -1,13 +1,13 @@ /* eslint-disable @typescript-eslint/no-loop-func */ -import type { WorkflowTestData } from '../../../../test/nodes/types'; +import type { WorkflowTestData } from '@test/nodes/types'; import { getResultNodeData, setup, readJsonFileSync, initBinaryDataManager, -} from '../../../../test/nodes/Helpers'; -import { executeWorkflow } from '../../../../test/nodes/ExecuteWorkflow'; +} from '@test/nodes/Helpers'; +import { executeWorkflow } from '@test/nodes/ExecuteWorkflow'; describe('Execute iCalendar Node', () => { beforeEach(async () => { diff --git a/packages/nodes-base/nodes/If/test/If.node.test.ts b/packages/nodes-base/nodes/If/test/If.node.test.ts index d30d7f20df..3a74ca0c07 100644 --- a/packages/nodes-base/nodes/If/test/If.node.test.ts +++ b/packages/nodes-base/nodes/If/test/If.node.test.ts @@ -1,4 +1,4 @@ -import { testWorkflows, getWorkflowFilenames } from '../../../test/nodes/Helpers'; +import { testWorkflows, getWorkflowFilenames } from '@test/nodes/Helpers'; const workflows = getWorkflowFilenames(__dirname); diff --git a/packages/nodes-base/nodes/ItemLists/V3/actions/itemList/concatenateItems.operation.ts b/packages/nodes-base/nodes/ItemLists/V3/actions/itemList/concatenateItems.operation.ts index 99a4279471..e3bf1645bc 100644 --- a/packages/nodes-base/nodes/ItemLists/V3/actions/itemList/concatenateItems.operation.ts +++ b/packages/nodes-base/nodes/ItemLists/V3/actions/itemList/concatenateItems.operation.ts @@ -1,5 +1,9 @@ -import type { IExecuteFunctions } from 'n8n-core'; -import type { IDataObject, INodeExecutionData, INodeProperties } from 'n8n-workflow'; +import type { + IDataObject, + IExecuteFunctions, + INodeExecutionData, + INodeProperties, +} from 'n8n-workflow'; import { NodeOperationError } from 'n8n-workflow'; import { updateDisplayOptions } from '@utils/utilities'; diff --git a/packages/nodes-base/nodes/ItemLists/V3/actions/itemList/limit.operation.ts b/packages/nodes-base/nodes/ItemLists/V3/actions/itemList/limit.operation.ts index 8fbbbf3c6e..5671cf246f 100644 --- a/packages/nodes-base/nodes/ItemLists/V3/actions/itemList/limit.operation.ts +++ b/packages/nodes-base/nodes/ItemLists/V3/actions/itemList/limit.operation.ts @@ -1,5 +1,4 @@ -import type { IExecuteFunctions } from 'n8n-core'; -import type { INodeExecutionData, INodeProperties } from 'n8n-workflow'; +import type { IExecuteFunctions, INodeExecutionData, INodeProperties } from 'n8n-workflow'; import { updateDisplayOptions } from '@utils/utilities'; const properties: INodeProperties[] = [ diff --git a/packages/nodes-base/nodes/ItemLists/V3/actions/itemList/removeDuplicates.operation.ts b/packages/nodes-base/nodes/ItemLists/V3/actions/itemList/removeDuplicates.operation.ts index c13e0f6b75..c4f6d708c9 100644 --- a/packages/nodes-base/nodes/ItemLists/V3/actions/itemList/removeDuplicates.operation.ts +++ b/packages/nodes-base/nodes/ItemLists/V3/actions/itemList/removeDuplicates.operation.ts @@ -1,5 +1,4 @@ -import type { IExecuteFunctions } from 'n8n-core'; -import type { INodeExecutionData, INodeProperties } from 'n8n-workflow'; +import type { IExecuteFunctions, INodeExecutionData, INodeProperties } from 'n8n-workflow'; import { NodeOperationError } from 'n8n-workflow'; import { updateDisplayOptions } from '@utils/utilities'; diff --git a/packages/nodes-base/nodes/ItemLists/V3/actions/itemList/sort.operation.ts b/packages/nodes-base/nodes/ItemLists/V3/actions/itemList/sort.operation.ts index 18d2392dc2..6d497253d8 100644 --- a/packages/nodes-base/nodes/ItemLists/V3/actions/itemList/sort.operation.ts +++ b/packages/nodes-base/nodes/ItemLists/V3/actions/itemList/sort.operation.ts @@ -1,5 +1,9 @@ -import type { IExecuteFunctions } from 'n8n-core'; -import type { IDataObject, INodeExecutionData, INodeProperties } from 'n8n-workflow'; +import type { + IExecuteFunctions, + IDataObject, + INodeExecutionData, + INodeProperties, +} from 'n8n-workflow'; import { NodeOperationError } from 'n8n-workflow'; import { updateDisplayOptions } from '@utils/utilities'; diff --git a/packages/nodes-base/nodes/ItemLists/V3/actions/itemList/splitOutItems.operation.ts b/packages/nodes-base/nodes/ItemLists/V3/actions/itemList/splitOutItems.operation.ts index cc4ee758a6..68bd5dbfbe 100644 --- a/packages/nodes-base/nodes/ItemLists/V3/actions/itemList/splitOutItems.operation.ts +++ b/packages/nodes-base/nodes/ItemLists/V3/actions/itemList/splitOutItems.operation.ts @@ -1,5 +1,9 @@ -import type { IExecuteFunctions } from 'n8n-core'; -import type { IDataObject, INodeExecutionData, INodeProperties } from 'n8n-workflow'; +import type { + IDataObject, + IExecuteFunctions, + INodeExecutionData, + INodeProperties, +} from 'n8n-workflow'; import { deepCopy, NodeOperationError } from 'n8n-workflow'; import { updateDisplayOptions } from '@utils/utilities'; diff --git a/packages/nodes-base/nodes/ItemLists/test/node/ItemLists.test.ts b/packages/nodes-base/nodes/ItemLists/test/node/ItemLists.test.ts index 715ee90b71..467b52d55c 100644 --- a/packages/nodes-base/nodes/ItemLists/test/node/ItemLists.test.ts +++ b/packages/nodes-base/nodes/ItemLists/test/node/ItemLists.test.ts @@ -1,4 +1,4 @@ -import { testWorkflows, getWorkflowFilenames } from '../../../../test/nodes/Helpers'; +import { testWorkflows, getWorkflowFilenames } from '@test/nodes/Helpers'; const workflows = getWorkflowFilenames(__dirname); diff --git a/packages/nodes-base/nodes/Ldap/Ldap.node.ts b/packages/nodes-base/nodes/Ldap/Ldap.node.ts index e31c526b36..379c42ab35 100644 --- a/packages/nodes-base/nodes/Ldap/Ldap.node.ts +++ b/packages/nodes-base/nodes/Ldap/Ldap.node.ts @@ -1,10 +1,10 @@ /* eslint-disable n8n-nodes-base/node-filename-against-convention */ -import type { IExecuteFunctions } from 'n8n-core'; import type { ICredentialDataDecryptedObject, ICredentialsDecrypted, ICredentialTestFunctions, IDataObject, + IExecuteFunctions, ILoadOptionsFunctions, INodeCredentialTestResult, INodeExecutionData, diff --git a/packages/nodes-base/nodes/LoneScale/GenericFunctions.ts b/packages/nodes-base/nodes/LoneScale/GenericFunctions.ts index 872e749287..2f8767a18e 100644 --- a/packages/nodes-base/nodes/LoneScale/GenericFunctions.ts +++ b/packages/nodes-base/nodes/LoneScale/GenericFunctions.ts @@ -1,8 +1,12 @@ import type { OptionsWithUri } from 'request'; -import type { IExecuteFunctions, ILoadOptionsFunctions } from 'n8n-core'; - -import type { IDataObject, IHookFunctions, IWebhookFunctions } from 'n8n-workflow'; +import type { + IDataObject, + IExecuteFunctions, + IHookFunctions, + ILoadOptionsFunctions, + IWebhookFunctions, +} from 'n8n-workflow'; import { BASE_URL } from './constants'; export async function lonescaleApiRequest( diff --git a/packages/nodes-base/nodes/LoneScale/LoneScaleTrigger.node.ts b/packages/nodes-base/nodes/LoneScale/LoneScaleTrigger.node.ts index 93499dd2e5..562c5cbfdc 100644 --- a/packages/nodes-base/nodes/LoneScale/LoneScaleTrigger.node.ts +++ b/packages/nodes-base/nodes/LoneScale/LoneScaleTrigger.node.ts @@ -1,5 +1,3 @@ -import type { IWebhookFunctions } from 'n8n-core'; - import type { IDataObject, IHookFunctions, @@ -7,6 +5,7 @@ import type { INodePropertyOptions, INodeType, INodeTypeDescription, + IWebhookFunctions, IWebhookResponseData, } from 'n8n-workflow'; diff --git a/packages/nodes-base/nodes/Markdown/test/node/Markdown.test.ts b/packages/nodes-base/nodes/Markdown/test/node/Markdown.test.ts index 5edd9dd6dd..dc8b584dca 100644 --- a/packages/nodes-base/nodes/Markdown/test/node/Markdown.test.ts +++ b/packages/nodes-base/nodes/Markdown/test/node/Markdown.test.ts @@ -1,4 +1,4 @@ -import { testWorkflows, getWorkflowFilenames } from '../../../../test/nodes/Helpers'; +import { testWorkflows, getWorkflowFilenames } from '@test/nodes/Helpers'; const workflows = getWorkflowFilenames(__dirname); diff --git a/packages/nodes-base/nodes/Merge/test/node/Merge.test.ts b/packages/nodes-base/nodes/Merge/test/node/Merge.test.ts index 207f2af495..5edb910df9 100644 --- a/packages/nodes-base/nodes/Merge/test/node/Merge.test.ts +++ b/packages/nodes-base/nodes/Merge/test/node/Merge.test.ts @@ -1,4 +1,4 @@ -import { testWorkflows, getWorkflowFilenames } from '../../../../test/nodes/Helpers'; +import { testWorkflows, getWorkflowFilenames } from '@test/nodes/Helpers'; const workflows = getWorkflowFilenames(__dirname); diff --git a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/addTable.test.ts b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/addTable.test.ts index 6cf70144f4..2cc7645b04 100644 --- a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/addTable.test.ts +++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/addTable.test.ts @@ -1,8 +1,8 @@ import type { INodeTypes } from 'n8n-workflow'; -import { getResultNodeData, setup, workflowToTests } from '../../../../../../../test/nodes/Helpers'; -import type { WorkflowTestData } from '../../../../../../../test/nodes/types'; -import { executeWorkflow } from '../../../../../../../test/nodes/ExecuteWorkflow'; +import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers'; +import type { WorkflowTestData } from '@test/nodes/types'; +import { executeWorkflow } from '@test/nodes/ExecuteWorkflow'; import * as transport from '../../../../v2/transport'; diff --git a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/append.test.ts b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/append.test.ts index 1eddfd1b38..343a978aab 100644 --- a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/append.test.ts +++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/append.test.ts @@ -1,8 +1,8 @@ import type { INodeTypes } from 'n8n-workflow'; -import { getResultNodeData, setup, workflowToTests } from '../../../../../../../test/nodes/Helpers'; -import type { WorkflowTestData } from '../../../../../../../test/nodes/types'; -import { executeWorkflow } from '../../../../../../../test/nodes/ExecuteWorkflow'; +import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers'; +import type { WorkflowTestData } from '@test/nodes/types'; +import { executeWorkflow } from '@test/nodes/ExecuteWorkflow'; import * as transport from '../../../../v2/transport'; diff --git a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/convertToRange.test.ts b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/convertToRange.test.ts index 0c100f2052..1e76d16cff 100644 --- a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/convertToRange.test.ts +++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/convertToRange.test.ts @@ -1,8 +1,8 @@ import type { INodeTypes } from 'n8n-workflow'; -import { getResultNodeData, setup, workflowToTests } from '../../../../../../../test/nodes/Helpers'; -import type { WorkflowTestData } from '../../../../../../../test/nodes/types'; -import { executeWorkflow } from '../../../../../../../test/nodes/ExecuteWorkflow'; +import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers'; +import type { WorkflowTestData } from '@test/nodes/types'; +import { executeWorkflow } from '@test/nodes/ExecuteWorkflow'; import * as transport from '../../../../v2/transport'; diff --git a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/deleteTable.test.ts b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/deleteTable.test.ts index 77d13225eb..fc6acff7ee 100644 --- a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/deleteTable.test.ts +++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/deleteTable.test.ts @@ -1,8 +1,8 @@ import type { INodeTypes } from 'n8n-workflow'; -import { getResultNodeData, setup, workflowToTests } from '../../../../../../../test/nodes/Helpers'; -import type { WorkflowTestData } from '../../../../../../../test/nodes/types'; -import { executeWorkflow } from '../../../../../../../test/nodes/ExecuteWorkflow'; +import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers'; +import type { WorkflowTestData } from '@test/nodes/types'; +import { executeWorkflow } from '@test/nodes/ExecuteWorkflow'; import * as transport from '../../../../v2/transport'; diff --git a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/getColumns.test.ts b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/getColumns.test.ts index 148dc44f9d..87def7c507 100644 --- a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/getColumns.test.ts +++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/getColumns.test.ts @@ -1,8 +1,8 @@ import type { INodeTypes } from 'n8n-workflow'; -import { getResultNodeData, setup, workflowToTests } from '../../../../../../../test/nodes/Helpers'; -import type { WorkflowTestData } from '../../../../../../../test/nodes/types'; -import { executeWorkflow } from '../../../../../../../test/nodes/ExecuteWorkflow'; +import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers'; +import type { WorkflowTestData } from '@test/nodes/types'; +import { executeWorkflow } from '@test/nodes/ExecuteWorkflow'; import * as transport from '../../../../v2/transport'; diff --git a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/getRows.test.ts b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/getRows.test.ts index 1ab8a1f39c..890692d879 100644 --- a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/getRows.test.ts +++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/getRows.test.ts @@ -1,8 +1,8 @@ import type { INodeTypes } from 'n8n-workflow'; -import { getResultNodeData, setup, workflowToTests } from '../../../../../../../test/nodes/Helpers'; -import type { WorkflowTestData } from '../../../../../../../test/nodes/types'; -import { executeWorkflow } from '../../../../../../../test/nodes/ExecuteWorkflow'; +import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers'; +import type { WorkflowTestData } from '@test/nodes/types'; +import { executeWorkflow } from '@test/nodes/ExecuteWorkflow'; import * as transport from '../../../../v2/transport'; diff --git a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/lookup.test.ts b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/lookup.test.ts index 17785d65ef..50bcdd89b1 100644 --- a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/lookup.test.ts +++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/lookup.test.ts @@ -1,8 +1,8 @@ import type { INodeTypes } from 'n8n-workflow'; -import { getResultNodeData, setup, workflowToTests } from '../../../../../../../test/nodes/Helpers'; -import type { WorkflowTestData } from '../../../../../../../test/nodes/types'; -import { executeWorkflow } from '../../../../../../../test/nodes/ExecuteWorkflow'; +import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers'; +import type { WorkflowTestData } from '@test/nodes/types'; +import { executeWorkflow } from '@test/nodes/ExecuteWorkflow'; import * as transport from '../../../../v2/transport'; diff --git a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/workbook/addWorksheet.test.ts b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/workbook/addWorksheet.test.ts index b6eea1cb54..cf42f7815b 100644 --- a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/workbook/addWorksheet.test.ts +++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/workbook/addWorksheet.test.ts @@ -1,8 +1,8 @@ import type { INodeTypes } from 'n8n-workflow'; -import { getResultNodeData, setup, workflowToTests } from '../../../../../../../test/nodes/Helpers'; -import type { WorkflowTestData } from '../../../../../../../test/nodes/types'; -import { executeWorkflow } from '../../../../../../../test/nodes/ExecuteWorkflow'; +import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers'; +import type { WorkflowTestData } from '@test/nodes/types'; +import { executeWorkflow } from '@test/nodes/ExecuteWorkflow'; import * as transport from '../../../../v2/transport'; diff --git a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/workbook/deleteWorkbook.test.ts b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/workbook/deleteWorkbook.test.ts index a4e63b1ebb..e6be58dae1 100644 --- a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/workbook/deleteWorkbook.test.ts +++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/workbook/deleteWorkbook.test.ts @@ -1,8 +1,8 @@ import type { INodeTypes } from 'n8n-workflow'; -import { getResultNodeData, setup, workflowToTests } from '../../../../../../../test/nodes/Helpers'; -import type { WorkflowTestData } from '../../../../../../../test/nodes/types'; -import { executeWorkflow } from '../../../../../../../test/nodes/ExecuteWorkflow'; +import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers'; +import type { WorkflowTestData } from '@test/nodes/types'; +import { executeWorkflow } from '@test/nodes/ExecuteWorkflow'; import * as transport from '../../../../v2/transport'; diff --git a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/workbook/getAll.test.ts b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/workbook/getAll.test.ts index a78e3b1d9e..55f14e99bd 100644 --- a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/workbook/getAll.test.ts +++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/workbook/getAll.test.ts @@ -1,8 +1,8 @@ import type { INodeTypes } from 'n8n-workflow'; -import { getResultNodeData, setup, workflowToTests } from '../../../../../../../test/nodes/Helpers'; -import type { WorkflowTestData } from '../../../../../../../test/nodes/types'; -import { executeWorkflow } from '../../../../../../../test/nodes/ExecuteWorkflow'; +import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers'; +import type { WorkflowTestData } from '@test/nodes/types'; +import { executeWorkflow } from '@test/nodes/ExecuteWorkflow'; import * as transport from '../../../../v2/transport'; diff --git a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/append.test.ts b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/append.test.ts index 108f278800..f554ed1a4d 100644 --- a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/append.test.ts +++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/append.test.ts @@ -1,10 +1,4 @@ -/* eslint-disable @typescript-eslint/no-unused-vars */ -import type { IDataObject } from 'n8n-workflow'; - -import { equalityTest, setup, workflowToTests } from '../../../../../../../test/nodes/Helpers'; - -// eslint-disable-next-line unused-imports/no-unused-imports -import * as transport from '../../../../v2/transport'; +import { equalityTest, setup, workflowToTests } from '@test/nodes/Helpers'; import nock from 'nock'; @@ -12,14 +6,7 @@ jest.mock('../../../../v2/transport', () => { const originalModule = jest.requireActual('../../../../v2/transport'); return { ...originalModule, - microsoftApiRequest: jest.fn(async function ( - method: string, - resource: string, - body?: IDataObject, - qs?: IDataObject, - uri?: string, - headers?: IDataObject, - ) { + microsoftApiRequest: jest.fn(async function (method: string, resource: string) { if (method === 'GET' && resource.includes('usedRange')) { return { address: 'Sheet4!A1:D6', diff --git a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/clear.test.ts b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/clear.test.ts index 0cd232a074..ed4ee37e20 100644 --- a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/clear.test.ts +++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/clear.test.ts @@ -1,8 +1,8 @@ import type { INodeTypes } from 'n8n-workflow'; -import { getResultNodeData, setup, workflowToTests } from '../../../../../../../test/nodes/Helpers'; -import type { WorkflowTestData } from '../../../../../../../test/nodes/types'; -import { executeWorkflow } from '../../../../../../../test/nodes/ExecuteWorkflow'; +import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers'; +import type { WorkflowTestData } from '@test/nodes/types'; +import { executeWorkflow } from '@test/nodes/ExecuteWorkflow'; import * as transport from '../../../../v2/transport'; diff --git a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/deleteWorksheet.test.ts b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/deleteWorksheet.test.ts index 0b12ff7c59..615887b98f 100644 --- a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/deleteWorksheet.test.ts +++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/deleteWorksheet.test.ts @@ -1,8 +1,8 @@ import type { INodeTypes } from 'n8n-workflow'; -import { getResultNodeData, setup, workflowToTests } from '../../../../../../../test/nodes/Helpers'; -import type { WorkflowTestData } from '../../../../../../../test/nodes/types'; -import { executeWorkflow } from '../../../../../../../test/nodes/ExecuteWorkflow'; +import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers'; +import type { WorkflowTestData } from '@test/nodes/types'; +import { executeWorkflow } from '@test/nodes/ExecuteWorkflow'; import * as transport from '../../../../v2/transport'; diff --git a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/getAll.test.ts b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/getAll.test.ts index a045e8675e..c4f98c42ee 100644 --- a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/getAll.test.ts +++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/getAll.test.ts @@ -1,8 +1,8 @@ import type { INodeTypes } from 'n8n-workflow'; -import { getResultNodeData, setup, workflowToTests } from '../../../../../../../test/nodes/Helpers'; -import type { WorkflowTestData } from '../../../../../../../test/nodes/types'; -import { executeWorkflow } from '../../../../../../../test/nodes/ExecuteWorkflow'; +import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers'; +import type { WorkflowTestData } from '@test/nodes/types'; +import { executeWorkflow } from '@test/nodes/ExecuteWorkflow'; import * as transport from '../../../../v2/transport'; diff --git a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/readRows.test.ts b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/readRows.test.ts index 014ff8d658..1f36d50e39 100644 --- a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/readRows.test.ts +++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/readRows.test.ts @@ -1,7 +1,4 @@ -import { equalityTest, setup, workflowToTests } from '../../../../../../../test/nodes/Helpers'; - -// eslint-disable-next-line unused-imports/no-unused-imports -import * as _transport from '../../../../v2/transport'; +import { equalityTest, setup, workflowToTests } from '@test/nodes/Helpers'; import nock from 'nock'; diff --git a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/update.test.ts b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/update.test.ts index ca062b7784..55fde1b0f6 100644 --- a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/update.test.ts +++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/update.test.ts @@ -1,7 +1,4 @@ -import { equalityTest, setup, workflowToTests } from '../../../../../../../test/nodes/Helpers'; - -// eslint-disable-next-line unused-imports/no-unused-imports -import * as _transport from '../../../../v2/transport'; +import { equalityTest, setup, workflowToTests } from '@test/nodes/Helpers'; import nock from 'nock'; diff --git a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/upsert.test.ts b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/upsert.test.ts index 61351fd1ff..70308b5a2c 100644 --- a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/upsert.test.ts +++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/upsert.test.ts @@ -1,7 +1,4 @@ -import { equalityTest, setup, workflowToTests } from '../../../../../../../test/nodes/Helpers'; - -// eslint-disable-next-line unused-imports/no-unused-imports -import * as _transport from '../../../../v2/transport'; +import { equalityTest, setup, workflowToTests } from '@test/nodes/Helpers'; import nock from 'nock'; diff --git a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/utils/utils.test.ts b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/utils/utils.test.ts index 5786e9c2d6..c67729b028 100644 --- a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/utils/utils.test.ts +++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/utils/utils.test.ts @@ -1,5 +1,7 @@ import { get } from 'lodash'; +import { mock } from 'jest-mock-extended'; import type { IDataObject, IExecuteFunctions, IGetNodeParameterOptions, INode } from 'n8n-workflow'; +import { constructExecutionMetaData } from 'n8n-core'; import { prepareOutput, updateByAutoMaping, @@ -86,27 +88,34 @@ const responseData = { }; describe('Test MicrosoftExcelV2, prepareOutput', () => { + const thisArg = mock({ + helpers: mock({ constructExecutionMetaData }), + }); + it('should return empty array', () => { - const output = prepareOutput(node, { values: [] }, { rawData: false }); + const output = prepareOutput.call(thisArg, node, { values: [] }, { rawData: false }); expect(output).toBeDefined(); expect(output).toEqual([]); }); it('should return raw response', () => { - const output = prepareOutput(node, responseData, { rawData: true }); + const output = prepareOutput.call(thisArg, node, responseData, { rawData: true }); expect(output).toBeDefined(); expect(output[0].json.data).toEqual(responseData); }); it('should return raw response in custom property', () => { const customKey = 'customKey'; - const output = prepareOutput(node, responseData, { rawData: true, dataProperty: customKey }); + const output = prepareOutput.call(thisArg, node, responseData, { + rawData: true, + dataProperty: customKey, + }); expect(output).toBeDefined(); expect(output[0].json.customKey).toEqual(responseData); }); it('should return formated response', () => { - const output = prepareOutput(node, responseData, { rawData: false }); + const output = prepareOutput.call(thisArg, node, responseData, { rawData: false }); expect(output).toBeDefined(); expect(output.length).toEqual(3); expect(output[0].json).toEqual({ @@ -118,7 +127,10 @@ describe('Test MicrosoftExcelV2, prepareOutput', () => { }); it('should return response with selected first data row', () => { - const output = prepareOutput(node, responseData, { rawData: false, firstDataRow: 3 }); + const output = prepareOutput.call(thisArg, node, responseData, { + rawData: false, + firstDataRow: 3, + }); expect(output).toBeDefined(); expect(output.length).toEqual(1); expect(output[0].json).toEqual({ @@ -132,7 +144,11 @@ describe('Test MicrosoftExcelV2, prepareOutput', () => { it('should return response with selected first data row', () => { const [firstRow, ...rest] = responseData.values; const response = { values: [...rest, firstRow] }; - const output = prepareOutput(node, response, { rawData: false, keyRow: 3, firstDataRow: 0 }); + const output = prepareOutput.call(thisArg, node, response, { + rawData: false, + keyRow: 3, + firstDataRow: 0, + }); expect(output).toBeDefined(); expect(output.length).toEqual(3); expect(output[0].json).toEqual({ diff --git a/packages/nodes-base/nodes/Microsoft/Excel/v1/MicrosoftExcelV1.node.ts b/packages/nodes-base/nodes/Microsoft/Excel/v1/MicrosoftExcelV1.node.ts index 0def98076b..a8c0e77c08 100644 --- a/packages/nodes-base/nodes/Microsoft/Excel/v1/MicrosoftExcelV1.node.ts +++ b/packages/nodes-base/nodes/Microsoft/Excel/v1/MicrosoftExcelV1.node.ts @@ -1,8 +1,7 @@ /* eslint-disable n8n-nodes-base/node-filename-against-convention */ -import type { IExecuteFunctions } from 'n8n-core'; - import type { IDataObject, + IExecuteFunctions, ILoadOptionsFunctions, INodeExecutionData, INodePropertyOptions, @@ -25,7 +24,7 @@ import { worksheetFields, worksheetOperations } from './WorksheetDescription'; import { tableFields, tableOperations } from './TableDescription'; -import { oldVersionNotice } from '../../../../utils/descriptions'; +import { oldVersionNotice } from '@utils/descriptions'; const versionDescription: INodeTypeDescription = { displayName: 'Microsoft Excel', diff --git a/packages/nodes-base/nodes/Microsoft/Excel/v2/MicrosoftExcelV2.node.ts b/packages/nodes-base/nodes/Microsoft/Excel/v2/MicrosoftExcelV2.node.ts index 660ca4fe87..7c05811017 100644 --- a/packages/nodes-base/nodes/Microsoft/Excel/v2/MicrosoftExcelV2.node.ts +++ b/packages/nodes-base/nodes/Microsoft/Excel/v2/MicrosoftExcelV2.node.ts @@ -1,7 +1,10 @@ /* eslint-disable n8n-nodes-base/node-filename-against-convention */ -import type { IExecuteFunctions } from 'n8n-core'; - -import type { INodeType, INodeTypeBaseDescription, INodeTypeDescription } from 'n8n-workflow'; +import type { + IExecuteFunctions, + INodeType, + INodeTypeBaseDescription, + INodeTypeDescription, +} from 'n8n-workflow'; import { listSearch, loadOptions } from './methods'; import { versionDescription } from './actions/versionDescription'; diff --git a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/router.ts b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/router.ts index 681b1e3bab..bf3f8a1a44 100644 --- a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/router.ts +++ b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/router.ts @@ -1,5 +1,4 @@ -import type { IExecuteFunctions } from 'n8n-core'; -import type { INodeExecutionData } from 'n8n-workflow'; +import type { IExecuteFunctions, INodeExecutionData } from 'n8n-workflow'; import { NodeOperationError } from 'n8n-workflow'; import type { MicrosoftExcel } from './node.type'; diff --git a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/addTable.operation.ts b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/addTable.operation.ts index 6e575516c2..c678137809 100644 --- a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/addTable.operation.ts +++ b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/addTable.operation.ts @@ -1,5 +1,9 @@ -import type { IExecuteFunctions } from 'n8n-core'; -import type { IDataObject, INodeExecutionData, INodeProperties } from 'n8n-workflow'; +import type { + IDataObject, + IExecuteFunctions, + INodeExecutionData, + INodeProperties, +} from 'n8n-workflow'; import { updateDisplayOptions } from '@utils/utilities'; import { microsoftApiRequest } from '../../transport'; import { workbookRLC, worksheetRLC } from '../common.descriptions'; diff --git a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/append.operation.ts b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/append.operation.ts index 3d335e88a5..3b69f3ce45 100644 --- a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/append.operation.ts +++ b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/append.operation.ts @@ -1,5 +1,9 @@ -import type { IExecuteFunctions } from 'n8n-core'; -import type { IDataObject, INodeExecutionData, INodeProperties } from 'n8n-workflow'; +import type { + IDataObject, + IExecuteFunctions, + INodeExecutionData, + INodeProperties, +} from 'n8n-workflow'; import { processJsonInput, updateDisplayOptions } from '@utils/utilities'; import type { ExcelResponse } from '../../helpers/interfaces'; import { prepareOutput } from '../../helpers/utils'; @@ -260,7 +264,7 @@ export async function execute( const dataProperty = (options.dataProperty as string) || 'data'; returnData.push( - ...prepareOutput(this.getNode(), responseData as ExcelResponse, { + ...prepareOutput.call(this, this.getNode(), responseData as ExcelResponse, { columnsRow, dataProperty, rawData, diff --git a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/convertToRange.operation.ts b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/convertToRange.operation.ts index f5a9337710..4d94549866 100644 --- a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/convertToRange.operation.ts +++ b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/convertToRange.operation.ts @@ -1,5 +1,9 @@ -import type { IExecuteFunctions } from 'n8n-core'; -import type { IDataObject, INodeExecutionData, INodeProperties } from 'n8n-workflow'; +import type { + IDataObject, + IExecuteFunctions, + INodeExecutionData, + INodeProperties, +} from 'n8n-workflow'; import { updateDisplayOptions } from '@utils/utilities'; import { microsoftApiRequest } from '../../transport'; import { tableRLC, workbookRLC, worksheetRLC } from '../common.descriptions'; diff --git a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/deleteTable.operation.ts b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/deleteTable.operation.ts index 367b5ed3bf..8d3ff97536 100644 --- a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/deleteTable.operation.ts +++ b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/deleteTable.operation.ts @@ -1,5 +1,4 @@ -import type { IExecuteFunctions } from 'n8n-core'; -import type { INodeExecutionData, INodeProperties } from 'n8n-workflow'; +import type { IExecuteFunctions, INodeExecutionData, INodeProperties } from 'n8n-workflow'; import { updateDisplayOptions } from '@utils/utilities'; import { microsoftApiRequest } from '../../transport'; import { tableRLC, workbookRLC, worksheetRLC } from '../common.descriptions'; diff --git a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/getColumns.operation.ts b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/getColumns.operation.ts index ea49a70356..86bda1a5de 100644 --- a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/getColumns.operation.ts +++ b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/getColumns.operation.ts @@ -1,5 +1,9 @@ -import type { IExecuteFunctions } from 'n8n-core'; -import type { IDataObject, INodeExecutionData, INodeProperties } from 'n8n-workflow'; +import type { + IDataObject, + IExecuteFunctions, + INodeExecutionData, + INodeProperties, +} from 'n8n-workflow'; import { updateDisplayOptions } from '@utils/utilities'; import { microsoftApiRequest, microsoftApiRequestAllItemsSkip } from '../../transport'; import { tableRLC, workbookRLC, worksheetRLC } from '../common.descriptions'; diff --git a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/getRows.operation.ts b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/getRows.operation.ts index 41a48f0fd2..f38f1ab6cb 100644 --- a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/getRows.operation.ts +++ b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/getRows.operation.ts @@ -1,5 +1,9 @@ -import type { IExecuteFunctions } from 'n8n-core'; -import type { IDataObject, INodeExecutionData, INodeProperties } from 'n8n-workflow'; +import type { + IDataObject, + IExecuteFunctions, + INodeExecutionData, + INodeProperties, +} from 'n8n-workflow'; import { updateDisplayOptions } from '@utils/utilities'; import { microsoftApiRequest, microsoftApiRequestAllItemsSkip } from '../../transport'; import { tableRLC, workbookRLC, worksheetRLC } from '../common.descriptions'; diff --git a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/lookup.operation.ts b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/lookup.operation.ts index cbfa515d90..45c1482a36 100644 --- a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/lookup.operation.ts +++ b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/lookup.operation.ts @@ -1,5 +1,10 @@ -import type { IExecuteFunctions } from 'n8n-core'; -import type { IDataObject, INodeExecutionData, INodeProperties, JsonObject } from 'n8n-workflow'; +import type { + IDataObject, + IExecuteFunctions, + INodeExecutionData, + INodeProperties, + JsonObject, +} from 'n8n-workflow'; import { NodeApiError } from 'n8n-workflow'; import { updateDisplayOptions } from '@utils/utilities'; import { microsoftApiRequestAllItemsSkip } from '../../transport'; diff --git a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/workbook/addWorksheet.operation.ts b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/workbook/addWorksheet.operation.ts index ec8701723c..91fb988e37 100644 --- a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/workbook/addWorksheet.operation.ts +++ b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/workbook/addWorksheet.operation.ts @@ -1,5 +1,9 @@ -import type { IExecuteFunctions } from 'n8n-core'; -import type { IDataObject, INodeExecutionData, INodeProperties } from 'n8n-workflow'; +import type { + IDataObject, + IExecuteFunctions, + INodeExecutionData, + INodeProperties, +} from 'n8n-workflow'; import { updateDisplayOptions } from '@utils/utilities'; import { microsoftApiRequest } from '../../transport'; import { workbookRLC } from '../common.descriptions'; diff --git a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/workbook/deleteWorkbook.operation.ts b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/workbook/deleteWorkbook.operation.ts index 15dc65335b..9366c43a4a 100644 --- a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/workbook/deleteWorkbook.operation.ts +++ b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/workbook/deleteWorkbook.operation.ts @@ -1,5 +1,4 @@ -import type { IExecuteFunctions } from 'n8n-core'; -import type { INodeExecutionData, INodeProperties } from 'n8n-workflow'; +import type { IExecuteFunctions, INodeExecutionData, INodeProperties } from 'n8n-workflow'; import { NodeOperationError } from 'n8n-workflow'; import { updateDisplayOptions } from '@utils/utilities'; import { microsoftApiRequest } from '../../transport'; diff --git a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/workbook/getAll.operation.ts b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/workbook/getAll.operation.ts index 0c24643f5f..1533b5afa5 100644 --- a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/workbook/getAll.operation.ts +++ b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/workbook/getAll.operation.ts @@ -1,5 +1,9 @@ -import type { IExecuteFunctions } from 'n8n-core'; -import type { IDataObject, INodeExecutionData, INodeProperties } from 'n8n-workflow'; +import type { + IDataObject, + IExecuteFunctions, + INodeExecutionData, + INodeProperties, +} from 'n8n-workflow'; import { updateDisplayOptions } from '@utils/utilities'; import { microsoftApiRequest, microsoftApiRequestAllItems } from '../../transport'; diff --git a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/append.operation.ts b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/append.operation.ts index b572b69a13..e2807861b2 100644 --- a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/append.operation.ts +++ b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/append.operation.ts @@ -1,5 +1,9 @@ -import type { IExecuteFunctions } from 'n8n-core'; -import type { IDataObject, INodeExecutionData, INodeProperties } from 'n8n-workflow'; +import type { + IDataObject, + IExecuteFunctions, + INodeExecutionData, + INodeProperties, +} from 'n8n-workflow'; import { processJsonInput, updateDisplayOptions } from '@utils/utilities'; import type { ExcelResponse } from '../../helpers/interfaces'; import { prepareOutput } from '../../helpers/utils'; @@ -220,7 +224,11 @@ export async function execute( const dataProperty = this.getNodeParameter('options.dataProperty', 0, 'data') as string; returnData.push( - ...prepareOutput(this.getNode(), responseData, { columnsRow, dataProperty, rawData }), + ...prepareOutput.call(this, this.getNode(), responseData, { + columnsRow, + dataProperty, + rawData, + }), ); return returnData; diff --git a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/clear.operation.ts b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/clear.operation.ts index 36205d4a60..b298ed2247 100644 --- a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/clear.operation.ts +++ b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/clear.operation.ts @@ -1,5 +1,4 @@ -import type { IExecuteFunctions } from 'n8n-core'; -import type { INodeExecutionData, INodeProperties } from 'n8n-workflow'; +import type { INodeExecutionData, IExecuteFunctions, INodeProperties } from 'n8n-workflow'; import { updateDisplayOptions } from '@utils/utilities'; import { microsoftApiRequest } from '../../transport'; import { workbookRLC, worksheetRLC } from '../common.descriptions'; diff --git a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/deleteWorksheet.operation.ts b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/deleteWorksheet.operation.ts index 4d9bc49f06..5fb00083fa 100644 --- a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/deleteWorksheet.operation.ts +++ b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/deleteWorksheet.operation.ts @@ -1,5 +1,4 @@ -import type { IExecuteFunctions } from 'n8n-core'; -import type { INodeExecutionData, INodeProperties } from 'n8n-workflow'; +import type { INodeExecutionData, IExecuteFunctions, INodeProperties } from 'n8n-workflow'; import { updateDisplayOptions } from '@utils/utilities'; import { microsoftApiRequest } from '../../transport'; import { workbookRLC, worksheetRLC } from '../common.descriptions'; diff --git a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/getAll.operation.ts b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/getAll.operation.ts index e69d59767c..296613b149 100644 --- a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/getAll.operation.ts +++ b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/getAll.operation.ts @@ -1,5 +1,9 @@ -import type { IExecuteFunctions } from 'n8n-core'; -import type { IDataObject, INodeExecutionData, INodeProperties } from 'n8n-workflow'; +import type { + IDataObject, + IExecuteFunctions, + INodeExecutionData, + INodeProperties, +} from 'n8n-workflow'; import { updateDisplayOptions } from '@utils/utilities'; import { microsoftApiRequest, microsoftApiRequestAllItems } from '../../transport'; import { workbookRLC } from '../common.descriptions'; diff --git a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/readRows.operation.ts b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/readRows.operation.ts index 7b8e095de1..bbfa6629a4 100644 --- a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/readRows.operation.ts +++ b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/readRows.operation.ts @@ -1,5 +1,9 @@ -import type { IExecuteFunctions } from 'n8n-core'; -import type { IDataObject, INodeExecutionData, INodeProperties } from 'n8n-workflow'; +import type { + IDataObject, + IExecuteFunctions, + INodeExecutionData, + INodeProperties, +} from 'n8n-workflow'; import { updateDisplayOptions } from '@utils/utilities'; import type { ExcelResponse } from '../../helpers/interfaces'; import { prepareOutput } from '../../helpers/utils'; @@ -167,7 +171,7 @@ export async function execute( const firstDataRow = this.getNodeParameter('dataStartRow', i, 1) as number; returnData.push( - ...prepareOutput(this.getNode(), responseData as ExcelResponse, { + ...prepareOutput.call(this, this.getNode(), responseData as ExcelResponse, { rawData, keyRow, firstDataRow, @@ -176,7 +180,7 @@ export async function execute( } else { const dataProperty = (options.dataProperty as string) || 'data'; returnData.push( - ...prepareOutput(this.getNode(), responseData as ExcelResponse, { + ...prepareOutput.call(this, this.getNode(), responseData as ExcelResponse, { rawData, dataProperty, }), diff --git a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/update.operation.ts b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/update.operation.ts index 8ac73272eb..06496008ff 100644 --- a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/update.operation.ts +++ b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/update.operation.ts @@ -1,5 +1,9 @@ -import type { IExecuteFunctions } from 'n8n-core'; -import type { IDataObject, INodeExecutionData, INodeProperties } from 'n8n-workflow'; +import type { + IDataObject, + IExecuteFunctions, + INodeExecutionData, + INodeProperties, +} from 'n8n-workflow'; import { NodeOperationError } from 'n8n-workflow'; import { processJsonInput, updateDisplayOptions } from '@utils/utilities'; import type { ExcelResponse, UpdateSummary } from '../../helpers/interfaces'; @@ -295,7 +299,7 @@ export async function execute( ); returnData.push( - ...prepareOutput(this.getNode(), responseData as ExcelResponse, { + ...prepareOutput.call(this, this.getNode(), responseData as ExcelResponse, { rawData, dataProperty, }), @@ -353,7 +357,7 @@ export async function execute( const { updatedRows } = updateSummary; returnData.push( - ...prepareOutput(this.getNode(), responseData as ExcelResponse, { + ...prepareOutput.call(this, this.getNode(), responseData as ExcelResponse, { updatedRows, rawData, dataProperty, diff --git a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/upsert.operation.ts b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/upsert.operation.ts index 160ef5ba53..6e90cbc839 100644 --- a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/upsert.operation.ts +++ b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/upsert.operation.ts @@ -1,5 +1,9 @@ -import type { IExecuteFunctions } from 'n8n-core'; -import type { IDataObject, INodeExecutionData, INodeProperties } from 'n8n-workflow'; +import type { + IDataObject, + IExecuteFunctions, + INodeExecutionData, + INodeProperties, +} from 'n8n-workflow'; import { NodeOperationError } from 'n8n-workflow'; import { processJsonInput, updateDisplayOptions } from '@utils/utilities'; import type { ExcelResponse, UpdateSummary } from '../../helpers/interfaces'; @@ -311,7 +315,7 @@ export async function execute( const dataProperty = this.getNodeParameter('options.dataProperty', 0, 'data') as string; returnData.push( - ...prepareOutput(this.getNode(), responseData as ExcelResponse, { + ...prepareOutput.call(this, this.getNode(), responseData as ExcelResponse, { updatedRows, rawData, dataProperty, diff --git a/packages/nodes-base/nodes/Microsoft/Excel/v2/helpers/utils.ts b/packages/nodes-base/nodes/Microsoft/Excel/v2/helpers/utils.ts index 1f71147c3d..133ee979f3 100644 --- a/packages/nodes-base/nodes/Microsoft/Excel/v2/helpers/utils.ts +++ b/packages/nodes-base/nodes/Microsoft/Excel/v2/helpers/utils.ts @@ -1,8 +1,6 @@ -import type { IExecuteFunctions } from 'n8n-core'; -import type { IDataObject, INode, INodeExecutionData } from 'n8n-workflow'; +import type { IDataObject, IExecuteFunctions, INode, INodeExecutionData } from 'n8n-workflow'; import { NodeOperationError } from 'n8n-workflow'; import type { ExcelResponse, SheetData, UpdateSummary } from './interfaces'; -import { constructExecutionMetaData } from 'n8n-core'; import { wrapData } from '@utils/utilities'; type PrepareOutputConfig = { @@ -15,6 +13,7 @@ type PrepareOutputConfig = { }; export function prepareOutput( + this: IExecuteFunctions, node: INode, responseData: ExcelResponse, config: PrepareOutputConfig, @@ -54,14 +53,14 @@ export function prepareOutput( for (let columnIndex = 0; columnIndex < columns.length; columnIndex++) { data[columns[columnIndex] as string] = values[rowIndex][columnIndex]; } - const executionData = constructExecutionMetaData(wrapData({ ...data }), { + const executionData = this.helpers.constructExecutionMetaData(wrapData({ ...data }), { itemData: { item: rowIndex }, }); returnData.push(...executionData); } } else { - const executionData = constructExecutionMetaData( + const executionData = this.helpers.constructExecutionMetaData( wrapData({ [config.dataProperty || 'data']: responseData }), { itemData: { item: 0 } }, ); diff --git a/packages/nodes-base/nodes/Microsoft/Excel/v2/transport/index.ts b/packages/nodes-base/nodes/Microsoft/Excel/v2/transport/index.ts index f28816ef8b..5a8b4609bc 100644 --- a/packages/nodes-base/nodes/Microsoft/Excel/v2/transport/index.ts +++ b/packages/nodes-base/nodes/Microsoft/Excel/v2/transport/index.ts @@ -1,6 +1,11 @@ import type { OptionsWithUri } from 'request'; -import type { IExecuteFunctions, IExecuteSingleFunctions, ILoadOptionsFunctions } from 'n8n-core'; -import type { IDataObject, JsonObject } from 'n8n-workflow'; +import type { + IDataObject, + IExecuteFunctions, + IExecuteSingleFunctions, + ILoadOptionsFunctions, + JsonObject, +} from 'n8n-workflow'; import { NodeApiError } from 'n8n-workflow'; export async function microsoftApiRequest( diff --git a/packages/nodes-base/nodes/MoveBinaryData/test/MoveBinaryData.test.ts b/packages/nodes-base/nodes/MoveBinaryData/test/MoveBinaryData.test.ts index c9c190b5cb..e0aef1e046 100644 --- a/packages/nodes-base/nodes/MoveBinaryData/test/MoveBinaryData.test.ts +++ b/packages/nodes-base/nodes/MoveBinaryData/test/MoveBinaryData.test.ts @@ -1,7 +1,7 @@ /* eslint-disable @typescript-eslint/no-loop-func */ -import * as Helpers from '../../../test/nodes/Helpers'; -import type { WorkflowTestData } from '../../../test/nodes/types'; -import { executeWorkflow } from '../../../test/nodes/ExecuteWorkflow'; +import * as Helpers from '@test/nodes/Helpers'; +import type { WorkflowTestData } from '@test/nodes/types'; +import { executeWorkflow } from '@test/nodes/ExecuteWorkflow'; import path from 'path'; describe('Test Move Binary Data Node', () => { diff --git a/packages/nodes-base/nodes/MySql/test/v2/operations.test.ts b/packages/nodes-base/nodes/MySql/test/v2/operations.test.ts index a131e929be..d79432ac2e 100644 --- a/packages/nodes-base/nodes/MySql/test/v2/operations.test.ts +++ b/packages/nodes-base/nodes/MySql/test/v2/operations.test.ts @@ -1,6 +1,6 @@ import type { IDataObject, INode } from 'n8n-workflow'; -import { createMockExecuteFunction } from '../../../../test/nodes/Helpers'; +import { createMockExecuteFunction } from '@test/nodes/Helpers'; import * as deleteTable from '../../v2/actions/database/deleteTable.operation'; import * as executeQuery from '../../v2/actions/database/executeQuery.operation'; diff --git a/packages/nodes-base/nodes/MySql/test/v2/runQueries.test.ts b/packages/nodes-base/nodes/MySql/test/v2/runQueries.test.ts index 3fd5ffce4e..94481afa91 100644 --- a/packages/nodes-base/nodes/MySql/test/v2/runQueries.test.ts +++ b/packages/nodes-base/nodes/MySql/test/v2/runQueries.test.ts @@ -1,4 +1,4 @@ -import { createMockExecuteFunction } from '../../../../test/nodes/Helpers'; +import { createMockExecuteFunction } from '@test/nodes/Helpers'; import { configureQueryRunner } from '../../v2/helpers/utils'; import type { Mysql2Pool, QueryRunner } from '../../v2/helpers/interfaces'; diff --git a/packages/nodes-base/nodes/MySql/v1/MySqlV1.node.ts b/packages/nodes-base/nodes/MySql/v1/MySqlV1.node.ts index ab25667113..aa29bd53db 100644 --- a/packages/nodes-base/nodes/MySql/v1/MySqlV1.node.ts +++ b/packages/nodes-base/nodes/MySql/v1/MySqlV1.node.ts @@ -4,6 +4,7 @@ import type { ICredentialsDecrypted, ICredentialTestFunctions, IDataObject, + IExecuteFunctions, INodeCredentialTestResult, INodeExecutionData, INodeType, @@ -15,7 +16,6 @@ import { NodeOperationError } from 'n8n-workflow'; import type mysql2 from 'mysql2/promise'; import { copyInputItems, createConnection, searchTables } from './GenericFunctions'; -import type { IExecuteFunctions } from 'n8n-core'; import { oldVersionNotice } from '@utils/descriptions'; diff --git a/packages/nodes-base/nodes/MySql/v2/MySqlV2.node.ts b/packages/nodes-base/nodes/MySql/v2/MySqlV2.node.ts index 13696dc468..01bc2aa8a2 100644 --- a/packages/nodes-base/nodes/MySql/v2/MySqlV2.node.ts +++ b/packages/nodes-base/nodes/MySql/v2/MySqlV2.node.ts @@ -1,13 +1,12 @@ /* eslint-disable n8n-nodes-base/node-filename-against-convention */ import type { + IExecuteFunctions, INodeExecutionData, INodeType, INodeTypeBaseDescription, INodeTypeDescription, } from 'n8n-workflow'; -import type { IExecuteFunctions } from 'n8n-core'; - import { listSearch, credentialTest, loadOptions } from './methods'; import { versionDescription } from './actions/versionDescription'; diff --git a/packages/nodes-base/nodes/MySql/v2/actions/database/deleteTable.operation.ts b/packages/nodes-base/nodes/MySql/v2/actions/database/deleteTable.operation.ts index ef6808ca98..7467558563 100644 --- a/packages/nodes-base/nodes/MySql/v2/actions/database/deleteTable.operation.ts +++ b/packages/nodes-base/nodes/MySql/v2/actions/database/deleteTable.operation.ts @@ -1,5 +1,9 @@ -import type { IExecuteFunctions } from 'n8n-core'; -import type { IDataObject, INodeExecutionData, INodeProperties } from 'n8n-workflow'; +import type { + IDataObject, + IExecuteFunctions, + INodeExecutionData, + INodeProperties, +} from 'n8n-workflow'; import { NodeOperationError } from 'n8n-workflow'; import type { diff --git a/packages/nodes-base/nodes/MySql/v2/actions/database/executeQuery.operation.ts b/packages/nodes-base/nodes/MySql/v2/actions/database/executeQuery.operation.ts index 13c552b0a1..2680849c08 100644 --- a/packages/nodes-base/nodes/MySql/v2/actions/database/executeQuery.operation.ts +++ b/packages/nodes-base/nodes/MySql/v2/actions/database/executeQuery.operation.ts @@ -1,5 +1,9 @@ -import type { IExecuteFunctions } from 'n8n-core'; -import type { IDataObject, INodeExecutionData, INodeProperties } from 'n8n-workflow'; +import type { + IDataObject, + IExecuteFunctions, + INodeExecutionData, + INodeProperties, +} from 'n8n-workflow'; import { NodeOperationError } from 'n8n-workflow'; import type { QueryRunner, QueryWithValues } from '../../helpers/interfaces'; diff --git a/packages/nodes-base/nodes/MySql/v2/actions/database/insert.operation.ts b/packages/nodes-base/nodes/MySql/v2/actions/database/insert.operation.ts index 08d818d31f..b253cb94d8 100644 --- a/packages/nodes-base/nodes/MySql/v2/actions/database/insert.operation.ts +++ b/packages/nodes-base/nodes/MySql/v2/actions/database/insert.operation.ts @@ -1,5 +1,9 @@ -import type { IExecuteFunctions } from 'n8n-core'; -import type { IDataObject, INodeExecutionData, INodeProperties } from 'n8n-workflow'; +import type { + IDataObject, + IExecuteFunctions, + INodeExecutionData, + INodeProperties, +} from 'n8n-workflow'; import type { QueryMode, diff --git a/packages/nodes-base/nodes/MySql/v2/actions/database/select.operation.ts b/packages/nodes-base/nodes/MySql/v2/actions/database/select.operation.ts index 909de912f6..ab00688e8a 100644 --- a/packages/nodes-base/nodes/MySql/v2/actions/database/select.operation.ts +++ b/packages/nodes-base/nodes/MySql/v2/actions/database/select.operation.ts @@ -1,5 +1,9 @@ -import type { IExecuteFunctions } from 'n8n-core'; -import type { IDataObject, INodeExecutionData, INodeProperties } from 'n8n-workflow'; +import type { + IDataObject, + IExecuteFunctions, + INodeExecutionData, + INodeProperties, +} from 'n8n-workflow'; import type { QueryRunner, diff --git a/packages/nodes-base/nodes/MySql/v2/actions/database/update.operation.ts b/packages/nodes-base/nodes/MySql/v2/actions/database/update.operation.ts index 7dd602e77f..cf7515adf3 100644 --- a/packages/nodes-base/nodes/MySql/v2/actions/database/update.operation.ts +++ b/packages/nodes-base/nodes/MySql/v2/actions/database/update.operation.ts @@ -1,5 +1,9 @@ -import type { IExecuteFunctions } from 'n8n-core'; -import type { IDataObject, INodeExecutionData, INodeProperties } from 'n8n-workflow'; +import type { + IDataObject, + IExecuteFunctions, + INodeExecutionData, + INodeProperties, +} from 'n8n-workflow'; import type { QueryRunner, QueryValues, QueryWithValues } from '../../helpers/interfaces'; import { AUTO_MAP, DATA_MODE } from '../../helpers/interfaces'; diff --git a/packages/nodes-base/nodes/MySql/v2/actions/database/upsert.operation.ts b/packages/nodes-base/nodes/MySql/v2/actions/database/upsert.operation.ts index 859686e5d6..40e2892bdc 100644 --- a/packages/nodes-base/nodes/MySql/v2/actions/database/upsert.operation.ts +++ b/packages/nodes-base/nodes/MySql/v2/actions/database/upsert.operation.ts @@ -1,5 +1,9 @@ -import type { IExecuteFunctions } from 'n8n-core'; -import type { IDataObject, INodeExecutionData, INodeProperties } from 'n8n-workflow'; +import type { + IDataObject, + IExecuteFunctions, + INodeExecutionData, + INodeProperties, +} from 'n8n-workflow'; import type { QueryRunner, QueryValues, QueryWithValues } from '../../helpers/interfaces'; import { AUTO_MAP, DATA_MODE } from '../../helpers/interfaces'; diff --git a/packages/nodes-base/nodes/MySql/v2/actions/router.ts b/packages/nodes-base/nodes/MySql/v2/actions/router.ts index 88cc1a3d08..3bb08bc93b 100644 --- a/packages/nodes-base/nodes/MySql/v2/actions/router.ts +++ b/packages/nodes-base/nodes/MySql/v2/actions/router.ts @@ -1,6 +1,5 @@ -import type { INodeExecutionData } from 'n8n-workflow'; +import type { IExecuteFunctions, INodeExecutionData } from 'n8n-workflow'; import { NodeOperationError } from 'n8n-workflow'; -import type { IExecuteFunctions } from 'n8n-core'; import { Client } from 'ssh2'; diff --git a/packages/nodes-base/nodes/N8n/test/node/N8n.test.ts b/packages/nodes-base/nodes/N8n/test/node/N8n.test.ts index 6d863e43db..9e896d3aa0 100644 --- a/packages/nodes-base/nodes/N8n/test/node/N8n.test.ts +++ b/packages/nodes-base/nodes/N8n/test/node/N8n.test.ts @@ -1,9 +1,9 @@ -import { setup, workflowToTests, getWorkflowFilenames } from '../../../../test/nodes/Helpers'; +import { setup, workflowToTests, getWorkflowFilenames } from '@test/nodes/Helpers'; import nock from 'nock'; -import { executeWorkflow } from '../../../../test/nodes/ExecuteWorkflow'; +import { executeWorkflow } from '@test/nodes/ExecuteWorkflow'; -import type { WorkflowTestData } from '../../../../test/nodes/types'; +import type { WorkflowTestData } from '@test/nodes/types'; import type { INodeTypes } from 'n8n-workflow'; diff --git a/packages/nodes-base/nodes/Postgres/test/v2/runQueries.test.ts b/packages/nodes-base/nodes/Postgres/test/v2/runQueries.test.ts index 9bf94936fe..769569ac57 100644 --- a/packages/nodes-base/nodes/Postgres/test/v2/runQueries.test.ts +++ b/packages/nodes-base/nodes/Postgres/test/v2/runQueries.test.ts @@ -1,10 +1,10 @@ -import { constructExecutionMetaData } from 'n8n-core'; -import type { IDataObject, INode } from 'n8n-workflow'; +import type { IDataObject, IExecuteFunctions, INode } from 'n8n-workflow'; import type { PgpDatabase } from '../../v2/helpers/interfaces'; import { configureQueryRunner } from '../../v2/helpers/utils'; import pgPromise from 'pg-promise'; +import { mock } from 'jest-mock-extended'; const node: INode = { id: '1', @@ -41,7 +41,8 @@ describe('Test PostgresV2, runQueries', () => { const dbMultiSpy = jest.spyOn(db, 'multi'); - const runQueries = configureQueryRunner(node, constructExecutionMetaData, false, pgp, db); + const thisArg = mock(); + const runQueries = configureQueryRunner.call(thisArg, node, false, pgp, db); const result = await runQueries([{ query: 'SELECT * FROM table', values: [] }], [], {}); diff --git a/packages/nodes-base/nodes/Postgres/v1/PostgresV1.node.ts b/packages/nodes-base/nodes/Postgres/v1/PostgresV1.node.ts index 09d57ad9fc..c7b7979a8d 100644 --- a/packages/nodes-base/nodes/Postgres/v1/PostgresV1.node.ts +++ b/packages/nodes-base/nodes/Postgres/v1/PostgresV1.node.ts @@ -1,9 +1,9 @@ /* eslint-disable n8n-nodes-base/node-filename-against-convention */ -import type { IExecuteFunctions } from 'n8n-core'; import type { ICredentialsDecrypted, ICredentialTestFunctions, IDataObject, + IExecuteFunctions, INodeCredentialTestResult, INodeExecutionData, INodeType, diff --git a/packages/nodes-base/nodes/Postgres/v2/PostgresV2.node.ts b/packages/nodes-base/nodes/Postgres/v2/PostgresV2.node.ts index cc7cab72d7..caa0ad669e 100644 --- a/packages/nodes-base/nodes/Postgres/v2/PostgresV2.node.ts +++ b/packages/nodes-base/nodes/Postgres/v2/PostgresV2.node.ts @@ -1,6 +1,6 @@ /* eslint-disable n8n-nodes-base/node-filename-against-convention */ -import type { IExecuteFunctions } from 'n8n-core'; import type { + IExecuteFunctions, INodeExecutionData, INodeType, INodeTypeBaseDescription, diff --git a/packages/nodes-base/nodes/Postgres/v2/actions/database/deleteTable.operation.ts b/packages/nodes-base/nodes/Postgres/v2/actions/database/deleteTable.operation.ts index 40c205cc4e..321f3fecc7 100644 --- a/packages/nodes-base/nodes/Postgres/v2/actions/database/deleteTable.operation.ts +++ b/packages/nodes-base/nodes/Postgres/v2/actions/database/deleteTable.operation.ts @@ -1,5 +1,9 @@ -import type { IExecuteFunctions } from 'n8n-core'; -import type { IDataObject, INodeExecutionData, INodeProperties } from 'n8n-workflow'; +import type { + IDataObject, + IExecuteFunctions, + INodeExecutionData, + INodeProperties, +} from 'n8n-workflow'; import { NodeOperationError } from 'n8n-workflow'; import { updateDisplayOptions } from '@utils/utilities'; diff --git a/packages/nodes-base/nodes/Postgres/v2/actions/database/executeQuery.operation.ts b/packages/nodes-base/nodes/Postgres/v2/actions/database/executeQuery.operation.ts index 8d3346ccc9..e043fddc34 100644 --- a/packages/nodes-base/nodes/Postgres/v2/actions/database/executeQuery.operation.ts +++ b/packages/nodes-base/nodes/Postgres/v2/actions/database/executeQuery.operation.ts @@ -1,5 +1,9 @@ -import type { IExecuteFunctions } from 'n8n-core'; -import type { IDataObject, INodeExecutionData, INodeProperties } from 'n8n-workflow'; +import type { + IDataObject, + IExecuteFunctions, + INodeExecutionData, + INodeProperties, +} from 'n8n-workflow'; import { NodeOperationError } from 'n8n-workflow'; import { getResolvables, updateDisplayOptions } from '@utils/utilities'; diff --git a/packages/nodes-base/nodes/Postgres/v2/actions/database/insert.operation.ts b/packages/nodes-base/nodes/Postgres/v2/actions/database/insert.operation.ts index e6a67f4100..8bf777f86a 100644 --- a/packages/nodes-base/nodes/Postgres/v2/actions/database/insert.operation.ts +++ b/packages/nodes-base/nodes/Postgres/v2/actions/database/insert.operation.ts @@ -1,5 +1,9 @@ -import type { IExecuteFunctions } from 'n8n-core'; -import type { IDataObject, INodeExecutionData, INodeProperties } from 'n8n-workflow'; +import type { + IDataObject, + IExecuteFunctions, + INodeExecutionData, + INodeProperties, +} from 'n8n-workflow'; import { updateDisplayOptions } from '@utils/utilities'; diff --git a/packages/nodes-base/nodes/Postgres/v2/actions/database/select.operation.ts b/packages/nodes-base/nodes/Postgres/v2/actions/database/select.operation.ts index 80a9418880..e1140d5df9 100644 --- a/packages/nodes-base/nodes/Postgres/v2/actions/database/select.operation.ts +++ b/packages/nodes-base/nodes/Postgres/v2/actions/database/select.operation.ts @@ -1,5 +1,9 @@ -import type { IExecuteFunctions } from 'n8n-core'; -import type { IDataObject, INodeExecutionData, INodeProperties } from 'n8n-workflow'; +import type { + IDataObject, + IExecuteFunctions, + INodeExecutionData, + INodeProperties, +} from 'n8n-workflow'; import { updateDisplayOptions } from '@utils/utilities'; diff --git a/packages/nodes-base/nodes/Postgres/v2/actions/database/update.operation.ts b/packages/nodes-base/nodes/Postgres/v2/actions/database/update.operation.ts index 32413a94e1..365801eed3 100644 --- a/packages/nodes-base/nodes/Postgres/v2/actions/database/update.operation.ts +++ b/packages/nodes-base/nodes/Postgres/v2/actions/database/update.operation.ts @@ -1,5 +1,9 @@ -import type { IExecuteFunctions } from 'n8n-core'; -import type { IDataObject, INodeExecutionData, INodeProperties } from 'n8n-workflow'; +import type { + IDataObject, + IExecuteFunctions, + INodeExecutionData, + INodeProperties, +} from 'n8n-workflow'; import { NodeOperationError } from 'n8n-workflow'; import { updateDisplayOptions } from '@utils/utilities'; diff --git a/packages/nodes-base/nodes/Postgres/v2/actions/database/upsert.operation.ts b/packages/nodes-base/nodes/Postgres/v2/actions/database/upsert.operation.ts index 8fcbaa6f87..cbc6ba762c 100644 --- a/packages/nodes-base/nodes/Postgres/v2/actions/database/upsert.operation.ts +++ b/packages/nodes-base/nodes/Postgres/v2/actions/database/upsert.operation.ts @@ -1,5 +1,9 @@ -import type { IExecuteFunctions } from 'n8n-core'; -import type { IDataObject, INodeExecutionData, INodeProperties } from 'n8n-workflow'; +import type { + IDataObject, + IExecuteFunctions, + INodeExecutionData, + INodeProperties, +} from 'n8n-workflow'; import { NodeOperationError } from 'n8n-workflow'; import { updateDisplayOptions } from '@utils/utilities'; diff --git a/packages/nodes-base/nodes/Postgres/v2/actions/router.ts b/packages/nodes-base/nodes/Postgres/v2/actions/router.ts index 901bc9f361..a52cd27eaf 100644 --- a/packages/nodes-base/nodes/Postgres/v2/actions/router.ts +++ b/packages/nodes-base/nodes/Postgres/v2/actions/router.ts @@ -20,9 +20,9 @@ export async function router(this: IExecuteFunctions): Promise; export type PgpConnectionParameters = pg.IConnectionParameters; export type ConnectionsData = { db: PgpDatabase; pgp: PgpClient; sshClient?: Client }; -export type ConstructExecutionMetaData = ( - inputData: INodeExecutionData[], - options: { - itemData: IPairedItemData | IPairedItemData[]; - }, -) => NodeExecutionWithMetadata[]; - export type QueriesRunner = ( queries: QueryWithValues[], items: INodeExecutionData[], diff --git a/packages/nodes-base/nodes/Postgres/v2/helpers/utils.ts b/packages/nodes-base/nodes/Postgres/v2/helpers/utils.ts index 61a8ce2218..b34c36e098 100644 --- a/packages/nodes-base/nodes/Postgres/v2/helpers/utils.ts +++ b/packages/nodes-base/nodes/Postgres/v2/helpers/utils.ts @@ -1,9 +1,14 @@ -import type { IDataObject, INode, INodeExecutionData, INodePropertyOptions } from 'n8n-workflow'; +import type { + IDataObject, + IExecuteFunctions, + INode, + INodeExecutionData, + INodePropertyOptions, +} from 'n8n-workflow'; import { NodeOperationError } from 'n8n-workflow'; import type { ColumnInfo, - ConstructExecutionMetaData, EnumInfo, PgpClient, PgpDatabase, @@ -194,15 +199,14 @@ export function addReturning( return [`${query} RETURNING $${replacementIndex}:name`, [...replacements, outputColumns]]; } -export const configureQueryRunner = - ( - node: INode, - constructExecutionMetaData: ConstructExecutionMetaData, - continueOnFail: boolean, - pgp: PgpClient, - db: PgpDatabase, - ) => - async (queries: QueryWithValues[], items: INodeExecutionData[], options: IDataObject) => { +export function configureQueryRunner( + this: IExecuteFunctions, + node: INode, + continueOnFail: boolean, + pgp: PgpClient, + db: PgpDatabase, +) { + return async (queries: QueryWithValues[], items: INodeExecutionData[], options: IDataObject) => { let returnData: INodeExecutionData[] = []; const queryBatching = (options.queryBatching as QueryMode) || 'single'; @@ -211,7 +215,7 @@ export const configureQueryRunner = try { returnData = (await db.multi(pgp.helpers.concat(queries))) .map((result, i) => { - return constructExecutionMetaData(wrapData(result as IDataObject[]), { + return this.helpers.constructExecutionMetaData(wrapData(result as IDataObject[]), { itemData: { item: i }, }); }) @@ -242,7 +246,7 @@ export const configureQueryRunner = queries[i].values, ); - const executionData = constructExecutionMetaData( + const executionData = this.helpers.constructExecutionMetaData( wrapData(transactionResult.length ? transactionResult : [{ success: true }]), { itemData: { item: i } }, ); @@ -269,7 +273,7 @@ export const configureQueryRunner = queries[i].values, ); - const executionData = constructExecutionMetaData( + const executionData = this.helpers.constructExecutionMetaData( wrapData(transactionResult.length ? transactionResult : [{ success: true }]), { itemData: { item: i } }, ); @@ -287,6 +291,7 @@ export const configureQueryRunner = return returnData; }; +} export function replaceEmptyStringsByNulls( items: INodeExecutionData[], diff --git a/packages/nodes-base/nodes/QuickChart/test/QuickChart.node.test.ts b/packages/nodes-base/nodes/QuickChart/test/QuickChart.node.test.ts index 77f125fd51..eeaa224493 100644 --- a/packages/nodes-base/nodes/QuickChart/test/QuickChart.node.test.ts +++ b/packages/nodes-base/nodes/QuickChart/test/QuickChart.node.test.ts @@ -1,7 +1,7 @@ /* eslint-disable @typescript-eslint/no-loop-func */ -import * as Helpers from '../../../test/nodes/Helpers'; -import type { WorkflowTestData } from '../../../test/nodes/types'; -import { executeWorkflow } from '../../../test/nodes/ExecuteWorkflow'; +import * as Helpers from '@test/nodes/Helpers'; +import type { WorkflowTestData } from '@test/nodes/types'; +import { executeWorkflow } from '@test/nodes/ExecuteWorkflow'; import nock from 'nock'; describe('Test QuickChart Node', () => { diff --git a/packages/nodes-base/nodes/ReadBinaryFile/test/ReadBinaryFile.test.ts b/packages/nodes-base/nodes/ReadBinaryFile/test/ReadBinaryFile.test.ts index fbba908978..637b1d6b07 100644 --- a/packages/nodes-base/nodes/ReadBinaryFile/test/ReadBinaryFile.test.ts +++ b/packages/nodes-base/nodes/ReadBinaryFile/test/ReadBinaryFile.test.ts @@ -1,7 +1,7 @@ /* eslint-disable @typescript-eslint/no-loop-func */ -import * as Helpers from '../../../test/nodes/Helpers'; -import type { WorkflowTestData } from '../../../test/nodes/types'; -import { executeWorkflow } from '../../../test/nodes/ExecuteWorkflow'; +import * as Helpers from '@test/nodes/Helpers'; +import type { WorkflowTestData } from '@test/nodes/types'; +import { executeWorkflow } from '@test/nodes/ExecuteWorkflow'; import path from 'path'; describe('Test Read Binary File Node', () => { diff --git a/packages/nodes-base/nodes/ReadBinaryFiles/test/ReadBinaryFiles.test.ts b/packages/nodes-base/nodes/ReadBinaryFiles/test/ReadBinaryFiles.test.ts index 8c79fbe480..78f021c504 100644 --- a/packages/nodes-base/nodes/ReadBinaryFiles/test/ReadBinaryFiles.test.ts +++ b/packages/nodes-base/nodes/ReadBinaryFiles/test/ReadBinaryFiles.test.ts @@ -1,7 +1,7 @@ /* eslint-disable @typescript-eslint/no-loop-func */ -import * as Helpers from '../../../test/nodes/Helpers'; -import type { WorkflowTestData } from '../../../test/nodes/types'; -import { executeWorkflow } from '../../../test/nodes/ExecuteWorkflow'; +import * as Helpers from '@test/nodes/Helpers'; +import type { WorkflowTestData } from '@test/nodes/types'; +import { executeWorkflow } from '@test/nodes/ExecuteWorkflow'; import path from 'path'; describe('Test Read Binary Files Node', () => { diff --git a/packages/nodes-base/nodes/ReadPdf/test/ReadPDF.test.ts b/packages/nodes-base/nodes/ReadPdf/test/ReadPDF.test.ts index b814a3eee5..efe6c44f11 100644 --- a/packages/nodes-base/nodes/ReadPdf/test/ReadPDF.test.ts +++ b/packages/nodes-base/nodes/ReadPdf/test/ReadPDF.test.ts @@ -1,7 +1,7 @@ /* eslint-disable @typescript-eslint/no-loop-func */ -import * as Helpers from '../../../test/nodes/Helpers'; -import type { WorkflowTestData } from '../../../test/nodes/types'; -import { executeWorkflow } from '../../../test/nodes/ExecuteWorkflow'; +import * as Helpers from '@test/nodes/Helpers'; +import type { WorkflowTestData } from '@test/nodes/types'; +import { executeWorkflow } from '@test/nodes/ExecuteWorkflow'; import path from 'path'; describe('Test Read PDF Node', () => { diff --git a/packages/nodes-base/nodes/RenameKeys/test/RenameKeys.test.ts b/packages/nodes-base/nodes/RenameKeys/test/RenameKeys.test.ts index 63446295bf..deb62b4ac9 100644 --- a/packages/nodes-base/nodes/RenameKeys/test/RenameKeys.test.ts +++ b/packages/nodes-base/nodes/RenameKeys/test/RenameKeys.test.ts @@ -1,4 +1,4 @@ -import { testWorkflows, getWorkflowFilenames } from '../../../test/nodes/Helpers'; +import { testWorkflows, getWorkflowFilenames } from '@test/nodes/Helpers'; const workflows = getWorkflowFilenames(__dirname); diff --git a/packages/nodes-base/nodes/RssFeedRead/RssFeedRead.node.ts b/packages/nodes-base/nodes/RssFeedRead/RssFeedRead.node.ts index 637f589b85..6397340036 100644 --- a/packages/nodes-base/nodes/RssFeedRead/RssFeedRead.node.ts +++ b/packages/nodes-base/nodes/RssFeedRead/RssFeedRead.node.ts @@ -14,7 +14,7 @@ import { URL } from 'url'; function validateURL(url: string) { try { - const _parseUrl = new URL(url); + new URL(url); return true; } catch (err) { return false; diff --git a/packages/nodes-base/nodes/RssFeedRead/test/node/RssFeedRead.test.ts b/packages/nodes-base/nodes/RssFeedRead/test/node/RssFeedRead.test.ts index ff46b61735..b1040c13d1 100644 --- a/packages/nodes-base/nodes/RssFeedRead/test/node/RssFeedRead.test.ts +++ b/packages/nodes-base/nodes/RssFeedRead/test/node/RssFeedRead.test.ts @@ -1,9 +1,4 @@ -import { - setup, - equalityTest, - workflowToTests, - getWorkflowFilenames, -} from '../../../../test/nodes/Helpers'; +import { setup, equalityTest, workflowToTests, getWorkflowFilenames } from '@test/nodes/Helpers'; import nock from 'nock'; diff --git a/packages/nodes-base/nodes/Set/test/Set.node.test.ts b/packages/nodes-base/nodes/Set/test/Set.node.test.ts index 9c794fa420..121a3c0a12 100644 --- a/packages/nodes-base/nodes/Set/test/Set.node.test.ts +++ b/packages/nodes-base/nodes/Set/test/Set.node.test.ts @@ -1,4 +1,4 @@ -import { testWorkflows, getWorkflowFilenames } from '../../../test/nodes/Helpers'; +import { testWorkflows, getWorkflowFilenames } from '@test/nodes/Helpers'; const workflows = getWorkflowFilenames(__dirname); describe('Test Set Node', () => testWorkflows(workflows)); diff --git a/packages/nodes-base/nodes/SplitInBatches/test/SplitInBatches.node.test.ts b/packages/nodes-base/nodes/SplitInBatches/test/SplitInBatches.node.test.ts index 21e55f4fd8..708919f602 100644 --- a/packages/nodes-base/nodes/SplitInBatches/test/SplitInBatches.node.test.ts +++ b/packages/nodes-base/nodes/SplitInBatches/test/SplitInBatches.node.test.ts @@ -1,4 +1,4 @@ -import { testWorkflows, getWorkflowFilenames } from '../../../test/nodes/Helpers'; +import { testWorkflows, getWorkflowFilenames } from '@test/nodes/Helpers'; const workflows = getWorkflowFilenames(__dirname); describe('Execute SplitInBatches Node', () => testWorkflows(workflows)); diff --git a/packages/nodes-base/nodes/SpreadsheetFile/test/SpreadsheetFile.test.ts b/packages/nodes-base/nodes/SpreadsheetFile/test/SpreadsheetFile.test.ts index d908c16895..ab7313deda 100644 --- a/packages/nodes-base/nodes/SpreadsheetFile/test/SpreadsheetFile.test.ts +++ b/packages/nodes-base/nodes/SpreadsheetFile/test/SpreadsheetFile.test.ts @@ -1,7 +1,7 @@ -import * as Helpers from '../../../test/nodes/Helpers'; -import type { WorkflowTestData } from '../../../test/nodes/types'; +import * as Helpers from '@test/nodes/Helpers'; +import type { WorkflowTestData } from '@test/nodes/types'; -import { executeWorkflow } from '../../../test/nodes/ExecuteWorkflow'; +import { executeWorkflow } from '@test/nodes/ExecuteWorkflow'; import path from 'path'; describe('Execute Spreadsheet File Node', () => { diff --git a/packages/nodes-base/nodes/StopAndError/test/node/StopAndError.test.ts b/packages/nodes-base/nodes/StopAndError/test/node/StopAndError.test.ts index fd33956231..fcb31fdad8 100644 --- a/packages/nodes-base/nodes/StopAndError/test/node/StopAndError.test.ts +++ b/packages/nodes-base/nodes/StopAndError/test/node/StopAndError.test.ts @@ -1,7 +1,7 @@ /* eslint-disable @typescript-eslint/no-loop-func */ -import type { WorkflowTestData } from '../../../../test/nodes/types'; -import { executeWorkflow } from '../../../../test/nodes/ExecuteWorkflow'; -import * as Helpers from '../../../../test/nodes/Helpers'; +import type { WorkflowTestData } from '@test/nodes/types'; +import { executeWorkflow } from '@test/nodes/ExecuteWorkflow'; +import * as Helpers from '@test/nodes/Helpers'; import type { IDataObject } from 'n8n-workflow'; describe('Execute Stop and Error Node', () => { diff --git a/packages/nodes-base/nodes/Switch/test/switch.node.test.ts b/packages/nodes-base/nodes/Switch/test/switch.node.test.ts index 030f9fa24e..ab506aa481 100644 --- a/packages/nodes-base/nodes/Switch/test/switch.node.test.ts +++ b/packages/nodes-base/nodes/Switch/test/switch.node.test.ts @@ -1,4 +1,4 @@ -import { testWorkflows, getWorkflowFilenames } from '../../../test/nodes/Helpers'; +import { testWorkflows, getWorkflowFilenames } from '@test/nodes/Helpers'; const workflows = getWorkflowFilenames(__dirname); describe('Execute Switch Node', () => testWorkflows(workflows)); diff --git a/packages/nodes-base/nodes/Totp/test/Totp.node.test.ts b/packages/nodes-base/nodes/Totp/test/Totp.node.test.ts index 200aa41d35..f454daeba3 100644 --- a/packages/nodes-base/nodes/Totp/test/Totp.node.test.ts +++ b/packages/nodes-base/nodes/Totp/test/Totp.node.test.ts @@ -1,6 +1,6 @@ -import * as Helpers from '../../../test/nodes/Helpers'; -import { executeWorkflow } from '../../../test/nodes/ExecuteWorkflow'; -import type { WorkflowTestData } from '../../../test/nodes/types'; +import * as Helpers from '@test/nodes/Helpers'; +import { executeWorkflow } from '@test/nodes/ExecuteWorkflow'; +import type { WorkflowTestData } from '@test/nodes/types'; jest.mock('otpauth', () => { return { diff --git a/packages/nodes-base/nodes/Twitter/test/Twitter.test.ts b/packages/nodes-base/nodes/Twitter/test/Twitter.test.ts index e9e1e09bae..9d164cc960 100644 --- a/packages/nodes-base/nodes/Twitter/test/Twitter.test.ts +++ b/packages/nodes-base/nodes/Twitter/test/Twitter.test.ts @@ -1,4 +1,4 @@ -import { getWorkflowFilenames, testWorkflows } from '../../../test/nodes/Helpers'; +import { getWorkflowFilenames, testWorkflows } from '@test/nodes/Helpers'; import nock from 'nock'; diff --git a/packages/nodes-base/nodes/UProc/UProc.node.ts b/packages/nodes-base/nodes/UProc/UProc.node.ts index bcd9f2967a..298e1f5efd 100644 --- a/packages/nodes-base/nodes/UProc/UProc.node.ts +++ b/packages/nodes-base/nodes/UProc/UProc.node.ts @@ -102,7 +102,6 @@ export class UProc implements INodeType { return field.name; }); - const _requestPromises = []; for (let i = 0; i < length; i++) { try { const toolKey = tool.replace(/([A-Z]+)/g, '-$1').toLowerCase(); diff --git a/packages/nodes-base/nodes/Wait/test/Wait.node.test.ts b/packages/nodes-base/nodes/Wait/test/Wait.node.test.ts index 02b5e39eac..d6d43c5329 100644 --- a/packages/nodes-base/nodes/Wait/test/Wait.node.test.ts +++ b/packages/nodes-base/nodes/Wait/test/Wait.node.test.ts @@ -1,4 +1,4 @@ -import { testWorkflows, getWorkflowFilenames } from '../../../test/nodes/Helpers'; +import { testWorkflows, getWorkflowFilenames } from '@test/nodes/Helpers'; const workflows = getWorkflowFilenames(__dirname); describe('Execute Wait Node', () => { diff --git a/packages/nodes-base/nodes/WriteBinaryFile/test/WriteBinaryFile.test.ts b/packages/nodes-base/nodes/WriteBinaryFile/test/WriteBinaryFile.test.ts index 8a11e927c1..147d4318f3 100644 --- a/packages/nodes-base/nodes/WriteBinaryFile/test/WriteBinaryFile.test.ts +++ b/packages/nodes-base/nodes/WriteBinaryFile/test/WriteBinaryFile.test.ts @@ -1,7 +1,7 @@ /* eslint-disable @typescript-eslint/no-loop-func */ -import * as Helpers from '../../../test/nodes/Helpers'; -import type { WorkflowTestData } from '../../../test/nodes/types'; -import { executeWorkflow } from '../../../test/nodes/ExecuteWorkflow'; +import * as Helpers from '@test/nodes/Helpers'; +import type { WorkflowTestData } from '@test/nodes/types'; +import { executeWorkflow } from '@test/nodes/ExecuteWorkflow'; import path from 'path'; describe('Test Write Binary File Node', () => { diff --git a/packages/nodes-base/nodes/Xml/test/node/Xml.test.ts b/packages/nodes-base/nodes/Xml/test/node/Xml.test.ts index 42fc0cf34a..3be88943f2 100644 --- a/packages/nodes-base/nodes/Xml/test/node/Xml.test.ts +++ b/packages/nodes-base/nodes/Xml/test/node/Xml.test.ts @@ -1,4 +1,4 @@ -import { testWorkflows, getWorkflowFilenames } from '../../../../test/nodes/Helpers'; +import { testWorkflows, getWorkflowFilenames } from '@test/nodes/Helpers'; const workflows = getWorkflowFilenames(__dirname); diff --git a/packages/nodes-base/tsconfig.json b/packages/nodes-base/tsconfig.json index 2d53507ba0..7031bb62f1 100644 --- a/packages/nodes-base/tsconfig.json +++ b/packages/nodes-base/tsconfig.json @@ -10,7 +10,6 @@ }, // TODO: remove all options below this line "noImplicitReturns": false, - "noUnusedLocals": false, "useUnknownInCatchVariables": false }, "include": ["credentials/**/*.ts", "nodes/**/*.ts", "test/**/*.ts", "utils/**/*.ts"],