@pnp/cli-microsoft365 6.0.0-beta.78fdd2c → 6.0.0-beta.7a78ebe

package/dist/m365/spo/commands/list/list-view-get.js

@@ -13,10 +13,12 @@ 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 _SpoListViewGetCommand_instances, _SpoListViewGetCommand_initTelemetry, _SpoListViewGetCommand_initOptions, _SpoListViewGetCommand_initValidators;
+var _SpoListViewGetCommand_instances, _SpoListViewGetCommand_initTelemetry, _SpoListViewGetCommand_initOptions, _SpoListViewGetCommand_initValidators, _SpoListViewGetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const formatting_1 = require("../../../../utils/formatting");
+const urlUtil_1 = require("../../../../utils/urlUtil");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoListViewGetCommand extends SpoCommand_1.default {
@@ -26,6 +28,7 @@ class SpoListViewGetCommand extends SpoCommand_1.default {
         __classPrivateFieldGet(this, _SpoListViewGetCommand_instances, "m", _SpoListViewGetCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoListViewGetCommand_instances, "m", _SpoListViewGetCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoListViewGetCommand_instances, "m", _SpoListViewGetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoListViewGetCommand_instances, "m", _SpoListViewGetCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.LIST_VIEW_GET;
@@ -33,33 +36,36 @@ class SpoListViewGetCommand extends SpoCommand_1.default {
     get description() {
         return 'Gets information about specific list view';
     }
-    commandAction(logger, args, cb) {
-        const baseRestUrl = `${args.options.webUrl}/_api/web`;
-        let listRestUrl = '';
-        if (args.options.listId) {
-            listRestUrl = `/lists(guid'${utils_1.formatting.encodeQueryParameter(args.options.listId)}')`;
-        }
-        else if (args.options.listTitle) {
-            listRestUrl = `/lists/getByTitle('${utils_1.formatting.encodeQueryParameter(args.options.listTitle)}')`;
-        }
-        else if (args.options.listUrl) {
-            const listServerRelativeUrl = utils_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.listUrl);
-            listRestUrl = `/GetList('${utils_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')`;
-        }
-        const viewRestUrl = `/views/${(args.options.viewId ? `getById('${utils_1.formatting.encodeQueryParameter(args.options.viewId)}')` : `getByTitle('${utils_1.formatting.encodeQueryParameter(args.options.viewTitle)}')`)}`;
-        const requestOptions = {
-            url: `${baseRestUrl}${listRestUrl}${viewRestUrl}`,
-            headers: {
-                accept: 'application/json;odata=nometadata'
-            },
-            responseType: 'json'
-        };
-        request_1.default
-            .get(requestOptions)
-            .then((result) => {
-            logger.log(result);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const baseRestUrl = `${args.options.webUrl}/_api/web`;
+            let listRestUrl = '';
+            if (args.options.listId) {
+                listRestUrl = `/lists(guid'${formatting_1.formatting.encodeQueryParameter(args.options.listId)}')`;
+            }
+            else if (args.options.listTitle) {
+                listRestUrl = `/lists/getByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.listTitle)}')`;
+            }
+            else if (args.options.listUrl) {
+                const listServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.listUrl);
+                listRestUrl = `/GetList('${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')`;
+            }
+            const viewRestUrl = `/views/${(args.options.id ? `getById('${formatting_1.formatting.encodeQueryParameter(args.options.id)}')` : `getByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.title)}')`)}`;
+            const requestOptions = {
+                url: `${baseRestUrl}${listRestUrl}${viewRestUrl}`,
+                headers: {
+                    accept: 'application/json;odata=nometadata'
+                },
+                responseType: 'json'
+            };
+            try {
+                const result = yield request_1.default.get(requestOptions);
+                logger.log(result);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 _SpoListViewGetCommand_instances = new WeakSet(), _SpoListViewGetCommand_initTelemetry = function _SpoListViewGetCommand_initTelemetry() {
@@ -68,8 +74,8 @@ _SpoListViewGetCommand_instances = new WeakSet(), _SpoListViewGetCommand_initTel
             listId: typeof args.options.listId !== 'undefined',
             listTitle: typeof args.options.listTitle !== 'undefined',
             listUrl: typeof args.options.listUrl !== 'undefined',
-            viewId: typeof args.options.viewId !== 'undefined',
-            viewTitle: typeof args.options.viewTitle !== 'undefined'
+            id: typeof args.options.id !== 'undefined',
+            title: typeof args.options.title !== 'undefined'
         });
     });
 }, _SpoListViewGetCommand_initOptions = function _SpoListViewGetCommand_initOptions() {
@@ -82,35 +88,28 @@ _SpoListViewGetCommand_instances = new WeakSet(), _SpoListViewGetCommand_initTel
     }, {
         option: '--listUrl [listUrl]'
     }, {
-        option: '--viewId [viewId]'
+        option: '--id [id]'
     }, {
-        option: '--viewTitle [viewTitle]'
+        option: '--title [title]'
     });
 }, _SpoListViewGetCommand_initValidators = function _SpoListViewGetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+        const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.webUrl);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }
-        if (!args.options.listId && !args.options.listTitle && !args.options.listUrl) {
-            return `Specify listId, listTitle or listUrl`;
-        }
         if (args.options.listId &&
-            !utils_1.validation.isValidGuid(args.options.listId)) {
+            !validation_1.validation.isValidGuid(args.options.listId)) {
             return `${args.options.listId} in option listId is not a valid GUID`;
         }
-        if (!args.options.viewId && !args.options.viewTitle) {
-            return `Specify viewId or viewTitle`;
-        }
-        if (args.options.viewId && args.options.viewTitle) {
-            return `Specify viewId or viewTitle but not both`;
-        }
-        if (args.options.viewId &&
-            !utils_1.validation.isValidGuid(args.options.viewId)) {
-            return `${args.options.viewId} in option viewId is not a valid GUID`;
+        if (args.options.id &&
+            !validation_1.validation.isValidGuid(args.options.id)) {
+            return `${args.options.id} in option id is not a valid GUID`;
         }
         return true;
     }));
+}, _SpoListViewGetCommand_initOptionSets = function _SpoListViewGetCommand_initOptionSets() {
+    this.optionSets.push(['listId', 'listTitle', 'listUrl'], ['id', 'title']);
 };
 module.exports = new SpoListViewGetCommand();
 //# sourceMappingURL=list-view-get.js.map

package/dist/m365/spo/commands/list/list-view-list.js

