@pnp/cli-microsoft365 5.9.0 → 6.0.0-beta.063a75a

package/dist/m365/spo/commands/listitem/listitem-roleinheritance-break.js

@@ -15,6 +15,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoListItemRoleInheritanceBreakCommand_instances, _SpoListItemRoleInheritanceBreakCommand_initTelemetry, _SpoListItemRoleInheritanceBreakCommand_initOptions, _SpoListItemRoleInheritanceBreakCommand_initValidators, _SpoListItemRoleInheritanceBreakCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
+const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
 const formatting_1 = require("../../../../utils/formatting");
 const urlUtil_1 = require("../../../../utils/urlUtil");
@@ -37,39 +38,56 @@ class SpoListItemRoleInheritanceBreakCommand extends SpoCommand_1.default {
         return 'Break inheritance of list item';
     }
     commandAction(logger, args) {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             if (this.verbose) {
                 logger.logToStderr(`Breaking role inheritance of list item in site at ${args.options.webUrl}...`);
             }
-            let requestUrl = `${args.options.webUrl}/_api/web`;
-            if (args.options.listId) {
-                requestUrl += `/lists(guid'${formatting_1.formatting.encodeQueryParameter(args.options.listId)}')`;
+            const breakListItemRoleInheritance = () => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    let requestUrl = `${args.options.webUrl}/_api/web`;
+                    if (args.options.listId) {
+                        requestUrl += `/lists(guid'${formatting_1.formatting.encodeQueryParameter(args.options.listId)}')`;
+                    }
+                    else if (args.options.listTitle) {
+                        requestUrl += `/lists/getbytitle('${formatting_1.formatting.encodeQueryParameter(args.options.listTitle)}')`;
+                    }
+                    else if (args.options.listUrl) {
+                        const listServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.listUrl);
+                        requestUrl += `/GetList('${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')`;
+                    }
+                    let keepExistingPermissions = true;
+                    if (args.options.clearExistingPermissions) {
+                        keepExistingPermissions = !args.options.clearExistingPermissions;
+                    }
+                    const requestOptions = {
+                        url: `${requestUrl}/items(${args.options.listItemId})/breakroleinheritance(${keepExistingPermissions})`,
+                        method: 'POST',
+                        headers: {
+                            'accept': 'application/json;odata=nometadata',
+                            'content-type': 'application/json'
+                        },
+                        responseType: 'json'
+                    };
+                    yield request_1.default.post(requestOptions);
+                }
+                catch (err) {
+                    this.handleRejectedODataJsonPromise(err);
+                }
+            });
+            if (args.options.confirm) {
+                yield breakListItemRoleInheritance();
             }
-            else if (args.options.listTitle) {
-                requestUrl += `/lists/getbytitle('${formatting_1.formatting.encodeQueryParameter(args.options.listTitle)}')`;
-            }
-            else if (args.options.listUrl) {
-                const listServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.listUrl);
-                requestUrl += `/GetList('${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')`;
-            }
-            let keepExistingPermissions = true;
-            if (args.options.clearExistingPermissions) {
-                keepExistingPermissions = !args.options.clearExistingPermissions;
-            }
-            const requestOptions = {
-                url: `${requestUrl}/items(${args.options.listItemId})/breakroleinheritance(${keepExistingPermissions})`,
-                method: 'POST',
-                headers: {
-                    'accept': 'application/json;odata=nometadata',
-                    'content-type': 'application/json'
-                },
-                responseType: 'json'
-            };
-            try {
-                yield request_1.default.post(requestOptions);
-            }
-            catch (err) {
-                this.handleRejectedODataJsonPromise(err);
+            else {
+                const result = yield Cli_1.Cli.prompt({
+                    type: 'confirm',
+                    name: 'continue',
+                    default: false,
+                    message: `Are you sure you want to break the role inheritance of ${args.options.listItemId} in list ${(_a = args.options.listId) !== null && _a !== void 0 ? _a : args.options.listTitle}?`
+                });
+                if (result.continue) {
+                    yield breakListItemRoleInheritance();
+                }
             }
         });
     }
@@ -80,7 +98,8 @@ _SpoListItemRoleInheritanceBreakCommand_instances = new WeakSet(), _SpoListItemR
             listId: typeof args.options.listId !== 'undefined',
             listTitle: typeof args.options.listTitle !== 'undefined',
             listUrl: typeof args.options.listUrl !== 'undefined',
