@pnp/cli-microsoft365 7.3.0-beta.73848f3 → 7.3.0-beta.9479ed4

package/dist/m365/spo/commands/tenant/tenant-appcatalog-add.js

@@ -4,7 +4,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _SpoTenantAppCatalogAddCommand_instances, _SpoTenantAppCatalogAddCommand_initTelemetry, _SpoTenantAppCatalogAddCommand_initOptions, _SpoTenantAppCatalogAddCommand_initValidators;
-import { Cli } from '../../../../cli/Cli.js';
+import { cli } from '../../../../cli/cli.js';
 import { CommandError } from '../../../../Command.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
@@ -31,7 +31,7 @@ class SpoTenantAppCatalogAddCommand extends SpoCommand {
         if (this.verbose) {
             await logger.logToStderr('Checking for existing app catalog URL...');
         }
-        const spoTenantAppCatalogUrlGetCommandOutput = await Cli.executeCommandWithOutput(spoTenantAppCatalogUrlGetCommand, { options: { output: 'text', _: [] } });
+        const spoTenantAppCatalogUrlGetCommandOutput = await cli.executeCommandWithOutput(spoTenantAppCatalogUrlGetCommand, { options: { output: 'text', _: [] } });
         const appCatalogUrl = spoTenantAppCatalogUrlGetCommandOutput.stdout;
         if (!appCatalogUrl) {
             if (this.verbose) {
@@ -61,7 +61,7 @@ class SpoTenantAppCatalogAddCommand extends SpoCommand {
             }
         };
         try {
-            await Cli.executeCommandWithOutput(spoSiteGetCommand, siteGetOptions);
+            await cli.executeCommandWithOutput(spoSiteGetCommand, siteGetOptions);
             if (this.verbose) {
                 await logger.logToStderr(`Found site ${url}`);
             }
@@ -79,7 +79,7 @@ class SpoTenantAppCatalogAddCommand extends SpoCommand {
                 verbose: this.verbose,
                 debug: this.debug
             };
-            await Cli.executeCommand(spoSiteRemoveCommand, { options: { ...siteRemoveOptions, _: [] } });
+            await cli.executeCommand(spoSiteRemoveCommand, { options: { ...siteRemoveOptions, _: [] } });
         }
         catch (err) {
             if (err.error?.message !== 'File not Found' && err.error?.message !== '404 FILE NOT FOUND') {
@@ -107,7 +107,7 @@ class SpoTenantAppCatalogAddCommand extends SpoCommand {
             debug: this.debug,
             removeDeletedSite: false
         };
-        return Cli.executeCommand(spoSiteAddCommand, { options: { ...siteAddOptions, _: [] } });
+        return cli.executeCommand(spoSiteAddCommand, { options: { ...siteAddOptions, _: [] } });
     }
 }
 _SpoTenantAppCatalogAddCommand_instances = new WeakSet(), _SpoTenantAppCatalogAddCommand_initTelemetry = function _SpoTenantAppCatalogAddCommand_initTelemetry() {

package/dist/m365/spo/commands/tenant/tenant-applicationcustomizer-add.js

@@ -4,7 +4,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _SpoTenantApplicationCustomizerAddCommand_instances, _SpoTenantApplicationCustomizerAddCommand_initTelemetry, _SpoTenantApplicationCustomizerAddCommand_initOptions, _SpoTenantApplicationCustomizerAddCommand_initValidators;
-import { Cli } from '../../../../cli/Cli.js';
+import { cli } from '../../../../cli/cli.js';
 import { urlUtil } from '../../../../utils/urlUtil.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
@@ -48,7 +48,7 @@ class SpoTenantApplicationCustomizerAddCommand extends SpoCommand {
         }
     }
     async getAppCatalogUrl(logger) {
-        const spoTenantAppCatalogUrlGetCommandOutput = await Cli.executeCommandWithOutput(spoTenantAppCatalogUrlGetCommand, { options: { output: 'text', _: [] } });
+        const spoTenantAppCatalogUrlGetCommandOutput = await cli.executeCommandWithOutput(spoTenantAppCatalogUrlGetCommand, { options: { output: 'text', _: [] } });
         if (this.verbose) {
             await logger.logToStderr(spoTenantAppCatalogUrlGetCommandOutput.stderr);
         }
@@ -74,7 +74,7 @@ class SpoTenantApplicationCustomizerAddCommand extends SpoCommand {
             debug: this.debug,
             output: 'json'
         };
-        const output = await Cli.executeCommandWithOutput(spoListItemListCommand, { options: { ...commandOptions, _: [] } });
+        const output = await cli.executeCommandWithOutput(spoListItemListCommand, { options: { ...commandOptions, _: [] } });
         if (this.verbose) {
             await logger.logToStderr(output.stderr);
         }
@@ -97,7 +97,7 @@ class SpoTenantApplicationCustomizerAddCommand extends SpoCommand {
             debug: this.debug,
             output: 'json'
         };
-        const output = await Cli.executeCommandWithOutput(spoListItemListCommand, { options: { ...commandOptions, _: [] } });
+        const output = await cli.executeCommandWithOutput(spoListItemListCommand, { options: { ...commandOptions, _: [] } });
         if (this.verbose) {
             await logger.logToStderr(output.stderr);
         }
@@ -126,7 +126,7 @@ class SpoTenantApplicationCustomizerAddCommand extends SpoCommand {
             debug: this.debug,
             output: options.output
         };
-        await Cli.executeCommand(spoListItemAddCommand, { options: { ...commandOptions, _: [] } });
+        await cli.executeCommand(spoListItemAddCommand, { options: { ...commandOptions, _: [] } });
     }
 }
 _SpoTenantApplicationCustomizerAddCommand_instances = new WeakSet(), _SpoTenantApplicationCustomizerAddCommand_initTelemetry = function _SpoTenantApplicationCustomizerAddCommand_initTelemetry() {

package/dist/m365/spo/commands/tenant/tenant-applicationcustomizer-get.js

@@ -11,7 +11,7 @@ import { urlUtil } from '../../../../utils/urlUtil.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
-import { Cli } from '../../../../cli/Cli.js';
+import { cli } from '../../../../cli/cli.js';
 class SpoTenantApplicationCustomizerGetCommand extends SpoCommand {
     get name() {
         return commands.TENANT_APPLICATIONCUSTOMIZER_GET;
@@ -52,7 +52,7 @@ class SpoTenantApplicationCustomizerGetCommand extends SpoCommand {
                 listItemInstances.forEach(v => delete v['ID']);
                 if (listItemInstances.length > 1) {
                     const resultAsKeyValuePair = formatting.convertArrayToHashTable('Id', listItemInstances);
-                    const result = await Cli.handleMultipleResultsFound(`Multiple application customizers with ${args.options.title || args.options.clientSideComponentId} were found.`, resultAsKeyValuePair);
+                    const result = await cli.handleMultipleResultsFound(`Multiple application customizers with ${args.options.title || args.options.clientSideComponentId} were found.`, resultAsKeyValuePair);
                     await logger.log(result);
                 }
                 else {

package/dist/m365/spo/commands/tenant/tenant-applicationcustomizer-remove.js

@@ -4,7 +4,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _SpoTenantApplicationCustomizerRemoveCommand_instances, _SpoTenantApplicationCustomizerRemoveCommand_initTelemetry, _SpoTenantApplicationCustomizerRemoveCommand_initOptions, _SpoTenantApplicationCustomizerRemoveCommand_initValidators, _SpoTenantApplicationCustomizerRemoveCommand_initOptionSets;
-import { Cli } from '../../../../cli/Cli.js';
+import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { odata } from '../../../../utils/odata.js';
@@ -33,7 +33,7 @@ class SpoTenantApplicationCustomizerRemoveCommand extends SpoCommand {
             if (args.options.force) {
                 return await this.removeTenantApplicationCustomizer(logger, args);
             }
-            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove the tenant applicationcustomizer ${args.options.id || args.options.title || args.options.clientSideComponentId}?` });
+            const result = await cli.promptForConfirmation({ message: `Are you sure you want to remove the tenant applicationcustomizer ${args.options.id || args.options.title || args.options.clientSideComponentId}?` });
             if (result) {
                 await this.removeTenantApplicationCustomizer(logger, args);
             }
@@ -62,7 +62,7 @@ class SpoTenantApplicationCustomizerRemoveCommand extends SpoCommand {
         }
         if (listItemInstances.length > 1) {
             const resultAsKeyValuePair = formatting.convertArrayToHashTable('Id', listItemInstances);
-            listItemInstances[0] = await Cli.handleMultipleResultsFound(`Multiple application customizers with ${args.options.title || args.options.clientSideComponentId} were found.`, resultAsKeyValuePair);
+            listItemInstances[0] = await cli.handleMultipleResultsFound(`Multiple application customizers with ${args.options.title || args.options.clientSideComponentId} were found.`, resultAsKeyValuePair);
         }
         return listItemInstances[0].Id;
     }

package/dist/m365/spo/commands/tenant/tenant-applicationcustomizer-set.js

@@ -4,7 +4,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _SpoTenantApplicationCustomizerSetCommand_instances, _SpoTenantApplicationCustomizerSetCommand_initTelemetry, _SpoTenantApplicationCustomizerSetCommand_initOptions, _SpoTenantApplicationCustomizerSetCommand_initValidators, _SpoTenantApplicationCustomizerSetCommand_initOptionSets;
-import { Cli } from '../../../../cli/Cli.js';
+import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { odata } from '../../../../utils/odata.js';
@@ -69,7 +69,7 @@ class SpoTenantApplicationCustomizerSetCommand extends SpoCommand {
         }
         if (listItemInstances.length > 1) {
             const resultAsKeyValuePair = formatting.convertArrayToHashTable('Id', listItemInstances);
-            const result = await Cli.handleMultipleResultsFound(`Multiple application customizers with ${title ? `title '${title}'` : `ClientSideComponentId '${clientSideComponentId}'`} found.`, resultAsKeyValuePair);
+            const result = await cli.handleMultipleResultsFound(`Multiple application customizers with ${title ? `title '${title}'` : `ClientSideComponentId '${clientSideComponentId}'`} found.`, resultAsKeyValuePair);
             return result.Id;
         }
         return listItemInstances[0].Id;
@@ -87,7 +87,7 @@ class SpoTenantApplicationCustomizerSetCommand extends SpoCommand {
             debug: this.debug,
             output: 'json'
         };
-        const output = await Cli.executeCommandWithOutput(spoListItemListCommand, { options: { ...commandOptions, _: [] } });
+        const output = await cli.executeCommandWithOutput(spoListItemListCommand, { options: { ...commandOptions, _: [] } });
         if (this.verbose) {
             logger.logToStderr(output.stderr);
         }
@@ -110,7 +110,7 @@ class SpoTenantApplicationCustomizerSetCommand extends SpoCommand {
             debug: this.debug,
             output: 'json'
         };
-        const output = await Cli.executeCommandWithOutput(spoListItemListCommand, { options: { ...commandOptions, _: [] } });
+        const output = await cli.executeCommandWithOutput(spoListItemListCommand, { options: { ...commandOptions, _: [] } });
         if (this.verbose) {
             logger.logToStderr(output.stderr);
         }

package/dist/m365/spo/commands/tenant/tenant-commandset-add.js

@@ -4,7 +4,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _SpoTenantCommandSetAddCommand_instances, _a, _SpoTenantCommandSetAddCommand_initTelemetry, _SpoTenantCommandSetAddCommand_initOptions, _SpoTenantCommandSetAddCommand_initValidators;
-import { Cli } from '../../../../cli/Cli.js';
+import { cli } from '../../../../cli/cli.js';
 import { urlUtil } from '../../../../utils/urlUtil.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
@@ -48,7 +48,7 @@ class SpoTenantCommandSetAddCommand extends SpoCommand {
         }
     }
     async getAppCatalogUrl(logger) {
-        const spoTenantAppCatalogUrlGetCommandOutput = await Cli.executeCommandWithOutput(spoTenantAppCatalogUrlGetCommand, { options: { output: 'text', _: [] } });
+        const spoTenantAppCatalogUrlGetCommandOutput = await cli.executeCommandWithOutput(spoTenantAppCatalogUrlGetCommand, { options: { output: 'text', _: [] } });
         if (this.verbose) {
             await logger.logToStderr(spoTenantAppCatalogUrlGetCommandOutput.stderr);
         }
@@ -74,7 +74,7 @@ class SpoTenantCommandSetAddCommand extends SpoCommand {
             debug: this.debug,
             output: 'json'
         };
-        const output = await Cli.executeCommandWithOutput(spoListItemListCommand, { options: { ...commandOptions, _: [] } });
+        const output = await cli.executeCommandWithOutput(spoListItemListCommand, { options: { ...commandOptions, _: [] } });
         if (this.verbose) {
             await logger.logToStderr(output.stderr);
         }
@@ -97,7 +97,7 @@ class SpoTenantCommandSetAddCommand extends SpoCommand {
             debug: this.debug,
             output: 'json'
         };
-        const output = await Cli.executeCommandWithOutput(spoListItemListCommand, { options: { ...commandOptions, _: [] } });
+        const output = await cli.executeCommandWithOutput(spoListItemListCommand, { options: { ...commandOptions, _: [] } });
         if (this.verbose) {
             await logger.logToStderr(output.stderr);
         }
@@ -126,7 +126,7 @@ class SpoTenantCommandSetAddCommand extends SpoCommand {
             debug: this.debug,
             output: options.output
         };
-        await Cli.executeCommand(spoListItemAddCommand, { options: { ...commandOptions, _: [] } });
+        await cli.executeCommand(spoListItemAddCommand, { options: { ...commandOptions, _: [] } });
     }
     getLocation(location) {
         switch (location) {

package/dist/m365/spo/commands/tenant/tenant-commandset-get.js

@@ -4,7 +4,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _SpoTenantCommandSetGetCommand_instances, _SpoTenantCommandSetGetCommand_initTelemetry, _SpoTenantCommandSetGetCommand_initOptions, _SpoTenantCommandSetGetCommand_initValidators, _SpoTenantCommandSetGetCommand_initOptionSets;
-import { Cli } from '../../../../cli/Cli.js';
+import { cli } from '../../../../cli/cli.js';
 import { CommandError } from '../../../../Command.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
@@ -57,7 +57,7 @@ class SpoTenantCommandSetGetCommand extends SpoCommand {
                 listItemInstances.value.forEach(v => delete v['ID']);
                 if (listItemInstances.value.length > 1) {
                     const resultAsKeyValuePair = formatting.convertArrayToHashTable('Id', listItemInstances.value);
-                    const result = await Cli.handleMultipleResultsFound(`Multiple ListView Command Sets with ${args.options.title || args.options.clientSideComponentId} were found.`, resultAsKeyValuePair);
+                    const result = await cli.handleMultipleResultsFound(`Multiple ListView Command Sets with ${args.options.title || args.options.clientSideComponentId} were found.`, resultAsKeyValuePair);
                     await logger.log(result);
                 }
                 else {

package/dist/m365/spo/commands/tenant/tenant-commandset-remove.js

@@ -4,7 +4,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _SpoTenantCommandSetRemoveCommand_instances, _SpoTenantCommandSetRemoveCommand_initTelemetry, _SpoTenantCommandSetRemoveCommand_initOptions, _SpoTenantCommandSetRemoveCommand_initValidators, _SpoTenantCommandSetRemoveCommand_initOptionSets;
-import { Cli } from '../../../../cli/Cli.js';
+import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { odata } from '../../../../utils/odata.js';
@@ -33,7 +33,7 @@ class SpoTenantCommandSetRemoveCommand extends SpoCommand {
             if (args.options.force) {
                 return await this.removeTenantCommandSet(logger, args);
             }
-            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove the tenant commandset ${args.options.id || args.options.title || args.options.clientSideComponentId}?` });
+            const result = await cli.promptForConfirmation({ message: `Are you sure you want to remove the tenant commandset ${args.options.id || args.options.title || args.options.clientSideComponentId}?` });
             if (result) {
                 await this.removeTenantCommandSet(logger, args);
             }
@@ -86,7 +86,7 @@ class SpoTenantCommandSetRemoveCommand extends SpoCommand {
         }
         if (listItemInstances.length > 1) {
             const resultAsKeyValuePair = formatting.convertArrayToHashTable('Id', listItemInstances);
-            const result = await Cli.handleMultipleResultsFound(`Multiple command sets with ${args.options.title || args.options.clientSideComponentId} were found.`, resultAsKeyValuePair);
+            const result = await cli.handleMultipleResultsFound(`Multiple command sets with ${args.options.title || args.options.clientSideComponentId} were found.`, resultAsKeyValuePair);
             return result.Id;
         }
         return listItemInstances[0].Id;

package/dist/m365/spo/commands/tenant/tenant-recyclebinitem-remove.js

@@ -4,7 +4,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _SpoTenantRecycleBinItemRemoveCommand_instances, _SpoTenantRecycleBinItemRemoveCommand_initTelemetry, _SpoTenantRecycleBinItemRemoveCommand_initOptions, _SpoTenantRecycleBinItemRemoveCommand_initValidators;
-import { Cli } from '../../../../cli/Cli.js';
+import { cli } from '../../../../cli/cli.js';
 import config from '../../../../config.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
@@ -31,7 +31,7 @@ class SpoTenantRecycleBinItemRemoveCommand extends SpoCommand {
             await this.removeDeletedSite(logger, args);
         }
         else {
-            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove the deleted site collection ${args.options.siteUrl} from tenant recycle bin?` });
+            const result = await cli.promptForConfirmation({ message: `Are you sure you want to remove the deleted site collection ${args.options.siteUrl} from tenant recycle bin?` });
             if (result) {
                 await this.removeDeletedSite(logger, args);
             }

package/dist/m365/spo/commands/term/term-get.js

@@ -4,7 +4,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _SpoTermGetCommand_instances, _SpoTermGetCommand_initTelemetry, _SpoTermGetCommand_initOptions, _SpoTermGetCommand_initValidators, _SpoTermGetCommand_initOptionSets;
-import { Cli } from '../../../../cli/Cli.js';
+import { cli } from '../../../../cli/cli.js';
 import config from '../../../../config.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
@@ -53,7 +53,7 @@ class SpoTermGetCommand extends SpoCommand {
                 }
                 if (terms._Child_Items_.length > 1) {
                     const resultAsKeyValuePair = formatting.convertArrayToHashTable('Id', terms._Child_Items_);
-                    term = await Cli.handleMultipleResultsFound(`Multiple terms with the specific term name found.`, resultAsKeyValuePair);
+                    term = await cli.handleMultipleResultsFound(`Multiple terms with the specific term name found.`, resultAsKeyValuePair);
                 }
                 else {
                     term = terms._Child_Items_[0];

package/dist/m365/spo/commands/term/term-list.js

@@ -4,7 +4,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _SpoTermListCommand_instances, _SpoTermListCommand_initTelemetry, _SpoTermListCommand_initOptions, _SpoTermListCommand_initValidators, _SpoTermListCommand_initOptionSets;
-import { Cli } from '../../../../cli/Cli.js';
+import { cli } from '../../../../cli/cli.js';
 import config from '../../../../config.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
@@ -51,7 +51,7 @@ class SpoTermListCommand extends SpoCommand {
                     }
                 }
             }
-            if (!args.options.output || !Cli.shouldTrimOutput(args.options.output)) {
+            if (!args.options.output || !cli.shouldTrimOutput(args.options.output)) {
                 await logger.log(terms);
             }
             else if (!args.options.includeChildTerms) {

package/dist/m365/spo/commands/theme/theme-remove.js

@@ -4,7 +4,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _SpoThemeRemoveCommand_instances, _SpoThemeRemoveCommand_initTelemetry, _SpoThemeRemoveCommand_initOptions;
-import { Cli } from '../../../../cli/Cli.js';
+import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { spo } from '../../../../utils/spo.js';
 import SpoCommand from '../../../base/SpoCommand.js';
@@ -27,7 +27,7 @@ class SpoThemeRemoveCommand extends SpoCommand {
             await this.removeTheme(logger, args.options);
         }
         else {
-            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove the theme` });
+            const result = await cli.promptForConfirmation({ message: `Are you sure you want to remove the theme` });
             if (result) {
                 await this.removeTheme(logger, args.options);
             }

package/dist/m365/spo/commands/user/user-remove.js

@@ -4,7 +4,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _SpoUserRemoveCommand_instances, _SpoUserRemoveCommand_initTelemetry, _SpoUserRemoveCommand_initOptions, _SpoUserRemoveCommand_initValidators, _SpoUserRemoveCommand_initOptionSets;
-import { Cli } from '../../../../cli/Cli.js';
+import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
@@ -30,7 +30,7 @@ class SpoUserRemoveCommand extends SpoCommand {
             await this.removeUser(logger, args.options);
         }
         else {
-            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove specified user from the site ${args.options.webUrl}?` });
+            const result = await cli.promptForConfirmation({ message: `Are you sure you want to remove specified user from the site ${args.options.webUrl}?` });
             if (result) {
                 await this.removeUser(logger, args.options);
             }

package/dist/m365/spo/commands/userprofile/userprofile-get.js

@@ -4,7 +4,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _SpoUserProfileGetCommand_instances, _SpoUserProfileGetCommand_initOptions, _SpoUserProfileGetCommand_initValidators;
-import { Cli } from '../../../../cli/Cli.js';
+import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { spo } from '../../../../utils/spo.js';
@@ -36,7 +36,7 @@ class SpoUserProfileGetCommand extends SpoCommand {
                 responseType: 'json'
             };
             const res = await request.get(requestOptions);
-            if (!args.options.output || Cli.shouldTrimOutput(args.options.output)) {
+            if (!args.options.output || cli.shouldTrimOutput(args.options.output)) {
                 res.UserProfileProperties = JSON.stringify(res.UserProfileProperties);
             }
             await logger.log(res);

package/dist/m365/spo/commands/web/web-remove.js

@@ -4,7 +4,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _SpoWebRemoveCommand_instances, _SpoWebRemoveCommand_initTelemetry, _SpoWebRemoveCommand_initOptions, _SpoWebRemoveCommand_initValidators;
-import { Cli } from '../../../../cli/Cli.js';
+import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
@@ -28,7 +28,7 @@ class SpoWebRemoveCommand extends SpoCommand {
             await this.removeWeb(logger, args.options.url);
         }
         else {
-            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove the subsite ${args.options.url}?` });
+            const result = await cli.promptForConfirmation({ message: `Are you sure you want to remove the subsite ${args.options.url}?` });
             if (result) {
                 await this.removeWeb(logger, args.options.url);
             }

package/dist/m365/spo/commands/web/web-roleassignment-add.js

@@ -4,7 +4,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _SpoWebRoleAssignmentAddCommand_instances, _SpoWebRoleAssignmentAddCommand_initTelemetry, _SpoWebRoleAssignmentAddCommand_initOptions, _SpoWebRoleAssignmentAddCommand_initValidators, _SpoWebRoleAssignmentAddCommand_initOptionSets;
-import { Cli } from '../../../../cli/Cli.js';
+import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
@@ -71,7 +71,7 @@ class SpoWebRoleAssignmentAddCommand extends SpoCommand {
             debug: this.debug,
             verbose: this.verbose
         };
-        const output = await Cli.executeCommandWithOutput(spoRoleDefinitionListCommand, { options: { ...roleDefinitionListCommandOptions, _: [] } });
+        const output = await cli.executeCommandWithOutput(spoRoleDefinitionListCommand, { options: { ...roleDefinitionListCommandOptions, _: [] } });
         const getRoleDefinitionListOutput = JSON.parse(output.stdout);
         const roleDefinitionId = getRoleDefinitionListOutput.find((role) => role.Name === options.roleDefinitionName).Id;
         return roleDefinitionId;
@@ -84,7 +84,7 @@ class SpoWebRoleAssignmentAddCommand extends SpoCommand {
             debug: this.debug,
             verbose: this.verbose
         };
-        const output = await Cli.executeCommandWithOutput(spoGroupGetCommand, { options: { ...groupGetCommandOptions, _: [] } });
+        const output = await cli.executeCommandWithOutput(spoGroupGetCommand, { options: { ...groupGetCommandOptions, _: [] } });
         const getGroupOutput = JSON.parse(output.stdout);
         return getGroupOutput.Id;
     }
@@ -97,7 +97,7 @@ class SpoWebRoleAssignmentAddCommand extends SpoCommand {
             debug: this.debug,
             verbose: this.verbose
         };
-        const output = await Cli.executeCommandWithOutput(spoUserGetCommand, { options: { ...userGetCommandOptions, _: [] } });
+        const output = await cli.executeCommandWithOutput(spoUserGetCommand, { options: { ...userGetCommandOptions, _: [] } });
         const getUserOutput = JSON.parse(output.stdout);
         return getUserOutput.Id;
     }

package/dist/m365/spo/commands/web/web-roleassignment-remove.js

@@ -4,7 +4,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _SpoWebRoleAssignmentRemoveCommand_instances, _SpoWebRoleAssignmentRemoveCommand_initTelemetry, _SpoWebRoleAssignmentRemoveCommand_initOptions, _SpoWebRoleAssignmentRemoveCommand_initValidators, _SpoWebRoleAssignmentRemoveCommand_initOptionSets;
-import { Cli } from '../../../../cli/Cli.js';
+import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
@@ -31,7 +31,7 @@ class SpoWebRoleAssignmentRemoveCommand extends SpoCommand {
             await this.removeRoleAssignment(logger, args.options);
         }
         else {
-            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove role assignment from web ${args.options.webUrl}?` });
+            const result = await cli.promptForConfirmation({ message: `Are you sure you want to remove role assignment from web ${args.options.webUrl}?` });
             if (result) {
                 await this.removeRoleAssignment(logger, args.options);
             }
@@ -78,7 +78,7 @@ class SpoWebRoleAssignmentRemoveCommand extends SpoCommand {
             debug: this.debug,
             verbose: this.verbose
         };
-        const output = await Cli.executeCommandWithOutput(spoGroupGetCommand, { options: { ...groupGetCommandOptions, _: [] } });
+        const output = await cli.executeCommandWithOutput(spoGroupGetCommand, { options: { ...groupGetCommandOptions, _: [] } });
         const getGroupOutput = JSON.parse(output.stdout);
         return getGroupOutput.Id;
     }
@@ -91,7 +91,7 @@ class SpoWebRoleAssignmentRemoveCommand extends SpoCommand {
             debug: this.debug,
             verbose: this.verbose
         };
-        const output = await Cli.executeCommandWithOutput(spoUserGetCommand, { options: { ...userGetCommandOptions, _: [] } });
+        const output = await cli.executeCommandWithOutput(spoUserGetCommand, { options: { ...userGetCommandOptions, _: [] } });
         const getUserOutput = JSON.parse(output.stdout);
         return getUserOutput.Id;
     }

package/dist/m365/spo/commands/web/web-roleinheritance-break.js

@@ -4,7 +4,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _SpoWebRoleInheritanceBreakCommand_instances, _SpoWebRoleInheritanceBreakCommand_initTelemetry, _SpoWebRoleInheritanceBreakCommand_initOptions, _SpoWebRoleInheritanceBreakCommand_initValidators;
-import { Cli } from '../../../../cli/Cli.js';
+import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
@@ -31,7 +31,7 @@ class SpoWebRoleInheritanceBreakCommand extends SpoCommand {
             await this.breakRoleInheritance(args.options);
         }
         else {
-            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to break the role inheritance of subsite ${args.options.webUrl}?` });
+            const result = await cli.promptForConfirmation({ message: `Are you sure you want to break the role inheritance of subsite ${args.options.webUrl}?` });
             if (result) {
                 await this.breakRoleInheritance(args.options);
             }

