n8n-workflow 0.101.0 → 0.104.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/src/Expression.d.ts +5 -5
- package/dist/src/Expression.js +33 -25
- package/dist/src/Expression.js.map +1 -1
- package/dist/src/ExpressionError.d.ts +12 -0
- package/dist/src/ExpressionError.js +30 -0
- package/dist/src/ExpressionError.js.map +1 -0
- package/dist/src/Interfaces.d.ts +50 -4
- package/dist/src/Interfaces.js +6 -1
- package/dist/src/Interfaces.js.map +1 -1
- package/dist/src/NodeErrors.d.ts +13 -5
- package/dist/src/NodeErrors.js +25 -5
- package/dist/src/NodeErrors.js.map +1 -1
- package/dist/src/NodeHelpers.js +4 -4
- package/dist/src/NodeHelpers.js.map +1 -1
- package/dist/src/RoutingNode.d.ts +3 -3
- package/dist/src/RoutingNode.js +21 -19
- package/dist/src/RoutingNode.js.map +1 -1
- package/dist/src/Workflow.d.ts +4 -4
- package/dist/src/Workflow.js +14 -12
- package/dist/src/Workflow.js.map +1 -1
- package/dist/src/WorkflowActivationError.d.ts +5 -0
- package/dist/src/WorkflowActivationError.js +17 -0
- package/dist/src/WorkflowActivationError.js.map +1 -0
- package/dist/src/WorkflowDataProxy.d.ts +3 -2
- package/dist/src/WorkflowDataProxy.js +206 -22
- package/dist/src/WorkflowDataProxy.js.map +1 -1
- package/dist/src/index.d.ts +2 -0
- package/dist/src/index.js +2 -0
- package/dist/src/index.js.map +1 -1
- package/dist/test/Helpers.d.ts +4 -4
- package/dist/test/Helpers.js +11 -5
- package/dist/test/Helpers.js.map +1 -1
- package/dist/test/NodeHelpers.test.js +33 -6
- package/dist/test/NodeHelpers.test.js.map +1 -1
- package/dist/test/RoutingNode.test.js +67 -4
- package/dist/test/RoutingNode.test.js.map +1 -1
- package/dist/test/Workflow.test.js +1 -0
- package/dist/test/Workflow.test.js.map +1 -1
- package/dist/test/WorkflowDataProxy.test.js +2 -0
- package/dist/test/WorkflowDataProxy.test.js.map +1 -1
- package/package.json +1 -1
package/dist/src/Expression.d.ts
CHANGED
|
@@ -1,10 +1,10 @@
|
|
|
1
|
-
import { INode, INodeExecutionData, INodeParameters, IRunExecutionData, IWorkflowDataProxyAdditionalKeys, NodeParameterValue, Workflow, WorkflowExecuteMode } from '.';
|
|
1
|
+
import { IExecuteData, INode, INodeExecutionData, INodeParameters, IRunExecutionData, IWorkflowDataProxyAdditionalKeys, NodeParameterValue, Workflow, WorkflowExecuteMode } from '.';
|
|
2
2
|
export declare class Expression {
|
|
3
3
|
workflow: Workflow;
|
|
4
4
|
constructor(workflow: Workflow);
|
|
5
5
|
convertObjectValueToString(value: object): string;
|
|
6
|
-
resolveSimpleParameterValue(parameterValue: NodeParameterValue, siblingParameters: INodeParameters, runExecutionData: IRunExecutionData | null, runIndex: number, itemIndex: number, activeNodeName: string, connectionInputData: INodeExecutionData[], mode: WorkflowExecuteMode, timezone: string, additionalKeys: IWorkflowDataProxyAdditionalKeys, returnObjectAsString?: boolean, selfData?: {}): NodeParameterValue | INodeParameters | NodeParameterValue[] | INodeParameters[];
|
|
7
|
-
getSimpleParameterValue(node: INode, parameterValue: string | boolean | undefined, mode: WorkflowExecuteMode, timezone: string, additionalKeys: IWorkflowDataProxyAdditionalKeys, defaultValue?: boolean | number | string): boolean | number | string | undefined;
|
|
8
|
-
getComplexParameterValue(node: INode, parameterValue: NodeParameterValue | INodeParameters | NodeParameterValue[] | INodeParameters[], mode: WorkflowExecuteMode, timezone: string, additionalKeys: IWorkflowDataProxyAdditionalKeys, defaultValue?: NodeParameterValue | INodeParameters | NodeParameterValue[] | INodeParameters[] | undefined, selfData?: {}): NodeParameterValue | INodeParameters | NodeParameterValue[] | INodeParameters[] | undefined;
|
|
9
|
-
getParameterValue(parameterValue: NodeParameterValue | INodeParameters | NodeParameterValue[] | INodeParameters[], runExecutionData: IRunExecutionData | null, runIndex: number, itemIndex: number, activeNodeName: string, connectionInputData: INodeExecutionData[], mode: WorkflowExecuteMode, timezone: string, additionalKeys: IWorkflowDataProxyAdditionalKeys, returnObjectAsString?: boolean, selfData?: {}): NodeParameterValue | INodeParameters | NodeParameterValue[] | INodeParameters[];
|
|
6
|
+
resolveSimpleParameterValue(parameterValue: NodeParameterValue, siblingParameters: INodeParameters, runExecutionData: IRunExecutionData | null, runIndex: number, itemIndex: number, activeNodeName: string, connectionInputData: INodeExecutionData[], mode: WorkflowExecuteMode, timezone: string, additionalKeys: IWorkflowDataProxyAdditionalKeys, executeData?: IExecuteData, returnObjectAsString?: boolean, selfData?: {}): NodeParameterValue | INodeParameters | NodeParameterValue[] | INodeParameters[];
|
|
7
|
+
getSimpleParameterValue(node: INode, parameterValue: string | boolean | undefined, mode: WorkflowExecuteMode, timezone: string, additionalKeys: IWorkflowDataProxyAdditionalKeys, executeData?: IExecuteData, defaultValue?: boolean | number | string): boolean | number | string | undefined;
|
|
8
|
+
getComplexParameterValue(node: INode, parameterValue: NodeParameterValue | INodeParameters | NodeParameterValue[] | INodeParameters[], mode: WorkflowExecuteMode, timezone: string, additionalKeys: IWorkflowDataProxyAdditionalKeys, executeData?: IExecuteData, defaultValue?: NodeParameterValue | INodeParameters | NodeParameterValue[] | INodeParameters[] | undefined, selfData?: {}): NodeParameterValue | INodeParameters | NodeParameterValue[] | INodeParameters[] | undefined;
|
|
9
|
+
getParameterValue(parameterValue: NodeParameterValue | INodeParameters | NodeParameterValue[] | INodeParameters[], runExecutionData: IRunExecutionData | null, runIndex: number, itemIndex: number, activeNodeName: string, connectionInputData: INodeExecutionData[], mode: WorkflowExecuteMode, timezone: string, additionalKeys: IWorkflowDataProxyAdditionalKeys, executeData?: IExecuteData, returnObjectAsString?: boolean, selfData?: {}): NodeParameterValue | INodeParameters | NodeParameterValue[] | INodeParameters[];
|
|
10
10
|
}
|
package/dist/src/Expression.js
CHANGED
|
@@ -28,7 +28,13 @@ const tmpl = __importStar(require("riot-tmpl"));
|
|
|
28
28
|
const luxon_1 = require("luxon");
|
|
29
29
|
const _1 = require(".");
|
|
30
30
|
tmpl.brackets.set('{{ }}');
|
|
31
|
-
tmpl.tmpl.errorHandler = () => {
|
|
31
|
+
tmpl.tmpl.errorHandler = (error) => {
|
|
32
|
+
if (error instanceof _1.ExpressionError) {
|
|
33
|
+
if (error.context.failExecution) {
|
|
34
|
+
throw error;
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
};
|
|
32
38
|
class Expression {
|
|
33
39
|
constructor(workflow) {
|
|
34
40
|
this.workflow = workflow;
|
|
@@ -37,12 +43,12 @@ class Expression {
|
|
|
37
43
|
const typeName = Array.isArray(value) ? 'Array' : 'Object';
|
|
38
44
|
return `[${typeName}: ${JSON.stringify(value)}]`;
|
|
39
45
|
}
|
|
40
|
-
resolveSimpleParameterValue(parameterValue, siblingParameters, runExecutionData, runIndex, itemIndex, activeNodeName, connectionInputData, mode, timezone, additionalKeys, returnObjectAsString = false, selfData = {}) {
|
|
46
|
+
resolveSimpleParameterValue(parameterValue, siblingParameters, runExecutionData, runIndex, itemIndex, activeNodeName, connectionInputData, mode, timezone, additionalKeys, executeData, returnObjectAsString = false, selfData = {}) {
|
|
41
47
|
if (typeof parameterValue !== 'string' || parameterValue.charAt(0) !== '=') {
|
|
42
48
|
return parameterValue;
|
|
43
49
|
}
|
|
44
50
|
parameterValue = parameterValue.substr(1);
|
|
45
|
-
const dataProxy = new _1.WorkflowDataProxy(this.workflow, runExecutionData, runIndex, itemIndex, activeNodeName, connectionInputData, siblingParameters, mode, timezone, additionalKeys, -1, selfData);
|
|
51
|
+
const dataProxy = new _1.WorkflowDataProxy(this.workflow, runExecutionData, runIndex, itemIndex, activeNodeName, connectionInputData, siblingParameters, mode, timezone, additionalKeys, executeData, -1, selfData);
|
|
46
52
|
const data = dataProxy.getDataProxy();
|
|
47
53
|
data.process = {
|
|
48
54
|
arch: process.arch,
|
|
@@ -73,26 +79,28 @@ class Expression {
|
|
|
73
79
|
data.Interval = luxon_1.Interval;
|
|
74
80
|
data.Duration = luxon_1.Duration;
|
|
75
81
|
data.constructor = {};
|
|
82
|
+
let returnValue;
|
|
76
83
|
try {
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
}
|
|
84
|
-
else if (returnValue !== null && typeof returnValue === 'object') {
|
|
85
|
-
if (returnObjectAsString) {
|
|
86
|
-
return this.convertObjectValueToString(returnValue);
|
|
84
|
+
returnValue = tmpl.tmpl(parameterValue, data);
|
|
85
|
+
}
|
|
86
|
+
catch (error) {
|
|
87
|
+
if (error instanceof _1.ExpressionError) {
|
|
88
|
+
if (error.context.failExecution) {
|
|
89
|
+
throw error;
|
|
87
90
|
}
|
|
88
91
|
}
|
|
89
|
-
return returnValue;
|
|
90
92
|
}
|
|
91
|
-
|
|
92
|
-
throw new Error(
|
|
93
|
+
if (typeof returnValue === 'function') {
|
|
94
|
+
throw new Error('Expression resolved to a function. Please add "()"');
|
|
95
|
+
}
|
|
96
|
+
else if (returnValue !== null && typeof returnValue === 'object') {
|
|
97
|
+
if (returnObjectAsString) {
|
|
98
|
+
return this.convertObjectValueToString(returnValue);
|
|
99
|
+
}
|
|
93
100
|
}
|
|
101
|
+
return returnValue;
|
|
94
102
|
}
|
|
95
|
-
getSimpleParameterValue(node, parameterValue, mode, timezone, additionalKeys, defaultValue) {
|
|
103
|
+
getSimpleParameterValue(node, parameterValue, mode, timezone, additionalKeys, executeData, defaultValue) {
|
|
96
104
|
if (parameterValue === undefined) {
|
|
97
105
|
return defaultValue;
|
|
98
106
|
}
|
|
@@ -104,9 +112,9 @@ class Expression {
|
|
|
104
112
|
runData: {},
|
|
105
113
|
},
|
|
106
114
|
};
|
|
107
|
-
return this.getParameterValue(parameterValue, runData, runIndex, itemIndex, node.name, connectionInputData, mode, timezone, additionalKeys);
|
|
115
|
+
return this.getParameterValue(parameterValue, runData, runIndex, itemIndex, node.name, connectionInputData, mode, timezone, additionalKeys, executeData);
|
|
108
116
|
}
|
|
109
|
-
getComplexParameterValue(node, parameterValue, mode, timezone, additionalKeys, defaultValue = undefined, selfData = {}) {
|
|
117
|
+
getComplexParameterValue(node, parameterValue, mode, timezone, additionalKeys, executeData, defaultValue = undefined, selfData = {}) {
|
|
110
118
|
if (parameterValue === undefined) {
|
|
111
119
|
return defaultValue;
|
|
112
120
|
}
|
|
@@ -118,21 +126,21 @@ class Expression {
|
|
|
118
126
|
runData: {},
|
|
119
127
|
},
|
|
120
128
|
};
|
|
121
|
-
const returnData = this.getParameterValue(parameterValue, runData, runIndex, itemIndex, node.name, connectionInputData, mode, timezone, additionalKeys, false, selfData);
|
|
122
|
-
return this.getParameterValue(returnData, runData, runIndex, itemIndex, node.name, connectionInputData, mode, timezone, additionalKeys, false, selfData);
|
|
129
|
+
const returnData = this.getParameterValue(parameterValue, runData, runIndex, itemIndex, node.name, connectionInputData, mode, timezone, additionalKeys, executeData, false, selfData);
|
|
130
|
+
return this.getParameterValue(returnData, runData, runIndex, itemIndex, node.name, connectionInputData, mode, timezone, additionalKeys, executeData, false, selfData);
|
|
123
131
|
}
|
|
124
|
-
getParameterValue(parameterValue, runExecutionData, runIndex, itemIndex, activeNodeName, connectionInputData, mode, timezone, additionalKeys, returnObjectAsString = false, selfData = {}) {
|
|
132
|
+
getParameterValue(parameterValue, runExecutionData, runIndex, itemIndex, activeNodeName, connectionInputData, mode, timezone, additionalKeys, executeData, returnObjectAsString = false, selfData = {}) {
|
|
125
133
|
const isComplexParameter = (value) => {
|
|
126
134
|
return typeof value === 'object';
|
|
127
135
|
};
|
|
128
136
|
const resolveParameterValue = (value, siblingParameters) => {
|
|
129
137
|
if (isComplexParameter(value)) {
|
|
130
|
-
return this.getParameterValue(value, runExecutionData, runIndex, itemIndex, activeNodeName, connectionInputData, mode, timezone, additionalKeys, returnObjectAsString, selfData);
|
|
138
|
+
return this.getParameterValue(value, runExecutionData, runIndex, itemIndex, activeNodeName, connectionInputData, mode, timezone, additionalKeys, executeData, returnObjectAsString, selfData);
|
|
131
139
|
}
|
|
132
|
-
return this.resolveSimpleParameterValue(value, siblingParameters, runExecutionData, runIndex, itemIndex, activeNodeName, connectionInputData, mode, timezone, additionalKeys, returnObjectAsString, selfData);
|
|
140
|
+
return this.resolveSimpleParameterValue(value, siblingParameters, runExecutionData, runIndex, itemIndex, activeNodeName, connectionInputData, mode, timezone, additionalKeys, executeData, returnObjectAsString, selfData);
|
|
133
141
|
};
|
|
134
142
|
if (!isComplexParameter(parameterValue)) {
|
|
135
|
-
return this.resolveSimpleParameterValue(parameterValue, {}, runExecutionData, runIndex, itemIndex, activeNodeName, connectionInputData, mode, timezone, additionalKeys, returnObjectAsString, selfData);
|
|
143
|
+
return this.resolveSimpleParameterValue(parameterValue, {}, runExecutionData, runIndex, itemIndex, activeNodeName, connectionInputData, mode, timezone, additionalKeys, executeData, returnObjectAsString, selfData);
|
|
136
144
|
}
|
|
137
145
|
if (Array.isArray(parameterValue)) {
|
|
138
146
|
const returnData = [];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Expression.js","sourceRoot":"","sources":["../../src/Expression.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AACA,gDAAkC;AAClC,iCAAqD;AAGrD,
|
|
1
|
+
{"version":3,"file":"Expression.js","sourceRoot":"","sources":["../../src/Expression.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AACA,gDAAkC;AAClC,iCAAqD;AAGrD,wBAYW;AAMX,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;AAI3B,IAAI,CAAC,IAAI,CAAC,YAAY,GAAG,CAAC,KAAY,EAAE,EAAE;IACzC,IAAI,KAAK,YAAY,kBAAe,EAAE;QACrC,IAAI,KAAK,CAAC,OAAO,CAAC,aAAa,EAAE;YAChC,MAAM,KAAK,CAAC;SACZ;KACD;AACF,CAAC,CAAC;AAEF,MAAa,UAAU;IAGtB,YAAY,QAAkB;QAC7B,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC1B,CAAC;IAUD,0BAA0B,CAAC,KAAa;QACvC,MAAM,QAAQ,GAAG,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ,CAAC;QAC3D,OAAO,IAAI,QAAQ,KAAK,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC;IAClD,CAAC;IAgBD,2BAA2B,CAC1B,cAAkC,EAClC,iBAAkC,EAClC,gBAA0C,EAC1C,QAAgB,EAChB,SAAiB,EACjB,cAAsB,EACtB,mBAAyC,EACzC,IAAyB,EACzB,QAAgB,EAChB,cAAgD,EAChD,WAA0B,EAC1B,oBAAoB,GAAG,KAAK,EAC5B,QAAQ,GAAG,EAAE;QAGb,IAAI,OAAO,cAAc,KAAK,QAAQ,IAAI,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,GAAG,EAAE;YAE3E,OAAO,cAAc,CAAC;SACtB;QAMD,cAAc,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;QAG1C,MAAM,SAAS,GAAG,IAAI,oBAAiB,CACtC,IAAI,CAAC,QAAQ,EACb,gBAAgB,EAChB,QAAQ,EACR,SAAS,EACT,cAAc,EACd,mBAAmB,EACnB,iBAAiB,EACjB,IAAI,EACJ,QAAQ,EACR,cAAc,EACd,WAAW,EACX,CAAC,CAAC,EACF,QAAQ,CACR,CAAC;QACF,MAAM,IAAI,GAAG,SAAS,CAAC,YAAY,EAAE,CAAC;QAItC,IAAI,CAAC,OAAO,GAAG;YACd,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,GAAG,EAAE,OAAO,CAAC,GAAG;YAChB,QAAQ,EAAE,OAAO,CAAC,QAAQ;YAC1B,GAAG,EAAE,OAAO,CAAC,GAAG;YAChB,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,OAAO,EAAE,OAAO,CAAC,GAAG;YACpB,QAAQ,EAAE,OAAO,CAAC,QAAQ;SAC1B,CAAC;QAGF,IAAI,CAAC,QAAQ,GAAG,EAAE,CAAC;QACnB,IAAI,CAAC,MAAM,GAAG,EAAE,CAAC;QACjB,IAAI,CAAC,MAAM,GAAG,EAAE,CAAC;QACjB,IAAI,CAAC,MAAM,GAAG,EAAE,CAAC;QACjB,IAAI,CAAC,IAAI,GAAG,EAAE,CAAC;QACf,IAAI,CAAC,IAAI,GAAG,EAAE,CAAC;QAGf,IAAI,CAAC,KAAK,GAAG,EAAE,CAAC;QAChB,IAAI,CAAC,MAAM,GAAG,EAAE,CAAC;QACjB,IAAI,CAAC,OAAO,GAAG,EAAE,CAAC;QAGlB,IAAI,CAAC,IAAI,GAAG,EAAE,CAAC;QACf,IAAI,CAAC,UAAU,GAAG,EAAE,CAAC;QACrB,IAAI,CAAC,WAAW,GAAG,EAAE,CAAC;QACtB,IAAI,CAAC,QAAQ,GAAG,EAAE,CAAC;QAGnB,IAAI,CAAC,KAAK,GAAG,EAAE,CAAC;QAChB,IAAI,CAAC,cAAc,GAAG,EAAE,CAAC;QAGzB,IAAI,CAAC,QAAQ,GAAG,gBAAQ,CAAC;QACzB,IAAI,CAAC,QAAQ,GAAG,gBAAQ,CAAC;QACzB,IAAI,CAAC,QAAQ,GAAG,gBAAQ,CAAC;QAGzB,IAAI,CAAC,WAAW,GAAG,EAAE,CAAC;QAItB,IAAI,WAAW,CAAC;QAChB,IAAI;YAEH,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,CAAC;SAC9C;QAAC,OAAO,KAAK,EAAE;YACf,IAAI,KAAK,YAAY,kBAAe,EAAE;gBAGrC,IAAI,KAAK,CAAC,OAAO,CAAC,aAAa,EAAE;oBAChC,MAAM,KAAK,CAAC;iBACZ;aACD;SACD;QAED,IAAI,OAAO,WAAW,KAAK,UAAU,EAAE;YACtC,MAAM,IAAI,KAAK,CAAC,oDAAoD,CAAC,CAAC;SACtE;aAAM,IAAI,WAAW,KAAK,IAAI,IAAI,OAAO,WAAW,KAAK,QAAQ,EAAE;YACnE,IAAI,oBAAoB,EAAE;gBACzB,OAAO,IAAI,CAAC,0BAA0B,CAAC,WAAW,CAAC,CAAC;aACpD;SACD;QAGD,OAAO,WAAW,CAAC;IACpB,CAAC;IAWD,uBAAuB,CACtB,IAAW,EACX,cAA4C,EAC5C,IAAyB,EACzB,QAAgB,EAChB,cAAgD,EAChD,WAA0B,EAC1B,YAAwC;QAExC,IAAI,cAAc,KAAK,SAAS,EAAE;YAEjC,OAAO,YAAY,CAAC;SACpB;QAGD,MAAM,QAAQ,GAAG,CAAC,CAAC;QACnB,MAAM,SAAS,GAAG,CAAC,CAAC;QACpB,MAAM,mBAAmB,GAAyB,EAAE,CAAC;QACrD,MAAM,OAAO,GAAsB;YAClC,UAAU,EAAE;gBACX,OAAO,EAAE,EAAE;aACX;SACD,CAAC;QAEF,OAAO,IAAI,CAAC,iBAAiB,CAC5B,cAAc,EACd,OAAO,EACP,QAAQ,EACR,SAAS,EACT,IAAI,CAAC,IAAI,EACT,mBAAmB,EACnB,IAAI,EACJ,QAAQ,EACR,cAAc,EACd,WAAW,CAC8B,CAAC;IAC5C,CAAC;IAWD,wBAAwB,CACvB,IAAW,EACX,cAA+F,EAC/F,IAAyB,EACzB,QAAgB,EAChB,cAAgD,EAChD,WAA0B,EAC1B,eAKe,SAAS,EACxB,QAAQ,GAAG,EAAE;QAEb,IAAI,cAAc,KAAK,SAAS,EAAE;YAEjC,OAAO,YAAY,CAAC;SACpB;QAGD,MAAM,QAAQ,GAAG,CAAC,CAAC;QACnB,MAAM,SAAS,GAAG,CAAC,CAAC;QACpB,MAAM,mBAAmB,GAAyB,EAAE,CAAC;QACrD,MAAM,OAAO,GAAsB;YAClC,UAAU,EAAE;gBACX,OAAO,EAAE,EAAE;aACX;SACD,CAAC;QAGF,MAAM,UAAU,GAAG,IAAI,CAAC,iBAAiB,CACxC,cAAc,EACd,OAAO,EACP,QAAQ,EACR,SAAS,EACT,IAAI,CAAC,IAAI,EACT,mBAAmB,EACnB,IAAI,EACJ,QAAQ,EACR,cAAc,EACd,WAAW,EACX,KAAK,EACL,QAAQ,CACR,CAAC;QAGF,OAAO,IAAI,CAAC,iBAAiB,CAC5B,UAAU,EACV,OAAO,EACP,QAAQ,EACR,SAAS,EACT,IAAI,CAAC,IAAI,EACT,mBAAmB,EACnB,IAAI,EACJ,QAAQ,EACR,cAAc,EACd,WAAW,EACX,KAAK,EACL,QAAQ,CACR,CAAC;IACH,CAAC;IAiBD,iBAAiB,CAChB,cAA+F,EAC/F,gBAA0C,EAC1C,QAAgB,EAChB,SAAiB,EACjB,cAAsB,EACtB,mBAAyC,EACzC,IAAyB,EACzB,QAAgB,EAChB,cAAgD,EAChD,WAA0B,EAC1B,oBAAoB,GAAG,KAAK,EAC5B,QAAQ,GAAG,EAAE;QAGb,MAAM,kBAAkB,GAAG,CAC1B,KAAsF,EACrF,EAAE;YACH,OAAO,OAAO,KAAK,KAAK,QAAQ,CAAC;QAClC,CAAC,CAAC;QAGF,MAAM,qBAAqB,GAAG,CAC7B,KAAsF,EACtF,iBAAkC,EACjC,EAAE;YACH,IAAI,kBAAkB,CAAC,KAAK,CAAC,EAAE;gBAC9B,OAAO,IAAI,CAAC,iBAAiB,CAC5B,KAAK,EACL,gBAAgB,EAChB,QAAQ,EACR,SAAS,EACT,cAAc,EACd,mBAAmB,EACnB,IAAI,EACJ,QAAQ,EACR,cAAc,EACd,WAAW,EACX,oBAAoB,EACpB,QAAQ,CACR,CAAC;aACF;YACD,OAAO,IAAI,CAAC,2BAA2B,CACtC,KAA2B,EAC3B,iBAAiB,EACjB,gBAAgB,EAChB,QAAQ,EACR,SAAS,EACT,cAAc,EACd,mBAAmB,EACnB,IAAI,EACJ,QAAQ,EACR,cAAc,EACd,WAAW,EACX,oBAAoB,EACpB,QAAQ,CACR,CAAC;QACH,CAAC,CAAC;QAGF,IAAI,CAAC,kBAAkB,CAAC,cAAc,CAAC,EAAE;YACxC,OAAO,IAAI,CAAC,2BAA2B,CACtC,cAAoC,EACpC,EAAE,EACF,gBAAgB,EAChB,QAAQ,EACR,SAAS,EACT,cAAc,EACd,mBAAmB,EACnB,IAAI,EACJ,QAAQ,EACR,cAAc,EACd,WAAW,EACX,oBAAoB,EACpB,QAAQ,CACR,CAAC;SACF;QAID,IAAI,KAAK,CAAC,OAAO,CAAC,cAAc,CAAC,EAAE;YAElC,MAAM,UAAU,GAAG,EAAE,CAAC;YAEtB,KAAK,MAAM,IAAI,IAAI,cAAc,EAAE;gBAClC,UAAU,CAAC,IAAI,CAAC,qBAAqB,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC;aACjD;YAED,IAAI,oBAAoB,IAAI,OAAO,UAAU,KAAK,QAAQ,EAAE;gBAC3D,OAAO,IAAI,CAAC,0BAA0B,CAAC,UAAU,CAAC,CAAC;aACnD;YAED,OAAO,UAAsD,CAAC;SAC9D;QACD,IAAI,cAAc,KAAK,IAAI,IAAI,cAAc,KAAK,SAAS,EAAE;YAC5D,OAAO,cAAc,CAAC;SACtB;QAGD,MAAM,UAAU,GAAoB,EAAE,CAAC;QAEvC,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,EAAE;YAC9C,UAAU,CAAC,GAAG,CAAC,GAAG,qBAAqB,CACrC,cAAkC,CAAC,GAAG,CAAC,EACxC,cAAiC,CACjC,CAAC;SACF;QAED,IAAI,oBAAoB,IAAI,OAAO,UAAU,KAAK,QAAQ,EAAE;YAC3D,OAAO,IAAI,CAAC,0BAA0B,CAAC,UAAU,CAAC,CAAC;SACnD;QAED,OAAO,UAAU,CAAC;IACnB,CAAC;CACD;AA/YD,gCA+YC"}
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
import { ExecutionBaseError } from './NodeErrors';
|
|
2
|
+
export declare class ExpressionError extends ExecutionBaseError {
|
|
3
|
+
constructor(message: string, options?: {
|
|
4
|
+
causeDetailed?: string;
|
|
5
|
+
description?: string;
|
|
6
|
+
runIndex?: number;
|
|
7
|
+
itemIndex?: number;
|
|
8
|
+
messageTemplate?: string;
|
|
9
|
+
parameter?: string;
|
|
10
|
+
failExecution?: boolean;
|
|
11
|
+
});
|
|
12
|
+
}
|
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.ExpressionError = void 0;
|
|
4
|
+
const NodeErrors_1 = require("./NodeErrors");
|
|
5
|
+
class ExpressionError extends NodeErrors_1.ExecutionBaseError {
|
|
6
|
+
constructor(message, options) {
|
|
7
|
+
super(new Error(message));
|
|
8
|
+
if ((options === null || options === void 0 ? void 0 : options.description) !== undefined) {
|
|
9
|
+
this.description = options.description;
|
|
10
|
+
}
|
|
11
|
+
if ((options === null || options === void 0 ? void 0 : options.causeDetailed) !== undefined) {
|
|
12
|
+
this.context.causeDetailed = options.causeDetailed;
|
|
13
|
+
}
|
|
14
|
+
if ((options === null || options === void 0 ? void 0 : options.runIndex) !== undefined) {
|
|
15
|
+
this.context.runIndex = options.runIndex;
|
|
16
|
+
}
|
|
17
|
+
if ((options === null || options === void 0 ? void 0 : options.itemIndex) !== undefined) {
|
|
18
|
+
this.context.itemIndex = options.itemIndex;
|
|
19
|
+
}
|
|
20
|
+
if ((options === null || options === void 0 ? void 0 : options.parameter) !== undefined) {
|
|
21
|
+
this.context.parameter = options.parameter;
|
|
22
|
+
}
|
|
23
|
+
if ((options === null || options === void 0 ? void 0 : options.messageTemplate) !== undefined) {
|
|
24
|
+
this.context.messageTemplate = options.messageTemplate;
|
|
25
|
+
}
|
|
26
|
+
this.context.failExecution = !!(options === null || options === void 0 ? void 0 : options.failExecution);
|
|
27
|
+
}
|
|
28
|
+
}
|
|
29
|
+
exports.ExpressionError = ExpressionError;
|
|
30
|
+
//# sourceMappingURL=ExpressionError.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ExpressionError.js","sourceRoot":"","sources":["../../src/ExpressionError.ts"],"names":[],"mappings":";;;AACA,6CAAkD;AAKlD,MAAa,eAAgB,SAAQ,+BAAkB;IACtD,YACC,OAAe,EACf,OAQC;QAED,KAAK,CAAC,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;QAE1B,IAAI,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,WAAW,MAAK,SAAS,EAAE;YACvC,IAAI,CAAC,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC;SACvC;QAED,IAAI,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,aAAa,MAAK,SAAS,EAAE;YACzC,IAAI,CAAC,OAAO,CAAC,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC;SACnD;QAED,IAAI,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,QAAQ,MAAK,SAAS,EAAE;YACpC,IAAI,CAAC,OAAO,CAAC,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC;SACzC;QAED,IAAI,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,SAAS,MAAK,SAAS,EAAE;YACrC,IAAI,CAAC,OAAO,CAAC,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC;SAC3C;QAED,IAAI,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,SAAS,MAAK,SAAS,EAAE;YACrC,IAAI,CAAC,OAAO,CAAC,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC;SAC3C;QAED,IAAI,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,eAAe,MAAK,SAAS,EAAE;YAC3C,IAAI,CAAC,OAAO,CAAC,eAAe,GAAG,OAAO,CAAC,eAAe,CAAC;SACvD;QAED,IAAI,CAAC,OAAO,CAAC,aAAa,GAAG,CAAC,CAAC,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,aAAa,CAAA,CAAC;IACvD,CAAC;CACD;AAzCD,0CAyCC"}
|
package/dist/src/Interfaces.d.ts
CHANGED
|
@@ -5,6 +5,7 @@ import { URLSearchParams } from 'url';
|
|
|
5
5
|
import { IDeferredPromise } from './DeferredPromise';
|
|
6
6
|
import { Workflow } from './Workflow';
|
|
7
7
|
import { WorkflowHooks } from './WorkflowHooks';
|
|
8
|
+
import { WorkflowActivationError } from './WorkflowActivationError';
|
|
8
9
|
import { WorkflowOperationError } from './WorkflowErrors';
|
|
9
10
|
import { NodeApiError, NodeOperationError } from './NodeErrors';
|
|
10
11
|
export interface IAdditionalCredentialOptions {
|
|
@@ -33,7 +34,7 @@ export interface IConnection {
|
|
|
33
34
|
type: string;
|
|
34
35
|
index: number;
|
|
35
36
|
}
|
|
36
|
-
export declare type ExecutionError = WorkflowOperationError | NodeOperationError | NodeApiError;
|
|
37
|
+
export declare type ExecutionError = WorkflowActivationError | WorkflowOperationError | NodeOperationError | NodeApiError;
|
|
37
38
|
export interface IGetCredentials {
|
|
38
39
|
get(type: string, id: string | null): Promise<ICredentialsEncrypted>;
|
|
39
40
|
}
|
|
@@ -189,6 +190,10 @@ export interface ICredentialDataDecryptedObject {
|
|
|
189
190
|
[key: string]: CredentialInformation;
|
|
190
191
|
}
|
|
191
192
|
export declare type NodeInputConnections = IConnection[][];
|
|
193
|
+
export interface INodeConnection {
|
|
194
|
+
sourceIndex: number;
|
|
195
|
+
destinationIndex: number;
|
|
196
|
+
}
|
|
192
197
|
export interface INodeConnections {
|
|
193
198
|
[key: string]: NodeInputConnections;
|
|
194
199
|
}
|
|
@@ -215,10 +220,10 @@ export interface IRunNodeResponse {
|
|
|
215
220
|
closeFunction?: () => Promise<void>;
|
|
216
221
|
}
|
|
217
222
|
export interface IGetExecuteFunctions {
|
|
218
|
-
(workflow: Workflow, runExecutionData: IRunExecutionData, runIndex: number, connectionInputData: INodeExecutionData[], inputData: ITaskDataConnections, node: INode, additionalData: IWorkflowExecuteAdditionalData, mode: WorkflowExecuteMode): IExecuteFunctions;
|
|
223
|
+
(workflow: Workflow, runExecutionData: IRunExecutionData, runIndex: number, connectionInputData: INodeExecutionData[], inputData: ITaskDataConnections, node: INode, additionalData: IWorkflowExecuteAdditionalData, executeData: IExecuteData, mode: WorkflowExecuteMode): IExecuteFunctions;
|
|
219
224
|
}
|
|
220
225
|
export interface IGetExecuteSingleFunctions {
|
|
221
|
-
(workflow: Workflow, runExecutionData: IRunExecutionData, runIndex: number, connectionInputData: INodeExecutionData[], inputData: ITaskDataConnections, node: INode, itemIndex: number, additionalData: IWorkflowExecuteAdditionalData, mode: WorkflowExecuteMode): IExecuteSingleFunctions;
|
|
226
|
+
(workflow: Workflow, runExecutionData: IRunExecutionData, runIndex: number, connectionInputData: INodeExecutionData[], inputData: ITaskDataConnections, node: INode, itemIndex: number, additionalData: IWorkflowExecuteAdditionalData, executeData: IExecuteData, mode: WorkflowExecuteMode): IExecuteSingleFunctions;
|
|
222
227
|
}
|
|
223
228
|
export interface IGetExecuteHookFunctions {
|
|
224
229
|
(workflow: Workflow, node: INode, additionalData: IWorkflowExecuteAdditionalData, mode: WorkflowExecuteMode, activation: WorkflowActivateMode, isTest?: boolean, webhookData?: IWebhookData): IHookFunctions;
|
|
@@ -226,9 +231,13 @@ export interface IGetExecuteHookFunctions {
|
|
|
226
231
|
export interface IGetExecuteWebhookFunctions {
|
|
227
232
|
(workflow: Workflow, node: INode, additionalData: IWorkflowExecuteAdditionalData, mode: WorkflowExecuteMode, webhookData: IWebhookData): IWebhookFunctions;
|
|
228
233
|
}
|
|
234
|
+
export interface ISourceDataConnections {
|
|
235
|
+
[key: string]: Array<ISourceData[] | null>;
|
|
236
|
+
}
|
|
229
237
|
export interface IExecuteData {
|
|
230
238
|
data: ITaskDataConnections;
|
|
231
239
|
node: INode;
|
|
240
|
+
source: ITaskDataConnectionsSource | null;
|
|
232
241
|
}
|
|
233
242
|
export declare type IContextObject = {
|
|
234
243
|
[key: string]: any;
|
|
@@ -309,6 +318,7 @@ export interface IExecuteFunctions {
|
|
|
309
318
|
getWorkflowStaticData(type: string): IDataObject;
|
|
310
319
|
getRestApiUrl(): string;
|
|
311
320
|
getTimezone(): string;
|
|
321
|
+
getExecuteData(): IExecuteData;
|
|
312
322
|
getWorkflow(): IWorkflowMetadata;
|
|
313
323
|
prepareOutputData(outputData: INodeExecutionData[], outputIndex?: number): Promise<INodeExecutionData[][]>;
|
|
314
324
|
putExecutionToWait(waitTill: Date): Promise<void>;
|
|
@@ -331,6 +341,7 @@ export interface IExecuteSingleFunctions {
|
|
|
331
341
|
getNodeParameter(parameterName: string, fallbackValue?: any): NodeParameterValue | INodeParameters | NodeParameterValue[] | INodeParameters[] | object;
|
|
332
342
|
getRestApiUrl(): string;
|
|
333
343
|
getTimezone(): string;
|
|
344
|
+
getExecuteData(): IExecuteData;
|
|
334
345
|
getWorkflow(): IWorkflowMetadata;
|
|
335
346
|
getWorkflowDataProxy(): IWorkflowDataProxyData;
|
|
336
347
|
getWorkflowStaticData(type: string): IDataObject;
|
|
@@ -479,11 +490,16 @@ export interface IObservableObject {
|
|
|
479
490
|
export interface IBinaryKeyData {
|
|
480
491
|
[key: string]: IBinaryData;
|
|
481
492
|
}
|
|
493
|
+
export interface IPairedItemData {
|
|
494
|
+
item: number;
|
|
495
|
+
input?: number;
|
|
496
|
+
}
|
|
482
497
|
export interface INodeExecutionData {
|
|
483
|
-
[key: string]: IDataObject | IBinaryKeyData | NodeApiError | NodeOperationError | undefined;
|
|
498
|
+
[key: string]: IDataObject | IBinaryKeyData | IPairedItemData | IPairedItemData[] | NodeApiError | NodeOperationError | number | undefined;
|
|
484
499
|
json: IDataObject;
|
|
485
500
|
binary?: IBinaryKeyData;
|
|
486
501
|
error?: NodeApiError | NodeOperationError;
|
|
502
|
+
pairedItem?: IPairedItemData | IPairedItemData[] | number;
|
|
487
503
|
}
|
|
488
504
|
export interface INodeExecuteFunctions {
|
|
489
505
|
getExecutePollFunctions: IGetExecutePollFunctions;
|
|
@@ -851,6 +867,7 @@ export interface IRunExecutionData {
|
|
|
851
867
|
contextData: IExecuteContextData;
|
|
852
868
|
nodeExecutionStack: IExecuteData[];
|
|
853
869
|
waitingExecution: IWaitingForExecution;
|
|
870
|
+
waitingExecutionSource: IWaitingForExecutionSource | null;
|
|
854
871
|
};
|
|
855
872
|
waitTill?: Date;
|
|
856
873
|
}
|
|
@@ -862,6 +879,12 @@ export interface ITaskData {
|
|
|
862
879
|
executionTime: number;
|
|
863
880
|
data?: ITaskDataConnections;
|
|
864
881
|
error?: ExecutionError;
|
|
882
|
+
source: Array<ISourceData | null>;
|
|
883
|
+
}
|
|
884
|
+
export interface ISourceData {
|
|
885
|
+
previousNode: string;
|
|
886
|
+
previousNodeOutput?: number;
|
|
887
|
+
previousNodeRun?: number;
|
|
865
888
|
}
|
|
866
889
|
export interface ITaskDataConnections {
|
|
867
890
|
[key: string]: Array<INodeExecutionData[] | null>;
|
|
@@ -871,6 +894,14 @@ export interface IWaitingForExecution {
|
|
|
871
894
|
[key: number]: ITaskDataConnections;
|
|
872
895
|
};
|
|
873
896
|
}
|
|
897
|
+
export interface ITaskDataConnectionsSource {
|
|
898
|
+
[key: string]: Array<ISourceData | null>;
|
|
899
|
+
}
|
|
900
|
+
export interface IWaitingForExecutionSource {
|
|
901
|
+
[key: string]: {
|
|
902
|
+
[key: number]: ITaskDataConnectionsSource;
|
|
903
|
+
};
|
|
904
|
+
}
|
|
874
905
|
export interface IWorkflowBase {
|
|
875
906
|
id?: number | string | any;
|
|
876
907
|
name: string;
|
|
@@ -1016,3 +1047,18 @@ export interface IConnectedNode {
|
|
|
1016
1047
|
indicies: number[];
|
|
1017
1048
|
depth: number;
|
|
1018
1049
|
}
|
|
1050
|
+
export declare enum OAuth2GrantType {
|
|
1051
|
+
authorizationCode = "authorizationCode",
|
|
1052
|
+
clientCredentials = "clientCredentials"
|
|
1053
|
+
}
|
|
1054
|
+
export interface IOAuth2Credentials {
|
|
1055
|
+
grantType: 'authorizationCode' | 'clientCredentials';
|
|
1056
|
+
clientId: string;
|
|
1057
|
+
clientSecret: string;
|
|
1058
|
+
accessTokenUrl: string;
|
|
1059
|
+
authUrl: string;
|
|
1060
|
+
authQueryParameters: string;
|
|
1061
|
+
authentication: 'body' | 'header';
|
|
1062
|
+
scope: string;
|
|
1063
|
+
oauthTokenData?: IDataObject;
|
|
1064
|
+
}
|
package/dist/src/Interfaces.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.ICredentialsHelper = exports.ICredentials = void 0;
|
|
3
|
+
exports.OAuth2GrantType = exports.ICredentialsHelper = exports.ICredentials = void 0;
|
|
4
4
|
class ICredentials {
|
|
5
5
|
constructor(nodeCredentials, type, nodesAccess, data) {
|
|
6
6
|
this.id = nodeCredentials.id || undefined;
|
|
@@ -17,4 +17,9 @@ class ICredentialsHelper {
|
|
|
17
17
|
}
|
|
18
18
|
}
|
|
19
19
|
exports.ICredentialsHelper = ICredentialsHelper;
|
|
20
|
+
var OAuth2GrantType;
|
|
21
|
+
(function (OAuth2GrantType) {
|
|
22
|
+
OAuth2GrantType["authorizationCode"] = "authorizationCode";
|
|
23
|
+
OAuth2GrantType["clientCredentials"] = "clientCredentials";
|
|
24
|
+
})(OAuth2GrantType = exports.OAuth2GrantType || (exports.OAuth2GrantType = {}));
|
|
20
25
|
//# sourceMappingURL=Interfaces.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Interfaces.js","sourceRoot":"","sources":["../../src/Interfaces.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"Interfaces.js","sourceRoot":"","sources":["../../src/Interfaces.ts"],"names":[],"mappings":";;;AAsEA,MAAsB,YAAY;IAWjC,YACC,eAAwC,EACxC,IAAY,EACZ,WAAoC,EACpC,IAAa;QAGb,IAAI,CAAC,EAAE,GAAG,eAAe,CAAC,EAAE,IAAI,SAAS,CAAC;QAC1C,IAAI,CAAC,IAAI,GAAG,eAAe,CAAC,IAAI,CAAC;QACjC,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAC/B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IAClB,CAAC;CAaD;AApCD,oCAoCC;AA8CD,MAAsB,kBAAkB;IAGvC,YAAY,aAAqB;QAChC,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;IACpC,CAAC;CAgCD;AArCD,gDAqCC;AAq0CD,IAAY,eAGX;AAHD,WAAY,eAAe;IAC1B,0DAAuC,CAAA;IACvC,0DAAuC,CAAA;AACxC,CAAC,EAHW,eAAe,GAAf,uBAAe,KAAf,uBAAe,QAG1B"}
|
package/dist/src/NodeErrors.d.ts
CHANGED
|
@@ -1,9 +1,13 @@
|
|
|
1
|
-
import { INode, JsonObject } from '.';
|
|
2
|
-
declare abstract class
|
|
1
|
+
import { IDataObject, INode, JsonObject } from '.';
|
|
2
|
+
export declare abstract class ExecutionBaseError extends Error {
|
|
3
3
|
description: string | null | undefined;
|
|
4
4
|
cause: Error | JsonObject;
|
|
5
|
-
node: INode;
|
|
6
5
|
timestamp: number;
|
|
6
|
+
context: IDataObject;
|
|
7
|
+
constructor(error: Error | ExecutionBaseError | JsonObject);
|
|
8
|
+
}
|
|
9
|
+
declare abstract class NodeError extends ExecutionBaseError {
|
|
10
|
+
node: INode;
|
|
7
11
|
constructor(node: INode, error: Error | JsonObject);
|
|
8
12
|
protected findProperty(error: JsonObject, potentialKeys: string[], traversalKeys?: string[]): string | null;
|
|
9
13
|
protected isTraversableObject(value: any): value is JsonObject;
|
|
@@ -11,16 +15,20 @@ declare abstract class NodeError extends Error {
|
|
|
11
15
|
}
|
|
12
16
|
export declare class NodeOperationError extends NodeError {
|
|
13
17
|
constructor(node: INode, error: Error | string, options?: {
|
|
14
|
-
description
|
|
18
|
+
description?: string;
|
|
19
|
+
runIndex?: number;
|
|
20
|
+
itemIndex?: number;
|
|
15
21
|
});
|
|
16
22
|
}
|
|
17
23
|
export declare class NodeApiError extends NodeError {
|
|
18
24
|
httpCode: string | null;
|
|
19
|
-
constructor(node: INode, error: JsonObject, { message, description, httpCode, parseXml, }?: {
|
|
25
|
+
constructor(node: INode, error: JsonObject, { message, description, httpCode, parseXml, runIndex, itemIndex, }?: {
|
|
20
26
|
message?: string;
|
|
21
27
|
description?: string;
|
|
22
28
|
httpCode?: string;
|
|
23
29
|
parseXml?: boolean;
|
|
30
|
+
runIndex?: number;
|
|
31
|
+
itemIndex?: number;
|
|
24
32
|
});
|
|
25
33
|
private setDescriptionFromXml;
|
|
26
34
|
private setMessage;
|
package/dist/src/NodeErrors.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.NodeApiError = exports.NodeOperationError = void 0;
|
|
3
|
+
exports.NodeApiError = exports.NodeOperationError = exports.ExecutionBaseError = void 0;
|
|
4
4
|
const xml2js_1 = require("xml2js");
|
|
5
5
|
const ERROR_MESSAGE_PROPERTIES = [
|
|
6
6
|
'cause',
|
|
@@ -37,16 +37,26 @@ const ERROR_STATUS_PROPERTIES = [
|
|
|
37
37
|
'error_code',
|
|
38
38
|
];
|
|
39
39
|
const ERROR_NESTING_PROPERTIES = ['error', 'err', 'response', 'body', 'data'];
|
|
40
|
-
class
|
|
41
|
-
constructor(
|
|
40
|
+
class ExecutionBaseError extends Error {
|
|
41
|
+
constructor(error) {
|
|
42
42
|
super();
|
|
43
|
+
this.context = {};
|
|
43
44
|
this.name = this.constructor.name;
|
|
44
45
|
this.cause = error;
|
|
45
|
-
this.node = node;
|
|
46
46
|
this.timestamp = Date.now();
|
|
47
47
|
if (error.message) {
|
|
48
48
|
this.message = error.message;
|
|
49
49
|
}
|
|
50
|
+
if (Object.prototype.hasOwnProperty.call(error, 'context')) {
|
|
51
|
+
this.context = error.context;
|
|
52
|
+
}
|
|
53
|
+
}
|
|
54
|
+
}
|
|
55
|
+
exports.ExecutionBaseError = ExecutionBaseError;
|
|
56
|
+
class NodeError extends ExecutionBaseError {
|
|
57
|
+
constructor(node, error) {
|
|
58
|
+
super(error);
|
|
59
|
+
this.node = node;
|
|
50
60
|
}
|
|
51
61
|
findProperty(error, potentialKeys, traversalKeys = []) {
|
|
52
62
|
for (const key of potentialKeys) {
|
|
@@ -126,6 +136,12 @@ class NodeOperationError extends NodeError {
|
|
|
126
136
|
if (options === null || options === void 0 ? void 0 : options.description) {
|
|
127
137
|
this.description = options.description;
|
|
128
138
|
}
|
|
139
|
+
if ((options === null || options === void 0 ? void 0 : options.runIndex) !== undefined) {
|
|
140
|
+
this.context.runIndex = options.runIndex;
|
|
141
|
+
}
|
|
142
|
+
if ((options === null || options === void 0 ? void 0 : options.itemIndex) !== undefined) {
|
|
143
|
+
this.context.itemIndex = options.itemIndex;
|
|
144
|
+
}
|
|
129
145
|
}
|
|
130
146
|
}
|
|
131
147
|
exports.NodeOperationError = NodeOperationError;
|
|
@@ -146,7 +162,7 @@ const STATUS_CODE_MESSAGES = {
|
|
|
146
162
|
};
|
|
147
163
|
const UNKNOWN_ERROR_MESSAGE = 'UNKNOWN ERROR - check the detailed error for more information';
|
|
148
164
|
class NodeApiError extends NodeError {
|
|
149
|
-
constructor(node, error, { message, description, httpCode, parseXml, } = {}) {
|
|
165
|
+
constructor(node, error, { message, description, httpCode, parseXml, runIndex, itemIndex, } = {}) {
|
|
150
166
|
super(node, error);
|
|
151
167
|
if (error.error) {
|
|
152
168
|
this.removeCircularRefs(error.error);
|
|
@@ -164,6 +180,10 @@ class NodeApiError extends NodeError {
|
|
|
164
180
|
return;
|
|
165
181
|
}
|
|
166
182
|
this.description = this.findProperty(error, ERROR_MESSAGE_PROPERTIES, ERROR_NESTING_PROPERTIES);
|
|
183
|
+
if (runIndex !== undefined)
|
|
184
|
+
this.context.runIndex = runIndex;
|
|
185
|
+
if (itemIndex !== undefined)
|
|
186
|
+
this.context.itemIndex = itemIndex;
|
|
167
187
|
}
|
|
168
188
|
setDescriptionFromXml(xml) {
|
|
169
189
|
(0, xml2js_1.parseString)(xml, { explicitArray: false }, (_, result) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NodeErrors.js","sourceRoot":"","sources":["../../src/NodeErrors.ts"],"names":[],"mappings":";;;AAOA,mCAAqC;AAOrC,MAAM,wBAAwB,GAAG;IAChC,OAAO;IACP,OAAO;IACP,SAAS;IACT,SAAS;IACT,KAAK;IACL,UAAU;IACV,aAAa;IACb,QAAQ;IACR,QAAQ;IACR,SAAS;IACT,QAAQ;IACR,cAAc;IACd,eAAe;IACf,cAAc;IACd,eAAe;IACf,gBAAgB;IAChB,kBAAkB;IAClB,mBAAmB;IACnB,eAAe;IACf,OAAO;IACP,MAAM;IACN,OAAO;IACP,KAAK;IACL,MAAM;CACN,CAAC;AAKF,MAAM,uBAAuB,GAAG;IAC/B,YAAY;IACZ,QAAQ;IACR,MAAM;IACN,aAAa;IACb,WAAW;IACX,YAAY;CACZ,CAAC;AAKF,MAAM,wBAAwB,GAAG,CAAC,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"NodeErrors.js","sourceRoot":"","sources":["../../src/NodeErrors.ts"],"names":[],"mappings":"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"}
|
package/dist/src/NodeHelpers.js
CHANGED
|
@@ -526,7 +526,7 @@ function getNodeParameters(nodePropertiesArray, nodeValues, returnDefaults, retu
|
|
|
526
526
|
Object.keys(propertyValues || {}).forEach((value) => {
|
|
527
527
|
returnValue[value] = {};
|
|
528
528
|
});
|
|
529
|
-
|
|
529
|
+
nodeParameters[nodeProperties.name] = returnValue;
|
|
530
530
|
}
|
|
531
531
|
if (Object.keys(collectionValues).length !== 0 || returnDefaults) {
|
|
532
532
|
if (returnDefaults) {
|
|
@@ -584,10 +584,10 @@ function getNodeWebhooks(workflow, node, additionalData, ignoreRestartWehbooks =
|
|
|
584
584
|
if (nodeWebhookPath.endsWith('/')) {
|
|
585
585
|
nodeWebhookPath = nodeWebhookPath.slice(0, -1);
|
|
586
586
|
}
|
|
587
|
-
const isFullPath = workflow.expression.getSimpleParameterValue(node, webhookDescription.isFullPath, 'internal', additionalData.timezone, {}, false);
|
|
588
|
-
const restartWebhook = workflow.expression.getSimpleParameterValue(node, webhookDescription.restartWebhook, 'internal', additionalData.timezone, {}, false);
|
|
587
|
+
const isFullPath = workflow.expression.getSimpleParameterValue(node, webhookDescription.isFullPath, 'internal', additionalData.timezone, {}, undefined, false);
|
|
588
|
+
const restartWebhook = workflow.expression.getSimpleParameterValue(node, webhookDescription.restartWebhook, 'internal', additionalData.timezone, {}, undefined, false);
|
|
589
589
|
const path = getNodeWebhookPath(workflowId, node, nodeWebhookPath, isFullPath, restartWebhook);
|
|
590
|
-
const httpMethod = workflow.expression.getSimpleParameterValue(node, webhookDescription.httpMethod, mode, additionalData.timezone, {}, 'GET');
|
|
590
|
+
const httpMethod = workflow.expression.getSimpleParameterValue(node, webhookDescription.httpMethod, mode, additionalData.timezone, {}, undefined, 'GET');
|
|
591
591
|
if (httpMethod === undefined) {
|
|
592
592
|
console.error(`The webhook "${path}" for node "${node.name}" in workflow "${workflowId}" could not be added because the httpMethod is not defined.`);
|
|
593
593
|
continue;
|