TryGhost/Ghost
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2024-12-30 06:12:03 +03:00
Code Issues Projects Releases Wiki Activity

Reshuffled yaml parser messages

Browse Source 
refs https://linear.app/tryghost/issue/CORE-35/refactor-route-and-redirect-settings

- The previous messages structure wasn't making any sense
This commit is contained in:
Naz 2021-09-30 18:18:19 +02:00
parent 7619ad31d4
commit 298a88ef40
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
core/server/services/route-settings/yaml-parser.js
View File

@ -3,10 +3,14 @@ const tpl = require('@tryghost/tpl');
const errors = require('@tryghost/errors');
const messages = {
error: 'Could not parse provided YAML file: {context}.',
help: 'Check provided file for typos and fix the named issues.',
yamlParse: 'YAML input cannot be a plain string. Check the format of your YAML file.',
yamlParseHelp: 'https://ghost.org/docs/themes/routing/'
parsingError: {
message: 'Could not parse provided YAML file: {context}.',
help: 'Check provided file for typos and fix the named issues.',
},
invalidYamlFormat: {
message: 'YAML input cannot be a plain string. Check the format of your YAML file.',
help: 'https://ghost.org/docs/themes/routing/'
}
};
/**
@ -23,9 +27,9 @@ module.exports = function parseYaml(file) {
// But one of the obvious errors is the plain string output.
// Here we check if the user made this mistake.
if (typeof parsed === 'string') {
throw new errors.BadRequestError({
message: messages.yamlParse,
help: messages.yamlParseHelp
throw new errors.IncorrectUsageError({
message: messages.invalidYamlFormat.message,
help: messages.invalidYamlFormat.help
});
}
@ -39,11 +43,11 @@ module.exports = function parseYaml(file) {
// `reason` property as well as in the message.
// As the file uploaded is invalid, the person uploading must fix this - it's a 4xx error
throw new errors.IncorrectUsageError({
message: tpl(messages.error, {context: error.reason}),
message: tpl(messages.parsingError.message, {context: error.reason}),
code: 'YAML_PARSER_ERROR',
context: error.message,
err: error,
help: messages.help
help: messages.parsingError.help
});
}
};