@pnp/cli-microsoft365 5.7.0 → 5.8.0-beta.bc15f2b

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

@@ -37,36 +37,56 @@ class SpoListRoleAssignmentRemoveCommand extends SpoCommand_1.default {
         return 'Removes a role assignment from list permissions';
     }
     commandAction(logger, args, cb) {
-        if (this.verbose) {
-            logger.logToStderr(`Removing role assignment frm list in site at ${args.options.webUrl}...`);
-        }
-        let requestUrl = `${args.options.webUrl}/_api/web/`;
-        if (args.options.listId) {
-            requestUrl += `lists(guid'${utils_1.formatting.encodeQueryParameter(args.options.listId)}')/`;
-        }
-        else if (args.options.listTitle) {
-            requestUrl += `lists/getByTitle('${utils_1.formatting.encodeQueryParameter(args.options.listTitle)}')/`;
-        }
-        else if (args.options.listUrl) {
-            const listServerRelativeUrl = utils_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.listUrl);
-            requestUrl += `GetList('${utils_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')/`;
-        }
-        if (args.options.upn) {
-            this.GetUserPrincipalId(args.options)
-                .then((userPrincipalId) => {
-                args.options.principalId = userPrincipalId;
-                this.RemoveRoleAssignment(requestUrl, logger, args.options, cb);
-            }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
-        }
-        else if (args.options.groupName) {
-            this.GetGroupPrincipalId(args.options)
-                .then((groupPrincipalId) => {
-                args.options.principalId = groupPrincipalId;
+        const removeRoleAssignment = () => {
+            if (this.verbose) {
+                logger.logToStderr(`Removing role assignment from list in site at ${args.options.webUrl}...`);
+            }
+            let requestUrl = `${args.options.webUrl}/_api/web/`;
+            if (args.options.listId) {
+                requestUrl += `lists(guid'${utils_1.formatting.encodeQueryParameter(args.options.listId)}')/`;
+            }
+            else if (args.options.listTitle) {
+                requestUrl += `lists/getByTitle('${utils_1.formatting.encodeQueryParameter(args.options.listTitle)}')/`;
+            }
+            else if (args.options.listUrl) {
+                const listServerRelativeUrl = utils_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.listUrl);
+                requestUrl += `GetList('${utils_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')/`;
+            }
+            if (args.options.upn) {
+                this.GetUserPrincipalId(args.options)
+                    .then((userPrincipalId) => {
+                    args.options.principalId = userPrincipalId;
+                    this.RemoveRoleAssignment(requestUrl, logger, args.options, cb);
+                }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+            }
+            else if (args.options.groupName) {
+                this.GetGroupPrincipalId(args.options)
+                    .then((groupPrincipalId) => {
+                    args.options.principalId = groupPrincipalId;
+                    this.RemoveRoleAssignment(requestUrl, logger, args.options, cb);
+                }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+            }
+            else {
                 this.RemoveRoleAssignment(requestUrl, logger, args.options, cb);
-            }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+            }
+        };
+        if (args.options.confirm) {
+            removeRoleAssignment();
         }
         else {
-            this.RemoveRoleAssignment(requestUrl, logger, args.options, cb);
+            cli_1.Cli.prompt({
+                type: 'confirm',
+                name: 'continue',
+                default: false,
+                message: `Are you sure you want to remove role assignment from list ${args.options.listId || args.options.listTitle} from site ${args.options.webUrl}?`
+            }, (result) => {
+                if (!result.continue) {
+                    cb();
+                }
+                else {
+                    removeRoleAssignment();
+                }
+            });
         }
     }
     RemoveRoleAssignment(requestUrl, logger, options, cb) {
@@ -125,7 +145,8 @@ _SpoListRoleAssignmentRemoveCommand_instances = new WeakSet(), _SpoListRoleAssig
             listUrl: typeof args.options.listUrl !== 'undefined',
             principalId: typeof args.options.principalId !== 'undefined',
             upn: typeof args.options.upn !== 'undefined',
-            groupName: typeof args.options.groupName !== 'undefined'
+            groupName: typeof args.options.groupName !== 'undefined',
+            confirm: (!(!args.options.confirm)).toString()
         });
     });
 }, _SpoListRoleAssignmentRemoveCommand_initOptions = function _SpoListRoleAssignmentRemoveCommand_initOptions() {
@@ -143,6 +164,8 @@ _SpoListRoleAssignmentRemoveCommand_instances = new WeakSet(), _SpoListRoleAssig
         option: '--upn [upn]'
     }, {
         option: '--groupName [groupName]'
+    }, {
+        option: '--confirm'
     });
 }, _SpoListRoleAssignmentRemoveCommand_initValidators = function _SpoListRoleAssignmentRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
