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

package/dist/m365/aad/commands/o365group/o365group-user-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 _AadO365GroupUserSetCommand_instances, _AadO365GroupUserSetCommand_initTelemetry, _AadO365GroupUserSetCommand_initOptions, _AadO365GroupUserSetCommand_initValidators;
+var _AadO365GroupUserSetCommand_instances, _AadO365GroupUserSetCommand_initTelemetry, _AadO365GroupUserSetCommand_initOptions, _AadO365GroupUserSetCommand_initValidators, _AadO365GroupUserSetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const utils_1 = require("../../../../utils");
@@ -27,6 +27,7 @@ class AadO365GroupUserSetCommand extends GraphCommand_1.default {
         __classPrivateFieldGet(this, _AadO365GroupUserSetCommand_instances, "m", _AadO365GroupUserSetCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _AadO365GroupUserSetCommand_instances, "m", _AadO365GroupUserSetCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _AadO365GroupUserSetCommand_instances, "m", _AadO365GroupUserSetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _AadO365GroupUserSetCommand_instances, "m", _AadO365GroupUserSetCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_2.default.O365GROUP_USER_SET;
@@ -143,12 +144,6 @@ _AadO365GroupUserSetCommand_instances = new WeakSet(), _AadO365GroupUserSetComma
     });
 }, _AadO365GroupUserSetCommand_initValidators = function _AadO365GroupUserSetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!args.options.groupId && !args.options.teamId) {
-            return 'Please provide one of the following parameters: groupId or teamId';
-        }
-        if (args.options.groupId && args.options.teamId) {
-            return 'You cannot provide both a groupId and teamId parameter, please provide only one';
-        }
         if (args.options.teamId && !utils_1.validation.isValidGuid(args.options.teamId)) {
             return `${args.options.teamId} is not a valid GUID`;
         }
@@ -160,6 +155,8 @@ _AadO365GroupUserSetCommand_instances = new WeakSet(), _AadO365GroupUserSetComma
         }
         return true;
     }));
+}, _AadO365GroupUserSetCommand_initOptionSets = function _AadO365GroupUserSetCommand_initOptionSets() {
+    this.optionSets.push(['groupId', 'teamId']);
 };
 module.exports = new AadO365GroupUserSetCommand();
 //# sourceMappingURL=o365group-user-set.js.map

package/dist/m365/aad/commands/sp/sp-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 _AadSpAddCommand_instances, _AadSpAddCommand_initTelemetry, _AadSpAddCommand_initOptions, _AadSpAddCommand_initValidators;
+var _AadSpAddCommand_instances, _AadSpAddCommand_initTelemetry, _AadSpAddCommand_initOptions, _AadSpAddCommand_initValidators, _AadSpAddCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const utils_1 = require("../../../../utils");
@@ -26,6 +26,7 @@ class AadSpAddCommand extends GraphCommand_1.default {
         __classPrivateFieldGet(this, _AadSpAddCommand_instances, "m", _AadSpAddCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _AadSpAddCommand_instances, "m", _AadSpAddCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _AadSpAddCommand_instances, "m", _AadSpAddCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _AadSpAddCommand_instances, "m", _AadSpAddCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.SP_ADD;
@@ -105,13 +106,6 @@ _AadSpAddCommand_instances = new WeakSet(), _AadSpAddCommand_initTelemetry = fun
     });
 }, _AadSpAddCommand_initValidators = function _AadSpAddCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        let optionsSpecified = 0;
-        optionsSpecified += args.options.appId ? 1 : 0;
-        optionsSpecified += args.options.appName ? 1 : 0;
-        optionsSpecified += args.options.objectId ? 1 : 0;
-        if (optionsSpecified !== 1) {
-            return 'Specify either appId, appName, or objectId';
-        }
         if (args.options.appId && !utils_1.validation.isValidGuid(args.options.appId)) {
             return `${args.options.appId} is not a valid appId GUID`;
         }
