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

package/dist/m365/spo/commands/term/term-group-add.js

@@ -4,7 +4,7 @@ const uuid_1 = require("uuid");
 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 SpoTermGroupAddCommand extends SpoCommand_1.default {
@@ -24,11 +24,11 @@ class SpoTermGroupAddCommand extends SpoCommand_1.default {
         let formDigest = '';
         let termGroup;
         let spoAdminUrl = '';
-        this
+        utils_1.spo
             .getSpoAdminUrl(logger, this.debug)
             .then((_spoAdminUrl) => {
             spoAdminUrl = _spoAdminUrl;
-            return this.getRequestDigest(spoAdminUrl);
+            return utils_1.spo.getRequestDigest(spoAdminUrl);
         })
             .then((res) => {
             formDigest = res.FormDigestValue;
@@ -60,7 +60,7 @@ class SpoTermGroupAddCommand extends SpoCommand_1.default {
                 headers: {
                     'X-RequestDigest': formDigest
                 },
-                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="14" ObjectPathId="13" /><ObjectIdentityQuery Id="15" ObjectPathId="13" /><Query Id="16" ObjectPathId="13"><Query SelectAllProperties="false"><Properties><Property Name="Name" ScalarProperty="true" /><Property Name="Id" ScalarProperty="true" /><Property Name="Description" ScalarProperty="true" /></Properties></Query></Query></Actions><ObjectPaths><Method Id="13" ParentId="6" Name="CreateGroup"><Parameters><Parameter Type="String">${Utils_1.default.escapeXml(args.options.name)}</Parameter><Parameter Type="Guid">{${termGroupId}}</Parameter></Parameters></Method><Identity Id="6" Name="${termStore._ObjectIdentity_}" /></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="14" ObjectPathId="13" /><ObjectIdentityQuery Id="15" ObjectPathId="13" /><Query Id="16" ObjectPathId="13"><Query SelectAllProperties="false"><Properties><Property Name="Name" ScalarProperty="true" /><Property Name="Id" ScalarProperty="true" /><Property Name="Description" ScalarProperty="true" /></Properties></Query></Query></Actions><ObjectPaths><Method Id="13" ParentId="6" Name="CreateGroup"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.name)}</Parameter><Parameter Type="Guid">{${termGroupId}}</Parameter></Parameters></Method><Identity Id="6" Name="${termStore._ObjectIdentity_}" /></ObjectPaths></Request>`
             };
             return request_1.default.post(requestOptions);
         })
@@ -82,7 +82,7 @@ class SpoTermGroupAddCommand extends SpoCommand_1.default {
                 headers: {
                     'X-RequestDigest': formDigest
                 },
-                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="51" ObjectPathId="45" Name="Description"><Parameter Type="String">${Utils_1.default.escapeXml(args.options.description)}</Parameter></SetProperty></Actions><ObjectPaths><Identity Id="45" Name="${termGroup._ObjectIdentity_}" /></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="51" ObjectPathId="45" Name="Description"><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.description)}</Parameter></SetProperty></Actions><ObjectPaths><Identity Id="45" Name="${termGroup._ObjectIdentity_}" /></ObjectPaths></Request>`
             };
             return request_1.default.post(requestOptions);
         })