@@ -160,10 +183,16 @@ _SpoListRoleAssignmentRemoveCommand_instances = new WeakSet(), _SpoListRoleAssig
         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;
     }));
 };

package/dist/m365/spo/commands/list/list-sitescript-get.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 _SpoListSiteScriptGetCommand_instances, _SpoListSiteScriptGetCommand_initTelemetry, _SpoListSiteScriptGetCommand_initOptions, _SpoListSiteScriptGetCommand_initValidators;
+var _SpoListSiteScriptGetCommand_instances, _SpoListSiteScriptGetCommand_initTelemetry, _SpoListSiteScriptGetCommand_initOptions, _SpoListSiteScriptGetCommand_initValidators, _SpoListSiteScriptGetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const Command_1 = require("../../../../Command");
 const request_1 = require("../../../../request");
@@ -27,6 +27,7 @@ class SpoListSiteScriptGetCommand extends SpoCommand_1.default {
         __classPrivateFieldGet(this, _SpoListSiteScriptGetCommand_instances, "m", _SpoListSiteScriptGetCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoListSiteScriptGetCommand_instances, "m", _SpoListSiteScriptGetCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoListSiteScriptGetCommand_instances, "m", _SpoListSiteScriptGetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoListSiteScriptGetCommand_instances, "m", _SpoListSiteScriptGetCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.LIST_SITESCRIPT_GET;
@@ -116,14 +117,10 @@ _SpoListSiteScriptGetCommand_instances = new WeakSet(), _SpoListSiteScriptGetCom
                 return `${args.options.listId} is not a valid GUID`;
             }
         }
-        if (args.options.listId && args.options.listTitle) {
-            return 'Specify listId or listTitle, but not both';
-        }
-        if (!args.options.listId && !args.options.listTitle) {
-            return 'Specify listId or listTitle, one is required';
-        }
         return true;
     }));
+}, _SpoListSiteScriptGetCommand_initOptionSets = function _SpoListSiteScriptGetCommand_initOptionSets() {
+    this.optionSets.push(['listId', 'listTitle']);
 };
 module.exports = new SpoListSiteScriptGetCommand();
 //# sourceMappingURL=list-sitescript-get.js.map

package/dist/m365/spo/commands/list/list-view-field-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 _SpoListViewFieldAddCommand_instances, _SpoListViewFieldAddCommand_initTelemetry, _SpoListViewFieldAddCommand_initOptions, _SpoListViewFieldAddCommand_initValidators;
+var _SpoListViewFieldAddCommand_instances, _SpoListViewFieldAddCommand_initTelemetry, _SpoListViewFieldAddCommand_initOptions, _SpoListViewFieldAddCommand_initValidators, _SpoListViewFieldAddCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const utils_1 = require("../../../../utils");
@@ -26,6 +26,7 @@ class SpoListViewFieldAddCommand extends SpoCommand_1.default {
         __classPrivateFieldGet(this, _SpoListViewFieldAddCommand_instances, "m", _SpoListViewFieldAddCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoListViewFieldAddCommand_instances, "m", _SpoListViewFieldAddCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoListViewFieldAddCommand_instances, "m", _SpoListViewFieldAddCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoListViewFieldAddCommand_instances, "m", _SpoListViewFieldAddCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.LIST_VIEW_FIELD_ADD;
@@ -158,26 +159,10 @@ _SpoListViewFieldAddCommand_instances = new WeakSet(), _SpoListViewFieldAddComma
                 return `${args.options.fieldPosition} is not a number`;
             }
         }
