@suitegeezus/suitecloud-cli 3.1.5 → 3.1.6-0

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@suitegeezus/suitecloud-cli",
-	"version": "3.1.5",
+	"version": "3.1.6-0",
 	"license": "UPL-1.0",
 	"description": "SuiteCloud CLI for Node.js",
 	"keywords": [

package/src/CLI.js

@@ -107,7 +107,7 @@ module.exports = class CLI {
 	_validateInteractive() {
 		let additionalAllowed = 0;
 		process.argv.forEach((arg)=>{
-			if( /\b(authid|project|config|debug)\b/.test(arg) ) additionalAllowed += 2;
+			if( /\b(authid|project|config|debug|skiphooks|folder)\b/.test(arg) ) additionalAllowed += 2;
 		});
 		if (process.argv.length > (4 + additionalAllowed) ) {
 			// There are more options apart from -i or --interactive

package/src/commands/account/setupci/AccountSetupCiAction.js

@@ -21,7 +21,7 @@ module.exports = class AccountSetupCiAction extends BaseAction {
 	}
 
 	preExecute(params) {
-		this._projectInfoService.checkWorkingDirectoryContainsValidProject(this._commandMetadata.name);
+		this._projectInfoService.checkWorkingDirectoryContainsValidProject(this._commandMetadata.name, false);
 
 		if (params[OPTIONS.ACCOUNT]) {
 			params[OPTIONS.ACCOUNT] = params[OPTIONS.ACCOUNT].toUpperCase();

package/src/commands/file/list/ListFilesInputHandler.js

@@ -35,20 +35,31 @@ module.exports = class ListFilesInputHandler extends BaseInputHandler {
 		if (accountFileCabinetFolders.length === 0) {
 			throw NodeTranslationService.getMessage(ERRORS.NO_FOLDERS_FOUND);
 		}
-		const fileCabinetFolders = accountFileCabinetFolders.map((folderPath) => {
-			return {
-				name: folderPath,
-				value: folderPath,
-			};
-		});
 
+		const fileCabinetFolders = new Set();
+		fileCabinetFolders.add(SUITE_SCRIPTS_FOLDER);
+		let defaultValue = SUITE_SCRIPTS_FOLDER;
+		accountFileCabinetFolders.forEach((folderPath) => {
+			// only return folder that match the filter
+			if( folderPath === params.folder ) defaultValue = folderPath;
+			if(
+				(typeof params.folder === 'string' && folderPath.includes(params.folder)) ||
+				typeof params.folder !== 'string'
+			){
+				return fileCabinetFolders.add({
+					name: folderPath,
+					value: folderPath,
+				});
+			}
+		});
+		if( fileCabinetFolders.has(defaultValue)) fileCabinetFolders.delete(defaultValue);
 		return prompt([
 			{
 				type: CommandUtils.INQUIRER_TYPES.LIST,
 				name: this._commandMetadata.options.folder.name,
 				message: NodeTranslationService.getMessage(SELECT_FOLDER),
-				default: SUITE_SCRIPTS_FOLDER,
-				choices: fileCabinetFolders,
+				default: defaultValue,
+				choices: [...fileCabinetFolders],
 			},
 		]);
 	}

package/src/core/CommandActionExecutor.js

@@ -256,10 +256,18 @@ module.exports = class CommandActionExecutor {
 			// apply defaults first
 			if (options.hasOwnProperty(optionId)){
 				if(optionMeta?.mandatory) {
-					if (optionMeta?.type === "FLAG") {
-						optionValues[optionId] = Boolean(optionMeta.defaultOption)
-					} else if(!["undefined"].includes( typeof optionMeta?.defaultOption)){
-						optionValues[optionId] = optionMeta.defaultOption;
+					switch(true){
+						case optionMeta?.type !== 'FLAG' && typeof optionMeta?.defaultOption === "boolean":
+							// don't set a value for boolean unless it is a FLAG type
+							break;
+						case (optionMeta?.type === "FLAG"):
+							optionValues[optionId] = Boolean(optionMeta.defaultOption)
+							break;
+						case !["undefined"].includes( typeof optionMeta?.defaultOption) && optionMeta?.type !== 'FLAG':
+								optionValues[optionId] = optionMeta.defaultOption;
+							break;
+						default:
+							break;
 					}
 				}
 			    if(args.hasOwnProperty(optionId)) {

package/src/core/CommandRegistrationService.js

@@ -65,11 +65,12 @@ module.exports = class CommandRegistrationService {
 
 	_addInteractiveCommandOptions(commandSetup,options){
 		const filteredOptions = Object.entries(options).filter(([key,o])=>{
-			return ['authid','project','config','debug'].includes(o.name);
+			return ['authid','project','config','debug','skiphooks','folder'].includes(o.name);
 		});
 		filteredOptions.push(['interactive',{
 			"name": "interactive",
 			"option": "interactive",
+			"alias": "i",
 			"description": "Be interactive",
 			"mandatory": true,
 			"type": "FLAG",

package/src/services/ProjectInfoService.js

@@ -19,6 +19,7 @@ const NodeTranslationService = require('./NodeTranslationService');
 const xml2js = require('xml2js');
 const assert = require('assert');
 const { lineBreak } = require('../loggers/LoggerOsConstants');
+const NodeConsoleLogger = require('../loggers/NodeConsoleLogger');
 
 const MANIFEST_TAG_XML_PATH = '/manifest';
 const PROJECT_TYPE_ATTRIBUTE = 'projecttype';
@@ -199,11 +200,13 @@ module.exports = class ProjectInfoService {
 		return this.isAccountCustomizationProject() || this.isSuiteAppProject();
 	}
 
-	checkWorkingDirectoryContainsValidProject(commandName) {
+	checkWorkingDirectoryContainsValidProject(commandName, doThrow=true) {
 		if (!FileUtils.exists(path.join(this._projectFolder, FILES.MANIFEST_XML))) {
 			const errorMessage = NodeTranslationService.getMessage(ERRORS.NOT_PROJECT_FOLDER, FILES.MANIFEST_XML, this._projectFolder, commandName)
-				+ lineBreak + NodeTranslationService.getMessage(ERRORS.SEE_PROJECT_STRUCTURE, INFO.PROJECT_STRUCTURE);
-			throw new CLIException(errorMessage);
+			if( doThrow) throw new CLIException(
+				errorMessage + lineBreak + NodeTranslationService.getMessage(ERRORS.SEE_PROJECT_STRUCTURE, INFO.PROJECT_STRUCTURE)
+			);
+			NodeConsoleLogger.warning(errorMessage);
 		}
 	}
 };