@@ -120,6 +114,8 @@ _AadSpAddCommand_instances = new WeakSet(), _AadSpAddCommand_initTelemetry = fun
         }
         return true;
     }));
+}, _AadSpAddCommand_initOptionSets = function _AadSpAddCommand_initOptionSets() {
+    this.optionSets.push(['appId', 'appName', 'objectId']);
 };
 module.exports = new AadSpAddCommand();
 //# sourceMappingURL=sp-add.js.map

package/dist/m365/aad/commands/sp/sp-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 _AadSpGetCommand_instances, _AadSpGetCommand_initTelemetry, _AadSpGetCommand_initOptions, _AadSpGetCommand_initValidators;
+var _AadSpGetCommand_instances, _AadSpGetCommand_initTelemetry, _AadSpGetCommand_initOptions, _AadSpGetCommand_initValidators, _AadSpGetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const utils_1 = require("../../../../utils");
@@ -26,6 +26,7 @@ class AadSpGetCommand extends GraphCommand_1.default {
         __classPrivateFieldGet(this, _AadSpGetCommand_instances, "m", _AadSpGetCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _AadSpGetCommand_instances, "m", _AadSpGetCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _AadSpGetCommand_instances, "m", _AadSpGetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _AadSpGetCommand_instances, "m", _AadSpGetCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.SP_GET;
@@ -105,13 +106,6 @@ _AadSpGetCommand_instances = new WeakSet(), _AadSpGetCommand_initTelemetry = fun
     });
 }, _AadSpGetCommand_initValidators = function _AadSpGetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        let optionsSpecified = 0;
-        optionsSpecified += args.options.appId ? 1 : 0;
-        optionsSpecified += args.options.displayName ? 1 : 0;
-        optionsSpecified += args.options.objectId ? 1 : 0;
-        if (optionsSpecified !== 1) {
-            return 'Specify either appId, objectId or displayName';
-        }
         if (args.options.appId && !utils_1.validation.isValidGuid(args.options.appId)) {
             return `${args.options.appId} is not a valid appId GUID`;
         }
@@ -120,6 +114,8 @@ _AadSpGetCommand_instances = new WeakSet(), _AadSpGetCommand_initTelemetry = fun
         }
         return true;
     }));
+}, _AadSpGetCommand_initOptionSets = function _AadSpGetCommand_initOptionSets() {
+    this.optionSets.push(['appId', 'displayName', 'objectId']);
 };
 module.exports = new AadSpGetCommand();
 //# sourceMappingURL=sp-get.js.map

package/dist/m365/aad/commands/user/user-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 _AadUserGetCommand_instances, _AadUserGetCommand_initTelemetry, _AadUserGetCommand_initOptions, _AadUserGetCommand_initValidators;
+var _AadUserGetCommand_instances, _AadUserGetCommand_initTelemetry, _AadUserGetCommand_initOptions, _AadUserGetCommand_initValidators, _AadUserGetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const utils_1 = require("../../../../utils");
@@ -26,6 +26,7 @@ class AadUserGetCommand extends GraphCommand_1.default {
         __classPrivateFieldGet(this, _AadUserGetCommand_instances, "m", _AadUserGetCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _AadUserGetCommand_instances, "m", _AadUserGetCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _AadUserGetCommand_instances, "m", _AadUserGetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _AadUserGetCommand_instances, "m", _AadUserGetCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.USER_GET;
@@ -94,20 +95,14 @@ _AadUserGetCommand_instances = new WeakSet(), _AadUserGetCommand_initTelemetry =
     });
 }, _AadUserGetCommand_initValidators = function _AadUserGetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!args.options.id && !args.options.userName && !args.options.email) {
-            return 'Specify id, userName or email, one is required';
-        }
-        if ((args.options.id && args.options.email) ||
-            (args.options.id && args.options.userName) ||
-            (args.options.userName && args.options.email)) {
-            return 'Use either id, userName or email, but not all';
-        }
         if (args.options.id &&
             !utils_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
         return true;
     }));
