@pnp/cli-microsoft365 6.0.0-beta.ff232be → 6.1.0-beta.11542c0

package/dist/m365/planner/commands/task/task-checklistitem-remove.js

@@ -1,7 +1,23 @@
 "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 _PlannerTaskChecklistItemRemoveCommand_instances, _PlannerTaskChecklistItemRemoveCommand_initTelemetry, _PlannerTaskChecklistItemRemoveCommand_initOptions;
 Object.defineProperty(exports, "__esModule", { value: true });
-const cli_1 = require("../../../../cli");
+const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
+const formatting_1 = require("../../../../utils/formatting");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class PlannerTaskChecklistItemRemoveCommand extends GraphCommand_1.default {
@@ -11,59 +27,61 @@ class PlannerTaskChecklistItemRemoveCommand extends GraphCommand_1.default {
     get description() {
         return 'Removes the checklist item from the planner task';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.confirm = (!(!args.options.confirm)).toString();
-        return telemetryProps;
+    constructor() {
+        super();
+        _PlannerTaskChecklistItemRemoveCommand_instances.add(this);
+        __classPrivateFieldGet(this, _PlannerTaskChecklistItemRemoveCommand_instances, "m", _PlannerTaskChecklistItemRemoveCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _PlannerTaskChecklistItemRemoveCommand_instances, "m", _PlannerTaskChecklistItemRemoveCommand_initOptions).call(this);
     }
-    commandAction(logger, args, cb) {
-        if (args.options.confirm) {
-            this.removeChecklistitem(logger, args, cb);
-        }
-        else {
-            cli_1.Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove the checklist item with id ${args.options.id} from the planner task?`
-            }, (result) => {
-                if (!result.continue) {
-                    cb();
-                }
-                else {
-                    this.removeChecklistitem(logger, args, cb);
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (args.options.confirm) {
+                yield this.removeChecklistitem(args);
+            }
+            else {
+                const result = yield Cli_1.Cli.prompt({
+                    type: 'confirm',
+                    name: 'continue',
+                    default: false,
+                    message: `Are you sure you want to remove the checklist item with id ${args.options.id} from the planner task?`
+                });
+                if (result.continue) {
+                    yield this.removeChecklistitem(args);
                 }
-            });
-        }
-    }
-    removeChecklistitem(logger, args, cb) {
-        this
-            .getTaskDetails(args.options.taskId)
-            .then(task => {
-            if (!task.checklist || !task.checklist[args.options.id]) {
-                return Promise.reject(`The specified checklist item with id ${args.options.id} does not exist`);
             }
-            const requestOptionsTaskDetails = {
-                url: `${this.resource}/v1.0/planner/tasks/${args.options.taskId}/details`,
-                headers: {
-                    'accept': 'application/json;odata.metadata=none',
-                    'If-Match': task['@odata.etag'],
-                    'Prefer': 'return=representation'
-                },
-                responseType: 'json',
-                data: {
-                    checklist: {
-                        [args.options.id]: null
-                    }
+        });
+    }
+    removeChecklistitem(args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const task = yield this.getTaskDetails(args.options.taskId);
+                if (!task.checklist || !task.checklist[args.options.id]) {
+                    throw `The specified checklist item with id ${args.options.id} does not exist`;
                 }
-            };
-            return request_1.default.patch(requestOptionsTaskDetails);
-        })
-            .then(_ => cb(), (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+                const requestOptionsTaskDetails = {
+                    url: `${this.resource}/v1.0/planner/tasks/${args.options.taskId}/details`,
+                    headers: {
+                        'accept': 'application/json;odata.metadata=none',
+                        'If-Match': task['@odata.etag'],
+                        'Prefer': 'return=representation'
+                    },
+                    responseType: 'json',
+                    data: {
+                        checklist: {
+                            [args.options.id]: null
+                        }
+                    }
+                };
+                yield request_1.default.patch(requestOptionsTaskDetails);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
     getTaskDetails(taskId) {
         const requestOptions = {
-            url: `${this.resource}/v1.0/planner/tasks/${encodeURIComponent(taskId)}/details?$select=checklist`,
+            url: `${this.resource}/v1.0/planner/tasks/${formatting_1.formatting.encodeQueryParameter(taskId)}/details?$select=checklist`,
             headers: {
                 accept: 'application/json;odata.metadata=minimal'
             },
@@ -71,15 +89,15 @@ class PlannerTaskChecklistItemRemoveCommand extends GraphCommand_1.default {
         };
         return request_1.default.get(requestOptions);
     }
-    options() {
-        const options = [
-            { option: '-i, --id <id>' },
-            { option: '--taskId <taskId>' },
-            { option: '--confirm' }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
 }
+_PlannerTaskChecklistItemRemoveCommand_instances = new WeakSet(), _PlannerTaskChecklistItemRemoveCommand_initTelemetry = function _PlannerTaskChecklistItemRemoveCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            confirm: (!(!args.options.confirm)).toString()
+        });
+    });
+}, _PlannerTaskChecklistItemRemoveCommand_initOptions = function _PlannerTaskChecklistItemRemoveCommand_initOptions() {
+    this.options.unshift({ option: '-i, --id <id>' }, { option: '--taskId <taskId>' }, { option: '--confirm' });
+};
 module.exports = new PlannerTaskChecklistItemRemoveCommand();
 //# sourceMappingURL=task-checklistitem-remove.js.map

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

@@ -1,60 +1,64 @@
 "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 _PlannerTaskGetCommand_instances, _PlannerTaskGetCommand_initTelemetry, _PlannerTaskGetCommand_initOptions, _PlannerTaskGetCommand_initValidators, _PlannerTaskGetCommand_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 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 formatting_1 = require("../../../../utils/formatting");
 class PlannerTaskGetCommand extends GraphCommand_1.default {
     get name() {
         return commands_1.default.TASK_GET;
     }
-    alias() {
-        return [commands_1.default.TASK_DETAILS_GET];
-    }
     get description() {
         return 'Retrieve the specified planner task';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.id = typeof args.options.id !== 'undefined';
-        telemetryProps.title = typeof args.options.title !== 'undefined';
-        telemetryProps.bucketId = typeof args.options.bucketId !== 'undefined';
-        telemetryProps.bucketName = typeof args.options.bucketName !== 'undefined';
-        telemetryProps.planId = typeof args.options.planId !== 'undefined';
-        telemetryProps.planName = typeof args.options.planName !== 'undefined';
-        telemetryProps.ownerGroupId = typeof args.options.ownerGroupId !== 'undefined';
-        telemetryProps.ownerGroupName = typeof args.options.ownerGroupName !== 'undefined';
-        return telemetryProps;
+    constructor() {
+        super();
+        _PlannerTaskGetCommand_instances.add(this);
+        __classPrivateFieldGet(this, _PlannerTaskGetCommand_instances, "m", _PlannerTaskGetCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _PlannerTaskGetCommand_instances, "m", _PlannerTaskGetCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _PlannerTaskGetCommand_instances, "m", _PlannerTaskGetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _PlannerTaskGetCommand_instances, "m", _PlannerTaskGetCommand_initOptionSets).call(this);
     }
-    commandAction(logger, args, cb) {
-        this.showDeprecationWarning(logger, commands_1.default.TASK_DETAILS_GET, commands_1.default.TASK_GET);
-        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 check has been added to support task details get alias. Needs to be removed when deprecation is removed. 
-        if (args.options.taskId) {
-            args.options.id = args.options.taskId;
-        }
-        this
-            .getTaskId(args.options)
-            .then(taskId => this.getTask(taskId))
-            .then(task => this.getTaskDetails(task))
-            .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 {
+                const taskId = yield this.getTaskId(args.options);
+                const task = yield this.getTask(taskId);
+                const res = yield this.getTaskDetails(task);
+                logger.log(res);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
     getTask(taskId) {
         const requestOptions = {
-            url: `${this.resource}/v1.0/planner/tasks/${encodeURIComponent(taskId)}`,
+            url: `${this.resource}/v1.0/planner/tasks/${formatting_1.formatting.encodeQueryParameter(taskId)}`,
             headers: {
                 accept: 'application/json;odata.metadata=none'
             },
@@ -150,51 +154,55 @@ class PlannerTaskGetCommand extends GraphCommand_1.default {
             .getGroupByDisplayName(options.ownerGroupName)
             .then(group => group.id);
     }
-    optionSets() {
-        return [
-            ['id', 'title']
-        ];
-    }
-    options() {
-        const options = [
-            { option: '--taskId [taskId]' },
-            { option: '-i, --id [id]' },
-            { option: '-t, --title [title]' },
-            { option: '--bucketId [bucketId]' },
-            { option: '--bucketName [bucketName]' },
-            { option: '--planId [planId]' },
-            { option: '--planName [planName]' },
-            { option: '--planTitle [planTitle]' },
-            { option: '--ownerGroupId [ownerGroupId]' },
-            { option: '--ownerGroupName [ownerGroupName]' }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
+}
+_PlannerTaskGetCommand_instances = new WeakSet(), _PlannerTaskGetCommand_initTelemetry = function _PlannerTaskGetCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            id: typeof args.options.id !== 'undefined',
+            title: typeof args.options.title !== 'undefined',
+            bucketId: typeof args.options.bucketId !== 'undefined',
+            bucketName: typeof args.options.bucketName !== 'undefined',
+            planId: typeof args.options.planId !== 'undefined',
+            ownerGroupId: typeof args.options.ownerGroupId !== 'undefined',
+            ownerGroupName: typeof args.options.ownerGroupName !== 'undefined'
+        });
+    });
+}, _PlannerTaskGetCommand_initOptions = function _PlannerTaskGetCommand_initOptions() {
+    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';
         }
         if (args.options.title && args.options.bucketId && args.options.bucketName) {
             return 'Specify either bucketId or bucketName when using title but not both';
         }
-        if (args.options.bucketName && !args.options.planId && !args.options.planName && !args.options.planTitle) {
+        if (args.options.bucketName && !args.options.planId && !args.options.planTitle) {
             return 'Specify either planId or planTitle when using bucketName';
         }
-        if (args.options.bucketName && args.options.planId && (args.options.planName || args.options.planTitle)) {
+        if (args.options.bucketName && args.options.planId && args.options.planTitle) {
             return 'Specify either planId or planTitle when using bucketName but not both';
         }
-        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';
         }
-        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`;
         }
         return true;
-    }
-}
+    }));
+}, _PlannerTaskGetCommand_initOptionSets = function _PlannerTaskGetCommand_initOptionSets() {
+    this.optionSets.push({ options: ['id', 'title'] });
+};
 module.exports = new PlannerTaskGetCommand();
 //# sourceMappingURL=task-get.js.map

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

