@pnp/cli-microsoft365 6.0.0-beta.566a6b8 → 6.0.0-beta.5ea1353

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

@@ -17,7 +17,10 @@ var _SpoPageAddCommand_instances, _SpoPageAddCommand_initTelemetry, _SpoPageAddC
 Object.defineProperty(exports, "__esModule", { value: true });
 const Auth_1 = require("../../../../Auth");
 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 SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 const Page_1 = require("./Page");
@@ -41,7 +44,7 @@ class SpoPageAddCommand extends SpoCommand_1.default {
             let requestDigest = '';
             let itemId = '';
             let pageName = args.options.name;
-            const serverRelativeSiteUrl = utils_1.urlUtil.getServerRelativeSiteUrl(args.options.webUrl);
+            const serverRelativeSiteUrl = urlUtil_1.urlUtil.getServerRelativeSiteUrl(args.options.webUrl);
             const fileNameWithoutExtension = pageName.replace('.aspx', '');
             let bannerImageUrl = '';
             let canvasContent1 = '';
@@ -50,7 +53,7 @@ class SpoPageAddCommand extends SpoCommand_1.default {
             let pageId = null;
             const pageDescription = args.options.description || "";
             try {
-                const reqDigest = yield utils_1.spo.getRequestDigest(args.options.webUrl);
+                const reqDigest = yield spo_1.spo.getRequestDigest(args.options.webUrl);
                 requestDigest = reqDigest.FormDigestValue;
                 if (!pageName.endsWith('.aspx')) {
                     pageName += '.aspx';
@@ -244,7 +247,7 @@ class SpoPageAddCommand extends SpoCommand_1.default {
                 }
                 else {
                     requestOptions = {
-                        url: `${args.options.webUrl}/_api/web/getfilebyid('${itemId}')/CheckIn(comment=@a1,checkintype=@a2)?@a1='${encodeURIComponent(args.options.publishMessage || '').replace(/'/g, '%39')}'&@a2=1`,
+                        url: `${args.options.webUrl}/_api/web/getfilebyid('${itemId}')/CheckIn(comment=@a1,checkintype=@a2)?@a1='${formatting_1.formatting.encodeQueryParameter(args.options.publishMessage || '').replace(/'/g, '%39')}'&@a2=1`,
                         headers: {
                             'X-RequestDigest': requestDigest,
                             'content-type': 'application/json;odata=nometadata',
@@ -296,7 +299,7 @@ _SpoPageAddCommand_instances = new WeakSet(), _SpoPageAddCommand_initTelemetry =
     });
 }, _SpoPageAddCommand_initValidators = function _SpoPageAddCommand_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/page/page-clientsidewebpart-add.js

@@ -13,12 +13,13 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _SpoPageClientSideWebPartAddCommand_instances, _SpoPageClientSideWebPartAddCommand_initTelemetry, _SpoPageClientSideWebPartAddCommand_initOptions, _SpoPageClientSideWebPartAddCommand_initValidators;
+var _SpoPageClientSideWebPartAddCommand_instances, _SpoPageClientSideWebPartAddCommand_initTelemetry, _SpoPageClientSideWebPartAddCommand_initOptions, _SpoPageClientSideWebPartAddCommand_initValidators, _SpoPageClientSideWebPartAddCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const util_1 = require("util");
 const uuid_1 = require("uuid");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const formatting_1 = require("../../../../utils/formatting");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 const StandardWebPartTypes_1 = require("../../StandardWebPartTypes");
@@ -29,6 +30,7 @@ class SpoPageClientSideWebPartAddCommand extends SpoCommand_1.default {
         __classPrivateFieldGet(this, _SpoPageClientSideWebPartAddCommand_instances, "m", _SpoPageClientSideWebPartAddCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoPageClientSideWebPartAddCommand_instances, "m", _SpoPageClientSideWebPartAddCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoPageClientSideWebPartAddCommand_instances, "m", _SpoPageClientSideWebPartAddCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoPageClientSideWebPartAddCommand_instances, "m", _SpoPageClientSideWebPartAddCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.PAGE_CLIENTSIDEWEBPART_ADD;
@@ -55,7 +57,7 @@ class SpoPageClientSideWebPartAddCommand extends SpoCommand_1.default {
             }
             try {
                 let requestOptions = {
-                    url: `${args.options.webUrl}/_api/sitepages/pages/GetByUrl('sitepages/${encodeURIComponent(pageFullName)}')`,
+                    url: `${args.options.webUrl}/_api/sitepages/pages/GetByUrl('sitepages/${formatting_1.formatting.encodeQueryParameter(pageFullName)}')`,
                     headers: {
                         'accept': 'application/json;odata=nometadata'
                     },
@@ -64,7 +66,7 @@ class SpoPageClientSideWebPartAddCommand extends SpoCommand_1.default {
                 let page = yield request_1.default.get(requestOptions);
                 if (!page.IsPageCheckedOutToCurrentUser) {
                     const requestOptions = {
-                        url: `${args.options.webUrl}/_api/sitepages/pages/GetByUrl('sitepages/${encodeURIComponent(pageFullName)}')/checkoutpage`,
+                        url: `${args.options.webUrl}/_api/sitepages/pages/GetByUrl('sitepages/${formatting_1.formatting.encodeQueryParameter(pageFullName)}')/checkoutpage`,
                         headers: {
                             'accept': 'application/json;odata=nometadata'
                         },
@@ -215,7 +217,7 @@ class SpoPageClientSideWebPartAddCommand extends SpoCommand_1.default {
                     pageData.CanvasContent1 = JSON.stringify(canvasContent);
                 }
                 requestOptions = {
-                    url: `${args.options.webUrl}/_api/sitepages/pages/GetByUrl('sitepages/${encodeURIComponent(pageFullName)}')/SavePageAsDraft`,
+                    url: `${args.options.webUrl}/_api/sitepages/pages/GetByUrl('sitepages/${formatting_1.formatting.encodeQueryParameter(pageFullName)}')/SavePageAsDraft`,
                     headers: {
                         'X-HTTP-Method': 'MERGE',
                         'IF-MATCH': '*',
@@ -362,13 +364,7 @@ _SpoPageClientSideWebPartAddCommand_instances = new WeakSet(), _SpoPageClientSid
     });
 }, _SpoPageClientSideWebPartAddCommand_initValidators = function _SpoPageClientSideWebPartAddCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!args.options.standardWebPart && !args.options.webPartId) {
-            return 'Specify either the standardWebPart or the webPartId option';
-        }
-        if (args.options.standardWebPart && args.options.webPartId) {
-            return 'Specify either the standardWebPart or the webPartId option but not both';
-        }
-        if (args.options.webPartId && !utils_1.validation.isValidGuid(args.options.webPartId)) {
+        if (args.options.webPartId && !validation_1.validation.isValidGuid(args.options.webPartId)) {
             return `The webPartId '${args.options.webPartId}' is not a valid GUID`;
         }
         if (args.options.standardWebPart && !StandardWebPartTypes_1.StandardWebPartUtils.isValidStandardWebPartType(args.options.standardWebPart)) {
@@ -401,8 +397,10 @@ _SpoPageClientSideWebPartAddCommand_instances = new WeakSet(), _SpoPageClientSid
         if (args.options.column && (!(0, util_1.isNumber)(args.options.column) || args.options.column < 1)) {
             return 'The value of parameter column must be 1 or higher';
         }
-        return utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+        return validation_1.validation.isValidSharePointUrl(args.options.webUrl);
     }));
+}, _SpoPageClientSideWebPartAddCommand_initOptionSets = function _SpoPageClientSideWebPartAddCommand_initOptionSets() {
+    this.optionSets.push(['standardWebPart', 'webPartId']);
 };
 module.exports = new SpoPageClientSideWebPartAddCommand();
 //# sourceMappingURL=page-clientsidewebpart-add.js.map

package/dist/m365/spo/commands/page/page-column-get.js

@@ -15,7 +15,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoPageColumnGetCommand_instances, _SpoPageColumnGetCommand_initOptions, _SpoPageColumnGetCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 const Page_1 = require("./Page");
@@ -78,7 +78,7 @@ _SpoPageColumnGetCommand_instances = new WeakSet(), _SpoPageColumnGetCommand_ini
         if (isNaN(args.options.column)) {
             return `${args.options.column} is not a number`;
         }
-        return utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+        return validation_1.validation.isValidSharePointUrl(args.options.webUrl);
     }));
 };
 module.exports = new SpoPageColumnGetCommand();

package/dist/m365/spo/commands/page/page-column-list.js

@@ -15,7 +15,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoPageColumnListCommand_instances, _SpoPageColumnListCommand_initOptions, _SpoPageColumnListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 const Page_1 = require("./Page");
@@ -66,7 +66,7 @@ _SpoPageColumnListCommand_instances = new WeakSet(), _SpoPageColumnListCommand_i
         if (isNaN(args.options.section)) {
             return `${args.options.section} is not a number`;
         }
-        return utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+        return validation_1.validation.isValidSharePointUrl(args.options.webUrl);
     }));
 };
 module.exports = new SpoPageColumnListCommand();