@@ -13,10 +13,11 @@ 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 _SpoListViewListCommand_instances, _SpoListViewListCommand_initTelemetry, _SpoListViewListCommand_initOptions, _SpoListViewListCommand_initValidators;
+var _SpoListViewListCommand_instances, _SpoListViewListCommand_initTelemetry, _SpoListViewListCommand_initOptions, _SpoListViewListCommand_initValidators, _SpoListViewListCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const formatting_1 = require("../../../../utils/formatting");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoListViewListCommand extends SpoCommand_1.default {
@@ -26,6 +27,7 @@ class SpoListViewListCommand extends SpoCommand_1.default {
         __classPrivateFieldGet(this, _SpoListViewListCommand_instances, "m", _SpoListViewListCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoListViewListCommand_instances, "m", _SpoListViewListCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoListViewListCommand_instances, "m", _SpoListViewListCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoListViewListCommand_instances, "m", _SpoListViewListCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.LIST_VIEW_LIST;
@@ -36,31 +38,34 @@ class SpoListViewListCommand extends SpoCommand_1.default {
     defaultProperties() {
         return ['Id', 'Title', 'DefaultView', 'Hidden', 'BaseViewId'];
     }
-    commandAction(logger, args, cb) {
-        if (this.verbose) {
-            const list = (args.options.listId ? args.options.listId : args.options.listTitle);
-            logger.logToStderr(`Retrieving views information for list ${list} in site at ${args.options.webUrl}...`);
-        }
-        let requestUrl = '';
-        if (args.options.listId) {
-            requestUrl = `${args.options.webUrl}/_api/web/lists(guid'${utils_1.formatting.encodeQueryParameter(args.options.listId)}')/views`;
-        }
-        else {
-            requestUrl = `${args.options.webUrl}/_api/web/lists/GetByTitle('${utils_1.formatting.encodeQueryParameter(args.options.listTitle)}')/views`;
-        }
-        const requestOptions = {
-            url: requestUrl,
-            headers: {
-                'accept': 'application/json;odata=nometadata'
-            },
-            responseType: 'json'
-        };
-        request_1.default
-            .get(requestOptions)
-            .then((res) => {
-            logger.log(res.value);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                const list = (args.options.listId ? args.options.listId : args.options.listTitle);
+                logger.logToStderr(`Retrieving views information for list ${list} in site at ${args.options.webUrl}...`);
+            }
+            let requestUrl = '';
+            if (args.options.listId) {
+                requestUrl = `${args.options.webUrl}/_api/web/lists(guid'${formatting_1.formatting.encodeQueryParameter(args.options.listId)}')/views`;
+            }
+            else {
+                requestUrl = `${args.options.webUrl}/_api/web/lists/GetByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.listTitle)}')/views`;
+            }
+            const requestOptions = {
+                url: requestUrl,
+                headers: {
+                    'accept': 'application/json;odata=nometadata'
+                },
+                responseType: 'json'
+            };
+            try {
+                const res = yield request_1.default.get(requestOptions);
+                logger.log(res.value);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 _SpoListViewListCommand_instances = new WeakSet(), _SpoListViewListCommand_initTelemetry = function _SpoListViewListCommand_initTelemetry() {
@@ -80,23 +85,19 @@ _SpoListViewListCommand_instances = new WeakSet(), _SpoListViewListCommand_initT
     });
 }, _SpoListViewListCommand_initValidators = function _SpoListViewListCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+        const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.webUrl);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }
         if (args.options.listId) {
-            if (!utils_1.validation.isValidGuid(args.options.listId)) {
+            if (!validation_1.validation.isValidGuid(args.options.listId)) {
                 return `${args.options.listId} is not a valid GUID`;
             }
         }
-        if (args.options.listId && args.options.listTitle) {
-            return 'Specify listId or listTitle, but not both';
-        }
-        if (!args.options.listId && !args.options.listTitle) {
-            return 'Specify listId or listTitle, one is required';
-        }
         return true;
     }));
+}, _SpoListViewListCommand_initOptionSets = function _SpoListViewListCommand_initOptionSets() {
+    this.optionSets.push(['listId', 'listTitle']);
 };
 module.exports = new SpoListViewListCommand();
 //# sourceMappingURL=list-view-list.js.map

package/dist/m365/spo/commands/list/list-view-remove.js

