@pnp/cli-microsoft365 5.8.0 → 5.9.0-beta.005c47a

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

@@ -17,7 +17,9 @@ var _SpoTermSetGetCommand_instances, _SpoTermSetGetCommand_initTelemetry, _SpoTe
 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 SpoTermSetGetCommand extends SpoCommand_1.default {
@@ -38,13 +40,13 @@ class SpoTermSetGetCommand 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 res = yield utils_1.spo.getRequestDigest(spoAdminUrl);
+                const spoAdminUrl = yield spo_1.spo.getSpoAdminUrl(logger, this.debug);
+                const res = yield spo_1.spo.getRequestDigest(spoAdminUrl);
                 if (this.verbose) {
                     logger.logToStderr(`Retrieving taxonomy term set...`);
                 }
-                const termGroupQuery = args.options.termGroupId ? `<Method Id="62" ParentId="60" Name="GetById"><Parameters><Parameter Type="Guid">{${args.options.termGroupId}}</Parameter></Parameters></Method>` : `<Method Id="62" ParentId="60" Name="GetByName"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.termGroupName)}</Parameter></Parameters></Method>`;
-                const termSetQuery = args.options.id ? `<Method Id="67" ParentId="65" Name="GetById"><Parameters><Parameter Type="Guid">{${args.options.id}}</Parameter></Parameters></Method>` : `<Method Id="67" ParentId="65" Name="GetByName"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.name)}</Parameter></Parameters></Method>`;
+                const termGroupQuery = args.options.termGroupId ? `<Method Id="62" ParentId="60" Name="GetById"><Parameters><Parameter Type="Guid">{${args.options.termGroupId}}</Parameter></Parameters></Method>` : `<Method Id="62" ParentId="60" Name="GetByName"><Parameters><Parameter Type="String">${formatting_1.formatting.escapeXml(args.options.termGroupName)}</Parameter></Parameters></Method>`;
+                const termSetQuery = args.options.id ? `<Method Id="67" ParentId="65" Name="GetById"><Parameters><Parameter Type="Guid">{${args.options.id}}</Parameter></Parameters></Method>` : `<Method Id="67" ParentId="65" Name="GetByName"><Parameters><Parameter Type="String">${formatting_1.formatting.escapeXml(args.options.name)}</Parameter></Parameters></Method>`;
                 const requestOptions = {
                     url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
                     headers: {
@@ -94,12 +96,12 @@ _SpoTermSetGetCommand_instances = new WeakSet(), _SpoTermSetGetCommand_initTelem
 }, _SpoTermSetGetCommand_initValidators = function _SpoTermSetGetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         if (args.options.id) {
-            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.termGroupId) {
-            if (!utils_1.validation.isValidGuid(args.options.termGroupId)) {
+            if (!validation_1.validation.isValidGuid(args.options.termGroupId)) {
                 return `${args.options.termGroupId} is not a valid GUID`;
             }
         }

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

@@ -17,7 +17,9 @@ var _SpoTermSetListCommand_instances, _SpoTermSetListCommand_initTelemetry, _Spo
 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 SpoTermSetListCommand extends SpoCommand_1.default {
@@ -41,12 +43,12 @@ class SpoTermSetListCommand 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 res = yield utils_1.spo.getRequestDigest(spoAdminUrl);
+                const spoAdminUrl = yield spo_1.spo.getSpoAdminUrl(logger, this.debug);
+                const res = yield spo_1.spo.getRequestDigest(spoAdminUrl);
                 if (this.verbose) {
                     logger.logToStderr(`Retrieving taxonomy term sets...`);
                 }
-                const query = args.options.termGroupId ? `<Method Id="62" ParentId="60" Name="GetById"><Parameters><Parameter Type="Guid">{${args.options.termGroupId}}</Parameter></Parameters></Method>` : `<Method Id="62" ParentId="60" Name="GetByName"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.termGroupName)}</Parameter></Parameters></Method>`;
+                const query = args.options.termGroupId ? `<Method Id="62" ParentId="60" Name="GetById"><Parameters><Parameter Type="Guid">{${args.options.termGroupId}}</Parameter></Parameters></Method>` : `<Method Id="62" ParentId="60" Name="GetByName"><Parameters><Parameter Type="String">${formatting_1.formatting.escapeXml(args.options.termGroupName)}</Parameter></Parameters></Method>`;
                 const requestOptions = {
                     url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
                     headers: {
@@ -93,7 +95,7 @@ _SpoTermSetListCommand_instances = new WeakSet(), _SpoTermSetListCommand_initTel
 }, _SpoTermSetListCommand_initValidators = function _SpoTermSetListCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         if (args.options.termGroupId) {
-            if (!utils_1.validation.isValidGuid(args.options.termGroupId)) {
+            if (!validation_1.validation.isValidGuid(args.options.termGroupId)) {
                 return `${args.options.termGroupId} is not a valid GUID`;
             }
         }

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

@@ -17,7 +17,9 @@ var _SpoThemeApplyCommand_instances, _SpoThemeApplyCommand_initOptions, _SpoThem
 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");
 const SharePointThemes = {
@@ -47,10 +49,10 @@ class SpoThemeApplyCommand extends SpoCommand_1.default {
         return __awaiter(this, void 0, void 0, function* () {
             const isSharePointTheme = args.options.sharePointTheme ? true : false;
             try {
-                const spoAdminUrl = yield utils_1.spo.getSpoAdminUrl(logger, this.debug);
+                const spoAdminUrl = yield spo_1.spo.getSpoAdminUrl(logger, this.debug);
                 let res = undefined;
                 if (!isSharePointTheme) {
-                    res = yield utils_1.spo.getRequestDigest(spoAdminUrl);
+                    res = yield spo_1.spo.getRequestDigest(spoAdminUrl);
                 }
                 if (this.verbose) {
                     logger.logToStderr(`Applying theme ${args.options.name} to the ${args.options.webUrl} site...`);
@@ -73,7 +75,7 @@ class SpoThemeApplyCommand extends SpoCommand_1.default {
                         headers: {
                             'X-RequestDigest': res.FormDigestValue
                         },
-                        data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="10" ObjectPathId="9" /><Method Name="SetWebTheme" Id="11" ObjectPathId="9"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.name)}</Parameter><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.webUrl)}</Parameter></Parameters></Method></Actions><ObjectPaths><Constructor Id="9" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></ObjectPaths></Request>`
+                        data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="10" ObjectPathId="9" /><Method Name="SetWebTheme" Id="11" ObjectPathId="9"><Parameters><Parameter Type="String">${formatting_1.formatting.escapeXml(args.options.name)}</Parameter><Parameter Type="String">${formatting_1.formatting.escapeXml(args.options.webUrl)}</Parameter></Parameters></Method></Actions><ObjectPaths><Constructor Id="9" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></ObjectPaths></Request>`
                     };
                 }
                 const processQuery = yield request_1.default.post(requestOptions);
@@ -150,7 +152,7 @@ _SpoThemeApplyCommand_instances = new WeakSet(), _SpoThemeApplyCommand_initOptio
     });
 }, _SpoThemeApplyCommand_initValidators = function _SpoThemeApplyCommand_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/theme/theme-get.js

@@ -17,7 +17,8 @@ var _SpoThemeGetCommand_instances, _SpoThemeGetCommand_initOptions;
 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 SpoThemeGetCommand extends SpoCommand_1.default {
@@ -35,8 +36,8 @@ class SpoThemeGetCommand 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 res = yield utils_1.spo.getRequestDigest(spoAdminUrl);
+                const spoAdminUrl = yield spo_1.spo.getSpoAdminUrl(logger, this.debug);
+                const res = yield spo_1.spo.getRequestDigest(spoAdminUrl);
                 if (this.verbose) {
                     logger.logToStderr(`Getting ${args.options.name} theme from tenant...`);
                 }
@@ -45,7 +46,7 @@ class SpoThemeGetCommand extends SpoCommand_1.default {
                     headers: {
                         'X-RequestDigest': res.FormDigestValue
                     },
-                    data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="12" ObjectPathId="11" /><ObjectPath Id="14" ObjectPathId="13" /><Query Id="15" ObjectPathId="13"><Query SelectAllProperties="true"><Properties /></Query></Query></Actions><ObjectPaths><Constructor Id="11" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /><Method Id="13" ParentId="11" Name="GetTenantTheme"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.name)}</Parameter></Parameters></Method></ObjectPaths></Request>`
+                    data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="12" ObjectPathId="11" /><ObjectPath Id="14" ObjectPathId="13" /><Query Id="15" ObjectPathId="13"><Query SelectAllProperties="true"><Properties /></Query></Query></Actions><ObjectPaths><Constructor Id="11" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /><Method Id="13" ParentId="11" Name="GetTenantTheme"><Parameters><Parameter Type="String">${formatting_1.formatting.escapeXml(args.options.name)}</Parameter></Parameters></Method></ObjectPaths></Request>`
                 };
                 const processQuery = yield request_1.default.post(requestOptions);
                 const json = JSON.parse(processQuery);

package/dist/m365/spo/commands/theme/theme-list.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 SpoThemeListCommand extends SpoCommand_1.default {
@@ -26,7 +26,7 @@ class SpoThemeListCommand 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 themes from tenant store...`);
                 }

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

@@ -15,9 +15,9 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoThemeRemoveCommand_instances, _SpoThemeRemoveCommand_initTelemetry, _SpoThemeRemoveCommand_initOptions;
 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 SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoThemeRemoveCommand extends SpoCommand_1.default {
@@ -37,7 +37,7 @@ class SpoThemeRemoveCommand extends SpoCommand_1.default {
         return __awaiter(this, void 0, void 0, function* () {
             const removeTheme = () => __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(`Removing theme from tenant...`);
                     }
@@ -61,7 +61,7 @@ class SpoThemeRemoveCommand extends SpoCommand_1.default {
                 yield removeTheme();
             }
             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/theme/theme-set.js

@@ -17,7 +17,9 @@ var _SpoThemeSetCommand_instances, _SpoThemeSetCommand_initTelemetry, _SpoThemeS
 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 SpoThemeSetCommand extends SpoCommand_1.default {
@@ -37,8 +39,8 @@ class SpoThemeSetCommand 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 res = yield utils_1.spo.getRequestDigest(spoAdminUrl);
+                const spoAdminUrl = yield spo_1.spo.getSpoAdminUrl(logger, this.debug);
+                const res = yield spo_1.spo.getRequestDigest(spoAdminUrl);
                 const palette = JSON.parse(args.options.theme);
                 if (this.debug) {
                     logger.logToStderr('');
@@ -51,7 +53,7 @@ class SpoThemeSetCommand extends SpoCommand_1.default {
                     headers: {
                         'X-RequestDigest': res.FormDigestValue
                     },
-                    data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="10" ObjectPathId="9" /><Method Name="UpdateTenantTheme" Id="11" ObjectPathId="9"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.name)}</Parameter><Parameter Type="String">{"isInverted":${isInverted},"name":"${utils_1.formatting.escapeXml(args.options.name)}","palette":${JSON.stringify(palette)}}</Parameter></Parameters></Method></Actions><ObjectPaths><Constructor Id="9" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}"/></ObjectPaths></Request>`
+                    data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="10" ObjectPathId="9" /><Method Name="UpdateTenantTheme" Id="11" ObjectPathId="9"><Parameters><Parameter Type="String">${formatting_1.formatting.escapeXml(args.options.name)}</Parameter><Parameter Type="String">{"isInverted":${isInverted},"name":"${formatting_1.formatting.escapeXml(args.options.name)}","palette":${JSON.stringify(palette)}}</Parameter></Parameters></Method></Actions><ObjectPaths><Constructor Id="9" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}"/></ObjectPaths></Request>`
                 };
                 const processQuery = yield request_1.default.post(requestOptions);
                 const json = JSON.parse(processQuery);
@@ -83,7 +85,7 @@ _SpoThemeSetCommand_instances = new WeakSet(), _SpoThemeSetCommand_initTelemetry
     });
 }, _SpoThemeSetCommand_initValidators = function _SpoThemeSetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!utils_1.validation.isValidTheme(args.options.theme)) {
+        if (!validation_1.validation.isValidTheme(args.options.theme)) {
             return 'The specified theme is not valid';
         }
         return true;

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

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoUserGetCommand_instances, _SpoUserGetCommand_initTelemetry, _SpoUserGetCommand_initOptions, _SpoUserGetCommand_initValidators, _SpoUserGetCommand_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 SpoUserGetCommand extends SpoCommand_1.default {
@@ -91,7 +91,7 @@ _SpoUserGetCommand_instances = new WeakSet(), _SpoUserGetCommand_initTelemetry =
             typeof args.options.id !== 'number') {
             return `Specified id ${args.options.id} is not a number`;
         }
-        return utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+        return validation_1.validation.isValidSharePointUrl(args.options.webUrl);
     }));
 }, _SpoUserGetCommand_initOptionSets = function _SpoUserGetCommand_initOptionSets() {
     this.optionSets.push(['id', 'email', 'loginName']);

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

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoUserListCommand_instances, _SpoUserListCommand_initOptions, _SpoUserListCommand_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 SpoUserListCommand extends SpoCommand_1.default {
@@ -65,7 +65,7 @@ _SpoUserListCommand_instances = new WeakSet(), _SpoUserListCommand_initOptions =
         option: '-u, --webUrl <webUrl>'
     });
 }, _SpoUserListCommand_initValidators = function _SpoUserListCommand_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 SpoUserListCommand();
 //# sourceMappingURL=user-list.js.map

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