package/dist/m365/spo/commands/page/page-control-get.js

@@ -16,7 +16,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoPageControlGetCommand_instances, _SpoPageControlGetCommand_initOptions, _SpoPageControlGetCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const formatting_1 = require("../../../../utils/formatting");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 const pageMethods_1 = require("./pageMethods");
@@ -41,7 +42,7 @@ class SpoPageControlGetCommand extends SpoCommand_1.default {
                 pageName += '.aspx';
             }
             const requestOptions = {
-                url: `${args.options.webUrl}/_api/SitePages/Pages/GetByUrl('sitepages/${encodeURIComponent(pageName)}')`,
+                url: `${args.options.webUrl}/_api/SitePages/Pages/GetByUrl('sitepages/${formatting_1.formatting.encodeQueryParameter(pageName)}')`,
                 headers: {
                     accept: 'application/json;odata=nometadata'
                 },
@@ -84,10 +85,10 @@ _SpoPageControlGetCommand_instances = new WeakSet(), _SpoPageControlGetCommand_i
     });
 }, _SpoPageControlGetCommand_initValidators = function _SpoPageControlGetCommand_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 SpoPageControlGetCommand();

package/dist/m365/spo/commands/page/page-control-list.js

@@ -16,7 +16,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoPageControlListCommand_instances, _SpoPageControlListCommand_initOptions, _SpoPageControlListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const formatting_1 = require("../../../../utils/formatting");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 const pageMethods_1 = require("./pageMethods");
@@ -43,7 +44,7 @@ class SpoPageControlListCommand extends SpoCommand_1.default {
                 pageName += '.aspx';
             }
             const requestOptions = {
-                url: `${args.options.webUrl}/_api/SitePages/Pages/GetByUrl('sitepages/${encodeURIComponent(pageName)}')`,
+                url: `${args.options.webUrl}/_api/SitePages/Pages/GetByUrl('sitepages/${formatting_1.formatting.encodeQueryParameter(pageName)}')`,
                 headers: {
                     accept: 'application/json;odata=nometadata'
                 },
@@ -78,7 +79,7 @@ _SpoPageControlListCommand_instances = new WeakSet(), _SpoPageControlListCommand
         option: '-u, --webUrl <webUrl>'
     });
 }, _SpoPageControlListCommand_initValidators = function _SpoPageControlListCommand_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 SpoPageControlListCommand();
 //# sourceMappingURL=page-control-list.js.map

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