@@ -13,11 +13,12 @@ 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 _SpoListViewRemoveCommand_instances, _SpoListViewRemoveCommand_initTelemetry, _SpoListViewRemoveCommand_initOptions, _SpoListViewRemoveCommand_initValidators;
+var _SpoListViewRemoveCommand_instances, _SpoListViewRemoveCommand_initTelemetry, _SpoListViewRemoveCommand_initOptions, _SpoListViewRemoveCommand_initValidators, _SpoListViewRemoveCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
-const cli_1 = require("../../../../cli");
+const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const formatting_1 = require("../../../../utils/formatting");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoListViewRemoveCommand extends SpoCommand_1.default {
@@ -27,6 +28,7 @@ class SpoListViewRemoveCommand extends SpoCommand_1.default {
         __classPrivateFieldGet(this, _SpoListViewRemoveCommand_instances, "m", _SpoListViewRemoveCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoListViewRemoveCommand_instances, "m", _SpoListViewRemoveCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoListViewRemoveCommand_instances, "m", _SpoListViewRemoveCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoListViewRemoveCommand_instances, "m", _SpoListViewRemoveCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.LIST_VIEW_REMOVE;
@@ -34,50 +36,49 @@ class SpoListViewRemoveCommand extends SpoCommand_1.default {
     get description() {
         return 'Deletes the specified view from the list';
     }
-    commandAction(logger, args, cb) {
-        const removeViewFromList = () => {
-            if (this.verbose) {
-                const list = (args.options.listId ? args.options.listId : args.options.listTitle);
-                logger.logToStderr(`Removing view ${args.options.viewId || args.options.viewTitle} from list ${list} in site at ${args.options.webUrl}...`);
-            }
-            let requestUrl = '';
-            const listSelector = args.options.listId ? `(guid'${utils_1.formatting.encodeQueryParameter(args.options.listId)}')` : `/GetByTitle('${utils_1.formatting.encodeQueryParameter(args.options.listTitle)}')`;
-            const viewSelector = args.options.viewId ? `(guid'${utils_1.formatting.encodeQueryParameter(args.options.viewId)}')` : `/GetByTitle('${utils_1.formatting.encodeQueryParameter(args.options.viewTitle)}')`;
-            requestUrl = `${args.options.webUrl}/_api/web/lists${listSelector}/views${viewSelector}`;
-            const requestOptions = {
-                url: requestUrl,
-                headers: {
-                    'X-HTTP-Method': 'DELETE',
-                    'If-Match': '*',
-                    'accept': 'application/json;odata=nometadata'
-                },
-                responseType: 'json'
-            };
-            request_1.default
-                .post(requestOptions)
-                .then(() => {
-                // REST post call doesn't return anything
-                cb();
-            }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
-        };
-        if (args.options.confirm) {
-            removeViewFromList();
-        }
-        else {
-            cli_1.Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove the view ${args.options.viewId || args.options.viewTitle} from the list ${args.options.listId || args.options.listTitle} in site ${args.options.webUrl}?`
-            }, (result) => {
-                if (!result.continue) {
-                    cb();
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const removeViewFromList = () => __awaiter(this, void 0, void 0, function* () {
+                if (this.verbose) {
+                    const list = (args.options.listId ? args.options.listId : args.options.listTitle);
+                    logger.logToStderr(`Removing view ${args.options.id || args.options.title} from list ${list} in site at ${args.options.webUrl}...`);
+                }
+                let requestUrl = '';
+                const listSelector = args.options.listId ? `(guid'${formatting_1.formatting.encodeQueryParameter(args.options.listId)}')` : `/GetByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.listTitle)}')`;
+                const viewSelector = args.options.id ? `(guid'${formatting_1.formatting.encodeQueryParameter(args.options.id)}')` : `/GetByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.title)}')`;
+                requestUrl = `${args.options.webUrl}/_api/web/lists${listSelector}/views${viewSelector}`;
+                const requestOptions = {
+                    url: requestUrl,
+                    headers: {
+                        'X-HTTP-Method': 'DELETE',
+                        'If-Match': '*',
+                        'accept': 'application/json;odata=nometadata'
+                    },
+                    responseType: 'json'
+                };
+                try {
+                    yield request_1.default.post(requestOptions);
+                    // REST post call doesn't return anything
                 }
-                else {
-                    removeViewFromList();
+                catch (err) {
+                    this.handleRejectedODataJsonPromise(err);
                 }
             });
-        }
+            if (args.options.confirm) {
+                yield removeViewFromList();
+            }
+            else {
+                const result = yield Cli_1.Cli.prompt({
+                    type: 'confirm',
+                    name: 'continue',
+                    default: false,
+                    message: `Are you sure you want to remove the view ${args.options.id || args.options.title} from the list ${args.options.listId || args.options.listTitle} in site ${args.options.webUrl}?`
+                });
+                if (result.continue) {
+                    yield removeViewFromList();
+                }
+            }
+        });
     }
 }
 _SpoListViewRemoveCommand_instances = new WeakSet(), _SpoListViewRemoveCommand_initTelemetry = function _SpoListViewRemoveCommand_initTelemetry() {
@@ -85,8 +86,8 @@ _SpoListViewRemoveCommand_instances = new WeakSet(), _SpoListViewRemoveCommand_i
         Object.assign(this.telemetryProperties, {
             listId: typeof args.options.listId !== 'undefined',
             listTitle: typeof args.options.listTitle !== 'undefined',
-            viewId: typeof args.options.viewId !== 'undefined',
-            viewTitle: typeof args.options.viewTitle !== 'undefined',
+            id: typeof args.options.id !== 'undefined',
+            title: typeof args.options.title !== 'undefined',
             confirm: (!(!args.options.confirm)).toString()
         });
     });
