mudhorn/n8n
1
0
Fork 0
mirror of https://github.com/n8n-io/n8n.git synced 2025-01-11 12:57:29 -08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

⚡ Make it possible to read sibling parameter

Browse source
This commit is contained in:
Jan Oberhauser 2021-05-14 18:16:48 -05:00
parent 6cf5e3c974
commit 1aa0a5cc8d
4 changed files with 33 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
packages/core/src/NodeExecuteFunctions.ts
View file

@ -691,7 +691,7 @@ export function getExecuteFunctions(workflow: Workflow, runExecutionData: IRunEx
return continueOnFail(node); return continueOnFail(node);
}, },
evaluateExpression: (expression: string, itemIndex: number) => { evaluateExpression: (expression: string, itemIndex: number) => {
return workflow.expression.resolveSimpleParameterValue('=' + expression, runExecutionData, runIndex, itemIndex, node.name, connectionInputData, mode); return workflow.expression.resolveSimpleParameterValue('=' + expression, {}, runExecutionData, runIndex, itemIndex, node.name, connectionInputData, mode);
}, },
async executeWorkflow(workflowInfo: IExecuteWorkflowInfo, inputData?: INodeExecutionData[]): Promise<any> { // tslint:disable-line:no-any async executeWorkflow(workflowInfo: IExecuteWorkflowInfo, inputData?: INodeExecutionData[]): Promise<any> { // tslint:disable-line:no-any
return additionalData.executeWorkflow(workflowInfo, additionalData, inputData); return additionalData.executeWorkflow(workflowInfo, additionalData, inputData);
@ -742,7 +742,7 @@ export function getExecuteFunctions(workflow: Workflow, runExecutionData: IRunEx
return getWorkflowMetadata(workflow); return getWorkflowMetadata(workflow);
}, },
getWorkflowDataProxy: (itemIndex: number): IWorkflowDataProxyData => { getWorkflowDataProxy: (itemIndex: number): IWorkflowDataProxyData => {
const dataProxy = new WorkflowDataProxy(workflow, runExecutionData, runIndex, itemIndex, node.name, connectionInputData, mode); const dataProxy = new WorkflowDataProxy(workflow, runExecutionData, runIndex, itemIndex, node.name, connectionInputData, {}, mode);
return dataProxy.getDataProxy(); return dataProxy.getDataProxy();
}, },
getWorkflowStaticData(type: string): IDataObject { getWorkflowStaticData(type: string): IDataObject {
@ -789,7 +789,7 @@ export function getExecuteSingleFunctions(workflow: Workflow, runExecutionData:
}, },
evaluateExpression: (expression: string, evaluateItemIndex: number | undefined) => { evaluateExpression: (expression: string, evaluateItemIndex: number | undefined) => {
evaluateItemIndex = evaluateItemIndex === undefined ? itemIndex : evaluateItemIndex; evaluateItemIndex = evaluateItemIndex === undefined ? itemIndex : evaluateItemIndex;
return workflow.expression.resolveSimpleParameterValue('=' + expression, runExecutionData, runIndex, evaluateItemIndex, node.name, connectionInputData, mode); return workflow.expression.resolveSimpleParameterValue('=' + expression, {}, runExecutionData, runIndex, evaluateItemIndex, node.name, connectionInputData, mode);
}, },
getContext(type: string): IContextObject { getContext(type: string): IContextObject {
return NodeHelpers.getContext(runExecutionData, type, node); return NodeHelpers.getContext(runExecutionData, type, node);
@ -841,7 +841,7 @@ export function getExecuteSingleFunctions(workflow: Workflow, runExecutionData:
return getWorkflowMetadata(workflow); return getWorkflowMetadata(workflow);
}, },
getWorkflowDataProxy: (): IWorkflowDataProxyData => { getWorkflowDataProxy: (): IWorkflowDataProxyData => {
const dataProxy = new WorkflowDataProxy(workflow, runExecutionData, runIndex, itemIndex, node.name, connectionInputData, mode); const dataProxy = new WorkflowDataProxy(workflow, runExecutionData, runIndex, itemIndex, node.name, connectionInputData, {}, mode);
return dataProxy.getDataProxy(); return dataProxy.getDataProxy();
}, },
getWorkflowStaticData(type: string): IDataObject { getWorkflowStaticData(type: string): IDataObject {

2
packages/editor-ui/src/components/VariableSelector.vue
View file

@ -379,7 +379,7 @@ export default mixins(
return returnData; return returnData;
} }
const dataProxy = new WorkflowDataProxy(workflow, runExecutionData, runIndex, itemIndex, nodeName, connectionInputData, 'manual'); const dataProxy = new WorkflowDataProxy(workflow, runExecutionData, runIndex, itemIndex, nodeName, connectionInputData, {}, 'manual');
const proxy = dataProxy.getDataProxy(); const proxy = dataProxy.getDataProxy();
// @ts-ignore // @ts-ignore

14
packages/workflow/src/Expression.ts
View file

@ -59,7 +59,7 @@ export class Expression {
* @returns {(NodeParameterValue | INodeParameters | NodeParameterValue[] | INodeParameters[])} * @returns {(NodeParameterValue | INodeParameters | NodeParameterValue[] | INodeParameters[])}
* @memberof Workflow * @memberof Workflow
*/ */
resolveSimpleParameterValue(parameterValue: NodeParameterValue, runExecutionData: IRunExecutionData | null, runIndex: number, itemIndex: number, activeNodeName: string, connectionInputData: INodeExecutionData[], mode: WorkflowExecuteMode, returnObjectAsString = false, selfData = {}): NodeParameterValue | INodeParameters | NodeParameterValue[] | INodeParameters[] { resolveSimpleParameterValue(parameterValue: NodeParameterValue, siblingParameters: INodeParameters, runExecutionData: IRunExecutionData | null, runIndex: number, itemIndex: number, activeNodeName: string, connectionInputData: INodeExecutionData[], mode: WorkflowExecuteMode, returnObjectAsString = false, selfData = {}): NodeParameterValue | INodeParameters | NodeParameterValue[] | INodeParameters[] {
// Check if it is an expression // Check if it is an expression
if (typeof parameterValue !== 'string' || parameterValue.charAt(0) !== '=') { if (typeof parameterValue !== 'string' || parameterValue.charAt(0) !== '=') {
// Is no expression so return value // Is no expression so return value
@ -72,7 +72,7 @@ export class Expression {
parameterValue = parameterValue.substr(1); parameterValue = parameterValue.substr(1);
// Generate a data proxy which allows to query workflow data // Generate a data proxy which allows to query workflow data
const dataProxy = new WorkflowDataProxy(this.workflow, runExecutionData, runIndex, itemIndex, activeNodeName, connectionInputData, mode, -1, selfData); const dataProxy = new WorkflowDataProxy(this.workflow, runExecutionData, runIndex, itemIndex, activeNodeName, connectionInputData, siblingParameters, mode, -1, selfData);
const data = dataProxy.getDataProxy(); const data = dataProxy.getDataProxy();
// Execute the expression // Execute the expression
@ -179,17 +179,17 @@ export class Expression {
}; };
// Helper function which resolves a parameter value depending on if it is simply or not // Helper function which resolves a parameter value depending on if it is simply or not
const resolveParameterValue = (value: NodeParameterValue | INodeParameters | NodeParameterValue[] | INodeParameters[]) => { const resolveParameterValue = (value: NodeParameterValue | INodeParameters | NodeParameterValue[] | INodeParameters[], siblingParameters: INodeParameters) => {
if (isComplexParameter(value)) { if (isComplexParameter(value)) {
return this.getParameterValue(value, runExecutionData, runIndex, itemIndex, activeNodeName, connectionInputData, mode, returnObjectAsString, selfData); return this.getParameterValue(value, runExecutionData, runIndex, itemIndex, activeNodeName, connectionInputData, mode, returnObjectAsString, selfData);
} else { } else {
return this.resolveSimpleParameterValue(value as NodeParameterValue, runExecutionData, runIndex, itemIndex, activeNodeName, connectionInputData, mode, returnObjectAsString, selfData); return this.resolveSimpleParameterValue(value as NodeParameterValue, siblingParameters, runExecutionData, runIndex, itemIndex, activeNodeName, connectionInputData, mode, returnObjectAsString, selfData);
} }
}; };
// Check if it value is a simple one that we can get it resolved directly // Check if it value is a simple one that we can get it resolved directly
if (!isComplexParameter(parameterValue)) { if (!isComplexParameter(parameterValue)) {
return this.resolveSimpleParameterValue(parameterValue as NodeParameterValue, runExecutionData, runIndex, itemIndex, activeNodeName, connectionInputData, mode, returnObjectAsString, selfData); return this.resolveSimpleParameterValue(parameterValue as NodeParameterValue, {}, runExecutionData, runIndex, itemIndex, activeNodeName, connectionInputData, mode, returnObjectAsString, selfData);
} }
// The parameter value is complex so resolve depending on type // The parameter value is complex so resolve depending on type
@ -198,7 +198,7 @@ export class Expression {
// Data is an array // Data is an array
const returnData = []; const returnData = [];
for (const item of parameterValue) { for (const item of parameterValue) {
returnData.push(resolveParameterValue(item)); returnData.push(resolveParameterValue(item, {}));
} }
if (returnObjectAsString === true && typeof returnData === 'object') { if (returnObjectAsString === true && typeof returnData === 'object') {
@ -212,7 +212,7 @@ export class Expression {
// Data is an object // Data is an object
const returnData: INodeParameters = {}; const returnData: INodeParameters = {};
for (const key of Object.keys(parameterValue)) { for (const key of Object.keys(parameterValue)) {
returnData[key] = resolveParameterValue((parameterValue as INodeParameters)[key]); returnData[key] = resolveParameterValue((parameterValue as INodeParameters)[key], parameterValue as INodeParameters);
} }
if (returnObjectAsString === true && typeof returnData === 'object') { if (returnObjectAsString === true && typeof returnData === 'object') {

28
packages/workflow/src/WorkflowDataProxy.ts
View file

@ -1,9 +1,11 @@
import { import {
IDataObject, IDataObject,
INodeExecutionData, INodeExecutionData,
INodeParameters,
IRunExecutionData, IRunExecutionData,
IWorkflowDataProxyData, IWorkflowDataProxyData,
NodeHelpers, NodeHelpers,
NodeParameterValue,
Workflow, Workflow,
WorkflowExecuteMode, WorkflowExecuteMode,
} from './'; } from './';
@ -18,12 +20,13 @@ export class WorkflowDataProxy {
private itemIndex: number; private itemIndex: number;
private activeNodeName: string; private activeNodeName: string;
private connectionInputData: INodeExecutionData[]; private connectionInputData: INodeExecutionData[];
private siblingParameters: INodeParameters;
private mode: WorkflowExecuteMode; private mode: WorkflowExecuteMode;
private selfData: IDataObject; private selfData: IDataObject;
constructor(workflow: Workflow, runExecutionData: IRunExecutionData | null, runIndex: number, itemIndex: number, activeNodeName: string, connectionInputData: INodeExecutionData[], mode: WorkflowExecuteMode, defaultReturnRunIndex = -1, selfData = {}) { constructor(workflow: Workflow, runExecutionData: IRunExecutionData | null, runIndex: number, itemIndex: number, activeNodeName: string, connectionInputData: INodeExecutionData[], siblingParameters: INodeParameters, mode: WorkflowExecuteMode, defaultReturnRunIndex = -1, selfData = {}) {
this.workflow = workflow; this.workflow = workflow;
this.runExecutionData = runExecutionData; this.runExecutionData = runExecutionData;
this.defaultReturnRunIndex = defaultReturnRunIndex; this.defaultReturnRunIndex = defaultReturnRunIndex;
@ -31,6 +34,7 @@ export class WorkflowDataProxy {
this.itemIndex = itemIndex; this.itemIndex = itemIndex;
this.activeNodeName = activeNodeName; this.activeNodeName = activeNodeName;
this.connectionInputData = connectionInputData; this.connectionInputData = connectionInputData;
this.siblingParameters = siblingParameters;
this.mode = mode; this.mode = mode;
this.selfData = selfData; this.selfData = selfData;
} }
@ -108,12 +112,22 @@ export class WorkflowDataProxy {
get(target, name, receiver) { get(target, name, receiver) {
name = name.toString(); name = name.toString();
if (!node.parameters.hasOwnProperty(name)) { let returnValue: INodeParameters | NodeParameterValue | NodeParameterValue[] | INodeParameters[];
// Parameter does not exist on node if (name[0] === '/') {
throw new Error(`Could not find parameter "${name}" on node "${nodeName}"`); const key = name.slice(1);
} if (!that.siblingParameters.hasOwnProperty(key)) {
throw new Error(`Could not find sibling parameter "${key}" on node "${nodeName}"`);
const returnValue = node.parameters[name]; }
returnValue = that.siblingParameters[key];
} else {
if (!node.parameters.hasOwnProperty(name)) {
// Parameter does not exist on node
throw new Error(`Could not find parameter "${name}" on node "${nodeName}"`);
}
returnValue = node.parameters[name];
}
if (typeof returnValue === 'string' && returnValue.charAt(0) === '=') { if (typeof returnValue === 'string' && returnValue.charAt(0) === '=') {
// The found value is an expression so resolve it // The found value is an expression so resolve it
@ -361,7 +375,7 @@ export class WorkflowDataProxy {
}, },
$item: (itemIndex: number, runIndex?: number) => { $item: (itemIndex: number, runIndex?: number) => {
const defaultReturnRunIndex = runIndex === undefined ? -1 : runIndex; const defaultReturnRunIndex = runIndex === undefined ? -1 : runIndex;
const dataProxy = new WorkflowDataProxy(this.workflow, this.runExecutionData, this.runIndex, itemIndex, this.activeNodeName, this.connectionInputData, that.mode, defaultReturnRunIndex); const dataProxy = new WorkflowDataProxy(this.workflow, this.runExecutionData, this.runIndex, itemIndex, this.activeNodeName, this.connectionInputData, that.siblingParameters, that.mode, defaultReturnRunIndex);
return dataProxy.getDataProxy(); return dataProxy.getDataProxy();
}, },
$items: (nodeName?: string, outputIndex?: number, runIndex?: number) => { $items: (nodeName?: string, outputIndex?: number, runIndex?: number) => {