@pnp/cli-microsoft365 5.9.0-beta.850564a → 5.9.0-beta.bc3200c

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

@@ -15,7 +15,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoPropertyBagGetCommand_instances, _SpoPropertyBagGetCommand_initTelemetry, _SpoPropertyBagGetCommand_initOptions, _SpoPropertyBagGetCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
-const utils_1 = require("../../../../utils");
+const spo_1 = require("../../../../utils/spo");
+const validation_1 = require("../../../../utils/validation");
 const commands_1 = require("../../commands");
 const propertybag_base_1 = require("./propertybag-base");
 class SpoPropertyBagGetCommand extends propertybag_base_1.SpoPropertyBagBaseCommand {
@@ -35,9 +36,9 @@ class SpoPropertyBagGetCommand extends propertybag_base_1.SpoPropertyBagBaseComm
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const contextResponse = yield utils_1.spo.getRequestDigest(args.options.webUrl);
+                const contextResponse = yield spo_1.spo.getRequestDigest(args.options.webUrl);
                 this.formDigestValue = contextResponse.FormDigestValue;
-                const identityResp = yield utils_1.spo.getCurrentWebIdentity(args.options.webUrl, this.formDigestValue);
+                const identityResp = yield spo_1.spo.getCurrentWebIdentity(args.options.webUrl, this.formDigestValue);
                 let propertyBagData;
                 const opts = args.options;
                 if (opts.folder) {
@@ -88,7 +89,7 @@ _SpoPropertyBagGetCommand_instances = new WeakSet(), _SpoPropertyBagGetCommand_i
         option: '-f, --folder [folder]'
     });
 }, _SpoPropertyBagGetCommand_initValidators = function _SpoPropertyBagGetCommand_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 SpoPropertyBagGetCommand();
 //# sourceMappingURL=propertybag-get.js.map

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

@@ -15,7 +15,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoPropertyBagListCommand_instances, _SpoPropertyBagListCommand_initTelemetry, _SpoPropertyBagListCommand_initOptions, _SpoPropertyBagListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
-const utils_1 = require("../../../../utils");
+const spo_1 = require("../../../../utils/spo");
+const validation_1 = require("../../../../utils/validation");
 const commands_1 = require("../../commands");
 const propertybag_base_1 = require("./propertybag-base");
 class SpoPropertyBagListCommand extends propertybag_base_1.SpoPropertyBagBaseCommand {
@@ -35,9 +36,9 @@ class SpoPropertyBagListCommand extends propertybag_base_1.SpoPropertyBagBaseCom
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const contextResponse = yield utils_1.spo.getRequestDigest(args.options.webUrl);
+                const contextResponse = yield spo_1.spo.getRequestDigest(args.options.webUrl);
                 this.formDigestValue = contextResponse.FormDigestValue;
-                const identityResp = yield utils_1.spo.getCurrentWebIdentity(args.options.webUrl, this.formDigestValue);
+                const identityResp = yield spo_1.spo.getCurrentWebIdentity(args.options.webUrl, this.formDigestValue);
                 let propertyBagData;
                 const opts = args.options;
                 if (opts.folder) {
@@ -86,7 +87,7 @@ _SpoPropertyBagListCommand_instances = new WeakSet(), _SpoPropertyBagListCommand
         option: '-f, --folder [folder]'
     });
 }, _SpoPropertyBagListCommand_initValidators = function _SpoPropertyBagListCommand_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 SpoPropertyBagListCommand();
 //# sourceMappingURL=propertybag-list.js.map

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