@@ -98,42 +99,32 @@ _SpoListViewRemoveCommand_instances = new WeakSet(), _SpoListViewRemoveCommand_i
     }, {
         option: '--listTitle [listTitle]'
     }, {
-        option: '--viewId [viewId]'
+        option: '--id [id]'
     }, {
-        option: '--viewTitle [viewTitle]'
+        option: '--title [title]'
     }, {
         option: '--confirm'
     });
 }, _SpoListViewRemoveCommand_initValidators = function _SpoListViewRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+        const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.webUrl);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }
         if (args.options.listId) {
-            if (!utils_1.validation.isValidGuid(args.options.listId)) {
+            if (!validation_1.validation.isValidGuid(args.options.listId)) {
                 return `${args.options.listId} is not a valid GUID`;
             }
         }
-        if (args.options.viewId) {
-            if (!utils_1.validation.isValidGuid(args.options.viewId)) {
-                return `${args.options.viewId} is not a valid GUID`;
+        if (args.options.id) {
+            if (!validation_1.validation.isValidGuid(args.options.id)) {
+                return `${args.options.id} is not a valid GUID`;
             }
         }
-        if (args.options.listId && args.options.listTitle) {
-            return 'Specify listId or listTitle, but not both';
-        }
-        if (!args.options.listId && !args.options.listTitle) {
-            return 'Specify listId or listTitle, one is required';
-        }
-        if (args.options.viewId && args.options.viewTitle) {
-            return 'Specify viewId or viewTitle, but not both';
-        }
-        if (!args.options.viewId && !args.options.viewTitle) {
-            return 'Specify viewId or viewTitle, one is required';
-        }
         return true;
     }));
+}, _SpoListViewRemoveCommand_initOptionSets = function _SpoListViewRemoveCommand_initOptionSets() {
+    this.optionSets.push(['listId', 'listTitle'], ['id', 'title']);
 };
 module.exports = new SpoListViewRemoveCommand();
 //# sourceMappingURL=list-view-remove.js.map

package/dist/m365/spo/commands/list/list-view-set.js

@@ -13,10 +13,12 @@ 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 _SpoListViewSetCommand_instances, _SpoListViewSetCommand_initTelemetry, _SpoListViewSetCommand_initOptions, _SpoListViewSetCommand_initValidators;
+var _SpoListViewSetCommand_instances, _SpoListViewSetCommand_initTelemetry, _SpoListViewSetCommand_initOptions, _SpoListViewSetCommand_initValidators, _SpoListViewSetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const formatting_1 = require("../../../../utils/formatting");
+const spo_1 = require("../../../../utils/spo");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoListViewSetCommand extends SpoCommand_1.default {
@@ -26,6 +28,7 @@ class SpoListViewSetCommand extends SpoCommand_1.default {
         __classPrivateFieldGet(this, _SpoListViewSetCommand_instances, "m", _SpoListViewSetCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoListViewSetCommand_instances, "m", _SpoListViewSetCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoListViewSetCommand_instances, "m", _SpoListViewSetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoListViewSetCommand_instances, "m", _SpoListViewSetCommand_initOptionSets).call(this);
     }
     allowUnknownOptions() {
         return true;
@@ -36,28 +39,31 @@ class SpoListViewSetCommand extends SpoCommand_1.default {
     get description() {
         return 'Updates existing list view';
     }
-    commandAction(logger, args, cb) {
-        const baseRestUrl = `${args.options.webUrl}/_api/web/lists`;
-        const listRestUrl = args.options.listId ?
-            `(guid'${utils_1.formatting.encodeQueryParameter(args.options.listId)}')`
-            : `/getByTitle('${utils_1.formatting.encodeQueryParameter(args.options.listTitle)}')`;
-        const viewRestUrl = `/views/${(args.options.viewId ? `getById('${utils_1.formatting.encodeQueryParameter(args.options.viewId)}')` : `getByTitle('${utils_1.formatting.encodeQueryParameter(args.options.viewTitle)}')`)}`;
-        utils_1.spo
-            .getRequestDigest(args.options.webUrl)
-            .then((res) => {
-            const requestOptions = {
-                url: `${baseRestUrl}${listRestUrl}${viewRestUrl}`,
-                headers: {
-                    'X-RequestDigest': res.FormDigestValue,
-                    'content-type': 'application/json;odata=nometadata',
-                    accept: 'application/json;odata=nometadata'
-                },
-                responseType: 'json',
-                data: this.getPayload(args.options)
-            };
-            return request_1.default.patch(requestOptions);
-        })
-            .then(_ => cb(), (rawRes) => this.handleRejectedODataJsonPromise(rawRes, logger, cb));
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const baseRestUrl = `${args.options.webUrl}/_api/web/lists`;
+            const listRestUrl = args.options.listId ?
+                `(guid'${formatting_1.formatting.encodeQueryParameter(args.options.listId)}')`
+                : `/getByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.listTitle)}')`;
+            const viewRestUrl = `/views/${(args.options.id ? `getById('${formatting_1.formatting.encodeQueryParameter(args.options.id)}')` : `getByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.title)}')`)}`;
+            try {
+                const res = yield spo_1.spo.getRequestDigest(args.options.webUrl);
+                const requestOptions = {
+                    url: `${baseRestUrl}${listRestUrl}${viewRestUrl}`,
+                    headers: {
+                        'X-RequestDigest': res.FormDigestValue,
+                        'content-type': 'application/json;odata=nometadata',
+                        accept: 'application/json;odata=nometadata'
+                    },
+                    responseType: 'json',
+                    data: this.getPayload(args.options)
+                };
+                yield request_1.default.patch(requestOptions);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
     getPayload(options) {
         const payload = {};
@@ -65,8 +71,8 @@ class SpoListViewSetCommand extends SpoCommand_1.default {
             'webUrl',
             'listId',
             'listTitle',
-            'viewId',
-            'viewTitle',
+            'id',
+            'title',
             'debug',
             'verbose',
             'output'
@@ -84,8 +90,8 @@ _SpoListViewSetCommand_instances = new WeakSet(), _SpoListViewSetCommand_initTel
         Object.assign(this.telemetryProperties, {
             listId: typeof args.options.listId !== 'undefined',
             listTitle: typeof args.options.listTitle !== 'undefined',
-            viewId: typeof args.options.viewId !== 'undefined',
-            viewTitle: typeof args.options.viewTitle !== 'undefined'
+            id: typeof args.options.id !== 'undefined',
+            title: typeof args.options.title !== 'undefined'
         });
     });
 }, _SpoListViewSetCommand_initOptions = function _SpoListViewSetCommand_initOptions() {
@@ -96,38 +102,28 @@ _SpoListViewSetCommand_instances = new WeakSet(), _SpoListViewSetCommand_initTel
     }, {
         option: '--listTitle [listTitle]'
     }, {
-        option: '--viewId [viewId]'
+        option: '--id [id]'
     }, {
-        option: '--viewTitle [viewTitle]'
+        option: '--title [title]'
     });
 }, _SpoListViewSetCommand_initValidators = function _SpoListViewSetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+        const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.webUrl);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }
-        if (!args.options.listId && !args.options.listTitle) {
-            return `Specify listId or listTitle`;
-        }
-        if (args.options.listId && args.options.listTitle) {
-            return `Specify listId or listTitle but not both`;
-        }
         if (args.options.listId &&
-            !utils_1.validation.isValidGuid(args.options.listId)) {
+            !validation_1.validation.isValidGuid(args.options.listId)) {
             return `${args.options.listId} in option listId is not a valid GUID`;
         }
-        if (!args.options.viewId && !args.options.viewTitle) {
-            return `Specify viewId or viewTitle`;
-        }
-        if (args.options.viewId && args.options.viewTitle) {
-            return `Specify viewId or viewTitle but not both`;
-        }
-        if (args.options.viewId &&
-            !utils_1.validation.isValidGuid(args.options.viewId)) {
-            return `${args.options.viewId} in option viewId is not a valid GUID`;
+        if (args.options.id &&
+            !validation_1.validation.isValidGuid(args.options.id)) {
+            return `${args.options.id} in option id is not a valid GUID`;
         }
         return true;
     }));
+}, _SpoListViewSetCommand_initOptionSets = function _SpoListViewSetCommand_initOptionSets() {
+    this.optionSets.push(['listId', 'listTitle'], ['id', 'title']);
 };
 module.exports = new SpoListViewSetCommand();
 //# sourceMappingURL=list-view-set.js.map