-            clearExistingPermissions: args.options.clearExistingPermissions === true
+            clearExistingPermissions: args.options.clearExistingPermissions === true,
+            confirm: (!(!args.options.confirm)).toString()
         });
     });
 }, _SpoListItemRoleInheritanceBreakCommand_initOptions = function _SpoListItemRoleInheritanceBreakCommand_initOptions() {
@@ -96,6 +115,8 @@ _SpoListItemRoleInheritanceBreakCommand_instances = new WeakSet(), _SpoListItemR
         option: '--listUrl [listUrl]'
     }, {
         option: '-c, --clearExistingPermissions'
+    }, {
+        option: '--confirm'
     });
 }, _SpoListItemRoleInheritanceBreakCommand_initValidators = function _SpoListItemRoleInheritanceBreakCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
@@ -112,7 +133,7 @@ _SpoListItemRoleInheritanceBreakCommand_instances = new WeakSet(), _SpoListItemR
         return true;
     }));
 }, _SpoListItemRoleInheritanceBreakCommand_initOptionSets = function _SpoListItemRoleInheritanceBreakCommand_initOptionSets() {
-    this.optionSets.push(['listId', 'listTitle', 'listUrl']);
+    this.optionSets.push({ options: ['listId', 'listTitle', 'listUrl'] });
 };
 module.exports = new SpoListItemRoleInheritanceBreakCommand();
 //# sourceMappingURL=listitem-roleinheritance-break.js.map

package/dist/m365/spo/commands/listitem/listitem-roleinheritance-reset.js

@@ -15,6 +15,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoListItemRoleInheritanceResetCommand_instances, _SpoListItemRoleInheritanceResetCommand_initTelemetry, _SpoListItemRoleInheritanceResetCommand_initOptions, _SpoListItemRoleInheritanceResetCommand_initValidators, _SpoListItemRoleInheritanceResetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
+const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
 const formatting_1 = require("../../../../utils/formatting");
 const urlUtil_1 = require("../../../../utils/urlUtil");
@@ -37,32 +38,52 @@ class SpoListItemRoleInheritanceResetCommand extends SpoCommand_1.default {
         return 'Restores the role inheritance of list item, file, or folder';
     }
     commandAction(logger, args) {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            let requestUrl = `${args.options.webUrl}/_api/web`;
-            if (args.options.listId) {
-                requestUrl += `/lists(guid'${formatting_1.formatting.encodeQueryParameter(args.options.listId)}')`;
+            if (this.verbose) {
+                logger.logToStderr(`Restore role inheritance of list item in site at ${args.options.webUrl}...`);
             }
-            else if (args.options.listTitle) {
-                requestUrl += `/lists/getbytitle('${formatting_1.formatting.encodeQueryParameter(args.options.listTitle)}')`;
+            const resetListItemRoleInheritance = () => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    let requestUrl = `${args.options.webUrl}/_api/web`;
+                    if (args.options.listId) {
+                        requestUrl += `/lists(guid'${formatting_1.formatting.encodeQueryParameter(args.options.listId)}')`;
+                    }
+                    else if (args.options.listTitle) {
+                        requestUrl += `/lists/getbytitle('${formatting_1.formatting.encodeQueryParameter(args.options.listTitle)}')`;
+                    }
+                    else if (args.options.listUrl) {
+                        const listServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.listUrl);
+                        requestUrl += `/GetList('${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')`;
+                    }
+                    const requestOptions = {
+                        url: `${requestUrl}/items(${args.options.listItemId})/resetroleinheritance`,
+                        method: 'POST',
+                        headers: {
+                            'accept': 'application/json;odata=nometadata',
+                            'content-type': 'application/json'
+                        },
+                        responseType: 'json'
+                    };
+                    yield request_1.default.post(requestOptions);
+                }
+                catch (err) {
+                    this.handleRejectedODataJsonPromise(err);
+                }
+            });
+            if (args.options.confirm) {
+                yield resetListItemRoleInheritance();
             }
