@pnp/cli-microsoft365 5.8.0 → 5.9.0-beta.5aade58

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

@@ -15,9 +15,9 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoGroupSetCommand_instances, _SpoGroupSetCommand_initTelemetry, _SpoGroupSetCommand_initOptions, _SpoGroupSetCommand_initValidators, _SpoGroupSetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
-const cli_1 = require("../../../../cli");
+const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const AadUserGetCommand = require("../../../aad/commands/user/user-get");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
@@ -90,7 +90,7 @@ class SpoGroupSetCommand extends SpoCommand_1.default {
             debug: options.debug,
             verbose: options.verbose
         };
-        return cli_1.Cli
+        return Cli_1.Cli
             .executeCommandWithOutput(AadUserGetCommand, { options: Object.assign(Object.assign({}, cmdOptions), { _: [] }) })
             .then((output) => {
             const getUserOutput = JSON.parse(output.stdout);
@@ -151,7 +151,7 @@ _SpoGroupSetCommand_instances = new WeakSet(), _SpoGroupSetCommand_initTelemetry
     });
 }, _SpoGroupSetCommand_initValidators = function _SpoGroupSetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+        const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.webUrl);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }
@@ -166,7 +166,7 @@ _SpoGroupSetCommand_instances = new WeakSet(), _SpoGroupSetCommand_initTelemetry
             args.options.allowRequestToJoinLeave, args.options.autoAcceptRequestToJoinLeave
         ];
         for (const option of booleanOptions) {
-            if (typeof option !== 'undefined' && !utils_1.validation.isValidBoolean(option)) {
+            if (typeof option !== 'undefined' && !validation_1.validation.isValidBoolean(option)) {
                 return `Value '${option}' is not a valid boolean`;
             }
         }

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

@@ -15,9 +15,9 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoGroupUserAddCommand_instances, _SpoGroupUserAddCommand_initTelemetry, _SpoGroupUserAddCommand_initOptions, _SpoGroupUserAddCommand_initValidators, _SpoGroupUserAddCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
-const cli_1 = require("../../../../cli");
+const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const AadUserGetCommand = require("../../../aad/commands/user/user-get");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
@@ -113,7 +113,7 @@ class SpoGroupUserAddCommand extends SpoCommand_1.default {
             else {
                 options.email = singleUserName.trim();
             }
-            return cli_1.Cli
+            return Cli_1.Cli
                 .executeCommandWithOutput(AadUserGetCommand, { options: Object.assign(Object.assign({}, options), { _: [] }) })
                 .then((getUserGetOutput) => {
                 if (this.debug) {
@@ -164,7 +164,7 @@ _SpoGroupUserAddCommand_instances = new WeakSet(), _SpoGroupUserAddCommand_initT
     });
 }, _SpoGroupUserAddCommand_initValidators = function _SpoGroupUserAddCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+        const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.webUrl);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }

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

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoGroupUserListCommand_instances, _SpoGroupUserListCommand_initTelemetry, _SpoGroupUserListCommand_initOptions, _SpoGroupUserListCommand_initValidators, _SpoGroupUserListCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoGroupUserListCommand extends SpoCommand_1.default {
@@ -82,7 +82,7 @@ _SpoGroupUserListCommand_instances = new WeakSet(), _SpoGroupUserListCommand_ini
         if (args.options.groupId && isNaN(args.options.groupId)) {
             return `Specified "groupId" ${args.options.groupId} is not valid`;
         }
-        return utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+        return validation_1.validation.isValidSharePointUrl(args.options.webUrl);
     }));
 }, _SpoGroupUserListCommand_initOptionSets = function _SpoGroupUserListCommand_initOptionSets() {
     this.optionSets.push(['groupName', 'groupId']);

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

@@ -15,9 +15,9 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoGroupUserRemoveCommand_instances, _SpoGroupUserRemoveCommand_initTelemetry, _SpoGroupUserRemoveCommand_initOptions, _SpoGroupUserRemoveCommand_initValidators, _SpoGroupUserRemoveCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
-const cli_1 = require("../../../../cli");
+const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoGroupUserRemoveCommand extends SpoCommand_1.default {
@@ -66,7 +66,7 @@ class SpoGroupUserRemoveCommand extends SpoCommand_1.default {
                 yield removeUserfromSPGroup();
             }
             else {
-                const result = yield cli_1.Cli.prompt({
+                const result = yield Cli_1.Cli.prompt({
                     type: 'confirm',
                     name: 'continue',
                     default: false,
@@ -104,7 +104,7 @@ _SpoGroupUserRemoveCommand_instances = new WeakSet(), _SpoGroupUserRemoveCommand
         if (args.options.groupId && isNaN(args.options.groupId)) {
             return `Specified "groupId" ${args.options.groupId} is not valid`;
         }
-        return utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+        return validation_1.validation.isValidSharePointUrl(args.options.webUrl);
     }));
 }, _SpoGroupUserRemoveCommand_initOptionSets = function _SpoGroupUserRemoveCommand_initOptionSets() {
     this.optionSets.push(['groupName', 'groupId']);

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

@@ -10,7 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const spo_1 = require("../../../../utils/spo");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoHideDefaultThemesGetCommand extends SpoCommand_1.default {
@@ -23,7 +23,7 @@ class SpoHideDefaultThemesGetCommand extends SpoCommand_1.default {
     commandAction(logger) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const spoAdminUrl = yield utils_1.spo.getSpoAdminUrl(logger, this.debug);
+                const spoAdminUrl = yield spo_1.spo.getSpoAdminUrl(logger, this.debug);
                 if (this.verbose) {
                     logger.logToStderr(`Getting the current value of the HideDefaultThemes setting...`);
                 }

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

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoHideDefaultThemesSetCommand_instances, _SpoHideDefaultThemesSetCommand_initTelemetry, _SpoHideDefaultThemesSetCommand_initOptions, _SpoHideDefaultThemesSetCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const spo_1 = require("../../../../utils/spo");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoHideDefaultThemesSetCommand extends SpoCommand_1.default {
@@ -36,7 +36,7 @@ class SpoHideDefaultThemesSetCommand extends SpoCommand_1.default {
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const spoAdminUrl = yield utils_1.spo.getSpoAdminUrl(logger, this.debug);
+                const spoAdminUrl = yield spo_1.spo.getSpoAdminUrl(logger, this.debug);
                 if (this.verbose) {
                     logger.logToStderr(`Setting the value of the HideDefaultThemes setting to ${args.options.hideDefaultThemes}...`);
                 }

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

@@ -10,7 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const spo_1 = require("../../../../utils/spo");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoHomeSiteGetCommand extends SpoCommand_1.default {
@@ -23,7 +23,7 @@ class SpoHomeSiteGetCommand extends SpoCommand_1.default {
     commandAction(logger) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const spoUrl = yield utils_1.spo.getSpoUrl(logger, this.debug);
+                const spoUrl = yield spo_1.spo.getSpoUrl(logger, this.debug);
                 const requestOptions = {
                     url: `${spoUrl}/_api/SP.SPHSite/Details`,
                     headers: {

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

@@ -15,10 +15,10 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoHomeSiteRemoveCommand_instances, _SpoHomeSiteRemoveCommand_initTelemetry, _SpoHomeSiteRemoveCommand_initOptions;
 Object.defineProperty(exports, "__esModule", { value: true });
-const cli_1 = require("../../../../cli");
+const Cli_1 = require("../../../../cli/Cli");
 const config_1 = require("../../../../config");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const spo_1 = require("../../../../utils/spo");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoHomeSiteRemoveCommand extends SpoCommand_1.default {
@@ -38,8 +38,8 @@ class SpoHomeSiteRemoveCommand extends SpoCommand_1.default {
         return __awaiter(this, void 0, void 0, function* () {
             const removeHomeSite = () => __awaiter(this, void 0, void 0, function* () {
                 try {
-                    const spoAdminUrl = yield utils_1.spo.getSpoAdminUrl(logger, this.debug);
-                    const reqDigest = yield utils_1.spo.getRequestDigest(spoAdminUrl);
+                    const spoAdminUrl = yield spo_1.spo.getSpoAdminUrl(logger, this.debug);
+                    const reqDigest = yield spo_1.spo.getRequestDigest(spoAdminUrl);
                     const requestOptions = {
                         url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
                         headers: {
@@ -65,7 +65,7 @@ class SpoHomeSiteRemoveCommand extends SpoCommand_1.default {
                 yield removeHomeSite();
             }
             else {
-                const result = yield cli_1.Cli.prompt({
+                const result = yield Cli_1.Cli.prompt({
                     type: 'confirm',
                     name: 'continue',
                     default: false,

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

@@ -17,7 +17,9 @@ var _SpoHomeSiteSetCommand_instances, _SpoHomeSiteSetCommand_initOptions, _SpoHo
 Object.defineProperty(exports, "__esModule", { value: true });
 const config_1 = require("../../../../config");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const formatting_1 = require("../../../../utils/formatting");
+const spo_1 = require("../../../../utils/spo");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoHomeSiteSetCommand extends SpoCommand_1.default {
@@ -36,14 +38,14 @@ class SpoHomeSiteSetCommand extends SpoCommand_1.default {
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const spoAdminUrl = yield utils_1.spo.getSpoAdminUrl(logger, this.debug);
-                const reqDigest = yield utils_1.spo.getRequestDigest(spoAdminUrl);
+                const spoAdminUrl = yield spo_1.spo.getSpoAdminUrl(logger, this.debug);
+                const reqDigest = yield spo_1.spo.getRequestDigest(spoAdminUrl);
                 const requestOptions = {
                     url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
                     headers: {
                         'X-RequestDigest': reqDigest.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="57" ObjectPathId="56" /><Method Name="SetSPHSite" Id="58" ObjectPathId="56"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.siteUrl)}</Parameter></Parameters></Method></Actions><ObjectPaths><Constructor Id="56" 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="57" ObjectPathId="56" /><Method Name="SetSPHSite" Id="58" ObjectPathId="56"><Parameters><Parameter Type="String">${formatting_1.formatting.escapeXml(args.options.siteUrl)}</Parameter></Parameters></Method></Actions><ObjectPaths><Constructor Id="56" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></ObjectPaths></Request>`
                 };
                 const res = yield request_1.default.post(requestOptions);
                 const json = JSON.parse(res);
@@ -66,7 +68,7 @@ _SpoHomeSiteSetCommand_instances = new WeakSet(), _SpoHomeSiteSetCommand_initOpt
         option: '-u, --siteUrl <siteUrl>'
     });
 }, _SpoHomeSiteSetCommand_initValidators = function _SpoHomeSiteSetCommand_initValidators() {
-    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return utils_1.validation.isValidSharePointUrl(args.options.siteUrl); }));
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return validation_1.validation.isValidSharePointUrl(args.options.siteUrl); }));
 };
 module.exports = new SpoHomeSiteSetCommand();
 //# sourceMappingURL=homesite-set.js.map

package/dist/m365/spo/commands/hubsite/hubsite-connect.js

@@ -16,7 +16,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoHubSiteConnectCommand_instances, _SpoHubSiteConnectCommand_initOptions, _SpoHubSiteConnectCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const spo_1 = require("../../../../utils/spo");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoHubSiteConnectCommand extends SpoCommand_1.default {
@@ -35,7 +36,7 @@ class SpoHubSiteConnectCommand extends SpoCommand_1.default {
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const res = yield utils_1.spo.getRequestDigest(args.options.url);
+                const res = yield spo_1.spo.getRequestDigest(args.options.url);
                 const requestOptions = {
                     url: `${args.options.url}/_api/site/JoinHubSite('${encodeURIComponent(args.options.hubSiteId)}')`,
                     headers: {
@@ -60,11 +61,11 @@ _SpoHubSiteConnectCommand_instances = new WeakSet(), _SpoHubSiteConnectCommand_i
     });
 }, _SpoHubSiteConnectCommand_initValidators = function _SpoHubSiteConnectCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.url);
+        const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.url);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }
-        if (!utils_1.validation.isValidGuid(args.options.hubSiteId)) {
+        if (!validation_1.validation.isValidGuid(args.options.hubSiteId)) {
             return `${args.options.hubSiteId} is not a valid GUID`;
         }
         return true;

package/dist/m365/spo/commands/hubsite/hubsite-data-get.js

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoHubSiteDataGetCommand_instances, _SpoHubSiteDataGetCommand_initTelemetry, _SpoHubSiteDataGetCommand_initOptions, _SpoHubSiteDataGetCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoHubSiteDataGetCommand extends SpoCommand_1.default {
@@ -76,7 +76,7 @@ _SpoHubSiteDataGetCommand_instances = new WeakSet(), _SpoHubSiteDataGetCommand_i
         option: '-f, --forceRefresh'
     });
 }, _SpoHubSiteDataGetCommand_initValidators = function _SpoHubSiteDataGetCommand_initValidators() {
-    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return utils_1.validation.isValidSharePointUrl(args.options.webUrl); }));
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return validation_1.validation.isValidSharePointUrl(args.options.webUrl); }));
 };
 module.exports = new SpoHubSiteDataGetCommand();
 //# sourceMappingURL=hubsite-data-get.js.map

package/dist/m365/spo/commands/hubsite/hubsite-disconnect.js

@@ -15,9 +15,10 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoHubSiteDisconnectCommand_instances, _SpoHubSiteDisconnectCommand_initTelemetry, _SpoHubSiteDisconnectCommand_initOptions, _SpoHubSiteDisconnectCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
-const cli_1 = require("../../../../cli");
+const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const spo_1 = require("../../../../utils/spo");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoHubSiteDisconnectCommand extends SpoCommand_1.default {
@@ -38,7 +39,7 @@ class SpoHubSiteDisconnectCommand extends SpoCommand_1.default {
         return __awaiter(this, void 0, void 0, function* () {
             const disconnectHubSite = () => __awaiter(this, void 0, void 0, function* () {
                 try {
-                    const res = yield utils_1.spo.getRequestDigest(args.options.url);
+                    const res = yield spo_1.spo.getRequestDigest(args.options.url);
                     if (this.verbose) {
                         logger.logToStderr(`Disconnecting site collection ${args.options.url} from its hubsite...`);
                     }
@@ -60,7 +61,7 @@ class SpoHubSiteDisconnectCommand extends SpoCommand_1.default {
                 yield disconnectHubSite();
             }
             else {
-                const result = yield cli_1.Cli.prompt({
+                const result = yield Cli_1.Cli.prompt({
                     type: 'confirm',
                     name: 'continue',
                     default: false,
@@ -86,7 +87,7 @@ _SpoHubSiteDisconnectCommand_instances = new WeakSet(), _SpoHubSiteDisconnectCom
         option: '--confirm'
     });
 }, _SpoHubSiteDisconnectCommand_initValidators = function _SpoHubSiteDisconnectCommand_initValidators() {
-    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return utils_1.validation.isValidSharePointUrl(args.options.url); }));
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return validation_1.validation.isValidSharePointUrl(args.options.url); }));
 };
 module.exports = new SpoHubSiteDisconnectCommand();
 //# sourceMappingURL=hubsite-disconnect.js.map

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

@@ -15,9 +15,10 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoHubSiteGetCommand_instances, _SpoHubSiteGetCommand_initTelemetry, _SpoHubSiteGetCommand_initOptions, _SpoHubSiteGetCommand_initValidators, _SpoHubSiteGetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
-const cli_1 = require("../../../../cli");
+const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const spo_1 = require("../../../../utils/spo");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 const SpoListItemListCommand = require("../listitem/listitem-list");
@@ -39,13 +40,13 @@ class SpoHubSiteGetCommand extends SpoCommand_1.default {
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const spoUrl = yield utils_1.spo.getSpoUrl(logger, this.debug);
+                const spoUrl = yield spo_1.spo.getSpoUrl(logger, this.debug);
                 const hubSite = args.options.id ? yield this.getHubSiteById(spoUrl, args.options) : yield this.getHubSite(spoUrl, args.options);
                 if (args.options.includeAssociatedSites && (args.options.output && args.options.output !== 'json')) {
                     throw 'includeAssociatedSites option is only allowed with json output mode';
                 }
                 if (args.options.includeAssociatedSites === true && args.options.output && args.options.output === 'json') {
-                    const spoAdminUrl = yield utils_1.spo.getSpoAdminUrl(logger, this.debug);
+                    const spoAdminUrl = yield spo_1.spo.getSpoAdminUrl(logger, this.debug);
                     const associatedSitesCommandOutput = yield this.getAssociatedSites(spoAdminUrl, hubSite.SiteId, logger, args);
                     const associatedSites = JSON.parse(associatedSitesCommandOutput.stdout);
                     hubSite.AssociatedSites = associatedSites.filter(s => s.SiteId !== hubSite.SiteId);
@@ -67,7 +68,7 @@ class SpoHubSiteGetCommand extends SpoCommand_1.default {
             filter: `HubSiteId eq '${hubSiteId}'`,
             fields: 'Title,SiteUrl,SiteId'
         };
-        return cli_1.Cli
+        return Cli_1.Cli
             .executeCommandWithOutput(SpoListItemListCommand, { options: Object.assign(Object.assign({}, options), { _: [] }) });
     }
     getHubSiteById(spoUrl, options) {
@@ -121,11 +122,11 @@ _SpoHubSiteGetCommand_instances = new WeakSet(), _SpoHubSiteGetCommand_initTelem
     this.options.unshift({ option: '-i, --id [id]' }, { option: '-t, --title [title]' }, { option: '-u, --url [url]' }, { option: '--includeAssociatedSites' });
 }, _SpoHubSiteGetCommand_initValidators = function _SpoHubSiteGetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (args.options.id && !utils_1.validation.isValidGuid(args.options.id)) {
+        if (args.options.id && !validation_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
         if (args.options.url) {
-            return utils_1.validation.isValidSharePointUrl(args.options.url);
+            return validation_1.validation.isValidSharePointUrl(args.options.url);
         }
         return true;
     }));

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

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoHubSiteListCommand_instances, _SpoHubSiteListCommand_initTelemetry, _SpoHubSiteListCommand_initOptions;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const spo_1 = require("../../../../utils/spo");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoHubSiteListCommand extends SpoCommand_1.default {
@@ -40,7 +40,7 @@ class SpoHubSiteListCommand extends SpoCommand_1.default {
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const spoAdminUrl = yield utils_1.spo.getSpoAdminUrl(logger, this.debug);
+                const spoAdminUrl = yield spo_1.spo.getSpoAdminUrl(logger, this.debug);
                 let requestOptions = {
                     url: `${spoAdminUrl}/_api/hubsites`,
                     headers: {

package/dist/m365/spo/commands/hubsite/hubsite-register.js

@@ -16,7 +16,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoHubSiteRegisterCommand_instances, _SpoHubSiteRegisterCommand_initOptions, _SpoHubSiteRegisterCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const spo_1 = require("../../../../utils/spo");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoHubSiteRegisterCommand extends SpoCommand_1.default {
@@ -35,7 +36,7 @@ class SpoHubSiteRegisterCommand extends SpoCommand_1.default {
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const reqDigest = yield utils_1.spo.getRequestDigest(args.options.url);
+                const reqDigest = yield spo_1.spo.getRequestDigest(args.options.url);
                 const requestOptions = {
                     url: `${args.options.url}/_api/site/RegisterHubSite`,
                     headers: {
@@ -58,7 +59,7 @@ _SpoHubSiteRegisterCommand_instances = new WeakSet(), _SpoHubSiteRegisterCommand
         option: '-u, --url <url>'
     });
 }, _SpoHubSiteRegisterCommand_initValidators = function _SpoHubSiteRegisterCommand_initValidators() {
-    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return utils_1.validation.isValidSharePointUrl(args.options.url); }));
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return validation_1.validation.isValidSharePointUrl(args.options.url); }));
 };
 module.exports = new SpoHubSiteRegisterCommand();
 //# sourceMappingURL=hubsite-register.js.map

package/dist/m365/spo/commands/hubsite/hubsite-rights-grant.js

@@ -17,7 +17,9 @@ var _SpoHubSiteRightsGrantCommand_instances, _SpoHubSiteRightsGrantCommand_initO
 Object.defineProperty(exports, "__esModule", { value: true });
 const config_1 = require("../../../../config");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const formatting_1 = require("../../../../utils/formatting");
+const spo_1 = require("../../../../utils/spo");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoHubSiteRightsGrantCommand extends SpoCommand_1.default {
@@ -36,14 +38,14 @@ class SpoHubSiteRightsGrantCommand extends SpoCommand_1.default {
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const spoAdminUrl = yield utils_1.spo.getSpoAdminUrl(logger, this.debug);
-                const reqDigest = yield utils_1.spo.getRequestDigest(spoAdminUrl);
+                const spoAdminUrl = yield spo_1.spo.getSpoAdminUrl(logger, this.debug);
+                const reqDigest = yield spo_1.spo.getRequestDigest(spoAdminUrl);
                 if (this.verbose) {
                     logger.logToStderr(`Granting permissions to join the hub site ${args.options.url} to principals ${args.options.principals}...`);
                 }
                 const principals = args.options.principals
                     .split(',')
-                    .map(p => `<Object Type="String">${utils_1.formatting.escapeXml(p.trim())}</Object>`)
+                    .map(p => `<Object Type="String">${formatting_1.formatting.escapeXml(p.trim())}</Object>`)
                     .join('');
                 const grantedRights = '1';
                 const requestOptions = {
@@ -51,7 +53,7 @@ class SpoHubSiteRightsGrantCommand extends SpoCommand_1.default {
                     headers: {
                         'X-RequestDigest': reqDigest.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="37" ObjectPathId="36" /><Method Name="GrantHubSiteRights" Id="38" ObjectPathId="36"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.url)}</Parameter><Parameter Type="Array">${principals}</Parameter><Parameter Type="Enum">${grantedRights}</Parameter></Parameters></Method></Actions><ObjectPaths><Constructor Id="36" 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="37" ObjectPathId="36" /><Method Name="GrantHubSiteRights" Id="38" ObjectPathId="36"><Parameters><Parameter Type="String">${formatting_1.formatting.escapeXml(args.options.url)}</Parameter><Parameter Type="Array">${principals}</Parameter><Parameter Type="Enum">${grantedRights}</Parameter></Parameters></Method></Actions><ObjectPaths><Constructor Id="36" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></ObjectPaths></Request>`
                 };
                 const res = yield request_1.default.post(requestOptions);
                 const json = JSON.parse(res);
@@ -77,7 +79,7 @@ _SpoHubSiteRightsGrantCommand_instances = new WeakSet(), _SpoHubSiteRightsGrantC
     });
 }, _SpoHubSiteRightsGrantCommand_initValidators = function _SpoHubSiteRightsGrantCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.url);
+        const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.url);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }

package/dist/m365/spo/commands/hubsite/hubsite-rights-revoke.js

@@ -15,10 +15,12 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoHubSiteRightsRevokeCommand_instances, _SpoHubSiteRightsRevokeCommand_initTelemetry, _SpoHubSiteRightsRevokeCommand_initOptions, _SpoHubSiteRightsRevokeCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
-const cli_1 = require("../../../../cli");
+const Cli_1 = require("../../../../cli/Cli");
 const config_1 = require("../../../../config");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const formatting_1 = require("../../../../utils/formatting");
+const spo_1 = require("../../../../utils/spo");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoHubSiteRightsRevokeCommand extends SpoCommand_1.default {
@@ -42,18 +44,18 @@ class SpoHubSiteRightsRevokeCommand extends SpoCommand_1.default {
                     if (this.verbose) {
                         logger.logToStderr(`Revoking rights for ${args.options.principals} from ${args.options.url}...`);
                     }
-                    const spoAdminUrl = yield utils_1.spo.getSpoAdminUrl(logger, this.debug);
-                    const reqDigest = yield utils_1.spo.getRequestDigest(spoAdminUrl);
+                    const spoAdminUrl = yield spo_1.spo.getSpoAdminUrl(logger, this.debug);
+                    const reqDigest = yield spo_1.spo.getRequestDigest(spoAdminUrl);
                     const principals = args.options.principals
                         .split(',')
-                        .map(p => `<Object Type="String">${utils_1.formatting.escapeXml(p.trim())}</Object>`)
+                        .map(p => `<Object Type="String">${formatting_1.formatting.escapeXml(p.trim())}</Object>`)
                         .join('');
                     const requestOptions = {
                         url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
                         headers: {
                             'X-RequestDigest': reqDigest.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="RevokeHubSiteRights" Id="11" ObjectPathId="9"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.url)}</Parameter><Parameter Type="Array">${principals}</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="RevokeHubSiteRights" Id="11" ObjectPathId="9"><Parameters><Parameter Type="String">${formatting_1.formatting.escapeXml(args.options.url)}</Parameter><Parameter Type="Array">${principals}</Parameter></Parameters></Method></Actions><ObjectPaths><Constructor Id="9" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></ObjectPaths></Request>`
                     };
                     const res = yield request_1.default.post(requestOptions);
                     const json = JSON.parse(res);
@@ -70,7 +72,7 @@ class SpoHubSiteRightsRevokeCommand extends SpoCommand_1.default {
                 yield revokeRights();
             }
             else {
-                const result = yield cli_1.Cli.prompt({
+                const result = yield Cli_1.Cli.prompt({
                     type: 'confirm',
                     name: 'continue',
                     default: false,
@@ -98,7 +100,7 @@ _SpoHubSiteRightsRevokeCommand_instances = new WeakSet(), _SpoHubSiteRightsRevok
         option: '--confirm'
     });
 }, _SpoHubSiteRightsRevokeCommand_initValidators = function _SpoHubSiteRightsRevokeCommand_initValidators() {
-    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return utils_1.validation.isValidSharePointUrl(args.options.url); }));
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return validation_1.validation.isValidSharePointUrl(args.options.url); }));
 };
 module.exports = new SpoHubSiteRightsRevokeCommand();
 //# sourceMappingURL=hubsite-rights-revoke.js.map

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

@@ -17,7 +17,9 @@ var _SpoHubSiteSetCommand_instances, _SpoHubSiteSetCommand_initTelemetry, _SpoHu
 Object.defineProperty(exports, "__esModule", { value: true });
 const config_1 = require("../../../../config");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const formatting_1 = require("../../../../utils/formatting");
+const spo_1 = require("../../../../utils/spo");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoHubSiteSetCommand extends SpoCommand_1.default {
@@ -38,20 +40,20 @@ class SpoHubSiteSetCommand extends SpoCommand_1.default {
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const spoAdminUrl = yield utils_1.spo.getSpoAdminUrl(logger, this.debug);
-                const reqDigest = yield utils_1.spo.getRequestDigest(spoAdminUrl);
+                const spoAdminUrl = yield spo_1.spo.getSpoAdminUrl(logger, this.debug);
+                const reqDigest = yield spo_1.spo.getRequestDigest(spoAdminUrl);
                 if (this.verbose) {
                     logger.logToStderr(`Updating hub site ${args.options.id}...`);
                 }
-                const title = typeof args.options.title === 'string' ? `<SetProperty Id="13" ObjectPathId="10" Name="Title"><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.title)}</Parameter></SetProperty>` : '';
-                const description = typeof args.options.description === 'string' ? `<SetProperty Id="15" ObjectPathId="10" Name="Description"><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.description)}</Parameter></SetProperty>` : '';
-                const logoUrl = typeof args.options.logoUrl === 'string' ? `<SetProperty Id="14" ObjectPathId="10" Name="LogoUrl"><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.logoUrl)}</Parameter></SetProperty>` : '';
+                const title = typeof args.options.title === 'string' ? `<SetProperty Id="13" ObjectPathId="10" Name="Title"><Parameter Type="String">${formatting_1.formatting.escapeXml(args.options.title)}</Parameter></SetProperty>` : '';
+                const description = typeof args.options.description === 'string' ? `<SetProperty Id="15" ObjectPathId="10" Name="Description"><Parameter Type="String">${formatting_1.formatting.escapeXml(args.options.description)}</Parameter></SetProperty>` : '';
+                const logoUrl = typeof args.options.logoUrl === 'string' ? `<SetProperty Id="14" ObjectPathId="10" Name="LogoUrl"><Parameter Type="String">${formatting_1.formatting.escapeXml(args.options.logoUrl)}</Parameter></SetProperty>` : '';
                 const requestOptions = {
                     url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
                     headers: {
                         'X-RequestDigest': reqDigest.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="9" ObjectPathId="8" /><ObjectPath Id="11" ObjectPathId="10" /><Query Id="12" ObjectPathId="10"><Query SelectAllProperties="true"><Properties /></Query></Query>${title}${logoUrl}${description}<Method Name="Update" Id="16" ObjectPathId="10" /></Actions><ObjectPaths><Constructor Id="8" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /><Method Id="10" ParentId="8" Name="GetHubSitePropertiesById"><Parameters><Parameter Type="Guid">${utils_1.formatting.escapeXml(args.options.id)}</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="9" ObjectPathId="8" /><ObjectPath Id="11" ObjectPathId="10" /><Query Id="12" ObjectPathId="10"><Query SelectAllProperties="true"><Properties /></Query></Query>${title}${logoUrl}${description}<Method Name="Update" Id="16" ObjectPathId="10" /></Actions><ObjectPaths><Constructor Id="8" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /><Method Id="10" ParentId="8" Name="GetHubSitePropertiesById"><Parameters><Parameter Type="Guid">${formatting_1.formatting.escapeXml(args.options.id)}</Parameter></Parameters></Method></ObjectPaths></Request>`
                 };
                 const res = yield request_1.default.post(requestOptions);
                 const json = JSON.parse(res);
@@ -93,7 +95,7 @@ _SpoHubSiteSetCommand_instances = new WeakSet(), _SpoHubSiteSetCommand_initTelem
     });
 }, _SpoHubSiteSetCommand_initValidators = function _SpoHubSiteSetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!utils_1.validation.isValidGuid(args.options.id)) {
+        if (!validation_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
         if (!args.options.title &&