@pnp/cli-microsoft365 5.8.0-beta.40c8ac8 → 6.0.0-beta.076a3a5

package/dist/m365/spo/commands/list/list-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 _SpoListGetCommand_instances, _SpoListGetCommand_initTelemetry, _SpoListGetCommand_initOptions, _SpoListGetCommand_initValidators;
+var _SpoListGetCommand_instances, _SpoListGetCommand_initTelemetry, _SpoListGetCommand_initOptions, _SpoListGetCommand_initValidators, _SpoListGetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const utils_1 = require("../../../../utils");
@@ -27,6 +27,7 @@ class SpoListGetCommand extends SpoCommand_1.default {
         __classPrivateFieldGet(this, _SpoListGetCommand_instances, "m", _SpoListGetCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoListGetCommand_instances, "m", _SpoListGetCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoListGetCommand_instances, "m", _SpoListGetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoListGetCommand_instances, "m", _SpoListGetCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.LIST_GET;
@@ -99,14 +100,10 @@ _SpoListGetCommand_instances = new WeakSet(), _SpoListGetCommand_initTelemetry =
                 return `${args.options.id} is not a valid GUID`;
             }
         }
-        if (args.options.id && args.options.title) {
-            return 'Specify id or title, but not both';
-        }
-        if (!args.options.id && !args.options.title) {
-            return 'Specify id or title, one is required';
-        }
         return true;
     }));
+}, _SpoListGetCommand_initOptionSets = function _SpoListGetCommand_initOptionSets() {
+    this.optionSets.push(['id', 'title']);
 };
 module.exports = new SpoListGetCommand();
 //# sourceMappingURL=list-get.js.map

package/dist/m365/spo/commands/list/list-label-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 _SpoListLabelGetCommand_instances, _SpoListLabelGetCommand_initTelemetry, _SpoListLabelGetCommand_initOptions, _SpoListLabelGetCommand_initValidators;
+var _SpoListLabelGetCommand_instances, _SpoListLabelGetCommand_initTelemetry, _SpoListLabelGetCommand_initOptions, _SpoListLabelGetCommand_initValidators, _SpoListLabelGetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const utils_1 = require("../../../../utils");
@@ -26,6 +26,7 @@ class SpoListLabelGetCommand extends SpoCommand_1.default {
         __classPrivateFieldGet(this, _SpoListLabelGetCommand_instances, "m", _SpoListLabelGetCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoListLabelGetCommand_instances, "m", _SpoListLabelGetCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoListLabelGetCommand_instances, "m", _SpoListLabelGetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoListLabelGetCommand_instances, "m", _SpoListLabelGetCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.LIST_LABEL_GET;
@@ -112,14 +113,10 @@ _SpoListLabelGetCommand_instances = new WeakSet(), _SpoListLabelGetCommand_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;
     }));
+}, _SpoListLabelGetCommand_initOptionSets = function _SpoListLabelGetCommand_initOptionSets() {
+    this.optionSets.push(['listId', 'listTitle']);
 };
 module.exports = new SpoListLabelGetCommand();
 //# sourceMappingURL=list-label-get.js.map

package/dist/m365/spo/commands/list/list-label-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 _SpoListLabelSetCommand_instances, _SpoListLabelSetCommand_initTelemetry, _SpoListLabelSetCommand_initOptions, _SpoListLabelSetCommand_initValidators;
+var _SpoListLabelSetCommand_instances, _SpoListLabelSetCommand_initTelemetry, _SpoListLabelSetCommand_initOptions, _SpoListLabelSetCommand_initValidators, _SpoListLabelSetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const utils_1 = require("../../../../utils");
@@ -26,6 +26,7 @@ class SpoListLabelSetCommand extends SpoCommand_1.default {
         __classPrivateFieldGet(this, _SpoListLabelSetCommand_instances, "m", _SpoListLabelSetCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoListLabelSetCommand_instances, "m", _SpoListLabelSetCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoListLabelSetCommand_instances, "m", _SpoListLabelSetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoListLabelSetCommand_instances, "m", _SpoListLabelSetCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.LIST_LABEL_SET;
@@ -112,14 +113,13 @@ _SpoListLabelSetCommand_instances = new WeakSet(), _SpoListLabelSetCommand_initT
     });
 }, _SpoListLabelSetCommand_initValidators = function _SpoListLabelSetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!args.options.listId && !args.options.listTitle && !args.options.listUrl) {
-            return `Specify listId or listTitle or listUrl.`;
-        }
         if (args.options.listId && !utils_1.validation.isValidGuid(args.options.listId)) {
             return `${args.options.listId} is not a valid GUID`;
         }
         return utils_1.validation.isValidSharePointUrl(args.options.webUrl);
     }));