package/dist/m365/spo/commands/web/web-roleinheritance-reset.js

@@ -4,7 +4,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _SpoWebRoleInheritanceResetCommand_instances, _SpoWebRoleInheritanceResetCommand_initTelemetry, _SpoWebRoleInheritanceResetCommand_initOptions, _SpoWebRoleInheritanceResetCommand_initValidators;
-import { Cli } from '../../../../cli/Cli.js';
+import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
@@ -31,7 +31,7 @@ class SpoWebRoleInheritanceResetCommand extends SpoCommand {
             await this.resetWebRoleInheritance(args.options);
         }
         else {
-            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to reset the role inheritance of ${args.options.webUrl}?` });
+            const result = await cli.promptForConfirmation({ message: `Are you sure you want to reset the role inheritance of ${args.options.webUrl}?` });
             if (result) {
                 await this.resetWebRoleInheritance(args.options);
             }

package/dist/m365/teams/commands/app/app-install.js

@@ -4,7 +4,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _TeamsAppInstallCommand_instances, _TeamsAppInstallCommand_initTelemetry, _TeamsAppInstallCommand_initOptions, _TeamsAppInstallCommand_initValidators, _TeamsAppInstallCommand_initOptionSets;
-import { Cli } from '../../../../cli/Cli.js';
+import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
@@ -29,6 +29,7 @@ class TeamsAppInstallCommand extends GraphCommand {
     async commandAction(logger, args) {
         try {
             await this.validateUser(args, logger);
+            const appId = await this.getAppId(args.options);
             let url = `${this.resource}/v1.0`;
             if (args.options.teamId) {
                 url += `/teams/${formatting.encodeQueryParameter(args.options.teamId)}/installedApps`;
@@ -44,7 +45,7 @@ class TeamsAppInstallCommand extends GraphCommand {
                 },
                 responseType: 'json',
                 data: {
-                    'teamsApp@odata.bind': `${this.resource}/v1.0/appCatalogs/teamsApps/${args.options.id}`
+                    'teamsApp@odata.bind': `${this.resource}/v1.0/appCatalogs/teamsApps/${appId}`
                 }
             };
             await request.post(requestOptions);
@@ -69,7 +70,7 @@ class TeamsAppInstallCommand extends GraphCommand {
             verbose: args.options.verbose
         };
         try {
-            const res = await Cli.executeCommandWithOutput(aadUserGetCommand, { options: { ...options, _: [] } });
+            const res = await cli.executeCommandWithOutput(aadUserGetCommand, { options: { ...options, _: [] } });
             if (this.verbose) {
                 await logger.logToStderr(res.stderr);
             }
@@ -82,20 +83,45 @@ class TeamsAppInstallCommand extends GraphCommand {
             throw `User with ID ${args.options.userId} not found. Original error: ${err.error.message}`;
         }
     }
+    async getAppId(options) {
+        if (options.id) {
+            return options.id;
+        }
+        const requestOptions = {
+            url: `${this.resource}/v1.0/appCatalogs/teamsApps?$filter=displayName eq '${formatting.encodeQueryParameter(options.name)}'`,
+            headers: {
+                accept: 'application/json;odata.metadata=none'
+            },
+            responseType: 'json'
+        };
+        const response = await request.get(requestOptions);
+        const app = response.value[0];
+        if (!app) {
+            throw `The specified Teams app does not exist`;
+        }
+        if (response.value.length > 1) {
+            const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', response.value);
+            const result = await cli.handleMultipleResultsFound(`Multiple Teams apps with name ${options.name} found.`, resultAsKeyValuePair);
+            return result.id;
+        }
+        return app.id;
+    }
 }
 _TeamsAppInstallCommand_instances = new WeakSet(), _TeamsAppInstallCommand_initTelemetry = function _TeamsAppInstallCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
+            id: typeof args.options.id !== 'undefined',
+            name: typeof args.options.name !== 'undefined',
             teamId: typeof args.options.teamId !== 'undefined',
             userId: typeof args.options.userId !== 'undefined',
             userName: typeof args.options.userName !== 'undefined'
         });
     });
 }, _TeamsAppInstallCommand_initOptions = function _TeamsAppInstallCommand_initOptions() {
-    this.options.unshift({ option: '--id <id>' }, { option: '--teamId [teamId]' }, { option: '--userId [userId]' }, { option: '--userName [userName]' });
+    this.options.unshift({ option: '-i, --id [id]' }, { option: '-n, --name [name]' }, { option: '--teamId [teamId]' }, { option: '--userId [userId]' }, { option: '--userName [userName]' });
 }, _TeamsAppInstallCommand_initValidators = function _TeamsAppInstallCommand_initValidators() {
     this.validators.push(async (args) => {
-        if (!validation.isValidGuid(args.options.id)) {
+        if (args.options.id && !validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
         if (args.options.teamId &&
@@ -110,6 +136,7 @@ _TeamsAppInstallCommand_instances = new WeakSet(), _TeamsAppInstallCommand_initT
     });
 }, _TeamsAppInstallCommand_initOptionSets = function _TeamsAppInstallCommand_initOptionSets() {
     this.optionSets.push({ options: ['teamId', 'userId', 'userName'] });
+    this.optionSets.push({ options: ['id', 'name'] });
 };
 export default new TeamsAppInstallCommand();
 //# sourceMappingURL=app-install.js.map

package/dist/m365/teams/commands/app/app-remove.js

@@ -4,7 +4,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _TeamsAppRemoveCommand_instances, _TeamsAppRemoveCommand_initTelemetry, _TeamsAppRemoveCommand_initOptions, _TeamsAppRemoveCommand_initValidators, _TeamsAppRemoveCommand_initOptionSets;
-import { Cli } from '../../../../cli/Cli.js';
+import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
@@ -48,7 +48,7 @@ class TeamsAppRemoveCommand extends GraphCommand {
             await removeApp();
         }
         else {
-            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove the Teams app ${args.options.id || args.options.name} from the app catalog?` });
+            const result = await cli.promptForConfirmation({ message: `Are you sure you want to remove the Teams app ${args.options.id || args.options.name} from the app catalog?` });
             if (result) {
                 await removeApp();
             }
@@ -75,7 +75,7 @@ class TeamsAppRemoveCommand extends GraphCommand {
         }
         if (response.value.length > 1) {
             const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', response.value);
-            const result = await Cli.handleMultipleResultsFound(`Multiple Teams apps with name '${options.name}' found.`, resultAsKeyValuePair);
+            const result = await cli.handleMultipleResultsFound(`Multiple Teams apps with name '${options.name}' found.`, resultAsKeyValuePair);
             return result.id;
         }
         return app.id;