-        if (args.options.listId && args.options.listTitle) {
-            return 'Specify listId or listTitle, but not both';
-        }
-        if (!args.options.listId && !args.options.listTitle) {
-            return 'Specify listId or listTitle, one is required';
-        }
-        if (args.options.viewId && args.options.viewTitle) {
-            return 'Specify viewId or viewTitle, but not both';
-        }
-        if (!args.options.viewId && !args.options.viewTitle) {
-            return 'Specify viewId or viewTitle, one is required';
-        }
-        if (args.options.fieldId && args.options.fieldTitle) {
-            return 'Specify fieldId or fieldTitle, but not both';
-        }
-        if (!args.options.fieldId && !args.options.fieldTitle) {
-            return 'Specify fieldId or fieldTitle, one is required';
-        }
         return true;
     }));
+}, _SpoListViewFieldAddCommand_initOptionSets = function _SpoListViewFieldAddCommand_initOptionSets() {
+    this.optionSets.push(['listId', 'listTitle'], ['viewId', 'viewTitle'], ['fieldId', 'fieldTitle']);
 };
 module.exports = new SpoListViewFieldAddCommand();
 //# sourceMappingURL=list-view-field-add.js.map

package/dist/m365/spo/commands/list/list-view-field-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 _SpoListViewFieldRemoveCommand_instances, _SpoListViewFieldRemoveCommand_initTelemetry, _SpoListViewFieldRemoveCommand_initOptions, _SpoListViewFieldRemoveCommand_initValidators;
+var _SpoListViewFieldRemoveCommand_instances, _SpoListViewFieldRemoveCommand_initTelemetry, _SpoListViewFieldRemoveCommand_initOptions, _SpoListViewFieldRemoveCommand_initValidators, _SpoListViewFieldRemoveCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const cli_1 = require("../../../../cli");
 const request_1 = require("../../../../request");
@@ -27,6 +27,7 @@ class SpoListViewFieldRemoveCommand extends SpoCommand_1.default {
         __classPrivateFieldGet(this, _SpoListViewFieldRemoveCommand_instances, "m", _SpoListViewFieldRemoveCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoListViewFieldRemoveCommand_instances, "m", _SpoListViewFieldRemoveCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoListViewFieldRemoveCommand_instances, "m", _SpoListViewFieldRemoveCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoListViewFieldRemoveCommand_instances, "m", _SpoListViewFieldRemoveCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.LIST_VIEW_FIELD_REMOVE;
@@ -145,26 +146,10 @@ _SpoListViewFieldRemoveCommand_instances = new WeakSet(), _SpoListViewFieldRemov
                 return `${args.options.viewId} is not a valid GUID`;
             }
         }
-        if (args.options.listId && args.options.listTitle) {
-            return 'Specify listId or listTitle, but not both';
-        }
-        if (!args.options.listId && !args.options.listTitle) {
-            return 'Specify listId or listTitle, one is required';
-        }
-        if (args.options.viewId && args.options.viewTitle) {
-            return 'Specify viewId or viewTitle, but not both';
-        }
-        if (!args.options.viewId && !args.options.viewTitle) {
-            return 'Specify viewId or viewTitle, one is required';
-        }
-        if (args.options.fieldId && args.options.fieldTitle) {
-            return 'Specify fieldId or fieldTitle, but not both';
-        }
-        if (!args.options.fieldId && !args.options.fieldTitle) {
-            return 'Specify fieldId or fieldTitle, one is required';
-        }
         return true;
     }));
