@pnp/cli-microsoft365 5.7.0 → 5.8.0-beta.03ce984

package/dist/m365/todo/commands/list/list-remove.js

@@ -13,7 +13,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _TodoListRemoveCommand_instances, _TodoListRemoveCommand_initTelemetry, _TodoListRemoveCommand_initOptions, _TodoListRemoveCommand_initValidators;
+var _TodoListRemoveCommand_instances, _TodoListRemoveCommand_initTelemetry, _TodoListRemoveCommand_initOptions, _TodoListRemoveCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const cli_1 = require("../../../../cli");
 const request_1 = require("../../../../request");
@@ -25,7 +25,7 @@ class TodoListRemoveCommand extends GraphCommand_1.default {
         _TodoListRemoveCommand_instances.add(this);
         __classPrivateFieldGet(this, _TodoListRemoveCommand_instances, "m", _TodoListRemoveCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _TodoListRemoveCommand_instances, "m", _TodoListRemoveCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _TodoListRemoveCommand_instances, "m", _TodoListRemoveCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _TodoListRemoveCommand_instances, "m", _TodoListRemoveCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.LIST_REMOVE;
@@ -33,58 +33,57 @@ class TodoListRemoveCommand extends GraphCommand_1.default {
     get description() {
         return 'Removes a Microsoft To Do task list';
     }
-    commandAction(logger, args, cb) {
-        const getListId = () => {
-            if (args.options.name) {
-                // Search list by its name
-                const requestOptions = {
-                    url: `${this.resource}/v1.0/me/todo/lists?$filter=displayName eq '${escape(args.options.name)}'`,
-                    headers: {
-                        accept: "application/json;odata.metadata=none"
-                    },
-                    responseType: 'json'
-                };
-                return request_1.default
-                    .get(requestOptions)
-                    .then((response) => response.value && response.value.length === 1 ? response.value[0].id : null);
-            }
-            return Promise.resolve(args.options.id);
-        };
-        const removeList = () => {
-            getListId()
-                .then(listId => {
-                if (!listId) {
-                    return Promise.reject(`The list ${args.options.name} cannot be found`);
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const getListId = () => __awaiter(this, void 0, void 0, function* () {
+                if (args.options.name) {
+                    // Search list by its name
+                    const requestOptions = {
+                        url: `${this.resource}/v1.0/me/todo/lists?$filter=displayName eq '${escape(args.options.name)}'`,
+                        headers: {
+                            accept: "application/json;odata.metadata=none"
+                        },
+                        responseType: 'json'
+                    };
+                    const response = yield request_1.default.get(requestOptions);
+                    return response.value && response.value.length === 1 ? response.value[0].id : null;
                 }
-                const requestOptions = {
-                    url: `${this.resource}/v1.0/me/todo/lists/${listId}`,
-                    headers: {
-                        accept: "application/json;odata.metadata=none"
-                    },
-                    responseType: 'json'
-                };
-                return request_1.default.delete(requestOptions);
-            })
-                .then(_ => cb(), (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
-        };
-        if (args.options.confirm) {
-            removeList();
-        }
-        else {
-            cli_1.Cli.prompt({
-                type: "confirm",
-                name: "continue",
-                default: false,
-                message: `Are you sure you want to remove the task list ${args.options.id || args.options.name}?`
-            }, (result) => {
-                if (!result.continue) {
-                    cb();
+                return args.options.id;
+            });
+            const removeList = () => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    const listId = yield getListId();
+                    if (!listId) {
+                        return Promise.reject(`The list ${args.options.name} cannot be found`);
+                    }
+                    const requestOptions = {
+                        url: `${this.resource}/v1.0/me/todo/lists/${listId}`,
+                        headers: {
+                            accept: "application/json;odata.metadata=none"
+                        },
+                        responseType: 'json'
+                    };
+                    yield request_1.default.delete(requestOptions);
                 }
-                else {
-                    removeList();
+                catch (err) {
+                    this.handleRejectedODataJsonPromise(err);
                 }
             });
-        }
+            if (args.options.confirm) {
+                yield removeList();
+            }
+            else {
+                const result = yield cli_1.Cli.prompt({
+                    type: 'confirm',
+                    name: 'continue',
+                    default: false,
+                    message: `Are you sure you want to remove the task list ${args.options.id || args.options.name}?`
+                });
+                if (result.continue) {
+                    yield removeList();
+                }
+            }
+        });
     }
 }
 _TodoListRemoveCommand_instances = new WeakSet(), _TodoListRemoveCommand_initTelemetry = function _TodoListRemoveCommand_initTelemetry() {
@@ -103,16 +102,8 @@ _TodoListRemoveCommand_instances = new WeakSet(), _TodoListRemoveCommand_initTel
     }, {
         option: '--confirm'
     });
-}, _TodoListRemoveCommand_initValidators = function _TodoListRemoveCommand_initValidators() {
-    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!args.options.name && !args.options.id) {
-            return 'Specify name or id of the list to remove';
-        }
-        if (args.options.name && args.options.id) {
-            return 'Specify either the name or the id of the list to remove but not both';
-        }
-        return true;
-    }));
+}, _TodoListRemoveCommand_initOptionSets = function _TodoListRemoveCommand_initOptionSets() {
+    this.optionSets.push(['name', 'id']);
 };
 module.exports = new TodoListRemoveCommand();
 //# sourceMappingURL=list-remove.js.map

