feat(editor-ui): Replace lezer with esprima in client linter (#4192)

* 🔥 Remove addition from misresolved conflict * ⚡ Replace `lezer` with `esprima` in client linter * ⚡ Add missing key * 📦 Update `package-lock.json` * ⚡ Match dependencies * 📦 Update `package-lock.json` * 📦 Re-update `package-lock.json`
n8n-io · Sep 26, 2022 · 55ef5b4 · 55ef5b4
1 parent 9631fc3
commit 55ef5b4
Show file tree

Hide file tree

Showing 8 changed files with 42,560 additions and 54,092 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/core/src/NodeExecuteFunctions.ts b/packages/core/src/NodeExecuteFunctions.ts
@@ -1377,6 +1377,18 @@ export function normalizeItems(
 		executionData = executionData.json ? [executionData] : [{ json: executionData as IDataObject }];
 	}
 
+	const SUPPORTED_ITEM_KEYS = new Set(['json', 'binary', 'error', 'pairedItem', 'index']);
+
+	for (const item of executionData) {
+		Object.keys(item).forEach((key) => {
+			if (SUPPORTED_ITEM_KEYS.has(key)) return;
+
+			throw new Error(
+				`Unknown top-level key: ${key}. Did you mean to set this property at item.json?`,
+			);
+		});
+	}
+
 	if (executionData.every((item) => typeof item === 'object' && 'json' in item))
 		return executionData;
 

diff --git a/packages/editor-ui/package.json b/packages/editor-ui/package.json
@@ -37,6 +37,7 @@
     "@fortawesome/vue-fontawesome": "^2.0.2",
     "axios": "^0.21.1",
     "dateformat": "^3.0.3",
+    "esprima": "^4.0.1",
     "fast-json-stable-stringify": "^2.1.0",
     "file-saver": "^2.0.2",
     "flatted": "^3.2.4",
@@ -77,6 +78,7 @@
     "@intlify/vue-i18n-loader": "^1.1.0",
     "@n8n_io/eslint-config": "",
     "@types/dateformat": "^3.0.0",
+    "@types/esprima": "^4.0.3",
     "@types/express": "^4.17.6",
     "@types/file-saver": "^2.0.1",
     "@types/jest": "^27.4.0",

diff --git a/packages/editor-ui/src/components/CodeNodeEditor/constants.ts b/packages/editor-ui/src/components/CodeNodeEditor/constants.ts
@@ -1,4 +1,5 @@
 import { STICKY_NODE_TYPE } from "@/constants";
+import type { Diagnostic } from "@codemirror/lint";
 
 export const ALL_ITEMS_PLACEHOLDER = `
 // Loop over input items and add a new field
@@ -28,3 +29,12 @@ export const AUTOCOMPLETABLE_BUILT_IN_MODULES = [
 	'readline',			'url',						'util',
 	'zlib',
 ];
+
+export const DEFAULT_LINTER_SEVERITY: Diagnostic['severity'] = 'error';
+
+export const DEFAULT_LINTER_DELAY_IN_MS = 300;
+
+/**
+ * Offset to account for script wrapper when finding location in source text.
+ */
+export const OFFSET_FOR_SCRIPT_WRAPPER = 35;