+}, _SpoListViewFieldRemoveCommand_initOptionSets = function _SpoListViewFieldRemoveCommand_initOptionSets() {
+    this.optionSets.push(['listId', 'listTitle'], ['viewId', 'viewTitle'], ['fieldId', 'fieldTitle']);
 };
 module.exports = new SpoListViewFieldRemoveCommand();
 //# sourceMappingURL=list-view-field-remove.js.map

package/dist/m365/spo/commands/list/list-view-field-set.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 _SpoListViewFieldSetCommand_instances, _SpoListViewFieldSetCommand_initTelemetry, _SpoListViewFieldSetCommand_initOptions, _SpoListViewFieldSetCommand_initValidators;
+var _SpoListViewFieldSetCommand_instances, _SpoListViewFieldSetCommand_initTelemetry, _SpoListViewFieldSetCommand_initOptions, _SpoListViewFieldSetCommand_initValidators, _SpoListViewFieldSetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const utils_1 = require("../../../../utils");
@@ -26,6 +26,7 @@ class SpoListViewFieldSetCommand extends SpoCommand_1.default {
         __classPrivateFieldGet(this, _SpoListViewFieldSetCommand_instances, "m", _SpoListViewFieldSetCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoListViewFieldSetCommand_instances, "m", _SpoListViewFieldSetCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoListViewFieldSetCommand_instances, "m", _SpoListViewFieldSetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoListViewFieldSetCommand_instances, "m", _SpoListViewFieldSetCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.LIST_VIEW_FIELD_SET;
@@ -128,26 +129,10 @@ _SpoListViewFieldSetCommand_instances = new WeakSet(), _SpoListViewFieldSetComma
         if (isNaN(position)) {
             return `${args.options.fieldPosition} is not a number`;
         }
-        if (args.options.listId && args.options.listTitle) {
-            return 'Specify listId or listTitle, but not both';
-        }
-        if (!args.options.listId && !args.options.listTitle) {
-            return 'Specify listId or listTitle, one is required';
-        }
-        if (args.options.viewId && args.options.viewTitle) {
-            return 'Specify viewId or viewTitle, but not both';
-        }
-        if (!args.options.viewId && !args.options.viewTitle) {
-            return 'Specify viewId or viewTitle, one is required';
-        }
-        if (args.options.fieldId && args.options.fieldTitle) {
-            return 'Specify fieldId or fieldTitle, but not both';
-        }
-        if (!args.options.fieldId && !args.options.fieldTitle) {
-            return 'Specify fieldId or fieldTitle, one is required';
-        }
         return true;
     }));
+}, _SpoListViewFieldSetCommand_initOptionSets = function _SpoListViewFieldSetCommand_initOptionSets() {
+    this.optionSets.push(['listId', 'listTitle'], ['viewId', 'viewTitle'], ['fieldId', 'fieldTitle']);
 };
 module.exports = new SpoListViewFieldSetCommand();
 //# sourceMappingURL=list-view-field-set.js.map

package/dist/m365/spo/commands/list/list-view-get.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 _SpoListViewGetCommand_instances, _SpoListViewGetCommand_initTelemetry, _SpoListViewGetCommand_initOptions, _SpoListViewGetCommand_initValidators;
+var _SpoListViewGetCommand_instances, _SpoListViewGetCommand_initTelemetry, _SpoListViewGetCommand_initOptions, _SpoListViewGetCommand_initValidators, _SpoListViewGetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const utils_1 = require("../../../../utils");
@@ -26,6 +26,7 @@ class SpoListViewGetCommand extends SpoCommand_1.default {
         __classPrivateFieldGet(this, _SpoListViewGetCommand_instances, "m", _SpoListViewGetCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoListViewGetCommand_instances, "m", _SpoListViewGetCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoListViewGetCommand_instances, "m", _SpoListViewGetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoListViewGetCommand_instances, "m", _SpoListViewGetCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.LIST_VIEW_GET;
@@ -92,25 +93,18 @@ _SpoListViewGetCommand_instances = new WeakSet(), _SpoListViewGetCommand_initTel
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }
-        if (!args.options.listId && !args.options.listTitle && !args.options.listUrl) {
-            return `Specify listId, listTitle or listUrl`;
-        }
         if (args.options.listId &&
             !utils_1.validation.isValidGuid(args.options.listId)) {
             return `${args.options.listId} in option listId is not a valid GUID`;
         }
-        if (!args.options.viewId && !args.options.viewTitle) {
-            return `Specify viewId or viewTitle`;
-        }
-        if (args.options.viewId && args.options.viewTitle) {
-            return `Specify viewId or viewTitle but not both`;
-        }
         if (args.options.viewId &&
             !utils_1.validation.isValidGuid(args.options.viewId)) {
             return `${args.options.viewId} in option viewId is not a valid GUID`;
         }
         return true;
     }));
