@pnp/cli-microsoft365 6.0.0-beta.ed1cc4a → 6.0.0-beta.f1889e3

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/mail/mail-send.js

@@ -15,6 +15,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _OutlookMailSendCommand_instances, _OutlookMailSendCommand_initTelemetry, _OutlookMailSendCommand_initOptions, _OutlookMailSendCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
+const Auth_1 = require("../../../../Auth");
+const Command_1 = require("../../../../Command");
 const request_1 = require("../../../../request");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
@@ -30,15 +32,16 @@ class OutlookMailSendCommand extends GraphCommand_1.default {
         return commands_1.default.MAIL_SEND;
     }
     get description() {
-        return 'Sends e-mail on behalf of the current user';
-    }
-    alias() {
-        return [commands_1.default.SENDMAIL];
+        return 'Sends an e-mail';
     }
     commandAction(logger, args, cb) {
         const bodyContents = args.options.bodyContents;
+        const isAppOnlyAuth = Auth_1.Auth.isAppOnlyAuth(Auth_1.default.service.accessTokens[this.resource].accessToken);
+        if (isAppOnlyAuth === true && !args.options.sender) {
+            return cb(new Command_1.CommandError(`Specify a upn or user id in the 'sender' option when using app only authentication.`));
+        }
         const requestOptions = {
-            url: `${this.resource}/v1.0/me/sendMail`,
+            url: `${this.resource}/v1.0/${args.options.sender ? 'users/' + encodeURIComponent(args.options.sender) : 'me'}/sendMail`,
             headers: {
                 accept: 'application/json;odata.metadata=none',
                 'content-type': 'application/json'
@@ -62,6 +65,13 @@ class OutlookMailSendCommand extends GraphCommand_1.default {
                 saveToSentItems: args.options.saveToSentItems
             }
         };
+        if (args.options.mailbox) {
+            requestOptions.data.message.from = {
+                emailAddress: {
+                    address: args.options.mailbox
+                }
+            };
+        }
         request_1.default
             .post(requestOptions)
             .then(_ => cb(), (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
@@ -72,7 +82,9 @@ _OutlookMailSendCommand_instances = new WeakSet(), _OutlookMailSendCommand_initT
         Object.assign(this.telemetryProperties, {
             bodyContents: typeof args.options.bodyContents !== 'undefined',
             bodyContentType: args.options.bodyContentType,
-            saveToSentItems: args.options.saveToSentItems
+            saveToSentItems: args.options.saveToSentItems,
+            mailbox: typeof args.options.mailbox !== 'undefined',
+            sender: typeof args.options.sender !== 'undefined'
         });
     });
 }, _OutlookMailSendCommand_initOptions = function _OutlookMailSendCommand_initOptions() {
@@ -80,6 +92,10 @@ _OutlookMailSendCommand_instances = new WeakSet(), _OutlookMailSendCommand_initT
         option: '-s, --subject <subject>'
     }, {
         option: '-t, --to <to>'
+    }, {
+        option: '--sender [sender]'
+    }, {
+        option: '-m, --mailbox [mailbox]'
     }, {
         option: '--bodyContents <bodyContents>'
     }, {

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/outlook/commands.js

@@ -17,7 +17,6 @@ exports.default = {
     REPORT_MAILBOXUSAGEQUOTASTATUSMAILBOXCOUNTS: `${prefix} report mailboxusagequotastatusmailboxcounts`,
     REPORT_MAILBOXUSAGESTORAGE: `${prefix} report mailboxusagestorage`,
     ROOM_LIST: `${prefix} room list`,
-    ROOMLIST_LIST: `${prefix} roomlist list`,
-    SENDMAIL: `${prefix} sendmail`
+    ROOMLIST_LIST: `${prefix} roomlist list`
 };
 //# sourceMappingURL=commands.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;
@@ -110,12 +111,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.planTitle) {
-            return 'Specify either planId or planTitle';
-        }
-        if (args.options.planId && args.options.planTitle) {
-            return 'Specify either planId or planTitle but not both';
-        }
         if (args.options.planTitle && !args.options.ownerGroupId && !args.options.ownerGroupName) {
             return 'Specify either ownerGroupId or ownerGroupName when using planTitle';
         }
@@ -127,6 +122,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;
@@ -90,12 +91,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.planTitle) {
-            return 'Specify either planId or planTitle';
-        }
-        if (args.options.planId && args.options.planTitle) {
-            return 'Specify either planId or planTitle but not both';
-        }
         if (args.options.planTitle && !args.options.ownerGroupId && !args.options.ownerGroupName) {
             return 'Specify either ownerGroupId or ownerGroupName when using planTitle';
         }
@@ -107,6 +102,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

package/dist/m365/planner/commands/plan/plan-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 _PlannerPlanAddCommand_instances, _PlannerPlanAddCommand_initTelemetry, _PlannerPlanAddCommand_initOptions, _PlannerPlanAddCommand_initValidators;
+var _PlannerPlanAddCommand_instances, _PlannerPlanAddCommand_initTelemetry, _PlannerPlanAddCommand_initOptions, _PlannerPlanAddCommand_initValidators, _PlannerPlanAddCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const Auth_1 = require("../../../../Auth");
 const request_1 = require("../../../../request");
@@ -27,6 +27,7 @@ class PlannerPlanAddCommand extends GraphCommand_1.default {
         __classPrivateFieldGet(this, _PlannerPlanAddCommand_instances, "m", _PlannerPlanAddCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _PlannerPlanAddCommand_instances, "m", _PlannerPlanAddCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _PlannerPlanAddCommand_instances, "m", _PlannerPlanAddCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _PlannerPlanAddCommand_instances, "m", _PlannerPlanAddCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.PLAN_ADD;
@@ -175,12 +176,6 @@ _PlannerPlanAddCommand_instances = new WeakSet(), _PlannerPlanAddCommand_initTel
     });
 }, _PlannerPlanAddCommand_initValidators = function _PlannerPlanAddCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!args.options.ownerGroupId && !args.options.ownerGroupName) {
-            return 'Specify either ownerGroupId or ownerGroupName';
-        }
-        if (args.options.ownerGroupId && args.options.ownerGroupName) {
-            return 'Specify either ownerGroupId or ownerGroupName but not both';
-        }
         if (args.options.ownerGroupId && !utils_1.validation.isValidGuid(args.options.ownerGroupId)) {
             return `${args.options.ownerGroupId} is not a valid GUID`;
         }
@@ -192,6 +187,8 @@ _PlannerPlanAddCommand_instances = new WeakSet(), _PlannerPlanAddCommand_initTel
         }
         return true;
     }));
+}, _PlannerPlanAddCommand_initOptionSets = function _PlannerPlanAddCommand_initOptionSets() {
+    this.optionSets.push(['ownerGroupId', 'ownerGroupName']);
 };
 module.exports = new PlannerPlanAddCommand();
 //# sourceMappingURL=plan-add.js.map

package/dist/m365/planner/commands/plan/plan-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 _PlannerPlanListCommand_instances, _PlannerPlanListCommand_initTelemetry, _PlannerPlanListCommand_initOptions, _PlannerPlanListCommand_initValidators;
+var _PlannerPlanListCommand_instances, _PlannerPlanListCommand_initTelemetry, _PlannerPlanListCommand_initOptions, _PlannerPlanListCommand_initValidators, _PlannerPlanListCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const Auth_1 = require("../../../../Auth");
 const utils_1 = require("../../../../utils");
@@ -28,6 +28,7 @@ class PlannerPlanListCommand extends GraphCommand_1.default {
         __classPrivateFieldGet(this, _PlannerPlanListCommand_instances, "m", _PlannerPlanListCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _PlannerPlanListCommand_instances, "m", _PlannerPlanListCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _PlannerPlanListCommand_instances, "m", _PlannerPlanListCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _PlannerPlanListCommand_instances, "m", _PlannerPlanListCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.PLAN_LIST;
@@ -77,17 +78,13 @@ _PlannerPlanListCommand_instances = new WeakSet(), _PlannerPlanListCommand_initT
     });
 }, _PlannerPlanListCommand_initValidators = function _PlannerPlanListCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!args.options.ownerGroupId && !args.options.ownerGroupName) {
-            return 'Specify either ownerGroupId or ownerGroupName';
-        }
-        if (args.options.ownerGroupId && args.options.ownerGroupName) {
-            return 'Specify either ownerGroupId or ownerGroupName but not both';
-        }
         if (args.options.ownerGroupId && !utils_1.validation.isValidGuid(args.options.ownerGroupId)) {
             return `${args.options.ownerGroupId} is not a valid GUID`;
         }
         return true;
     }));
+}, _PlannerPlanListCommand_initOptionSets = function _PlannerPlanListCommand_initOptionSets() {
+    this.optionSets.push(['ownerGroupId', 'ownerGroupName']);
 };
 module.exports = new PlannerPlanListCommand();
 //# sourceMappingURL=plan-list.js.map

