From 9157d5981f6840bfa06652ad8fd16754c6fd679d Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Wed, 11 Sep 2019 10:19:03 +0200 Subject: Improve plugin package.json error message --- server/helpers/custom-validators/plugins.ts | 70 ++++++++++++++++++++++++----- 1 file changed, 59 insertions(+), 11 deletions(-) (limited to 'server/helpers/custom-validators') diff --git a/server/helpers/custom-validators/plugins.ts b/server/helpers/custom-validators/plugins.ts index 63af91a44..2e3175742 100644 --- a/server/helpers/custom-validators/plugins.ts +++ b/server/helpers/custom-validators/plugins.ts @@ -84,17 +84,65 @@ function isThemeNameValid (name: string) { } function isPackageJSONValid (packageJSON: PluginPackageJson, pluginType: PluginType) { - return isNpmPluginNameValid(packageJSON.name) && - isPluginDescriptionValid(packageJSON.description) && - isPluginEngineValid(packageJSON.engine) && - isPluginHomepage(packageJSON.homepage) && - exists(packageJSON.author) && - isPluginBugs(packageJSON.bugs) && - (pluginType === PluginType.THEME || isSafePath(packageJSON.library)) && - areStaticDirectoriesValid(packageJSON.staticDirs) && - areCSSPathsValid(packageJSON.css) && - areClientScriptsValid(packageJSON.clientScripts) && - areTranslationPathsValid(packageJSON.translations) + let result = true + const badFields: string[] = [] + + if (!isNpmPluginNameValid(packageJSON.name)) { + result = false + badFields.push('name') + } + + if (!isPluginDescriptionValid(packageJSON.description)) { + result = false + badFields.push('description') + } + + if (!isPluginEngineValid(packageJSON.engine)) { + result = false + badFields.push('engine') + } + + if (!isPluginHomepage(packageJSON.homepage)) { + result = false + badFields.push('homepage') + } + + if (!exists(packageJSON.author)) { + result = false + badFields.push('author') + } + + if (!isPluginBugs(packageJSON.bugs)) { + result = false + badFields.push('bugs') + } + + if (pluginType === PluginType.PLUGIN && !isSafePath(packageJSON.library)) { + result = false + badFields.push('library') + } + + if (!areStaticDirectoriesValid(packageJSON.staticDirs)) { + result = false + badFields.push('staticDirs') + } + + if (!areCSSPathsValid(packageJSON.css)) { + result = false + badFields.push('css') + } + + if (!areClientScriptsValid(packageJSON.clientScripts)) { + result = false + badFields.push('clientScripts') + } + + if (!areTranslationPathsValid(packageJSON.translations)) { + result = false + badFields.push('translations') + } + + return { result, badFields } } function isLibraryCodeValid (library: any) { -- cgit v1.2.3