+}, _SpoListLabelSetCommand_initOptionSets = function _SpoListLabelSetCommand_initOptionSets() {
+    this.optionSets.push(['listId', 'listTitle', 'listUrl']);
 };
 module.exports = new SpoListLabelSetCommand();
 //# sourceMappingURL=list-label-set.js.map

package/dist/m365/spo/commands/list/list-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 _SpoListListCommand_instances, _SpoListListCommand_initTelemetry, _SpoListListCommand_initOptions, _SpoListListCommand_initValidators;
+var _SpoListListCommand_instances, _SpoListListCommand_initOptions, _SpoListListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const utils_1 = require("../../../../utils");
@@ -23,7 +23,6 @@ class SpoListListCommand extends SpoCommand_1.default {
     constructor() {
         super();
         _SpoListListCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoListListCommand_instances, "m", _SpoListListCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoListListCommand_instances, "m", _SpoListListCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoListListCommand_instances, "m", _SpoListListCommand_initValidators).call(this);
     }
@@ -40,9 +39,8 @@ class SpoListListCommand extends SpoCommand_1.default {
         if (this.verbose) {
             logger.logToStderr(`Retrieving all lists in site at ${args.options.webUrl}...`);
         }
-        const suffix = args.options.executeWithLimitedPermissions ? '&$select=RootFolder/ServerRelativeUrl,*' : '';
         const requestOptions = {
-            url: `${args.options.webUrl}/_api/web/lists?$expand=RootFolder${suffix}`,
+            url: `${args.options.webUrl}/_api/web/lists?$expand=RootFolder&$select=RootFolder/ServerRelativeUrl,*`,
             method: 'GET',
             headers: {
                 'accept': 'application/json;odata=nometadata'
@@ -60,17 +58,9 @@ class SpoListListCommand extends SpoCommand_1.default {
         }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
     }
 }
-_SpoListListCommand_instances = new WeakSet(), _SpoListListCommand_initTelemetry = function _SpoListListCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            executeWithLimitedPermissions: !!args.options.executeWithLimitedPermissions
-        });
-    });
-}, _SpoListListCommand_initOptions = function _SpoListListCommand_initOptions() {
+_SpoListListCommand_instances = new WeakSet(), _SpoListListCommand_initOptions = function _SpoListListCommand_initOptions() {
     this.options.unshift({
         option: '-u, --webUrl <webUrl>'
-    }, {
-        option: '--executeWithLimitedPermissions'
     });
 }, _SpoListListCommand_initValidators = function _SpoListListCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return utils_1.validation.isValidSharePointUrl(args.options.webUrl); }));

package/dist/m365/spo/commands/list/list-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 _SpoListRemoveCommand_instances, _SpoListRemoveCommand_initTelemetry, _SpoListRemoveCommand_initOptions, _SpoListRemoveCommand_initValidators;
+var _SpoListRemoveCommand_instances, _SpoListRemoveCommand_initTelemetry, _SpoListRemoveCommand_initOptions, _SpoListRemoveCommand_initValidators, _SpoListRemoveCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const cli_1 = require("../../../../cli");
 const request_1 = require("../../../../request");