@@ -15,10 +15,12 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoPropertyBagRemoveCommand_instances, _SpoPropertyBagRemoveCommand_initTelemetry, _SpoPropertyBagRemoveCommand_initOptions, _SpoPropertyBagRemoveCommand_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 commands_1 = require("../../commands");
 const propertybag_base_1 = require("./propertybag-base");
 class SpoPropertyBagRemoveCommand extends propertybag_base_1.SpoPropertyBagBaseCommand {
@@ -39,13 +41,13 @@ class SpoPropertyBagRemoveCommand extends propertybag_base_1.SpoPropertyBagBaseC
         return __awaiter(this, void 0, void 0, function* () {
             const removeProperty = () => __awaiter(this, void 0, void 0, function* () {
                 try {
-                    const contextResponse = yield utils_1.spo.getRequestDigest(args.options.webUrl);
+                    const contextResponse = yield spo_1.spo.getRequestDigest(args.options.webUrl);
                     this.formDigestValue = contextResponse.FormDigestValue;
-                    let identityResp = yield utils_1.spo.getCurrentWebIdentity(args.options.webUrl, this.formDigestValue);
+                    let identityResp = yield spo_1.spo.getCurrentWebIdentity(args.options.webUrl, this.formDigestValue);
                     const opts = args.options;
                     if (opts.folder) {
                         // get the folder guid instead of the web guid
-                        identityResp = yield utils_1.spo.getFolderIdentity(identityResp.objectIdentity, opts.webUrl, opts.folder, this.formDigestValue);
+                        identityResp = yield spo_1.spo.getFolderIdentity(identityResp.objectIdentity, opts.webUrl, opts.folder, this.formDigestValue);
                     }
                     yield this.removeProperty(identityResp, args.options);
                 }
@@ -57,7 +59,7 @@ class SpoPropertyBagRemoveCommand extends propertybag_base_1.SpoPropertyBagBaseC
                 yield removeProperty();
             }
             else {
-                const result = yield cli_1.Cli.prompt({
+                const result = yield Cli_1.Cli.prompt({
                     type: 'confirm',
                     name: 'continue',
                     default: false,
@@ -79,7 +81,7 @@ class SpoPropertyBagRemoveCommand extends propertybag_base_1.SpoPropertyBagBaseC
             headers: {
                 'X-RequestDigest': this.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><Method Name="SetFieldValue" Id="206" ObjectPathId="205"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(options.key)}</Parameter><Parameter Type="Null" /></Parameters></Method><Method Name="Update" Id="207" ObjectPathId="198" /></Actions><ObjectPaths><Property Id="205" ParentId="198" Name="${objectType}" /><Identity Id="198" Name="${identityResp.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><Method Name="SetFieldValue" Id="206" ObjectPathId="205"><Parameters><Parameter Type="String">${formatting_1.formatting.escapeXml(options.key)}</Parameter><Parameter Type="Null" /></Parameters></Method><Method Name="Update" Id="207" ObjectPathId="198" /></Actions><ObjectPaths><Property Id="205" ParentId="198" Name="${objectType}" /><Identity Id="198" Name="${identityResp.objectIdentity}" /></ObjectPaths></Request>`
         };
         return new Promise((resolve, reject) => {
             request_1.default.post(requestOptions).then((res) => {
@@ -113,7 +115,7 @@ _SpoPropertyBagRemoveCommand_instances = new WeakSet(), _SpoPropertyBagRemoveCom
         option: '--confirm'
     });
 }, _SpoPropertyBagRemoveCommand_initValidators = function _SpoPropertyBagRemoveCommand_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 SpoPropertyBagRemoveCommand();
 //# sourceMappingURL=propertybag-remove.js.map

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

@@ -15,7 +15,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoPropertyBagSetCommand_instances, _SpoPropertyBagSetCommand_initTelemetry, _SpoPropertyBagSetCommand_initOptions, _SpoPropertyBagSetCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
-const utils_1 = require("../../../../utils");
+const spo_1 = require("../../../../utils/spo");
+const validation_1 = require("../../../../utils/validation");
 const commands_1 = require("../../commands");
 const propertybag_base_1 = require("./propertybag-base");
 class SpoPropertyBagSetCommand extends propertybag_base_1.SpoPropertyBagBaseCommand {
@@ -35,9 +36,9 @@ class SpoPropertyBagSetCommand extends propertybag_base_1.SpoPropertyBagBaseComm
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const contextResponse = yield utils_1.spo.getRequestDigest(args.options.webUrl);
+                const contextResponse = yield spo_1.spo.getRequestDigest(args.options.webUrl);
                 this.formDigestValue = contextResponse.FormDigestValue;
-                let identityResp = yield utils_1.spo.getCurrentWebIdentity(args.options.webUrl, this.formDigestValue);
+                let identityResp = yield spo_1.spo.getCurrentWebIdentity(args.options.webUrl, this.formDigestValue);
                 const webIdentityResp = identityResp;
                 // Check if web no script enabled or not
                 // Cannot set property bag value if no script is enabled
@@ -48,7 +49,7 @@ class SpoPropertyBagSetCommand extends propertybag_base_1.SpoPropertyBagBaseComm
                 const opts = args.options;
                 if (opts.folder) {
                     // get the folder guid instead of the web guid
-                    identityResp = yield utils_1.spo.getFolderIdentity(webIdentityResp.objectIdentity, opts.webUrl, opts.folder, this.formDigestValue);
+                    identityResp = yield spo_1.spo.getFolderIdentity(webIdentityResp.objectIdentity, opts.webUrl, opts.folder, this.formDigestValue);
                 }
                 yield this.setProperty(identityResp, args.options, logger);
             }
@@ -81,7 +82,7 @@ _SpoPropertyBagSetCommand_instances = new WeakSet(), _SpoPropertyBagSetCommand_i
         option: '-f, --folder [folder]'
     });
 }, _SpoPropertyBagSetCommand_initValidators = function _SpoPropertyBagSetCommand_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 SpoPropertyBagSetCommand();
 //# sourceMappingURL=propertybag-set.js.map

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

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoRoleDefinitionAddCommand_instances, _SpoRoleDefinitionAddCommand_initTelemetry, _SpoRoleDefinitionAddCommand_initOptions, _SpoRoleDefinitionAddCommand_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 base_permissions_1 = require("../../base-permissions");
 const commands_1 = require("../../commands");
@@ -110,7 +110,7 @@ _SpoRoleDefinitionAddCommand_instances = new WeakSet(), _SpoRoleDefinitionAddCom
                 }
             }
         }
-        return utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+        return validation_1.validation.isValidSharePointUrl(args.options.webUrl);
     }));
 };
 module.exports = new SpoRoleDefinitionAddCommand();

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

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoRoleDefinitionGetCommand_instances, _SpoRoleDefinitionGetCommand_initOptions, _SpoRoleDefinitionGetCommand_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 base_permissions_1 = require("../../base-permissions");
 const commands_1 = require("../../commands");
