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

package/dist/m365/spo/commands/list/list-view-field-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");
@@ -38,18 +39,28 @@ class SpoListViewFieldRemoveCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            const listSelector = args.options.listId ? `(guid'${formatting_1.formatting.encodeQueryParameter(args.options.listId)}')` : `/GetByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.listTitle)}')`;
             const removeFieldFromView = () => __awaiter(this, void 0, void 0, function* () {
                 try {
                     if (this.verbose) {
                         logger.logToStderr(`Getting field ${args.options.id || args.options.title}...`);
                     }
+                    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)}')`;
+                    }
                     const field = yield this.getField(args.options, listSelector);
                     if (this.verbose) {
                         logger.logToStderr(`Removing field ${args.options.id || args.options.title} from view ${args.options.viewId || args.options.viewTitle}...`);
                     }
                     const viewSelector = args.options.viewId ? `('${formatting_1.formatting.encodeQueryParameter(args.options.viewId)}')` : `/GetByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.viewTitle)}')`;
-                    const postRequestUrl = `${args.options.webUrl}/_api/web/lists${listSelector}/views${viewSelector}/viewfields/removeviewfield('${field.InternalName}')`;
+                    const postRequestUrl = `${args.options.webUrl}/_api/web/${listSelector}/views${viewSelector}/viewfields/removeviewfield('${field.InternalName}')`;
                     const postRequestOptions = {
                         url: postRequestUrl,
                         headers: {
@@ -82,7 +93,7 @@ class SpoListViewFieldRemoveCommand extends SpoCommand_1.default {
     }
     getField(options, listSelector) {
         const fieldSelector = options.id ? `/getbyid('${encodeURIComponent(options.id)}')` : `/getbyinternalnameortitle('${encodeURIComponent(options.title)}')`;
-        const getRequestUrl = `${options.webUrl}/_api/web/lists${listSelector}/fields${fieldSelector}`;
+        const getRequestUrl = `${options.webUrl}/_api/web/${listSelector}/fields${fieldSelector}`;
         const requestOptions = {
             url: getRequestUrl,
             headers: {
@@ -98,6 +109,7 @@ _SpoListViewFieldRemoveCommand_instances = new WeakSet(), _SpoListViewFieldRemov
         Object.assign(this.telemetryProperties, {
             listId: typeof args.options.listId !== 'undefined',
             listTitle: typeof args.options.listTitle !== 'undefined',
+            listUrl: typeof args.options.listUrl !== 'undefined',
             viewId: typeof args.options.viewId !== 'undefined',
             viewTitle: typeof args.options.viewTitle !== 'undefined',
             id: typeof args.options.id !== 'undefined',
@@ -112,6 +124,8 @@ _SpoListViewFieldRemoveCommand_instances = new WeakSet(), _SpoListViewFieldRemov
         option: '--listId [listId]'
     }, {
         option: '--listTitle [listTitle]'
+    }, {
+        option: '--listUrl [listUrl]'
     }, {
         option: '--viewId [viewId]'
     }, {
@@ -147,7 +161,7 @@ _SpoListViewFieldRemoveCommand_instances = new WeakSet(), _SpoListViewFieldRemov
         return true;
     }));
 }, _SpoListViewFieldRemoveCommand_initOptionSets = function _SpoListViewFieldRemoveCommand_initOptionSets() {
-    this.optionSets.push(['listId', 'listTitle'], ['viewId', 'viewTitle'], ['id', 'title']);
+    this.optionSets.push(['listId', 'listTitle', 'listUrl'], ['viewId', 'viewTitle'], ['id', 'title']);
 };
 module.exports = new SpoListViewFieldRemoveCommand();
 //# sourceMappingURL=list-view-field-remove.js.map

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

@@ -17,6 +17,7 @@ var _SpoListViewFieldSetCommand_instances, _SpoListViewFieldSetCommand_initTelem
 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");
@@ -37,7 +38,17 @@ class SpoListViewFieldSetCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            const listSelector = args.options.listId ? `(guid'${formatting_1.formatting.encodeQueryParameter(args.options.listId)}')` : `/GetByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.listTitle)}')`;
+            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)}')`;
+            }
             const viewSelector = args.options.viewId ? `('${formatting_1.formatting.encodeQueryParameter(args.options.viewId)}')` : `/GetByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.viewTitle)}')`;
             if (this.verbose) {
                 logger.logToStderr(`Getting field ${args.options.id || args.options.title}...`);
@@ -47,7 +58,7 @@ class SpoListViewFieldSetCommand extends SpoCommand_1.default {
                 if (this.verbose) {
                     logger.logToStderr(`Moving the field ${args.options.id || args.options.title} in view ${args.options.viewId || args.options.viewTitle} to position ${args.options.position}...`);
                 }
-                const moveRequestUrl = `${args.options.webUrl}/_api/web/lists${listSelector}/views${viewSelector}/viewfields/moveviewfieldto`;
+                const moveRequestUrl = `${args.options.webUrl}/_api/web/${listSelector}/views${viewSelector}/viewfields/moveviewfieldto`;
                 const moveRequestOptions = {
                     url: moveRequestUrl,
                     headers: {
@@ -68,7 +79,7 @@ class SpoListViewFieldSetCommand extends SpoCommand_1.default {
     }
     getField(options, listSelector) {
         const fieldSelector = options.id ? `/getbyid('${encodeURIComponent(options.id)}')` : `/getbyinternalnameortitle('${encodeURIComponent(options.title)}')`;
-        const getRequestUrl = `${options.webUrl}/_api/web/lists${listSelector}/fields${fieldSelector}`;
+        const getRequestUrl = `${options.webUrl}/_api/web/${listSelector}/fields${fieldSelector}`;
         const requestOptions = {
             url: getRequestUrl,
             headers: {
@@ -84,6 +95,7 @@ _SpoListViewFieldSetCommand_instances = new WeakSet(), _SpoListViewFieldSetComma
         Object.assign(this.telemetryProperties, {
             listId: typeof args.options.listId !== 'undefined',
             listTitle: typeof args.options.listTitle !== 'undefined',
+            listUrl: typeof args.options.listUrl !== 'undefined',
             viewId: typeof args.options.viewId !== 'undefined',
             viewTitle: typeof args.options.viewTitle !== 'undefined',
             id: typeof args.options.id !== 'undefined',
@@ -97,6 +109,8 @@ _SpoListViewFieldSetCommand_instances = new WeakSet(), _SpoListViewFieldSetComma
         option: '--listId [listId]'
     }, {
         option: '--listTitle [listTitle]'
+    }, {
+        option: '--listUrl [listUrl]'
     }, {
         option: '--viewId [viewId]'
     }, {
@@ -136,7 +150,7 @@ _SpoListViewFieldSetCommand_instances = new WeakSet(), _SpoListViewFieldSetComma
         return true;
     }));
 }, _SpoListViewFieldSetCommand_initOptionSets = function _SpoListViewFieldSetCommand_initOptionSets() {
-    this.optionSets.push(['listId', 'listTitle'], ['viewId', 'viewTitle'], ['id', 'title']);
+    this.optionSets.push(['listId', 'listTitle', 'listUrl'], ['viewId', 'viewTitle'], ['id', 'title']);
 };
 module.exports = new SpoListViewFieldSetCommand();
 //# sourceMappingURL=list-view-field-set.js.map

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-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() {
@@ -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-clientsidewebpart-add.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 _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");
@@ -29,6 +29,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;
@@ -362,12 +363,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 +398,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/roledefinition/roledefinition-list.js

@@ -18,7 +18,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
+const base_permissions_1 = require("../../base-permissions");
 const commands_1 = require("../../commands");
+const RoleType_1 = require("./RoleType");
 class SpoRoleDefinitionListCommand extends SpoCommand_1.default {
     constructor() {
         super();
@@ -48,14 +50,25 @@ class SpoRoleDefinitionListCommand extends SpoCommand_1.default {
                 responseType: 'json'
             };
             try {
-                const response = yield request_1.default.get(requestOptions);
-                logger.log(response.value);
+                const res = yield request_1.default.get(requestOptions);
+                const response = this.setFriendlyPermissions(res.value);
+                logger.log(response);
             }
             catch (err) {
                 this.handleRejectedODataJsonPromise(err);
             }
         });
     }
+    setFriendlyPermissions(response) {
+        response.forEach((r) => {
+            const permissions = new base_permissions_1.BasePermissions();
+            permissions.high = r.BasePermissions.High;
+            permissions.low = r.BasePermissions.Low;
+            r.BasePermissionsValue = permissions.parse();
+            r.RoleTypeKindValue = RoleType_1.RoleType[r.RoleTypeKind];
+        });
+        return response;
+    }
 }
 _SpoRoleDefinitionListCommand_instances = new WeakSet(), _SpoRoleDefinitionListCommand_initOptions = function _SpoRoleDefinitionListCommand_initOptions() {
     this.options.unshift({

package/dist/m365/spo/commands/{hubsite/hubsite-theme-sync.js → site/site-hubsite-theme-sync.js}

@@ -13,24 +13,24 @@ 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 _SpoHubSiteThemeSyncCommand_instances, _SpoHubSiteThemeSyncCommand_initOptions, _SpoHubSiteThemeSyncCommand_initValidators;
+var _SpoSiteHubSiteThemeSyncCommand_instances, _SpoSiteHubSiteThemeSyncCommand_initOptions, _SpoSiteHubSiteThemeSyncCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
-class SpoHubSiteThemeSyncCommand extends SpoCommand_1.default {
+class SpoSiteHubSiteThemeSyncCommand extends SpoCommand_1.default {
     constructor() {
         super();
-        _SpoHubSiteThemeSyncCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoHubSiteThemeSyncCommand_instances, "m", _SpoHubSiteThemeSyncCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoHubSiteThemeSyncCommand_instances, "m", _SpoHubSiteThemeSyncCommand_initValidators).call(this);
+        _SpoSiteHubSiteThemeSyncCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoSiteHubSiteThemeSyncCommand_instances, "m", _SpoSiteHubSiteThemeSyncCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoSiteHubSiteThemeSyncCommand_instances, "m", _SpoSiteHubSiteThemeSyncCommand_initValidators).call(this);
     }
     get name() {
-        return commands_1.default.HUBSITE_THEME_SYNC;
+        return commands_1.default.SITE_HUBSITE_THEME_SYNC;
     }
     get description() {
-        return 'Applies any theme updates from the parent hub site.';
+        return 'Applies any theme updates from the hub site the site is connected to.';
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -53,12 +53,12 @@ class SpoHubSiteThemeSyncCommand extends SpoCommand_1.default {
         });
     }
 }
-_SpoHubSiteThemeSyncCommand_instances = new WeakSet(), _SpoHubSiteThemeSyncCommand_initOptions = function _SpoHubSiteThemeSyncCommand_initOptions() {
+_SpoSiteHubSiteThemeSyncCommand_instances = new WeakSet(), _SpoSiteHubSiteThemeSyncCommand_initOptions = function _SpoSiteHubSiteThemeSyncCommand_initOptions() {
     this.options.unshift({
         option: '-u, --webUrl <webUrl>'
     });
-}, _SpoHubSiteThemeSyncCommand_initValidators = function _SpoHubSiteThemeSyncCommand_initValidators() {
+}, _SpoSiteHubSiteThemeSyncCommand_initValidators = function _SpoSiteHubSiteThemeSyncCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return validation_1.validation.isValidSharePointUrl(args.options.webUrl); }));
 };
-module.exports = new SpoHubSiteThemeSyncCommand();
-//# sourceMappingURL=hubsite-theme-sync.js.map
+module.exports = new SpoSiteHubSiteThemeSyncCommand();
+//# sourceMappingURL=site-hubsite-theme-sync.js.map