@@ -15,9 +15,9 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoUserRemoveCommand_instances, _SpoUserRemoveCommand_initTelemetry, _SpoUserRemoveCommand_initOptions, _SpoUserRemoveCommand_initValidators, _SpoUserRemoveCommand_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 SpoUserRemoveCommand extends SpoCommand_1.default {
@@ -66,7 +66,7 @@ class SpoUserRemoveCommand extends SpoCommand_1.default {
                 yield removeUser();
             }
             else {
-                const result = yield cli_1.Cli.prompt({
+                const result = yield Cli_1.Cli.prompt({
                     type: 'confirm',
                     name: 'continue',
                     default: false,
@@ -99,7 +99,7 @@ _SpoUserRemoveCommand_instances = new WeakSet(), _SpoUserRemoveCommand_initTelem
     });
 }, _SpoUserRemoveCommand_initValidators = function _SpoUserRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        return utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+        return validation_1.validation.isValidSharePointUrl(args.options.webUrl);
     }));
 }, _SpoUserRemoveCommand_initOptionSets = function _SpoUserRemoveCommand_initOptionSets() {
     this.optionSets.push(['id', 'loginName']);

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

@@ -16,7 +16,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoUserProfileGetCommand_instances, _SpoUserProfileGetCommand_initOptions, _SpoUserProfileGetCommand_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 SpoUserProfileGetCommand extends SpoCommand_1.default {
@@ -35,7 +36,7 @@ class SpoUserProfileGetCommand 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 userName = `i:0#.f|membership|${args.options.userName}`;
                 const requestOptions = {
                     url: `${spoUrl}/_api/SP.UserProfiles.PeopleManager/GetPropertiesFor(accountName=@v)?@v='${encodeURIComponent(`${userName}`)}'`,
@@ -63,7 +64,7 @@ _SpoUserProfileGetCommand_instances = new WeakSet(), _SpoUserProfileGetCommand_i
     });
 }, _SpoUserProfileGetCommand_initValidators = function _SpoUserProfileGetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!utils_1.validation.isValidUserPrincipalName(args.options.userName)) {
+        if (!validation_1.validation.isValidUserPrincipalName(args.options.userName)) {
             return `${args.options.userName} is not a valid user principal name`;
         }
         return true;

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

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoUserProfileSetCommand_instances, _SpoUserProfileSetCommand_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 SpoUserProfileSetCommand extends SpoCommand_1.default {
@@ -34,8 +34,8 @@ class SpoUserProfileSetCommand 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 res = yield utils_1.spo.getRequestDigest(spoUrl);
+                const spoUrl = yield spo_1.spo.getSpoUrl(logger, this.debug);
+                const res = yield spo_1.spo.getRequestDigest(spoUrl);
                 const propertyValue = args.options.propertyValue.split(',').map(o => o.trim());
                 let propertyType = 'SetSingleValueProfileProperty';
                 const data = {

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

@@ -17,7 +17,8 @@ var _SpoWebAddCommand_instances, _SpoWebAddCommand_initTelemetry, _SpoWebAddComm
 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 validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const base_permissions_1 = require("../../base-permissions");
 const commands_1 = require("../../commands");
@@ -43,7 +44,7 @@ class SpoWebAddCommand extends SpoCommand_1.default {
             let siteInfo = null;
             let subsiteFullUrl = '';
             try {
-                const res = yield utils_1.spo.getRequestDigest(args.options.parentWebUrl);
+                const res = yield spo_1.spo.getRequestDigest(args.options.parentWebUrl);
                 const requestOptionsPost = {
                     url: `${args.options.parentWebUrl}/_api/web/webinfos/add`,
                     headers: {
@@ -89,7 +90,7 @@ class SpoWebAddCommand extends SpoCommand_1.default {
                     /// See https://support.office.com/en-us/article/Turn-scripting-capabilities-on-or-off-1f2c515f-5d7e-448a-9fd7-835da935584f
                     /// for the effects of NoScript
                     if (permissions.has(base_permissions_1.PermissionKind.AddAndCustomizePages)) {
-                        const digest = yield utils_1.spo.getRequestDigest(subsiteFullUrl);
+                        const digest = yield spo_1.spo.getRequestDigest(subsiteFullUrl);
                         const requestOptionsQuery = {
                             url: `${subsiteFullUrl}/_vti_bin/client.svc/ProcessQuery`,
                             headers: {
@@ -147,7 +148,7 @@ _SpoWebAddCommand_instances = new WeakSet(), _SpoWebAddCommand_initTelemetry = f
     });
 }, _SpoWebAddCommand_initValidators = function _SpoWebAddCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.parentWebUrl);
+        const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.parentWebUrl);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }

package/dist/m365/spo/commands/web/web-clientsidewebpart-list.js

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoWebClientSideWebPartListCommand_instances, _SpoWebClientSideWebPartListCommand_initOptions, _SpoWebClientSideWebPartListCommand_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 SpoWebClientSideWebPartListCommand extends SpoCommand_1.default {
@@ -71,7 +71,7 @@ _SpoWebClientSideWebPartListCommand_instances = new WeakSet(), _SpoWebClientSide
         option: '-u, --webUrl <webUrl>'
     });
 }, _SpoWebClientSideWebPartListCommand_initValidators = function _SpoWebClientSideWebPartListCommand_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 SpoWebClientSideWebPartListCommand();
 //# sourceMappingURL=web-clientsidewebpart-list.js.map

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

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoWebGetCommand_instances, _SpoWebGetCommand_initTelemetry, _SpoWebGetCommand_initOptions, _SpoWebGetCommand_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 SpoWebGetCommand extends SpoCommand_1.default {
@@ -69,7 +69,7 @@ _SpoWebGetCommand_instances = new WeakSet(), _SpoWebGetCommand_initTelemetry = f
         option: '--withGroups'
     });
 }, _SpoWebGetCommand_initValidators = function _SpoWebGetCommand_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 SpoWebGetCommand();
 //# sourceMappingURL=web-get.js.map

package/dist/m365/spo/commands/web/web-installedlanguage-list.js

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoWebInstalledLanguageListCommand_instances, _SpoWebInstalledLanguageListCommand_initOptions, _SpoWebInstalledLanguageListCommand_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 SpoWebInstalledLanguageListCommand extends SpoCommand_1.default {
@@ -62,7 +62,7 @@ _SpoWebInstalledLanguageListCommand_instances = new WeakSet(), _SpoWebInstalledL
         option: '-u, --webUrl <webUrl>'
     });
 }, _SpoWebInstalledLanguageListCommand_initValidators = function _SpoWebInstalledLanguageListCommand_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 SpoWebInstalledLanguageListCommand();
 //# sourceMappingURL=web-installedlanguage-list.js.map

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

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoWebListCommand_instances, _SpoWebListCommand_initOptions, _SpoWebListCommand_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 SpoWebListCommand extends SpoCommand_1.default {
@@ -66,7 +66,7 @@ _SpoWebListCommand_instances = new WeakSet(), _SpoWebListCommand_initOptions = f
         option: '-u, --webUrl <webUrl>'
     });
 }, _SpoWebListCommand_initValidators = function _SpoWebListCommand_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 SpoWebListCommand();
 //# sourceMappingURL=web-list.js.map