@@ -72,7 +72,7 @@ _SpoRoleDefinitionGetCommand_instances = new WeakSet(), _SpoRoleDefinitionGetCom
         if (isNaN(args.options.id)) {
             return `${args.options.id} is not a number`;
         }
-        return utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+        return validation_1.validation.isValidSharePointUrl(args.options.webUrl);
     }));
 };
 module.exports = new SpoRoleDefinitionGetCommand();

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

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoRoleDefinitionListCommand_instances, _SpoRoleDefinitionListCommand_initOptions, _SpoRoleDefinitionListCommand_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 SpoRoleDefinitionListCommand extends SpoCommand_1.default {
@@ -62,7 +62,7 @@ _SpoRoleDefinitionListCommand_instances = new WeakSet(), _SpoRoleDefinitionListC
         option: '-u, --webUrl <webUrl>'
     });
 }, _SpoRoleDefinitionListCommand_initValidators = function _SpoRoleDefinitionListCommand_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 SpoRoleDefinitionListCommand();
 //# sourceMappingURL=roledefinition-list.js.map

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

@@ -15,9 +15,9 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoRoleDefinitionRemoveCommand_instances, _SpoRoleDefinitionRemoveCommand_initTelemetry, _SpoRoleDefinitionRemoveCommand_initOptions, _SpoRoleDefinitionRemoveCommand_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 validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoRoleDefinitionRemoveCommand extends SpoCommand_1.default {
@@ -61,7 +61,7 @@ class SpoRoleDefinitionRemoveCommand extends SpoCommand_1.default {
                 yield removeRoleDefinition();
             }
             else {
-                const result = yield cli_1.Cli.prompt({
+                const result = yield Cli_1.Cli.prompt({
                     type: 'confirm',
                     name: 'continue',
                     default: false,
@@ -94,7 +94,7 @@ _SpoRoleDefinitionRemoveCommand_instances = new WeakSet(), _SpoRoleDefinitionRem
         if (isNaN(id)) {
             return `${args.options.id} is not a valid role definition ID`;
         }
-        return utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+        return validation_1.validation.isValidSharePointUrl(args.options.webUrl);
     }));
 };
 module.exports = new SpoRoleDefinitionRemoveCommand();

package/dist/m365/spo/commands/serviceprincipal/serviceprincipal-grant-add.js

@@ -17,7 +17,8 @@ var _SpoServicePrincipalGrantAddCommand_instances, _SpoServicePrincipalGrantAddC
 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 SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoServicePrincipalGrantAddCommand extends SpoCommand_1.default {
@@ -38,17 +39,17 @@ class SpoServicePrincipalGrantAddCommand 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(`Retrieving request digest...`);
                 }
-                const resDigest = yield utils_1.spo.getRequestDigest(spoAdminUrl);
+                const resDigest = yield spo_1.spo.getRequestDigest(spoAdminUrl);
                 const requestOptions = {
                     url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
                     headers: {
                         'X-RequestDigest': resDigest.FormDigestValue
                     },
-                    data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="4" ObjectPathId="3" /><ObjectPath Id="6" ObjectPathId="5" /><ObjectPath Id="8" ObjectPathId="7" /><Query Id="9" ObjectPathId="7"><Query SelectAllProperties="true"><Properties /></Query></Query></Actions><ObjectPaths><Constructor Id="3" TypeId="{104e8f06-1e00-4675-99c6-1b9b504ed8d8}" /><Property Id="5" ParentId="3" Name="PermissionRequests" /><Method Id="7" ParentId="5" Name="Approve"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.resource)}</Parameter><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.scope)}</Parameter></Parameters></Method></ObjectPaths></Request>`
+                    data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="4" ObjectPathId="3" /><ObjectPath Id="6" ObjectPathId="5" /><ObjectPath Id="8" ObjectPathId="7" /><Query Id="9" ObjectPathId="7"><Query SelectAllProperties="true"><Properties /></Query></Query></Actions><ObjectPaths><Constructor Id="3" TypeId="{104e8f06-1e00-4675-99c6-1b9b504ed8d8}" /><Property Id="5" ParentId="3" Name="PermissionRequests" /><Method Id="7" ParentId="5" Name="Approve"><Parameters><Parameter Type="String">${formatting_1.formatting.escapeXml(args.options.resource)}</Parameter><Parameter Type="String">${formatting_1.formatting.escapeXml(args.options.scope)}</Parameter></Parameters></Method></ObjectPaths></Request>`
                 };
                 const res = yield request_1.default.post(requestOptions);
                 const json = JSON.parse(res);

