Improve error typing, fix assignment hint update

n8n-io · Apr 11, 2024 · aa53f85 · aa53f85
1 parent e1c9694
commit aa53f85
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 22 deletions.
diff --git a/packages/editor-ui/src/components/AssignmentCollection/Assignment.vue b/packages/editor-ui/src/components/AssignmentCollection/Assignment.vue
@@ -56,21 +56,6 @@ const assignmentTypeToNodeProperty = (
 	}
 };
 
-function getExpressionResult(value: string): Result<unknown, unknown> {
-	try {
-		const resolvedValue = resolveExpression(value, {
-			targetItem: ndvStore.hoveringItem ?? undefined,
-			inputNodeName: ndvStore.ndvInputNodeName,
-			inputRunIndex: ndvStore.ndvInputRunIndex,
-			inputBranchIndex: ndvStore.ndvInputBranchIndex,
-		}) as unknown;
-
-		return { ok: true, result: resolvedValue };
-	} catch (error) {
-		return { ok: false, error };
-	}
-}
-
 const nameParameter = computed<INodeProperties>(() => ({
 	name: 'name',
 	displayName: 'Name',
@@ -95,7 +80,22 @@ const hint = computed(() => {
 	if (typeof value !== 'string' || !value.startsWith('=')) {
 		return '';
 	}
-	return stringifyExpressionResult(getExpressionResult(value));
+
+	let result: Result<unknown, Error>;
+	try {
+		const resolvedValue = resolveExpression(value, undefined, {
+			targetItem: ndvStore.hoveringItem ?? undefined,
+			inputNodeName: ndvStore.ndvInputNodeName,
+			inputRunIndex: ndvStore.ndvInputRunIndex,
+			inputBranchIndex: ndvStore.ndvInputBranchIndex,
+		}) as unknown;
+
+		result = { ok: true, result: resolvedValue };
+	} catch (error) {
+		result = { ok: false, error };
+	}
+
+	return stringifyExpressionResult(result);
 });
 
 const highlightHint = computed(() =>

diff --git a/packages/editor-ui/src/components/ParameterInputWrapper.vue b/packages/editor-ui/src/components/ParameterInputWrapper.vue
@@ -197,12 +197,13 @@ export default defineComponent({
 		isInputParentOfActiveNode(): boolean {
 			return this.ndvStore.isInputParentOfActiveNode;
 		},
-		evaluatedExpression(): Result<unknown, unknown> {
+		evaluatedExpression(): Result<unknown, Error> {
 			const value = isResourceLocatorValue(this.modelValue)
 				? this.modelValue.value
 				: this.modelValue;
+
 			if (!this.activeNode || !this.isValueExpression || typeof value !== 'string') {
-				return { ok: false, error: '' };
+				return { ok: false, error: new Error() };
 			}
 
 			try {

diff --git a/packages/editor-ui/src/utils/expressions.ts b/packages/editor-ui/src/utils/expressions.ts
@@ -111,15 +111,13 @@ export const getExpressionErrorMessage = (error: Error): string => {
 	return error.message;
 };
 
-export const stringifyExpressionResult = (result: Result<unknown, unknown>): string => {
+export const stringifyExpressionResult = (result: Result<unknown, Error>): string => {
 	if (!result.ok) {
 		if (getResolvableState(result.error) !== 'invalid') {
 			return '';
 		}
 
-		return `[${i18n.baseText('parameterInput.error')}: ${getExpressionErrorMessage(
-			result.error as Error,
-		)}]`;
+		return `[${i18n.baseText('parameterInput.error')}: ${getExpressionErrorMessage(result.error)}]`;
 	}
 
 	if (result.result === null) {