archive-gh-me/serverless
1
0
Fork 0
mirror of https://github.com/serverless/serverless.git synced 2026-01-25 15:07:39 +00:00
Code Issues Projects Releases Wiki Activity

refactor: Rely on external isHelpRequest CLI util

Browse Source
This commit is contained in:
Mariusz Nowak 2021-01-21 17:58:24 +01:00 committed by Mariusz Nowak
parent 8f3481e42a
commit dc9f1809d1
2 changed files with 2 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/classes/CLI.js
View File

@ -7,8 +7,6 @@ const chalk = require('chalk');
const getCommandSuggestion = require('../utils/getCommandSuggestion');
const resolveCliInput = require('../utils/resolveCliInput');
const helpCommandNames = new Set(['help', 'version']);
class CLI {
constructor(serverless, inputArray) {
this.serverless = serverless;
@ -63,24 +61,6 @@ class CLI {
this.log = function () {};
}
isHelpRequest(processedInput) {
const commands = processedInput.commands;
const options = processedInput.options;
if (options.help || options.h) return true;
switch (commands.length) {
case 0:
if (options.version || options.v) return true;
if (options['help-interactive']) return true;
return false;
case 1:
return helpCommandNames.has(commands[0]);
default:
return false;
}
}
displayHelp(processedInput) {
const commands = processedInput.commands;
const options = processedInput.options;

3
lib/classes/Service.js
View File

@ -4,6 +4,7 @@ const { ServerlessError, logWarning } = require('./Error');
const path = require('path');
const _ = require('lodash');
const semver = require('semver');
const isHelpRequest = require('../cli/is-help-request');
const currentVersion = require('../../package').version;
class Service {
@ -45,7 +46,7 @@ class Service {
try {
this.loadServiceFileParam();
} catch (error) {
if (this.serverless.cli.isHelpRequest(this.serverless.processedInput)) return;
if (isHelpRequest()) return;
throw error;
}
}