@@ -27,6 +27,7 @@ class SpoListRemoveCommand extends SpoCommand_1.default {
         __classPrivateFieldGet(this, _SpoListRemoveCommand_instances, "m", _SpoListRemoveCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoListRemoveCommand_instances, "m", _SpoListRemoveCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoListRemoveCommand_instances, "m", _SpoListRemoveCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoListRemoveCommand_instances, "m", _SpoListRemoveCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.LIST_REMOVE;
@@ -111,14 +112,10 @@ _SpoListRemoveCommand_instances = new WeakSet(), _SpoListRemoveCommand_initTelem
             !utils_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
-        if (args.options.id && args.options.title) {
-            return 'Specify id or title, but not both';
-        }
-        if (!args.options.id && !args.options.title) {
-            return 'Specify id or title';
-        }
         return true;
     }));
+}, _SpoListRemoveCommand_initOptionSets = function _SpoListRemoveCommand_initOptionSets() {
+    this.optionSets.push(['id', 'title']);
 };
 module.exports = new SpoListRemoveCommand();
 //# sourceMappingURL=list-remove.js.map

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

@@ -193,14 +193,23 @@ _SpoListRoleAssignmentAddCommand_instances = new WeakSet(), _SpoListRoleAssignme
         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`;
+        }
         const roleDefinitionOptions = [args.options.roleDefinitionId, args.options.roleDefinitionName];
         if (roleDefinitionOptions.some(item => item !== undefined) && roleDefinitionOptions.filter(item => item !== undefined).length > 1) {
             return `Specify either roleDefinitionId id or roleDefinitionName`;
         }
+        if (roleDefinitionOptions.filter(item => item !== undefined).length === 0) {
+            return `Specify at least roleDefinitionId id or roleDefinitionName`;
+        }
         return true;
     }));
 };

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;
@@ -38,13 +39,13 @@ class SpoListViewFieldAddCommand extends SpoCommand_1.default {
         let viewSelector = '';
         let currentField;
         if (this.verbose) {
-            logger.logToStderr(`Getting field ${args.options.fieldId || args.options.fieldTitle}...`);
+            logger.logToStderr(`Getting field ${args.options.id || args.options.title}...`);
         }
         this
             .getField(args.options, listSelector)
             .then((field) => {
             if (this.verbose) {
-                logger.logToStderr(`Adding the field ${args.options.fieldId || args.options.fieldTitle} to the view ${args.options.viewId || args.options.viewTitle}...`);
+                logger.logToStderr(`Adding the field ${args.options.id || args.options.title} to the view ${args.options.viewId || args.options.viewTitle}...`);
             }
             currentField = field;
             viewSelector = args.options.viewId ? `('${utils_1.formatting.encodeQueryParameter(args.options.viewId)}')` : `/GetByTitle('${utils_1.formatting.encodeQueryParameter(args.options.viewTitle)}')`;
@@ -59,7 +60,7 @@ class SpoListViewFieldAddCommand extends SpoCommand_1.default {
             return request_1.default.post(postRequestOptions);
         })
             .then(() => {
-            if (typeof args.options.fieldPosition === 'undefined') {
+            if (typeof args.options.position === 'undefined') {
                 if (this.debug) {
                     logger.logToStderr(`No field position.`);
                 }
@@ -67,10 +68,10 @@ class SpoListViewFieldAddCommand extends SpoCommand_1.default {
             }
             if (this.debug) {
                 logger.logToStderr(`moveField request...`);
-                logger.logToStderr(args.options.fieldPosition);
+                logger.logToStderr(args.options.position);
             }
             if (this.verbose) {
-                logger.logToStderr(`Moving the field ${args.options.fieldId || args.options.fieldTitle} to the position ${args.options.fieldPosition} from view ${args.options.viewId || args.options.viewTitle}...`);
+                logger.logToStderr(`Moving the field ${args.options.id || args.options.title} to the position ${args.options.position} from view ${args.options.viewId || args.options.viewTitle}...`);
             }
             const moveRequestUrl = `${args.options.webUrl}/_api/web/lists${listSelector}/views${viewSelector}/viewfields/moveviewfieldto`;
             const moveRequestOptions = {
@@ -78,7 +79,7 @@ class SpoListViewFieldAddCommand extends SpoCommand_1.default {
                 headers: {
                     'accept': 'application/json;odata=nometadata'
                 },
-                data: { 'field': currentField.InternalName, 'index': args.options.fieldPosition },
+                data: { 'field': currentField.InternalName, 'index': args.options.position },
                 responseType: 'json'
             };
             return request_1.default.post(moveRequestOptions);
@@ -89,7 +90,7 @@ class SpoListViewFieldAddCommand extends SpoCommand_1.default {
         }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
     }
     getField(options, listSelector) {
-        const fieldSelector = options.fieldId ? `/getbyid('${encodeURIComponent(options.fieldId)}')` : `/getbyinternalnameortitle('${encodeURIComponent(options.fieldTitle)}')`;
+        const fieldSelector = options.id ? `/getbyid('${encodeURIComponent(options.id)}')` : `/getbyinternalnameortitle('${encodeURIComponent(options.title)}')`;
         const getRequestUrl = `${options.webUrl}/_api/web/lists${listSelector}/fields${fieldSelector}`;
         const requestOptions = {
             url: getRequestUrl,
@@ -108,9 +109,9 @@ _SpoListViewFieldAddCommand_instances = new WeakSet(), _SpoListViewFieldAddComma
             listTitle: typeof args.options.listTitle !== 'undefined',
             viewId: typeof args.options.viewId !== 'undefined',
             viewTitle: typeof args.options.viewTitle !== 'undefined',
-            fieldId: typeof args.options.fieldId !== 'undefined',
-            fieldTitle: typeof args.options.fieldTitle !== 'undefined',
-            fieldPosition: typeof args.options.fieldPosition !== 'undefined'
+            id: typeof args.options.id !== 'undefined',
+            title: typeof args.options.title !== 'undefined',
+            position: typeof args.options.position !== 'undefined'
         });
     });
 }, _SpoListViewFieldAddCommand_initOptions = function _SpoListViewFieldAddCommand_initOptions() {
@@ -125,11 +126,11 @@ _SpoListViewFieldAddCommand_instances = new WeakSet(), _SpoListViewFieldAddComma
     }, {
         option: '--viewTitle [viewTitle]'
     }, {
-        option: '--fieldId [fieldId]'
+        option: '--id [id]'
     }, {
-        option: '--fieldTitle [fieldTitle]'
+        option: '--title [title]'
     }, {
-        option: '--fieldPosition [fieldPosition]'
+        option: '--position [position]'
     });
 }, _SpoListViewFieldAddCommand_initValidators = function _SpoListViewFieldAddCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
@@ -147,37 +148,21 @@ _SpoListViewFieldAddCommand_instances = new WeakSet(), _SpoListViewFieldAddComma
                 return `${args.options.viewId} is not a valid GUID`;
             }
         }
-        if (args.options.fieldId) {
-            if (!utils_1.validation.isValidGuid(args.options.fieldId)) {
-                return `${args.options.fieldId} is not a valid GUID`;
+        if (args.options.id) {
+            if (!utils_1.validation.isValidGuid(args.options.id)) {
+                return `${args.options.id} is not a valid GUID`;
             }
         }
-        if (args.options.fieldPosition) {
-            const position = parseInt(args.options.fieldPosition);
+        if (args.options.position) {
+            const position = parseInt(args.options.position);
             if (isNaN(position)) {
-                return `${args.options.fieldPosition} is not a number`;
+                return `${args.options.position} 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'], ['id', 'title']);
 };
 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;