@@ -120,7 +120,7 @@ class SpoTermGroupAddCommand extends SpoCommand_1.default {
     }
     validate(args) {
         if (args.options.id) {
-            if (!Utils_1.default.isValidGuid(args.options.id)) {
+            if (!utils_1.validation.isValidGuid(args.options.id)) {
                 return `${args.options.id} is not a valid GUID`;
             }
         }

package/dist/m365/spo/commands/term/term-group-get.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 SpoTermGroupGetCommand extends SpoCommand_1.default {
@@ -21,17 +21,17 @@ class SpoTermGroupGetCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args, cb) {
         let spoAdminUrl = '';
-        this
+        utils_1.spo
             .getSpoAdminUrl(logger, this.debug)
             .then((_spoAdminUrl) => {
             spoAdminUrl = _spoAdminUrl;
-            return this.getRequestDigest(spoAdminUrl);
+            return utils_1.spo.getRequestDigest(spoAdminUrl);
         })
             .then((res) => {
             if (this.verbose) {
                 logger.logToStderr(`Retrieving taxonomy term groups...`);
             }
-            const query = args.options.id ? `<Method Id="32" ParentId="30" Name="GetById"><Parameters><Parameter Type="Guid">{${Utils_1.default.escapeXml(args.options.id)}}</Parameter></Parameters></Method>` : `<Method Id="32" ParentId="30" Name="GetByName"><Parameters><Parameter Type="String">${Utils_1.default.escapeXml(args.options.name)}</Parameter></Parameters></Method>`;
+            const query = args.options.id ? `<Method Id="32" ParentId="30" Name="GetById"><Parameters><Parameter Type="Guid">{${utils_1.formatting.escapeXml(args.options.id)}}</Parameter></Parameters></Method>` : `<Method Id="32" ParentId="30" Name="GetByName"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.name)}</Parameter></Parameters></Method>`;
             const requestOptions = {
                 url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
                 headers: {
@@ -78,7 +78,7 @@ class SpoTermGroupGetCommand extends SpoCommand_1.default {
             return 'Specify either id or name but not both';
         }
         if (args.options.id) {
-            if (!Utils_1.default.isValidGuid(args.options.id)) {
+            if (!utils_1.validation.isValidGuid(args.options.id)) {
                 return `${args.options.id} is not a valid GUID`;
             }
         }

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

@@ -3,6 +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 SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoTermGroupListCommand extends SpoCommand_1.default {
@@ -17,11 +18,11 @@ class SpoTermGroupListCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args, cb) {
         let spoAdminUrl = '';
-        this
+        utils_1.spo
             .getSpoAdminUrl(logger, this.debug)
             .then((_spoAdminUrl) => {
             spoAdminUrl = _spoAdminUrl;
-            return this.getRequestDigest(spoAdminUrl);
+            return utils_1.spo.getRequestDigest(spoAdminUrl);
         })
             .then((res) => {
             if (this.verbose) {

package/dist/m365/spo/commands/term/term-list.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 SpoTermListCommand extends SpoCommand_1.default {
@@ -26,18 +26,18 @@ class SpoTermListCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args, cb) {
         let spoAdminUrl = '';
-        this
+        utils_1.spo
             .getSpoAdminUrl(logger, this.debug)
             .then((_spoAdminUrl) => {
             spoAdminUrl = _spoAdminUrl;
-            return this.getRequestDigest(spoAdminUrl);
+            return utils_1.spo.getRequestDigest(spoAdminUrl);
         })
             .then((res) => {
             if (this.verbose) {
                 logger.logToStderr(`Retrieving taxonomy term sets...`);
             }
-            const termGroupQuery = args.options.termGroupId ? `<Method Id="77" ParentId="75" Name="GetById"><Parameters><Parameter Type="Guid">{${args.options.termGroupId}}</Parameter></Parameters></Method>` : `<Method Id="77" ParentId="75" Name="GetByName"><Parameters><Parameter Type="String">${Utils_1.default.escapeXml(args.options.termGroupName)}</Parameter></Parameters></Method>`;
-            const termSetQuery = args.options.termSetId ? `<Method Id="82" ParentId="80" Name="GetById"><Parameters><Parameter Type="Guid">{${args.options.termSetId}}</Parameter></Parameters></Method>` : `<Method Id="82" ParentId="80" Name="GetByName"><Parameters><Parameter Type="String">${Utils_1.default.escapeXml(args.options.termSetName)}</Parameter></Parameters></Method>`;
+            const termGroupQuery = args.options.termGroupId ? `<Method Id="77" ParentId="75" Name="GetById"><Parameters><Parameter Type="Guid">{${args.options.termGroupId}}</Parameter></Parameters></Method>` : `<Method Id="77" ParentId="75" Name="GetByName"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.termGroupName)}</Parameter></Parameters></Method>`;
+            const termSetQuery = args.options.termSetId ? `<Method Id="82" ParentId="80" Name="GetById"><Parameters><Parameter Type="Guid">{${args.options.termSetId}}</Parameter></Parameters></Method>` : `<Method Id="82" ParentId="80" Name="GetByName"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.termSetName)}</Parameter></Parameters></Method>`;
             const requestOptions = {
                 url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
                 headers: {
@@ -92,7 +92,7 @@ class SpoTermListCommand extends SpoCommand_1.default {
             return 'Specify either termGroupId or termGroupName but not both';
         }
         if (args.options.termGroupId) {
-            if (!Utils_1.default.isValidGuid(args.options.termGroupId)) {
+            if (!utils_1.validation.isValidGuid(args.options.termGroupId)) {
                 return `${args.options.termGroupId} is not a valid GUID`;
             }
         }
@@ -103,7 +103,7 @@ class SpoTermListCommand extends SpoCommand_1.default {
             return 'Specify either termSetId or termSetName but not both';
         }
         if (args.options.termSetId) {
-            if (!Utils_1.default.isValidGuid(args.options.termSetId)) {
+            if (!utils_1.validation.isValidGuid(args.options.termSetId)) {
                 return `${args.options.termSetId} is not a valid GUID`;
             }
         }

package/dist/m365/spo/commands/term/term-set-add.js

@@ -4,7 +4,7 @@ const uuid_1 = require("uuid");
 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 SpoTermSetAddCommand extends SpoCommand_1.default {
@@ -27,11 +27,11 @@ class SpoTermSetAddCommand extends SpoCommand_1.default {
         let formDigest = '';
         let termSet;
         let spoAdminUrl = '';
-        this
+        utils_1.spo
             .getSpoAdminUrl(logger, this.debug)
             .then((_spoAdminUrl) => {
             spoAdminUrl = _spoAdminUrl;
-            return this.getRequestDigest(spoAdminUrl);
+            return utils_1.spo.getRequestDigest(spoAdminUrl);
         })
             .then((res) => {
             formDigest = res.FormDigestValue;
@@ -39,7 +39,7 @@ class SpoTermSetAddCommand extends SpoCommand_1.default {
                 logger.logToStderr(`Adding taxonomy term set...`);
             }
             const termGroupQuery = args.options.termGroupName ?
-                `<Method Id="42" ParentId="40" Name="GetByName"><Parameters><Parameter Type="String">${Utils_1.default.escapeXml(args.options.termGroupName)}</Parameter></Parameters></Method>` :
+                `<Method Id="42" ParentId="40" Name="GetByName"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.termGroupName)}</Parameter></Parameters></Method>` :
                 `<Method Id="42" ParentId="40" Name="GetById"><Parameters><Parameter Type="Guid">{${args.options.termGroupId}}</Parameter></Parameters></Method>`;
             const termSetId = args.options.id || (0, uuid_1.v4)();
             const requestOptions = {
@@ -47,7 +47,7 @@ class SpoTermSetAddCommand 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="35" ObjectPathId="34" /><ObjectIdentityQuery Id="36" ObjectPathId="34" /><ObjectPath Id="38" ObjectPathId="37" /><ObjectIdentityQuery Id="39" ObjectPathId="37" /><ObjectPath Id="41" ObjectPathId="40" /><ObjectPath Id="43" ObjectPathId="42" /><ObjectIdentityQuery Id="44" ObjectPathId="42" /><ObjectPath Id="46" ObjectPathId="45" /><ObjectIdentityQuery Id="47" ObjectPathId="45" /><Query Id="48" ObjectPathId="45"><Query SelectAllProperties="true"><Properties /></Query></Query></Actions><ObjectPaths><StaticMethod Id="34" Name="GetTaxonomySession" TypeId="{981cbc68-9edc-4f8d-872f-71146fcbb84f}" /><Method Id="37" ParentId="34" Name="GetDefaultSiteCollectionTermStore" /><Property Id="40" ParentId="37" Name="Groups" />${termGroupQuery}<Method Id="45" ParentId="42" Name="CreateTermSet"><Parameters><Parameter Type="String">${Utils_1.default.escapeXml(args.options.name)}</Parameter><Parameter Type="Guid">{${termSetId}}</Parameter><Parameter Type="Int32">1033</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="35" ObjectPathId="34" /><ObjectIdentityQuery Id="36" ObjectPathId="34" /><ObjectPath Id="38" ObjectPathId="37" /><ObjectIdentityQuery Id="39" ObjectPathId="37" /><ObjectPath Id="41" ObjectPathId="40" /><ObjectPath Id="43" ObjectPathId="42" /><ObjectIdentityQuery Id="44" ObjectPathId="42" /><ObjectPath Id="46" ObjectPathId="45" /><ObjectIdentityQuery Id="47" ObjectPathId="45" /><Query Id="48" ObjectPathId="45"><Query SelectAllProperties="true"><Properties /></Query></Query></Actions><ObjectPaths><StaticMethod Id="34" Name="GetTaxonomySession" TypeId="{981cbc68-9edc-4f8d-872f-71146fcbb84f}" /><Method Id="37" ParentId="34" Name="GetDefaultSiteCollectionTermStore" /><Property Id="40" ParentId="37" Name="Groups" />${termGroupQuery}<Method Id="45" ParentId="42" Name="CreateTermSet"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.name)}</Parameter><Parameter Type="Guid">{${termSetId}}</Parameter><Parameter Type="Int32">1033</Parameter></Parameters></Method></ObjectPaths></Request>`
             };
             return request_1.default.post(requestOptions);
         })
@@ -77,13 +77,13 @@ class SpoTermSetAddCommand extends SpoCommand_1.default {
             const properties = [];
             let i = 127;
             if (args.options.description) {
-                properties.push(`<SetProperty Id="${i++}" ObjectPathId="117" Name="Description"><Parameter Type="String">${Utils_1.default.escapeXml(args.options.description)}</Parameter></SetProperty>`);
+                properties.push(`<SetProperty Id="${i++}" ObjectPathId="117" Name="Description"><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.description)}</Parameter></SetProperty>`);
                 termSet.Description = args.options.description;
             }
             if (args.options.customProperties) {
                 const customProperties = JSON.parse(args.options.customProperties);
                 Object.keys(customProperties).forEach(k => {
-                    properties.push(`<Method Name="SetCustomProperty" Id="${i++}" ObjectPathId="117"><Parameters><Parameter Type="String">${Utils_1.default.escapeXml(k)}</Parameter><Parameter Type="String">${Utils_1.default.escapeXml(customProperties[k])}</Parameter></Parameters></Method>`);
+                    properties.push(`<Method Name="SetCustomProperty" Id="${i++}" ObjectPathId="117"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(k)}</Parameter><Parameter Type="String">${utils_1.formatting.escapeXml(customProperties[k])}</Parameter></Parameters></Method>`);
                 });
                 termSet.CustomProperties = customProperties;
             }
@@ -140,7 +140,7 @@ class SpoTermSetAddCommand extends SpoCommand_1.default {
     }
     validate(args) {
         if (args.options.id) {
-            if (!Utils_1.default.isValidGuid(args.options.id)) {
+            if (!utils_1.validation.isValidGuid(args.options.id)) {
                 return `${args.options.id} is not a valid GUID`;
             }
         }
@@ -151,7 +151,7 @@ class SpoTermSetAddCommand extends SpoCommand_1.default {
             return 'Specify termGroupId or termGroupName but not both';
         }
         if (args.options.termGroupId) {
-            if (!Utils_1.default.isValidGuid(args.options.termGroupId)) {
+            if (!utils_1.validation.isValidGuid(args.options.termGroupId)) {
                 return `${args.options.termGroupId} is not a valid GUID`;
             }
         }

package/dist/m365/spo/commands/term/term-set-get.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 SpoTermSetGetCommand extends SpoCommand_1.default {
@@ -23,18 +23,18 @@ class SpoTermSetGetCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args, cb) {
         let spoAdminUrl = '';
-        this
+        utils_1.spo
             .getSpoAdminUrl(logger, this.debug)
             .then((_spoAdminUrl) => {
             spoAdminUrl = _spoAdminUrl;
-            return this.getRequestDigest(spoAdminUrl);
+            return utils_1.spo.getRequestDigest(spoAdminUrl);
         })
             .then((res) => {
             if (this.verbose) {
                 logger.logToStderr(`Retrieving taxonomy term set...`);
             }
-            const termGroupQuery = args.options.termGroupId ? `<Method Id="62" ParentId="60" Name="GetById"><Parameters><Parameter Type="Guid">{${args.options.termGroupId}}</Parameter></Parameters></Method>` : `<Method Id="62" ParentId="60" Name="GetByName"><Parameters><Parameter Type="String">${Utils_1.default.escapeXml(args.options.termGroupName)}</Parameter></Parameters></Method>`;
-            const termSetQuery = args.options.id ? `<Method Id="67" ParentId="65" Name="GetById"><Parameters><Parameter Type="Guid">{${args.options.id}}</Parameter></Parameters></Method>` : `<Method Id="67" ParentId="65" Name="GetByName"><Parameters><Parameter Type="String">${Utils_1.default.escapeXml(args.options.name)}</Parameter></Parameters></Method>`;
+            const termGroupQuery = args.options.termGroupId ? `<Method Id="62" ParentId="60" Name="GetById"><Parameters><Parameter Type="Guid">{${args.options.termGroupId}}</Parameter></Parameters></Method>` : `<Method Id="62" ParentId="60" Name="GetByName"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.termGroupName)}</Parameter></Parameters></Method>`;
+            const termSetQuery = args.options.id ? `<Method Id="67" ParentId="65" Name="GetById"><Parameters><Parameter Type="Guid">{${args.options.id}}</Parameter></Parameters></Method>` : `<Method Id="67" ParentId="65" Name="GetByName"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.name)}</Parameter></Parameters></Method>`;
             const requestOptions = {
                 url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
                 headers: {
@@ -87,7 +87,7 @@ class SpoTermSetGetCommand extends SpoCommand_1.default {
             return 'Specify either id or name but not both';
         }
         if (args.options.id) {
-            if (!Utils_1.default.isValidGuid(args.options.id)) {
+            if (!utils_1.validation.isValidGuid(args.options.id)) {
                 return `${args.options.id} is not a valid GUID`;
             }
         }
@@ -98,7 +98,7 @@ class SpoTermSetGetCommand extends SpoCommand_1.default {
             return 'Specify termGroupId or termGroupName but not both';
         }
         if (args.options.termGroupId) {
-            if (!Utils_1.default.isValidGuid(args.options.termGroupId)) {
+            if (!utils_1.validation.isValidGuid(args.options.termGroupId)) {
                 return `${args.options.termGroupId} is not a valid GUID`;
             }
         }

package/dist/m365/spo/commands/term/term-set-list.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 SpoTermSetListCommand extends SpoCommand_1.default {
@@ -24,17 +24,17 @@ class SpoTermSetListCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args, cb) {
         let spoAdminUrl = '';
-        this
+        utils_1.spo
             .getSpoAdminUrl(logger, this.debug)
             .then((_spoAdminUrl) => {
             spoAdminUrl = _spoAdminUrl;
-            return this.getRequestDigest(spoAdminUrl);
+            return utils_1.spo.getRequestDigest(spoAdminUrl);
         })
             .then((res) => {
             if (this.verbose) {
                 logger.logToStderr(`Retrieving taxonomy term sets...`);
             }
-            const query = args.options.termGroupId ? `<Method Id="62" ParentId="60" Name="GetById"><Parameters><Parameter Type="Guid">{${args.options.termGroupId}}</Parameter></Parameters></Method>` : `<Method Id="62" ParentId="60" Name="GetByName"><Parameters><Parameter Type="String">${Utils_1.default.escapeXml(args.options.termGroupName)}</Parameter></Parameters></Method>`;
+            const query = args.options.termGroupId ? `<Method Id="62" ParentId="60" Name="GetById"><Parameters><Parameter Type="Guid">{${args.options.termGroupId}}</Parameter></Parameters></Method>` : `<Method Id="62" ParentId="60" Name="GetByName"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.termGroupName)}</Parameter></Parameters></Method>`;
             const requestOptions = {
                 url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
                 headers: {
@@ -84,7 +84,7 @@ class SpoTermSetListCommand extends SpoCommand_1.default {
             return 'Specify either termGroupId or termGroupName but not both';
         }
         if (args.options.termGroupId) {
-            if (!Utils_1.default.isValidGuid(args.options.termGroupId)) {
+            if (!utils_1.validation.isValidGuid(args.options.termGroupId)) {
                 return `${args.options.termGroupId} is not a valid GUID`;
             }
         }

package/dist/m365/spo/commands/theme/theme-apply.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");
 const SharePointThemes = {
@@ -26,14 +26,14 @@ class SpoThemeApplyCommand extends SpoCommand_1.default {
     commandAction(logger, args, cb) {
         const isSharePointTheme = args.options.sharePointTheme ? true : false;
         let spoAdminUrl = '';
-        this
+        utils_1.spo
             .getSpoAdminUrl(logger, this.debug)
             .then((_spoAdminUrl) => {
             spoAdminUrl = _spoAdminUrl;
             if (isSharePointTheme) {
                 return Promise.resolve(undefined);
             }
-            return this.getRequestDigest(spoAdminUrl);
+            return utils_1.spo.getRequestDigest(spoAdminUrl);
         })
             .then((res) => {
             if (this.verbose) {
@@ -57,7 +57,7 @@ class SpoThemeApplyCommand 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="10" ObjectPathId="9" /><Method Name="SetWebTheme" Id="11" ObjectPathId="9"><Parameters><Parameter Type="String">${Utils_1.default.escapeXml(args.options.name)}</Parameter><Parameter Type="String">${Utils_1.default.escapeXml(args.options.webUrl)}</Parameter></Parameters></Method></Actions><ObjectPaths><Constructor Id="9" 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="10" ObjectPathId="9" /><Method Name="SetWebTheme" Id="11" ObjectPathId="9"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.name)}</Parameter><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.webUrl)}</Parameter></Parameters></Method></Actions><ObjectPaths><Constructor Id="9" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></ObjectPaths></Request>`
                 };
             }
             return request_1.default.post(requestOptions);
@@ -102,7 +102,7 @@ class SpoThemeApplyCommand extends SpoCommand_1.default {
         return options.concat(parentOptions);
     }
     validate(args) {
-        const isValidSharePointUrl = SpoCommand_1.default.isValidSharePointUrl(args.options.webUrl);
+        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.webUrl);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }

package/dist/m365/spo/commands/theme/theme-get.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 SpoThemeGetCommand extends SpoCommand_1.default {
@@ -14,11 +14,11 @@ class SpoThemeGetCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args, cb) {
         let spoAdminUrl = '';
-        this
+        utils_1.spo
             .getSpoAdminUrl(logger, this.debug)
             .then((_spoAdminUrl) => {
             spoAdminUrl = _spoAdminUrl;
-            return this.getRequestDigest(spoAdminUrl);
+            return utils_1.spo.getRequestDigest(spoAdminUrl);
         })
             .then((res) => {
             if (this.verbose) {
@@ -29,7 +29,7 @@ class SpoThemeGetCommand 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="12" ObjectPathId="11" /><ObjectPath Id="14" ObjectPathId="13" /><Query Id="15" ObjectPathId="13"><Query SelectAllProperties="true"><Properties /></Query></Query></Actions><ObjectPaths><Constructor Id="11" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /><Method Id="13" ParentId="11" Name="GetTenantTheme"><Parameters><Parameter Type="String">${Utils_1.default.escapeXml(args.options.name)}</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="12" ObjectPathId="11" /><ObjectPath Id="14" ObjectPathId="13" /><Query Id="15" ObjectPathId="13"><Query SelectAllProperties="true"><Properties /></Query></Query></Actions><ObjectPaths><Constructor Id="11" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /><Method Id="13" ParentId="11" Name="GetTenantTheme"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.name)}</Parameter></Parameters></Method></ObjectPaths></Request>`
             };
             return request_1.default.post(requestOptions);
         })

package/dist/m365/spo/commands/theme/theme-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 SpoThemeListCommand extends SpoCommand_1.default {
@@ -14,7 +15,7 @@ class SpoThemeListCommand extends SpoCommand_1.default {
         return ['name'];
     }
     commandAction(logger, args, cb) {
-        this
+        utils_1.spo
             .getSpoAdminUrl(logger, this.debug)
             .then((spoAdminUrl) => {
             if (this.verbose) {

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

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const cli_1 = require("../../../../cli");
 const request_1 = require("../../../../request");
+const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoThemeRemoveCommand extends SpoCommand_1.default {
@@ -18,7 +19,7 @@ class SpoThemeRemoveCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args, cb) {
         const removeTheme = () => {
-            this
+            utils_1.spo
                 .getSpoAdminUrl(logger, this.debug)
                 .then((spoAdminUrl) => {
                 if (this.verbose) {

package/dist/m365/spo/commands/theme/theme-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 SpoThemeSetCommand extends SpoCommand_1.default {
@@ -19,11 +19,11 @@ class SpoThemeSetCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args, cb) {
         let spoAdminUrl = '';
-        this
+        utils_1.spo
             .getSpoAdminUrl(logger, this.debug)
             .then((_spoAdminUrl) => {
             spoAdminUrl = _spoAdminUrl;
-            return this.getRequestDigest(spoAdminUrl);
+            return utils_1.spo.getRequestDigest(spoAdminUrl);
         })
             .then((res) => {
             const palette = JSON.parse(args.options.theme);
@@ -38,7 +38,7 @@ class SpoThemeSetCommand 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="10" ObjectPathId="9" /><Method Name="UpdateTenantTheme" Id="11" ObjectPathId="9"><Parameters><Parameter Type="String">${Utils_1.default.escapeXml(args.options.name)}</Parameter><Parameter Type="String">{"isInverted":${isInverted},"name":"${Utils_1.default.escapeXml(args.options.name)}","palette":${JSON.stringify(palette)}}</Parameter></Parameters></Method></Actions><ObjectPaths><Constructor Id="9" 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="10" ObjectPathId="9" /><Method Name="UpdateTenantTheme" Id="11" ObjectPathId="9"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.name)}</Parameter><Parameter Type="String">{"isInverted":${isInverted},"name":"${utils_1.formatting.escapeXml(args.options.name)}","palette":${JSON.stringify(palette)}}</Parameter></Parameters></Method></Actions><ObjectPaths><Constructor Id="9" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}"/></ObjectPaths></Request>`
             };
             return request_1.default.post(requestOptions);
         })
@@ -66,7 +66,7 @@ class SpoThemeSetCommand extends SpoCommand_1.default {
         return options.concat(parentOptions);
     }
     validate(args) {
-        if (!Utils_1.default.isValidTheme(args.options.theme)) {
+        if (!utils_1.validation.isValidTheme(args.options.theme)) {
             return 'The specified theme is not valid';
         }
         return true;

package/dist/m365/spo/commands/user/user-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 SpoUserGetCommand extends SpoCommand_1.default {
@@ -77,7 +78,7 @@ class SpoUserGetCommand extends SpoCommand_1.default {
             typeof args.options.id !== 'number') {
             return `Specified id ${args.options.id} is not a number`;
         }
-        return SpoCommand_1.default.isValidSharePointUrl(args.options.webUrl);
+        return utils_1.validation.isValidSharePointUrl(args.options.webUrl);
     }
 }
 module.exports = new SpoUserGetCommand();

package/dist/m365/spo/commands/user/user-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 SpoUserListCommand extends SpoCommand_1.default {
@@ -44,7 +45,7 @@ class SpoUserListCommand extends SpoCommand_1.default {
         return options.concat(parentOptions);
     }
     validate(args) {
-        return SpoCommand_1.default.isValidSharePointUrl(args.options.webUrl);
+        return utils_1.validation.isValidSharePointUrl(args.options.webUrl);
     }
 }
 module.exports = new SpoUserListCommand();

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

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const cli_1 = require("../../../../cli");
 const request_1 = require("../../../../request");
+const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoUserRemoveCommand extends SpoCommand_1.default {
@@ -85,7 +86,7 @@ class SpoUserRemoveCommand extends SpoCommand_1.default {
         if (args.options.id && args.options.loginName) {
             return 'Use either id or loginName, but not both';
         }
-        return SpoCommand_1.default.isValidSharePointUrl(args.options.webUrl);
+        return utils_1.validation.isValidSharePointUrl(args.options.webUrl);
     }
 }
 module.exports = new SpoUserRemoveCommand();

package/dist/m365/spo/commands/userprofile/userprofile-get.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 SpoUserProfileGetCommand extends SpoCommand_1.default {
@@ -12,7 +12,7 @@ class SpoUserProfileGetCommand extends SpoCommand_1.default {
         return 'Sets user profile property for a SharePoint user';
     }
     commandAction(logger, args, cb) {
-        this
+        utils_1.spo
             .getSpoUrl(logger, this.debug)
             .then((spoUrl) => {
             const userName = `i:0#.f|membership|${args.options.userName}`;
@@ -45,7 +45,7 @@ class SpoUserProfileGetCommand extends SpoCommand_1.default {
         return options.concat(parentOptions);
     }
     validate(args) {
-        if (!Utils_1.default.isValidUserPrincipalName(args.options.userName)) {
+        if (!utils_1.validation.isValidUserPrincipalName(args.options.userName)) {
             return `${args.options.userName} is not a valid user principal name`;
         }
         return true;

package/dist/m365/spo/commands/userprofile/userprofile-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");
 class SpoUserProfileSetCommand extends SpoCommand_1.default {
@@ -12,11 +13,11 @@ class SpoUserProfileSetCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args, cb) {
         let spoUrl = '';
-        this
+        utils_1.spo
             .getSpoUrl(logger, this.debug)
             .then((_spoUrl) => {
             spoUrl = _spoUrl;
-            return this.getRequestDigest(spoUrl);
+            return utils_1.spo.getRequestDigest(spoUrl);
         })
             .then((res) => {
             const propertyValue = args.options.propertyValue.split(',').map(o => o.trim());