package/dist/m365/todo/commands/list/list-set.js

@@ -13,7 +13,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _TodoListSetCommand_instances, _TodoListSetCommand_initTelemetry, _TodoListSetCommand_initOptions, _TodoListSetCommand_initValidators;
+var _TodoListSetCommand_instances, _TodoListSetCommand_initTelemetry, _TodoListSetCommand_initOptions, _TodoListSetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const GraphCommand_1 = require("../../../base/GraphCommand");
@@ -24,7 +24,7 @@ class TodoListSetCommand extends GraphCommand_1.default {
         _TodoListSetCommand_instances.add(this);
         __classPrivateFieldGet(this, _TodoListSetCommand_instances, "m", _TodoListSetCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _TodoListSetCommand_instances, "m", _TodoListSetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _TodoListSetCommand_instances, "m", _TodoListSetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _TodoListSetCommand_instances, "m", _TodoListSetCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.LIST_SET;
@@ -32,29 +32,32 @@ class TodoListSetCommand extends GraphCommand_1.default {
     get description() {
         return 'Updates a Microsoft To Do task list';
     }
-    commandAction(logger, args, cb) {
-        const endpoint = `${this.resource}/v1.0`;
-        const data = {
-            displayName: args.options.newName
-        };
-        this
-            .getListId(args)
-            .then(listId => {
-            if (!listId) {
-                return Promise.reject(`The list ${args.options.name} cannot be found`);
-            }
-            const requestOptions = {
-                url: `${endpoint}/me/todo/lists/${listId}`,
-                headers: {
-                    accept: 'application/json;odata.metadata=none',
-                    'content-type': 'application/json'
-                },
-                data,
-                responseType: 'json'
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const endpoint = `${this.resource}/v1.0`;
+            const data = {
+                displayName: args.options.newName
             };
-            return request_1.default.patch(requestOptions);
-        })
-            .then(_ => cb(), (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+            try {
+                const listId = yield this.getListId(args);
+                if (!listId) {
+                    throw `The list ${args.options.name} cannot be found`;
+                }
+                const requestOptions = {
+                    url: `${endpoint}/me/todo/lists/${listId}`,
+                    headers: {
+                        accept: 'application/json;odata.metadata=none',
+                        'content-type': 'application/json'
+                    },
+                    data,
+                    responseType: 'json'
+                };
+                yield request_1.default.patch(requestOptions);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
     getListId(args) {
         const endpoint = `${this.resource}/v1.0`;
@@ -88,16 +91,8 @@ _TodoListSetCommand_instances = new WeakSet(), _TodoListSetCommand_initTelemetry
     }, {
         option: '--newName <newName>'
     });
-}, _TodoListSetCommand_initValidators = function _TodoListSetCommand_initValidators() {
-    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!args.options.name && !args.options.id) {
-            return 'Specify name or id of the list to update';
-        }
-        if (args.options.name && args.options.id) {
-            return 'Specify either the name or the id of the list to update but not both';
-        }
-        return true;
-    }));
+}, _TodoListSetCommand_initOptionSets = function _TodoListSetCommand_initOptionSets() {
+    this.optionSets.push(['name', 'id']);
 };
 module.exports = new TodoListSetCommand();
 //# sourceMappingURL=list-set.js.map

package/dist/m365/todo/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 _TodoTaskAddCommand_instances, _TodoTaskAddCommand_initTelemetry, _TodoTaskAddCommand_initOptions, _TodoTaskAddCommand_initValidators;
+var _TodoTaskAddCommand_instances, _TodoTaskAddCommand_initTelemetry, _TodoTaskAddCommand_initOptions, _TodoTaskAddCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const GraphCommand_1 = require("../../../base/GraphCommand");
@@ -24,7 +24,7 @@ class TodoTaskAddCommand extends GraphCommand_1.default {
         _TodoTaskAddCommand_instances.add(this);
         __classPrivateFieldGet(this, _TodoTaskAddCommand_instances, "m", _TodoTaskAddCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _TodoTaskAddCommand_instances, "m", _TodoTaskAddCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _TodoTaskAddCommand_instances, "m", _TodoTaskAddCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _TodoTaskAddCommand_instances, "m", _TodoTaskAddCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.TASK_ADD;
@@ -32,28 +32,29 @@ class TodoTaskAddCommand extends GraphCommand_1.default {
     get description() {
         return 'Add a task to a Microsoft To Do task list';
     }
-    commandAction(logger, args, cb) {
-        const endpoint = `${this.resource}/v1.0`;
-        this
-            .getTodoListId(args)
-            .then((listId) => {
-            const requestOptions = {
-                url: `${endpoint}/me/todo/lists/${listId}/tasks`,
-                headers: {
-                    accept: 'application/json;odata.metadata=none',
-                    'Content-Type': 'application/json'
-                },
-                data: {
-                    title: args.options.title
-                },
-                responseType: 'json'
-            };
-            return request_1.default.post(requestOptions);
-        })
-            .then((res) => {
-            logger.log(res);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const endpoint = `${this.resource}/v1.0`;
+            try {
+                const listId = yield this.getTodoListId(args);
+                const requestOptions = {
+                    url: `${endpoint}/me/todo/lists/${listId}/tasks`,
+                    headers: {
+                        accept: 'application/json;odata.metadata=none',
+                        'Content-Type': 'application/json'
+                    },
+                    data: {
+                        title: args.options.title
+                    },
+                    responseType: 'json'
+                };
+                const res = yield request_1.default.post(requestOptions);
+                logger.log(res);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
     getTodoListId(args) {
         if (args.options.listId) {
@@ -91,16 +92,8 @@ _TodoTaskAddCommand_instances = new WeakSet(), _TodoTaskAddCommand_initTelemetry
     }, {
         option: '--listId [listId]'
     });
-}, _TodoTaskAddCommand_initValidators = function _TodoTaskAddCommand_initValidators() {
-    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (args.options.listId && args.options.listName) {
-            return 'Specify listId or listName but not both';
-        }
-        if (!args.options.listId && !args.options.listName) {
-            return 'Specify listId or listName';
-        }
-        return true;
-    }));
+}, _TodoTaskAddCommand_initOptionSets = function _TodoTaskAddCommand_initOptionSets() {
+    this.optionSets.push(['listId', 'listName']);
 };
 module.exports = new TodoTaskAddCommand();
 //# sourceMappingURL=task-add.js.map

package/dist/m365/todo/commands/task/task-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 _TodoTaskListCommand_instances, _TodoTaskListCommand_initTelemetry, _TodoTaskListCommand_initOptions, _TodoTaskListCommand_initValidators;
+var _TodoTaskListCommand_instances, _TodoTaskListCommand_initTelemetry, _TodoTaskListCommand_initOptions, _TodoTaskListCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const utils_1 = require("../../../../utils");
@@ -25,7 +25,7 @@ class TodoTaskListCommand extends GraphCommand_1.default {
         _TodoTaskListCommand_instances.add(this);
         __classPrivateFieldGet(this, _TodoTaskListCommand_instances, "m", _TodoTaskListCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _TodoTaskListCommand_instances, "m", _TodoTaskListCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _TodoTaskListCommand_instances, "m", _TodoTaskListCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _TodoTaskListCommand_instances, "m", _TodoTaskListCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.TASK_LIST;
@@ -56,30 +56,31 @@ class TodoTaskListCommand extends GraphCommand_1.default {
             return Promise.resolve(taskList.id);
         });
     }
-    commandAction(logger, args, cb) {
-        this
-            .getTodoListId(args)
-            .then((listId) => {
-            const endpoint = `${this.resource}/v1.0/me/todo/lists/${listId}/tasks`;
-            return utils_1.odata.getAllItems(endpoint);
-        })
-            .then((items) => {
-            if (args.options.output === 'json') {
-                logger.log(items);
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const listId = yield this.getTodoListId(args);
+                const endpoint = `${this.resource}/v1.0/me/todo/lists/${listId}/tasks`;
+                const items = yield utils_1.odata.getAllItems(endpoint);
+                if (args.options.output === 'json') {
+                    logger.log(items);
+                }
+                else {
+                    logger.log(items.map(m => {
+                        return {
+                            id: m.id,
+                            title: m.title,
+                            status: m.status,
+                            createdDateTime: m.createdDateTime,
+                            lastModifiedDateTime: m.lastModifiedDateTime
+                        };
+                    }));
+                }
             }
-            else {
-                logger.log(items.map(m => {
-                    return {
-                        id: m.id,
-                        title: m.title,
-                        status: m.status,
-                        createdDateTime: m.createdDateTime,
-                        lastModifiedDateTime: m.lastModifiedDateTime
-                    };
-                }));
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+        });
     }
 }
 _TodoTaskListCommand_instances = new WeakSet(), _TodoTaskListCommand_initTelemetry = function _TodoTaskListCommand_initTelemetry() {
@@ -95,16 +96,8 @@ _TodoTaskListCommand_instances = new WeakSet(), _TodoTaskListCommand_initTelemet
     }, {
         option: '--listId [listId]'
     });
-}, _TodoTaskListCommand_initValidators = function _TodoTaskListCommand_initValidators() {
-    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (args.options.listId && args.options.listName) {
-            return 'Specify listId or listName, but not both';
-        }
-        if (!args.options.listId && !args.options.listName) {
-            return 'Specify listId or listName';
-        }
-        return true;
-    }));
+}, _TodoTaskListCommand_initOptionSets = function _TodoTaskListCommand_initOptionSets() {
+    this.optionSets.push(['listId', 'listName']);
 };
 module.exports = new TodoTaskListCommand();
 //# sourceMappingURL=task-list.js.map

