@pnp/cli-microsoft365 6.0.0-beta.a9609a1 → 6.0.0-beta.aa5918d

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

@@ -17,6 +17,7 @@ var _SpoListViewListCommand_instances, _SpoListViewListCommand_initTelemetry, _S
 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");
 const commands_1 = require("../../commands");
@@ -40,16 +41,16 @@ class SpoListViewListCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (this.verbose) {
-                const list = (args.options.listId ? args.options.listId : args.options.listTitle);
-                logger.logToStderr(`Retrieving views information for list ${list} in site at ${args.options.webUrl}...`);
-            }
-            let requestUrl = '';
+            let requestUrl = `${args.options.webUrl}/_api/web`;
             if (args.options.listId) {
-                requestUrl = `${args.options.webUrl}/_api/web/lists(guid'${formatting_1.formatting.encodeQueryParameter(args.options.listId)}')/views`;
+                requestUrl += `/lists(guid'${formatting_1.formatting.encodeQueryParameter(args.options.listId)}')/views`;
+            }
+            else if (args.options.listTitle) {
+                requestUrl += `/lists/GetByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.listTitle)}')/views`;
             }
-            else {
-                requestUrl = `${args.options.webUrl}/_api/web/lists/GetByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.listTitle)}')/views`;
+            else if (args.options.listUrl) {
+                const listServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.listUrl);
+                requestUrl += `/GetList('${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')/views`;
             }
             const requestOptions = {
                 url: requestUrl,
@@ -72,7 +73,8 @@ _SpoListViewListCommand_instances = new WeakSet(), _SpoListViewListCommand_initT
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             listId: typeof args.options.listId !== 'undefined',
-            listTitle: typeof args.options.listTitle !== 'undefined'
+            listTitle: typeof args.options.listTitle !== 'undefined',
+            listUrl: typeof args.options.listUrl !== 'undefined'
         });
     });
 }, _SpoListViewListCommand_initOptions = function _SpoListViewListCommand_initOptions() {
@@ -82,6 +84,8 @@ _SpoListViewListCommand_instances = new WeakSet(), _SpoListViewListCommand_initT
         option: '-i, --listId [listId]'
     }, {
         option: '-t, --listTitle [listTitle]'
+    }, {
+        option: '--listUrl [listUrl]'
     });
 }, _SpoListViewListCommand_initValidators = function _SpoListViewListCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
@@ -97,7 +101,7 @@ _SpoListViewListCommand_instances = new WeakSet(), _SpoListViewListCommand_initT
         return true;
     }));
 }, _SpoListViewListCommand_initOptionSets = function _SpoListViewListCommand_initOptionSets() {
-    this.optionSets.push(['listId', 'listTitle']);
+    this.optionSets.push(['listId', 'listTitle', 'listUrl']);
 };
 module.exports = new SpoListViewListCommand();
 //# sourceMappingURL=list-view-list.js.map

package/dist/m365/spo/commands/list/list-view-remove.js