+}, _SpoListViewGetCommand_initOptionSets = function _SpoListViewGetCommand_initOptionSets() {
+    this.optionSets.push(['listId', 'listTitle', 'listUrl'], ['viewId', 'viewTitle']);
 };
 module.exports = new SpoListViewGetCommand();
 //# sourceMappingURL=list-view-get.js.map

package/dist/m365/spo/commands/list/list-view-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 _SpoListViewListCommand_instances, _SpoListViewListCommand_initTelemetry, _SpoListViewListCommand_initOptions, _SpoListViewListCommand_initValidators;
+var _SpoListViewListCommand_instances, _SpoListViewListCommand_initTelemetry, _SpoListViewListCommand_initOptions, _SpoListViewListCommand_initValidators, _SpoListViewListCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const utils_1 = require("../../../../utils");
@@ -26,6 +26,7 @@ class SpoListViewListCommand extends SpoCommand_1.default {
         __classPrivateFieldGet(this, _SpoListViewListCommand_instances, "m", _SpoListViewListCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoListViewListCommand_instances, "m", _SpoListViewListCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoListViewListCommand_instances, "m", _SpoListViewListCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoListViewListCommand_instances, "m", _SpoListViewListCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.LIST_VIEW_LIST;
@@ -89,14 +90,10 @@ _SpoListViewListCommand_instances = new WeakSet(), _SpoListViewListCommand_initT
                 return `${args.options.listId} is not a valid GUID`;
             }
         }
-        if (args.options.listId && args.options.listTitle) {
-            return 'Specify listId or listTitle, but not both';
-        }
-        if (!args.options.listId && !args.options.listTitle) {
-            return 'Specify listId or listTitle, one is required';
-        }
         return true;
     }));
+}, _SpoListViewListCommand_initOptionSets = function _SpoListViewListCommand_initOptionSets() {
+    this.optionSets.push(['listId', 'listTitle']);
 };
 module.exports = new SpoListViewListCommand();
 //# sourceMappingURL=list-view-list.js.map

package/dist/m365/spo/commands/list/list-view-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 _SpoListViewRemoveCommand_instances, _SpoListViewRemoveCommand_initTelemetry, _SpoListViewRemoveCommand_initOptions, _SpoListViewRemoveCommand_initValidators;
+var _SpoListViewRemoveCommand_instances, _SpoListViewRemoveCommand_initTelemetry, _SpoListViewRemoveCommand_initOptions, _SpoListViewRemoveCommand_initValidators, _SpoListViewRemoveCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const cli_1 = require("../../../../cli");
 const request_1 = require("../../../../request");
@@ -27,6 +27,7 @@ class SpoListViewRemoveCommand extends SpoCommand_1.default {
         __classPrivateFieldGet(this, _SpoListViewRemoveCommand_instances, "m", _SpoListViewRemoveCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoListViewRemoveCommand_instances, "m", _SpoListViewRemoveCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoListViewRemoveCommand_instances, "m", _SpoListViewRemoveCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoListViewRemoveCommand_instances, "m", _SpoListViewRemoveCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.LIST_VIEW_REMOVE;
@@ -120,20 +121,10 @@ _SpoListViewRemoveCommand_instances = new WeakSet(), _SpoListViewRemoveCommand_i
                 return `${args.options.viewId} is not a valid GUID`;
             }
         }
