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

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

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const util_1 = require("util");
 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 SpoSearchCommand extends SpoCommand_1.default {
@@ -46,7 +46,7 @@ class SpoSearchCommand extends SpoCommand_1.default {
                 return Promise.resolve(args.options.webUrl);
             }
             else {
-                return this.getSpoUrl(logger, this.debug);
+                return utils_1.spo.getSpoUrl(logger, this.debug);
             }
         })()
             .then((_webUrl) => {
@@ -213,10 +213,10 @@ class SpoSearchCommand extends SpoCommand_1.default {
         return options.concat(parentOptions);
     }
     validate(args) {
-        if (args.options.sourceId && !Utils_1.default.isValidGuid(args.options.sourceId)) {
+        if (args.options.sourceId && !utils_1.validation.isValidGuid(args.options.sourceId)) {
             return `${args.options.sourceId} is not a valid GUID`;
         }
-        if (args.options.rankingModelId && !Utils_1.default.isValidGuid(args.options.rankingModelId)) {
+        if (args.options.rankingModelId && !utils_1.validation.isValidGuid(args.options.rankingModelId)) {
             return `${args.options.rankingModelId} is not a valid GUID`;
         }
         if (args.options.sortList && !/^([a-z0-9_]+:(ascending|descending))(,([a-z0-9_]+:(ascending|descending)))*$/gi.test(args.options.sortList)) {

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

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const Auth_1 = require("../../../Auth");
 const Command_1 = require("../../../Command");
+const utils_1 = require("../../../utils");
 const SpoCommand_1 = require("../../base/SpoCommand");
 const commands_1 = require("../commands");
 class SpoSetCommand extends SpoCommand_1.default {
@@ -29,7 +30,7 @@ class SpoSetCommand 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 SpoSetCommand();

package/dist/m365/spo/commands/storageentity/storageentity-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 SpoStorageEntityGetCommand extends SpoCommand_1.default {
@@ -11,7 +12,7 @@ class SpoStorageEntityGetCommand extends SpoCommand_1.default {
         return 'Get details for the specified tenant property';
     }
     commandAction(logger, args, cb) {
-        this
+        utils_1.spo
             .getSpoUrl(logger, this.debug)
             .then((spoUrl) => {
             const requestOptions = {

package/dist/m365/spo/commands/storageentity/storageentity-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 SpoStorageEntityListCommand extends SpoCommand_1.default {
@@ -66,7 +67,7 @@ class SpoStorageEntityListCommand extends SpoCommand_1.default {
         return options.concat(parentOptions);
     }
     validate(args) {
-        const result = SpoCommand_1.default.isValidSharePointUrl(args.options.appCatalogUrl);
+        const result = utils_1.validation.isValidSharePointUrl(args.options.appCatalogUrl);
         if (result === false) {
             return 'Missing required option appCatalogUrl';
         }

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

@@ -4,7 +4,7 @@ const cli_1 = require("../../../../cli");
 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 SpoStorageEntityRemoveCommand extends SpoCommand_1.default {
@@ -25,11 +25,11 @@ class SpoStorageEntityRemoveCommand extends SpoCommand_1.default {
             if (this.verbose) {
                 logger.logToStderr(`Removing tenant property ${args.options.key} from ${args.options.appCatalogUrl}...`);
             }
-            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 requestOptions = {
@@ -37,7 +37,7 @@ class SpoStorageEntityRemoveCommand 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="31" ObjectPathId="30" /><ObjectPath Id="33" ObjectPathId="32" /><ObjectPath Id="35" ObjectPathId="34" /><Method Name="RemoveStorageEntity" Id="36" ObjectPathId="34"><Parameters><Parameter Type="String">${Utils_1.default.escapeXml(args.options.key)}</Parameter></Parameters></Method></Actions><ObjectPaths><Constructor Id="30" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /><Method Id="32" ParentId="30" Name="GetSiteByUrl"><Parameters><Parameter Type="String">${Utils_1.default.escapeXml(args.options.appCatalogUrl)}</Parameter></Parameters></Method><Property Id="34" ParentId="32" Name="RootWeb" /></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="31" ObjectPathId="30" /><ObjectPath Id="33" ObjectPathId="32" /><ObjectPath Id="35" ObjectPathId="34" /><Method Name="RemoveStorageEntity" Id="36" ObjectPathId="34"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.key)}</Parameter></Parameters></Method></Actions><ObjectPaths><Constructor Id="30" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /><Method Id="32" ParentId="30" Name="GetSiteByUrl"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.appCatalogUrl)}</Parameter></Parameters></Method><Property Id="34" ParentId="32" Name="RootWeb" /></ObjectPaths></Request>`
                 };
                 return request_1.default.post(requestOptions);
             })
@@ -87,7 +87,7 @@ class SpoStorageEntityRemoveCommand extends SpoCommand_1.default {
         return options.concat(parentOptions);
     }
     validate(args) {
-        const result = SpoCommand_1.default.isValidSharePointUrl(args.options.appCatalogUrl);
+        const result = utils_1.validation.isValidSharePointUrl(args.options.appCatalogUrl);
         if (result === false) {
             return 'Missing required option appCatalogUrl';
         }

package/dist/m365/spo/commands/storageentity/storageentity-set.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 SpoStorageEntitySetCommand extends SpoCommand_1.default {
@@ -21,11 +21,11 @@ class SpoStorageEntitySetCommand 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) {
@@ -36,7 +36,7 @@ class SpoStorageEntitySetCommand 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="24" ObjectPathId="23" /><ObjectPath Id="26" ObjectPathId="25" /><ObjectPath Id="28" ObjectPathId="27" /><Method Name="SetStorageEntity" Id="29" ObjectPathId="27"><Parameters><Parameter Type="String">${Utils_1.default.escapeXml(args.options.key)}</Parameter><Parameter Type="String">${Utils_1.default.escapeXml(args.options.value)}</Parameter><Parameter Type="String">${Utils_1.default.escapeXml(args.options.description || '')}</Parameter><Parameter Type="String">${Utils_1.default.escapeXml(args.options.comment || '')}</Parameter></Parameters></Method></Actions><ObjectPaths><Constructor Id="23" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /><Method Id="25" ParentId="23" Name="GetSiteByUrl"><Parameters><Parameter Type="String">${Utils_1.default.escapeXml(args.options.appCatalogUrl)}</Parameter></Parameters></Method><Property Id="27" ParentId="25" Name="RootWeb" /></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="24" ObjectPathId="23" /><ObjectPath Id="26" ObjectPathId="25" /><ObjectPath Id="28" ObjectPathId="27" /><Method Name="SetStorageEntity" Id="29" ObjectPathId="27"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.key)}</Parameter><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.value)}</Parameter><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.description || '')}</Parameter><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.comment || '')}</Parameter></Parameters></Method></Actions><ObjectPaths><Constructor Id="23" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /><Method Id="25" ParentId="23" Name="GetSiteByUrl"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.appCatalogUrl)}</Parameter></Parameters></Method><Property Id="27" ParentId="25" Name="RootWeb" /></ObjectPaths></Request>`
             };
             return request_1.default.post(requestOptions);
         })
@@ -77,7 +77,7 @@ class SpoStorageEntitySetCommand extends SpoCommand_1.default {
         return options.concat(parentOptions);
     }
     validate(args) {
-        const result = SpoCommand_1.default.isValidSharePointUrl(args.options.appCatalogUrl);
+        const result = utils_1.validation.isValidSharePointUrl(args.options.appCatalogUrl);
         if (result === false) {
             return 'Missing required option appCatalogUrl';
         }

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

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const cli_1 = require("../../../../cli");
 const Command_1 = require("../../../../Command");
+const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 const spoSiteClassicAddCommand = require("../site/site-classic-add");
@@ -125,7 +126,7 @@ class SpoTenantAppCatalogAddCommand 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/tenant/tenant-appcatalogurl-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 SpoTenantAppCatalogUrlGetCommand extends SpoCommand_1.default {
@@ -11,7 +12,7 @@ class SpoTenantAppCatalogUrlGetCommand extends SpoCommand_1.default {
         return 'Gets the URL of the tenant app catalog';
     }
     commandAction(logger, args, cb) {
-        this
+        utils_1.spo
             .getSpoUrl(logger, this.debug)
             .then((spoUrl) => {
             const requestOptions = {

package/dist/m365/spo/commands/tenant/tenant-recyclebinitem-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 SpoTenantRecycleBinItemListCommand extends SpoCommand_1.default {
@@ -17,11 +18,11 @@ class SpoTenantRecycleBinItemListCommand 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 requestOptions = {

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

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const cli_1 = require("../../../../cli");
 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 SpoTenantRecycleBinItemRemoveCommand extends SpoCommand_1.default {
@@ -21,11 +21,11 @@ class SpoTenantRecycleBinItemRemoveCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args, cb) {
         const removeDeletedSite = () => {
-            this
+            utils_1.spo
                 .getSpoAdminUrl(logger, this.debug)
                 .then((adminUrl) => {
                 this.spoAdminUrl = adminUrl;
-                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;
@@ -37,7 +37,7 @@ class SpoTenantRecycleBinItemRemoveCommand 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="16" ObjectPathId="15" /><Query Id="17" ObjectPathId="15"><Query SelectAllProperties="false"><Properties><Property Name="PollingInterval" ScalarProperty="true" /><Property Name="IsComplete" ScalarProperty="true" /></Properties></Query></Query></Actions><ObjectPaths><Method Id="15" ParentId="1" Name="RemoveDeletedSite"><Parameters><Parameter Type="String">${Utils_1.default.escapeXml(args.options.url)}</Parameter></Parameters></Method><Constructor Id="1" 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="16" ObjectPathId="15" /><Query Id="17" ObjectPathId="15"><Query SelectAllProperties="false"><Properties><Property Name="PollingInterval" ScalarProperty="true" /><Property Name="IsComplete" ScalarProperty="true" /></Properties></Query></Query></Actions><ObjectPaths><Method Id="15" ParentId="1" Name="RemoveDeletedSite"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.url)}</Parameter></Parameters></Method><Constructor Id="1" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></ObjectPaths></Request>`
                 };
                 return request_1.default.post(requestOptions);
             })
@@ -56,7 +56,17 @@ class SpoTenantRecycleBinItemRemoveCommand 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);
                     }
                 });
@@ -98,7 +108,7 @@ class SpoTenantRecycleBinItemRemoveCommand 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 SpoTenantRecycleBinItemRemoveCommand();

package/dist/m365/spo/commands/tenant/tenant-recyclebinitem-restore.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 SpoTenantRecycleBinItemRestoreCommand extends SpoCommand_1.default {
@@ -19,11 +19,11 @@ class SpoTenantRecycleBinItemRestoreCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args, cb) {
         this.dots = '';
-        this
+        utils_1.spo
             .getSpoAdminUrl(logger, this.debug)
             .then((adminUrl) => {
             this.spoAdminUrl = adminUrl;
-            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;
@@ -35,7 +35,7 @@ class SpoTenantRecycleBinItemRestoreCommand 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="2" ObjectPathId="1" /><ObjectPath Id="4" ObjectPathId="3" /><Query Id="5" ObjectPathId="3"><Query SelectAllProperties="false"><Properties><Property Name="PollingInterval" ScalarProperty="true" /><Property Name="IsComplete" ScalarProperty="true" /></Properties></Query></Query></Actions><ObjectPaths><Constructor Id="1" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /><Method Id="3" ParentId="1" Name="RestoreDeletedSite"><Parameters><Parameter Type="String">${Utils_1.default.escapeXml(args.options.url)}</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="2" ObjectPathId="1" /><ObjectPath Id="4" ObjectPathId="3" /><Query Id="5" ObjectPathId="3"><Query SelectAllProperties="false"><Properties><Property Name="PollingInterval" ScalarProperty="true" /><Property Name="IsComplete" ScalarProperty="true" /></Properties></Query></Query></Actions><ObjectPaths><Constructor Id="1" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /><Method Id="3" ParentId="1" Name="RestoreDeletedSite"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.url)}</Parameter></Parameters></Method></ObjectPaths></Request>`
             };
             return request_1.default.post(requestOptions);
         })
@@ -54,7 +54,17 @@ class SpoTenantRecycleBinItemRestoreCommand 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);
                 }
             });
@@ -74,7 +84,7 @@ class SpoTenantRecycleBinItemRestoreCommand 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 SpoTenantRecycleBinItemRestoreCommand();

package/dist/m365/spo/commands/tenant/tenant-settings-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 SpoTenantSettingsListCommand extends SpoCommand_1.default {
@@ -14,11 +15,11 @@ class SpoTenantSettingsListCommand 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 requestOptions = {

package/dist/m365/spo/commands/tenant/tenant-settings-set.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 SpoTenantSettingsSetCommand extends SpoCommand_1.default {
@@ -116,15 +116,15 @@ class SpoTenantSettingsSetCommand extends SpoCommand_1.default {
         let formDigestValue = '';
         let spoAdminUrl = '';
         let tenantId = '';
-        this
+        utils_1.spo
             .getTenantId(logger, this.debug)
             .then((_tenantId) => {
             tenantId = _tenantId;
-            return this.getSpoAdminUrl(logger, this.debug);
+            return utils_1.spo.getSpoAdminUrl(logger, this.debug);
         })
             .then((_spoAdminUrl) => {
             spoAdminUrl = _spoAdminUrl;
-            return this.getRequestDigest(spoAdminUrl);
+            return utils_1.spo.getRequestDigest(spoAdminUrl);
         })
             .then((res) => {
             formDigestValue = res.FormDigestValue;
@@ -144,7 +144,7 @@ class SpoTenantSettingsSetCommand extends SpoCommand_1.default {
                     // the XML has to be represented as array of guids
                     let valuesXml = '';
                     optionValue.split(',').forEach((value) => {
-                        valuesXml += `<Object Type="Guid">{${Utils_1.default.escapeXml(value)}}</Object>`;
+                        valuesXml += `<Object Type="Guid">{${utils_1.formatting.escapeXml(value)}}</Object>`;
                     });
                     propsXml += `<SetProperty Id="${id++}" ObjectPathId="7" Name="${optionKey}"><Parameter Type="Array">${valuesXml}</Parameter></SetProperty><Method Name="Update" Id="${id++}" ObjectPathId="7" />`;
                 }

package/dist/m365/spo/commands/term/term-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 SpoTermAddCommand extends SpoCommand_1.default {
@@ -31,25 +31,25 @@ class SpoTermAddCommand extends SpoCommand_1.default {
         let term;
         let formDigest;
         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;
             if (this.verbose) {
                 logger.logToStderr(`Adding taxonomy term...`);
             }
-            const termGroupQuery = args.options.termGroupId ? `<Method Id="11" ParentId="9" Name="GetById"><Parameters><Parameter Type="Guid">{${args.options.termGroupId}}</Parameter></Parameters></Method>` : `<Method Id="11" ParentId="9" Name="GetByName"><Parameters><Parameter Type="String">${Utils_1.default.escapeXml(args.options.termGroupName)}</Parameter></Parameters></Method>`;
+            const termGroupQuery = args.options.termGroupId ? `<Method Id="11" ParentId="9" Name="GetById"><Parameters><Parameter Type="Guid">{${args.options.termGroupId}}</Parameter></Parameters></Method>` : `<Method Id="11" ParentId="9" Name="GetByName"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.termGroupName)}</Parameter></Parameters></Method>`;
             const termParentQuery = args.options.parentTermId ?
                 // get parent term by ID
                 `<Method Id="16" ParentId="6" Name="GetTerm"><Parameters><Parameter Type="Guid">{${args.options.parentTermId}}</Parameter></Parameters></Method>` :
                 // no parent term specified, add to term set
-                args.options.termSetId ? `<Method Id="16" ParentId="14" Name="GetById"><Parameters><Parameter Type="Guid">{${args.options.termSetId}}</Parameter></Parameters></Method>` : `<Method Id="16" ParentId="14" Name="GetByName"><Parameters><Parameter Type="String">${Utils_1.default.escapeXml(args.options.termSetName)}</Parameter></Parameters></Method>`;
+                args.options.termSetId ? `<Method Id="16" ParentId="14" Name="GetById"><Parameters><Parameter Type="Guid">{${args.options.termSetId}}</Parameter></Parameters></Method>` : `<Method Id="16" ParentId="14" Name="GetByName"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.termSetName)}</Parameter></Parameters></Method>`;
             const termId = args.options.id || (0, uuid_1.v4)();
-            const 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" /><ObjectIdentityQuery Id="5" ObjectPathId="3" /><ObjectPath Id="7" ObjectPathId="6" /><ObjectIdentityQuery Id="8" ObjectPathId="6" /><ObjectPath Id="10" ObjectPathId="9" /><ObjectPath Id="12" ObjectPathId="11" /><ObjectIdentityQuery Id="13" ObjectPathId="11" /><ObjectPath Id="15" ObjectPathId="14" /><ObjectPath Id="17" ObjectPathId="16" /><ObjectIdentityQuery Id="18" ObjectPathId="16" /><ObjectPath Id="20" ObjectPathId="19" /><ObjectIdentityQuery Id="21" ObjectPathId="19" /><Query Id="22" ObjectPathId="19"><Query SelectAllProperties="true"><Properties /></Query></Query></Actions><ObjectPaths><StaticMethod Id="3" Name="GetTaxonomySession" TypeId="{981cbc68-9edc-4f8d-872f-71146fcbb84f}" /><Method Id="6" ParentId="3" Name="GetDefaultSiteCollectionTermStore" /><Property Id="9" ParentId="6" Name="Groups" />${termGroupQuery}<Property Id="14" ParentId="11" Name="TermSets" />${termParentQuery}<Method Id="19" ParentId="16" Name="CreateTerm"><Parameters><Parameter Type="String">${Utils_1.default.escapeXml(args.options.name)}</Parameter><Parameter Type="Int32">1033</Parameter><Parameter Type="Guid">{${termId}}</Parameter></Parameters></Method></ObjectPaths></Request>`;
+            const 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" /><ObjectIdentityQuery Id="5" ObjectPathId="3" /><ObjectPath Id="7" ObjectPathId="6" /><ObjectIdentityQuery Id="8" ObjectPathId="6" /><ObjectPath Id="10" ObjectPathId="9" /><ObjectPath Id="12" ObjectPathId="11" /><ObjectIdentityQuery Id="13" ObjectPathId="11" /><ObjectPath Id="15" ObjectPathId="14" /><ObjectPath Id="17" ObjectPathId="16" /><ObjectIdentityQuery Id="18" ObjectPathId="16" /><ObjectPath Id="20" ObjectPathId="19" /><ObjectIdentityQuery Id="21" ObjectPathId="19" /><Query Id="22" ObjectPathId="19"><Query SelectAllProperties="true"><Properties /></Query></Query></Actions><ObjectPaths><StaticMethod Id="3" Name="GetTaxonomySession" TypeId="{981cbc68-9edc-4f8d-872f-71146fcbb84f}" /><Method Id="6" ParentId="3" Name="GetDefaultSiteCollectionTermStore" /><Property Id="9" ParentId="6" Name="Groups" />${termGroupQuery}<Property Id="14" ParentId="11" Name="TermSets" />${termParentQuery}<Method Id="19" ParentId="16" Name="CreateTerm"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.name)}</Parameter><Parameter Type="Int32">1033</Parameter><Parameter Type="Guid">{${termId}}</Parameter></Parameters></Method></ObjectPaths></Request>`;
             const requestOptions = {
                 url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
                 headers: {
@@ -77,20 +77,20 @@ class SpoTermAddCommand extends SpoCommand_1.default {
             const properties = [];
             let i = 127;
             if (args.options.description) {
-                properties.push(`<Method Name="SetDescription" Id="${i++}" ObjectPathId="117"><Parameters><Parameter Type="String">${Utils_1.default.escapeXml(args.options.description)}</Parameter><Parameter Type="Int32">1033</Parameter></Parameters></Method>`);
+                properties.push(`<Method Name="SetDescription" Id="${i++}" ObjectPathId="117"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.description)}</Parameter><Parameter Type="Int32">1033</Parameter></Parameters></Method>`);
                 term.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>`);
                 });
                 term.CustomProperties = customProperties;
             }
             if (args.options.localCustomProperties) {
                 const localCustomProperties = JSON.parse(args.options.localCustomProperties);
                 Object.keys(localCustomProperties).forEach(k => {
-                    properties.push(`<Method Name="SetLocalCustomProperty" Id="${i++}" ObjectPathId="117"><Parameters><Parameter Type="String">${Utils_1.default.escapeXml(k)}</Parameter><Parameter Type="String">${Utils_1.default.escapeXml(localCustomProperties[k])}</Parameter></Parameters></Method>`);
+                    properties.push(`<Method Name="SetLocalCustomProperty" Id="${i++}" ObjectPathId="117"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(k)}</Parameter><Parameter Type="String">${utils_1.formatting.escapeXml(localCustomProperties[k])}</Parameter></Parameters></Method>`);
                 });
                 term.LocalCustomProperties = localCustomProperties;
             }
@@ -168,12 +168,12 @@ class SpoTermAddCommand 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`;
             }
         }
         if (args.options.parentTermId) {
-            if (!Utils_1.default.isValidGuid(args.options.parentTermId)) {
+            if (!utils_1.validation.isValidGuid(args.options.parentTermId)) {
                 return `${args.options.parentTermId} is not a valid GUID`;
             }
             if (args.options.termSetId || args.options.termSetName) {
@@ -187,7 +187,7 @@ class SpoTermAddCommand 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`;
             }
         }
@@ -198,7 +198,7 @@ class SpoTermAddCommand extends SpoCommand_1.default {
             return 'Specify 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-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 SpoTermGetCommand extends SpoCommand_1.default {
@@ -25,11 +25,11 @@ class SpoTermGetCommand 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) {
@@ -40,9 +40,9 @@ class SpoTermGetCommand extends SpoCommand_1.default {
                 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="true"><Properties /></Query></Query></Actions><ObjectPaths><StaticMethod Id="6" Name="GetTaxonomySession" TypeId="{981cbc68-9edc-4f8d-872f-71146fcbb84f}" /><Method Id="7" ParentId="6" Name="GetDefaultSiteCollectionTermStore" /><Method Id="13" ParentId="7" Name="GetTerm"><Parameters><Parameter Type="Guid">{${args.options.id}}</Parameter></Parameters></Method></ObjectPaths></Request>`;
             }
             else {
-                const termGroupQuery = args.options.termGroupId ? `<Method Id="98" ParentId="96" Name="GetById"><Parameters><Parameter Type="Guid">{${args.options.termGroupId}}</Parameter></Parameters></Method>` : `<Method Id="98" ParentId="96" Name="GetByName"><Parameters><Parameter Type="String">${Utils_1.default.escapeXml(args.options.termGroupName)}</Parameter></Parameters></Method>`;
-                const termSetQuery = args.options.termSetId ? `<Method Id="103" ParentId="101" Name="GetById"><Parameters><Parameter Type="Guid">{${args.options.termSetId}}</Parameter></Parameters></Method>` : `<Method Id="103" ParentId="101" Name="GetByName"><Parameters><Parameter Type="String">${Utils_1.default.escapeXml(args.options.termSetName)}</Parameter></Parameters></Method>`;
-                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="91" ObjectPathId="90" /><ObjectIdentityQuery Id="92" ObjectPathId="90" /><ObjectPath Id="94" ObjectPathId="93" /><ObjectIdentityQuery Id="95" ObjectPathId="93" /><ObjectPath Id="97" ObjectPathId="96" /><ObjectPath Id="99" ObjectPathId="98" /><ObjectIdentityQuery Id="100" ObjectPathId="98" /><ObjectPath Id="102" ObjectPathId="101" /><ObjectPath Id="104" ObjectPathId="103" /><ObjectIdentityQuery Id="105" ObjectPathId="103" /><ObjectPath Id="107" ObjectPathId="106" /><ObjectPath Id="109" ObjectPathId="108" /><ObjectIdentityQuery Id="110" ObjectPathId="108" /><Query Id="111" ObjectPathId="108"><Query SelectAllProperties="true"><Properties /></Query></Query></Actions><ObjectPaths><StaticMethod Id="90" Name="GetTaxonomySession" TypeId="{981cbc68-9edc-4f8d-872f-71146fcbb84f}" /><Method Id="93" ParentId="90" Name="GetDefaultSiteCollectionTermStore" /><Property Id="96" ParentId="93" Name="Groups" />${termGroupQuery}<Property Id="101" ParentId="98" Name="TermSets" />${termSetQuery}<Property Id="106" ParentId="103" Name="Terms" /><Method Id="108" ParentId="106" Name="GetByName"><Parameters><Parameter Type="String">${Utils_1.default.escapeXml(args.options.name)}</Parameter></Parameters></Method></ObjectPaths></Request>`;
+                const termGroupQuery = args.options.termGroupId ? `<Method Id="98" ParentId="96" Name="GetById"><Parameters><Parameter Type="Guid">{${args.options.termGroupId}}</Parameter></Parameters></Method>` : `<Method Id="98" ParentId="96" Name="GetByName"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.termGroupName)}</Parameter></Parameters></Method>`;
+                const termSetQuery = args.options.termSetId ? `<Method Id="103" ParentId="101" Name="GetById"><Parameters><Parameter Type="Guid">{${args.options.termSetId}}</Parameter></Parameters></Method>` : `<Method Id="103" ParentId="101" Name="GetByName"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.termSetName)}</Parameter></Parameters></Method>`;
+                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="91" ObjectPathId="90" /><ObjectIdentityQuery Id="92" ObjectPathId="90" /><ObjectPath Id="94" ObjectPathId="93" /><ObjectIdentityQuery Id="95" ObjectPathId="93" /><ObjectPath Id="97" ObjectPathId="96" /><ObjectPath Id="99" ObjectPathId="98" /><ObjectIdentityQuery Id="100" ObjectPathId="98" /><ObjectPath Id="102" ObjectPathId="101" /><ObjectPath Id="104" ObjectPathId="103" /><ObjectIdentityQuery Id="105" ObjectPathId="103" /><ObjectPath Id="107" ObjectPathId="106" /><ObjectPath Id="109" ObjectPathId="108" /><ObjectIdentityQuery Id="110" ObjectPathId="108" /><Query Id="111" ObjectPathId="108"><Query SelectAllProperties="true"><Properties /></Query></Query></Actions><ObjectPaths><StaticMethod Id="90" Name="GetTaxonomySession" TypeId="{981cbc68-9edc-4f8d-872f-71146fcbb84f}" /><Method Id="93" ParentId="90" Name="GetDefaultSiteCollectionTermStore" /><Property Id="96" ParentId="93" Name="Groups" />${termGroupQuery}<Property Id="101" ParentId="98" Name="TermSets" />${termSetQuery}<Property Id="106" ParentId="103" Name="Terms" /><Method Id="108" ParentId="106" Name="GetByName"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.name)}</Parameter></Parameters></Method></ObjectPaths></Request>`;
             }
             const requestOptions = {
                 url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
@@ -106,7 +106,7 @@ class SpoTermGetCommand 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`;
             }
         }
@@ -122,7 +122,7 @@ class SpoTermGetCommand 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`;
             }
         }
@@ -130,7 +130,7 @@ class SpoTermGetCommand extends SpoCommand_1.default {
             return 'Specify 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`;
             }
         }