+}, _AadUserGetCommand_initOptionSets = function _AadUserGetCommand_initOptionSets() {
+    this.optionSets.push(['id', 'userName', 'email']);
 };
 module.exports = new AadUserGetCommand();
 //# sourceMappingURL=user-get.js.map

package/dist/m365/aad/commands/user/user-list.js

@@ -6,6 +6,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _AadUserListCommand_instances, _AadUserListCommand_initTelemetry, _AadUserListCommand_initOptions;
 Object.defineProperty(exports, "__esModule", { value: true });
+const Command_1 = require("../../../../Command");
 const utils_1 = require("../../../../utils");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
@@ -26,10 +27,17 @@ class AadUserListCommand extends GraphCommand_1.default {
         return true;
     }
     commandAction(logger, args, cb) {
+        let filter = '';
         const properties = args.options.properties ?
             args.options.properties.split(',').map(p => p.trim()) :
             ['userPrincipalName', 'displayName'];
-        const filter = this.getFilter(args.options);
+        try {
+            filter = this.getFilter(args.options);
+        }
+        catch (ex) {
+            cb(new Command_1.CommandError(ex));
+            return;
+        }
         const endpoint = args.options.deleted ? 'directory/deletedItems/microsoft.graph.user' : 'users';
         const url = `${this.resource}/v1.0/${endpoint}?$select=${properties.join(',')}${(filter.length > 0 ? '&' + filter : '')}&$top=100`;
         utils_1.odata
@@ -55,7 +63,10 @@ class AadUserListCommand extends GraphCommand_1.default {
         ];
         Object.keys(options).forEach(key => {
             if (excludeOptions.indexOf(key) === -1) {
-                filters[key] = encodeURIComponent(options[key].replace(/'/g, `''`));
+                if (typeof options[key] === 'boolean') {
+                    throw `Specify value for the ${key} property`;
+                }
+                filters[key] = encodeURIComponent(options[key].toString().replace(/'/g, `''`));
             }
         });
         let filter = Object.keys(filters).map(key => `startsWith(${key}, '${filters[key]}')`).join(' and ');

package/dist/m365/aad/commands/user/user-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 _AadUserSetCommand_instances, _AadUserSetCommand_initTelemetry, _AadUserSetCommand_initOptions, _AadUserSetCommand_initValidators;
+var _AadUserSetCommand_instances, _AadUserSetCommand_initTelemetry, _AadUserSetCommand_initOptions, _AadUserSetCommand_initValidators, _AadUserSetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const utils_1 = require("../../../../utils");
@@ -26,6 +26,7 @@ class AadUserSetCommand extends GraphCommand_1.default {
         __classPrivateFieldGet(this, _AadUserSetCommand_instances, "m", _AadUserSetCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _AadUserSetCommand_instances, "m", _AadUserSetCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _AadUserSetCommand_instances, "m", _AadUserSetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _AadUserSetCommand_instances, "m", _AadUserSetCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.USER_SET;
@@ -91,18 +92,14 @@ _AadUserSetCommand_instances = new WeakSet(), _AadUserSetCommand_initTelemetry =
     });
 }, _AadUserSetCommand_initValidators = function _AadUserSetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!args.options.objectId && !args.options.userPrincipalName) {
-            return 'Specify either objectId or userPrincipalName';
-        }
-        if (args.options.objectId && args.options.userPrincipalName) {
-            return 'Specify either objectId or userPrincipalName but not both';
-        }
         if (args.options.objectId &&
             !utils_1.validation.isValidGuid(args.options.objectId)) {
             return `${args.options.objectId} is not a valid GUID`;
         }
         return true;
     }));
+}, _AadUserSetCommand_initOptionSets = function _AadUserSetCommand_initOptionSets() {
+    this.optionSets.push(['objectId', 'userPrincipalName']);
 };
 module.exports = new AadUserSetCommand();
 //# sourceMappingURL=user-set.js.map

package/dist/m365/onenote/commands/notebook/notebook-list.js