-        if (args.options.listId && args.options.listTitle) {
-            return 'Specify listId or listTitle, but not both';
-        }
-        if (!args.options.listId && !args.options.listTitle) {
-            return 'Specify listId or listTitle, one is required';
-        }
-        if (args.options.viewId && args.options.viewTitle) {
-            return 'Specify viewId or viewTitle, but not both';
-        }
-        if (!args.options.viewId && !args.options.viewTitle) {
-            return 'Specify viewId or viewTitle, one is required';
-        }
         return true;
     }));
+}, _SpoListViewRemoveCommand_initOptionSets = function _SpoListViewRemoveCommand_initOptionSets() {
+    this.optionSets.push(['listId', 'listTitle'], ['viewId', 'viewTitle']);
 };
 module.exports = new SpoListViewRemoveCommand();
 //# sourceMappingURL=list-view-remove.js.map

package/dist/m365/spo/commands/list/list-view-set.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 _SpoListViewSetCommand_instances, _SpoListViewSetCommand_initTelemetry, _SpoListViewSetCommand_initOptions, _SpoListViewSetCommand_initValidators;
+var _SpoListViewSetCommand_instances, _SpoListViewSetCommand_initTelemetry, _SpoListViewSetCommand_initOptions, _SpoListViewSetCommand_initValidators, _SpoListViewSetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const utils_1 = require("../../../../utils");
@@ -26,6 +26,7 @@ class SpoListViewSetCommand extends SpoCommand_1.default {
         __classPrivateFieldGet(this, _SpoListViewSetCommand_instances, "m", _SpoListViewSetCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoListViewSetCommand_instances, "m", _SpoListViewSetCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoListViewSetCommand_instances, "m", _SpoListViewSetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoListViewSetCommand_instances, "m", _SpoListViewSetCommand_initOptionSets).call(this);
     }
     allowUnknownOptions() {
         return true;
@@ -106,28 +107,18 @@ _SpoListViewSetCommand_instances = new WeakSet(), _SpoListViewSetCommand_initTel
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }
-        if (!args.options.listId && !args.options.listTitle) {
-            return `Specify listId or listTitle`;
-        }
-        if (args.options.listId && args.options.listTitle) {
-            return `Specify listId or listTitle but not both`;
-        }
         if (args.options.listId &&
             !utils_1.validation.isValidGuid(args.options.listId)) {
             return `${args.options.listId} in option listId is not a valid GUID`;
         }
-        if (!args.options.viewId && !args.options.viewTitle) {
-            return `Specify viewId or viewTitle`;
-        }
-        if (args.options.viewId && args.options.viewTitle) {
-            return `Specify viewId or viewTitle but not both`;
-        }
         if (args.options.viewId &&
             !utils_1.validation.isValidGuid(args.options.viewId)) {
             return `${args.options.viewId} in option viewId is not a valid GUID`;
         }
         return true;
     }));
+}, _SpoListViewSetCommand_initOptionSets = function _SpoListViewSetCommand_initOptionSets() {
+    this.optionSets.push(['listId', 'listTitle'], ['viewId', 'viewTitle']);
 };
 module.exports = new SpoListViewSetCommand();
 //# sourceMappingURL=list-view-set.js.map

