@pnp/cli-microsoft365 7.3.0-beta.6e32b20 → 7.3.0-beta.9479ed4

package/dist/m365/spo/commands/page/page-add.js

@@ -4,8 +4,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _SpoPageAddCommand_instances, _SpoPageAddCommand_initTelemetry, _SpoPageAddCommand_initOptions, _SpoPageAddCommand_initValidators;
-import { Auth } from '../../../../Auth.js';
-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';
@@ -31,11 +30,9 @@ class SpoPageAddCommand extends SpoCommand {
         __classPrivateFieldGet(this, _SpoPageAddCommand_instances, "m", _SpoPageAddCommand_initValidators).call(this);
     }
     async commandAction(logger, args) {
-        const resource = Auth.getResourceFromUrl(args.options.webUrl);
         let requestDigest = '';
         let itemId = '';
         let pageName = args.options.name;
-        const serverRelativeSiteUrl = urlUtil.getServerRelativeSiteUrl(args.options.webUrl);
         const fileNameWithoutExtension = pageName.replace('.aspx', '');
         let bannerImageUrl = '';
         let canvasContent1 = '';
@@ -52,39 +49,22 @@ class SpoPageAddCommand extends SpoCommand {
             const reqDigest = await spo.getRequestDigest(args.options.webUrl);
             requestDigest = reqDigest.FormDigestValue;
             let requestOptions = {
-                url: `${args.options.webUrl}/_api/web/GetFolderByServerRelativePath(DecodedUrl='${serverRelativeSiteUrl}/sitepages')/files/AddTemplateFile`,
+                url: `${args.options.webUrl}/_api/sitepages/pages`,
+                responseType: 'json',
                 headers: {
-                    'X-RequestDigest': requestDigest,
                     'content-type': 'application/json;odata=nometadata',
                     accept: 'application/json;odata=nometadata'
                 },
                 data: {
-                    urlOfFile: `${serverRelativeSiteUrl}/sitepages/${pageName}`,
-                    templateFileType: 3
-                },
-                responseType: 'json'
+                    PageLayoutType: args.options.layoutType || 'Article',
+                    Name: pageName,
+                    PromotedState: args.options.promoteAs === 'NewsPage' ? 2 : 0,
+                    Title: pageTitle
+                }
             };
             const template = await request.post(requestOptions);
             itemId = template.UniqueId;
             const listItemId = await this.getFileListItemId(args.options.webUrl, serverRelativeFileUrl);
-            const layoutType = args.options.layoutType || 'Article';
-            const listItemSetOptions = {
-                webUrl: args.options.webUrl,
-                listUrl: listServerRelativeUrl,
-                id: listItemId,
-                systemUpdate: true,
-                ContentTypeId: '0x0101009D1CB255DA76424F860D91F20E6C4118',
-                Title: pageTitle,
-                ClientSideApplicationId: 'b6917cb1-93a0-4b97-a84d-7cf49975d4ec',
-                PageLayoutType: layoutType,
-                verbose: this.verbose,
-                debug: this.debug
-            };
-            if (args.options.layoutType === 'Article') {
-                listItemSetOptions.PromotedState = 0;
-                listItemSetOptions.BannerImageUrl = `${resource}/_layouts/15/images/sitepagethumbnail.png, /_layouts/15/images/sitepagethumbnail.png`;
-            }
-            await Cli.executeCommand(spoListItemSetCommand, { options: { ...listItemSetOptions, _: [] } });
             const pageProps = await Page.checkout(pageName, args.options.webUrl, logger, this.debug, this.verbose);
             if (pageProps) {
                 pageId = pageProps.Id;
@@ -117,12 +97,11 @@ class SpoPageAddCommand extends SpoCommand {
                             listUrl: listServerRelativeUrl,
                             id: listItemId,
                             systemUpdate: true,
-                            PromotedState: 2,
                             FirstPublishedDate: new Date().toISOString(),
                             verbose: this.verbose,
                             debug: this.debug
                         };
-                        await Cli.executeCommand(spoListItemSetCommand, { options: { ...listItemSetOptions, _: [] } });
+                        await cli.executeCommand(spoListItemSetCommand, { options: { ...listItemSetOptions, _: [] } });
                         break;
                     case 'Template':
                         requestOptions.url = `${args.options.webUrl}/_api/SitePages/Pages(${listItemId})/SavePageAsTemplate`;
@@ -241,7 +220,7 @@ class SpoPageAddCommand extends SpoCommand {
             verbose: this.verbose,
             debug: this.debug
         };
-        const fileGetOutput = await Cli.executeCommandWithOutput(spoFileGetCommand, { options: { ...fileGetOptions, _: [] } });
+        const fileGetOutput = await cli.executeCommandWithOutput(spoFileGetCommand, { options: { ...fileGetOptions, _: [] } });
         const fileGetOutputJson = JSON.parse(fileGetOutput.stdout);
         return fileGetOutputJson.Id;
     }

package/dist/m365/spo/commands/page/page-column-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 _SpoPageColumnGetCommand_instances, _SpoPageColumnGetCommand_initOptions, _SpoPageColumnGetCommand_initValidators;
-import { Cli } from '../../../../cli/Cli.js';
+import { cli } from '../../../../cli/cli.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
@@ -28,7 +28,7 @@ class SpoPageColumnGetCommand extends SpoCommand {
             const sections = clientSidePage.sections
                 .filter(section => section.order === args.options.section);
             if (sections.length) {
-                const isJSONOutput = !Cli.shouldTrimOutput(args.options.output);
+                const isJSONOutput = !cli.shouldTrimOutput(args.options.output);
                 const columns = sections[0].columns.filter(col => col.order === args.options.column);
                 if (columns.length) {
                     const column = Page.getColumnsInformation(columns[0], isJSONOutput);

package/dist/m365/spo/commands/page/page-column-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 _SpoPageColumnListCommand_instances, _SpoPageColumnListCommand_initOptions, _SpoPageColumnListCommand_initValidators;
-import { Cli } from '../../../../cli/Cli.js';
+import { cli } from '../../../../cli/cli.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
@@ -28,7 +28,7 @@ class SpoPageColumnListCommand extends SpoCommand {
             const sections = clientSidePage.sections
                 .filter(section => section.order === args.options.section);
             if (sections.length) {
-                const isJSONOutput = !Cli.shouldTrimOutput(args.options.output);
+                const isJSONOutput = !cli.shouldTrimOutput(args.options.output);
                 await logger.log(sections[0].columns.map(c => {
                     const column = Page.getColumnsInformation(c, isJSONOutput);
                     column.controls = c.controls.length;

package/dist/m365/spo/commands/page/page-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 _SpoPageRemoveCommand_instances, _SpoPageRemoveCommand_initOptions, _SpoPageRemoveCommand_initValidators;
-import { Cli } from '../../../../cli/Cli.js';
+import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { spo } from '../../../../utils/spo.js';
 import { urlUtil } from '../../../../utils/urlUtil.js';
@@ -29,7 +29,7 @@ class SpoPageRemoveCommand extends SpoCommand {
             await this.removePage(logger, args);
         }
         else {
-            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove the page '${args.options.name}'?` });
+            const result = await cli.promptForConfirmation({ message: `Are you sure you want to remove the page '${args.options.name}'?` });
             if (result) {
                 await this.removePage(logger, args);
             }

package/dist/m365/spo/commands/page/page-section-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 _SpoPageSectionGetCommand_instances, _SpoPageSectionGetCommand_initOptions, _SpoPageSectionGetCommand_initValidators;
-import { Cli } from '../../../../cli/Cli.js';
+import { cli } from '../../../../cli/cli.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
@@ -27,7 +27,7 @@ class SpoPageSectionGetCommand extends SpoCommand {
             const clientSidePage = await Page.getPage(args.options.pageName, args.options.webUrl, logger, this.debug, this.verbose);
             const sections = clientSidePage.sections
                 .filter(section => section.order === args.options.section);
-            const isJSONOutput = !Cli.shouldTrimOutput(args.options.output);
+            const isJSONOutput = !cli.shouldTrimOutput(args.options.output);
             if (sections.length) {
                 await logger.log(Page.getSectionInformation(sections[0], isJSONOutput));
             }

package/dist/m365/spo/commands/page/page-section-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 _SpoPageSectionListCommand_instances, _SpoPageSectionListCommand_initOptions, _SpoPageSectionListCommand_initValidators;
-import { Cli } from '../../../../cli/Cli.js';
+import { cli } from '../../../../cli/cli.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
@@ -26,7 +26,7 @@ class SpoPageSectionListCommand extends SpoCommand {
         try {
             const clientSidePage = await Page.getPage(args.options.pageName, args.options.webUrl, logger, this.debug, this.verbose);
             const sections = clientSidePage.sections;
-            const isJSONOutput = !Cli.shouldTrimOutput(args.options.output);
+            const isJSONOutput = !cli.shouldTrimOutput(args.options.output);
             if (sections.length) {
                 const output = sections.map(section => Page.getSectionInformation(section, isJSONOutput));
                 if (isJSONOutput) {

package/dist/m365/spo/commands/page/page-set.js

@@ -5,7 +5,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoPageSetCommand_instances, _SpoPageSetCommand_initTelemetry, _SpoPageSetCommand_initOptions, _SpoPageSetCommand_initTypes, _SpoPageSetCommand_initValidators;
 import { Auth } from '../../../../Auth.js';
-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';
@@ -79,7 +79,7 @@ class SpoPageSetCommand extends SpoCommand {
                     listItemSetOptions.PromotedState = 0;
                     listItemSetOptions.BannerImageUrl = `${resource}/_layouts/15/images/sitepagethumbnail.png, /_layouts/15/images/sitepagethumbnail.png`;
                 }
-                await Cli.executeCommand(spoListItemSetCommand, { options: { ...listItemSetOptions, _: [] } });
+                await cli.executeCommand(spoListItemSetCommand, { options: { ...listItemSetOptions, _: [] } });
             }
             if (args.options.promoteAs) {
                 const requestOptions = {
@@ -112,7 +112,7 @@ class SpoPageSetCommand extends SpoCommand {
                             verbose: this.verbose,
                             debug: this.debug
                         };
-                        await Cli.executeCommand(spoListItemSetCommand, { options: { ...listItemSetOptions, _: [] } });
+                        await cli.executeCommand(spoListItemSetCommand, { options: { ...listItemSetOptions, _: [] } });
                         break;
                     case 'Template':
                         const templateItemId = await this.getFileListItemId(args.options.webUrl, serverRelativeFileUrl);
@@ -220,7 +220,7 @@ class SpoPageSetCommand extends SpoCommand {
                     verbose: this.verbose,
                     debug: this.debug
                 };
-                await Cli.executeCommandWithOutput(spoListItemSetCommand, { options: { ...listItemSetOptions, _: [] } });
+                await cli.executeCommandWithOutput(spoListItemSetCommand, { options: { ...listItemSetOptions, _: [] } });
             }
             let requestOptions;
             if (!args.options.publish) {
@@ -262,7 +262,7 @@ class SpoPageSetCommand extends SpoCommand {
             verbose: this.verbose,
             debug: this.debug
         };
-        const fileGetOutput = await Cli.executeCommandWithOutput(spoFileGetCommand, { options: { ...fileGetOptions, _: [] } });
+        const fileGetOutput = await cli.executeCommandWithOutput(spoFileGetCommand, { options: { ...fileGetOptions, _: [] } });
         const fileGetOutputJson = JSON.parse(fileGetOutput.stdout);
         return fileGetOutputJson.Id;
     }

package/dist/m365/spo/commands/propertybag/propertybag-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 _SpoPropertyBagRemoveCommand_instances, _SpoPropertyBagRemoveCommand_initTelemetry, _SpoPropertyBagRemoveCommand_initOptions, _SpoPropertyBagRemoveCommand_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 SpoPropertyBagRemoveCommand extends SpoPropertyBagBaseCommand {
             await this.removeProperty(args);
         }
         else {
-            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove the ${args.options.key} property?` });
+            const result = await cli.promptForConfirmation({ message: `Are you sure you want to remove the ${args.options.key} property?` });
             if (result) {
                 await this.removeProperty(args);
             }

package/dist/m365/spo/commands/roledefinition/roledefinition-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 _SpoRoleDefinitionRemoveCommand_instances, _SpoRoleDefinitionRemoveCommand_initTelemetry, _SpoRoleDefinitionRemoveCommand_initOptions, _SpoRoleDefinitionRemoveCommand_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 SpoRoleDefinitionRemoveCommand extends SpoCommand {
             await this.removeRoleDefinition(logger, args);
         }
         else {
-            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove the role definition with id ${args.options.id} from site ${args.options.webUrl}?` });
+            const result = await cli.promptForConfirmation({ message: `Are you sure you want to remove the role definition with id ${args.options.id} from site ${args.options.webUrl}?` });
             if (result) {
                 await this.removeRoleDefinition(logger, args);
             }

package/dist/m365/spo/commands/serviceprincipal/serviceprincipal-permissionrequest-approve.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 _SpoServicePrincipalPermissionRequestApproveCommand_instances, _SpoServicePrincipalPermissionRequestApproveCommand_initOptions, _SpoServicePrincipalPermissionRequestApproveCommand_initValidators, _SpoServicePrincipalPermissionRequestApproveCommand_initTelemetry, _SpoServicePrincipalPermissionRequestApproveCommand_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';
@@ -60,7 +60,7 @@ class SpoServicePrincipalPermissionRequestApproveCommand extends SpoCommand {
                 debug: this.debug,
                 verbose: this.verbose
             };
-            const output = await Cli.executeCommandWithOutput(spoServicePrincipalPermissionRequestListCommand, { options: { ...options, _: [] } });
+            const output = await cli.executeCommandWithOutput(spoServicePrincipalPermissionRequestListCommand, { options: { ...options, _: [] } });
             const getPermissionRequestsOutput = JSON.parse(output.stdout);
             if (args.options.resource) {
                 return getPermissionRequestsOutput.filter((x) => x.Resource === args.options.resource).map((x) => { return x.Id; });

package/dist/m365/spo/commands/serviceprincipal/serviceprincipal-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 _SpoServicePrincipalSetCommand_instances, _SpoServicePrincipalSetCommand_initTelemetry, _SpoServicePrincipalSetCommand_initOptions, _SpoServicePrincipalSetCommand_initTypes;
-import { Cli } from '../../../../cli/Cli.js';
+import { cli } from '../../../../cli/cli.js';
 import config from '../../../../config.js';
 import request from '../../../../request.js';
 import { spo } from '../../../../utils/spo.js';
@@ -32,7 +32,7 @@ class SpoServicePrincipalSetCommand extends SpoCommand {
             await this.toggleServicePrincipal(logger, args);
         }
         else {
-            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to ${args.options.enabled ? 'enable' : 'disable'} the service principal?` });
+            const result = await cli.promptForConfirmation({ message: `Are you sure you want to ${args.options.enabled ? 'enable' : 'disable'} the service principal?` });
             if (result) {
                 await this.toggleServicePrincipal(logger, args);
             }

package/dist/m365/spo/commands/site/site-apppermission-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 _SpoSiteAppPermissionRemoveCommand_instances, _SpoSiteAppPermissionRemoveCommand_initTelemetry, _SpoSiteAppPermissionRemoveCommand_initOptions, _SpoSiteAppPermissionRemoveCommand_initValidators, _SpoSiteAppPermissionRemoveCommand_initOptionSets;
-import { Cli } from '../../../../cli/Cli.js';
+import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { spo } from '../../../../utils/spo.js';
 import { validation } from '../../../../utils/validation.js';
@@ -72,7 +72,7 @@ class SpoSiteAppPermissionRemoveCommand extends GraphCommand {
             await this.removeSiteAppPermission(logger, args.options);
         }
         else {
-            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove the specified application permission from site ${args.options.siteUrl}?` });
+            const result = await cli.promptForConfirmation({ message: `Are you sure you want to remove the specified application permission from site ${args.options.siteUrl}?` });
             if (result) {
                 await this.removeSiteAppPermission(logger, args.options);
             }

package/dist/m365/spo/commands/site/site-hubsite-disconnect.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 _SpoSiteHubSiteDisconnectCommand_instances, _SpoSiteHubSiteDisconnectCommand_initTelemetry, _SpoSiteHubSiteDisconnectCommand_initOptions, _SpoSiteHubSiteDisconnectCommand_initValidators;
-import { Cli } from '../../../../cli/Cli.js';
+import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { spo } from '../../../../utils/spo.js';
 import { validation } from '../../../../utils/validation.js';
@@ -29,7 +29,7 @@ class SpoSiteHubSiteDisconnectCommand extends SpoCommand {
             await this.disconnectHubSite(logger, args);
         }
         else {
-            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to disconnect the site collection ${args.options.siteUrl} from its hub site?` });
+            const result = await cli.promptForConfirmation({ message: `Are you sure you want to disconnect the site collection ${args.options.siteUrl} from its hub site?` });
             if (result) {
                 await this.disconnectHubSite(logger, args);
             }

package/dist/m365/spo/commands/site/site-recyclebinitem-clear.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 _SpoSiteRecycleBinItemClearCommand_instances, _SpoSiteRecycleBinItemClearCommand_initTelemetry, _SpoSiteRecycleBinItemClearCommand_initOptions, _SpoSiteRecycleBinItemClearCommand_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 SpoSiteRecycleBinItemClearCommand extends SpoCommand {
             await this.clearRecycleBin(args, logger);
         }
         else {
-            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to clear the recycle bin of site ${args.options.siteUrl}?` });
+            const result = await cli.promptForConfirmation({ message: `Are you sure you want to clear the recycle bin of site ${args.options.siteUrl}?` });
             if (result) {
                 await this.clearRecycleBin(args, logger);
             }

package/dist/m365/spo/commands/site/site-recyclebinitem-move.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 _SpoSiteRecycleBinItemMoveCommand_instances, _SpoSiteRecycleBinItemMoveCommand_initTelemetry, _SpoSiteRecycleBinItemMoveCommand_initOptions, _SpoSiteRecycleBinItemMoveCommand_initOptionSets, _SpoSiteRecycleBinItemMoveCommand_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';
@@ -29,7 +29,7 @@ class SpoSiteRecycleBinItemMoveCommand extends SpoCommand {
             await this.moveRecycleBinItem(args, logger);
         }
         else {
-            const result = await Cli.promptForConfirmation({ message: 'Are you sure you want to move these items to the second-stage recycle bin?' });
+            const result = await cli.promptForConfirmation({ message: 'Are you sure you want to move these items to the second-stage recycle bin?' });
             if (result) {
                 await this.moveRecycleBinItem(args, logger);
             }

package/dist/m365/spo/commands/site/site-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 _SpoSiteRecycleBinItemRemoveCommand_instances, _SpoSiteRecycleBinItemRemoveCommand_initTelemetry, _SpoSiteRecycleBinItemRemoveCommand_initOptions, _SpoSiteRecycleBinItemRemoveCommand_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 SpoSiteRecycleBinItemRemoveCommand extends SpoCommand {
             await this.removeRecycleBinItem(args, logger);
         }
         else {
-            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to permanently delete ${args.options.ids.split(',').length} item(s) from the site recycle bin?` });
+            const result = await cli.promptForConfirmation({ message: `Are you sure you want to permanently delete ${args.options.ids.split(',').length} item(s) from the site recycle bin?` });
             if (result) {
                 await this.removeRecycleBinItem(args, logger);
             }

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

@@ -5,7 +5,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoSiteRemoveCommand_instances, _SpoSiteRemoveCommand_initTelemetry, _SpoSiteRemoveCommand_initOptions, _SpoSiteRemoveCommand_initValidators;
 import chalk from 'chalk';
-import { Cli } from '../../../../cli/Cli.js';
+import { cli } from '../../../../cli/cli.js';
 import config from '../../../../config.js';
 import request from '../../../../request.js';
 import { aadGroup } from '../../../../utils/aadGroup.js';
@@ -33,7 +33,7 @@ class SpoSiteRemoveCommand extends SpoCommand {
             await this.removeSite(logger, args);
         }
         else {
-            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove the site ${args.options.url}?` });
+            const result = await cli.promptForConfirmation({ message: `Are you sure you want to remove the site ${args.options.url}?` });
             if (result) {
                 await this.removeSite(logger, args);
             }

package/dist/m365/spo/commands/site/site-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 _SpoSiteSetCommand_instances, _SpoSiteSetCommand_initTelemetry, _SpoSiteSetCommand_initOptions, _SpoSiteSetCommand_initValidators, _SpoSiteSetCommand_initTypes;
-import { Cli } from '../../../../cli/Cli.js';
+import { cli } from '../../../../cli/cli.js';
 import { CommandError } from '../../../../Command.js';
 import config from '../../../../config.js';
 import request from '../../../../request.js';
@@ -243,7 +243,7 @@ class SpoSiteSetCommand extends SpoCommand {
                 debug: this.debug,
                 verbose: this.verbose
             };
-            promises.push(Cli.executeCommand(aadM365GroupSetCommand, { options: { ...commandOptions, _: [] } }));
+            promises.push(cli.executeCommand(aadM365GroupSetCommand, { options: { ...commandOptions, _: [] } }));
         }
         if (args.options.description) {
             promises.push(this.setGroupifiedSiteDescription(args.options.description));
@@ -394,7 +394,7 @@ class SpoSiteSetCommand extends SpoCommand {
             debug: this.debug,
             verbose: this.verbose
         };
-        return Cli.executeCommand(spoSiteDesignApplyCommand, { options: { ...options, _: [] } });
+        return cli.executeCommand(spoSiteDesignApplyCommand, { options: { ...options, _: [] } });
     }
     async loadSiteIds(siteUrl, logger) {
         if (this.debug) {

package/dist/m365/spo/commands/sitedesign/sitedesign-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 _SpoSiteDesignGetCommand_instances, _SpoSiteDesignGetCommand_initTelemetry, _SpoSiteDesignGetCommand_initOptions, _SpoSiteDesignGetCommand_initValidators, _SpoSiteDesignGetCommand_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 { spo } from '../../../../utils/spo.js';
@@ -44,7 +44,7 @@ class SpoSiteDesignGetCommand extends SpoCommand {
         }
         if (matchingSiteDesigns.length > 1) {
             const resultAsKeyValuePair = formatting.convertArrayToHashTable('Id', matchingSiteDesigns);
-            const result = await Cli.handleMultipleResultsFound(`Multiple site designs with title '${args.options.title}' found.`, resultAsKeyValuePair);
+            const result = await cli.handleMultipleResultsFound(`Multiple site designs with title '${args.options.title}' found.`, resultAsKeyValuePair);
             return result.Id;
         }
         return matchingSiteDesigns[0].Id;

package/dist/m365/spo/commands/sitedesign/sitedesign-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 _SpoSiteDesignRemoveCommand_instances, _SpoSiteDesignRemoveCommand_initTelemetry, _SpoSiteDesignRemoveCommand_initOptions, _SpoSiteDesignRemoveCommand_initValidators;
-import { Cli } from '../../../../cli/Cli.js';
+import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { spo } from '../../../../utils/spo.js';
 import { validation } from '../../../../utils/validation.js';
@@ -29,7 +29,7 @@ class SpoSiteDesignRemoveCommand extends SpoCommand {
             await this.removeSiteDesign(logger, args.options.id);
         }
         else {
-            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove the site design ${args.options.id}?` });
+            const result = await cli.promptForConfirmation({ message: `Are you sure you want to remove the site design ${args.options.id}?` });
             if (result) {
                 await this.removeSiteDesign(logger, args.options.id);
             }

package/dist/m365/spo/commands/sitedesign/sitedesign-rights-revoke.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 _SpoSiteDesignRightsRevokeCommand_instances, _SpoSiteDesignRightsRevokeCommand_initTelemetry, _SpoSiteDesignRightsRevokeCommand_initOptions, _SpoSiteDesignRightsRevokeCommand_initValidators;
-import { Cli } from '../../../../cli/Cli.js';
+import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { spo } from '../../../../utils/spo.js';
 import { validation } from '../../../../utils/validation.js';
@@ -52,7 +52,7 @@ class SpoSiteDesignRightsRevokeCommand extends SpoCommand {
             await revokePermissions();
         }
         else {
-            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to revoke access to site design ${args.options.siteDesignId} from the specified users?` });
+            const result = await cli.promptForConfirmation({ message: `Are you sure you want to revoke access to site design ${args.options.siteDesignId} from the specified users?` });
             if (result) {
                 await revokePermissions();
             }

package/dist/m365/spo/commands/sitedesign/sitedesign-task-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 _SpoSiteDesignTaskRemoveCommand_instances, _SpoSiteDesignTaskRemoveCommand_initTelemetry, _SpoSiteDesignTaskRemoveCommand_initOptions, _SpoSiteDesignTaskRemoveCommand_initValidators;
-import { Cli } from '../../../../cli/Cli.js';
+import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { spo } from '../../../../utils/spo.js';
 import { validation } from '../../../../utils/validation.js';
@@ -29,7 +29,7 @@ class SpoSiteDesignTaskRemoveCommand extends SpoCommand {
             await this.removeSiteDesignTask(logger, args.options.id);
         }
         else {
-            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove the site design task ${args.options.id}?` });
+            const result = await cli.promptForConfirmation({ message: `Are you sure you want to remove the site design task ${args.options.id}?` });
             if (result) {
                 await this.removeSiteDesignTask(logger, args.options.id);
             }

package/dist/m365/spo/commands/sitescript/sitescript-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 _SpoSiteScriptRemoveCommand_instances, _SpoSiteScriptRemoveCommand_initTelemetry, _SpoSiteScriptRemoveCommand_initOptions, _SpoSiteScriptRemoveCommand_initValidators;
-import { Cli } from '../../../../cli/Cli.js';
+import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { spo } from '../../../../utils/spo.js';
 import { validation } from '../../../../utils/validation.js';
@@ -29,7 +29,7 @@ class SpoSiteScriptRemoveCommand extends SpoCommand {
             await this.removeSiteScript(logger, args.options.id);
         }
         else {
-            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove the site script ${args.options.id}?` });
+            const result = await cli.promptForConfirmation({ message: `Are you sure you want to remove the site script ${args.options.id}?` });
             if (result) {
                 await this.removeSiteScript(logger, args.options.id);
             }

package/dist/m365/spo/commands/spo-search.js

@@ -5,7 +5,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoSearchCommand_instances, _SpoSearchCommand_initTelemetry, _SpoSearchCommand_initOptions, _SpoSearchCommand_initValidators;
 import { isNumber } from 'util';
-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';
@@ -115,7 +115,7 @@ class SpoSearchCommand extends SpoCommand {
         else {
             await logger.log(this.getParsedOutput(args, results));
         }
-        if (!args.options.output || Cli.shouldTrimOutput(args.options.output)) {
+        if (!args.options.output || cli.shouldTrimOutput(args.options.output)) {
             await logger.log("# Rows: " + results[results.length - 1].PrimaryQueryResult.RelevantResults.TotalRows);
             await logger.log("# Rows (Including duplicates): " + results[results.length - 1].PrimaryQueryResult.RelevantResults.TotalRowsIncludingDuplicates);
             await logger.log("Elapsed Time: " + this.getElapsedTime(results));

package/dist/m365/spo/commands/storageentity/storageentity-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 _SpoStorageEntityRemoveCommand_instances, _SpoStorageEntityRemoveCommand_initTelemetry, _SpoStorageEntityRemoveCommand_initOptions, _SpoStorageEntityRemoveCommand_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 SpoStorageEntityRemoveCommand extends SpoCommand {
             await this.removeTenantProperty(logger, args);
         }
         else {
-            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to delete the ${args.options.key} tenant property?` });
+            const result = await cli.promptForConfirmation({ message: `Are you sure you want to delete the ${args.options.key} tenant property?` });
             if (result) {
                 await this.removeTenantProperty(logger, args);
             }