@@ -16,7 +16,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoPageControlSetCommand_instances, _SpoPageControlSetCommand_initTelemetry, _SpoPageControlSetCommand_initOptions, _SpoPageControlSetCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const formatting_1 = require("../../../../utils/formatting");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 const Page_1 = require("./Page");
@@ -42,7 +43,7 @@ class SpoPageControlSetCommand extends SpoCommand_1.default {
             }
             try {
                 let requestOptions = {
-                    url: `${args.options.webUrl}/_api/SitePages/Pages/GetByUrl('sitepages/${encodeURIComponent(pageName)}')`,
+                    url: `${args.options.webUrl}/_api/SitePages/Pages/GetByUrl('sitepages/${formatting_1.formatting.encodeQueryParameter(pageName)}')`,
                     headers: {
                         accept: 'application/json;odata=nometadata'
                     },
@@ -122,7 +123,7 @@ class SpoPageControlSetCommand extends SpoCommand_1.default {
                     pageData.CanvasContent1 = JSON.stringify(canvasContent);
                 }
                 requestOptions = {
-                    url: `${args.options.webUrl}/_api/sitepages/pages/GetByUrl('sitepages/${encodeURIComponent(pageName)}')/SavePageAsDraft`,
+                    url: `${args.options.webUrl}/_api/sitepages/pages/GetByUrl('sitepages/${formatting_1.formatting.encodeQueryParameter(pageName)}')/SavePageAsDraft`,
                     headers: {
                         'X-HTTP-Method': 'MERGE',
                         'IF-MATCH': '*',
@@ -161,7 +162,7 @@ _SpoPageControlSetCommand_instances = new WeakSet(), _SpoPageControlSetCommand_i
     });
 }, _SpoPageControlSetCommand_initValidators = function _SpoPageControlSetCommand_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.webPartData && args.options.webPartProperties) {
@@ -183,7 +184,7 @@ _SpoPageControlSetCommand_instances = new WeakSet(), _SpoPageControlSetCommand_i
                 return `Specified webPartData is not a valid JSON string. Input: ${args.options.webPartData}. Error: ${e}`;
             }
         }
