n8n-workflow
Advanced tools
Comparing version 0.64.0 to 0.65.0
@@ -1,2 +0,2 @@ | ||
import { INode, INodeExecutionData, INodeParameters, IRunExecutionData, NodeParameterValue, Workflow, WorkflowExecuteMode } from './'; | ||
import { INode, INodeExecutionData, INodeParameters, IRunExecutionData, IWorkflowDataProxyAdditionalKeys, NodeParameterValue, Workflow, WorkflowExecuteMode } from './'; | ||
export declare class Expression { | ||
@@ -6,6 +6,6 @@ workflow: Workflow; | ||
convertObjectValueToString(value: object): string; | ||
resolveSimpleParameterValue(parameterValue: NodeParameterValue, siblingParameters: INodeParameters, runExecutionData: IRunExecutionData | null, runIndex: number, itemIndex: number, activeNodeName: string, connectionInputData: INodeExecutionData[], mode: WorkflowExecuteMode, returnObjectAsString?: boolean, selfData?: {}): NodeParameterValue | INodeParameters | NodeParameterValue[] | INodeParameters[]; | ||
getSimpleParameterValue(node: INode, parameterValue: string | boolean | undefined, mode: WorkflowExecuteMode, defaultValue?: boolean | number | string): boolean | number | string | undefined; | ||
getComplexParameterValue(node: INode, parameterValue: NodeParameterValue | INodeParameters | NodeParameterValue[] | INodeParameters[], mode: WorkflowExecuteMode, defaultValue?: NodeParameterValue | INodeParameters | NodeParameterValue[] | INodeParameters[] | undefined, selfData?: {}): NodeParameterValue | INodeParameters | NodeParameterValue[] | INodeParameters[] | undefined; | ||
getParameterValue(parameterValue: NodeParameterValue | INodeParameters | NodeParameterValue[] | INodeParameters[], runExecutionData: IRunExecutionData | null, runIndex: number, itemIndex: number, activeNodeName: string, connectionInputData: INodeExecutionData[], mode: WorkflowExecuteMode, returnObjectAsString?: boolean, selfData?: {}): NodeParameterValue | INodeParameters | NodeParameterValue[] | INodeParameters[]; | ||
resolveSimpleParameterValue(parameterValue: NodeParameterValue, siblingParameters: INodeParameters, runExecutionData: IRunExecutionData | null, runIndex: number, itemIndex: number, activeNodeName: string, connectionInputData: INodeExecutionData[], mode: WorkflowExecuteMode, additionalKeys: IWorkflowDataProxyAdditionalKeys, returnObjectAsString?: boolean, selfData?: {}): NodeParameterValue | INodeParameters | NodeParameterValue[] | INodeParameters[]; | ||
getSimpleParameterValue(node: INode, parameterValue: string | boolean | undefined, mode: WorkflowExecuteMode, additionalKeys: IWorkflowDataProxyAdditionalKeys, defaultValue?: boolean | number | string): boolean | number | string | undefined; | ||
getComplexParameterValue(node: INode, parameterValue: NodeParameterValue | INodeParameters | NodeParameterValue[] | INodeParameters[], mode: WorkflowExecuteMode, additionalKeys: IWorkflowDataProxyAdditionalKeys, defaultValue?: NodeParameterValue | INodeParameters | NodeParameterValue[] | INodeParameters[] | undefined, selfData?: {}): NodeParameterValue | INodeParameters | NodeParameterValue[] | INodeParameters[] | undefined; | ||
getParameterValue(parameterValue: NodeParameterValue | INodeParameters | NodeParameterValue[] | INodeParameters[], runExecutionData: IRunExecutionData | null, runIndex: number, itemIndex: number, activeNodeName: string, connectionInputData: INodeExecutionData[], mode: WorkflowExecuteMode, additionalKeys: IWorkflowDataProxyAdditionalKeys, returnObjectAsString?: boolean, selfData?: {}): NodeParameterValue | INodeParameters | NodeParameterValue[] | INodeParameters[]; | ||
} |
@@ -16,3 +16,3 @@ "use strict"; | ||
} | ||
resolveSimpleParameterValue(parameterValue, siblingParameters, runExecutionData, runIndex, itemIndex, activeNodeName, connectionInputData, mode, returnObjectAsString = false, selfData = {}) { | ||
resolveSimpleParameterValue(parameterValue, siblingParameters, runExecutionData, runIndex, itemIndex, activeNodeName, connectionInputData, mode, additionalKeys, returnObjectAsString = false, selfData = {}) { | ||
if (typeof parameterValue !== 'string' || parameterValue.charAt(0) !== '=') { | ||
@@ -22,3 +22,3 @@ return parameterValue; | ||
parameterValue = parameterValue.substr(1); | ||
const dataProxy = new _1.WorkflowDataProxy(this.workflow, runExecutionData, runIndex, itemIndex, activeNodeName, connectionInputData, siblingParameters, mode, -1, selfData); | ||
const dataProxy = new _1.WorkflowDataProxy(this.workflow, runExecutionData, runIndex, itemIndex, activeNodeName, connectionInputData, siblingParameters, mode, additionalKeys, -1, selfData); | ||
const data = dataProxy.getDataProxy(); | ||
@@ -41,3 +41,3 @@ try { | ||
} | ||
getSimpleParameterValue(node, parameterValue, mode, defaultValue) { | ||
getSimpleParameterValue(node, parameterValue, mode, additionalKeys, defaultValue) { | ||
if (parameterValue === undefined) { | ||
@@ -54,5 +54,5 @@ return defaultValue; | ||
}; | ||
return this.getParameterValue(parameterValue, runData, runIndex, itemIndex, node.name, connectionInputData, mode); | ||
return this.getParameterValue(parameterValue, runData, runIndex, itemIndex, node.name, connectionInputData, mode, additionalKeys); | ||
} | ||
getComplexParameterValue(node, parameterValue, mode, defaultValue = undefined, selfData = {}) { | ||
getComplexParameterValue(node, parameterValue, mode, additionalKeys, defaultValue = undefined, selfData = {}) { | ||
if (parameterValue === undefined) { | ||
@@ -69,6 +69,6 @@ return defaultValue; | ||
}; | ||
const returnData = this.getParameterValue(parameterValue, runData, runIndex, itemIndex, node.name, connectionInputData, mode, false, selfData); | ||
return this.getParameterValue(returnData, runData, runIndex, itemIndex, node.name, connectionInputData, mode, false, selfData); | ||
const returnData = this.getParameterValue(parameterValue, runData, runIndex, itemIndex, node.name, connectionInputData, mode, additionalKeys, false, selfData); | ||
return this.getParameterValue(returnData, runData, runIndex, itemIndex, node.name, connectionInputData, mode, additionalKeys, false, selfData); | ||
} | ||
getParameterValue(parameterValue, runExecutionData, runIndex, itemIndex, activeNodeName, connectionInputData, mode, returnObjectAsString = false, selfData = {}) { | ||
getParameterValue(parameterValue, runExecutionData, runIndex, itemIndex, activeNodeName, connectionInputData, mode, additionalKeys, returnObjectAsString = false, selfData = {}) { | ||
const isComplexParameter = (value) => { | ||
@@ -79,10 +79,10 @@ return typeof value === 'object'; | ||
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, additionalKeys, returnObjectAsString, selfData); | ||
} | ||
else { | ||
return this.resolveSimpleParameterValue(value, siblingParameters, runExecutionData, runIndex, itemIndex, activeNodeName, connectionInputData, mode, returnObjectAsString, selfData); | ||
return this.resolveSimpleParameterValue(value, siblingParameters, runExecutionData, runIndex, itemIndex, activeNodeName, connectionInputData, mode, additionalKeys, returnObjectAsString, selfData); | ||
} | ||
}; | ||
if (!isComplexParameter(parameterValue)) { | ||
return this.resolveSimpleParameterValue(parameterValue, {}, runExecutionData, runIndex, itemIndex, activeNodeName, connectionInputData, mode, returnObjectAsString, selfData); | ||
return this.resolveSimpleParameterValue(parameterValue, {}, runExecutionData, runIndex, itemIndex, activeNodeName, connectionInputData, mode, additionalKeys, returnObjectAsString, selfData); | ||
} | ||
@@ -89,0 +89,0 @@ if (Array.isArray(parameterValue)) { |
@@ -71,6 +71,5 @@ import { Workflow } from './Workflow'; | ||
encryptionKey: string; | ||
workflowCredentials: IWorkflowCredentials; | ||
constructor(workflowCredentials: IWorkflowCredentials, encryptionKey: string); | ||
abstract getCredentials(name: string, type: string): ICredentials; | ||
abstract getDecrypted(name: string, type: string, mode: WorkflowExecuteMode, raw?: boolean, expressionResolveValues?: ICredentialsExpressionResolveValues): ICredentialDataDecryptedObject; | ||
constructor(encryptionKey: string); | ||
abstract getCredentials(name: string, type: string): Promise<ICredentials>; | ||
abstract getDecrypted(name: string, type: string, mode: WorkflowExecuteMode, raw?: boolean, expressionResolveValues?: ICredentialsExpressionResolveValues): Promise<ICredentialDataDecryptedObject>; | ||
abstract updateCredentials(name: string, type: string, data: ICredentialDataDecryptedObject): Promise<void>; | ||
@@ -149,3 +148,3 @@ } | ||
getContext(type: string): IContextObject; | ||
getCredentials(type: string, itemIndex?: number): ICredentialDataDecryptedObject | undefined; | ||
getCredentials(type: string, itemIndex?: number): Promise<ICredentialDataDecryptedObject | undefined>; | ||
getInputData(inputIndex?: number, inputName?: string): INodeExecutionData[]; | ||
@@ -161,2 +160,3 @@ getMode(): WorkflowExecuteMode; | ||
prepareOutputData(outputData: INodeExecutionData[], outputIndex?: number): Promise<INodeExecutionData[][]>; | ||
putExecutionToWait(waitTill: Date): Promise<void>; | ||
sendMessageToUI(message: any): void; | ||
@@ -171,3 +171,3 @@ helpers: { | ||
getContext(type: string): IContextObject; | ||
getCredentials(type: string): ICredentialDataDecryptedObject | undefined; | ||
getCredentials(type: string): Promise<ICredentialDataDecryptedObject | undefined>; | ||
getInputData(inputIndex?: number, inputName?: string): INodeExecutionData; | ||
@@ -191,3 +191,3 @@ getMode(): WorkflowExecuteMode; | ||
export interface ILoadOptionsFunctions { | ||
getCredentials(type: string): ICredentialDataDecryptedObject | undefined; | ||
getCredentials(type: string): Promise<ICredentialDataDecryptedObject | undefined>; | ||
getNode(): INode; | ||
@@ -204,3 +204,3 @@ getNodeParameter(parameterName: string, fallbackValue?: any): NodeParameterValue | INodeParameters | NodeParameterValue[] | INodeParameters[] | object; | ||
export interface IHookFunctions { | ||
getCredentials(type: string): ICredentialDataDecryptedObject | undefined; | ||
getCredentials(type: string): Promise<ICredentialDataDecryptedObject | undefined>; | ||
getMode(): WorkflowExecuteMode; | ||
@@ -222,3 +222,3 @@ getActivationMode(): WorkflowActivateMode; | ||
__emit(data: INodeExecutionData[][]): void; | ||
getCredentials(type: string): ICredentialDataDecryptedObject | undefined; | ||
getCredentials(type: string): Promise<ICredentialDataDecryptedObject | undefined>; | ||
getMode(): WorkflowExecuteMode; | ||
@@ -238,3 +238,3 @@ getActivationMode(): WorkflowActivateMode; | ||
emit(data: INodeExecutionData[][]): void; | ||
getCredentials(type: string): ICredentialDataDecryptedObject | undefined; | ||
getCredentials(type: string): Promise<ICredentialDataDecryptedObject | undefined>; | ||
getMode(): WorkflowExecuteMode; | ||
@@ -254,3 +254,3 @@ getActivationMode(): WorkflowActivateMode; | ||
getBodyData(): IDataObject; | ||
getCredentials(type: string): ICredentialDataDecryptedObject | undefined; | ||
getCredentials(type: string): Promise<ICredentialDataDecryptedObject | undefined>; | ||
getHeaderData(): object; | ||
@@ -322,3 +322,3 @@ getMode(): WorkflowExecuteMode; | ||
} | ||
export declare type NodePropertyTypes = 'boolean' | 'collection' | 'color' | 'dateTime' | 'fixedCollection' | 'hidden' | 'json' | 'multiOptions' | 'number' | 'options' | 'string'; | ||
export declare type NodePropertyTypes = 'boolean' | 'collection' | 'color' | 'dateTime' | 'fixedCollection' | 'hidden' | 'json' | 'notice' | 'multiOptions' | 'number' | 'options' | 'string'; | ||
export declare type EditorTypes = 'code'; | ||
@@ -484,2 +484,3 @@ export interface INodePropertyTypeOptions { | ||
responseData?: WebhookResponseData | string; | ||
restartWebhook?: boolean; | ||
} | ||
@@ -499,2 +500,5 @@ export interface IWorkflowDataProxyData { | ||
} | ||
export interface IWorkflowDataProxyAdditionalKeys { | ||
[key: string]: string | number | undefined; | ||
} | ||
export interface IWorkflowMetadata { | ||
@@ -529,2 +533,3 @@ id?: number | string; | ||
mode: WorkflowExecuteMode; | ||
waitTill?: Date; | ||
startedAt: Date; | ||
@@ -548,2 +553,3 @@ stoppedAt?: Date; | ||
}; | ||
waitTill?: Date; | ||
} | ||
@@ -591,6 +597,6 @@ export interface IRunData { | ||
export interface IWorkflowExecuteAdditionalData { | ||
credentials: IWorkflowCredentials; | ||
credentialsHelper: ICredentialsHelper; | ||
encryptionKey: string; | ||
executeWorkflow: (workflowInfo: IExecuteWorkflowInfo, additionalData: IWorkflowExecuteAdditionalData, inputData?: INodeExecutionData[], parentExecutionId?: string, loadedWorkflowData?: IWorkflowBase, loadedRunData?: any) => Promise<any>; | ||
executionId?: string; | ||
hooks?: WorkflowHooks; | ||
@@ -603,2 +609,3 @@ httpResponse?: express.Response; | ||
webhookBaseUrl: string; | ||
webhookWaitingBaseUrl: string; | ||
webhookTestBaseUrl: string; | ||
@@ -605,0 +612,0 @@ currentNodeParameters?: INodeParameters; |
@@ -14,5 +14,4 @@ "use strict"; | ||
class ICredentialsHelper { | ||
constructor(workflowCredentials, encryptionKey) { | ||
constructor(encryptionKey) { | ||
this.encryptionKey = encryptionKey; | ||
this.workflowCredentials = workflowCredentials; | ||
} | ||
@@ -19,0 +18,0 @@ } |
@@ -104,5 +104,5 @@ import { IContextObject, INode, INodeCredentialDescription, INodeExecutionData, INodeIssues, INodeParameters, INodeProperties, INodeType, IParameterDependencies, IRunExecutionData, IWebhookData, IWorkflowExecuteAdditionalData, NodeParameterValue } from './Interfaces'; | ||
export declare function prepareOutputData(outputData: INodeExecutionData[], outputIndex?: number): Promise<INodeExecutionData[][]>; | ||
export declare function getNodeWebhooks(workflow: Workflow, node: INode, additionalData: IWorkflowExecuteAdditionalData): IWebhookData[]; | ||
export declare function getNodeWebhooks(workflow: Workflow, node: INode, additionalData: IWorkflowExecuteAdditionalData, ignoreRestartWehbooks?: boolean): IWebhookData[]; | ||
export declare function getNodeWebhooksBasic(workflow: Workflow, node: INode): IWebhookData[]; | ||
export declare function getNodeWebhookPath(workflowId: string, node: INode, path: string, isFullPath?: boolean): string; | ||
export declare function getNodeWebhookPath(workflowId: string, node: INode, path: string, isFullPath?: boolean, restartWebhook?: boolean): string; | ||
export declare function getNodeWebhookUrl(baseUrl: string, workflowId: string, node: INode, path: string, isFullPath?: boolean): string; | ||
@@ -109,0 +109,0 @@ export declare function getNodeParametersIssues(nodePropertiesArray: INodeProperties[], node: INode): INodeIssues | null; |
@@ -543,3 +543,3 @@ "use strict"; | ||
exports.prepareOutputData = prepareOutputData; | ||
function getNodeWebhooks(workflow, node, additionalData) { | ||
function getNodeWebhooks(workflow, node, additionalData, ignoreRestartWehbooks = false) { | ||
if (node.disabled === true) { | ||
@@ -556,3 +556,6 @@ return []; | ||
for (const webhookDescription of nodeType.description.webhooks) { | ||
let nodeWebhookPath = workflow.expression.getSimpleParameterValue(node, webhookDescription['path'], mode); | ||
if (ignoreRestartWehbooks === true && webhookDescription.restartWebhook === true) { | ||
continue; | ||
} | ||
let nodeWebhookPath = workflow.expression.getSimpleParameterValue(node, webhookDescription['path'], mode, {}); | ||
if (nodeWebhookPath === undefined) { | ||
@@ -569,5 +572,6 @@ console.error(`No webhook path could be found for node "${node.name}" in workflow "${workflowId}".`); | ||
} | ||
const isFullPath = workflow.expression.getSimpleParameterValue(node, webhookDescription['isFullPath'], 'internal', false); | ||
const path = getNodeWebhookPath(workflowId, node, nodeWebhookPath, isFullPath); | ||
const httpMethod = workflow.expression.getSimpleParameterValue(node, webhookDescription['httpMethod'], mode, 'GET'); | ||
const isFullPath = workflow.expression.getSimpleParameterValue(node, webhookDescription['isFullPath'], 'internal', {}, false); | ||
const restartWebhook = workflow.expression.getSimpleParameterValue(node, webhookDescription['restartWebhook'], 'internal', {}, false); | ||
const path = getNodeWebhookPath(workflowId, node, nodeWebhookPath, isFullPath, restartWebhook); | ||
const httpMethod = workflow.expression.getSimpleParameterValue(node, webhookDescription['httpMethod'], mode, {}, 'GET'); | ||
if (httpMethod === undefined) { | ||
@@ -606,3 +610,3 @@ console.error(`The webhook "${path}" for node "${node.name}" in workflow "${workflowId}" could not be added because the httpMethod is not defined.`); | ||
for (const webhookDescription of nodeType.description.webhooks) { | ||
let nodeWebhookPath = workflow.expression.getSimpleParameterValue(node, webhookDescription['path'], mode); | ||
let nodeWebhookPath = workflow.expression.getSimpleParameterValue(node, webhookDescription['path'], mode, {}); | ||
if (nodeWebhookPath === undefined) { | ||
@@ -619,5 +623,5 @@ console.error(`No webhook path could be found for node "${node.name}" in workflow "${workflowId}".`); | ||
} | ||
const isFullPath = workflow.expression.getSimpleParameterValue(node, webhookDescription['isFullPath'], mode, false); | ||
const isFullPath = workflow.expression.getSimpleParameterValue(node, webhookDescription['isFullPath'], mode, {}, false); | ||
const path = getNodeWebhookPath(workflowId, node, nodeWebhookPath, isFullPath); | ||
const httpMethod = workflow.expression.getSimpleParameterValue(node, webhookDescription['httpMethod'], mode); | ||
const httpMethod = workflow.expression.getSimpleParameterValue(node, webhookDescription['httpMethod'], mode, {}); | ||
if (httpMethod === undefined) { | ||
@@ -638,5 +642,8 @@ console.error(`The webhook "${path}" for node "${node.name}" in workflow "${workflowId}" could not be added because the httpMethod is not defined.`); | ||
exports.getNodeWebhooksBasic = getNodeWebhooksBasic; | ||
function getNodeWebhookPath(workflowId, node, path, isFullPath) { | ||
function getNodeWebhookPath(workflowId, node, path, isFullPath, restartWebhook) { | ||
let webhookPath = ''; | ||
if (node.webhookId === undefined) { | ||
if (restartWebhook === true) { | ||
return path; | ||
} | ||
else if (node.webhookId === undefined) { | ||
webhookPath = `${workflowId}/${encodeURIComponent(node.name.toLowerCase())}/${path}`; | ||
@@ -643,0 +650,0 @@ } |
@@ -305,2 +305,10 @@ "use strict"; | ||
getNodeConnectionOutputIndex(nodeName, parentNodeName, type = 'main', depth = -1, checkedNodes) { | ||
const node = this.getNode(parentNodeName); | ||
if (node === null) { | ||
return undefined; | ||
} | ||
const nodeType = this.nodeTypes.getByName(node.type); | ||
if (nodeType.description.outputs.length === 1) { | ||
return 0; | ||
} | ||
depth = depth === -1 ? -1 : depth; | ||
@@ -329,3 +337,3 @@ const newDepth = depth === -1 ? depth : depth - 1; | ||
if (checkedNodes.includes(connection.node)) { | ||
return; | ||
continue; | ||
} | ||
@@ -332,0 +340,0 @@ outputIndex = this.getNodeConnectionOutputIndex(connection.node, parentNodeName, type, newDepth, checkedNodes); |
@@ -1,2 +0,2 @@ | ||
import { INodeExecutionData, INodeParameters, IRunExecutionData, IWorkflowDataProxyData, Workflow, WorkflowExecuteMode } from './'; | ||
import { INodeExecutionData, INodeParameters, IRunExecutionData, IWorkflowDataProxyAdditionalKeys, IWorkflowDataProxyData, Workflow, WorkflowExecuteMode } from './'; | ||
export declare class WorkflowDataProxy { | ||
@@ -13,3 +13,4 @@ private workflow; | ||
private selfData; | ||
constructor(workflow: Workflow, runExecutionData: IRunExecutionData | null, runIndex: number, itemIndex: number, activeNodeName: string, connectionInputData: INodeExecutionData[], siblingParameters: INodeParameters, mode: WorkflowExecuteMode, defaultReturnRunIndex?: number, selfData?: {}); | ||
private additionalKeys; | ||
constructor(workflow: Workflow, runExecutionData: IRunExecutionData | null, runIndex: number, itemIndex: number, activeNodeName: string, connectionInputData: INodeExecutionData[], siblingParameters: INodeParameters, mode: WorkflowExecuteMode, additionalKeys: IWorkflowDataProxyAdditionalKeys, defaultReturnRunIndex?: number, selfData?: {}); | ||
private nodeContextGetter; | ||
@@ -16,0 +17,0 @@ private selfGetter; |
@@ -6,3 +6,3 @@ "use strict"; | ||
class WorkflowDataProxy { | ||
constructor(workflow, runExecutionData, runIndex, itemIndex, activeNodeName, connectionInputData, siblingParameters, mode, defaultReturnRunIndex = -1, selfData = {}) { | ||
constructor(workflow, runExecutionData, runIndex, itemIndex, activeNodeName, connectionInputData, siblingParameters, mode, additionalKeys, defaultReturnRunIndex = -1, selfData = {}) { | ||
this.workflow = workflow; | ||
@@ -18,2 +18,3 @@ this.runExecutionData = runExecutionData; | ||
this.selfData = selfData; | ||
this.additionalKeys = additionalKeys; | ||
} | ||
@@ -76,3 +77,3 @@ nodeContextGetter(nodeName) { | ||
if (typeof returnValue === 'string' && returnValue.charAt(0) === '=') { | ||
return that.workflow.expression.getParameterValue(returnValue, that.runExecutionData, that.runIndex, that.itemIndex, that.activeNodeName, that.connectionInputData, that.mode); | ||
return that.workflow.expression.getParameterValue(returnValue, that.runExecutionData, that.runIndex, that.itemIndex, that.activeNodeName, that.connectionInputData, that.mode, that.additionalKeys); | ||
} | ||
@@ -206,16 +207,10 @@ return returnValue; | ||
const that = this; | ||
const base = { | ||
$binary: {}, | ||
$data: {}, | ||
$env: this.envGetter(), | ||
$evaluateExpression: (expression, itemIndex) => { | ||
const base = Object.assign({ $binary: {}, $data: {}, $env: this.envGetter(), $evaluateExpression: (expression, itemIndex) => { | ||
itemIndex = itemIndex || that.itemIndex; | ||
return that.workflow.expression.getParameterValue('=' + expression, that.runExecutionData, that.runIndex, itemIndex, that.activeNodeName, that.connectionInputData, that.mode); | ||
}, | ||
$item: (itemIndex, runIndex) => { | ||
return that.workflow.expression.getParameterValue('=' + expression, that.runExecutionData, that.runIndex, itemIndex, that.activeNodeName, that.connectionInputData, that.mode, that.additionalKeys); | ||
}, $item: (itemIndex, runIndex) => { | ||
const defaultReturnRunIndex = runIndex === undefined ? -1 : runIndex; | ||
const dataProxy = new WorkflowDataProxy(this.workflow, this.runExecutionData, this.runIndex, itemIndex, this.activeNodeName, this.connectionInputData, that.siblingParameters, that.mode, defaultReturnRunIndex); | ||
const dataProxy = new WorkflowDataProxy(this.workflow, this.runExecutionData, this.runIndex, itemIndex, this.activeNodeName, this.connectionInputData, that.siblingParameters, that.mode, that.additionalKeys, defaultReturnRunIndex); | ||
return dataProxy.getDataProxy(); | ||
}, | ||
$items: (nodeName, outputIndex, runIndex) => { | ||
}, $items: (nodeName, outputIndex, runIndex) => { | ||
let executionData; | ||
@@ -231,12 +226,3 @@ if (nodeName === undefined) { | ||
return executionData; | ||
}, | ||
$json: {}, | ||
$node: this.nodeGetter(), | ||
$self: this.selfGetter(), | ||
$parameter: this.nodeParameterGetter(this.activeNodeName), | ||
$position: this.itemIndex, | ||
$runIndex: this.runIndex, | ||
$mode: this.mode, | ||
$workflow: this.workflowGetter(), | ||
}; | ||
}, $json: {}, $node: this.nodeGetter(), $self: this.selfGetter(), $parameter: this.nodeParameterGetter(this.activeNodeName), $position: this.itemIndex, $runIndex: this.runIndex, $mode: this.mode, $workflow: this.workflowGetter() }, that.additionalKeys); | ||
return new Proxy(base, { | ||
@@ -243,0 +229,0 @@ get(target, name, receiver) { |
@@ -1018,3 +1018,3 @@ "use strict"; | ||
const parameterValue = nodes.find((node) => node.name === activeNodeName).parameters[parameterName]; | ||
const result = workflow.expression.getParameterValue(parameterValue, runExecutionData, runIndex, itemIndex, activeNodeName, connectionInputData, 'manual'); | ||
const result = workflow.expression.getParameterValue(parameterValue, runExecutionData, runIndex, itemIndex, activeNodeName, connectionInputData, 'manual', {}); | ||
expect(result).toEqual(testData.output[parameterName]); | ||
@@ -1080,3 +1080,3 @@ } | ||
const parameterValue = nodes.find((node) => node.name === activeNodeName).parameters[parameterName]; | ||
const result = workflow.expression.getParameterValue(parameterValue, runExecutionData, runIndex, itemIndex, activeNodeName, connectionInputData, 'manual'); | ||
const result = workflow.expression.getParameterValue(parameterValue, runExecutionData, runIndex, itemIndex, activeNodeName, connectionInputData, 'manual', {}); | ||
expect(result).toEqual({ | ||
@@ -1083,0 +1083,0 @@ string: [ |
{ | ||
"name": "n8n-workflow", | ||
"version": "0.64.0", | ||
"version": "0.65.0", | ||
"description": "Workflow base code of n8n", | ||
@@ -5,0 +5,0 @@ "license": "SEE LICENSE IN LICENSE.md", |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
465709
7377