@@ -0,0 +1,139 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    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 _OneNoteNotebookListCommand_instances, _OneNoteNotebookListCommand_initTelemetry, _OneNoteNotebookListCommand_initOptions, _OneNoteNotebookListCommand_initValidators;
+Object.defineProperty(exports, "__esModule", { value: true });
+const request_1 = require("../../../../request");
+const utils_1 = require("../../../../utils");
+const aadGroup_1 = require("../../../../utils/aadGroup");
+const GraphCommand_1 = require("../../../base/GraphCommand");
+const commands_1 = require("../../commands");
+class OneNoteNotebookListCommand extends GraphCommand_1.default {
+    constructor() {
+        super();
+        _OneNoteNotebookListCommand_instances.add(this);
+        __classPrivateFieldGet(this, _OneNoteNotebookListCommand_instances, "m", _OneNoteNotebookListCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _OneNoteNotebookListCommand_instances, "m", _OneNoteNotebookListCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _OneNoteNotebookListCommand_instances, "m", _OneNoteNotebookListCommand_initValidators).call(this);
+    }
+    get name() {
+        return commands_1.default.NOTEBOOK_LIST;
+    }
+    get description() {
+        return 'Retrieve a list of notebooks';
+    }
+    getEndpointUrl(args) {
+        return new Promise((resolve, reject) => {
+            let endpoint = `${this.resource}/v1.0/me/onenote/notebooks`;
+            if (args.options.userId) {
+                endpoint = `${this.resource}/v1.0/users/${args.options.userId}/onenote/notebooks`;
+                return resolve(endpoint);
+            }
+            else if (args.options.userName) {
+                endpoint = `${this.resource}/v1.0/users/${args.options.userName}/onenote/notebooks`;
+                return resolve(endpoint);
+            }
+            else if (args.options.groupId) {
+                endpoint = `${this.resource}/v1.0/groups/${args.options.groupId}/onenote/notebooks`;
+                return resolve(endpoint);
+            }
+            else if (args.options.groupName) {
+                this
+                    .getGroupId(args)
+                    .then((retrievedgroupId) => {
+                    endpoint = `${this.resource}/v1.0/groups/${retrievedgroupId}/onenote/notebooks`;
+                    return resolve(endpoint);
+                })
+                    .catch((err) => {
+                    reject(err);
+                });
+            }
+            else if (args.options.webUrl) {
+                this
+                    .getSpoSiteId(args)
+                    .then((siteId) => {
+                    endpoint = `${this.resource}/v1.0/sites/${siteId}/onenote/notebooks`;
+                    return resolve(endpoint);
+                })
+                    .catch((err) => {
+                    reject(err);
+                });
+            }
+            else {
+                return resolve(endpoint);
+            }
+        });
+    }
+    defaultProperties() {
+        return ['createdDateTime', 'displayName', 'id'];
+    }
+    getGroupId(args) {
+        return aadGroup_1.aadGroup
+            .getGroupByDisplayName(args.options.groupName)
+            .then(group => group.id);
+    }
+    getSpoSiteId(args) {
+        const url = new URL(args.options.webUrl);
+        const requestOptions = {
+            url: `${this.resource}/v1.0/sites/${url.hostname}:${url.pathname}`,
+            headers: {
+                accept: 'application/json;odata.metadata=none'
+            },
+            responseType: 'json'
+        };
+        return request_1.default
+            .get(requestOptions)
+            .then((site) => site.id);
+    }
+    commandAction(logger, args, cb) {
+        this
+            .getEndpointUrl(args)
+            .then(endpoint => utils_1.odata.getAllItems(endpoint))
+            .then((items) => {
+            return Promise.resolve(items);
+        })
+            .then((items) => {
+            logger.log(items);
+            cb();
+        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    }
+}
+_OneNoteNotebookListCommand_instances = new WeakSet(), _OneNoteNotebookListCommand_initTelemetry = function _OneNoteNotebookListCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            joined: args.options.joined
+        });
+    });
+}, _OneNoteNotebookListCommand_initOptions = function _OneNoteNotebookListCommand_initOptions() {
+    this.options.unshift({ option: '--userId [userId]' }, { option: '--userName [userName]' }, { option: '--groupId [groupId]' }, { option: '--groupName [groupName]' }, { option: '-u, --webUrl [webUrl]' });
+}, _OneNoteNotebookListCommand_initValidators = function _OneNoteNotebookListCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        if (args.options.userId && !utils_1.validation.isValidGuid(args.options.userId)) {
+            return `${args.options.userId} is not a valid GUID`;
+        }
+        if (args.options.groupId && !utils_1.validation.isValidGuid(args.options.groupId)) {
+            return `${args.options.groupId} is not a valid GUID`;
+        }
+        if (args.options.userId && args.options.userName) {
+            return 'Specify either userId or userName, but not both';
+        }
+        if (args.options.groupId && args.options.groupName) {
+            return 'Specify either groupId or groupName, but not both';
+        }
+        return true;
+    }));
+};
+module.exports = new OneNoteNotebookListCommand();
+//# sourceMappingURL=notebook-list.js.map

package/dist/m365/onenote/commands.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const prefix = 'onenote';
+exports.default = {
+    NOTEBOOK_LIST: `${prefix} notebook list`
+};
+//# sourceMappingURL=commands.js.map

package/dist/m365/outlook/commands/message/message-list.js

@@ -1,19 +1,10 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
     if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
     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 _OutlookMessageListCommand_instances, _OutlookMessageListCommand_initTelemetry, _OutlookMessageListCommand_initOptions, _OutlookMessageListCommand_initValidators;
+var _OutlookMessageListCommand_instances, _OutlookMessageListCommand_initTelemetry, _OutlookMessageListCommand_initOptions, _OutlookMessageListCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const os = require("os");
 const request_1 = require("../../../../request");
@@ -27,7 +18,7 @@ class OutlookMessageListCommand extends GraphCommand_1.default {
         _OutlookMessageListCommand_instances.add(this);
         __classPrivateFieldGet(this, _OutlookMessageListCommand_instances, "m", _OutlookMessageListCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _OutlookMessageListCommand_instances, "m", _OutlookMessageListCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _OutlookMessageListCommand_instances, "m", _OutlookMessageListCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _OutlookMessageListCommand_instances, "m", _OutlookMessageListCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.MESSAGE_LIST;
@@ -99,18 +90,8 @@ _OutlookMessageListCommand_instances = new WeakSet(), _OutlookMessageListCommand
         option: '--folderId [folderId]',
         autocomplete: Outlook_1.Outlook.wellKnownFolderNames
     });
-}, _OutlookMessageListCommand_initValidators = function _OutlookMessageListCommand_initValidators() {
-    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!args.options.folderId &&
-            !args.options.folderName) {
-            return 'Specify folderId or folderName';
-        }
-        if (args.options.folderId &&
-            args.options.folderName) {
-            return 'Specify either folderId or folderName but not both';
-        }
-        return true;
-    }));
+}, _OutlookMessageListCommand_initOptionSets = function _OutlookMessageListCommand_initOptionSets() {
+    this.optionSets.push(['folderId', 'folderName']);
 };
 module.exports = new OutlookMessageListCommand();
 //# sourceMappingURL=message-list.js.map

package/dist/m365/outlook/commands/message/message-move.js

@@ -1,19 +1,10 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
     if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
     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 _OutlookMessageMoveCommand_instances, _OutlookMessageMoveCommand_initTelemetry, _OutlookMessageMoveCommand_initOptions, _OutlookMessageMoveCommand_initValidators;
+var _OutlookMessageMoveCommand_instances, _OutlookMessageMoveCommand_initTelemetry, _OutlookMessageMoveCommand_initOptions, _OutlookMessageMoveCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const os = require("os");
 const request_1 = require("../../../../request");