-        return utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+        return validation_1.validation.isValidSharePointUrl(args.options.webUrl);
     }));
 };
 module.exports = new SpoPageControlSetCommand();

package/dist/m365/spo/commands/page/page-copy.js

@@ -17,7 +17,7 @@ var _SpoPageCopyCommand_instances, _SpoPageCopyCommand_initTelemetry, _SpoPageCo
 Object.defineProperty(exports, "__esModule", { value: true });
 const chalk = require("chalk");
 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 SpoPageCopyCommand extends SpoCommand_1.default {
@@ -130,7 +130,7 @@ _SpoPageCopyCommand_instances = new WeakSet(), _SpoPageCopyCommand_initTelemetry
         option: '--overwrite'
     });
 }, _SpoPageCopyCommand_initValidators = function _SpoPageCopyCommand_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 SpoPageCopyCommand();
 //# sourceMappingURL=page-copy.js.map

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

@@ -16,7 +16,9 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoPageGetCommand_instances, _SpoPageGetCommand_initOptions, _SpoPageGetCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const formatting_1 = require("../../../../utils/formatting");
+const urlUtil_1 = require("../../../../utils/urlUtil");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoPageGetCommand extends SpoCommand_1.default {
@@ -46,7 +48,7 @@ class SpoPageGetCommand extends SpoCommand_1.default {
             }
             try {
                 let requestOptions = {
-                    url: `${args.options.webUrl}/_api/web/getfilebyserverrelativeurl('${utils_1.urlUtil.getServerRelativeSiteUrl(args.options.webUrl)}/SitePages/${encodeURIComponent(pageName)}')?$expand=ListItemAllFields/ClientSideApplicationId,ListItemAllFields/PageLayoutType,ListItemAllFields/CommentsDisabled`,
+                    url: `${args.options.webUrl}/_api/web/getfilebyserverrelativeurl('${urlUtil_1.urlUtil.getServerRelativeSiteUrl(args.options.webUrl)}/SitePages/${formatting_1.formatting.encodeQueryParameter(pageName)}')?$expand=ListItemAllFields/ClientSideApplicationId,ListItemAllFields/PageLayoutType,ListItemAllFields/CommentsDisabled`,
                     headers: {
                         'content-type': 'application/json;charset=utf-8',
                         accept: 'application/json;odata=nometadata'
@@ -99,7 +101,7 @@ _SpoPageGetCommand_instances = new WeakSet(), _SpoPageGetCommand_initOptions = f
         option: '--metadataOnly'
     });
 }, _SpoPageGetCommand_initValidators = function _SpoPageGetCommand_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 SpoPageGetCommand();
 //# sourceMappingURL=page-get.js.map

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

@@ -16,7 +16,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoPageHeaderSetCommand_instances, _SpoPageHeaderSetCommand_initTelemetry, _SpoPageHeaderSetCommand_initOptions, _SpoPageHeaderSetCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const formatting_1 = require("../../../../utils/formatting");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoPageHeaderSetCommand extends SpoCommand_1.default {
@@ -138,7 +139,7 @@ class SpoPageHeaderSetCommand extends SpoCommand_1.default {
             }
             try {
                 let requestOptions = {
-                    url: `${args.options.webUrl}/_api/sitepages/pages/GetByUrl('sitepages/${encodeURIComponent(pageFullName)}')?$select=IsPageCheckedOutToCurrentUser,Title`,
+                    url: `${args.options.webUrl}/_api/sitepages/pages/GetByUrl('sitepages/${formatting_1.formatting.encodeQueryParameter(pageFullName)}')?$select=IsPageCheckedOutToCurrentUser,Title`,
                     headers: {
                         'accept': 'application/json;odata=nometadata'
                     },
@@ -149,7 +150,7 @@ class SpoPageHeaderSetCommand extends SpoCommand_1.default {
                 let pageData;
                 if (page.IsPageCheckedOutToCurrentUser) {
                     const requestOptions = {
-                        url: `${args.options.webUrl}/_api/sitepages/pages/GetByUrl('sitepages/${encodeURIComponent(pageFullName)}')?$expand=ListItemAllFields`,
+                        url: `${args.options.webUrl}/_api/sitepages/pages/GetByUrl('sitepages/${formatting_1.formatting.encodeQueryParameter(pageFullName)}')?$expand=ListItemAllFields`,
                         headers: {
                             'accept': 'application/json;odata=nometadata'
                         },
@@ -159,7 +160,7 @@ class SpoPageHeaderSetCommand extends SpoCommand_1.default {
                 }
                 else {
                     const requestOptions = {
-                        url: `${args.options.webUrl}/_api/sitepages/pages/GetByUrl('sitepages/${encodeURIComponent(pageFullName)}')/checkoutpage`,
+                        url: `${args.options.webUrl}/_api/sitepages/pages/GetByUrl('sitepages/${formatting_1.formatting.encodeQueryParameter(pageFullName)}')/checkoutpage`,
                         headers: {
                             'accept': 'application/json;odata=nometadata'
                         },
@@ -264,7 +265,7 @@ class SpoPageHeaderSetCommand extends SpoCommand_1.default {
                     requestBody.CanvasContent1 = canvasContent;
                 }
                 requestOptions = {
-                    url: `${args.options.webUrl}/_api/sitepages/pages/GetByUrl('sitepages/${encodeURIComponent(pageFullName)}')/SavePageAsDraft`,
+                    url: `${args.options.webUrl}/_api/sitepages/pages/GetByUrl('sitepages/${formatting_1.formatting.encodeQueryParameter(pageFullName)}')/SavePageAsDraft`,
                     headers: {
                         'X-HTTP-Method': 'MERGE',
                         'IF-MATCH': '*',
@@ -312,7 +313,7 @@ class SpoPageHeaderSetCommand extends SpoCommand_1.default {
             logger.logToStderr(`Retrieving information about the header image...`);
         }
         const requestOptions = {
-            url: `${siteUrl}/_api/web/getfilebyserverrelativeurl('${encodeURIComponent(imageUrl)}')?$select=ListId,UniqueId`,
+            url: `${siteUrl}/_api/web/getfilebyserverrelativeurl('${formatting_1.formatting.encodeQueryParameter(imageUrl)}')?$select=ListId,UniqueId`,
             headers: {
                 accept: 'application/json;odata=nometadata'
             },
@@ -394,7 +395,7 @@ _SpoPageHeaderSetCommand_instances = new WeakSet(), _SpoPageHeaderSetCommand_ini
             args.options.textAlignment !== 'Center') {
             return `${args.options.textAlignment} is not a valid textAlignment value. Allowed values Left|Center`;
         }
-        return utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+        return validation_1.validation.isValidSharePointUrl(args.options.webUrl);
     }));
 };
 module.exports = new SpoPageHeaderSetCommand();

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

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoPageListCommand_instances, _SpoPageListCommand_initOptions, _SpoPageListCommand_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 SpoPageListCommand extends SpoCommand_1.default {
@@ -84,7 +84,7 @@ _SpoPageListCommand_instances = new WeakSet(), _SpoPageListCommand_initOptions =
         option: '-u, --webUrl <webUrl>'
     });
 }, _SpoPageListCommand_initValidators = function _SpoPageListCommand_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 SpoPageListCommand();
 //# sourceMappingURL=page-list.js.map

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

@@ -15,9 +15,11 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoPageRemoveCommand_instances, _SpoPageRemoveCommand_initOptions, _SpoPageRemoveCommand_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 urlUtil_1 = require("../../../../utils/urlUtil");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoPageRemoveCommand extends SpoCommand_1.default {
@@ -39,7 +41,7 @@ class SpoPageRemoveCommand extends SpoCommand_1.default {
             let pageName = args.options.name;
             const removePage = () => __awaiter(this, void 0, void 0, function* () {
                 try {
-                    const reqDigest = yield utils_1.spo.getRequestDigest(args.options.webUrl);
+                    const reqDigest = yield spo_1.spo.getRequestDigest(args.options.webUrl);
                     requestDigest = reqDigest.FormDigestValue;
                     if (!pageName.endsWith('.aspx')) {
                         pageName += '.aspx';
@@ -49,7 +51,7 @@ class SpoPageRemoveCommand extends SpoCommand_1.default {
                     }
                     const requestOptions = {
                         url: `${args.options
-                            .webUrl}/_api/web/getfilebyserverrelativeurl('${utils_1.urlUtil.getServerRelativeSiteUrl(args.options.webUrl)}/sitepages/${pageName}')`,
+                            .webUrl}/_api/web/getfilebyserverrelativeurl('${urlUtil_1.urlUtil.getServerRelativeSiteUrl(args.options.webUrl)}/sitepages/${pageName}')`,
                         headers: {
                             'X-RequestDigest': requestDigest,
                             'X-HTTP-Method': 'DELETE',
@@ -68,7 +70,7 @@ class SpoPageRemoveCommand extends SpoCommand_1.default {
                 yield removePage();
             }
             else {
-                const result = yield cli_1.Cli.prompt({
+                const result = yield Cli_1.Cli.prompt({
                     type: 'confirm',
                     name: 'continue',
                     default: false,
@@ -90,7 +92,7 @@ _SpoPageRemoveCommand_instances = new WeakSet(), _SpoPageRemoveCommand_initOptio
         option: '--confirm'
     });
 }, _SpoPageRemoveCommand_initValidators = function _SpoPageRemoveCommand_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 SpoPageRemoveCommand();
 //# sourceMappingURL=page-remove.js.map

package/dist/m365/spo/commands/page/page-section-add.js

@@ -17,7 +17,8 @@ var _SpoPageSectionAddCommand_instances, _SpoPageSectionAddCommand_initTelemetry
 Object.defineProperty(exports, "__esModule", { value: true });
 const util_1 = require("util");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const formatting_1 = require("../../../../utils/formatting");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 const clientsidepages_1 = require("./clientsidepages");
@@ -47,7 +48,7 @@ class SpoPageSectionAddCommand extends SpoCommand_1.default {
             }
             try {
                 let requestOptions = {
-                    url: `${args.options.webUrl}/_api/sitepages/pages/GetByUrl('sitepages/${encodeURIComponent(pageFullName)}')?$select=CanvasContent1,IsPageCheckedOutToCurrentUser`,
+                    url: `${args.options.webUrl}/_api/sitepages/pages/GetByUrl('sitepages/${formatting_1.formatting.encodeQueryParameter(pageFullName)}')?$select=CanvasContent1,IsPageCheckedOutToCurrentUser`,
                     headers: {
                         'accept': 'application/json;odata=nometadata'
                     },
@@ -57,7 +58,7 @@ class SpoPageSectionAddCommand extends SpoCommand_1.default {
                 canvasContent = JSON.parse(res.CanvasContent1 || "[{\"controlType\":0,\"pageSettingsSlice\":{\"isDefaultDescription\":true,\"isDefaultThumbnail\":true}}]");
                 if (!res.IsPageCheckedOutToCurrentUser) {
                     requestOptions = {
-                        url: `${args.options.webUrl}/_api/sitepages/pages/GetByUrl('sitepages/${encodeURIComponent(pageFullName)}')/checkoutpage`,
+                        url: `${args.options.webUrl}/_api/sitepages/pages/GetByUrl('sitepages/${formatting_1.formatting.encodeQueryParameter(pageFullName)}')/checkoutpage`,
                         headers: {
                             'accept': 'application/json;odata=nometadata'
                         },
@@ -88,7 +89,7 @@ class SpoPageSectionAddCommand extends SpoCommand_1.default {
                 }
                 canvasContent.splice(pos, 0, ...columnsToAdd);
                 requestOptions = {
-                    url: `${args.options.webUrl}/_api/sitepages/pages/GetByUrl('sitepages/${encodeURIComponent(pageFullName)}')/savepage`,
+                    url: `${args.options.webUrl}/_api/sitepages/pages/GetByUrl('sitepages/${formatting_1.formatting.encodeQueryParameter(pageFullName)}')/savepage`,
                     headers: {
                         'accept': 'application/json;odata=nometadata',
                         'content-type': 'application/json;odata=nometadata'
@@ -190,7 +191,7 @@ _SpoPageSectionAddCommand_instances = new WeakSet(), _SpoPageSectionAddCommand_i
                 return 'The value of parameter order must be 1 or higher';
             }
         }
-        return utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+        return validation_1.validation.isValidSharePointUrl(args.options.webUrl);
     }));
 };
 module.exports = new SpoPageSectionAddCommand();

package/dist/m365/spo/commands/page/page-section-get.js

@@ -15,7 +15,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoPageSectionGetCommand_instances, _SpoPageSectionGetCommand_initOptions, _SpoPageSectionGetCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 const Page_1 = require("./Page");
@@ -62,7 +62,7 @@ _SpoPageSectionGetCommand_instances = new WeakSet(), _SpoPageSectionGetCommand_i
         if (isNaN(args.options.section)) {
             return `${args.options.section} is not a number`;
         }
-        return utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+        return validation_1.validation.isValidSharePointUrl(args.options.webUrl);
     }));
 };
 module.exports = new SpoPageSectionGetCommand();

package/dist/m365/spo/commands/page/page-section-list.js

@@ -15,7 +15,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoPageSectionListCommand_instances, _SpoPageSectionListCommand_initOptions, _SpoPageSectionListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 const Page_1 = require("./Page");
@@ -66,7 +66,7 @@ _SpoPageSectionListCommand_instances = new WeakSet(), _SpoPageSectionListCommand
         option: '-n, --pageName <pageName>'
     });
 }, _SpoPageSectionListCommand_initValidators = function _SpoPageSectionListCommand_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 SpoPageSectionListCommand();
 //# sourceMappingURL=page-section-list.js.map

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

@@ -17,7 +17,10 @@ var _SpoPageSetCommand_instances, _SpoPageSetCommand_initTelemetry, _SpoPageSetC
 Object.defineProperty(exports, "__esModule", { value: true });
 const Auth_1 = require("../../../../Auth");
 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 SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 const Page_1 = require("./Page");
@@ -52,10 +55,10 @@ class SpoPageSetCommand extends SpoCommand_1.default {
             if (!pageName.endsWith('.aspx')) {
                 pageName += '.aspx';
             }
-            const serverRelativeFileUrl = `${utils_1.urlUtil.getServerRelativeSiteUrl(args.options.webUrl)}/sitepages/${pageName}`;
+            const serverRelativeFileUrl = `${urlUtil_1.urlUtil.getServerRelativeSiteUrl(args.options.webUrl)}/sitepages/${pageName}`;
             const needsToSavePage = !!args.options.title || !!args.options.description;
             try {
-                const requestDigestResult = yield utils_1.spo.getRequestDigest(args.options.webUrl);
+                const requestDigestResult = yield spo_1.spo.getRequestDigest(args.options.webUrl);
                 const requestDigest = requestDigestResult.FormDigestValue;
                 const page = yield Page_1.Page.checkout(args.options.name, args.options.webUrl, logger, this.debug, this.verbose);
                 if (page) {
@@ -247,7 +250,7 @@ class SpoPageSetCommand extends SpoCommand_1.default {
                 }
                 else {
                     requestOptions = {
-                        url: `${args.options.webUrl}/_api/web/getfilebyserverrelativeurl('${serverRelativeFileUrl}')/CheckIn(comment=@a1,checkintype=@a2)?@a1='${encodeURIComponent(args.options.publishMessage || '').replace(/'/g, '%39')}'&@a2=1`,
+                        url: `${args.options.webUrl}/_api/web/getfilebyserverrelativeurl('${serverRelativeFileUrl}')/CheckIn(comment=@a1,checkintype=@a2)?@a1='${formatting_1.formatting.encodeQueryParameter(args.options.publishMessage || '')}'&@a2=1`,
                         headers: {
                             'X-RequestDigest': requestDigest,
                             'content-type': 'application/json;odata=nometadata',
@@ -301,7 +304,7 @@ _SpoPageSetCommand_instances = new WeakSet(), _SpoPageSetCommand_initTelemetry =
     });
 }, _SpoPageSetCommand_initValidators = function _SpoPageSetCommand_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/page/page-template-list.js

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoPageTemplateListCommand_instances, _SpoPageTemplateListCommand_initOptions, _SpoPageTemplateListCommand_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 SpoPageTemplateListCommand extends SpoCommand_1.default {
@@ -69,7 +69,7 @@ _SpoPageTemplateListCommand_instances = new WeakSet(), _SpoPageTemplateListComma
         option: '-u, --webUrl <webUrl>'
     });
 }, _SpoPageTemplateListCommand_initValidators = function _SpoPageTemplateListCommand_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 SpoPageTemplateListCommand();
 //# sourceMappingURL=page-template-list.js.map