admin/n8n-enterprise-unlocked
1
0
Fork 0
mirror of https://github.com/Abdulazizzn/n8n-enterprise-unlocked.git synced 2025-12-17 18:12:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: Migrate packages from lodash to lodash-es (no-changelog) (#5538)

Browse Source
This commit is contained in:
Alex Grozav
2023-02-23 17:16:05 +02:00
committed by GitHub
parent e2d7c1804f
commit f0695827f5
91 changed files with 737 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
packages/nodes-base/nodes/KoBoToolbox/GenericFunctions.ts
View File

@@ -9,7 +9,21 @@ import type {
IWebhookFunctions,
} from 'n8n-workflow';
import _ from 'lodash';
import set from 'lodash.set';
import concat from 'lodash.concat';
import split from 'lodash.split';
import every from 'lodash.every';
import toString from 'lodash.tostring';
import toNumber from 'lodash.tonumber';
import isString from 'lodash.isstring';
import compact from 'lodash.compact';
import first from 'lodash.first';
import last from 'lodash.last';
import clone from 'lodash.clone';
import some from 'lodash.some';
import isArray from 'lodash.isarray';
import trim from 'lodash.trim';
import escapeRegExp from 'lodash.escaperegexp';
export async function koBoToolboxApiRequest(
this: IExecuteFunctions | IWebhookFunctions | IHookFunctions | ILoadOptionsFunctions,
@@ -21,7 +35,7 @@ export async function koBoToolboxApiRequest(
const returnAll = !!option.returnAll;
if (returnAll) {
// Override manual pagination options
_.set(option, 'qs.limit', 3000);
set(option, 'qs.limit', 3000);
// Don't pass this custom param to helpers.httpRequest
delete option.returnAll;
}
@@ -49,7 +63,7 @@ export async function koBoToolboxApiRequest(
options,
);
// Append or set results
results = response.results ? _.concat(results || [], response.results) : response;
results = response.results ? concat(results || [], response.results) : response;
if (returnAll && response.next) {
options.url = response.next;
} else {
@@ -76,30 +90,30 @@ export async function koBoToolboxRawRequest(
function parseGeoPoint(geoPoint: string): null | number[] {
// Check if it looks like a "lat lon z precision" flat string e.g. "-1.931161 30.079811 0 0" (lat, lon, elevation, precision)
// NOTE: we are discarding the elevation and precision values since they're not (well) supported in GeoJSON
const coordinates = _.split(geoPoint, ' ');
const coordinates = split(geoPoint, ' ');
if (
coordinates.length >= 2 &&
_.every(coordinates, (coord) => coord && /^-?\d+(?:\.\d+)?$/.test(_.toString(coord)))
every(coordinates, (coord) => coord && /^-?\d+(?:\.\d+)?$/.test(toString(coord)))
) {
// NOTE: GeoJSON uses lon, lat, while most common systems use lat, lon order!
return [_.toNumber(coordinates[1]), _.toNumber(coordinates[0])];
return [toNumber(coordinates[1]), toNumber(coordinates[0])];
}
return null;
}
export function parseStringList(value: string): string[] {
return _.split(_.toString(value), /[\s,]+/);
return split(toString(value), /[\s,]+/);
}
const matchWildcard = (value: string, pattern: string): boolean => {
const regex = new RegExp(`^${_.escapeRegExp(pattern).replace('\\*', '.*')}$`);
const regex = new RegExp(`^${escapeRegExp(pattern).replace('\\*', '.*')}$`);
return regex.test(value);
};
const formatValue = (value: any, format: string): any => {
if (_.isString(value)) {
if (isString(value)) {
// Sanitize value
value = _.toString(value);
value = toString(value);
// Parse geoPoints
const geoPoint = parseGeoPoint(value);
@@ -114,11 +128,11 @@ const formatValue = (value: any, format: string): any => {
const points = value.split(';');
if (points.length >= 2 && /^[-\d\.\s;]+$/.test(value)) {
// Using the GeoJSON format as per https://geojson.org/
const coordinates = _.compact(points.map(parseGeoPoint));
const coordinates = compact(points.map(parseGeoPoint));
// Only return if all values are properly parsed
if (coordinates.length === points.length) {
// If the shape is closed, declare it as Polygon, otherwise as LineString
if (_.first(points) === _.last(points)) {
if (first(points) === last(points)) {
return {
type: 'Polygon',
coordinates: [coordinates],
@@ -131,12 +145,12 @@ const formatValue = (value: any, format: string): any => {
// Parse numbers
if ('number' === format) {
return _.toNumber(value);
return toNumber(value);
}
// Split multi-select
if ('multiSelect' === format) {
return _.split(_.toString(value), ' ');
return split(toString(value), ' ');
}
}
@@ -152,29 +166,29 @@ export function formatSubmission(
const response = {} as IDataObject;
for (const key of Object.keys(submission)) {
let value = _.clone(submission[key]);
let value = clone(submission[key]);
// Sanitize key names: split by group, trim _
const sanitizedKey = key
.split('/')
.map((k) => _.trim(k, ' _'))
.map((k) => trim(k, ' _'))
.join('.');
const leafKey = sanitizedKey.split('.').pop() || '';
let format = 'string';
if (_.some(numberMasks, (mask) => matchWildcard(leafKey, mask))) {
if (some(numberMasks, (mask) => matchWildcard(leafKey, mask))) {
format = 'number';
}
if (_.some(selectMasks, (mask) => matchWildcard(leafKey, mask))) {
if (some(selectMasks, (mask) => matchWildcard(leafKey, mask))) {
format = 'multiSelect';
}
value = formatValue(value, format);
_.set(response, sanitizedKey, value);
set(response, sanitizedKey, value);
}
// Reformat _geolocation
if (
_.isArray(response.geolocation) &&
isArray(response.geolocation) &&
response.geolocation.length === 2 &&
response.geolocation[0] &&
response.geolocation[1]
@@ -210,7 +224,7 @@ export async function downloadAttachments(
for (const [index, attachment] of attachmentList.entries()) {
// look for the question name linked to this attachment
const fileName = attachment.filename;
const sanitizedFileName = _.toString(fileName).replace(/_[^_]+(?=\.\w+)/, ''); // strip suffix
const sanitizedFileName = toString(fileName).replace(/_[^_]+(?=\.\w+)/, ''); // strip suffix
let relatedQuestion = null;
if ('question' === options.binaryNamingScheme) {
@@ -218,7 +232,7 @@ export async function downloadAttachments(
// The logic to map attachments to question is sometimes ambiguous:
// - If the attachment is linked to a question, the question's value is the same as the attachment's filename (with spaces replaced by underscores)
// - BUT sometimes the attachment's filename has an extra suffix, e.g. "My_Picture_0OdlaKJ.jpg", would map to the question "picture": "My Picture.jpg"
const sanitizedQuestionValue = _.toString(submission[question]).replace(/\s/g, '_'); // replace spaces with underscores
const sanitizedQuestionValue = toString(submission[question]).replace(/\s/g, '_'); // replace spaces with underscores
if (sanitizedFileName === sanitizedQuestionValue) {
relatedQuestion = question;
// Just use the first match...