-            else if (args.options.listUrl) {
-                const listServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.listUrl);
-                requestUrl += `/GetList('${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')`;
-            }
-            const requestOptions = {
-                url: `${requestUrl}/items(${args.options.listItemId})/resetroleinheritance`,
-                method: 'POST',
-                headers: {
-                    'accept': 'application/json;odata=nometadata',
-                    'content-type': 'application/json'
-                },
-                responseType: 'json'
-            };
-            try {
-                yield request_1.default.post(requestOptions);
-            }
-            catch (err) {
-                this.handleRejectedODataJsonPromise(err);
+            else {
+                const result = yield Cli_1.Cli.prompt({
+                    type: 'confirm',
+                    name: 'continue',
+                    default: false,
+                    message: `Are you sure you want to reset the role inheritance of ${args.options.listItemId} in list ${(_a = args.options.listId) !== null && _a !== void 0 ? _a : args.options.listTitle}?`
+                });
+                if (result.continue) {
+                    yield resetListItemRoleInheritance();
+                }
             }
         });
     }
@@ -72,7 +93,8 @@ _SpoListItemRoleInheritanceResetCommand_instances = new WeakSet(), _SpoListItemR
         Object.assign(this.telemetryProperties, {
             listId: typeof args.options.listId !== 'undefined',
             listTitle: typeof args.options.listTitle !== 'undefined',
-            listUrl: typeof args.options.listUrl !== 'undefined'
+            listUrl: typeof args.options.listUrl !== 'undefined',
+            confirm: (!(!args.options.confirm)).toString()
         });
     });
 }, _SpoListItemRoleInheritanceResetCommand_initOptions = function _SpoListItemRoleInheritanceResetCommand_initOptions() {
@@ -86,6 +108,8 @@ _SpoListItemRoleInheritanceResetCommand_instances = new WeakSet(), _SpoListItemR
         option: '--listTitle [listTitle]'
     }, {
         option: '--listUrl [listUrl]'
+    }, {
+        option: '--confirm'
     });
 }, _SpoListItemRoleInheritanceResetCommand_initValidators = function _SpoListItemRoleInheritanceResetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
@@ -102,7 +126,7 @@ _SpoListItemRoleInheritanceResetCommand_instances = new WeakSet(), _SpoListItemR
         return true;
     }));
 }, _SpoListItemRoleInheritanceResetCommand_initOptionSets = function _SpoListItemRoleInheritanceResetCommand_initOptionSets() {
-    this.optionSets.push(['listId', 'listTitle', 'listUrl']);
+    this.optionSets.push({ options: ['listId', 'listTitle', 'listUrl'] });
 };
 module.exports = new SpoListItemRoleInheritanceResetCommand();
 //# sourceMappingURL=listitem-roleinheritance-reset.js.map

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

@@ -322,7 +322,7 @@ _SpoListItemSetCommand_instances = new WeakSet(), _SpoListItemSetCommand_initTel
     this.types.string.push('webUrl', 'listId', 'listTitle', 'listUrl', 'id', 'contentType');
     this.types.boolean.push('systemUpdate');
 }, _SpoListItemSetCommand_initOptionSets = function _SpoListItemSetCommand_initOptionSets() {
-    this.optionSets.push(['listId', 'listTitle', 'listUrl']);
+    this.optionSets.push({ options: ['listId', 'listTitle', 'listUrl'] });
 };
 module.exports = new SpoListItemSetCommand();
 //# sourceMappingURL=listitem-set.js.map

package/dist/m365/spo/commands/navigation/navigation-node-list.js