package/dist/m365/planner/commands/task/task-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 _PlannerTaskAddCommand_instances, _PlannerTaskAddCommand_initTelemetry, _PlannerTaskAddCommand_initOptions, _PlannerTaskAddCommand_initValidators;
+var _PlannerTaskAddCommand_instances, _PlannerTaskAddCommand_initTelemetry, _PlannerTaskAddCommand_initOptions, _PlannerTaskAddCommand_initValidators, _PlannerTaskAddCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const Auth_1 = require("../../../../Auth");
 const request_1 = require("../../../../request");
@@ -32,6 +32,7 @@ class PlannerTaskAddCommand extends GraphCommand_1.default {
         __classPrivateFieldGet(this, _PlannerTaskAddCommand_instances, "m", _PlannerTaskAddCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _PlannerTaskAddCommand_instances, "m", _PlannerTaskAddCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _PlannerTaskAddCommand_instances, "m", _PlannerTaskAddCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _PlannerTaskAddCommand_instances, "m", _PlannerTaskAddCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.TASK_ADD;
@@ -249,12 +250,6 @@ _PlannerTaskAddCommand_instances = new WeakSet(), _PlannerTaskAddCommand_initTel
     }, { option: '--orderHint [orderHint]' }, { option: '--priority [priority]', autocomplete: taskPriority_1.taskPriority.priorityValues });
 }, _PlannerTaskAddCommand_initValidators = function _PlannerTaskAddCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!args.options.planId && !args.options.planTitle) {
-            return 'Specify either planId or planTitle';
-        }
-        if (args.options.planId && args.options.planTitle) {
-            return 'Specify either planId or planTitle but not both';
-        }
         if (args.options.planTitle && !args.options.ownerGroupId && !args.options.ownerGroupName) {
             return 'Specify either ownerGroupId or ownerGroupName when using planTitle';
         }
@@ -264,12 +259,6 @@ _PlannerTaskAddCommand_instances = new WeakSet(), _PlannerTaskAddCommand_initTel
         if (args.options.ownerGroupId && !utils_1.validation.isValidGuid(args.options.ownerGroupId)) {
             return `${args.options.ownerGroupId} is not a valid GUID`;
         }
-        if (!args.options.bucketId && !args.options.bucketName) {
-            return 'Specify either bucketId or bucketName';
-        }
-        if (args.options.bucketId && args.options.bucketName) {
-            return 'Specify either bucketId or bucketName but not both';
-        }
         if (args.options.startDateTime && !utils_1.validation.isValidISODateTime(args.options.startDateTime)) {
             return 'The startDateTime is not a valid ISO date string';
         }
@@ -306,6 +295,8 @@ _PlannerTaskAddCommand_instances = new WeakSet(), _PlannerTaskAddCommand_initTel
         }
         return true;
     }));
+}, _PlannerTaskAddCommand_initOptionSets = function _PlannerTaskAddCommand_initOptionSets() {
+    this.optionSets.push(['planId', 'planTitle'], ['bucketId', 'bucketName']);
 };
 module.exports = new PlannerTaskAddCommand();
 //# sourceMappingURL=task-add.js.map

package/dist/m365/planner/commands/task/task-get.js

@@ -166,6 +166,13 @@ _PlannerTaskGetCommand_instances = new WeakSet(), _PlannerTaskGetCommand_initTel
     this.options.unshift({ option: '-i, --id [id]' }, { option: '-t, --title [title]' }, { option: '--bucketId [bucketId]' }, { option: '--bucketName [bucketName]' }, { option: '--planId [planId]' }, { option: '--planTitle [planTitle]' }, { option: '--ownerGroupId [ownerGroupId]' }, { option: '--ownerGroupName [ownerGroupName]' });
 }, _PlannerTaskGetCommand_initValidators = function _PlannerTaskGetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        if (args.options.id) {
+            if (args.options.bucketId || args.options.bucketName ||
+                args.options.planId || args.options.planName || args.options.planTitle ||
+                args.options.ownerGroupId || args.options.ownerGroupName) {
+                return 'Don\'t specify bucketId, bucketName, planId, planTitle, ownerGroupId or ownerGroupName when using id';
+            }
+        }
         if (args.options.title && !args.options.bucketId && !args.options.bucketName) {
             return 'Specify either bucketId or bucketName when using title';
         }

package/dist/m365/pp/commands/environment/environment-list.js

@@ -64,7 +64,7 @@ _PpEnvironmentListCommand_instances = new WeakSet(), _PpEnvironmentListCommand_i
     });
 }, _PpEnvironmentListCommand_initOptions = function _PpEnvironmentListCommand_initOptions() {
     this.options.unshift({
-        option: '-a, --asAdmin [teamId]'
+        option: '-a, --asAdmin'
     });
 };
 module.exports = new PpEnvironmentListCommand();