mirror of
https://github.com/Abdulazizzn/n8n-enterprise-unlocked.git
synced 2025-12-18 02:21:13 +00:00
n8n-3867-progressively-apply-prettier-to-all (#3873)
* 🔨 formatting nodes with prettier
This commit is contained in:
@@ -10,12 +10,16 @@ import pg from 'pg-promise/typescript/pg-subset';
|
||||
* @param {string[]} properties The properties it should include
|
||||
* @returns
|
||||
*/
|
||||
export function getItemsCopy(items: INodeExecutionData[], properties: string[], guardedColumns?: {[key: string]: string}): IDataObject[] {
|
||||
export function getItemsCopy(
|
||||
items: INodeExecutionData[],
|
||||
properties: string[],
|
||||
guardedColumns?: { [key: string]: string },
|
||||
): IDataObject[] {
|
||||
let newItem: IDataObject;
|
||||
return items.map(item => {
|
||||
return items.map((item) => {
|
||||
newItem = {};
|
||||
if (guardedColumns) {
|
||||
Object.keys(guardedColumns).forEach( column => {
|
||||
Object.keys(guardedColumns).forEach((column) => {
|
||||
newItem[column] = item.json[guardedColumns[column]];
|
||||
});
|
||||
} else {
|
||||
@@ -35,10 +39,14 @@ export function getItemsCopy(items: INodeExecutionData[], properties: string[],
|
||||
* @param {string[]} properties The properties it should include
|
||||
* @returns
|
||||
*/
|
||||
export function getItemCopy(item: INodeExecutionData, properties: string[], guardedColumns?: {[key: string]: string}): IDataObject {
|
||||
export function getItemCopy(
|
||||
item: INodeExecutionData,
|
||||
properties: string[],
|
||||
guardedColumns?: { [key: string]: string },
|
||||
): IDataObject {
|
||||
const newItem: IDataObject = {};
|
||||
if (guardedColumns) {
|
||||
Object.keys(guardedColumns).forEach( column => {
|
||||
Object.keys(guardedColumns).forEach((column) => {
|
||||
newItem[column] = item.json[guardedColumns[column]];
|
||||
});
|
||||
} else {
|
||||
@@ -56,7 +64,13 @@ export function getItemCopy(item: INodeExecutionData, properties: string[], guar
|
||||
* @returns string
|
||||
*/
|
||||
export function generateReturning(pgp: pgPromise.IMain<{}, pg.IClient>, returning: string): string {
|
||||
return ' RETURNING ' + returning.split(',').map(returnedField => pgp.as.name(returnedField.trim())).join(', ');
|
||||
return (
|
||||
' RETURNING ' +
|
||||
returning
|
||||
.split(',')
|
||||
.map((returnedField) => pgp.as.name(returnedField.trim()))
|
||||
.join(', ')
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -81,12 +95,12 @@ export async function pgQuery(
|
||||
let valuesArray = [] as string[][];
|
||||
if (additionalFields.queryParams) {
|
||||
const propertiesString = additionalFields.queryParams as string;
|
||||
const properties = propertiesString.split(',').map(column => column.trim());
|
||||
const properties = propertiesString.split(',').map((column) => column.trim());
|
||||
const paramsItems = getItemsCopy(items, properties);
|
||||
valuesArray = paramsItems.map((row) => properties.map(col => row[col])) as string[][];
|
||||
valuesArray = paramsItems.map((row) => properties.map((col) => row[col])) as string[][];
|
||||
}
|
||||
|
||||
const allQueries = [] as Array<{query: string, values?: string[]}>;
|
||||
const allQueries = [] as Array<{ query: string; values?: string[] }>;
|
||||
for (let i = 0; i < items.length; i++) {
|
||||
const query = getNodeParam('query', i) as string;
|
||||
const values = valuesArray[i];
|
||||
@@ -94,32 +108,46 @@ export async function pgQuery(
|
||||
allQueries.push(queryFormat);
|
||||
}
|
||||
|
||||
const mode = overrideMode ? overrideMode : (additionalFields.mode ?? 'multiple') as string;
|
||||
const mode = overrideMode ? overrideMode : ((additionalFields.mode ?? 'multiple') as string);
|
||||
if (mode === 'multiple') {
|
||||
return (await db.multi(pgp.helpers.concat(allQueries))).flat(1);
|
||||
} else if (mode === 'transaction') {
|
||||
return db.tx(async t => {
|
||||
return db.tx(async (t) => {
|
||||
const result: IDataObject[] = [];
|
||||
for (let i = 0; i < allQueries.length; i++) {
|
||||
try {
|
||||
Array.prototype.push.apply(result, await t.any(allQueries[i].query, allQueries[i].values));
|
||||
Array.prototype.push.apply(
|
||||
result,
|
||||
await t.any(allQueries[i].query, allQueries[i].values),
|
||||
);
|
||||
} catch (err) {
|
||||
if (continueOnFail === false) throw err;
|
||||
result.push({ ...items[i].json, code: (err as JsonObject).code, message: (err as JsonObject).message });
|
||||
result.push({
|
||||
...items[i].json,
|
||||
code: (err as JsonObject).code,
|
||||
message: (err as JsonObject).message,
|
||||
});
|
||||
return result;
|
||||
}
|
||||
}
|
||||
return result;
|
||||
});
|
||||
} else if (mode === 'independently') {
|
||||
return db.task(async t => {
|
||||
return db.task(async (t) => {
|
||||
const result: IDataObject[] = [];
|
||||
for (let i = 0; i < allQueries.length; i++) {
|
||||
try {
|
||||
Array.prototype.push.apply(result, await t.any(allQueries[i].query, allQueries[i].values));
|
||||
Array.prototype.push.apply(
|
||||
result,
|
||||
await t.any(allQueries[i].query, allQueries[i].values),
|
||||
);
|
||||
} catch (err) {
|
||||
if (continueOnFail === false) throw err;
|
||||
result.push({ ...items[i].json, code: (err as JsonObject).code, message: (err as JsonObject).message });
|
||||
result.push({
|
||||
...items[i].json,
|
||||
code: (err as JsonObject).code,
|
||||
message: (err as JsonObject).message,
|
||||
});
|
||||
}
|
||||
}
|
||||
return result;
|
||||
@@ -148,28 +176,30 @@ export async function pgInsert(
|
||||
const table = getNodeParam('table', 0) as string;
|
||||
const schema = getNodeParam('schema', 0) as string;
|
||||
const columnString = getNodeParam('columns', 0) as string;
|
||||
const guardedColumns: {[key: string]: string} = {};
|
||||
const guardedColumns: { [key: string]: string } = {};
|
||||
|
||||
const columns = columnString.split(',')
|
||||
.map(column => column.trim().split(':'))
|
||||
const columns = columnString
|
||||
.split(',')
|
||||
.map((column) => column.trim().split(':'))
|
||||
.map(([name, cast], i) => {
|
||||
guardedColumns[`column${i}`] = name;
|
||||
return { name, cast, prop: `column${i}` };
|
||||
});
|
||||
|
||||
const columnNames = columns.map(column => column.name);
|
||||
const columnNames = columns.map((column) => column.name);
|
||||
|
||||
const cs = new pgp.helpers.ColumnSet(columns, { table: { table, schema } });
|
||||
|
||||
const additionalFields = getNodeParam('additionalFields', 0) as IDataObject;
|
||||
const mode = overrideMode ? overrideMode : (additionalFields.mode ?? 'multiple') as string;
|
||||
const mode = overrideMode ? overrideMode : ((additionalFields.mode ?? 'multiple') as string);
|
||||
|
||||
const returning = generateReturning(pgp, getNodeParam('returnFields', 0) as string);
|
||||
if (mode === 'multiple') {
|
||||
const query = pgp.helpers.insert(getItemsCopy(items, columnNames, guardedColumns), cs) + returning;
|
||||
const query =
|
||||
pgp.helpers.insert(getItemsCopy(items, columnNames, guardedColumns), cs) + returning;
|
||||
return db.any(query);
|
||||
} else if (mode === 'transaction') {
|
||||
return db.tx(async t => {
|
||||
return db.tx(async (t) => {
|
||||
const result: IDataObject[] = [];
|
||||
for (let i = 0; i < items.length; i++) {
|
||||
const itemCopy = getItemCopy(items[i], columnNames, guardedColumns);
|
||||
@@ -177,14 +207,18 @@ export async function pgInsert(
|
||||
result.push(await t.one(pgp.helpers.insert(itemCopy, cs) + returning));
|
||||
} catch (err) {
|
||||
if (continueOnFail === false) throw err;
|
||||
result.push({ ...itemCopy, code: (err as JsonObject).code, message: (err as JsonObject).message });
|
||||
result.push({
|
||||
...itemCopy,
|
||||
code: (err as JsonObject).code,
|
||||
message: (err as JsonObject).message,
|
||||
});
|
||||
return result;
|
||||
}
|
||||
}
|
||||
return result;
|
||||
});
|
||||
} else if (mode === 'independently') {
|
||||
return db.task(async t => {
|
||||
return db.task(async (t) => {
|
||||
const result: IDataObject[] = [];
|
||||
for (let i = 0; i < items.length; i++) {
|
||||
const itemCopy = getItemCopy(items[i], columnNames, guardedColumns);
|
||||
@@ -197,7 +231,11 @@ export async function pgInsert(
|
||||
if (continueOnFail === false) {
|
||||
throw err;
|
||||
}
|
||||
result.push({ ...itemCopy, code: (err as JsonObject).code, message: (err as JsonObject).message });
|
||||
result.push({
|
||||
...itemCopy,
|
||||
code: (err as JsonObject).code,
|
||||
message: (err as JsonObject).message,
|
||||
});
|
||||
}
|
||||
}
|
||||
return result;
|
||||
@@ -227,10 +265,11 @@ export async function pgUpdate(
|
||||
const schema = getNodeParam('schema', 0) as string;
|
||||
const updateKey = getNodeParam('updateKey', 0) as string;
|
||||
const columnString = getNodeParam('columns', 0) as string;
|
||||
const guardedColumns: {[key: string]: string} = {};
|
||||
const guardedColumns: { [key: string]: string } = {};
|
||||
|
||||
const columns: Array<{name:string, cast: string, prop:string}> = columnString.split(',')
|
||||
.map(column => column.trim().split(':'))
|
||||
const columns: Array<{ name: string; cast: string; prop: string }> = columnString
|
||||
.split(',')
|
||||
.map((column) => column.trim().split(':'))
|
||||
.map(([name, cast], i) => {
|
||||
guardedColumns[`column${i}`] = name;
|
||||
return { name, cast, prop: `column${i}` };
|
||||
@@ -243,61 +282,83 @@ export async function pgUpdate(
|
||||
if (!targetCol) {
|
||||
guardedColumns[updateColumn.prop] = name;
|
||||
columns.unshift(updateColumn);
|
||||
}
|
||||
else if (!targetCol.cast) {
|
||||
} else if (!targetCol.cast) {
|
||||
targetCol.cast = updateColumn.cast || targetCol.cast;
|
||||
}
|
||||
return updateColumn;
|
||||
});
|
||||
|
||||
const additionalFields = getNodeParam('additionalFields', 0) as IDataObject;
|
||||
const mode = additionalFields.mode ?? 'multiple' as string;
|
||||
const mode = additionalFields.mode ?? ('multiple' as string);
|
||||
|
||||
const cs = new pgp.helpers.ColumnSet(columns, { table: { table, schema } });
|
||||
|
||||
// Prepare the data to update and copy it to be returned
|
||||
const columnNames = columns.map(column => column.name);
|
||||
const columnNames = columns.map((column) => column.name);
|
||||
const updateItems = getItemsCopy(items, columnNames, guardedColumns);
|
||||
|
||||
const returning = generateReturning(pgp, getNodeParam('returnFields', 0) as string);
|
||||
if (mode === 'multiple') {
|
||||
const query =
|
||||
pgp.helpers.update(updateItems, cs)
|
||||
+ ' WHERE ' + updateKeys.map(updateKey => {
|
||||
const key = pgp.as.name(updateKey.name);
|
||||
return 'v.' + key + ' = t.' + key;
|
||||
}).join(' AND ')
|
||||
+ returning;
|
||||
pgp.helpers.update(updateItems, cs) +
|
||||
' WHERE ' +
|
||||
updateKeys
|
||||
.map((updateKey) => {
|
||||
const key = pgp.as.name(updateKey.name);
|
||||
return 'v.' + key + ' = t.' + key;
|
||||
})
|
||||
.join(' AND ') +
|
||||
returning;
|
||||
return await db.any(query);
|
||||
} else {
|
||||
const where = ' WHERE ' +
|
||||
updateKeys.map(updateKey => pgp.as.name(updateKey.name) +
|
||||
' = ${' + updateKey.prop + '}').join(' AND ');
|
||||
const where =
|
||||
' WHERE ' +
|
||||
updateKeys
|
||||
.map((updateKey) => pgp.as.name(updateKey.name) + ' = ${' + updateKey.prop + '}')
|
||||
.join(' AND ');
|
||||
if (mode === 'transaction') {
|
||||
return db.tx(async t => {
|
||||
return db.tx(async (t) => {
|
||||
const result: IDataObject[] = [];
|
||||
for (let i = 0; i < items.length; i++) {
|
||||
const itemCopy = getItemCopy(items[i], columnNames, guardedColumns);
|
||||
try {
|
||||
Array.prototype.push.apply(result, await t.any(pgp.helpers.update(itemCopy, cs) + pgp.as.format(where, itemCopy) + returning));
|
||||
Array.prototype.push.apply(
|
||||
result,
|
||||
await t.any(
|
||||
pgp.helpers.update(itemCopy, cs) + pgp.as.format(where, itemCopy) + returning,
|
||||
),
|
||||
);
|
||||
} catch (err) {
|
||||
if (continueOnFail === false) throw err;
|
||||
result.push({ ...itemCopy, code: (err as JsonObject).code, message: (err as JsonObject).message });
|
||||
result.push({
|
||||
...itemCopy,
|
||||
code: (err as JsonObject).code,
|
||||
message: (err as JsonObject).message,
|
||||
});
|
||||
return result;
|
||||
}
|
||||
}
|
||||
return result;
|
||||
});
|
||||
} else if (mode === 'independently') {
|
||||
return db.task(async t => {
|
||||
return db.task(async (t) => {
|
||||
const result: IDataObject[] = [];
|
||||
for (let i = 0; i < items.length; i++) {
|
||||
const itemCopy = getItemCopy(items[i], columnNames, guardedColumns);
|
||||
try {
|
||||
Array.prototype.push.apply(result, await t.any(pgp.helpers.update(itemCopy, cs) + pgp.as.format(where, itemCopy) + returning));
|
||||
Array.prototype.push.apply(
|
||||
result,
|
||||
await t.any(
|
||||
pgp.helpers.update(itemCopy, cs) + pgp.as.format(where, itemCopy) + returning,
|
||||
),
|
||||
);
|
||||
} catch (err) {
|
||||
if (continueOnFail === false) throw err;
|
||||
result.push({ ...itemCopy, code: (err as JsonObject).code, message: (err as JsonObject).message });
|
||||
result.push({
|
||||
...itemCopy,
|
||||
code: (err as JsonObject).code,
|
||||
message: (err as JsonObject).message,
|
||||
});
|
||||
}
|
||||
}
|
||||
return result;
|
||||
|
||||
Reference in New Issue
Block a user