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

fix: Do not show [object Object] in error message when validating type (no-changelog) (#9591)

Browse Source
This commit is contained in:
Michael Kret
2024-06-03 12:09:48 +03:00
committed by GitHub
parent 19e5c0397a
commit cda1e3f6e5
3 changed files with 29 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
packages/workflow/src/TypeValidation.ts
View File

@@ -145,6 +145,16 @@ export const tryToParseObject = (value: unknown): object => {
}
};
export const getValueDescription = <T>(value: T): string => {
if (typeof value === 'object') {
if (value === null) return "'null'";
if (Array.isArray(value)) return 'array';
return 'object';
}
return `'${String(value)}'`;
};
export const tryToParseUrl = (value: unknown): string => {
if (typeof value === 'string' && !value.includes('://')) {
value = `http://${value}`;
@@ -196,7 +206,8 @@ export function validateFieldType(
const strict = options.strict ?? false;
const valueOptions = options.valueOptions ?? [];
const parseStrings = options.parseStrings ?? false;
const defaultErrorMessage = `'${fieldName}' expects a ${type} but we got '${String(value)}'`;
const defaultErrorMessage = `'${fieldName}' expects a ${type} but we got ${getValueDescription(value)}`;
switch (type.toLowerCase()) {
case 'string': {
if (!parseStrings) return { valid: true, newValue: value };
@@ -256,7 +267,7 @@ export function validateFieldType(
} catch (e) {
return {
valid: false,
errorMessage: `'${fieldName}' expects time (hh:mm:(:ss)) but we got '${String(value)}'.`,
errorMessage: `'${fieldName}' expects time (hh:mm:(:ss)) but we got ${getValueDescription(value)}.`,
};
}
}
@@ -287,9 +298,9 @@ export function validateFieldType(
if (!isValidOption) {
return {
valid: false,
errorMessage: `'${fieldName}' expects one of the following values: [${validOptions}] but we got '${String(
errorMessage: `'${fieldName}' expects one of the following values: [${validOptions}] but we got ${getValueDescription(
value,
)}'`,
)}`,
};
}
return { valid: true, newValue: value };

13
packages/workflow/test/TypeValidation.test.ts
View File

@@ -1,4 +1,4 @@
import { validateFieldType } from '@/TypeValidation';
import { getValueDescription, validateFieldType } from '@/TypeValidation';
import { DateTime } from 'luxon';
const VALID_ISO_DATES = [
@@ -230,4 +230,15 @@ describe('Type Validation', () => {
});
});
});
describe('getValueDescription util function', () => {
it('should return correct description', () => {
expect(getValueDescription('foo')).toBe("'foo'");
expect(getValueDescription(42)).toBe("'42'");
expect(getValueDescription(true)).toBe("'true'");
expect(getValueDescription(null)).toBe("'null'");
expect(getValueDescription(undefined)).toBe("'undefined'");
expect(getValueDescription([{}])).toBe('array');
expect(getValueDescription({})).toBe('object');
});
});
});