package/dist/m365/todo/commands/task/task-remove.js

@@ -13,7 +13,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _TodoTaskRemoveCommand_instances, _TodoTaskRemoveCommand_initTelemetry, _TodoTaskRemoveCommand_initOptions, _TodoTaskRemoveCommand_initValidators;
+var _TodoTaskRemoveCommand_instances, _TodoTaskRemoveCommand_initTelemetry, _TodoTaskRemoveCommand_initOptions, _TodoTaskRemoveCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const cli_1 = require("../../../../cli");
 const request_1 = require("../../../../request");
@@ -25,7 +25,7 @@ class TodoTaskRemoveCommand extends GraphCommand_1.default {
         _TodoTaskRemoveCommand_instances.add(this);
         __classPrivateFieldGet(this, _TodoTaskRemoveCommand_instances, "m", _TodoTaskRemoveCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _TodoTaskRemoveCommand_instances, "m", _TodoTaskRemoveCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _TodoTaskRemoveCommand_instances, "m", _TodoTaskRemoveCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _TodoTaskRemoveCommand_instances, "m", _TodoTaskRemoveCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.TASK_REMOVE;
@@ -33,58 +33,57 @@ class TodoTaskRemoveCommand extends GraphCommand_1.default {
     get description() {
         return 'Removes the specified Microsoft To Do task';
     }
-    commandAction(logger, args, cb) {
-        const getToDoListId = () => {
-            if (args.options.listName) {
-                // Search list by its name
-                const requestOptions = {
-                    url: `${this.resource}/v1.0/me/todo/lists?$filter=displayName eq '${escape(args.options.listName)}'`,
-                    headers: {
-                        accept: "application/json;odata.metadata=none"
-                    },
-                    responseType: 'json'
-                };
-                return request_1.default
-                    .get(requestOptions)
-                    .then((response) => response.value && response.value.length === 1 ? response.value[0].id : undefined);
-            }
-            return Promise.resolve(args.options.listId);
-        };
-        const removeToDoTask = () => {
-            getToDoListId()
-                .then(toDoListId => {
-                if (!toDoListId) {
-                    return Promise.reject(`The list ${args.options.listName} cannot be found`);
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const getToDoListId = () => __awaiter(this, void 0, void 0, function* () {
+                if (args.options.listName) {
+                    // Search list by its name
+                    const requestOptions = {
+                        url: `${this.resource}/v1.0/me/todo/lists?$filter=displayName eq '${escape(args.options.listName)}'`,
+                        headers: {
+                            accept: "application/json;odata.metadata=none"
+                        },
+                        responseType: 'json'
+                    };
+                    const response = yield request_1.default.get(requestOptions);
+                    return response.value && response.value.length === 1 ? response.value[0].id : undefined;
                 }
-                const requestOptions = {
-                    url: `${this.resource}/v1.0/me/todo/lists/${toDoListId}/tasks/${args.options.id}`,
-                    headers: {
-                        accept: "application/json;odata.metadata=none"
-                    },
-                    responseType: 'json'
-                };
-                return request_1.default.delete(requestOptions);
-            })
-                .then(_ => cb(), (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
-        };
-        if (args.options.confirm) {
-            removeToDoTask();
-        }
-        else {
-            cli_1.Cli.prompt({
-                type: "confirm",
-                name: "continue",
-                default: false,
-                message: `Are you sure you want to remove the task ${args.options.id} from list ${args.options.listId || args.options.listName}?`
-            }, (result) => {
-                if (!result.continue) {
-                    cb();
+                return Promise.resolve(args.options.listId);
+            });
+            const removeToDoTask = () => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    const toDoListId = yield getToDoListId();
+                    if (!toDoListId) {
+                        throw `The list ${args.options.listName} cannot be found`;
+                    }
+                    const requestOptions = {
+                        url: `${this.resource}/v1.0/me/todo/lists/${toDoListId}/tasks/${args.options.id}`,
+                        headers: {
+                            accept: "application/json;odata.metadata=none"
+                        },
+                        responseType: 'json'
+                    };
+                    yield request_1.default.delete(requestOptions);
                 }
-                else {
-                    removeToDoTask();
+                catch (err) {
+                    this.handleRejectedODataJsonPromise(err);
                 }
             });
-        }
+            if (args.options.confirm) {
+                yield removeToDoTask();
+            }
+            else {
+                const result = yield cli_1.Cli.prompt({
+                    type: 'confirm',
+                    name: 'continue',
+                    default: false,
+                    message: `Are you sure you want to remove the task ${args.options.id} from list ${args.options.listId || args.options.listName}?`
+                });
+                if (result.continue) {
+                    yield removeToDoTask();
+                }
+            }
+        });
     }
 }
 _TodoTaskRemoveCommand_instances = new WeakSet(), _TodoTaskRemoveCommand_initTelemetry = function _TodoTaskRemoveCommand_initTelemetry() {
@@ -105,16 +104,8 @@ _TodoTaskRemoveCommand_instances = new WeakSet(), _TodoTaskRemoveCommand_initTel
     }, {
         option: '--confirm'
     });
-}, _TodoTaskRemoveCommand_initValidators = function _TodoTaskRemoveCommand_initValidators() {
-    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!args.options.listName && !args.options.listId) {
-            return 'Specify name or id of the To Do list';
-        }
-        if (args.options.listName && args.options.listId) {
-            return 'Specify either the name or the id of the To Do list but not both';
-        }
-        return true;
-    }));
+}, _TodoTaskRemoveCommand_initOptionSets = function _TodoTaskRemoveCommand_initOptionSets() {
+    this.optionSets.push(['listName', 'listId']);
 };
 module.exports = new TodoTaskRemoveCommand();
 //# sourceMappingURL=task-remove.js.map