@@ -15,7 +15,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoNavigationNodeListCommand_instances, _SpoNavigationNodeListCommand_initTelemetry, _SpoNavigationNodeListCommand_initOptions, _SpoNavigationNodeListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
-const request_1 = require("../../../../request");
+const odata_1 = require("../../../../utils/odata");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
@@ -38,16 +38,9 @@ class SpoNavigationNodeListCommand extends SpoCommand_1.default {
             if (this.verbose) {
                 logger.logToStderr(`Retrieving navigation nodes...`);
             }
-            const requestOptions = {
-                url: `${args.options.webUrl}/_api/web/navigation/${args.options.location.toLowerCase()}`,
-                headers: {
-                    accept: 'application/json;odata=nometadata'
-                },
-                responseType: 'json'
-            };
             try {
-                const res = yield request_1.default.get(requestOptions);
-                logger.log(res.value.map(n => {
+                const res = yield odata_1.odata.getAllItems(`${args.options.webUrl}/_api/web/navigation/${args.options.location.toLowerCase()}`);
+                logger.log(res.map(n => {
                     return {
                         Id: n.Id,
                         Title: n.Title,

package/dist/m365/spo/commands/page/Page.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Page = exports.supportedPromoteAs = exports.supportedPageLayouts = void 0;
 const request_1 = require("../../../../request");
+const formatting_1 = require("../../../../utils/formatting");
 const urlUtil_1 = require("../../../../utils/urlUtil");
 const clientsidepages_1 = require("./clientsidepages");
 const pageMethods_1 = require("./pageMethods");
@@ -15,7 +16,7 @@ class Page {
             }
             const pageName = this.getPageNameWithExtension(name);
             const requestOptions = {
-                url: `${webUrl}/_api/web/getfilebyserverrelativeurl('${urlUtil_1.urlUtil.getServerRelativeSiteUrl(webUrl)}/SitePages/${encodeURIComponent(pageName)}')?$expand=ListItemAllFields/ClientSideApplicationId`,
+                url: `${webUrl}/_api/web/getfilebyserverrelativeurl('${urlUtil_1.urlUtil.getServerRelativeSiteUrl(webUrl)}/SitePages/${formatting_1.formatting.encodeQueryParameter(pageName)}')?$expand=ListItemAllFields/ClientSideApplicationId`,
                 headers: {
                     'content-type': 'application/json;charset=utf-8',
                     accept: 'application/json;odata=nometadata'
@@ -47,7 +48,7 @@ class Page {
             }
             const pageName = this.getPageNameWithExtension(name);
             const requestOptions = {
-                url: `${webUrl}/_api/sitepages/pages/GetByUrl('sitepages/${encodeURIComponent(pageName)}')/checkoutpage`,
+                url: `${webUrl}/_api/sitepages/pages/GetByUrl('sitepages/${formatting_1.formatting.encodeQueryParameter(pageName)}')/checkoutpage`,
                 headers: {
                     'accept': 'application/json;odata=nometadata'
                 },

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

@@ -17,6 +17,7 @@ var _SpoPageAddCommand_instances, _SpoPageAddCommand_initTelemetry, _SpoPageAddC
 Object.defineProperty(exports, "__esModule", { value: true });
 const Auth_1 = require("../../../../Auth");
 const request_1 = require("../../../../request");
+const formatting_1 = require("../../../../utils/formatting");
 const spo_1 = require("../../../../utils/spo");
 const urlUtil_1 = require("../../../../utils/urlUtil");
 const validation_1 = require("../../../../utils/validation");
@@ -246,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',

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

@@ -13,11 +13,12 @@ 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 formatting_1 = require("../../../../utils/formatting");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
@@ -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,12 +364,6 @@ _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 && !validation_1.validation.isValidGuid(args.options.webPartId)) {
             return `The webPartId '${args.options.webPartId}' is not a valid GUID`;
         }
@@ -403,6 +399,8 @@ _SpoPageClientSideWebPartAddCommand_instances = new WeakSet(), _SpoPageClientSid
         }
         return validation_1.validation.isValidSharePointUrl(args.options.webUrl);
     }));
+}, _SpoPageClientSideWebPartAddCommand_initOptionSets = function _SpoPageClientSideWebPartAddCommand_initOptionSets() {
+    this.optionSets.push({ options: ['standardWebPart', 'webPartId'] });
 };
 module.exports = new SpoPageClientSideWebPartAddCommand();
 //# sourceMappingURL=page-clientsidewebpart-add.js.map

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

@@ -35,7 +35,7 @@ class SpoPageColumnGetCommand extends SpoCommand_1.default {
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const clientSidePage = yield Page_1.Page.getPage(args.options.name, args.options.webUrl, logger, this.debug, this.verbose);
+                const clientSidePage = yield Page_1.Page.getPage(args.options.pageName, args.options.webUrl, logger, this.debug, this.verbose);
                 const sections = clientSidePage.sections
                     .filter(section => section.order === args.options.section);
                 if (sections.length) {
@@ -64,7 +64,7 @@ _SpoPageColumnGetCommand_instances = new WeakSet(), _SpoPageColumnGetCommand_ini
     this.options.unshift({
         option: '-u, --webUrl <webUrl>'
     }, {
-        option: '-n, --name <name>'
+        option: '-n, --pageName <pageName>'
     }, {
         option: '-s, --section <section>'
     }, {

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

@@ -35,7 +35,7 @@ class SpoPageColumnListCommand extends SpoCommand_1.default {
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const clientSidePage = yield Page_1.Page.getPage(args.options.name, args.options.webUrl, logger, this.debug, this.verbose);
+                const clientSidePage = yield Page_1.Page.getPage(args.options.pageName, args.options.webUrl, logger, this.debug, this.verbose);
                 const sections = clientSidePage.sections
                     .filter(section => section.order === args.options.section);
                 if (sections.length) {
@@ -57,7 +57,7 @@ _SpoPageColumnListCommand_instances = new WeakSet(), _SpoPageColumnListCommand_i
     this.options.unshift({
         option: '-u, --webUrl <webUrl>'
     }, {
-        option: '-n, --name <name>'
+        option: '-n, --pageName <pageName>'
     }, {
         option: '-s, --section <sectionId>'
     });

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

@@ -16,6 +16,7 @@ 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 formatting_1 = require("../../../../utils/formatting");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
@@ -36,12 +37,12 @@ class SpoPageControlGetCommand extends SpoCommand_1.default {
     commandAction(logger, args) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            let pageName = args.options.name;
-            if (args.options.name.indexOf('.aspx') < 0) {
+            let pageName = args.options.pageName;
+            if (args.options.pageName.indexOf('.aspx') < 0) {
                 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'
                 },
@@ -64,7 +65,7 @@ class SpoPageControlGetCommand extends SpoCommand_1.default {
                 }
                 else {
                     if (this.verbose) {
-                        logger.logToStderr(`Control with ID ${args.options.id} not found on page ${args.options.name}`);
+                        logger.logToStderr(`Control with ID ${args.options.id} not found on page ${args.options.pageName}`);
                     }
                 }
             }
@@ -78,7 +79,7 @@ _SpoPageControlGetCommand_instances = new WeakSet(), _SpoPageControlGetCommand_i
     this.options.unshift({
         option: '-i, --id <id>'
     }, {
-        option: '-n, --name <name>'
+        option: '-n, --pageName <pageName>'
     }, {
         option: '-u, --webUrl <webUrl>'
     });

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

@@ -16,6 +16,7 @@ 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 formatting_1 = require("../../../../utils/formatting");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
@@ -38,12 +39,12 @@ class SpoPageControlListCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            let pageName = args.options.name;
-            if (args.options.name.indexOf('.aspx') < 0) {
+            let pageName = args.options.pageName;
+            if (args.options.pageName.indexOf('.aspx') < 0) {
                 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'
                 },
@@ -73,7 +74,7 @@ class SpoPageControlListCommand extends SpoCommand_1.default {
 }
 _SpoPageControlListCommand_instances = new WeakSet(), _SpoPageControlListCommand_initOptions = function _SpoPageControlListCommand_initOptions() {
     this.options.unshift({
-        option: '-n, --name <name>'
+        option: '-n, --pageName <pageName>'
     }, {
         option: '-u, --webUrl <webUrl>'
     });

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

@@ -16,6 +16,7 @@ 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 formatting_1 = require("../../../../utils/formatting");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
@@ -36,13 +37,13 @@ class SpoPageControlSetCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            let pageName = args.options.name;
-            if (args.options.name.indexOf('.aspx') < 0) {
+            let pageName = args.options.pageName;
+            if (args.options.pageName.indexOf('.aspx') < 0) {
                 pageName += '.aspx';
             }
             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': '*',
@@ -151,7 +152,7 @@ _SpoPageControlSetCommand_instances = new WeakSet(), _SpoPageControlSetCommand_i
     this.options.unshift({
         option: '-i, --id <id>'
     }, {
-        option: '-n, --name <name>'
+        option: '-n, --pageName <pageName>'
     }, {
         option: '-u, --webUrl <webUrl>'
     }, {

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

@@ -16,6 +16,7 @@ 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 formatting_1 = require("../../../../utils/formatting");
 const urlUtil_1 = require("../../../../utils/urlUtil");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
@@ -47,7 +48,7 @@ class SpoPageGetCommand extends SpoCommand_1.default {
             }
             try {
                 let requestOptions = {
-                    url: `${args.options.webUrl}/_api/web/getfilebyserverrelativeurl('${urlUtil_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'

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

@@ -16,6 +16,7 @@ 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 formatting_1 = require("../../../../utils/formatting");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
@@ -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'
             },