@@ -38,13 +39,13 @@ class SpoListViewFieldRemoveCommand extends SpoCommand_1.default {
         const listSelector = args.options.listId ? `(guid'${utils_1.formatting.encodeQueryParameter(args.options.listId)}')` : `/GetByTitle('${utils_1.formatting.encodeQueryParameter(args.options.listTitle)}')`;
         const removeFieldFromView = () => {
             if (this.verbose) {
-                logger.logToStderr(`Getting field ${args.options.fieldId || args.options.fieldTitle}...`);
+                logger.logToStderr(`Getting field ${args.options.id || args.options.title}...`);
             }
             this
                 .getField(args.options, listSelector)
                 .then((field) => {
                 if (this.verbose) {
-                    logger.logToStderr(`Removing field ${args.options.fieldId || args.options.fieldTitle} from view ${args.options.viewId || args.options.viewTitle}...`);
+                    logger.logToStderr(`Removing field ${args.options.id || args.options.title} from view ${args.options.viewId || args.options.viewTitle}...`);
                 }
                 const viewSelector = args.options.viewId ? `('${utils_1.formatting.encodeQueryParameter(args.options.viewId)}')` : `/GetByTitle('${utils_1.formatting.encodeQueryParameter(args.options.viewTitle)}')`;
                 const postRequestUrl = `${args.options.webUrl}/_api/web/lists${listSelector}/views${viewSelector}/viewfields/removeviewfield('${field.InternalName}')`;
@@ -70,7 +71,7 @@ class SpoListViewFieldRemoveCommand extends SpoCommand_1.default {
                 type: 'confirm',
                 name: 'continue',
                 default: false,
-                message: `Are you sure you want to remove the field ${args.options.fieldId || args.options.fieldTitle} from the view ${args.options.viewId || args.options.viewTitle} from list ${args.options.listId || args.options.listTitle} in site ${args.options.webUrl}?`
+                message: `Are you sure you want to remove the field ${args.options.id || args.options.title} from the view ${args.options.viewId || args.options.viewTitle} from list ${args.options.listId || args.options.listTitle} in site ${args.options.webUrl}?`
             }, (result) => {
                 if (!result.continue) {
                     cb();
@@ -82,7 +83,7 @@ class SpoListViewFieldRemoveCommand extends SpoCommand_1.default {
         }
     }
     getField(options, listSelector) {
-        const fieldSelector = options.fieldId ? `/getbyid('${encodeURIComponent(options.fieldId)}')` : `/getbyinternalnameortitle('${encodeURIComponent(options.fieldTitle)}')`;
+        const fieldSelector = options.id ? `/getbyid('${encodeURIComponent(options.id)}')` : `/getbyinternalnameortitle('${encodeURIComponent(options.title)}')`;
         const getRequestUrl = `${options.webUrl}/_api/web/lists${listSelector}/fields${fieldSelector}`;
         const requestOptions = {
             url: getRequestUrl,
@@ -101,8 +102,8 @@ _SpoListViewFieldRemoveCommand_instances = new WeakSet(), _SpoListViewFieldRemov
             listTitle: typeof args.options.listTitle !== 'undefined',
             viewId: typeof args.options.viewId !== 'undefined',
             viewTitle: typeof args.options.viewTitle !== 'undefined',
-            fieldId: typeof args.options.fieldId !== 'undefined',
-            fieldTitle: typeof args.options.fieldTitle !== 'undefined',
+            id: typeof args.options.id !== 'undefined',
+            title: typeof args.options.title !== 'undefined',
             confirm: (!(!args.options.confirm)).toString()
         });
     });
@@ -118,9 +119,9 @@ _SpoListViewFieldRemoveCommand_instances = new WeakSet(), _SpoListViewFieldRemov
     }, {
         option: '--viewTitle [viewTitle]'
     }, {
-        option: '--fieldId [fieldId]'
+        option: '--id [id]'
     }, {
-        option: '--fieldTitle [fieldTitle]'
+        option: '--title [title]'
     }, {
         option: '--confirm'
     });
@@ -140,31 +141,15 @@ _SpoListViewFieldRemoveCommand_instances = new WeakSet(), _SpoListViewFieldRemov
                 return `${args.options.viewId} is not a valid GUID`;
             }
         }
-        if (args.options.fieldId) {
-            if (!utils_1.validation.isValidGuid(args.options.fieldId)) {
+        if (args.options.id) {
+            if (!utils_1.validation.isValidGuid(args.options.id)) {
                 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'], ['id', 'title']);
 };
 module.exports = new SpoListViewFieldRemoveCommand();
 //# sourceMappingURL=list-view-field-remove.js.map