@pnp/cli-microsoft365 5.0.0-beta.fc638c4 → 5.1.0-beta.04832fc

package/dist/m365/spo/commands/site/site-apppermission-list.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
+const utils_1 = require("../../../../utils");
 const GraphCommand_1 = require("../../../base/GraphCommand");
-const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoSiteAppPermissionListCommand extends GraphCommand_1.default {
     constructor() {
@@ -117,7 +117,7 @@ class SpoSiteAppPermissionListCommand extends GraphCommand_1.default {
         if (args.options.appId && args.options.appDisplayName) {
             return `Provide either appId or appDisplayName, not both`;
         }
-        return SpoCommand_1.default.isValidSharePointUrl(args.options.siteUrl);
+        return utils_1.validation.isValidSharePointUrl(args.options.siteUrl);
     }
 }
 module.exports = new SpoSiteAppPermissionListCommand();

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

@@ -2,9 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const cli_1 = require("../../../../cli");
 const request_1 = require("../../../../request");
-const Utils_1 = require("../../../../Utils");
+const utils_1 = require("../../../../utils");
 const GraphCommand_1 = require("../../../base/GraphCommand");
-const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoSiteAppPermissionRemoveCommand extends GraphCommand_1.default {
     constructor() {
@@ -152,10 +151,10 @@ class SpoSiteAppPermissionRemoveCommand extends GraphCommand_1.default {
             (args.options.permissionId && args.options.appDisplayName)) {
             return 'Use either appId, appDisplayName, or permissionId, but not multiple';
         }
-        if (args.options.appId && !Utils_1.default.isValidGuid(args.options.appId)) {
+        if (args.options.appId && !utils_1.validation.isValidGuid(args.options.appId)) {
             return `${args.options.appId} is not a valid GUID`;
         }
-        return SpoCommand_1.default.isValidSharePointUrl(args.options.siteUrl);
+        return utils_1.validation.isValidSharePointUrl(args.options.siteUrl);
     }
 }
 module.exports = new SpoSiteAppPermissionRemoveCommand();

package/dist/m365/spo/commands/site/site-apppermission-set.js

@@ -1,9 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const Utils_1 = require("../../../../Utils");
+const utils_1 = require("../../../../utils");
 const GraphCommand_1 = require("../../../base/GraphCommand");
-const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoSiteAppPermissionSetCommand extends GraphCommand_1.default {
     constructor() {
@@ -120,7 +119,7 @@ class SpoSiteAppPermissionSetCommand extends GraphCommand_1.default {
         if (!args.options.permissionId && !args.options.appId && !args.options.appDisplayName) {
             return `Specify permissionId, appId or appDisplayName, one is required`;
         }
-        if (args.options.appId && !Utils_1.default.isValidGuid(args.options.appId)) {
+        if (args.options.appId && !utils_1.validation.isValidGuid(args.options.appId)) {
             return `${args.options.appId} is not a valid GUID`;
         }
         const permissions = args.options.permission.split(',');
@@ -129,7 +128,7 @@ class SpoSiteAppPermissionSetCommand extends GraphCommand_1.default {
                 return `${permissions[i]} is not a valid permission value. Allowed values are read|write|read,write`;
             }
         }
-        return SpoCommand_1.default.isValidSharePointUrl(args.options.siteUrl);
+        return utils_1.validation.isValidSharePointUrl(args.options.siteUrl);
     }
 }
 module.exports = new SpoSiteAppPermissionSetCommand();

package/dist/m365/spo/commands/site/site-chrome-set.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
+const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 var HeaderLayout;
@@ -132,7 +133,7 @@ class SpoSiteChromeSetCommand extends SpoCommand_1.default {
         return options.concat(parentOptions);
     }
     validate(args) {
-        const isValidSharePointUrl = SpoCommand_1.default.isValidSharePointUrl(args.options.url);
+        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.url);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }

package/dist/m365/spo/commands/site/site-classic-add.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const config_1 = require("../../../../config");
 const request_1 = require("../../../../request");
-const Utils_1 = require("../../../../Utils");
+const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoSiteClassicAddCommand extends SpoCommand_1.default {
@@ -27,11 +27,11 @@ class SpoSiteClassicAddCommand extends SpoCommand_1.default {
     commandAction(logger, args, cb) {
         this.dots = '';
         this.showDeprecationWarning(logger, commands_1.default.SITE_CLASSIC_ADD, commands_1.default.SITE_ADD);
-        this
+        utils_1.spo
             .getSpoAdminUrl(logger, this.debug)
             .then((_spoAdminUrl) => {
             this.spoAdminUrl = _spoAdminUrl;
-            return this.ensureFormDigest(this.spoAdminUrl, logger, this.context, this.debug);
+            return utils_1.spo.ensureFormDigest(this.spoAdminUrl, logger, this.context, this.debug);
         })
             .then((res) => {
             this.context = res;
@@ -58,7 +58,7 @@ class SpoSiteClassicAddCommand extends SpoCommand_1.default {
             }
         })
             .then(() => {
-            return this.ensureFormDigest(this.spoAdminUrl, logger, this.context, this.debug);
+            return utils_1.spo.ensureFormDigest(this.spoAdminUrl, logger, this.context, this.debug);
         })
             .then((res) => {
             this.context = res;
@@ -76,7 +76,7 @@ class SpoSiteClassicAddCommand extends SpoCommand_1.default {
                 headers: {
                     'X-RequestDigest': this.context.FormDigestValue
                 },
-                data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="4" ObjectPathId="3" /><ObjectPath Id="6" ObjectPathId="5" /><Query Id="7" ObjectPathId="3"><Query SelectAllProperties="true"><Properties /></Query></Query><Query Id="8" ObjectPathId="5"><Query SelectAllProperties="false"><Properties><Property Name="IsComplete" ScalarProperty="true" /><Property Name="PollingInterval" ScalarProperty="true" /></Properties></Query></Query></Actions><ObjectPaths><Constructor Id="3" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /><Method Id="5" ParentId="3" Name="CreateSite"><Parameters><Parameter TypeId="{11f84fff-b8cf-47b6-8b50-34e692656606}"><Property Name="CompatibilityLevel" Type="Int32">0</Property><Property Name="Lcid" Type="UInt32">${lcid}</Property><Property Name="Owner" Type="String">${Utils_1.default.escapeXml(args.options.owner)}</Property><Property Name="StorageMaximumLevel" Type="Int64">${storageQuota}</Property><Property Name="StorageWarningLevel" Type="Int64">${storageQuotaWarningLevel}</Property><Property Name="Template" Type="String">${Utils_1.default.escapeXml(webTemplate)}</Property><Property Name="TimeZoneId" Type="Int32">${args.options.timeZone}</Property><Property Name="Title" Type="String">${Utils_1.default.escapeXml(args.options.title)}</Property><Property Name="Url" Type="String">${Utils_1.default.escapeXml(args.options.url)}</Property><Property Name="UserCodeMaximumLevel" Type="Double">${resourceQuota}</Property><Property Name="UserCodeWarningLevel" Type="Double">${resourceQuotaWarningLevel}</Property></Parameter></Parameters></Method></ObjectPaths></Request>`
+                data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="4" ObjectPathId="3" /><ObjectPath Id="6" ObjectPathId="5" /><Query Id="7" ObjectPathId="3"><Query SelectAllProperties="true"><Properties /></Query></Query><Query Id="8" ObjectPathId="5"><Query SelectAllProperties="false"><Properties><Property Name="IsComplete" ScalarProperty="true" /><Property Name="PollingInterval" ScalarProperty="true" /></Properties></Query></Query></Actions><ObjectPaths><Constructor Id="3" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /><Method Id="5" ParentId="3" Name="CreateSite"><Parameters><Parameter TypeId="{11f84fff-b8cf-47b6-8b50-34e692656606}"><Property Name="CompatibilityLevel" Type="Int32">0</Property><Property Name="Lcid" Type="UInt32">${lcid}</Property><Property Name="Owner" Type="String">${utils_1.formatting.escapeXml(args.options.owner)}</Property><Property Name="StorageMaximumLevel" Type="Int64">${storageQuota}</Property><Property Name="StorageWarningLevel" Type="Int64">${storageQuotaWarningLevel}</Property><Property Name="Template" Type="String">${utils_1.formatting.escapeXml(webTemplate)}</Property><Property Name="TimeZoneId" Type="Int32">${args.options.timeZone}</Property><Property Name="Title" Type="String">${utils_1.formatting.escapeXml(args.options.title)}</Property><Property Name="Url" Type="String">${utils_1.formatting.escapeXml(args.options.url)}</Property><Property Name="UserCodeMaximumLevel" Type="Double">${resourceQuota}</Property><Property Name="UserCodeWarningLevel" Type="Double">${resourceQuotaWarningLevel}</Property></Parameter></Parameters></Method></ObjectPaths></Request>`
             };
             return request_1.default.post(requestOptions);
         })
@@ -95,7 +95,17 @@ class SpoSiteClassicAddCommand extends SpoCommand_1.default {
                         return;
                     }
                     setTimeout(() => {
-                        this.waitUntilFinished(JSON.stringify(operation._ObjectIdentity_), this.spoAdminUrl, resolve, reject, logger, this.context, this.dots);
+                        utils_1.spo.waitUntilFinished({
+                            operationId: JSON.stringify(operation._ObjectIdentity_),
+                            siteUrl: this.spoAdminUrl,
+                            resolve,
+                            reject,
+                            logger,
+                            currentContext: this.context,
+                            dots: this.dots,
+                            debug: this.debug,
+                            verbose: this.verbose
+                        });
                     }, operation.PollingInterval);
                 }
             });
@@ -104,7 +114,7 @@ class SpoSiteClassicAddCommand extends SpoCommand_1.default {
     }
     siteExistsInTheRecycleBin(url, logger) {
         return new Promise((resolve, reject) => {
-            this
+            utils_1.spo
                 .ensureFormDigest(this.spoAdminUrl, logger, this.context, this.debug)
                 .then((res) => {
                 this.context = res;
@@ -116,7 +126,7 @@ class SpoSiteClassicAddCommand extends SpoCommand_1.default {
                     headers: {
                         'X-RequestDigest': this.context.FormDigestValue
                     },
-                    data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="197" ObjectPathId="196" /><ObjectPath Id="199" ObjectPathId="198" /><Query Id="200" ObjectPathId="198"><Query SelectAllProperties="true"><Properties /></Query></Query></Actions><ObjectPaths><Constructor Id="196" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /><Method Id="198" ParentId="196" Name="GetSitePropertiesByUrl"><Parameters><Parameter Type="String">${Utils_1.default.escapeXml(url)}</Parameter><Parameter Type="Boolean">false</Parameter></Parameters></Method></ObjectPaths></Request>`
+                    data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="197" ObjectPathId="196" /><ObjectPath Id="199" ObjectPathId="198" /><Query Id="200" ObjectPathId="198"><Query SelectAllProperties="true"><Properties /></Query></Query></Actions><ObjectPaths><Constructor Id="196" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /><Method Id="198" ParentId="196" Name="GetSitePropertiesByUrl"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(url)}</Parameter><Parameter Type="Boolean">false</Parameter></Parameters></Method></ObjectPaths></Request>`
                 };
                 return request_1.default.post(requestOptions);
             })
@@ -150,7 +160,7 @@ class SpoSiteClassicAddCommand extends SpoCommand_1.default {
                     headers: {
                         'X-RequestDigest': this.context.FormDigestValue
                     },
-                    data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="181" ObjectPathId="180" /><Query Id="182" ObjectPathId="180"><Query SelectAllProperties="true"><Properties /></Query></Query></Actions><ObjectPaths><Method Id="180" ParentId="175" Name="GetDeletedSitePropertiesByUrl"><Parameters><Parameter Type="String">${Utils_1.default.escapeXml(url)}</Parameter></Parameters></Method><Constructor Id="175" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></ObjectPaths></Request>`
+                    data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="181" ObjectPathId="180" /><Query Id="182" ObjectPathId="180"><Query SelectAllProperties="true"><Properties /></Query></Query></Actions><ObjectPaths><Method Id="180" ParentId="175" Name="GetDeletedSitePropertiesByUrl"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(url)}</Parameter></Parameters></Method><Constructor Id="175" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></ObjectPaths></Request>`
                 };
                 return request_1.default.post(requestOptions);
             })
@@ -186,7 +196,7 @@ class SpoSiteClassicAddCommand extends SpoCommand_1.default {
     }
     deleteSiteFromTheRecycleBin(url, wait, logger) {
         return new Promise((resolve, reject) => {
-            this
+            utils_1.spo
                 .ensureFormDigest(this.spoAdminUrl, logger, this.context, this.debug)
                 .then((res) => {
                 this.context = res;
@@ -198,7 +208,7 @@ class SpoSiteClassicAddCommand extends SpoCommand_1.default {
                     headers: {
                         'X-RequestDigest': this.context.FormDigestValue
                     },
-                    data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="185" ObjectPathId="184" /><Query Id="186" ObjectPathId="184"><Query SelectAllProperties="false"><Properties><Property Name="IsComplete" ScalarProperty="true" /><Property Name="PollingInterval" ScalarProperty="true" /></Properties></Query></Query></Actions><ObjectPaths><Method Id="184" ParentId="175" Name="RemoveDeletedSite"><Parameters><Parameter Type="String">${Utils_1.default.escapeXml(url)}</Parameter></Parameters></Method><Constructor Id="175" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></ObjectPaths></Request>`
+                    data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="185" ObjectPathId="184" /><Query Id="186" ObjectPathId="184"><Query SelectAllProperties="false"><Properties><Property Name="IsComplete" ScalarProperty="true" /><Property Name="PollingInterval" ScalarProperty="true" /></Properties></Query></Query></Actions><ObjectPaths><Method Id="184" ParentId="175" Name="RemoveDeletedSite"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(url)}</Parameter></Parameters></Method><Constructor Id="175" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></ObjectPaths></Request>`
                 };
                 return request_1.default.post(requestOptions);
             })
@@ -216,7 +226,17 @@ class SpoSiteClassicAddCommand extends SpoCommand_1.default {
                         return;
                     }
                     setTimeout(() => {
-                        this.waitUntilFinished(JSON.stringify(operation._ObjectIdentity_), this.spoAdminUrl, resolve, reject, logger, this.context, this.dots);
+                        utils_1.spo.waitUntilFinished({
+                            operationId: JSON.stringify(operation._ObjectIdentity_),
+                            siteUrl: this.spoAdminUrl,
+                            resolve,
+                            reject,
+                            logger,
+                            currentContext: this.context,
+                            dots: this.dots,
+                            verbose: this.verbose,
+                            debug: this.debug
+                        });
                     }, operation.PollingInterval);
                 }
             });
@@ -265,7 +285,7 @@ class SpoSiteClassicAddCommand extends SpoCommand_1.default {
         return options.concat(parentOptions);
     }
     validate(args) {
-        const isValidSharePointUrl = SpoCommand_1.default.isValidSharePointUrl(args.options.url);
+        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.url);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }

package/dist/m365/spo/commands/site/site-classic-list.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const config_1 = require("../../../../config");
 const request_1 = require("../../../../request");
-const Utils_1 = require("../../../../Utils");
+const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoSiteClassicListCommand extends SpoCommand_1.default {
@@ -27,7 +27,7 @@ class SpoSiteClassicListCommand extends SpoCommand_1.default {
         const includeOneDriveSites = args.options.includeOneDriveSites || false;
         const personalSite = includeOneDriveSites === false ? '0' : '1';
         let spoAdminUrl = '';
-        this
+        utils_1.spo
             .getSpoAdminUrl(logger, this.debug)
             .then((_spoAdminUrl) => {
             spoAdminUrl = _spoAdminUrl;
@@ -35,7 +35,7 @@ class SpoSiteClassicListCommand extends SpoCommand_1.default {
                 logger.logToStderr(`Retrieving list of site collections...`);
             }
             this.allSites = [];
-            return this.getAllSites(spoAdminUrl, Utils_1.default.escapeXml(args.options.filter || ''), '0', personalSite, webTemplate, undefined, logger);
+            return this.getAllSites(spoAdminUrl, utils_1.formatting.escapeXml(args.options.filter || ''), '0', personalSite, webTemplate, undefined, logger);
         })
             .then(_ => {
             logger.log(this.allSites);
@@ -44,7 +44,7 @@ class SpoSiteClassicListCommand extends SpoCommand_1.default {
     }
     getAllSites(spoAdminUrl, filter, startIndex, personalSite, webTemplate, formDigest, logger) {
         return new Promise((resolve, reject) => {
-            this
+            utils_1.spo
                 .ensureFormDigest(spoAdminUrl, logger, formDigest, this.debug)
                 .then((res) => {
                 const requestOptions = {

package/dist/m365/spo/commands/site/site-classic-set.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const config_1 = require("../../../../config");
 const request_1 = require("../../../../request");
-const Utils_1 = require("../../../../Utils");
+const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoSiteClassicSetCommand extends SpoCommand_1.default {
@@ -30,15 +30,15 @@ class SpoSiteClassicSetCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args, cb) {
         this.dots = '';
-        this
+        utils_1.spo
             .getTenantId(logger, this.debug)
             .then((_tenantId) => {
             this.tenantId = _tenantId;
-            return this.getSpoAdminUrl(logger, this.debug);
+            return utils_1.spo.getSpoAdminUrl(logger, this.debug);
         })
             .then((_spoAdminUrl) => {
             this.spoAdminUrl = _spoAdminUrl;
-            return this.ensureFormDigest(this.spoAdminUrl, logger, this.context, this.debug);
+            return utils_1.spo.ensureFormDigest(this.spoAdminUrl, logger, this.context, this.debug);
         })
             .then((res) => {
             this.context = res;
@@ -68,7 +68,7 @@ class SpoSiteClassicSetCommand extends SpoCommand_1.default {
             let i = 0;
             const updates = [];
             if (args.options.title) {
-                updates.push(`<SetProperty Id="${++i}" ObjectPathId="5" Name="Title"><Parameter Type="String">${Utils_1.default.escapeXml(args.options.title)}</Parameter></SetProperty>`);
+                updates.push(`<SetProperty Id="${++i}" ObjectPathId="5" Name="Title"><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.title)}</Parameter></SetProperty>`);
             }
             if (args.options.sharing) {
                 const sharing = ['Disabled', 'ExternalUserSharingOnly', 'ExternalUserAndGuestSharing', 'ExistingExternalUserSharingOnly'].indexOf(args.options.sharing);
@@ -122,12 +122,22 @@ class SpoSiteClassicSetCommand extends SpoCommand_1.default {
                         return;
                     }
                     setTimeout(() => {
-                        this.waitUntilFinished(JSON.stringify(operation._ObjectIdentity_), this.spoAdminUrl, resolve, reject, logger, this.context, this.dots);
+                        utils_1.spo.waitUntilFinished({
+                            operationId: JSON.stringify(operation._ObjectIdentity_),
+                            siteUrl: this.spoAdminUrl,
+                            resolve,
+                            reject,
+                            logger,
+                            currentContext: this.context,
+                            dots: this.dots,
+                            debug: this.debug,
+                            verbose: this.verbose
+                        });
                     }, operation.PollingInterval);
                 }
             });
         })
-            .then(_ => this.ensureFormDigest(this.spoAdminUrl, logger, this.context, this.debug))
+            .then(_ => utils_1.spo.ensureFormDigest(this.spoAdminUrl, logger, this.context, this.debug))
             .then((res) => {
             this.context = res;
             return new Promise((resolve, reject) => {
@@ -145,7 +155,7 @@ class SpoSiteClassicSetCommand extends SpoCommand_1.default {
                 });
             });
         })
-            .then(_ => this.ensureFormDigest(this.spoAdminUrl, logger, this.context, this.debug))
+            .then(_ => utils_1.spo.ensureFormDigest(this.spoAdminUrl, logger, this.context, this.debug))
             .then((res) => {
             this.context = res;
             if (!args.options.description) {
@@ -176,7 +186,7 @@ class SpoSiteClassicSetCommand extends SpoCommand_1.default {
                 headers: {
                     'X-RequestDigest': this.context.FormDigestValue
                 },
-                data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><SetProperty Id="7" ObjectPathId="5" Name="LockState"><Parameter Type="String">${Utils_1.default.escapeXml(args.options.lockState)}</Parameter></SetProperty><ObjectPath Id="9" ObjectPathId="8" /><ObjectIdentityQuery Id="10" ObjectPathId="5" /><Query Id="11" ObjectPathId="8"><Query SelectAllProperties="true"><Properties /></Query></Query></Actions><ObjectPaths><Method Id="5" ParentId="3" Name="GetSitePropertiesByUrl"><Parameters><Parameter Type="String">${Utils_1.default.escapeXml(args.options.url)}</Parameter><Parameter Type="Boolean">false</Parameter></Parameters></Method><Method Id="8" ParentId="5" Name="Update" /><Constructor Id="3" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></ObjectPaths></Request>`
+                data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><SetProperty Id="7" ObjectPathId="5" Name="LockState"><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.lockState)}</Parameter></SetProperty><ObjectPath Id="9" ObjectPathId="8" /><ObjectIdentityQuery Id="10" ObjectPathId="5" /><Query Id="11" ObjectPathId="8"><Query SelectAllProperties="true"><Properties /></Query></Query></Actions><ObjectPaths><Method Id="5" ParentId="3" Name="GetSitePropertiesByUrl"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.url)}</Parameter><Parameter Type="Boolean">false</Parameter></Parameters></Method><Method Id="8" ParentId="5" Name="Update" /><Constructor Id="3" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></ObjectPaths></Request>`
             };
             return request_1.default.post(requestOptions);
         })
@@ -199,7 +209,17 @@ class SpoSiteClassicSetCommand extends SpoCommand_1.default {
                         return;
                     }
                     setTimeout(() => {
-                        this.waitUntilFinished(JSON.stringify(operation._ObjectIdentity_), this.spoAdminUrl, resolve, reject, logger, this.context, this.dots);
+                        utils_1.spo.waitUntilFinished({
+                            operationId: JSON.stringify(operation._ObjectIdentity_),
+                            siteUrl: this.spoAdminUrl,
+                            resolve,
+                            reject,
+                            logger,
+                            currentContext: this.context,
+                            dots: this.dots,
+                            debug: this.debug,
+                            verbose: this.verbose
+                        });
                     }, operation.PollingInterval);
                 }
             });
@@ -208,7 +228,7 @@ class SpoSiteClassicSetCommand extends SpoCommand_1.default {
     }
     setAdmin(logger, siteUrl, principal) {
         return new Promise((resolve, reject) => {
-            this
+            utils_1.spo
                 .ensureFormDigest(this.spoAdminUrl, logger, this.context, this.debug)
                 .then((res) => {
                 this.context = res;
@@ -217,7 +237,7 @@ class SpoSiteClassicSetCommand extends SpoCommand_1.default {
                     headers: {
                         'X-RequestDigest': this.context.FormDigestValue
                     },
-                    data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="48" ObjectPathId="47" /></Actions><ObjectPaths><Method Id="47" ParentId="34" Name="SetSiteAdmin"><Parameters><Parameter Type="String">${Utils_1.default.escapeXml(siteUrl)}</Parameter><Parameter Type="String">${Utils_1.default.escapeXml(principal)}</Parameter><Parameter Type="Boolean">true</Parameter></Parameters></Method><Constructor Id="34" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></ObjectPaths></Request>`
+                    data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="48" ObjectPathId="47" /></Actions><ObjectPaths><Method Id="47" ParentId="34" Name="SetSiteAdmin"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(siteUrl)}</Parameter><Parameter Type="String">${utils_1.formatting.escapeXml(principal)}</Parameter><Parameter Type="Boolean">true</Parameter></Parameters></Method><Constructor Id="34" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></ObjectPaths></Request>`
                 };
                 return request_1.default.post(requestOptions);
             })
@@ -283,7 +303,7 @@ class SpoSiteClassicSetCommand extends SpoCommand_1.default {
         return options.concat(parentOptions);
     }
     validate(args) {
-        const isValidSharePointUrl = SpoCommand_1.default.isValidSharePointUrl(args.options.url);
+        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.url);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }

package/dist/m365/spo/commands/site/site-commsite-enable.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const Command_1 = require("../../../../Command");
 const config_1 = require("../../../../config");
 const request_1 = require("../../../../request");
-const Utils_1 = require("../../../../Utils");
+const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoSiteCommSiteEnableCommand extends SpoCommand_1.default {
@@ -21,14 +21,14 @@ class SpoSiteCommSiteEnableCommand extends SpoCommand_1.default {
     commandAction(logger, args, cb) {
         const designPackageId = args.options.designPackageId || '{d604dac3-50d3-405e-9ab9-d4713cda74ef}';
         let spoAdminUrl = '';
-        this
+        utils_1.spo
             .getSpoAdminUrl(logger, this.debug)
             .then((_spoAdminUrl) => {
             spoAdminUrl = _spoAdminUrl;
             if (this.debug) {
                 logger.logToStderr(`Retrieving request digest...`);
             }
-            return this.getRequestDigest(spoAdminUrl);
+            return utils_1.spo.getRequestDigest(spoAdminUrl);
         })
             .then((res) => {
             const requestOptions = {
@@ -36,7 +36,7 @@ class SpoSiteCommSiteEnableCommand extends SpoCommand_1.default {
                 headers: {
                     'X-RequestDigest': res.FormDigestValue
                 },
-                data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="4" ObjectPathId="3" /><Method Name="EnableCommSite" Id="5" ObjectPathId="3"><Parameters><Parameter Type="String">${Utils_1.default.escapeXml(args.options.url)}</Parameter><Parameter Type="Guid">${Utils_1.default.escapeXml(designPackageId)}</Parameter></Parameters></Method></Actions><ObjectPaths><Constructor Id="3" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></ObjectPaths></Request>`
+                data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="4" ObjectPathId="3" /><Method Name="EnableCommSite" Id="5" ObjectPathId="3"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.url)}</Parameter><Parameter Type="Guid">${utils_1.formatting.escapeXml(designPackageId)}</Parameter></Parameters></Method></Actions><ObjectPaths><Constructor Id="3" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></ObjectPaths></Request>`
             };
             return request_1.default.post(requestOptions);
         })
@@ -64,10 +64,10 @@ class SpoSiteCommSiteEnableCommand extends SpoCommand_1.default {
     }
     validate(args) {
         if (args.options.designPackageId &&
-            !Utils_1.default.isValidGuid(args.options.designPackageId)) {
+            !utils_1.validation.isValidGuid(args.options.designPackageId)) {
             return `${args.options.designPackageId} is not a valid GUID`;
         }
-        return SpoCommand_1.default.isValidSharePointUrl(args.options.url);
+        return utils_1.validation.isValidSharePointUrl(args.options.url);
     }
 }
 module.exports = new SpoSiteCommSiteEnableCommand();

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

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const chalk = require("chalk");
 const cli_1 = require("../../../../cli");
+const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 const spoWebGetCommand = require("../web/web-get");
@@ -236,7 +237,7 @@ class SpoSiteEnsureCommand extends SpoCommand_1.default {
         return options.concat(parentOptions);
     }
     validate(args) {
-        return SpoCommand_1.default.isValidSharePointUrl(args.options.url);
+        return utils_1.validation.isValidSharePointUrl(args.options.url);
     }
 }
 module.exports = new SpoSiteEnsureCommand();

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

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
+const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoSiteGetCommand extends SpoCommand_1.default {
@@ -33,7 +34,7 @@ class SpoSiteGetCommand extends SpoCommand_1.default {
         return options.concat(parentOptions);
     }
     validate(args) {
-        return SpoCommand_1.default.isValidSharePointUrl(args.options.url);
+        return utils_1.validation.isValidSharePointUrl(args.options.url);
     }
 }
 module.exports = new SpoSiteGetCommand();

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

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
+const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoSiteGroupifyCommand extends SpoCommand_1.default {
@@ -80,7 +81,7 @@ class SpoSiteGroupifyCommand extends SpoCommand_1.default {
         return options.concat(parentOptions);
     }
     validate(args) {
-        return SpoCommand_1.default.isValidSharePointUrl(args.options.siteUrl);
+        return utils_1.validation.isValidSharePointUrl(args.options.siteUrl);
     }
 }
 module.exports = new SpoSiteGroupifyCommand();

package/dist/m365/spo/commands/site/site-inplacerecordsmanagement-set.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const Utils_1 = require("../../../../Utils");
+const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoSiteInPlaceRecordsManagementSetCommand extends SpoCommand_1.default {
@@ -49,10 +49,10 @@ class SpoSiteInPlaceRecordsManagementSetCommand extends SpoCommand_1.default {
         return options.concat(parentOptions);
     }
     validate(args) {
-        if (!Utils_1.default.isValidBoolean(args.options.enabled)) {
+        if (!utils_1.validation.isValidBoolean(args.options.enabled)) {
             return 'Invalid "enabled" option value. Specify "true" or "false"';
         }
-        return SpoCommand_1.default.isValidSharePointUrl(args.options.siteUrl);
+        return utils_1.validation.isValidSharePointUrl(args.options.siteUrl);
     }
 }
 module.exports = new SpoSiteInPlaceRecordsManagementSetCommand();

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

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const config_1 = require("../../../../config");
 const request_1 = require("../../../../request");
-const Utils_1 = require("../../../../Utils");
+const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoSiteListCommand extends SpoCommand_1.default {
@@ -26,7 +26,7 @@ class SpoSiteListCommand extends SpoCommand_1.default {
         const siteType = args.options.type || 'TeamSite';
         const webTemplate = siteType === 'TeamSite' ? 'GROUP#0' : 'SITEPAGEPUBLISHING#0';
         let spoAdminUrl;
-        this
+        utils_1.spo
             .getSpoAdminUrl(logger, this.debug)
             .then((_spoAdminUrl) => {
             spoAdminUrl = _spoAdminUrl;
@@ -34,7 +34,7 @@ class SpoSiteListCommand extends SpoCommand_1.default {
                 logger.logToStderr(`Retrieving list of site collections...`);
             }
             this.allSites = [];
-            return this.getAllSites(spoAdminUrl, Utils_1.default.escapeXml(args.options.filter || ''), '0', webTemplate, undefined, args.options.deleted, logger);
+            return this.getAllSites(spoAdminUrl, utils_1.formatting.escapeXml(args.options.filter || ''), '0', webTemplate, undefined, args.options.deleted, logger);
         })
             .then(_ => {
             logger.log(this.allSites);
@@ -43,7 +43,7 @@ class SpoSiteListCommand extends SpoCommand_1.default {
     }
     getAllSites(spoAdminUrl, filter, startIndex, webTemplate, formDigest, deleted, logger) {
         return new Promise((resolve, reject) => {
-            this
+            utils_1.spo
                 .ensureFormDigest(spoAdminUrl, logger, formDigest, this.debug)
                 .then((res) => {
                 let requestBody = `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="2" ObjectPathId="1" /><ObjectPath Id="4" ObjectPathId="3" /><Query Id="5" ObjectPathId="3"><Query SelectAllProperties="true"><Properties /></Query><ChildItemQuery SelectAllProperties="true"><Properties /></ChildItemQuery></Query></Actions><ObjectPaths><Constructor Id="1" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /><Method Id="3" ParentId="1" Name="GetSitePropertiesFromSharePointByFilters"><Parameters><Parameter TypeId="{b92aeee2-c92c-4b67-abcc-024e471bc140}"><Property Name="Filter" Type="String">${filter}</Property><Property Name="IncludeDetail" Type="Boolean">false</Property><Property Name="IncludePersonalSite" Type="Enum">0</Property><Property Name="StartIndex" Type="String">${startIndex}</Property><Property Name="Template" Type="String">${webTemplate}</Property></Parameter></Parameters></Method></ObjectPaths></Request>`;

package/dist/m365/spo/commands/site/site-recyclebinitem-list.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
+const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoSiteRecycleBinItemListCommand extends SpoCommand_1.default {
@@ -56,7 +57,7 @@ class SpoSiteRecycleBinItemListCommand extends SpoCommand_1.default {
         return options.concat(parentOptions);
     }
     validate(args) {
-        const isValidSharePointUrl = SpoCommand_1.default.isValidSharePointUrl(args.options.siteUrl);
+        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.siteUrl);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }