From c63f365a658031fcb51202f062fe3e66885f9058 Mon Sep 17 00:00:00 2001
From: Arpad Gabor <hello@arpadgabor.com>
Date: Sat, 23 Oct 2021 18:38:46 +0300
Subject: [PATCH 01/16] feat: replace function node code editor with monaco

---
 packages/editor-ui/package.json               |   4 +-
 .../editor-ui/src/components/CodeEdit.vue     | 128 ++++++++++++------
 .../src/components/ParameterInput.vue         |   4 +-
 packages/editor-ui/vue.config.js              |   5 +
 4 files changed, 97 insertions(+), 44 deletions(-)

diff --git a/packages/editor-ui/package.json b/packages/editor-ui/package.json
index 2f381b5740..69eb7c1521 100644
--- a/packages/editor-ui/package.json
+++ b/packages/editor-ui/package.json
@@ -27,6 +27,7 @@
   "dependencies": {
     "@fontsource/open-sans": "^4.5.0",
     "n8n-design-system": "~0.5.0",
+    "monaco-editor": "^0.29.1",
     "timeago.js": "^4.0.2",
     "v-click-outside": "^3.1.2",
     "vue-fragment": "^1.5.2"
@@ -72,11 +73,12 @@
     "lodash.get": "^4.4.2",
     "lodash.set": "^4.3.2",
     "n8n-workflow": "~0.73.0",
-    "sass": "^1.26.5",
+    "monaco-editor-webpack-plugin": "^5.0.0",
     "normalize-wheel": "^1.0.1",
     "prismjs": "^1.17.1",
     "quill": "^2.0.0-dev.3",
     "quill-autoformat": "^0.1.1",
+    "sass": "^1.26.5",
     "sass-loader": "^8.0.2",
     "string-template-parser": "^1.2.6",
     "ts-jest": "^26.3.0",
diff --git a/packages/editor-ui/src/components/CodeEdit.vue b/packages/editor-ui/src/components/CodeEdit.vue
index fb1c02521d..85c7cc1c25 100644
--- a/packages/editor-ui/src/components/CodeEdit.vue
+++ b/packages/editor-ui/src/components/CodeEdit.vue
@@ -1,61 +1,107 @@
 <template>
-	<div v-if="dialogVisible">
-		<el-dialog :visible="dialogVisible" append-to-body :close-on-click-modal="false" width="80%" :title="`Edit ${parameter.displayName}`" :before-close="closeDialog">
-			<div class="text-editor-wrapper ignore-key-press">
-				<div class="editor-description">
-					{{parameter.displayName}}:
-				</div>
-				<div class="text-editor" @keydown.stop>
-					<prism-editor :lineNumbers="true" :code="value" :readonly="isReadOnly" @change="valueChanged" language="js"></prism-editor>
-				</div>
-			</div>
-		</el-dialog>
-	</div>
+	<el-dialog
+		visible
+		append-to-body
+		:close-on-click-modal="false"
+		width="80%"
+		:title="`Edit ${parameter.displayName}`"
+		:before-close="closeDialog"
+	>
+		<div class="text-editor-wrapper ignore-key-press">
+			<div ref="code" class="text-editor" @keydown.stop></div>
+		</div>
+	</el-dialog>
 </template>
 
 <script lang="ts">
 // @ts-ignore
-import PrismEditor from 'vue-prism-editor';
+// import PrismEditor from 'vue-prism-editor';
+import * as monaco from 'monaco-editor/esm/vs/editor/editor.api';
 
 import { genericHelpers } from '@/components/mixins/genericHelpers';
 
 import mixins from 'vue-typed-mixins';
+import { IExecutionResponse } from '@/Interface';
+import { INodeExecutionData } from 'n8n-workflow';
 
-export default mixins(
-	genericHelpers,
-)
-	.extend({
-		name: 'CodeEdit',
-		props: [
-			'dialogVisible',
-			'parameter',
-			'value',
-		],
-		components: {
-			PrismEditor,
+export default mixins(genericHelpers).extend({
+	name: 'CodeEdit',
+	props: ['dialogVisible', 'parameter', 'value'],
+	data() {
+		return {
+			monacoInstance: null as monaco.editor.IStandaloneCodeEditor | null,
+			monacoLibrary: null as monaco.IDisposable | null,
+		};
+	},
+	mounted() {
+		setTimeout(this.loadEditor);
+	},
+	destroyed() {
+		this.monacoLibrary!.dispose();
+	},
+	methods: {
+		closeDialog() {
+			// Handle the close externally as the visible parameter is an external prop
+			// and is so not allowed to be changed here.
+			this.$emit('closeDialog');
+			return false;
 		},
-		data () {
-			return {
-			};
-		},
-		methods: {
-			valueChanged (value: string) {
-				this.$emit('valueChanged', value);
-			},
 
-			closeDialog () {
-				// Handle the close externally as the visible parameter is an external prop
-				// and is so not allowed to be changed here.
-				this.$emit('closeDialog');
-				return false;
-			},
+		loadEditor() {
+			if (!this.$refs.code) return;
+
+			this.monacoInstance = monaco.editor.create(this.$refs.code as HTMLElement, {
+				value: this.value,
+				language: 'javascript',
+				tabSize: 2,
+			});
+
+			this.monacoInstance.onDidChangeModelContent((ev) => {
+				if (this.monacoInstance) {
+					const model = this.monacoInstance.getModel();
+					if (model) {
+						this.$emit('valueChanged', model.getValue());
+					}
+				}
+			});
+
+			this.loadAutocompleteData();
 		},
-	});
+
+		loadAutocompleteData(): void {
+			const executedWorkflow: IExecutionResponse | null = this.$store.getters.getWorkflowExecution;
+
+			let autocompleteData: INodeExecutionData[] = [{ json: { myNewField: 2 } }];
+
+			if (executedWorkflow) {
+				const lastNodeExecuted = executedWorkflow.data.resultData.lastNodeExecuted;
+
+				if (lastNodeExecuted) {
+					const data = executedWorkflow.data.resultData.runData[lastNodeExecuted];
+
+					// @ts-ignore
+					autocompleteData = data[0].data!.main[0];
+				}
+			}
+
+			this.monacoLibrary = monaco.languages.typescript.javascriptDefaults.addExtraLib(
+				[
+					`/**\n\`\`\`\nconst items = ${JSON.stringify(autocompleteData, null, 2)}\n\`\`\`\n*/`,
+					`const items = ${JSON.stringify(autocompleteData)}`,
+				].join('\n'),
+			);
+		},
+	},
+});
 </script>
 
 <style scoped>
 .editor-description {
 	font-weight: bold;
-	padding: 0 0 0.5em 0.2em;;
+	padding: 0 0 0.5em 0.2em;
+}
+
+.text-editor {
+	min-height: 30rem;
 }
 </style>
diff --git a/packages/editor-ui/src/components/ParameterInput.vue b/packages/editor-ui/src/components/ParameterInput.vue
index 5ea58f5f4c..30008448ad 100644
--- a/packages/editor-ui/src/components/ParameterInput.vue
+++ b/packages/editor-ui/src/components/ParameterInput.vue
@@ -13,7 +13,7 @@
 		/>
 
 		<div v-else-if="['json', 'string'].includes(parameter.type) || remoteParameterOptionsLoadingIssues !== null">
-			<code-edit :dialogVisible="codeEditDialogVisible" :value="value" :parameter="parameter" @closeDialog="closeCodeEditDialog" @valueChanged="expressionUpdated"></code-edit>
+			<code-edit v-if="codeEditDialogVisible" :value="value" :parameter="parameter" @closeDialog="closeCodeEditDialog" @valueChanged="expressionUpdated"></code-edit>
 			<text-edit :dialogVisible="textEditDialogVisible" :value="value" :parameter="parameter" @closeDialog="closeTextEditDialog" @valueChanged="expressionUpdated"></text-edit>
 
 			<div v-if="isEditor === true" class="clickable" @click="displayEditDialog()">
@@ -597,7 +597,7 @@ export default mixins(
 						parameter_field_type: this.parameter.type,
 						new_expression: !this.isValueExpression,
 						workflow_id: this.$store.getters.workflowId,
-					});	
+					});
 				}
 			},
 			closeTextEditDialog () {
diff --git a/packages/editor-ui/vue.config.js b/packages/editor-ui/vue.config.js
index d1233395fe..ef36eb00bc 100644
--- a/packages/editor-ui/vue.config.js
+++ b/packages/editor-ui/vue.config.js
@@ -1,3 +1,5 @@
+const MonacoWebpackPlugin = require('monaco-editor-webpack-plugin');
+
 module.exports = {
 	chainWebpack: config => config.resolve.symlinks(false),
 	// transpileDependencies: [
@@ -13,6 +15,9 @@ module.exports = {
 		devServer: {
 			disableHostCheck: true,
 		},
+		plugins: [
+			new MonacoWebpackPlugin(),
+		],
 	},
 	css: {
 		loaderOptions: {

From 7a020d079fa564f895564c14339df2617ce470f5 Mon Sep 17 00:00:00 2001
From: Arpad Gabor <hello@arpadgabor.com>
Date: Sat, 23 Oct 2021 18:39:34 +0300
Subject: [PATCH 02/16] fix: set autocomplete data as empty array

---
 packages/editor-ui/src/components/CodeEdit.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/editor-ui/src/components/CodeEdit.vue b/packages/editor-ui/src/components/CodeEdit.vue
index 85c7cc1c25..b3cfac943e 100644
--- a/packages/editor-ui/src/components/CodeEdit.vue
+++ b/packages/editor-ui/src/components/CodeEdit.vue
@@ -71,7 +71,7 @@ export default mixins(genericHelpers).extend({
 		loadAutocompleteData(): void {
 			const executedWorkflow: IExecutionResponse | null = this.$store.getters.getWorkflowExecution;
 
-			let autocompleteData: INodeExecutionData[] = [{ json: { myNewField: 2 } }];
+			let autocompleteData: INodeExecutionData[] = [];
 
 			if (executedWorkflow) {
 				const lastNodeExecuted = executedWorkflow.data.resultData.lastNodeExecuted;

From 62f0899e100b11ba45509df796c1c5d342b1c78d Mon Sep 17 00:00:00 2001
From: Arpad Gabor <hello@arpadgabor.com>
Date: Sat, 23 Oct 2021 18:48:45 +0300
Subject: [PATCH 03/16] fix: forgot readonly to editor

---
 packages/editor-ui/src/components/CodeEdit.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/editor-ui/src/components/CodeEdit.vue b/packages/editor-ui/src/components/CodeEdit.vue
index b3cfac943e..3a32ed7862 100644
--- a/packages/editor-ui/src/components/CodeEdit.vue
+++ b/packages/editor-ui/src/components/CodeEdit.vue
@@ -54,6 +54,7 @@ export default mixins(genericHelpers).extend({
 				value: this.value,
 				language: 'javascript',
 				tabSize: 2,
+				readOnly: this.isReadOnly,
 			});
 
 			this.monacoInstance.onDidChangeModelContent((ev) => {

From f811992527e15aa310fcef1603a69776adff6a7c Mon Sep 17 00:00:00 2001
From: Arpad Gabor <hello@arpadgabor.com>
Date: Sat, 23 Oct 2021 19:06:02 +0300
Subject: [PATCH 04/16] fix: monaco build problems

---
 packages/editor-ui/src/components/CodeEdit.vue | 11 +++++------
 packages/editor-ui/vue.config.js               |  4 ++--
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/packages/editor-ui/src/components/CodeEdit.vue b/packages/editor-ui/src/components/CodeEdit.vue
index 3a32ed7862..b5bfd9a94e 100644
--- a/packages/editor-ui/src/components/CodeEdit.vue
+++ b/packages/editor-ui/src/components/CodeEdit.vue
@@ -57,12 +57,11 @@ export default mixins(genericHelpers).extend({
 				readOnly: this.isReadOnly,
 			});
 
-			this.monacoInstance.onDidChangeModelContent((ev) => {
-				if (this.monacoInstance) {
-					const model = this.monacoInstance.getModel();
-					if (model) {
-						this.$emit('valueChanged', model.getValue());
-					}
+			this.monacoInstance.onDidChangeModelContent(() => {
+				const model = this.monacoInstance!.getModel();
+
+				if (model) {
+					this.$emit('valueChanged', model.getValue());
 				}
 			});
 
diff --git a/packages/editor-ui/vue.config.js b/packages/editor-ui/vue.config.js
index ef36eb00bc..6f2e10804c 100644
--- a/packages/editor-ui/vue.config.js
+++ b/packages/editor-ui/vue.config.js
@@ -16,7 +16,7 @@ module.exports = {
 			disableHostCheck: true,
 		},
 		plugins: [
-			new MonacoWebpackPlugin(),
+			new MonacoWebpackPlugin({ languages: ['javascript', 'html', 'typescript'] }),
 		],
 	},
 	css: {
@@ -28,5 +28,5 @@ module.exports = {
 			},
 		},
 	},
-	publicPath: process.env.VUE_APP_PUBLIC_PATH ? process.env.VUE_APP_PUBLIC_PATH : '/',
+	publicPath: process.env.VUE_APP_PUBLIC_PATH && process.env.VUE_APP_PUBLIC_PATH !== '/%BASE_PATH%/' ? process.env.VUE_APP_PUBLIC_PATH : '/',
 };

From 5fa004dbc6b4d5ef2f47626ce96a085ca2c137eb Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Sat, 4 Dec 2021 10:36:21 +0100
Subject: [PATCH 05/16] :zap: Fix build issues

---
 packages/cli/src/telemetry/index.ts | 2 ++
 packages/cli/tsconfig.json          | 1 +
 2 files changed, 3 insertions(+)

diff --git a/packages/cli/src/telemetry/index.ts b/packages/cli/src/telemetry/index.ts
index fb38ed257d..105b4ac123 100644
--- a/packages/cli/src/telemetry/index.ts
+++ b/packages/cli/src/telemetry/index.ts
@@ -135,10 +135,12 @@ export class Telemetry {
 	async track(eventName: string, properties?: IDataObject): Promise<void> {
 		return new Promise<void>((resolve) => {
 			if (this.client) {
+				// @ts-ignore
 				this.client.track(
 					{
 						userId: this.instanceId,
 						event: eventName,
+						// @ts-ignore
 						properties,
 					},
 					resolve,
diff --git a/packages/cli/tsconfig.json b/packages/cli/tsconfig.json
index aa44bc610f..a603b7e8d0 100644
--- a/packages/cli/tsconfig.json
+++ b/packages/cli/tsconfig.json
@@ -11,6 +11,7 @@
 		"module": "commonjs",
 		"noImplicitAny": true,
 		"removeComments": true,
+		"skipLibCheck": true,
 		"strictNullChecks": true,
 		"forceConsistentCasingInFileNames": true,
 		"noImplicitReturns": true,

From 291c5154c61be8bd052d221f5b5c311562a8bcd2 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Mon, 20 Dec 2021 23:41:45 +0100
Subject: [PATCH 06/16] :zap: Change background color and add $json
 autocomplete

---
 .../editor-ui/src/components/CodeEdit.vue     | 26 ++++++++++++++-----
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/packages/editor-ui/src/components/CodeEdit.vue b/packages/editor-ui/src/components/CodeEdit.vue
index bc4ac6fb45..990d04123d 100644
--- a/packages/editor-ui/src/components/CodeEdit.vue
+++ b/packages/editor-ui/src/components/CodeEdit.vue
@@ -14,8 +14,6 @@
 </template>
 
 <script lang="ts">
-// @ts-ignore
-// import PrismEditor from 'vue-prism-editor';
 import * as monaco from 'monaco-editor/esm/vs/editor/editor.api';
 
 import { genericHelpers } from '@/components/mixins/genericHelpers';
@@ -57,6 +55,16 @@ export default mixins(genericHelpers).extend({
 				readOnly: this.isReadOnly,
 			});
 
+			monaco.editor.defineTheme('myTheme', {
+				base: 'vs',
+				inherit: true,
+				rules: [{ background: 'f5f2f0' }],
+				colors: {
+					'editor.background': '#f5f2f0',
+				},
+			});
+			monaco.editor.setTheme('myTheme');
+
 			this.monacoInstance.onDidChangeModelContent(() => {
 				const model = this.monacoInstance!.getModel();
 
@@ -84,11 +92,17 @@ export default mixins(genericHelpers).extend({
 				}
 			}
 
+			const autoCompleteItems = [
+				`/**\n\`\`\`\nconst items = ${JSON.stringify(autocompleteData, null, 2)}\n\`\`\`\n*/`,
+				`const items = ${JSON.stringify(autocompleteData)}`,
+			];
+
+			if (autocompleteData.length) {
+				autoCompleteItems.push(`const $json = ${JSON.stringify(autocompleteData[0].json)}`);
+			}
+
 			this.monacoLibrary = monaco.languages.typescript.javascriptDefaults.addExtraLib(
-				[
-					`/**\n\`\`\`\nconst items = ${JSON.stringify(autocompleteData, null, 2)}\n\`\`\`\n*/`,
-					`const items = ${JSON.stringify(autocompleteData)}`,
-				].join('\n'),
+				autoCompleteItems.join('\n'),
 			);
 		},
 	},

From c62225c86672e89ad32d0408cb65a1f973269bed Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Mon, 20 Dec 2021 23:51:04 +0100
Subject: [PATCH 07/16] :zap: Fix syntax error and disable minimap

---
 packages/editor-ui/src/components/CodeEdit.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/editor-ui/src/components/CodeEdit.vue b/packages/editor-ui/src/components/CodeEdit.vue
index 990d04123d..424feb126a 100644
--- a/packages/editor-ui/src/components/CodeEdit.vue
+++ b/packages/editor-ui/src/components/CodeEdit.vue
@@ -53,12 +53,15 @@ export default mixins(genericHelpers).extend({
 				language: 'javascript',
 				tabSize: 2,
 				readOnly: this.isReadOnly,
+				minimap: {
+					enabled: false,
+				},
 			});
 
 			monaco.editor.defineTheme('myTheme', {
 				base: 'vs',
 				inherit: true,
-				rules: [{ background: 'f5f2f0' }],
+				rules: [],
 				colors: {
 					'editor.background': '#f5f2f0',
 				},

From cd3ea6a33f07894826f0cadddf6ebd58db1dcf60 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Mon, 20 Dec 2021 23:52:19 +0100
Subject: [PATCH 08/16] :zap: Fix theme name

---
 packages/editor-ui/src/components/CodeEdit.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/editor-ui/src/components/CodeEdit.vue b/packages/editor-ui/src/components/CodeEdit.vue
index 424feb126a..e0535dab03 100644
--- a/packages/editor-ui/src/components/CodeEdit.vue
+++ b/packages/editor-ui/src/components/CodeEdit.vue
@@ -58,7 +58,7 @@ export default mixins(genericHelpers).extend({
 				},
 			});
 
-			monaco.editor.defineTheme('myTheme', {
+			monaco.editor.defineTheme('n8nCustomTheme', {
 				base: 'vs',
 				inherit: true,
 				rules: [],
@@ -66,7 +66,7 @@ export default mixins(genericHelpers).extend({
 					'editor.background': '#f5f2f0',
 				},
 			});
-			monaco.editor.setTheme('myTheme');
+			monaco.editor.setTheme('n8nCustomTheme');
 
 			this.monacoInstance.onDidChangeModelContent(() => {
 				const model = this.monacoInstance!.getModel();

From fa760ee26bce8a56cb527ca49cfd6cf4da2a9c5a Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Thu, 23 Dec 2021 11:41:46 +0100
Subject: [PATCH 09/16] :zap: Improve autocomplete and a few other changes

---
 package-lock.json                             |  57 ++++++
 .../editor-ui/src/components/CodeEdit.vue     | 187 ++++++++++++++----
 .../src/components/ParameterInput.vue         |  10 +-
 packages/editor-ui/vue.config.js              |   2 +-
 .../ExecuteWorkflow/ExecuteWorkflow.node.ts   |   2 +-
 .../nodes/Function/Function.node.ts           |   1 +
 .../nodes/FunctionItem/FunctionItem.node.ts   |   1 +
 packages/workflow/src/Interfaces.ts           |   6 +-
 packages/workflow/src/WorkflowDataProxy.ts    |  21 ++
 9 files changed, 246 insertions(+), 41 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 6d2bc54f2b..552414fd01 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -33010,6 +33010,31 @@
 				"moment": ">= 2.9.0"
 			}
 		},
+		"monaco-editor": {
+			"version": "0.29.1",
+			"resolved": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.29.1.tgz",
+			"integrity": "sha512-rguaEG/zrPQSaKzQB7IfX/PpNa0qxF1FY8ZXRkN4WIl8qZdTQRSRJCtRto7IMcSgrU6H53RXI+fTcywOBC4aVw=="
+		},
+		"monaco-editor-webpack-plugin": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/monaco-editor-webpack-plugin/-/monaco-editor-webpack-plugin-5.0.0.tgz",
+			"integrity": "sha512-KrUUTmMO3lDCNK4honZ6rrrKjOI7FFLeyCktPetIo5HlRqr5dfE6ewaA9qNLH96XY7CekE3Z+v/+I6ufAs3ObA==",
+			"requires": {
+				"loader-utils": "^2.0.0"
+			},
+			"dependencies": {
+				"loader-utils": {
+					"version": "2.0.2",
+					"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.2.tgz",
+					"integrity": "sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A==",
+					"requires": {
+						"big.js": "^5.2.2",
+						"emojis-list": "^3.0.0",
+						"json5": "^2.1.2"
+					}
+				}
+			}
+		},
 		"mongodb": {
 			"version": "3.7.3",
 			"resolved": "https://registry.npmjs.org/mongodb/-/mongodb-3.7.3.tgz",
@@ -33242,6 +33267,38 @@
 				"thenify-all": "^1.0.0"
 			}
 		},
+		"n8n-core": {
+			"version": "0.96.0",
+			"resolved": "https://registry.npmjs.org/n8n-core/-/n8n-core-0.96.0.tgz",
+			"integrity": "sha512-FwcLt9tYATP2FJkEkiGlbQCdzzdShTcXfpd6ba0RDeOAwvKK+IIoMvlnaU4ClhJX5og7wvLDouAOWRj9UjjdRQ==",
+			"requires": {
+				"axios": "^0.21.1",
+				"client-oauth2": "^4.2.5",
+				"cron": "~1.7.2",
+				"crypto-js": "~4.1.1",
+				"file-type": "^14.6.2",
+				"form-data": "^4.0.0",
+				"lodash.get": "^4.4.2",
+				"mime-types": "^2.1.27",
+				"n8n-workflow": "~0.79.0",
+				"oauth-1.0a": "^2.2.6",
+				"p-cancelable": "^2.0.0",
+				"qs": "^6.10.1",
+				"request": "^2.88.2",
+				"request-promise-native": "^1.0.7"
+			}
+		},
+		"n8n-workflow": {
+			"version": "0.79.0",
+			"resolved": "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.79.0.tgz",
+			"integrity": "sha512-ylzM1l7M00gfAnCcQtdRn2DzYZ+7vyWu2gfVe5crpOJnuoLstYbUF+UgShXyrlugdMg6GV86w9mE0iRkgbMb/Q==",
+			"requires": {
+				"lodash.get": "^4.4.2",
+				"lodash.isequal": "^4.5.0",
+				"riot-tmpl": "^3.0.8",
+				"xml2js": "^0.4.23"
+			}
+		},
 		"named-placeholders": {
 			"version": "1.1.2",
 			"resolved": "https://registry.npmjs.org/named-placeholders/-/named-placeholders-1.1.2.tgz",
diff --git a/packages/editor-ui/src/components/CodeEdit.vue b/packages/editor-ui/src/components/CodeEdit.vue
index e0535dab03..5bb6aff73f 100644
--- a/packages/editor-ui/src/components/CodeEdit.vue
+++ b/packages/editor-ui/src/components/CodeEdit.vue
@@ -17,14 +17,29 @@
 import * as monaco from 'monaco-editor/esm/vs/editor/editor.api';
 
 import { genericHelpers } from '@/components/mixins/genericHelpers';
+import { workflowHelpers } from '@/components/mixins/workflowHelpers';
 
 import mixins from 'vue-typed-mixins';
-import { IExecutionResponse } from '@/Interface';
-import { INodeExecutionData } from 'n8n-workflow';
+import { IExecutionResponse, INodeUi } from '@/Interface';
+import {
+	IBinaryKeyData,
+	IDataObject,
+	INodeExecutionData,
+	IRunExecutionData,
+	IWorkflowDataProxyAdditionalKeys,
+	WorkflowDataProxy,
+} from 'n8n-workflow';
 
-export default mixins(genericHelpers).extend({
+import {
+	PLACEHOLDER_FILLED_AT_EXECUTION_TIME,
+} from '@/constants';
+
+export default mixins(
+	genericHelpers,
+	workflowHelpers,
+).extend({
 	name: 'CodeEdit',
-	props: ['dialogVisible', 'parameter', 'value'],
+	props: ['codeAutocomplete', 'dialogVisible', 'parameter', 'type', 'value'],
 	data() {
 		return {
 			monacoInstance: null as monaco.editor.IStandaloneCodeEditor | null,
@@ -35,7 +50,9 @@ export default mixins(genericHelpers).extend({
 		setTimeout(this.loadEditor);
 	},
 	destroyed() {
-		this.monacoLibrary!.dispose();
+		if (this.monacoLibrary) {
+			this.monacoLibrary.dispose();
+		}
 	},
 	methods: {
 		closeDialog() {
@@ -45,19 +62,50 @@ export default mixins(genericHelpers).extend({
 			return false;
 		},
 
+		createSimpleRepresentation(inputData: object | null | undefined | boolean | string | number | boolean[] | string[] | number[] | object[]): object | null | undefined | boolean | string | number | boolean[] | string[] | number[] | object[] {
+			if (inputData === null || inputData === undefined) {
+				return inputData;
+			} else if (typeof inputData === 'string') {
+				return '';
+			} else if (typeof inputData === 'boolean') {
+				return true;
+			} else if (typeof inputData === 'number') {
+				return 1;
+			} else if (Array.isArray(inputData)) {
+				return inputData.map(value => this.createSimpleRepresentation(value));
+			} else if (typeof inputData === 'object') {
+				const returnData: { [key: string]: object } = {};
+				Object.keys(inputData).forEach(key => {
+					// @ts-ignore
+					returnData[key] = this.createSimpleRepresentation(inputData[key]);
+				});
+				return returnData;
+			}
+			return inputData;
+		},
+
 		loadEditor() {
 			if (!this.$refs.code) return;
 
 			this.monacoInstance = monaco.editor.create(this.$refs.code as HTMLElement, {
 				value: this.value,
-				language: 'javascript',
+				language: this.type === 'code' ? 'javascript' : 'json',
 				tabSize: 2,
+				wordBasedSuggestions: false,
 				readOnly: this.isReadOnly,
 				minimap: {
 					enabled: false,
 				},
 			});
 
+
+			this.monacoInstance.onDidChangeModelContent(() => {
+				const model = this.monacoInstance!.getModel();
+				if (model) {
+					this.$emit('valueChanged', model.getValue());
+				}
+			});
+
 			monaco.editor.defineTheme('n8nCustomTheme', {
 				base: 'vs',
 				inherit: true,
@@ -68,45 +116,112 @@ export default mixins(genericHelpers).extend({
 			});
 			monaco.editor.setTheme('n8nCustomTheme');
 
-			this.monacoInstance.onDidChangeModelContent(() => {
-				const model = this.monacoInstance!.getModel();
+			if (this.type === 'code') {
+				// As wordBasedSuggestions: false does not have any effect does it however seem
+				// to remove all all suggestions from the editor if I do this
+				monaco.languages.typescript.javascriptDefaults.setCompilerOptions({
+					allowNonTsExtensions: true,
+				});
 
-				if (model) {
-					this.$emit('valueChanged', model.getValue());
-				}
-			});
-
-			this.loadAutocompleteData();
+				this.loadAutocompleteData();
+			} else if (this.type === 'json') {
+				monaco.languages.json.jsonDefaults.setDiagnosticsOptions({
+					validate: true,
+				});
+			}
 		},
 
 		loadAutocompleteData(): void {
-			const executedWorkflow: IExecutionResponse | null = this.$store.getters.getWorkflowExecution;
+			if (['function', 'functionItem'].includes(this.codeAutocomplete)) {
+				const executedWorkflow: IExecutionResponse | null = this.$store.getters.getWorkflowExecution;
+				const workflow = this.getWorkflow();
+				const activeNode: INodeUi | null = this.$store.getters.activeNode;
+				const inputIndex = 0;
+				const itemIndex = 0;
+				const inputName = 'main';
+				const mode = 'manual';
+				const runIndex = 0;
 
-			let autocompleteData: INodeExecutionData[] = [];
+				const autocompleteData: string[] = [];
 
-			if (executedWorkflow) {
-				const lastNodeExecuted = executedWorkflow.data.resultData.lastNodeExecuted;
+				const executionData = this.$store.getters.getWorkflowExecution as IExecutionResponse | null;
 
-				if (lastNodeExecuted) {
-					const data = executedWorkflow.data.resultData.runData[lastNodeExecuted];
-
-					// @ts-ignore
-					autocompleteData = data[0].data!.main[0];
+				let runExecutionData: IRunExecutionData;
+				if (executionData === null) {
+					runExecutionData = {
+						resultData: {
+							runData: {},
+						},
+					};
+				} else {
+					runExecutionData = executionData.data;
 				}
+				const parentNode = workflow.getParentNodes(activeNode!.name, inputName, 1);
+
+				const connectionInputData = this.connectionInputData(parentNode, inputName, runIndex, inputIndex);
+
+				const additionalProxyKeys: IWorkflowDataProxyAdditionalKeys = {
+					$executionId: PLACEHOLDER_FILLED_AT_EXECUTION_TIME,
+					$resumeWebhookUrl: PLACEHOLDER_FILLED_AT_EXECUTION_TIME,
+				};
+
+				const dataProxy = new WorkflowDataProxy(workflow, runExecutionData, runIndex, itemIndex, activeNode!.name, connectionInputData || [], {}, mode, additionalProxyKeys);
+				const proxy = dataProxy.getDataProxy();
+
+				const autoCompleteItems = [
+					`function $evaluateExpression(expression: string, itemIndex?: number): any {};`,
+					`function getNodeParameter(parameterName: string, itemIndex: number, fallbackValue?: any): any {};`,
+					`function getWorkflowStaticData(type: string): object {};`,
+					`function $item(itemIndex: number, runIndex?: number) {};`,
+					`function $items(nodeName?: string, outputIndex?: number, runIndex?: number) {};`,
+				];
+
+				const baseKeys = ['$env', '$executionId', '$mode', '$parameter', '$position', '$resumeWebhookUrl', '$workflow'];
+				const additionalKeys = ['$json', '$binary'];
+				if (executedWorkflow) {
+					baseKeys.push(...additionalKeys);
+				} else {
+					additionalKeys.forEach(key => {
+						autoCompleteItems.push(`const ${key} = {}`);
+					});
+				}
+
+				for (const key of baseKeys) {
+					autoCompleteItems.push(`const ${key} = ${JSON.stringify(this.createSimpleRepresentation(proxy[key]))}`);
+				}
+
+				// Add the nodes and their simplified data
+				const nodes: {
+					[key: string]: INodeExecutionData;
+				} = {};
+				for (const [nodeName, node] of Object.entries(workflow.nodes)) {
+					// To not load to much data create a simple representation.
+					nodes[nodeName] = {
+						json: {} as IDataObject,
+						parameter: this.createSimpleRepresentation(proxy.$node[nodeName].parameter) as IDataObject,
+					};
+
+					try {
+						nodes[nodeName]!.json = this.createSimpleRepresentation(proxy.$node[nodeName].json) as IDataObject;
+						nodes[nodeName]!.context = this.createSimpleRepresentation(proxy.$node[nodeName].context) as IDataObject;
+						nodes[nodeName]!.runIndex = proxy.$node[nodeName].runIndex;
+						if (Object.keys(proxy.$node[nodeName].binary).length) {
+							nodes[nodeName]!.binary = this.createSimpleRepresentation(proxy.$node[nodeName].binary) as IBinaryKeyData;
+						}
+					} catch(error) {}
+				}
+				autoCompleteItems.push(`const $node = ${JSON.stringify(nodes)}`);
+
+				if (this.codeAutocomplete === 'function') {
+					autoCompleteItems.push(`const items = ${JSON.stringify(this.createSimpleRepresentation(connectionInputData))}`);
+				} else if (this.codeAutocomplete === 'functionItem') {
+					autoCompleteItems.push(`const item = $json`);
+				}
+
+				this.monacoLibrary = monaco.languages.typescript.javascriptDefaults.addExtraLib(
+					autoCompleteItems.join('\n'),
+				);
 			}
-
-			const autoCompleteItems = [
-				`/**\n\`\`\`\nconst items = ${JSON.stringify(autocompleteData, null, 2)}\n\`\`\`\n*/`,
-				`const items = ${JSON.stringify(autocompleteData)}`,
-			];
-
-			if (autocompleteData.length) {
-				autoCompleteItems.push(`const $json = ${JSON.stringify(autocompleteData[0].json)}`);
-			}
-
-			this.monacoLibrary = monaco.languages.typescript.javascriptDefaults.addExtraLib(
-				autoCompleteItems.join('\n'),
-			);
 		},
 	},
 });
diff --git a/packages/editor-ui/src/components/ParameterInput.vue b/packages/editor-ui/src/components/ParameterInput.vue
index 0a7f441740..cfecb4f250 100644
--- a/packages/editor-ui/src/components/ParameterInput.vue
+++ b/packages/editor-ui/src/components/ParameterInput.vue
@@ -13,7 +13,7 @@
 		/>
 
 		<div v-else-if="['json', 'string'].includes(parameter.type) || remoteParameterOptionsLoadingIssues !== null">
-			<code-edit v-if="codeEditDialogVisible" :value="value" :parameter="parameter" @closeDialog="closeCodeEditDialog" @valueChanged="expressionUpdated"></code-edit>
+			<code-edit v-if="codeEditDialogVisible" :value="value" :parameter="parameter" :type="editorType" :codeAutocomplete="codeAutocomplete" @closeDialog="closeCodeEditDialog" @valueChanged="expressionUpdated"></code-edit>
 			<text-edit :dialogVisible="textEditDialogVisible" :value="value" :parameter="parameter" @closeDialog="closeTextEditDialog" @valueChanged="expressionUpdated"></text-edit>
 
 			<div v-if="isEditor === true" class="code-edit clickable" @click="displayEditDialog()">
@@ -301,6 +301,9 @@ export default mixins(
 			},
 		},
 		computed: {
+			codeAutocomplete (): string | undefined {
+				return this.getArgument('codeAutocomplete') as string | undefined;
+			},
 			showExpressionAsTextInput(): boolean {
 				const types = ['number', 'boolean', 'dateTime', 'options', 'multiOptions'];
 
@@ -500,7 +503,7 @@ export default mixins(
 				return this.parameter.default === this.value;
 			},
 			isEditor (): boolean {
-				return this.getArgument('editor') === 'code';
+				return ['code', 'json'].includes(this.editorType);
 			},
 			isValueExpression () {
 				if (this.parameter.noDataExpression === true) {
@@ -511,6 +514,9 @@ export default mixins(
 				}
 				return false;
 			},
+			editorType (): string {
+				return this.getArgument('editor') as string;
+			},
 			parameterOptions (): INodePropertyOptions[] {
 				if (this.remoteMethod === undefined) {
 					// Options are already given
diff --git a/packages/editor-ui/vue.config.js b/packages/editor-ui/vue.config.js
index e1b23fb014..5f43c129b9 100644
--- a/packages/editor-ui/vue.config.js
+++ b/packages/editor-ui/vue.config.js
@@ -25,7 +25,7 @@ module.exports = {
 			disableHostCheck: true,
 		},
 		plugins: [
-			new MonacoWebpackPlugin({ languages: ['javascript', 'html', 'typescript'] }),
+			new MonacoWebpackPlugin({ languages: ['javascript', 'json', 'typescript'] }),
 		],
 	},
 	css: {
diff --git a/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflow.node.ts b/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflow.node.ts
index 02271ed8a7..07e5d222fe 100644
--- a/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflow.node.ts
+++ b/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflow.node.ts
@@ -107,7 +107,7 @@ export class ExecuteWorkflow implements INodeType {
 				type: 'string',
 				typeOptions: {
 					alwaysOpenEditWindow: true,
-					editor: 'code',
+					editor: 'json',
 					rows: 10,
 				},
 				displayOptions: {
diff --git a/packages/nodes-base/nodes/Function/Function.node.ts b/packages/nodes-base/nodes/Function/Function.node.ts
index f1a1b6aac1..ac0c46f555 100644
--- a/packages/nodes-base/nodes/Function/Function.node.ts
+++ b/packages/nodes-base/nodes/Function/Function.node.ts
@@ -28,6 +28,7 @@ export class Function implements INodeType {
 				name: 'functionCode',
 				typeOptions: {
 					alwaysOpenEditWindow: true,
+					codeAutocomplete: 'function',
 					editor: 'code',
 					rows: 10,
 				},
diff --git a/packages/nodes-base/nodes/FunctionItem/FunctionItem.node.ts b/packages/nodes-base/nodes/FunctionItem/FunctionItem.node.ts
index b536c8daf7..5e586a0b13 100644
--- a/packages/nodes-base/nodes/FunctionItem/FunctionItem.node.ts
+++ b/packages/nodes-base/nodes/FunctionItem/FunctionItem.node.ts
@@ -30,6 +30,7 @@ export class FunctionItem implements INodeType {
 				name: 'functionCode',
 				typeOptions: {
 					alwaysOpenEditWindow: true,
+					codeAutocomplete: 'functionItem',
 					editor: 'code',
 					rows: 10,
 				},
diff --git a/packages/workflow/src/Interfaces.ts b/packages/workflow/src/Interfaces.ts
index 3b3c018316..cc2b34ae6a 100644
--- a/packages/workflow/src/Interfaces.ts
+++ b/packages/workflow/src/Interfaces.ts
@@ -631,10 +631,13 @@ export type NodePropertyTypes =
 	| 'options'
 	| 'string';
 
-export type EditorTypes = 'code';
+export type CodeAutocompleteTypes = 'function' | 'functionItem';
+
+export type EditorTypes = 'code' | 'json';
 
 export interface INodePropertyTypeOptions {
 	alwaysOpenEditWindow?: boolean; // Supported by: string
+	codeAutocomplete?: CodeAutocompleteTypes; // Supported by: string
 	editor?: EditorTypes; // Supported by: string
 	loadOptionsDependsOn?: string[]; // Supported by: options
 	loadOptionsMethod?: string; // Supported by: options
@@ -850,6 +853,7 @@ export interface IWebhookDescription {
 }
 
 export interface IWorkflowDataProxyData {
+	[key: string]: any;
 	$binary: any;
 	$data: any;
 	$env: any;
diff --git a/packages/workflow/src/WorkflowDataProxy.ts b/packages/workflow/src/WorkflowDataProxy.ts
index 735e04a178..e168c6b48c 100644
--- a/packages/workflow/src/WorkflowDataProxy.ts
+++ b/packages/workflow/src/WorkflowDataProxy.ts
@@ -92,6 +92,12 @@ export class WorkflowDataProxy {
 
 					return Reflect.ownKeys(target);
 				},
+				getOwnPropertyDescriptor(k) {
+					return {
+						enumerable: true,
+						configurable: true,
+					};
+				},
 				get(target, name, receiver) {
 					// eslint-disable-next-line no-param-reassign
 					name = name.toString();
@@ -142,6 +148,12 @@ export class WorkflowDataProxy {
 			ownKeys(target) {
 				return Reflect.ownKeys(target);
 			},
+			getOwnPropertyDescriptor(k) {
+				return {
+					enumerable: true,
+					configurable: true,
+				};
+			},
 			get(target, name, receiver) {
 				name = name.toString();
 
@@ -385,6 +397,15 @@ export class WorkflowDataProxy {
 		return new Proxy(
 			{},
 			{
+				ownKeys(target) {
+					return allowedValues;
+				},
+				getOwnPropertyDescriptor(k) {
+					return {
+						enumerable: true,
+						configurable: true,
+					};
+				},
 				get(target, name, receiver) {
 					if (!allowedValues.includes(name.toString())) {
 						throw new Error(`The key "${name.toString()}" is not supported!`);

From 0f1b8779e43104ed6650fba66225aba8e4542ca7 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Thu, 23 Dec 2021 15:16:42 +0100
Subject: [PATCH 10/16] :zap: Add line numbers to errors

---
 .../nodes-base/nodes/Function/Function.node.ts    | 12 ++++++++++++
 .../nodes/FunctionItem/FunctionItem.node.ts       | 15 +++++++++++++++
 2 files changed, 27 insertions(+)

diff --git a/packages/nodes-base/nodes/Function/Function.node.ts b/packages/nodes-base/nodes/Function/Function.node.ts
index ac0c46f555..7abcb6b64e 100644
--- a/packages/nodes-base/nodes/Function/Function.node.ts
+++ b/packages/nodes-base/nodes/Function/Function.node.ts
@@ -127,6 +127,18 @@ return items;`,
 			if (this.continueOnFail()) {
 				items=[{json:{ error: error.message }}];
 			} else {
+				// Try to find the lien number which contains the error and attach to error message
+				const stackLines = error.stack.split('\n');
+				if (stackLines.length > 0) {
+					const lineParts = stackLines[1].split(':');
+					if (lineParts.length > 2) {
+						const lineNumber = lineParts.splice(-2, 1);
+						if (!isNaN(lineNumber)) {
+							error.message = `${error.message} [Line ${lineNumber}]`;
+						}
+					}
+				}
+
 				return Promise.reject(error);
 			}
 		}
diff --git a/packages/nodes-base/nodes/FunctionItem/FunctionItem.node.ts b/packages/nodes-base/nodes/FunctionItem/FunctionItem.node.ts
index 5e586a0b13..c0effffd66 100644
--- a/packages/nodes-base/nodes/FunctionItem/FunctionItem.node.ts
+++ b/packages/nodes-base/nodes/FunctionItem/FunctionItem.node.ts
@@ -120,6 +120,21 @@ return item;`,
 						returnData.push({json:{ error: error.message }});
 						continue;
 					} else {
+						// Try to find the lien number which contains the error and attach to error message
+						const stackLines = error.stack.split('\n');
+						if (stackLines.length > 0) {
+							const lineParts = stackLines[1].split(':');
+							if (lineParts.length > 2) {
+								const lineNumber = lineParts.splice(-2, 1);
+								if (!isNaN(lineNumber)) {
+									error.message = `${error.message} [Line ${lineNumber} | Item Index: ${itemIndex}]`;
+									return Promise.reject(error);
+								}
+							}
+						}
+
+						error.message = `${error.message} [Item Index: ${itemIndex}]`;
+
 						return Promise.reject(error);
 					}
 				}

From b9abf5c57bdfc9cf148e74ae6c0eb3fbbb68a88f Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Thu, 23 Dec 2021 15:54:30 +0100
Subject: [PATCH 11/16] :bug: Fix issue with no incoming data

---
 packages/editor-ui/src/components/CodeEdit.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/editor-ui/src/components/CodeEdit.vue b/packages/editor-ui/src/components/CodeEdit.vue
index 5bb6aff73f..b43282c56c 100644
--- a/packages/editor-ui/src/components/CodeEdit.vue
+++ b/packages/editor-ui/src/components/CodeEdit.vue
@@ -178,7 +178,7 @@ export default mixins(
 
 				const baseKeys = ['$env', '$executionId', '$mode', '$parameter', '$position', '$resumeWebhookUrl', '$workflow'];
 				const additionalKeys = ['$json', '$binary'];
-				if (executedWorkflow) {
+				if (executedWorkflow && connectionInputData) {
 					baseKeys.push(...additionalKeys);
 				} else {
 					additionalKeys.forEach(key => {

From 4ab7257c2b8fe8cf83d898029e94e5d9183e1c66 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Thu, 23 Dec 2021 18:02:32 +0100
Subject: [PATCH 12/16] :bug: Fix issue with comments in last line

---
 packages/nodes-base/nodes/Function/Function.node.ts         | 2 +-
 packages/nodes-base/nodes/FunctionItem/FunctionItem.node.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/nodes-base/nodes/Function/Function.node.ts b/packages/nodes-base/nodes/Function/Function.node.ts
index 7abcb6b64e..6c9be76f90 100644
--- a/packages/nodes-base/nodes/Function/Function.node.ts
+++ b/packages/nodes-base/nodes/Function/Function.node.ts
@@ -102,7 +102,7 @@ return items;`,
 
 		try {
 			// Execute the function code
-			items = (await vm.run(`module.exports = async function() {${functionCode}}()`, __dirname));
+			items = (await vm.run(`module.exports = async function() {${functionCode}\n}()`, __dirname));
 			// Do very basic validation of the data
 			if (items === undefined) {
 				throw new NodeOperationError(this.getNode(), 'No data got returned. Always return an Array of items!');
diff --git a/packages/nodes-base/nodes/FunctionItem/FunctionItem.node.ts b/packages/nodes-base/nodes/FunctionItem/FunctionItem.node.ts
index c0effffd66..5c173fd8d6 100644
--- a/packages/nodes-base/nodes/FunctionItem/FunctionItem.node.ts
+++ b/packages/nodes-base/nodes/FunctionItem/FunctionItem.node.ts
@@ -114,7 +114,7 @@ return item;`,
 				let jsonData: IDataObject;
 				try {
 					// Execute the function code
-					jsonData = await vm.run(`module.exports = async function() {${functionCode}}()`, __dirname);
+					jsonData = await vm.run(`module.exports = async function() {${functionCode}\n}()`, __dirname);
 				} catch (error) {
 					if (this.continueOnFail()) {
 						returnData.push({json:{ error: error.message }});

From cc4f16f419d34c8f9d3b1cfc76689cda4231239d Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Thu, 23 Dec 2021 18:13:25 +0100
Subject: [PATCH 13/16] :zap: Improve default types if there is not execution
 data

---
 packages/editor-ui/src/components/CodeEdit.vue | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/packages/editor-ui/src/components/CodeEdit.vue b/packages/editor-ui/src/components/CodeEdit.vue
index b43282c56c..8c0cb7b825 100644
--- a/packages/editor-ui/src/components/CodeEdit.vue
+++ b/packages/editor-ui/src/components/CodeEdit.vue
@@ -213,9 +213,17 @@ export default mixins(
 				autoCompleteItems.push(`const $node = ${JSON.stringify(nodes)}`);
 
 				if (this.codeAutocomplete === 'function') {
-					autoCompleteItems.push(`const items = ${JSON.stringify(this.createSimpleRepresentation(connectionInputData))}`);
+					if (connectionInputData) {
+						autoCompleteItems.push(`const items = ${JSON.stringify(this.createSimpleRepresentation(connectionInputData))}`);
+					} else {
+						autoCompleteItems.push(`const items: {json: any}[] = []`);
+					}
 				} else if (this.codeAutocomplete === 'functionItem') {
-					autoCompleteItems.push(`const item = $json`);
+					if (connectionInputData) {
+						autoCompleteItems.push(`const item = $json`);
+					} else {
+						autoCompleteItems.push(`const item = {}`);
+					}
 				}
 
 				this.monacoLibrary = monaco.languages.typescript.javascriptDefaults.addExtraLib(

From 85be1223e93016192face390d2e819433ca394db Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Thu, 23 Dec 2021 18:15:40 +0100
Subject: [PATCH 14/16] :zap: Further improve default types

---
 packages/editor-ui/src/components/CodeEdit.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/editor-ui/src/components/CodeEdit.vue b/packages/editor-ui/src/components/CodeEdit.vue
index 8c0cb7b825..554c01061a 100644
--- a/packages/editor-ui/src/components/CodeEdit.vue
+++ b/packages/editor-ui/src/components/CodeEdit.vue
@@ -216,13 +216,13 @@ export default mixins(
 					if (connectionInputData) {
 						autoCompleteItems.push(`const items = ${JSON.stringify(this.createSimpleRepresentation(connectionInputData))}`);
 					} else {
-						autoCompleteItems.push(`const items: {json: any}[] = []`);
+						autoCompleteItems.push(`const items: {json: {[key: string]: any}}[] = []`);
 					}
 				} else if (this.codeAutocomplete === 'functionItem') {
 					if (connectionInputData) {
 						autoCompleteItems.push(`const item = $json`);
 					} else {
-						autoCompleteItems.push(`const item = {}`);
+						autoCompleteItems.push(`const item: {[key: string]: any} = {}`);
 					}
 				}
 

From 395f8ed5b56cac167e872b0aee68d5647e33c193 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Thu, 23 Dec 2021 19:11:14 +0100
Subject: [PATCH 15/16] :bug: Add support for data from not first output data

---
 packages/editor-ui/src/components/CodeEdit.vue | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/packages/editor-ui/src/components/CodeEdit.vue b/packages/editor-ui/src/components/CodeEdit.vue
index 554c01061a..0e05cb4ce9 100644
--- a/packages/editor-ui/src/components/CodeEdit.vue
+++ b/packages/editor-ui/src/components/CodeEdit.vue
@@ -133,14 +133,16 @@ export default mixins(
 
 		loadAutocompleteData(): void {
 			if (['function', 'functionItem'].includes(this.codeAutocomplete)) {
-				const executedWorkflow: IExecutionResponse | null = this.$store.getters.getWorkflowExecution;
-				const workflow = this.getWorkflow();
-				const activeNode: INodeUi | null = this.$store.getters.activeNode;
-				const inputIndex = 0;
 				const itemIndex = 0;
 				const inputName = 'main';
 				const mode = 'manual';
-				const runIndex = 0;
+				let runIndex = 0;
+
+				const executedWorkflow: IExecutionResponse | null = this.$store.getters.getWorkflowExecution;
+				const workflow = this.getWorkflow();
+				const activeNode: INodeUi | null = this.$store.getters.activeNode;
+				const parentNode = workflow.getParentNodes(activeNode!.name, inputName, 1);
+				const inputIndex = workflow.getNodeConnectionOutputIndex(activeNode.name, parentNode[0]);
 
 				const autocompleteData: string[] = [];
 
@@ -155,8 +157,10 @@ export default mixins(
 					};
 				} else {
 					runExecutionData = executionData.data;
+					if (runExecutionData.resultData.runData[activeNode.name]) {
+						runIndex = runExecutionData.resultData.runData[activeNode.name].length - 1;
+					}
 				}
-				const parentNode = workflow.getParentNodes(activeNode!.name, inputName, 1);
 
 				const connectionInputData = this.connectionInputData(parentNode, inputName, runIndex, inputIndex);
 
@@ -178,7 +182,7 @@ export default mixins(
 
 				const baseKeys = ['$env', '$executionId', '$mode', '$parameter', '$position', '$resumeWebhookUrl', '$workflow'];
 				const additionalKeys = ['$json', '$binary'];
-				if (executedWorkflow && connectionInputData) {
+				if (executedWorkflow && connectionInputData && connectionInputData.length) {
 					baseKeys.push(...additionalKeys);
 				} else {
 					additionalKeys.forEach(key => {

From b4f2251bcb41a38760bed194626a0480e4bcc73a Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Thu, 23 Dec 2021 21:00:08 +0100
Subject: [PATCH 16/16] :zap: Improvements

---
 packages/cli/src/telemetry/index.ts                  |  2 --
 packages/cli/tsconfig.json                           |  1 -
 packages/editor-ui/src/components/CodeEdit.vue       | 12 ++++--------
 packages/nodes-base/nodes/Function/Function.node.ts  |  2 +-
 .../nodes/FunctionItem/FunctionItem.node.ts          |  2 +-
 5 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/packages/cli/src/telemetry/index.ts b/packages/cli/src/telemetry/index.ts
index 0138fb03ec..fb4f53460d 100644
--- a/packages/cli/src/telemetry/index.ts
+++ b/packages/cli/src/telemetry/index.ts
@@ -186,13 +186,11 @@ export class Telemetry {
 	async track(eventName: string, properties?: IDataObject): Promise<void> {
 		return new Promise<void>((resolve) => {
 			if (this.client) {
-				// @ts-ignore
 				this.client.track(
 					{
 						userId: this.instanceId,
 						anonymousId: '000000000000',
 						event: eventName,
-						// @ts-ignore
 						properties,
 					},
 					resolve,
diff --git a/packages/cli/tsconfig.json b/packages/cli/tsconfig.json
index a603b7e8d0..aa44bc610f 100644
--- a/packages/cli/tsconfig.json
+++ b/packages/cli/tsconfig.json
@@ -11,7 +11,6 @@
 		"module": "commonjs",
 		"noImplicitAny": true,
 		"removeComments": true,
-		"skipLibCheck": true,
 		"strictNullChecks": true,
 		"forceConsistentCasingInFileNames": true,
 		"noImplicitReturns": true,
diff --git a/packages/editor-ui/src/components/CodeEdit.vue b/packages/editor-ui/src/components/CodeEdit.vue
index 0e05cb4ce9..ad2eb3417d 100644
--- a/packages/editor-ui/src/components/CodeEdit.vue
+++ b/packages/editor-ui/src/components/CodeEdit.vue
@@ -39,7 +39,7 @@ export default mixins(
 	workflowHelpers,
 ).extend({
 	name: 'CodeEdit',
-	props: ['codeAutocomplete', 'dialogVisible', 'parameter', 'type', 'value'],
+	props: ['codeAutocomplete', 'parameter', 'type', 'value'],
 	data() {
 		return {
 			monacoInstance: null as monaco.editor.IStandaloneCodeEditor | null,
@@ -142,7 +142,7 @@ export default mixins(
 				const workflow = this.getWorkflow();
 				const activeNode: INodeUi | null = this.$store.getters.activeNode;
 				const parentNode = workflow.getParentNodes(activeNode!.name, inputName, 1);
-				const inputIndex = workflow.getNodeConnectionOutputIndex(activeNode.name, parentNode[0]);
+				const inputIndex = workflow.getNodeConnectionOutputIndex(activeNode!.name, parentNode[0]) || 0;
 
 				const autocompleteData: string[] = [];
 
@@ -157,8 +157,8 @@ export default mixins(
 					};
 				} else {
 					runExecutionData = executionData.data;
-					if (runExecutionData.resultData.runData[activeNode.name]) {
-						runIndex = runExecutionData.resultData.runData[activeNode.name].length - 1;
+					if (runExecutionData.resultData.runData[activeNode!.name]) {
+						runIndex = runExecutionData.resultData.runData[activeNode!.name].length - 1;
 					}
 				}
 
@@ -240,10 +240,6 @@ export default mixins(
 </script>
 
 <style scoped>
-.editor-description {
-	font-weight: bold;
-	padding: 0 0 0.5em 0.2em;
-}
 
 .text-editor {
 	min-height: 30rem;
diff --git a/packages/nodes-base/nodes/Function/Function.node.ts b/packages/nodes-base/nodes/Function/Function.node.ts
index 6c9be76f90..649ec70ee9 100644
--- a/packages/nodes-base/nodes/Function/Function.node.ts
+++ b/packages/nodes-base/nodes/Function/Function.node.ts
@@ -127,7 +127,7 @@ return items;`,
 			if (this.continueOnFail()) {
 				items=[{json:{ error: error.message }}];
 			} else {
-				// Try to find the lien number which contains the error and attach to error message
+				// Try to find the line number which contains the error and attach to error message
 				const stackLines = error.stack.split('\n');
 				if (stackLines.length > 0) {
 					const lineParts = stackLines[1].split(':');
diff --git a/packages/nodes-base/nodes/FunctionItem/FunctionItem.node.ts b/packages/nodes-base/nodes/FunctionItem/FunctionItem.node.ts
index 5c173fd8d6..2ae9fba283 100644
--- a/packages/nodes-base/nodes/FunctionItem/FunctionItem.node.ts
+++ b/packages/nodes-base/nodes/FunctionItem/FunctionItem.node.ts
@@ -120,7 +120,7 @@ return item;`,
 						returnData.push({json:{ error: error.message }});
 						continue;
 					} else {
-						// Try to find the lien number which contains the error and attach to error message
+						// Try to find the line number which contains the error and attach to error message
 						const stackLines = error.stack.split('\n');
 						if (stackLines.length > 0) {
 							const lineParts = stackLines[1].split(':');