n8n-nodes-base 1.121.27 → 1.121.28
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/nodes/Code/JavaScriptSandbox.d.ts.map +1 -1
- package/dist/nodes/Code/JavaScriptSandbox.js +4 -6
- package/dist/nodes/Code/JavaScriptSandbox.js.map +1 -1
- package/dist/nodes/Code/utils.d.ts +3 -0
- package/dist/nodes/Code/utils.d.ts.map +1 -1
- package/dist/nodes/Code/utils.js +19 -0
- package/dist/nodes/Code/utils.js.map +1 -1
- package/dist/nodes/Function/Function.node.d.ts.map +1 -1
- package/dist/nodes/Function/Function.node.js +2 -1
- package/dist/nodes/Function/Function.node.js.map +1 -1
- package/dist/nodes/FunctionItem/FunctionItem.node.d.ts.map +1 -1
- package/dist/nodes/FunctionItem/FunctionItem.node.js +2 -1
- package/dist/nodes/FunctionItem/FunctionItem.node.js.map +1 -1
- package/dist/nodes/ItemLists/V3/helpers/utils.d.ts.map +1 -1
- package/dist/nodes/ItemLists/V3/helpers/utils.js +2 -1
- package/dist/nodes/ItemLists/V3/helpers/utils.js.map +1 -1
- package/dist/nodes/Transform/Sort/utils.d.ts.map +1 -1
- package/dist/nodes/Transform/Sort/utils.js +2 -1
- package/dist/nodes/Transform/Sort/utils.js.map +1 -1
- package/dist/typecheck.tsbuildinfo +1 -1
- package/dist/types/nodes.json +2 -2
- package/package.json +5 -5
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"JavaScriptSandbox.d.ts","sourceRoot":"","sources":["../../../nodes/Code/JavaScriptSandbox.ts"],"names":[],"mappings":"AAAA,OAAO,EAAyC,KAAK,QAAQ,EAAE,MAAM,KAAK,CAAC;AAC3E,OAAO,KAAK,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAQ1E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAChD,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"JavaScriptSandbox.d.ts","sourceRoot":"","sources":["../../../nodes/Code/JavaScriptSandbox.ts"],"names":[],"mappings":"AAAA,OAAO,EAAyC,KAAK,QAAQ,EAAE,MAAM,KAAK,CAAC;AAC3E,OAAO,KAAK,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAQ1E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAChD,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAOpC,eAAO,MAAM,UAAU,UAQrB,CAAC;AAEH,qBAAa,iBAAkB,SAAQ,OAAO;IAK5C,OAAO,CAAC,MAAM;IAJf,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAS;gBAG3B,OAAO,EAAE,cAAc,EACf,MAAM,EAAE,MAAM,EACtB,OAAO,EAAE,iBAAiB,CAAC,SAAS,CAAC,EACrC,OAAO,CAAC,EAAE;QAAE,QAAQ,CAAC,EAAE,QAAQ,CAAA;KAAE;IAqB5B,OAAO,CAAC,CAAC,GAAG,OAAO,KAAK,OAAO,CAAC,CAAC,CAAC;IASlC,eAAe,CAAC,OAAO,CAAC,EAAE;QAC/B,WAAW,CAAC,EAAE,OAAO,CAAC;KACtB,GAAG,OAAO,CAAC,kBAAkB,EAAE,GAAG,kBAAkB,EAAE,EAAE,CAAC;IAkCpD,eAAe,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,kBAAkB,GAAG,SAAS,CAAC;CAkBjF"}
|
|
@@ -6,6 +6,7 @@ const ExecutionError_1 = require("./ExecutionError");
|
|
|
6
6
|
const JsCodeValidator_1 = require("./JsCodeValidator");
|
|
7
7
|
const Sandbox_1 = require("./Sandbox");
|
|
8
8
|
const ValidationError_1 = require("./ValidationError");
|
|
9
|
+
const utils_1 = require("./utils");
|
|
9
10
|
const { NODE_FUNCTION_ALLOW_BUILTIN: builtIn, NODE_FUNCTION_ALLOW_EXTERNAL: external } = process.env;
|
|
10
11
|
exports.vmResolver = (0, vm2_1.makeResolverFromLegacyOptions)({
|
|
11
12
|
external: external
|
|
@@ -36,9 +37,8 @@ class JavaScriptSandbox extends Sandbox_1.Sandbox {
|
|
|
36
37
|
this.vm.on('console.log', (...args) => this.emit('output', ...args));
|
|
37
38
|
}
|
|
38
39
|
async runCode() {
|
|
39
|
-
const script = `module.exports = async function() {${this.jsCode}\n}()`;
|
|
40
40
|
try {
|
|
41
|
-
const executionResult = (await this.vm.run(
|
|
41
|
+
const executionResult = (await this.vm.run((0, utils_1.generateScript)(this.jsCode), __dirname));
|
|
42
42
|
return executionResult;
|
|
43
43
|
}
|
|
44
44
|
catch (error) {
|
|
@@ -46,10 +46,9 @@ class JavaScriptSandbox extends Sandbox_1.Sandbox {
|
|
|
46
46
|
}
|
|
47
47
|
}
|
|
48
48
|
async runCodeAllItems(options) {
|
|
49
|
-
const script = `module.exports = async function() {${this.jsCode}\n}()`;
|
|
50
49
|
let executionResult;
|
|
51
50
|
try {
|
|
52
|
-
executionResult = await this.vm.run(
|
|
51
|
+
executionResult = await this.vm.run((0, utils_1.generateScript)(this.jsCode), __dirname);
|
|
53
52
|
}
|
|
54
53
|
catch (error) {
|
|
55
54
|
// anticipate user expecting `items` to pre-exist as in Function Item node
|
|
@@ -73,11 +72,10 @@ class JavaScriptSandbox extends Sandbox_1.Sandbox {
|
|
|
73
72
|
return this.validateRunCodeAllItems(executionResult);
|
|
74
73
|
}
|
|
75
74
|
async runCodeEachItem(itemIndex) {
|
|
76
|
-
const script = `module.exports = async function() {${this.jsCode}\n}()`;
|
|
77
75
|
(0, JsCodeValidator_1.validateNoDisallowedMethodsInRunForEach)(this.jsCode, itemIndex);
|
|
78
76
|
let executionResult;
|
|
79
77
|
try {
|
|
80
|
-
executionResult = await this.vm.run(
|
|
78
|
+
executionResult = await this.vm.run((0, utils_1.generateScript)(this.jsCode), __dirname);
|
|
81
79
|
}
|
|
82
80
|
catch (error) {
|
|
83
81
|
// anticipate user expecting `item` to pre-exist as in Function Item node
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"JavaScriptSandbox.js","sourceRoot":"","sources":["../../../nodes/Code/JavaScriptSandbox.ts"],"names":[],"mappings":";;;AAAA,6BAA2E;AAG3E,qDAAkD;AAClD,uDAI2B;AAE3B,uCAAoC;AACpC,uDAAoD;
|
|
1
|
+
{"version":3,"file":"JavaScriptSandbox.js","sourceRoot":"","sources":["../../../nodes/Code/JavaScriptSandbox.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import type { INodeExecutionData, IDataObject, IExecuteFunctions } from 'n8n-workflow';
|
|
2
|
+
import { VMScript } from 'vm2';
|
|
2
3
|
export declare function isObject(maybe: unknown): maybe is {
|
|
3
4
|
[key: string]: unknown;
|
|
4
5
|
};
|
|
@@ -7,4 +8,6 @@ export declare function isObject(maybe: unknown): maybe is {
|
|
|
7
8
|
*/
|
|
8
9
|
export declare function standardizeOutput(output: IDataObject): IDataObject;
|
|
9
10
|
export declare const addPostExecutionWarning: (context: IExecuteFunctions, returnData: INodeExecutionData[], inputItemsLength: number) => void;
|
|
11
|
+
export declare function generateScript(jsCode: string): VMScript;
|
|
12
|
+
export declare function generateSortingScript(jsCode: string): VMScript;
|
|
10
13
|
//# sourceMappingURL=utils.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../nodes/Code/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,WAAW,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../nodes/Code/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,WAAW,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACvF,OAAO,EAAE,QAAQ,EAAE,MAAM,KAAK,CAAC;AAE/B,wBAAgB,QAAQ,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;CAAE,CAI5E;AAMD;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,WAAW,eAsBpD;AAED,eAAO,MAAM,uBAAuB,GACnC,SAAS,iBAAiB,EAC1B,YAAY,kBAAkB,EAAE,EAChC,kBAAkB,MAAM,KACtB,IAWF,CAAC;AAaF,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,YAK5C;AAED,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,MAAM,YAKnD"}
|
package/dist/nodes/Code/utils.js
CHANGED
|
@@ -3,6 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.addPostExecutionWarning = void 0;
|
|
4
4
|
exports.isObject = isObject;
|
|
5
5
|
exports.standardizeOutput = standardizeOutput;
|
|
6
|
+
exports.generateScript = generateScript;
|
|
7
|
+
exports.generateSortingScript = generateSortingScript;
|
|
8
|
+
const vm2_1 = require("vm2");
|
|
6
9
|
function isObject(maybe) {
|
|
7
10
|
return (typeof maybe === 'object' && maybe !== null && !Array.isArray(maybe) && !(maybe instanceof Date));
|
|
8
11
|
}
|
|
@@ -44,4 +47,20 @@ const addPostExecutionWarning = (context, returnData, inputItemsLength) => {
|
|
|
44
47
|
}
|
|
45
48
|
};
|
|
46
49
|
exports.addPostExecutionWarning = addPostExecutionWarning;
|
|
50
|
+
const PREPARE_STACKTRACE = `
|
|
51
|
+
Error.prepareStackTrace = (err, structuredStackTrace) => {
|
|
52
|
+
return "Error: " + err + "\\n" + structuredStackTrace
|
|
53
|
+
.filter(callSite => callSite.getLineNumber())
|
|
54
|
+
.map(callSite => {
|
|
55
|
+
return " at Code:" + callSite.getLineNumber() + ":" + callSite.getColumnNumber()
|
|
56
|
+
})
|
|
57
|
+
.join("\\n");
|
|
58
|
+
};
|
|
59
|
+
`;
|
|
60
|
+
function generateScript(jsCode) {
|
|
61
|
+
return new vm2_1.VMScript(`module.exports = async function() {${jsCode}\n}() ${PREPARE_STACKTRACE}`, 'Code');
|
|
62
|
+
}
|
|
63
|
+
function generateSortingScript(jsCode) {
|
|
64
|
+
return new vm2_1.VMScript(`module.exports = items.sort((a, b) => { ${jsCode} }) ${PREPARE_STACKTRACE}`, 'Code');
|
|
65
|
+
}
|
|
47
66
|
//# sourceMappingURL=utils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../nodes/Code/utils.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../nodes/Code/utils.ts"],"names":[],"mappings":";;;AAGA,4BAIC;AASD,8CAsBC;AA8BD,wCAKC;AAED,sDAKC;AA/ED,6BAA+B;AAE/B,SAAgB,QAAQ,CAAC,KAAc;IACtC,OAAO,CACN,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,KAAK,YAAY,IAAI,CAAC,CAChG,CAAC;AACH,CAAC;AAED,SAAS,aAAa,CAAC,KAAc;IACpC,OAAO,QAAQ,CAAC,KAAK,CAAC,IAAI,OAAO,KAAK,CAAC,MAAM,KAAK,UAAU,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;AAC/F,CAAC;AAED;;GAEG;AACH,SAAgB,iBAAiB,CAAC,MAAmB;IACpD,SAAS,0BAA0B,CAAC,GAAgB,EAAE,YAAY,GAAG,IAAI,OAAO,EAAE;QACjF,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;YAChD,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC;gBAAE,SAAS;YAEpC,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;gBACjD,IAAI,YAAY,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC;oBAC7B,2BAA2B;oBAC3B,SAAS;gBACV,CAAC;gBACD,YAAY,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;YACzB,CAAC;YAED,GAAG,CAAC,GAAG,CAAC;gBACP,KAAK,CAAC,WAAW,CAAC,IAAI,KAAK,QAAQ;oBAClC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,qBAAqB;oBAC7C,CAAC,CAAC,0BAA0B,CAAC,KAAK,EAAE,YAAY,CAAC,CAAC;QACrD,CAAC;QACD,OAAO,GAAG,CAAC;IACZ,CAAC;IACD,0BAA0B,CAAC,MAAM,CAAC,CAAC;IACnC,OAAO,MAAM,CAAC;AACf,CAAC;AAEM,MAAM,uBAAuB,GAAG,CACtC,OAA0B,EAC1B,UAAgC,EAChC,gBAAwB,EACjB,EAAE;IACT,IACC,UAAU,CAAC,MAAM,KAAK,gBAAgB;QACtC,UAAU,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,UAAU,KAAK,SAAS,CAAC,EACvD,CAAC;QACF,OAAO,CAAC,iBAAiB,CAAC;YACzB,OAAO,EACN,+NAA+N;YAChO,QAAQ,EAAE,YAAY;SACtB,CAAC,CAAC;IACJ,CAAC;AACF,CAAC,CAAC;AAfW,QAAA,uBAAuB,2BAelC;AAEF,MAAM,kBAAkB,GAAG;;;;;;;;;CAS1B,CAAC;AAEF,SAAgB,cAAc,CAAC,MAAc;IAC5C,OAAO,IAAI,cAAQ,CAClB,sCAAsC,MAAM,SAAS,kBAAkB,EAAE,EACzE,MAAM,CACN,CAAC;AACH,CAAC;AAED,SAAgB,qBAAqB,CAAC,MAAc;IACnD,OAAO,IAAI,cAAQ,CAClB,2CAA2C,MAAM,OAAO,kBAAkB,EAAE,EAC5E,MAAM,CACN,CAAC;AACH,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Function.node.d.ts","sourceRoot":"","sources":["../../../nodes/Function/Function.node.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACX,iBAAiB,EAGjB,kBAAkB,EAClB,SAAS,EACT,oBAAoB,EACpB,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"Function.node.d.ts","sourceRoot":"","sources":["../../../nodes/Function/Function.node.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACX,iBAAiB,EAGjB,kBAAkB,EAClB,SAAS,EACT,oBAAoB,EACpB,MAAM,cAAc,CAAC;AAMtB,qBAAa,QAAS,YAAW,SAAS;IACzC,WAAW,EAAE,oBAAoB,CAiD/B;IAEI,OAAO,CAAC,IAAI,EAAE,iBAAiB,GAAG,OAAO,CAAC,kBAAkB,EAAE,EAAE,CAAC;CAmKvE"}
|
|
@@ -4,6 +4,7 @@ exports.Function = void 0;
|
|
|
4
4
|
const vm2_1 = require("vm2");
|
|
5
5
|
const n8n_workflow_1 = require("n8n-workflow");
|
|
6
6
|
const JavaScriptSandbox_1 = require("../Code/JavaScriptSandbox");
|
|
7
|
+
const utils_1 = require("../Code/utils");
|
|
7
8
|
class Function {
|
|
8
9
|
description = {
|
|
9
10
|
displayName: 'Function',
|
|
@@ -131,7 +132,7 @@ return items;`,
|
|
|
131
132
|
const functionCode = this.getNodeParameter('functionCode', 0);
|
|
132
133
|
try {
|
|
133
134
|
// Execute the function code
|
|
134
|
-
items = await vm.run(
|
|
135
|
+
items = await vm.run((0, utils_1.generateScript)(functionCode), __dirname);
|
|
135
136
|
items = this.helpers.normalizeItems(items);
|
|
136
137
|
// Do very basic validation of the data
|
|
137
138
|
if (items === undefined) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Function.node.js","sourceRoot":"","sources":["../../../nodes/Function/Function.node.ts"],"names":[],"mappings":";;;AACA,6BAA6B;AAS7B,+CAAiF;AAEjF,iEAAuD;
|
|
1
|
+
{"version":3,"file":"Function.node.js","sourceRoot":"","sources":["../../../nodes/Function/Function.node.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FunctionItem.node.d.ts","sourceRoot":"","sources":["../../../nodes/FunctionItem/FunctionItem.node.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACX,iBAAiB,EAGjB,kBAAkB,EAClB,SAAS,EACT,oBAAoB,EACpB,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"FunctionItem.node.d.ts","sourceRoot":"","sources":["../../../nodes/FunctionItem/FunctionItem.node.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACX,iBAAiB,EAGjB,kBAAkB,EAClB,SAAS,EACT,oBAAoB,EACpB,MAAM,cAAc,CAAC;AAMtB,qBAAa,YAAa,YAAW,SAAS;IAC7C,WAAW,EAAE,oBAAoB,CA8C/B;IAEI,OAAO,CAAC,IAAI,EAAE,iBAAiB,GAAG,OAAO,CAAC,kBAAkB,EAAE,EAAE,CAAC;CAkLvE"}
|
|
@@ -4,6 +4,7 @@ exports.FunctionItem = void 0;
|
|
|
4
4
|
const vm2_1 = require("vm2");
|
|
5
5
|
const n8n_workflow_1 = require("n8n-workflow");
|
|
6
6
|
const JavaScriptSandbox_1 = require("../Code/JavaScriptSandbox");
|
|
7
|
+
const utils_1 = require("../Code/utils");
|
|
7
8
|
class FunctionItem {
|
|
8
9
|
description = {
|
|
9
10
|
displayName: 'Function Item',
|
|
@@ -140,7 +141,7 @@ return item;`,
|
|
|
140
141
|
let jsonData;
|
|
141
142
|
try {
|
|
142
143
|
// Execute the function code
|
|
143
|
-
jsonData = await vm.run(
|
|
144
|
+
jsonData = await vm.run((0, utils_1.generateScript)(functionCode), __dirname);
|
|
144
145
|
}
|
|
145
146
|
catch (error) {
|
|
146
147
|
if (this.continueOnFail()) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FunctionItem.node.js","sourceRoot":"","sources":["../../../nodes/FunctionItem/FunctionItem.node.ts"],"names":[],"mappings":";;;AACA,6BAA6B;AAS7B,+CAAiF;AAEjF,iEAAuD;
|
|
1
|
+
{"version":3,"file":"FunctionItem.node.js","sourceRoot":"","sources":["../../../nodes/FunctionItem/FunctionItem.node.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../../nodes/ItemLists/V3/helpers/utils.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACX,iBAAiB,EAEjB,kBAAkB,EAClB,YAAY,EACZ,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../../nodes/ItemLists/V3/helpers/utils.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACX,iBAAiB,EAEjB,kBAAkB,EAClB,YAAY,EACZ,MAAM,cAAc,CAAC;AAItB,eAAO,MAAM,kBAAkB,GAAI,QAAQ,MAAM,GAAG,MAAM,EAAE,EAAE,kBAAoB,aAcjF,CAAC;AAIF,wBAAgB,UAAU,CACzB,IAAI,EAAE,iBAAiB,EACvB,KAAK,EAAE,kBAAkB,EAAE,GACzB,kBAAkB,EAAE,CAgBtB;AA4BD,wBAAgB,iBAAiB,CAChC,OAAO,EAAE,kBAAkB,EAC3B,KAAK,EAAE,kBAAkB,EAAE,EAC3B,UAAU,CAAC,EAAE,OAAO,sBA4BpB;AAED,wBAAgB,YAAY,CAAC,KAAK,EAAE,YAAY,GAAG,MAAM,CAiBxD"}
|
|
@@ -6,6 +6,7 @@ exports.addBinariesToItem = addBinariesToItem;
|
|
|
6
6
|
exports.typeToNumber = typeToNumber;
|
|
7
7
|
const vm2_1 = require("vm2");
|
|
8
8
|
const n8n_workflow_1 = require("n8n-workflow");
|
|
9
|
+
const utils_1 = require("../../../Code/utils");
|
|
9
10
|
const prepareFieldsArray = (fields, fieldName = 'Fields') => {
|
|
10
11
|
if (typeof fields === 'string') {
|
|
11
12
|
return fields
|
|
@@ -30,7 +31,7 @@ function sortByCode(items) {
|
|
|
30
31
|
console: mode === 'manual' ? 'redirect' : 'inherit',
|
|
31
32
|
sandbox: { items },
|
|
32
33
|
});
|
|
33
|
-
return vm.run(
|
|
34
|
+
return vm.run((0, utils_1.generateSortingScript)(code));
|
|
34
35
|
}
|
|
35
36
|
const isBinaryUniqueSetup = () => {
|
|
36
37
|
const binaries = [];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../nodes/ItemLists/V3/helpers/utils.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../nodes/ItemLists/V3/helpers/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../nodes/Transform/Sort/utils.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../nodes/Transform/Sort/utils.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAK1E,wBAAgB,UAAU,CACzB,IAAI,EAAE,iBAAiB,EACvB,KAAK,EAAE,kBAAkB,EAAE,GACzB,kBAAkB,EAAE,CAgBtB"}
|
|
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.sortByCode = sortByCode;
|
|
4
4
|
const vm2_1 = require("vm2");
|
|
5
5
|
const n8n_workflow_1 = require("n8n-workflow");
|
|
6
|
+
const utils_1 = require("../../Code/utils");
|
|
6
7
|
const returnRegExp = /\breturn\b/;
|
|
7
8
|
function sortByCode(items) {
|
|
8
9
|
const code = this.getNodeParameter('code', 0);
|
|
@@ -14,6 +15,6 @@ function sortByCode(items) {
|
|
|
14
15
|
console: mode === 'manual' ? 'redirect' : 'inherit',
|
|
15
16
|
sandbox: { items },
|
|
16
17
|
});
|
|
17
|
-
return vm.run(
|
|
18
|
+
return vm.run((0, utils_1.generateSortingScript)(code));
|
|
18
19
|
}
|
|
19
20
|
//# sourceMappingURL=utils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../nodes/Transform/Sort/utils.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../nodes/Transform/Sort/utils.ts"],"names":[],"mappings":";;AAMA,gCAmBC;AAzBD,6BAA6B;AAE7B,+CAAkD;AAClD,4CAAyD;AAEzD,MAAM,YAAY,GAAG,YAAY,CAAC;AAClC,SAAgB,UAAU,CAEzB,KAA2B;IAE3B,MAAM,IAAI,GAAG,IAAI,CAAC,gBAAgB,CAAC,MAAM,EAAE,CAAC,CAAW,CAAC;IACxD,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;QAC9B,MAAM,IAAI,iCAAkB,CAC3B,IAAI,CAAC,OAAO,EAAE,EACd,wEAAwE,CACxE,CAAC;IACH,CAAC;IAED,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC;IAC5B,MAAM,EAAE,GAAG,IAAI,YAAM,CAAC;QACrB,OAAO,EAAE,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS;QACnD,OAAO,EAAE,EAAE,KAAK,EAAE;KAClB,CAAC,CAAC;IAEH,OAAO,EAAE,CAAC,GAAG,CAAC,IAAA,6BAAqB,EAAC,IAAI,CAAC,CAAC,CAAC;AAC5C,CAAC"}
|