package/dist/m365/todo/commands/task/task-set.js

@@ -13,7 +13,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _TodoTaskSetCommand_instances, _TodoTaskSetCommand_initTelemetry, _TodoTaskSetCommand_initOptions, _TodoTaskSetCommand_initValidators;
+var _TodoTaskSetCommand_instances, _TodoTaskSetCommand_initTelemetry, _TodoTaskSetCommand_initOptions, _TodoTaskSetCommand_initValidators, _TodoTaskSetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const GraphCommand_1 = require("../../../base/GraphCommand");
@@ -25,6 +25,7 @@ class TodoTaskSetCommand extends GraphCommand_1.default {
         __classPrivateFieldGet(this, _TodoTaskSetCommand_instances, "m", _TodoTaskSetCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _TodoTaskSetCommand_instances, "m", _TodoTaskSetCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _TodoTaskSetCommand_instances, "m", _TodoTaskSetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _TodoTaskSetCommand_instances, "m", _TodoTaskSetCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.TASK_SET;
@@ -32,27 +33,28 @@ class TodoTaskSetCommand extends GraphCommand_1.default {
     get description() {
         return 'Update a task in a Microsoft To Do task list';
     }
-    commandAction(logger, args, cb) {
-        const endpoint = `${this.resource}/v1.0`;
-        const data = this.mapRequestBody(args.options);
-        this
-            .getTodoListId(args)
-            .then((listId) => {
-            const requestOptions = {
-                url: `${endpoint}/me/todo/lists/${listId}/tasks/${encodeURIComponent(args.options.id)}`,
-                headers: {
-                    accept: 'application/json;odata.metadata=none',
-                    'Content-Type': 'application/json'
-                },
-                data: data,
-                responseType: 'json'
-            };
-            return request_1.default.patch(requestOptions);
-        })
-            .then((res) => {
-            logger.log(res);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const endpoint = `${this.resource}/v1.0`;
+            const data = this.mapRequestBody(args.options);
+            try {
+                const listId = yield this.getTodoListId(args);
+                const requestOptions = {
+                    url: `${endpoint}/me/todo/lists/${listId}/tasks/${encodeURIComponent(args.options.id)}`,
+                    headers: {
+                        accept: 'application/json;odata.metadata=none',
+                        'Content-Type': 'application/json'
+                    },
+                    data: data,
+                    responseType: 'json'
+                };
+                const res = yield request_1.default.patch(requestOptions);
+                logger.log(res);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
     getTodoListId(args) {
         if (args.options.listId) {
@@ -109,12 +111,6 @@ _TodoTaskSetCommand_instances = new WeakSet(), _TodoTaskSetCommand_initTelemetry
     });
 }, _TodoTaskSetCommand_initValidators = function _TodoTaskSetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (args.options.listId && args.options.listName) {
-            return 'Specify listId or listName but not both';
-        }
-        if (!args.options.listId && !args.options.listName) {
-            return 'Specify listId or listName';
-        }
         if (args.options.status &&
             args.options.status !== 'notStarted' &&
             args.options.status !== 'inProgress' &&
@@ -125,6 +121,8 @@ _TodoTaskSetCommand_instances = new WeakSet(), _TodoTaskSetCommand_initTelemetry
         }
         return true;
     }));
+}, _TodoTaskSetCommand_initOptionSets = function _TodoTaskSetCommand_initOptionSets() {
+    this.optionSets.push(['listId', 'listName']);
 };
 module.exports = new TodoTaskSetCommand();
 //# sourceMappingURL=task-set.js.map