perf(tooling): Upgrade to TypeScript 4.8 (#4207)

* ⬆️ Upgrade to TypeScript 4.8 * 🔥 Remove unneeded setting * 📦 Update `package-lock.json` * ⏪ Restore `skipLibCheck` * 📦 Re-update `package-lock.json` * ♻️ Apply feedback * ♻️ Add check to new WhatsApp node * 📦 Update `package-lock.json` * Update package-lock.json * ran `npm run lintfix` Co-authored-by: कारतोफ्फेलस्क्रिप्ट™ <aditya@netroy.in>
n8n-io · Oct 5, 2022 · 9089dbe · 9089dbe
1 parent cc2a2e4
commit 9089dbe
Show file tree

Hide file tree

Showing 39 changed files with 37,651 additions and 27,520 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -101,7 +101,7 @@
     "supertest": "^6.2.2",
     "ts-jest": "^27.1.3",
     "ts-node": "^8.9.1",
-    "typescript": "~4.6.0"
+    "typescript": "~4.8.0"
   },
   "dependencies": {
     "@oclif/command": "^1.5.18",

diff --git a/packages/cli/src/Db.ts b/packages/cli/src/Db.ts
@@ -13,6 +13,7 @@ import {
 	EntityTarget,
 	getRepository,
 	LoggerOptions,
+	ObjectLiteral,
 	Repository,
 } from 'typeorm';
 import { TlsOptions } from 'tls';
@@ -38,7 +39,9 @@ export async function transaction<T>(fn: (entityManager: EntityManager) => Promi
 	return connection.transaction(fn);
 }
 
-export function linkRepository<Entity>(entityClass: EntityTarget<Entity>): Repository<Entity> {
+export function linkRepository<Entity extends ObjectLiteral>(
+	entityClass: EntityTarget<Entity>,
+): Repository<Entity> {
 	return getRepository(entityClass, connection.name);
 }
 
@@ -183,9 +186,12 @@ export async function init(
 		}
 	}
 
+	// @ts-ignore
 	collections.Credentials = linkRepository(entities.CredentialsEntity);
+	// @ts-ignore
 	collections.Execution = linkRepository(entities.ExecutionEntity);
 	collections.Workflow = linkRepository(entities.WorkflowEntity);
+	// @ts-ignore
 	collections.Webhook = linkRepository(entities.WebhookEntity);
 	collections.Tag = linkRepository(entities.TagEntity);
 

diff --git a/packages/cli/src/PublicApi/v1/handlers/workflows/workflows.handler.ts b/packages/cli/src/PublicApi/v1/handlers/workflows/workflows.handler.ts
@@ -1,6 +1,6 @@
 import express from 'express';
 
-import { FindManyOptions, In } from 'typeorm';
+import { FindManyOptions, In, ObjectLiteral } from 'typeorm';
 
 import { ActiveWorkflowRunner, Db } from '../../../..';
 import config = require('../../../../../config');
@@ -110,7 +110,7 @@ export = {
 			let workflows: WorkflowEntity[];
 			let count: number;
 
-			const query: FindManyOptions<WorkflowEntity> = {
+			const query: FindManyOptions<WorkflowEntity> & { where: ObjectLiteral } = {
 				skip: offset,
 				take: limit,
 				where: {

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -40,7 +40,7 @@
     "jest": "^27.4.7",
     "source-map-support": "^0.5.9",
     "ts-jest": "^27.1.3",
-    "typescript": "~4.6.0"
+    "typescript": "~4.8.0"
   },
   "dependencies": {
     "axios": "^0.21.1",

diff --git a/packages/core/src/NodeExecuteFunctions.ts b/packages/core/src/NodeExecuteFunctions.ts
@@ -964,18 +964,16 @@ export async function requestOAuth2(
 	// Signs the request by adding authorization headers or query parameters depending
 	// on the token-type used.
 	const newRequestOptions = token.sign(requestOptions as clientOAuth2.RequestObject);
+	const newRequestHeaders = (newRequestOptions.headers = newRequestOptions.headers ?? {});
 	// If keep bearer is false remove the it from the authorization header
 	if (oAuth2Options?.keepBearer === false) {
-		// @ts-ignore
-		newRequestOptions?.headers?.Authorization =
+		newRequestHeaders.Authorization =
 			// @ts-ignore
-			newRequestOptions?.headers?.Authorization.split(' ')[1];
+			newRequestHeaders.Authorization.split(' ')[1];
 	}
 
-	// @ts-ignore
 	if (oAuth2Options?.keyToIncludeInAccessTokenHeader) {
-		Object.assign(newRequestOptions.headers, {
-			// @ts-ignore
+		Object.assign(newRequestHeaders, {
 			[oAuth2Options.keyToIncludeInAccessTokenHeader]: token.accessToken,
 		});
 	}
@@ -1030,10 +1028,8 @@ export async function requestOAuth2(
 				);
 				const refreshedRequestOption = newToken.sign(requestOptions as clientOAuth2.RequestObject);
 
-				// @ts-ignore
 				if (oAuth2Options?.keyToIncludeInAccessTokenHeader) {
-					Object.assign(newRequestOptions.headers, {
-						// @ts-ignore
+					Object.assign(newRequestHeaders, {
 						[oAuth2Options.keyToIncludeInAccessTokenHeader]: token.accessToken,
 					});
 				}
@@ -1108,6 +1104,7 @@ export async function requestOAuth2(
 
 			// Make the request again with the new token
 			const newRequestOptions = newToken.sign(requestOptions as clientOAuth2.RequestObject);
+			newRequestOptions.headers = newRequestOptions.headers ?? {};
 
 			// @ts-ignore
 			if (oAuth2Options?.keyToIncludeInAccessTokenHeader) {

diff --git a/packages/core/src/UserSettings.ts b/packages/core/src/UserSettings.ts
@@ -74,7 +74,7 @@ export async function prepareUserSettings(): Promise<IUserSettings> {
 
 export async function getEncryptionKey(): Promise<string> {
 	if (process.env[ENCRYPTION_KEY_ENV_OVERWRITE] !== undefined) {
-		return process.env[ENCRYPTION_KEY_ENV_OVERWRITE] as string;
+		return process.env[ENCRYPTION_KEY_ENV_OVERWRITE];
 	}
 
 	const userSettings = await getUserSettings();
@@ -233,7 +233,7 @@ export function getUserSettingsPath(): string {
 export function getUserN8nFolderPath(): string {
 	let userFolder;
 	if (process.env[USER_FOLDER_ENV_OVERWRITE] !== undefined) {
-		userFolder = process.env[USER_FOLDER_ENV_OVERWRITE] as string;
+		userFolder = process.env[USER_FOLDER_ENV_OVERWRITE];
 	} else {
 		userFolder = getUserHome();
 	}

diff --git a/packages/core/test/Helpers.ts b/packages/core/test/Helpers.ts
@@ -43,8 +43,7 @@ export class CredentialsHelper extends ICredentialsHelper {
 		credentialsExpired: boolean,
 	): Promise<ICredentialDataDecryptedObject | undefined> {
 		return undefined;
-	};
-
+	}
 
 	getParentTypes(name: string): string[] {
 		return [];

diff --git a/packages/design-system/package.json b/packages/design-system/package.json
@@ -60,7 +60,7 @@
     "storybook-addon-designs": "^6.3.1",
     "storybook-addon-themes": "^6.1.0",
     "trim": ">=0.0.3",
-    "typescript": "~4.6.0",
+    "typescript": "~4.8.0",
     "vite": "2.9.5",
     "vite-plugin-vue2": "1.9.3",
     "vitest": "0.9.3",

diff --git a/packages/editor-ui/package.json b/packages/editor-ui/package.json
@@ -95,7 +95,7 @@
     "sass-loader": "^8.0.2",
     "string-template-parser": "^1.2.6",
     "tslint": "^6.1.2",
-    "typescript": "~4.6.0",
+    "typescript": "~4.8.0",
     "vite": "2.9",
     "vite-plugin-html": "^3.2.0",
     "vite-plugin-monaco-editor": "^1.0.10",

diff --git a/packages/node-dev/package.json b/packages/node-dev/package.json
@@ -66,6 +66,6 @@
     "replace-in-file": "^6.0.0",
     "request": "^2.88.2",
     "tmp-promise": "^3.0.2",
-    "typescript": "~4.6.0"
+    "typescript": "~4.8.0"
   }
 }
diff --git a/packages/nodes-base/credentials/PushoverApi.credentials.ts b/packages/nodes-base/credentials/PushoverApi.credentials.ts
@@ -22,9 +22,9 @@ export class PushoverApi implements ICredentialType {
 		credentials: ICredentialDataDecryptedObject,
 		requestOptions: IHttpRequestOptions,
 	): Promise<IHttpRequestOptions> {
-		if (requestOptions.method === 'GET') {
+		if (requestOptions.method === 'GET' && requestOptions.qs) {
 			Object.assign(requestOptions.qs, { token: credentials.apiKey });
-		} else {
+		} else if (requestOptions.body) {
 			Object.assign(requestOptions.body, { token: credentials.apiKey });
 		}
 		return requestOptions;

diff --git a/packages/nodes-base/credentials/WooCommerceApi.credentials.ts b/packages/nodes-base/credentials/WooCommerceApi.credentials.ts
@@ -48,7 +48,7 @@ export class WooCommerceApi implements ICredentialType {
 			user: credentials.consumerKey as string,
 			password: credentials.consumerSecret as string,
 		};
-		if (credentials.includeCredentialsInQuery === true) {
+		if (credentials.includeCredentialsInQuery === true && requestOptions.qs) {
 			delete requestOptions.auth;
 			Object.assign(requestOptions.qs, {
 				consumer_key: credentials.consumerKey,

diff --git a/packages/nodes-base/nodes/ActionNetwork/ActionNetwork.node.ts b/packages/nodes-base/nodes/ActionNetwork/ActionNetwork.node.ts
@@ -235,7 +235,7 @@ export class ActionNetwork implements INodeType {
 
 						const additionalFields = this.getNodeParameter('additionalFields', i) as IDataObject;
 
-						if (Object.keys(additionalFields).length) {
+						if (Object.keys(additionalFields).length && body.person) {
 							Object.assign(body.person, adjustPersonPayload(additionalFields));
 						}
 

diff --git a/packages/nodes-base/nodes/Aws/S3/AwsS3.node.ts b/packages/nodes-base/nodes/Aws/S3/AwsS3.node.ts
@@ -599,7 +599,7 @@ export class AwsS3 implements INodeType {
 							binary: {},
 						};
 
-						if (items[i].binary !== undefined) {
+						if (items[i].binary !== undefined && newItem.binary) {
 							// Create a shallow copy of the binary data so that the old
 							// data references which do not get changed still stay behind
 							// but the incoming data does not get changed.

diff --git a/packages/nodes-base/nodes/Aws/Transcribe/AwsTranscribe.node.ts b/packages/nodes-base/nodes/Aws/Transcribe/AwsTranscribe.node.ts
@@ -382,42 +382,44 @@ export class AwsTranscribe implements INodeType {
 							body.LanguageCode = this.getNodeParameter('languageCode', i) as string;
 						}
 
-						if (options.channelIdentification) {
-							Object.assign(body.Settings, {
-								ChannelIdentification: options.channelIdentification,
-							});
-						}
+						if (body.Settings) {
+							if (options.channelIdentification) {
+								Object.assign(body.Settings, {
+									ChannelIdentification: options.channelIdentification,
+								});
+							}
 
-						if (options.maxAlternatives) {
-							Object.assign(body.Settings, {
-								ShowAlternatives: true,
-								MaxAlternatives: options.maxAlternatives,
-							});
-						}
+							if (options.maxAlternatives) {
+								Object.assign(body.Settings, {
+									ShowAlternatives: true,
+									MaxAlternatives: options.maxAlternatives,
+								});
+							}
 
-						if (options.maxSpeakerLabels) {
-							Object.assign(body.Settings, {
-								ShowSpeakerLabels: true,
-								MaxSpeakerLabels: options.maxSpeakerLabels,
-							});
-						}
+							if (options.maxSpeakerLabels) {
+								Object.assign(body.Settings, {
+									ShowSpeakerLabels: true,
+									MaxSpeakerLabels: options.maxSpeakerLabels,
+								});
+							}
 
-						if (options.vocabularyName) {
-							Object.assign(body.Settings, {
-								VocabularyName: options.vocabularyName,
-							});
-						}
+							if (options.vocabularyName) {
+								Object.assign(body.Settings, {
+									VocabularyName: options.vocabularyName,
+								});
+							}
 
-						if (options.vocabularyFilterName) {
-							Object.assign(body.Settings, {
-								VocabularyFilterName: options.vocabularyFilterName,
-							});
-						}
+							if (options.vocabularyFilterName) {
+								Object.assign(body.Settings, {
+									VocabularyFilterName: options.vocabularyFilterName,
+								});
+							}
 
-						if (options.vocabularyFilterMethod) {
-							Object.assign(body.Settings, {
-								VocabularyFilterMethod: options.vocabularyFilterMethod,
-							});
+							if (options.vocabularyFilterMethod) {
+								Object.assign(body.Settings, {
+									VocabularyFilterMethod: options.vocabularyFilterMethod,
+								});
+							}
 						}
 
 						const action = 'Transcribe.StartTranscriptionJob';

diff --git a/packages/nodes-base/nodes/BambooHr/v1/actions/companyReport/get/execute.ts b/packages/nodes-base/nodes/BambooHr/v1/actions/companyReport/get/execute.ts
@@ -53,7 +53,7 @@ export async function get(this: IExecuteFunctions, index: number) {
 		binary: {},
 	};
 
-	if (items[index].binary !== undefined) {
+	if (items[index].binary !== undefined && newItem.binary) {
 		// Create a shallow copy of the binary data so that the old
 		// data references which do not get changed still stay behind
 		// but the incoming data does not get changed.

diff --git a/packages/nodes-base/nodes/BambooHr/v1/actions/employeeDocument/download/execute.ts b/packages/nodes-base/nodes/BambooHr/v1/actions/employeeDocument/download/execute.ts
@@ -40,7 +40,7 @@ export async function download(this: IExecuteFunctions, index: number) {
 		binary: {},
 	};
 
-	if (items[index].binary !== undefined) {
+	if (items[index].binary !== undefined && newItem.binary) {
 		// Create a shallow copy of the binary data so that the old
 		// data references which do not get changed still stay behind
 		// but the incoming data does not get changed.

diff --git a/packages/nodes-base/nodes/BambooHr/v1/actions/employeeDocument/upload/execute.ts b/packages/nodes-base/nodes/BambooHr/v1/actions/employeeDocument/upload/execute.ts
@@ -53,7 +53,7 @@ export async function upload(this: IExecuteFunctions, index: number) {
 		resolveWithFullResponse: true,
 	};
 
-	if (options.hasOwnProperty('share')) {
+	if (options.hasOwnProperty('share') && body.formData) {
 		Object.assign(body.formData, options.share ? { share: 'yes' } : { share: 'no' });
 	}
 	//endpoint

diff --git a/packages/nodes-base/nodes/BambooHr/v1/actions/file/download/execute.ts b/packages/nodes-base/nodes/BambooHr/v1/actions/file/download/execute.ts
@@ -40,7 +40,7 @@ export async function download(this: IExecuteFunctions, index: number) {
 		binary: {},
 	};
 
-	if (items[index].binary !== undefined) {
+	if (items[index].binary !== undefined && newItem.binary) {
 		// Create a shallow copy of the binary data so that the old
 		// data references which do not get changed still stay behind
 		// but the incoming data does not get changed.

diff --git a/packages/nodes-base/nodes/BambooHr/v1/actions/file/upload/execute.ts b/packages/nodes-base/nodes/BambooHr/v1/actions/file/upload/execute.ts
@@ -51,7 +51,9 @@ export async function upload(this: IExecuteFunctions, index: number) {
 		resolveWithFullResponse: true,
 	};
 
-	Object.assign(body.formData, share ? { share: 'yes' } : { share: 'no' });
+	if (body.formData) {
+		Object.assign(body.formData, share ? { share: 'yes' } : { share: 'no' });
+	}
 
 	//endpoint
 	const endpoint = `files`;

diff --git a/packages/nodes-base/nodes/EditImage/EditImage.node.ts b/packages/nodes-base/nodes/EditImage/EditImage.node.ts
@@ -1262,7 +1262,7 @@ export class EditImage implements INodeType {
 					}
 				}
 
-				if (item.binary !== undefined) {
+				if (item.binary !== undefined && newItem.binary) {
 					// Create a shallow copy of the binary data so that the old
 					// data references which do not get changed still stay behind
 					// but the incoming data does not get changed.

diff --git a/packages/nodes-base/nodes/Ftp/Ftp.node.ts b/packages/nodes-base/nodes/Ftp/Ftp.node.ts
@@ -456,7 +456,7 @@ export class Ftp implements INodeType {
 					binary: {},
 				};
 
-				if (items[i].binary !== undefined) {
+				if (items[i].binary !== undefined && newItem.binary) {
 					// Create a shallow copy of the binary data so that the old
 					// data references which do not get changed still stay behind
 					// but the incoming data does not get changed.

diff --git a/packages/nodes-base/nodes/HomeAssistant/HomeAssistant.node.ts b/packages/nodes-base/nodes/HomeAssistant/HomeAssistant.node.ts
@@ -422,7 +422,7 @@ export class HomeAssistant implements INodeType {
 							mimeType = responseData.headers['content-type'];
 						}
 
-						if (items[i].binary !== undefined) {
+						if (items[i].binary !== undefined && newItem.binary) {
 							// Create a shallow copy of the binary data so that the old
 							// data references which do not get changed still stay behind
 							// but the incoming data does not get changed.

diff --git a/packages/nodes-base/nodes/Metabase/QuestionsDescription.ts b/packages/nodes-base/nodes/Metabase/QuestionsDescription.ts
@@ -69,7 +69,7 @@ export const questionsOperations: INodeProperties[] = [
 										binary: {},
 									};
 
-									if (items[i].binary !== undefined) {
+									if (items[i].binary !== undefined && newItem.binary) {
 										Object.assign(newItem.binary, items[i].binary);
 									}
 									items[i] = newItem;

diff --git a/packages/nodes-base/nodes/Postmark/GenericFunctions.ts b/packages/nodes-base/nodes/Postmark/GenericFunctions.ts
@@ -32,7 +32,7 @@ export async function postmarkApiRequest(
 		uri: 'https://api.postmarkapp.com' + endpoint,
 		json: true,
 	};
-	if (body === {}) {
+	if (Object.keys(body).length === 0) {
 		delete options.body;
 	}
 	options = Object.assign({}, options, option);

diff --git a/packages/nodes-base/nodes/ReadBinaryFile/ReadBinaryFile.node.ts b/packages/nodes-base/nodes/ReadBinaryFile/ReadBinaryFile.node.ts
@@ -78,7 +78,7 @@ export class ReadBinaryFile implements INodeType {
 					},
 				};
 
-				if (item.binary !== undefined) {
+				if (item.binary !== undefined && newItem.binary) {
 					// Create a shallow copy of the binary data so that the old
 					// data references which do not get changed still stay behind
 					// but the incoming data does not get changed.

diff --git a/packages/nodes-base/nodes/SecurityScorecard/SecurityScorecard.node.ts b/packages/nodes-base/nodes/SecurityScorecard/SecurityScorecard.node.ts
@@ -233,7 +233,7 @@ export class SecurityScorecard implements INodeType {
 						binary: {},
 					};
 
-					if (items[i].binary !== undefined) {
+					if (items[i].binary !== undefined && newItem.binary) {
 						// Create a shallow copy of the binary data so that the old
 						// data references which do not get changed still stay behind
 						// but the incoming data does not get changed.

diff --git a/packages/nodes-base/nodes/Ssh/Ssh.node.ts b/packages/nodes-base/nodes/Ssh/Ssh.node.ts
@@ -323,7 +323,7 @@ export class Ssh implements INodeType {
 								},
 							};
 
-							if (items[i].binary !== undefined) {
+							if (items[i].binary !== undefined && newItem.binary) {
 								// Create a shallow copy of the binary data so that the old
 								// data references which do not get changed still stay behind
 								// but the incoming data does not get changed.