@@ -1,12 +1,30 @@
 "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 _PlannerTaskListCommand_instances, _PlannerTaskListCommand_initTelemetry, _PlannerTaskListCommand_initOptions, _PlannerTaskListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
-const utils_1 = require("../../../../utils");
 const Auth_1 = require("../../../../Auth");
 const request_1 = require("../../../../request");
+const accessToken_1 = require("../../../../utils/accessToken");
+const odata_1 = require("../../../../utils/odata");
+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");
+const formatting_1 = require("../../../../utils/formatting");
 class PlannerTaskListCommand extends GraphCommand_1.default {
     get name() {
         return commands_1.default.TASK_LIST;
@@ -14,82 +32,64 @@ class PlannerTaskListCommand extends GraphCommand_1.default {
     get description() {
         return 'Lists planner tasks in a bucket, plan, or tasks for the currently logged in user';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.bucketId = typeof args.options.bucketId !== 'undefined';
-        telemetryProps.bucketName = typeof args.options.bucketName !== 'undefined';
-        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';
-        return telemetryProps;
-    }
     defaultProperties() {
         return ['id', 'title', 'startDateTime', 'dueDateTime', 'completedDateTime'];
     }
-    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;
-        }
-        const bucketName = args.options.bucketName;
-        let bucketId = args.options.bucketId;
-        const planTitle = args.options.planTitle;
-        let planId = args.options.planId;
-        let taskItems = [];
-        if (bucketId || bucketName) {
-            this
-                .getBucketId(args)
-                .then((retrievedBucketId) => {
-                bucketId = retrievedBucketId;
-                return utils_1.odata.getAllItems(`${this.resource}/v1.0/planner/buckets/${bucketId}/tasks`);
-            })
-                .then((tasks) => {
-                taskItems = tasks;
-                return utils_1.odata.getAllItems(`${this.resource}/beta/planner/buckets/${bucketId}/tasks`);
-            })
-                .then((betaTasks) => {
-                logger.log(this.mergeTaskPriority(taskItems, betaTasks));
-                cb();
-            }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
-        }
-        else if (planId || planTitle) {
-            this
-                .getPlanId(args)
-                .then((retrievedPlanId) => {
-                planId = retrievedPlanId;
-                return utils_1.odata.getAllItems(`${this.resource}/v1.0/planner/plans/${planId}/tasks`);
-            })
-                .then((tasks) => {
-                taskItems = tasks;
-                return utils_1.odata.getAllItems(`${this.resource}/beta/planner/plans/${planId}/tasks`);
-            })
-                .then((betaTasks) => {
-                logger.log(this.mergeTaskPriority(taskItems, betaTasks));
-                cb();
-            }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
-        }
-        else {
-            utils_1.odata
-                .getAllItems(`${this.resource}/v1.0/me/planner/tasks`)
-                .then((tasks) => {
-                taskItems = tasks;
-                return utils_1.odata.getAllItems(`${this.resource}/beta/me/planner/tasks`);
-            })
-                .then((betaTasks) => {
-                logger.log(this.mergeTaskPriority(taskItems, betaTasks));
-                cb();
-            }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
-        }
+    constructor() {
+        super();
+        _PlannerTaskListCommand_instances.add(this);
+        __classPrivateFieldGet(this, _PlannerTaskListCommand_instances, "m", _PlannerTaskListCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _PlannerTaskListCommand_instances, "m", _PlannerTaskListCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _PlannerTaskListCommand_instances, "m", _PlannerTaskListCommand_initValidators).call(this);
+    }
+    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;
+            }
+            const bucketName = args.options.bucketName;
+            let bucketId = args.options.bucketId;
+            const planTitle = args.options.planTitle;
+            let planId = args.options.planId;
+            let taskItems = [];
+            if (bucketId || bucketName) {
+                try {
+                    bucketId = yield this.getBucketId(args);
+                    taskItems = yield odata_1.odata.getAllItems(`${this.resource}/v1.0/planner/buckets/${bucketId}/tasks`);
+                    const betaTasks = yield odata_1.odata.getAllItems(`${this.resource}/beta/planner/buckets/${bucketId}/tasks`);
+                    logger.log(this.mergeTaskPriority(taskItems, betaTasks));
+                }
+                catch (err) {
+                    this.handleRejectedODataJsonPromise(err);
+                }
+            }
+            else if (planId || planTitle) {
+                try {
+                    planId = yield this.getPlanId(args);
+                    taskItems = yield odata_1.odata.getAllItems(`${this.resource}/v1.0/planner/plans/${planId}/tasks`);
+                    const betaTasks = yield odata_1.odata.getAllItems(`${this.resource}/beta/planner/plans/${planId}/tasks`);
+                    logger.log(this.mergeTaskPriority(taskItems, betaTasks));
+                }
+                catch (err) {
+                    this.handleRejectedODataJsonPromise(err);
+                }
+            }
+            else {
+                try {
+                    taskItems = yield odata_1.odata.getAllItems(`${this.resource}/v1.0/me/planner/tasks`);
+                    const betaTasks = yield odata_1.odata.getAllItems(`${this.resource}/beta/me/planner/tasks`);
+                    logger.log(this.mergeTaskPriority(taskItems, betaTasks));
+                }
+                catch (err) {
+                    this.handleRejectedODataJsonPromise(err);
+                }
+            }
+        });
     }
     getBucketId(args) {
         if (args.options.bucketId) {
-            return Promise.resolve(encodeURIComponent(args.options.bucketId));
+            return Promise.resolve(formatting_1.formatting.encodeQueryParameter(args.options.bucketId));
         }
         return this
             .getPlanId(args)
@@ -113,7 +113,7 @@ class PlannerTaskListCommand extends GraphCommand_1.default {
     }
     getPlanId(args) {
         if (args.options.planId) {
-            return Promise.resolve(encodeURIComponent(args.options.planId));
+            return Promise.resolve(formatting_1.formatting.encodeQueryParameter(args.options.planId));
         }
         return this
             .getGroupId(args)
@@ -122,7 +122,7 @@ class PlannerTaskListCommand extends GraphCommand_1.default {
     }
     getGroupId(args) {
         if (args.options.ownerGroupId) {
-            return Promise.resolve(encodeURIComponent(args.options.ownerGroupId));
+            return Promise.resolve(formatting_1.formatting.encodeQueryParameter(args.options.ownerGroupId));
         }
         return aadGroup_1.aadGroup
             .getGroupByDisplayName(args.options.ownerGroupName)
@@ -139,54 +139,54 @@ class PlannerTaskListCommand extends GraphCommand_1.default {
         });
         return taskItems;
     }
-    options() {
-        const options = [
-            {
-                option: '--bucketId [bucketId]'
-            },
-            {
-                option: '--bucketName [bucketName]'
-            },
-            {
-                option: '--planId [planId]'
-            },
-            {
-                option: '--planName [planName]'
-            },
-            {
-                option: '--planTitle [planTitle]'
-            },
-            {
-                option: '--ownerGroupId [ownerGroupId]'
-            },
-            {
-                option: '--ownerGroupName [ownerGroupName]'
-            }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
+}
+_PlannerTaskListCommand_instances = new WeakSet(), _PlannerTaskListCommand_initTelemetry = function _PlannerTaskListCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            bucketId: typeof args.options.bucketId !== 'undefined',
+            bucketName: typeof args.options.bucketName !== 'undefined',
+            planId: typeof args.options.planId !== 'undefined',
+            planTitle: typeof args.options.planTitle !== 'undefined',
+            ownerGroupId: typeof args.options.ownerGroupId !== 'undefined',
+            ownerGroupName: typeof args.options.ownerGroupName !== 'undefined'
+        });
+    });
+}, _PlannerTaskListCommand_initOptions = function _PlannerTaskListCommand_initOptions() {
+    this.options.unshift({
+        option: '--bucketId [bucketId]'
+    }, {
+        option: '--bucketName [bucketName]'
+    }, {
+        option: '--planId [planId]'
+    }, {
+        option: '--planTitle [planTitle]'
+    }, {
+        option: '--ownerGroupId [ownerGroupId]'
+    }, {
+        option: '--ownerGroupName [ownerGroupName]'
+    });
+}, _PlannerTaskListCommand_initValidators = function _PlannerTaskListCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         if (args.options.bucketId && args.options.bucketName) {
             return 'To retrieve tasks from a bucket, specify bucketId or bucketName, but not both';
         }
-        if (args.options.bucketName && !args.options.planId && !args.options.planName && !args.options.planTitle) {
+        if (args.options.bucketName && !args.options.planId && !args.options.planTitle) {
             return 'Specify either planId or planTitle when using bucketName';
         }
-        if (args.options.planId && (args.options.planName || args.options.planTitle)) {
+        if (args.options.planId && 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) {
+        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`;
         }
         return true;
-    }
-}
+    }));
+};
 module.exports = new PlannerTaskListCommand();
 //# sourceMappingURL=task-list.js.map