@@ -18,6 +18,7 @@ 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");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
@@ -39,14 +40,19 @@ class SpoListViewRemoveCommand extends SpoCommand_1.default {
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             const removeViewFromList = () => __awaiter(this, void 0, void 0, function* () {
-                if (this.verbose) {
-                    const list = (args.options.listId ? args.options.listId : args.options.listTitle);
-                    logger.logToStderr(`Removing view ${args.options.id || args.options.title} from list ${list} in site at ${args.options.webUrl}...`);
+                let listSelector = '';
+                if (args.options.listId) {
+                    listSelector = `lists(guid'${formatting_1.formatting.encodeQueryParameter(args.options.listId)}')`;
+                }
+                else if (args.options.listTitle) {
+                    listSelector = `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);
+                    listSelector = `GetList('${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')`;
                 }
-                let requestUrl = '';
-                const listSelector = args.options.listId ? `(guid'${formatting_1.formatting.encodeQueryParameter(args.options.listId)}')` : `/GetByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.listTitle)}')`;
                 const viewSelector = args.options.id ? `(guid'${formatting_1.formatting.encodeQueryParameter(args.options.id)}')` : `/GetByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.title)}')`;
-                requestUrl = `${args.options.webUrl}/_api/web/lists${listSelector}/views${viewSelector}`;
+                const requestUrl = `${args.options.webUrl}/_api/web/${listSelector}/views${viewSelector}`;
                 const requestOptions = {
                     url: requestUrl,
                     headers: {
@@ -72,7 +78,7 @@ class SpoListViewRemoveCommand extends SpoCommand_1.default {
                     type: 'confirm',
                     name: 'continue',
                     default: false,
-                    message: `Are you sure you want to remove the view ${args.options.id || args.options.title} from the list ${args.options.listId || args.options.listTitle} in site ${args.options.webUrl}?`
+                    message: `Are you sure you want to remove the view ${args.options.id || args.options.title} from the list ${args.options.listId || args.options.listTitle || args.options.listUrl} in site ${args.options.webUrl}?`
                 });
                 if (result.continue) {
                     yield removeViewFromList();
@@ -86,6 +92,7 @@ _SpoListViewRemoveCommand_instances = new WeakSet(), _SpoListViewRemoveCommand_i
         Object.assign(this.telemetryProperties, {
             listId: typeof args.options.listId !== 'undefined',
             listTitle: typeof args.options.listTitle !== 'undefined',
+            listUrl: typeof args.options.listUrl !== 'undefined',
             id: typeof args.options.id !== 'undefined',
             title: typeof args.options.title !== 'undefined',
             confirm: (!(!args.options.confirm)).toString()
@@ -98,6 +105,8 @@ _SpoListViewRemoveCommand_instances = new WeakSet(), _SpoListViewRemoveCommand_i
         option: '--listId [listId]'
     }, {
         option: '--listTitle [listTitle]'
+    }, {
+        option: '--listUrl [listUrl]'
     }, {
         option: '--id [id]'
     }, {
@@ -124,7 +133,7 @@ _SpoListViewRemoveCommand_instances = new WeakSet(), _SpoListViewRemoveCommand_i
         return true;
     }));
 }, _SpoListViewRemoveCommand_initOptionSets = function _SpoListViewRemoveCommand_initOptionSets() {
-    this.optionSets.push(['listId', 'listTitle'], ['id', 'title']);
+    this.optionSets.push(['listId', 'listTitle', 'listUrl'], ['id', 'title']);
 };
 module.exports = new SpoListViewRemoveCommand();
 //# sourceMappingURL=list-view-remove.js.map

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

@@ -17,6 +17,7 @@ var _SpoListViewSetCommand_instances, _SpoListViewSetCommand_initTelemetry, _Spo
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const formatting_1 = require("../../../../utils/formatting");
+const urlUtil_1 = require("../../../../utils/urlUtil");
 const spo_1 = require("../../../../utils/spo");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
@@ -41,15 +42,22 @@ class SpoListViewSetCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            const baseRestUrl = `${args.options.webUrl}/_api/web/lists`;
-            const listRestUrl = args.options.listId ?
-                `(guid'${formatting_1.formatting.encodeQueryParameter(args.options.listId)}')`
-                : `/getByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.listTitle)}')`;
-            const viewRestUrl = `/views/${(args.options.id ? `getById('${formatting_1.formatting.encodeQueryParameter(args.options.id)}')` : `getByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.title)}')`)}`;
+            let listRestUrl = '';
+            if (args.options.listId) {
+                listRestUrl = `lists(guid'${formatting_1.formatting.encodeQueryParameter(args.options.listId)}')`;
+            }
+            else if (args.options.listTitle) {
+                listRestUrl = `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);
+                listRestUrl = `GetList('${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')`;
+            }
+            const viewRestUrl = `/views/${(args.options.id ? `GetById('${formatting_1.formatting.encodeQueryParameter(args.options.id)}')` : `GetByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.title)}')`)}`;
             try {
                 const res = yield spo_1.spo.getRequestDigest(args.options.webUrl);
                 const requestOptions = {
-                    url: `${baseRestUrl}${listRestUrl}${viewRestUrl}`,
+                    url: `${args.options.webUrl}/_api/web/${listRestUrl}${viewRestUrl}`,
                     headers: {
                         'X-RequestDigest': res.FormDigestValue,
                         'content-type': 'application/json;odata=nometadata',
@@ -71,6 +79,7 @@ class SpoListViewSetCommand extends SpoCommand_1.default {
             'webUrl',
             'listId',
             'listTitle',
+            'listUrl',
             'id',
             'title',
             'debug',
@@ -90,6 +99,7 @@ _SpoListViewSetCommand_instances = new WeakSet(), _SpoListViewSetCommand_initTel
         Object.assign(this.telemetryProperties, {
             listId: typeof args.options.listId !== 'undefined',
             listTitle: typeof args.options.listTitle !== 'undefined',
+            listUrl: typeof args.options.listUrl !== 'undefined',
             id: typeof args.options.id !== 'undefined',
             title: typeof args.options.title !== 'undefined'
         });
@@ -101,6 +111,8 @@ _SpoListViewSetCommand_instances = new WeakSet(), _SpoListViewSetCommand_initTel
         option: '--listId [listId]'
     }, {
         option: '--listTitle [listTitle]'
+    }, {
+        option: '--listUrl [listUrl]'
     }, {
         option: '--id [id]'
     }, {
@@ -123,7 +135,7 @@ _SpoListViewSetCommand_instances = new WeakSet(), _SpoListViewSetCommand_initTel
         return true;
     }));
 }, _SpoListViewSetCommand_initOptionSets = function _SpoListViewSetCommand_initOptionSets() {
-    this.optionSets.push(['listId', 'listTitle'], ['id', 'title']);
+    this.optionSets.push(['listId', 'listTitle', 'listUrl'], ['id', 'title']);
 };
 module.exports = new SpoListViewSetCommand();
 //# sourceMappingURL=list-view-set.js.map

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

@@ -53,16 +53,13 @@ class SpoListWebhookSetCommand extends SpoCommand_1.default {
                 const listServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.listUrl);
                 requestUrl += `/GetList('${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')/Subscriptions('${formatting_1.formatting.encodeQueryParameter(args.options.id)}')`;
             }
-            const requestBody = {};
-            if (args.options.notificationUrl) {
-                requestBody.notificationUrl = args.options.notificationUrl;
-            }
-            if (args.options.expirationDateTime) {
-                requestBody.expirationDateTime = args.options.expirationDateTime;
-            }
+            const requestBody = {
+                notificationUrl: args.options.notificationUrl,
+                expirationDateTime: args.options.expirationDateTime,
+                clientState: args.options.clientState
+            };
             const requestOptions = {
                 url: requestUrl,
-                method: 'PATCH',
                 headers: {
                     'accept': 'application/json;odata=nometadata'
                 },
@@ -71,7 +68,6 @@ class SpoListWebhookSetCommand extends SpoCommand_1.default {
             };
             try {
                 yield request_1.default.patch(requestOptions);
-                // REST patch call doesn't return anything
             }
             catch (err) {
                 this.handleRejectedODataJsonPromise(err);
@@ -86,7 +82,8 @@ _SpoListWebhookSetCommand_instances = new WeakSet(), _SpoListWebhookSetCommand_i
             listTitle: typeof args.options.listTitle !== 'undefined',
             listUrl: typeof args.options.listUrl !== 'undefined',
             notificationUrl: typeof args.options.notificationUrl !== 'undefined',
-            expirationDateTime: typeof args.options.expirationDateTime !== 'undefined'
+            expirationDateTime: typeof args.options.expirationDateTime !== 'undefined',
+            clientState: typeof args.options.clientState !== 'undefined'
         });
     });
 }, _SpoListWebhookSetCommand_initOptions = function _SpoListWebhookSetCommand_initOptions() {
@@ -104,6 +101,8 @@ _SpoListWebhookSetCommand_instances = new WeakSet(), _SpoListWebhookSetCommand_i
         option: '-n, --notificationUrl [notificationUrl]'
     }, {
         option: '-e, --expirationDateTime [expirationDateTime]'
+    }, {
+        option: '-c, --clientState [clientState]'
     });
 }, _SpoListWebhookSetCommand_initValidators = function _SpoListWebhookSetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
@@ -119,8 +118,8 @@ _SpoListWebhookSetCommand_instances = new WeakSet(), _SpoListWebhookSetCommand_i
                 return `${args.options.listId} is not a valid GUID`;
             }
         }
-        if (!args.options.notificationUrl && !args.options.expirationDateTime) {
-            return 'Specify notificationUrl, expirationDateTime or both, at least one is required';
+        if (!args.options.notificationUrl && !args.options.expirationDateTime && !args.options.clientState) {
+            return 'Specify notificationUrl, expirationDateTime, clientState or multiple, at least one is required';
         }
         const parsedDateTime = Date.parse(args.options.expirationDateTime);
         if (args.options.expirationDateTime && !(!parsedDateTime) !== true) {

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

@@ -59,7 +59,7 @@ class SpoListItemGetCommand extends SpoCommand_1.default {
             const expandPropertiesArray = propertiesToExpand.filter((item, pos) => propertiesToExpand.indexOf(item) === pos);
             const fieldExpand = expandPropertiesArray.length > 0 ? `&$expand=${expandPropertiesArray.join(",")}` : ``;
             const requestOptions = {
-                url: `${requestUrl}/items(${args.options.id})?$select=${encodeURIComponent(propertiesSelect.join(","))}${fieldExpand}`,
+                url: `${requestUrl}/items(${args.options.id})?$select=${formatting_1.formatting.encodeQueryParameter(propertiesSelect.join(","))}${fieldExpand}`,
                 headers: {
                     'accept': 'application/json;odata=nometadata'
                 },

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

@@ -13,7 +13,7 @@ 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 _SpoListItemListCommand_instances, _SpoListItemListCommand_initTelemetry, _SpoListItemListCommand_initOptions, _SpoListItemListCommand_initValidators, _SpoListItemListCommand_initTypes;
+var _SpoListItemListCommand_instances, _SpoListItemListCommand_initTelemetry, _SpoListItemListCommand_initOptions, _SpoListItemListCommand_initValidators, _SpoListItemListCommand_initOptionSets, _SpoListItemListCommand_initTypes;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const formatting_1 = require("../../../../utils/formatting");
@@ -29,6 +29,7 @@ class SpoListItemListCommand extends SpoCommand_1.default {
         __classPrivateFieldGet(this, _SpoListItemListCommand_instances, "m", _SpoListItemListCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoListItemListCommand_instances, "m", _SpoListItemListCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoListItemListCommand_instances, "m", _SpoListItemListCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoListItemListCommand_instances, "m", _SpoListItemListCommand_initOptionSets).call(this);
         __classPrivateFieldGet(this, _SpoListItemListCommand_instances, "m", _SpoListItemListCommand_initTypes).call(this);
     }
     get name() {
@@ -67,7 +68,7 @@ class SpoListItemListCommand extends SpoCommand_1.default {
                 let res;
                 if (args.options.pageNumber && Number(args.options.pageNumber) > 0) {
                     const rowLimit = `$top=${Number(args.options.pageSize) * Number(args.options.pageNumber)}`;
-                    const filter = args.options.filter ? `$filter=${encodeURIComponent(args.options.filter)}` : ``;
+                    const filter = args.options.filter ? `$filter=${formatting_1.formatting.encodeQueryParameter(args.options.filter)}` : ``;
                     const fieldSelect = `?$select=Id&${rowLimit}&${filter}`;
                     const requestOptions = {
                         url: `${requestUrl}/items${fieldSelect}`,
@@ -82,10 +83,10 @@ class SpoListItemListCommand extends SpoCommand_1.default {
                 const skipTokenId = (res && res.value && res.value.length && res.value[res.value.length - 1]) ? res.value[res.value.length - 1].Id : 0;
                 const skipToken = (args.options.pageNumber && Number(args.options.pageNumber) > 0 && skipTokenId > 0) ? `$skiptoken=Paged=TRUE%26p_ID=${res.value[res.value.length - 1].Id}` : ``;
                 const rowLimit = args.options.pageSize ? `$top=${args.options.pageSize}` : ``;
-                const filter = args.options.filter ? `$filter=${encodeURIComponent(args.options.filter)}` : ``;
+                const filter = args.options.filter ? `$filter=${formatting_1.formatting.encodeQueryParameter(args.options.filter)}` : ``;
                 const fieldExpand = expandFieldsArray.length > 0 ? `&$expand=${expandFieldsArray.join(",")}` : ``;
                 const fieldSelect = fieldsArray.length > 0 ?
-                    `?$select=${encodeURIComponent(fieldsArray.join(","))}${fieldExpand}&${rowLimit}&${skipToken}&${filter}` :
+                    `?$select=${formatting_1.formatting.encodeQueryParameter(fieldsArray.join(","))}${fieldExpand}&${rowLimit}&${skipToken}&${filter}` :
                     `?${rowLimit}&${skipToken}&${filter}`;
                 const requestBody = args.options.camlQuery ?
                     {
@@ -152,12 +153,6 @@ _SpoListItemListCommand_instances = new WeakSet(), _SpoListItemListCommand_initT
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }
-        if (!args.options.listId && !args.options.listTitle && !args.options.listUrl) {
-            return `Specify listId or listTitle or listUrl`;
-        }
-        if ([args.options.listId, args.options.listTitle, args.options.listUrl].filter(o => o).length > 1) {
-            return 'Specify listId or listTitle or listUrl but not multiple';
-        }
         if (args.options.camlQuery && args.options.fields) {
             return `Specify camlQuery or fields but not both`;
         }
@@ -181,6 +176,8 @@ _SpoListItemListCommand_instances = new WeakSet(), _SpoListItemListCommand_initT
         }
         return true;
     }));
+}, _SpoListItemListCommand_initOptionSets = function _SpoListItemListCommand_initOptionSets() {
+    this.optionSets.push(['listId', 'listTitle']);
 }, _SpoListItemListCommand_initTypes = function _SpoListItemListCommand_initTypes() {
     this.types.string.push('webUrl', 'camlQuery', 'pageSize', 'pageNumber', 'fields', 'filter');
 };

package/dist/m365/spo/commands/listitem/listitem-roleassignment-remove.js

@@ -13,7 +13,7 @@ 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 _SpoListItemRoleAssignmentRemoveCommand_instances, _SpoListItemRoleAssignmentRemoveCommand_initTelemetry, _SpoListItemRoleAssignmentRemoveCommand_initOptions, _SpoListItemRoleAssignmentRemoveCommand_initValidators;
+var _SpoListItemRoleAssignmentRemoveCommand_instances, _SpoListItemRoleAssignmentRemoveCommand_initTelemetry, _SpoListItemRoleAssignmentRemoveCommand_initOptions, _SpoListItemRoleAssignmentRemoveCommand_initValidators, _SpoListItemRoleAssignmentRemoveCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
@@ -31,6 +31,7 @@ class SpoListItemRoleAssignmentRemoveCommand extends SpoCommand_1.default {
         __classPrivateFieldGet(this, _SpoListItemRoleAssignmentRemoveCommand_instances, "m", _SpoListItemRoleAssignmentRemoveCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoListItemRoleAssignmentRemoveCommand_instances, "m", _SpoListItemRoleAssignmentRemoveCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoListItemRoleAssignmentRemoveCommand_instances, "m", _SpoListItemRoleAssignmentRemoveCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoListItemRoleAssignmentRemoveCommand_instances, "m", _SpoListItemRoleAssignmentRemoveCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.LISTITEM_ROLEASSIGNMENT_REMOVE;
@@ -185,22 +186,10 @@ _SpoListItemRoleAssignmentRemoveCommand_instances = new WeakSet(), _SpoListItemR
         if (args.options.principalId && isNaN(args.options.principalId)) {
             return `Specified principalId ${args.options.principalId} is not a number`;
         }
-        const listOptions = [args.options.listId, args.options.listTitle, args.options.listUrl];
-        if (listOptions.some(item => item !== undefined) && listOptions.filter(item => item !== undefined).length > 1) {
-            return `Specify either list id or title or list url`;
-        }
-        if (listOptions.filter(item => item !== undefined).length === 0) {
-            return `Specify at least list id or title or list url`;
-        }
-        const principalOptions = [args.options.principalId, args.options.upn, args.options.groupName];
-        if (principalOptions.some(item => item !== undefined) && principalOptions.filter(item => item !== undefined).length > 1) {
-            return `Specify either principalId id or upn or groupName`;
-        }
-        if (principalOptions.filter(item => item !== undefined).length === 0) {
-            return `Specify at least principalId id or upn or groupName`;
-        }
         return true;
     }));
+}, _SpoListItemRoleAssignmentRemoveCommand_initOptionSets = function _SpoListItemRoleAssignmentRemoveCommand_initOptionSets() {
+    this.optionSets.push(['listId', 'listTitle', 'listUrl'], ['principalId', 'upn', 'groupName']);
 };
 module.exports = new SpoListItemRoleAssignmentRemoveCommand();
 //# sourceMappingURL=listitem-roleassignment-remove.js.map

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(['standardWebPart', 'webPartId']);
 };
 module.exports = new SpoPageClientSideWebPartAddCommand();
 //# sourceMappingURL=page-clientsidewebpart-add.js.map

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");
@@ -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'
                 },

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");
@@ -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'
                 },

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");
@@ -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': '*',

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'
             },