package/dist/m365/spo/commands/web/web-reindex.js

@@ -16,7 +16,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoWebReindexCommand_instances, _SpoWebReindexCommand_initOptions, _SpoWebReindexCommand_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");
 const propertybag_base_1 = require("../propertybag/propertybag-base");
@@ -38,12 +39,12 @@ class SpoWebReindexCommand extends SpoCommand_1.default {
             let requestDigest = '';
             let webIdentityResp;
             try {
-                const res = yield utils_1.spo.getRequestDigest(args.options.webUrl);
+                const res = yield spo_1.spo.getRequestDigest(args.options.webUrl);
                 requestDigest = res.FormDigestValue;
                 if (this.debug) {
                     logger.logToStderr(`Retrieved request digest. Retrieving web identity...`);
                 }
-                const identityResp = yield utils_1.spo.getCurrentWebIdentity(args.options.webUrl, requestDigest);
+                const identityResp = yield spo_1.spo.getCurrentWebIdentity(args.options.webUrl, requestDigest);
                 webIdentityResp = identityResp;
                 if (this.debug) {
                     logger.logToStderr(`Retrieved web identity.`);
@@ -111,7 +112,7 @@ class SpoWebReindexCommand extends SpoCommand_1.default {
                 resolve();
                 return;
             }
-            utils_1.spo
+            spo_1.spo
                 .getFolderIdentity(webIdentityResp.objectIdentity, webUrl, list.RootFolder.ServerRelativeUrl, requestDigest)
                 .then((folderIdentityResp) => {
                 let searchversion = list.RootFolder.Properties.vti_x005f_searchversion || 0;
@@ -129,7 +130,7 @@ _SpoWebReindexCommand_instances = new WeakSet(), _SpoWebReindexCommand_initOptio
         option: '-u, --webUrl <webUrl>'
     });
 }, _SpoWebReindexCommand_initValidators = function _SpoWebReindexCommand_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 SpoWebReindexCommand();
 //# sourceMappingURL=web-reindex.js.map

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

@@ -15,9 +15,9 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoWebRemoveCommand_instances, _SpoWebRemoveCommand_initTelemetry, _SpoWebRemoveCommand_initOptions, _SpoWebRemoveCommand_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 SpoWebRemoveCommand extends SpoCommand_1.default {
@@ -59,7 +59,7 @@ class SpoWebRemoveCommand extends SpoCommand_1.default {
                 yield removeWeb();
             }
             else {
-                const result = yield cli_1.Cli.prompt({
+                const result = yield Cli_1.Cli.prompt({
                     type: 'confirm',
                     name: 'continue',
                     default: false,
@@ -85,7 +85,7 @@ _SpoWebRemoveCommand_instances = new WeakSet(), _SpoWebRemoveCommand_initTelemet
         option: '--confirm'
     });
 }, _SpoWebRemoveCommand_initValidators = function _SpoWebRemoveCommand_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 SpoWebRemoveCommand();
 //# sourceMappingURL=web-remove.js.map

package/dist/m365/spo/commands/web/web-roleassignment-add.js

@@ -15,9 +15,9 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoWebRoleAssignmentAddCommand_instances, _SpoWebRoleAssignmentAddCommand_initTelemetry, _SpoWebRoleAssignmentAddCommand_initOptions, _SpoWebRoleAssignmentAddCommand_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");
 const SpoUserGetCommand = require("../user/user-get");
@@ -86,7 +86,7 @@ class SpoWebRoleAssignmentAddCommand extends SpoCommand_1.default {
             debug: this.debug,
             verbose: this.verbose
         };
-        return cli_1.Cli.executeCommandWithOutput(SpoRoleDefinitionListCommand, { options: Object.assign(Object.assign({}, roleDefinitionListCommandOptions), { _: [] }) })
+        return Cli_1.Cli.executeCommandWithOutput(SpoRoleDefinitionListCommand, { options: Object.assign(Object.assign({}, roleDefinitionListCommandOptions), { _: [] }) })
             .then((output) => {
             const getRoleDefinitionListOutput = JSON.parse(output.stdout);
             const roleDefinitionId = getRoleDefinitionListOutput.find((role) => role.Name === options.roleDefinitionName).Id;
@@ -103,7 +103,7 @@ class SpoWebRoleAssignmentAddCommand extends SpoCommand_1.default {
             debug: this.debug,
             verbose: this.verbose
         };
-        return cli_1.Cli.executeCommandWithOutput(SpoGroupGetCommand, { options: Object.assign(Object.assign({}, groupGetCommandOptions), { _: [] }) })
+        return Cli_1.Cli.executeCommandWithOutput(SpoGroupGetCommand, { options: Object.assign(Object.assign({}, groupGetCommandOptions), { _: [] }) })
             .then((output) => {
             const getGroupOutput = JSON.parse(output.stdout);
             return Promise.resolve(getGroupOutput.Id);
@@ -120,7 +120,7 @@ class SpoWebRoleAssignmentAddCommand extends SpoCommand_1.default {
             debug: this.debug,
             verbose: this.verbose
         };
-        return cli_1.Cli.executeCommandWithOutput(SpoUserGetCommand, { options: Object.assign(Object.assign({}, userGetCommandOptions), { _: [] }) })
+        return Cli_1.Cli.executeCommandWithOutput(SpoUserGetCommand, { options: Object.assign(Object.assign({}, userGetCommandOptions), { _: [] }) })
             .then((output) => {
             const getUserOutput = JSON.parse(output.stdout);
             return Promise.resolve(getUserOutput.Id);
@@ -155,7 +155,7 @@ _SpoWebRoleAssignmentAddCommand_instances = new WeakSet(), _SpoWebRoleAssignment
     });
 }, _SpoWebRoleAssignmentAddCommand_initValidators = function _SpoWebRoleAssignmentAddCommand_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;
         }