From f50fc8443e3359b0a3b0ca991b4be878aa52e606 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= Date: Wed, 16 Aug 2023 15:52:41 +0200 Subject: [PATCH] refactor: Reduce usage of `IExecuteSingleFunctions` (no-changelog) (#6944) --- .../AcuityScheduling/GenericFunctions.ts | 8 +------- .../nodes/AgileCrm/GenericFunctions.ts | 5 ++--- .../nodes/Automizy/GenericFunctions.ts | 3 +-- .../nodes/Bitbucket/GenericFunctions.ts | 3 +-- .../nodes/Bitly/GenericFunctions.ts | 3 +-- .../nodes-base/nodes/Box/GenericFunctions.ts | 3 +-- .../nodes/Brandfetch/GenericFunctions.ts | 3 +-- .../nodes/CircleCi/GenericFunctions.ts | 3 +-- .../nodes/Clearbit/GenericFunctions.ts | 3 +-- .../nodes/ClickUp/GenericFunctions.ts | 8 +------- .../nodes/Cloudflare/GenericFunctions.ts | 3 +-- .../nodes/Cockpit/CollectionFunctions.ts | 13 ++++--------- .../nodes-base/nodes/Cockpit/FormFunctions.ts | 9 ++------- .../nodes/Cockpit/GenericFunctions.ts | 5 ++--- .../nodes/Cockpit/SingletonFunctions.ts | 10 +++------- .../nodes-base/nodes/Coda/GenericFunctions.ts | 3 +-- .../nodes/CoinGecko/GenericFunctions.ts | 3 +-- .../nodes/Contentful/GenericFunctions.ts | 3 +-- .../nodes/ConvertKit/GenericFunctions.ts | 3 +-- .../nodes/Copper/GenericFunctions.ts | 8 +------- .../nodes/Cortex/GenericFunctions.ts | 3 +-- .../nodes/DeepL/GenericFunctions.ts | 3 +-- .../nodes/Demio/GenericFunctions.ts | 3 +-- .../nodes-base/nodes/Dhl/GenericFunctions.ts | 3 +-- .../nodes/Discourse/GenericFunctions.ts | 3 +-- .../nodes/Disqus/GenericFunctions.ts | 5 ++--- .../nodes-base/nodes/Egoi/GenericFunctions.ts | 3 +-- .../nodes/Eventbrite/GenericFunctions.ts | 8 +------- .../nodes/Facebook/GenericFunctions.ts | 8 +------- .../nodes/Figma/GenericFunctions.ts | 3 +-- .../nodes/FileMaker/GenericFunctions.ts | 9 +++------ .../nodes-base/nodes/Flow/GenericFunctions.ts | 3 +-- .../nodes/Ghost/GenericFunctions.ts | 3 +-- .../Google/Analytics/v1/GenericFunctions.ts | 3 +-- .../Google/Analytics/v2/transport/index.ts | 3 +-- .../Google/BigQuery/v1/GenericFunctions.ts | 3 +-- .../Google/BigQuery/v2/transport/index.ts | 3 +-- .../nodes/Google/Books/GenericFunctions.ts | 3 +-- .../nodes/Google/Calendar/GenericFunctions.ts | 3 +-- .../nodes/Google/Chat/GenericFunctions.ts | 3 +-- .../CloudNaturalLanguage/GenericFunctions.ts | 3 +-- .../nodes/Google/Contacts/GenericFunctions.ts | 3 +-- .../nodes/Google/Drive/v1/GenericFunctions.ts | 3 +-- .../nodes/Google/Drive/v2/transport/index.ts | 3 +-- .../CloudFirestore/GenericFunctions.ts | 3 +-- .../RealtimeDatabase/GenericFunctions.ts | 5 ++--- .../Google/GSuiteAdmin/GenericFunctions.ts | 3 +-- .../nodes/Google/GenericFunctions.ts | 8 +------- .../nodes/Google/Gmail/GenericFunctions.ts | 9 ++++----- .../nodes/Google/Sheet/v1/GenericFunctions.ts | 3 +-- .../nodes/Google/Sheet/v2/transport/index.ts | 3 +-- .../nodes/Google/Task/GenericFunctions.ts | 3 +-- .../Google/Translate/GenericFunctions.ts | 3 +-- .../nodes/Google/YouTube/GenericFunctions.ts | 3 +-- .../nodes/Gotify/GenericFunctions.ts | 3 +-- .../nodes/Gumroad/GenericFunctions.ts | 8 +------- .../nodes/HaloPSA/GenericFunctions.ts | 9 +-------- .../nodes/Harvest/GenericFunctions.ts | 5 ++--- .../nodes/HelpScout/GenericFunctions.ts | 3 +-- .../nodes/Hubspot/V1/GenericFunctions.ts | 3 +-- .../nodes/Hubspot/V2/GenericFunctions.ts | 3 +-- .../nodes/HumanticAI/GenericFunctions.ts | 3 +-- .../nodes/Hunter/GenericFunctions.ts | 3 +-- .../nodes/Intercom/GenericFunctions.ts | 3 +-- .../nodes/InvoiceNinja/GenericFunctions.ts | 3 +-- .../nodes/Iterable/GenericFunctions.ts | 3 +-- .../nodes/Jenkins/GenericFunctions.ts | 3 +-- .../nodes-base/nodes/Jira/GenericFunctions.ts | 3 +-- .../nodes/JotForm/GenericFunctions.ts | 8 +------- .../nodes-base/nodes/Line/GenericFunctions.ts | 3 +-- .../nodes/LingvaNex/GenericFunctions.ts | 3 +-- .../nodes/Mailchimp/GenericFunctions.ts | 5 ++--- .../nodes/MailerLite/GenericFunctions.ts | 3 +-- .../nodes/Mailjet/GenericFunctions.ts | 3 +-- .../nodes/Matrix/GenericFunctions.ts | 3 +-- .../nodes/Mautic/GenericFunctions.ts | 3 +-- .../nodes/Medium/GenericFunctions.ts | 3 +-- .../Microsoft/Dynamics/GenericFunctions.ts | 3 +-- .../Microsoft/Excel/v1/GenericFunctions.ts | 3 +-- .../Microsoft/Excel/v2/transport/index.ts | 3 +-- .../Microsoft/OneDrive/GenericFunctions.ts | 3 +-- .../Microsoft/Outlook/GenericFunctions.ts | 3 +-- .../nodes/Microsoft/Teams/GenericFunctions.ts | 3 +-- .../nodes/Mindee/GenericFunctions.ts | 3 +-- .../nodes/Netlify/GenericFunctions.ts | 3 +-- .../nodes/Notion/GenericFunctions.ts | 8 +------- .../nodes-base/nodes/Odoo/GenericFunctions.ts | 19 +++++++++---------- .../nodes/OpenThesaurus/GenericFunctions.ts | 3 +-- .../nodes/Orbit/GenericFunctions.ts | 3 +-- .../nodes-base/nodes/Oura/GenericFunctions.ts | 3 +-- .../nodes/Paddle/GenericFunctions.ts | 8 +------- .../nodes/PayPal/GenericFunctions.ts | 17 +++-------------- .../nodes/Peekalink/GenericFunctions.ts | 3 +-- .../nodes/Phantombuster/GenericFunctions.ts | 3 +-- .../nodes/ProfitWell/GenericFunctions.ts | 3 +-- .../nodes/Pushover/GenericFunctions.ts | 3 +-- .../nodes/Salesforce/GenericFunctions.ts | 7 +++---- .../nodes/Salesmate/GenericFunctions.ts | 8 +------- .../nodes/Segment/GenericFunctions.ts | 8 +------- .../nodes/SendGrid/GenericFunctions.ts | 3 +-- .../nodes/SentryIo/GenericFunctions.ts | 8 +------- .../nodes/Shopify/GenericFunctions.ts | 3 +-- .../nodes/Slack/V1/GenericFunctions.ts | 3 +-- .../nodes/Slack/V2/GenericFunctions.ts | 8 ++------ .../nodes/Storyblok/GenericFunctions.ts | 3 +-- .../nodes/Strava/GenericFunctions.ts | 8 +------- .../nodes/Supabase/GenericFunctions.ts | 8 +------- .../nodes/Taiga/GenericFunctions.ts | 15 ++------------- .../nodes/Tapfiliate/GenericFunctions.ts | 3 +-- .../nodes/Toggl/GenericFunctions.ts | 2 -- .../nodes/TravisCi/GenericFunctions.ts | 3 +-- .../nodes/Twitter/V1/GenericFunctions.ts | 3 +-- .../nodes/Twitter/V2/GenericFunctions.ts | 3 +-- .../nodes/UProc/GenericFunctions.ts | 3 +-- .../UnleashedSoftware/GenericFunctions.ts | 3 +-- .../nodes/Uplead/GenericFunctions.ts | 3 +-- .../Venafi/Datacenter/GenericFunctions.ts | 3 +-- .../Venafi/ProtectCloud/GenericFunctions.ts | 3 +-- .../nodes-base/nodes/Vero/GenericFunctions.ts | 3 +-- .../nodes/Vonage/GenericFunctions.ts | 3 +-- .../nodes/WooCommerce/GenericFunctions.ts | 8 +------- .../nodes/Wordpress/GenericFunctions.ts | 3 +-- .../nodes/Workable/GenericFunctions.ts | 3 +-- .../nodes/Wufoo/GenericFunctions.ts | 3 +-- .../nodes-base/nodes/Xero/GenericFunctions.ts | 3 +-- .../nodes/Yourls/GenericFunctions.ts | 3 +-- .../nodes/Zendesk/GenericFunctions.ts | 3 +-- .../nodes-base/nodes/Zoom/GenericFunctions.ts | 3 +-- 128 files changed, 158 insertions(+), 409 deletions(-) diff --git a/packages/nodes-base/nodes/AcuityScheduling/GenericFunctions.ts b/packages/nodes-base/nodes/AcuityScheduling/GenericFunctions.ts index 46722dad9b..03453268c2 100644 --- a/packages/nodes-base/nodes/AcuityScheduling/GenericFunctions.ts +++ b/packages/nodes-base/nodes/AcuityScheduling/GenericFunctions.ts @@ -2,7 +2,6 @@ import type { OptionsWithUri } from 'request'; import type { IDataObject, IExecuteFunctions, - IExecuteSingleFunctions, IHookFunctions, ILoadOptionsFunctions, IWebhookFunctions, @@ -11,12 +10,7 @@ import type { import { NodeApiError } from 'n8n-workflow'; export async function acuitySchedulingApiRequest( - this: - | IHookFunctions - | IExecuteFunctions - | IExecuteSingleFunctions - | ILoadOptionsFunctions - | IWebhookFunctions, + this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions | IWebhookFunctions, method: string, resource: string, body: any = {}, diff --git a/packages/nodes-base/nodes/AgileCrm/GenericFunctions.ts b/packages/nodes-base/nodes/AgileCrm/GenericFunctions.ts index 3fb6345f2f..eaa68d6393 100644 --- a/packages/nodes-base/nodes/AgileCrm/GenericFunctions.ts +++ b/packages/nodes-base/nodes/AgileCrm/GenericFunctions.ts @@ -3,7 +3,6 @@ import type { OptionsWithUri } from 'request'; import type { IDataObject, IExecuteFunctions, - IExecuteSingleFunctions, IHookFunctions, ILoadOptionsFunctions, JsonObject, @@ -15,7 +14,7 @@ import type { IContactUpdate } from './ContactInterface'; import type { IFilterRules, ISearchConditions } from './FilterInterface'; export async function agileCrmApiRequest( - this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, + this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions, method: string, endpoint: string, body: any = {}, @@ -95,7 +94,7 @@ export async function agileCrmApiRequestAllItems( } export async function agileCrmApiRequestUpdate( - this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, + this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions, method = 'PUT', endpoint?: string, body: any = {}, diff --git a/packages/nodes-base/nodes/Automizy/GenericFunctions.ts b/packages/nodes-base/nodes/Automizy/GenericFunctions.ts index 44b2760a7b..26de35ce15 100644 --- a/packages/nodes-base/nodes/Automizy/GenericFunctions.ts +++ b/packages/nodes-base/nodes/Automizy/GenericFunctions.ts @@ -2,7 +2,6 @@ import type { OptionsWithUri } from 'request'; import type { IExecuteFunctions, - IExecuteSingleFunctions, ILoadOptionsFunctions, IDataObject, JsonObject, @@ -10,7 +9,7 @@ import type { import { NodeApiError } from 'n8n-workflow'; export async function automizyApiRequest( - this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, + this: IExecuteFunctions | ILoadOptionsFunctions, method: string, path: string, diff --git a/packages/nodes-base/nodes/Bitbucket/GenericFunctions.ts b/packages/nodes-base/nodes/Bitbucket/GenericFunctions.ts index 084f209de4..b9c98c4c2d 100644 --- a/packages/nodes-base/nodes/Bitbucket/GenericFunctions.ts +++ b/packages/nodes-base/nodes/Bitbucket/GenericFunctions.ts @@ -2,7 +2,6 @@ import type { OptionsWithUri } from 'request'; import type { IDataObject, IExecuteFunctions, - IExecuteSingleFunctions, IHookFunctions, ILoadOptionsFunctions, JsonObject, @@ -10,7 +9,7 @@ import type { import { NodeApiError } from 'n8n-workflow'; export async function bitbucketApiRequest( - this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, + this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions, method: string, resource: string, diff --git a/packages/nodes-base/nodes/Bitly/GenericFunctions.ts b/packages/nodes-base/nodes/Bitly/GenericFunctions.ts index e959caac3a..321c5800e7 100644 --- a/packages/nodes-base/nodes/Bitly/GenericFunctions.ts +++ b/packages/nodes-base/nodes/Bitly/GenericFunctions.ts @@ -3,7 +3,6 @@ import type { OptionsWithUri } from 'request'; import type { IDataObject, IExecuteFunctions, - IExecuteSingleFunctions, IHookFunctions, ILoadOptionsFunctions, JsonObject, @@ -11,7 +10,7 @@ import type { import { NodeApiError } from 'n8n-workflow'; export async function bitlyApiRequest( - this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, + this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions, method: string, resource: string, diff --git a/packages/nodes-base/nodes/Box/GenericFunctions.ts b/packages/nodes-base/nodes/Box/GenericFunctions.ts index 1249681399..ea77a8edc7 100644 --- a/packages/nodes-base/nodes/Box/GenericFunctions.ts +++ b/packages/nodes-base/nodes/Box/GenericFunctions.ts @@ -3,7 +3,6 @@ import type { OptionsWithUri } from 'request'; import type { IDataObject, IExecuteFunctions, - IExecuteSingleFunctions, IHookFunctions, ILoadOptionsFunctions, IOAuth2Options, @@ -12,7 +11,7 @@ import type { import { NodeApiError } from 'n8n-workflow'; export async function boxApiRequest( - this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions | IHookFunctions, + this: IExecuteFunctions | ILoadOptionsFunctions | IHookFunctions, method: string, resource: string, diff --git a/packages/nodes-base/nodes/Brandfetch/GenericFunctions.ts b/packages/nodes-base/nodes/Brandfetch/GenericFunctions.ts index 15a59c07b3..a7472f0a02 100644 --- a/packages/nodes-base/nodes/Brandfetch/GenericFunctions.ts +++ b/packages/nodes-base/nodes/Brandfetch/GenericFunctions.ts @@ -3,7 +3,6 @@ import type { OptionsWithUri } from 'request'; import type { IDataObject, IExecuteFunctions, - IExecuteSingleFunctions, IHookFunctions, ILoadOptionsFunctions, JsonObject, @@ -11,7 +10,7 @@ import type { import { NodeApiError } from 'n8n-workflow'; export async function brandfetchApiRequest( - this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, + this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions, method: string, resource: string, diff --git a/packages/nodes-base/nodes/CircleCi/GenericFunctions.ts b/packages/nodes-base/nodes/CircleCi/GenericFunctions.ts index 3a3f47d2ac..661f5c5336 100644 --- a/packages/nodes-base/nodes/CircleCi/GenericFunctions.ts +++ b/packages/nodes-base/nodes/CircleCi/GenericFunctions.ts @@ -3,7 +3,6 @@ import type { OptionsWithUri } from 'request'; import type { IDataObject, IExecuteFunctions, - IExecuteSingleFunctions, IHookFunctions, ILoadOptionsFunctions, JsonObject, @@ -11,7 +10,7 @@ import type { import { NodeApiError } from 'n8n-workflow'; export async function circleciApiRequest( - this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, + this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions, method: string, resource: string, diff --git a/packages/nodes-base/nodes/Clearbit/GenericFunctions.ts b/packages/nodes-base/nodes/Clearbit/GenericFunctions.ts index f5dcfe3409..5c3dc9cea7 100644 --- a/packages/nodes-base/nodes/Clearbit/GenericFunctions.ts +++ b/packages/nodes-base/nodes/Clearbit/GenericFunctions.ts @@ -3,7 +3,6 @@ import type { OptionsWithUri } from 'request'; import type { IDataObject, IExecuteFunctions, - IExecuteSingleFunctions, IHookFunctions, ILoadOptionsFunctions, JsonObject, @@ -11,7 +10,7 @@ import type { import { NodeApiError } from 'n8n-workflow'; export async function clearbitApiRequest( - this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, + this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions, method: string, api: string, resource: string, diff --git a/packages/nodes-base/nodes/ClickUp/GenericFunctions.ts b/packages/nodes-base/nodes/ClickUp/GenericFunctions.ts index 234f5177f7..a17f77c4de 100644 --- a/packages/nodes-base/nodes/ClickUp/GenericFunctions.ts +++ b/packages/nodes-base/nodes/ClickUp/GenericFunctions.ts @@ -3,7 +3,6 @@ import type { OptionsWithUri } from 'request'; import type { IDataObject, IExecuteFunctions, - IExecuteSingleFunctions, IHookFunctions, ILoadOptionsFunctions, IWebhookFunctions, @@ -13,12 +12,7 @@ import type { import { NodeApiError } from 'n8n-workflow'; export async function clickupApiRequest( - this: - | IHookFunctions - | IExecuteFunctions - | IExecuteSingleFunctions - | ILoadOptionsFunctions - | IWebhookFunctions, + this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions | IWebhookFunctions, method: string, resource: string, diff --git a/packages/nodes-base/nodes/Cloudflare/GenericFunctions.ts b/packages/nodes-base/nodes/Cloudflare/GenericFunctions.ts index 43424366a2..ea764fcaf8 100644 --- a/packages/nodes-base/nodes/Cloudflare/GenericFunctions.ts +++ b/packages/nodes-base/nodes/Cloudflare/GenericFunctions.ts @@ -3,7 +3,6 @@ import type { OptionsWithUri } from 'request'; import type { IDataObject, IExecuteFunctions, - IExecuteSingleFunctions, ILoadOptionsFunctions, IPollFunctions, JsonObject, @@ -11,7 +10,7 @@ import type { import { NodeApiError } from 'n8n-workflow'; export async function cloudflareApiRequest( - this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions | IPollFunctions, + this: IExecuteFunctions | ILoadOptionsFunctions | IPollFunctions, method: string, resource: string, body = {}, diff --git a/packages/nodes-base/nodes/Cockpit/CollectionFunctions.ts b/packages/nodes-base/nodes/Cockpit/CollectionFunctions.ts index 20739f3910..9c9647ca32 100644 --- a/packages/nodes-base/nodes/Cockpit/CollectionFunctions.ts +++ b/packages/nodes-base/nodes/Cockpit/CollectionFunctions.ts @@ -1,15 +1,10 @@ -import type { - IExecuteFunctions, - IExecuteSingleFunctions, - ILoadOptionsFunctions, - IDataObject, -} from 'n8n-workflow'; +import type { IExecuteFunctions, ILoadOptionsFunctions, IDataObject } from 'n8n-workflow'; import { jsonParse } from 'n8n-workflow'; import type { ICollection } from './CollectionInterface'; import { cockpitApiRequest } from './GenericFunctions'; export async function createCollectionEntry( - this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, + this: IExecuteFunctions | ILoadOptionsFunctions, resourceName: string, data: IDataObject, id?: string, @@ -29,7 +24,7 @@ export async function createCollectionEntry( } export async function getAllCollectionEntries( - this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, + this: IExecuteFunctions | ILoadOptionsFunctions, resourceName: string, options: IDataObject, ): Promise { @@ -85,7 +80,7 @@ export async function getAllCollectionEntries( } export async function getAllCollectionNames( - this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, + this: IExecuteFunctions | ILoadOptionsFunctions, ): Promise { return cockpitApiRequest.call(this, 'GET', '/collections/listCollections', {}); } diff --git a/packages/nodes-base/nodes/Cockpit/FormFunctions.ts b/packages/nodes-base/nodes/Cockpit/FormFunctions.ts index 3083912892..6ca1f58f51 100644 --- a/packages/nodes-base/nodes/Cockpit/FormFunctions.ts +++ b/packages/nodes-base/nodes/Cockpit/FormFunctions.ts @@ -1,14 +1,9 @@ -import type { - IExecuteFunctions, - IExecuteSingleFunctions, - ILoadOptionsFunctions, - IDataObject, -} from 'n8n-workflow'; +import type { IExecuteFunctions, ILoadOptionsFunctions, IDataObject } from 'n8n-workflow'; import type { IForm } from './FormInterface'; import { cockpitApiRequest } from './GenericFunctions'; export async function submitForm( - this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, + this: IExecuteFunctions | ILoadOptionsFunctions, resourceName: string, form: IDataObject, ) { diff --git a/packages/nodes-base/nodes/Cockpit/GenericFunctions.ts b/packages/nodes-base/nodes/Cockpit/GenericFunctions.ts index 16101fb9ab..e950dd7f34 100644 --- a/packages/nodes-base/nodes/Cockpit/GenericFunctions.ts +++ b/packages/nodes-base/nodes/Cockpit/GenericFunctions.ts @@ -1,7 +1,6 @@ import type { IDataObject, IExecuteFunctions, - IExecuteSingleFunctions, ILoadOptionsFunctions, JsonObject, } from 'n8n-workflow'; @@ -9,7 +8,7 @@ import { jsonParse, NodeApiError } from 'n8n-workflow'; import type { OptionsWithUri } from 'request'; export async function cockpitApiRequest( - this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, + this: IExecuteFunctions | ILoadOptionsFunctions, method: string, resource: string, @@ -46,7 +45,7 @@ export async function cockpitApiRequest( } export function createDataFromParameters( - this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, + this: IExecuteFunctions | ILoadOptionsFunctions, itemIndex: number, ): IDataObject { const dataFieldsAreJson = this.getNodeParameter('jsonDataFields', itemIndex) as boolean; diff --git a/packages/nodes-base/nodes/Cockpit/SingletonFunctions.ts b/packages/nodes-base/nodes/Cockpit/SingletonFunctions.ts index 1fcbd8f3c5..0bcca3053b 100644 --- a/packages/nodes-base/nodes/Cockpit/SingletonFunctions.ts +++ b/packages/nodes-base/nodes/Cockpit/SingletonFunctions.ts @@ -1,19 +1,15 @@ -import type { - IExecuteFunctions, - IExecuteSingleFunctions, - ILoadOptionsFunctions, -} from 'n8n-workflow'; +import type { IExecuteFunctions, ILoadOptionsFunctions } from 'n8n-workflow'; import { cockpitApiRequest } from './GenericFunctions'; export async function getSingleton( - this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, + this: IExecuteFunctions | ILoadOptionsFunctions, resourceName: string, ): Promise { return cockpitApiRequest.call(this, 'get', `/singletons/get/${resourceName}`); } export async function getAllSingletonNames( - this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, + this: IExecuteFunctions | ILoadOptionsFunctions, ): Promise { return cockpitApiRequest.call(this, 'GET', '/singletons/listSingletons', {}); } diff --git a/packages/nodes-base/nodes/Coda/GenericFunctions.ts b/packages/nodes-base/nodes/Coda/GenericFunctions.ts index 50c047c8f8..a993c6c2c9 100644 --- a/packages/nodes-base/nodes/Coda/GenericFunctions.ts +++ b/packages/nodes-base/nodes/Coda/GenericFunctions.ts @@ -2,14 +2,13 @@ import type { OptionsWithUri } from 'request'; import type { IDataObject, IExecuteFunctions, - IExecuteSingleFunctions, ILoadOptionsFunctions, JsonObject, } from 'n8n-workflow'; import { NodeApiError } from 'n8n-workflow'; export async function codaApiRequest( - this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, + this: IExecuteFunctions | ILoadOptionsFunctions, method: string, resource: string, diff --git a/packages/nodes-base/nodes/CoinGecko/GenericFunctions.ts b/packages/nodes-base/nodes/CoinGecko/GenericFunctions.ts index 4ec589c78d..b3d40454c0 100644 --- a/packages/nodes-base/nodes/CoinGecko/GenericFunctions.ts +++ b/packages/nodes-base/nodes/CoinGecko/GenericFunctions.ts @@ -2,7 +2,6 @@ import type { OptionsWithUri } from 'request'; import type { IExecuteFunctions, - IExecuteSingleFunctions, ILoadOptionsFunctions, IDataObject, JsonObject, @@ -10,7 +9,7 @@ import type { import { NodeApiError } from 'n8n-workflow'; export async function coinGeckoApiRequest( - this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, + this: IExecuteFunctions | ILoadOptionsFunctions, method: string, endpoint: string, diff --git a/packages/nodes-base/nodes/Contentful/GenericFunctions.ts b/packages/nodes-base/nodes/Contentful/GenericFunctions.ts index d2fdf44329..273f5d165e 100644 --- a/packages/nodes-base/nodes/Contentful/GenericFunctions.ts +++ b/packages/nodes-base/nodes/Contentful/GenericFunctions.ts @@ -3,14 +3,13 @@ import type { OptionsWithUri } from 'request'; import type { IDataObject, IExecuteFunctions, - IExecuteSingleFunctions, ILoadOptionsFunctions, JsonObject, } from 'n8n-workflow'; import { NodeApiError } from 'n8n-workflow'; export async function contentfulApiRequest( - this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, + this: IExecuteFunctions | ILoadOptionsFunctions, method: string, resource: string, diff --git a/packages/nodes-base/nodes/ConvertKit/GenericFunctions.ts b/packages/nodes-base/nodes/ConvertKit/GenericFunctions.ts index acb6cb6a3e..66d1650e74 100644 --- a/packages/nodes-base/nodes/ConvertKit/GenericFunctions.ts +++ b/packages/nodes-base/nodes/ConvertKit/GenericFunctions.ts @@ -2,7 +2,6 @@ import type { OptionsWithUri } from 'request'; import type { IExecuteFunctions, - IExecuteSingleFunctions, ILoadOptionsFunctions, IDataObject, IHookFunctions, @@ -11,7 +10,7 @@ import type { import { NodeApiError } from 'n8n-workflow'; export async function convertKitApiRequest( - this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions | IHookFunctions, + this: IExecuteFunctions | ILoadOptionsFunctions | IHookFunctions, method: string, endpoint: string, diff --git a/packages/nodes-base/nodes/Copper/GenericFunctions.ts b/packages/nodes-base/nodes/Copper/GenericFunctions.ts index c8ebeb5277..9bfae5a255 100644 --- a/packages/nodes-base/nodes/Copper/GenericFunctions.ts +++ b/packages/nodes-base/nodes/Copper/GenericFunctions.ts @@ -6,7 +6,6 @@ import type { ICredentialDataDecryptedObject, IDataObject, IExecuteFunctions, - IExecuteSingleFunctions, IHookFunctions, ILoadOptionsFunctions, IWebhookFunctions, @@ -28,12 +27,7 @@ import type { * Make an authenticated API request to Copper. */ export async function copperApiRequest( - this: - | IHookFunctions - | IExecuteFunctions - | IExecuteSingleFunctions - | ILoadOptionsFunctions - | IWebhookFunctions, + this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions | IWebhookFunctions, method: string, resource: string, body: IDataObject = {}, diff --git a/packages/nodes-base/nodes/Cortex/GenericFunctions.ts b/packages/nodes-base/nodes/Cortex/GenericFunctions.ts index c13f5f6109..8b51c79b8f 100644 --- a/packages/nodes-base/nodes/Cortex/GenericFunctions.ts +++ b/packages/nodes-base/nodes/Cortex/GenericFunctions.ts @@ -3,7 +3,6 @@ import type { OptionsWithUri } from 'request'; import type { IDataObject, IExecuteFunctions, - IExecuteSingleFunctions, IHookFunctions, ILoadOptionsFunctions, } from 'n8n-workflow'; @@ -11,7 +10,7 @@ import type { import moment from 'moment'; export async function cortexApiRequest( - this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, + this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions, method: string, resource: string, diff --git a/packages/nodes-base/nodes/DeepL/GenericFunctions.ts b/packages/nodes-base/nodes/DeepL/GenericFunctions.ts index 4193e86707..5d8db92eb2 100644 --- a/packages/nodes-base/nodes/DeepL/GenericFunctions.ts +++ b/packages/nodes-base/nodes/DeepL/GenericFunctions.ts @@ -2,7 +2,6 @@ import type { OptionsWithUri } from 'request'; import type { IExecuteFunctions, - IExecuteSingleFunctions, ILoadOptionsFunctions, IDataObject, JsonObject, @@ -10,7 +9,7 @@ import type { import { NodeApiError } from 'n8n-workflow'; export async function deepLApiRequest( - this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, + this: IExecuteFunctions | ILoadOptionsFunctions, method: string, resource: string, body: IDataObject = {}, diff --git a/packages/nodes-base/nodes/Demio/GenericFunctions.ts b/packages/nodes-base/nodes/Demio/GenericFunctions.ts index db2e63ed37..5304b67f52 100644 --- a/packages/nodes-base/nodes/Demio/GenericFunctions.ts +++ b/packages/nodes-base/nodes/Demio/GenericFunctions.ts @@ -3,7 +3,6 @@ import type { OptionsWithUri } from 'request'; import type { IDataObject, IExecuteFunctions, - IExecuteSingleFunctions, IHookFunctions, ILoadOptionsFunctions, JsonObject, @@ -11,7 +10,7 @@ import type { import { NodeApiError } from 'n8n-workflow'; export async function demioApiRequest( - this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, + this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions, method: string, resource: string, diff --git a/packages/nodes-base/nodes/Dhl/GenericFunctions.ts b/packages/nodes-base/nodes/Dhl/GenericFunctions.ts index d670e8835e..8d2d3fdcfe 100644 --- a/packages/nodes-base/nodes/Dhl/GenericFunctions.ts +++ b/packages/nodes-base/nodes/Dhl/GenericFunctions.ts @@ -5,7 +5,6 @@ import type { ICredentialTestFunctions, IDataObject, IExecuteFunctions, - IExecuteSingleFunctions, IHookFunctions, ILoadOptionsFunctions, JsonObject, @@ -13,7 +12,7 @@ import type { import { NodeApiError } from 'n8n-workflow'; export async function dhlApiRequest( - this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, + this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions, method: string, path: string, diff --git a/packages/nodes-base/nodes/Discourse/GenericFunctions.ts b/packages/nodes-base/nodes/Discourse/GenericFunctions.ts index 64330c7ca9..cf3b09a202 100644 --- a/packages/nodes-base/nodes/Discourse/GenericFunctions.ts +++ b/packages/nodes-base/nodes/Discourse/GenericFunctions.ts @@ -2,7 +2,6 @@ import type { OptionsWithUri } from 'request'; import type { IExecuteFunctions, - IExecuteSingleFunctions, ILoadOptionsFunctions, IDataObject, JsonObject, @@ -10,7 +9,7 @@ import type { import { NodeApiError } from 'n8n-workflow'; export async function discourseApiRequest( - this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, + this: IExecuteFunctions | ILoadOptionsFunctions, method: string, path: string, diff --git a/packages/nodes-base/nodes/Disqus/GenericFunctions.ts b/packages/nodes-base/nodes/Disqus/GenericFunctions.ts index d6471873f5..0b96d755d6 100644 --- a/packages/nodes-base/nodes/Disqus/GenericFunctions.ts +++ b/packages/nodes-base/nodes/Disqus/GenericFunctions.ts @@ -2,7 +2,6 @@ import type { OptionsWithUri } from 'request'; import type { IDataObject, IExecuteFunctions, - IExecuteSingleFunctions, IHookFunctions, ILoadOptionsFunctions, JsonObject, @@ -10,7 +9,7 @@ import type { import { NodeApiError } from 'n8n-workflow'; export async function disqusApiRequest( - this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, + this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions, method: string, qs: IDataObject = {}, uri?: string, @@ -55,7 +54,7 @@ export async function disqusApiRequest( * and return all results */ export async function disqusApiRequestAllItems( - this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, + this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions, method: string, qs: IDataObject = {}, uri?: string, diff --git a/packages/nodes-base/nodes/Egoi/GenericFunctions.ts b/packages/nodes-base/nodes/Egoi/GenericFunctions.ts index e1abbb2bff..6a42d95f4b 100644 --- a/packages/nodes-base/nodes/Egoi/GenericFunctions.ts +++ b/packages/nodes-base/nodes/Egoi/GenericFunctions.ts @@ -3,7 +3,6 @@ import type { OptionsWithUrl } from 'request'; import type { IDataObject, IExecuteFunctions, - IExecuteSingleFunctions, IHookFunctions, ILoadOptionsFunctions, JsonObject, @@ -21,7 +20,7 @@ const fieldCache: { } = {}; export async function egoiApiRequest( - this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, + this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions, method: string, endpoint: string, diff --git a/packages/nodes-base/nodes/Eventbrite/GenericFunctions.ts b/packages/nodes-base/nodes/Eventbrite/GenericFunctions.ts index ca4d36417f..8ea91020aa 100644 --- a/packages/nodes-base/nodes/Eventbrite/GenericFunctions.ts +++ b/packages/nodes-base/nodes/Eventbrite/GenericFunctions.ts @@ -3,7 +3,6 @@ import type { OptionsWithUri } from 'request'; import type { IDataObject, IExecuteFunctions, - IExecuteSingleFunctions, IHookFunctions, ILoadOptionsFunctions, IWebhookFunctions, @@ -12,12 +11,7 @@ import type { import { NodeApiError } from 'n8n-workflow'; export async function eventbriteApiRequest( - this: - | IHookFunctions - | IExecuteFunctions - | IExecuteSingleFunctions - | ILoadOptionsFunctions - | IWebhookFunctions, + this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions | IWebhookFunctions, method: string, resource: string, diff --git a/packages/nodes-base/nodes/Facebook/GenericFunctions.ts b/packages/nodes-base/nodes/Facebook/GenericFunctions.ts index 3ddb130efb..703ec0c7ce 100644 --- a/packages/nodes-base/nodes/Facebook/GenericFunctions.ts +++ b/packages/nodes-base/nodes/Facebook/GenericFunctions.ts @@ -3,7 +3,6 @@ import type { OptionsWithUri } from 'request'; import type { IDataObject, IExecuteFunctions, - IExecuteSingleFunctions, IHookFunctions, ILoadOptionsFunctions, IWebhookFunctions, @@ -14,12 +13,7 @@ import { NodeApiError } from 'n8n-workflow'; import { capitalCase } from 'change-case'; export async function facebookApiRequest( - this: - | IHookFunctions - | IExecuteFunctions - | IExecuteSingleFunctions - | ILoadOptionsFunctions - | IWebhookFunctions, + this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions | IWebhookFunctions, method: string, resource: string, diff --git a/packages/nodes-base/nodes/Figma/GenericFunctions.ts b/packages/nodes-base/nodes/Figma/GenericFunctions.ts index 7af362db76..a2f8324b0f 100644 --- a/packages/nodes-base/nodes/Figma/GenericFunctions.ts +++ b/packages/nodes-base/nodes/Figma/GenericFunctions.ts @@ -3,7 +3,6 @@ import type { OptionsWithUri } from 'request'; import type { IDataObject, IExecuteFunctions, - IExecuteSingleFunctions, IHookFunctions, ILoadOptionsFunctions, JsonObject, @@ -11,7 +10,7 @@ import type { import { NodeApiError } from 'n8n-workflow'; export async function figmaApiRequest( - this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, + this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions, method: string, resource: string, diff --git a/packages/nodes-base/nodes/FileMaker/GenericFunctions.ts b/packages/nodes-base/nodes/FileMaker/GenericFunctions.ts index f8e8a855f6..bdb13b1099 100644 --- a/packages/nodes-base/nodes/FileMaker/GenericFunctions.ts +++ b/packages/nodes-base/nodes/FileMaker/GenericFunctions.ts @@ -1,6 +1,5 @@ import type { IExecuteFunctions, - IExecuteSingleFunctions, ILoadOptionsFunctions, IDataObject, INodePropertyOptions, @@ -30,9 +29,7 @@ interface ScriptObject { folderScriptNames?: LayoutObject[]; } -export async function getToken( - this: ILoadOptionsFunctions | IExecuteFunctions | IExecuteSingleFunctions, -): Promise { +export async function getToken(this: ILoadOptionsFunctions | IExecuteFunctions): Promise { const credentials = await this.getCredentials('fileMaker'); const host = credentials.host as string; @@ -108,7 +105,7 @@ function parseLayouts(layouts: LayoutObject[]): INodePropertyOptions[] { * */ export async function layoutsApiRequest( - this: ILoadOptionsFunctions | IExecuteFunctions | IExecuteSingleFunctions, + this: ILoadOptionsFunctions | IExecuteFunctions, ): Promise { const token = await getToken.call(this); const credentials = await this.getCredentials('fileMaker'); @@ -246,7 +243,7 @@ export async function getScripts(this: ILoadOptionsFunctions): Promise { } export async function logout( - this: ILoadOptionsFunctions | IExecuteFunctions | IExecuteSingleFunctions, + this: ILoadOptionsFunctions | IExecuteFunctions, token: string, ): Promise { const credentials = await this.getCredentials('fileMaker'); diff --git a/packages/nodes-base/nodes/Flow/GenericFunctions.ts b/packages/nodes-base/nodes/Flow/GenericFunctions.ts index 0ea3e23191..e2b110df4c 100644 --- a/packages/nodes-base/nodes/Flow/GenericFunctions.ts +++ b/packages/nodes-base/nodes/Flow/GenericFunctions.ts @@ -2,7 +2,6 @@ import type { OptionsWithUri } from 'request'; import type { IDataObject, IExecuteFunctions, - IExecuteSingleFunctions, IHookFunctions, ILoadOptionsFunctions, JsonObject, @@ -10,7 +9,7 @@ import type { import { NodeApiError } from 'n8n-workflow'; export async function flowApiRequest( - this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, + this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions, method: string, resource: string, diff --git a/packages/nodes-base/nodes/Ghost/GenericFunctions.ts b/packages/nodes-base/nodes/Ghost/GenericFunctions.ts index 602d9cb28a..0178966870 100644 --- a/packages/nodes-base/nodes/Ghost/GenericFunctions.ts +++ b/packages/nodes-base/nodes/Ghost/GenericFunctions.ts @@ -3,13 +3,12 @@ import type { OptionsWithUri } from 'request'; import type { IDataObject, IExecuteFunctions, - IExecuteSingleFunctions, IHookFunctions, ILoadOptionsFunctions, } from 'n8n-workflow'; export async function ghostApiRequest( - this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, + this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions, method: string, endpoint: string, diff --git a/packages/nodes-base/nodes/Google/Analytics/v1/GenericFunctions.ts b/packages/nodes-base/nodes/Google/Analytics/v1/GenericFunctions.ts index aaac818ff6..79ba392e2a 100644 --- a/packages/nodes-base/nodes/Google/Analytics/v1/GenericFunctions.ts +++ b/packages/nodes-base/nodes/Google/Analytics/v1/GenericFunctions.ts @@ -1,7 +1,6 @@ import type { OptionsWithUri } from 'request'; import type { IExecuteFunctions, - IExecuteSingleFunctions, ILoadOptionsFunctions, IDataObject, JsonObject, @@ -9,7 +8,7 @@ import type { import { NodeApiError } from 'n8n-workflow'; export async function googleApiRequest( - this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, + this: IExecuteFunctions | ILoadOptionsFunctions, method: string, endpoint: string, body: IDataObject = {}, diff --git a/packages/nodes-base/nodes/Google/Analytics/v2/transport/index.ts b/packages/nodes-base/nodes/Google/Analytics/v2/transport/index.ts index 804db46717..cc955f7409 100644 --- a/packages/nodes-base/nodes/Google/Analytics/v2/transport/index.ts +++ b/packages/nodes-base/nodes/Google/Analytics/v2/transport/index.ts @@ -2,14 +2,13 @@ import type { OptionsWithUri } from 'request'; import type { IDataObject, IExecuteFunctions, - IExecuteSingleFunctions, ILoadOptionsFunctions, JsonObject, } from 'n8n-workflow'; import { NodeApiError } from 'n8n-workflow'; export async function googleApiRequest( - this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, + this: IExecuteFunctions | ILoadOptionsFunctions, method: string, endpoint: string, body: IDataObject = {}, diff --git a/packages/nodes-base/nodes/Google/BigQuery/v1/GenericFunctions.ts b/packages/nodes-base/nodes/Google/BigQuery/v1/GenericFunctions.ts index 12a8773ba0..9a955f698c 100644 --- a/packages/nodes-base/nodes/Google/BigQuery/v1/GenericFunctions.ts +++ b/packages/nodes-base/nodes/Google/BigQuery/v1/GenericFunctions.ts @@ -2,7 +2,6 @@ import type { OptionsWithUri } from 'request'; import type { IExecuteFunctions, - IExecuteSingleFunctions, ILoadOptionsFunctions, IDataObject, JsonObject, @@ -11,7 +10,7 @@ import { NodeApiError, NodeOperationError } from 'n8n-workflow'; import { getGoogleAccessToken } from '../../GenericFunctions'; export async function googleApiRequest( - this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, + this: IExecuteFunctions | ILoadOptionsFunctions, method: string, resource: string, body: any = {}, 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 5c3785afeb..b4c39c90bb 100644 --- a/packages/nodes-base/nodes/Google/BigQuery/v2/transport/index.ts +++ b/packages/nodes-base/nodes/Google/BigQuery/v2/transport/index.ts @@ -3,7 +3,6 @@ import type { OptionsWithUri } from 'request'; import type { IDataObject, IExecuteFunctions, - IExecuteSingleFunctions, ILoadOptionsFunctions, JsonObject, } from 'n8n-workflow'; @@ -11,7 +10,7 @@ import { NodeApiError, NodeOperationError } from 'n8n-workflow'; import { getGoogleAccessToken } from '../../../GenericFunctions'; export async function googleApiRequest( - this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, + this: IExecuteFunctions | ILoadOptionsFunctions, method: string, resource: string, body: IDataObject = {}, diff --git a/packages/nodes-base/nodes/Google/Books/GenericFunctions.ts b/packages/nodes-base/nodes/Google/Books/GenericFunctions.ts index a4528bd216..65e44048e4 100644 --- a/packages/nodes-base/nodes/Google/Books/GenericFunctions.ts +++ b/packages/nodes-base/nodes/Google/Books/GenericFunctions.ts @@ -2,7 +2,6 @@ import type { OptionsWithUri } from 'request'; import type { IExecuteFunctions, - IExecuteSingleFunctions, ILoadOptionsFunctions, IDataObject, JsonObject, @@ -11,7 +10,7 @@ import { NodeApiError } from 'n8n-workflow'; import { getGoogleAccessToken } from '../GenericFunctions'; export async function googleApiRequest( - this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, + this: IExecuteFunctions | ILoadOptionsFunctions, method: string, resource: string, body: any = {}, diff --git a/packages/nodes-base/nodes/Google/Calendar/GenericFunctions.ts b/packages/nodes-base/nodes/Google/Calendar/GenericFunctions.ts index 4b26b099e2..95e44d5add 100644 --- a/packages/nodes-base/nodes/Google/Calendar/GenericFunctions.ts +++ b/packages/nodes-base/nodes/Google/Calendar/GenericFunctions.ts @@ -3,7 +3,6 @@ import type { OptionsWithUri } from 'request'; import type { IDataObject, IExecuteFunctions, - IExecuteSingleFunctions, ILoadOptionsFunctions, INodeListSearchItems, INodeListSearchResult, @@ -15,7 +14,7 @@ import { NodeApiError } from 'n8n-workflow'; import moment from 'moment-timezone'; export async function googleApiRequest( - this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions | IPollFunctions, + this: IExecuteFunctions | ILoadOptionsFunctions | IPollFunctions, method: string, resource: string, diff --git a/packages/nodes-base/nodes/Google/Chat/GenericFunctions.ts b/packages/nodes-base/nodes/Google/Chat/GenericFunctions.ts index 41d2599201..6041dca5ef 100644 --- a/packages/nodes-base/nodes/Google/Chat/GenericFunctions.ts +++ b/packages/nodes-base/nodes/Google/Chat/GenericFunctions.ts @@ -3,7 +3,6 @@ import type { OptionsWithUri } from 'request'; import type { IDataObject, IExecuteFunctions, - IExecuteSingleFunctions, ILoadOptionsFunctions, INodeProperties, JsonObject, @@ -13,7 +12,7 @@ import { NodeApiError } from 'n8n-workflow'; import { getGoogleAccessToken } from '../GenericFunctions'; export async function googleApiRequest( - this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, + this: IExecuteFunctions | ILoadOptionsFunctions, method: string, resource: string, diff --git a/packages/nodes-base/nodes/Google/CloudNaturalLanguage/GenericFunctions.ts b/packages/nodes-base/nodes/Google/CloudNaturalLanguage/GenericFunctions.ts index 3430912a0e..c299a40782 100644 --- a/packages/nodes-base/nodes/Google/CloudNaturalLanguage/GenericFunctions.ts +++ b/packages/nodes-base/nodes/Google/CloudNaturalLanguage/GenericFunctions.ts @@ -2,7 +2,6 @@ import type { OptionsWithUri } from 'request'; import type { IExecuteFunctions, - IExecuteSingleFunctions, ILoadOptionsFunctions, IDataObject, JsonObject, @@ -10,7 +9,7 @@ import type { import { NodeApiError } from 'n8n-workflow'; export async function googleApiRequest( - this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, + this: IExecuteFunctions | ILoadOptionsFunctions, method: string, endpoint: string, diff --git a/packages/nodes-base/nodes/Google/Contacts/GenericFunctions.ts b/packages/nodes-base/nodes/Google/Contacts/GenericFunctions.ts index 55cc5c75a3..50b116a69f 100644 --- a/packages/nodes-base/nodes/Google/Contacts/GenericFunctions.ts +++ b/packages/nodes-base/nodes/Google/Contacts/GenericFunctions.ts @@ -2,7 +2,6 @@ import type { OptionsWithUri } from 'request'; import type { IExecuteFunctions, - IExecuteSingleFunctions, ILoadOptionsFunctions, IDataObject, JsonObject, @@ -10,7 +9,7 @@ import type { import { NodeApiError } from 'n8n-workflow'; export async function googleApiRequest( - this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, + this: IExecuteFunctions | ILoadOptionsFunctions, method: string, resource: string, diff --git a/packages/nodes-base/nodes/Google/Drive/v1/GenericFunctions.ts b/packages/nodes-base/nodes/Google/Drive/v1/GenericFunctions.ts index b3600fca2f..b8ecafdf31 100644 --- a/packages/nodes-base/nodes/Google/Drive/v1/GenericFunctions.ts +++ b/packages/nodes-base/nodes/Google/Drive/v1/GenericFunctions.ts @@ -2,7 +2,6 @@ import type { OptionsWithUri } from 'request'; import type { IExecuteFunctions, - IExecuteSingleFunctions, ILoadOptionsFunctions, IDataObject, IPollFunctions, @@ -13,7 +12,7 @@ import { NodeApiError } from 'n8n-workflow'; import { getGoogleAccessToken } from '../../GenericFunctions'; export async function googleApiRequest( - this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions | IPollFunctions, + this: IExecuteFunctions | ILoadOptionsFunctions | IPollFunctions, method: string, resource: string, body: any = {}, diff --git a/packages/nodes-base/nodes/Google/Drive/v2/transport/index.ts b/packages/nodes-base/nodes/Google/Drive/v2/transport/index.ts index 417ef06c7c..54961bb628 100644 --- a/packages/nodes-base/nodes/Google/Drive/v2/transport/index.ts +++ b/packages/nodes-base/nodes/Google/Drive/v2/transport/index.ts @@ -1,6 +1,5 @@ import type { IExecuteFunctions, - IExecuteSingleFunctions, ILoadOptionsFunctions, IDataObject, IPollFunctions, @@ -12,7 +11,7 @@ import { NodeApiError } from 'n8n-workflow'; import { getGoogleAccessToken } from '../../../GenericFunctions'; export async function googleApiRequest( - this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions | IPollFunctions, + this: IExecuteFunctions | ILoadOptionsFunctions | IPollFunctions, method: IHttpRequestMethods, resource: string, body: IDataObject | string | Buffer = {}, diff --git a/packages/nodes-base/nodes/Google/Firebase/CloudFirestore/GenericFunctions.ts b/packages/nodes-base/nodes/Google/Firebase/CloudFirestore/GenericFunctions.ts index ae1f5e141b..8caf77c2b9 100644 --- a/packages/nodes-base/nodes/Google/Firebase/CloudFirestore/GenericFunctions.ts +++ b/packages/nodes-base/nodes/Google/Firebase/CloudFirestore/GenericFunctions.ts @@ -2,7 +2,6 @@ import type { OptionsWithUri } from 'request'; import type { IExecuteFunctions, - IExecuteSingleFunctions, ILoadOptionsFunctions, IDataObject, JsonObject, @@ -12,7 +11,7 @@ import { NodeApiError } from 'n8n-workflow'; import moment from 'moment-timezone'; export async function googleApiRequest( - this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, + this: IExecuteFunctions | ILoadOptionsFunctions, method: string, resource: string, diff --git a/packages/nodes-base/nodes/Google/Firebase/RealtimeDatabase/GenericFunctions.ts b/packages/nodes-base/nodes/Google/Firebase/RealtimeDatabase/GenericFunctions.ts index ccf0c189cb..71b03a3369 100644 --- a/packages/nodes-base/nodes/Google/Firebase/RealtimeDatabase/GenericFunctions.ts +++ b/packages/nodes-base/nodes/Google/Firebase/RealtimeDatabase/GenericFunctions.ts @@ -2,7 +2,6 @@ import type { OptionsWithUrl } from 'request'; import type { IExecuteFunctions, - IExecuteSingleFunctions, ILoadOptionsFunctions, IDataObject, JsonObject, @@ -10,7 +9,7 @@ import type { import { NodeApiError } from 'n8n-workflow'; export async function googleApiRequest( - this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, + this: IExecuteFunctions | ILoadOptionsFunctions, projectId: string, method: string, resource: string, @@ -54,7 +53,7 @@ export async function googleApiRequest( } export async function googleApiRequestAllItems( - this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, + this: IExecuteFunctions | ILoadOptionsFunctions, projectId: string, method: string, resource: string, diff --git a/packages/nodes-base/nodes/Google/GSuiteAdmin/GenericFunctions.ts b/packages/nodes-base/nodes/Google/GSuiteAdmin/GenericFunctions.ts index 848bab2e96..4c9d15b0d6 100644 --- a/packages/nodes-base/nodes/Google/GSuiteAdmin/GenericFunctions.ts +++ b/packages/nodes-base/nodes/Google/GSuiteAdmin/GenericFunctions.ts @@ -2,7 +2,6 @@ import type { OptionsWithUri } from 'request'; import type { IExecuteFunctions, - IExecuteSingleFunctions, ILoadOptionsFunctions, IDataObject, JsonObject, @@ -10,7 +9,7 @@ import type { import { NodeApiError } from 'n8n-workflow'; export async function googleApiRequest( - this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, + this: IExecuteFunctions | ILoadOptionsFunctions, method: string, resource: string, diff --git a/packages/nodes-base/nodes/Google/GenericFunctions.ts b/packages/nodes-base/nodes/Google/GenericFunctions.ts index e83661dc92..c89f3e8241 100644 --- a/packages/nodes-base/nodes/Google/GenericFunctions.ts +++ b/packages/nodes-base/nodes/Google/GenericFunctions.ts @@ -1,6 +1,5 @@ import type { IExecuteFunctions, - IExecuteSingleFunctions, ILoadOptionsFunctions, ICredentialTestFunctions, IDataObject, @@ -58,12 +57,7 @@ const googleServiceAccountScopes = { type GoogleServiceAccount = keyof typeof googleServiceAccountScopes; export async function getGoogleAccessToken( - this: - | IExecuteFunctions - | IExecuteSingleFunctions - | ILoadOptionsFunctions - | ICredentialTestFunctions - | IPollFunctions, + this: IExecuteFunctions | ILoadOptionsFunctions | ICredentialTestFunctions | IPollFunctions, credentials: IDataObject, service: GoogleServiceAccount, ): Promise { diff --git a/packages/nodes-base/nodes/Google/Gmail/GenericFunctions.ts b/packages/nodes-base/nodes/Google/Gmail/GenericFunctions.ts index 44ac541a4c..8aee320407 100644 --- a/packages/nodes-base/nodes/Google/Gmail/GenericFunctions.ts +++ b/packages/nodes-base/nodes/Google/Gmail/GenericFunctions.ts @@ -6,7 +6,6 @@ import type { IBinaryKeyData, IDataObject, IExecuteFunctions, - IExecuteSingleFunctions, ILoadOptionsFunctions, INode, INodeExecutionData, @@ -43,7 +42,7 @@ import MailComposer from 'nodemailer/lib/mail-composer'; import { getGoogleAccessToken } from '../GenericFunctions'; export async function googleApiRequest( - this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions | IPollFunctions, + this: IExecuteFunctions | ILoadOptionsFunctions | IPollFunctions, method: string, endpoint: string, body: IDataObject = {}, @@ -349,7 +348,7 @@ export const prepareTimestamp = ( }; export function prepareQuery( - this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions | IPollFunctions, + this: IExecuteFunctions | ILoadOptionsFunctions | IPollFunctions, fields: IDataObject, itemIndex: number, ) { @@ -406,7 +405,7 @@ export function prepareQuery( } export function prepareEmailsInput( - this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, + this: IExecuteFunctions | ILoadOptionsFunctions, input: string, fieldName: string, itemIndex: number, @@ -434,7 +433,7 @@ export function prepareEmailsInput( } export function prepareEmailBody( - this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, + this: IExecuteFunctions | ILoadOptionsFunctions, itemIndex: number, ) { const emailType = this.getNodeParameter('emailType', itemIndex) as string; diff --git a/packages/nodes-base/nodes/Google/Sheet/v1/GenericFunctions.ts b/packages/nodes-base/nodes/Google/Sheet/v1/GenericFunctions.ts index 7175cb64a3..ac494e6f1a 100644 --- a/packages/nodes-base/nodes/Google/Sheet/v1/GenericFunctions.ts +++ b/packages/nodes-base/nodes/Google/Sheet/v1/GenericFunctions.ts @@ -3,7 +3,6 @@ import type { OptionsWithUri } from 'request'; import type { IDataObject, IExecuteFunctions, - IExecuteSingleFunctions, ILoadOptionsFunctions, JsonObject, } from 'n8n-workflow'; @@ -18,7 +17,7 @@ export interface IGoogleAuthCredentials { } export async function googleApiRequest( - this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, + this: IExecuteFunctions | ILoadOptionsFunctions, method: string, resource: string, diff --git a/packages/nodes-base/nodes/Google/Sheet/v2/transport/index.ts b/packages/nodes-base/nodes/Google/Sheet/v2/transport/index.ts index 024b95bbe4..40a0e09224 100644 --- a/packages/nodes-base/nodes/Google/Sheet/v2/transport/index.ts +++ b/packages/nodes-base/nodes/Google/Sheet/v2/transport/index.ts @@ -2,7 +2,6 @@ import type { OptionsWithUri } from 'request'; import type { IDataObject, IExecuteFunctions, - IExecuteSingleFunctions, ILoadOptionsFunctions, IPollFunctions, JsonObject, @@ -11,7 +10,7 @@ import { NodeApiError } from 'n8n-workflow'; import { getGoogleAccessToken } from '../../../GenericFunctions'; export async function apiRequest( - this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions | IPollFunctions, + this: IExecuteFunctions | ILoadOptionsFunctions | IPollFunctions, method: string, resource: string, body: IDataObject = {}, diff --git a/packages/nodes-base/nodes/Google/Task/GenericFunctions.ts b/packages/nodes-base/nodes/Google/Task/GenericFunctions.ts index 265b11773c..41b67f833a 100644 --- a/packages/nodes-base/nodes/Google/Task/GenericFunctions.ts +++ b/packages/nodes-base/nodes/Google/Task/GenericFunctions.ts @@ -2,7 +2,6 @@ import type { OptionsWithUri } from 'request'; import type { IExecuteFunctions, - IExecuteSingleFunctions, ILoadOptionsFunctions, IDataObject, JsonObject, @@ -10,7 +9,7 @@ import type { import { NodeApiError } from 'n8n-workflow'; export async function googleApiRequest( - this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, + this: IExecuteFunctions | ILoadOptionsFunctions, method: string, resource: string, body: IDataObject = {}, diff --git a/packages/nodes-base/nodes/Google/Translate/GenericFunctions.ts b/packages/nodes-base/nodes/Google/Translate/GenericFunctions.ts index f4274b7535..1cfb4c66c3 100644 --- a/packages/nodes-base/nodes/Google/Translate/GenericFunctions.ts +++ b/packages/nodes-base/nodes/Google/Translate/GenericFunctions.ts @@ -2,7 +2,6 @@ import type { OptionsWithUri } from 'request'; import type { IExecuteFunctions, - IExecuteSingleFunctions, ILoadOptionsFunctions, IDataObject, JsonObject, @@ -12,7 +11,7 @@ import { NodeApiError } from 'n8n-workflow'; import { getGoogleAccessToken } from '../GenericFunctions'; export async function googleApiRequest( - this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, + this: IExecuteFunctions | ILoadOptionsFunctions, method: string, resource: string, diff --git a/packages/nodes-base/nodes/Google/YouTube/GenericFunctions.ts b/packages/nodes-base/nodes/Google/YouTube/GenericFunctions.ts index e18ea26ce5..3ef2240da1 100644 --- a/packages/nodes-base/nodes/Google/YouTube/GenericFunctions.ts +++ b/packages/nodes-base/nodes/Google/YouTube/GenericFunctions.ts @@ -2,7 +2,6 @@ import type { OptionsWithUri } from 'request'; import type { IExecuteFunctions, - IExecuteSingleFunctions, ILoadOptionsFunctions, IDataObject, JsonObject, @@ -10,7 +9,7 @@ import type { import { NodeApiError } from 'n8n-workflow'; export async function googleApiRequest( - this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, + this: IExecuteFunctions | ILoadOptionsFunctions, method: string, resource: string, diff --git a/packages/nodes-base/nodes/Gotify/GenericFunctions.ts b/packages/nodes-base/nodes/Gotify/GenericFunctions.ts index 5194c53580..a963f106bb 100644 --- a/packages/nodes-base/nodes/Gotify/GenericFunctions.ts +++ b/packages/nodes-base/nodes/Gotify/GenericFunctions.ts @@ -2,7 +2,6 @@ import type { OptionsWithUri } from 'request'; import type { IExecuteFunctions, - IExecuteSingleFunctions, ILoadOptionsFunctions, IDataObject, JsonObject, @@ -10,7 +9,7 @@ import type { import { NodeApiError } from 'n8n-workflow'; export async function gotifyApiRequest( - this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, + this: IExecuteFunctions | ILoadOptionsFunctions, method: string, path: string, diff --git a/packages/nodes-base/nodes/Gumroad/GenericFunctions.ts b/packages/nodes-base/nodes/Gumroad/GenericFunctions.ts index 35023996de..1b19fccf05 100644 --- a/packages/nodes-base/nodes/Gumroad/GenericFunctions.ts +++ b/packages/nodes-base/nodes/Gumroad/GenericFunctions.ts @@ -2,7 +2,6 @@ import type { OptionsWithUri } from 'request'; import type { IDataObject, IExecuteFunctions, - IExecuteSingleFunctions, IHookFunctions, ILoadOptionsFunctions, IWebhookFunctions, @@ -11,12 +10,7 @@ import type { import { NodeApiError } from 'n8n-workflow'; export async function gumroadApiRequest( - this: - | IHookFunctions - | IExecuteFunctions - | IExecuteSingleFunctions - | ILoadOptionsFunctions - | IWebhookFunctions, + this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions | IWebhookFunctions, method: string, resource: string, diff --git a/packages/nodes-base/nodes/HaloPSA/GenericFunctions.ts b/packages/nodes-base/nodes/HaloPSA/GenericFunctions.ts index dd8a022582..2d000453ec 100644 --- a/packages/nodes-base/nodes/HaloPSA/GenericFunctions.ts +++ b/packages/nodes-base/nodes/HaloPSA/GenericFunctions.ts @@ -4,7 +4,6 @@ import type { IDataObject, IExecuteFunctions, IHookFunctions, - IExecuteSingleFunctions, ILoadOptionsFunctions, IPollFunctions, JsonObject, @@ -60,12 +59,7 @@ export async function getAccessTokens( } export async function haloPSAApiRequest( - this: - | IHookFunctions - | IExecuteFunctions - | IExecuteSingleFunctions - | ILoadOptionsFunctions - | IPollFunctions, + this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions | IPollFunctions, method: string, resource: string, accessToken: string, @@ -127,7 +121,6 @@ export async function haloPSAApiRequest( // this: // | IHookFunctions // | IExecuteFunctions -// | IExecuteSingleFunctions // | ILoadOptionsFunctions // | IPollFunctions, // clientId: string, diff --git a/packages/nodes-base/nodes/Harvest/GenericFunctions.ts b/packages/nodes-base/nodes/Harvest/GenericFunctions.ts index 583741c35f..596d6e75bd 100644 --- a/packages/nodes-base/nodes/Harvest/GenericFunctions.ts +++ b/packages/nodes-base/nodes/Harvest/GenericFunctions.ts @@ -3,7 +3,6 @@ import type { OptionsWithUri } from 'request'; import type { IDataObject, IExecuteFunctions, - IExecuteSingleFunctions, IHookFunctions, ILoadOptionsFunctions, JsonObject, @@ -11,7 +10,7 @@ import type { import { NodeApiError } from 'n8n-workflow'; export async function harvestApiRequest( - this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, + this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions, method: string, qs: IDataObject, path: string, @@ -59,7 +58,7 @@ export async function harvestApiRequest( * and return all results */ export async function harvestApiRequestAllItems( - this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, + this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions, method: string, qs: IDataObject, uri: string, diff --git a/packages/nodes-base/nodes/HelpScout/GenericFunctions.ts b/packages/nodes-base/nodes/HelpScout/GenericFunctions.ts index 05cb449c9a..ead007d459 100644 --- a/packages/nodes-base/nodes/HelpScout/GenericFunctions.ts +++ b/packages/nodes-base/nodes/HelpScout/GenericFunctions.ts @@ -3,7 +3,6 @@ import type { OptionsWithUri } from 'request'; import type { IDataObject, IExecuteFunctions, - IExecuteSingleFunctions, IHookFunctions, ILoadOptionsFunctions, JsonObject, @@ -13,7 +12,7 @@ import { NodeApiError } from 'n8n-workflow'; import get from 'lodash/get'; export async function helpscoutApiRequest( - this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions | IHookFunctions, + this: IExecuteFunctions | ILoadOptionsFunctions | IHookFunctions, method: string, resource: string, diff --git a/packages/nodes-base/nodes/Hubspot/V1/GenericFunctions.ts b/packages/nodes-base/nodes/Hubspot/V1/GenericFunctions.ts index 0f666c1bef..b93c778ed2 100644 --- a/packages/nodes-base/nodes/Hubspot/V1/GenericFunctions.ts +++ b/packages/nodes-base/nodes/Hubspot/V1/GenericFunctions.ts @@ -5,7 +5,6 @@ import type { ICredentialTestFunctions, IDataObject, IExecuteFunctions, - IExecuteSingleFunctions, IHookFunctions, ILoadOptionsFunctions, JsonObject, @@ -15,7 +14,7 @@ import { NodeApiError } from 'n8n-workflow'; import moment from 'moment'; export async function hubspotApiRequest( - this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, + this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions, method: string, endpoint: string, // tslint:disable-next-line:no-any diff --git a/packages/nodes-base/nodes/Hubspot/V2/GenericFunctions.ts b/packages/nodes-base/nodes/Hubspot/V2/GenericFunctions.ts index be7d8040f5..9604dba0c6 100644 --- a/packages/nodes-base/nodes/Hubspot/V2/GenericFunctions.ts +++ b/packages/nodes-base/nodes/Hubspot/V2/GenericFunctions.ts @@ -5,7 +5,6 @@ import type { ICredentialTestFunctions, IDataObject, IExecuteFunctions, - IExecuteSingleFunctions, IHookFunctions, ILoadOptionsFunctions, JsonObject, @@ -15,7 +14,7 @@ import { NodeApiError } from 'n8n-workflow'; import moment from 'moment'; export async function hubspotApiRequest( - this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, + this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions, method: string, endpoint: string, diff --git a/packages/nodes-base/nodes/HumanticAI/GenericFunctions.ts b/packages/nodes-base/nodes/HumanticAI/GenericFunctions.ts index d33ae31a96..823d6f879b 100644 --- a/packages/nodes-base/nodes/HumanticAI/GenericFunctions.ts +++ b/packages/nodes-base/nodes/HumanticAI/GenericFunctions.ts @@ -3,7 +3,6 @@ import type { OptionsWithUri } from 'request'; import type { IDataObject, IExecuteFunctions, - IExecuteSingleFunctions, IHookFunctions, ILoadOptionsFunctions, JsonObject, @@ -11,7 +10,7 @@ import type { import { NodeApiError } from 'n8n-workflow'; export async function humanticAiApiRequest( - this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, + this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions, method: string, resource: string, diff --git a/packages/nodes-base/nodes/Hunter/GenericFunctions.ts b/packages/nodes-base/nodes/Hunter/GenericFunctions.ts index 8627f4f2c2..6d4f2bbd43 100644 --- a/packages/nodes-base/nodes/Hunter/GenericFunctions.ts +++ b/packages/nodes-base/nodes/Hunter/GenericFunctions.ts @@ -2,7 +2,6 @@ import type { OptionsWithUri } from 'request'; import type { IDataObject, IExecuteFunctions, - IExecuteSingleFunctions, IHookFunctions, ILoadOptionsFunctions, JsonObject, @@ -10,7 +9,7 @@ import type { import { NodeApiError } from 'n8n-workflow'; export async function hunterApiRequest( - this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, + this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions, method: string, resource: string, diff --git a/packages/nodes-base/nodes/Intercom/GenericFunctions.ts b/packages/nodes-base/nodes/Intercom/GenericFunctions.ts index f064da22d3..b6c3c366cc 100644 --- a/packages/nodes-base/nodes/Intercom/GenericFunctions.ts +++ b/packages/nodes-base/nodes/Intercom/GenericFunctions.ts @@ -3,7 +3,6 @@ import type { OptionsWithUri } from 'request'; import type { IDataObject, IExecuteFunctions, - IExecuteSingleFunctions, IHookFunctions, ILoadOptionsFunctions, JsonObject, @@ -11,7 +10,7 @@ import type { import { NodeApiError } from 'n8n-workflow'; export async function intercomApiRequest( - this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, + this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions, endpoint: string, method: string, diff --git a/packages/nodes-base/nodes/InvoiceNinja/GenericFunctions.ts b/packages/nodes-base/nodes/InvoiceNinja/GenericFunctions.ts index ad3f71c387..b515bbdc55 100644 --- a/packages/nodes-base/nodes/InvoiceNinja/GenericFunctions.ts +++ b/packages/nodes-base/nodes/InvoiceNinja/GenericFunctions.ts @@ -3,7 +3,6 @@ import type { OptionsWithUri } from 'request'; import type { IDataObject, IExecuteFunctions, - IExecuteSingleFunctions, IHookFunctions, ILoadOptionsFunctions, JsonObject, @@ -21,7 +20,7 @@ export const eventID: { [key: string]: string } = { }; export async function invoiceNinjaApiRequest( - this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, + this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions, method: string, endpoint: string, body: IDataObject = {}, diff --git a/packages/nodes-base/nodes/Iterable/GenericFunctions.ts b/packages/nodes-base/nodes/Iterable/GenericFunctions.ts index 1b488ab5e7..b809b43d6f 100644 --- a/packages/nodes-base/nodes/Iterable/GenericFunctions.ts +++ b/packages/nodes-base/nodes/Iterable/GenericFunctions.ts @@ -2,7 +2,6 @@ import type { OptionsWithUri } from 'request'; import type { IExecuteFunctions, - IExecuteSingleFunctions, ILoadOptionsFunctions, IDataObject, JsonObject, @@ -10,7 +9,7 @@ import type { import { NodeApiError } from 'n8n-workflow'; export async function iterableApiRequest( - this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, + this: IExecuteFunctions | ILoadOptionsFunctions, method: string, resource: string, diff --git a/packages/nodes-base/nodes/Jenkins/GenericFunctions.ts b/packages/nodes-base/nodes/Jenkins/GenericFunctions.ts index 04e471bee6..62d9afab2b 100644 --- a/packages/nodes-base/nodes/Jenkins/GenericFunctions.ts +++ b/packages/nodes-base/nodes/Jenkins/GenericFunctions.ts @@ -3,7 +3,6 @@ import type { OptionsWithUri } from 'request'; import type { IDataObject, IExecuteFunctions, - IExecuteSingleFunctions, IHookFunctions, ILoadOptionsFunctions, JsonObject, @@ -15,7 +14,7 @@ export function tolerateTrailingSlash(baseUrl: string) { } export async function jenkinsApiRequest( - this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, + this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions, method: string, uri: string, qs: IDataObject = {}, diff --git a/packages/nodes-base/nodes/Jira/GenericFunctions.ts b/packages/nodes-base/nodes/Jira/GenericFunctions.ts index 6f7d70ad31..78c0f31039 100644 --- a/packages/nodes-base/nodes/Jira/GenericFunctions.ts +++ b/packages/nodes-base/nodes/Jira/GenericFunctions.ts @@ -3,7 +3,6 @@ import type { OptionsWithUri } from 'request'; import type { IDataObject, IExecuteFunctions, - IExecuteSingleFunctions, IHookFunctions, ILoadOptionsFunctions, INodeListSearchItems, @@ -12,7 +11,7 @@ import type { import { NodeApiError } from 'n8n-workflow'; export async function jiraSoftwareCloudApiRequest( - this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, + this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions, endpoint: string, method: string, body: any = {}, diff --git a/packages/nodes-base/nodes/JotForm/GenericFunctions.ts b/packages/nodes-base/nodes/JotForm/GenericFunctions.ts index 863a75596a..c831a0b773 100644 --- a/packages/nodes-base/nodes/JotForm/GenericFunctions.ts +++ b/packages/nodes-base/nodes/JotForm/GenericFunctions.ts @@ -2,7 +2,6 @@ import type { OptionsWithUri } from 'request'; import type { IDataObject, IExecuteFunctions, - IExecuteSingleFunctions, IHookFunctions, ILoadOptionsFunctions, IWebhookFunctions, @@ -11,12 +10,7 @@ import type { import { NodeApiError } from 'n8n-workflow'; export async function jotformApiRequest( - this: - | IHookFunctions - | IExecuteFunctions - | IExecuteSingleFunctions - | ILoadOptionsFunctions - | IWebhookFunctions, + this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions | IWebhookFunctions, method: string, resource: string, diff --git a/packages/nodes-base/nodes/Line/GenericFunctions.ts b/packages/nodes-base/nodes/Line/GenericFunctions.ts index 0b57cbbfc1..ddb36adf8e 100644 --- a/packages/nodes-base/nodes/Line/GenericFunctions.ts +++ b/packages/nodes-base/nodes/Line/GenericFunctions.ts @@ -3,7 +3,6 @@ import type { OptionsWithUri } from 'request'; import type { IDataObject, IExecuteFunctions, - IExecuteSingleFunctions, IHookFunctions, ILoadOptionsFunctions, JsonObject, @@ -11,7 +10,7 @@ import type { import { NodeApiError } from 'n8n-workflow'; export async function lineApiRequest( - this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions | IHookFunctions, + this: IExecuteFunctions | ILoadOptionsFunctions | IHookFunctions, method: string, resource: string, diff --git a/packages/nodes-base/nodes/LingvaNex/GenericFunctions.ts b/packages/nodes-base/nodes/LingvaNex/GenericFunctions.ts index 895a7bd831..50e7a31cd3 100644 --- a/packages/nodes-base/nodes/LingvaNex/GenericFunctions.ts +++ b/packages/nodes-base/nodes/LingvaNex/GenericFunctions.ts @@ -3,7 +3,6 @@ import type { OptionsWithUri } from 'request'; import type { IDataObject, IExecuteFunctions, - IExecuteSingleFunctions, IHookFunctions, ILoadOptionsFunctions, JsonObject, @@ -11,7 +10,7 @@ import type { import { NodeApiError } from 'n8n-workflow'; export async function lingvaNexApiRequest( - this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, + this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions, method: string, resource: string, diff --git a/packages/nodes-base/nodes/Mailchimp/GenericFunctions.ts b/packages/nodes-base/nodes/Mailchimp/GenericFunctions.ts index f73b7a3d22..c1b4c5ca69 100644 --- a/packages/nodes-base/nodes/Mailchimp/GenericFunctions.ts +++ b/packages/nodes-base/nodes/Mailchimp/GenericFunctions.ts @@ -3,7 +3,6 @@ import type { OptionsWithUrl } from 'request'; import type { IDataObject, IExecuteFunctions, - IExecuteSingleFunctions, IHookFunctions, ILoadOptionsFunctions, JsonObject, @@ -11,7 +10,7 @@ import type { import { NodeApiError, NodeOperationError } from 'n8n-workflow'; async function getMetadata( - this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, + this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions, oauthTokenData: IDataObject, ) { const credentials = await this.getCredentials('mailchimpOAuth2Api'); @@ -28,7 +27,7 @@ async function getMetadata( } export async function mailchimpApiRequest( - this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, + this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions, endpoint: string, method: string, diff --git a/packages/nodes-base/nodes/MailerLite/GenericFunctions.ts b/packages/nodes-base/nodes/MailerLite/GenericFunctions.ts index d27d7a3882..b4486ace3d 100644 --- a/packages/nodes-base/nodes/MailerLite/GenericFunctions.ts +++ b/packages/nodes-base/nodes/MailerLite/GenericFunctions.ts @@ -3,7 +3,6 @@ import type { OptionsWithUri } from 'request'; import type { IDataObject, IExecuteFunctions, - IExecuteSingleFunctions, IHookFunctions, ILoadOptionsFunctions, JsonObject, @@ -11,7 +10,7 @@ import type { import { NodeApiError } from 'n8n-workflow'; export async function mailerliteApiRequest( - this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions | IHookFunctions, + this: IExecuteFunctions | ILoadOptionsFunctions | IHookFunctions, method: string, path: string, diff --git a/packages/nodes-base/nodes/Mailjet/GenericFunctions.ts b/packages/nodes-base/nodes/Mailjet/GenericFunctions.ts index 89e5c44e1a..e4b55fcdd9 100644 --- a/packages/nodes-base/nodes/Mailjet/GenericFunctions.ts +++ b/packages/nodes-base/nodes/Mailjet/GenericFunctions.ts @@ -2,14 +2,13 @@ import type { OptionsWithUri } from 'request'; import type { IExecuteFunctions, - IExecuteSingleFunctions, ILoadOptionsFunctions, IDataObject, IHookFunctions, } from 'n8n-workflow'; export async function mailjetApiRequest( - this: IExecuteFunctions | IExecuteSingleFunctions | IHookFunctions | ILoadOptionsFunctions, + this: IExecuteFunctions | IHookFunctions | ILoadOptionsFunctions, method: string, path: string, diff --git a/packages/nodes-base/nodes/Matrix/GenericFunctions.ts b/packages/nodes-base/nodes/Matrix/GenericFunctions.ts index eebe1aebfe..4231df3c8b 100644 --- a/packages/nodes-base/nodes/Matrix/GenericFunctions.ts +++ b/packages/nodes-base/nodes/Matrix/GenericFunctions.ts @@ -3,7 +3,6 @@ import type { OptionsWithUri } from 'request'; import type { IDataObject, IExecuteFunctions, - IExecuteSingleFunctions, ILoadOptionsFunctions, JsonObject, } from 'n8n-workflow'; @@ -12,7 +11,7 @@ import { NodeApiError, NodeOperationError } from 'n8n-workflow'; import { v4 as uuid } from 'uuid'; export async function matrixApiRequest( - this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, + this: IExecuteFunctions | ILoadOptionsFunctions, method: string, resource: string, body: string | object = {}, diff --git a/packages/nodes-base/nodes/Mautic/GenericFunctions.ts b/packages/nodes-base/nodes/Mautic/GenericFunctions.ts index 63add5325a..f332d5d6a0 100644 --- a/packages/nodes-base/nodes/Mautic/GenericFunctions.ts +++ b/packages/nodes-base/nodes/Mautic/GenericFunctions.ts @@ -1,7 +1,6 @@ import type { IDataObject, IExecuteFunctions, - IExecuteSingleFunctions, IHookFunctions, ILoadOptionsFunctions, JsonObject, @@ -10,7 +9,7 @@ import { NodeApiError } from 'n8n-workflow'; import type { OptionsWithUri } from 'request'; export async function mauticApiRequest( - this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, + this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions, method: string, endpoint: string, diff --git a/packages/nodes-base/nodes/Medium/GenericFunctions.ts b/packages/nodes-base/nodes/Medium/GenericFunctions.ts index 5ac51fed31..11dae638ff 100644 --- a/packages/nodes-base/nodes/Medium/GenericFunctions.ts +++ b/packages/nodes-base/nodes/Medium/GenericFunctions.ts @@ -3,7 +3,6 @@ import type { OptionsWithUri } from 'request'; import type { IDataObject, IExecuteFunctions, - IExecuteSingleFunctions, IHookFunctions, ILoadOptionsFunctions, JsonObject, @@ -11,7 +10,7 @@ import type { import { NodeApiError } from 'n8n-workflow'; export async function mediumApiRequest( - this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, + this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions, method: string, endpoint: string, diff --git a/packages/nodes-base/nodes/Microsoft/Dynamics/GenericFunctions.ts b/packages/nodes-base/nodes/Microsoft/Dynamics/GenericFunctions.ts index dba23f3953..bdb2987ced 100644 --- a/packages/nodes-base/nodes/Microsoft/Dynamics/GenericFunctions.ts +++ b/packages/nodes-base/nodes/Microsoft/Dynamics/GenericFunctions.ts @@ -2,7 +2,6 @@ import type { OptionsWithUri } from 'request'; import type { IExecuteFunctions, - IExecuteSingleFunctions, ILoadOptionsFunctions, IDataObject, INodeProperties, @@ -12,7 +11,7 @@ import type { import { NodeApiError } from 'n8n-workflow'; export async function microsoftApiRequest( - this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, + this: IExecuteFunctions | ILoadOptionsFunctions, method: string, resource: string, diff --git a/packages/nodes-base/nodes/Microsoft/Excel/v1/GenericFunctions.ts b/packages/nodes-base/nodes/Microsoft/Excel/v1/GenericFunctions.ts index 5b5d79bb0a..682eed399f 100644 --- a/packages/nodes-base/nodes/Microsoft/Excel/v1/GenericFunctions.ts +++ b/packages/nodes-base/nodes/Microsoft/Excel/v1/GenericFunctions.ts @@ -2,14 +2,13 @@ import type { OptionsWithUri } from 'request'; import type { IDataObject, IExecuteFunctions, - IExecuteSingleFunctions, ILoadOptionsFunctions, JsonObject, } from 'n8n-workflow'; import { NodeApiError } from 'n8n-workflow'; export async function microsoftApiRequest( - this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, + this: IExecuteFunctions | ILoadOptionsFunctions, method: string, resource: string, 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 5a8b4609bc..843ebf0ed3 100644 --- a/packages/nodes-base/nodes/Microsoft/Excel/v2/transport/index.ts +++ b/packages/nodes-base/nodes/Microsoft/Excel/v2/transport/index.ts @@ -2,14 +2,13 @@ import type { OptionsWithUri } from 'request'; import type { IDataObject, IExecuteFunctions, - IExecuteSingleFunctions, ILoadOptionsFunctions, JsonObject, } from 'n8n-workflow'; import { NodeApiError } from 'n8n-workflow'; export async function microsoftApiRequest( - this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, + this: IExecuteFunctions | ILoadOptionsFunctions, method: string, resource: string, body: any = {}, diff --git a/packages/nodes-base/nodes/Microsoft/OneDrive/GenericFunctions.ts b/packages/nodes-base/nodes/Microsoft/OneDrive/GenericFunctions.ts index 881cde156f..ce8641818b 100644 --- a/packages/nodes-base/nodes/Microsoft/OneDrive/GenericFunctions.ts +++ b/packages/nodes-base/nodes/Microsoft/OneDrive/GenericFunctions.ts @@ -2,7 +2,6 @@ import type { OptionsWithUri } from 'request'; import type { IExecuteFunctions, - IExecuteSingleFunctions, ILoadOptionsFunctions, IDataObject, JsonObject, @@ -10,7 +9,7 @@ import type { import { NodeApiError } from 'n8n-workflow'; export async function microsoftApiRequest( - this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, + this: IExecuteFunctions | ILoadOptionsFunctions, method: string, resource: string, diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/GenericFunctions.ts b/packages/nodes-base/nodes/Microsoft/Outlook/GenericFunctions.ts index 2f76822be1..1bd0e37644 100644 --- a/packages/nodes-base/nodes/Microsoft/Outlook/GenericFunctions.ts +++ b/packages/nodes-base/nodes/Microsoft/Outlook/GenericFunctions.ts @@ -3,7 +3,6 @@ import type { OptionsWithUri } from 'request'; import type { IDataObject, IExecuteFunctions, - IExecuteSingleFunctions, ILoadOptionsFunctions, INodeExecutionData, JsonObject, @@ -11,7 +10,7 @@ import type { import { BINARY_ENCODING, NodeApiError } from 'n8n-workflow'; export async function microsoftApiRequest( - this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, + this: IExecuteFunctions | ILoadOptionsFunctions, method: string, resource: string, diff --git a/packages/nodes-base/nodes/Microsoft/Teams/GenericFunctions.ts b/packages/nodes-base/nodes/Microsoft/Teams/GenericFunctions.ts index 7608e980d1..3b6b95e9c6 100644 --- a/packages/nodes-base/nodes/Microsoft/Teams/GenericFunctions.ts +++ b/packages/nodes-base/nodes/Microsoft/Teams/GenericFunctions.ts @@ -2,7 +2,6 @@ import type { OptionsWithUri } from 'request'; import type { IExecuteFunctions, - IExecuteSingleFunctions, ILoadOptionsFunctions, IDataObject, JsonObject, @@ -10,7 +9,7 @@ import type { import { NodeApiError } from 'n8n-workflow'; export async function microsoftApiRequest( - this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, + this: IExecuteFunctions | ILoadOptionsFunctions, method: string, resource: string, diff --git a/packages/nodes-base/nodes/Mindee/GenericFunctions.ts b/packages/nodes-base/nodes/Mindee/GenericFunctions.ts index 1b69ff951b..b2024d624a 100644 --- a/packages/nodes-base/nodes/Mindee/GenericFunctions.ts +++ b/packages/nodes-base/nodes/Mindee/GenericFunctions.ts @@ -2,7 +2,6 @@ import type { OptionsWithUri } from 'request'; import type { IExecuteFunctions, - IExecuteSingleFunctions, ILoadOptionsFunctions, IDataObject, JsonObject, @@ -10,7 +9,7 @@ import type { import { NodeApiError } from 'n8n-workflow'; export async function mindeeApiRequest( - this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, + this: IExecuteFunctions | ILoadOptionsFunctions, method: string, path: string, body: any = {}, diff --git a/packages/nodes-base/nodes/Netlify/GenericFunctions.ts b/packages/nodes-base/nodes/Netlify/GenericFunctions.ts index 21bdd92411..dd257e4fcc 100644 --- a/packages/nodes-base/nodes/Netlify/GenericFunctions.ts +++ b/packages/nodes-base/nodes/Netlify/GenericFunctions.ts @@ -3,7 +3,6 @@ import type { OptionsWithUri } from 'request'; import type { IDataObject, IExecuteFunctions, - IExecuteSingleFunctions, IHookFunctions, ILoadOptionsFunctions, JsonObject, @@ -11,7 +10,7 @@ import type { import { NodeApiError } from 'n8n-workflow'; export async function netlifyApiRequest( - this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, + this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions, method: string, endpoint: string, diff --git a/packages/nodes-base/nodes/Notion/GenericFunctions.ts b/packages/nodes-base/nodes/Notion/GenericFunctions.ts index f93704b7ea..b459c8bc13 100644 --- a/packages/nodes-base/nodes/Notion/GenericFunctions.ts +++ b/packages/nodes-base/nodes/Notion/GenericFunctions.ts @@ -5,7 +5,6 @@ import type { IDataObject, IDisplayOptions, IExecuteFunctions, - IExecuteSingleFunctions, IHookFunctions, ILoadOptionsFunctions, INodeExecutionData, @@ -44,12 +43,7 @@ const apiVersion: { [key: number]: string } = { }; export async function notionApiRequest( - this: - | IHookFunctions - | IExecuteFunctions - | IExecuteSingleFunctions - | ILoadOptionsFunctions - | IPollFunctions, + this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions | IPollFunctions, method: string, resource: string, diff --git a/packages/nodes-base/nodes/Odoo/GenericFunctions.ts b/packages/nodes-base/nodes/Odoo/GenericFunctions.ts index 573642ff3e..8cecc59cc9 100644 --- a/packages/nodes-base/nodes/Odoo/GenericFunctions.ts +++ b/packages/nodes-base/nodes/Odoo/GenericFunctions.ts @@ -3,7 +3,6 @@ import type { OptionsWithUri } from 'request'; import type { IDataObject, IExecuteFunctions, - IExecuteSingleFunctions, IHookFunctions, ILoadOptionsFunctions, JsonObject, @@ -105,7 +104,7 @@ export function processNameValueFields(value: IDataObject) { // } export async function odooJSONRPCRequest( - this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, + this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions, body: IDataObject, url: string, ): Promise { @@ -136,7 +135,7 @@ export async function odooJSONRPCRequest( } export async function odooGetModelFields( - this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, + this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions, db: string, userID: number, password: string, @@ -171,7 +170,7 @@ export async function odooGetModelFields( } export async function odooCreate( - this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, + this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions, db: string, userID: number, password: string, @@ -207,7 +206,7 @@ export async function odooCreate( } export async function odooGet( - this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, + this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions, db: string, userID: number, password: string, @@ -251,7 +250,7 @@ export async function odooGet( } export async function odooGetAll( - this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, + this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions, db: string, userID: number, password: string, @@ -292,7 +291,7 @@ export async function odooGetAll( } export async function odooUpdate( - this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, + this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions, db: string, userID: number, password: string, @@ -342,7 +341,7 @@ export async function odooUpdate( } export async function odooDelete( - this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, + this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions, db: string, userID: number, password: string, @@ -384,7 +383,7 @@ export async function odooDelete( } export async function odooGetUserID( - this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, + this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions, db: string, username: string, password: string, @@ -409,7 +408,7 @@ export async function odooGetUserID( } export async function odooGetServerVersion( - this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, + this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions, url: string, ) { try { diff --git a/packages/nodes-base/nodes/OpenThesaurus/GenericFunctions.ts b/packages/nodes-base/nodes/OpenThesaurus/GenericFunctions.ts index 38a5f39bc1..9e61d9d02c 100644 --- a/packages/nodes-base/nodes/OpenThesaurus/GenericFunctions.ts +++ b/packages/nodes-base/nodes/OpenThesaurus/GenericFunctions.ts @@ -3,7 +3,6 @@ import type { OptionsWithUri } from 'request'; import type { IDataObject, IExecuteFunctions, - IExecuteSingleFunctions, IHookFunctions, ILoadOptionsFunctions, JsonObject, @@ -11,7 +10,7 @@ import type { import { NodeApiError } from 'n8n-workflow'; export async function openThesaurusApiRequest( - this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, + this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions, method: string, resource: string, diff --git a/packages/nodes-base/nodes/Orbit/GenericFunctions.ts b/packages/nodes-base/nodes/Orbit/GenericFunctions.ts index a39ad2493f..459d8b27f6 100644 --- a/packages/nodes-base/nodes/Orbit/GenericFunctions.ts +++ b/packages/nodes-base/nodes/Orbit/GenericFunctions.ts @@ -3,7 +3,6 @@ import type { OptionsWithUri } from 'request'; import type { JsonObject, IExecuteFunctions, - IExecuteSingleFunctions, IHookFunctions, ILoadOptionsFunctions, IDataObject, @@ -13,7 +12,7 @@ import { NodeApiError } from 'n8n-workflow'; import type { IRelation } from './Interfaces'; export async function orbitApiRequest( - this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, + this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions, method: string, resource: string, diff --git a/packages/nodes-base/nodes/Oura/GenericFunctions.ts b/packages/nodes-base/nodes/Oura/GenericFunctions.ts index a520f7f144..1987a1c01c 100644 --- a/packages/nodes-base/nodes/Oura/GenericFunctions.ts +++ b/packages/nodes-base/nodes/Oura/GenericFunctions.ts @@ -3,7 +3,6 @@ import type { OptionsWithUri } from 'request'; import type { IDataObject, IExecuteFunctions, - IExecuteSingleFunctions, IHookFunctions, ILoadOptionsFunctions, JsonObject, @@ -11,7 +10,7 @@ import type { import { NodeApiError } from 'n8n-workflow'; export async function ouraApiRequest( - this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, + this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions, method: string, resource: string, body: IDataObject = {}, diff --git a/packages/nodes-base/nodes/Paddle/GenericFunctions.ts b/packages/nodes-base/nodes/Paddle/GenericFunctions.ts index 457028faea..8dedc3a49b 100644 --- a/packages/nodes-base/nodes/Paddle/GenericFunctions.ts +++ b/packages/nodes-base/nodes/Paddle/GenericFunctions.ts @@ -3,7 +3,6 @@ import type { OptionsWithUri } from 'request'; import type { JsonObject, IExecuteFunctions, - IExecuteSingleFunctions, IHookFunctions, ILoadOptionsFunctions, IWebhookFunctions, @@ -12,12 +11,7 @@ import type { import { NodeApiError } from 'n8n-workflow'; export async function paddleApiRequest( - this: - | IHookFunctions - | IExecuteFunctions - | IExecuteSingleFunctions - | ILoadOptionsFunctions - | IWebhookFunctions, + this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions | IWebhookFunctions, endpoint: string, method: string, diff --git a/packages/nodes-base/nodes/PayPal/GenericFunctions.ts b/packages/nodes-base/nodes/PayPal/GenericFunctions.ts index 6d64e29d18..8c34194c5b 100644 --- a/packages/nodes-base/nodes/PayPal/GenericFunctions.ts +++ b/packages/nodes-base/nodes/PayPal/GenericFunctions.ts @@ -4,7 +4,6 @@ import type { JsonObject, IDataObject, IExecuteFunctions, - IExecuteSingleFunctions, IHookFunctions, ILoadOptionsFunctions, IWebhookFunctions, @@ -19,12 +18,7 @@ function getEnvironment(env: string) { } async function getAccessToken( - this: - | IHookFunctions - | IExecuteFunctions - | IExecuteSingleFunctions - | ILoadOptionsFunctions - | IWebhookFunctions, + this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions | IWebhookFunctions, ): Promise { const credentials = await this.getCredentials('payPalApi'); const env = getEnvironment(credentials.env as string); @@ -52,12 +46,7 @@ async function getAccessToken( } export async function payPalApiRequest( - this: - | IHookFunctions - | IExecuteFunctions - | IExecuteSingleFunctions - | ILoadOptionsFunctions - | IWebhookFunctions, + this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions | IWebhookFunctions, endpoint: string, method: string, @@ -101,7 +90,7 @@ function getNext(links: IDataObject[]): string | undefined { * and return all results */ export async function payPalApiRequestAllItems( - this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, + this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions, propertyName: string, endpoint: string, method: string, diff --git a/packages/nodes-base/nodes/Peekalink/GenericFunctions.ts b/packages/nodes-base/nodes/Peekalink/GenericFunctions.ts index b288aa77f2..222b4bac00 100644 --- a/packages/nodes-base/nodes/Peekalink/GenericFunctions.ts +++ b/packages/nodes-base/nodes/Peekalink/GenericFunctions.ts @@ -3,7 +3,6 @@ import type { OptionsWithUri } from 'request'; import type { JsonObject, IExecuteFunctions, - IExecuteSingleFunctions, IHookFunctions, ILoadOptionsFunctions, IDataObject, @@ -11,7 +10,7 @@ import type { import { NodeApiError } from 'n8n-workflow'; export async function peekalinkApiRequest( - this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, + this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions, method: string, resource: string, diff --git a/packages/nodes-base/nodes/Phantombuster/GenericFunctions.ts b/packages/nodes-base/nodes/Phantombuster/GenericFunctions.ts index 904cd1114e..861644f312 100644 --- a/packages/nodes-base/nodes/Phantombuster/GenericFunctions.ts +++ b/packages/nodes-base/nodes/Phantombuster/GenericFunctions.ts @@ -4,13 +4,12 @@ import type { JsonObject, IDataObject, IExecuteFunctions, - IExecuteSingleFunctions, ILoadOptionsFunctions, } from 'n8n-workflow'; import { NodeApiError, NodeOperationError } from 'n8n-workflow'; export async function phantombusterApiRequest( - this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, + this: IExecuteFunctions | ILoadOptionsFunctions, method: string, path: string, diff --git a/packages/nodes-base/nodes/ProfitWell/GenericFunctions.ts b/packages/nodes-base/nodes/ProfitWell/GenericFunctions.ts index da3bcb1e97..02baa5a776 100644 --- a/packages/nodes-base/nodes/ProfitWell/GenericFunctions.ts +++ b/packages/nodes-base/nodes/ProfitWell/GenericFunctions.ts @@ -3,7 +3,6 @@ import type { OptionsWithUri } from 'request'; import type { IDataObject, IExecuteFunctions, - IExecuteSingleFunctions, IHookFunctions, ILoadOptionsFunctions, JsonObject, @@ -11,7 +10,7 @@ import type { import { NodeApiError } from 'n8n-workflow'; export async function profitWellApiRequest( - this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, + this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions, method: string, resource: string, diff --git a/packages/nodes-base/nodes/Pushover/GenericFunctions.ts b/packages/nodes-base/nodes/Pushover/GenericFunctions.ts index f5333705ad..56051e59cf 100644 --- a/packages/nodes-base/nodes/Pushover/GenericFunctions.ts +++ b/packages/nodes-base/nodes/Pushover/GenericFunctions.ts @@ -1,7 +1,6 @@ import type { IDataObject, IExecuteFunctions, - IExecuteSingleFunctions, ILoadOptionsFunctions, IHttpRequestMethods, IHttpRequestOptions, @@ -10,7 +9,7 @@ import type { import { NodeApiError } from 'n8n-workflow'; export async function pushoverApiRequest( - this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, + this: IExecuteFunctions | ILoadOptionsFunctions, method: IHttpRequestMethods, path: string, diff --git a/packages/nodes-base/nodes/Salesforce/GenericFunctions.ts b/packages/nodes-base/nodes/Salesforce/GenericFunctions.ts index 86128c1c1e..fa59d770ee 100644 --- a/packages/nodes-base/nodes/Salesforce/GenericFunctions.ts +++ b/packages/nodes-base/nodes/Salesforce/GenericFunctions.ts @@ -2,7 +2,6 @@ import type { OptionsWithUri } from 'request'; import type { IExecuteFunctions, - IExecuteSingleFunctions, ILoadOptionsFunctions, IDataObject, INodePropertyOptions, @@ -15,7 +14,7 @@ import moment from 'moment-timezone'; import jwt from 'jsonwebtoken'; function getOptions( - this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, + this: IExecuteFunctions | ILoadOptionsFunctions, method: string, endpoint: string, @@ -42,7 +41,7 @@ function getOptions( } async function getAccessToken( - this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, + this: IExecuteFunctions | ILoadOptionsFunctions, credentials: IDataObject, ): Promise { const now = moment().unix(); @@ -84,7 +83,7 @@ async function getAccessToken( } export async function salesforceApiRequest( - this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, + this: IExecuteFunctions | ILoadOptionsFunctions, method: string, endpoint: string, diff --git a/packages/nodes-base/nodes/Salesmate/GenericFunctions.ts b/packages/nodes-base/nodes/Salesmate/GenericFunctions.ts index 466b3efc0d..ec87988a00 100644 --- a/packages/nodes-base/nodes/Salesmate/GenericFunctions.ts +++ b/packages/nodes-base/nodes/Salesmate/GenericFunctions.ts @@ -3,7 +3,6 @@ import type { OptionsWithUri } from 'request'; import type { IDataObject, IExecuteFunctions, - IExecuteSingleFunctions, IHookFunctions, ILoadOptionsFunctions, IWebhookFunctions, @@ -12,12 +11,7 @@ import type { import { NodeApiError } from 'n8n-workflow'; export async function salesmateApiRequest( - this: - | IHookFunctions - | IExecuteFunctions - | IExecuteSingleFunctions - | ILoadOptionsFunctions - | IWebhookFunctions, + this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions | IWebhookFunctions, method: string, resource: string, diff --git a/packages/nodes-base/nodes/Segment/GenericFunctions.ts b/packages/nodes-base/nodes/Segment/GenericFunctions.ts index 739a526963..9b90251f0f 100644 --- a/packages/nodes-base/nodes/Segment/GenericFunctions.ts +++ b/packages/nodes-base/nodes/Segment/GenericFunctions.ts @@ -2,19 +2,13 @@ import type { OptionsWithUri } from 'request'; import type { IDataObject, IExecuteFunctions, - IExecuteSingleFunctions, IHookFunctions, ILoadOptionsFunctions, IWebhookFunctions, } from 'n8n-workflow'; export async function segmentApiRequest( - this: - | IHookFunctions - | IExecuteFunctions - | IExecuteSingleFunctions - | ILoadOptionsFunctions - | IWebhookFunctions, + this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions | IWebhookFunctions, method: string, resource: string, body: any = {}, diff --git a/packages/nodes-base/nodes/SendGrid/GenericFunctions.ts b/packages/nodes-base/nodes/SendGrid/GenericFunctions.ts index 62754ad7b7..d03e8aff34 100644 --- a/packages/nodes-base/nodes/SendGrid/GenericFunctions.ts +++ b/packages/nodes-base/nodes/SendGrid/GenericFunctions.ts @@ -3,13 +3,12 @@ import type { OptionsWithUri } from 'request'; import type { IDataObject, IExecuteFunctions, - IExecuteSingleFunctions, IHookFunctions, ILoadOptionsFunctions, } from 'n8n-workflow'; export async function sendGridApiRequest( - this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, + this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions, endpoint: string, method: string, diff --git a/packages/nodes-base/nodes/SentryIo/GenericFunctions.ts b/packages/nodes-base/nodes/SentryIo/GenericFunctions.ts index 855f628a3c..435e854146 100644 --- a/packages/nodes-base/nodes/SentryIo/GenericFunctions.ts +++ b/packages/nodes-base/nodes/SentryIo/GenericFunctions.ts @@ -3,7 +3,6 @@ import type { OptionsWithUri } from 'request'; import type { IDataObject, IExecuteFunctions, - IExecuteSingleFunctions, IHookFunctions, ILoadOptionsFunctions, IWebhookFunctions, @@ -12,12 +11,7 @@ import type { import { NodeApiError } from 'n8n-workflow'; export async function sentryIoApiRequest( - this: - | IHookFunctions - | IExecuteFunctions - | IExecuteSingleFunctions - | ILoadOptionsFunctions - | IWebhookFunctions, + this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions | IWebhookFunctions, method: string, resource: string, diff --git a/packages/nodes-base/nodes/Shopify/GenericFunctions.ts b/packages/nodes-base/nodes/Shopify/GenericFunctions.ts index d10f9d74b9..5224665e7b 100644 --- a/packages/nodes-base/nodes/Shopify/GenericFunctions.ts +++ b/packages/nodes-base/nodes/Shopify/GenericFunctions.ts @@ -3,7 +3,6 @@ import type { OptionsWithUri } from 'request'; import type { IDataObject, IExecuteFunctions, - IExecuteSingleFunctions, IHookFunctions, ILoadOptionsFunctions, IOAuth2Options, @@ -12,7 +11,7 @@ import type { import { snakeCase } from 'change-case'; export async function shopifyApiRequest( - this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, + this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions, method: string, resource: string, diff --git a/packages/nodes-base/nodes/Slack/V1/GenericFunctions.ts b/packages/nodes-base/nodes/Slack/V1/GenericFunctions.ts index 30aef85e8a..a52f6e85b5 100644 --- a/packages/nodes-base/nodes/Slack/V1/GenericFunctions.ts +++ b/packages/nodes-base/nodes/Slack/V1/GenericFunctions.ts @@ -2,7 +2,6 @@ import type { OptionsWithUri } from 'request'; import type { IExecuteFunctions, - IExecuteSingleFunctions, ILoadOptionsFunctions, IDataObject, IOAuth2Options, @@ -13,7 +12,7 @@ import { NodeApiError, NodeOperationError } from 'n8n-workflow'; import get from 'lodash/get'; export async function slackApiRequest( - this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, + this: IExecuteFunctions | ILoadOptionsFunctions, method: string, resource: string, body: object = {}, diff --git a/packages/nodes-base/nodes/Slack/V2/GenericFunctions.ts b/packages/nodes-base/nodes/Slack/V2/GenericFunctions.ts index 2a22d54d08..4d3c8bed03 100644 --- a/packages/nodes-base/nodes/Slack/V2/GenericFunctions.ts +++ b/packages/nodes-base/nodes/Slack/V2/GenericFunctions.ts @@ -2,7 +2,6 @@ import type { OptionsWithUri } from 'request'; import type { IDataObject, IExecuteFunctions, - IExecuteSingleFunctions, ILoadOptionsFunctions, IOAuth2Options, } from 'n8n-workflow'; @@ -12,7 +11,7 @@ import { NodeOperationError, jsonParse } from 'n8n-workflow'; import get from 'lodash/get'; export async function slackApiRequest( - this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, + this: IExecuteFunctions | ILoadOptionsFunctions, method: string, resource: string, body: object = {}, @@ -130,10 +129,7 @@ export async function slackApiRequestAllItems( return returnData; } -export function getMessageContent( - this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, - i: number, -) { +export function getMessageContent(this: IExecuteFunctions | ILoadOptionsFunctions, i: number) { const nodeVersion = this.getNode().typeVersion; const includeLinkToWorkflow = this.getNodeParameter( diff --git a/packages/nodes-base/nodes/Storyblok/GenericFunctions.ts b/packages/nodes-base/nodes/Storyblok/GenericFunctions.ts index 1b5e8f0aee..4c622ff68c 100644 --- a/packages/nodes-base/nodes/Storyblok/GenericFunctions.ts +++ b/packages/nodes-base/nodes/Storyblok/GenericFunctions.ts @@ -3,7 +3,6 @@ import type { OptionsWithUri } from 'request'; import type { IDataObject, IExecuteFunctions, - IExecuteSingleFunctions, IHookFunctions, ILoadOptionsFunctions, JsonObject, @@ -11,7 +10,7 @@ import type { import { NodeApiError } from 'n8n-workflow'; export async function storyblokApiRequest( - this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, + this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions, method: string, resource: string, body: IDataObject = {}, diff --git a/packages/nodes-base/nodes/Strava/GenericFunctions.ts b/packages/nodes-base/nodes/Strava/GenericFunctions.ts index c42c34ad93..e50c15054e 100644 --- a/packages/nodes-base/nodes/Strava/GenericFunctions.ts +++ b/packages/nodes-base/nodes/Strava/GenericFunctions.ts @@ -3,7 +3,6 @@ import type { OptionsWithUri } from 'request'; import type { IDataObject, IExecuteFunctions, - IExecuteSingleFunctions, IHookFunctions, ILoadOptionsFunctions, IWebhookFunctions, @@ -12,12 +11,7 @@ import type { import { NodeApiError } from 'n8n-workflow'; export async function stravaApiRequest( - this: - | IExecuteFunctions - | IExecuteSingleFunctions - | ILoadOptionsFunctions - | IHookFunctions - | IWebhookFunctions, + this: IExecuteFunctions | ILoadOptionsFunctions | IHookFunctions | IWebhookFunctions, method: string, resource: string, body: IDataObject = {}, diff --git a/packages/nodes-base/nodes/Supabase/GenericFunctions.ts b/packages/nodes-base/nodes/Supabase/GenericFunctions.ts index b88c75d60f..1c5a60c975 100644 --- a/packages/nodes-base/nodes/Supabase/GenericFunctions.ts +++ b/packages/nodes-base/nodes/Supabase/GenericFunctions.ts @@ -5,7 +5,6 @@ import type { ICredentialTestFunctions, IDataObject, IExecuteFunctions, - IExecuteSingleFunctions, IHookFunctions, ILoadOptionsFunctions, IWebhookFunctions, @@ -16,12 +15,7 @@ import type { import { NodeApiError } from 'n8n-workflow'; export async function supabaseApiRequest( - this: - | IExecuteFunctions - | IExecuteSingleFunctions - | ILoadOptionsFunctions - | IHookFunctions - | IWebhookFunctions, + this: IExecuteFunctions | ILoadOptionsFunctions | IHookFunctions | IWebhookFunctions, method: string, resource: string, body: IDataObject | IDataObject[] = {}, diff --git a/packages/nodes-base/nodes/Taiga/GenericFunctions.ts b/packages/nodes-base/nodes/Taiga/GenericFunctions.ts index c787691bbf..9b09ffc35b 100644 --- a/packages/nodes-base/nodes/Taiga/GenericFunctions.ts +++ b/packages/nodes-base/nodes/Taiga/GenericFunctions.ts @@ -4,7 +4,6 @@ import type { ICredentialDataDecryptedObject, IDataObject, IExecuteFunctions, - IExecuteSingleFunctions, IHookFunctions, ILoadOptionsFunctions, IWebhookFunctions, @@ -15,12 +14,7 @@ import { NodeApiError, NodeOperationError } from 'n8n-workflow'; import { createHash } from 'crypto'; export async function getAuthorization( - this: - | IHookFunctions - | IExecuteFunctions - | IExecuteSingleFunctions - | ILoadOptionsFunctions - | IWebhookFunctions, + this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions | IWebhookFunctions, credentials?: ICredentialDataDecryptedObject, ): Promise { if (credentials === undefined) { @@ -50,12 +44,7 @@ export async function getAuthorization( } export async function taigaApiRequest( - this: - | IHookFunctions - | IExecuteFunctions - | IExecuteSingleFunctions - | ILoadOptionsFunctions - | IWebhookFunctions, + this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions | IWebhookFunctions, method: string, resource: string, body = {}, diff --git a/packages/nodes-base/nodes/Tapfiliate/GenericFunctions.ts b/packages/nodes-base/nodes/Tapfiliate/GenericFunctions.ts index e96b69c375..5bcfa3763a 100644 --- a/packages/nodes-base/nodes/Tapfiliate/GenericFunctions.ts +++ b/packages/nodes-base/nodes/Tapfiliate/GenericFunctions.ts @@ -3,7 +3,6 @@ import type { OptionsWithUri } from 'request'; import type { IDataObject, IExecuteFunctions, - IExecuteSingleFunctions, IHookFunctions, ILoadOptionsFunctions, JsonObject, @@ -11,7 +10,7 @@ import type { import { NodeApiError } from 'n8n-workflow'; export async function tapfiliateApiRequest( - this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, + this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions, method: string, endpoint: string, diff --git a/packages/nodes-base/nodes/Toggl/GenericFunctions.ts b/packages/nodes-base/nodes/Toggl/GenericFunctions.ts index 33557fc6b9..064cddfcd0 100644 --- a/packages/nodes-base/nodes/Toggl/GenericFunctions.ts +++ b/packages/nodes-base/nodes/Toggl/GenericFunctions.ts @@ -3,7 +3,6 @@ import type { OptionsWithUri } from 'request'; import type { IDataObject, IExecuteFunctions, - IExecuteSingleFunctions, IHookFunctions, ILoadOptionsFunctions, IPollFunctions, @@ -18,7 +17,6 @@ export async function togglApiRequest( | IPollFunctions | IHookFunctions | IExecuteFunctions - | IExecuteSingleFunctions | ILoadOptionsFunctions, method: string, resource: string, diff --git a/packages/nodes-base/nodes/TravisCi/GenericFunctions.ts b/packages/nodes-base/nodes/TravisCi/GenericFunctions.ts index 609fde5094..14d1d82a6c 100644 --- a/packages/nodes-base/nodes/TravisCi/GenericFunctions.ts +++ b/packages/nodes-base/nodes/TravisCi/GenericFunctions.ts @@ -3,7 +3,6 @@ import type { OptionsWithUri } from 'request'; import type { IDataObject, IExecuteFunctions, - IExecuteSingleFunctions, IHookFunctions, ILoadOptionsFunctions, JsonObject, @@ -13,7 +12,7 @@ import { NodeApiError } from 'n8n-workflow'; import get from 'lodash/get'; export async function travisciApiRequest( - this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, + this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions, method: string, resource: string, body: IDataObject | string = {}, diff --git a/packages/nodes-base/nodes/Twitter/V1/GenericFunctions.ts b/packages/nodes-base/nodes/Twitter/V1/GenericFunctions.ts index 94194b8243..03b0efa30b 100644 --- a/packages/nodes-base/nodes/Twitter/V1/GenericFunctions.ts +++ b/packages/nodes-base/nodes/Twitter/V1/GenericFunctions.ts @@ -3,7 +3,6 @@ import type { OptionsWithUrl } from 'request'; import type { IDataObject, IExecuteFunctions, - IExecuteSingleFunctions, IHookFunctions, ILoadOptionsFunctions, JsonObject, @@ -11,7 +10,7 @@ import type { import { NodeApiError, NodeOperationError, sleep } from 'n8n-workflow'; export async function twitterApiRequest( - this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions | IHookFunctions, + this: IExecuteFunctions | ILoadOptionsFunctions | IHookFunctions, method: string, resource: string, body: IDataObject = {}, diff --git a/packages/nodes-base/nodes/Twitter/V2/GenericFunctions.ts b/packages/nodes-base/nodes/Twitter/V2/GenericFunctions.ts index 2064e05a82..7227b1cca8 100644 --- a/packages/nodes-base/nodes/Twitter/V2/GenericFunctions.ts +++ b/packages/nodes-base/nodes/Twitter/V2/GenericFunctions.ts @@ -3,7 +3,6 @@ import type { OptionsWithUrl } from 'request'; import type { IDataObject, IExecuteFunctions, - IExecuteSingleFunctions, IHookFunctions, ILoadOptionsFunctions, INodeParameterResourceLocator, @@ -12,7 +11,7 @@ import type { import { NodeApiError, NodeOperationError } from 'n8n-workflow'; export async function twitterApiRequest( - this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions | IHookFunctions, + this: IExecuteFunctions | ILoadOptionsFunctions | IHookFunctions, method: string, resource: string, body: IDataObject = {}, diff --git a/packages/nodes-base/nodes/UProc/GenericFunctions.ts b/packages/nodes-base/nodes/UProc/GenericFunctions.ts index 9b96f5b51d..e66c53a64a 100644 --- a/packages/nodes-base/nodes/UProc/GenericFunctions.ts +++ b/packages/nodes-base/nodes/UProc/GenericFunctions.ts @@ -1,7 +1,6 @@ import type { IDataObject, IExecuteFunctions, - IExecuteSingleFunctions, IHookFunctions, ILoadOptionsFunctions, IHttpRequestMethods, @@ -11,7 +10,7 @@ import type { import { NodeApiError } from 'n8n-workflow'; export async function uprocApiRequest( - this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, + this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions, method: string, body: any = {}, qs: IDataObject = {}, diff --git a/packages/nodes-base/nodes/UnleashedSoftware/GenericFunctions.ts b/packages/nodes-base/nodes/UnleashedSoftware/GenericFunctions.ts index 510cc36b60..f519e307df 100644 --- a/packages/nodes-base/nodes/UnleashedSoftware/GenericFunctions.ts +++ b/packages/nodes-base/nodes/UnleashedSoftware/GenericFunctions.ts @@ -3,7 +3,6 @@ import type { OptionsWithUrl } from 'request'; import type { IDataObject, IExecuteFunctions, - IExecuteSingleFunctions, IHookFunctions, ILoadOptionsFunctions, JsonObject, @@ -15,7 +14,7 @@ import { createHmac } from 'crypto'; import qs from 'qs'; export async function unleashedApiRequest( - this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, + this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions, method: string, path: string, body: IDataObject = {}, diff --git a/packages/nodes-base/nodes/Uplead/GenericFunctions.ts b/packages/nodes-base/nodes/Uplead/GenericFunctions.ts index b18069ad2a..75cd656355 100644 --- a/packages/nodes-base/nodes/Uplead/GenericFunctions.ts +++ b/packages/nodes-base/nodes/Uplead/GenericFunctions.ts @@ -2,7 +2,6 @@ import type { OptionsWithUri } from 'request'; import type { IDataObject, IExecuteFunctions, - IExecuteSingleFunctions, IHookFunctions, ILoadOptionsFunctions, JsonObject, @@ -10,7 +9,7 @@ import type { import { NodeApiError } from 'n8n-workflow'; export async function upleadApiRequest( - this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, + this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions, method: string, resource: string, diff --git a/packages/nodes-base/nodes/Venafi/Datacenter/GenericFunctions.ts b/packages/nodes-base/nodes/Venafi/Datacenter/GenericFunctions.ts index 3e13b5099e..e7532e30bd 100644 --- a/packages/nodes-base/nodes/Venafi/Datacenter/GenericFunctions.ts +++ b/packages/nodes-base/nodes/Venafi/Datacenter/GenericFunctions.ts @@ -3,7 +3,6 @@ import type { OptionsWithUri } from 'request'; import type { IDataObject, IExecuteFunctions, - IExecuteSingleFunctions, ILoadOptionsFunctions, IPollFunctions, } from 'n8n-workflow'; @@ -11,7 +10,7 @@ import type { import get from 'lodash/get'; export async function venafiApiRequest( - this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions | IPollFunctions, + this: IExecuteFunctions | ILoadOptionsFunctions | IPollFunctions, method: string, resource: string, body: IDataObject = {}, diff --git a/packages/nodes-base/nodes/Venafi/ProtectCloud/GenericFunctions.ts b/packages/nodes-base/nodes/Venafi/ProtectCloud/GenericFunctions.ts index 0ea7ad50e8..f4a08a7279 100644 --- a/packages/nodes-base/nodes/Venafi/ProtectCloud/GenericFunctions.ts +++ b/packages/nodes-base/nodes/Venafi/ProtectCloud/GenericFunctions.ts @@ -2,7 +2,6 @@ import type { OptionsWithUri } from 'request'; import type { IExecuteFunctions, - IExecuteSingleFunctions, ILoadOptionsFunctions, IDataObject, IHookFunctions, @@ -15,7 +14,7 @@ import get from 'lodash/get'; import * as nacl_factory from 'js-nacl'; export async function venafiApiRequest( - this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions | IHookFunctions, + this: IExecuteFunctions | ILoadOptionsFunctions | IHookFunctions, method: string, resource: string, body = {}, diff --git a/packages/nodes-base/nodes/Vero/GenericFunctions.ts b/packages/nodes-base/nodes/Vero/GenericFunctions.ts index cb2b1a087f..822ff0409f 100644 --- a/packages/nodes-base/nodes/Vero/GenericFunctions.ts +++ b/packages/nodes-base/nodes/Vero/GenericFunctions.ts @@ -2,14 +2,13 @@ import type { OptionsWithUri } from 'request'; import type { IDataObject, IExecuteFunctions, - IExecuteSingleFunctions, ILoadOptionsFunctions, JsonObject, } from 'n8n-workflow'; import { NodeApiError } from 'n8n-workflow'; export async function veroApiRequest( - this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, + this: IExecuteFunctions | ILoadOptionsFunctions, method: string, resource: string, diff --git a/packages/nodes-base/nodes/Vonage/GenericFunctions.ts b/packages/nodes-base/nodes/Vonage/GenericFunctions.ts index b67d956f45..843bccc9ce 100644 --- a/packages/nodes-base/nodes/Vonage/GenericFunctions.ts +++ b/packages/nodes-base/nodes/Vonage/GenericFunctions.ts @@ -2,7 +2,6 @@ import type { OptionsWithUri } from 'request'; import type { IExecuteFunctions, - IExecuteSingleFunctions, ILoadOptionsFunctions, IDataObject, JsonObject, @@ -10,7 +9,7 @@ import type { import { NodeApiError } from 'n8n-workflow'; export async function vonageApiRequest( - this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, + this: IExecuteFunctions | ILoadOptionsFunctions, method: string, path: string, diff --git a/packages/nodes-base/nodes/WooCommerce/GenericFunctions.ts b/packages/nodes-base/nodes/WooCommerce/GenericFunctions.ts index db0f7626cd..4ee3c27866 100644 --- a/packages/nodes-base/nodes/WooCommerce/GenericFunctions.ts +++ b/packages/nodes-base/nodes/WooCommerce/GenericFunctions.ts @@ -4,7 +4,6 @@ import type { ICredentialDataDecryptedObject, IDataObject, IExecuteFunctions, - IExecuteSingleFunctions, IHookFunctions, ILoadOptionsFunctions, IWebhookFunctions, @@ -19,12 +18,7 @@ import { snakeCase } from 'change-case'; import omit from 'lodash/omit'; export async function woocommerceApiRequest( - this: - | IHookFunctions - | IExecuteFunctions - | IExecuteSingleFunctions - | ILoadOptionsFunctions - | IWebhookFunctions, + this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions | IWebhookFunctions, method: string, resource: string, diff --git a/packages/nodes-base/nodes/Wordpress/GenericFunctions.ts b/packages/nodes-base/nodes/Wordpress/GenericFunctions.ts index 5470a0724b..64f8f43282 100644 --- a/packages/nodes-base/nodes/Wordpress/GenericFunctions.ts +++ b/packages/nodes-base/nodes/Wordpress/GenericFunctions.ts @@ -2,7 +2,6 @@ import type { OptionsWithUri } from 'request'; import type { IExecuteFunctions, - IExecuteSingleFunctions, ILoadOptionsFunctions, IDataObject, JsonObject, @@ -10,7 +9,7 @@ import type { import { NodeApiError } from 'n8n-workflow'; export async function wordpressApiRequest( - this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, + this: IExecuteFunctions | ILoadOptionsFunctions, method: string, resource: string, diff --git a/packages/nodes-base/nodes/Workable/GenericFunctions.ts b/packages/nodes-base/nodes/Workable/GenericFunctions.ts index b0ac788890..f855a66f10 100644 --- a/packages/nodes-base/nodes/Workable/GenericFunctions.ts +++ b/packages/nodes-base/nodes/Workable/GenericFunctions.ts @@ -3,7 +3,6 @@ import type { OptionsWithUri } from 'request'; import type { IDataObject, IExecuteFunctions, - IExecuteSingleFunctions, IHookFunctions, ILoadOptionsFunctions, JsonObject, @@ -11,7 +10,7 @@ import type { import { NodeApiError } from 'n8n-workflow'; export async function workableApiRequest( - this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, + this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions, method: string, resource: string, diff --git a/packages/nodes-base/nodes/Wufoo/GenericFunctions.ts b/packages/nodes-base/nodes/Wufoo/GenericFunctions.ts index 2a58f899a7..025fc46710 100644 --- a/packages/nodes-base/nodes/Wufoo/GenericFunctions.ts +++ b/packages/nodes-base/nodes/Wufoo/GenericFunctions.ts @@ -3,13 +3,12 @@ import type { OptionsWithUri } from 'request'; import type { IDataObject, IExecuteFunctions, - IExecuteSingleFunctions, IHookFunctions, ILoadOptionsFunctions, } from 'n8n-workflow'; export async function wufooApiRequest( - this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, + this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions, method: string, resource: string, diff --git a/packages/nodes-base/nodes/Xero/GenericFunctions.ts b/packages/nodes-base/nodes/Xero/GenericFunctions.ts index 56a248827e..02037e9f68 100644 --- a/packages/nodes-base/nodes/Xero/GenericFunctions.ts +++ b/packages/nodes-base/nodes/Xero/GenericFunctions.ts @@ -2,7 +2,6 @@ import type { OptionsWithUri } from 'request'; import type { IExecuteFunctions, - IExecuteSingleFunctions, ILoadOptionsFunctions, IDataObject, JsonObject, @@ -10,7 +9,7 @@ import type { import { NodeApiError } from 'n8n-workflow'; export async function xeroApiRequest( - this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, + this: IExecuteFunctions | ILoadOptionsFunctions, method: string, resource: string, diff --git a/packages/nodes-base/nodes/Yourls/GenericFunctions.ts b/packages/nodes-base/nodes/Yourls/GenericFunctions.ts index 293d4842d2..2aba2cc599 100644 --- a/packages/nodes-base/nodes/Yourls/GenericFunctions.ts +++ b/packages/nodes-base/nodes/Yourls/GenericFunctions.ts @@ -2,7 +2,6 @@ import type { OptionsWithUri } from 'request'; import type { IExecuteFunctions, - IExecuteSingleFunctions, ILoadOptionsFunctions, IDataObject, JsonObject, @@ -10,7 +9,7 @@ import type { import { NodeApiError, NodeOperationError } from 'n8n-workflow'; export async function yourlsApiRequest( - this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, + this: IExecuteFunctions | ILoadOptionsFunctions, method: string, body: any = {}, diff --git a/packages/nodes-base/nodes/Zendesk/GenericFunctions.ts b/packages/nodes-base/nodes/Zendesk/GenericFunctions.ts index 4c5d26d55a..edc968f899 100644 --- a/packages/nodes-base/nodes/Zendesk/GenericFunctions.ts +++ b/packages/nodes-base/nodes/Zendesk/GenericFunctions.ts @@ -3,7 +3,6 @@ import type { OptionsWithUri } from 'request'; import type { IDataObject, IExecuteFunctions, - IExecuteSingleFunctions, IHookFunctions, ILoadOptionsFunctions, } from 'n8n-workflow'; @@ -17,7 +16,7 @@ function getUri(resource: string, subdomain: string) { } export async function zendeskApiRequest( - this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, + this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions, method: string, resource: string, diff --git a/packages/nodes-base/nodes/Zoom/GenericFunctions.ts b/packages/nodes-base/nodes/Zoom/GenericFunctions.ts index faa63161ed..156fb7f993 100644 --- a/packages/nodes-base/nodes/Zoom/GenericFunctions.ts +++ b/packages/nodes-base/nodes/Zoom/GenericFunctions.ts @@ -2,7 +2,6 @@ import type { OptionsWithUri } from 'request'; import type { IExecuteFunctions, - IExecuteSingleFunctions, ILoadOptionsFunctions, IDataObject, JsonObject, @@ -10,7 +9,7 @@ import type { import { NodeApiError } from 'n8n-workflow'; export async function zoomApiRequest( - this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, + this: IExecuteFunctions | ILoadOptionsFunctions, method: string, resource: string, body: object = {},