@@ -26,7 +17,7 @@ class OutlookMessageMoveCommand extends GraphCommand_1.default {
         _OutlookMessageMoveCommand_instances.add(this);
         __classPrivateFieldGet(this, _OutlookMessageMoveCommand_instances, "m", _OutlookMessageMoveCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _OutlookMessageMoveCommand_instances, "m", _OutlookMessageMoveCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _OutlookMessageMoveCommand_instances, "m", _OutlookMessageMoveCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _OutlookMessageMoveCommand_instances, "m", _OutlookMessageMoveCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.MESSAGE_MOVE;
@@ -116,26 +107,8 @@ _OutlookMessageMoveCommand_instances = new WeakSet(), _OutlookMessageMoveCommand
         option: '--targetFolderId [targetFolderId]',
         autocomplete: Outlook_1.Outlook.wellKnownFolderNames
     });
-}, _OutlookMessageMoveCommand_initValidators = function _OutlookMessageMoveCommand_initValidators() {
-    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!args.options.sourceFolderId &&
-            !args.options.sourceFolderName) {
-            return 'Specify sourceFolderId or sourceFolderName';
-        }
-        if (args.options.sourceFolderId &&
-            args.options.sourceFolderName) {
-            return 'Specify either sourceFolderId or sourceFolderName but not both';
-        }
-        if (!args.options.targetFolderId &&
-            !args.options.targetFolderName) {
-            return 'Specify targetFolderId or targetFolderName';
-        }
-        if (args.options.targetFolderId &&
-            args.options.targetFolderName) {
-            return 'Specify either targetFolderId or targetFolderName but not both';
-        }
-        return true;
-    }));
+}, _OutlookMessageMoveCommand_initOptionSets = function _OutlookMessageMoveCommand_initOptionSets() {
+    this.optionSets.push(['sourceFolderId', 'sourceFolderName'], ['targetFolderId', 'targetFolderName']);
 };
 module.exports = new OutlookMessageMoveCommand();
 //# sourceMappingURL=message-move.js.map

package/dist/m365/pa/commands/app/app-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 _PaAppGetCommand_instances, _PaAppGetCommand_initTelemetry, _PaAppGetCommand_initOptions, _PaAppGetCommand_initValidators;
+var _PaAppGetCommand_instances, _PaAppGetCommand_initTelemetry, _PaAppGetCommand_initOptions, _PaAppGetCommand_initValidators, _PaAppGetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const cli_1 = require("../../../../cli");
 const request_1 = require("../../../../request");
@@ -28,6 +28,7 @@ class PaAppGetCommand extends PowerAppsCommand_1.default {
         __classPrivateFieldGet(this, _PaAppGetCommand_instances, "m", _PaAppGetCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _PaAppGetCommand_instances, "m", _PaAppGetCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _PaAppGetCommand_instances, "m", _PaAppGetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _PaAppGetCommand_instances, "m", _PaAppGetCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.APP_GET;
@@ -121,17 +122,13 @@ _PaAppGetCommand_instances = new WeakSet(), _PaAppGetCommand_initTelemetry = fun
     });
 }, _PaAppGetCommand_initValidators = function _PaAppGetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!args.options.name && !args.options.displayName) {
-            return 'Specify either name or displayName';
-        }
-        if (args.options.name && args.options.displayName) {
-            return 'Specify either name or displayName but not both';
-        }
         if (args.options.name && !utils_1.validation.isValidGuid(args.options.name)) {
             return `${args.options.name} is not a valid GUID`;
         }
         return true;
     }));
+}, _PaAppGetCommand_initOptionSets = function _PaAppGetCommand_initOptionSets() {
+    this.optionSets.push(['name', 'displayName']);
 };
 module.exports = new PaAppGetCommand();
 //# sourceMappingURL=app-get.js.map

package/dist/m365/planner/commands/bucket/bucket-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 _PlannerBucketAddCommand_instances, _PlannerBucketAddCommand_initTelemetry, _PlannerBucketAddCommand_initOptions, _PlannerBucketAddCommand_initValidators;
+var _PlannerBucketAddCommand_instances, _PlannerBucketAddCommand_initTelemetry, _PlannerBucketAddCommand_initOptions, _PlannerBucketAddCommand_initValidators, _PlannerBucketAddCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const Auth_1 = require("../../../../Auth");
 const request_1 = require("../../../../request");
