@pnp/cli-microsoft365 5.9.0-beta.e941763 → 5.9.0-beta.fd6d022

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

@@ -15,11 +15,14 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoSiteSetCommand_instances, _SpoSiteSetCommand_initTelemetry, _SpoSiteSetCommand_initOptions, _SpoSiteSetCommand_initValidators, _SpoSiteSetCommand_initTypes;
 Object.defineProperty(exports, "__esModule", { value: true });
-const cli_1 = require("../../../../cli");
+const Cli_1 = require("../../../../cli/Cli");
 const Command_1 = require("../../../../Command");
 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 urlUtil_1 = require("../../../../utils/urlUtil");
+const validation_1 = require("../../../../utils/validation");
 const aadO365GroupSetCommand = require("../../../aad/commands/o365group/o365group-set");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
@@ -44,9 +47,9 @@ class SpoSiteSetCommand extends SpoCommand_1.default {
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 this.dots = '';
-                this.tenantId = yield utils_1.spo.getTenantId(logger, this.debug);
-                this.spoAdminUrl = yield utils_1.spo.getSpoAdminUrl(logger, this.debug);
-                this.context = yield utils_1.spo.ensureFormDigest(this.spoAdminUrl, logger, this.context, this.debug);
+                this.tenantId = yield spo_1.spo.getTenantId(logger, this.debug);
+                this.spoAdminUrl = yield spo_1.spo.getSpoAdminUrl(logger, this.debug);
+                this.context = yield spo_1.spo.ensureFormDigest(this.spoAdminUrl, logger, this.context, this.debug);
                 yield this.loadSiteIds(args.options.url, logger);
                 if (this.isGroupConnectedSite()) {
                     yield this.updateGroupConnectedSite(logger, args);
@@ -76,7 +79,7 @@ class SpoSiteSetCommand extends SpoCommand_1.default {
         if (this.debug) {
             logger.logToStderr(`Setting the site its logo...`);
         }
-        const logoUrl = args.options.siteLogoUrl ? utils_1.urlUtil.getServerRelativePath(args.options.url, args.options.siteLogoUrl) : "";
+        const logoUrl = args.options.siteLogoUrl ? urlUtil_1.urlUtil.getServerRelativePath(args.options.url, args.options.siteLogoUrl) : "";
         const requestOptions = {
             url: `${args.options.url}/_api/siteiconmanager/setsitelogo`,
             headers: {
@@ -118,7 +121,7 @@ class SpoSiteSetCommand extends SpoCommand_1.default {
                     return;
                 }
                 setTimeout(() => {
-                    utils_1.spo.waitUntilFinished({
+                    spo_1.spo.waitUntilFinished({
                         operationId: JSON.stringify(operation._ObjectIdentity_),
                         siteUrl: this.spoAdminUrl,
                         resolve,
@@ -158,7 +161,7 @@ class SpoSiteSetCommand extends SpoCommand_1.default {
                 headers: {
                     'X-RequestDigest': this.context.FormDigestValue
                 },
-                data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="48" ObjectPathId="47" /></Actions><ObjectPaths><Method Id="47" ParentId="34" Name="SetSiteAdmin"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(siteUrl)}</Parameter><Parameter Type="String">${utils_1.formatting.escapeXml(principal)}</Parameter><Parameter Type="Boolean">true</Parameter></Parameters></Method><Constructor Id="34" 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="48" ObjectPathId="47" /></Actions><ObjectPaths><Method Id="47" ParentId="34" Name="SetSiteAdmin"><Parameters><Parameter Type="String">${formatting_1.formatting.escapeXml(siteUrl)}</Parameter><Parameter Type="String">${formatting_1.formatting.escapeXml(principal)}</Parameter><Parameter Type="Boolean">true</Parameter></Parameters></Method><Constructor Id="34" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></ObjectPaths></Request>`
             };
             return request_1.default.post(requestOptions)
                 .then((res) => {
@@ -210,7 +213,7 @@ class SpoSiteSetCommand extends SpoCommand_1.default {
             headers: {
                 'X-RequestDigest': this.context.FormDigestValue
             },
-            data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><SetProperty Id="7" ObjectPathId="5" Name="LockState"><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.lockState)}</Parameter></SetProperty><ObjectPath Id="9" ObjectPathId="8" /><ObjectIdentityQuery Id="10" ObjectPathId="5" /><Query Id="11" ObjectPathId="8"><Query SelectAllProperties="true"><Properties /></Query></Query></Actions><ObjectPaths><Method Id="5" ParentId="3" Name="GetSitePropertiesByUrl"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.url)}</Parameter><Parameter Type="Boolean">false</Parameter></Parameters></Method><Method Id="8" ParentId="5" Name="Update" /><Constructor Id="3" 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><SetProperty Id="7" ObjectPathId="5" Name="LockState"><Parameter Type="String">${formatting_1.formatting.escapeXml(args.options.lockState)}</Parameter></SetProperty><ObjectPath Id="9" ObjectPathId="8" /><ObjectIdentityQuery Id="10" ObjectPathId="5" /><Query Id="11" ObjectPathId="8"><Query SelectAllProperties="true"><Properties /></Query></Query></Actions><ObjectPaths><Method Id="5" ParentId="3" Name="GetSitePropertiesByUrl"><Parameters><Parameter Type="String">${formatting_1.formatting.escapeXml(args.options.url)}</Parameter><Parameter Type="Boolean">false</Parameter></Parameters></Method><Method Id="8" ParentId="5" Name="Update" /><Constructor Id="3" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></ObjectPaths></Request>`
         };
         return request_1.default.post(requestOptions);
     }
@@ -250,7 +253,7 @@ class SpoSiteSetCommand extends SpoCommand_1.default {
                     debug: this.debug,
                     verbose: this.verbose
                 };
-                promises.push(cli_1.Cli.executeCommand(aadO365GroupSetCommand, { options: Object.assign(Object.assign({}, commandOptions), { _: [] }) }));
+                promises.push(Cli_1.Cli.executeCommand(aadO365GroupSetCommand, { options: Object.assign(Object.assign({}, commandOptions), { _: [] }) }));
             }
             if (args.options.description) {
                 promises.push(this.setGroupifiedSiteDescription(args.options.description));
@@ -327,7 +330,7 @@ class SpoSiteSetCommand extends SpoCommand_1.default {
         if (!updatedProperties) {
             return Promise.resolve(undefined);
         }
-        return utils_1.spo
+        return spo_1.spo
             .ensureFormDigest(this.spoAdminUrl, logger, this.context, this.debug)
             .then(res => {
             this.context = res;
@@ -338,7 +341,7 @@ class SpoSiteSetCommand extends SpoCommand_1.default {
             const payload = [];
             if (!isGroupConnectedSite) {
                 if (args.options.title) {
-                    payload.push(`<SetProperty Id="${propertyId++}" ObjectPathId="5" Name="Title"><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.title)}</Parameter></SetProperty>`);
+                    payload.push(`<SetProperty Id="${propertyId++}" ObjectPathId="5" Name="Title"><Parameter Type="String">${formatting_1.formatting.escapeXml(args.options.title)}</Parameter></SetProperty>`);
                 }
                 if (args.options.resourceQuota) {
                     payload.push(`<SetProperty Id="${propertyId++}" ObjectPathId="5" Name="UserCodeMaximumLevel"><Parameter Type="Double">${args.options.resourceQuota}</Parameter></SetProperty>`);
@@ -357,7 +360,7 @@ class SpoSiteSetCommand extends SpoCommand_1.default {
                 }
             }
             if (typeof args.options.classification === 'string') {
-                payload.push(`<SetProperty Id="${propertyId++}" ObjectPathId="5" Name="Classification"><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.classification)}</Parameter></SetProperty>`);
+                payload.push(`<SetProperty Id="${propertyId++}" ObjectPathId="5" Name="Classification"><Parameter Type="String">${formatting_1.formatting.escapeXml(args.options.classification)}</Parameter></SetProperty>`);
             }
             if (typeof args.options.disableFlows === 'string') {
                 payload.push(`<SetProperty Id="${propertyId++}" ObjectPathId="5" Name="DisableFlows"><Parameter Type="Boolean">${args.options.disableFlows === 'true'}</Parameter></SetProperty>`);
@@ -395,7 +398,7 @@ class SpoSiteSetCommand extends SpoCommand_1.default {
             debug: this.debug,
             verbose: this.verbose
         };
-        return cli_1.Cli.executeCommand(spoSiteDesignApplyCommand, { options: Object.assign(Object.assign({}, options), { _: [] }) });
+        return Cli_1.Cli.executeCommand(spoSiteDesignApplyCommand, { options: Object.assign(Object.assign({}, options), { _: [] }) });
     }
     loadSiteIds(siteUrl, logger) {
         if (this.debug) {
@@ -505,7 +508,7 @@ _SpoSiteSetCommand_instances = new WeakSet(), _SpoSiteSetCommand_initTelemetry =
     });
 }, _SpoSiteSetCommand_initValidators = function _SpoSiteSetCommand_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;
         }
@@ -532,19 +535,19 @@ _SpoSiteSetCommand_instances = new WeakSet(), _SpoSiteSetCommand_initTelemetry =
             return `${args.options.siteLogoUrl} is not a valid value for the siteLogoUrl option. Specify the logo URL or an empty string "" to unset the logo.`;
         }
         if (typeof args.options.disableFlows === 'string' &&
-            !utils_1.validation.isValidBoolean(args.options.disableFlows)) {
+            !validation_1.validation.isValidBoolean(args.options.disableFlows)) {
             return `${args.options.disableFlows} is not a valid value for the disableFlow option. Allowed values are true|false`;
         }
         if (typeof args.options.isPublic === 'string' &&
-            !utils_1.validation.isValidBoolean(args.options.isPublic)) {
+            !validation_1.validation.isValidBoolean(args.options.isPublic)) {
             return `${args.options.isPublic} is not a valid value for the isPublic option. Allowed values are true|false`;
         }
         if (typeof args.options.shareByEmailEnabled === 'string' &&
-            !utils_1.validation.isValidBoolean(args.options.shareByEmailEnabled)) {
+            !validation_1.validation.isValidBoolean(args.options.shareByEmailEnabled)) {
             return `${args.options.shareByEmailEnabled} is not a valid value for the shareByEmailEnabled option. Allowed values are true|false`;
         }
         if (args.options.siteDesignId) {
-            if (!utils_1.validation.isValidGuid(args.options.siteDesignId)) {
+            if (!validation_1.validation.isValidGuid(args.options.siteDesignId)) {
                 return `${args.options.siteDesignId} is not a valid GUID`;
             }
         }
@@ -579,7 +582,7 @@ _SpoSiteSetCommand_instances = new WeakSet(), _SpoSiteSetCommand_initTelemetry =
             return `storageQuotaWarningLevel must not exceed the storageQuota`;
         }
         if (args.options.allowSelfServiceUpgrade &&
-            !utils_1.validation.isValidBoolean(args.options.allowSelfServiceUpgrade)) {
+            !validation_1.validation.isValidBoolean(args.options.allowSelfServiceUpgrade)) {
             return `${args.options.allowSelfServiceUpgrade} is not a valid boolean value`;
         }
         if (args.options.lockState &&
@@ -587,7 +590,7 @@ _SpoSiteSetCommand_instances = new WeakSet(), _SpoSiteSetCommand_initTelemetry =
             return `${args.options.lockState} is not a valid value for the lockState option. Allowed values Unlock|NoAdditions|ReadOnly|NoAccess`;
         }
         if (args.options.noScriptSite &&
-            !utils_1.validation.isValidBoolean(args.options.noScriptSite)) {
+            !validation_1.validation.isValidBoolean(args.options.noScriptSite)) {
             return `${args.options.noScriptSite} is not a valid boolean value`;
         }
         return true;

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

@@ -16,7 +16,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoSiteDesignAddCommand_instances, _SpoSiteDesignAddCommand_initTelemetry, _SpoSiteDesignAddCommand_initOptions, _SpoSiteDesignAddCommand_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 SpoSiteDesignAddCommand extends SpoCommand_1.default {
@@ -36,8 +37,8 @@ class SpoSiteDesignAddCommand 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 requestDigest = yield utils_1.spo.getRequestDigest(spoUrl);
+                const spoUrl = yield spo_1.spo.getSpoUrl(logger, this.debug);
+                const requestDigest = yield spo_1.spo.getRequestDigest(spoUrl);
                 const info = {
                     Title: args.options.title,
                     WebTemplate: args.options.webTemplate === 'TeamSite' ? '64' : '68',
@@ -111,7 +112,7 @@ _SpoSiteDesignAddCommand_instances = new WeakSet(), _SpoSiteDesignAddCommand_ini
         const siteScripts = args.options.siteScripts.split(',');
         for (let i = 0; i < siteScripts.length; i++) {
             const trimmedId = siteScripts[i].trim();
-            if (!utils_1.validation.isValidGuid(trimmedId)) {
+            if (!validation_1.validation.isValidGuid(trimmedId)) {
                 return `${trimmedId} is not a valid GUID`;
             }
         }

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

@@ -16,7 +16,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoSiteDesignApplyCommand_instances, _SpoSiteDesignApplyCommand_initTelemetry, _SpoSiteDesignApplyCommand_initOptions, _SpoSiteDesignApplyCommand_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 SpoSiteDesignApplyCommand extends SpoCommand_1.default {
@@ -36,7 +37,7 @@ class SpoSiteDesignApplyCommand 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 requestBody = {
                     siteDesignId: args.options.id,
                     webUrl: args.options.webUrl
@@ -80,10 +81,10 @@ _SpoSiteDesignApplyCommand_instances = new WeakSet(), _SpoSiteDesignApplyCommand
     });
 }, _SpoSiteDesignApplyCommand_initValidators = function _SpoSiteDesignApplyCommand_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`;
         }
-        return utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+        return validation_1.validation.isValidSharePointUrl(args.options.webUrl);
     }));
 };
 module.exports = new SpoSiteDesignApplyCommand();

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

@@ -16,7 +16,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoSiteDesignGetCommand_instances, _SpoSiteDesignGetCommand_initTelemetry, _SpoSiteDesignGetCommand_initOptions, _SpoSiteDesignGetCommand_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 SpoSiteDesignGetCommand extends SpoCommand_1.default {
@@ -60,7 +61,7 @@ class SpoSiteDesignGetCommand 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 siteDesignId = yield this.getSiteDesignId(args, spoUrl);
                 const requestOptions = {
                     url: `${spoUrl}/_api/Microsoft.Sharepoint.Utilities.WebTemplateExtensions.SiteScriptUtility.GetSiteDesignMetadata`,
@@ -101,7 +102,7 @@ _SpoSiteDesignGetCommand_instances = new WeakSet(), _SpoSiteDesignGetCommand_ini
         if (!args.options.id && !args.options.title) {
             return 'Specify id or title, one is required';
         }
-        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`;
         }
         return true;

package/dist/m365/spo/commands/sitedesign/sitedesign-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 SpoSiteDesignListCommand extends SpoCommand_1.default {
@@ -26,7 +26,7 @@ class SpoSiteDesignListCommand 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/Microsoft.Sharepoint.Utilities.WebTemplateExtensions.SiteScriptUtility.GetSiteDesigns`,
                     headers: {

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

@@ -15,9 +15,10 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoSiteDesignRemoveCommand_instances, _SpoSiteDesignRemoveCommand_initTelemetry, _SpoSiteDesignRemoveCommand_initOptions, _SpoSiteDesignRemoveCommand_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 SpoSiteDesignRemoveCommand extends SpoCommand_1.default {
@@ -38,8 +39,8 @@ class SpoSiteDesignRemoveCommand extends SpoCommand_1.default {
         return __awaiter(this, void 0, void 0, function* () {
             const removeSiteDesign = () => __awaiter(this, void 0, void 0, function* () {
                 try {
-                    const spoUrl = yield utils_1.spo.getSpoUrl(logger, this.debug);
-                    const requestDigest = yield utils_1.spo.getRequestDigest(spoUrl);
+                    const spoUrl = yield spo_1.spo.getSpoUrl(logger, this.debug);
+                    const requestDigest = yield spo_1.spo.getRequestDigest(spoUrl);
                     const requestOptions = {
                         url: `${spoUrl}/_api/Microsoft.Sharepoint.Utilities.WebTemplateExtensions.SiteScriptUtility.DeleteSiteDesign`,
                         headers: {
@@ -60,7 +61,7 @@ class SpoSiteDesignRemoveCommand extends SpoCommand_1.default {
                 yield removeSiteDesign();
             }
             else {
-                const result = yield cli_1.Cli.prompt({
+                const result = yield Cli_1.Cli.prompt({
                     type: 'confirm',
                     name: 'continue',
                     default: false,
@@ -87,7 +88,7 @@ _SpoSiteDesignRemoveCommand_instances = new WeakSet(), _SpoSiteDesignRemoveComma
     });
 }, _SpoSiteDesignRemoveCommand_initValidators = function _SpoSiteDesignRemoveCommand_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`;
         }
         return true;

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

@@ -16,7 +16,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoSiteDesignRightsGrantCommand_instances, _SpoSiteDesignRightsGrantCommand_initOptions, _SpoSiteDesignRightsGrantCommand_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 SpoSiteDesignRightsGrantCommand extends SpoCommand_1.default {
@@ -35,8 +36,8 @@ class SpoSiteDesignRightsGrantCommand 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 requestDigest = yield utils_1.spo.getRequestDigest(spoUrl);
+                const spoUrl = yield spo_1.spo.getSpoUrl(logger, this.debug);
+                const requestDigest = yield spo_1.spo.getRequestDigest(spoUrl);
                 const grantedRights = '1';
                 const requestOptions = {
                     url: `${spoUrl}/_api/Microsoft.Sharepoint.Utilities.WebTemplateExtensions.SiteScriptUtility.GrantSiteDesignRights`,
@@ -71,7 +72,7 @@ _SpoSiteDesignRightsGrantCommand_instances = new WeakSet(), _SpoSiteDesignRights
     });
 }, _SpoSiteDesignRightsGrantCommand_initValidators = function _SpoSiteDesignRightsGrantCommand_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.rights !== 'View') {

package/dist/m365/spo/commands/sitedesign/sitedesign-rights-list.js

@@ -16,7 +16,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoSiteDesignRightsListCommand_instances, _SpoSiteDesignRightsListCommand_initOptions, _SpoSiteDesignRightsListCommand_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 SpoSiteDesignRightsListCommand extends SpoCommand_1.default {
@@ -35,8 +36,8 @@ class SpoSiteDesignRightsListCommand 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 requestDigest = yield utils_1.spo.getRequestDigest(spoUrl);
+                const spoUrl = yield spo_1.spo.getSpoUrl(logger, this.debug);
+                const requestDigest = yield spo_1.spo.getRequestDigest(spoUrl);
                 const requestOptions = {
                     url: `${spoUrl}/_api/Microsoft.Sharepoint.Utilities.WebTemplateExtensions.SiteScriptUtility.GetSiteDesignRights`,
                     headers: {
@@ -65,7 +66,7 @@ _SpoSiteDesignRightsListCommand_instances = new WeakSet(), _SpoSiteDesignRightsL
     });
 }, _SpoSiteDesignRightsListCommand_initValidators = function _SpoSiteDesignRightsListCommand_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`;
         }
         return true;

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

@@ -15,9 +15,10 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoSiteDesignRightsRevokeCommand_instances, _SpoSiteDesignRightsRevokeCommand_initTelemetry, _SpoSiteDesignRightsRevokeCommand_initOptions, _SpoSiteDesignRightsRevokeCommand_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 SpoSiteDesignRightsRevokeCommand extends SpoCommand_1.default {
@@ -38,8 +39,8 @@ class SpoSiteDesignRightsRevokeCommand extends SpoCommand_1.default {
         return __awaiter(this, void 0, void 0, function* () {
             const revokePermissions = () => __awaiter(this, void 0, void 0, function* () {
                 try {
-                    const spoUrl = yield utils_1.spo.getSpoUrl(logger, this.debug);
-                    const requestDigest = yield utils_1.spo.getRequestDigest(spoUrl);
+                    const spoUrl = yield spo_1.spo.getSpoUrl(logger, this.debug);
+                    const requestDigest = yield spo_1.spo.getRequestDigest(spoUrl);
                     const requestOptions = {
                         url: `${spoUrl}/_api/Microsoft.Sharepoint.Utilities.WebTemplateExtensions.SiteScriptUtility.RevokeSiteDesignRights`,
                         headers: {
@@ -63,7 +64,7 @@ class SpoSiteDesignRightsRevokeCommand extends SpoCommand_1.default {
                 yield revokePermissions();
             }
             else {
-                const result = yield cli_1.Cli.prompt({
+                const result = yield Cli_1.Cli.prompt({
                     type: 'confirm',
                     name: 'continue',
                     default: false,
@@ -92,7 +93,7 @@ _SpoSiteDesignRightsRevokeCommand_instances = new WeakSet(), _SpoSiteDesignRight
     });
 }, _SpoSiteDesignRightsRevokeCommand_initValidators = function _SpoSiteDesignRightsRevokeCommand_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`;
         }
         return true;

package/dist/m365/spo/commands/sitedesign/sitedesign-run-list.js

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoSiteDesignRunListCommand_instances, _SpoSiteDesignRunListCommand_initTelemetry, _SpoSiteDesignRunListCommand_initOptions, _SpoSiteDesignRunListCommand_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 SpoSiteDesignRunListCommand extends SpoCommand_1.default {
@@ -80,12 +80,12 @@ _SpoSiteDesignRunListCommand_instances = new WeakSet(), _SpoSiteDesignRunListCom
     });
 }, _SpoSiteDesignRunListCommand_initValidators = function _SpoSiteDesignRunListCommand_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;
         }
         if (args.options.siteDesignId) {
-            if (!utils_1.validation.isValidGuid(args.options.siteDesignId)) {
+            if (!validation_1.validation.isValidGuid(args.options.siteDesignId)) {
                 return `${args.options.siteDesignId} is not a valid GUID`;
             }
         }

package/dist/m365/spo/commands/sitedesign/sitedesign-run-status-get.js

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoSiteDesignRunStatusGetCommand_instances, _SpoSiteDesignRunStatusGetCommand_initOptions, _SpoSiteDesignRunStatusGetCommand_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 SpoSiteDesignRunStatusGetCommand extends SpoCommand_1.default {
@@ -67,11 +67,11 @@ _SpoSiteDesignRunStatusGetCommand_instances = new WeakSet(), _SpoSiteDesignRunSt
     });
 }, _SpoSiteDesignRunStatusGetCommand_initValidators = function _SpoSiteDesignRunStatusGetCommand_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;
         }
-        if (!utils_1.validation.isValidGuid(args.options.runId)) {
+        if (!validation_1.validation.isValidGuid(args.options.runId)) {
             return `${args.options.runId} is not a valid GUID`;
         }
         return true;

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

@@ -16,7 +16,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoSiteDesignSetCommand_instances, _SpoSiteDesignSetCommand_initTelemetry, _SpoSiteDesignSetCommand_initOptions, _SpoSiteDesignSetCommand_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 SpoSiteDesignSetCommand extends SpoCommand_1.default {
@@ -36,7 +37,7 @@ class SpoSiteDesignSetCommand 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 updateInfo = {
                     Id: args.options.id
                 };
@@ -125,7 +126,7 @@ _SpoSiteDesignSetCommand_instances = new WeakSet(), _SpoSiteDesignSetCommand_ini
     });
 }, _SpoSiteDesignSetCommand_initValidators = function _SpoSiteDesignSetCommand_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.webTemplate &&
@@ -137,7 +138,7 @@ _SpoSiteDesignSetCommand_instances = new WeakSet(), _SpoSiteDesignSetCommand_ini
             const siteScripts = args.options.siteScripts.split(',');
             for (let i = 0; i < siteScripts.length; i++) {
                 const trimmedId = siteScripts[i].trim();
-                if (!utils_1.validation.isValidGuid(trimmedId)) {
+                if (!validation_1.validation.isValidGuid(trimmedId)) {
                     return `${trimmedId} is not a valid GUID`;
                 }
             }

package/dist/m365/spo/commands/sitedesign/sitedesign-task-get.js

@@ -16,7 +16,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoSiteDesignTaskGetCommand_instances, _SpoSiteDesignTaskGetCommand_initOptions, _SpoSiteDesignTaskGetCommand_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 SpoSiteDesignTaskGetCommand extends SpoCommand_1.default {
@@ -35,7 +36,7 @@ class SpoSiteDesignTaskGetCommand 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 requestOptions = {
                     url: `${spoUrl}/_api/Microsoft.Sharepoint.Utilities.WebTemplateExtensions.SiteScriptUtility.GetSiteDesignTask`,
                     headers: {
@@ -63,7 +64,7 @@ _SpoSiteDesignTaskGetCommand_instances = new WeakSet(), _SpoSiteDesignTaskGetCom
     });
 }, _SpoSiteDesignTaskGetCommand_initValidators = function _SpoSiteDesignTaskGetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!utils_1.validation.isValidGuid(args.options.taskId)) {
+        if (!validation_1.validation.isValidGuid(args.options.taskId)) {
             return `${args.options.taskId} is not a valid GUID`;
         }
         return true;

package/dist/m365/spo/commands/sitedesign/sitedesign-task-list.js

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoSiteDesignTaskListCommand_instances, _SpoSiteDesignTaskListCommand_initOptions, _SpoSiteDesignTaskListCommand_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 SpoSiteDesignTaskListCommand extends SpoCommand_1.default {
@@ -59,7 +59,7 @@ _SpoSiteDesignTaskListCommand_instances = new WeakSet(), _SpoSiteDesignTaskListC
         option: '-u, --webUrl <webUrl>'
     });
 }, _SpoSiteDesignTaskListCommand_initValidators = function _SpoSiteDesignTaskListCommand_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 SpoSiteDesignTaskListCommand();
 //# sourceMappingURL=sitedesign-task-list.js.map

package/dist/m365/spo/commands/sitedesign/sitedesign-task-remove.js

@@ -15,9 +15,10 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoSiteDesignTaskRemoveCommand_instances, _SpoSiteDesignTaskRemoveCommand_initTelemetry, _SpoSiteDesignTaskRemoveCommand_initOptions, _SpoSiteDesignTaskRemoveCommand_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 SpoSiteDesignTaskRemoveCommand extends SpoCommand_1.default {
@@ -38,7 +39,7 @@ class SpoSiteDesignTaskRemoveCommand extends SpoCommand_1.default {
         return __awaiter(this, void 0, void 0, function* () {
             const removeSiteDesignTask = () => __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/Microsoft.Sharepoint.Utilities.WebTemplateExtensions.SiteScriptUtility.RemoveSiteDesignTask`,
                         headers: {
@@ -59,7 +60,7 @@ class SpoSiteDesignTaskRemoveCommand extends SpoCommand_1.default {
                 yield removeSiteDesignTask();
             }
             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 @@ _SpoSiteDesignTaskRemoveCommand_instances = new WeakSet(), _SpoSiteDesignTaskRem
     });
 }, _SpoSiteDesignTaskRemoveCommand_initValidators = function _SpoSiteDesignTaskRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!utils_1.validation.isValidGuid(args.options.taskId)) {
+        if (!validation_1.validation.isValidGuid(args.options.taskId)) {
             return `${args.options.taskId} is not a valid GUID`;
         }
         return true;

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

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoSiteScriptAddCommand_instances, _SpoSiteScriptAddCommand_initTelemetry, _SpoSiteScriptAddCommand_initOptions, _SpoSiteScriptAddCommand_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 SpoSiteScriptAddCommand extends SpoCommand_1.default {
@@ -36,8 +36,8 @@ class SpoSiteScriptAddCommand 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 requestDigest = yield utils_1.spo.getRequestDigest(spoUrl);
+                const spoUrl = yield spo_1.spo.getSpoUrl(logger, this.debug);
+                const requestDigest = yield spo_1.spo.getRequestDigest(spoUrl);
                 const requestOptions = {
                     url: `${spoUrl}/_api/Microsoft.Sharepoint.Utilities.WebTemplateExtensions.SiteScriptUtility.CreateSiteScript(Title=@title, Description=@description)?@title='${encodeURIComponent(args.options.title)}'&@description='${encodeURIComponent(args.options.description || '')}'`,
                     headers: {