package/dist/m365/spo/commands/serviceprincipal/serviceprincipal-grant-list.js

@@ -11,7 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 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 SpoServicePrincipalGrantListCommand extends SpoCommand_1.default {
@@ -27,11 +27,11 @@ class SpoServicePrincipalGrantListCommand 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(`Retrieving request digest...`);
                 }
-                const reqDigest = yield utils_1.spo.getRequestDigest(spoAdminUrl);
+                const reqDigest = yield spo_1.spo.getRequestDigest(spoAdminUrl);
                 const requestOptions = {
                     url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
                     headers: {

package/dist/m365/spo/commands/serviceprincipal/serviceprincipal-grant-revoke.js

@@ -17,7 +17,8 @@ var _SpoServicePrincipalGrantRevokeCommand_instances, _SpoServicePrincipalGrantR
 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 SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoServicePrincipalGrantRevokeCommand extends SpoCommand_1.default {
@@ -38,17 +39,17 @@ class SpoServicePrincipalGrantRevokeCommand 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(`Retrieving request digest...`);
                 }
-                const reqDigest = yield utils_1.spo.getRequestDigest(spoAdminUrl);
+                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="10" ObjectPathId="9" /><ObjectPath Id="12" ObjectPathId="11" /><ObjectPath Id="14" ObjectPathId="13" /><Method Name="DeleteObject" Id="15" ObjectPathId="13" /><Query Id="16" ObjectPathId="13"><Query SelectAllProperties="true"><Properties /></Query></Query></Actions><ObjectPaths><Constructor Id="9" TypeId="{104e8f06-1e00-4675-99c6-1b9b504ed8d8}" /><Property Id="11" ParentId="9" Name="PermissionGrants" /><Method Id="13" ParentId="11" Name="GetByObjectId"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.grantId)}</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="10" ObjectPathId="9" /><ObjectPath Id="12" ObjectPathId="11" /><ObjectPath Id="14" ObjectPathId="13" /><Method Name="DeleteObject" Id="15" ObjectPathId="13" /><Query Id="16" ObjectPathId="13"><Query SelectAllProperties="true"><Properties /></Query></Query></Actions><ObjectPaths><Constructor Id="9" TypeId="{104e8f06-1e00-4675-99c6-1b9b504ed8d8}" /><Property Id="11" ParentId="9" Name="PermissionGrants" /><Method Id="13" ParentId="11" Name="GetByObjectId"><Parameters><Parameter Type="String">${formatting_1.formatting.escapeXml(args.options.grantId)}</Parameter></Parameters></Method></ObjectPaths></Request>`
                 };
                 const res = yield request_1.default.post(requestOptions);
                 const json = JSON.parse(res);

package/dist/m365/spo/commands/serviceprincipal/serviceprincipal-permissionrequest-approve.js

@@ -17,7 +17,9 @@ var _SpoServicePrincipalPermissionRequestApproveCommand_instances, _SpoServicePr
 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 SpoServicePrincipalPermissionRequestApproveCommand extends SpoCommand_1.default {
@@ -39,17 +41,17 @@ class SpoServicePrincipalPermissionRequestApproveCommand extends SpoCommand_1.de
     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(`Retrieving request digest...`);
                 }
-                const reqDigest = yield utils_1.spo.getRequestDigest(spoAdminUrl);
+                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="16" ObjectPathId="15" /><ObjectPath Id="18" ObjectPathId="17" /><ObjectPath Id="20" ObjectPathId="19" /><ObjectPath Id="22" ObjectPathId="21" /><Query Id="23" ObjectPathId="21"><Query SelectAllProperties="true"><Properties /></Query></Query></Actions><ObjectPaths><Constructor Id="15" TypeId="{104e8f06-1e00-4675-99c6-1b9b504ed8d8}" /><Property Id="17" ParentId="15" Name="PermissionRequests" /><Method Id="19" ParentId="17" Name="GetById"><Parameters><Parameter Type="Guid">{${utils_1.formatting.escapeXml(args.options.requestId)}}</Parameter></Parameters></Method><Method Id="21" ParentId="19" Name="Approve" /></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" /><ObjectPath Id="18" ObjectPathId="17" /><ObjectPath Id="20" ObjectPathId="19" /><ObjectPath Id="22" ObjectPathId="21" /><Query Id="23" ObjectPathId="21"><Query SelectAllProperties="true"><Properties /></Query></Query></Actions><ObjectPaths><Constructor Id="15" TypeId="{104e8f06-1e00-4675-99c6-1b9b504ed8d8}" /><Property Id="17" ParentId="15" Name="PermissionRequests" /><Method Id="19" ParentId="17" Name="GetById"><Parameters><Parameter Type="Guid">{${formatting_1.formatting.escapeXml(args.options.requestId)}}</Parameter></Parameters></Method><Method Id="21" ParentId="19" Name="Approve" /></ObjectPaths></Request>`
                 };
                 const res = yield request_1.default.post(requestOptions);
                 const json = JSON.parse(res);
