mudhorn/n8n
1
0
Fork 0
mirror of https://github.com/n8n-io/n8n.git synced 2024-09-20 14:57:31 -07:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

⚡ Always stringify data of Function-Nodes (#2606)

Browse source 
* ⚡ Always stringify data of Function-Nodes

* ⚡ Fix lint issue and fix data
This commit is contained in:
Jan Oberhauser 2022-01-02 10:33:15 +01:00 committed by GitHub
parent 815e405148
commit 6d0a4d2132
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 35 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
packages/nodes-base/nodes/Function/Function.node.ts
View file

@ -1,5 +1,6 @@
import { IExecuteFunctions } from 'n8n-core';
import {
IDataObject,
INodeExecutionData,
INodeType,
INodeTypeDescription,
@ -58,6 +59,21 @@ return items;`,
// Copy the items as they may get changed in the functions
items = JSON.parse(JSON.stringify(items));
const cleanupData = (inputData: IDataObject): IDataObject => {
Object.keys(inputData).map(key => {
if (inputData[key] !== null && typeof inputData[key] === 'object') {
if (inputData[key]!.constructor.name === 'Object') {
// Is regular node.js object so check its data
inputData[key] = cleanupData(inputData[key] as IDataObject);
} else {
// Is some special object like a Date so stringify
inputData[key] = JSON.parse(JSON.stringify(inputData[key]));
}
}
});
return inputData;
};
// Define the global objects for the custom function
const sandbox = {
getNodeParameter: this.getNodeParameter,
@ -117,6 +133,9 @@ return items;`,
if (typeof item.json !== 'object') {
throw new NodeOperationError(this.getNode(), 'The json-property has to be an object!');
}
item.json = cleanupData(item.json);
if (item.binary !== undefined) {
if (Array.isArray(item.binary) || typeof item.binary !== 'object') {
throw new NodeOperationError(this.getNode(), 'The binary-property has to be an object!');
@ -143,9 +162,6 @@ return items;`,
}
}
return this.prepareOutputData(items);
}
}

17
packages/nodes-base/nodes/FunctionItem/FunctionItem.node.ts
View file

@ -58,6 +58,21 @@ return item;`,
const length = items.length as unknown as number;
let item: INodeExecutionData;
const cleanupData = (inputData: IDataObject): IDataObject => {
Object.keys(inputData).map(key => {
if (inputData[key] !== null && typeof inputData[key] === 'object') {
if (inputData[key]!.constructor.name === 'Object') {
// Is regular node.js object so check its data
inputData[key] = cleanupData(inputData[key] as IDataObject);
} else {
// Is some special object like a Date so stringify
inputData[key] = JSON.parse(JSON.stringify(inputData[key]));
}
}
});
return inputData;
};
for (let itemIndex = 0; itemIndex < length; itemIndex++) {
try {
item = items[itemIndex];
@ -145,7 +160,7 @@ return item;`,
}
const returnItem: INodeExecutionData = {
json: jsonData,
json: cleanupData(jsonData),
};
if (item.binary) {