@pnp/cli-microsoft365 6.0.0-beta.38c66cf → 6.0.0-beta.3a04435

package/dist/m365/planner/commands/plan/plan-list.js

@@ -1,41 +1,62 @@
 "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 _PlannerPlanListCommand_instances, _PlannerPlanListCommand_initTelemetry, _PlannerPlanListCommand_initOptions, _PlannerPlanListCommand_initValidators, _PlannerPlanListCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
-const utils_1 = require("../../../../utils");
 const Auth_1 = require("../../../../Auth");
+const accessToken_1 = require("../../../../utils/accessToken");
+const validation_1 = require("../../../../utils/validation");
+const aadGroup_1 = require("../../../../utils/aadGroup");
 const planner_1 = require("../../../../utils/planner");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
-const aadGroup_1 = require("../../../../utils/aadGroup");
 class PlannerPlanListCommand extends GraphCommand_1.default {
+    constructor() {
+        super();
+        _PlannerPlanListCommand_instances.add(this);
+        __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;
     }
     get description() {
         return 'Returns a list of plans associated with a specified group';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.ownerGroupId = typeof args.options.ownerGroupId !== 'undefined';
-        telemetryProps.ownerGroupName = typeof args.options.ownerGroupName !== 'undefined';
-        return telemetryProps;
-    }
     defaultProperties() {
         return ['id', 'title', 'createdDateTime', 'owner'];
     }
-    commandAction(logger, args, cb) {
-        if (utils_1.accessToken.isAppOnlyAccessToken(Auth_1.default.service.accessTokens[this.resource].accessToken)) {
-            this.handleError('This command does not support application permissions.', logger, cb);
-            return;
-        }
-        this
-            .getGroupId(args)
-            .then((groupId) => planner_1.planner.getPlansByGroupId(groupId))
-            .then((res) => {
-            if (res && res.length > 0) {
-                logger.log(res);
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (accessToken_1.accessToken.isAppOnlyAccessToken(Auth_1.default.service.accessTokens[this.resource].accessToken)) {
+                this.handleError('This command does not support application permissions.');
+                return;
+            }
+            try {
+                const groupId = yield this.getGroupId(args);
+                const result = yield planner_1.planner.getPlansByGroupId(groupId);
+                if (result && result.length > 0) {
+                    logger.log(result);
+                }
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+        });
     }
     getGroupId(args) {
         if (args.options.ownerGroupId) {
@@ -45,30 +66,29 @@ class PlannerPlanListCommand extends GraphCommand_1.default {
             .getGroupByDisplayName(args.options.ownerGroupName)
             .then(group => group.id);
     }
-    options() {
-        const options = [
-            {
-                option: "--ownerGroupId [ownerGroupId]"
-            },
-            {
-                option: "--ownerGroupName [ownerGroupName]"
-            }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
-        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)) {
+}
+_PlannerPlanListCommand_instances = new WeakSet(), _PlannerPlanListCommand_initTelemetry = function _PlannerPlanListCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            ownerGroupId: typeof args.options.ownerGroupId !== 'undefined',
+            ownerGroupName: typeof args.options.ownerGroupName !== 'undefined'
+        });
+    });
+}, _PlannerPlanListCommand_initOptions = function _PlannerPlanListCommand_initOptions() {
+    this.options.unshift({
+        option: "--ownerGroupId [ownerGroupId]"
+    }, {
+        option: "--ownerGroupName [ownerGroupName]"
+    });
+}, _PlannerPlanListCommand_initValidators = function _PlannerPlanListCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        if (args.options.ownerGroupId && !validation_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/plan/plan-remove.js

@@ -8,72 +8,75 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         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 _PlannerPlanRemoveCommand_instances, _PlannerPlanRemoveCommand_initTelemetry, _PlannerPlanRemoveCommand_initOptions, _PlannerPlanRemoveCommand_initValidators, _PlannerPlanRemoveCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const Auth_1 = require("../../../../Auth");
-const cli_1 = require("../../../../cli");
+const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const accessToken_1 = require("../../../../utils/accessToken");
+const validation_1 = require("../../../../utils/validation");
 const aadGroup_1 = require("../../../../utils/aadGroup");
 const planner_1 = require("../../../../utils/planner");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class PlannerPlanRemoveCommand extends GraphCommand_1.default {
+    constructor() {
+        super();
+        _PlannerPlanRemoveCommand_instances.add(this);
+        __classPrivateFieldGet(this, _PlannerPlanRemoveCommand_instances, "m", _PlannerPlanRemoveCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _PlannerPlanRemoveCommand_instances, "m", _PlannerPlanRemoveCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _PlannerPlanRemoveCommand_instances, "m", _PlannerPlanRemoveCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _PlannerPlanRemoveCommand_instances, "m", _PlannerPlanRemoveCommand_initOptionSets).call(this);
+    }
     get name() {
         return commands_1.default.PLAN_REMOVE;
     }
     get description() {
         return 'Removes the Microsoft Planner plan';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.id = typeof args.options.id !== 'undefined';
-        telemetryProps.title = typeof args.options.title !== 'undefined';
-        telemetryProps.ownerGroupId = typeof args.options.ownerGroupId !== 'undefined';
-        telemetryProps.ownerGroupName = typeof args.options.ownerGroupName !== 'undefined';
-        telemetryProps.confirm = !!args.options.confirm;
-        return telemetryProps;
-    }
-    commandAction(logger, args, cb) {
-        if (utils_1.accessToken.isAppOnlyAccessToken(Auth_1.default.service.accessTokens[this.resource].accessToken)) {
-            this.handleError('This command does not support application permissions.', logger, cb);
-            return;
-        }
-        const removePlan = () => __awaiter(this, void 0, void 0, function* () {
-            try {
-                const plan = yield this.getPlan(args);
-                const requestOptions = {
-                    url: `${this.resource}/v1.0/planner/plans/${plan.id}`,
-                    headers: {
-                        accept: 'application/json;odata.metadata=none',
-                        'if-match': plan['@odata.etag']
-                    },
-                    responseType: 'json'
-                };
-                yield request_1.default.delete(requestOptions);
-                cb();
-            }
-            catch (err) {
-                this.handleRejectedODataJsonPromise(err, logger, cb);
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (accessToken_1.accessToken.isAppOnlyAccessToken(Auth_1.default.service.accessTokens[this.resource].accessToken)) {
+                this.handleError('This command does not support application permissions.');
+                return;
             }
-        });
-        if (args.options.confirm) {
-            removePlan();
-        }
-        else {
-            cli_1.Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove the plan ${args.options.id || args.options.title}?`
-            }, (result) => {
-                if (!result.continue) {
-                    cb();
+            const removePlan = () => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    const plan = yield this.getPlan(args);
+                    const requestOptions = {
+                        url: `${this.resource}/v1.0/planner/plans/${plan.id}`,
+                        headers: {
+                            accept: 'application/json;odata.metadata=none',
+                            'if-match': plan['@odata.etag']
+                        },
+                        responseType: 'json'
+                    };
+                    yield request_1.default.delete(requestOptions);
                 }
-                else {
-                    removePlan();
+                catch (err) {
+                    this.handleRejectedODataJsonPromise(err);
                 }
             });
-        }
+            if (args.options.confirm) {
+                yield removePlan();
+            }
+            else {
+                const result = yield Cli_1.Cli.prompt({
+                    type: 'confirm',
+                    name: 'continue',
+                    default: false,
+                    message: `Are you sure you want to remove the plan ${args.options.id || args.options.title}?`
+                });
+                if (result.continue) {
+                    yield removePlan();
+                }
+            }
+        });
     }
     getPlan(args) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -95,31 +98,31 @@ class PlannerPlanRemoveCommand extends GraphCommand_1.default {
             return group.id;
         });
     }
-    optionSets() {
-        return [['id', 'title']];
-    }
-    options() {
-        const options = [
-            {
-                option: '-i, --id [id]'
-            },
-            {
-                option: '-t, --title [title]'
-            },
-            {
-                option: '--ownerGroupId [ownerGroupId]'
-            },
-            {
-                option: '--ownerGroupName [ownerGroupName]'
-            },
-            {
-                option: '--confirm'
-            }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
+}
+_PlannerPlanRemoveCommand_instances = new WeakSet(), _PlannerPlanRemoveCommand_initTelemetry = function _PlannerPlanRemoveCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            id: typeof args.options.id !== 'undefined',
+            title: typeof args.options.title !== 'undefined',
+            ownerGroupId: typeof args.options.ownerGroupId !== 'undefined',
+            ownerGroupName: typeof args.options.ownerGroupName !== 'undefined',
+            confirm: !!args.options.confirm
+        });
+    });
+}, _PlannerPlanRemoveCommand_initOptions = function _PlannerPlanRemoveCommand_initOptions() {
+    this.options.unshift({
+        option: '-i, --id [id]'
+    }, {
+        option: '-t, --title [title]'
+    }, {
+        option: '--ownerGroupId [ownerGroupId]'
+    }, {
+        option: '--ownerGroupName [ownerGroupName]'
+    }, {
+        option: '--confirm'
+    });
+}, _PlannerPlanRemoveCommand_initValidators = function _PlannerPlanRemoveCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         if (args.options.title) {
             if (!args.options.ownerGroupId && !args.options.ownerGroupName) {
                 return 'Specify either ownerGroupId or ownerGroupName';
@@ -127,7 +130,7 @@ class PlannerPlanRemoveCommand extends GraphCommand_1.default {
             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)) {
+            if (args.options.ownerGroupId && !validation_1.validation.isValidGuid(args.options.ownerGroupId)) {
                 return `${args.options.ownerGroupId} is not a valid GUID`;
             }
         }
@@ -135,7 +138,9 @@ class PlannerPlanRemoveCommand extends GraphCommand_1.default {
             return 'Don\'t specify ownerGroupId or ownerGroupName when using id';
         }
         return true;
-    }
-}
+    }));
+}, _PlannerPlanRemoveCommand_initOptionSets = function _PlannerPlanRemoveCommand_initOptionSets() {
+    this.optionSets.push(['id', 'title']);
+};
 module.exports = new PlannerPlanRemoveCommand();
 //# sourceMappingURL=plan-remove.js.map

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

@@ -1,8 +1,25 @@
 "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 _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");
-const utils_1 = require("../../../../utils");
+const accessToken_1 = require("../../../../utils/accessToken");
+const formatting_1 = require("../../../../utils/formatting");
+const validation_1 = require("../../../../utils/validation");
 const aadGroup_1 = require("../../../../utils/aadGroup");
 const planner_1 = require("../../../../utils/planner");
 const GraphCommand_1 = require("../../../base/GraphCommand");
@@ -10,9 +27,14 @@ const commands_1 = require("../../commands");
 const taskPriority_1 = require("../../taskPriority");
 class PlannerTaskAddCommand extends GraphCommand_1.default {
     constructor() {
-        super(...arguments);
+        super();
+        _PlannerTaskAddCommand_instances.add(this);
         this.allowedAppliedCategories = ['category1', 'category2', 'category3', 'category4', 'category5', 'category6'];
         this.allowedPreviewTypes = ['automatic', 'nopreview', 'checklist', 'description', 'reference'];
+        __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;
@@ -20,76 +42,45 @@ class PlannerTaskAddCommand extends GraphCommand_1.default {
     get description() {
         return 'Adds a new Microsoft Planner Task';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.planId = typeof args.options.planId !== 'undefined';
-        telemetryProps.planName = typeof args.options.planName !== 'undefined';
-        telemetryProps.planTitle = typeof args.options.planTitle !== 'undefined';
-        telemetryProps.ownerGroupId = typeof args.options.ownerGroupId !== 'undefined';
-        telemetryProps.ownerGroupName = typeof args.options.ownerGroupName !== 'undefined';
-        telemetryProps.bucketId = typeof args.options.bucketId !== 'undefined';
-        telemetryProps.bucketName = typeof args.options.bucketName !== 'undefined';
-        telemetryProps.startDateTime = typeof args.options.startDateTime !== 'undefined';
-        telemetryProps.dueDateTime = typeof args.options.dueDateTime !== 'undefined';
-        telemetryProps.percentComplete = typeof args.options.percentComplete !== 'undefined';
-        telemetryProps.assignedToUserIds = typeof args.options.assignedToUserIds !== 'undefined';
-        telemetryProps.assignedToUserNames = typeof args.options.assignedToUserNames !== 'undefined';
-        telemetryProps.assigneePriority = typeof args.options.assigneePriority !== 'undefined';
-        telemetryProps.description = typeof args.options.description !== 'undefined';
-        telemetryProps.appliedCategories = typeof args.options.appliedCategories !== 'undefined';
-        telemetryProps.previewType = typeof args.options.previewType !== 'undefined';
-        telemetryProps.orderHint = typeof args.options.orderHint !== 'undefined';
-        telemetryProps.priority = typeof args.options.priority !== 'undefined';
-        return telemetryProps;
-    }
-    commandAction(logger, args, cb) {
-        if (args.options.planName) {
-            args.options.planTitle = args.options.planName;
-            this.warn(logger, `Option 'planName' is deprecated. Please use 'planTitle' instead`);
-        }
-        if (utils_1.accessToken.isAppOnlyAccessToken(Auth_1.default.service.accessTokens[this.resource].accessToken)) {
-            this.handleError('This command does not support application permissions.', logger, cb);
-            return;
-        }
-        this
-            .getPlanId(args)
-            .then(planId => {
-            this.planId = planId;
-            return this.getBucketId(args, planId);
-        })
-            .then(bucketId => {
-            this.bucketId = bucketId;
-            return this.generateUserAssignments(args);
-        })
-            .then(assignments => {
-            const appliedCategories = this.generateAppliedCategories(args.options);
-            const requestOptions = {
-                url: `${this.resource}/v1.0/planner/tasks`,
-                headers: {
-                    accept: 'application/json;odata.metadata=none'
-                },
-                responseType: 'json',
-                data: {
-                    planId: this.planId,
-                    bucketId: this.bucketId,
-                    title: args.options.title,
-                    startDateTime: args.options.startDateTime,
-                    dueDateTime: args.options.dueDateTime,
-                    percentComplete: args.options.percentComplete,
-                    assignments: assignments,
-                    orderHint: args.options.orderHint,
-                    assigneePriority: args.options.assigneePriority,
-                    appliedCategories: appliedCategories,
-                    priority: taskPriority_1.taskPriority.getPriorityValue(args.options.priority)
-                }
-            };
-            return request_1.default.post(requestOptions);
-        })
-            .then(newTask => this.updateTaskDetails(args.options, newTask))
-            .then((res) => {
-            logger.log(res);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (accessToken_1.accessToken.isAppOnlyAccessToken(Auth_1.default.service.accessTokens[this.resource].accessToken)) {
+                this.handleError('This command does not support application permissions.');
+                return;
+            }
+            try {
+                this.planId = yield this.getPlanId(args);
+                this.bucketId = yield this.getBucketId(args, this.planId);
+                const assignments = yield this.generateUserAssignments(args);
+                const appliedCategories = this.generateAppliedCategories(args.options);
+                const requestOptions = {
+                    url: `${this.resource}/v1.0/planner/tasks`,
+                    headers: {
+                        accept: 'application/json;odata.metadata=none'
+                    },
+                    responseType: 'json',
+                    data: {
+                        planId: this.planId,
+                        bucketId: this.bucketId,
+                        title: args.options.title,
+                        startDateTime: args.options.startDateTime,
+                        dueDateTime: args.options.dueDateTime,
+                        percentComplete: args.options.percentComplete,
+                        assignments: assignments,
+                        orderHint: args.options.orderHint,
+                        assigneePriority: args.options.assigneePriority,
+                        appliedCategories: appliedCategories,
+                        priority: taskPriority_1.taskPriority.getPriorityValue(args.options.priority)
+                    }
+                };
+                const newTask = yield request_1.default.post(requestOptions);
+                const result = yield this.updateTaskDetails(args.options, newTask);
+                logger.log(result);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
     getTaskDetailsEtag(taskId) {
         const requestOptions = {
@@ -201,7 +192,7 @@ class PlannerTaskAddCommand extends GraphCommand_1.default {
         let userIds = [];
         const promises = userArr.map(user => {
             const requestOptions = {
-                url: `${this.resource}/v1.0/users?$filter=userPrincipalName eq '${utils_1.formatting.encodeQueryParameter(user)}'&$select=id,userPrincipalName`,
+                url: `${this.resource}/v1.0/users?$filter=userPrincipalName eq '${formatting_1.formatting.encodeQueryParameter(user)}'&$select=id,userPrincipalName`,
                 headers: {
                     'content-type': 'application/json'
                 },
@@ -223,63 +214,52 @@ class PlannerTaskAddCommand extends GraphCommand_1.default {
             return Promise.resolve(userIds);
         });
     }
-    options() {
-        const options = [
-            { option: '-t, --title <title>' },
-            { option: '--planId [planId]' },
-            { option: '--planName [planName]' },
-            { option: '--planTitle [planTitle]' },
-            { option: '--ownerGroupId [ownerGroupId]' },
-            { option: '--ownerGroupName [ownerGroupName]' },
-            { option: '--bucketId [bucketId]' },
-            { option: '--bucketName [bucketName]' },
-            { option: '--startDateTime [startDateTime]' },
-            { option: '--dueDateTime [dueDateTime]' },
-            { option: '--percentComplete [percentComplete]' },
-            { option: '--assignedToUserIds [assignedToUserIds]' },
-            { option: '--assignedToUserNames [assignedToUserNames]' },
-            { option: '--assigneePriority [assigneePriority]' },
-            { option: '--description [description]' },
-            {
-                option: '--appliedCategories [appliedCategories]',
-                autocomplete: this.allowedAppliedCategories
-            },
-            {
-                option: '--previewType [previewType]',
-                autocomplete: this.allowedPreviewTypes
-            },
-            { option: '--orderHint [orderHint]' },
-            { option: '--priority [priority]', autocomplete: taskPriority_1.taskPriority.priorityValues }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
-        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) {
+}
+_PlannerTaskAddCommand_instances = new WeakSet(), _PlannerTaskAddCommand_initTelemetry = function _PlannerTaskAddCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            planId: typeof args.options.planId !== 'undefined',
+            planTitle: typeof args.options.planTitle !== 'undefined',
+            ownerGroupId: typeof args.options.ownerGroupId !== 'undefined',
+            ownerGroupName: typeof args.options.ownerGroupName !== 'undefined',
+            bucketId: typeof args.options.bucketId !== 'undefined',
+            bucketName: typeof args.options.bucketName !== 'undefined',
+            startDateTime: typeof args.options.startDateTime !== 'undefined',
+            dueDateTime: typeof args.options.dueDateTime !== 'undefined',
+            percentComplete: typeof args.options.percentComplete !== 'undefined',
+            assignedToUserIds: typeof args.options.assignedToUserIds !== 'undefined',
+            assignedToUserNames: typeof args.options.assignedToUserNames !== 'undefined',
+            assigneePriority: typeof args.options.assigneePriority !== 'undefined',
+            description: typeof args.options.description !== 'undefined',
+            appliedCategories: typeof args.options.appliedCategories !== 'undefined',
+            previewType: typeof args.options.previewType !== 'undefined',
+            orderHint: typeof args.options.orderHint !== 'undefined',
+            priority: typeof args.options.priority !== 'undefined'
+        });
+    });
+}, _PlannerTaskAddCommand_initOptions = function _PlannerTaskAddCommand_initOptions() {
+    this.options.unshift({ option: '-t, --title <title>' }, { option: '--planId [planId]' }, { option: '--planTitle [planTitle]' }, { option: '--ownerGroupId [ownerGroupId]' }, { option: '--ownerGroupName [ownerGroupName]' }, { option: '--bucketId [bucketId]' }, { option: '--bucketName [bucketName]' }, { option: '--startDateTime [startDateTime]' }, { option: '--dueDateTime [dueDateTime]' }, { option: '--percentComplete [percentComplete]' }, { option: '--assignedToUserIds [assignedToUserIds]' }, { option: '--assignedToUserNames [assignedToUserNames]' }, { option: '--assigneePriority [assigneePriority]' }, { option: '--description [description]' }, {
+        option: '--appliedCategories [appliedCategories]',
+        autocomplete: this.allowedAppliedCategories
+    }, {
+        option: '--previewType [previewType]',
+        autocomplete: this.allowedPreviewTypes
+    }, { 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.planTitle && !args.options.ownerGroupId && !args.options.ownerGroupName) {
             return 'Specify either ownerGroupId or ownerGroupName when using planTitle';
         }
-        if ((args.options.planName || args.options.planTitle) && args.options.ownerGroupId && args.options.ownerGroupName) {
+        if (args.options.planTitle && args.options.ownerGroupId && args.options.ownerGroupName) {
             return 'Specify either ownerGroupId or ownerGroupName when using planTitle but not both';
         }
-        if (args.options.ownerGroupId && !utils_1.validation.isValidGuid(args.options.ownerGroupId)) {
+        if (args.options.ownerGroupId && !validation_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)) {
+        if (args.options.startDateTime && !validation_1.validation.isValidISODateTime(args.options.startDateTime)) {
             return 'The startDateTime is not a valid ISO date string';
         }
-        if (args.options.dueDateTime && !utils_1.validation.isValidISODateTime(args.options.dueDateTime)) {
+        if (args.options.dueDateTime && !validation_1.validation.isValidISODateTime(args.options.dueDateTime)) {
             return 'The dueDateTime is not a valid ISO date string';
         }
         if (args.options.percentComplete && isNaN(args.options.percentComplete)) {
@@ -288,7 +268,7 @@ class PlannerTaskAddCommand extends GraphCommand_1.default {
         if (args.options.percentComplete && (args.options.percentComplete < 0 || args.options.percentComplete > 100)) {
             return `percentComplete should be between 0 and 100`;
         }
-        if (args.options.assignedToUserIds && !utils_1.validation.isValidGuidArray(args.options.assignedToUserIds.split(','))) {
+        if (args.options.assignedToUserIds && !validation_1.validation.isValidGuidArray(args.options.assignedToUserIds.split(','))) {
             return 'assignedToUserIds contains invalid GUID';
         }
         if (args.options.assignedToUserIds && args.options.assignedToUserNames) {
@@ -311,7 +291,9 @@ class PlannerTaskAddCommand extends GraphCommand_1.default {
             }
         }
         return true;
-    }
-}
+    }));
+}, _PlannerTaskAddCommand_initOptionSets = function _PlannerTaskAddCommand_initOptionSets() {
+    this.optionSets.push(['planId', 'planTitle'], ['bucketId', 'bucketName']);
+};
 module.exports = new PlannerTaskAddCommand();
 //# sourceMappingURL=task-add.js.map