@@ -29,6 +29,7 @@ class PlannerBucketAddCommand extends GraphCommand_1.default {
         __classPrivateFieldGet(this, _PlannerBucketAddCommand_instances, "m", _PlannerBucketAddCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _PlannerBucketAddCommand_instances, "m", _PlannerBucketAddCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _PlannerBucketAddCommand_instances, "m", _PlannerBucketAddCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _PlannerBucketAddCommand_instances, "m", _PlannerBucketAddCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.BUCKET_ADD;
@@ -117,12 +118,6 @@ _PlannerBucketAddCommand_instances = new WeakSet(), _PlannerBucketAddCommand_ini
     });
 }, _PlannerBucketAddCommand_initValidators = function _PlannerBucketAddCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!args.options.planId && !args.options.planName && !args.options.planTitle) {
-            return 'Specify either planId or planTitle';
-        }
-        if (args.options.planId && (args.options.planName || args.options.planTitle)) {
-            return 'Specify either planId or planTitle but not both';
-        }
         if ((args.options.planName || args.options.planTitle) && !args.options.ownerGroupId && !args.options.ownerGroupName) {
             return 'Specify either ownerGroupId or ownerGroupName when using planTitle';
         }
@@ -134,6 +129,8 @@ _PlannerBucketAddCommand_instances = new WeakSet(), _PlannerBucketAddCommand_ini
         }
         return true;
     }));
+}, _PlannerBucketAddCommand_initOptionSets = function _PlannerBucketAddCommand_initOptionSets() {
+    this.optionSets.push(['planId', 'planTitle']);
 };
 module.exports = new PlannerBucketAddCommand();
 //# sourceMappingURL=bucket-add.js.map

package/dist/m365/planner/commands/bucket/bucket-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 _PlannerBucketListCommand_instances, _PlannerBucketListCommand_initTelemetry, _PlannerBucketListCommand_initOptions, _PlannerBucketListCommand_initValidators;
+var _PlannerBucketListCommand_instances, _PlannerBucketListCommand_initTelemetry, _PlannerBucketListCommand_initOptions, _PlannerBucketListCommand_initValidators, _PlannerBucketListCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const Auth_1 = require("../../../../Auth");
 const utils_1 = require("../../../../utils");
@@ -28,6 +28,7 @@ class PlannerBucketListCommand extends GraphCommand_1.default {
         __classPrivateFieldGet(this, _PlannerBucketListCommand_instances, "m", _PlannerBucketListCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _PlannerBucketListCommand_instances, "m", _PlannerBucketListCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _PlannerBucketListCommand_instances, "m", _PlannerBucketListCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _PlannerBucketListCommand_instances, "m", _PlannerBucketListCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.BUCKET_LIST;
@@ -97,12 +98,6 @@ _PlannerBucketListCommand_instances = new WeakSet(), _PlannerBucketListCommand_i
     });
 }, _PlannerBucketListCommand_initValidators = function _PlannerBucketListCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!args.options.planId && !args.options.planName && !args.options.planTitle) {
-            return 'Specify either planId or planTitle';
-        }
-        if (args.options.planId && (args.options.planName || args.options.planTitle)) {
-            return 'Specify either planId or planTitle but not both';
-        }
         if ((args.options.planName || args.options.planTitle) && !args.options.ownerGroupId && !args.options.ownerGroupName) {
             return 'Specify either ownerGroupId or ownerGroupName when using planTitle';
         }
@@ -114,6 +109,8 @@ _PlannerBucketListCommand_instances = new WeakSet(), _PlannerBucketListCommand_i
         }
         return true;
     }));
+}, _PlannerBucketListCommand_initOptionSets = function _PlannerBucketListCommand_initOptionSets() {
+    this.optionSets.push(['planId', 'planTitle']);
 };
 module.exports = new PlannerBucketListCommand();
 //# sourceMappingURL=bucket-list.js.map