package/dist/m365/spo/commands/list/list-webhook-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 _SpoListWebhookAddCommand_instances, _SpoListWebhookAddCommand_initTelemetry, _SpoListWebhookAddCommand_initOptions, _SpoListWebhookAddCommand_initValidators;
+var _SpoListWebhookAddCommand_instances, _SpoListWebhookAddCommand_initTelemetry, _SpoListWebhookAddCommand_initOptions, _SpoListWebhookAddCommand_initValidators, _SpoListWebhookAddCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const utils_1 = require("../../../../utils");
@@ -30,6 +30,7 @@ class SpoListWebhookAddCommand extends SpoCommand_1.default {
         __classPrivateFieldGet(this, _SpoListWebhookAddCommand_instances, "m", _SpoListWebhookAddCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoListWebhookAddCommand_instances, "m", _SpoListWebhookAddCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoListWebhookAddCommand_instances, "m", _SpoListWebhookAddCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoListWebhookAddCommand_instances, "m", _SpoListWebhookAddCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.LIST_WEBHOOK_ADD;
@@ -112,12 +113,6 @@ _SpoListWebhookAddCommand_instances = new WeakSet(), _SpoListWebhookAddCommand_i
                 return `${args.options.listId} is not a valid GUID`;
             }
         }
-        if (args.options.listId && args.options.listTitle) {
-            return 'Specify listId or listTitle, but not both';
-        }
-        if (!args.options.listId && !args.options.listTitle) {
-            return 'Specify listId or listTitle, one is required';
-        }
         const parsedDateTime = Date.parse(args.options.expirationDateTime);
         if (args.options.expirationDateTime && !(!parsedDateTime) !== true) {
             return `Provide the date in one of the following formats:
@@ -131,6 +126,8 @@ _SpoListWebhookAddCommand_instances = new WeakSet(), _SpoListWebhookAddCommand_i
         }
         return true;
     }));
+}, _SpoListWebhookAddCommand_initOptionSets = function _SpoListWebhookAddCommand_initOptionSets() {
+    this.optionSets.push(['listId', 'listTitle']);
 };
 module.exports = new SpoListWebhookAddCommand();
 //# sourceMappingURL=list-webhook-add.js.map

package/dist/m365/spo/commands/list/list-webhook-get.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 _SpoListWebhookGetCommand_instances, _SpoListWebhookGetCommand_initTelemetry, _SpoListWebhookGetCommand_initOptions, _SpoListWebhookGetCommand_initValidators;
+var _SpoListWebhookGetCommand_instances, _SpoListWebhookGetCommand_initTelemetry, _SpoListWebhookGetCommand_initOptions, _SpoListWebhookGetCommand_initValidators, _SpoListWebhookGetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const utils_1 = require("../../../../utils");
@@ -26,6 +26,7 @@ class SpoListWebhookGetCommand extends SpoCommand_1.default {
         __classPrivateFieldGet(this, _SpoListWebhookGetCommand_instances, "m", _SpoListWebhookGetCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoListWebhookGetCommand_instances, "m", _SpoListWebhookGetCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoListWebhookGetCommand_instances, "m", _SpoListWebhookGetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoListWebhookGetCommand_instances, "m", _SpoListWebhookGetCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.LIST_WEBHOOK_GET;
@@ -98,14 +99,10 @@ _SpoListWebhookGetCommand_instances = new WeakSet(), _SpoListWebhookGetCommand_i
                 return `${args.options.listId} is not a valid GUID`;
             }
         }
-        if (args.options.listId && args.options.listTitle) {
-            return 'Specify listId or listTitle, but not both';
-        }
-        if (!args.options.listId && !args.options.listTitle) {
-            return 'Specify listId or listTitle, one is required';
-        }
         return true;
     }));
+}, _SpoListWebhookGetCommand_initOptionSets = function _SpoListWebhookGetCommand_initOptionSets() {
+    this.optionSets.push(['listId', 'listTitle']);
 };
 module.exports = new SpoListWebhookGetCommand();
 //# sourceMappingURL=list-webhook-get.js.map

package/dist/m365/spo/commands/list/list-webhook-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 _SpoListWebhookRemoveCommand_instances, _SpoListWebhookRemoveCommand_initTelemetry, _SpoListWebhookRemoveCommand_initOptions, _SpoListWebhookRemoveCommand_initValidators;
+var _SpoListWebhookRemoveCommand_instances, _SpoListWebhookRemoveCommand_initTelemetry, _SpoListWebhookRemoveCommand_initOptions, _SpoListWebhookRemoveCommand_initValidators, _SpoListWebhookRemoveCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const cli_1 = require("../../../../cli");
 const request_1 = require("../../../../request");
@@ -27,6 +27,7 @@ class SpoListWebhookRemoveCommand extends SpoCommand_1.default {
         __classPrivateFieldGet(this, _SpoListWebhookRemoveCommand_instances, "m", _SpoListWebhookRemoveCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoListWebhookRemoveCommand_instances, "m", _SpoListWebhookRemoveCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoListWebhookRemoveCommand_instances, "m", _SpoListWebhookRemoveCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoListWebhookRemoveCommand_instances, "m", _SpoListWebhookRemoveCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.LIST_WEBHOOK_REMOVE;
@@ -119,14 +120,10 @@ _SpoListWebhookRemoveCommand_instances = new WeakSet(), _SpoListWebhookRemoveCom
                 return `${args.options.listId} is not a valid GUID`;
             }
         }
-        if (args.options.listId && args.options.listTitle) {
-            return 'Specify listId or listTitle, but not both';
-        }
-        if (!args.options.listId && !args.options.listTitle) {
-            return 'Specify listId or listTitle, one is required';
-        }
         return true;
     }));
+}, _SpoListWebhookRemoveCommand_initOptionSets = function _SpoListWebhookRemoveCommand_initOptionSets() {
+    this.optionSets.push(['listId', 'listTitle']);
 };
 module.exports = new SpoListWebhookRemoveCommand();
 //# sourceMappingURL=list-webhook-remove.js.map

package/dist/m365/spo/commands/list/list-webhook-set.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 _SpoListWebhookSetCommand_instances, _SpoListWebhookSetCommand_initTelemetry, _SpoListWebhookSetCommand_initOptions, _SpoListWebhookSetCommand_initValidators;
+var _SpoListWebhookSetCommand_instances, _SpoListWebhookSetCommand_initTelemetry, _SpoListWebhookSetCommand_initOptions, _SpoListWebhookSetCommand_initValidators, _SpoListWebhookSetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const chalk = require("chalk");
 const request_1 = require("../../../../request");
@@ -27,6 +27,7 @@ class SpoListWebhookSetCommand extends SpoCommand_1.default {
         __classPrivateFieldGet(this, _SpoListWebhookSetCommand_instances, "m", _SpoListWebhookSetCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoListWebhookSetCommand_instances, "m", _SpoListWebhookSetCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoListWebhookSetCommand_instances, "m", _SpoListWebhookSetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoListWebhookSetCommand_instances, "m", _SpoListWebhookSetCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.LIST_WEBHOOK_SET;
@@ -108,12 +109,6 @@ _SpoListWebhookSetCommand_instances = new WeakSet(), _SpoListWebhookSetCommand_i
                 return `${args.options.listId} is not a valid GUID`;
             }
         }
-        if (args.options.listId && args.options.listTitle) {
-            return 'Specify listId or listTitle, but not both';
-        }
-        if (!args.options.listId && !args.options.listTitle) {
-            return 'Specify listId or listTitle, one is required';
-        }
         if (!args.options.notificationUrl && !args.options.expirationDateTime) {
             return 'Specify notificationUrl, expirationDateTime or both, at least one is required';
         }
@@ -127,6 +122,8 @@ _SpoListWebhookSetCommand_instances = new WeakSet(), _SpoListWebhookSetCommand_i
         }
         return true;
     }));
+}, _SpoListWebhookSetCommand_initOptionSets = function _SpoListWebhookSetCommand_initOptionSets() {
+    this.optionSets.push(['listId', 'listTitle']);
 };
 module.exports = new SpoListWebhookSetCommand();
 //# sourceMappingURL=list-webhook-set.js.map