mirror of
https://github.com/n8n-io/n8n.git
synced 2024-11-10 06:34:05 -08:00
⚡ Always stringify data of Function-Nodes (#2606)
* ⚡ Always stringify data of Function-Nodes * ⚡ Fix lint issue and fix data
This commit is contained in:
parent
815e405148
commit
6d0a4d2132
|
@ -1,5 +1,6 @@
|
||||||
import { IExecuteFunctions } from 'n8n-core';
|
import { IExecuteFunctions } from 'n8n-core';
|
||||||
import {
|
import {
|
||||||
|
IDataObject,
|
||||||
INodeExecutionData,
|
INodeExecutionData,
|
||||||
INodeType,
|
INodeType,
|
||||||
INodeTypeDescription,
|
INodeTypeDescription,
|
||||||
|
@ -58,6 +59,21 @@ return items;`,
|
||||||
// Copy the items as they may get changed in the functions
|
// Copy the items as they may get changed in the functions
|
||||||
items = JSON.parse(JSON.stringify(items));
|
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
|
// Define the global objects for the custom function
|
||||||
const sandbox = {
|
const sandbox = {
|
||||||
getNodeParameter: this.getNodeParameter,
|
getNodeParameter: this.getNodeParameter,
|
||||||
|
@ -117,6 +133,9 @@ return items;`,
|
||||||
if (typeof item.json !== 'object') {
|
if (typeof item.json !== 'object') {
|
||||||
throw new NodeOperationError(this.getNode(), 'The json-property has to be an object!');
|
throw new NodeOperationError(this.getNode(), 'The json-property has to be an object!');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
item.json = cleanupData(item.json);
|
||||||
|
|
||||||
if (item.binary !== undefined) {
|
if (item.binary !== undefined) {
|
||||||
if (Array.isArray(item.binary) || typeof item.binary !== 'object') {
|
if (Array.isArray(item.binary) || typeof item.binary !== 'object') {
|
||||||
throw new NodeOperationError(this.getNode(), 'The binary-property has to be an object!');
|
throw new NodeOperationError(this.getNode(), 'The binary-property has to be an object!');
|
||||||
|
@ -143,9 +162,6 @@ return items;`,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
return this.prepareOutputData(items);
|
return this.prepareOutputData(items);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -58,6 +58,21 @@ return item;`,
|
||||||
const length = items.length as unknown as number;
|
const length = items.length as unknown as number;
|
||||||
let item: INodeExecutionData;
|
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++) {
|
for (let itemIndex = 0; itemIndex < length; itemIndex++) {
|
||||||
try {
|
try {
|
||||||
item = items[itemIndex];
|
item = items[itemIndex];
|
||||||
|
@ -145,7 +160,7 @@ return item;`,
|
||||||
}
|
}
|
||||||
|
|
||||||
const returnItem: INodeExecutionData = {
|
const returnItem: INodeExecutionData = {
|
||||||
json: jsonData,
|
json: cleanupData(jsonData),
|
||||||
};
|
};
|
||||||
|
|
||||||
if (item.binary) {
|
if (item.binary) {
|
||||||
|
|
Loading…
Reference in a new issue