@@ -75,7 +77,7 @@ _SpoServicePrincipalPermissionRequestApproveCommand_instances = new WeakSet(), _
     });
 }, _SpoServicePrincipalPermissionRequestApproveCommand_initValidators = function _SpoServicePrincipalPermissionRequestApproveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!utils_1.validation.isValidGuid(args.options.requestId)) {
+        if (!validation_1.validation.isValidGuid(args.options.requestId)) {
             return `${args.options.requestId} is not a valid GUID`;
         }
         return true;

package/dist/m365/spo/commands/serviceprincipal/serviceprincipal-permissionrequest-deny.js

@@ -17,7 +17,9 @@ var _SpoServicePrincipalPermissionRequestDenyCommand_instances, _SpoServicePrinc
 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 SpoServicePrincipalPermissionRequestDenyCommand extends SpoCommand_1.default {
@@ -39,17 +41,17 @@ class SpoServicePrincipalPermissionRequestDenyCommand extends SpoCommand_1.defau
     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(`Retrieving request digest...`);
                 }
-                const reqDigest = yield utils_1.spo.getRequestDigest(spoAdminUrl);
+                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="160" ObjectPathId="159" /><ObjectPath Id="162" ObjectPathId="161" /><ObjectPath Id="164" ObjectPathId="163" /><Method Name="Deny" Id="165" ObjectPathId="163" /></Actions><ObjectPaths><Constructor Id="159" TypeId="{104e8f06-1e00-4675-99c6-1b9b504ed8d8}" /><Property Id="161" ParentId="159" Name="PermissionRequests" /><Method Id="163" ParentId="161" Name="GetById"><Parameters><Parameter Type="Guid">{${utils_1.formatting.escapeXml(args.options.requestId)}}</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="160" ObjectPathId="159" /><ObjectPath Id="162" ObjectPathId="161" /><ObjectPath Id="164" ObjectPathId="163" /><Method Name="Deny" Id="165" ObjectPathId="163" /></Actions><ObjectPaths><Constructor Id="159" TypeId="{104e8f06-1e00-4675-99c6-1b9b504ed8d8}" /><Property Id="161" ParentId="159" Name="PermissionRequests" /><Method Id="163" ParentId="161" Name="GetById"><Parameters><Parameter Type="Guid">{${formatting_1.formatting.escapeXml(args.options.requestId)}}</Parameter></Parameters></Method></ObjectPaths></Request>`
                 };
                 const res = yield request_1.default.post(requestOptions);
                 const json = JSON.parse(res);
@@ -70,7 +72,7 @@ _SpoServicePrincipalPermissionRequestDenyCommand_instances = new WeakSet(), _Spo
     });
 }, _SpoServicePrincipalPermissionRequestDenyCommand_initValidators = function _SpoServicePrincipalPermissionRequestDenyCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!utils_1.validation.isValidGuid(args.options.requestId)) {
+        if (!validation_1.validation.isValidGuid(args.options.requestId)) {
             return `${args.options.requestId} is not a valid GUID`;
         }
         return true;

package/dist/m365/spo/commands/serviceprincipal/serviceprincipal-permissionrequest-list.js

@@ -11,7 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 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 SpoServicePrincipalPermissionRequestListCommand extends SpoCommand_1.default {
@@ -27,11 +27,11 @@ class SpoServicePrincipalPermissionRequestListCommand extends SpoCommand_1.defau
     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(`Retrieving request digest...`);
                 }
-                const reqDigest = yield utils_1.spo.getRequestDigest(spoAdminUrl);
+                const reqDigest = yield spo_1.spo.getRequestDigest(spoAdminUrl);
                 const requestOptions = {
                     url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
                     headers: {

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

@@ -15,10 +15,10 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoServicePrincipalSetCommand_instances, _SpoServicePrincipalSetCommand_initTelemetry, _SpoServicePrincipalSetCommand_initOptions, _SpoServicePrincipalSetCommand_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 spo_1 = require("../../../../utils/spo");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoServicePrincipalSetCommand extends SpoCommand_1.default {
@@ -43,8 +43,8 @@ class SpoServicePrincipalSetCommand extends SpoCommand_1.default {
             const enabled = args.options.enabled === 'true';
             const toggleServicePrincipal = () => __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(`${(enabled ? 'Enabling' : 'Disabling')} service principal...`);
                     }
@@ -75,7 +75,7 @@ class SpoServicePrincipalSetCommand extends SpoCommand_1.default {
                 yield toggleServicePrincipal();
             }
             else {
-                const result = yield cli_1.Cli.prompt({
+                const result = yield Cli_1.Cli.prompt({
                     type: 'confirm',
                     name: 'continue',
                     default: false,