admin/n8n-enterprise-unlocked
1
0
Fork 0
mirror of https://github.com/Abdulazizzn/n8n-enterprise-unlocked.git synced 2025-12-21 11:49:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(core): Make expression resolution improvements (#4829)

Browse Source 
⚡ Make expression resolution improvements
This commit is contained in:
Iván Ovejero
2022-12-07 12:07:32 +01:00
committed by GitHub
parent 1e4ca1f0d0
commit 0bd13c7173
3 changed files with 59 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
packages/workflow/src/Expression.ts
View File

@@ -254,6 +254,7 @@ export class Expression {
// Execute the expression
const returnValue = this.renderExpression(parameterValue, data);
if (typeof returnValue === 'function') {
if (returnValue.name === '$') throw new Error('invalid syntax');
throw new Error('Expression resolved to a function. Please add "()"');
} else if (typeof returnValue === 'string') {
return returnValue;
@@ -278,12 +279,8 @@ export class Expression {
}
}
if (
error instanceof Error &&
typeof error.message === 'string' &&
error.name === 'SyntaxError'
) {
throw new Error(error.message);
if (error instanceof Error && error.name === 'SyntaxError') {
throw new Error('invalid syntax');
}
}

40
packages/workflow/src/WorkflowDataProxy.ts
View File

@@ -126,6 +126,10 @@ export class WorkflowDataProxy {
const that = this;
const node = this.workflow.nodes[nodeName];
if (!that.runExecutionData?.executionData && that.connectionInputData.length > 1) {
return {}; // incoming connection has pinned data, so stub context object
}
if (!that.runExecutionData?.executionData) {
throw new ExpressionError(
`The workflow hasn't been executed yet, so you can't reference any context data`,
@@ -332,7 +336,7 @@ export class WorkflowDataProxy {
);
if (nodeConnection === undefined) {
throw new ExpressionError(`connect ${that.activeNodeName} to ${nodeName}`, {
throw new ExpressionError(`connect "${that.activeNodeName}" to "${nodeName}"`, {
runIndex: that.runIndex,
itemIndex: that.itemIndex,
});
@@ -569,7 +573,39 @@ export class WorkflowDataProxy {
{},
{
get(target, name, receiver) {
return that.nodeDataGetter(name.toString());
const nodeName = name.toString();
if (that.workflow.getNode(nodeName) === null) {
throw new ExpressionError(`"${nodeName}" node doesn't exist`, {
runIndex: that.runIndex,
itemIndex: that.itemIndex,
failExecution: true,
});
}
if (
nodeName !== that.activeNodeName &&
!that.runExecutionData?.resultData.runData?.hasOwnProperty(nodeName)
) {
throw new ExpressionError(`no data, execute "${nodeName}" node first`, {
runIndex: that.runIndex,
itemIndex: that.itemIndex,
failExecution: true,
});
}
if (
nodeName !== that.activeNodeName &&
!that.workflow.getNodeConnectionIndexes(that.activeNodeName, nodeName, 'main')
) {
throw new ExpressionError(`connect "${that.activeNodeName}" to "${nodeName}"`, {
runIndex: that.runIndex,
itemIndex: that.itemIndex,
failExecution: true,
});
}
return that.nodeDataGetter(nodeName);
},
},
);